@rowan-agent/agent 0.4.8 → 0.4.10

package/README.md

@@ -214,7 +214,7 @@ agent.subscribe((event: AgentEvent) => {
 
 ### Parallel Phase Events
 
-When multiple phases run concurrently (via multi-target `route`), each branch emits its own `turn_*`, `message_*`, and `tool_execution_*` events into the shared event stream — they are interleaved, not sequenced. Individual parallel phases do **not** emit `phase_start`/`phase_end`; those only fire for serial phases. After all branches complete, a merged `<phase_results>` message is injected and `message_start`/`message_end` fire for it.
+When multiple phases run concurrently (via multi-target `route`), each branch emits its own `turn_*`, `message_*`, and `tool_execution_*` events into the shared event stream — they are interleaved, not sequenced. Individual parallel phases do **not** emit `phase_start`/`phase_end`; those only fire for serial phases. After all branches complete, their outputs are stashed and surfaced in the next iteration's phase entry message (under `<prev_phase_outputs>`); the `message_start`/`message_end` you observe for that entry message carry the merged results.
 
 ## Session
 
@@ -296,11 +296,11 @@ Per iteration:
                     ┌──────────┐        ┌──────────┐
                     │   lint   │        │typecheck │
                     └────┬─────┘        └────┬─────┘
-                         └─────────┬─────────┘
-                                   ▼
-                          <phase_results> merged
-                                   │
-                            route("stop")
+└─────────┬─────────┘
+                                    ▼
+                       merged into <prev_phase_outputs>
+                                    │
+                             route("stop")
                                    │
                                    ▼
                              ┌──────────┐

package/dist/{chunk-APSIAOUD.js → chunk-FTIS43EE.js}

@@ -336,26 +336,25 @@ ${indent}</${tag}>`;
     return `${indent}<${tag}>${escapeXml(String(val))}</${tag}>`;
   }).join("\n");
 }
-function buildPhaseResultMessage(phases, toolUseId, instruction) {
+function buildPhaseDirectiveMessage(phase, output, toolUseId) {
   const parts = [];
-  if (instruction) {
-    parts.push(`<instruction>${instruction}</instruction>`);
-  }
-  parts.push(`<phase_results>`);
-  for (const p of phases) {
-    parts.push(`  <phase name="${p.name}">`);
-    if (p.content) {
-      parts.push(`    <content>${p.content}</content>`);
+  parts.push(`<phase name="${escapeXml(phase.name)}">`);
+  parts.push(`  <content>${phase.content}</content>`);
+  if (output.results && output.results.length > 0) {
+    parts.push(`  <prev_phase_outputs>`);
+    if (output.instruction) {
+      parts.push(`    <instruction>${escapeXml(output.instruction)}</instruction>`);
     }
-    if (p.output !== void 0) {
-      parts.push(`    <output>${jsonToXml(p.output, 2)}</output>`);
-    }
-    if (!p.content && p.output === void 0) {
-      parts.push(`    <content>Phase "${p.name}" completed with no output.</content>`);
+    for (const r of output.results) {
+      parts.push(`    <phase name="${escapeXml(r.name)}">`);
+      if (r.output !== void 0) {
+        parts.push(jsonToXml(r.output, 3));
+      }
+      parts.push(`    </phase>`);
     }
-    parts.push(`  </phase>`);
+    parts.push(`  </prev_phase_outputs>`);
   }
-  parts.push(`</phase_results>`);
+  parts.push(`</phase>`);
   return [{
     type: "tool_result",
     toolUseId,
@@ -497,7 +496,7 @@ export {
   buildSkillsDescription,
   formatResourceOutput,
   detectResourceType,
-  buildPhaseResultMessage,
+  buildPhaseDirectiveMessage,
   loadPhase,
   readPhaseContent,
   loadPhases,

package/dist/index.cjs

@@ -520,26 +520,25 @@ ${indent}</${tag}>`;
     return `${indent}<${tag}>${escapeXml(String(val))}</${tag}>`;
   }).join("\n");
 }
-function buildPhaseResultMessage(phases, toolUseId, instruction) {
+function buildPhaseDirectiveMessage(phase, output, toolUseId) {
   const parts = [];
-  if (instruction) {
-    parts.push(`<instruction>${instruction}</instruction>`);
-  }
-  parts.push(`<phase_results>`);
-  for (const p of phases) {
-    parts.push(`  <phase name="${p.name}">`);
-    if (p.content) {
-      parts.push(`    <content>${p.content}</content>`);
-    }
-    if (p.output !== void 0) {
-      parts.push(`    <output>${jsonToXml(p.output, 2)}</output>`);
-    }
-    if (!p.content && p.output === void 0) {
-      parts.push(`    <content>Phase "${p.name}" completed with no output.</content>`);
+  parts.push(`<phase name="${escapeXml(phase.name)}">`);
+  parts.push(`  <content>${phase.content}</content>`);
+  if (output.results && output.results.length > 0) {
+    parts.push(`  <prev_phase_outputs>`);
+    if (output.instruction) {
+      parts.push(`    <instruction>${escapeXml(output.instruction)}</instruction>`);
+    }
+    for (const r of output.results) {
+      parts.push(`    <phase name="${escapeXml(r.name)}">`);
+      if (r.output !== void 0) {
+        parts.push(jsonToXml(r.output, 3));
+      }
+      parts.push(`    </phase>`);
     }
-    parts.push(`  </phase>`);
+    parts.push(`  </prev_phase_outputs>`);
   }
-  parts.push(`</phase_results>`);
+  parts.push(`</phase>`);
   return [{
     type: "tool_result",
     toolUseId,
@@ -1856,10 +1855,14 @@ function applyFirstDecision(route, output) {
   if (first.reason) output.routeReason = first.reason;
   if (first.payload !== void 0) output.payload = normalizePayload(first.payload);
 }
-function injectPhaseContent(phase, payload, messageManager) {
+function injectPhaseContent(phase, output, messageManager) {
   try {
     const phaseContent = phase.filePath ? readPhaseContent(phase) : phase.content ?? phase.description ?? "";
-    const content = buildPhaseResultMessage([{ name: phase.name, content: phaseContent, output: payload }], `phase_${phase.id}`);
+    const content = buildPhaseDirectiveMessage(
+      { name: phase.id, content: phaseContent },
+      output,
+      `phase_${phase.id}`
+    );
     const msgId = messageManager.start("tool", content, { phase: phase.id });
     messageManager.end(msgId);
     return msgId;
@@ -2033,6 +2036,8 @@ async function runPhaseLoop(config, state, registry) {
   let isContinuing = false;
   let previousPayload = void 0;
   let previousPhaseMsgId = void 0;
+  let previousResults = [];
+  let pendingInstruction = void 0;
   while (currentPhaseId) {
     await reloadPhases(registry);
     if (config.phases) {
@@ -2117,7 +2122,9 @@ async function runPhaseLoop(config, state, registry) {
     removePhaseMessage(config.context.messages, previousPhaseMsgId);
     previousPhaseMsgId = void 0;
     if (enteringNewPhase) {
-      previousPhaseMsgId = injectPhaseContent(phase, phaseContext.state.payload, messageManager);
+      previousPhaseMsgId = injectPhaseContent(phase, { results: previousResults, instruction: pendingInstruction }, messageManager);
+      previousResults = [];
+      pendingInstruction = void 0;
     }
     const runtime = { phase, config, state, execution, messageManager, registry, context: phaseContext };
     let output = await executePhase(runtime);
@@ -2160,21 +2167,15 @@ async function runPhaseLoop(config, state, registry) {
         if (!pt) continue;
         const instanceId = instanceIds[i];
         const context = pt.isolated ? [] : contextSnapshot;
-        const payload = target.payload !== void 0 ? normalizePayload(target.payload) : previousPayload;
-        const promise = executeParallelPhase(config, state, registry, pt, payload, context, availablePhases);
+        const payload = target.payload !== void 0 ? normalizePayload(target.payload) : void 0;
+        const promise = executeParallelPhase(config, state, registry, pt, payload, context, availablePhases, currentPhaseId);
         parallelTasks.set(instanceId, { promise, phaseId: target.phase });
       }
       const successfulResults = await waitForBackgroundTasks(parallelTasks);
-      if (successfulResults.length > 0) {
-        const phaseResults = successfulResults.map((r) => ({ name: r.phaseId, content: r.content, output: r.payload }));
-        const content = buildPhaseResultMessage(phaseResults, `phase_results`, routeDecision.instruction);
-        const msgId = messageManager.start("tool", content, { phase: "parallel_group" });
-        await messageManager.end(msgId);
-        previousPhaseMsgId = msgId;
-      }
+      previousResults = successfulResults.map((r) => ({ name: r.instanceId, output: r.payload }));
+      pendingInstruction = routeDecision.instruction;
       const entryPhaseId = phase.target ?? registry.entryPhaseId ?? "default";
       if (entryPhaseId === "stop") {
-        removePhaseMessage(config.context.messages, previousPhaseMsgId);
         return completeRun(config, state, createOutcome.default(output, config.context.messages));
       }
       currentPhaseId = entryPhaseId;
@@ -2204,6 +2205,7 @@ async function runPhaseLoop(config, state, registry) {
       ts: createTimestamp()
     });
     previousPayload = output.payload;
+    previousResults = output.payload !== void 0 ? [{ name: phase.id, output: output.payload }] : [];
     currentPhaseId = targetPhaseId;
   }
   throw new Error("Phase machine exited without a stop or abort transition.");
@@ -2411,7 +2413,7 @@ function createPhaseExecution(config, state, allTools, phase, messageManager, to
     }
   };
 }
-async function executeParallelPhase(config, state, registry, phase, parentPayload, context, availablePhases) {
+async function executeParallelPhase(config, state, registry, phase, payload, context, availablePhases, currentPhaseId) {
   const messages = [...context];
   const allTools = buildToolsWithRouting(config, availablePhases);
   const phaseTools = phase.tools ? allTools.filter((t) => t.name === PhaseRouteTool || phase.tools.includes(t.name)) : allTools;
@@ -2426,19 +2428,23 @@ async function executeParallelPhase(config, state, registry, phase, parentPayloa
       current: phase.id,
       available: Array.from(registry.phases.keys()),
       iterations: 0,
-      payload: parentPayload
+      payload
     }
   };
   const messageManager = createMessageManager({ messages }, config.emit, config.onMessage);
-  const phaseMsgId = phase.isolated ? void 0 : injectPhaseContent(phase, parentPayload, messageManager);
+  const phaseMsgId = phase.isolated ? void 0 : injectPhaseContent(
+    phase,
+    { results: payload !== void 0 ? [{ name: currentPhaseId, output: payload }] : [] },
+    messageManager
+  );
   const toolExecutionManager = createToolExecutionManager(config.emit);
   const execution = createPhaseExecution(config, state, phaseTools, phase, messageManager, toolExecutionManager, registry);
   const runtime = { phase, config, state, execution, messageManager, registry, context: phaseContext };
   const output = await executePhase(runtime);
   if (phaseMsgId) removePhaseMessage(messages, phaseMsgId);
   const decision = output.toolCalls ? extractRouteCall(output.toolCalls) : void 0;
-  const payload = decision?.decision[0]?.payload !== void 0 ? normalizePayload(decision.decision[0].payload) : output.payload;
-  return { phaseId: phase.id, payload, content: output.message };
+  const resultPayload = decision?.decision[0]?.payload !== void 0 ? normalizePayload(decision.decision[0].payload) : output.payload;
+  return { instanceId: "", phaseId: phase.id, payload: resultPayload, content: output.message };
 }
 async function waitForBackgroundTasks(backgroundTasks) {
   const entries = Array.from(backgroundTasks.entries());
@@ -2447,7 +2453,7 @@ async function waitForBackgroundTasks(backgroundTasks) {
   for (let i = 0; i < results.length; i++) {
     const r = results[i];
     if (r.status === "fulfilled") {
-      successful.push(r.value);
+      successful.push({ ...r.value, instanceId: entries[i][0] });
     }
   }
   backgroundTasks.clear();

package/dist/index.js

@@ -1,5 +1,5 @@
 import {
-  buildPhaseResultMessage,
+  buildPhaseDirectiveMessage,
   buildSkillsDescription,
   buildStructuredSection,
   detectResourceType,
@@ -16,7 +16,7 @@ import {
   reloadPhases,
   resolveDefaultModel,
   resolveResourcePath
-} from "./chunk-APSIAOUD.js";
+} from "./chunk-FTIS43EE.js";
 import {
   normalizeRelativePath,
   resolveInWorkspace,
@@ -1132,10 +1132,14 @@ function applyFirstDecision(route, output) {
   if (first.reason) output.routeReason = first.reason;
   if (first.payload !== void 0) output.payload = normalizePayload(first.payload);
 }
-function injectPhaseContent(phase, payload, messageManager) {
+function injectPhaseContent(phase, output, messageManager) {
   try {
     const phaseContent = phase.filePath ? readPhaseContent(phase) : phase.content ?? phase.description ?? "";
-    const content = buildPhaseResultMessage([{ name: phase.name, content: phaseContent, output: payload }], `phase_${phase.id}`);
+    const content = buildPhaseDirectiveMessage(
+      { name: phase.id, content: phaseContent },
+      output,
+      `phase_${phase.id}`
+    );
     const msgId = messageManager.start("tool", content, { phase: phase.id });
     messageManager.end(msgId);
     return msgId;
@@ -1309,6 +1313,8 @@ async function runPhaseLoop(config, state, registry) {
   let isContinuing = false;
   let previousPayload = void 0;
   let previousPhaseMsgId = void 0;
+  let previousResults = [];
+  let pendingInstruction = void 0;
   while (currentPhaseId) {
     await reloadPhases(registry);
     if (config.phases) {
@@ -1393,7 +1399,9 @@ async function runPhaseLoop(config, state, registry) {
     removePhaseMessage(config.context.messages, previousPhaseMsgId);
     previousPhaseMsgId = void 0;
     if (enteringNewPhase) {
-      previousPhaseMsgId = injectPhaseContent(phase, phaseContext.state.payload, messageManager);
+      previousPhaseMsgId = injectPhaseContent(phase, { results: previousResults, instruction: pendingInstruction }, messageManager);
+      previousResults = [];
+      pendingInstruction = void 0;
     }
     const runtime = { phase, config, state, execution, messageManager, registry, context: phaseContext };
     let output = await executePhase(runtime);
@@ -1436,21 +1444,15 @@ async function runPhaseLoop(config, state, registry) {
         if (!pt) continue;
         const instanceId = instanceIds[i];
         const context = pt.isolated ? [] : contextSnapshot;
-        const payload = target.payload !== void 0 ? normalizePayload(target.payload) : previousPayload;
-        const promise = executeParallelPhase(config, state, registry, pt, payload, context, availablePhases);
+        const payload = target.payload !== void 0 ? normalizePayload(target.payload) : void 0;
+        const promise = executeParallelPhase(config, state, registry, pt, payload, context, availablePhases, currentPhaseId);
         parallelTasks.set(instanceId, { promise, phaseId: target.phase });
       }
       const successfulResults = await waitForBackgroundTasks(parallelTasks);
-      if (successfulResults.length > 0) {
-        const phaseResults = successfulResults.map((r) => ({ name: r.phaseId, content: r.content, output: r.payload }));
-        const content = buildPhaseResultMessage(phaseResults, `phase_results`, routeDecision.instruction);
-        const msgId = messageManager.start("tool", content, { phase: "parallel_group" });
-        await messageManager.end(msgId);
-        previousPhaseMsgId = msgId;
-      }
+      previousResults = successfulResults.map((r) => ({ name: r.instanceId, output: r.payload }));
+      pendingInstruction = routeDecision.instruction;
       const entryPhaseId = phase.target ?? registry.entryPhaseId ?? "default";
       if (entryPhaseId === "stop") {
-        removePhaseMessage(config.context.messages, previousPhaseMsgId);
         return completeRun(config, state, createOutcome.default(output, config.context.messages));
       }
       currentPhaseId = entryPhaseId;
@@ -1480,6 +1482,7 @@ async function runPhaseLoop(config, state, registry) {
       ts: createTimestamp()
     });
     previousPayload = output.payload;
+    previousResults = output.payload !== void 0 ? [{ name: phase.id, output: output.payload }] : [];
     currentPhaseId = targetPhaseId;
   }
   throw new Error("Phase machine exited without a stop or abort transition.");
@@ -1687,7 +1690,7 @@ function createPhaseExecution(config, state, allTools, phase, messageManager, to
     }
   };
 }
-async function executeParallelPhase(config, state, registry, phase, parentPayload, context, availablePhases) {
+async function executeParallelPhase(config, state, registry, phase, payload, context, availablePhases, currentPhaseId) {
   const messages = [...context];
   const allTools = buildToolsWithRouting(config, availablePhases);
   const phaseTools = phase.tools ? allTools.filter((t) => t.name === PhaseRouteTool || phase.tools.includes(t.name)) : allTools;
@@ -1702,19 +1705,23 @@ async function executeParallelPhase(config, state, registry, phase, parentPayloa
       current: phase.id,
       available: Array.from(registry.phases.keys()),
       iterations: 0,
-      payload: parentPayload
+      payload
     }
   };
   const messageManager = createMessageManager({ messages }, config.emit, config.onMessage);
-  const phaseMsgId = phase.isolated ? void 0 : injectPhaseContent(phase, parentPayload, messageManager);
+  const phaseMsgId = phase.isolated ? void 0 : injectPhaseContent(
+    phase,
+    { results: payload !== void 0 ? [{ name: currentPhaseId, output: payload }] : [] },
+    messageManager
+  );
   const toolExecutionManager = createToolExecutionManager(config.emit);
   const execution = createPhaseExecution(config, state, phaseTools, phase, messageManager, toolExecutionManager, registry);
   const runtime = { phase, config, state, execution, messageManager, registry, context: phaseContext };
   const output = await executePhase(runtime);
   if (phaseMsgId) removePhaseMessage(messages, phaseMsgId);
   const decision = output.toolCalls ? extractRouteCall(output.toolCalls) : void 0;
-  const payload = decision?.decision[0]?.payload !== void 0 ? normalizePayload(decision.decision[0].payload) : output.payload;
-  return { phaseId: phase.id, payload, content: output.message };
+  const resultPayload = decision?.decision[0]?.payload !== void 0 ? normalizePayload(decision.decision[0].payload) : output.payload;
+  return { instanceId: "", phaseId: phase.id, payload: resultPayload, content: output.message };
 }
 async function waitForBackgroundTasks(backgroundTasks) {
   const entries = Array.from(backgroundTasks.entries());
@@ -1723,7 +1730,7 @@ async function waitForBackgroundTasks(backgroundTasks) {
   for (let i = 0; i < results.length; i++) {
     const r = results[i];
     if (r.status === "fulfilled") {
-      successful.push(r.value);
+      successful.push({ ...r.value, instanceId: entries[i][0] });
     }
   }
   backgroundTasks.clear();
@@ -2127,7 +2134,7 @@ ${additionalInstructions}` : content;
    */
   async phase(name) {
     const workspace = resolveWorkspacePaths({ cwd: this.options.cwd, rowanDir: this.options.rowanDir });
-    const { loadPhase: loadPhase2, readPhaseContent: readPhaseContent2 } = await import("./loader-MVD5JAKM.js");
+    const { loadPhase: loadPhase2, readPhaseContent: readPhaseContent2 } = await import("./loader-HCYCHPGT.js");
     try {
       const phase = await loadPhase2(name, workspace);
       return readPhaseContent2(phase);

package/dist/{loader-MVD5JAKM.js → loader-HCYCHPGT.js}

@@ -3,7 +3,7 @@ import {
   loadPhases,
   readPhaseContent,
   reloadPhases
-} from "./chunk-APSIAOUD.js";
+} from "./chunk-FTIS43EE.js";
 import "./chunk-2FIII4GP.js";
 export {
   loadPhase,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowan-agent/agent",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
     "build": "tsup"
   },
   "dependencies": {
-    "@rowan-agent/models": "workspace:*",
+    "@rowan-agent/models": "0.4.10",
     "jiti": "2.7.0",
     "typebox": "^1.0.0",
     "yaml": "^2.7.0"