pi-extensible-workflows 3.4.0 → 3.4.1

package/dist/src/agent-execution.js

@@ -17,6 +17,7 @@ function text(message) {
         return "";
     return message.content.filter((part) => typeof part === "object" && part !== null && "type" in part && part.type === "text" && "text" in part && typeof part.text === "string").map((part) => part.text).join("");
 }
+function isEmptyAbortedAssistant(message) { return message?.stopReason === "aborted" && Array.isArray(message.content) && message.content.length === 0; }
 function hasToolCall(message) {
     return typeof message === "object" && message !== null && Array.isArray(message.content) && message.content.some((part) => typeof part === "object" && part !== null && part.type === "toolCall");
 }
@@ -145,6 +146,11 @@ export async function createLocalPiSession(input) {
     });
 }
 function workflowAgentMessage(message) { return message ? { role: message.role, ...(message.content === undefined ? {} : { content: message.content }), ...(message.stopReason === undefined ? {} : { stopReason: message.stopReason }), ...(message.errorMessage === undefined ? {} : { errorMessage: message.errorMessage }), ...(message.usage === undefined ? {} : { usage: message.usage }) } : undefined; }
+function latestUsableAssistant(messages) { for (let index = messages.length - 1; index >= 0; index -= 1) {
+    const candidate = workflowAgentMessage(messages[index]);
+    if (candidate?.role === "assistant" && !isEmptyAbortedAssistant(candidate))
+        return candidate;
+} return undefined; }
 function workflowAgentStats(stats) { return { tokens: { input: stats.tokens.input, output: stats.tokens.output, cacheRead: stats.tokens.cacheRead, cacheWrite: stats.tokens.cacheWrite, total: stats.tokens.total }, cost: stats.cost }; }
 function workflowAgentState(native, prepared) {
     const tools = native.agent?.state.tools.map(({ name }) => name) ?? prepared.tools;
@@ -173,11 +179,11 @@ export async function createLocalWorkflowAgentSession(prepared, context) {
         getState: () => Object.freeze(workflowAgentState(native, prepared)),
         getSessionStats: () => workflowAgentStats(native.getSessionStats()),
         subscribe(listener) { listener({ type: "state_changed", state: workflowAgentState(native, prepared) }); return native.subscribe?.((event) => { listener(localSessionEvent(event)); }) ?? (() => undefined); },
-        getLastAssistant: () => workflowAgentMessage([...native.messages].reverse().find((message) => message.role === "assistant")),
+        getLastAssistant: () => latestUsableAssistant(native.messages),
         async prompt(text) {
             if (disposed)
                 throw new WorkflowError("INTERNAL_ERROR", "Local workflow session is disposed");
-            const prompt = Promise.resolve().then(async () => { await native.prompt(text); const assistant = workflowAgentMessage([...native.messages].reverse().find((message) => message.role === "assistant")); return assistant ? { assistant } : {}; });
+            const prompt = Promise.resolve().then(async () => { await native.prompt(text); const assistant = latestUsableAssistant(native.messages); return assistant ? { assistant } : {}; });
             prompting = prompt;
             try {
                 return await prompt;
@@ -477,11 +483,20 @@ export class WorkflowAgentExecutor {
                     setupSummary = { ...setupSummary, disabledAgentResources: resourcePolicySummary(setup.sessionInput.resourcePolicy) };
                 const activeSession = session;
                 let lastAssistant;
+                const acceptAssistant = (candidate) => {
+                    if (isEmptyAbortedAssistant(candidate)) {
+                        const previous = activeSession.getLastAssistant?.();
+                        if (previous && !isEmptyAbortedAssistant(previous))
+                            lastAssistant = previous;
+                    }
+                    else if (candidate)
+                        lastAssistant = candidate;
+                };
                 const recoverTerminal = () => recoverTerminalProviderError(activeSession, options.label, options.providerErrorRecovery, async () => { try {
-                    lastAssistant = (await promptWithProviderPause(activeSession, providerContinuationPrompt, remaining(options.timeoutMs, started), attemptSignal, this.root.providerPause)).assistant;
+                    acceptAssistant((await promptWithProviderPause(activeSession, providerContinuationPrompt, remaining(options.timeoutMs, started), attemptSignal, this.root.providerPause)).assistant);
                 }
                 catch (error) {
-                    lastAssistant = activeSession.getLastAssistant?.() ?? lastAssistant;
+                    acceptAssistant(activeSession.getLastAssistant?.() ?? lastAssistant);
                     if (!hasSchemaResult())
                         throw error;
                 } }, () => lastAssistant);
@@ -489,10 +504,10 @@ export class WorkflowAgentExecutor {
                     let promptFailed = false;
                     let promptError;
                     try {
-                        lastAssistant = (await promptWithProviderPause(activeSession, prompt, remaining(options.timeoutMs, started), attemptSignal, this.root.providerPause)).assistant;
+                        acceptAssistant((await promptWithProviderPause(activeSession, prompt, remaining(options.timeoutMs, started), attemptSignal, this.root.providerPause)).assistant);
                     }
                     catch (error) {
-                        lastAssistant = activeSession.getLastAssistant?.() ?? lastAssistant;
+                        acceptAssistant(activeSession.getLastAssistant?.() ?? lastAssistant);
                         promptFailed = true;
                         promptError = error;
                     }
@@ -556,7 +571,7 @@ export class WorkflowAgentExecutor {
                         activity = undefined;
                         shouldReport = activityChanged(previousActivity);
                         if (event.message?.role === "assistant") {
-                            lastAssistant = event.message;
+                            acceptAssistant(event.message);
                             const needsMoreWork = hasToolCall(event.message);
                             const final = !needsMoreWork || (options.schema !== undefined && hasSchemaResult());
                             if (!budgetError) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-extensible-workflows",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Deterministic multi-agent workflow orchestration for Pi",
   "homepage": "https://vekexasia.github.io/pi-extensible-workflows/",
   "repository": {
@@ -33,7 +33,7 @@
     "inspect": "node dist/src/cli.js inspect",
     "lint": "eslint .",
     "test": "npm run build && TEST_FILES='dist/test/*.test.js' npm run test:run",
-    "test:run": "tmp=$(mktemp -d); trap 'rm -rf \"$tmp\"' EXIT; TMPDIR=\"$tmp\" node --test --test-concurrency=1 $TEST_FILES",
+    "test:run": "tmp=$(mktemp -d); trap 'rm -rf \"$tmp\"' EXIT; TMPDIR=\"$tmp\" node --test --test-concurrency=1 --test-reporter=dot $TEST_FILES",
     "acceptance": "npm run build && TEST_FILES='dist/test/runtime-acceptance.test.js' npm run test:run",
     "docs:check": "node scripts/check-docs.mjs",
     "check": "npm run lint && npm test && npm run docs:check",

package/src/agent-execution.ts

@@ -94,6 +94,7 @@ function text(message: WorkflowAgentMessage | undefined): string {
   if (!message || !Array.isArray(message.content)) return "";
   return message.content.filter((part: unknown): part is { type: "text"; text: string } => typeof part === "object" && part !== null && "type" in part && part.type === "text" && "text" in part && typeof part.text === "string").map((part) => part.text).join("");
 }
+function isEmptyAbortedAssistant(message: WorkflowAgentMessage | undefined): boolean { return message?.stopReason === "aborted" && Array.isArray(message.content) && message.content.length === 0; }
 
 function hasToolCall(message: unknown): boolean {
   return typeof message === "object" && message !== null && Array.isArray((message as { content?: unknown }).content) && (message as { content: unknown[] }).content.some((part) => typeof part === "object" && part !== null && (part as { type?: unknown }).type === "toolCall");
@@ -205,6 +206,7 @@ export async function createLocalPiSession(input: SessionInput): Promise<PiSessi
   }) as unknown as PiSession;
 }
 function workflowAgentMessage(message: AgentMessage | undefined): WorkflowAgentMessage | undefined { return message ? { role: message.role, ...(message.content === undefined ? {} : { content: message.content }), ...(message.stopReason === undefined ? {} : { stopReason: message.stopReason }), ...(message.errorMessage === undefined ? {} : { errorMessage: message.errorMessage }), ...(message.usage === undefined ? {} : { usage: message.usage }) } : undefined; }
+function latestUsableAssistant(messages: readonly AgentMessage[]): WorkflowAgentMessage | undefined { for (let index = messages.length - 1; index >= 0; index -= 1) { const candidate = workflowAgentMessage(messages[index]); if (candidate?.role === "assistant" && !isEmptyAbortedAssistant(candidate)) return candidate; } return undefined; }
 function workflowAgentStats(stats: ReturnType<PiSession["getSessionStats"]>): WorkflowAgentSessionStats { return { tokens: { input: stats.tokens.input, output: stats.tokens.output, cacheRead: stats.tokens.cacheRead, cacheWrite: stats.tokens.cacheWrite, total: stats.tokens.total }, cost: stats.cost }; }
 function workflowAgentState(native: PiSession, prepared: Readonly<PreparedAgentSession>): WorkflowAgentSessionState {
   const tools = native.agent?.state.tools.map(({ name }) => name) ?? prepared.tools;
@@ -233,10 +235,10 @@ export async function createLocalWorkflowAgentSession(prepared: Readonly<Prepare
     getState: () => Object.freeze(workflowAgentState(native, prepared)),
     getSessionStats: () => workflowAgentStats(native.getSessionStats()),
     subscribe(listener: (event: WorkflowAgentSessionEvent) => void) { listener({ type: "state_changed", state: workflowAgentState(native, prepared) }); return native.subscribe?.((event) => { listener(localSessionEvent(event)); }) ?? (() => undefined); },
-    getLastAssistant: () => workflowAgentMessage([...native.messages].reverse().find((message) => message.role === "assistant")),
+    getLastAssistant: () => latestUsableAssistant(native.messages),
     async prompt(text: string) {
       if (disposed) throw new WorkflowError("INTERNAL_ERROR", "Local workflow session is disposed");
-      const prompt = Promise.resolve().then(async () => { await native.prompt(text); const assistant = workflowAgentMessage([...native.messages].reverse().find((message) => message.role === "assistant")); return assistant ? { assistant } : {}; });
+      const prompt = Promise.resolve().then(async () => { await native.prompt(text); const assistant = latestUsableAssistant(native.messages); return assistant ? { assistant } : {}; });
       prompting = prompt;
       try { return await prompt; } finally { if (prompting === prompt) prompting = undefined; }
     },
@@ -480,11 +482,17 @@ export class WorkflowAgentExecutor {
         if (setup.sessionInput.resourcePolicy) setupSummary = { ...setupSummary, disabledAgentResources: resourcePolicySummary(setup.sessionInput.resourcePolicy) };
         const activeSession = session;
         let lastAssistant: WorkflowAgentMessage | undefined;
-        const recoverTerminal = () => recoverTerminalProviderError(activeSession, options.label, options.providerErrorRecovery, async () => { try { lastAssistant = (await promptWithProviderPause(activeSession, providerContinuationPrompt, remaining(options.timeoutMs, started), attemptSignal, this.root.providerPause)).assistant; } catch (error) { lastAssistant = (activeSession as WorkflowAgentSession & { getLastAssistant?: () => WorkflowAgentMessage | undefined }).getLastAssistant?.() ?? lastAssistant; if (!hasSchemaResult()) throw error; } }, () => lastAssistant);
+        const acceptAssistant = (candidate: WorkflowAgentMessage | undefined) => {
+          if (isEmptyAbortedAssistant(candidate)) {
+            const previous = (activeSession as WorkflowAgentSession & { getLastAssistant?: () => WorkflowAgentMessage | undefined }).getLastAssistant?.();
+            if (previous && !isEmptyAbortedAssistant(previous)) lastAssistant = previous;
+          } else if (candidate) lastAssistant = candidate;
+        };
+        const recoverTerminal = () => recoverTerminalProviderError(activeSession, options.label, options.providerErrorRecovery, async () => { try { acceptAssistant((await promptWithProviderPause(activeSession, providerContinuationPrompt, remaining(options.timeoutMs, started), attemptSignal, this.root.providerPause)).assistant); } catch (error) { acceptAssistant((activeSession as WorkflowAgentSession & { getLastAssistant?: () => WorkflowAgentMessage | undefined }).getLastAssistant?.() ?? lastAssistant); if (!hasSchemaResult()) throw error; } }, () => lastAssistant);
         const promptAndRecover = async (prompt: string): Promise<void> => {
           let promptFailed = false;
           let promptError: unknown;
-          try { lastAssistant = (await promptWithProviderPause(activeSession, prompt, remaining(options.timeoutMs, started), attemptSignal, this.root.providerPause)).assistant; } catch (error) { lastAssistant = (activeSession as WorkflowAgentSession & { getLastAssistant?: () => WorkflowAgentMessage | undefined }).getLastAssistant?.() ?? lastAssistant; promptFailed = true; promptError = error; }
+          try { acceptAssistant((await promptWithProviderPause(activeSession, prompt, remaining(options.timeoutMs, started), attemptSignal, this.root.providerPause)).assistant); } catch (error) { acceptAssistant((activeSession as WorkflowAgentSession & { getLastAssistant?: () => WorkflowAgentMessage | undefined }).getLastAssistant?.() ?? lastAssistant); promptFailed = true; promptError = error; }
           const recovered = await recoverTerminal();
           if (promptFailed && !hasSchemaResult() && !recovered) throw promptError;
         };
@@ -519,7 +527,7 @@ export class WorkflowAgentExecutor {
             activity = undefined;
             shouldReport = activityChanged(previousActivity);
             if (event.message?.role === "assistant") {
-              lastAssistant = event.message;
+              acceptAssistant(event.message);
               const needsMoreWork = hasToolCall(event.message);
               const final = !needsMoreWork || (options.schema !== undefined && hasSchemaResult());
               if (!budgetError) { try { options.budget?.afterTurn(accounting(activeSession.getSessionStats()), final); if (!final) { const instruction = options.budget?.instruction(); if (instruction) void activeSession.steer(instruction); } } catch (error) { budgetError ??= error instanceof WorkflowError ? error : new WorkflowError("BUDGET_EXHAUSTED", error instanceof Error ? error.message : String(error)); void activeSession.abort(); } }