multiclaw 0.13.0 → 0.14.0

package/dist/commands/resume.d.ts

@@ -1,4 +1,4 @@
-import type { OrchestratorResult } from "@multiclawcli/core";
+import { type OrchestratorResult } from "@multiclawcli/core";
 /** A previous run's report, as much of it as resume needs. */
 export interface ResumeTarget {
     runDir: string;
@@ -22,14 +22,13 @@ export declare function readReport(runDir: string): OrchestratorResult;
 /**
  * Turn a report (plus an optional requirement override) into run config.
  *
- * The requirement is the one thing a report cannot always supply — an older
- * report predates the field — so an explicit override wins, and its absence on
- * both sides is an error rather than a silently empty run.
+ * An explicit requirement override wins. Missing requirements fail rather than
+ * silently starting an empty run.
  */
 export declare function resumeOptionsFromReport(report: OrchestratorResult, requirementOverride?: string): {
     requirement: string;
     resume: {
         agents: string[];
-        sessions?: Record<string, string>;
+        sessions?: Record<string, import("@multiclawcli/core").SessionRecord>;
     };
 };

package/dist/index.js

@@ -662,6 +662,9 @@ async function assertRuntimesAvailable(config) {
 }
 
 // src/reporters/ConsoleReporter.ts
+import {
+  describeSession
+} from "@multiclawcli/core";
 var isFancy = !process.env.NO_COLOR && process.env.TERM !== "dumb" && process.stdout.isTTY === true;
 var S = isFancy ? { ok: "\u2713", fail: "\u2717", run: "\u203A", retry: "\u21BB", skip: "\u2298", warn: "\u26A0", bullet: "\xB7" } : { ok: "+", fail: "x", run: ">", retry: "~", skip: "-", warn: "!", bullet: "*" };
 var C = isFancy ? {
@@ -685,6 +688,7 @@ var C = isFancy ? {
 };
 function markFor(status) {
   if (status === "success") return { icon: S.ok, color: C.green };
+  if (status === "handed_back") return { icon: S.retry, color: C.yellow };
   if (status === "cancelled") return { icon: S.skip, color: C.yellow };
   return { icon: S.fail, color: C.red };
 }
@@ -694,6 +698,13 @@ var ConsoleReporter = class {
   }
   handle(e) {
     switch (e.type) {
+      case "agent:session": {
+        if (e.payload.action === "state_changed") break;
+        console.log(
+          e.payload.record.agentId + ": " + e.payload.action.replaceAll("_", " ") + (e.payload.requestedSessionId ? " target=" + e.payload.requestedSessionId : "") + " \u2014 " + describeSession(e.payload.record) + (e.payload.reason ? " \u2014 " + e.payload.reason : "")
+        );
+        break;
+      }
       case "orchestration:start": {
         const line = (isFancy ? "\u2550" : "=").repeat(50);
         const edge = isFancy ? ["\u2554", "\u2551", "\u255A", "\u2557", "\u255D"] : ["+", "|", "+", "+", "+"];
@@ -711,6 +722,23 @@ ${C.bold}${C.purple}${edge[0]}${line}${edge[3]}`);
         }
         break;
       }
+      case "orchestration:route": {
+        const route = JSON.stringify(e.payload.routing);
+        if (route === this.lastRoute) break;
+        this.lastRoute = route;
+        console.log(
+          "Route: " + e.payload.routing.mode + " work=" + (e.payload.routing.workId ?? "unknown") + (e.payload.routing.reroutes ? " (rerouting once)" : "")
+        );
+        break;
+      }
+      case "orchestration:routing-error": {
+        console.log("Routing incomplete: " + e.payload.message);
+        break;
+      }
+      case "agent:handed-back": {
+        console.log(e.payload.agentName + " handed back: " + e.payload.handoffReason);
+        break;
+      }
       case "orchestration:stages": {
         console.log(
           `${C.dim}${S.bullet} Plan applied \u2014 ${e.payload.stages.length} stages${C.reset}`
@@ -767,7 +795,7 @@ ${C.cyan}${mark} ${reply.message}${C.reset}`);
         }
         const line = (isFancy ? "\u2550" : "=").repeat(50);
         const edge = isFancy ? ["\u2554", "\u2551", "\u255A", "\u2557", "\u255D"] : ["+", "|", "+", "+", "+"];
-        const title = reply ? reply.mode === "ask" ? `${S.warn} Needs your input` : `${S.ok} Answered` : acceptance ? acceptance.status === "approved" ? `${S.ok} Approved` : acceptance.status === "changes_required" ? `${S.warn} Changes required` : acceptance.status === "cancelled" ? `${S.skip} Acceptance cancelled` : `${S.fail} Acceptance failed` : e.payload.cancelled ? `${S.skip} Cancelled` : success ? `${S.ok} All done` : `${S.warn} Done (with failures)`;
+        const title = e.payload.routing?.error ? `${S.warn} Work incomplete` : reply ? reply.mode === "ask" ? `${S.warn} Needs your input` : `${S.ok} Answered` : acceptance ? acceptance.status === "approved" ? `${S.ok} Approved` : acceptance.status === "changes_required" ? `${S.warn} Changes required` : acceptance.status === "cancelled" ? `${S.skip} Acceptance cancelled` : `${S.fail} Acceptance failed` : e.payload.cancelled ? `${S.skip} Cancelled` : success ? `${S.ok} All done` : `${S.warn} Done (with failures)`;
         console.log(`
 ${C.bold}${C.purple}${edge[0]}${line}${edge[3]}`);
         console.log(`${edge[1]}  ${title.padEnd(48)}${edge[1]}`);
@@ -788,6 +816,7 @@ ${C.bold}${C.purple}${edge[0]}${line}${edge[3]}`);
         const cost = e.payload.totalCostUsd;
         const costStr = cost === void 0 ? "" : `  $${cost.toFixed(2)}`;
         console.log(`  ~ ${"Total".padEnd(nameWidth)}   ${totalStr.padStart(7)}${costStr}`);
+        if (e.payload.routing?.reroutes) console.log("  Execution attempts (audit):");
         for (const r of agentResults) {
           const { icon, color: color2 } = markFor(r.status);
           const dur = `${(r.duration / 1e3).toFixed(1)}s`;
@@ -795,6 +824,12 @@ ${C.bold}${C.purple}${edge[0]}${line}${edge[3]}`);
             `  ${color2}${icon}${C.reset} ${r.agentName.padEnd(nameWidth)}   ${dur.padStart(7)}`
           );
         }
+        if (e.payload.routing?.reroutes) {
+          console.log("  Effective results:");
+          for (const result of e.payload.effectiveAgentResults ?? [])
+            console.log("  " + result.agentId + ": " + result.status);
+        }
+        if (e.payload.routing?.error) console.log("  " + e.payload.routing.error);
         if (e.payload.deliverables && e.payload.deliverables.length > 0) {
           console.log(`
   Deliverables:`);
@@ -893,6 +928,7 @@ function errorMessage(err) {
 // src/commands/resume.ts
 import * as fs5 from "fs";
 import * as path5 from "path";
+import { isSessionRecord } from "@multiclawcli/core";
 function resolveRunDir(runsRoot, target) {
   if (typeof target !== "string" || target === "latest") {
     return latestRunDir(runsRoot);
@@ -928,14 +964,18 @@ function readReport(runDir) {
   }
 }
 function resumeOptionsFromReport(report, requirementOverride) {
-  const latest = new Map(report.agentResults.map((result) => [result.agentId, result]));
+  const latest = new Map(
+    (report.effectiveAgentResults ?? report.agentResults).map((result) => [result.agentId, result])
+  );
   const agents2 = [...latest.keys()].filter((id) => id !== report.acceptance?.reviewer);
   if (agents2.length === 0) {
     throw new Error("The previous run has no agent results \u2014 nothing to resume");
   }
   const sessions2 = {};
   for (const result of latest.values()) {
-    if (result.sessionId) sessions2[result.agentId] = result.sessionId;
+    if (result.session !== void 0 && !isSessionRecord(result.session))
+      throw new Error("Invalid Session metadata for " + result.agentId);
+    if (result.session?.sessionId) sessions2[result.agentId] = result.session;
   }
   const requirement = requirementOverride ?? report.requirement;
   if (requirement === void 0) {
@@ -945,8 +985,7 @@ function resumeOptionsFromReport(report, requirementOverride) {
     requirement,
     resume: {
       agents: agents2,
-      // Absent, not `{}`: core reads a missing `sessions` as "start every agent
-      // fresh", which is exactly the single-agent retry of a failed agent.
+      // No established Session means the fixed retry starts a fresh executor.
       ...Object.keys(sessions2).length > 0 ? { sessions: sessions2 } : {}
     }
   };
@@ -967,6 +1006,7 @@ async function runCommand(requirementArg, options) {
     const { requirement, resume } = resumeOptionsFromReport(report, requirementArg);
     config.workDir = runDir;
     config.resume = resume;
+    config.latestWork = report.work;
     config.context = { ...config.context, requirement };
     config.logDir = path6.join(runDir, `logs-resume-${stamp}`);
     const plan = describeResumePlan({
@@ -1017,6 +1057,8 @@ async function runCommand(requirementArg, options) {
 }
 function printDryRun(preview, workDir) {
   console.log("Dry run \u2014 no pipeline agents will execute.");
+  if (preview.routing)
+    console.log("Route: " + preview.routing.mode + " work=" + preview.routing.workId);
   console.log(`Project: ${preview.name}`);
   console.log(`Work dir: ${workDir}`);
   if (preview.requirement) console.log(`Requirement: ${preview.requirement}`);
@@ -1024,6 +1066,10 @@ function printDryRun(preview, workDir) {
     console.log(`${preview.reply.mode === "ask" ? "Question" : "Reply"}: ${preview.reply.message}`);
     return;
   }
+  for (const session of preview.sessions ?? [])
+    console.log(
+      "Session intent: " + session.agentId + " " + session.action + " \u2014 " + session.reason
+    );
   console.log(`Agents: ${preview.totalAgents}`);
   if (preview.selectionReason) console.log(`Why: ${preview.selectionReason}`);
   for (const stage of preview.stages) {

package/dist/reporters/ConsoleReporter.d.ts

@@ -1,5 +1,6 @@
-import type { EventBus } from "@multiclawcli/core";
+import { type EventBus } from "@multiclawcli/core";
 export declare class ConsoleReporter {
+    private lastRoute?;
     attach(eventBus: EventBus): () => void;
     private handle;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "multiclaw",
-  "version": "0.13.0",
+  "version": "0.14.0",
   "type": "module",
   "bin": {
     "multiclaw": "dist/index.js"
@@ -30,8 +30,8 @@
     "@agentclientprotocol/claude-agent-acp": "^0.95.0",
     "@agentclientprotocol/codex-acp": "^2.2.2",
     "@inquirer/prompts": "^8.7.4",
-    "@multiclawcli/core": "0.13.0",
-    "@multiclawcli/dashboard": "0.13.0",
+    "@multiclawcli/core": "0.14.0",
+    "@multiclawcli/dashboard": "0.14.0",
     "commander": "^15.0.0",
     "jiti": "^2.7.0"
   },