@oisincoveney/pipeline 1.5.2 → 1.5.3

package/dist/index.js

@@ -28680,14 +28680,6 @@ function header(host) {
   return [GENERATED_MARKER, `${OWNER_MARKER_PREFIX}host=${host} -->`, ""].join(`
 `);
 }
-function tsHeader(host) {
-  return [
-    GENERATED_TS_MARKER,
-    `${OWNER_TS_MARKER_PREFIX}host=${host}`,
-    ""
-  ].join(`
-`);
-}
 function yamlHeader(host) {
   return [
     GENERATED_YAML_MARKER,
@@ -28717,12 +28709,6 @@ function profileEntries(config2) {
 function nativeProfileEntries(host, config2) {
   return profileEntries(config2).filter(([_, profile]) => canRunNatively(host, config2, profile));
 }
-function hasAgentWorkflowNodes(config2) {
-  return compileWorkflowPlan(config2).topologicalOrder.some((node) => node.kind === "agent");
-}
-function profileNames(config2) {
-  return profileEntries(config2).map(([name]) => `\`${name}\``).join(", ");
-}
 function orchestratorProfile(config2) {
   const profile = config2.profiles[config2.orchestrator.profile];
   if (!profile) {
@@ -28733,33 +28719,14 @@ function orchestratorProfile(config2) {
     hooks: config2.orchestrator.hooks
   };
 }
-function workflowSummary(config2) {
-  const plan = compileWorkflowPlan(config2);
-  return [
-    `Workflow: ${plan.workflowId}`,
-    entrypointSummary(config2),
-    "",
-    ...plan.topologicalOrder.map((node) => {
-      const parts = [
-        `- ${node.id}`,
-        `kind=${node.kind}`,
-        node.profile ? `profile=${node.profile}` : "",
-        runnerForNode(config2, node.profile) ? `runner=${runnerForNode(config2, node.profile)}` : "",
-        node.needs.length ? `needs=${node.needs.join(",")}` : "needs=none"
-      ].filter(Boolean);
-      return parts.join(" ");
-    })
-  ].join(`
-`);
-}
-function runnerForNode(config2, profileId) {
-  return profileId ? config2.profiles[profileId]?.runner : undefined;
-}
 function resolvedHostModel(config2, host, profile) {
   const runner = config2.runners[profile.runner];
   return profile.host_models?.[host] ?? runner?.host_models?.[host] ?? profile.model ?? runner?.model;
 }
 function canRunNatively(host, config2, profile) {
+  if (host === "pi") {
+    return false;
+  }
   if (profile.runner === host) {
     return true;
   }
@@ -28768,12 +28735,9 @@ function canRunNatively(host, config2, profile) {
 function isModelRunner(runnerId) {
   return COMMAND_HOSTS.some((host) => host === runnerId);
 }
-function runnerCliLabel(runnerId) {
-  return `${runnerId} CLI`;
-}
-function dispatchSummary(host, config2) {
+function agentDispatchRoutes(host, config2) {
   const plan = compileWorkflowPlan(config2);
-  const lines = plan.topologicalOrder.flatMap((node) => {
+  return plan.topologicalOrder.flatMap((node) => {
     if (!(node.kind === "agent" && node.profile)) {
       return [];
     }
@@ -28781,43 +28745,43 @@ function dispatchSummary(host, config2) {
     if (!profile) {
       return [];
     }
-    return [dispatchLineForAgent(host, config2, node.id, node.profile, profile)];
+    return [
+      dispatchRouteForAgent(host, config2, {
+        needs: node.needs,
+        nodeId: node.id,
+        profile,
+        profileId: node.profile
+      })
+    ];
   });
-  return ["Node dispatch:", ...lines.length > 0 ? lines : ["- none"]].join(`
-`);
 }
-function dispatchLineForAgent(host, config2, nodeId, profileId, profile) {
-  if (profile.runner === host) {
-    return sameHostDispatchLine(host, nodeId, profileId, profile.runner);
+function dispatchRouteForAgent(host, config2, route) {
+  const runnerId = route.profile.runner;
+  if (host !== "pi" && runnerId === host) {
+    return {
+      ...route,
+      kind: "native-named-agent",
+      nativeAgentId: route.profileId,
+      runnerId
+    };
   }
-  if (host === "opencode" && isModelRunner(profile.runner)) {
-    const model = resolvedHostModel(config2, host, profile);
+  if (host === "opencode" && isModelRunner(runnerId)) {
+    const model = resolvedHostModel(config2, host, route.profile);
     if (model) {
-      return `- ${nodeId}: OpenCode native subagent profile=${profileId} model=${model} runner=${profile.runner}`;
+      return {
+        ...route,
+        kind: "native-model-agent",
+        model,
+        nativeAgentId: route.profileId,
+        runnerId
+      };
     }
   }
-  return `- ${nodeId}: ${runnerCliLabel(profile.runner)} profile=${profileId} runner=${profile.runner}`;
-}
-function sameHostDispatchLine(host, nodeId, profileId, runnerId) {
-  const labels = {
-    claude: `Claude native subagent subagent_type=${profileId}`,
-    codex: `Codex native worker subagent profile=${profileId} agent_type=worker`,
-    kimi: `Kimi native Agent subagent subagent_type=${profileId}`,
-    opencode: `OpenCode native subagent subagent_type=${profileId}`,
-    pi: `Pi native subagent chain profile=${profileId}`
+  return {
+    ...route,
+    kind: "cli",
+    runnerId
   };
-  return `- ${nodeId}: ${labels[host]} runner=${runnerId}`;
-}
-function entrypointSummary(config2) {
-  const entries = Object.entries(config2.entrypoints);
-  if (entries.length === 0) {
-    return "Entrypoints: none";
-  }
-  return [
-    "Entrypoints:",
-    ...entries.map(([id, entrypoint]) => `- ${id} -> ${entrypoint.workflow}${entrypoint.description ? ` (${entrypoint.description})` : ""}`)
-  ].join(`
-`);
 }
 function grants(actor) {
   return [
@@ -28842,42 +28806,127 @@ function orchestratorBlock(config2) {
   ].join(`
 `);
 }
-function nativeDelegationInstruction(host, config2) {
-  if (!hasAgentWorkflowNodes(config2)) {
+function dispatchBlock(host, config2) {
+  const routes = agentDispatchRoutes(host, config2);
+  if (routes.length === 0) {
     return;
   }
-  if (host === "opencode") {
-    return "Dispatch each agent workflow node by its runner. For lines marked `OpenCode native subagent`, use OpenCode's task tool with `subagent_type` exactly equal to the configured profile id. For cross-runner nodes with an explicit resolved OpenCode model, use the generated OpenCode native subagent. For lines marked CLI, invoke that runner's CLI directly. Do not substitute a default subagent. Do not use instruction-only translation. Do not invoke package scripts or the pipeline CLI to run this workflow.";
+  const plan = compileWorkflowPlan(config2);
+  const nativeRoutes = routes.filter((route) => route.kind !== "cli");
+  const cliRoutes = routes.filter((route) => route.kind === "cli");
+  return [
+    `Run workflow \`${plan.workflowId}\` for the user task.`,
+    "",
+    nativeDispatchBlock(host, nativeRoutes),
+    cliDispatchBlock(host, cliRoutes),
+    nodePromptContract(plan.workflowId, routes),
+    "Do not use `pipe`, `oisin-pipeline`, or package scripts to execute workflow nodes.",
+    hostSpecificDispatchGuard(host, nativeRoutes, cliRoutes)
+  ].filter((line) => Boolean(line)).join(`
+`);
+}
+function nativeDispatchBlock(host, routes) {
+  if (routes.length === 0) {
+    return;
   }
+  return [
+    `${hostDisplayName(host)} native routes:`,
+    ...routes.map((route) => nativeDispatchLine(host, route)),
+    ""
+  ].join(`
+`);
+}
+function nativeDispatchLine(host, route) {
+  const needs = needsSummary(route.needs);
   if (host === "codex") {
-    return 'Dispatch each agent workflow node by its runner. For lines marked `Codex native worker subagent`, call `spawn_agent` with `agent_type: "worker"` and `fork_context: false`, then pass a node prompt containing the task, workflow id, node id, profile id, runner id, configured profile instructions, grants, and dependency outputs. Codex `exec` exposes native built-in agent types (`default`, `explorer`, `worker`) rather than arbitrary generated project profile ids, so do not call `spawn_agent` with the profile id as `agent_type`. Do not spawn the default agent for configured Codex nodes. For lines marked CLI, invoke that runner\'s CLI directly. Do not use instruction-only translation. Do not invoke package scripts or the pipeline CLI to run this workflow.';
+    return `- ${route.nodeId}: spawn_agent agent_type=${route.nativeAgentId} runner=${route.runnerId} needs=${needs}`;
   }
   if (host === "claude") {
-    return "Dispatch each agent workflow node by its runner. For lines marked `Claude native subagent`, use Claude's Task tool with `subagent_type` exactly equal to the configured profile id. For lines marked CLI, invoke that runner's CLI directly. Do not substitute a default subagent. Do not use instruction-only translation. Do not invoke package scripts or the pipeline CLI to run this workflow.";
+    return `- ${route.nodeId}: Agent tool subagent_type=${route.nativeAgentId} runner=${route.runnerId} needs=${needs}`;
   }
   if (host === "kimi") {
-    return "Dispatch each agent workflow node by its runner. For lines marked `Kimi native Agent subagent`, use Kimi's Agent tool with `subagent_type` exactly equal to the configured profile id when the current Kimi root agent exposes that subagent type. If that native subagent type is not available, invoke Kimi CLI with the generated `.kimi/agents/<profile>.yaml` agent spec. For non-Kimi nodes, invoke that runner's CLI directly. Do not substitute a default subagent. Do not use instruction-only translation. Do not invoke package scripts or the pipeline CLI to run this workflow.";
+    return `- ${route.nodeId}: Agent tool subagent_type=${route.nativeAgentId} runner=${route.runnerId} needs=${needs}`;
   }
-  if (host === "pi") {
-    return "Dispatch each agent workflow node by its runner. Use Pi's native subagent chain only when every agent node is a Pi runner node and the Pi subagent commands are available. If Pi native subagent commands are unavailable, invoke each configured runner through its CLI directly. For mixed-runner workflows, invoke each configured runner through its CLI directly. Do not use instruction-only translation. Do not invoke package scripts or the pipeline CLI to run this workflow.";
+  if (host === "opencode") {
+    const model = route.model ? ` model=${route.model}` : "";
+    return `- ${route.nodeId}: Task tool subagent_type=${route.nativeAgentId}${model} runner=${route.runnerId} needs=${needs}`;
   }
-  return "Dispatch each agent workflow node by its runner. Use this host's native subagent mechanism only when it can actually run the requested runner/model. For cross-runner nodes that cannot be represented natively, invoke that runner's CLI directly. Do not use instruction-only translation. Do not invoke package scripts or the pipeline CLI to run this workflow.";
+  return `- ${route.nodeId}: native agent ${route.nativeAgentId} runner=${route.runnerId} needs=${needs}`;
 }
-function cliDispatchInstructions(config2) {
-  if (!hasAgentWorkflowNodes(config2)) {
+function cliDispatchBlock(host, routes) {
+  if (routes.length === 0) {
     return;
   }
+  const nativeNotice = host === "pi" ? "Pi native dispatch is not enabled for this generated workflow." : `These nodes are not ${hostDisplayName(host)} native routes.`;
+  return [nativeNotice, "CLI routes:", ...routes.map(cliDispatchLine), ""].join(`
+`);
+}
+function cliDispatchLine(route) {
+  return `- ${route.nodeId}: ${route.runnerId} CLI profile=${route.profileId} command=\`${runnerCliCommand(route)}\` needs=${needsSummary(route.needs)}`;
+}
+function runnerCliCommand(route) {
+  if (route.runnerId === "codex") {
+    return `codex exec --json -C <repo-root> --sandbox ${codexSandbox(route.profile)} --skip-git-repo-check <node prompt>`;
+  }
+  if (route.runnerId === "kimi") {
+    return `kimi --print --agent-file .kimi/agents/${route.profileId}.yaml --work-dir <repo-root> --final-message-only --prompt <node prompt>`;
+  }
+  if (route.runnerId === "opencode") {
+    return `opencode run --agent ${route.profileId} --format json --dir <repo-root> <node prompt>`;
+  }
+  if (route.runnerId === "claude") {
+    return `claude --agent ${route.profileId} --print -p <node prompt>`;
+  }
+  if (route.runnerId === "pi") {
+    return "pi --print --no-session <node prompt>";
+  }
+  return `${route.runnerId} <node prompt>`;
+}
+function codexSandbox(profile) {
+  return profile.filesystem?.mode === "workspace-write" ? "workspace-write" : "read-only";
+}
+function nodePromptContract(workflowId, routes) {
+  const hasCliRoutes = routes.some((route) => route.kind === "cli");
+  const lead = hasCliRoutes ? "For each CLI node prompt include:" : "For each native node prompt include:";
   return [
-    "For CLI-dispatched nodes, construct the node prompt with the task, workflow id, node id, profile id, runner id, and dependency outputs.",
-    "CLI dispatch command shapes:",
-    "- codex: `codex exec --json -C <repo-root> --sandbox <mode> --config 'approval_policy=\"never\"' --skip-git-repo-check <node prompt>`",
-    "- kimi: `kimi --print --agent-file .kimi/agents/<profile>.yaml --work-dir <repo-root> --final-message-only --prompt <node prompt>`",
-    "- opencode: `opencode run --agent <profile> --format json --dir <repo-root> <node prompt>`",
-    "- claude: `claude --print -p <node prompt>`",
-    "- pi: `pi --print --no-session <node prompt>`"
+    lead,
+    "- user task",
+    `- workflow id: ${workflowId}`,
+    "- node id",
+    "- profile id",
+    "- runner id",
+    "- profile instructions reference",
+    "- profile grants",
+    "- dependency outputs",
+    ""
   ].join(`
 `);
 }
+function hostSpecificDispatchGuard(host, nativeRoutes, cliRoutes) {
+  if (host === "codex" && nativeRoutes.length > 0) {
+    return "Do not substitute the generic Codex worker for configured profiles.";
+  }
+  if (cliRoutes.length > 0 && nativeRoutes.length > 0) {
+    return `Do not claim CLI routes are ${hostDisplayName(host)} native routes.`;
+  }
+  if (cliRoutes.length > 0 && nativeRoutes.length === 0 && host !== "pi") {
+    return `Do not claim these nodes are ${hostDisplayName(host)} subagents.`;
+  }
+  return;
+}
+function hostDisplayName(host) {
+  const names = {
+    claude: "Claude",
+    codex: "Codex",
+    kimi: "Kimi",
+    opencode: "OpenCode",
+    pi: "Pi"
+  };
+  return names[host];
+}
+function needsSummary(needs) {
+  return needs.length > 0 ? needs.join(",") : "none";
+}
 function compactLines(lines) {
   return lines.filter((line) => line !== undefined);
 }
@@ -28905,17 +28954,9 @@ function claudeDefinitions(config2) {
       }, compactLines([
         header("claude").trimEnd(),
         "",
-        workflowSummary(config2),
-        "",
-        dispatchSummary("claude", config2),
-        "",
         orchestratorBlock(config2),
         "",
-        nativeDelegationInstruction("claude", config2),
-        "",
-        cliDispatchInstructions(config2),
-        "",
-        `Delegate work only to configured profiles: ${profileNames(config2)}.`
+        dispatchBlock("claude", config2)
       ]).join(`
 `)),
       host: "claude",
@@ -28962,22 +29003,13 @@ function opencodeDefinitions(config2) {
     {
       content: markdown({
         agent: "pipeline-orchestrator",
-        description: "Run the configured pipeline workflow",
-        subtask: true
+        description: "Run the configured pipeline workflow"
       }, compactLines([
         header("opencode").trimEnd(),
         "",
-        workflowSummary(config2),
-        "",
-        dispatchSummary("opencode", config2),
-        "",
         orchestratorBlock(config2),
         "",
-        nativeDelegationInstruction("opencode", config2),
-        "",
-        cliDispatchInstructions(config2),
-        "",
-        `Delegate work only to configured profiles: ${profileNames(config2)}.`
+        dispatchBlock("opencode", config2)
       ]).join(`
 `)),
       host: "opencode",
@@ -28989,18 +29021,14 @@ function opencodeDefinitions(config2) {
         description: "Orchestrate the configured pipeline and enforce gates.",
         mode: "primary",
         permission: opencodePermission(orchestratorProfile(config2), {
-          forceTask: hasAgentWorkflowNodes(config2)
+          forceTask: agentDispatchRoutes("opencode", config2).some((route) => route.kind !== "cli")
         })
       }, compactLines([
         header("opencode").trimEnd(),
         "",
         orchestratorBlock(config2),
         "",
-        dispatchSummary("opencode", config2),
-        "",
-        nativeDelegationInstruction("opencode", config2),
-        "",
-        cliDispatchInstructions(config2)
+        dispatchBlock("opencode", config2)
       ]).join(`
 `)),
       host: "opencode",
@@ -29041,17 +29069,9 @@ function codexDefinitions(config2) {
         "",
         "Invoke this skill with `$pipe <task description>`.",
         "",
-        workflowSummary(config2),
-        "",
-        dispatchSummary("codex", config2),
-        "",
         orchestratorBlock(config2),
         "",
-        nativeDelegationInstruction("codex", config2),
-        "",
-        cliDispatchInstructions(config2),
-        "",
-        `Use separate configured profiles: ${profileNames(config2)}.`
+        dispatchBlock("codex", config2)
       ]).join(`
 `)),
       host: "codex",
@@ -29087,17 +29107,9 @@ function kimiDefinitions(config2) {
       }, compactLines([
         header("kimi").trimEnd(),
         "",
-        workflowSummary(config2),
-        "",
-        dispatchSummary("kimi", config2),
-        "",
         orchestratorBlock(config2),
         "",
-        nativeDelegationInstruction("kimi", config2),
-        "",
-        cliDispatchInstructions(config2),
-        "",
-        `Use separate configured profiles: ${profileNames(config2)}.`
+        dispatchBlock("kimi", config2)
       ]).join(`
 `)),
       host: "kimi",
@@ -29155,6 +29167,9 @@ function kimiAgentDefinitions(id, profile) {
   ];
 }
 function kimiOrchestratorAgentDefinitions(config2) {
+  if (agentDispatchRoutes("kimi", config2).every((route) => route.kind !== "native-named-agent")) {
+    return [];
+  }
   const agentPath = ".kimi/agents/pipeline-orchestrator.yaml";
   const promptPath = ".kimi/agents/pipeline-orchestrator.prompt.md";
   const nativeKimiProfiles = nativeProfileEntries("kimi", config2);
@@ -29208,15 +29223,9 @@ function kimiOrchestratorAgentDefinitions(config2) {
       content: compactLines([
         header("kimi").trimEnd(),
         "",
-        workflowSummary(config2),
-        "",
-        dispatchSummary("kimi", config2),
-        "",
         orchestratorBlock(config2),
         "",
-        nativeDelegationInstruction("kimi", config2),
-        "",
-        cliDispatchInstructions(config2),
+        dispatchBlock("kimi", config2),
         "",
         "This agent file is the Kimi-native orchestrator surface. Launch Kimi with `--agent-file .kimi/agents/pipeline-orchestrator.yaml` before using `/skill:pipe` when you want Kimi runner nodes to run through Kimi's native Agent tool."
       ]).join(`
@@ -29247,42 +29256,18 @@ function piDefinitions(config2) {
     {
       content: markdown({
         "argument-hint": "<task description>",
-        description: "Run the configured pipeline workflow with Pi subagents"
+        description: "Run the configured pipeline workflow"
       }, compactLines([
         header("pi").trimEnd(),
         "",
-        workflowSummary(config2),
-        "",
-        dispatchSummary("pi", config2),
-        "",
         orchestratorBlock(config2),
         "",
-        nativeDelegationInstruction("pi", config2),
-        "",
-        cliDispatchInstructions(config2)
+        dispatchBlock("pi", config2)
       ]).join(`
 `)),
       host: "pi",
       invocation: "/pipe <task description>",
       path: ".pi/prompts/pipe.md"
-    },
-    {
-      content: [
-        tsHeader("pi").trimEnd(),
-        "",
-        "// Pi exposes project prompt templates as slash commands.",
-        "// The real /pipe command is .pi/prompts/pipe.md.",
-        "// This generated shim intentionally registers no command so it cannot",
-        "// intercept /pipe in print mode before the prompt-template expansion runs.",
-        "export default function pipelineWorkNext(): void {",
-        "  return;",
-        "}",
-        ""
-      ].join(`
-`),
-      host: "pi",
-      invocation: "/pipe <task description>",
-      path: ".pi/extensions/pipe.ts"
     }
   ];
 }

package/package.json

@@ -73,7 +73,7 @@
     "prepack": "bun run build:cli"
   },
   "type": "module",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "",
   "main": "index.js",
   "keywords": [],