Commit b981fad920f43fe64dac4b547aba6ca4fb2f4715 | the-knife

author	Julius Marminge <julius0216@outlook.com> 2026-03-02 18:32:38-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-03-02 18:53:21-08:00
log	b981fad920f43fe64dac4b547aba6ca4fb2f4715
tree	0ccb568522239d235bba0a8f071285fb7bab4a92
parent	8a2f2a5c2b057f62473172dae3e2467afb8db394

Sync thread metadata after worktree branch rename

- Dispatch `thread.meta.update` with the renamed branch after `git.renameBranch`
- Remove pre-rename active-branch status check and related skip path
- Update reactor tests to assert branch metadata moves to generated branch

2 files changed, 23 insertions(+), 111 deletions(-)

apps
- server
  - src
    orchestration
    Layers
    ProviderCommandReactor.test.ts
    ProviderCommandReactor.ts

apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts+12-75

 @@ -108,27 +108,11 @@ describe("ProviderCommandReactor", () => {
     const interruptTurn = vi.fn((_: unknown) => Effect.void);
     const respondToRequest = vi.fn((_: unknown) => Effect.void);
     const stopSession = vi.fn((_: unknown) => Effect.void);
-    const statusBranchByCwd = new Map<string, string | null>();
     const renameBranch = vi.fn((_: unknown) =>
       Effect.succeed({
         branch: "t3code/generated-name",
       }),
     );
-    const statusDetails = vi.fn((cwd: string) =>
-      Effect.succeed({
-        branch: statusBranchByCwd.get(cwd) ?? null,
-        upstreamRef: null,
-        hasWorkingTreeChanges: false,
-        workingTree: {
-          files: [],
-          insertions: 0,
-          deletions: 0,
-        },
-        hasUpstream: false,
-        aheadCount: 0,
-        behindCount: 0,
-      }),
-    );
     const generateBranchName = vi.fn<TextGenerationShape["generateBranchName"]>(() =>
       Effect.succeed({
         branch: "generated-name",
 @@ -157,12 +141,7 @@ describe("ProviderCommandReactor", () => {
     const layer = ProviderCommandReactorLive.pipe(
       Layer.provideMerge(orchestrationLayer),
       Layer.provideMerge(Layer.succeed(ProviderService, service)),
-      Layer.provideMerge(
+      Layer.provideMerge(Layer.succeed(GitCore, { renameBranch } as unknown as GitCoreShape)),
-        Layer.succeed(
-          GitCore,
-          { renameBranch, statusDetails } as unknown as GitCoreShape,
-        ),
-      ),
       Layer.provideMerge(
         Layer.succeed(TextGeneration, { generateBranchName } as unknown as TextGenerationShape),
       ),
 @@ -210,11 +189,7 @@ describe("ProviderCommandReactor", () => {
       respondToRequest,
       stopSession,
       renameBranch,
-      statusDetails,
       generateBranchName,
-      setStatusBranch: (cwd: string, branch: string | null) => {
-        statusBranchByCwd.set(cwd, branch);
-      },
       stateDir,
     };
   }
 @@ -260,7 +235,6 @@ describe("ProviderCommandReactor", () => {
   it("generates and renames temporary worktree branch on first turn", async () => {
     const harness = await createHarness();
     const now = new Date().toISOString();
-    const worktreeCwd = "/tmp/provider-project/.t3/worktrees/t3code-89abc123";
     await Effect.runPromise(
       harness.engine.dispatch({
 @@ -268,10 +242,9 @@ describe("ProviderCommandReactor", () => {
         commandId: CommandId.makeUnsafe("cmd-thread-meta-set-temp-branch"),
         threadId: ThreadId.makeUnsafe("thread-1"),
         branch: "t3code/89abc123",
-        worktreePath: worktreeCwd,
+        worktreePath: "/tmp/provider-project/.t3/worktrees/t3code-89abc123",
       }),
     );
-    harness.setStatusBranch(worktreeCwd, "t3code/89abc123");
     await Effect.runPromise(
       harness.engine.dispatch({
 @@ -302,7 +275,7 @@ describe("ProviderCommandReactor", () => {
     await waitFor(() => harness.renameBranch.mock.calls.length === 1);
     expect(harness.generateBranchName.mock.calls[0]?.[0]).toEqual({
-      cwd: worktreeCwd,
+      cwd: "/tmp/provider-project/.t3/worktrees/t3code-89abc123",
       message: "Fix visual bug from screenshot",
       attachments: [
         {
 @@ -315,14 +288,18 @@ describe("ProviderCommandReactor", () => {
       ],
     });
     expect(harness.renameBranch.mock.calls[0]?.[0]).toEqual({
-      cwd: worktreeCwd,
+      cwd: "/tmp/provider-project/.t3/worktrees/t3code-89abc123",
       oldBranch: "t3code/89abc123",
       newBranch: "t3code/generated-name",
     });
-    const readModel = await Effect.runPromise(harness.engine.getReadModel());
+    await waitFor(() => {
-    const thread = readModel.threads.find((entry) => entry.id === ThreadId.makeUnsafe("thread-1"));
+      const readModel = Effect.runSync(harness.engine.getReadModel());
-    expect(thread?.branch).toBe("t3code/89abc123");
+      const thread = readModel.threads.find(
+        (entry) => entry.id === ThreadId.makeUnsafe("thread-1"),
+      );
+      return thread?.branch === "t3code/generated-name";
+    });
   });
   it("passes persisted attachment references to branch generation and turn start", async () => {
 @@ -396,7 +373,6 @@ describe("ProviderCommandReactor", () => {
   it("skips worktree branch generation after the first user turn", async () => {
     const harness = await createHarness();
     const now = new Date().toISOString();
-    const worktreeCwd = "/tmp/provider-project/.t3/worktrees/t3code-1234abcd";
     await Effect.runPromise(
       harness.engine.dispatch({
 @@ -404,10 +380,9 @@ describe("ProviderCommandReactor", () => {
         commandId: CommandId.makeUnsafe("cmd-thread-meta-set-temp-branch-2"),
         threadId: ThreadId.makeUnsafe("thread-1"),
         branch: "t3code/1234abcd",
-        worktreePath: worktreeCwd,
+        worktreePath: "/tmp/provider-project/.t3/worktrees/t3code-1234abcd",
       }),
     );
-    harness.setStatusBranch(worktreeCwd, "t3code/1234abcd");
     await Effect.runPromise(
       harness.engine.dispatch({
 @@ -450,44 +425,6 @@ describe("ProviderCommandReactor", () => {
     expect(harness.renameBranch.mock.calls.length).toBe(1);
   });
-  it("skips worktree rename when active branch already changed", async () => {
-    const harness = await createHarness();
-    const now = new Date().toISOString();
-    const worktreeCwd = "/tmp/provider-project/.t3/worktrees/t3code-badf00d0";
-    await Effect.runPromise(
-      harness.engine.dispatch({
-        type: "thread.meta.update",
-        commandId: CommandId.makeUnsafe("cmd-thread-meta-set-temp-branch-switched"),
-        threadId: ThreadId.makeUnsafe("thread-1"),
-        branch: "t3code/badf00d0",
-        worktreePath: worktreeCwd,
-      }),
-    );
-    harness.setStatusBranch(worktreeCwd, "feature/add-vscode-open-in-support");
-    await Effect.runPromise(
-      harness.engine.dispatch({
-        type: "thread.turn.start",
-        commandId: CommandId.makeUnsafe("cmd-turn-start-worktree-switched"),
-        threadId: ThreadId.makeUnsafe("thread-1"),
-        message: {
-          messageId: asMessageId("user-message-worktree-switched"),
-          role: "user",
-          text: "Fix visual bug from screenshot",
-          attachments: [],
-        },
-        approvalPolicy: "on-request",
-        sandboxMode: "workspace-write",
-        createdAt: now,
-      }),
-    );
-    await waitFor(() => harness.generateBranchName.mock.calls.length === 1);
-    await Effect.runPromise(Effect.sleep("20 millis"));
-    expect(harness.renameBranch.mock.calls.length).toBe(0);
-  });
   it("skips worktree rename when branch-name generation fails", async () => {
     const harness = await createHarness();
     const now = new Date().toISOString();

apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+11-36

...	@@ -330,42 +330,17 @@ const make = Effect.gen(function* () {	...	@@ -330,42 +330,17 @@ const make = Effect.gen(function* () {
330	const targetBranch = buildGeneratedWorktreeBranchName(generated.branch);	330	const targetBranch = buildGeneratedWorktreeBranchName(generated.branch);
331	if (targetBranch === oldBranch) return Effect.void;	331	if (targetBranch === oldBranch) return Effect.void;
332		332
333	return Effect.gen(function* () {	333	return Effect.flatMap(
334	const currentBranch = yield* git.statusDetails(cwd).pipe(	334	git.renameBranch({ cwd, oldBranch, newBranch: targetBranch }),
335	Effect.map((status) => status.branch),	335	(renamed) =>
336	Effect.catch((error) =>	336	orchestrationEngine.dispatch({
337	Effect.logWarning(	337	type: "thread.meta.update",
338	"provider command reactor failed to read active worktree branch",	338	commandId: serverCommandId("worktree-branch-rename"),
339	{	339	threadId: input.threadId,
340	threadId: input.threadId,	340	branch: renamed.branch,
341	cwd,	341	worktreePath: cwd,
342	oldBranch,	342	}),
343	targetBranch,	343	);
344	reason: error.message,
345	},
346	).pipe(Effect.as(null)),
347	),
348	);
349
350	if (currentBranch !== oldBranch) {
351	return yield* Effect.logWarning(
352	"provider command reactor skipped worktree branch rename because active branch changed",
353	{
354	threadId: input.threadId,
355	cwd,
356	oldBranch,
357	targetBranch,
358	currentBranch,
359	},
360	);
361	}
362
363	yield* git.renameBranch({
364	cwd,
365	oldBranch,
366	newBranch: targetBranch,
367	});
368	});
369	}),	344	}),
370	Effect.catchCause((cause) =>	345	Effect.catchCause((cause) =>
371	Effect.logWarning(	346	Effect.logWarning(