@pencil-agent/nano-pencil 1.11.33 → 1.11.34

package/dist/core/config/settings-manager.d.ts

@@ -97,6 +97,10 @@ export interface Settings {
             lockStaleMinutes?: number;
         };
     };
+    /** Auto-update setting: 'always' = auto-update on startup, 'prompt' = ask user (default), 'never' = never check */
+    autoUpdate?: "always" | "prompt" | "never";
+    /** Last skipped version for update prompts */
+    skippedVersion?: string;
 }
 export type SettingsScope = "global" | "project";
 export interface SettingsStorage {
@@ -251,5 +255,9 @@ export declare class SettingsManager {
     getAutocompleteMaxVisible(): number;
     setAutocompleteMaxVisible(maxVisible: number): void;
     getCodeBlockIndent(): string;
+    getAutoUpdate(): "always" | "prompt" | "never";
+    setAutoUpdate(mode: "always" | "prompt" | "never"): void;
+    getSkippedVersion(): string | undefined;
+    setSkippedVersion(version: string | undefined): void;
 }
 //# sourceMappingURL=settings-manager.d.ts.map

package/dist/core/config/settings-manager.js

@@ -689,5 +689,21 @@ export class SettingsManager {
     getCodeBlockIndent() {
         return this.settings.markdown?.codeBlockIndent ?? "  ";
     }
+    getAutoUpdate() {
+        return this.settings.autoUpdate ?? "prompt";
+    }
+    setAutoUpdate(mode) {
+        this.globalSettings.autoUpdate = mode;
+        this.markModified("autoUpdate");
+        this.save();
+    }
+    getSkippedVersion() {
+        return this.settings.skippedVersion;
+    }
+    setSkippedVersion(version) {
+        this.globalSettings.skippedVersion = version;
+        this.markModified("skippedVersion");
+        this.save();
+    }
 }
 //# sourceMappingURL=settings-manager.js.map

package/dist/core/index.d.ts

@@ -10,6 +10,7 @@ export type { CompactionResult } from "./session/compaction/index.js";
 export { createEventBus, type EventBus, type EventBusController, } from "./runtime/event-bus.js";
 export { type AgentEndEvent, type AgentStartEvent, type AgentToolResult, type AgentToolUpdateCallback, type BeforeAgentStartEvent, type ContextEvent, discoverAndLoadExtensions, type ExecOptions, type ExecResult, type Extension, type ExtensionAPI, type ExtensionCommandContext, type ExtensionContext, type ExtensionError, type ExtensionEvent, type ExtensionFactory, type ExtensionFlag, type ExtensionHandler, ExtensionRunner, type ExtensionShortcut, type ExtensionUIContext, type LoadExtensionsResult, type MessageRenderer, type RegisteredCommand, type SessionBeforeCompactEvent, type SessionBeforeForkEvent, type SessionBeforeSwitchEvent, type SessionBeforeTreeEvent, type SessionCompactEvent, type SessionForkEvent, type SessionShutdownEvent, type SessionStartEvent, type SessionSwitchEvent, type SessionTreeEvent, type ToolCallEvent, type ToolDefinition, type ToolRenderResultOptions, type ToolResultEvent, type TurnEndEvent, type TurnStartEvent, wrapToolsWithExtensions, } from "./extensions/index.js";
 export { MCPManager } from "./mcp-manager.js";
+export { getDebugLogger, createDebugLogger, debug, type DebugLogLevel, } from "../packages/ai/dist/debug-logger.js";
 export type { MCPServerConfig, MCPTool, MCPToolResult, } from "./mcp/mcp-client.js";
 export { loadMCPConfig, saveMCPConfig, addMCPServer, removeMCPServer, getMCPServer, listMCPServers, listEnabledMCPServers, } from "./mcp/mcp-config.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/core/index.js

@@ -11,5 +11,7 @@ export { createEventBus, } from "./runtime/event-bus.js";
 export { discoverAndLoadExtensions, ExtensionRunner, wrapToolsWithExtensions, } from "./extensions/index.js";
 // MCP (Model Context Protocol) support
 export { MCPManager } from "./mcp-manager.js";
+// Debug logging (re-exported from ai package)
+export { getDebugLogger, createDebugLogger, debug, } from "../packages/ai/dist/debug-logger.js";
 export { loadMCPConfig, saveMCPConfig, addMCPServer, removeMCPServer, getMCPServer, listMCPServers, listEnabledMCPServers, } from "./mcp/mcp-config.js";
 //# sourceMappingURL=index.js.map

package/dist/core/model/switcher.d.ts

@@ -40,7 +40,7 @@ export declare class ModelSwitcher {
      */
     hasApiKey(model: Model<any>): Promise<boolean>;
     /**
-     * Get models with API keys
+     * Get models with API keys (async, validates OAuth tokens)
      */
     getModelsWithApiKey(): Promise<Model<any>[]>;
     /**
@@ -60,6 +60,7 @@ export declare class ModelSwitcher {
     private cycleScopedModel;
     /**
      * Cycle through all available models
+     * Skips models with expired OAuth tokens.
      */
     private cycleAvailableModel;
     /**

package/dist/core/model/switcher.js

@@ -20,13 +20,14 @@ export class ModelSwitcher {
         return !!apiKey;
     }
     /**
-     * Get models with API keys
+     * Get models with API keys (async, validates OAuth tokens)
      */
     async getModelsWithApiKey() {
         const available = this.options.getAvailableModels();
         const result = [];
         for (const model of available) {
-            if (await this.hasApiKey(model)) {
+            const apiKey = await this.options.getApiKey(model);
+            if (apiKey) {
                 result.push(model);
             }
         }
@@ -89,9 +90,10 @@ export class ModelSwitcher {
     }
     /**
      * Cycle through all available models
+     * Skips models with expired OAuth tokens.
      */
     async cycleAvailableModel(direction) {
-        const available = await this.getModelsWithApiKey();
+        const available = this.options.getAvailableModels();
         if (available.length <= 1)
             return undefined;
         const currentModel = this.getModel();
@@ -99,11 +101,32 @@ export class ModelSwitcher {
         if (currentIndex === -1)
             currentIndex = 0;
         const len = available.length;
-        const nextIndex = direction === "forward"
-            ? (currentIndex + 1) % len
-            : (currentIndex - 1 + len) % len;
-        const next = available[nextIndex];
+        // Find next model with valid API key, skipping expired OAuth tokens
+        let nextIndex = currentIndex;
+        let attempts = 0;
+        let next;
         const previousModel = currentModel;
+        while (attempts < len - 1) {
+            attempts++;
+            nextIndex =
+                direction === "forward"
+                    ? (nextIndex + 1) % len
+                    : (nextIndex - 1 + len) % len;
+            const candidate = available[nextIndex];
+            if (!candidate)
+                continue;
+            // Use async getApiKey to validate OAuth tokens
+            const apiKey = await this.options.getApiKey(candidate);
+            if (apiKey) {
+                next = candidate;
+                break;
+            }
+            // No valid key - skip this model and continue cycling
+        }
+        if (!next) {
+            // No models have valid API keys
+            return undefined;
+        }
         // Set the new model
         this.options.setModelOnAgent(next);
         return {

package/dist/core/model-registry.d.ts

@@ -58,6 +58,11 @@ export declare class ModelRegistry {
      * This is a fast check that doesn't refresh OAuth tokens.
      */
     getAvailable(): Model<Api>[];
+    /**
+     * Get models with valid API keys (async, validates OAuth tokens).
+     * This checks and refreshes OAuth tokens, filtering out expired ones.
+     */
+    getAvailableAsync(): Promise<Model<Api>[]>;
     /**
      * Find a model by provider and ID.
      */

package/dist/core/model-registry.js

@@ -411,6 +411,20 @@ export class ModelRegistry {
     getAvailable() {
         return this.models.filter((m) => this.authStorage.hasAuth(m.provider));
     }
+    /**
+     * Get models with valid API keys (async, validates OAuth tokens).
+     * This checks and refreshes OAuth tokens, filtering out expired ones.
+     */
+    async getAvailableAsync() {
+        const result = [];
+        for (const model of this.models) {
+            const apiKey = await this.authStorage.getApiKey(model.provider);
+            if (apiKey) {
+                result.push(model);
+            }
+        }
+        return result;
+    }
     /**
      * Find a model by provider and ID.
      */

package/dist/core/runtime/agent-session.d.ts

@@ -1,5 +1,13 @@
 import type { Agent, AgentEvent, AgentMessage, AgentState, AgentTool, ThinkingLevel } from "@pencil-agent/agent-core";
 import type { ImageContent, Model, TextContent } from "@pencil-agent/ai";
+/**
+ * Custom error for model cycling with additional context.
+ */
+export declare class CycleModelError extends Error {
+    readonly provider?: string | undefined;
+    readonly code?: "oauth_expired" | "no_valid_key" | "api_error" | undefined;
+    constructor(message: string, provider?: string | undefined, code?: "oauth_expired" | "no_valid_key" | "api_error" | undefined);
+}
 import { type BashResult } from "../bash-executor.js";
 import { type CompactionResult } from "../session/compaction/index.js";
 import { CompactionCoordinator } from "../session/compaction/compaction-coordinator.js";

package/dist/core/runtime/agent-session.js

@@ -19,6 +19,19 @@ import { getDocsPath } from "../../config.js";
 import { theme } from "../../modes/interactive/theme/theme.js";
 import { stripFrontmatter } from "../../utils/frontmatter.js";
 import { sleep } from "../utils/sleep.js";
+/**
+ * Custom error for model cycling with additional context.
+ */
+export class CycleModelError extends Error {
+    provider;
+    code;
+    constructor(message, provider, code) {
+        super(message);
+        this.provider = provider;
+        this.code = code;
+        this.name = "CycleModelError";
+    }
+}
 import { executeBash as executeBashCommand, executeBashWithOperations, } from "../bash-executor.js";
 import { calculateContextTokens, collectEntriesForBranchSummary, compact, estimateContextTokens, generateBranchSummary, prepareCompaction, shouldCompact, } from "../session/compaction/index.js";
 import { CompactionCoordinator } from "../session/compaction/compaction-coordinator.js";
@@ -1190,7 +1203,8 @@ export class AgentSession {
         };
     }
     async _cycleAvailableModel(direction) {
-        const availableModels = await this._modelRegistry.getAvailable();
+        // Use getAvailableAsync to pre-filter models with invalid OAuth tokens
+        const availableModels = await this._modelRegistry.getAvailableAsync();
         if (availableModels.length <= 1)
             return undefined;
         const currentModel = this.model;
@@ -1198,13 +1212,38 @@ export class AgentSession {
         if (currentIndex === -1)
             currentIndex = 0;
         const len = availableModels.length;
-        const nextIndex = direction === "forward"
-            ? (currentIndex + 1) % len
-            : (currentIndex - 1 + len) % len;
-        const nextModel = availableModels[nextIndex];
-        const apiKey = await this._modelRegistry.getApiKey(nextModel);
-        if (!apiKey) {
-            throw new Error(`No API key for ${nextModel.provider}/${nextModel.id}`);
+        // Find next model with valid API key, skipping expired OAuth tokens
+        // Start from nextIndex and loop through all models
+        const startIndex = currentIndex;
+        let nextIndex = currentIndex;
+        let attempts = 0;
+        let nextModel;
+        let apiKey;
+        while (attempts < len - 1) {
+            attempts++;
+            nextIndex =
+                direction === "forward"
+                    ? (nextIndex + 1) % len
+                    : (nextIndex - 1 + len) % len;
+            const candidate = availableModels[nextIndex];
+            if (!candidate)
+                continue;
+            // Use async getApiKey to validate OAuth tokens
+            apiKey = await this._modelRegistry.getApiKey(candidate);
+            if (apiKey) {
+                nextModel = candidate;
+                break;
+            }
+            // No valid key - skip this model and continue cycling
+        }
+        if (!nextModel || !apiKey) {
+            // No models have valid API keys (all OAuth tokens expired or no keys)
+            const provider = currentModel?.provider;
+            const cred = provider ? this._modelRegistry.authStorage.get(provider) : undefined;
+            if (cred?.type === "oauth") {
+                throw new CycleModelError(`All available models have expired OAuth tokens. Use /login ${provider} to re-authenticate.`, provider, "oauth_expired");
+            }
+            throw new CycleModelError(`No models with valid API keys available`, provider, "no_valid_key");
         }
         this.agent.setModel(nextModel);
         this.sessionManager.appendModelChange(nextModel.provider, nextModel.id);

package/dist/modes/interactive/components/model-selector.js

@@ -271,32 +271,54 @@ export class ModelSelectorComponent extends Container {
         }
     }
     async handleSelect(model) {
-        if (this.ensureProviderConfigured) {
-            const ready = await this.ensureProviderConfigured(model);
-            if (!ready)
-                return;
-            this.modelRegistry.refresh();
+        try {
+            if (this.ensureProviderConfigured) {
+                const ready = await this.ensureProviderConfigured(model);
+                if (!ready) {
+                    this.onCancelCallback();
+                    return;
+                }
+                this.modelRegistry.refresh();
+            }
+            // Use async getApiKey to validate OAuth tokens (hasAuth is sync and doesn't refresh)
+            const apiKey = await this.modelRegistry.authStorage.getApiKey(model.provider);
+            if (!apiKey) {
+                // Check if this is an OAuth provider with expired/invalid token
+                const cred = this.modelRegistry.authStorage.get(model.provider);
+                if (cred?.type === "oauth") {
+                    // OAuth token expired or refresh failed - prompt user to re-login
+                    // Note: onSelectCallback will handle showing error and suggesting /login
+                    this.onSelectCallback(model);
+                    return;
+                }
+                // Non-OAuth provider without key - prompt for API key input
+                const providerHints = {
+                    "dashscope-coding": "DashScope API key (sk-sp-...)",
+                    "qianfan-coding": "Qianfan API key",
+                    "ark-coding": "Ark API key",
+                    openrouter: "OpenRouter API key",
+                };
+                const prompt = providerHints[model.provider] ?? `${model.provider} API key`;
+                const key = await promptForApiKey({ prompt: `Enter ${prompt}` });
+                if (!key) {
+                    this.onCancelCallback();
+                    return;
+                }
+                this.modelRegistry.authStorage.set(model.provider, {
+                    type: "api_key",
+                    key,
+                });
+                this.modelRegistry.refresh();
+            }
+            const refreshedModel = this.modelRegistry.find(model.provider, model.id) ?? model;
+            this.settingsManager.setDefaultModelAndProvider(refreshedModel.provider, refreshedModel.id);
+            this.onSelectCallback(refreshedModel);
         }
-        if (!this.modelRegistry.authStorage.hasAuth(model.provider)) {
-            const providerHints = {
-                "dashscope-coding": "DashScope API key (sk-sp-...)",
-                "qianfan-coding": "Qianfan API key",
-                "ark-coding": "Ark API key",
-                openrouter: "OpenRouter API key",
-            };
-            const prompt = providerHints[model.provider] ?? `${model.provider} API key`;
-            const key = await promptForApiKey({ prompt: `Enter ${prompt}` });
-            if (!key)
-                return;
-            this.modelRegistry.authStorage.set(model.provider, {
-                type: "api_key",
-                key,
-            });
-            this.modelRegistry.refresh();
+        catch (error) {
+            // Ensure selector is closed on any error
+            this.onCancelCallback();
+            throw error;
         }
-        const refreshedModel = this.modelRegistry.find(model.provider, model.id) ?? model;
-        this.settingsManager.setDefaultModelAndProvider(refreshedModel.provider, refreshedModel.id);
-        this.onSelectCallback(refreshedModel);
     }
     getSearchInput() {
         return this.searchInput;

package/dist/modes/interactive/interactive-mode.d.ts

@@ -377,5 +377,36 @@ export declare class InteractiveMode {
     private handleMcpCommand;
     private handleLanguageCommand;
     private handleUpdateCommand;
+    /**
+     * Show interactive update options when a new version is available.
+     */
+    private showUpdateOptions;
+    /**
+     * Perform the actual npm install update.
+     */
+    private performUpdate;
+    /**
+     * Show retry options after a failed update attempt.
+     */
+    private showRetryOptions;
+    /**
+     * Wait for a specific key press from user.
+     * Falls back to selector UI if TTY is not available.
+     */
+    private waitForKeyPress;
+    /**
+     * Restart NanoPencil by spawning a new process.
+     * Tries to detect the correct command to restart.
+     */
+    private restartNanoPencil;
+    /**
+     * Compare two version strings (semver style).
+     * Returns: 1 if v1 > v2, -1 if v1 < v2, 0 if equal
+     */
+    private compareVersion;
+    /**
+     * Check for updates on startup if auto-update is enabled.
+     */
+    private checkAutoUpdateOnStartup;
 }
 //# sourceMappingURL=interactive-mode.d.ts.map