@psnext/slingcli 2.5.20260623-1 → 2.5.20260705-1

package/node_modules/@earendil-works/pi-ai/dist/utils/oauth/openai-codex.js

@@ -323,9 +323,9 @@ function getAccountId(accessToken) {
     return typeof accountId === "string" && accountId.length > 0 ? accountId : null;
 }
 function credentialsFromToken(token) {
-    const accountId = getAccountId(token.access) || "unknown";
+    const accountId = getAccountId(token.access);
     if (!accountId) {
-        console.log("Failed to extract accountId from token");
+        throw new Error("Failed to extract accountId from token");
     }
     return {
         access: token.access,

package/node_modules/@earendil-works/pi-ai/dist/utils/overflow.js

@@ -22,6 +22,7 @@
  * - GitHub Copilot: "prompt token count of X exceeds the limit of Y"
  * - MiniMax: "invalid params, context window exceeds limit"
  * - Kimi For Coding: "Your request exceeded model token limit: X (requested: Y)"
+ * - DS4: "Prompt has X tokens, but the configured context size is Y tokens"
  * - Cerebras: "400/413 status code (no body)"
  * - Mistral: "Prompt contains X tokens ... too large for model with Y maximum context length"
  * - z.ai: Does NOT error, accepts overflow silently - handled via usage.input > contextWindow
@@ -48,6 +49,7 @@ const OVERFLOW_PATTERNS = [
     /context window exceeds limit/i, // MiniMax
     /exceeded model token limit/i, // Kimi For Coding
     /too large for model with \d+ maximum context length/i, // Mistral
+    /prompt has [\d,]+ tokens?, but the configured context size is [\d,]+ tokens?/i, // DS4 server
     /model_context_window_exceeded/i, // z.ai non-standard finish_reason surfaced as error text
     /prompt too long; exceeded (?:max )?context length/i, // Ollama explicit overflow error
     /context[_ ]length[_ ]exceeded/i, // Generic fallback
@@ -94,6 +96,7 @@ const NON_OVERFLOW_PATTERNS = [
  * - llama.cpp: "exceeds the available context size"
  * - LM Studio: "greater than the context length"
  * - Kimi For Coding: "exceeded model token limit: X (requested: Y)"
+ * - DS4: "Prompt has X tokens, but the configured context size is Y tokens"
  *
  * **Unreliable detection:**
  * - z.ai: Sometimes accepts overflow silently (detectable via usage.input > contextWindow),

package/node_modules/@earendil-works/pi-ai/dist/utils/retry.js

@@ -0,0 +1,87 @@
+function buildProviderErrorPattern(patterns) {
+    return new RegExp(patterns.join("|"), "i");
+}
+const NON_RETRYABLE_PROVIDER_LIMIT_ERROR_PATTERN = buildProviderErrorPattern([
+    // OpenCode Go/free-tier limits returned as 429 JSON error types by OpenCode's
+    // Zen API. These are subscription/account limits, not transient throttles.
+    "GoUsageLimitError",
+    "FreeUsageLimitError",
+    // OpenCode Go subscription-limit text asks users to enable available-balance
+    // usage after rolling/weekly/monthly limits are reached.
+    "Monthly usage limit reached",
+    "available balance",
+    // Generic quota/budget/billing exhaustion. `insufficient_quota` is OpenAI's
+    // quota/billing error code; the other strings cover common gateway wording.
+    "insufficient_quota",
+    "out of budget",
+    "quota exceeded",
+    "billing",
+]);
+const RETRYABLE_PROVIDER_ERROR_PATTERN = buildProviderErrorPattern([
+    // Generic provider load, HTTP status, and server-side transient failures.
+    "overloaded",
+    "rate.?limit",
+    "too many requests",
+    "429",
+    "500",
+    "502",
+    "503",
+    "504",
+    "524",
+    "service.?unavailable",
+    "server.?error",
+    "internal.?error",
+    // Wrapper/provider text for transient upstream failures, including OpenRouter
+    // "Provider returned error" responses (#2264).
+    "provider.?returned.?error",
+    // Network, proxy, and fetch transport failures. This includes OpenAI Codex
+    // raw-fetch failures such as "upstream connect", "connection refused", and
+    // "reset before headers" (#733), plus OpenRouter connection drops (#3317).
+    "network.?error",
+    "connection.?error",
+    "connection.?refused",
+    "connection.?lost",
+    "other side closed",
+    "fetch failed",
+    "upstream.?connect",
+    "reset before headers",
+    "socket hang up",
+    "timed? out",
+    "timeout",
+    "terminated",
+    // WebSocket transports can report close/error text instead of HTTP/fetch text.
+    "websocket.?closed",
+    "websocket.?error",
+    // Premature stream endings from SDKs and transports. Anthropic can throw
+    // "stream ended without ..." and "Anthropic stream ended before message_stop"
+    // (#4433); Bedrock/Smithy can throw an HTTP/2 no-response error (#3594).
+    "ended without",
+    "stream ended before message_stop",
+    "http2 request did not get a response",
+    // Provider-requested retry delay cap failures should flow through the outer
+    // retry policy so callers can surface/abort the backoff (#1123).
+    "retry delay",
+    // Explicit retry guidance emitted mid-stream by OpenAI Responses and Bedrock
+    // stream exceptions (#6019).
+    "you can retry your request",
+    "try your request again",
+    "please retry your request",
+]);
+/**
+ * Classifies whether a failed assistant message looks like a transient provider
+ * or transport error, so callers can decide if the last assistant turn should be
+ * restarted.
+ *
+ * This does not implement retry policy. Callers should first handle context
+ * overflow separately, then apply their own retry budget, backoff, and reporting
+ * before restarting the assistant turn.
+ */
+export function isRetryableAssistantError(message) {
+    if (message.stopReason !== "error" || !message.errorMessage)
+        return false;
+    const errorMessage = message.errorMessage;
+    if (NON_RETRYABLE_PROVIDER_LIMIT_ERROR_PATTERN.test(errorMessage))
+        return false;
+    return RETRYABLE_PROVIDER_ERROR_PATTERN.test(errorMessage);
+}
+//# sourceMappingURL=retry.js.map

package/node_modules/@earendil-works/pi-ai/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@earendil-works/pi-ai",
-	"version": "0.79.10",
+	"version": "0.80.3",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"type": "module",
 	"main": "./dist/index.js",
@@ -27,38 +27,6 @@
 			"types": "./dist/api/*.d.ts",
 			"import": "./dist/api/*.js"
 		},
-		"./anthropic": {
-			"types": "./dist/api/anthropic-messages.d.ts",
-			"import": "./dist/api/anthropic-messages.js"
-		},
-		"./azure-openai-responses": {
-			"types": "./dist/api/azure-openai-responses.d.ts",
-			"import": "./dist/api/azure-openai-responses.js"
-		},
-		"./google": {
-			"types": "./dist/api/google-generative-ai.d.ts",
-			"import": "./dist/api/google-generative-ai.js"
-		},
-		"./google-vertex": {
-			"types": "./dist/api/google-vertex.d.ts",
-			"import": "./dist/api/google-vertex.js"
-		},
-		"./mistral": {
-			"types": "./dist/api/mistral-conversations.d.ts",
-			"import": "./dist/api/mistral-conversations.js"
-		},
-		"./openai-codex-responses": {
-			"types": "./dist/api/openai-codex-responses.d.ts",
-			"import": "./dist/api/openai-codex-responses.js"
-		},
-		"./openai-completions": {
-			"types": "./dist/api/openai-completions.d.ts",
-			"import": "./dist/api/openai-completions.js"
-		},
-		"./openai-responses": {
-			"types": "./dist/api/openai-responses.d.ts",
-			"import": "./dist/api/openai-responses.js"
-		},
 		"./oauth": {
 			"types": "./dist/oauth.d.ts",
 			"import": "./dist/oauth.js"

package/node_modules/@earendil-works/pi-coding-agent/dist/cli/file-processor.js

@@ -5,7 +5,7 @@ import { access, readFile, stat } from "node:fs/promises";
 import chalk from "chalk";
 import { resolve } from "path";
 import { resolveReadPath } from "../core/tools/path-utils.js";
-import { formatDimensionNote, resizeImage } from "../utils/image-resize.js";
+import { processImage } from "../utils/image-process.js";
 import { detectSupportedImageMimeTypeFromFile } from "../utils/mime.js";
 /** Process @file arguments into text content and image attachments */
 export async function processFileArguments(fileArgs, options) {
@@ -33,32 +33,20 @@ export async function processFileArguments(fileArgs, options) {
         if (mimeType) {
             // Handle image file
             const content = await readFile(absolutePath);
-            let attachment;
-            let dimensionNote;
-            if (autoResizeImages) {
-                const resized = await resizeImage(content, mimeType);
-                if (!resized) {
-                    text += `<file name="${absolutePath}">[Image omitted: could not be resized below the inline image size limit.]</file>\n`;
-                    continue;
-                }
-                dimensionNote = formatDimensionNote(resized);
-                attachment = {
-                    type: "image",
-                    mimeType: resized.mimeType,
-                    data: resized.data,
-                };
-            }
-            else {
-                attachment = {
-                    type: "image",
-                    mimeType,
-                    data: content.toString("base64"),
-                };
+            const processed = await processImage(content, mimeType, { autoResizeImages });
+            if (!processed.ok) {
+                text += `<file name="${absolutePath}">${processed.message}</file>\n`;
+                continue;
             }
+            const attachment = {
+                type: "image",
+                mimeType: processed.mimeType,
+                data: processed.data,
+            };
             images.push(attachment);
-            // Add text reference to image with optional dimension note
-            if (dimensionNote) {
-                text += `<file name="${absolutePath}">${dimensionNote}</file>\n`;
+            // Add text reference to image with optional processing hints
+            if (processed.hints.length > 0) {
+                text += `<file name="${absolutePath}">${processed.hints.join("\n")}</file>\n`;
             }
             else {
                 text += `<file name="${absolutePath}"></file>\n`;

package/node_modules/@earendil-works/pi-coding-agent/dist/core/agent-session.js

@@ -14,7 +14,7 @@
  */
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname } from "node:path";
-import { clampThinkingLevel, cleanupSessionResources, getSupportedThinkingLevels, isContextOverflow, modelsAreEqual, resetApiProviders, streamSimple, } from "@earendil-works/pi-ai/compat";
+import { clampThinkingLevel, cleanupSessionResources, getSupportedThinkingLevels, isContextOverflow, isRetryableAssistantError, modelsAreEqual, resetApiProviders, streamSimple, } from "@earendil-works/pi-ai/compat";
 import { getThemeByName, theme } from "../modes/interactive/theme/theme.js";
 import { stripFrontmatter } from "../utils/frontmatter.js";
 import { resolvePath } from "../utils/paths.js";
@@ -120,6 +120,7 @@ export class AgentSession {
     // Base system prompt (without extension appends) - used to apply fresh appends each turn
     _baseSystemPrompt = "";
     _baseSystemPromptOptions;
+    _systemPromptOverride;
     constructor(config) {
         this.agent = config.agent;
         this.sessionManager = config.sessionManager;
@@ -139,6 +140,7 @@ export class AgentSession {
         // (session persistence, extensions, auto-compaction, retry logic)
         this._unsubscribeAgent = this.agent.subscribe(this._handleAgentEvent);
         this._installAgentToolHooks();
+        this._installAgentNextTurnRefresh();
         this._buildRuntime({
             activeToolNames: this._initialActiveToolNames,
             includeAllExtensionTools: true,
@@ -227,6 +229,26 @@ export class AgentSession {
             };
         };
     }
+    _installAgentNextTurnRefresh() {
+        const previousPrepareNextTurnWithContext = this.agent.prepareNextTurnWithContext ??
+            (this.agent.prepareNextTurn
+                ? async (_turn, signal) => await this.agent.prepareNextTurn?.(signal)
+                : undefined);
+        this.agent.prepareNextTurnWithContext = async (turn, signal) => {
+            const previousSnapshot = await previousPrepareNextTurnWithContext?.(turn, signal);
+            const previousContext = previousSnapshot?.context ?? turn.context;
+            return {
+                ...previousSnapshot,
+                context: {
+                    ...previousContext,
+                    systemPrompt: this._systemPromptOverride ?? this._baseSystemPrompt,
+                    tools: this.agent.state.tools.slice(),
+                },
+                model: this.agent.state.model,
+                thinkingLevel: this.agent.state.thinkingLevel,
+            };
+        };
+    }
     // =========================================================================
     // Event Subscription
     // =========================================================================
@@ -560,7 +582,7 @@ export class AgentSession {
         this.agent.state.tools = tools;
         // Rebuild base system prompt with new tool set
         this._baseSystemPrompt = this._rebuildSystemPrompt(validToolNames);
-        this.agent.state.systemPrompt = this._baseSystemPrompt;
+        this.agent.state.systemPrompt = this._systemPromptOverride ?? this._baseSystemPrompt;
     }
     /** Whether compaction or branch summarization is currently running */
     get isCompacting() {
@@ -668,6 +690,7 @@ export class AgentSession {
             }
         }
         finally {
+            this._systemPromptOverride = undefined;
             this._flushPendingBashMessages();
         }
     }
@@ -769,18 +792,11 @@ export class AgentSession {
                 }
                 throw new Error(formatNoApiKeyFoundMessage(this.model.provider));
             }
-            // Check if we need to compact before sending (catches aborted responses)
+            // Check if we need to compact before sending (catches aborted responses).
+            // The user's new prompt is sent below, so do not call agent.continue() here.
             const lastAssistant = this._findLastAssistantMessage();
-            if (lastAssistant && (await this._checkCompaction(lastAssistant, false))) {
-                try {
-                    await this.agent.continue();
-                    while (await this._handlePostAgentRun()) {
-                        await this.agent.continue();
-                    }
-                }
-                finally {
-                    this._flushPendingBashMessages();
-                }
+            if (lastAssistant) {
+                await this._checkCompaction(lastAssistant, false);
             }
             // Build messages array (custom message if any, then user message)
             messages = [];
@@ -815,11 +831,13 @@ export class AgentSession {
                 }
             }
             // Apply extension-modified system prompt, or reset to base
-            if (result?.systemPrompt) {
+            if (result?.systemPrompt !== undefined) {
+                this._systemPromptOverride = result.systemPrompt;
                 this.agent.state.systemPrompt = result.systemPrompt;
             }
             else {
                 // Ensure we're using the base prompt (in case previous turn had modifications)
+                this._systemPromptOverride = undefined;
                 this.agent.state.systemPrompt = this._baseSystemPrompt;
             }
         }
@@ -1459,10 +1477,12 @@ export class AgentSession {
             return await this._runAutoCompaction("overflow", willRetry);
         }
         // Case 2: Threshold - context is getting large
-        // For error messages (no usage data), estimate from last successful response.
-        // This ensures sessions that hit persistent API errors (e.g. 529) can still compact.
+        // For error messages or all-zero usage messages, estimate from the last valid response.
+        // This ensures sessions that hit persistent API errors (e.g. 529) or malformed zero-usage
+        // responses can still compact and do not reset context accounting.
         let contextTokens;
-        if (assistantMessage.stopReason === "error") {
+        const directContextTokens = assistantMessage.usage ? calculateContextTokens(assistantMessage.usage) : 0;
+        if (assistantMessage.stopReason === "error" || directContextTokens === 0) {
             const messages = this.agent.state.messages;
             const estimate = estimateContextTokens(messages);
             if (estimate.lastUsageIndex === null)
@@ -1479,7 +1499,7 @@ export class AgentSession {
             contextTokens = estimate.tokens;
         }
         else {
-            contextTokens = calculateContextTokens(assistantMessage.usage);
+            contextTokens = directContextTokens;
         }
         if (shouldCompact(contextTokens, contextWindow, settings)) {
             return await this._runAutoCompaction("threshold", false);
@@ -1765,7 +1785,11 @@ export class AgentSession {
                 });
             },
             appendEntry: (customType, data) => {
-                this.sessionManager.appendCustomEntry(customType, data);
+                const entryId = this.sessionManager.appendCustomEntry(customType, data);
+                const entry = this.sessionManager.getEntry(entryId);
+                if (entry) {
+                    this._emit({ type: "entry_appended", entry });
+                }
             },
             setSessionName: (name) => {
                 this.setSessionName(name);
@@ -1968,25 +1992,15 @@ export class AgentSession {
     // =========================================================================
     // Auto-Retry
     // =========================================================================
-    _isNonRetryableProviderLimitError(errorMessage) {
-        return /GoUsageLimitError|FreeUsageLimitError|Monthly usage limit reached|available balance|insufficient_quota|out of budget|quota exceeded|billing/i.test(errorMessage);
-    }
     /**
      * Check if an error is retryable (overloaded, rate limit, server errors).
      * Context overflow errors are NOT retryable (handled by compaction instead).
      */
     _isRetryableError(message) {
-        if (message.stopReason !== "error" || !message.errorMessage)
-            return false;
-        // Context overflow is handled by compaction, not retry
-        const contextWindow = this.model?.contextWindow ?? 0;
-        if (isContextOverflow(message, contextWindow))
-            return false;
-        const err = message.errorMessage;
-        if (this._isNonRetryableProviderLimitError(err))
+        // Context overflow is handled by compaction, not retry.
+        if (isContextOverflow(message, this.model?.contextWindow ?? 0))
             return false;
-        // Match: overloaded_error, provider returned error, rate limit, 429, 500, 502, 503, 504, service unavailable, network/connection errors (including connection lost), WebSocket transport closes/errors, fetch failed, premature stream endings, HTTP/2 closed before response, terminated, retry delay exceeded
-        return /overloaded|provider.?returned.?error|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server.?error|internal.?error|network.?error|connection.?error|connection.?refused|connection.?lost|websocket.?closed|websocket.?error|other side closed|fetch failed|upstream.?connect|reset before headers|socket hang up|ended without|stream ended before message_stop|http2 request did not get a response|timed? out|timeout|terminated|retry delay/i.test(err);
+        return isRetryableAssistantError(message);
     }
     /**
      * Prepare a retryable error for continuation with exponential backoff.
@@ -2152,7 +2166,9 @@ export class AgentSession {
      */
     setSessionName(name) {
         this.sessionManager.appendSessionInfo(name);
-        this._emit({ type: "session_info_changed", name: this.sessionManager.getSessionName() });
+        const event = { type: "session_info_changed", name: this.sessionManager.getSessionName() };
+        this._emit(event);
+        void this._extensionRunner.emit(event);
     }
     // =========================================================================
     // Tree Navigation
@@ -2424,8 +2440,8 @@ export class AgentSession {
                         const contextTokens = calculateContextTokens(assistant.usage);
                         if (contextTokens > 0) {
                             hasPostCompactionUsage = true;
+                            break;
                         }
-                        break;
                     }
                 }
             }

package/node_modules/@earendil-works/pi-coding-agent/dist/core/auth-storage.js

@@ -208,9 +208,15 @@ export class AuthStorage {
     }
     persistProviderChange(provider, credential) {
         if (this.loadError) {
-            return;
+            this.reload();
+        }
+        if (this.loadError) {
+            const error = new Error(`Cannot update auth storage because it could not be loaded: ${this.loadError.message}`);
+            this.recordError(error);
+            throw error;
         }
         try {
+            let persistedData = {};
             this.storage.withLock((current) => {
                 const currentData = this.parseStorageData(current);
                 const merged = { ...currentData };
@@ -220,11 +226,15 @@ export class AuthStorage {
                 else {
                     delete merged[provider];
                 }
+                persistedData = merged;
                 return { result: undefined, next: JSON.stringify(merged, null, 2) };
             });
+            this.loadError = null;
+            return persistedData;
         }
         catch (error) {
             this.recordError(error);
+            throw error;
         }
     }
     /**
@@ -244,15 +254,13 @@ export class AuthStorage {
      * Set credential for a provider.
      */
     set(provider, credential) {
-        this.data[provider] = credential;
-        this.persistProviderChange(provider, credential);
+        this.data = this.persistProviderChange(provider, credential);
     }
     /**
      * Remove credential for a provider.
      */
     remove(provider) {
-        delete this.data[provider];
-        this.persistProviderChange(provider, undefined);
+        this.data = this.persistProviderChange(provider, undefined);
     }
     /**
      * List all providers with credentials.

package/node_modules/@earendil-works/pi-coding-agent/dist/core/compaction/compaction.js

@@ -80,19 +80,22 @@ export function calculateContextTokens(usage) {
 }
 /**
  * Get usage from an assistant message if available.
- * Skips aborted and error messages as they don't have valid usage data.
+ * Skips aborted, error, and all-zero usage messages as they don't have valid usage data.
  */
 function getAssistantUsage(msg) {
     if (msg.role === "assistant" && "usage" in msg) {
         const assistantMsg = msg;
-        if (assistantMsg.stopReason !== "aborted" && assistantMsg.stopReason !== "error" && assistantMsg.usage) {
+        if (assistantMsg.stopReason !== "aborted" &&
+            assistantMsg.stopReason !== "error" &&
+            assistantMsg.usage &&
+            calculateContextTokens(assistantMsg.usage) > 0) {
             return assistantMsg.usage;
         }
     }
     return undefined;
 }
 /**
- * Find the last non-aborted assistant message usage from session entries.
+ * Find the last valid assistant message usage from session entries.
  */
 export function getLastAssistantUsage(entries) {
     for (let i = entries.length - 1; i >= 0; i--) {
@@ -565,16 +568,13 @@ Be concise. Focus on what's needed to understand the kept suffix.`;
  */
 export async function compact(preparation, model, apiKey, headers, customInstructions, signal, thinkingLevel, streamFn, env) {
     const { firstKeptEntryId, messagesToSummarize, turnPrefixMessages, isSplitTurn, tokensBefore, previousSummary, fileOps, settings, } = preparation;
-    // Generate summaries (can be parallel if both needed) and merge into one
+    // Generate summaries and merge into one
     let summary;
     if (isSplitTurn && turnPrefixMessages.length > 0) {
-        // Generate both summaries in parallel
-        const [historyResult, turnPrefixResult] = await Promise.all([
-            messagesToSummarize.length > 0
-                ? generateSummary(messagesToSummarize, model, settings.reserveTokens, apiKey, headers, signal, customInstructions, previousSummary, thinkingLevel, streamFn, env)
-                : Promise.resolve("No prior history."),
-            generateTurnPrefixSummary(turnPrefixMessages, model, settings.reserveTokens, apiKey, headers, env, signal, thinkingLevel, streamFn),
-        ]);
+        const historyResult = messagesToSummarize.length > 0
+            ? await generateSummary(messagesToSummarize, model, settings.reserveTokens, apiKey, headers, signal, customInstructions, previousSummary, thinkingLevel, streamFn, env)
+            : "No prior history.";
+        const turnPrefixResult = await generateTurnPrefixSummary(turnPrefixMessages, model, settings.reserveTokens, apiKey, headers, env, signal, thinkingLevel, streamFn);
         // Merge into single summary
         summary = `${historyResult}\n\n---\n\n**Turn Context (split turn):**\n\n${turnPrefixResult}`;
     }

package/node_modules/@earendil-works/pi-coding-agent/dist/core/extensions/loader.js

@@ -25,6 +25,7 @@ import { resolvePath } from "../../utils/paths.js";
 import { createEventBus } from "../event-bus.js";
 import { execCommand } from "../exec.js";
 import { createSyntheticSourceInfo } from "../source-info.js";
+import { time } from "../timings.js";
 /** Modules available to extensions via virtualModules (for compiled Bun binary) */
 const VIRTUAL_MODULES = {
     typebox: _bundledTypebox,
@@ -153,7 +154,7 @@ export function createExtensionRuntime() {
         invalidate: (message) => {
             state.staleMessage ??=
                 message ??
-                    "This extension ctx is stale after session replacement or reload. Do not use a captured sling or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().";
+                    "This extension ctx is stale after session replacement or reload. Do not use a captured pi or command ctx after ctx.newSession(), ctx.fork(), ctx.switchSession(), or ctx.reload(). For newSession, fork, and switchSession, move post-replacement work into withSession and use the ctx passed to withSession. For reload, do not use the old ctx after await ctx.reload().";
         },
         // Pre-bind: queue registrations so bindCore() can flush them once the
         // model registry is available. bindCore() replaces both with direct calls.
@@ -211,6 +212,11 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
             runtime.assertActive();
             extension.messageRenderers.set(customType, renderer);
         },
+        registerEntryRenderer(customType, renderer) {
+            runtime.assertActive();
+            extension.entryRenderers ??= new Map();
+            extension.entryRenderers.set(customType, renderer);
+        },
         // Flag access - checks extension registered it, reads from runtime
         getFlag(name) {
             runtime.assertActive();
@@ -331,6 +337,7 @@ function createExtension(extensionPath, resolvedPath) {
         handlers: new Map(),
         tools: new Map(),
         messageRenderers: new Map(),
+        entryRenderers: new Map(),
         commands: new Map(),
         flags: new Map(),
         shortcuts: new Map(),
@@ -340,12 +347,14 @@ async function loadExtension(extensionPath, cwd, eventBus, runtime, cacheToken)
     const resolvedPath = resolvePath(extensionPath, cwd, { normalizeUnicodeSpaces: true });
     try {
         const factory = await loadExtensionModule(resolvedPath, cacheToken);
+        time(`${extensionPath} module import`, "extensions");
         if (!factory) {
             return { extension: null, error: `Extension does not export a valid factory function: ${extensionPath}` };
         }
         const extension = createExtension(extensionPath, resolvedPath);
         const api = createExtensionAPI(extension, runtime, cwd, eventBus);
         await factory(api);
+        time(`${extensionPath} factory`, "extensions");
         return { extension, error: null };
     }
     catch (err) {
@@ -361,6 +370,7 @@ export async function loadExtensionFromFactory(factory, cwd, eventBus, runtime,
     const resolvedCwd = resolvePath(cwd);
     const api = createExtensionAPI(extension, runtime, resolvedCwd, eventBus);
     await factory(api);
+    time(`${extensionPath} factory`, "extensions");
     return extension;
 }
 /**

package/node_modules/@earendil-works/pi-coding-agent/dist/core/extensions/runner.js

@@ -45,6 +45,23 @@ const buildBuiltinKeybindings = (resolvedKeybindings) => {
     }
     return builtinKeybindings;
 };
+async function callContextHandlerAbortable(fn, signal) {
+    if (signal.aborted) {
+        throw new Error("Agent run aborted");
+    }
+    let cleanup = () => { };
+    const abortPromise = new Promise((_resolve, reject) => {
+        const onAbort = () => reject(new Error("Agent run aborted"));
+        signal.addEventListener("abort", onAbort, { once: true });
+        cleanup = () => signal.removeEventListener("abort", onAbort);
+    });
+    try {
+        return await Promise.race([Promise.resolve().then(fn), abortPromise]);
+    }
+    finally {
+        cleanup();
+    }
+}
 /**
  * Helper function to emit session_shutdown event to extensions.
  * Returns true if the event was emitted, false if there were no handlers.
@@ -358,6 +375,15 @@ export class ExtensionRunner {
         }
         return undefined;
     }
+    getEntryRenderer(customType) {
+        for (const ext of this.extensions) {
+            const renderer = ext.entryRenderers?.get(customType);
+            if (renderer) {
+                return renderer;
+            }
+        }
+        return undefined;
+    }
     resolveRegisteredCommands() {
         const commands = [];
         const counts = new Map();
@@ -684,6 +710,7 @@ export class ExtensionRunner {
     }
     async emitContext(messages) {
         const ctx = this.createContext();
+        const signal = ctx.signal;
         let currentMessages = structuredClone(messages);
         for (const ext of this.extensions) {
             const handlers = ext.handlers.get("context");
@@ -692,12 +719,17 @@ export class ExtensionRunner {
             for (const handler of handlers) {
                 try {
                     const event = { type: "context", messages: currentMessages };
-                    const handlerResult = await handler(event, ctx);
+                    const handlerResult = signal
+                        ? await callContextHandlerAbortable(() => handler(event, ctx), signal)
+                        : await handler(event, ctx);
                     if (handlerResult && handlerResult.messages) {
                         currentMessages = handlerResult.messages;
                     }
                 }
                 catch (err) {
+                    if (signal?.aborted) {
+                        throw err;
+                    }
                     const message = err instanceof Error ? err.message : String(err);
                     const stack = err instanceof Error ? err.stack : undefined;
                     this.emitError({