merge: preserve current Orca authority checks

Author: ruby-dlee

bin/backends/orca.sh

@@ -153,7 +153,7 @@ fm_backend_orca_worktree_create() {  # <project-path> <name>
   wt_path=$(printf '%s' "$out" | fm_backend_orca_json_get worktree-path 2>/dev/null || true)
   proof=unproven
   [ -z "$terminal" ] || proof=recorded
-  printf '%s\t%s\t%s\t%s\t%s\t%s' "$wt_id" "$wt_path" "$terminal" "$proof" "$repo_id" "$name"
+  printf '%s\t%s\t%s\t%s\t%s' "$wt_id" "$wt_path" "$terminal" "$proof" "$repo_id"
   if [ "$status" -ne 0 ] || [ -z "$wt_id" ] || [ -z "$wt_path" ]; then
     echo "error: orca worktree create returned incomplete or unsuccessful authority for $name" >&2
     return 2

bin/fm-spawn.sh

@@ -1147,10 +1147,9 @@ parse_orca_worktree_result() {
   ORCA_TERMINAL_PROOF=${rest%%$'\t'*}
   [ "$rest" != "$ORCA_TERMINAL_PROOF" ] || return 1
   rest=${rest#*$'\t'}
-  ORCA_REPO_ID=${rest%%$'\t'*}
-  [ "$rest" != "$ORCA_REPO_ID" ] || return 1
-  ORCA_PROVIDER_TASK=${rest#*$'\t'}
-  case "$ORCA_PROVIDER_TASK" in *$'\t'*) return 1 ;; esac
+  ORCA_REPO_ID=$rest
+  case "$ORCA_REPO_ID" in *$'\t'*) return 1 ;; esac
+  ORCA_PROVIDER_TASK=
 }
 
 persist_orca_cleanup_quarantine() {

tests/fm-checkout-refresh.test.sh

@@ -654,7 +654,7 @@ test_pool_preflight_surfaces_dirty_worktrees_without_blocking_clean_selection()
 }
 
 test_bootstrap_relays_hygiene_alerts() {
-  local project draft out diagnostic_out config_backup config_real
+  local project draft out config_backup config_real
   project=$(cd "$FM_TEST_HOME/projects/relvino" && pwd -P)
   draft="$project/.agents/skills/bootstrap-draft/SKILL.md"
   mkdir -p "$(dirname "$draft")"