minimal-agent 0.18.13 → 0.18.14

package/src/tools/agent/agentTypes.js

@@ -28,7 +28,6 @@ export const SUBAGENT_EXCLUDED_TOOLS = [
     'AgentFollowup',
     'AgentResolve',
     'Advisor',
-    'AdvisorDecision',
     // 子任务只向主 Agent 汇报；正式用户交付由主 Agent 统一收口，避免重复结果卡。
     'PresentResult',
     'RememberMemory',

package/src/tools/agent/agentTypes.ts

@@ -46,7 +46,6 @@ export const SUBAGENT_EXCLUDED_TOOLS: readonly string[] = [
   'AgentFollowup',
   'AgentResolve',
   'Advisor',
-  'AdvisorDecision',
   // 子任务只向主 Agent 汇报；正式用户交付由主 Agent 统一收口，避免重复结果卡。
   'PresentResult',
   'RememberMemory',

package/src/tools/agent/coordinator.js

@@ -1,5 +1,6 @@
 import { realpath } from 'node:fs/promises';
 import { isAbsolute, relative, resolve, sep } from 'node:path';
+import { CONFIG_LIMITS } from '../../config/numericLimits.js';
 const active = [];
 const waiters = [];
 let running = 0;
@@ -87,7 +88,9 @@ export async function normalizeWriteScopes(cwd, rawScopes) {
     return [...normalized].sort();
 }
 export async function acquireSubagentLease(cwd, scopes, maxConcurrent = 3, options = {}) {
-    const safeMax = Math.max(1, Math.min(8, maxConcurrent));
+    // The configured ceiling is the only bound (numericLimits.ts); a second
+    // hard-coded cap silently ignored values the settings page accepts.
+    const safeMax = Math.max(1, Math.min(CONFIG_LIMITS.subagentMaxConcurrent.max, maxConcurrent));
     return new Promise((resolveLease, reject) => {
         if (options.signal?.aborted)
             return reject(new DOMException('Aborted', 'AbortError'));

package/src/tools/agent/coordinator.ts

@@ -1,5 +1,6 @@
 import { realpath } from 'node:fs/promises';
 import { isAbsolute, relative, resolve, sep } from 'node:path';
+import { CONFIG_LIMITS } from '../../config/numericLimits.js';
 
 interface Waiter {
   owner: string;
@@ -104,7 +105,9 @@ export async function acquireSubagentLease(
   maxConcurrent = 3,
   options: { signal?: AbortSignal; onStatus?: (status: LeaseStatus) => void; owner?: string } = {},
 ): Promise<() => void> {
-  const safeMax = Math.max(1, Math.min(8, maxConcurrent));
+  // The configured ceiling is the only bound (numericLimits.ts); a second
+  // hard-coded cap silently ignored values the settings page accepts.
+  const safeMax = Math.max(1, Math.min(CONFIG_LIMITS.subagentMaxConcurrent.max, maxConcurrent));
   return new Promise((resolveLease, reject) => {
     if (options.signal?.aborted) return reject(new DOMException('Aborted', 'AbortError'));
     const waiter: Waiter = { owner: options.owner ?? cwd, cwd, scopes, maxConcurrent: safeMax, onStatus: options.onStatus, signal: options.signal, resolve: resolveLease, reject };

package/src/tools/bash/semantics.js

@@ -200,11 +200,10 @@ export function isReadOnlyShellCommand(command) {
  * Advisor 专用信号，别处不要复用：命令是否只是"检查现状"（跑测试/构建/lint/
  * 类型检查），而不是开始实施改动。跟 isReadOnlyShellCommand 是两个不同的问题——
  * 后者要回答"能不能安全并行/算不算并发写"，这类命令往往会写构建产物/缓存/
- * 日志，答案本该是 false，改不得；但 advisorCoordinator 拿 isReadOnlyShellCommand
- * 的结果去判定"这是不是本任务版本的首次实质写入"时，会把纯验证型命令
- * （如 `cd frontend && npm run build` 核对现状）误判成"开始写代码"，白白
- * 烧掉本该留给真正改动的那次检查点。真实事故：一次只读验证的 `npm run build`
- * 直接把 pre-execution 检查点触发了。
+ * 日志，答案本该是 false，改不得；但顾问提醒（advisorNudge）拿 isReadOnlyShellCommand
+ * 的结果去判定"这是不是开始实施改动"时，会把纯验证型命令
+ * （如 `cd frontend && npm run build` 核对现状）误判成"开始写代码"，
+ * 于是过早提醒"动手前先咨询"。
  *
  * 宁可漏判（仍照旧触发一次检查点，是现状，不算回退）也不误判（放过真正的写）：
  * 每个分段要么落在 isReadOnlyShellCommand 的白名单里，要么命中下面这份

package/src/tools/bash/semantics.ts

@@ -216,11 +216,10 @@ export function isReadOnlyShellCommand(command: string): boolean {
  * Advisor 专用信号，别处不要复用：命令是否只是"检查现状"（跑测试/构建/lint/
  * 类型检查），而不是开始实施改动。跟 isReadOnlyShellCommand 是两个不同的问题——
  * 后者要回答"能不能安全并行/算不算并发写"，这类命令往往会写构建产物/缓存/
- * 日志，答案本该是 false，改不得；但 advisorCoordinator 拿 isReadOnlyShellCommand
- * 的结果去判定"这是不是本任务版本的首次实质写入"时，会把纯验证型命令
- * （如 `cd frontend && npm run build` 核对现状）误判成"开始写代码"，白白
- * 烧掉本该留给真正改动的那次检查点。真实事故：一次只读验证的 `npm run build`
- * 直接把 pre-execution 检查点触发了。
+ * 日志，答案本该是 false，改不得；但顾问提醒（advisorNudge）拿 isReadOnlyShellCommand
+ * 的结果去判定"这是不是开始实施改动"时，会把纯验证型命令
+ * （如 `cd frontend && npm run build` 核对现状）误判成"开始写代码"，
+ * 于是过早提醒"动手前先咨询"。
  *
  * 宁可漏判（仍照旧触发一次检查点，是现状，不算回退）也不误判（放过真正的写）：
  * 每个分段要么落在 isReadOnlyShellCommand 的白名单里，要么命中下面这份

package/src/tools/capabilities.js

@@ -4,7 +4,6 @@ const TOOL_CAPABILITIES = Object.freeze({
     Edit: 'files.write', MultiEdit: 'files.write', Write: 'files.write', ApplyPatch: 'files.write',
     Bash: 'shell',
     PowerShell: 'shell', TaskOutput: 'background.process', TaskStop: 'background.process',
-    SSH: 'shell.remote', SSHUpload: 'shell.remote', SSHDownload: 'shell.remote', SSHHosts: 'shell.remote',
     Trash: 'files.trash',
     TaskCreate: 'task.management', TaskGet: 'task.management', TaskUpdate: 'task.management', TaskList: 'task.management',
     Skill: 'skill.invoke', SearchSkills: 'skill.invoke', EnterWorktree: 'worktree.session', ExitWorktree: 'worktree.session',
@@ -12,7 +11,7 @@ const TOOL_CAPABILITIES = Object.freeze({
     LSP: 'code.intelligence', NotebookEdit: 'files.write',
     WebSearch: 'web.search', WebFetch: 'web.fetch', WebBrowser: 'web.browser', BrowserBatch: 'web.browser', BrowserCDP: 'web.browser',
     Download: 'network.download',
-    ComputerUse: 'computer.use', AskUserQuestion: 'ask', Advisor: 'advisor', AdvisorDecision: 'advisor',
+    ComputerUse: 'computer.use', AskUserQuestion: 'ask', Advisor: 'advisor',
     Agent: 'subagent', AgentMessage: 'subagent', AgentList: 'subagent', AgentWait: 'subagent',
     AgentInterrupt: 'subagent', AgentFollowup: 'subagent', AgentReport: 'subagent', AgentResolve: 'subagent',
     PresentResult: 'delivery', GenerateImage: 'media', GenerateSpeech: 'media',
@@ -27,7 +26,7 @@ const CORE_TOOLS = new Set([
     'Read', 'Glob', 'Grep', 'Edit', 'MultiEdit', 'Write', 'ApplyPatch', 'NotebookEdit', 'Bash',
 ]);
 const AUXILIARY_TOOLS = new Set([
-    'Advisor', 'AdvisorDecision', 'Agent', 'AgentMessage', 'AgentList',
+    'Advisor', 'Agent', 'AgentMessage', 'AgentList',
     'AgentWait', 'AgentInterrupt', 'AgentFollowup', 'OptimizeConversation',
 ]);
 export function budgetClassForToolName(name) {

package/src/tools/capabilities.ts

@@ -20,7 +20,6 @@ export type CapabilityId =
   | 'skill.invoke'
   | 'worktree.session'
   | 'terminal.capture'
-  | 'shell.remote'
   | 'context.optimize';
 
 export type ToolBudgetClass = 'core' | 'task' | 'auxiliary';
@@ -31,7 +30,6 @@ const TOOL_CAPABILITIES: Readonly<Record<string, CapabilityId>> = Object.freeze(
   Edit: 'files.write', MultiEdit: 'files.write', Write: 'files.write', ApplyPatch: 'files.write',
   Bash: 'shell',
   PowerShell: 'shell', TaskOutput: 'background.process', TaskStop: 'background.process',
-  SSH: 'shell.remote', SSHUpload: 'shell.remote', SSHDownload: 'shell.remote', SSHHosts: 'shell.remote',
   Trash: 'files.trash',
   TaskCreate: 'task.management', TaskGet: 'task.management', TaskUpdate: 'task.management', TaskList: 'task.management',
   Skill: 'skill.invoke', SearchSkills: 'skill.invoke', EnterWorktree: 'worktree.session', ExitWorktree: 'worktree.session',
@@ -39,7 +37,7 @@ const TOOL_CAPABILITIES: Readonly<Record<string, CapabilityId>> = Object.freeze(
   LSP: 'code.intelligence', NotebookEdit: 'files.write',
   WebSearch: 'web.search', WebFetch: 'web.fetch', WebBrowser: 'web.browser', BrowserBatch: 'web.browser', BrowserCDP: 'web.browser',
   Download: 'network.download',
-  ComputerUse: 'computer.use', AskUserQuestion: 'ask', Advisor: 'advisor', AdvisorDecision: 'advisor',
+  ComputerUse: 'computer.use', AskUserQuestion: 'ask', Advisor: 'advisor',
   Agent: 'subagent', AgentMessage: 'subagent', AgentList: 'subagent', AgentWait: 'subagent',
   AgentInterrupt: 'subagent', AgentFollowup: 'subagent', AgentReport: 'subagent', AgentResolve: 'subagent',
   PresentResult: 'delivery', GenerateImage: 'media', GenerateSpeech: 'media',
@@ -55,7 +53,7 @@ const CORE_TOOLS = new Set([
   'Read', 'Glob', 'Grep', 'Edit', 'MultiEdit', 'Write', 'ApplyPatch', 'NotebookEdit', 'Bash',
 ]);
 const AUXILIARY_TOOLS = new Set([
-  'Advisor', 'AdvisorDecision', 'Agent', 'AgentMessage', 'AgentList',
+  'Advisor', 'Agent', 'AgentMessage', 'AgentList',
   'AgentWait', 'AgentInterrupt', 'AgentFollowup', 'OptimizeConversation',
 ]);
 

package/src/tools/index.js

@@ -14,7 +14,6 @@
  */
 import { advisorTool } from './advisor/advisor.js';
 import { optimizeConversationTool } from './optimizeConversation/optimizeConversation.js';
-import { advisorDecisionTool } from './advisor/advisorDecision.js';
 import { applyPatchTool } from './applypatch/applyPatch.js';
 // ⚠️ agent.ts 与本模块构成环（tools/index → agent → loop → tools/index）：
 // agent.ts 顶层不求值本模块/loop 的任何导出、loop.ts 的工具 token 估算已懒化，
@@ -42,10 +41,6 @@ import { presentResultTool } from './presentresult/presentresult.js';
 import { readTool } from './read/read.js';
 import { skillTool } from './skill/skill.js';
 import { searchSkillsTool } from './skill/searchSkills.js';
-import { sshTool } from './ssh/ssh.js';
-import { sshUploadTool } from './ssh/sshUpload.js';
-import { sshDownloadTool } from './ssh/sshDownload.js';
-import { sshHostsTool } from './ssh/sshHostsTool.js';
 import { snipTool } from './snip/snip.js';
 import { taskCreateTool, taskGetTool, taskListTool, taskUpdateTool, } from './tasks/taskManagement.js';
 import { taskOutputTool } from './tasks/taskOutput.js';
@@ -93,7 +88,6 @@ export const ALL_TOOLS = attachBuiltinPromptGuides([
     taskStopTool,
     askUserQuestionTool,
     advisorTool,
-    advisorDecisionTool,
     computerUseTool,
     // 追加在末尾：主循环 tools schema 的原有前缀字节不动（提示词缓存友好）
     agentTool,
@@ -118,11 +112,6 @@ export const ALL_TOOLS = attachBuiltinPromptGuides([
     // Browser extensions append after the stable legacy schema prefix.
     browserBatchTool,
     browserCdpTool,
-    // SSH tools append at the end for the same schema-prefix-cache reason as above.
-    sshHostsTool,
-    sshTool,
-    sshUploadTool,
-    sshDownloadTool,
     memoryMaintenanceTool,
     searchSkillsTool,
     optimizeConversationTool,
@@ -236,7 +225,6 @@ export { multiEditTool } from './edit/multi-edit.js';
 export { genImageTool } from './genimage/genimage.js';
 export { advisorTool } from './advisor/advisor.js';
 export { optimizeConversationTool } from './optimizeConversation/optimizeConversation.js';
-export { advisorDecisionTool } from './advisor/advisorDecision.js';
 export { applyPatchTool } from './applypatch/applyPatch.js';
 export { agentTool } from './agent/agent.js';
 export { agentResolveTool } from './agent/agentHandoff.js';
@@ -254,7 +242,3 @@ export { skillTool } from './skill/skill.js';
 export { snipTool } from './snip/snip.js';
 export { enterWorktreeTool, exitWorktreeTool, } from './worktree/sessionWorktree.js';
 export { terminalCaptureTool, installTerminalCapture, } from './terminal/terminalCapture.js';
-export { createSshTool, sshTool } from './ssh/ssh.js';
-export { createSshUploadTool, sshUploadTool } from './ssh/sshUpload.js';
-export { createSshDownloadTool, sshDownloadTool } from './ssh/sshDownload.js';
-export { createSshHostsTool, sshHostsTool } from './ssh/sshHostsTool.js';

package/src/tools/index.ts

@@ -16,7 +16,6 @@
 import type { Tool, ToolCallContext, ToolResult } from '../types.js';
 import { advisorTool } from './advisor/advisor.js';
 import { optimizeConversationTool } from './optimizeConversation/optimizeConversation.js';
-import { advisorDecisionTool } from './advisor/advisorDecision.js';
 import { applyPatchTool } from './applypatch/applyPatch.js';
 // ⚠️ agent.ts 与本模块构成环（tools/index → agent → loop → tools/index）：
 // agent.ts 顶层不求值本模块/loop 的任何导出、loop.ts 的工具 token 估算已懒化，
@@ -61,10 +60,6 @@ import { presentResultTool } from './presentresult/presentresult.js';
 import { readTool } from './read/read.js';
 import { skillTool } from './skill/skill.js';
 import { searchSkillsTool } from './skill/searchSkills.js';
-import { sshTool } from './ssh/ssh.js';
-import { sshUploadTool } from './ssh/sshUpload.js';
-import { sshDownloadTool } from './ssh/sshDownload.js';
-import { sshHostsTool } from './ssh/sshHostsTool.js';
 import { snipTool } from './snip/snip.js';
 import {
   taskCreateTool,
@@ -121,7 +116,6 @@ export const ALL_TOOLS: Tool[] = attachBuiltinPromptGuides([
   taskStopTool,
   askUserQuestionTool,
   advisorTool,
-  advisorDecisionTool,
   computerUseTool,
   // 追加在末尾：主循环 tools schema 的原有前缀字节不动（提示词缓存友好）
   agentTool,
@@ -146,11 +140,6 @@ export const ALL_TOOLS: Tool[] = attachBuiltinPromptGuides([
   // Browser extensions append after the stable legacy schema prefix.
   browserBatchTool,
   browserCdpTool,
-  // SSH tools append at the end for the same schema-prefix-cache reason as above.
-  sshHostsTool,
-  sshTool,
-  sshUploadTool,
-  sshDownloadTool,
   memoryMaintenanceTool,
   searchSkillsTool,
   optimizeConversationTool,
@@ -307,7 +296,6 @@ export { multiEditTool } from './edit/multi-edit.js';
 export { genImageTool } from './genimage/genimage.js';
 export { advisorTool } from './advisor/advisor.js';
 export { optimizeConversationTool } from './optimizeConversation/optimizeConversation.js';
-export { advisorDecisionTool } from './advisor/advisorDecision.js';
 export { applyPatchTool } from './applypatch/applyPatch.js';
 export { agentTool } from './agent/agent.js';
 export { agentResolveTool } from './agent/agentHandoff.js';
@@ -345,7 +333,3 @@ export {
   terminalCaptureTool,
   installTerminalCapture,
 } from './terminal/terminalCapture.js';
-export { createSshTool, sshTool } from './ssh/ssh.js';
-export { createSshUploadTool, sshUploadTool } from './ssh/sshUpload.js';
-export { createSshDownloadTool, sshDownloadTool } from './ssh/sshDownload.js';
-export { createSshHostsTool, sshHostsTool } from './ssh/sshHostsTool.js';

package/src/tools/memory/maintenance.js

@@ -1,16 +1,16 @@
 import { z } from 'zod';
-import { backgroundLearningHealth } from '../../memory/jobPolicy.js';
+import { backgroundLearningHealth, isPausedJob } from '../../memory/jobPolicy.js';
 import { getWorkingDir } from '../../bootstrap/workingDir.js';
 import { sha256 } from '../../memory/codec.js';
 import { captureDependencies } from '../../memory/dependencies.js';
 import { adoptExperience, experienceReviewDue, readExperienceStore, recordExperienceFeedback, } from '../../memory/experienceStore.js';
-import { factCandidates } from '../../memory/factCandidates.js';
+import { factCandidates, isLiveFactCandidate, } from '../../memory/factCandidates.js';
 import { cancelFactLearning, factLearningStatus, } from '../../memory/factLearning.js';
 import { cancelLearning, persistedLearningStatus, } from '../../memory/learning.js';
 import { createLearningModel } from '../../memory/learningModel.js';
 import { manageLearning } from '../../memory/managementService.js';
 import { memoryService } from '../../memory/memoryService.js';
-import { projectKnowledgeStatus, promoteExperienceKnowledge, promoteProjectKnowledge, } from '../../memory/projectKnowledge.js';
+import { isLiveKnowledgeCandidate, projectKnowledgeStatus, promoteExperienceKnowledge, promoteProjectKnowledge, } from '../../memory/projectKnowledge.js';
 import { toToolParameters } from '../../utils/zodToJson.js';
 import { denyUnlessLocalOwner } from './policy.js';
 const schema = z.object({
@@ -285,7 +285,7 @@ export const memoryMaintenanceTool = {
             const knowledge = await projectKnowledgeStatus(ctx.workspaceId);
             // Same orphan rule as buildContextBundle: a candidate whose old record
             // was forgotten must not print that record's text back out.
-            const liveRecordIds = new Set((await memoryService.snapshot(ctx.workspaceId)).records.map((record) => record.id));
+            const statements = new Map((await memoryService.snapshot(ctx.workspaceId)).records.map((record) => [record.id, record.statement]));
             return {
                 ok: true,
                 content: JSON.stringify({
@@ -301,12 +301,11 @@ export const memoryMaintenanceTool = {
                         pendingTurns: facts.pending.length,
                         queue: facts.pending.map(({ id, attempts, nextAttemptAt, failure }) => ({
                             id,
-                            failure,
+                            failure: failure && { ...failure, paused: isPausedJob({ failure }) },
                             attempts,
                             nextAttemptAt,
                         })),
-                        candidates: (await factCandidates(ctx.workspaceId)).filter((item) => item.status === 'open' &&
-                            (!item.old || liveRecordIds.has(item.old.id))),
+                        candidates: (await factCandidates(ctx.workspaceId)).filter((item) => isLiveFactCandidate(item, statements)),
                         receipts: facts.receipts.slice(-10),
                         enabled: (await memoryService.settings()).factLearning,
                     },
@@ -314,7 +313,7 @@ export const memoryMaintenanceTool = {
                         records: knowledge.records
                             .filter((item) => item.status !== 'superseded')
                             .slice(-20),
-                        candidates: knowledge.candidates.filter((item) => item.status === 'open'),
+                        candidates: knowledge.candidates.filter((item) => isLiveKnowledgeCandidate(item, knowledge.records)),
                     },
                     // Dismissed items are filtered out of both lists above, so without
                     // this the IDs `restore` needs are unreachable — delete would be a
@@ -341,7 +340,7 @@ export const memoryMaintenanceTool = {
                     pendingTurns: store.pending.length,
                     queue: store.pending.map(({ id, attempts, nextAttemptAt, failure }) => ({
                         id,
-                        failure,
+                        failure: failure && { ...failure, paused: isPausedJob({ failure }) },
                         attempts,
                         nextAttemptAt,
                     })),

package/src/tools/memory/maintenance.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { backgroundLearningHealth } from '../../memory/jobPolicy.js';
+import { backgroundLearningHealth, isPausedJob } from '../../memory/jobPolicy.js';
 import { getWorkingDir } from '../../bootstrap/workingDir.js';
 import { sha256 } from '../../memory/codec.js';
 import { captureDependencies } from '../../memory/dependencies.js';
@@ -9,7 +9,10 @@ import {
   readExperienceStore,
   recordExperienceFeedback,
 } from '../../memory/experienceStore.js';
-import { factCandidates } from '../../memory/factCandidates.js';
+import {
+  factCandidates,
+  isLiveFactCandidate,
+} from '../../memory/factCandidates.js';
 import {
   cancelFactLearning,
   factLearningStatus,
@@ -22,6 +25,7 @@ import { createLearningModel } from '../../memory/learningModel.js';
 import { manageLearning, type LearningManagementRequest } from '../../memory/managementService.js';
 import { memoryService } from '../../memory/memoryService.js';
 import {
+  isLiveKnowledgeCandidate,
   projectKnowledgeStatus,
   promoteExperienceKnowledge,
   promoteProjectKnowledge,
@@ -379,9 +383,9 @@ export const memoryMaintenanceTool: Tool<z.infer<typeof schema>> = {
       const knowledge = await projectKnowledgeStatus(ctx.workspaceId);
       // Same orphan rule as buildContextBundle: a candidate whose old record
       // was forgotten must not print that record's text back out.
-      const liveRecordIds = new Set(
+      const statements = new Map(
         (await memoryService.snapshot(ctx.workspaceId)).records.map(
-          (record) => record.id,
+          (record) => [record.id, record.statement],
         ),
       );
       return {
@@ -400,14 +404,12 @@ export const memoryMaintenanceTool: Tool<z.infer<typeof schema>> = {
               pendingTurns: facts.pending.length,
               queue: facts.pending.map(({ id, attempts, nextAttemptAt, failure }) => ({
                 id,
-                failure,
+                failure: failure && { ...failure, paused: isPausedJob({ failure }) },
                 attempts,
                 nextAttemptAt,
               })),
               candidates: (await factCandidates(ctx.workspaceId)).filter(
-                (item) =>
-                  item.status === 'open' &&
-                  (!item.old || liveRecordIds.has(item.old.id)),
+                (item) => isLiveFactCandidate(item, statements),
               ),
               receipts: facts.receipts.slice(-10),
               enabled: (await memoryService.settings()).factLearning,
@@ -416,8 +418,8 @@ export const memoryMaintenanceTool: Tool<z.infer<typeof schema>> = {
               records: knowledge.records
                 .filter((item) => item.status !== 'superseded')
                 .slice(-20),
-              candidates: knowledge.candidates.filter(
-                (item) => item.status === 'open',
+              candidates: knowledge.candidates.filter((item) =>
+                isLiveKnowledgeCandidate(item, knowledge.records),
               ),
             },
             // Dismissed items are filtered out of both lists above, so without
@@ -445,7 +447,7 @@ export const memoryMaintenanceTool: Tool<z.infer<typeof schema>> = {
             pendingTurns: store.pending.length,
             queue: store.pending.map(({ id, attempts, nextAttemptAt, failure }) => ({
               id,
-              failure,
+              failure: failure && { ...failure, paused: isPausedJob({ failure }) },
               attempts,
               nextAttemptAt,
             })),

package/src/tools/memory/memory.js

@@ -3,7 +3,7 @@ import { recallExperiences, experienceContext } from '../../memory/experienceSto
 import { recallProjectKnowledge, projectKnowledgeContext } from '../../memory/projectKnowledge.js';
 import { readConversationEpisode, searchConversationPage } from '../../memory/episodicMemory.js';
 import { memoryRecordPath } from '../../memory/fileStore.js';
-import { memoryService, } from '../../memory/memoryService.js';
+import { memoryService, settleCandidatesAfterUpdate, } from '../../memory/memoryService.js';
 import { toToolParameters } from '../../utils/zodToJson.js';
 import { DEFAULT_MAX_RESULT_SIZE_CHARS } from '../types.js';
 import { EXPLICIT_CROSS_WORKSPACE_INTENT, EXPLICIT_FORGET_INTENT, EXPLICIT_MEMORY_INTENT, EXPLICIT_PERSONA_INTENT, confirmSensitiveMemory, confirmMemoryCorrection, denyUnlessLocalOwner, requireCurrentEvidence, } from './policy.js';
@@ -307,6 +307,10 @@ export const updateMemoryTool = {
             }
             throw error;
         }
+        // Workspace records settle inside updateWithVersion; a personal record's
+        // candidates were retained in the workspace where the change was heard.
+        if (updated && input.scope === 'personal' && ctx.workspaceId)
+            await settleCandidatesAfterUpdate(ctx.workspaceId, updated);
         return updated
             ? {
                 ok: true,

package/src/tools/memory/memory.ts

@@ -8,6 +8,7 @@ import {
   type MemoryCategory,
   type MemoryScope,
   memoryService,
+  settleCandidatesAfterUpdate,
 } from '../../memory/memoryService.js';
 import type { Tool } from '../../types.js';
 import { toToolParameters } from '../../utils/zodToJson.js';
@@ -355,6 +356,10 @@ export const updateMemoryTool: Tool<z.infer<typeof updateSchema>> = {
       }
       throw error;
     }
+    // Workspace records settle inside updateWithVersion; a personal record's
+    // candidates were retained in the workspace where the change was heard.
+    if (updated && input.scope === 'personal' && ctx.workspaceId)
+      await settleCandidatesAfterUpdate(ctx.workspaceId, updated);
     return updated
       ? {
           ok: true,

package/src/tools/optimizeConversation/README.md

@@ -25,12 +25,10 @@
 保留原有消息 ID、工具调用 ID、来源标签、工具元数据、顾问咨询和决定；不引入数据库、
 服务器依赖或新的状态目录。普通 provider 和 gateway 请求会剥离这个本地字段。
 
-- Advisor 展开冷记录与实时尾部，再执行原有脱敏、图片控制和输入预算筛选；不会拿主模型
-  的摘要冒充原始证据。上下文包提供证据总数、选取数及省略数；条目是摘录，不代表完整审阅。
-- AdvisorDecision 可以关联被压缩移出的 `tool_call_id`。优化结果不参与证据计数、
-  证据候选或证据引用校验，不能用“优化成功”证明任务已完成。
-- 恢复 Session 时用相同审阅来源重放检查点、版本、历史意见与待处理咨询；新请求仍执行
-  原有 pending 隔离规则。压缩不会创建一次新任务或绕过评审。
+- Advisor 展开冷记录与实时尾部（压缩产生的续接摘要紧随其后，标明不是一手证据），再抹密钥、
+  按窗口截尾；不会拿主模型的摘要冒充原始证据。
+- 优化结果不是一手证据，不能用“优化成功”证明任务已完成；顾问提醒只按本次运行内的真实
+  改动、验证和调查证据计算，压缩不会创建一次新任务或绕过提醒。
 - 串行批次每完成一个工具就写入历史及观察状态，后面的 Advisor 能看到刚完成的结果；
   并行只读批次仍按调用顺序统一写入。优化工具继续保护整个在途批次。
 - 手动、自动、应急摘要和规则式 snip 共用保留逻辑；反复压缩把冷记录展平，不递归复制

package/src/tools/toolPromptGuides.js

@@ -32,10 +32,6 @@ export const BUILTIN_TOOL_PROMPT_GUIDES = {
     TaskOutput: g('shell', '读取后台任务增量输出或等待完成', '持有 task_id 后阻塞等待新输出', '高频轮询'),
     TaskStop: g('shell', '停止不再需要或失控的后台任务', '传入准确 task_id 并确认终止结果', '任务仍有价值时不要提前停止'),
     TerminalCapture: g('shell', '查看当前 TUI 终端屏幕状态', '仅在需要屏幕呈现而非命令输出时截取', '项目命令输出用 Bash/TaskOutput'),
-    SSHHosts: g('shell', '调用 SSH/SSHUpload/SSHDownload 前不确定当前工作区配置了哪些远程主机', '直接调用查看别名列表'),
-    SSH: g('shell', '在用户已配置的远程主机上执行命令', '按别名指定主机，命令明确后再执行', '本机操作用 Bash；主机未配置时先引导用户去 /config 添加'),
-    SSHUpload: g('shell', '把本地文件传到已配置的远程主机', '给出本地路径和远程目标路径', '本机内文件操作用 Write/Edit'),
-    SSHDownload: g('shell', '把已配置远程主机上的文件取回本地', '给出远程源路径和本地落盘路径', '读取远程命令输出用 SSH 而非下载文件'),
     WebSearch: g('web', '发现来源、查询当前信息或做多来源核实', '用短查询和明确时间范围，再打开高价值来源', '已知 URL 正文直接用 WebFetch', 'preferred'),
     WebFetch: g('web', '读取已知 URL 的静态正文', '抓取正文后核对来源与发布时间', '需要登录态、点击或动态交互时用 WebBrowser'),
     WebBrowser: g('web', '操作登录态网页、动态页面、表单或做网页视觉验收', '先观察，单步操作，再验证页面状态', '普通搜索、静态阅读和原生应用不要使用'),
@@ -69,8 +65,7 @@ export const BUILTIN_TOOL_PROMPT_GUIDES = {
     SearchConversations: g('memory', '用户提到之前、上次或既有方案', '用少量内容关键词检索', '不要提交整段问题或元词'),
     Skill: g('memory', '加载已安装的专门工作流程', '按精确名称读取并遵循 SKILL.md', '没有匹配 Skill 时不要调用'),
     SearchSkills: g('memory', 'Skill 目录被省略或需要按任务发现已安装技能', '搜索元数据，核对依赖，再用 Skill 加载命中名称', '已知精确技能名可直接加载'),
-    Advisor: g('memory', '计划执行前、成果提交前、同题两次失败、用户不满意或非常不确定', '提供目标、证据和分歧点，再核验建议', '不要把顾问当事实来源或权限授予者'),
-    AdvisorDecision: g('memory', '已收到 Advisor 建议，希望记录主 Agent 的采纳判断', '按证据记录 accept、partial 或 reject', '未咨询 Advisor 时不要调用'),
+    Advisor: g('memory', '实质工作前、认为完成后、同一问题失败两次、想换方案或非常不确定', '顾问已看到整段对话；note 只写想挑战的疑点，再核验建议', '不要把顾问当事实来源或权限授予者'),
     GenerateImage: g('media', '用户要求生成或编辑图片', '给出成品目标和输出位置并检查结果', '分析已有图片不使用'),
     GenerateSpeech: g('media', '用户要求生成语音或音频', '提供文本、声音要求和输出位置', '普通文字回答不使用'),
     PresentResult: g('media', '向用户正式交付生成或修改后的文件', '提交真实最终文件并附简短说明', '只提交面向用户的最终产物', 'preferred'),
@@ -109,9 +104,7 @@ export const CONTRACT_DESCRIPTION_OVERRIDES = {
         const notice = bashShellNotice();
         return notice ? `${base}\n\n${notice}` : base;
     },
-    Advisor: '向无工具权限的顾问模型请求一次结构化第二意见。默认 reviewMode=brief 只给重点短评；完整代码审查用 full，并提供范围、基线和证据。full 不扩大上下文或输出预算，材料不足时必须说明未完成。',
-    // 保留决策必填条件，与 schema 的 superRefine 一致；不能只概括成“记录决定”。
-    AdvisorDecision: '记录主 Agent 对顾问第二意见的 accept、partial 或 reject 判断；是否采纳由主 Agent 决定，登记不是执行许可。partial 同时填 acceptedPoints/rejectedPoints；reject 填 rejectedPoints，列出被拒绝点及依据；evidenceRefs 只引用真实 tool_call_id，没有引用则记录待验证。登记失败不阻止任务继续。',
+    Advisor: '向无工具权限的顾问模型请求一次第二意见；它能看到整段对话，无需复述。默认 reviewMode=brief 只给重点短评；用户要求完整代码审查时用 full，并在 note 说明范围、基线和证据。full 不扩大上下文或输出预算，材料不足时必须说明未完成。',
     MultiEdit: '同文件有序批量精确替换，先 Read 相关范围；全部匹配成功才写盘。old_string 非空且唯一，或显式 replace_all。后续匹配前序生成文本会被拒绝，请合并 edits。操作条数不等于替换次数，diff 预览可能不完整。',
     LSP: '查询定义、引用、类型、符号和诊断。line/character 为 1-based UTF-16；尚未收到诊断不等于没有错误，编辑前读取源码。',
     WebFetch: '读取已知 HTTP(S) URL 的静态文本并完整保存会话快照，HTML 转 Markdown；结果仅为窗口，使用 snapshot_id + next_offset 续读，query 在全文中精确搜索，max_chars 可扩大读取预算。不要重复读取同一窗口或声称已读未展示部分。不执行 JavaScript、不继承登录态。PDF/图片用 Download 后 Read；动态页面用 WebBrowser。',

package/src/tools/toolPromptGuides.ts

@@ -43,10 +43,6 @@ export const BUILTIN_TOOL_PROMPT_GUIDES: Readonly<Record<string, ToolPromptGuide
   TaskOutput: g('shell', '读取后台任务增量输出或等待完成', '持有 task_id 后阻塞等待新输出', '高频轮询'),
   TaskStop: g('shell', '停止不再需要或失控的后台任务', '传入准确 task_id 并确认终止结果', '任务仍有价值时不要提前停止'),
   TerminalCapture: g('shell', '查看当前 TUI 终端屏幕状态', '仅在需要屏幕呈现而非命令输出时截取', '项目命令输出用 Bash/TaskOutput'),
-  SSHHosts: g('shell', '调用 SSH/SSHUpload/SSHDownload 前不确定当前工作区配置了哪些远程主机', '直接调用查看别名列表'),
-  SSH: g('shell', '在用户已配置的远程主机上执行命令', '按别名指定主机，命令明确后再执行', '本机操作用 Bash；主机未配置时先引导用户去 /config 添加'),
-  SSHUpload: g('shell', '把本地文件传到已配置的远程主机', '给出本地路径和远程目标路径', '本机内文件操作用 Write/Edit'),
-  SSHDownload: g('shell', '把已配置远程主机上的文件取回本地', '给出远程源路径和本地落盘路径', '读取远程命令输出用 SSH 而非下载文件'),
 
   WebSearch: g('web', '发现来源、查询当前信息或做多来源核实', '用短查询和明确时间范围，再打开高价值来源', '已知 URL 正文直接用 WebFetch', 'preferred'),
   WebFetch: g('web', '读取已知 URL 的静态正文', '抓取正文后核对来源与发布时间', '需要登录态、点击或动态交互时用 WebBrowser'),
@@ -84,8 +80,7 @@ export const BUILTIN_TOOL_PROMPT_GUIDES: Readonly<Record<string, ToolPromptGuide
   SearchConversations: g('memory', '用户提到之前、上次或既有方案', '用少量内容关键词检索', '不要提交整段问题或元词'),
   Skill: g('memory', '加载已安装的专门工作流程', '按精确名称读取并遵循 SKILL.md', '没有匹配 Skill 时不要调用'),
   SearchSkills: g('memory', 'Skill 目录被省略或需要按任务发现已安装技能', '搜索元数据，核对依赖，再用 Skill 加载命中名称', '已知精确技能名可直接加载'),
-  Advisor: g('memory', '计划执行前、成果提交前、同题两次失败、用户不满意或非常不确定', '提供目标、证据和分歧点，再核验建议', '不要把顾问当事实来源或权限授予者'),
-  AdvisorDecision: g('memory', '已收到 Advisor 建议，希望记录主 Agent 的采纳判断', '按证据记录 accept、partial 或 reject', '未咨询 Advisor 时不要调用'),
+  Advisor: g('memory', '实质工作前、认为完成后、同一问题失败两次、想换方案或非常不确定', '顾问已看到整段对话；note 只写想挑战的疑点，再核验建议', '不要把顾问当事实来源或权限授予者'),
 
   GenerateImage: g('media', '用户要求生成或编辑图片', '给出成品目标和输出位置并检查结果', '分析已有图片不使用'),
   GenerateSpeech: g('media', '用户要求生成语音或音频', '提供文本、声音要求和输出位置', '普通文字回答不使用'),
@@ -127,9 +122,7 @@ export const CONTRACT_DESCRIPTION_OVERRIDES: Readonly<Record<string, string | ((
     const notice = bashShellNotice();
     return notice ? `${base}\n\n${notice}` : base;
   },
-  Advisor: '向无工具权限的顾问模型请求一次结构化第二意见。默认 reviewMode=brief 只给重点短评；完整代码审查用 full，并提供范围、基线和证据。full 不扩大上下文或输出预算，材料不足时必须说明未完成。',
-  // 保留决策必填条件，与 schema 的 superRefine 一致；不能只概括成“记录决定”。
-  AdvisorDecision: '记录主 Agent 对顾问第二意见的 accept、partial 或 reject 判断；是否采纳由主 Agent 决定，登记不是执行许可。partial 同时填 acceptedPoints/rejectedPoints；reject 填 rejectedPoints，列出被拒绝点及依据；evidenceRefs 只引用真实 tool_call_id，没有引用则记录待验证。登记失败不阻止任务继续。',
+  Advisor: '向无工具权限的顾问模型请求一次第二意见；它能看到整段对话，无需复述。默认 reviewMode=brief 只给重点短评；用户要求完整代码审查时用 full，并在 note 说明范围、基线和证据。full 不扩大上下文或输出预算，材料不足时必须说明未完成。',
   MultiEdit: '同文件有序批量精确替换，先 Read 相关范围；全部匹配成功才写盘。old_string 非空且唯一，或显式 replace_all。后续匹配前序生成文本会被拒绝，请合并 edits。操作条数不等于替换次数，diff 预览可能不完整。',
   LSP: '查询定义、引用、类型、符号和诊断。line/character 为 1-based UTF-16；尚未收到诊断不等于没有错误，编辑前读取源码。',
   WebFetch: '读取已知 HTTP(S) URL 的静态文本并完整保存会话快照，HTML 转 Markdown；结果仅为窗口，使用 snapshot_id + next_offset 续读，query 在全文中精确搜索，max_chars 可扩大读取预算。不要重复读取同一窗口或声称已读未展示部分。不执行 JavaScript、不继承登录态。PDF/图片用 Download 后 Read；动态页面用 WebBrowser。',