test(FN-4397): align worktree conflict tests with stale-resolved + tripwire assertions

Fusion-Task-Id: FN-4397
Fusion-Task-Lineage: 1ffac4f7-adf5-4115-b588-108d75eadde7

packages/engine/src/__tests__/executor-worktree.test.ts

@@ -885,7 +885,7 @@ describe("TaskExecutor worktree recovery", () => {
     }
 
     expect(handleSpy).toHaveBeenCalledTimes(5);
-    const tripwireLogCall = vi.mocked(store.logEntry).mock.calls.find((call) =>
+    const tripwireLogCall = vi.mocked(store.logEntry).mock.calls.find((call: unknown[]) =>
       call[0] === "FN-050" && String(call[1]).includes("Branch conflict tripwire fired after 6 events"),
     );
     expect(tripwireLogCall).toBeDefined();

packages/engine/src/__tests__/worktree-pool.test.ts

@@ -276,6 +276,14 @@ describe("WorktreePool", () => {
           );
           throw err;
         }
+        if (cmdStr === "git worktree list --porcelain") {
+          return Buffer.from([
+            "worktree /other/wt",
+            "HEAD 1111111",
+            "branch refs/heads/fusion/fn-042",
+            "",
+          ].join("\n"));
+        }
         if (cmdStr.includes("git rev-parse --verify 'fusion/fn-042^{commit}'")) {
           return Buffer.from("abc123def456\n");
         }