fix: address review findings on fork, session list, tower, wire, and transcript

- fork: route session lookup and confirmation errors through the command
  error path; drop redundant undefined unions
- session list: reject malformed --limit values such as 2x and 1.5
- git status parser: consume the origin path for unstaged renames/copies
- tower: validate the persisted base branch; treat completed missions as
  not needing a replacement worker; document /tower <base> activation
- wire: reject dot segments as legacy plan ids before migrating the key
- session fork: stamp updatedAt with the fork time so new forks sort first
- transcript: register the interruption marker; correct the plan directory
  and MCP forwarding docs
- tests: make acp success-path exit assertions discriminating; assert
  debounce timer cleanup directly; type telemetry stubs without casts

Author: elkaix

apps/pythinker-code/src/cli/sub/fork.ts

@@ -26,7 +26,7 @@ interface WritableLike {
 
 export interface ForkedSessionResult {
   readonly id: string;
-  readonly title?: string | undefined;
+  readonly title?: string;
 }
 
 export interface ForkDeps {
@@ -41,34 +41,34 @@ export interface ForkDeps {
 
 export interface ForkOptions {
   readonly yes: boolean;
-  readonly cwd?: string | undefined;
+  readonly cwd?: string;
 }
 
 export async function handleFork(
   deps: ForkDeps,
   sessionId: string | undefined,
   opts: ForkOptions,
 ): Promise<void> {
-  let resolvedId = normalizeOptionalSessionId(sessionId);
-  if (resolvedId === undefined) {
-    const sessions = await deps.listSessions(opts.cwd ?? deps.cwd());
-    const latest = sessions[0];
-    if (latest === undefined) {
-      deps.stderr.write('No previous session found to fork.\n');
-      return deps.exit(1);
-    }
-    if (!opts.yes) {
-      const confirmed = await deps.confirmPreviousSession(latest);
-      if (!confirmed) {
-        deps.stdout.write('Fork cancelled.\n');
-        return;
+  try {
+    let resolvedId = normalizeOptionalSessionId(sessionId);
+    if (resolvedId === undefined) {
+      const sessions = await deps.listSessions(opts.cwd ?? deps.cwd());
+      const latest = sessions[0];
+      if (latest === undefined) {
+        deps.stderr.write('No previous session found to fork.\n');
+        return deps.exit(1);
+      }
+      if (!opts.yes) {
+        const confirmed = await deps.confirmPreviousSession(latest);
+        if (!confirmed) {
+          deps.stdout.write('Fork cancelled.\n');
+          return;
+        }
       }
+      resolvedId = latest.id;
     }
-    resolvedId = latest.id;
-  }
 
-  const startedAt = Date.now();
-  try {
+    const startedAt = Date.now();
     const forked = await deps.forkSession(resolvedId);
     const elapsedMs = Date.now() - startedAt;
     const title = forked.title === undefined ? '' : ` ("${forked.title}")`;

apps/pythinker-code/src/cli/sub/session.ts

@@ -135,7 +135,7 @@ function formatRow(summary: SessionSummary, showWorkDir: boolean): string {
 }
 
 function sanitizeField(value: string): string {
-  return value.replaceAll(/[\x00-\x1F\x7F]+/g, ' ').trim();
+  return value.replaceAll(/[\u0000-\u001F\u007F]+/g, ' ').trim();
 }
 
 function formatTimestamp(epochMs: number): string {
@@ -145,8 +145,8 @@ function formatTimestamp(epochMs: number): string {
 }
 
 function parseLimitOption(value: string): number {
-  const parsed = Number.parseInt(value, 10);
-  if (!Number.isFinite(parsed) || parsed <= 0) {
+  const parsed = /^\d+$/.test(value) ? Number(value) : Number.NaN;
+  if (!Number.isSafeInteger(parsed) || parsed <= 0) {
     throw new Error(`--limit must be a positive integer, got "${value}"`);
   }
   return parsed;

apps/pythinker-code/test/cli/acp.test.ts

@@ -57,20 +57,22 @@ describe('pythinker acp', () => {
     const program = new Command('pythinker').exitOverride();
     registerAcpCommand(program);
 
-    await expect(program.parseAsync(['node', 'pythinker', 'acp'])).rejects.toThrow(ExitCalled);
+    exitSpy.mockImplementation((() => undefined) as never);
+    await program.parseAsync(['node', 'pythinker', 'acp']);
 
     expect(runAcpServer).toHaveBeenCalledTimes(1);
     expect(vi.mocked(runAcpServer).mock.calls[0]?.[0]).toEqual(
       expect.objectContaining({ homeDir: getDataDir() }),
     );
-    expect(exitSpy).toHaveBeenCalledWith(0);
+    expect(exitSpy.mock.calls).toEqual([[0]]);
   });
 
   it('invokes runAcpServer with the v2 host options and exits 0 on success', async () => {
     const program = new Command('pythinker').exitOverride();
     registerAcpCommand(program);
 
-    await expect(program.parseAsync(['node', 'pythinker', 'acp'])).rejects.toThrow(ExitCalled);
+    exitSpy.mockImplementation((() => undefined) as never);
+    await program.parseAsync(['node', 'pythinker', 'acp']);
 
     expect(runAcpServer).toHaveBeenCalledTimes(1);
     const optsArg = vi.mocked(runAcpServer).mock.calls[0]?.[0];
@@ -80,7 +82,7 @@ describe('pythinker acp', () => {
         agentInfo: { name: 'Pythinker Code CLI', version: expect.any(String) },
       }),
     );
-    expect(exitSpy).toHaveBeenCalledWith(0);
+    expect(exitSpy.mock.calls).toEqual([[0]]);
   });
 
   it('uses PYTHINKER_CODE_HOME as homeDir when set', async () => {
@@ -90,7 +92,8 @@ describe('pythinker acp', () => {
       const program = new Command('pythinker').exitOverride();
       registerAcpCommand(program);
 
-      await expect(program.parseAsync(['node', 'pythinker', 'acp'])).rejects.toThrow(ExitCalled);
+      exitSpy.mockImplementation((() => undefined) as never);
+    await program.parseAsync(['node', 'pythinker', 'acp']);
 
       const optsArg = vi.mocked(runAcpServer).mock.calls[0]?.[0];
       expect(optsArg).toEqual(

apps/pythinker-code/test/cli/session.test.ts

@@ -171,14 +171,14 @@ describe('registerSessionCommand', () => {
     expect(captured.exitCode).toBeUndefined();
   });
 
-  it('rejects a non-numeric --limit', async () => {
+  it.each(['abc', '2x', '1.5', '0', '-1'])('rejects a malformed --limit %s', async (limit) => {
     const { deps } = stubDeps([]);
     const program = new Command('pythinker');
     program.exitOverride();
     registerSessionCommand(program, deps);
 
     await expect(
-      program.parseAsync(['node', 'pythinker', 'session', 'list', '--limit', 'abc']),
+      program.parseAsync(['node', 'pythinker', 'session', 'list', '--limit', limit]),
     ).rejects.toThrow(/positive integer/);
   });
 });

apps/vscode/test/webview/useDebouncedValue.test.ts

@@ -1,8 +1,13 @@
 import { renderHook, waitFor } from '@testing-library/react';
-import { describe, expect, it } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 import { useDebouncedValue } from '@/hooks/useDebouncedValue';
 
 describe('useDebouncedValue', () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+    vi.useRealTimers();
+  });
+
   it('returns the initial value immediately without debounce', () => {
     const { result } = renderHook(() => useDebouncedValue('a', 100));
     expect(result.current).toBe('a');
@@ -28,11 +33,17 @@ describe('useDebouncedValue', () => {
     await waitFor(() => { expect(result.current).toBe('abc'); });
   });
 
-  it('does not update state after unmount', async () => {
-    const { result, rerender, unmount } = renderHook(({ value }) => useDebouncedValue(value, 100), { initialProps: { value: 'a' } });
+  it('clears the pending timer on unmount', () => {
+    vi.useFakeTimers();
+    const clearTimeoutSpy = vi.spyOn(globalThis, 'clearTimeout');
+    const { rerender, unmount } = renderHook(({ value }) => useDebouncedValue(value, 100), { initialProps: { value: 'a' } });
     rerender({ value: 'ab' });
+    const pending = vi.getTimerCount();
+    expect(pending).toBeGreaterThan(0);
+
     unmount();
-    await new Promise((r) => setTimeout(r, 150));
-    expect(result.current).toBe('a');
+
+    expect(clearTimeoutSpy).toHaveBeenCalled();
+    expect(vi.getTimerCount()).toBe(pending - 1);
   });
 });

docs/reference/pythinker-acp.md

@@ -83,7 +83,7 @@ All methods not listed above return `methodNotFound`.
 
 ## MCP forwarding
 
-When an ACP client provides `mcpServers` in `session/new` or `session/load`, the ACP server performs the following conversions:
+When an ACP client provides `mcpServers` in `session/new`, `session/load`, or `session/resume`, the ACP server performs the following conversions:
 
 - `http` → Pythinker's `transport: 'http'` configuration
 - `stdio` → Pythinker's `transport: 'stdio'` configuration

packages/agent-core-v2/src/app/git/gitParsers.ts

@@ -25,7 +25,7 @@ export function parsePorcelain(
     const xy = record.slice(0, 2);
     const wirePath = record.slice(3);
 
-    if (xy.startsWith('R') || xy.startsWith('C')) {
+    if (xy.includes('R') || xy.includes('C')) {
       i++;
     }
     if (filter !== undefined && !filter.has(wirePath)) continue;

packages/agent-core-v2/src/features/tower/tools/init/init.md

@@ -2,7 +2,7 @@ Initialize a tower multi-agent workspace in the current repository.
 
 Creates the .tower/ directory (comms state, inbox, findings, reviews, missions, activity log, worktree slots) that the full tower tool set operates on (TowerPlan/TowerSpawn/TowerMerge/TowerTeardown plus the shared TowerSend/TowerInbox/TowerFinding/TowerReview/TowerMission/TowerStatus).
 
-Tower mode must already be active before you call this — only the user can enable it, with `/tower on`; the agent can never enter tower mode by itself. While the mode is off this tool refuses: ask the user to turn tower mode on first. Use tower only when a task is large enough to split across multiple parallel agents with isolated git worktrees and a review-gated merge protocol.
+Tower mode must already be active before you call this — only the user can enable it, with `/tower on` or `/tower <base>`; the agent can never enter tower mode by itself. While the mode is off this tool refuses: ask the user to turn tower mode on first. Use tower only when a task is large enough to split across multiple parallel agents with isolated git worktrees and a review-gated merge protocol.
 
 Safe to call again — an existing workspace is reported, never reset. Re-entering from a new CLI session adopts the workspace: roster entries the previous session spawned are retired (their agent ids cannot be resumed across sessions), while missions, worktrees, and the activity log carry over.
 

packages/agent-core-v2/src/features/tower/tools/status/statusTool.ts

@@ -183,7 +183,7 @@ function renderDeathWarnings(state: TowerState): string[] {
   const lines: string[] = [];
   for (const mission of state.missions) {
     if (mission.owner === undefined) continue;
-    if (mission.status === 'merged' || mission.status === 'abandoned') continue;
+    if (mission.status === 'completed' || mission.status === 'merged' || mission.status === 'abandoned') continue;
     const entry = deadByName.get(mission.owner);
     if (entry === undefined) continue;
     lines.push(

packages/agent-core-v2/src/features/tower/towerOps.ts

@@ -54,7 +54,7 @@ export const towerOwnerKey = defineState('tower.owner', () => undefined as strin
 
 export const towerBaseKey = defineState('tower.base', (): string | null => null)
   .replayable({
-    schema: z.custom<string | null>(),
+    schema: z.string().nullable(),
   })
   .on(TowerModeEnter, (_s, e) => e.base ?? null)
   .on(TowerModeExit, () => null);