minimal-agent 0.18.7 → 0.18.8

package/src/tools/agent/agent.js

@@ -128,10 +128,10 @@ const SUBAGENT_COMMON_APPENDIX = `# 你是子 agent（fork 分身）
  */
 const PROMPT_CACHE_TTL_MS = 60_000;
 const promptCache = new Map();
-async function buildSubSystemPrompt(cwd, def, allTools, conversationMode = 'private') {
+async function buildSubSystemPrompt(cwd, def, allTools, conversationMode = 'private', output) {
     // Effective capabilities are part of prompt identity; a child must never
     // reuse a cached parent-capability prompt (notably Desktop WebBrowser).
-    const key = `${cwd}::${def.type}::${conversationMode}::${allTools.map((tool) => tool.name).join(',')}`;
+    const key = `${cwd}::${def.type}::${conversationMode}::${JSON.stringify(output ?? null)}::${allTools.map((tool) => tool.name).join(',')}`;
     const hit = promptCache.get(key);
     if (hit && Date.now() - hit.at < PROMPT_CACHE_TTL_MS)
         return hit.value;
@@ -143,7 +143,7 @@ async function buildSubSystemPrompt(cwd, def, allTools, conversationMode = 'priv
         profile: def.type === 'general' ? 'subagent-general' : 'subagent-explore',
         includeProjectInstructions: true, // 子 agent 在同一仓库干活，项目约定必须继承
         includePlugins: false, // 插件是宿主命令面，子 agent 不该被引去激活插件
-        runtime: { conversationMode },
+        runtime: { conversationMode, output },
     });
     const value = [base, SUBAGENT_COMMON_APPENDIX, def.promptAppendix].join('\n\n');
     promptCache.set(key, { value, at: Date.now() });
@@ -298,6 +298,7 @@ async function runAgentTaskImpl(input, signal, ctx, deps = {}) {
         ? 'denied'
         : 'read-only';
     const childRuntime = createAgentRuntimeContext({
+        output: ctx.output,
         surface: 'subagent',
         profile: def.type === 'general' ? 'subagent-general' : 'subagent-explore',
         conversationMode: ctx.conversationMode,
@@ -318,6 +319,7 @@ async function runAgentTaskImpl(input, signal, ctx, deps = {}) {
         includeProjectInstructions: true,
         includePlugins: false,
         runtime: {
+            output: childRuntime.output,
             surface: 'subagent',
             conversationMode: ctx.conversationMode,
             cwd,
@@ -341,10 +343,10 @@ async function runAgentTaskImpl(input, signal, ctx, deps = {}) {
     };
     // ---- 子 history：一条 system（压缩按 role 定位，必须存在）+ runQuery 自己 push 任务书 ----
     const history = deps.initialHistory?.length ? [...deps.initialHistory] : [
-        { role: 'system', content: await buildSubSystemPrompt(cwd, def, subTools, ctx.conversationMode) },
+        { role: 'system', content: await buildSubSystemPrompt(cwd, def, subTools, ctx.conversationMode, childRuntime.output) },
     ];
     if (deps.initialHistory?.length) {
-        const system = await buildSubSystemPrompt(cwd, def, subTools, ctx.conversationMode);
+        const system = await buildSubSystemPrompt(cwd, def, subTools, ctx.conversationMode, childRuntime.output);
         const index = history.findIndex((message) => message.role === 'system');
         if (index >= 0)
             history[index] = { role: 'system', content: system };

package/src/tools/agent/agent.ts

@@ -183,10 +183,11 @@ async function buildSubSystemPrompt(
   def: AgentTypeDef,
   allTools: Tool[],
   conversationMode: ToolCallContext['conversationMode'] = 'private',
+  output?: ToolCallContext['output'],
 ): Promise<string> {
   // Effective capabilities are part of prompt identity; a child must never
   // reuse a cached parent-capability prompt (notably Desktop WebBrowser).
-  const key = `${cwd}::${def.type}::${conversationMode}::${allTools.map((tool) => tool.name).join(',')}`;
+  const key = `${cwd}::${def.type}::${conversationMode}::${JSON.stringify(output ?? null)}::${allTools.map((tool) => tool.name).join(',')}`;
   const hit = promptCache.get(key);
   if (hit && Date.now() - hit.at < PROMPT_CACHE_TTL_MS) return hit.value;
 
@@ -198,7 +199,7 @@ async function buildSubSystemPrompt(
     profile: def.type === 'general' ? 'subagent-general' : 'subagent-explore',
     includeProjectInstructions: true, // 子 agent 在同一仓库干活，项目约定必须继承
     includePlugins: false, // 插件是宿主命令面，子 agent 不该被引去激活插件
-    runtime: { conversationMode },
+    runtime: { conversationMode, output },
   });
   const value = [base, SUBAGENT_COMMON_APPENDIX, def.promptAppendix].join('\n\n');
   promptCache.set(key, { value, at: Date.now() });
@@ -374,6 +375,7 @@ async function runAgentTaskImpl(
     ? 'denied'
     : 'read-only';
   const childRuntime = createAgentRuntimeContext({
+    output: ctx.output,
     surface: 'subagent',
     profile: def.type === 'general' ? 'subagent-general' : 'subagent-explore',
     conversationMode: ctx.conversationMode,
@@ -397,6 +399,7 @@ async function runAgentTaskImpl(
     includeProjectInstructions: true,
     includePlugins: false,
     runtime: {
+      output: childRuntime.output,
       surface: 'subagent',
       conversationMode: ctx.conversationMode,
       cwd,
@@ -421,10 +424,10 @@ async function runAgentTaskImpl(
 
   // ---- 子 history：一条 system（压缩按 role 定位，必须存在）+ runQuery 自己 push 任务书 ----
   const history: RunQueryOptions['history'] = deps.initialHistory?.length ? [...deps.initialHistory] : [
-    { role: 'system', content: await buildSubSystemPrompt(cwd, def, subTools, ctx.conversationMode) },
+    { role: 'system', content: await buildSubSystemPrompt(cwd, def, subTools, ctx.conversationMode, childRuntime.output) },
   ];
   if (deps.initialHistory?.length) {
-    const system = await buildSubSystemPrompt(cwd, def, subTools, ctx.conversationMode);
+    const system = await buildSubSystemPrompt(cwd, def, subTools, ctx.conversationMode, childRuntime.output);
     const index = history.findIndex((message) => message.role === 'system');
     if (index >= 0) history[index] = { role: 'system', content: system };
     else history.unshift({ role: 'system', content: system });

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/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 }