minimal-agent 0.18.7 → 0.18.9

package/src/tools/memory/memory.js

@@ -6,7 +6,7 @@ import { memoryRecordPath } from '../../memory/fileStore.js';
 import { memoryService, } 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, denyUnlessLocalOwner, requireCurrentEvidence, } from './policy.js';
+import { EXPLICIT_CROSS_WORKSPACE_INTENT, EXPLICIT_FORGET_INTENT, EXPLICIT_MEMORY_INTENT, EXPLICIT_PERSONA_INTENT, confirmSensitiveMemory, confirmMemoryCorrection, denyUnlessLocalOwner, requireCurrentEvidence, } from './policy.js';
 const scopeSchema = z.enum(['personal', 'workspace']);
 const categorySchema = z.enum([
     'profile',
@@ -21,7 +21,7 @@ function formatRecord(record, version) {
         ? ` workspace=${record.workspaceId}`
         : '';
     const lifecycle = ` status=${record.status ?? 'active'} revision=${record.revision ?? 1}`;
-    return `- [${record.id}] scope=${record.scope} ${record.category}/${record.subject}${workspace}${lifecycle}${version ? ` version=${version}` : ''}: ${record.statement}（${record.evidence}，${new Date(record.updatedAt).toISOString()}）`;
+    return `- [${record.id}] scope=${record.scope} ${record.category}/${record.subject}${workspace}${lifecycle}${version ? ` version=${version}` : ''}: ${record.statement}（${record.evidence}，${new Date(record.updatedAt).toISOString()}）${record.status === 'needs_review' && record.confirmationContext ? `\n复核线索（非事实）：${record.confirmationContext}` : ''}`;
 }
 function diagnosticSuffix(diagnostics) {
     if (!diagnostics.length)
@@ -159,15 +159,18 @@ export const rememberMemoryTool = {
     },
 };
 const updateSchema = z.object({
+    action: z.enum(['update', 'review', 'confirm']).optional().describe('默认 update：当前用户原话纠正；review：仅标记待复核，不改事实；confirm：通过宿主向用户确认拟更新内容后保存'),
+    reason: z.string().min(1).max(1000).optional().describe('review/confirm 必填：冲突或纠正依据，注明来源；不得伪造用户陈述'),
     id: z.string().uuid(),
     scope: scopeSchema,
     category: categorySchema.optional(),
     subject: z.string().min(1).max(120).optional(),
-    statement: z.string().min(1).max(1000),
+    statement: z.string().min(1).max(1000).optional(),
     evidenceQuote: z
         .string()
         .min(1)
         .max(1000)
+        .optional()
         .describe('当前用户消息中的逐字证据片段'),
     sensitivity: z.enum(['normal', 'sensitive']).optional(),
     aliases: z.array(z.string().min(1).max(120)).max(20).optional(),
@@ -184,7 +187,7 @@ const updateSchema = z.object({
 });
 export const updateMemoryTool = {
     name: 'UpdateMemory',
-    description: '在用户当前陈述纠正或替换旧事实时，按 RecallMemory 返回的 ID 整条更新。必须先读取旧记录，evidenceQuote 必须逐字来自当前用户消息；不得用推断补写历史。',
+    description: '纠正用户事实记忆：先 RecallMemory 读取 ID/version。默认 update 需要 statement 与当前用户原话 evidenceQuote；review 需要 reason，仅标记待复核、保留原事实与证据；confirm 需要 statement/reason，通过宿主展示新旧内容并取得用户确认再更新。拒绝或无法交互不写入。项目知识和经验走 MemoryMaintenance，不伪造用户证据。',
     inputSchema: updateSchema,
     parameters: toToolParameters(updateSchema),
     isReadOnly: false,
@@ -196,9 +199,23 @@ export const updateMemoryTool = {
         if (denied)
             return denied;
         const current = ctx.currentUserInput ?? '';
-        const invalidEvidence = requireCurrentEvidence(ctx, input.evidenceQuote);
-        if (invalidEvidence)
-            return invalidEvidence;
+        const action = input.action ?? 'update';
+        if (action === 'review' && (input.statement !== undefined || input.evidenceQuote !== undefined)) {
+            return { ok: false, error: 'review 仅提交 reason，不提交 statement/evidenceQuote；标记疑点不代表确认新事实' };
+        }
+        if (action !== 'update' && (input.category !== undefined || input.subject !== undefined || input.aliases !== undefined || input.supersedesIds !== undefined || input.sensitivity !== undefined)) {
+            return { ok: false, error: 'review/confirm 只处理当前记录的复核状态或正文，不同时修改分类、敏感级别、别名或替代其他记录' };
+        }
+        if (action === 'update') {
+            if (!input.statement || !input.evidenceQuote)
+                return { ok: false, error: 'update 需要 statement 和当前用户原话 evidenceQuote' };
+            const invalidEvidence = requireCurrentEvidence(ctx, input.evidenceQuote);
+            if (invalidEvidence)
+                return invalidEvidence;
+        }
+        else if (!input.reason || (action === 'confirm' && !input.statement)) {
+            return { ok: false, error: 'review 需要 reason；confirm 需要 reason 和 statement' };
+        }
         if (input.scope === 'workspace' && !ctx.workspaceId) {
             return {
                 ok: false,
@@ -206,7 +223,7 @@ export const updateMemoryTool = {
             };
         }
         if (!(await memoryService.settings()).autoRemember &&
-            !EXPLICIT_MEMORY_INTENT.test(current)) {
+            !EXPLICIT_MEMORY_INTENT.test(current) && action !== 'confirm') {
             return {
                 ok: false,
                 error: '用户已关闭自动记忆；当前消息没有明确要求更新记忆',
@@ -215,18 +232,43 @@ export const updateMemoryTool = {
         const currentRecord = await memoryService.readWithVersion(input.id, input.scope, input.scope === 'workspace' ? ctx.workspaceId : undefined);
         if (!currentRecord)
             return { ok: false, error: '未找到该记忆，未做修改' };
-        const sensitivity = input.sensitivity ?? currentRecord.record.sensitivity ?? 'normal';
+        const expectedVersion = input.expectedVersion ?? currentRecord.version;
+        if (expectedVersion !== currentRecord.version) {
+            return {
+                ok: false,
+                error: '记忆已被手工或并发修改。未应用本次更新；保留以下当前记录的并发修改后可直接重试，不存在时重新定位。\n'
+                    + JSON.stringify({ current: currentRecord }),
+            };
+        }
+        if (action === 'review') {
+            signal?.throwIfAborted();
+            try {
+                const reviewed = await memoryService.updateWithVersion(input.id, input.scope, expectedVersion, { status: 'needs_review', confirmationContext: `待复核原因（非确认事实）：${input.reason}` }, input.scope === 'workspace' ? ctx.workspaceId : undefined);
+                return reviewed ? { ok: true, content: `已标记待复核，原事实和证据未改写。id=${input.id}\nversion=${reviewed.version}` }
+                    : { ok: false, error: '记录已不存在，未做修改' };
+            }
+            catch (error) {
+                if (error.message === 'MEMORY_VERSION_CONFLICT')
+                    return { ok: false, error: '记忆并发变更，请重新读取；未标记待复核' };
+                throw error;
+            }
+        }
+        const statement = input.statement;
+        const confirmed = action === 'confirm' && await confirmMemoryCorrection(currentRecord.record.subject, currentRecord.record.statement, statement, input.reason, signal);
+        if (action === 'confirm' && !confirmed)
+            return { ok: false, error: '未获得用户确认（拒绝或宿主无法交互），原记忆未改写；可标记待复核，不要重复请求确认' };
+        const evidenceQuote = confirmed ? `用户通过纠正记忆确认：${statement}` : input.evidenceQuote;
+        const sensitivity = currentRecord.record.sensitivity === 'sensitive' ? 'sensitive' : input.sensitivity ?? 'normal';
         if (sensitivity === 'sensitive' &&
-            input.statement.trim() === input.evidenceQuote.trim()) {
+            !confirmed && statement.trim() === evidenceQuote.trim()) {
             return {
                 ok: false,
                 error: '敏感内容不得逐字更新；请先概括、去除不必要细节后再请求确认',
             };
         }
-        const evidence = await confirmSensitiveMemory(input.statement, sensitivity, signal);
+        const evidence = confirmed ? 'user_confirmed' : await confirmSensitiveMemory(statement, sensitivity, signal);
         if (!evidence)
             return { ok: false, error: '敏感记忆更新未获确认' };
-        const expectedVersion = input.expectedVersion ?? currentRecord.version;
         let updated;
         try {
             updated = await memoryService.updateWithVersion(input.id, input.scope, expectedVersion, {
@@ -234,9 +276,11 @@ export const updateMemoryTool = {
                     ? { category: input.category }
                     : {}),
                 ...(input.subject ? { subject: input.subject } : {}),
-                statement: input.statement,
+                statement,
+                status: 'active',
                 evidence,
-                evidenceQuote: input.evidenceQuote,
+                evidenceQuote,
+                confirmationContext: confirmed ? `宿主确认纠正：${input.reason}` : '',
                 sourceSessionId: ctx.sessionId ?? 'unknown',
                 sourceMessageId: ctx.userMessageId ?? 'unknown',
                 sensitivity,

package/src/tools/memory/memory.ts

@@ -18,6 +18,7 @@ import {
   EXPLICIT_MEMORY_INTENT,
   EXPLICIT_PERSONA_INTENT,
   confirmSensitiveMemory,
+  confirmMemoryCorrection,
   denyUnlessLocalOwner,
   requireCurrentEvidence,
 } from './policy.js';
@@ -39,7 +40,7 @@ function formatRecord(
     ? ` workspace=${record.workspaceId}`
     : '';
   const lifecycle = ` status=${record.status ?? 'active'} revision=${record.revision ?? 1}`;
-  return `- [${record.id}] scope=${record.scope} ${record.category}/${record.subject}${workspace}${lifecycle}${version ? ` version=${version}` : ''}: ${record.statement}（${record.evidence}，${new Date(record.updatedAt).toISOString()}）`;
+  return `- [${record.id}] scope=${record.scope} ${record.category}/${record.subject}${workspace}${lifecycle}${version ? ` version=${version}` : ''}: ${record.statement}（${record.evidence}，${new Date(record.updatedAt).toISOString()}）${record.status === 'needs_review' && record.confirmationContext ? `\n复核线索（非事实）：${record.confirmationContext}` : ''}`;
 }
 
 function diagnosticSuffix(
@@ -188,15 +189,18 @@ export const rememberMemoryTool: Tool<z.infer<typeof rememberSchema>> = {
 };
 
 const updateSchema = z.object({
+  action: z.enum(['update', 'review', 'confirm']).optional().describe('默认 update：当前用户原话纠正；review：仅标记待复核，不改事实；confirm：通过宿主向用户确认拟更新内容后保存'),
+  reason: z.string().min(1).max(1000).optional().describe('review/confirm 必填：冲突或纠正依据，注明来源；不得伪造用户陈述'),
   id: z.string().uuid(),
   scope: scopeSchema,
   category: categorySchema.optional(),
   subject: z.string().min(1).max(120).optional(),
-  statement: z.string().min(1).max(1000),
+  statement: z.string().min(1).max(1000).optional(),
   evidenceQuote: z
     .string()
     .min(1)
     .max(1000)
+    .optional()
     .describe('当前用户消息中的逐字证据片段'),
   sensitivity: z.enum(['normal', 'sensitive']).optional(),
   aliases: z.array(z.string().min(1).max(120)).max(20).optional(),
@@ -217,7 +221,7 @@ const updateSchema = z.object({
 export const updateMemoryTool: Tool<z.infer<typeof updateSchema>> = {
   name: 'UpdateMemory',
   description:
-    '在用户当前陈述纠正或替换旧事实时，按 RecallMemory 返回的 ID 整条更新。必须先读取旧记录，evidenceQuote 必须逐字来自当前用户消息；不得用推断补写历史。',
+    '纠正用户事实记忆：先 RecallMemory 读取 ID/version。默认 update 需要 statement 与当前用户原话 evidenceQuote；review 需要 reason，仅标记待复核、保留原事实与证据；confirm 需要 statement/reason，通过宿主展示新旧内容并取得用户确认再更新。拒绝或无法交互不写入。项目知识和经验走 MemoryMaintenance，不伪造用户证据。',
   inputSchema: updateSchema,
   parameters: toToolParameters(updateSchema),
   isReadOnly: false,
@@ -228,8 +232,20 @@ export const updateMemoryTool: Tool<z.infer<typeof updateSchema>> = {
     const denied = denyUnlessLocalOwner(ctx);
     if (denied) return denied;
     const current = ctx.currentUserInput ?? '';
-    const invalidEvidence = requireCurrentEvidence(ctx, input.evidenceQuote);
-    if (invalidEvidence) return invalidEvidence;
+    const action = input.action ?? 'update';
+    if (action === 'review' && (input.statement !== undefined || input.evidenceQuote !== undefined)) {
+      return { ok: false, error: 'review 仅提交 reason，不提交 statement/evidenceQuote；标记疑点不代表确认新事实' };
+    }
+    if (action !== 'update' && (input.category !== undefined || input.subject !== undefined || input.aliases !== undefined || input.supersedesIds !== undefined || input.sensitivity !== undefined)) {
+      return { ok: false, error: 'review/confirm 只处理当前记录的复核状态或正文，不同时修改分类、敏感级别、别名或替代其他记录' };
+    }
+    if (action === 'update') {
+      if (!input.statement || !input.evidenceQuote) return { ok: false, error: 'update 需要 statement 和当前用户原话 evidenceQuote' };
+      const invalidEvidence = requireCurrentEvidence(ctx, input.evidenceQuote);
+      if (invalidEvidence) return invalidEvidence;
+    } else if (!input.reason || (action === 'confirm' && !input.statement)) {
+      return { ok: false, error: 'review 需要 reason；confirm 需要 reason 和 statement' };
+    }
     if (input.scope === 'workspace' && !ctx.workspaceId) {
       return {
         ok: false,
@@ -238,7 +254,7 @@ export const updateMemoryTool: Tool<z.infer<typeof updateSchema>> = {
     }
     if (
       !(await memoryService.settings()).autoRemember &&
-      !EXPLICIT_MEMORY_INTENT.test(current)
+      !EXPLICIT_MEMORY_INTENT.test(current) && action !== 'confirm'
     ) {
       return {
         ok: false,
@@ -251,23 +267,49 @@ export const updateMemoryTool: Tool<z.infer<typeof updateSchema>> = {
       input.scope === 'workspace' ? ctx.workspaceId : undefined,
     );
     if (!currentRecord) return { ok: false, error: '未找到该记忆，未做修改' };
-    const sensitivity = input.sensitivity ?? currentRecord.record.sensitivity ?? 'normal';
+    const expectedVersion = input.expectedVersion ?? currentRecord.version;
+    if (expectedVersion !== currentRecord.version) {
+      return {
+        ok: false,
+        error:
+          '记忆已被手工或并发修改。未应用本次更新；保留以下当前记录的并发修改后可直接重试，不存在时重新定位。\n'
+          + JSON.stringify({ current: currentRecord }),
+      };
+    }
+    if (action === 'review') {
+      signal?.throwIfAborted();
+      try {
+        const reviewed = await memoryService.updateWithVersion(input.id, input.scope, expectedVersion,
+          { status: 'needs_review', confirmationContext: `待复核原因（非确认事实）：${input.reason}` },
+          input.scope === 'workspace' ? ctx.workspaceId : undefined);
+        return reviewed ? { ok: true, content: `已标记待复核，原事实和证据未改写。id=${input.id}\nversion=${reviewed.version}` }
+          : { ok: false, error: '记录已不存在，未做修改' };
+      } catch (error) {
+        if ((error as Error).message === 'MEMORY_VERSION_CONFLICT') return { ok: false, error: '记忆并发变更，请重新读取；未标记待复核' };
+        throw error;
+      }
+    }
+    const statement = input.statement!;
+    const confirmed = action === 'confirm' && await confirmMemoryCorrection(currentRecord.record.subject,
+      currentRecord.record.statement, statement, input.reason!, signal);
+    if (action === 'confirm' && !confirmed) return { ok: false, error: '未获得用户确认（拒绝或宿主无法交互），原记忆未改写；可标记待复核，不要重复请求确认' };
+    const evidenceQuote = confirmed ? `用户通过纠正记忆确认：${statement}` : input.evidenceQuote!;
+    const sensitivity = currentRecord.record.sensitivity === 'sensitive' ? 'sensitive' : input.sensitivity ?? 'normal';
     if (
       sensitivity === 'sensitive' &&
-      input.statement.trim() === input.evidenceQuote.trim()
+      !confirmed && statement.trim() === evidenceQuote.trim()
     ) {
       return {
         ok: false,
         error: '敏感内容不得逐字更新；请先概括、去除不必要细节后再请求确认',
       };
     }
-    const evidence = await confirmSensitiveMemory(
-      input.statement,
+    const evidence = confirmed ? 'user_confirmed' : await confirmSensitiveMemory(
+      statement,
       sensitivity,
       signal,
     );
     if (!evidence) return { ok: false, error: '敏感记忆更新未获确认' };
-    const expectedVersion = input.expectedVersion ?? currentRecord.version;
     let updated: Awaited<ReturnType<typeof memoryService.updateWithVersion>>;
     try {
       updated = await memoryService.updateWithVersion(
@@ -279,9 +321,11 @@ export const updateMemoryTool: Tool<z.infer<typeof updateSchema>> = {
             ? { category: input.category as MemoryCategory }
             : {}),
           ...(input.subject ? { subject: input.subject } : {}),
-          statement: input.statement,
+          statement,
+          status: 'active',
           evidence,
-          evidenceQuote: input.evidenceQuote,
+          evidenceQuote,
+          confirmationContext: confirmed ? `宿主确认纠正：${input.reason}` : '',
           sourceSessionId: ctx.sessionId ?? 'unknown',
           sourceMessageId: ctx.userMessageId ?? 'unknown',
           sensitivity,

package/src/tools/memory/policy.js

@@ -25,9 +25,24 @@ export function requireCurrentEvidence(ctx, evidenceQuote) {
         ? null
         : {
             ok: false,
-            error: 'evidenceQuote 不是当前用户消息的逐字片段，拒绝写入推断性记忆',
+            error: 'evidenceQuote 不是当前用户消息的逐字片段，未写入。不要改写或伪造引用重试：用户事实可用 UpdateMemory(action=confirm) 请求确认，或 action=review 标记待复核；项目知识/经验使用 MemoryMaintenance，不把工具证据当用户原话。',
         };
 }
+export async function confirmMemoryCorrection(subject, previous, proposed, reason, signal) {
+    if (!hasAskHandler())
+        return false;
+    signal?.throwIfAborted();
+    const [answer] = await requestUserChoice([{
+            header: '纠正记忆',
+            question: `是否更新“${subject}”？\n原记录：${previous}\n拟更新为：${proposed}\n纠正依据：${reason}`,
+            options: [
+                { label: '暂不更新', description: '保留原记录，不把建议视为事实。' },
+                { label: '确认更新', description: '确认拟更新内容准确，并保存为本机长期记忆。' },
+            ],
+        }], signal);
+    signal?.throwIfAborted();
+    return answer?.selected.length === 1 && answer.selected[0] === '确认更新';
+}
 export async function confirmSensitiveMemory(statement, sensitivity, signal) {
     if (sensitivity === 'normal')
         return 'user_stated';

package/src/tools/memory/policy.ts

@@ -38,10 +38,25 @@ export function requireCurrentEvidence(
     ? null
     : {
         ok: false,
-        error: 'evidenceQuote 不是当前用户消息的逐字片段，拒绝写入推断性记忆',
+        error: 'evidenceQuote 不是当前用户消息的逐字片段，未写入。不要改写或伪造引用重试：用户事实可用 UpdateMemory(action=confirm) 请求确认，或 action=review 标记待复核；项目知识/经验使用 MemoryMaintenance，不把工具证据当用户原话。',
       };
 }
 
+export async function confirmMemoryCorrection(subject: string, previous: string, proposed: string, reason: string, signal?: AbortSignal): Promise<boolean> {
+  if (!hasAskHandler()) return false;
+  signal?.throwIfAborted();
+  const [answer] = await requestUserChoice([{
+    header: '纠正记忆',
+    question: `是否更新“${subject}”？\n原记录：${previous}\n拟更新为：${proposed}\n纠正依据：${reason}`,
+    options: [
+      { label: '暂不更新', description: '保留原记录，不把建议视为事实。' },
+      { label: '确认更新', description: '确认拟更新内容准确，并保存为本机长期记忆。' },
+    ],
+  }], signal);
+  signal?.throwIfAborted();
+  return answer?.selected.length === 1 && answer.selected[0] === '确认更新';
+}
+
 export async function confirmSensitiveMemory(
   statement: string,
   sensitivity: 'normal' | 'sensitive',

package/src/tools/skill/searchSkills.js

@@ -24,7 +24,7 @@ export const searchSkillsTool = {
     }),
     callWithContext: async (input, signal, ctx) => {
         signal?.throwIfAborted();
-        const skills = visibleSkills(await discoverSkills(ctx.cwd, ctx));
+        const skills = visibleSkills(await discoverSkills(ctx.cwd, ctx), ctx.availableToolNames?.());
         signal?.throwIfAborted();
         const terms = (input.query ?? '')
             .toLocaleLowerCase()
@@ -48,7 +48,7 @@ export const searchSkillsTool = {
                 total: ranked.length,
                 nextOffset: offset + page.length < ranked.length ? offset + page.length : null,
                 skills: page.map(({ skill }) => skill),
-                note: '这是已安装目录，不表示依赖工具已启用。同名项用 sourceId 精确加载；未找到可换关键词，仅加载当前阶段相关技能。',
+                note: '宿主提供有效工具集合时已按依赖筛选；目录不授予执行权限。同名项用 sourceId 精确加载，仅加载当前阶段相关技能。',
             }),
         };
     },

package/src/tools/skill/searchSkills.ts

@@ -28,7 +28,7 @@ export const searchSkillsTool: Tool<z.infer<typeof schema>> = {
   }),
   callWithContext: async (input, signal, ctx) => {
     signal?.throwIfAborted();
-    const skills = visibleSkills(await discoverSkills(ctx.cwd, ctx));
+    const skills = visibleSkills(await discoverSkills(ctx.cwd, ctx), ctx.availableToolNames?.());
     signal?.throwIfAborted();
     const terms = (input.query ?? '')
       .toLocaleLowerCase()
@@ -58,7 +58,7 @@ export const searchSkillsTool: Tool<z.infer<typeof schema>> = {
         nextOffset:
           offset + page.length < ranked.length ? offset + page.length : null,
         skills: page.map(({ skill }) => skill),
-        note: '这是已安装目录，不表示依赖工具已启用。同名项用 sourceId 精确加载；未找到可换关键词，仅加载当前阶段相关技能。',
+        note: '宿主提供有效工具集合时已按依赖筛选；目录不授予执行权限。同名项用 sourceId 精确加载，仅加载当前阶段相关技能。',
       }),
     };
   },

package/src/tools/skill/skill.js

@@ -27,6 +27,10 @@ async function call(input, context) {
             ok: false,
             error: `Skill 名称有歧义：${input.name}。请选择 sourceId 后重试。\n${JSON.stringify(found.map(({ sourceId, sourceDir }) => ({ sourceId, sourceDir })))}`,
         };
+    const available = context.availableToolNames?.();
+    const missing = available && found[0].requiresTools?.filter(name => !available.has(name));
+    if (missing?.length)
+        return { ok: false, error: `Skill ${input.name} 当前缺少工具：${missing.join(', ')}。不能通过技能扩大执行权限。` };
     // Search roots are ordered: project skill intentionally overrides the bundled skill.
     const path = join(found[0].sourceDir, 'SKILL.md');
     const content = await readFile(path);

package/src/tools/skill/skill.ts

@@ -42,6 +42,9 @@ async function call(
       ok: false,
       error: `Skill 名称有歧义：${input.name}。请选择 sourceId 后重试。\n${JSON.stringify(found.map(({ sourceId, sourceDir }) => ({ sourceId, sourceDir })))}`,
     };
+  const available = context.availableToolNames?.();
+  const missing = available && found[0]!.requiresTools?.filter(name => !available.has(name));
+  if (missing?.length) return { ok: false, error: `Skill ${input.name} 当前缺少工具：${missing.join(', ')}。不能通过技能扩大执行权限。` };
   // Search roots are ordered: project skill intentionally overrides the bundled skill.
   const path = join(found[0]!.sourceDir, 'SKILL.md');
   const content = await readFile(path);

package/src/tools/toolPromptGuides.js

@@ -1,3 +1,4 @@
+import { AGENT_TOOL_DESCRIPTION } from '../prompts/delegation.js';
 import { bashShellNotice } from './bash/bash.js';
 import { COMPUTER_USE_TOOL_ACTIONS } from './computeruse/protocol.js';
 export const TOOL_CATEGORY_LABELS = {
@@ -42,7 +43,7 @@ export const BUILTIN_TOOL_PROMPT_GUIDES = {
     BrowserCDP: g('web', '需要现有浏览器工具未覆盖的原始 CDP 能力', '发送精确方法并按事件序列读取结果', '常规网页自动化优先 WebBrowser/BrowserBatch', 'last-resort'),
     Download: g('web', '把已知 URL 的原始资源保存到本机', '给出目标路径并校验下载结果', '只阅读正文时用 WebFetch'),
     ComputerUse: g('desktop', '用户明确要求观察或操作原生应用、系统窗口或桌面界面', '观察当前界面，执行一个动作，再验证结果', '文件、静态图片、Shell 和网页任务优先专用工具', 'last-resort'),
-    Agent: g('agents', '派生独立且边界清晰的子任务', '给出自包含任务书并在返回后核验整合', '不要拆分琐碎或强顺序工作'),
+    Agent: g('agents', '大型多模块调查优先委派独立只读问题', '先定位入口，再同轮派发 explore，核验整合证据', '少量已知文件或强顺序工作直接处理'),
     AgentMessage: g('agents', '向运行中的子 Agent 补充非触发消息', '按稳定 agent id 发送必要上下文', '需要追加新工作使用 AgentFollowup'),
     AgentList: g('agents', '查看子 Agent 状态和稳定 ID', '按任务路径列出后选择目标', '已知目标 ID 时无需调用'),
     AgentWait: g('agents', '等待指定子 Agent 进展或结果', '优先长等待，收到更新后再整合', '忙轮询'),
@@ -58,7 +59,7 @@ export const BUILTIN_TOOL_PROMPT_GUIDES = {
     RecallMemory: g('memory', '当前回答依赖跨会话稳定偏好、决定或背景', '按主题召回并核对证据', '当前消息已足够时不要装饰性召回'),
     MemoryMaintenance: g('memory', '处理学习队列、项目事实冲突及经验反馈', 'status 定位；summaries 按 query 找近期任务线索、按 turnId 查证据；resolve/resolveKnowledge 结清候选；明确跨项目适用条件后 promoteExperience/promoteKnowledge；adopt 后 feedback', '召回不算使用；失败摘要不是已确认事实；不每轮调用'),
     RememberMemory: g('memory', '用户明确要求记住长期有效事实、偏好或决定', '保存原话证据和适用范围', '普通陈述交由已启用的后台提炼，不重复保存'),
-    UpdateMemory: g('memory', '当前用户陈述纠正一条已有记忆', '先 Recall 定位版本，再完整替换', '不要创建冲突副本'),
+    UpdateMemory: g('memory', '纠正用户事实', '读版本后 update/review/confirm', '项目知识/经验走 MemoryMaintenance'),
     ListMemories: g('memory', '用户要查看已保存记忆或需要管理总览', '按范围列出后再决定操作', '正常任务无需全量列出'),
     ForgetMemory: g('memory', '用户明确要求忘记某条记忆', '定位准确 ID 后删除', '不得主动清理'),
     SetPersona: g('memory', '用户明确要求改变长期角色或协作风格', '写入清晰、稳定的人格要求', '一次性语气请求不要持久化'),
@@ -117,7 +118,7 @@ export const CONTRACT_DESCRIPTION_OVERRIDES = {
     WebSearch: 'Tavily 搜索返回标题、URL、片段及可选综合答案，不是完整原文或浏览器。重要结论读取来源正文；按子问题查询，重试改变关键词或来源。recency 控制时效，历史范围用 start_date/end_date，none 关闭自动时效；advanced 更慢，news 偏新闻。需配置 Tavily。',
     PowerShell: '运行宿主 PowerShell 独立进程并检查结果；长任务用 TaskOutput/TaskStop。永久删除用 Trash；不可逆操作先确认，非交互时取消。',
     Download: '下载 HTTP(S) 原始字节到指定路径；相对路径基于工作目录，会覆盖已有文件；失败或中断不保留部分下载。',
-    Agent: '启动隔离上下文子任务并返回 agent_id。explore 只读，general 按 write_scopes 或 worktree 执行。run_in_background 立即返回；resume_agent_id 续接私有历史。context.researchQuestions 定义问题契约，AgentReport.findings 按 ID 回传证据结论；reportMaxChars 限制返回预览，完整交接可由 TaskOutput 获取。',
+    Agent: AGENT_TOOL_DESCRIPTION,
     EnterWorktree: '从已提交 HEAD 创建并进入隔离工作树，不自动复制原工作区未提交修改；后续文件工具使用隔离目录，项目记忆仍属于原工作区。',
     ExitWorktree: '退出隔离工作树：apply 检查并应用补丁到原工作区但不自动提交；keep 保留；discard 有改动则归档保留。实际应用成功后的清理告警不表示应重新应用。',
 };

package/src/tools/toolPromptGuides.ts

@@ -1,4 +1,5 @@
 import type { Tool, ToolCategory, ToolPromptGuide } from '../types.js';
+import { AGENT_TOOL_DESCRIPTION } from '../prompts/delegation.js';
 import { bashShellNotice } from './bash/bash.js';
 import { COMPUTER_USE_TOOL_ACTIONS } from './computeruse/protocol.js';
 
@@ -56,7 +57,7 @@ export const BUILTIN_TOOL_PROMPT_GUIDES: Readonly<Record<string, ToolPromptGuide
 
   ComputerUse: g('desktop', '用户明确要求观察或操作原生应用、系统窗口或桌面界面', '观察当前界面，执行一个动作，再验证结果', '文件、静态图片、Shell 和网页任务优先专用工具', 'last-resort'),
 
-  Agent: g('agents', '派生独立且边界清晰的子任务', '给出自包含任务书并在返回后核验整合', '不要拆分琐碎或强顺序工作'),
+  Agent: g('agents', '大型多模块调查优先委派独立只读问题', '先定位入口，再同轮派发 explore，核验整合证据', '少量已知文件或强顺序工作直接处理'),
   AgentMessage: g('agents', '向运行中的子 Agent 补充非触发消息', '按稳定 agent id 发送必要上下文', '需要追加新工作使用 AgentFollowup'),
   AgentList: g('agents', '查看子 Agent 状态和稳定 ID', '按任务路径列出后选择目标', '已知目标 ID 时无需调用'),
   AgentWait: g('agents', '等待指定子 Agent 进展或结果', '优先长等待，收到更新后再整合', '忙轮询'),
@@ -73,7 +74,7 @@ export const BUILTIN_TOOL_PROMPT_GUIDES: Readonly<Record<string, ToolPromptGuide
   RecallMemory: g('memory', '当前回答依赖跨会话稳定偏好、决定或背景', '按主题召回并核对证据', '当前消息已足够时不要装饰性召回'),
   MemoryMaintenance: g('memory', '处理学习队列、项目事实冲突及经验反馈', 'status 定位；summaries 按 query 找近期任务线索、按 turnId 查证据；resolve/resolveKnowledge 结清候选；明确跨项目适用条件后 promoteExperience/promoteKnowledge；adopt 后 feedback', '召回不算使用；失败摘要不是已确认事实；不每轮调用'),
   RememberMemory: g('memory', '用户明确要求记住长期有效事实、偏好或决定', '保存原话证据和适用范围', '普通陈述交由已启用的后台提炼，不重复保存'),
-  UpdateMemory: g('memory', '当前用户陈述纠正一条已有记忆', '先 Recall 定位版本，再完整替换', '不要创建冲突副本'),
+  UpdateMemory: g('memory', '纠正用户事实', '读版本后 update/review/confirm', '项目知识/经验走 MemoryMaintenance'),
   ListMemories: g('memory', '用户要查看已保存记忆或需要管理总览', '按范围列出后再决定操作', '正常任务无需全量列出'),
   ForgetMemory: g('memory', '用户明确要求忘记某条记忆', '定位准确 ID 后删除', '不得主动清理'),
   SetPersona: g('memory', '用户明确要求改变长期角色或协作风格', '写入清晰、稳定的人格要求', '一次性语气请求不要持久化'),
@@ -135,7 +136,7 @@ export const CONTRACT_DESCRIPTION_OVERRIDES: Readonly<Record<string, string | ((
   WebSearch: 'Tavily 搜索返回标题、URL、片段及可选综合答案，不是完整原文或浏览器。重要结论读取来源正文；按子问题查询，重试改变关键词或来源。recency 控制时效，历史范围用 start_date/end_date，none 关闭自动时效；advanced 更慢，news 偏新闻。需配置 Tavily。',
   PowerShell: '运行宿主 PowerShell 独立进程并检查结果；长任务用 TaskOutput/TaskStop。永久删除用 Trash；不可逆操作先确认，非交互时取消。',
   Download: '下载 HTTP(S) 原始字节到指定路径；相对路径基于工作目录，会覆盖已有文件；失败或中断不保留部分下载。',
-  Agent: '启动隔离上下文子任务并返回 agent_id。explore 只读，general 按 write_scopes 或 worktree 执行。run_in_background 立即返回；resume_agent_id 续接私有历史。context.researchQuestions 定义问题契约，AgentReport.findings 按 ID 回传证据结论；reportMaxChars 限制返回预览，完整交接可由 TaskOutput 获取。',
+  Agent: AGENT_TOOL_DESCRIPTION,
   EnterWorktree: '从已提交 HEAD 创建并进入隔离工作树，不自动复制原工作区未提交修改；后续文件工具使用隔离目录，项目记忆仍属于原工作区。',
   ExitWorktree: '退出隔离工作树：apply 检查并应用补丁到原工作区但不自动提交；keep 保留；discard 有改动则归档保留。实际应用成功后的清理告警不表示应重新应用。',
 };

package/src/types.ts

@@ -570,6 +570,10 @@ export type ToolResult = { problem?: ToolProblemOutcome; observation?: ReadObser
  * 避免按工具名写特判分支。
  */
 export interface ToolCallContext {
+  /** Host presentation only; cannot grant tools to a delegated agent. */
+  output?: import('./runtime/outputContract.js').OutputContract;
+  /** Live effective catalog, including per-turn restrictions. */
+  availableToolNames?: () => ReadonlySet<string>;
   messageProvenance?: ConversationProvenance;
   agentHandoff?: {
     questionIds?: readonly string[];

package/src/web/protocol.ts

@@ -292,6 +292,7 @@ export interface SkillInfo {
   name: string;
   description: string;
   source?: 'builtin' | 'workspace';
+  unavailableReason?: string;
 }
 
 export type ApiFormat = 'openai' | 'anthropic';
@@ -2195,6 +2196,7 @@ export type ClientFrame =
   | { t: 'answer'; requestId: string; answers: AskAnswer[] }
   | { t: 'cancelAsk'; requestId: string }
   | { t: 'abort' }
+  | { t: 'compact/abort'; requestId: string }
   | { t: 'new'; dir: string; sessionId?: string }
   | { t: 'compact'; dir: string; sessionId?: string; requestId?: string }
   | { t: 'listDirs' }
@@ -3060,7 +3062,7 @@ export type ServerFrame =
       ok: boolean;
       message: string;
     }
-  | { t: 'skills'; skills: SkillInfo[] }
+  | { t: 'skills'; skills: SkillInfo[]; dir?: string | null }
   | { t: 'server_error'; message: string }
   | { t: 'resource/crons/list'; tasks: CronTaskWithRuns[]; missedCount: number }
   | { t: 'resource/crons/draft'; draft: CronDraftResult }