@vaclav-synacek/pi-coding-agent-termux 0.50.7-1 → 0.51.1-0

package/dist/core/agent-session.js

@@ -13,7 +13,7 @@
  * Modes use this class and add their own I/O layer on top.
  */
 import { readFileSync } from "node:fs";
-import { join } from "node:path";
+import { basename, dirname, join } from "node:path";
 import { isContextOverflow, modelsAreEqual, resetApiProviders, supportsXhigh } from "@mariozechner/pi-ai";
 import { getDocsPath } from "../config.js";
 import { theme } from "../modes/interactive/theme/theme.js";
@@ -884,21 +884,36 @@ export class AgentSession {
         }
         return this._cycleAvailableModel(direction);
     }
+    async _getScopedModelsWithApiKey() {
+        const apiKeysByProvider = new Map();
+        const result = [];
+        for (const scoped of this._scopedModels) {
+            const provider = scoped.model.provider;
+            let apiKey;
+            if (apiKeysByProvider.has(provider)) {
+                apiKey = apiKeysByProvider.get(provider);
+            }
+            else {
+                apiKey = await this._modelRegistry.getApiKeyForProvider(provider);
+                apiKeysByProvider.set(provider, apiKey);
+            }
+            if (apiKey) {
+                result.push(scoped);
+            }
+        }
+        return result;
+    }
     async _cycleScopedModel(direction) {
-        if (this._scopedModels.length <= 1)
+        const scopedModels = await this._getScopedModelsWithApiKey();
+        if (scopedModels.length <= 1)
             return undefined;
         const currentModel = this.model;
-        let currentIndex = this._scopedModels.findIndex((sm) => modelsAreEqual(sm.model, currentModel));
+        let currentIndex = scopedModels.findIndex((sm) => modelsAreEqual(sm.model, currentModel));
         if (currentIndex === -1)
             currentIndex = 0;
-        const len = this._scopedModels.length;
+        const len = scopedModels.length;
         const nextIndex = direction === "forward" ? (currentIndex + 1) % len : (currentIndex - 1 + len) % len;
-        const next = this._scopedModels[nextIndex];
-        // Validate API key
-        const apiKey = await this._modelRegistry.getApiKey(next.model);
-        if (!apiKey) {
-            throw new Error(`No API key for ${next.model.provider}/${next.model.id}`);
-        }
+        const next = scopedModels[nextIndex];
         // Apply model
         this.agent.setModel(next.model);
         this.sessionManager.appendModelChange(next.model.provider, next.model.id);
@@ -937,14 +952,18 @@ export class AgentSession {
     /**
      * Set thinking level.
      * Clamps to model capabilities based on available thinking levels.
-     * Saves to session and settings.
+     * Saves to session and settings only if the level actually changes.
      */
     setThinkingLevel(level) {
         const availableLevels = this.getAvailableThinkingLevels();
         const effectiveLevel = availableLevels.includes(level) ? level : this._clampThinkingLevel(level, availableLevels);
+        // Only persist if actually changing
+        const isChanging = effectiveLevel !== this.agent.state.thinkingLevel;
         this.agent.setThinkingLevel(effectiveLevel);
-        this.sessionManager.appendThinkingLevelChange(effectiveLevel);
-        this.settingsManager.setDefaultThinkingLevel(effectiveLevel);
+        if (isChanging) {
+            this.sessionManager.appendThinkingLevelChange(effectiveLevel);
+            this.settingsManager.setDefaultThinkingLevel(effectiveLevel);
+        }
     }
     /**
      * Cycle to next thinking level.
@@ -1317,7 +1336,48 @@ export class AgentSession {
         if (this._extensionRunner) {
             this._applyExtensionBindings(this._extensionRunner);
             await this._extensionRunner.emit({ type: "session_start" });
+            await this.extendResourcesFromExtensions("startup");
+        }
+    }
+    async extendResourcesFromExtensions(reason) {
+        if (!this._extensionRunner?.hasHandlers("resources_discover")) {
+            return;
+        }
+        const { skillPaths, promptPaths, themePaths } = await this._extensionRunner.emitResourcesDiscover(this._cwd, reason);
+        if (skillPaths.length === 0 && promptPaths.length === 0 && themePaths.length === 0) {
+            return;
+        }
+        const extensionPaths = {
+            skillPaths: this.buildExtensionResourcePaths(skillPaths),
+            promptPaths: this.buildExtensionResourcePaths(promptPaths),
+            themePaths: this.buildExtensionResourcePaths(themePaths),
+        };
+        this._resourceLoader.extendResources(extensionPaths);
+        this._baseSystemPrompt = this._rebuildSystemPrompt(this.getActiveToolNames());
+        this.agent.setSystemPrompt(this._baseSystemPrompt);
+    }
+    buildExtensionResourcePaths(entries) {
+        return entries.map((entry) => {
+            const source = this.getExtensionSourceLabel(entry.extensionPath);
+            const baseDir = entry.extensionPath.startsWith("<") ? undefined : dirname(entry.extensionPath);
+            return {
+                path: entry.path,
+                metadata: {
+                    source,
+                    scope: "temporary",
+                    origin: "top-level",
+                    baseDir,
+                },
+            };
+        });
+    }
+    getExtensionSourceLabel(extensionPath) {
+        if (extensionPath.startsWith("<")) {
+            return `extension:${extensionPath.replace(/[<>]/g, "")}`;
         }
+        const base = basename(extensionPath);
+        const name = base.replace(/\.(ts|js)$/, "");
+        return `extension:${name}`;
     }
     _applyExtensionBindings(runner) {
         runner.setUIContext(this._extensionUIContext);
@@ -1482,6 +1542,7 @@ export class AgentSession {
             this._extensionErrorListener;
         if (this._extensionRunner && hasBindings) {
             await this._extensionRunner.emit({ type: "session_start" });
+            await this.extendResourcesFromExtensions("reload");
         }
     }
     // =========================================================================
@@ -1499,8 +1560,8 @@ export class AgentSession {
         if (isContextOverflow(message, contextWindow))
             return false;
         const err = message.errorMessage;
-        // Match: overloaded_error, rate limit, 429, 500, 502, 503, 504, service unavailable, connection errors, fetch failed, terminated
-        return /overloaded|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error|connection.?refused|other side closed|fetch failed|upstream.?connect|reset before headers|terminated/i.test(err);
+        // Match: overloaded_error, rate limit, 429, 500, 502, 503, 504, service unavailable, connection errors, fetch failed, terminated, retry delay exceeded
+        return /overloaded|rate.?limit|too many requests|429|500|502|503|504|service.?unavailable|server error|internal error|connection.?error|connection.?refused|other side closed|fetch failed|upstream.?connect|reset before headers|terminated|retry delay/i.test(err);
     }
     /**
      * Handle retryable errors with exponential backoff.