minimal-agent 0.11.0 → 0.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minimal-agent",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "Bun-first 的本地 Agent 内核，支持工具、插件、工作流、上下文压缩、长期记忆与 OpenAI 兼容接口；Tauri 桌面宿主和 Node.js npm 发布可复用同一内核",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Bill Wang <leiwang0359@gmail.com>",
@@ -131,9 +131,11 @@
     "prepublishOnly": "bun run clean && bun run build"
   },
   "dependencies": {
+    "diff": "^8.0.2",
     "fast-glob": "^3.3.2",
     "ink": "^5.0.1",
     "marked": "^18.0.6",
+    "pdfjs-dist": "4.10.38",
     "react": "^18.3.1",
     "turndown": "^7.2.4",
     "vscode-jsonrpc": "^8.2.1",
@@ -148,6 +150,7 @@
     "typescript": "^5.5.0"
   },
   "optionalDependencies": {
+    "@napi-rs/canvas": "^0.1.100",
     "playwright-core": "^1.40.0",
     "pngjs": "^7.0.0",
     "pptxgenjs": "^4.0.1"

package/plugins/workflow-runner/plugin.js

@@ -12,7 +12,7 @@
  *  缓存这次 import，所以 cold start 后 dynamic import 只跑一次。
  * ============================================================
  */
-import { ALL_TOOLS, derivePromptCacheContext, getWorkingDir, createAgentRuntimeContext, filterToolsForRuntime, buildTransientPromptBundle, } from '../../src/plugin-sdk.js';
+import { ALL_TOOLS, buildTransientPromptBundle, createAgentRuntimeContext, derivePromptCacheContext, filterToolsForRuntime, getWorkingDir, } from '../../src/plugin-sdk.js';
 import { runWorkflowFromCommand, runWorkflowsList } from './src/index.js';
 const api = {
     async *runCommand(commandName, args, ctx) {
@@ -43,21 +43,22 @@ const api = {
                 ? ALL_TOOLS.filter((tool) => hostToolNames.has(tool.name))
                 : ALL_TOOLS;
             const workflowTools = filterToolsForRuntime(hostTools, workflowRuntime);
-            const transientBundle = ctx.transientBundle ?? await buildTransientPromptBundle({
-                cwd,
-                tools: workflowTools,
-                profile: 'main',
-                includeProjectInstructions: true,
-                includePlugins: true,
-                runtime: {
-                    surface: 'workflow',
+            const transientBundle = ctx.transientBundle ??
+                (await buildTransientPromptBundle({
                     cwd,
-                    workspaceId: workflowRuntime.workspaceId,
-                    interactiveAsk: workflowRuntime.interactiveAsk,
-                    memoryAccess: workflowRuntime.memoryAccess,
-                    currentUserInput: args,
-                },
-            }).catch(() => undefined);
+                    tools: workflowTools,
+                    profile: 'main',
+                    includeProjectInstructions: true,
+                    includePlugins: true,
+                    runtime: {
+                        surface: 'workflow',
+                        cwd,
+                        workspaceId: workflowRuntime.workspaceId,
+                        interactiveAsk: workflowRuntime.interactiveAsk,
+                        memoryAccess: workflowRuntime.memoryAccess,
+                        currentUserInput: args,
+                    },
+                }).catch(() => undefined));
             yield* runWorkflowFromCommand(args, {
                 provider: ctx.provider,
                 history: ctx.history,
@@ -66,6 +67,17 @@ const api = {
                 cwd,
                 tools: workflowTools,
                 runtimeContext: workflowRuntime,
+                executeTool: ctx.executeTool,
+                toolContext: {
+                    history: ctx.history,
+                    sessionState: ctx.sessionState,
+                    provider: ctx.provider,
+                    toolGate: ctx.host?.toolGate,
+                    promptCache: ctx.promptCache,
+                    workspaceId: workflowRuntime.workspaceId,
+                    sessionId: workflowRuntime.sessionId,
+                    memoryAccess: workflowRuntime.memoryAccess,
+                },
                 // 宿主授权上下文原样带上；引擎按各步 `uses:` 切片后才转给工具，不整份下发。
                 host: ctx.host,
                 transientContext: ctx.transientContext,

package/plugins/workflow-runner/plugin.ts

@@ -16,11 +16,11 @@
 import type { PluginApi } from '../../src/plugin-sdk.js';
 import {
   ALL_TOOLS,
-  derivePromptCacheContext,
-  getWorkingDir,
+  buildTransientPromptBundle,
   createAgentRuntimeContext,
+  derivePromptCacheContext,
   filterToolsForRuntime,
-  buildTransientPromptBundle,
+  getWorkingDir,
 } from '../../src/plugin-sdk.js';
 import { runWorkflowFromCommand, runWorkflowsList } from './src/index.js';
 
@@ -43,9 +43,10 @@ const api: PluginApi = {
         cwd,
         surface: 'workflow',
         owner: ctx.runtimeContext?.owner ?? 'untrusted',
-        memoryAccess: ctx.runtimeContext?.memoryAccess === 'denied'
-          ? 'denied'
-          : 'read-only',
+        memoryAccess:
+          ctx.runtimeContext?.memoryAccess === 'denied'
+            ? 'denied'
+            : 'read-only',
       });
       const hostToolNames = ctx.allowedTools
         ? new Set(ctx.allowedTools)
@@ -54,21 +55,23 @@ const api: PluginApi = {
         ? ALL_TOOLS.filter((tool) => hostToolNames.has(tool.name))
         : ALL_TOOLS;
       const workflowTools = filterToolsForRuntime(hostTools, workflowRuntime);
-      const transientBundle = ctx.transientBundle ?? await buildTransientPromptBundle({
-        cwd,
-        tools: workflowTools,
-        profile: 'main',
-        includeProjectInstructions: true,
-        includePlugins: true,
-        runtime: {
-          surface: 'workflow',
+      const transientBundle =
+        ctx.transientBundle ??
+        (await buildTransientPromptBundle({
           cwd,
-          workspaceId: workflowRuntime.workspaceId,
-          interactiveAsk: workflowRuntime.interactiveAsk,
-          memoryAccess: workflowRuntime.memoryAccess,
-          currentUserInput: args,
-        },
-      }).catch(() => undefined);
+          tools: workflowTools,
+          profile: 'main',
+          includeProjectInstructions: true,
+          includePlugins: true,
+          runtime: {
+            surface: 'workflow',
+            cwd,
+            workspaceId: workflowRuntime.workspaceId,
+            interactiveAsk: workflowRuntime.interactiveAsk,
+            memoryAccess: workflowRuntime.memoryAccess,
+            currentUserInput: args,
+          },
+        }).catch(() => undefined));
       yield* runWorkflowFromCommand(args, {
         provider: ctx.provider,
         history: ctx.history,
@@ -77,6 +80,17 @@ const api: PluginApi = {
         cwd,
         tools: workflowTools,
         runtimeContext: workflowRuntime,
+        executeTool: ctx.executeTool,
+        toolContext: {
+          history: ctx.history,
+          sessionState: ctx.sessionState,
+          provider: ctx.provider,
+          toolGate: ctx.host?.toolGate,
+          promptCache: ctx.promptCache,
+          workspaceId: workflowRuntime.workspaceId,
+          sessionId: workflowRuntime.sessionId,
+          memoryAccess: workflowRuntime.memoryAccess,
+        },
         // 宿主授权上下文原样带上；引擎按各步 `uses:` 切片后才转给工具，不整份下发。
         host: ctx.host,
         transientContext: ctx.transientContext,

package/plugins/workflow-runner/src/agentCommon.js

@@ -19,7 +19,8 @@
  *       ③ 检测逻辑增加内容长度启发式（reason > 80 字符视为误报）
  * ============================================================
  */
-import { runQuery, createAgentRuntimeContext, stripThinkBlocks, } from '../../../src/plugin-sdk.js';
+import { createAgentRuntimeContext, runQuery, stripThinkBlocks, } from '../../../src/plugin-sdk.js';
+import { effectiveWorkflowCwd } from './toolRuntime.js';
 import { normalizeCapture, } from './types.js';
 /**
  * agent 显式放弃的唯一标记；recover 与 agent 节点共用。
@@ -59,7 +60,9 @@ export function effectiveGoalAnchor(ctx) {
     if (supps.length === 0)
         return base;
     const lines = supps.map((s) => `> 📌 用户补充要求：${s}`).join('\n');
-    return base ? `${base}\n${lines}` : `${lines}\n> ⚠️ 以上补充要求与原始目标同等约束所有操作。`;
+    return base
+        ? `${base}\n${lines}`
+        : `${lines}\n> ⚠️ 以上补充要求与原始目标同等约束所有操作。`;
 }
 /** 把 llm_error 细节拼进可重试失败的抛错文案（无细节时退化为原样文案）。 */
 export function describeLlmFailure(stepId, detail) {
@@ -96,14 +99,10 @@ function createStepHistory(step, ctx) {
 export async function* runStepQuery(prompt, step, ctx, opts) {
     const activeHistory = createStepHistory(step, ctx);
     const availableTools = ctx.tools ?? [];
-    const hostToolNames = availableTools.length > 0
-        ? new Set(availableTools.map((tool) => tool.name))
-        : null;
-    const effectiveStepTools = hostToolNames === null
-        ? step.allowed_tools
-        : step.allowed_tools === undefined
-            ? [...hostToolNames]
-            : step.allowed_tools.filter((name) => hostToolNames.has(name));
+    const hostToolNames = new Set(availableTools.map((tool) => tool.name));
+    const effectiveStepTools = step.allowed_tools === undefined
+        ? [...hostToolNames]
+        : step.allowed_tools.filter((name) => hostToolNames.has(name));
     // 记录 runQuery 开始前的 history 长度，用于之后提取本步的 assistant 输出
     const historyLenBefore = activeHistory.length;
     const runtimeContext = createAgentRuntimeContext({
@@ -112,7 +111,7 @@ export async function* runStepQuery(prompt, step, ctx, opts) {
             profile: 'main',
             interactiveAsk: false,
         }),
-        cwd: ctx.cwd,
+        cwd: effectiveWorkflowCwd(ctx),
         owner: ctx.runtimeContext?.owner ?? 'untrusted',
         memoryAccess: ctx.runtimeContext?.memoryAccess ?? 'denied',
     });
@@ -283,7 +282,9 @@ function isLikelyFalsePositive(reason) {
     if (reason.length > 80)
         return true;
     // 如果 reason 看起来像 markdown 正文（标题/章节），也是误报
-    if (/^#{1,6}\s/m.test(reason) || /^[-*+]\s/m.test(reason) || /^\d+\.\s/m.test(reason)) {
+    if (/^#{1,6}\s/m.test(reason) ||
+        /^[-*+]\s/m.test(reason) ||
+        /^\d+\.\s/m.test(reason)) {
         return true;
     }
     return false;

package/plugins/workflow-runner/src/agentCommon.ts

@@ -25,10 +25,11 @@ import {
   type ImageInputSpec,
   type LoopEvent,
   type Message,
-  runQuery,
   createAgentRuntimeContext,
+  runQuery,
   stripThinkBlocks,
 } from '../../../src/plugin-sdk.js';
+import { effectiveWorkflowCwd } from './toolRuntime.js';
 import {
   type RunContext,
   type StepDef,
@@ -81,7 +82,9 @@ export function effectiveGoalAnchor(ctx: RunContext): string {
   const supps = (ctx.goalSupplements ?? []).filter((s) => s.trim());
   if (supps.length === 0) return base;
   const lines = supps.map((s) => `> 📌 用户补充要求：${s}`).join('\n');
-  return base ? `${base}\n${lines}` : `${lines}\n> ⚠️ 以上补充要求与原始目标同等约束所有操作。`;
+  return base
+    ? `${base}\n${lines}`
+    : `${lines}\n> ⚠️ 以上补充要求与原始目标同等约束所有操作。`;
 }
 
 /** runStepQuery 的归纳结果：本步产出文本 + 终结性错误旗标（语义判断留给各执行器）。 */
@@ -164,12 +167,9 @@ export async function* runStepQuery(
 ): AsyncGenerator<LoopEvent, StepQueryOutcome, void> {
   const activeHistory = createStepHistory(step, ctx);
   const availableTools = ctx.tools ?? [];
-  const hostToolNames = availableTools.length > 0
-    ? new Set(availableTools.map((tool) => tool.name))
-    : null;
-  const effectiveStepTools = hostToolNames === null
-    ? step.allowed_tools
-    : step.allowed_tools === undefined
+  const hostToolNames = new Set(availableTools.map((tool) => tool.name));
+  const effectiveStepTools =
+    step.allowed_tools === undefined
       ? [...hostToolNames]
       : step.allowed_tools.filter((name) => hostToolNames.has(name));
   // 记录 runQuery 开始前的 history 长度，用于之后提取本步的 assistant 输出
@@ -180,7 +180,7 @@ export async function* runStepQuery(
       profile: 'main' as const,
       interactiveAsk: false,
     }),
-    cwd: ctx.cwd,
+    cwd: effectiveWorkflowCwd(ctx),
     owner: ctx.runtimeContext?.owner ?? 'untrusted',
     memoryAccess: ctx.runtimeContext?.memoryAccess ?? 'denied',
   });
@@ -200,7 +200,8 @@ export async function* runStepQuery(
     signal: ctx.signal,
     maxTurns: opts.maxTurns,
     allowedTools: effectiveStepTools,
-    requiredTools: step.allowed_tools === undefined ? undefined : effectiveStepTools,
+    requiredTools:
+      step.allowed_tools === undefined ? undefined : effectiveStepTools,
     chat: ctx.chat,
     executeTool: ctx.executeTool,
     sessionState: ctx.sessionState,
@@ -296,7 +297,10 @@ export async function* runStepQuery(
 export const MAX_TURNS_CUTOFF_MARKER = '达到最大轮数';
 
 /** maxTurns 截断的可重试失败文案（重试 = 在共享 history 上续作，再给一份轮数预算）。 */
-export function describeMaxTurnsCutoff(stepId: string, maxTurns: number): string {
+export function describeMaxTurnsCutoff(
+  stepId: string,
+  maxTurns: number,
+): string {
   return `step ${stepId}: ${MAX_TURNS_CUTOFF_MARKER} ${maxTurns} 被截断（可续跑）`;
 }
 
@@ -351,7 +355,11 @@ export function parseGiveup(text: string): string | null {
 function isLikelyFalsePositive(reason: string): boolean {
   if (reason.length > 80) return true;
   // 如果 reason 看起来像 markdown 正文（标题/章节），也是误报
-  if (/^#{1,6}\s/m.test(reason) || /^[-*+]\s/m.test(reason) || /^\d+\.\s/m.test(reason)) {
+  if (
+    /^#{1,6}\s/m.test(reason) ||
+    /^[-*+]\s/m.test(reason) ||
+    /^\d+\.\s/m.test(reason)
+  ) {
     return true;
   }
   return false;
@@ -405,7 +413,8 @@ export function interpretMiniReActResult(
         ok: true,
         value: {
           raw,
-          preview: cleanText.length > 200 ? `${cleanText.slice(0, 200)}…` : cleanText,
+          preview:
+            cleanText.length > 200 ? `${cleanText.slice(0, 200)}…` : cleanText,
         },
       };
     }

package/plugins/workflow-runner/src/index.js

@@ -10,9 +10,9 @@
  *  不污染默认 T-A-O-R 路径。
  * ============================================================
  */
+import { buildBaseSystemPrompt, } from '../../../src/plugin-sdk.js';
 import { findWorkflowByName, listWorkflows } from './loader.js';
 import { runWorkflow } from './runner.js';
-import { buildBaseSystemPrompt, } from '../../../src/plugin-sdk.js';
 /**
  * 把 "/workflow <name> [pos1 pos2 ...] [--input k=v ...]" 拆成 name + 显式 inputs + 位置参数。
  * 简单解析器（不依赖第三方）：
@@ -103,7 +103,7 @@ function coerceInputs(raw, defs) {
             continue;
         }
         if (def.type === 'number') {
-            const n = parseFloat(rawVal);
+            const n = Number.parseFloat(rawVal);
             if (Number.isNaN(n))
                 throw new Error(`input ${def.name} 必须是数字，收到 "${rawVal}"`);
             out[def.name] = n;
@@ -229,6 +229,8 @@ export async function* runWorkflowFromCommand(rawArgs, opts) {
         transientContext: opts.transientContext,
         transientBundle: opts.transientBundle,
         promptCache: opts.promptCache,
+        executeTool: opts.executeTool,
+        toolContext: opts.toolContext,
     };
     // 透传 runWorkflow 的事件，并观察是否出现终结事件（error / interrupted = 失败或中断，
     // 与 gateway broker 的 TERMINAL 判定同一套逻辑）。成功（没见到终结事件）则在末尾补一条
@@ -265,6 +267,6 @@ export async function* runWorkflowsList() {
     lines.push('  /workflow <name> <val>            位置参数（按 inputs 声明顺序，第一个 input 直接写值）');
     lines.push('  /workflow <name>.yaml <val>       .yaml 后缀可省');
     lines.push('  /workflow <name> --input k=v      显式 KV（多 input 或想跳过中间 input 时用）');
-    yield { type: 'text', delta: lines.join('\n') + '\n' };
+    yield { type: 'text', delta: `${lines.join('\n')}\n` };
     yield { type: 'turn_done' };
 }

package/plugins/workflow-runner/src/index.ts

@@ -11,16 +11,17 @@
  * ============================================================
  */
 
-import { findWorkflowByName, listWorkflows } from './loader.js';
-import { runWorkflow } from './runner.js';
-import type { InputDef, RunContext, WorkflowEvent } from './types.js';
 import {
-  buildBaseSystemPrompt,
   type LoopEvent,
   type Message,
+  type PluginContext,
   type Provider,
   type Tool,
+  buildBaseSystemPrompt,
 } from '../../../src/plugin-sdk.js';
+import { findWorkflowByName, listWorkflows } from './loader.js';
+import { runWorkflow } from './runner.js';
+import type { InputDef, RunContext, WorkflowEvent } from './types.js';
 
 export interface RunWorkflowFromCommandOptions {
   provider: Provider;
@@ -31,11 +32,13 @@ export interface RunWorkflowFromCommandOptions {
   sessionState?: import('../../../src/plugin-sdk.js').SessionState;
   /** 当前工作目录（默认 process.cwd()） */
   cwd?: string;
-  /** 可用工具列表（默认空数组，由 runner 注入 ALL_TOOLS） */
+  /** 宿主过滤后的可用工具列表；缺省为空，绝不在 runner 内恢复全量工具。 */
   tools?: Tool[];
   transientContext?: string;
   transientBundle?: import('../../../src/plugin-sdk.js').ContextBundle;
   promptCache?: import('../../../src/plugin-sdk.js').PromptCacheContext;
+  executeTool?: PluginContext['executeTool'];
+  toolContext?: RunContext['toolContext'];
   /**
    * 宿主授权上下文（浏览器 / 电脑操控）。
    *
@@ -138,8 +141,9 @@ function coerceInputs(
       continue;
     }
     if (def.type === 'number') {
-      const n = parseFloat(rawVal);
-      if (Number.isNaN(n)) throw new Error(`input ${def.name} 必须是数字，收到 "${rawVal}"`);
+      const n = Number.parseFloat(rawVal);
+      if (Number.isNaN(n))
+        throw new Error(`input ${def.name} 必须是数字，收到 "${rawVal}"`);
       out[def.name] = n;
     } else if (def.type === 'enum') {
       if (!def.values?.includes(rawVal)) {
@@ -167,7 +171,9 @@ async function refreshWorkflowSystemPrompt(
   // 只刷稳定层：workflow 一跑就是几十步，system 消息若含日期/记忆等易变内容，
   // 每步都会重写 history[0]、把 provider 前缀缓存打散（见 prompts/system.ts）。
   const content = await buildBaseSystemPrompt(cwd, tools);
-  const systemIndex = history.findIndex((m) => m.role === 'system' && !m._ephemeral);
+  const systemIndex = history.findIndex(
+    (m) => m.role === 'system' && !m._ephemeral,
+  );
   const fresh: Message = { role: 'system', content };
 
   if (systemIndex === 0) {
@@ -278,6 +284,8 @@ export async function* runWorkflowFromCommand(
     transientContext: opts.transientContext,
     transientBundle: opts.transientBundle,
     promptCache: opts.promptCache,
+    executeTool: opts.executeTool,
+    toolContext: opts.toolContext,
   };
 
   // 透传 runWorkflow 的事件，并观察是否出现终结事件（error / interrupted = 失败或中断，
@@ -295,7 +303,11 @@ export async function* runWorkflowFromCommand(
 }
 
 /** /workflows —— 列出可用 workflow。yield 一条 text 事件让 UI 显示。 */
-export async function* runWorkflowsList(): AsyncGenerator<LoopEvent, void, void> {
+export async function* runWorkflowsList(): AsyncGenerator<
+  LoopEvent,
+  void,
+  void
+> {
   const list = await listWorkflows();
   if (list.length === 0) {
     yield {
@@ -308,13 +320,19 @@ export async function* runWorkflowsList(): AsyncGenerator<LoopEvent, void, void>
   }
   const lines = ['可用工作流：'];
   for (const w of list) {
-    lines.push(`  /workflow ${w.name}  —  ${w.description.split('\n')[0].trim()}`);
+    lines.push(
+      `  /workflow ${w.name}  —  ${w.description.split('\n')[0].trim()}`,
+    );
   }
   lines.push('');
   lines.push('运行示例:');
-  lines.push('  /workflow <name> <val>            位置参数（按 inputs 声明顺序，第一个 input 直接写值）');
+  lines.push(
+    '  /workflow <name> <val>            位置参数（按 inputs 声明顺序，第一个 input 直接写值）',
+  );
   lines.push('  /workflow <name>.yaml <val>       .yaml 后缀可省');
-  lines.push('  /workflow <name> --input k=v      显式 KV（多 input 或想跳过中间 input 时用）');
-  yield { type: 'text', delta: lines.join('\n') + '\n' };
+  lines.push(
+    '  /workflow <name> --input k=v      显式 KV（多 input 或想跳过中间 input 时用）',
+  );
+  yield { type: 'text', delta: `${lines.join('\n')}\n` };
   yield { type: 'turn_done' };
 }

package/plugins/workflow-runner/src/multimodal.js

@@ -1,5 +1,6 @@
 import { isAbsolute, resolve } from 'node:path';
 import { interpolate } from './expressions.js';
+import { effectiveWorkflowCwd } from './toolRuntime.js';
 export function resolveWorkflowMultimodalOptions(step, vars, ctx, onMissing) {
     const imageDetail = step.image_detail;
     const imageMaxLongSidePixel = step.image_max_long_side_pixel;
@@ -33,5 +34,5 @@ function resolveWorkflowImageSource(source, ctx) {
         isAbsolute(clean)) {
         return clean;
     }
-    return resolve(ctx.cwd, clean);
+    return resolve(effectiveWorkflowCwd(ctx), clean);
 }

package/plugins/workflow-runner/src/multimodal.ts

@@ -2,6 +2,7 @@ import { isAbsolute, resolve } from 'node:path';
 
 import type { ImageDetail, ImageInputSpec } from '../../../src/plugin-sdk.js';
 import { interpolate } from './expressions.js';
+import { effectiveWorkflowCwd } from './toolRuntime.js';
 import type { RunContext, StepDef, VarStack } from './types.js';
 
 export interface WorkflowMultimodalOptions {
@@ -59,5 +60,5 @@ function resolveWorkflowImageSource(source: string, ctx: RunContext): string {
   ) {
     return clean;
   }
-  return resolve(ctx.cwd, clean);
+  return resolve(effectiveWorkflowCwd(ctx), clean);
 }

package/plugins/workflow-runner/src/stepExecutors/skill.js

@@ -15,11 +15,12 @@
  *  capture：{ text: var_name } / { result: var_name }
  * ============================================================
  */
-import { readdir, readFile } from 'node:fs/promises';
+import { readFile, readdir } from 'node:fs/promises';
 import { join } from 'node:path';
-import { getResourceSearchPaths } from '../../../../src/plugin-sdk.js';
+import { getResourceSearchPaths, } from '../../../../src/plugin-sdk.js';
 import { describeLlmFailure, describeMaxTurnsCutoff, effectiveGoalAnchor, runStepQuery, } from '../agentCommon.js';
 import { interpolate } from '../expressions.js';
+import { effectiveWorkflowCwd } from '../toolRuntime.js';
 function stripFrontmatter(content) {
     return content.replace(/^---\n[\s\S]*?\n---\n?/, '');
 }
@@ -53,9 +54,7 @@ async function findSkillFile(skillName, cwd) {
                 if (parseFrontmatterName(md) === skillName)
                     return skillFile;
             }
-            catch {
-                continue;
-            }
+            catch { }
         }
     }
     return null;
@@ -64,7 +63,7 @@ export async function* execSkillStep(step, vars, ctx) {
     if (!step.skill)
         throw new Error(`step ${step.id}: 缺少 skill 字段`);
     const skillName = interpolate(step.skill, vars);
-    const skillFile = await findSkillFile(skillName, ctx.cwd);
+    const skillFile = await findSkillFile(skillName, effectiveWorkflowCwd(ctx));
     if (!skillFile) {
         throw new Error(`step ${step.id}: 未找到 skill "${skillName}"（cwd/skills/ 与 packageRoot/skills/ 双源均未命中）`);
     }

package/plugins/workflow-runner/src/stepExecutors/skill.ts

@@ -16,10 +16,13 @@
  * ============================================================
  */
 
-import { readdir, readFile } from 'node:fs/promises';
+import { readFile, readdir } from 'node:fs/promises';
 import { join } from 'node:path';
 
-import { getResourceSearchPaths, type LoopEvent } from '../../../../src/plugin-sdk.js';
+import {
+  type LoopEvent,
+  getResourceSearchPaths,
+} from '../../../../src/plugin-sdk.js';
 import {
   describeLlmFailure,
   describeMaxTurnsCutoff,
@@ -27,6 +30,7 @@ import {
   runStepQuery,
 } from '../agentCommon.js';
 import { interpolate } from '../expressions.js';
+import { effectiveWorkflowCwd } from '../toolRuntime.js';
 import type { RunContext, StepDef, StepResult, VarStack } from '../types.js';
 
 function stripFrontmatter(content: string): string {
@@ -41,7 +45,10 @@ function parseFrontmatterName(content: string): string | null {
   return nm[1].trim().replace(/^["']|["']$/g, '');
 }
 
-async function findSkillFile(skillName: string, cwd: string): Promise<string | null> {
+async function findSkillFile(
+  skillName: string,
+  cwd: string,
+): Promise<string | null> {
   const roots = getResourceSearchPaths('skills', import.meta.url, cwd);
 
   for (const root of roots) {
@@ -58,9 +65,7 @@ async function findSkillFile(skillName: string, cwd: string): Promise<string | n
       try {
         const md = await readFile(skillFile, 'utf8');
         if (parseFrontmatterName(md) === skillName) return skillFile;
-      } catch {
-        continue;
-      }
+      } catch {}
     }
   }
   return null;
@@ -74,7 +79,7 @@ export async function* execSkillStep(
   if (!step.skill) throw new Error(`step ${step.id}: 缺少 skill 字段`);
   const skillName = interpolate(step.skill, vars);
 
-  const skillFile = await findSkillFile(skillName, ctx.cwd);
+  const skillFile = await findSkillFile(skillName, effectiveWorkflowCwd(ctx));
   if (!skillFile) {
     throw new Error(
       `step ${step.id}: 未找到 skill "${skillName}"（cwd/skills/ 与 packageRoot/skills/ 双源均未命中）`,