Skip to content

Commit fa1507b

Browse files
committed
fix: restore Orca behavior baseline
1 parent 32cbb4a commit fa1507b

3 files changed

Lines changed: 112 additions & 65 deletions

File tree

bin/fm-spawn.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3417,8 +3417,8 @@ EOF
34173417
echo "error: cannot durably record Orca create authority for $ID" >&2
34183418
exit 1
34193419
}
3420-
if [ -z "$ORCA_WORKTREE_ID" ] || [ -z "$WT" ] || [ "$ORCA_PROVIDER_TASK" != "$ORCA_EXPECTED_TASK" ]; then
3421-
echo "error: orca did not return matching worktree id, path, and task authority for $W" >&2
3420+
if [ -z "$ORCA_WORKTREE_ID" ] || [ -z "$WT" ]; then
3421+
echo "error: orca did not return worktree id and path authority for $W" >&2
34223422
exit 1
34233423
fi
34243424
validate_spawn_worktree "orca worktree create" "$W"

bin/fm-teardown.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,10 @@ quiesce_child_endpoint() {
410410
scoped_target=$(meta_value "$meta" tmux_session_target)
411411
[ "$backend" != orca ] || scoped_target=$(meta_value "$meta" orca_worktree_id)
412412
if [ "$backend" = orca ]; then
413+
[ -n "$target" ] || {
414+
echo "error: child endpoint identity for $task is missing; refusing destructive cleanup" >&2
415+
return 1
416+
}
413417
quiesce_authoritative_orca_endpoint "$target" "$scoped_target" "fm-$task" || {
414418
echo "error: child Orca endpoint authority or quiescence is unproven for $task" >&2
415419
return 1

0 commit comments

Comments
 (0)