@oeronteros-1/opencode-orchestra 1.0.13 → 1.0.14

package/dist/routing/planner.js

@@ -9,98 +9,96 @@ const PROFILE_WORKERS = {
     migration: ["orch-repo", "orch-tests", "orch-research"],
     ops: ["orch-repo", "orch-research", "orch-tests"],
 };
-const ANALYSTS = new Set(["orch-critic", "orch-security", "orch-visual-review"]);
+const REVIEWERS = new Set(["orch-critic", "orch-security", "orch-visual-review"]);
 export function planTask(profile, secondaryProfiles = [], options = {}) {
-    const maxNodes = options.maxNodes ?? 6;
+    const maxNodes = Math.max(1, options.maxNodes ?? 6);
     const dependencyAware = options.dependencyAware ?? true;
-    const own = PROFILE_WORKERS[profile] ?? [];
-    const level0 = [];
-    const level1 = [];
+    const includeMerger = options.includeMerger ?? dependencyAware;
+    const workerLimit = Math.max(0, maxNodes - (includeMerger ? 1 : 0));
+    const primary = [];
+    const reviewers = [];
     const seen = new Set();
-    for (const worker of own) {
+    const add = (worker) => {
+        if (seen.has(worker) || worker === "orch-merge")
+            return;
         seen.add(worker);
-        (ANALYSTS.has(worker) ? level1 : level0).push(worker);
-    }
-    for (const secondary of secondaryProfiles) {
-        for (const worker of PROFILE_WORKERS[secondary] ?? []) {
-            if (seen.has(worker))
-                continue;
-            seen.add(worker);
-            (ANALYSTS.has(worker) ? level1 : level0).push(worker);
-        }
-    }
-    for (const worker of options.secondaryWorkers ?? []) {
-        if (seen.has(worker))
-            continue;
-        seen.add(worker);
-        (ANALYSTS.has(worker) ? level1 : level0).push(worker);
-    }
-    const trimmedLevel0 = level0.slice(0, Math.max(1, maxNodes));
-    const remaining = maxNodes - trimmedLevel0.length;
-    const trimmedLevel1 = level1.slice(0, Math.max(0, remaining));
+        (REVIEWERS.has(worker) ? reviewers : primary).push(worker);
+    };
+    for (const worker of PROFILE_WORKERS[profile] ?? [])
+        add(worker);
+    for (const secondary of secondaryProfiles)
+        for (const worker of PROFILE_WORKERS[secondary] ?? [])
+            add(worker);
+    for (const worker of options.secondaryWorkers ?? [])
+        add(worker);
+    const selectedPrimary = primary.slice(0, workerLimit);
+    const selectedReviewers = reviewers.slice(0, Math.max(0, workerLimit - selectedPrimary.length));
     const nodes = [];
     const levels = [];
-    if (dependencyAware && trimmedLevel1.length > 0) {
-        const l0 = trimmedLevel0.map((worker, i) => {
-            const node = {
-                id: "n0-" + i,
-                description: "Gather primary evidence for the " + profile + " task using " + worker + ".",
-                worker,
-                dependsOn: [],
-            };
-            nodes.push(node);
-            return node.id;
-        });
-        levels.push(l0);
-        const l1 = trimmedLevel1.map((worker, i) => {
-            const node = {
-                id: "n1-" + i,
-                description: "Cross-check the gathered evidence using " + worker + ".",
-                worker,
-                dependsOn: l0,
-            };
+    const first = selectedPrimary.map((worker, i) => {
+        const node = { id: "n0-" + i, description: "Investigate an independent " + profile + " branch using " + worker + ".", worker, dependsOn: [], role: "specialist" };
+        nodes.push(node);
+        return node.id;
+    });
+    if (first.length)
+        levels.push(first);
+    let evidence = first;
+    if (selectedReviewers.length) {
+        const review = selectedReviewers.map((worker, i) => {
+            const deps = dependencyAware ? first : [];
+            const node = { id: "n1-" + i, description: "Cross-check specialist evidence using " + worker + ".", worker, dependsOn: deps, role: "reviewer" };
             nodes.push(node);
             return node.id;
         });
-        levels.push(l1);
+        if (dependencyAware)
+            levels.push(review);
+        else if (levels[0])
+            levels[0].push(...review);
+        else
+            levels.push(review);
+        evidence = [...first, ...review];
     }
-    else {
-        const flat = [...trimmedLevel0, ...trimmedLevel1].slice(0, maxNodes);
-        const l0 = flat.map((worker, i) => {
-            const node = {
-                id: "n0-" + i,
-                description: "Contribute an independent branch for the " + profile + " task using " + worker + ".",
-                worker,
-                dependsOn: [],
-            };
-            nodes.push(node);
-            return node.id;
-        });
-        levels.push(l0);
+    let mergerNodeId;
+    if (includeMerger) {
+        mergerNodeId = "merge";
+        nodes.push({ id: mergerNodeId, description: "Merge all completed specialist outputs into one evidence-backed handoff, preserving conflicts and provenance.", worker: "orch-merge", dependsOn: evidence, role: "merger" });
+        levels.push([mergerNodeId]);
     }
-    return {
-        nodes,
-        levels,
-        maxParallel: levels.reduce((max, level) => Math.max(max, level.length), 0),
-    };
+    return { nodes, levels, maxParallel: levels.reduce((max, level) => Math.max(max, level.length), 0), ...(mergerNodeId ? { mergerNodeId } : {}) };
 }
 export function validatePlan(plan) {
-    const byId = new Map(plan.nodes.map((n) => [n.id, n]));
-    const position = new Map(plan.nodes.map((n, i) => [n.id, i]));
+    const byId = new Map();
     const problems = [];
     for (const node of plan.nodes) {
-        if (!byId.has(node.id))
-            problems.push("missing node " + node.id);
+        if (byId.has(node.id))
+            problems.push("duplicate node " + node.id);
+        byId.set(node.id, node);
+    }
+    const visiting = new Set(), visited = new Set();
+    const visit = (id) => {
+        if (visiting.has(id)) {
+            problems.push("cycle includes " + id);
+            return;
+        }
+        if (visited.has(id))
+            return;
+        const node = byId.get(id);
+        if (!node)
+            return;
+        visiting.add(id);
         for (const dep of node.dependsOn) {
             if (!byId.has(dep))
-                problems.push("node " + node.id + " references unknown dependency " + dep);
-            else if (dep === node.id)
-                problems.push("node " + node.id + " depends on itself");
-            else if ((position.get(dep) ?? -1) >= (position.get(node.id) ?? 0)) {
-                problems.push("node " + node.id + " has a forward/cyclic dependency on " + dep);
-            }
+                problems.push("node " + id + " references unknown dependency " + dep);
+            else if (dep === id)
+                problems.push("node " + id + " depends on itself");
+            else
+                visit(dep);
         }
-    }
-    return problems;
+        visiting.delete(id);
+        visited.add(id);
+    };
+    for (const node of plan.nodes)
+        visit(node.id);
+    return [...new Set(problems)];
 }
 //# sourceMappingURL=planner.js.map

package/dist/routing/planner.js.map

@@ -1 +1 @@
-{"version":3,"file":"planner.js","sourceRoot":"","sources":["../../src/routing/planner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"planner.js","sourceRoot":"","sources":["../../src/routing/planner.ts"],"names":[],"mappings":"AAmBA,MAAM,eAAe,GAA2C;IAC9D,YAAY,EAAE,CAAC,WAAW,EAAE,eAAe,EAAE,aAAa,CAAC;IAC3D,KAAK,EAAE,CAAC,WAAW,EAAE,YAAY,EAAE,aAAa,CAAC;IACjD,EAAE,EAAE,CAAC,uBAAuB,EAAE,oBAAoB,EAAE,WAAW,CAAC;IAChE,QAAQ,EAAE,CAAC,eAAe,EAAE,WAAW,EAAE,aAAa,CAAC;IACvD,MAAM,EAAE,CAAC,aAAa,EAAE,WAAW,EAAE,YAAY,CAAC;IAClD,QAAQ,EAAE,CAAC,eAAe,EAAE,WAAW,EAAE,aAAa,CAAC;IACvD,WAAW,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,aAAa,CAAC;IACvD,SAAS,EAAE,CAAC,WAAW,EAAE,YAAY,EAAE,eAAe,CAAC;IACvD,GAAG,EAAE,CAAC,WAAW,EAAE,eAAe,EAAE,YAAY,CAAC;CAClD,CAAA;AASD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,oBAAoB,CAAC,CAAC,CAAA;AAEjF,MAAM,UAAU,QAAQ,CAAC,OAAoB,EAAE,oBAAmC,EAAE,EAAE,UAAuB,EAAE;IAC7G,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAA;IACnD,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,IAAI,CAAA;IACvD,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,eAAe,CAAA;IAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACnE,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,MAAM,SAAS,GAAa,EAAE,CAAA;IAC9B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,MAAM,GAAG,GAAG,CAAC,MAAc,EAAE,EAAE;QAC7B,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,MAAM,KAAK,YAAY;YAAE,OAAM;QACvD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CACf;QAAA,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC7D,CAAC,CAAA;IACD,KAAK,MAAM,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE;QAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAChE,KAAK,MAAM,SAAS,IAAI,iBAAiB;QAAE,KAAK,MAAM,MAAM,IAAI,eAAe,CAAC,SAAS,CAAC,IAAI,EAAE;YAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC7G,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,gBAAgB,IAAI,EAAE;QAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAEhE,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAA;IACrD,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAA;IAC/F,MAAM,KAAK,GAAe,EAAE,CAAA;IAC5B,MAAM,MAAM,GAAe,EAAE,CAAA;IAE7B,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC9C,MAAM,IAAI,GAAa,EAAE,EAAE,EAAE,KAAK,GAAG,CAAC,EAAE,WAAW,EAAE,6BAA6B,GAAG,OAAO,GAAG,gBAAgB,GAAG,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAA;QAC3K,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAAC,OAAO,IAAI,CAAC,EAAE,CAAA;IAClC,CAAC,CAAC,CAAA;IACF,IAAI,KAAK,CAAC,MAAM;QAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAEpC,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,IAAI,iBAAiB,CAAC,MAAM,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;YACzC,MAAM,IAAI,GAAa,EAAE,EAAE,EAAE,KAAK,GAAG,CAAC,EAAE,WAAW,EAAE,wCAAwC,GAAG,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;YACzJ,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAAC,OAAO,IAAI,CAAC,EAAE,CAAA;QAClC,CAAC,CAAC,CAAA;QACF,IAAI,eAAe;YAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;aACnC,IAAI,MAAM,CAAC,CAAC,CAAC;YAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAA;;YACxC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACxB,QAAQ,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,MAAM,CAAC,CAAA;IAClC,CAAC;IAED,IAAI,YAAgC,CAAA;IACpC,IAAI,aAAa,EAAE,CAAC;QAClB,YAAY,GAAG,OAAO,CAAA;QACtB,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,WAAW,EAAE,+GAA+G,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;QACzN,MAAM,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAA;IAC7B,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAA;AACjJ,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAc;IACzC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAoB,CAAA;IACxC,MAAM,QAAQ,GAAa,EAAE,CAAA;IAC7B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,EAAE,CAAC,CAAA;QACjE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;IACzB,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,EAAE,OAAO,GAAG,IAAI,GAAG,EAAU,CAAA;IAC/D,MAAM,KAAK,GAAG,CAAC,EAAU,EAAQ,EAAE;QACjC,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC,CAAC;YAAC,OAAM;QAAC,CAAC;QACvE,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,OAAM;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAAC,IAAI,CAAC,IAAI;YAAE,OAAM;QAC5C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAChB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,iCAAiC,GAAG,GAAG,CAAC,CAAA;iBACpF,IAAI,GAAG,KAAK,EAAE;gBAAE,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,EAAE,GAAG,oBAAoB,CAAC,CAAA;;gBAClE,KAAK,CAAC,GAAG,CAAC,CAAA;QACjB,CAAC;QACD,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACtC,CAAC,CAAA;IACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK;QAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;IAC7C,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAA;AAC/B,CAAC"}

package/dist/telemetry/live.d.ts

@@ -0,0 +1,154 @@
+/**
+ * Live orchestration activity feed.
+ *
+ * The OpenCode plugin and the standalone dashboard server run in separate
+ * processes, so live state is bridged over the filesystem exactly like the
+ * usage ledger. The plugin feeds this stream while agents generate (start /
+ * delta / finish) and the dashboard's SSE endpoint re-reads the small snapshot
+ * file on a poll, diffing it by a monotonic sequence number.
+ *
+ * The persisted file is intentionally a full snapshot (active agents + a short
+ * ring of recent events) rather than an unbounded log, so a freshly connected
+ * dashboard client can read the whole thing with no tailing/trimming logic.
+ * The `active` array is authoritative for what is running right now; `recent`
+ * is a rolling event log used to animate the UI. Flushes to disk are throttled,
+ * and start/finish flush immediately so state changes appear promptly.
+ */
+/** Per-million-token USD prices for a resolved model. */
+export interface LiveTokenPrice {
+    input: number;
+    output: number;
+}
+/** An event appended to the stream (start / delta / finish). */
+export type LiveEventKind = "start" | "delta" | "finish";
+export interface LiveEvent {
+    /** Monotonic sequence; used by the dashboard as its diffing cursor. */
+    seq: number;
+    e: LiveEventKind;
+    /** Epoch ms the event was produced. */
+    ts: number;
+    /** Orchestration message id the activity belongs to. */
+    k: string;
+    sessionID?: string | undefined;
+    agent?: string | undefined;
+    model?: string | undefined;
+    provider?: string | undefined;
+    /** Current snippet of what the agent produced (what it is "doing"). */
+    text?: string | undefined;
+    /** USD cost-so-far (delta carries the running estimate; finish the actual). */
+    cost?: number | undefined;
+    /** Tokens-so-far (delta estimate) or finalized tokens (finish). */
+    tokens?: {
+        input: number;
+        output: number;
+        reasoning: number;
+    } | undefined;
+    /** Finalization reason, present on finish events. */
+    finish?: string | undefined;
+    /** Stream-observer confidence + flags, present on flagged deltas. */
+    confidence?: number | undefined;
+    flags?: string[] | undefined;
+}
+/** An agent currently generating. */
+export interface LiveActiveAgent {
+    key: string;
+    sessionID?: string | undefined;
+    agent?: string | undefined;
+    model?: string | undefined;
+    provider?: string | undefined;
+    /** Epoch ms the agent started responding. */
+    startedAt: number;
+    /** Last-seen snippet of the in-progress output. */
+    text: string;
+    /** Estimated USD accrued while still generating. */
+    cost: number;
+    tokens: {
+        input: number;
+        output: number;
+        reasoning: number;
+    };
+    confidence?: number | undefined;
+    flags?: string[] | undefined;
+}
+export interface LiveSnapshot {
+    version: 1;
+    /** Epoch ms the snapshot was last written. */
+    updatedAt: number;
+    /** Maximum sequence emitted so far. */
+    seq: number;
+    /** Agents currently generating. */
+    active: LiveActiveAgent[];
+    /** Rolling event log (newest last). */
+    recent: LiveEvent[];
+}
+export declare function emptyLiveSnapshot(): LiveSnapshot;
+/** Parse the persisted live snapshot; returns an empty snapshot on failure. */
+export declare function parseLiveSnapshot(text: string): LiveSnapshot;
+/** Estimate output tokens from character count (≈4 chars/token). */
+export declare function estimateOutputTokens(chars: number): number;
+/** Estimate live USD accrued from accumulated text + assumed input volume. */
+export declare function estimateLiveCost(chars: number, price: LiveTokenPrice | undefined, assumedInput?: number): {
+    cost: number;
+    input: number;
+    output: number;
+};
+export declare class LiveStream {
+    readonly liveFile: string;
+    private readonly maxRecent;
+    private readonly throttleMs;
+    private readonly estimatePrice;
+    private active;
+    private recent;
+    private seq;
+    private queue;
+    private timer;
+    private lastWrite;
+    private dirty;
+    private enabled;
+    constructor(directory: string, telemetryDirectory: string, enabled: boolean, estimatePrice?: (provider: string | undefined, model: string | undefined) => LiveTokenPrice | undefined, maxRecent?: number, throttleMs?: number);
+    private makeEvent;
+    /** Mark an agent message as started generating. */
+    start(input: {
+        key: string;
+        sessionID?: string | undefined;
+        agent?: string | undefined;
+        provider?: string | undefined;
+        model?: string | undefined;
+        startedAt?: number;
+    }): void;
+    /**
+     * Append generated text for an in-flight agent. Each delta updates the
+     * in-memory state immediately and is appended to the rolling log; the disk
+     * flush is throttled by the class so the dashboard poll stays cheap.
+     */
+    delta(input: {
+        key: string;
+        text: string;
+        sessionID?: string | undefined;
+        agent?: string | undefined;
+        provider?: string | undefined;
+        model?: string | undefined;
+        confidence?: number | undefined;
+        flags?: string[] | undefined;
+    }): void;
+    /** Mark an agent message as finished and remove it from the active set. */
+    finish(input: {
+        key: string;
+        cost: number;
+        tokens?: {
+            input: number;
+            output: number;
+            reasoning: number;
+        } | undefined;
+        finish?: string | undefined;
+        sessionID?: string | undefined;
+        agent?: string | undefined;
+    }): void;
+    /** The current snapshot (before the next disk flush). */
+    current(): LiveSnapshot;
+    private record;
+    private serialize;
+    private scheduleFlush;
+    private flush;
+    dispose(): Promise<void>;
+}

package/dist/telemetry/live.js

@@ -0,0 +1,248 @@
+import { mkdir, rename, writeFile } from "node:fs/promises";
+import path from "node:path";
+const MAX_RECENT = 200;
+const THROTTLE_MS = 450;
+function emptySnapshot() {
+    return { version: 1, updatedAt: 0, seq: 0, active: [], recent: [] };
+}
+export function emptyLiveSnapshot() {
+    return emptySnapshot();
+}
+/** Parse the persisted live snapshot; returns an empty snapshot on failure. */
+export function parseLiveSnapshot(text) {
+    try {
+        const parsed = JSON.parse(text);
+        if (typeof parsed !== "object" || parsed === null)
+            return emptySnapshot();
+        const candidate = parsed;
+        if (candidate.version !== 1)
+            return emptySnapshot();
+        return {
+            version: 1,
+            updatedAt: typeof candidate.updatedAt === "number" ? candidate.updatedAt : 0,
+            seq: typeof candidate.seq === "number" ? candidate.seq : 0,
+            active: Array.isArray(candidate.active) ? candidate.active : [],
+            recent: Array.isArray(candidate.recent) ? candidate.recent : [],
+        };
+    }
+    catch {
+        return emptySnapshot();
+    }
+}
+/** Estimate output tokens from character count (≈4 chars/token). */
+export function estimateOutputTokens(chars) {
+    return Math.max(0, Math.floor(chars / 4));
+}
+/** Estimate live USD accrued from accumulated text + assumed input volume. */
+export function estimateLiveCost(chars, price, assumedInput = 1500) {
+    const output = estimateOutputTokens(chars);
+    const input = assumedInput;
+    let cost = 0;
+    if (price) {
+        cost = (input * price.input + output * price.output) / 1_000_000;
+    }
+    return { cost, input, output };
+}
+export class LiveStream {
+    liveFile;
+    maxRecent;
+    throttleMs;
+    estimatePrice;
+    active = new Map();
+    recent = [];
+    seq = 0;
+    queue = Promise.resolve();
+    timer;
+    lastWrite = 0;
+    dirty = false;
+    enabled;
+    constructor(directory, telemetryDirectory, enabled, estimatePrice = () => undefined, maxRecent = MAX_RECENT, throttleMs = THROTTLE_MS) {
+        this.liveFile = path.resolve(directory, telemetryDirectory, "live.ndjson");
+        this.enabled = enabled;
+        this.maxRecent = maxRecent;
+        this.throttleMs = throttleMs;
+        this.estimatePrice = estimatePrice;
+    }
+    makeEvent(input) {
+        const event = { seq: ++this.seq, ts: Date.now(), ...input };
+        this.recent.push(event);
+        if (this.recent.length > this.maxRecent)
+            this.recent.splice(0, this.recent.length - this.maxRecent);
+        return event;
+    }
+    /** Mark an agent message as started generating. */
+    start(input) {
+        if (!this.enabled)
+            return;
+        if (this.active.has(input.key)) {
+            this.scheduleFlush(true);
+            return;
+        }
+        const price = this.estimatePrice(input.provider, input.model);
+        const est = estimateLiveCost(0, price);
+        this.active.set(input.key, {
+            key: input.key,
+            sessionID: input.sessionID,
+            agent: input.agent,
+            model: input.model,
+            provider: input.provider,
+            startedAt: input.startedAt ?? Date.now(),
+            text: "",
+            cost: est.cost,
+            tokens: { input: est.input, output: 0, reasoning: 0 },
+            lastSeq: this.seq,
+        });
+        this.makeEvent({
+            e: "start",
+            k: input.key,
+            sessionID: input.sessionID,
+            agent: input.agent,
+            model: input.model,
+            provider: input.provider,
+            text: "",
+            cost: 0,
+            tokens: undefined,
+        });
+        this.scheduleFlush(true);
+    }
+    /**
+     * Append generated text for an in-flight agent. Each delta updates the
+     * in-memory state immediately and is appended to the rolling log; the disk
+     * flush is throttled by the class so the dashboard poll stays cheap.
+     */
+    delta(input) {
+        if (!this.enabled)
+            return;
+        const existing = this.active.get(input.key);
+        if (!existing) {
+            // No prior start for this key: synthesize one so the row is visible.
+            this.start({
+                key: input.key,
+                sessionID: input.sessionID,
+                agent: input.agent,
+                provider: input.provider,
+                model: input.model,
+            });
+            return;
+        }
+        if (input.sessionID)
+            existing.sessionID = input.sessionID;
+        if (input.agent)
+            existing.agent = input.agent;
+        if (input.model)
+            existing.model = input.model;
+        if (input.provider)
+            existing.provider = input.provider;
+        const snippet = input.text.length > 240 ? `${input.text.slice(-240)}…` : input.text;
+        existing.text = snippet;
+        existing.confidence = input.confidence;
+        existing.flags = input.flags;
+        existing.lastSeq = this.seq;
+        const price = this.estimatePrice(input.provider ?? existing.provider, input.model ?? existing.model);
+        const est = estimateLiveCost(snippet.length, price);
+        existing.cost = est.cost;
+        existing.tokens = { input: est.input, output: est.output, reasoning: 0 };
+        this.record({
+            e: "delta",
+            k: input.key,
+            sessionID: existing.sessionID,
+            agent: existing.agent,
+            model: input.model ?? existing.model,
+            provider: input.provider ?? existing.provider,
+            text: snippet,
+            cost: existing.cost,
+            tokens: { input: existing.tokens.input, output: existing.tokens.output, reasoning: existing.tokens.reasoning },
+            confidence: input.confidence,
+            flags: input.flags,
+        });
+    }
+    /** Mark an agent message as finished and remove it from the active set. */
+    finish(input) {
+        if (!this.enabled)
+            return;
+        const existing = this.active.get(input.key);
+        this.active.delete(input.key);
+        const tokens = input.tokens ?? existing?.tokens ?? { input: 0, output: 0, reasoning: 0 };
+        this.record({
+            e: "finish",
+            k: input.key,
+            sessionID: input.sessionID ?? existing?.sessionID,
+            agent: input.agent ?? existing?.agent,
+            model: existing?.model,
+            provider: existing?.provider,
+            cost: input.cost,
+            tokens,
+            finish: input.finish,
+        });
+        this.scheduleFlush(true);
+    }
+    /** The current snapshot (before the next disk flush). */
+    current() {
+        return this.serialize();
+    }
+    record(input) {
+        this.makeEvent(input);
+        this.scheduleFlush(false);
+    }
+    serialize() {
+        const active = [...this.active.values()]
+            .map(({ lastSeq: _lastSeq, ...rest }) => rest)
+            .sort((a, b) => a.startedAt - b.startedAt);
+        return {
+            version: 1,
+            updatedAt: this.lastWrite || Date.now(),
+            seq: this.seq,
+            active,
+            recent: [...this.recent],
+        };
+    }
+    scheduleFlush(immediate) {
+        if (!this.enabled)
+            return;
+        this.dirty = true;
+        if (immediate) {
+            if (this.timer) {
+                clearTimeout(this.timer);
+                this.timer = undefined;
+            }
+            void this.flush();
+            return;
+        }
+        if (this.timer)
+            return;
+        const remaining = this.throttleMs - (Date.now() - this.lastWrite);
+        this.timer = setTimeout(() => {
+            this.timer = undefined;
+            void this.flush();
+        }, Math.max(20, remaining));
+    }
+    flush() {
+        this.dirty = false;
+        this.lastWrite = Date.now();
+        const snapshot = this.serialize();
+        this.queue = this.queue.then(async () => {
+            try {
+                const directory = path.dirname(this.liveFile);
+                await mkdir(directory, { recursive: true });
+                const temporary = `${this.liveFile}.tmp`;
+                await writeFile(temporary, JSON.stringify(snapshot) + "\n", "utf8");
+                await rename(temporary, this.liveFile);
+            }
+            catch {
+                // Live telemetry is best-effort; a failure must never break orchestration.
+            }
+        });
+        return this.queue;
+    }
+    async dispose() {
+        if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = undefined;
+        }
+        if (this.dirty)
+            await this.flush();
+        else
+            await this.queue;
+    }
+}
+//# sourceMappingURL=live.js.map

package/dist/telemetry/live.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"live.js","sourceRoot":"","sources":["../../src/telemetry/live.ts"],"names":[],"mappings":"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"}

package/dist/tools.js

@@ -52,7 +52,8 @@ export function createOrchestraTools(config, ledger, pluginStatus, pricing) {
                 const workers = workerPool.slice(0, config.orchestration.maxWorkers);
                 const planOptions = {
                     maxNodes: config.orchestration.maxWorkers,
-                    dependencyAware: config.budget !== "ebobo",
+                    dependencyAware: true,
+                    includeMerger: true,
                     ...(config.budget === "ebobo" ? { secondaryWorkers: Array.from(new Set(enabledWorkers)) } : {}),
                 };
                 const plan = planTask(profile, classification.secondaryProfiles, planOptions);
@@ -99,7 +100,7 @@ export function createOrchestraTools(config, ledger, pluginStatus, pricing) {
                     escalation,
                     ...(estimate ? { estimate } : {}),
                     ...(estimate ? { warning: formatEstimateWarning(estimate, config.pricing.warnThresholdUSD) ?? null } : { warning: null }),
-                    next: "Delegate the full task once to orch-lead with profile=" + profile + ". Let orch-lead dispatch workers per the plan levels: level 0 branches in parallel, then level 1 synthesis." + eboboHint,
+                    next: "Delegate the full task and returned plan once to orch-lead with profile=" + profile + ". Execute ready nodes level-by-level, concurrently within parallelWorkers, then call orch-merge exactly once." + eboboHint,
                 }, null, 2);
             },
         }),