@cydm/pie 1.0.14 → 1.0.16

package/dist/cli.js

@@ -14,7 +14,7 @@ import {
   getSettingsPath,
   getThemesDir,
   migrateConfigFromAgentDir
-} from "./chunks/chunk-EFG2MQFD.js";
+} from "./chunks/chunk-62XU6P2H.js";
 import {
   AGENTS_CONTEXT_FILE_NAME,
   AgentSessionController,
@@ -37,11 +37,14 @@ import {
   createSharedFileSystemTools,
   createSharedWebSearchTool,
   createTodoWidgetView,
+  estimateContextTokens,
+  estimateTokens,
   evaluateTodoClosureAfterAbort,
   evaluateTodoClosureAfterCompletedTurn,
   evaluateTodoClosureAfterFailedTurn,
   findFirstKeptEntryId,
   formatSkillSummariesForPrompt,
+  getAutoCompactTokenLimit,
   hasInteractionHandler,
   maybeAdvanceTodoExecutionState,
   modalityForReadFileUnderstandingKind,
@@ -52,7 +55,8 @@ import {
   selectToolsForRuntimePolicy,
   shouldPreserveExecutionStateForUserText,
   supersedeExecutionState
-} from "./chunks/chunk-LF5Q7BVU.js";
+} from "./chunks/chunk-7GAYJ6AF.js";
+import "./chunks/chunk-VE2HDCNB.js";
 import {
   Deref,
   Errors,
@@ -86,7 +90,7 @@ import {
   setLogger,
   sortToolModelCandidatesByCapability,
   type_exports
-} from "./chunks/chunk-D7NAXU7F.js";
+} from "./chunks/chunk-5DA2D3K2.js";
 import {
   resolveCliProjectRoot
 } from "./chunks/chunk-NTYHFBUA.js";
@@ -61387,7 +61391,7 @@ function bindInteractiveRuntimeEvents(host) {
           lastStopReason: host.agent.state.messages.at(-1)?.role === "assistant" ? host.agent.state.messages.at(-1).stopReason : void 0
         });
         const lastMessage = host.agent.state.messages[host.agent.state.messages.length - 1];
-        if (lastMessage?.role === "assistant" && lastMessage?.stopReason === "error") {
+        if (!hasControllerTurnAuthority(host) && lastMessage?.role === "assistant" && lastMessage?.stopReason === "error") {
           host.sessionTrace.abortTurn(String(lastMessage?.errorMessage || "agent_end"));
         }
         host.isProcessing = false;
@@ -61432,6 +61436,12 @@ function handleSemanticAgentEvent(host, event) {
       break;
     }
     case "turn_completed": {
+      if (hasControllerTurnAuthority(host)) {
+        host.logDebug("semantic:turn_completed_ignored_controller_authority", {
+          turnIndex: host._semanticTurnIndex
+        });
+        break;
+      }
       host.clearContinuationTimeout("turn_completed");
       host.emitExtensionEvent({
         type: "turn:completed",
@@ -61459,6 +61469,13 @@ function handleSemanticAgentEvent(host, event) {
       break;
     }
     case "turn_failed": {
+      if (hasControllerTurnAuthority(host)) {
+        host.logDebug("semantic:turn_failed_ignored_controller_authority", {
+          turnIndex: host._semanticTurnIndex,
+          recoveryState: host.agentSessionController?.turnRecoveryState
+        });
+        break;
+      }
       host.clearContinuationTimeout("turn_failed");
       host.emitExtensionEvent({
         type: "turn:failed",
@@ -61487,6 +61504,9 @@ function handleSemanticAgentEvent(host, event) {
     }
     case "status_snapshot_changed": {
       const snapshot = event.snapshot;
+      if (isControllerRecovering(host)) {
+        break;
+      }
       if (snapshot.phase === "idle" && !snapshot.hasPendingToolContinuation) {
         host.clearContinuationTimeout("status_idle");
         const outcome = host.executionState.markAwaitingContinuationStalled();
@@ -61508,6 +61528,13 @@ function handleSemanticAgentEvent(host, event) {
     }
   }
 }
+function hasControllerTurnAuthority(host) {
+  return host.agentSessionController?.turnRecoveryState !== void 0;
+}
+function isControllerRecovering(host) {
+  const state = host.agentSessionController?.turnRecoveryState;
+  return state === "retry_pending" || state === "retrying" || state === "compacting";
+}
 function handleMessageStart(host, event) {
   if (event.message?.role === "assistant") {
     host.clearContinuationTimeout("assistant_message_start");
@@ -64043,84 +64070,183 @@ function buildCliSystemPrompt(options) {
   ].filter(Boolean).join("\n\n");
 }
 
-// src/runtime/interactive-context-ui.ts
-function calculateContextUsage(host) {
-  const messages = host.agent?.state.messages ?? [];
-  if (messages.length === 0) {
-    return { tokens: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
+// src/runtime/cli-auto-compaction.ts
+function calculateCliContextUsage(params) {
+  const messages = stripStaleUsageBeforeCompaction(
+    params.messages,
+    params.latestCompactionTimestamp ?? null
+  );
+  const estimate = estimateContextTokens(messages);
+  const usageMessage = estimate.lastUsageIndex !== null ? messages[estimate.lastUsageIndex] : void 0;
+  const usage = usageMessage?.role === "assistant" ? usageMessage.usage : void 0;
+  return {
+    tokens: estimate.tokens,
+    input: usage?.input ?? 0,
+    output: usage?.output ?? 0,
+    cacheRead: usage?.cacheRead ?? 0,
+    cacheWrite: usage?.cacheWrite ?? 0,
+    cost: usage?.cost.total ?? 0
+  };
+}
+function createCliAutoCompactDecision(params) {
+  const errorMessage3 = params.message?.role === "assistant" ? params.message.errorMessage : void 0;
+  if (errorMessage3 && params.isContextOverflowError(errorMessage3)) {
+    return { reason: "overflow", willRetry: true };
   }
-  let lastAssistantIndex = -1;
-  let lastUsage = null;
-  const latestCompactionTimestamp = host.sessionManager.getLatestCompactionTimestamp();
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const msg = messages[i];
-    if (msg.role === "assistant") {
-      const assistantMsg = msg;
-      if (latestCompactionTimestamp !== null && assistantMsg.timestamp <= latestCompactionTimestamp) {
-        continue;
-      }
-      if (assistantMsg.usage && assistantMsg.stopReason !== "aborted" && assistantMsg.stopReason !== "error") {
-        lastAssistantIndex = i;
-        lastUsage = assistantMsg.usage;
-        break;
-      }
-    }
+  if (!params.autoCompactEnabled || params.contextWindow <= 0) {
+    return void 0;
+  }
+  const usage = calculateCliContextUsage({
+    messages: params.messages,
+    latestCompactionTimestamp: params.latestCompactionTimestamp
+  });
+  if (!usage.tokens) {
+    return void 0;
   }
-  if (!lastUsage || lastAssistantIndex < 0) {
-    const estimated = messages.reduce((sum, msg) => sum + estimateMessageTokens(msg), 0);
-    return { tokens: estimated, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
+  const tokenLimit = getAutoCompactTokenLimit(params.contextWindow, params.reserveTokens);
+  if (tokenLimit === void 0) {
+    return void 0;
   }
-  const usageTokens = lastUsage.totalTokens || lastUsage.input + lastUsage.output + lastUsage.cacheRead + lastUsage.cacheWrite;
-  if (usageTokens <= 0) {
-    const estimated = messages.reduce((sum, msg) => sum + estimateMessageTokens(msg), 0);
-    return {
-      tokens: estimated,
-      input: lastUsage.input,
-      output: lastUsage.output,
-      cacheRead: lastUsage.cacheRead,
-      cacheWrite: lastUsage.cacheWrite,
-      cost: lastUsage.cost.total
-    };
+  return usage.tokens > tokenLimit ? { reason: "threshold", willRetry: false } : void 0;
+}
+function shouldCliAutoCompactTokens(params) {
+  if (!params.tokens || params.contextWindow <= 0) {
+    return false;
+  }
+  const tokenLimit = getAutoCompactTokenLimit(params.contextWindow, params.reserveTokens);
+  return tokenLimit !== void 0 && params.tokens > tokenLimit;
+}
+async function createCliAutoCompactionResult(params) {
+  const activeEntryId = params.context.sessionManager.getActiveEntryId();
+  if (!activeEntryId) {
+    return { aborted: true };
   }
-  let trailingTokens = 0;
-  for (let i = lastAssistantIndex + 1; i < messages.length; i++) {
-    trailingTokens += estimateMessageTokens(messages[i]);
+  const pathEntries = params.context.sessionManager.getPathToEntry(activeEntryId);
+  const firstKeptEntryId = findFirstKeptEntryId(pathEntries);
+  if (!firstKeptEntryId) {
+    return { aborted: true };
   }
+  const compactOptions = {
+    model: params.model,
+    apiKey: params.apiKey,
+    systemPrompt: params.systemPrompt
+  };
+  const summary = await createCompactionSummary(params.context.messages, compactOptions);
   return {
-    tokens: usageTokens + trailingTokens,
-    input: lastUsage.input,
-    output: lastUsage.output,
-    cacheRead: lastUsage.cacheRead,
-    cacheWrite: lastUsage.cacheWrite,
-    cost: lastUsage.cost.total
+    summary,
+    firstKeptEntryId,
+    tokensBefore: calculateTotalTokens(params.context.messages)
   };
 }
-function estimateMessageTokens(msg) {
-  let chars = 0;
-  if (msg.role === "user") {
-    const content = msg.content;
-    if (typeof content === "string") {
-      chars = content.length;
-    } else if (Array.isArray(content)) {
-      for (const block of content) {
-        if (block.type === "text" && block.text) {
-          chars += block.text.length;
-        }
-      }
+function stripStaleUsageBeforeCompaction(messages, latestCompactionTimestamp) {
+  if (latestCompactionTimestamp === null) {
+    return messages;
+  }
+  return messages.map((message) => {
+    if (message.role !== "assistant" || message.timestamp > latestCompactionTimestamp) {
+      return message;
     }
-  } else if (msg.role === "assistant") {
-    const assistant = msg;
-    for (const block of assistant.content) {
-      if (block.type === "text") {
-        chars += block.text.length;
-      } else if (block.type === "thinking") {
-        chars += block.thinking.length;
-      } else if (block.type === "toolCall") {
-        chars += block.name.length + JSON.stringify(block.arguments).length;
+    return {
+      ...message,
+      usage: {
+        input: 0,
+        output: 0,
+        cacheRead: 0,
+        cacheWrite: 0,
+        totalTokens: 0,
+        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
       }
-    }
+    };
+  });
+}
+
+// src/runtime/retry-policy.ts
+var TRANSIENT_NETWORK_ERROR_PATTERN = /sse stream aborted|sse stream closed before end|sse stream ended before response completed|(?:read\s+)?ECONNRESET|ETIMEDOUT|EAI_AGAIN|ENOTFOUND|ECONNREFUSED|socket hang up|request timeout|client network socket disconnected before secure TLS connection was established|connection.?error|connection.?refused|other side closed|fetch failed|upstream.?connect|reset before headers|terminated/i;
+var PROVIDER_TRANSIENT_ERROR_PATTERN = /overloaded|rate.?limit|too many requests|\b429\b|\b500\b|\b502\b|\b503\b|\b504\b|service.?unavailable|server error|internal error|retry delay/i;
+var USER_ABORT_PATTERN = /request was aborted|local abort signal|user abort|user_interrupt|interrupted by user|esc pressed|ctrl\+c/i;
+var AUTH_CONFIG_PATTERN = /missing api key|invalid api key|api key.*invalid|unauthorized|\b401\b|\b403\b|forbidden|authentication failed|no configured model|no models? are configured/i;
+var INVALID_FILE_REFERENCE_PATTERN = /not the owner of this file|owner of this file|invalid_authentication_error/i;
+var INVALID_REQUEST_PATTERN = /bad request|\b400\b|invalid request|invalid schema|schema validation|invalid parameter|unsupported parameter|malformed/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 createClassification(kind, message, overrides) {
+  return {
+    kind,
+    message,
+    retryable: false,
+    compactable: false,
+    userAbort: false,
+    terminal: true,
+    ...overrides
+  };
+}
+function classifyCliFailure(context) {
+  const errorMessage3 = typeof context === "string" ? context : context.errorMessage;
+  if (isCliContextOverflowError(errorMessage3)) {
+    return createClassification("context_overflow", errorMessage3, {
+      compactable: true,
+      terminal: false
+    });
+  }
+  if (USER_ABORT_PATTERN.test(errorMessage3)) {
+    return createClassification("user_abort", errorMessage3, {
+      userAbort: true,
+      terminal: false
+    });
+  }
+  if (INVALID_FILE_REFERENCE_PATTERN.test(errorMessage3)) {
+    return createClassification("invalid_file_reference", errorMessage3);
+  }
+  if (AUTH_CONFIG_PATTERN.test(errorMessage3)) {
+    return createClassification("auth_config", errorMessage3);
+  }
+  if (TRANSIENT_NETWORK_ERROR_PATTERN.test(errorMessage3)) {
+    return createClassification("transient_network", errorMessage3, {
+      retryable: true,
+      terminal: false
+    });
+  }
+  if (PROVIDER_TRANSIENT_ERROR_PATTERN.test(errorMessage3)) {
+    return createClassification("provider_transient", errorMessage3, {
+      retryable: true,
+      terminal: false
+    });
+  }
+  if (INVALID_REQUEST_PATTERN.test(errorMessage3)) {
+    return createClassification("invalid_request", errorMessage3);
+  }
+  return createClassification("unknown", errorMessage3);
+}
+function isCliRetryableError(errorMessage3) {
+  return classifyCliFailure(errorMessage3).retryable;
+}
+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 ?? [];
+  if (messages.length === 0) {
+    return { tokens: 0, input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
   }
-  return Math.ceil(chars / 4);
+  return calculateCliContextUsage({
+    messages,
+    latestCompactionTimestamp: host.sessionManager.getLatestCompactionTimestamp()
+  });
+}
+function estimateMessageTokens(msg) {
+  return estimateTokens(msg);
 }
 function buildSystemPrompt(host) {
   const tools = (host.agent?.state?.tools ?? host.options.tools ?? []).filter((tool) => typeof tool.name === "string").map((tool) => ({
@@ -64266,20 +64392,15 @@ 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;
-  if (!contextTokens || contextWindow <= 0) return false;
   const reserveTokens = host.options.settingsManager.getAutoCompactReserveTokens();
-  return contextTokens > contextWindow - reserveTokens;
+  return shouldCliAutoCompactTokens({ tokens: 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(
@@ -64721,28 +64842,6 @@ async function prepareAgentTurn(host, context) {
     messages: result.messages?.length ? [...context.messages, ...result.messages] : context.messages
   };
 }
-async function createAutoCompactionResult(host, messages) {
-  const activeEntryId = host.sessionManager.getActiveEntryId();
-  if (!activeEntryId) {
-    return { aborted: true };
-  }
-  const pathEntries = host.sessionManager.getPathToEntry(activeEntryId);
-  const firstKeptEntryId = findFirstKeptEntryId(pathEntries);
-  if (!firstKeptEntryId) {
-    return { aborted: true };
-  }
-  const compactOptions = {
-    model: host.options.model,
-    apiKey: host.options.apiKey,
-    systemPrompt: host.agent.state.systemPrompt
-  };
-  const summary = await createCompactionSummary(messages, compactOptions);
-  return {
-    summary,
-    firstKeptEntryId,
-    tokensBefore: calculateTotalTokens(messages)
-  };
-}
 function createInteractiveAgentSessionController(host) {
   return new AgentSessionController({
     agent: host.agent,
@@ -64762,14 +64861,16 @@ function createInteractiveAgentSessionController(host) {
       }
       return { allowed: true };
     },
-    getAutoCompactDecision: ({ message }) => {
+    getAutoCompactDecision: ({ message, messages }) => {
       if (message?.role === "assistant" && message.stopReason === "error" && message.errorMessage) {
         if (host._isContextOverflowError(message.errorMessage)) {
           return { reason: "overflow", willRetry: true };
         }
-        return void 0;
       }
-      const contextUsage = host.calculateContextUsage();
+      const contextUsage = calculateCliContextUsage({
+        messages,
+        latestCompactionTimestamp: host.sessionManager.getLatestCompactionTimestamp()
+      });
       const contextWindow = host.options.model?.contextWindow ?? 0;
       if (host._shouldAutoCompact(contextUsage.tokens, contextWindow)) {
         return { reason: "threshold", willRetry: false };
@@ -64777,13 +64878,19 @@ function createInteractiveAgentSessionController(host) {
       return void 0;
     },
     getAutoContinueMessage: () => host.getTodoAutoContinueMessage(),
+    classifyFailure: (context) => classifyCliFailure(context),
     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)
+      compact: async (context) => createCliAutoCompactionResult({
+        context,
+        model: host.options.model,
+        apiKey: host.options.apiKey,
+        systemPrompt: host.agent.state.systemPrompt
+      })
     },
     onEvent: (event) => {
       host.sessionTrace.noteRuntimeEvent(event.type, event);
@@ -64806,11 +64913,15 @@ function createInteractiveAgentSessionController(host) {
           reason: event.reason,
           queueLength: host.agentSessionController?.pendingMessageCount ?? 0
         });
-      } else if (event.type === "retry_scheduled") {
-        host.showStatus(`Rate limited. Retrying in ${event.delayMs / 1e3}s... (attempt ${event.attempt}/${event.maxRetries})`);
-      } else if (event.type === "retry_start") {
+      } else if (event.type === "turn_recovery_pending") {
+        if (event.recovery === "retry") {
+          host.showStatus(`Transient request error. Retrying in ${(event.delayMs ?? 0) / 1e3}s... (attempt ${event.attempt}/${event.maxRetries})`);
+        } else {
+          host.showStatus(event.failure.kind === "context_overflow" ? "Context overflow detected, compacting..." : "Auto-compacting context before retry...");
+        }
+      } else if (event.type === "turn_retry_started") {
         host.showStatus(`Retrying request (attempt ${event.attempt}/${event.maxRetries})...`);
-      } else if (event.type === "retry_succeeded") {
+      } else if (event.type === "turn_retry_succeeded") {
         const outcome = host.executionState.resumePausedTodo();
         if (outcome.changed) {
           host.sessionTrace.noteRuntimeEvent("todo_resumed_after_retry", {
@@ -64821,12 +64932,80 @@ function createInteractiveAgentSessionController(host) {
           void host.refreshTodoWidget();
         }
         host.showStatus("Retry succeeded");
-      } else if (event.type === "retry_exhausted") {
+      } else if (event.type === "turn_completed") {
+        host.clearContinuationTimeout("turn_completed");
+        host.emitExtensionEvent({
+          type: "turn:completed",
+          turnIndex: host._semanticTurnIndex,
+          message: event.message,
+          toolResults: event.toolResults
+        });
+        const outcome = host.executionState.advanceFromCompletedTurn(event.message, event.toolResults || []);
+        host.logDebug("execution:turn_completed", {
+          turnIndex: host._semanticTurnIndex,
+          changed: outcome.changed,
+          currentStepId: host.executionState.read().currentStepId,
+          lifecycle: host.executionState.read().lifecycle,
+          reason: outcome.cleared ? `cleared_${outcome.terminalStatus}` : outcome.changed ? "completed_turn" : "unchanged"
+        });
+        if (outcome.changed) {
+          host.persistExecutionState();
+          void host.refreshTodoWidget();
+        }
+        if (outcome.terminalSummary) {
+          host.appendWarningSummary(outcome.terminalSummary);
+        }
+        host.sessionTrace.completeTurn(event.message, false);
+        host._semanticTurnIndex++;
+      } else if (event.type === "turn_failed_terminal") {
+        host.clearContinuationTimeout("turn_failed_terminal");
+        if (event.message) {
+          host.emitExtensionEvent({
+            type: "turn:failed",
+            turnIndex: host._semanticTurnIndex,
+            message: event.message,
+            toolResults: []
+          });
+        }
+        const outcome = host.executionState.handleTurnFailed();
+        host.logDebug("execution:turn_failed_terminal", {
+          turnIndex: host._semanticTurnIndex,
+          changed: outcome.changed,
+          currentStepId: host.executionState.read().currentStepId,
+          lifecycle: host.executionState.read().lifecycle,
+          kind: event.failure.kind
+        });
+        if (outcome.changed) {
+          host.persistExecutionState();
+          void host.refreshTodoWidget();
+        }
+        if (outcome.terminalSummary) {
+          host.appendWarningSummary(outcome.terminalSummary);
+        }
+        if (event.message) {
+          host.sessionTrace.completeTurn(event.message, true);
+        }
+        host._semanticTurnIndex++;
         const state = host.executionState.read();
         if (state.mode === "todo" && state.lifecycle === "paused" && state.steps.length > 0) {
           host.showStatus("Todo list preserved. Send 'continue' when you want to resume it.");
         }
-        host.showError(`Request failed after ${event.maxRetries} retries: ${event.errorMessage}`);
+        host.showError(event.failure.message);
+      } else if (event.type === "turn_cancelled") {
+        const outcome = host.executionState.abort();
+        host.logDebug("execution:turn_cancelled", {
+          turnIndex: host._semanticTurnIndex,
+          cleared: outcome.cleared,
+          lifecycle: host.executionState.read().lifecycle,
+          reason: event.reason
+        });
+        if (outcome.cleared || outcome.terminalSummary) {
+          host.persistExecutionState();
+          void host.refreshTodoWidget();
+        }
+        if (outcome.terminalSummary) {
+          host.appendWarningSummary(outcome.terminalSummary);
+        }
       } else if (event.type === "runtime_guard_triggered") {
         host.sessionTrace.noteStalled("runtime_guard_triggered", {
           toolName: event.toolName,
@@ -66739,7 +66918,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 +67482,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 +67585,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 +67622,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 +67645,47 @@ 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()
+    },
+    getAutoCompactDecision: ({ message, messages }) => createCliAutoCompactDecision({
+      message,
+      messages,
+      contextWindow: runtime.model.contextWindow ?? 0,
+      autoCompactEnabled: runtime.settingsManager.getAutoCompactEnabled(),
+      reserveTokens: runtime.settingsManager.getAutoCompactReserveTokens(),
+      latestCompactionTimestamp: runtime.sessionManager.getLatestCompactionTimestamp(),
+      isContextOverflowError: isCliContextOverflowError
+    }),
+    compaction: {
+      compact: async (context) => createCliAutoCompactionResult({
+        context,
+        model: runtime.model,
+        apiKey: runtime.apiKey,
+        systemPrompt: agent?.state.systemPrompt ?? baseSystemPrompt
+      })
+    },
+    classifyFailure: (context) => classifyCliFailure(context),
+    onEvent: (event) => {
+      sessionTrace.noteRuntimeEvent(event.type, event);
+      if (event.type === "turn_recovery_pending" && event.recovery === "retry") {
+        console.error(`Transient request error: ${event.failure.message}. Retrying in ${(event.delayMs ?? 0) / 1e3}s (${event.attempt}/${event.maxRetries}).`);
+      } else if (event.type === "turn_recovery_pending" && event.recovery === "compaction") {
+        console.error(event.failure.kind === "context_overflow" ? "Context overflow detected, compacting..." : "Auto-compacting context before retry...");
+      } else if (event.type === "auto_compaction_start") {
+        console.error(event.reason === "overflow" ? "Context overflow detected, compacting..." : "Auto-compacting context...");
+      } else if (event.type === "turn_retry_started") {
+        console.error(`Retrying request (${event.attempt}/${event.maxRetries})...`);
+      } else if (event.type === "turn_retry_succeeded") {
+        console.error(`Retry succeeded after ${event.attempts} attempt${event.attempts === 1 ? "" : "s"}.`);
+      } else if (event.type === "turn_failed_terminal" && (event.failure.kind === "transient_network" || event.failure.kind === "provider_transient")) {
+        console.error(`Request failed after ${CLI_RETRY_MAX_RETRIES} retries: ${event.failure.message}`);
+      }
     }
   });
-  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 +67695,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,
@@ -67598,14 +67841,25 @@ function assistantTextFromAgent(agent) {
   const messages = agent?.state.messages ?? [];
   const lastMessage = messages[messages.length - 1];
   if (lastMessage?.role !== "assistant") return "";
+  return assistantTextFromMessage(lastMessage);
+}
+function assistantTextFromMessage(message) {
+  if (message.role !== "assistant") return "";
   let text = "";
-  for (const content of lastMessage.content) {
+  for (const content of message.content) {
     if (content.type === "text") {
       text += content.text;
     }
   }
   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 +67966,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 +67984,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",
@@ -67741,13 +67998,31 @@ async function runJsonEventsMode(params) {
       chunk
     });
   }
+  function bufferAssistantOutput(chunk) {
+    if (!activeTurn || !chunk) return;
+    activeTurn.pendingAssistantOutput += chunk;
+    touch();
+  }
+  function clearPendingAssistantOutput() {
+    if (activeTurn) {
+      activeTurn.pendingAssistantOutput = "";
+    }
+  }
+  function flushAssistantOutput(fallbackText = "") {
+    if (!activeTurn) return;
+    const chunk = activeTurn.pendingAssistantOutput || fallbackText;
+    activeTurn.pendingAssistantOutput = "";
+    if (chunk) {
+      display(chunk);
+    }
+  }
   function finalize(kind, detail) {
     const turn = activeTurn;
     if (!turn || turn.finalized) return;
     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" });
@@ -67764,7 +68039,7 @@ async function runJsonEventsMode(params) {
     if (!activeTurn || activeTurn.finalized) return;
     switch (event.type) {
       case "assistant_response_delta":
-        display(event.delta);
+        bufferAssistantOutput(event.delta);
         break;
       case "tool_started":
         touch();
@@ -67783,7 +68058,7 @@ async function runJsonEventsMode(params) {
           const progressText = extractJsonEventsToolProgressText(event.partialResult);
           if (progressText) {
             display(progressText.endsWith("\n") ? progressText : `${progressText}
-`);
+`, { appendToSummary: false });
           }
         }
         break;
@@ -67804,6 +68079,113 @@ async function runJsonEventsMode(params) {
         break;
     }
   }
+  function handleControllerEvent(event) {
+    trace?.noteRuntimeEvent(event.type, event);
+    if (event.type === "turn_settled" && activeTurn) {
+      writeEvent({
+        type: "turn.settled",
+        sessionId: activeTurn.sessionId,
+        turnId: activeTurn.turnId
+      });
+      return;
+    }
+    if (!activeTurn || activeTurn.finalized) return;
+    if (event.type === "turn_recovery_pending" && event.recovery === "retry") {
+      lastRetryEvent = {
+        attempt: event.attempt ?? 0,
+        maxRetries: event.maxRetries ?? CLI_RETRY_MAX_RETRIES,
+        delayMs: event.delayMs,
+        error: event.failure.message
+      };
+      touch();
+      writeEvent({
+        type: "turn.recovery.pending",
+        sessionId: activeTurn.sessionId,
+        turnId: activeTurn.turnId,
+        recovery: event.recovery,
+        attempt: event.attempt,
+        maxRetries: event.maxRetries,
+        delayMs: event.delayMs,
+        error: event.failure.message
+      });
+    } else if (event.type === "turn_recovery_pending" && event.recovery === "compaction") {
+      activeTurn.summary = "";
+      clearPendingAssistantOutput();
+      touch();
+      writeEvent({
+        type: "turn.recovery.pending",
+        sessionId: activeTurn.sessionId,
+        turnId: activeTurn.turnId,
+        recovery: event.recovery,
+        error: event.failure.message
+      });
+    } else if (event.type === "turn_retry_started") {
+      activeTurn.summary = "";
+      clearPendingAssistantOutput();
+      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 === "turn_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 === "turn_compaction_started") {
+      if (event.willRetry) {
+        activeTurn.summary = "";
+        clearPendingAssistantOutput();
+      }
+      touch();
+      writeEvent({
+        type: "turn.compaction.started",
+        sessionId: activeTurn.sessionId,
+        turnId: activeTurn.turnId,
+        reason: event.reason,
+        willRetry: event.willRetry
+      });
+    } else if (event.type === "turn_completed") {
+      const text = assistantTextFromMessage(event.message);
+      flushAssistantOutput(text);
+      finalize("completed", text || activeTurn.summary.trim());
+    } else if (event.type === "turn_failed_terminal") {
+      touch();
+      if (lastRetryEvent) {
+        writeEvent({
+          type: "turn.retry.exhausted",
+          sessionId: activeTurn.sessionId,
+          turnId: activeTurn.turnId,
+          attempt: lastRetryEvent.attempt,
+          maxRetries: lastRetryEvent.maxRetries,
+          delayMs: lastRetryEvent.delayMs,
+          error: event.failure.message
+        });
+        lastRetryEvent = void 0;
+      }
+      finalize("failed", event.failure.message);
+    } else if (event.type === "turn_cancelled") {
+      finalize("cancelled", event.reason);
+    }
+  }
   async function ensureRuntime() {
     if (params.mockResponse !== void 0 || controller) return;
     const runtime = params.runtime;
@@ -67813,7 +68195,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 +68222,8 @@ async function runJsonEventsMode(params) {
         tools,
         thinkingLevel: "off"
       },
-      apiKey: runtime.apiKey
+      apiKey: runtime.apiKey,
+      streamFn: params.streamFn
     });
     controller = new AgentSessionController({
       agent,
@@ -67858,7 +68241,31 @@ 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()
+      },
+      getAutoCompactDecision: ({ message, messages }) => createCliAutoCompactDecision({
+        message,
+        messages,
+        contextWindow: runtime.model.contextWindow ?? 0,
+        autoCompactEnabled: runtime.settingsManager.getAutoCompactEnabled(),
+        reserveTokens: runtime.settingsManager.getAutoCompactReserveTokens(),
+        latestCompactionTimestamp: runtime.sessionManager.getLatestCompactionTimestamp(),
+        isContextOverflowError: isCliContextOverflowError
+      }),
+      compaction: {
+        compact: async (context) => createCliAutoCompactionResult({
+          context,
+          model: runtime.model,
+          apiKey: runtime.apiKey,
+          systemPrompt: agent?.state.systemPrompt ?? baseSystemPrompt
+        })
+      },
+      classifyFailure: (context) => classifyCliFailure(context),
+      onEvent: handleControllerEvent
     });
     trace = new SessionTraceWriter(runtime.paths.sessionsDir, runtime.sessionManager);
     attachAgentEventsToSessionTrace({ agent, trace });
@@ -67894,7 +68301,8 @@ async function runJsonEventsMode(params) {
       interrupted: false,
       stalled: false,
       finalized: false,
-      summary: ""
+      summary: "",
+      pendingAssistantOutput: ""
     };
     const turn = activeTurn;
     writeEvent({ type: "turn.started", sessionId: activeTurn.sessionId, turnId: activeTurn.turnId });
@@ -67938,7 +68346,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 +68357,21 @@ 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);
-        if (!activeTurn?.summary && text) {
-          display(text);
+        const finalError = assistantErrorFromAgent(agent);
+        if (activeTurn?.interrupted) {
+          finalize("cancelled", "user_interrupt");
+          return;
         }
-        finalize(activeTurn?.interrupted ? "cancelled" : "completed", activeTurn?.interrupted ? "user_interrupt" : void 0);
+        if (finalError) {
+          finalize("failed", finalError);
+          return;
+        }
+        const text = assistantTextFromAgent(agent);
+        flushAssistantOutput(text);
+        finalize("completed", text || activeTurn?.summary.trim());
       }
     } catch (error) {
       const messageText = error instanceof Error ? error.message : String(error);
@@ -68000,7 +68415,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 +68433,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 +68613,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 +68649,11 @@ async function startChat(initialPrompt, testCommand) {
         }
         throw error;
       }
-      await runJsonEventsMode({ runtime: runtime2, explicitSessionId });
+      await runJsonEventsMode({
+        runtime: runtime2,
+        explicitSessionId,
+        streamFn: await createCliTestStreamFnFromEnv()
+      });
     });
     return;
   }
@@ -68256,7 +68682,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;
   }