@psnext/slingcli 2.5.20260617-2 → 2.5.20260623-1

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

@@ -1,13 +1,14 @@
 /**
  * TUI session selector for --resume flag
  */
-import { ProcessTerminal, setKeybindings, TUI } from "@earendil-works/pi-tui";
+import { setKeybindings } from "@earendil-works/pi-tui";
 import { KeybindingsManager } from "../core/keybindings.js";
 import { SessionSelectorComponent } from "../modes/interactive/components/session-selector.js";
+import { createStartupTui, startStartupTui } from "./startup-ui.js";
 /** Show TUI session selector and return selected session path or null if cancelled */
-export async function selectSession(currentSessionsLoader, allSessionsLoader) {
+export async function selectSession(currentSessionsLoader, allSessionsLoader, settingsManager) {
+    const ui = await createStartupTui(settingsManager);
     return new Promise((resolve) => {
-        const ui = new TUI(new ProcessTerminal());
         const keybindings = KeybindingsManager.create();
         setKeybindings(keybindings);
         let resolved = false;
@@ -29,7 +30,7 @@ export async function selectSession(currentSessionsLoader, allSessionsLoader) {
         }, () => ui.requestRender(), { showRenameHint: false, keybindings });
         ui.addChild(selector);
         ui.setFocus(selector.getSessionList());
-        ui.start();
+        startStartupTui(ui, settingsManager);
     });
 }
 //# sourceMappingURL=session-picker.js.map

package/node_modules/@earendil-works/pi-coding-agent/dist/cli/startup-ui.js

@@ -1,12 +1,14 @@
 import { ProcessTerminal, setKeybindings, TUI } from "@earendil-works/pi-tui";
 import { existsSync } from "fs";
-import { APP_NAME, CONFIG_DIR_NAME, ENV_AGENT_DIR, getSettingsPath, PACKAGE_NAME } from "../config.js";
+import { APP_NAME, CONFIG_DIR_NAME, ENV_AGENT_DIR, getAgentDir, getSettingsPath, PACKAGE_NAME } from "../config.js";
 import { areExperimentalFeaturesEnabled } from "../core/experimental.js";
 import { KeybindingsManager } from "../core/keybindings.js";
+import { DefaultPackageManager } from "../core/package-manager.js";
+import { SettingsManager } from "../core/settings-manager.js";
 import { ExtensionInputComponent } from "../modes/interactive/components/extension-input.js";
 import { ExtensionSelectorComponent } from "../modes/interactive/components/extension-selector.js";
 import { FirstTimeSetupComponent, } from "../modes/interactive/components/first-time-setup.js";
-import { detectTerminalBackgroundTheme, initTheme, setTheme } from "../modes/interactive/theme/theme.js";
+import { detectTerminalBackgroundFromEnv, detectTerminalThemeForAuto, initTheme, loadThemeFromPath, parseAutoThemeSetting, resolveThemeSetting, setRegisteredThemes, setTheme, } from "../modes/interactive/theme/theme.js";
 const OFFICIAL_PACKAGE_NAME = "@earendil-works/pi-coding-agent";
 const OFFICIAL_APP_NAME = "pi";
 const OFFICIAL_CONFIG_DIR_NAME = ".pi";
@@ -15,13 +17,62 @@ function isOfficialDistribution({ packageName, appName, configDirName }) {
         appName === OFFICIAL_APP_NAME &&
         configDirName === OFFICIAL_CONFIG_DIR_NAME);
 }
-function createStartupTui(settingsManager) {
-    initTheme(settingsManager.getTheme());
+function loadThemes(resources) {
+    const themes = [];
+    const seen = new Set();
+    for (const resource of resources) {
+        if (!resource.enabled)
+            continue;
+        try {
+            const loadedTheme = loadThemeFromPath(resource.path);
+            if (loadedTheme.name) {
+                if (seen.has(loadedTheme.name))
+                    continue;
+                seen.add(loadedTheme.name);
+            }
+            themes.push(loadedTheme);
+        }
+        catch {
+            // Startup prompts should not fail because a theme is broken. The normal
+            // resource loader reports theme diagnostics later in startup.
+        }
+    }
+    return themes;
+}
+async function loadStartupThemes(settingsManager) {
+    const globalSettingsManager = SettingsManager.inMemory(settingsManager.getGlobalSettings(), {
+        projectTrusted: false,
+    });
+    const packageManager = new DefaultPackageManager({
+        cwd: process.cwd(),
+        agentDir: getAgentDir(),
+        settingsManager: globalSettingsManager,
+    });
+    const resolvedPaths = await packageManager.resolve(async () => "skip");
+    return loadThemes(resolvedPaths.themes);
+}
+export async function createStartupTui(settingsManager) {
+    setRegisteredThemes(await loadStartupThemes(settingsManager));
+    const terminalTheme = detectTerminalBackgroundFromEnv().theme;
+    initTheme(resolveThemeSetting(settingsManager.getThemeSetting(), terminalTheme) ?? terminalTheme);
     setKeybindings(KeybindingsManager.create());
     const ui = new TUI(new ProcessTerminal(), settingsManager.getShowHardwareCursor());
     ui.setClearOnShrink(settingsManager.getClearOnShrink());
     return ui;
 }
+export function startStartupTui(ui, settingsManager) {
+    ui.start();
+    void applyDetectedStartupTheme(ui, settingsManager);
+}
+async function applyDetectedStartupTheme(ui, settingsManager) {
+    const themeSetting = settingsManager.getThemeSetting();
+    if (themeSetting && !parseAutoThemeSetting(themeSetting))
+        return;
+    const terminalTheme = await detectTerminalThemeForAuto({ ui, timeoutMs: 100 });
+    setTheme(resolveThemeSetting(themeSetting, terminalTheme) ?? terminalTheme);
+    ui.invalidate();
+    ui.requestRender();
+}
 async function clearStartupTui(ui) {
     ui.clear();
     ui.requestRender();
@@ -51,8 +102,8 @@ export function shouldRunFirstTimeSetup(settingsPath = getSettingsPath()) {
     return !existsSync(settingsPath);
 }
 export async function showStartupSelector(settingsManager, title, options) {
+    const ui = await createStartupTui(settingsManager);
     return new Promise((resolve) => {
-        const ui = createStartupTui(settingsManager);
         let settled = false;
         const finish = async (result) => {
             if (settled) {
@@ -66,13 +117,13 @@ export async function showStartupSelector(settingsManager, title, options) {
         const selector = new ExtensionSelectorComponent(title, options.map((option) => option.label), (option) => void finish(options.find((entry) => entry.label === option)?.value), () => void finish(undefined), { tui: ui });
         ui.addChild(selector);
         ui.setFocus(selector);
-        ui.start();
+        startStartupTui(ui, settingsManager);
     });
 }
 /** Show the first-time setup dialog and persist the result */
 export async function showFirstTimeSetup(settingsManager) {
+    const ui = await createStartupTui(settingsManager);
     return new Promise((resolve) => {
-        const ui = createStartupTui(settingsManager);
         let settled = false;
         const finish = async (result) => {
             if (settled) {
@@ -90,10 +141,10 @@ export async function showFirstTimeSetup(settingsManager) {
         };
         const showSetup = async () => {
             ui.start();
-            const detection = await detectTerminalBackgroundTheme({ ui, timeoutMs: 100 });
-            setTheme(detection.theme);
+            const detectedTheme = await detectTerminalThemeForAuto({ ui, timeoutMs: 100 });
+            setTheme(detectedTheme);
             const component = new FirstTimeSetupComponent({
-                detectedTheme: detection.theme,
+                detectedTheme,
                 onThemePreview: (themeName) => {
                     setTheme(themeName);
                     ui.requestRender();
@@ -109,8 +160,8 @@ export async function showFirstTimeSetup(settingsManager) {
     });
 }
 export async function showStartupInput(settingsManager, title, placeholder) {
+    const ui = await createStartupTui(settingsManager);
     return new Promise((resolve) => {
-        const ui = createStartupTui(settingsManager);
         let settled = false;
         const finish = async (result) => {
             if (settled) {
@@ -127,7 +178,7 @@ export async function showStartupInput(settingsManager, title, placeholder) {
         });
         ui.addChild(input);
         ui.setFocus(input);
-        ui.start();
+        startStartupTui(ui, settingsManager);
     });
 }
 //# sourceMappingURL=startup-ui.js.map

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

@@ -16,6 +16,12 @@ const __dirname = dirname(__filename);
 export const isBunBinary = import.meta.url.includes("$bunfs") || import.meta.url.includes("~BUN") || import.meta.url.includes("%7EBUN");
 /** Detect if Bun is the runtime (compiled binary or bun run) */
 export const isBunRuntime = !!process.versions.bun;
+function normalizeSelfUpdatePackageTarget(target) {
+    if (typeof target === "string") {
+        return { packageName: target, installSpec: target };
+    }
+    return { packageName: target.packageName, installSpec: target.installSpec ?? target.packageName };
+}
 function makeSelfUpdateCommand(installStep, uninstallStep) {
     if (!uninstallStep)
         return installStep;
@@ -72,7 +78,8 @@ function getInferredNpmInstall() {
     // infer unsupported Windows custom prefixes without `npm root -g` evidence.
     return undefined;
 }
-function getSelfUpdateCommandForMethod(method, installedPackageName, updatePackageName = installedPackageName, npmCommand) {
+function getSelfUpdateCommandForMethod(method, installedPackageName, updatePackageTarget = installedPackageName, npmCommand) {
+    const target = normalizeSelfUpdatePackageTarget(updatePackageTarget);
     switch (method) {
         case "bun-binary":
             return undefined;
@@ -89,13 +96,13 @@ function getSelfUpdateCommandForMethod(method, installedPackageName, updatePacka
                 "--ignore-scripts",
                 "--config.minimumReleaseAge=0",
                 ...binDirArgs,
-                updatePackageName,
-            ]), updatePackageName === installedPackageName
+                target.installSpec,
+            ]), target.packageName === installedPackageName
                 ? undefined
                 : makeSelfUpdateCommandStep("pnpm", ["remove", "-g", ...binDirArgs, installedPackageName]));
         }
         case "yarn":
-            return makeSelfUpdateCommand(makeSelfUpdateCommandStep("yarn", ["global", "add", "--ignore-scripts", updatePackageName]), updatePackageName === installedPackageName
+            return makeSelfUpdateCommand(makeSelfUpdateCommandStep("yarn", ["global", "add", "--ignore-scripts", target.installSpec]), target.packageName === installedPackageName
                 ? undefined
                 : makeSelfUpdateCommandStep("yarn", ["global", "remove", installedPackageName]));
         case "bun":
@@ -104,8 +111,8 @@ function getSelfUpdateCommandForMethod(method, installedPackageName, updatePacka
                 "-g",
                 "--ignore-scripts",
                 "--minimum-release-age=0",
-                updatePackageName,
-            ]), updatePackageName === installedPackageName
+                target.installSpec,
+            ]), target.packageName === installedPackageName
                 ? undefined
                 : makeSelfUpdateCommandStep("bun", ["uninstall", "-g", installedPackageName]));
         case "npm": {
@@ -118,9 +125,9 @@ function getSelfUpdateCommandForMethod(method, installedPackageName, updatePacka
                 "-g",
                 "--ignore-scripts",
                 "--min-release-age=0",
-                updatePackageName,
+                target.installSpec,
             ]);
-            const uninstallStep = updatePackageName === installedPackageName
+            const uninstallStep = target.packageName === installedPackageName
                 ? undefined
                 : makeSelfUpdateCommandStep(command, [...prefixArgs, "uninstall", "-g", installedPackageName]);
             return makeSelfUpdateCommand(installStep, uninstallStep);
@@ -243,27 +250,28 @@ function isManagedByGlobalPackageManager(method, packageName, npmCommand) {
         });
     });
 }
-export function getSelfUpdateCommand(packageName, npmCommand, updatePackageName = packageName) {
+export function getSelfUpdateCommand(packageName, npmCommand, updatePackageTarget = packageName) {
     const method = detectInstallMethod();
-    const command = getSelfUpdateCommandForMethod(method, packageName, updatePackageName, npmCommand);
+    const command = getSelfUpdateCommandForMethod(method, packageName, updatePackageTarget, npmCommand);
     if (!command || !isManagedByGlobalPackageManager(method, packageName, npmCommand) || !isSelfUpdatePathWritable()) {
         return undefined;
     }
     return command;
 }
-export function getSelfUpdateUnavailableInstruction(packageName, npmCommand, updatePackageName = packageName) {
+export function getSelfUpdateUnavailableInstruction(packageName, npmCommand, updatePackageTarget = packageName) {
     const method = detectInstallMethod();
+    const target = normalizeSelfUpdatePackageTarget(updatePackageTarget);
     if (method === "bun-binary") {
         return `Download from: https://github.com/earendil-works/pi-mono/releases/latest`;
     }
-    const command = getSelfUpdateCommandForMethod(method, packageName, updatePackageName, npmCommand);
+    const command = getSelfUpdateCommandForMethod(method, packageName, target, npmCommand);
     if (command) {
         if (isManagedByGlobalPackageManager(method, packageName, npmCommand) && !isSelfUpdatePathWritable()) {
             return `This installation is managed by a global ${method} install, but the install path is not writable. Update it yourself with: ${command.display}`;
         }
         return `This installation is not managed by a global ${method} install. Update it with the package manager, wrapper, or source checkout that provides it.`;
     }
-    return `Update ${updatePackageName} using the package manager, wrapper, or source checkout that provides this installation.`;
+    return `Update ${target.installSpec} using the package manager, wrapper, or source checkout that provides this installation.`;
 }
 export function getUpdateInstruction(packageName) {
     const method = detectInstallMethod();

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, 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
 // ============================================================================
@@ -1293,6 +1300,8 @@ export class AgentSession {
                     preparation,
                     branchEntries: pathEntries,
                     customInstructions,
+                    reason: "manual",
+                    willRetry: false,
                     signal: this._compactionAbortController.signal,
                 }));
                 if (result?.cancel) {
@@ -1329,6 +1338,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 +1346,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 +1429,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,7 +1456,7 @@ 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.
@@ -1471,17 +1491,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 +1502,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 +1514,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 +1527,8 @@ export class AgentSession {
                     preparation,
                     branchEntries: pathEntries,
                     customInstructions: undefined,
+                    reason,
+                    willRetry,
                     signal: this._autoCompactionAbortController.signal,
                 }));
                 if (extensionResult?.cancel) {
@@ -1576,6 +1579,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 +1587,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 +1613,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 +1943,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 +1960,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");
         }

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";
@@ -517,6 +517,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