@psnext/slingcli 2.5.20260621-1 → 2.5.20260629-1

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

@@ -14,14 +14,14 @@
  */
 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";
+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";
 import { sleep } from "../utils/sleep.js";
 import { formatNoApiKeyFoundMessage, formatNoModelSelectedMessage } from "./auth-guidance.js";
 import { executeBashWithOperations } from "./bash-executor.js";
-import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
+import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, estimateTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "./compaction/index.js";
 import { DEFAULT_THINKING_LEVEL } from "./defaults.js";
 import { exportSessionToHtml } from "./export-html/index.js";
 import { createToolHtmlRenderer } from "./export-html/tool-renderer.js";
@@ -49,6 +49,13 @@ export function parseSkillBlock(text) {
         userMessage: match[4]?.trim() || undefined,
     };
 }
+function estimateMessagesTokens(messages) {
+    let tokens = 0;
+    for (const message of messages) {
+        tokens += estimateTokens(message);
+    }
+    return tokens;
+}
 // ============================================================================
 // Constants
 // ============================================================================
@@ -762,18 +769,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 = [];
@@ -1293,6 +1293,8 @@ export class AgentSession {
                     preparation,
                     branchEntries: pathEntries,
                     customInstructions,
+                    reason: "manual",
+                    willRetry: false,
                     signal: this._compactionAbortController.signal,
                 }));
                 if (result?.cancel) {
@@ -1329,6 +1331,7 @@ export class AgentSession {
             const newEntries = this.sessionManager.getEntries();
             const sessionContext = this.sessionManager.buildSessionContext();
             this.agent.state.messages = sessionContext.messages;
+            const estimatedTokensAfter = estimateMessagesTokens(sessionContext.messages);
             // Get the saved compaction entry for the extension event
             const savedCompactionEntry = newEntries.find((e) => e.type === "compaction" && e.summary === summary);
             if (this._extensionRunner && savedCompactionEntry) {
@@ -1336,12 +1339,15 @@ export class AgentSession {
                     type: "session_compact",
                     compactionEntry: savedCompactionEntry,
                     fromExtension,
+                    reason: "manual",
+                    willRetry: false,
                 });
             }
             const compactionResult = {
                 summary,
                 firstKeptEntryId,
                 tokensBefore,
+                estimatedTokensAfter,
                 details,
             };
             this._emit({
@@ -1416,8 +1422,15 @@ export class AgentSession {
         if (assistantIsFromBeforeCompaction) {
             return false;
         }
-        // Case 1: Overflow - LLM returned context overflow error
+        // Case 1: Overflow - LLM returned context overflow error, or reported usage exceeded
+        // the configured window. A successful response over the configured window should compact
+        // but must not retry: the assistant answer already completed and agent.continue() cannot
+        // continue from an assistant message.
         if (sameModel && isContextOverflow(assistantMessage, contextWindow)) {
+            const willRetry = assistantMessage.stopReason !== "stop";
+            if (!willRetry) {
+                return await this._runAutoCompaction("overflow", false);
+            }
             if (this._overflowRecoveryAttempted) {
                 this._emit({
                     type: "compaction_end",
@@ -1436,13 +1449,15 @@ export class AgentSession {
             if (messages.length > 0 && messages[messages.length - 1].role === "assistant") {
                 this.agent.state.messages = messages.slice(0, -1);
             }
-            return await this._runAutoCompaction("overflow", true);
+            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)
@@ -1459,7 +1474,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);
@@ -1471,17 +1486,9 @@ export class AgentSession {
      */
     async _runAutoCompaction(reason, willRetry) {
         const settings = this.settingsManager.getCompactionSettings();
-        this._emit({ type: "compaction_start", reason });
-        this._autoCompactionAbortController = new AbortController();
+        let started = false;
         try {
             if (!this.model) {
-                this._emit({
-                    type: "compaction_end",
-                    reason,
-                    result: undefined,
-                    aborted: false,
-                    willRetry: false,
-                });
                 return false;
             }
             let apiKey;
@@ -1490,13 +1497,6 @@ export class AgentSession {
             if (this.agent.streamFn === streamSimple) {
                 const authResult = await this._modelRegistry.getApiKeyAndHeaders(this.model);
                 if (!authResult.ok || !authResult.apiKey) {
-                    this._emit({
-                        type: "compaction_end",
-                        reason,
-                        result: undefined,
-                        aborted: false,
-                        willRetry: false,
-                    });
                     return false;
                 }
                 apiKey = authResult.apiKey;
@@ -1509,15 +1509,11 @@ export class AgentSession {
             const pathEntries = this.sessionManager.getBranch();
             const preparation = prepareCompaction(pathEntries, settings);
             if (!preparation) {
-                this._emit({
-                    type: "compaction_end",
-                    reason,
-                    result: undefined,
-                    aborted: false,
-                    willRetry: false,
-                });
                 return false;
             }
+            this._emit({ type: "compaction_start", reason });
+            this._autoCompactionAbortController = new AbortController();
+            started = true;
             let extensionCompaction;
             let fromExtension = false;
             if (this._extensionRunner.hasHandlers("session_before_compact")) {
@@ -1526,6 +1522,8 @@ export class AgentSession {
                     preparation,
                     branchEntries: pathEntries,
                     customInstructions: undefined,
+                    reason,
+                    willRetry,
                     signal: this._autoCompactionAbortController.signal,
                 }));
                 if (extensionResult?.cancel) {
@@ -1576,6 +1574,7 @@ export class AgentSession {
             const newEntries = this.sessionManager.getEntries();
             const sessionContext = this.sessionManager.buildSessionContext();
             this.agent.state.messages = sessionContext.messages;
+            const estimatedTokensAfter = estimateMessagesTokens(sessionContext.messages);
             // Get the saved compaction entry for the extension event
             const savedCompactionEntry = newEntries.find((e) => e.type === "compaction" && e.summary === summary);
             if (this._extensionRunner && savedCompactionEntry) {
@@ -1583,12 +1582,15 @@ export class AgentSession {
                     type: "session_compact",
                     compactionEntry: savedCompactionEntry,
                     fromExtension,
+                    reason,
+                    willRetry,
                 });
             }
             const result = {
                 summary,
                 firstKeptEntryId,
                 tokensBefore,
+                estimatedTokensAfter,
                 details,
             };
             this._emit({ type: "compaction_end", reason, result, aborted: false, willRetry });
@@ -1606,16 +1608,18 @@ export class AgentSession {
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : "compaction failed";
-            this._emit({
-                type: "compaction_end",
-                reason,
-                result: undefined,
-                aborted: false,
-                willRetry: false,
-                errorMessage: reason === "overflow"
-                    ? `Context overflow recovery failed: ${errorMessage}`
-                    : `Auto-compaction failed: ${errorMessage}`,
-            });
+            if (started) {
+                this._emit({
+                    type: "compaction_end",
+                    reason,
+                    result: undefined,
+                    aborted: false,
+                    willRetry: false,
+                    errorMessage: reason === "overflow"
+                        ? `Context overflow recovery failed: ${errorMessage}`
+                        : `Auto-compaction failed: ${errorMessage}`,
+                });
+            }
             return false;
         }
         finally {
@@ -1934,7 +1938,7 @@ export class AgentSession {
             includeAllExtensionTools: options.includeAllExtensionTools,
         });
     }
-    async reload() {
+    async reload(options) {
         const previousFlagValues = this._extensionRunner.getFlagValues();
         await emitSessionShutdownEvent(this._extensionRunner, { type: "session_shutdown", reason: "reload" });
         await this.settingsManager.reload();
@@ -1951,6 +1955,7 @@ export class AgentSession {
             this._extensionShutdownHandler ||
             this._extensionErrorListener;
         if (hasBindings) {
+            await options?.beforeSessionStart?.();
             await this._extensionRunner.emit({ type: "session_start", reason: "reload" });
             await this.extendResourcesFromExtensions("reload");
         }
@@ -1958,25 +1963,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.
@@ -2414,8 +2409,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

@@ -5,7 +5,7 @@
  * Uses file locking to prevent race conditions when multiple pi instances
  * try to refresh tokens simultaneously.
  */
-import { findEnvKeys, getEnvApiKey, } from "@earendil-works/pi-ai";
+import { findEnvKeys, getEnvApiKey, } from "@earendil-works/pi-ai/compat";
 import { getOAuthApiKey, getOAuthProvider, getOAuthProviders } from "@earendil-works/pi-ai/oauth";
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
@@ -147,7 +147,6 @@ export class InMemoryAuthStorageBackend {
 export class AuthStorage {
     data = {};
     runtimeOverrides = new Map();
-    fallbackResolver;
     loadError = null;
     errors = [];
     storage;
@@ -179,13 +178,6 @@ export class AuthStorage {
     removeRuntimeApiKey(provider) {
         this.runtimeOverrides.delete(provider);
     }
-    /**
-     * Set a fallback resolver for API keys not found in auth.json or env vars.
-     * Used for custom provider keys from models.json.
-     */
-    setFallbackResolver(resolver) {
-        this.fallbackResolver = resolver;
-    }
     recordError(error) {
         const normalizedError = error instanceof Error ? error : new Error(String(error));
         this.errors.push(normalizedError);
@@ -285,8 +277,6 @@ export class AuthStorage {
             return true;
         if (getEnvApiKey(provider))
             return true;
-        if (this.fallbackResolver?.(provider))
-            return true;
         return false;
     }
     /**
@@ -303,9 +293,6 @@ export class AuthStorage {
         if (envKeys?.[0]) {
             return { configured: false, source: "environment", label: envKeys[0] };
         }
-        if (this.fallbackResolver?.(provider)) {
-            return { configured: false, source: "fallback", label: "custom provider config" };
-        }
         return { configured: false };
     }
     /**
@@ -383,9 +370,8 @@ export class AuthStorage {
      * 2. API key from auth.json
      * 3. OAuth token from auth.json (auto-refreshed with locking)
      * 4. Environment variable
-     * 5. Fallback resolver (models.json custom providers)
      */
-    async getApiKey(providerId, options) {
+    async getApiKey(providerId, options = {}) {
         // Runtime override takes highest priority
         const runtimeKey = this.runtimeOverrides.get(providerId);
         if (runtimeKey) {
@@ -430,14 +416,12 @@ export class AuthStorage {
                 return provider.getApiKey(cred);
             }
         }
+        if (options.includeFallback === false)
+            return undefined;
         // Fall back to environment variable
         const envKey = getEnvApiKey(providerId);
         if (envKey)
             return envKey;
-        // Fall back to custom resolver (e.g., models.json custom providers)
-        if (options?.includeFallback !== false) {
-            return this.fallbackResolver?.(providerId) ?? undefined;
-        }
         return undefined;
     }
     /**

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

@@ -4,7 +4,7 @@
  * When navigating to a different point in the session tree, this generates
  * a summary of the branch being left so context isn't lost.
  */
-import { completeSimple } from "@earendil-works/pi-ai";
+import { completeSimple } from "@earendil-works/pi-ai/compat";
 import { convertToLlm, createBranchSummaryMessage, createCompactionSummaryMessage, createCustomMessage, } from "../messages.js";
 import { estimateTokens } from "./compaction.js";
 import { computeFileLists, createFileOps, extractFileOpsFromMessage, formatFileOperations, SUMMARIZATION_SYSTEM_PROMPT, serializeConversation, } from "./utils.js";

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

@@ -4,7 +4,7 @@
  * Pure functions for compaction logic. The session manager handles I/O,
  * and after compaction the session is reloaded.
  */
-import { completeSimple } from "@earendil-works/pi-ai";
+import { completeSimple } from "@earendil-works/pi-ai/compat";
 import { convertToLlm, createBranchSummaryMessage, createCompactionSummaryMessage, createCustomMessage, } from "../messages.js";
 import { buildSessionContext } from "../session-manager.js";
 import { computeFileLists, createFileOps, extractFileOpsFromMessage, formatFileOperations, SUMMARIZATION_SYSTEM_PROMPT, serializeConversation, } from "./utils.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--) {
@@ -517,6 +520,9 @@ export function prepareCompaction(pathEntries, settings) {
                 turnPrefixMessages.push(msg);
         }
     }
+    if (messagesToSummarize.length === 0 && turnPrefixMessages.length === 0) {
+        return undefined;
+    }
     // Extract file operations from messages and previous compaction
     const fileOps = extractFileOperations(messagesToSummarize, pathEntries, prevCompactionIndex);
     // Also extract file ops from turn prefix if splitting

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

@@ -7,7 +7,7 @@ import { createRequire } from "node:module";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import * as _bundledPiAgentCore from "@earendil-works/pi-agent-core";
-import * as _bundledPiAi from "@earendil-works/pi-ai";
+import * as _bundledPiAiCompat from "@earendil-works/pi-ai/compat";
 import * as _bundledPiAiOauth from "@earendil-works/pi-ai/oauth";
 import * as _bundledPiTui from "@earendil-works/pi-tui";
 import { createJiti } from "jiti/static";
@@ -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,
@@ -35,12 +36,17 @@ const VIRTUAL_MODULES = {
     "@sinclair/typebox/value": _bundledTypeboxValue,
     "@earendil-works/pi-agent-core": _bundledPiAgentCore,
     "@earendil-works/pi-tui": _bundledPiTui,
-    "@earendil-works/pi-ai": _bundledPiAi,
+    // Extensions resolve the pi-ai root to the compat entrypoint (a strict
+    // superset of the core entrypoint): existing extensions using the old
+    // global API keep working at runtime until compat is removed.
+    "@earendil-works/pi-ai": _bundledPiAiCompat,
+    "@earendil-works/pi-ai/compat": _bundledPiAiCompat,
     "@earendil-works/pi-ai/oauth": _bundledPiAiOauth,
     "@earendil-works/pi-coding-agent": _bundledPiCodingAgent,
     "@mariozechner/pi-agent-core": _bundledPiAgentCore,
     "@mariozechner/pi-tui": _bundledPiTui,
-    "@mariozechner/pi-ai": _bundledPiAi,
+    "@mariozechner/pi-ai": _bundledPiAiCompat,
+    "@mariozechner/pi-ai/compat": _bundledPiAiCompat,
     "@mariozechner/pi-ai/oauth": _bundledPiAiOauth,
     "@mariozechner/pi-coding-agent": _bundledPiCodingAgent,
 };
@@ -69,18 +75,23 @@ function getAliases() {
     const piCodingAgentEntry = packageIndex;
     const piAgentCoreEntry = resolveWorkspaceOrImport("agent/dist/index.js", "@earendil-works/pi-agent-core");
     const piTuiEntry = resolveWorkspaceOrImport("tui/dist/index.js", "@earendil-works/pi-tui");
-    const piAiEntry = resolveWorkspaceOrImport("ai/dist/index.js", "@earendil-works/pi-ai");
+    // Extensions resolve the pi-ai root to the compat entrypoint (a strict
+    // superset of the core entrypoint): existing extensions using the old
+    // global API keep working at runtime until compat is removed.
+    const piAiCompatEntry = resolveWorkspaceOrImport("ai/dist/compat.js", "@earendil-works/pi-ai/compat");
     const piAiOauthEntry = resolveWorkspaceOrImport("ai/dist/oauth.js", "@earendil-works/pi-ai/oauth");
     _aliases = {
         "@earendil-works/pi-coding-agent": piCodingAgentEntry,
         "@earendil-works/pi-agent-core": piAgentCoreEntry,
         "@earendil-works/pi-tui": piTuiEntry,
-        "@earendil-works/pi-ai": piAiEntry,
+        "@earendil-works/pi-ai": piAiCompatEntry,
+        "@earendil-works/pi-ai/compat": piAiCompatEntry,
         "@earendil-works/pi-ai/oauth": piAiOauthEntry,
         "@mariozechner/pi-coding-agent": piCodingAgentEntry,
         "@mariozechner/pi-agent-core": piAgentCoreEntry,
         "@mariozechner/pi-tui": piTuiEntry,
-        "@mariozechner/pi-ai": piAiEntry,
+        "@mariozechner/pi-ai": piAiCompatEntry,
+        "@mariozechner/pi-ai/compat": piAiCompatEntry,
         "@mariozechner/pi-ai/oauth": piAiOauthEntry,
         typebox: typeboxEntry,
         "typebox/compile": typeboxCompileEntry,
@@ -91,6 +102,22 @@ function getAliases() {
     };
     return _aliases;
 }
+let extensionCacheCwd;
+let extensionCacheGeneration = 0;
+const extensionCache = new Map();
+export function clearExtensionCache() {
+    extensionCache.clear();
+    extensionCacheCwd = undefined;
+    extensionCacheGeneration++;
+}
+function useExtensionCacheCwd(cwd) {
+    const resolvedCwd = resolvePath(cwd);
+    if (extensionCacheCwd !== undefined && extensionCacheCwd !== resolvedCwd) {
+        clearExtensionCache();
+    }
+    extensionCacheCwd = resolvedCwd;
+    return { cwd: resolvedCwd, generation: extensionCacheGeneration };
+}
 /**
  * Create a runtime with throwing stubs for action methods.
  * Runner.bindCore() replaces these with real implementations.
@@ -261,7 +288,18 @@ function createExtensionAPI(extension, runtime, cwd, eventBus) {
     };
     return api;
 }
-async function loadExtensionModule(extensionPath) {
+function isCurrentCacheToken(cacheToken) {
+    return (cacheToken !== undefined &&
+        extensionCacheCwd === cacheToken.cwd &&
+        extensionCacheGeneration === cacheToken.generation);
+}
+async function loadExtensionModule(extensionPath, cacheToken) {
+    if (isCurrentCacheToken(cacheToken)) {
+        const cachedFactory = extensionCache.get(extensionPath);
+        if (cachedFactory) {
+            return cachedFactory;
+        }
+    }
     const jiti = createJiti(import.meta.url, {
         moduleCache: false,
         // In Bun binary: use virtualModules for bundled packages (no filesystem resolution)
@@ -271,7 +309,13 @@ async function loadExtensionModule(extensionPath) {
     });
     const module = await jiti.import(extensionPath, { default: true });
     const factory = module;
-    return typeof factory !== "function" ? undefined : factory;
+    if (typeof factory !== "function") {
+        return undefined;
+    }
+    if (isCurrentCacheToken(cacheToken)) {
+        extensionCache.set(extensionPath, factory);
+    }
+    return factory;
 }
 /**
  * Create an Extension object with empty collections.
@@ -293,16 +337,18 @@ function createExtension(extensionPath, resolvedPath) {
         shortcuts: new Map(),
     };
 }
-async function loadExtension(extensionPath, cwd, eventBus, runtime) {
+async function loadExtension(extensionPath, cwd, eventBus, runtime, cacheToken) {
     const resolvedPath = resolvePath(extensionPath, cwd, { normalizeUnicodeSpaces: true });
     try {
-        const factory = await loadExtensionModule(resolvedPath);
+        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) {
@@ -318,19 +364,21 @@ 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;
 }
 /**
  * Load extensions from paths.
  */
-export async function loadExtensions(paths, cwd, eventBus, runtime) {
+async function loadExtensionsInternal(paths, cwd, eventBus, runtime, useCache = false) {
     const extensions = [];
     const errors = [];
-    const resolvedCwd = resolvePath(cwd);
+    const cacheToken = useCache ? useExtensionCacheCwd(cwd) : undefined;
+    const resolvedCwd = cacheToken?.cwd ?? resolvePath(cwd);
     const resolvedEventBus = eventBus ?? createEventBus();
     const resolvedRuntime = runtime ?? createExtensionRuntime();
     for (const extPath of paths) {
-        const { extension, error } = await loadExtension(extPath, resolvedCwd, resolvedEventBus, resolvedRuntime);
+        const { extension, error } = await loadExtension(extPath, resolvedCwd, resolvedEventBus, resolvedRuntime, cacheToken);
         if (error) {
             errors.push({ path: extPath, error });
             continue;
@@ -345,6 +393,12 @@ export async function loadExtensions(paths, cwd, eventBus, runtime) {
         runtime: resolvedRuntime,
     };
 }
+export async function loadExtensions(paths, cwd, eventBus, runtime) {
+    return loadExtensionsInternal(paths, cwd, eventBus, runtime);
+}
+export async function loadExtensionsCached(paths, cwd, eventBus, runtime) {
+    return loadExtensionsInternal(paths, cwd, eventBus, runtime, true);
+}
 function readPiManifest(packageJsonPath) {
     try {
         const content = fs.readFileSync(packageJsonPath, "utf-8");

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

@@ -320,7 +320,7 @@ export class ExtensionRunner {
     getShortcutDiagnostics() {
         return this.shortcutDiagnostics;
     }
-    invalidate(message = "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().") {
+    invalidate(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().") {
         if (!this.staleMessage) {
             this.staleMessage = message;
             this.runtime.invalidate(message);