Commit 76519303b9a488a0b9f4fb4c4b1968d6f9bacba8 | the-knife

apps/server/src/orchestration/Layers/CheckpointReactor.test.ts+52-3

...	@@ -220,6 +220,8 @@ describe("CheckpointReactor", () => {	...	@@ -220,6 +220,8 @@ describe("CheckpointReactor", () => {
220	async function createHarness(options?: {	220	async function createHarness(options?: {
221	readonly hasSession?: boolean;	221	readonly hasSession?: boolean;
222	readonly seedFilesystemCheckpoints?: boolean;	222	readonly seedFilesystemCheckpoints?: boolean;
		223	readonly projectWorkspaceRoot?: string;
		224	readonly threadWorktreePath?: string \| null;
223	}) {	225	}) {
224	const cwd = createGitRepository();	226	const cwd = createGitRepository();
225	tempDirs.push(cwd);	227	tempDirs.push(cwd);
...	@@ -252,7 +254,7 @@ describe("CheckpointReactor", () => {	...	@@ -252,7 +254,7 @@ describe("CheckpointReactor", () => {
252	commandId: asCommandId("cmd-project-create"),	254	commandId: asCommandId("cmd-project-create"),
253	projectId: asProjectId("project-1"),	255	projectId: asProjectId("project-1"),
254	title: "Test Project",	256	title: "Test Project",
255	workspaceRoot: "/tmp/test-project",	257	workspaceRoot: options?.projectWorkspaceRoot ?? cwd,
256	defaultModel: "gpt-5-codex",	258	defaultModel: "gpt-5-codex",
257	createdAt,	259	createdAt,
258	}),	260	}),
...	@@ -266,7 +268,7 @@ describe("CheckpointReactor", () => {	...	@@ -266,7 +268,7 @@ describe("CheckpointReactor", () => {
266	title: "Thread",	268	title: "Thread",
267	model: "gpt-5-codex",	269	model: "gpt-5-codex",
268	branch: null,	270	branch: null,
269	worktreePath: cwd,	271	worktreePath: options?.threadWorktreePath ?? cwd,
270	createdAt,	272	createdAt,
271	}),	273	}),
272	);	274	);
...	@@ -363,10 +365,11 @@ describe("CheckpointReactor", () => {	...	@@ -363,10 +365,11 @@ describe("CheckpointReactor", () => {
363	).toBe("v2\n");	365	).toBe("v2\n");
364	});	366	});
365		367
366	it("captures pre-turn baseline from thread.turn.start domain flow before runtime turn events", async () => {	368	it("captures pre-turn baseline from project workspace root when thread worktree is unset", async () => {
367	const harness = await createHarness({	369	const harness = await createHarness({
368	hasSession: false,	370	hasSession: false,
369	seedFilesystemCheckpoints: false,	371	seedFilesystemCheckpoints: false,
		372	threadWorktreePath: null,
370	});	373	});
371		374
372	await Effect.runPromise(	375	await Effect.runPromise(
...	@@ -390,6 +393,52 @@ describe("CheckpointReactor", () => {	...	@@ -390,6 +393,52 @@ describe("CheckpointReactor", () => {
390	).toBe("v1\n");	393	).toBe("v1\n");
391	});	394	});
392		395
		396	it("captures turn completion checkpoint from project workspace root when provider session cwd is unavailable", async () => {
		397	const harness = await createHarness({
		398	hasSession: false,
		399	seedFilesystemCheckpoints: false,
		400	threadWorktreePath: null,
		401	});
		402	const createdAt = new Date().toISOString();
		403
		404	await Effect.runPromise(
		405	harness.engine.dispatch({
		406	type: "thread.session.set",
		407	commandId: asCommandId("cmd-session-set-missing-provider-cwd"),
		408	threadId: asThreadId("thread-1"),
		409	session: {
		410	threadId: asThreadId("thread-1"),
		411	status: "running",
		412	providerName: "codex",
		413	providerSessionId: asSessionId("sess-missing"),
		414	providerThreadId: ProviderThreadId.makeUnsafe("provider-thread-missing"),
		415	activeTurnId: asTurnId("turn-missing-cwd"),
		416	lastError: null,
		417	updatedAt: createdAt,
		418	},
		419	createdAt,
		420	}),
		421	);
		422
		423	fs.writeFileSync(path.join(harness.cwd, "README.md"), "v2\n", "utf8");
		424	harness.provider.emit({
		425	type: "turn.completed",
		426	eventId: EventId.makeUnsafe("evt-turn-completed-missing-provider-cwd"),
		427	provider: "codex",
		428	sessionId: asSessionId("sess-missing"),
		429	createdAt: new Date().toISOString(),
		430	threadId: ProviderThreadId.makeUnsafe("provider-thread-missing"),
		431	turnId: asTurnId("turn-missing-cwd"),
		432	status: "completed",
		433	});
		434
		435	await waitForEvent(harness.engine, (event) => event.type === "thread.turn-diff-completed");
		436	expect(gitRefExists(harness.cwd, checkpointRefForTurn(asThreadId("thread-1"), 1))).toBe(true);
		437	expect(
		438	gitShowFileAtRef(harness.cwd, checkpointRefForTurn(asThreadId("thread-1"), 1), "README.md"),
		439	).toBe("v2\n");
		440	});
		441
393	it("maps runtime checkpoint.captured into thread.turn.diff.complete when missing in read model", async () => {	442	it("maps runtime checkpoint.captured into thread.turn.diff.complete when missing in read model", async () => {
394	const harness = await createHarness();	443	const harness = await createHarness();
395	const createdAt = new Date().toISOString();	444	const createdAt = new Date().toISOString();

apps/server/src/orchestration/Layers/CheckpointReactor.ts+56-10

 @@ -46,6 +46,27 @@ function trimToNonEmpty(value: string | null | undefined): string | undefined {
   return normalized && normalized.length > 0 ? normalized : undefined;
 }
+function resolveThreadWorkspaceCwd(input: {
+  readonly thread: {
+    readonly projectId: string;
+    readonly worktreePath: string | null;
+  };
+  readonly projects: ReadonlyArray<{
+    readonly id: string;
+    readonly workspaceRoot: string;
+  }>;
+}): string | undefined {
+  const worktreeCwd = trimToNonEmpty(input.thread.worktreePath);
+  if (worktreeCwd) {
+    return worktreeCwd;
+  }
+  const workspaceRoot = input.projects.find(
+    (project) => project.id === input.thread.projectId,
+  )?.workspaceRoot;
+  return trimToNonEmpty(workspaceRoot);
+}
 function checkpointStatusFromRuntime(status: string | undefined): "ready" | "missing" | "error" {
   switch (status) {
     case "failed":
 @@ -133,6 +154,7 @@ const make = Effect.gen(function* () {
     const readModel = yield* orchestrationEngine.getReadModel();
     const thread = readModel.threads.find((entry) => entry.id === threadId);
     const projectedSessionId = thread?.session?.providerSessionId ?? null;
+    const projectedProviderThreadId = trimToNonEmpty(thread?.session?.providerThreadId);
     const sessions = yield* providerService.listSessions();
 @@ -154,8 +176,17 @@ const make = Effect.gen(function* () {
       }
     }
-    const matchedSession = sessions.find((session) => session.threadId?.trim() === threadId.trim());
+    if (projectedProviderThreadId) {
-    return findSessionWithCwd(matchedSession);
+      const matchedSession = sessions.find(
+        (session) => session.threadId?.trim() === projectedProviderThreadId,
+      );
+      const fromProviderThread = findSessionWithCwd(matchedSession);
+      if (Option.isSome(fromProviderThread)) {
+        return fromProviderThread;
+      }
+    }
+    return Option.none();
   });
   const captureCheckpointFromTurnCompletion = Effect.fnUntraced(function* (
 @@ -179,7 +210,16 @@ const make = Effect.gen(function* () {
     }
     const sessionRuntime = yield* resolveSessionRuntimeForThread(thread.id);
-    if (Option.isNone(sessionRuntime)) {
+    const checkpointCwd =
+      Option.match(sessionRuntime, {
+        onNone: () => undefined,
+        onSome: (runtime) => runtime.cwd,
+      }) ??
+      resolveThreadWorkspaceCwd({
+        thread,
+        projects: readModel.projects,
+      });
+    if (!checkpointCwd) {
       yield* Effect.logWarning("checkpoint capture skipped: no active provider session cwd", {
         threadId: thread.id,
         turnId,
 @@ -197,7 +237,7 @@ const make = Effect.gen(function* () {
     const targetCheckpointRef = checkpointRefForThreadTurn(thread.id, nextTurnCount);
     const fromCheckpointExists = yield* checkpointStore.hasCheckpointRef({
-      cwd: sessionRuntime.value.cwd,
+      cwd: checkpointCwd,
       checkpointRef: fromCheckpointRef,
     });
     if (!fromCheckpointExists) {
 @@ -209,13 +249,13 @@ const make = Effect.gen(function* () {
     }
     yield* checkpointStore.captureCheckpoint({
-      cwd: sessionRuntime.value.cwd,
+      cwd: checkpointCwd,
       checkpointRef: targetCheckpointRef,
     });
     const files = yield* checkpointStore
       .diffCheckpoints({
-        cwd: sessionRuntime.value.cwd,
+        cwd: checkpointCwd,
         fromCheckpointRef,
         toCheckpointRef: targetCheckpointRef,
         fallbackFromToHead: false,
 @@ -296,9 +336,12 @@ const make = Effect.gen(function* () {
       return;
     }
-    const checkpointCwdFromThread = trimToNonEmpty(thread.worktreePath);
+    const checkpointCwdFromThreadOrProject = resolveThreadWorkspaceCwd({
+      thread,
+      projects: readModel.projects,
+    });
     const checkpointCwd =
-      checkpointCwdFromThread ??
+      checkpointCwdFromThreadOrProject ??
       Option.match(yield* resolveSessionRuntimeForThread(thread.id), {
         onNone: () => undefined,
         onSome: (runtime) => runtime.cwd,
 @@ -349,9 +392,12 @@ const make = Effect.gen(function* () {
       return;
     }
-    const checkpointCwdFromThread = trimToNonEmpty(thread.worktreePath);
+    const checkpointCwdFromThreadOrProject = resolveThreadWorkspaceCwd({
+      thread,
+      projects: readModel.projects,
+    });
     const checkpointCwd =
-      checkpointCwdFromThread ??
+      checkpointCwdFromThreadOrProject ??
       Option.match(yield* resolveSessionRuntimeForThread(threadId), {
         onNone: () => undefined,
         onSome: (runtime) => runtime.cwd,

apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts+4

 @@ -181,6 +181,10 @@ describe("ProviderCommandReactor", () => {
     await waitFor(() => harness.startSession.mock.calls.length === 1);
     await waitFor(() => harness.sendTurn.mock.calls.length === 1);
+    expect(harness.startSession.mock.calls[0]?.[0]).toMatchObject({
+      cwd: "/tmp/provider-project",
+      model: "gpt-5-codex",
+    });
     const readModel = await Effect.runPromise(harness.engine.getReadModel());
     const thread = readModel.threads.find((entry) => entry.id === asThreadId("thread-1"));

apps/server/src/orchestration/Layers/ProviderCommandReactor.ts+28-5

 @@ -5,7 +5,6 @@ import {
   type OrchestrationEvent,
   type ProviderKind,
   type OrchestrationSession,
-  type ProviderSessionId,
   type ThreadId,
   type TurnId,
 } from "@t3tools/contracts";
 @@ -34,6 +33,27 @@ function trimToNonEmptyOrUndefined(value: string | undefined): string | undefine
   return normalized && normalized.length > 0 ? normalized : undefined;
 }
+function resolveEffectiveThreadCwd(input: {
+  readonly thread: {
+    readonly projectId: string;
+    readonly worktreePath: string | null;
+  };
+  readonly projects: ReadonlyArray<{
+    readonly id: string;
+    readonly workspaceRoot: string;
+  }>;
+}): string | undefined {
+  const worktreeCwd = trimToNonEmptyOrUndefined(input.thread.worktreePath ?? undefined);
+  if (worktreeCwd) {
+    return worktreeCwd;
+  }
+  const workspaceRoot = input.projects.find(
+    (project) => project.id === input.thread.projectId,
+  )?.workspaceRoot;
+  return trimToNonEmptyOrUndefined(workspaceRoot);
+}
 function mapProviderSessionStatusToOrchestrationStatus(
   status: "connecting" | "ready" | "running" | "error" | "closed",
 ): OrchestrationSession["status"] {
 @@ -115,7 +135,8 @@ const make = Effect.gen(function* () {
     threadId: ThreadId,
     createdAt: string,
   ) {
-    const thread = yield* resolveThread(threadId);
+    const readModel = yield* orchestrationEngine.getReadModel();
+    const thread = readModel.threads.find((entry) => entry.id === threadId);
     if (!thread) {
       return yield* Effect.die(new Error(`Thread '${threadId}' was not found in read model.`));
     }
 @@ -129,12 +150,14 @@ const make = Effect.gen(function* () {
       thread.session?.providerName === "codex" || thread.session?.providerName === "claudeCode"
         ? thread.session.providerName
         : undefined;
+    const effectiveCwd = resolveEffectiveThreadCwd({
+      thread,
+      projects: readModel.projects,
+    });
     const startedSession = yield* providerService.startSession({
       ...(preferredProvider ? { provider: preferredProvider } : {}),
-      ...(trimToNonEmptyOrUndefined(thread.worktreePath ?? undefined)
+      ...(effectiveCwd ? { cwd: effectiveCwd } : {}),
-        ? { cwd: trimToNonEmptyOrUndefined(thread.worktreePath ?? undefined) }
-        : {}),
       ...(trimToNonEmptyOrUndefined(thread.model) ? { model: thread.model } : {}),
     });

author	Julius Marminge <julius0216@outlook.com> 2026-02-24 20:15:40-08:00
committer	Julius Marminge <jmarminge@gmail.com> 2026-02-26 13:20:36-08:00
log	76519303b9a488a0b9f4fb4c4b1968d6f9bacba8
tree	1c7558bf5cd6e5b4fa0522c16bb91f8514eba9b0
parent	448c48cd109bee06abecffddb3fc7130a50e3666

fix checkpoint path