删除冗余字段

Author: phantom5099

docs/tools.md

@@ -50,7 +50,7 @@ Coding Code 的工具系统是 Agent 与外部世界交互的核心机制。本
 - **Core 工具**：始终可用，在启动时注册。包括上述所有内置工具。
 - **MCP 工具**：从 MCP 服务自动导入和注册。名称空间化为 `serverName:toolName` 格式，避免不同服务间的工具名冲突。
 
-Agent 在一次运行开始时注册内置工具、项目 MCP 工具和 `dispatch_agent`。plan 模式通过独立的 `PLAN_MODE_ALLOWED_TOOLS` 策略过滤工具。
+Agent 在一次运行开始时注册内置工具、项目 MCP 工具和 `dispatch_agent`。plan 模式通过独立的 `PLAN_PROFILE_ALLOWED_TOOLS` 策略过滤工具。
 
 ---
 
@@ -103,7 +103,7 @@ interface ToolVisibilityPolicy {
 |------|------|------|
 | 1 | **RuleEngine** | 规则引擎匹配，支持 glob 模式匹配工具名和参数，按优先级排序 |
 | 2 | **ReadonlyWhitelist** | 只读工具自动放行（read_file, search_code, search_files, fetch_url, web_search, dispatch_agent, todo_write） |
-| 3 | **PermissionMode** | 权限模式判断：`bypass`（全部放行）、`acceptEdits`（非破坏性工具放行）、`default`（继续下一层）。`plan` 模式由独立的 `agent/mode.ts` 中的 `planModeGateHook` 在 Layer 4 强制，不在此层处理 |
+| 3 | **PermissionMode** | 权限模式判断：`bypass`（全部放行）、`acceptEdits`（非破坏性工具放行）、`default`（继续下一层）。`plan` Profile 由独立的 `agent/profile.ts` 中的 `planProfileGateHook` 在 Layer 4 强制，不在此层处理 |
 | 4 | **HookPreToolUse** | 钩子决策，可返回 allow/deny/ask/continue，支持 `modifiedInput` 修改参数 |
 | 5 | **UserConfirmation** | 异步用户确认，支持 allow/deny/always/never 四种响应，always/never 会持久化为规则 |
 | 6 | **AuditLog** | 每一层决策后记录审计日志，通过 `tool.approval.post` 钩子发出 |
@@ -134,7 +134,7 @@ type PermissionMode = 'default' | 'acceptEdits' | 'bypass';
 - `acceptEdits`：非破坏性工具自动放行，减少确认弹窗
 - `bypass`：全部放行，跳过所有审批（慎用）
 
-> `plan` 不再是 `PermissionMode` 的成员。plan 模式通过 `AgentProfile.name === 'plan'` 结构化识别，由 `agent/mode.ts` 的 `planModeGateHook` 和 `PLAN_MODE_ALLOWED_TOOLS` 共同限制工具。
+> `plan` 不再是 `PermissionMode` 的成员。plan Profile 通过 `AgentProfile.name === 'plan'` 结构化识别，由 `agent/profile.ts` 的 `planProfileGateHook` 和 `PLAN_PROFILE_ALLOWED_TOOLS` 共同限制工具。
 
 ### OS 级沙箱（预留）
 

packages/codingcode/package.json

@@ -44,7 +44,8 @@
     "./checkpoint/bootstrap": "./src/checkpoint/bootstrap.ts",
     "./llm/factory": "./src/llm/factory.ts",
     "./llm/client": "./src/llm/client.ts",
-    "./layer": "./src/layer.ts"
+    "./layer": "./src/layer.ts",
+    "./subagent/types": "./src/subagent/types.ts"
   },
   "dependencies": {
     "@ai-sdk/deepseek": "^2.0.35",

packages/codingcode/src/agent/agent.ts

@@ -24,8 +24,8 @@ import { ToolRegistry } from '../tools/registry.js';
 import { submitPlanTool } from '../tools/domains/subagent/submit-plan.js';
 import { createDispatchAgentTool } from '../tools/domains/subagent/dispatch.js';
 import { normalizePath } from '../core/path.js';
-import { isPlanProfile } from './mode.js';
-import type { SessionMode } from '../session/types.js';
+import { isPlanProfile } from './profile.js';
+import type { AgentProfileName } from '../subagent/types.js';
 import type { PermissionMode } from '../approval/types.js';
 
 const REACTIVE_COMPACT_MAX_RETRIES = 3;
@@ -119,7 +119,7 @@ export const sendMessage = (
   options: {
     signal?: AbortSignal;
     approvalOverride?: import('../approval/index.js').ApprovalService;
-    mode?: SessionMode;
+    activeProfile?: AgentProfileName;
     permissionMode?: PermissionMode;
     model?: string;
   }
@@ -143,27 +143,28 @@ export const sendMessage = (
     yield* skills.evictProject(normalizedCwd);
 
     if (!sessionId) {
-      if (!options.mode || !options.permissionMode || !options.model) {
+      if (!options.activeProfile || !options.permissionMode || !options.model) {
         return yield* Effect.fail(
-          new AgentError('CONFIG_MISSING', 'new session requires mode, permissionMode, and model')
+          new AgentError(
+            'CONFIG_MISSING',
+            'new session requires activeProfile, permissionMode, and model'
+          )
         );
       }
-      const created = yield* session.createSessionWithProfile(normalizedCwd, {
+      const created = yield* session.create(normalizedCwd, {
         model: options.model,
-        mode: options.mode,
+        activeProfile: options.activeProfile,
         permissionMode: options.permissionMode,
       });
       sessionId = created.sessionId;
     }
     const state = yield* session.load(normalizedCwd, sessionId);
-    if (state.activeProfile) {
-      yield* runtime.restoreSessionProfile(
-        normalizedCwd,
-        state.sessionId,
-        state.activeProfile,
-        state.permissionMode
-      );
-    }
+    yield* runtime.restoreSessionProfile(
+      normalizedCwd,
+      state.sessionId,
+      state.activeProfile,
+      state.permissionMode
+    );
     state.memorySnapshot = memory.loadMemoryForPrompt(state.cwd);
     const sid = state.sessionId;
 
@@ -183,8 +184,7 @@ export const sendMessage = (
 
     yield* session.recordUser(state, actualInput);
 
-    const turnTitle = actualInput.trim().slice(0, 5) || '(empty)';
-    yield* checkpoint.snapshotBaseline(state.cwd, sid, turnId, turnTitle);
+    yield* checkpoint.snapshotBaseline(state.cwd, sid, turnId);
 
     const rulesText = rules.getAllRules(state.cwd);
 
@@ -269,7 +269,7 @@ export function agentLoop(
 
     for (let attempt = 0; attempt <= maxOverflowRetries; attempt++) {
       const payload = yield* Effect.sync(() =>
-        context.assemblePayload(state.transcriptPath, llm.modelInfo.maxTokens)
+        context.assemblePayload(session.getTranscriptPath(state), llm.modelInfo.maxTokens)
       );
       messages = payload.messages;
 
@@ -293,7 +293,12 @@ export function agentLoop(
 
         const compressResult = yield* Effect.tryPromise({
           try: () =>
-            context.compactIfNeeded(state.transcriptPath, messages, llm.modelInfo.maxTokens, llm),
+            context.compactIfNeeded(
+              session.getTranscriptPath(state),
+              messages,
+              llm.modelInfo.maxTokens,
+              llm
+            ),
           catch: (e) => new AgentError('LLM_FAILED', String(e)),
         });
         if (compressResult.didCompress && compressResult.messages) {
@@ -339,7 +344,7 @@ export function agentLoop(
             const compressResult = yield* Effect.tryPromise({
               try: () =>
                 context.compactWithLLM(
-                  state.transcriptPath,
+                  session.getTranscriptPath(state),
                   llm.modelInfo.maxTokens,
                   llm,
                   undefined

packages/codingcode/src/agent/mode.ts packages/codingcode/src/agent/profile.tspackages/codingcode/src/agent/mode.ts renamed to packages/codingcode/src/agent/profile.ts

@@ -22,38 +22,38 @@ export function isPlanProfile(p: { name: string } | null | undefined): boolean {
   return p?.name === PLAN_PROFILE_NAME;
 }
 
-export const PLAN_MODE_ALLOWED_TOOLS: ReadonlySet<string> = new Set([
+export const PLAN_PROFILE_ALLOWED_TOOLS: ReadonlySet<string> = new Set([
   'read_file',
   'search_files',
   'search_code',
   'fetch_url',
   'submit_plan',
 ]);
 
-export function isSessionInPlanMode(sessionId: string, cwd: string): boolean {
+export function isSessionUsingPlanProfile(sessionId: string, cwd: string): boolean {
   try {
     const paths = computePaths(cwd, sessionId);
     const idx = JSON.parse(readFileSync(paths.indexPath, 'utf8')) as {
-      mode?: string;
+      activeProfile?: string;
     };
-    return idx?.mode === 'plan';
+    return idx?.activeProfile === PLAN_PROFILE_NAME;
   } catch {
     return false;
   }
 }
 
-export const planModeGateHook: DecisionHandler = (payload) => {
+export const planProfileGateHook: DecisionHandler = (payload) => {
   const sessionId = payload.sessionId as string | undefined;
   const projectPath = payload.projectPath as string | undefined;
   if (!sessionId || !projectPath) return null;
-  if (!isSessionInPlanMode(sessionId, projectPath)) return null;
+  if (!isSessionUsingPlanProfile(sessionId, projectPath)) return null;
 
   const toolName = payload.toolName as string | undefined;
   if (!toolName) return null;
-  if (PLAN_MODE_ALLOWED_TOOLS.has(toolName)) return null;
+  if (PLAN_PROFILE_ALLOWED_TOOLS.has(toolName)) return null;
 
   return {
     decision: 'deny',
-    reason: 'Write operations denied in plan mode. Use submit_plan to submit a plan.',
+    reason: 'Write operations denied in plan profile. Use submit_plan to submit a plan.',
   };
 };

packages/codingcode/src/agent/prompt.ts

@@ -67,7 +67,7 @@ export const PLAN_PROMPT = `You are a planning agent. Your role is to analyze th
 
 You can read files and search code. You can submit a plan via the \`submit_plan\` tool — each call overwrites the previous plan file; use it to revise your plan based on user feedback.
 
-In plan mode, write_file / edit_file / execute_command are denied. The only write operation allowed is \`submit_plan\`.
+In plan profile, write_file / edit_file / execute_command are denied. The only write operation allowed is \`submit_plan\`.
 
 ## Research process
 1. Understand the project structure and conventions

packages/codingcode/src/checkpoint/checkpoint-service.ts

@@ -51,15 +51,13 @@ export class CheckpointService extends Effect.Service<CheckpointService>()('Chec
     }
 
     return {
-      snapshotBaseline: (projectPath: string, sessionId: string, turnId: number, title?: string) =>
+      snapshotBaseline: (projectPath: string, sessionId: string, turnId: number) =>
         Effect.sync(() => {
           const sg = ensure(projectPath);
           repairIncompleteTurn(sg, sessionId);
           if (sg.isTooLargeForSnapshot()) return;
           const lock = lockFor(projectPath);
-          const msg = title
-            ? `${commitMsg(sessionId, turnId, 'baseline')} ${title}`
-            : commitMsg(sessionId, turnId, 'baseline');
+          const msg = commitMsg(sessionId, turnId, 'baseline');
           lock.lock();
           try {
             sg.commit(msg);
@@ -90,7 +88,6 @@ export class CheckpointService extends Effect.Service<CheckpointService>()('Chec
           const completedTurns = getCompletedTurnsFor(sg, sessionId);
           const result: Array<{
             turnId: number;
-            title: string;
             files: string[];
           }> = [];
 
@@ -100,23 +97,12 @@ export class CheckpointService extends Effect.Service<CheckpointService>()('Chec
             const fCommit = sg.findCommitByMessage(`${prefix}${i}-final`);
             if (!fCommit) continue;
 
-            const msgResult = sg.git(
-              'log',
-              '--all',
-              '--grep',
-              `${prefix}${i}-baseline`,
-              '--format=%s',
-              '-1'
-            );
-            const fullMsg = msgResult.stdout.trim();
-            const title = fullMsg.includes(' ') ? fullMsg.split(' ').slice(1).join(' ') : '';
-
             const allChanges = sg.diffFiles(bCommit, fCommit);
             const files = [
               ...new Set(allChanges.map((c) => normalizePath(resolve(projectPath, c.file)))),
             ];
 
-            result.push({ turnId: i, title, files });
+            result.push({ turnId: i, files });
           }
           return result;
         }),

packages/codingcode/src/cli.ts

@@ -38,8 +38,8 @@ async function main() {
 
     if (tuiOnly) {
       const tuiPath = '../../tui/src/index.js';
-      const { runTui, createTuiClientFromFacades } = yield* Effect.tryPromise(() =>
-        import(tuiPath)
+      const { runTui, createTuiClientFromFacades } = yield* Effect.tryPromise(
+        () => import(tuiPath)
       );
       const llm = yield* llmFactory.getLLMClient();
       const client = createTuiClientFromFacades(llm, rt);
@@ -53,8 +53,8 @@ async function main() {
 
     if (!serveOnly) {
       const tuiPath = '../../tui/src/index.js';
-      const { runTui, createTuiClientFromFacades } = yield* Effect.tryPromise(() =>
-        import(tuiPath)
+      const { runTui, createTuiClientFromFacades } = yield* Effect.tryPromise(
+        () => import(tuiPath)
       );
       const llm = yield* llmFactory.getLLMClient();
       const client = createTuiClientFromFacades(llm, rt);

packages/codingcode/src/client/http/agent-runtime.ts

@@ -15,7 +15,7 @@ export interface AgentRuntimeClient {
   }): Promise<void>;
   compact(input: { sessionId: string; cwd: string }): Promise<void>;
 
-  getCheckpoints(): Promise<Array<{ turnId: number; title: string; files: string[] }>>;
+  getCheckpoints(): Promise<Array<{ turnId: number; files: string[] }>>;
   getCheckpointDiff(turnId?: number): Promise<import('../../checkpoint/types.js').CheckpointDiff>;
   revertCheckpointFiles(
     turnId: number,
@@ -27,9 +27,7 @@ export interface AgentRuntimeClient {
   rollbackCodeToTurn(
     throughTurnId: number
   ): Promise<import('../../checkpoint/types.js').CodeRollbackResult>;
-  rollbackContext(
-    throughTurnId: number
-  ): Promise<{
+  rollbackContext(throughTurnId: number): Promise<{
     turns: Array<{ id: string; items: object[]; status: string }>;
     rollbackState: import('../../checkpoint/types.js').RollbackState;
   }>;
@@ -43,9 +41,7 @@ export interface AgentRuntimeClient {
     files?: string[]
   ): Promise<import('../../checkpoint/types.js').CodeRollbackUndoResult>;
   getRollbackState(): Promise<import('../../checkpoint/types.js').RollbackState>;
-  forkSession(
-    atTurnId?: number
-  ): Promise<{
+  forkSession(atTurnId?: number): Promise<{
     sessionId: string;
     turns: Array<{ id: string; items: object[]; status: string }>;
   }>;

packages/codingcode/src/client/http/sessions.ts

@@ -6,31 +6,32 @@ import type {
   RollbackPreviewDiff,
   RollbackState,
 } from '../../checkpoint/types.js';
-import type { SessionEvent, SessionIndex, SessionMode } from '../../session/types.js';
+import type { SessionEvent, SessionIndex } from '../../session/types.js';
+import type { AgentProfileName } from '../../subagent/types.js';
 import type { createRequestHelpers } from './request.js';
 
 export interface SessionClient {
   createSession(input: {
     cwd: string;
-    mode: SessionMode;
+    activeProfile: AgentProfileName;
     permissionMode: PermissionMode;
     model: string;
   }): Promise<{ sessionId: string }>;
   resumeSession(input: { sessionId: string; cwd: string }): Promise<SessionEvent[]>;
   listSessions(input: { cwd: string }): Promise<SessionIndex[]>;
   getSessionHistory(input: { sessionId: string; cwd: string }): Promise<SessionEvent[]>;
   deleteSession(input: { sessionId: string; cwd: string }): Promise<void>;
-  getSessionMode(input: { sessionId: string; cwd: string }): Promise<{
-    mode: SessionMode;
+  getSessionProfile(input: { sessionId: string; cwd: string }): Promise<{
+    activeProfile: AgentProfileName;
     permissionMode: PermissionMode;
     cwd: string;
     available: Array<{ name: string; description: string }>;
   }>;
-  setSessionMode(input: {
+  setSessionProfile(input: {
     sessionId: string;
     cwd: string;
-    mode: SessionMode;
-  }): Promise<{ mode: SessionMode; permissionMode: PermissionMode }>;
+    activeProfile: AgentProfileName;
+  }): Promise<{ activeProfile: AgentProfileName; permissionMode: PermissionMode }>;
   getSessionPermissionMode(input: { sessionId: string; cwd: string }): Promise<PermissionMode>;
   setSessionPermissionMode(input: {
     sessionId: string;
@@ -92,8 +93,8 @@ export function createHttpSessionClient(
   const { apiGet, apiPost, apiPut, apiDelete } = request;
 
   return {
-    async createSession({ cwd, mode, permissionMode, model }) {
-      return apiPost('/api/sessions', { cwd, mode, permissionMode, model });
+    async createSession({ cwd, activeProfile, permissionMode, model }) {
+      return apiPost('/api/sessions', { cwd, activeProfile, permissionMode, model });
     },
 
     async resumeSession({ sessionId, cwd }) {
@@ -115,12 +116,12 @@ export function createHttpSessionClient(
       await apiDelete(`/api/sessions/${sessionId}?cwd=${encodeURIComponent(cwd)}`);
     },
 
-    async getSessionMode({ sessionId, cwd }) {
-      return apiGet(`/api/sessions/${sessionId}/mode?cwd=${encodeURIComponent(cwd)}`);
+    async getSessionProfile({ sessionId, cwd }) {
+      return apiGet(`/api/sessions/${sessionId}/profile?cwd=${encodeURIComponent(cwd)}`);
     },
 
-    async setSessionMode({ sessionId, cwd, mode }) {
-      return apiPost(`/api/sessions/${sessionId}/mode`, { cwd, mode });
+    async setSessionProfile({ sessionId, cwd, activeProfile }) {
+      return apiPost(`/api/sessions/${sessionId}/profile`, { cwd, activeProfile });
     },
 
     async getSessionPermissionMode({ sessionId, cwd }) {
@@ -135,9 +136,7 @@ export function createHttpSessionClient(
     },
 
     async getSessionPlan({ sessionId, cwd }) {
-      return apiGet(
-        `/api/sessions/${sessionId}/plan?cwd=${encodeURIComponent(cwd)}`
-      );
+      return apiGet(`/api/sessions/${sessionId}/plan?cwd=${encodeURIComponent(cwd)}`);
     },
 
     async getCheckpointDiff({ sessionId, cwd, turnId }) {

packages/codingcode/src/client/types.ts

@@ -40,7 +40,7 @@ export interface AgentClient {
   listModels(): Promise<{ models: SelectableModel[]; activeId: string | null }>;
   switchModel(id: string): Promise<void>;
   getSessionId(): string;
-  getCheckpoints(): Promise<Array<{ turnId: number; title: string; files: string[] }>>;
+  getCheckpoints(): Promise<Array<{ turnId: number; files: string[] }>>;
   getCheckpointDiff(turnId?: number): Promise<CheckpointDiff>;
   revertCheckpointFiles(turnId: number, files: string[]): Promise<CodeRollbackResult>;
   previewRollbackDiff(throughTurnId: number): Promise<RollbackPreviewDiff>;