@quintinshaw/pi-dynamic-workflows 1.0.0 → 1.1.0

package/README.md

@@ -116,8 +116,9 @@ Scripts run inside a Node `vm` sandbox. Intentionally unavailable: `Date.now()`,
 
 - **Core runtime** — `agent` / `parallel` / `pipeline` / `phase` / `log` / `budget` in a sandboxed script
 - **Structured output** — JSON-Schema-validated subagent results
+- **Real token & cost accounting** — read from each subagent's SDK session (input / output / total / cost), with a character estimate only as fallback when a provider reports no usage; `budget` gates on the real total
 - **Safety limits** — 1000-agent cap (`maxAgents`), per-agent timeout (`agentTimeoutMs`), recoverable-vs-fatal error classification
-- **Live progress + token display**, `Esc` to abort
+- **Live progress + token/cost display**, `Esc` to abort
 - **Log persistence** to `.pi/workflows/runs/`
 
 ## Roadmap
@@ -125,7 +126,6 @@ Scripts run inside a Node `vm` sandbox. Intentionally unavailable: `Date.now()`,
 Tracked toward closer parity with Claude Code dynamic workflows:
 
 - **Real per-agent / per-phase model routing** (`opts.model`, `meta.phases[].model`)
-- **Real token accounting** via the SDK's session stats (today's display uses an estimate)
 - **Command surface** — `/workflows` (list / status / stop) and reachable background runs
 - **Resume** — journaled results, replay the unchanged prefix, run the rest live
 - **Worktree isolation** for parallel edits, and **bundled `/deep-research`**

package/dist/agent.d.ts

@@ -9,12 +9,27 @@ export interface WorkflowAgentOptions {
     /** Extra system guidance prepended to every subagent task. */
     instructions?: string;
 }
+/** Real token/cost usage for a single subagent run, read from the SDK session. */
+export interface AgentUsage {
+    input: number;
+    output: number;
+    cacheRead: number;
+    cacheWrite: number;
+    total: number;
+    cost: number;
+}
 export interface AgentRunOptions<TSchemaDef extends TSchema | undefined = undefined> {
     label?: string;
     schema?: TSchemaDef;
     tools?: ToolDefinition[];
     instructions?: string;
     signal?: AbortSignal;
+    /**
+     * Called once with this subagent's real usage, read from the session right
+     * before disposal. Fires on both the success and error paths so partial
+     * usage is never lost. `total === 0` means the provider reported no usage.
+     */
+    onUsage?: (usage: AgentUsage) => void;
 }
 export type AgentRunResult<TSchemaDef extends TSchema | undefined> = TSchemaDef extends TSchema ? Static<TSchemaDef> : string;
 export declare class WorkflowAgent {

package/dist/agent.js

@@ -52,6 +52,23 @@ export class WorkflowAgent {
         }
         finally {
             removeAbortListener?.();
+            // Read real usage before disposing — dispose tears down the session state.
+            if (options.onUsage) {
+                try {
+                    const { tokens, cost } = session.getSessionStats();
+                    options.onUsage({
+                        input: tokens.input,
+                        output: tokens.output,
+                        cacheRead: tokens.cacheRead,
+                        cacheWrite: tokens.cacheWrite,
+                        total: tokens.total,
+                        cost,
+                    });
+                }
+                catch {
+                    // Usage is best-effort; never let stats failure mask the real result/error.
+                }
+            }
             session.dispose();
         }
     }

package/dist/display.d.ts

@@ -29,6 +29,7 @@ export interface WorkflowSnapshot {
         input: number;
         output: number;
         total: number;
+        cost?: number;
     };
     runId?: string;
 }

package/dist/display.js

@@ -80,8 +80,10 @@ export function renderWorkflowLines(snapshot, options = {}) {
         : snapshot.runningCount > 0
             ? `, ${snapshot.runningCount} running`
             : "";
-    // Build header with token info
-    const tokenInfo = snapshot.tokenUsage ? ` · ${snapshot.tokenUsage.total.toLocaleString()} tokens` : "";
+    // Build header with token info (and cost when the provider reports it)
+    const usage = snapshot.tokenUsage;
+    const costInfo = usage?.cost ? ` · $${usage.cost.toFixed(4)}` : "";
+    const tokenInfo = usage ? ` · ${usage.total.toLocaleString()} tokens${costInfo}` : "";
     const lines = [
         `◆ Workflow: ${snapshot.name} (${snapshot.doneCount}/${snapshot.agentCount} done${state}${tokenInfo})`,
     ];

package/dist/workflow-tool.js

@@ -160,8 +160,10 @@ export function createWorkflowTool(options = {}) {
             snapshot.durationMs = result.durationMs;
             snapshot = recomputeWorkflowSnapshot(snapshot);
             display.complete(snapshot);
-            // Format token usage
-            const tokenInfo = result.tokenUsage ? `\n\nToken usage: ${result.tokenUsage.total.toLocaleString()} tokens` : "";
+            // Format token usage (include cost when the provider reports it)
+            const tokenInfo = result.tokenUsage
+                ? `\n\nToken usage: ${result.tokenUsage.total.toLocaleString()} tokens${result.tokenUsage.cost ? ` ($${result.tokenUsage.cost.toFixed(4)})` : ""}`
+                : "";
             return {
                 content: [
                     {

package/dist/workflow.d.ts

@@ -42,6 +42,7 @@ export interface WorkflowRunOptions extends WorkflowAgentOptions {
         input: number;
         output: number;
         total: number;
+        cost: number;
     }) => void;
 }
 export interface WorkflowRunResult<T = unknown> {
@@ -56,6 +57,7 @@ export interface WorkflowRunResult<T = unknown> {
         input: number;
         output: number;
         total: number;
+        cost: number;
     };
 }
 export interface AgentOptions<TSchemaDef extends TSchema | undefined = TSchema | undefined> {

package/dist/workflow.js

@@ -23,7 +23,7 @@ export async function runWorkflow(script, options = {}) {
         phases: [],
         agentCount: 0,
         spent: 0,
-        tokenUsage: { input: 0, output: 0, total: 0 },
+        tokenUsage: { input: 0, output: 0, total: 0, cost: 0 },
     };
     const agentRunner = options.agent ?? new WorkflowAgent(options);
     const concurrency = Math.max(1, Math.min(options.concurrency ?? Math.max(1, (globalThis.navigator?.hardwareConcurrency ?? 8) - 2), MAX_CONCURRENCY));
@@ -67,6 +67,20 @@ export async function runWorkflow(script, options = {}) {
             const label = requestedLabel || defaultAgentLabel(assignedPhase, state.agentCount);
             const timeout = agentOptions.timeoutMs ?? agentTimeoutMs;
             options.onAgentStart?.({ label, phase: assignedPhase, prompt });
+            // Captured from the subagent's real session usage; falls back to an
+            // estimate when the provider reports no usage (total === 0).
+            let usage;
+            const recordTokens = (result) => {
+                const tokens = usage && usage.total > 0 ? usage.total : estimateTokens(result) + estimateTokens(prompt);
+                if (usage) {
+                    state.tokenUsage.input += usage.input;
+                    state.tokenUsage.output += usage.output;
+                    state.tokenUsage.cost += usage.cost;
+                }
+                state.tokenUsage.total += tokens;
+                state.spent += tokens;
+                return tokens;
+            };
             try {
                 throwIfAborted();
                 // Run agent with timeout
@@ -75,12 +89,12 @@ export async function runWorkflow(script, options = {}) {
                     schema: agentOptions.schema,
                     signal: options.signal,
                     instructions: buildAgentInstructions(assignedPhase, agentOptions),
+                    onUsage: (u) => {
+                        usage = u;
+                    },
                 }), timeout, `Agent "${label}" timed out after ${timeout}ms`);
                 throwIfAborted();
-                // Estimate token usage
-                const tokens = estimateTokens(result) + estimateTokens(prompt);
-                state.spent += tokens;
-                state.tokenUsage.total += tokens;
+                const tokens = recordTokens(result);
                 options.onAgentEnd?.({ label, phase: assignedPhase, result, tokens });
                 return result;
             }
@@ -89,9 +103,8 @@ export async function runWorkflow(script, options = {}) {
                     throw error;
                 const workflowError = wrapError(error, { agentLabel: label });
                 logger.error(`agent ${label} failed: ${workflowError.message}`);
-                const errorTokens = estimateTokens(prompt);
-                state.tokenUsage.total += errorTokens;
-                options.onAgentEnd?.({ label, phase: assignedPhase, result: null, tokens: errorTokens });
+                const tokens = recordTokens(null);
+                options.onAgentEnd?.({ label, phase: assignedPhase, result: null, tokens });
                 // Return null for recoverable errors
                 if (workflowError.recoverable) {
                     return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintinshaw/pi-dynamic-workflows",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Claude-Code-style dynamic workflow orchestration for Pi.",
   "type": "module",
   "main": "./dist/index.js",

package/src/agent.ts

@@ -21,12 +21,28 @@ export interface WorkflowAgentOptions {
   instructions?: string;
 }
 
+/** Real token/cost usage for a single subagent run, read from the SDK session. */
+export interface AgentUsage {
+  input: number;
+  output: number;
+  cacheRead: number;
+  cacheWrite: number;
+  total: number;
+  cost: number;
+}
+
 export interface AgentRunOptions<TSchemaDef extends TSchema | undefined = undefined> {
   label?: string;
   schema?: TSchemaDef;
   tools?: ToolDefinition[];
   instructions?: string;
   signal?: AbortSignal;
+  /**
+   * Called once with this subagent's real usage, read from the session right
+   * before disposal. Fires on both the success and error paths so partial
+   * usage is never lost. `total === 0` means the provider reported no usage.
+   */
+  onUsage?: (usage: AgentUsage) => void;
 }
 
 export type AgentRunResult<TSchemaDef extends TSchema | undefined> = TSchemaDef extends TSchema
@@ -93,6 +109,22 @@ export class WorkflowAgent {
       return this.lastAssistantText(session.messages) as AgentRunResult<TSchemaDef>;
     } finally {
       removeAbortListener?.();
+      // Read real usage before disposing — dispose tears down the session state.
+      if (options.onUsage) {
+        try {
+          const { tokens, cost } = session.getSessionStats();
+          options.onUsage({
+            input: tokens.input,
+            output: tokens.output,
+            cacheRead: tokens.cacheRead,
+            cacheWrite: tokens.cacheWrite,
+            total: tokens.total,
+            cost,
+          });
+        } catch {
+          // Usage is best-effort; never let stats failure mask the real result/error.
+        }
+      }
       session.dispose();
     }
   }

package/src/display.ts

@@ -32,6 +32,7 @@ export interface WorkflowSnapshot {
     input: number;
     output: number;
     total: number;
+    cost?: number;
   };
   runId?: string;
 }
@@ -143,8 +144,10 @@ export function renderWorkflowLines(snapshot: WorkflowSnapshot, options: Workflo
       : snapshot.runningCount > 0
         ? `, ${snapshot.runningCount} running`
         : "";
-  // Build header with token info
-  const tokenInfo = snapshot.tokenUsage ? ` · ${snapshot.tokenUsage.total.toLocaleString()} tokens` : "";
+  // Build header with token info (and cost when the provider reports it)
+  const usage = snapshot.tokenUsage;
+  const costInfo = usage?.cost ? ` · $${usage.cost.toFixed(4)}` : "";
+  const tokenInfo = usage ? ` · ${usage.total.toLocaleString()} tokens${costInfo}` : "";
   const lines = [
     `◆ Workflow: ${snapshot.name} (${snapshot.doneCount}/${snapshot.agentCount} done${state}${tokenInfo})`,
   ];

package/src/workflow-tool.ts

@@ -198,8 +198,12 @@ export function createWorkflowTool(options: WorkflowToolOptions = {}): ToolDefin
       snapshot = recomputeWorkflowSnapshot(snapshot);
       display.complete(snapshot);
 
-      // Format token usage
-      const tokenInfo = result.tokenUsage ? `\n\nToken usage: ${result.tokenUsage.total.toLocaleString()} tokens` : "";
+      // Format token usage (include cost when the provider reports it)
+      const tokenInfo = result.tokenUsage
+        ? `\n\nToken usage: ${result.tokenUsage.total.toLocaleString()} tokens${
+            result.tokenUsage.cost ? ` ($${result.tokenUsage.cost.toFixed(4)})` : ""
+          }`
+        : "";
 
       return {
         content: [

package/src/workflow.ts

@@ -2,6 +2,7 @@ import vm from "node:vm";
 import type { Node } from "acorn";
 import { parse } from "acorn";
 import type { TSchema } from "typebox";
+import type { AgentUsage } from "./agent.js";
 import { WorkflowAgent, type WorkflowAgentOptions } from "./agent.js";
 import { DEFAULT_AGENT_TIMEOUT_MS, MAX_AGENTS_PER_RUN, MAX_CONCURRENCY } from "./config.js";
 import { WorkflowError, WorkflowErrorCode, wrapError } from "./errors.js";
@@ -38,7 +39,7 @@ export interface WorkflowRunOptions extends WorkflowAgentOptions {
   onPhase?: (title: string) => void;
   onAgentStart?: (event: { label: string; phase?: string; prompt: string }) => void;
   onAgentEnd?: (event: { label: string; phase?: string; result: unknown; tokens?: number }) => void;
-  onTokenUsage?: (usage: { input: number; output: number; total: number }) => void;
+  onTokenUsage?: (usage: { input: number; output: number; total: number; cost: number }) => void;
 }
 
 export interface WorkflowRunResult<T = unknown> {
@@ -53,6 +54,7 @@ export interface WorkflowRunResult<T = unknown> {
     input: number;
     output: number;
     total: number;
+    cost: number;
   };
 }
 
@@ -77,6 +79,7 @@ interface RuntimeState {
     input: number;
     output: number;
     total: number;
+    cost: number;
   };
 }
 
@@ -107,7 +110,7 @@ export async function runWorkflow<T = unknown>(
     phases: [],
     agentCount: 0,
     spent: 0,
-    tokenUsage: { input: 0, output: 0, total: 0 },
+    tokenUsage: { input: 0, output: 0, total: 0, cost: 0 },
   };
 
   const agentRunner = options.agent ?? new WorkflowAgent(options);
@@ -169,6 +172,21 @@ export async function runWorkflow<T = unknown>(
 
       options.onAgentStart?.({ label, phase: assignedPhase, prompt });
 
+      // Captured from the subagent's real session usage; falls back to an
+      // estimate when the provider reports no usage (total === 0).
+      let usage: AgentUsage | undefined;
+      const recordTokens = (result: unknown): number => {
+        const tokens = usage && usage.total > 0 ? usage.total : estimateTokens(result) + estimateTokens(prompt);
+        if (usage) {
+          state.tokenUsage.input += usage.input;
+          state.tokenUsage.output += usage.output;
+          state.tokenUsage.cost += usage.cost;
+        }
+        state.tokenUsage.total += tokens;
+        state.spent += tokens;
+        return tokens;
+      };
+
       try {
         throwIfAborted();
 
@@ -179,6 +197,9 @@ export async function runWorkflow<T = unknown>(
             schema: agentOptions.schema,
             signal: options.signal,
             instructions: buildAgentInstructions(assignedPhase, agentOptions),
+            onUsage: (u: AgentUsage) => {
+              usage = u;
+            },
           } as any),
           timeout,
           `Agent "${label}" timed out after ${timeout}ms`,
@@ -186,11 +207,7 @@ export async function runWorkflow<T = unknown>(
 
         throwIfAborted();
 
-        // Estimate token usage
-        const tokens = estimateTokens(result) + estimateTokens(prompt);
-        state.spent += tokens;
-        state.tokenUsage.total += tokens;
-
+        const tokens = recordTokens(result);
         options.onAgentEnd?.({ label, phase: assignedPhase, result, tokens });
         return result;
       } catch (error) {
@@ -198,9 +215,8 @@ export async function runWorkflow<T = unknown>(
 
         const workflowError = wrapError(error, { agentLabel: label });
         logger.error(`agent ${label} failed: ${workflowError.message}`);
-        const errorTokens = estimateTokens(prompt);
-        state.tokenUsage.total += errorTokens;
-        options.onAgentEnd?.({ label, phase: assignedPhase, result: null, tokens: errorTokens });
+        const tokens = recordTokens(null);
+        options.onAgentEnd?.({ label, phase: assignedPhase, result: null, tokens });
 
         // Return null for recoverable errors
         if (workflowError.recoverable) {