minimal-agent 0.11.0 → 0.13.0

package/src/tools/worktree/sessionWorktree.js

@@ -0,0 +1,128 @@
+import { randomUUID } from 'node:crypto';
+import { z } from 'zod';
+import { toToolParameters } from '../../utils/zodToJson.js';
+import { join } from 'node:path';
+import { readRuntimeJson, sessionRuntimeDir, writeRuntimeJson, } from '../../session/runtimeStore.js';
+import { applyAgentWorktree, commitWorktreeChanges, createAgentWorktree, hasWorktreeChanges, removeAgentWorktree, } from '../agent/worktree.js';
+const enterSchema = z.object({
+    name: z
+        .string()
+        .regex(/^[a-zA-Z0-9._-]{1,48}$/)
+        .optional(),
+});
+const exitSchema = z.object({ action: z.enum(['apply', 'keep', 'discard']) });
+async function persist(ctx, state) {
+    await writeRuntimeJson(join(sessionRuntimeDir(ctx), 'worktree.json'), {
+        active: state ?? null,
+    });
+}
+export async function hydrateSessionWorktree(ctx) {
+    if (!ctx.sessionState || ctx.sessionState.activeWorktree)
+        return;
+    const saved = await readRuntimeJson(join(sessionRuntimeDir(ctx), 'worktree.json'), {});
+    if (saved.active)
+        ctx.sessionState.activeWorktree = saved.active;
+}
+async function enter(input, ctx) {
+    const state = ctx.sessionState;
+    if (!state)
+        return { ok: false, error: 'EnterWorktree 需要会话状态' };
+    if (state.activeWorktree)
+        return {
+            ok: true,
+            content: `当前已在 worktree ${state.activeWorktree.path}`,
+        };
+    const slug = `session-${input.name ?? randomUUID().slice(0, 8)}`;
+    const wt = await createAgentWorktree(slug, ctx.cwd);
+    if (!wt.ok)
+        return wt;
+    state.activeWorktree = {
+        id: slug,
+        path: wt.path,
+        branch: wt.branch,
+        baseSha: wt.baseSha,
+        gitRoot: wt.gitRoot,
+    };
+    await persist(ctx, state.activeWorktree);
+    return {
+        ok: true,
+        content: `已进入主 Agent 隔离 worktree：${wt.path}\n分支：${wt.branch}\n后续工具调用立即使用该目录。`,
+    };
+}
+async function exit(input, ctx) {
+    const state = ctx.sessionState, wt = state?.activeWorktree;
+    if (!state || !wt)
+        return { ok: false, error: '当前会话没有活动 worktree' };
+    if (input.action === 'keep') {
+        state.activeWorktree = undefined;
+        await persist(ctx, undefined);
+        return {
+            ok: true,
+            content: `已退出有效 cwd，但保留 worktree：${wt.path}\n分支：${wt.branch}`,
+        };
+    }
+    const changed = await hasWorktreeChanges(wt.path, wt.baseSha);
+    if (input.action === 'discard' && changed) {
+        const committed = await commitWorktreeChanges(wt.path, `archive: preserve discarded session ${wt.id}`);
+        if (committed.ok) {
+            state.activeWorktree = undefined;
+            await persist(ctx, undefined);
+        }
+        return committed.ok
+            ? {
+                ok: true,
+                content: `检测到成果，未永久删除。已归档到分支 ${wt.branch}，worktree 保留在 ${wt.path}。`,
+            }
+            : {
+                ok: false,
+                error: `无法安全归档，worktree 保持活动：${committed.error}`,
+            };
+    }
+    if (input.action === 'discard') {
+        await removeAgentWorktree(wt.path, wt.branch, wt.gitRoot);
+        state.activeWorktree = undefined;
+        await persist(ctx, undefined);
+        return {
+            ok: true,
+            content: 'worktree 无改动，已通过 Git worktree 管理安全清理。',
+        };
+    }
+    const committed = await commitWorktreeChanges(wt.path, `minimal-agent: apply session ${wt.id}`);
+    if (!committed.ok)
+        return {
+            ok: false,
+            error: `提交隔离改动失败，worktree 保持活动：${committed.error}`,
+        };
+    const applied = await applyAgentWorktree(wt.gitRoot, wt.id);
+    if (!applied.ok)
+        return {
+            ok: false,
+            error: `应用检查失败，worktree 保持活动：${applied.error}`,
+        };
+    state.activeWorktree = undefined;
+    await persist(ctx, undefined);
+    return {
+        ok: true,
+        content: `已通过 git apply --check 并将变更应用到原工作区；未自动提交。`,
+    };
+}
+export const enterWorktreeTool = {
+    name: 'EnterWorktree',
+    description: 'Creates and enters a session-scoped Git worktree for the main Agent. Later tool calls use it immediately while project memory keeps the original workspace identity.',
+    inputSchema: enterSchema,
+    parameters: toToolParameters(enterSchema),
+    isReadOnly: false,
+    isConcurrencySafe: false,
+    call: async () => ({ ok: false, error: 'requires session context' }),
+    callWithContext: (i, _s, c) => enter(i, c),
+};
+export const exitWorktreeTool = {
+    name: 'ExitWorktree',
+    description: 'Leaves the current session worktree. apply checks and applies its patch to the original workspace; keep preserves it; discard never destroys uncommitted results and archives changed work.',
+    inputSchema: exitSchema,
+    parameters: toToolParameters(exitSchema),
+    isReadOnly: false,
+    isConcurrencySafe: false,
+    call: async () => ({ ok: false, error: 'requires session context' }),
+    callWithContext: (i, _s, c) => exit(i, c),
+};

package/src/tools/worktree/sessionWorktree.ts

@@ -0,0 +1,158 @@
+import { randomUUID } from 'node:crypto';
+import { z } from 'zod';
+import type { SessionState } from '../../session/sessionState.js';
+import type { Tool, ToolCallContext, ToolResult } from '../../types.js';
+import { toToolParameters } from '../../utils/zodToJson.js';
+import { join } from 'node:path';
+import {
+  readRuntimeJson,
+  sessionRuntimeDir,
+  writeRuntimeJson,
+} from '../../session/runtimeStore.js';
+import {
+  applyAgentWorktree,
+  commitWorktreeChanges,
+  createAgentWorktree,
+  hasWorktreeChanges,
+  removeAgentWorktree,
+} from '../agent/worktree.js';
+
+const enterSchema = z.object({
+  name: z
+    .string()
+    .regex(/^[a-zA-Z0-9._-]{1,48}$/)
+    .optional(),
+});
+const exitSchema = z.object({ action: z.enum(['apply', 'keep', 'discard']) });
+async function persist(
+  ctx: ToolCallContext,
+  state: SessionState['activeWorktree'],
+) {
+  await writeRuntimeJson(join(sessionRuntimeDir(ctx), 'worktree.json'), {
+    active: state ?? null,
+  });
+}
+export async function hydrateSessionWorktree(
+  ctx: ToolCallContext,
+): Promise<void> {
+  if (!ctx.sessionState || ctx.sessionState.activeWorktree) return;
+  const saved = await readRuntimeJson<{
+    active?: NonNullable<SessionState['activeWorktree']> | null;
+  }>(join(sessionRuntimeDir(ctx), 'worktree.json'), {});
+  if (saved.active) ctx.sessionState.activeWorktree = saved.active;
+}
+async function enter(
+  input: z.infer<typeof enterSchema>,
+  ctx: ToolCallContext,
+): Promise<ToolResult> {
+  const state = ctx.sessionState;
+  if (!state) return { ok: false, error: 'EnterWorktree 需要会话状态' };
+  if (state.activeWorktree)
+    return {
+      ok: true,
+      content: `当前已在 worktree ${state.activeWorktree.path}`,
+    };
+  const slug = `session-${input.name ?? randomUUID().slice(0, 8)}`;
+  const wt = await createAgentWorktree(slug, ctx.cwd);
+  if (!wt.ok) return wt;
+  state.activeWorktree = {
+    id: slug,
+    path: wt.path,
+    branch: wt.branch,
+    baseSha: wt.baseSha,
+    gitRoot: wt.gitRoot,
+  };
+  await persist(ctx, state.activeWorktree);
+  return {
+    ok: true,
+    content: `已进入主 Agent 隔离 worktree：${wt.path}\n分支：${wt.branch}\n后续工具调用立即使用该目录。`,
+  };
+}
+async function exit(
+  input: z.infer<typeof exitSchema>,
+  ctx: ToolCallContext,
+): Promise<ToolResult> {
+  const state = ctx.sessionState,
+    wt = state?.activeWorktree;
+  if (!state || !wt) return { ok: false, error: '当前会话没有活动 worktree' };
+  if (input.action === 'keep') {
+    state.activeWorktree = undefined;
+    await persist(ctx, undefined);
+    return {
+      ok: true,
+      content: `已退出有效 cwd，但保留 worktree：${wt.path}\n分支：${wt.branch}`,
+    };
+  }
+  const changed = await hasWorktreeChanges(wt.path, wt.baseSha);
+  if (input.action === 'discard' && changed) {
+    const committed = await commitWorktreeChanges(
+      wt.path,
+      `archive: preserve discarded session ${wt.id}`,
+    );
+    if (committed.ok) {
+      state.activeWorktree = undefined;
+      await persist(ctx, undefined);
+    }
+    return committed.ok
+      ? {
+          ok: true,
+          content: `检测到成果，未永久删除。已归档到分支 ${wt.branch}，worktree 保留在 ${wt.path}。`,
+        }
+      : {
+          ok: false,
+          error: `无法安全归档，worktree 保持活动：${committed.error}`,
+        };
+  }
+  if (input.action === 'discard') {
+    await removeAgentWorktree(wt.path, wt.branch, wt.gitRoot);
+    state.activeWorktree = undefined;
+    await persist(ctx, undefined);
+    return {
+      ok: true,
+      content: 'worktree 无改动，已通过 Git worktree 管理安全清理。',
+    };
+  }
+  const committed = await commitWorktreeChanges(
+    wt.path,
+    `minimal-agent: apply session ${wt.id}`,
+  );
+  if (!committed.ok)
+    return {
+      ok: false,
+      error: `提交隔离改动失败，worktree 保持活动：${committed.error}`,
+    };
+  const applied = await applyAgentWorktree(wt.gitRoot, wt.id);
+  if (!applied.ok)
+    return {
+      ok: false,
+      error: `应用检查失败，worktree 保持活动：${applied.error}`,
+    };
+  state.activeWorktree = undefined;
+  await persist(ctx, undefined);
+  return {
+    ok: true,
+    content: `已通过 git apply --check 并将变更应用到原工作区；未自动提交。`,
+  };
+}
+export const enterWorktreeTool: Tool<z.infer<typeof enterSchema>> = {
+  name: 'EnterWorktree',
+  description:
+    'Creates and enters a session-scoped Git worktree for the main Agent. Later tool calls use it immediately while project memory keeps the original workspace identity.',
+  inputSchema: enterSchema,
+  parameters: toToolParameters(enterSchema),
+  isReadOnly: false,
+  isConcurrencySafe: false,
+  call: async () => ({ ok: false, error: 'requires session context' }),
+  callWithContext: (i, _s, c) => enter(i, c),
+};
+export const exitWorktreeTool: Tool<z.infer<typeof exitSchema>> = {
+  name: 'ExitWorktree',
+  description:
+    'Leaves the current session worktree. apply checks and applies its patch to the original workspace; keep preserves it; discard never destroys uncommitted results and archives changed work.',
+  inputSchema: exitSchema,
+  parameters: toToolParameters(exitSchema),
+  isReadOnly: false,
+  isConcurrencySafe: false,
+  call: async () => ({ ok: false, error: 'requires session context' }),
+  callWithContext: (i, _s, c) => exit(i, c),
+};

package/src/tools/write/write.js

@@ -22,6 +22,7 @@ import { filePathField } from '../shared/schemas.js';
 import { assertFresh, hashFileBytes, recordRead } from '../shared/fileState.js';
 import { fileActivityMetadata } from '../shared/fileActivity.js';
 import { emitFileMutation } from '../shared/fileMutationBus.js';
+import { buildPatchSummary } from '../shared/diffSummary.js';
 /** 写入内容上限：1GB。防止模型试图写入超大内容撑爆内存/磁盘。 */
 const MAX_WRITE_SIZE_BYTES = 1024 * 1024 * 1024;
 // ---------------- 1. Zod 输入 schema ----------------
@@ -69,9 +70,11 @@ async function call(input, state, cwd) {
             catch { }
         }
         let contentToWrite = input.content;
+        let originalContent = '';
         let bomEncoding = 'utf8';
         if (fileExisted) {
             const snapshot = await readTextFile(filePath);
+            originalContent = snapshot.content;
             bomEncoding = snapshot.encoding;
             contentToWrite = applyLineEnding(input.content, snapshot.lineEnding);
         }
@@ -88,10 +91,11 @@ async function call(input, state, cwd) {
         const bomInfo = bomEncoding === 'utf8-bom'
             ? '，已保留 UTF-8 BOM'
             : bomEncoding === 'utf16le' ? '，已保留 UTF-16 LE' : '';
+        const patch = buildPatchSummary(originalContent, contentToWrite, input.file_path);
         return {
             ok: true,
-            content: `${action} ${filePath}${sizeInfo}${bomInfo}`,
-            metadata: await fileActivityMetadata(filePath, fileExisted ? 'modified' : 'created', 'not_run', 'support', cwd),
+            content: `${action} ${filePath}${sizeInfo}${bomInfo}\n${patch.unifiedDiff ?? '[diff omitted: too large]'}`,
+            metadata: await fileActivityMetadata(filePath, fileExisted ? 'modified' : 'created', 'not_run', 'support', cwd, patch),
         };
     }
     catch (e) {

package/src/tools/write/write.ts

@@ -31,6 +31,7 @@ import { filePathField } from '../shared/schemas.js';
 import { assertFresh, hashFileBytes, recordRead, type FileReadState } from '../shared/fileState.js';
 import { fileActivityMetadata } from '../shared/fileActivity.js';
 import { emitFileMutation } from '../shared/fileMutationBus.js';
+import { buildPatchSummary } from '../shared/diffSummary.js';
 
 /** 写入内容上限：1GB。防止模型试图写入超大内容撑爆内存/磁盘。 */
 const MAX_WRITE_SIZE_BYTES = 1024 * 1024 * 1024;
@@ -86,9 +87,11 @@ async function call(input: WriteInput, state?: FileReadState, cwd?: string): Pro
     }
 
     let contentToWrite = input.content;
+    let originalContent = '';
     let bomEncoding: Awaited<ReturnType<typeof readTextFile>>['encoding'] = 'utf8';
     if (fileExisted) {
       const snapshot = await readTextFile(filePath);
+      originalContent = snapshot.content;
       bomEncoding = snapshot.encoding;
       contentToWrite = applyLineEnding(input.content, snapshot.lineEnding);
     }
@@ -106,11 +109,12 @@ async function call(input: WriteInput, state?: FileReadState, cwd?: string): Pro
     const bomInfo = bomEncoding === 'utf8-bom'
       ? '，已保留 UTF-8 BOM'
       : bomEncoding === 'utf16le' ? '，已保留 UTF-16 LE' : '';
+    const patch = buildPatchSummary(originalContent, contentToWrite, input.file_path);
 
     return {
       ok: true,
-      content: `${action} ${filePath}${sizeInfo}${bomInfo}`,
-      metadata: await fileActivityMetadata(filePath, fileExisted ? 'modified' : 'created', 'not_run', 'support', cwd),
+      content: `${action} ${filePath}${sizeInfo}${bomInfo}\n${patch.unifiedDiff ?? '[diff omitted: too large]'}`,
+      metadata: await fileActivityMetadata(filePath, fileExisted ? 'modified' : 'created', 'not_run', 'support', cwd, patch),
     };
   } catch (e) {
     return { ok: false, error: `写入失败：${(e as Error).message}` };

package/src/types.ts

@@ -191,6 +191,8 @@ export interface AgentResultMetadata {
   kind: 'agent';
   agentType: 'explore' | 'general';
   description: string;
+  agentId?: string;
+  status?: 'running' | 'completed' | 'failed' | 'stopped' | 'interrupted';
   isolation: 'none' | 'worktree';
   turns: number;
   toolCalls: number;
@@ -214,6 +216,15 @@ export interface AgentResultMetadata {
 export type FileActivityKind = 'read' | 'created' | 'modified' | 'generated' | 'deleted';
 export type FileVerification = 'passed' | 'failed' | 'not_run';
 export type ConversationFilePurpose = 'source' | 'deliverable' | 'support';
+export interface FilePatchSummary {
+  unifiedDiff?: string;
+  beforeHash?: string;
+  afterHash: string;
+  additions: number;
+  deletions: number;
+  truncated: boolean;
+  omittedReason?: 'too_large';
+}
 
 /** Structured local file output. Paths are always workspace-relative. */
 export interface FileActivityMetadata {
@@ -225,6 +236,7 @@ export interface FileActivityMetadata {
     mime?: string;
     verification: FileVerification;
     purpose: ConversationFilePurpose;
+    patch?: FilePatchSummary;
   }>;
 }
 
@@ -873,11 +885,17 @@ export type LoopEvent =
    *
    * code（v2.x 新增，可选）：让 `-p --output-format json` 把终结原因映射成稳定的
    * stop_reason，也让 print.ts 区分"致命错误（退出）"与"非致命警告（继续）"：
-   *   - 'llm_error'      LLM 调用失败 → 终结，stop_reason='error'
-   *   - 'max_turns'      撞最大轮数上限 → 终结，stop_reason='max_turns'
-   *   - 'compact_failed' 自动压缩失败但 loop 想继续 → 非致命，print.ts 只 stderr 警告不退出
-   *   - 'aborted'        被中断（signal.aborted）
+   *   - 'llm_error'        LLM 调用失败 → 终结，stop_reason='error'
+   *   - 'max_turns'        撞最大轮数上限 → 终结，stop_reason='max_turns'
+   *   - 'compact_failed'   自动压缩失败但 loop 想继续 → 非致命，print.ts 只 stderr 警告不退出
+   *   - 'aborted'          被中断（signal.aborted）
+   *   - 'stalled'          StallGuard 判定原地打转（同一失败反复 / 整批调用无进展）
+   *                        → 终结，stop_reason='stalled'
+   *   - 'context_overflow' 即使降级后仍超模型输入上限，主动不发这次请求
+   *                        → 终结，stop_reason='error'
    * 缺省（旧调用方 / 未分类错误）按致命、stop_reason='error' 处理。
+   * ⚠️ 增删 code 时同步改 print.ts 的映射：那里只特判 max_turns / stalled，
+   * 其余一律落 'error'，新增的终结原因不特判就会被并进通用 error。
    */
   | {
       type: 'error';

package/src/ui/hooks/useChat.js

@@ -27,6 +27,7 @@ import { resolveSessionFile, sessionFileFor, } from '../../context/sessionPath.j
 import { buildBaseSystemPrompt, buildTransientPromptBundle } from '../../prompts/system.js';
 import { createPromptCacheContext } from '../../llm/promptCache.js';
 import { createAgentRuntimeContext, filterToolsForRuntime, memoryContextFromRuntime, } from '../../runtime/agentRuntimeContext.js';
+import { startTurnJournal } from '../../memory/turnJournal.js';
 import { ALL_TOOLS, getToolByName } from '../../tools/index.js';
 import { createInputQueue } from '../../messageQueue.js';
 import { createAskCoordinator, setAskHandler, } from '../../askBridge.js';
@@ -34,6 +35,7 @@ import { createAskSlot } from './askSlot.js';
 import { figures } from '../figures.js';
 import { clearFileState } from '../../tools/shared/fileState.js';
 import { getOrCreateSessionState, sessionStateKey } from '../../session/sessionState.js';
+import { hydrateSessionWorktree } from '../../tools/worktree/sessionWorktree.js';
 import { runAdvisor } from '../../tools/advisor/advisor.js';
 import { runWithPlugins } from '../../plugins/pluginRunner.js';
 import { dlog } from '../../utils/debugLog.js';
@@ -394,6 +396,8 @@ export function useChat(args) {
         const ac = new AbortController();
         abortRef.current = ac;
         let releaseContextLock = null;
+        let turnJournal = null;
+        let turnJournalStart = 0;
         dlog('ui', 'turn START', { input: trimmed.slice(0, 80) });
         // 长时间运行时（如工作流 agent 步骤）的定时 token 刷新：
         // runQuery 的 text/reasoning 事件不触发 bump，导致 StatusLine token 数
@@ -441,10 +445,20 @@ export function useChat(args) {
                 })
                 : undefined;
             const toolGate = computerRun ? createComputerUseHostGate(computerRun) : undefined;
+            const turnSessionState = getOrCreateSessionState(sessionStateKey({
+                surface: 'tui', workspaceId: workspace?.id,
+                cwd: workspace?.id ? undefined : getWorkingDir(),
+                sessionId: activeSessionIdRef.current,
+            }));
+            await hydrateSessionWorktree({
+                sessionState: turnSessionState, workspaceId: workspace?.id,
+                sessionId: activeSessionIdRef.current, cwd: getWorkingDir(),
+            });
+            const effectiveCwd = turnSessionState.activeWorktree?.path ?? getWorkingDir();
             const runtimeContext = createAgentRuntimeContext({
                 surface: 'tui',
                 profile: 'main',
-                cwd: getWorkingDir(),
+                cwd: effectiveCwd,
                 workspaceId: workspace?.id,
                 sessionId: activeSessionIdRef.current,
                 owner: 'local-owner',
@@ -455,9 +469,9 @@ export function useChat(args) {
                 toolGate,
             });
             const turnTools = filterToolsForRuntime(ALL_TOOLS, runtimeContext);
-            const toolSignature = turnTools.map((tool) => tool.name).join(',');
+            const toolSignature = `${effectiveCwd}\0${turnTools.map((tool) => tool.name).join(',')}`;
             if (promptToolSignatureRef.current !== toolSignature) {
-                const stablePrompt = await buildBaseSystemPrompt(getWorkingDir(), turnTools);
+                const stablePrompt = await buildBaseSystemPrompt(effectiveCwd, turnTools);
                 const rest = historyRef.current[0]?.role === 'system'
                     ? historyRef.current.slice(1)
                     : [...historyRef.current];
@@ -467,30 +481,33 @@ export function useChat(args) {
             }
             // 每回合只刷新易变层；稳定层仅在实际能力目录变化时重建。
             const turnTransient = await buildTransientPromptBundle({
-                cwd: getWorkingDir(),
+                cwd: effectiveCwd,
                 tools: turnTools,
                 runtime: {
                     surface: 'tui',
-                    cwd: getWorkingDir(),
+                    cwd: effectiveCwd,
                     currentUserInput: trimmed,
                     workspaceId: workspace?.id,
+                    sessionId: activeSessionIdRef.current,
                     interactiveAsk: true,
                     supervisedBrowser: false,
                     memoryAccess: 'read-write',
                 },
             }).catch(() => undefined);
+            // 会话原文记账（与 session/runTurn.ts 共用同一份实现）。
+            // TUI 不经过 runTurn，此前整条路径都不入库，SearchConversations 对 TUI 用户静默失效。
+            turnJournalStart = historyRef.current.length;
+            turnJournal = await startTurnJournal({
+                memoryContext: memoryContextFromRuntime(runtimeContext),
+                userInput: trimmed,
+            }).catch(() => null);
             for await (const ev of runWithPlugins(trimmed, {
                 provider: providerRef.current,
                 history: historyRef.current,
                 signal: ac.signal,
                 runtimeContext,
                 allowedTools: turnTools.map((tool) => tool.name),
-                sessionState: getOrCreateSessionState(sessionStateKey({
-                    surface: 'tui',
-                    workspaceId: workspace?.id,
-                    cwd: workspace?.id ? undefined : getWorkingDir(),
-                    sessionId: activeSessionIdRef.current,
-                })),
+                sessionState: turnSessionState,
                 parseInlineImages: true,
                 ...(turnTransient ? { transientBundle: turnTransient } : {}),
                 promptCache: createPromptCacheContext(`workspace:${workspace?.id ?? getWorkingDir()}:session:${activeSessionIdRef.current}`),
@@ -558,6 +575,9 @@ export function useChat(args) {
             }
             activeComputerRunRef.current = null;
             runningToolsRef.current.clear();
+            // 记账失败不影响落盘与解锁（它是附加能力，不是功能）。
+            await turnJournal?.finish(historyRef.current, turnJournalStart).catch(() => undefined);
+            turnJournal = null;
             // v2 multi-session：持久化到当前 active session 文件。
             try {
                 await saveContext(historyRef.current, sessionFileFor(getWorkingDir(), activeSessionIdRef.current));

package/src/ui/hooks/useChat.ts

@@ -45,6 +45,7 @@ import {
   filterToolsForRuntime,
   memoryContextFromRuntime,
 } from '../../runtime/agentRuntimeContext.js';
+import { startTurnJournal, type TurnJournal } from '../../memory/turnJournal.js';
 import { ALL_TOOLS, getToolByName } from '../../tools/index.js';
 import { createInputQueue } from '../../messageQueue.js';
 import {
@@ -58,6 +59,7 @@ import { createAskSlot } from './askSlot.js';
 import { figures } from '../figures.js';
 import { clearFileState } from '../../tools/shared/fileState.js';
 import { getOrCreateSessionState, sessionStateKey } from '../../session/sessionState.js';
+import { hydrateSessionWorktree } from '../../tools/worktree/sessionWorktree.js';
 import type {
   LoopEvent,
   Message,
@@ -627,6 +629,8 @@ export function useChat(args: {
       const ac = new AbortController();
       abortRef.current = ac;
       let releaseContextLock: (() => Promise<void>) | null = null;
+      let turnJournal: TurnJournal | null = null;
+      let turnJournalStart = 0;
       dlog('ui', 'turn START', { input: trimmed.slice(0, 80) });
 
       // 长时间运行时（如工作流 agent 步骤）的定时 token 刷新：
@@ -681,10 +685,20 @@ export function useChat(args: {
             })
           : undefined;
         const toolGate = computerRun ? createComputerUseHostGate(computerRun) : undefined;
+        const turnSessionState = getOrCreateSessionState(sessionStateKey({
+          surface: 'tui', workspaceId: workspace?.id,
+          cwd: workspace?.id ? undefined : getWorkingDir(),
+          sessionId: activeSessionIdRef.current,
+        }));
+        await hydrateSessionWorktree({
+          sessionState: turnSessionState, workspaceId: workspace?.id,
+          sessionId: activeSessionIdRef.current, cwd: getWorkingDir(),
+        });
+        const effectiveCwd = turnSessionState.activeWorktree?.path ?? getWorkingDir();
         const runtimeContext = createAgentRuntimeContext({
           surface: 'tui',
           profile: 'main',
-          cwd: getWorkingDir(),
+          cwd: effectiveCwd,
           workspaceId: workspace?.id,
           sessionId: activeSessionIdRef.current,
           owner: 'local-owner',
@@ -695,9 +709,9 @@ export function useChat(args: {
           toolGate,
         });
         const turnTools = filterToolsForRuntime(ALL_TOOLS, runtimeContext);
-        const toolSignature = turnTools.map((tool) => tool.name).join(',');
+        const toolSignature = `${effectiveCwd}\0${turnTools.map((tool) => tool.name).join(',')}`;
         if (promptToolSignatureRef.current !== toolSignature) {
-          const stablePrompt = await buildBaseSystemPrompt(getWorkingDir(), turnTools);
+          const stablePrompt = await buildBaseSystemPrompt(effectiveCwd, turnTools);
           const rest = historyRef.current[0]?.role === 'system'
             ? historyRef.current.slice(1)
             : [...historyRef.current];
@@ -707,32 +721,33 @@ export function useChat(args: {
         }
         // 每回合只刷新易变层；稳定层仅在实际能力目录变化时重建。
         const turnTransient = await buildTransientPromptBundle({
-          cwd: getWorkingDir(),
+          cwd: effectiveCwd,
           tools: turnTools,
           runtime: {
             surface: 'tui',
-            cwd: getWorkingDir(),
+            cwd: effectiveCwd,
             currentUserInput: trimmed,
             workspaceId: workspace?.id,
+            sessionId: activeSessionIdRef.current,
             interactiveAsk: true,
             supervisedBrowser: false,
             memoryAccess: 'read-write',
           },
         }).catch(() => undefined);
+        // 会话原文记账（与 session/runTurn.ts 共用同一份实现）。
+        // TUI 不经过 runTurn，此前整条路径都不入库，SearchConversations 对 TUI 用户静默失效。
+        turnJournalStart = historyRef.current.length;
+        turnJournal = await startTurnJournal({
+          memoryContext: memoryContextFromRuntime(runtimeContext),
+          userInput: trimmed,
+        }).catch(() => null);
         for await (const ev of runWithPlugins(trimmed, {
           provider: providerRef.current,
           history: historyRef.current,
           signal: ac.signal,
           runtimeContext,
           allowedTools: turnTools.map((tool) => tool.name),
-          sessionState: getOrCreateSessionState(
-            sessionStateKey({
-              surface: 'tui',
-              workspaceId: workspace?.id,
-              cwd: workspace?.id ? undefined : getWorkingDir(),
-              sessionId: activeSessionIdRef.current,
-            }),
-          ),
+          sessionState: turnSessionState,
           parseInlineImages: true,
           ...(turnTransient ? { transientBundle: turnTransient } : {}),
           promptCache: createPromptCacheContext(
@@ -800,6 +815,9 @@ export function useChat(args: {
         }
         activeComputerRunRef.current = null;
         runningToolsRef.current.clear();
+        // 记账失败不影响落盘与解锁（它是附加能力，不是功能）。
+        await turnJournal?.finish(historyRef.current, turnJournalStart).catch(() => undefined);
+        turnJournal = null;
         // v2 multi-session：持久化到当前 active session 文件。
         try {
           await saveContext(historyRef.current, sessionFileFor(getWorkingDir(), activeSessionIdRef.current));