@cydm/pie 1.0.14 → 1.0.15

package/dist/chunks/{src-LZC56DRG.js → src-6WPNVGT2.js}

@@ -3,7 +3,8 @@ import {
   Agent,
   agentLoop,
   agentLoopContinue
-} from "./chunk-D7NAXU7F.js";
+} from "./chunk-VE2HDCNB.js";
+import "./chunk-5DA2D3K2.js";
 import "./chunk-TG2EQLX2.js";
 export {
   Agent,

package/dist/chunks/test-stream-ZSKNLUEJ.js

@@ -0,0 +1,94 @@
+import { createRequire as __createRequire } from "node:module"; const require = __createRequire(import.meta.url);
+import {
+  EventStream
+} from "./chunk-5DA2D3K2.js";
+import "./chunk-TG2EQLX2.js";
+
+// src/app/test-stream.ts
+function createAssistantMessage(model, text, stopReason = "stop", errorMessage) {
+  return {
+    role: "assistant",
+    content: [{ type: "text", text }],
+    api: model.api,
+    provider: model.provider,
+    model: model.id,
+    usage: {
+      input: 1,
+      output: text ? 1 : 0,
+      cacheRead: 0,
+      cacheWrite: 0,
+      totalTokens: text ? 2 : 1,
+      cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
+    },
+    stopReason,
+    errorMessage,
+    timestamp: Date.now()
+  };
+}
+function parseMockStreamSequence(value) {
+  const parsed = JSON.parse(value);
+  if (!Array.isArray(parsed)) {
+    throw new Error("PIE_TEST_MOCK_STREAM_SEQUENCE must be a JSON array");
+  }
+  return parsed.map((item) => {
+    if (!item || typeof item !== "object") {
+      throw new Error("PIE_TEST_MOCK_STREAM_SEQUENCE entries must be objects");
+    }
+    const record = item;
+    if (record.type === "error" && typeof record.error === "string") {
+      return {
+        type: "error",
+        error: record.error,
+        partialText: typeof record.partialText === "string" ? record.partialText : void 0
+      };
+    }
+    if (record.type === "text" && typeof record.text === "string") {
+      return { type: "text", text: record.text };
+    }
+    throw new Error("PIE_TEST_MOCK_STREAM_SEQUENCE entries must be text or error steps");
+  });
+}
+function createTestStreamFnFromSequenceEnv(value = process.env.PIE_TEST_MOCK_STREAM_SEQUENCE) {
+  if (!value) {
+    return void 0;
+  }
+  const steps = parseMockStreamSequence(value);
+  let callIndex = 0;
+  return async (model) => {
+    const step = steps[Math.min(callIndex, steps.length - 1)];
+    callIndex += 1;
+    const stream = new EventStream(
+      (event) => event.type === "done" || event.type === "error",
+      (event) => event.type === "done" ? event.message : event.error
+    );
+    queueMicrotask(() => {
+      if (!step) {
+        const message2 = createAssistantMessage(model, "");
+        stream.push({ type: "done", reason: "stop", message: message2 });
+        return;
+      }
+      if (step.type === "error") {
+        if (step.partialText) {
+          const partial = createAssistantMessage(model, step.partialText);
+          stream.push({ type: "start", partial });
+          stream.push({ type: "text_start", contentIndex: 0, partial });
+          stream.push({ type: "text_delta", contentIndex: 0, delta: step.partialText, partial });
+          stream.push({ type: "text_end", contentIndex: 0, content: step.partialText, partial });
+        }
+        const error = createAssistantMessage(model, "", "error", step.error);
+        stream.push({ type: "error", reason: "error", error });
+        return;
+      }
+      const message = createAssistantMessage(model, step.text);
+      stream.push({ type: "start", partial: message });
+      stream.push({ type: "text_start", contentIndex: 0, partial: message });
+      stream.push({ type: "text_delta", contentIndex: 0, delta: step.text, partial: message });
+      stream.push({ type: "text_end", contentIndex: 0, content: step.text, partial: message });
+      stream.push({ type: "done", reason: "stop", message });
+    });
+    return stream;
+  };
+}
+export {
+  createTestStreamFnFromSequenceEnv
+};

package/dist/cli.js

@@ -14,7 +14,7 @@ import {
   getSettingsPath,
   getThemesDir,
   migrateConfigFromAgentDir
-} from "./chunks/chunk-EFG2MQFD.js";
+} from "./chunks/chunk-55RUSXEA.js";
 import {
   AGENTS_CONTEXT_FILE_NAME,
   AgentSessionController,
@@ -52,7 +52,8 @@ import {
   selectToolsForRuntimePolicy,
   shouldPreserveExecutionStateForUserText,
   supersedeExecutionState
-} from "./chunks/chunk-LF5Q7BVU.js";
+} from "./chunks/chunk-R5LYKDKA.js";
+import "./chunks/chunk-VE2HDCNB.js";
 import {
   Deref,
   Errors,
@@ -86,7 +87,7 @@ import {
   setLogger,
   sortToolModelCandidatesByCapability,
   type_exports
-} from "./chunks/chunk-D7NAXU7F.js";
+} from "./chunks/chunk-5DA2D3K2.js";
 import {
   resolveCliProjectRoot
 } from "./chunks/chunk-NTYHFBUA.js";
@@ -64043,6 +64044,34 @@ function buildCliSystemPrompt(options) {
   ].filter(Boolean).join("\n\n");
 }
 
+// src/runtime/retry-policy.ts
+var TRANSIENT_MODEL_ERROR_PATTERN = /overloaded|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error|connection.?refused|other side closed|fetch failed|upstream.?connect|reset before headers|terminated|retry delay|sse stream aborted|sse stream closed before end|sse stream ended before response completed/i;
+var USER_ABORT_PATTERN = /request was aborted/i;
+var CLI_RETRY_MAX_RETRIES = 3;
+var CLI_RETRY_BASE_DELAY_MS = 2e3;
+function isCliContextOverflowError(errorMessage3) {
+  return /context length exceeded|context_length_exceeded|maximum context length|maximum context size|too many tokens|input.*too long|prompt.*too long|context window|token limit exceeded|exceeds.{0,20}context/i.test(
+    errorMessage3
+  );
+}
+function isCliRetryableError(errorMessage3) {
+  if (isCliContextOverflowError(errorMessage3)) {
+    return false;
+  }
+  if (USER_ABORT_PATTERN.test(errorMessage3)) {
+    return false;
+  }
+  return TRANSIENT_MODEL_ERROR_PATTERN.test(errorMessage3);
+}
+function getCliRetryBaseDelayMs() {
+  const override = process.env.PIE_TEST_CLI_RETRY_BASE_DELAY_MS;
+  if (!override) {
+    return CLI_RETRY_BASE_DELAY_MS;
+  }
+  const parsed = Number(override);
+  return Number.isFinite(parsed) && parsed >= 0 ? parsed : CLI_RETRY_BASE_DELAY_MS;
+}
+
 // src/runtime/interactive-context-ui.ts
 function calculateContextUsage(host) {
   const messages = host.agent?.state.messages ?? [];
@@ -64266,9 +64295,7 @@ function setupAutocomplete(host) {
   host.editor.setAutocompleteProvider(provider);
 }
 function isContextOverflowError(errorMessage3) {
-  return /context length exceeded|context_length_exceeded|maximum context length|maximum context size|too many tokens|input.*too long|prompt.*too long|context window|token limit exceeded|exceeds.{0,20}context/i.test(
-    errorMessage3
-  );
+  return isCliContextOverflowError(errorMessage3);
 }
 function shouldAutoCompact(host, contextTokens, contextWindow) {
   if (!host.options.settingsManager.getAutoCompactEnabled()) return false;
@@ -64277,9 +64304,7 @@ function shouldAutoCompact(host, contextTokens, contextWindow) {
   return contextTokens > contextWindow - reserveTokens;
 }
 function isRetryableError(errorMessage3) {
-  return /overloaded|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error|connection.?refused|other side closed|fetch failed|upstream.?connect|reset before headers|terminated|retry delay/i.test(
-    errorMessage3
-  );
+  return isCliRetryableError(errorMessage3);
 }
 function isInvalidFileReferenceError(errorMessage3) {
   return /not the owner of this file|owner of this file|invalid_authentication_error/i.test(
@@ -64778,9 +64803,9 @@ function createInteractiveAgentSessionController(host) {
     },
     getAutoContinueMessage: () => host.getTodoAutoContinueMessage(),
     retry: {
-      isRetryableError: (errorMessage3) => !host._isContextOverflowError(errorMessage3) && host._isRetryableError(errorMessage3),
-      maxRetries: 3,
-      baseDelayMs: 2e3
+      isRetryableError: (errorMessage3) => !host._isContextOverflowError(errorMessage3) && isCliRetryableError(errorMessage3),
+      maxRetries: CLI_RETRY_MAX_RETRIES,
+      baseDelayMs: getCliRetryBaseDelayMs()
     },
     compaction: {
       compact: async ({ messages }) => createAutoCompactionResult(host, messages)
@@ -66739,7 +66764,7 @@ var InteractiveMode = class {
     if (savedLevel) {
       this.thinkingLevel = savedLevel;
     }
-    const { Agent } = await import("./chunks/src-LZC56DRG.js");
+    const { Agent } = await import("./chunks/src-6WPNVGT2.js");
     const activeSession = this.sessionManager.getActiveSession();
     this.agent = new Agent({
       initialState: {
@@ -67303,6 +67328,12 @@ function createNoOpExtensionUIContext() {
     custom: async () => void 0
   };
 }
+function readAssistantError(message) {
+  if (message.role !== "assistant") {
+    return "";
+  }
+  return message.errorMessage || "assistant response failed";
+}
 async function loadPrintModeExtensions(params) {
   const uiContext = createNoOpExtensionUIContext();
   const executionState = new ExecutionStateManager();
@@ -67400,7 +67431,7 @@ async function runPrintMode(params) {
 `);
     console.log("Assistant: ");
   }
-  const { Agent: AgentClass } = await import("./chunks/src-LZC56DRG.js");
+  const { Agent: AgentClass } = await import("./chunks/src-6WPNVGT2.js");
   let agent;
   const printModeExtensions = await loadPrintModeExtensions({
     cwd: runtime.cwd,
@@ -67437,8 +67468,10 @@ async function runPrintMode(params) {
       tools: printModeTools,
       thinkingLevel: "off"
     },
-    apiKey: runtime.apiKey
+    apiKey: runtime.apiKey,
+    streamFn: params.streamFn
   });
+  const sessionTrace = new SessionTraceWriter(runtime.paths.sessionsDir, runtime.sessionManager);
   const agentSessionController = new AgentSessionController({
     agent,
     sessionManager: runtime.sessionManager,
@@ -67458,9 +67491,25 @@ async function runPrintMode(params) {
         systemPrompt: result.systemPrompt ?? context.baseSystemPrompt ?? baseSystemPrompt,
         messages: result.messages?.length ? [...context.messages, ...result.messages] : context.messages
       };
+    },
+    retry: {
+      isRetryableError: isCliRetryableError,
+      maxRetries: CLI_RETRY_MAX_RETRIES,
+      baseDelayMs: getCliRetryBaseDelayMs()
+    },
+    onEvent: (event) => {
+      sessionTrace.noteRuntimeEvent(event.type, event);
+      if (event.type === "retry_scheduled") {
+        console.error(`Transient request error: ${event.errorMessage}. Retrying in ${event.delayMs / 1e3}s (${event.attempt}/${event.maxRetries}).`);
+      } else if (event.type === "retry_start") {
+        console.error(`Retrying request (${event.attempt}/${event.maxRetries})...`);
+      } else if (event.type === "retry_succeeded") {
+        console.error(`Retry succeeded after ${event.attempts} attempt${event.attempts === 1 ? "" : "s"}.`);
+      } else if (event.type === "retry_exhausted") {
+        console.error(`Request failed after ${event.maxRetries} retries: ${event.errorMessage}`);
+      }
     }
   });
-  const sessionTrace = new SessionTraceWriter(runtime.paths.sessionsDir, runtime.sessionManager);
   sessionTrace.notePendingUserText(params.initialPrompt);
   attachAgentEventsToSessionTrace({ agent, trace: sessionTrace });
   agent.setTools(wrapToolsWithExtensions(agent.state.tools, printModeExtensions.runner));
@@ -67470,19 +67519,37 @@ async function runPrintMode(params) {
     await agentSessionController.prompt(params.initialPrompt, { source: "print" });
     sessionTrace.noteDispatchSettled({ mode: "print" });
     sessionTrace.noteWaitForIdleStart({ mode: "print" });
-    await agentSessionController.waitForIdle();
+    await agentSessionController.waitForSettled();
     sessionTrace.noteWaitForIdleSettled({ mode: "print" });
     const messages = agent.state.messages;
     const lastMessage = messages[messages.length - 1];
     let assistantText = "";
+    let assistantError = "";
     if (lastMessage?.role === "assistant") {
       for (const content of lastMessage.content) {
         if (typeof content === "object" && "type" in content && content.type === "text" && "text" in content) {
           assistantText += content.text;
         }
       }
+      if (lastMessage.stopReason === "error" || lastMessage.stopReason === "aborted") {
+        assistantError = readAssistantError(lastMessage);
+      }
     }
-    if (params.jsonOutput) {
+    if (assistantError) {
+      process.exitCode = 1;
+      if (params.jsonOutput) {
+        console.log(
+          JSON.stringify({
+            ok: false,
+            error: assistantError,
+            sessionId: runtime.sessionManager.getActiveSession()?.id,
+            provider: runtime.provider,
+            modelId: runtime.modelId
+          })
+        );
+      }
+      console.error("Error:", assistantError);
+    } else if (params.jsonOutput) {
       console.log(
         JSON.stringify({
           ok: true,
@@ -67606,6 +67673,13 @@ function assistantTextFromAgent(agent) {
   }
   return text;
 }
+function assistantErrorFromAgent(agent) {
+  const messages = agent?.state.messages ?? [];
+  const lastMessage = messages[messages.length - 1];
+  if (lastMessage?.role !== "assistant") return "";
+  if (lastMessage.stopReason !== "error" && lastMessage.stopReason !== "aborted") return "";
+  return lastMessage.errorMessage || "assistant response failed";
+}
 function readProgressText(value) {
   return typeof value === "string" ? value : "";
 }
@@ -67712,6 +67786,7 @@ async function runJsonEventsMode(params) {
   let disposeAgentSubscription;
   let disposeSemanticSubscription;
   let trace;
+  let lastRetryEvent;
   const noProgressTimeoutMs = Number(process.env.PIE_JSON_EVENTS_NO_PROGRESS_MS || 6e5);
   const mockResponseDelayMs = Number(process.env.PIE_TEST_MOCK_RESPONSE_DELAY_MS || 0);
   writeEvent({ type: "agent.ready", sessionId });
@@ -67729,9 +67804,11 @@ async function runJsonEventsMode(params) {
       activeTurn.lastActivityAt = Date.now();
     }
   }
-  function display(chunk) {
+  function display(chunk, options) {
     if (!activeTurn || !chunk) return;
-    activeTurn.summary += chunk;
+    if (options?.appendToSummary !== false) {
+      activeTurn.summary += chunk;
+    }
     touch();
     writeEvent({
       type: "display.output",
@@ -67747,7 +67824,7 @@ async function runJsonEventsMode(params) {
     turn.finalized = true;
     switch (kind) {
       case "completed":
-        writeEvent({ type: "turn.completed", sessionId: turn.sessionId, turnId: turn.turnId, summary: turn.summary.trim() });
+        writeEvent({ type: "turn.completed", sessionId: turn.sessionId, turnId: turn.turnId, summary: (detail ?? turn.summary).trim() });
         break;
       case "failed":
         writeEvent({ type: "turn.failed", sessionId: turn.sessionId, turnId: turn.turnId, error: detail || "turn failed" });
@@ -67783,7 +67860,7 @@ async function runJsonEventsMode(params) {
           const progressText = extractJsonEventsToolProgressText(event.partialResult);
           if (progressText) {
             display(progressText.endsWith("\n") ? progressText : `${progressText}
-`);
+`, { appendToSummary: false });
           }
         }
         break;
@@ -67804,6 +67881,70 @@ async function runJsonEventsMode(params) {
         break;
     }
   }
+  function handleControllerEvent(event) {
+    trace?.noteRuntimeEvent(event.type, event);
+    if (!activeTurn || activeTurn.finalized) return;
+    if (event.type === "retry_scheduled") {
+      lastRetryEvent = {
+        attempt: event.attempt,
+        maxRetries: event.maxRetries,
+        delayMs: event.delayMs,
+        error: event.errorMessage
+      };
+      touch();
+      writeEvent({
+        type: "turn.retry.scheduled",
+        sessionId: activeTurn.sessionId,
+        turnId: activeTurn.turnId,
+        attempt: event.attempt,
+        maxRetries: event.maxRetries,
+        delayMs: event.delayMs,
+        error: event.errorMessage
+      });
+    } else if (event.type === "retry_start") {
+      activeTurn.summary = "";
+      lastRetryEvent = {
+        attempt: event.attempt,
+        maxRetries: event.maxRetries,
+        delayMs: lastRetryEvent?.delayMs,
+        error: lastRetryEvent?.error
+      };
+      touch();
+      writeEvent({
+        type: "turn.retry.started",
+        sessionId: activeTurn.sessionId,
+        turnId: activeTurn.turnId,
+        attempt: event.attempt,
+        maxRetries: event.maxRetries,
+        delayMs: lastRetryEvent.delayMs,
+        error: lastRetryEvent.error
+      });
+    } else if (event.type === "retry_succeeded") {
+      touch();
+      writeEvent({
+        type: "turn.retry.succeeded",
+        sessionId: activeTurn.sessionId,
+        turnId: activeTurn.turnId,
+        attempt: event.attempts,
+        maxRetries: lastRetryEvent?.maxRetries ?? CLI_RETRY_MAX_RETRIES,
+        delayMs: lastRetryEvent?.delayMs,
+        error: lastRetryEvent?.error
+      });
+      lastRetryEvent = void 0;
+    } else if (event.type === "retry_exhausted") {
+      touch();
+      writeEvent({
+        type: "turn.retry.exhausted",
+        sessionId: activeTurn.sessionId,
+        turnId: activeTurn.turnId,
+        attempt: lastRetryEvent?.attempt ?? event.maxRetries,
+        maxRetries: event.maxRetries,
+        delayMs: lastRetryEvent?.delayMs,
+        error: event.errorMessage
+      });
+      lastRetryEvent = void 0;
+    }
+  }
   async function ensureRuntime() {
     if (params.mockResponse !== void 0 || controller) return;
     const runtime = params.runtime;
@@ -67813,7 +67954,7 @@ async function runJsonEventsMode(params) {
     if (runtime.initialModel.unconfigured) {
       return;
     }
-    const { Agent: AgentClass } = await import("./chunks/src-LZC56DRG.js");
+    const { Agent: AgentClass } = await import("./chunks/src-6WPNVGT2.js");
     const jsonModeExtensions = await loadJsonModeExtensions({ runtime, getAgent: () => agent });
     const tools = [...runtime.tools, ...jsonModeExtensions.extensionTools];
     recordCliCompositionStep(runtime.compositionTrace, {
@@ -67840,7 +67981,8 @@ async function runJsonEventsMode(params) {
         tools,
         thinkingLevel: "off"
       },
-      apiKey: runtime.apiKey
+      apiKey: runtime.apiKey,
+      streamFn: params.streamFn
     });
     controller = new AgentSessionController({
       agent,
@@ -67858,7 +68000,13 @@ async function runJsonEventsMode(params) {
           systemPrompt: result?.systemPrompt ?? context.baseSystemPrompt ?? baseSystemPrompt,
           messages: result?.messages?.length ? [...context.messages, ...result.messages] : context.messages
         };
-      }
+      },
+      retry: {
+        isRetryableError: isCliRetryableError,
+        maxRetries: CLI_RETRY_MAX_RETRIES,
+        baseDelayMs: getCliRetryBaseDelayMs()
+      },
+      onEvent: handleControllerEvent
     });
     trace = new SessionTraceWriter(runtime.paths.sessionsDir, runtime.sessionManager);
     attachAgentEventsToSessionTrace({ agent, trace });
@@ -67938,7 +68086,7 @@ async function runJsonEventsMode(params) {
       if (!turn2 || turn2.finalized) return;
       if (Date.now() - turn2.lastActivityAt >= noProgressTimeoutMs) {
         turn2.stalled = true;
-        agent?.abort();
+        controller?.abort();
         finalize("stalled", "no_progress_timeout");
       }
     }, Math.max(1e3, Math.min(noProgressTimeoutMs, 1e4)));
@@ -67949,14 +68097,23 @@ async function runJsonEventsMode(params) {
       await controller.prompt(message.prompt, { source: "json-events" });
       trace?.noteDispatchSettled({ mode: "json-events" });
       trace?.noteWaitForIdleStart({ mode: "json-events" });
-      await controller.waitForIdle();
+      await controller.waitForSettled();
       trace?.noteWaitForIdleSettled({ mode: "json-events" });
       if (!activeTurn?.finalized) {
-        const text = activeTurn?.summary.trim() || assistantTextFromAgent(agent);
+        const finalError = assistantErrorFromAgent(agent);
+        if (activeTurn?.interrupted) {
+          finalize("cancelled", "user_interrupt");
+          return;
+        }
+        if (finalError) {
+          finalize("failed", finalError);
+          return;
+        }
+        const text = assistantTextFromAgent(agent);
         if (!activeTurn?.summary && text) {
           display(text);
         }
-        finalize(activeTurn?.interrupted ? "cancelled" : "completed", activeTurn?.interrupted ? "user_interrupt" : void 0);
+        finalize("completed", text || activeTurn?.summary.trim());
       }
     } catch (error) {
       const messageText = error instanceof Error ? error.message : String(error);
@@ -68000,7 +68157,7 @@ async function runJsonEventsMode(params) {
       return;
     }
     activeTurn.interrupted = true;
-    agent?.abort();
+    controller?.abort();
     if (params.mockResponse !== void 0) {
       finalize("cancelled", message.reason || "user_interrupt");
       activeTurn = null;
@@ -68018,7 +68175,7 @@ async function runJsonEventsMode(params) {
     if (message.type === "shutdown") {
       if (activeTurn && !activeTurn.finalized) {
         activeTurn.interrupted = true;
-        agent?.abort();
+        controller?.abort();
         finalize("cancelled", message.reason || "shutdown");
       }
       break;
@@ -68198,6 +68355,13 @@ async function runWithJsonEventsConsoleIsolation(fn) {
     console.debug = originalDebug;
   }
 }
+async function createCliTestStreamFnFromEnv() {
+  if (!process.env.PIE_TEST_MOCK_STREAM_SEQUENCE) {
+    return void 0;
+  }
+  const { createTestStreamFnFromSequenceEnv } = await import("./chunks/test-stream-ZSKNLUEJ.js");
+  return createTestStreamFnFromSequenceEnv();
+}
 async function startChat(initialPrompt, testCommand) {
   const rawOutput = process.argv.includes("--raw-output");
   const jsonOutput = process.argv.includes("--json-output");
@@ -68227,7 +68391,11 @@ async function startChat(initialPrompt, testCommand) {
         }
         throw error;
       }
-      await runJsonEventsMode({ runtime: runtime2, explicitSessionId });
+      await runJsonEventsMode({
+        runtime: runtime2,
+        explicitSessionId,
+        streamFn: await createCliTestStreamFnFromEnv()
+      });
     });
     return;
   }
@@ -68256,7 +68424,13 @@ async function startChat(initialPrompt, testCommand) {
     throw error;
   }
   if (initialPrompt) {
-    await runPrintMode({ initialPrompt, rawOutput, jsonOutput, runtime });
+    await runPrintMode({
+      initialPrompt,
+      rawOutput,
+      jsonOutput,
+      runtime,
+      streamFn: await createCliTestStreamFnFromEnv()
+    });
     process.exit(process.exitCode ?? 0);
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cydm/pie",
-	"version": "1.0.14",
+	"version": "1.0.15",
 	"description": "Pie AI Agent CLI",
 	"type": "module",
 	"bin": {