@zhushanwen/pi-subagent-workflow 8.3.0 → 8.5.0

package/src/orchestration/worker-script-builder.ts

@@ -66,7 +66,7 @@ const WORKER_TEMPLATE_PRE = [
     'const _workerLogs = [];',
     '// IF6(#12): known agent() fields — hoisted to module scope, built once per worker',
     '// (was rebuilt inside agent() on every call; field set is call-invariant).',
-    'const _KNOWN_FIELDS = new Set(["prompt", "description", "schema", "model", "scene", "label", "task", "agent", "phase", "skill", "timeoutMs", "cwd", "fork", "worktree", "returnMeta", "thinkingLevel"]);',
+    'const _KNOWN_FIELDS = new Set(["prompt", "description", "schema", "model", "scene", "label", "task", "agent", "phase", "skill", "timeoutMs", "cwd", "fork", "worktree", "returnMeta", "thinkingLevel", "engine"]);',
     'function _pushWorkerLog(level, args) {',
     '  try { _workerLogs.push({ level, message: args.map((a) => typeof a === "string" ? a : JSON.stringify(a)).join(" ") }); } catch (e) { /* swallow */ }',
     '}',
@@ -210,6 +210,8 @@ const WORKER_TEMPLATE_PRE = [
     '        scene: (secondArg && typeof secondArg === "object" && secondArg.scene) || undefined,\n' +
       '        phase: (secondArg && typeof secondArg === "object" && secondArg.phase) || undefined,',
       '        thinkingLevel: (secondArg && typeof secondArg === "object" && secondArg.thinkingLevel) || $THINKING_LEVEL,',
+      '        // P4 D9③：step 级 engine 显式指定（仅限必须某引擎独有能力的场景）',
+      '        engine: (secondArg && typeof secondArg === "object" && secondArg.engine) || undefined,',
     '      };',
     '    } else if (typeof firstArg === "object" && firstArg !== null) {',
     '      if (firstArg.prompt) {',
@@ -231,6 +233,7 @@ const WORKER_TEMPLATE_PRE = [
     '          worktree: firstArg.worktree,',
     '          returnMeta: firstArg.returnMeta,',
     '          thinkingLevel: firstArg.thinkingLevel || $THINKING_LEVEL,',
+    '          engine: firstArg.engine,',
     '        };',
     '      } else {',
     '        opts = firstArg;',
@@ -247,7 +250,7 @@ const WORKER_TEMPLATE_PRE = [
     '    // Validate known agent() fields to catch API misuse early (_KNOWN_FIELDS at module scope)',
     '    const _unknownFields = Object.keys(opts).filter((k) => !_KNOWN_FIELDS.has(k));',
     '    if (_unknownFields.length > 0) {',
-    '      _pushWorkerLog("warn", ["[workflow] agent() received unknown fields: " + _unknownFields.join(", ") + ". Known fields: prompt, description, schema, model, scene, label, task, agent, phase, skill, timeoutMs, cwd, fork, worktree, returnMeta, thinkingLevel"]);',
+    '      _pushWorkerLog("warn", ["[workflow] agent() received unknown fields: " + _unknownFields.join(", ") + ". Known fields: prompt, description, schema, model, scene, label, task, agent, phase, skill, timeoutMs, cwd, fork, worktree, returnMeta, thinkingLevel, engine"]);',
     '    }',
     '',
     '    const callId = _callIdCounter;',

package/src/shared/meta-parser.ts

@@ -88,7 +88,9 @@ function typecheckMeta(raw: unknown, kind: ResourceKind): ResourceMeta | null {
 
   if (kind === "workflow") {
     // minor-2：agent 专属字段不可出现在 workflow（串类 reject）
-    if (o.examples !== undefined || o.tools !== undefined || o.model !== undefined) return null;
+    if (o.examples !== undefined || o.tools !== undefined || o.model !== undefined || o.engine !== undefined) {
+      return null;
+    }
     // phases 必填数组，元素为 string | {title:string, detail?:string}
     if (!Array.isArray(o.phases)) return null;
     const phases: WorkflowMeta["phases"] = [];
@@ -156,6 +158,7 @@ function typecheckMeta(raw: unknown, kind: ResourceKind): ResourceMeta | null {
     }
   }
   const model = isString(o.model) ? o.model : undefined;
+  const engine = isString(o.engine) ? o.engine : undefined;
 
   const meta: AgentMeta = {
     kind: "agent",
@@ -164,6 +167,7 @@ function typecheckMeta(raw: unknown, kind: ResourceKind): ResourceMeta | null {
     ...(examples !== undefined ? { examples } : {}),
     ...(tools !== undefined ? { tools } : {}),
     ...(model !== undefined ? { model } : {}),
+    ...(engine !== undefined ? { engine } : {}),
     ...(when !== undefined ? { when } : {}),
     ...(notFor !== undefined ? { notFor } : {}),
   };

package/src/shared/resource-meta.ts

@@ -54,6 +54,11 @@ export interface AgentMeta extends ResourceMetaBase {
   /** 供 AgentRegistry 执行侧 spawn 时注入，不进 system prompt 注入段。 */
   tools?: string[];
   model?: string;
+  /**
+   * 执行引擎 id（D9 per-agent 主通道：调用参数 engine > 本字段 > 全局默认）。
+   * 与 model 字段同风格——路由字段（不进 system prompt），执行侧（P4 路由层）消费。
+   */
+  engine?: string;
 }
 
 /** 判别联合（kind 判别）。 */