@pencil-agent/nano-pencil 1.10.8 → 1.11.1

package/dist/builtin-extensions.d.ts

@@ -0,0 +1,34 @@
+/**
+ * NanoPencil 内置扩展注册表
+ *
+ * 管理 NanoPencil 默认加载的内置扩展路径：
+ * - NanoMem: 持久化记忆扩展（packages/mem-core/）
+ * - Soul: AI 人格进化扩展（extensions/defaults/soul/）
+ * - MCP: MCP 工具扩展（extensions/defaults/mcp/）
+ * - LinkWorld: 互联网访问扩展（extensions/defaults/link-world/）
+ * - SecurityAudit: 安全审计扩展（extensions/defaults/security-audit/）
+ *
+ * 可选扩展（通过配置启用）：
+ * - Simplify: 代码简化扩展（extensions/optional/simplify/）
+ * - export-html: HTML 导出扩展（extensions/optional/export-html/）
+ */
+/**
+ * 获取 NanoPencil 默认加载的内置扩展路径列表
+ *
+ * 返回所有默认启用的扩展路径（defaults/）：
+ * - NanoMem (持久化记忆)
+ * - Soul (AI 人格进化)
+ * - LinkWorld (联网搜索)
+ * - SecurityAudit (安全审计)
+ * - MCP (MCP 协议适配)
+ *
+ * 可选扩展需要通过配置启用：
+ * - Simplify (代码简化) - extensions/optional/simplify/
+ * - export-html (HTML 导出) - extensions/optional/export-html/
+ */
+export declare function getBuiltinExtensionPaths(): string[];
+/**
+ * @deprecated 请使用 getBuiltinExtensionPaths()
+ */
+export declare function getNanopencilDefaultExtensionPaths(): string[];
+//# sourceMappingURL=builtin-extensions.d.ts.map

package/dist/builtin-extensions.js

@@ -0,0 +1,153 @@
+/**
+ * NanoPencil 内置扩展注册表
+ *
+ * 管理 NanoPencil 默认加载的内置扩展路径：
+ * - NanoMem: 持久化记忆扩展（packages/mem-core/）
+ * - Soul: AI 人格进化扩展（extensions/defaults/soul/）
+ * - MCP: MCP 工具扩展（extensions/defaults/mcp/）
+ * - LinkWorld: 互联网访问扩展（extensions/defaults/link-world/）
+ * - SecurityAudit: 安全审计扩展（extensions/defaults/security-audit/）
+ *
+ * 可选扩展（通过配置启用）：
+ * - Simplify: 代码简化扩展（extensions/optional/simplify/）
+ * - export-html: HTML 导出扩展（extensions/optional/export-html/）
+ */
+import { existsSync, readFileSync } from "node:fs";
+import { createRequire } from "node:module";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+/** 内置扩展路径 */
+const BUNDLED_NANOMEM_EXTENSION_PACKAGES = join(__dirname, "packages", "mem-core", "extension.js");
+const BUNDLED_SIMPLIFY_EXTENSION = join(__dirname, "extensions", "optional", "simplify", "index.js");
+const BUNDLED_LINK_WORLD_EXTENSION = join(__dirname, "extensions", "defaults", "link-world", "index.js");
+const BUNDLED_SECURITY_AUDIT_EXTENSION = join(__dirname, "extensions", "defaults", "security-audit", "index.js");
+const BUNDLED_SOUL_EXTENSION = join(__dirname, "extensions", "defaults", "soul", "index.js");
+const BUNDLED_MCP_EXTENSION = join(__dirname, "extensions", "defaults", "mcp", "index.js");
+const BUNDLED_EXPORT_HTML_EXTENSION = join(__dirname, "extensions", "optional", "export-html", "index.js");
+/** 从当前模块位置向上查找包根（含 package.json 且 name 为 nano-pencil 相关） */
+function findPackageRoot(startDir) {
+    let dir = startDir;
+    for (let i = 0; i < 20; i++) {
+        try {
+            const pkgPath = join(dir, "package.json");
+            if (existsSync(pkgPath)) {
+                const raw = readFileSync(pkgPath, "utf-8");
+                const pkg = JSON.parse(raw);
+                if (pkg.name === "@pencil-agent/nano-pencil" || pkg.name === "nanopencil")
+                    return dir;
+            }
+        }
+        catch {
+            // ignore
+        }
+        const parent = dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return null;
+}
+/**
+ * 获取 NanoPencil 默认加载的内置扩展路径列表
+ *
+ * 返回所有默认启用的扩展路径（defaults/）：
+ * - NanoMem (持久化记忆)
+ * - Soul (AI 人格进化)
+ * - LinkWorld (联网搜索)
+ * - SecurityAudit (安全审计)
+ * - MCP (MCP 协议适配)
+ *
+ * 可选扩展需要通过配置启用：
+ * - Simplify (代码简化) - extensions/optional/simplify/
+ * - export-html (HTML 导出) - extensions/optional/export-html/
+ */
+export function getBuiltinExtensionPaths() {
+    const paths = [];
+    // === NanoMem 扩展 ===
+    // 1) 优先使用 build 时打包到 dist/packages 的扩展
+    if (existsSync(BUNDLED_NANOMEM_EXTENSION_PACKAGES)) {
+        paths.push(BUNDLED_NANOMEM_EXTENSION_PACKAGES);
+    }
+    else {
+        // 2) require.resolve：开发/本地安装时 node_modules 中的 mem-core
+        try {
+            const extPath = require.resolve("@pencil-agent/mem-core/extension.js");
+            if (existsSync(extPath))
+                paths.push(extPath);
+        }
+        catch {
+            // 3) 按包根 + node_modules/@pencil-agent/mem-core/dist/extension.js 查找
+            const packageRoot = findPackageRoot(__dirname);
+            if (packageRoot) {
+                const candidate = join(packageRoot, "node_modules", "@pencil-agent", "mem-core", "dist", "extension.js");
+                if (existsSync(candidate))
+                    paths.push(candidate);
+            }
+        }
+    }
+    // === Simplify 扩展（可选源码，编译到 dist/extensions/optional/simplify） ===
+    if (existsSync(BUNDLED_SIMPLIFY_EXTENSION)) {
+        paths.push(BUNDLED_SIMPLIFY_EXTENSION);
+    }
+    else {
+        // 开发模式：尝试 .ts 源文件
+        const simplifyTs = join(__dirname, "extensions", "optional", "simplify", "index.ts");
+        if (existsSync(simplifyTs))
+            paths.push(simplifyTs);
+    }
+    // === link-world 扩展（内置源码，编译到 dist/extensions/defaults/link-world） ===
+    if (existsSync(BUNDLED_LINK_WORLD_EXTENSION)) {
+        paths.push(BUNDLED_LINK_WORLD_EXTENSION);
+    }
+    else {
+        const linkWorldTs = join(__dirname, "extensions", "defaults", "link-world", "index.ts");
+        if (existsSync(linkWorldTs))
+            paths.push(linkWorldTs);
+    }
+    // === Security Audit 扩展（内置源码，编译到 dist/extensions/defaults/security-audit） ===
+    if (existsSync(BUNDLED_SECURITY_AUDIT_EXTENSION)) {
+        paths.push(BUNDLED_SECURITY_AUDIT_EXTENSION);
+    }
+    else {
+        const securityAuditTs = join(__dirname, "extensions", "defaults", "security-audit", "index.ts");
+        if (existsSync(securityAuditTs))
+            paths.push(securityAuditTs);
+    }
+    // === Soul 扩展（人格进化系统） ===
+    if (existsSync(BUNDLED_SOUL_EXTENSION)) {
+        paths.push(BUNDLED_SOUL_EXTENSION);
+    }
+    else {
+        const soulTs = join(__dirname, "extensions", "defaults", "soul", "index.ts");
+        if (existsSync(soulTs))
+            paths.push(soulTs);
+    }
+    // === MCP 扩展（MCP 工具协议适配） ===
+    if (existsSync(BUNDLED_MCP_EXTENSION)) {
+        paths.push(BUNDLED_MCP_EXTENSION);
+    }
+    else {
+        const mcpTs = join(__dirname, "extensions", "defaults", "mcp", "index.ts");
+        if (existsSync(mcpTs))
+            paths.push(mcpTs);
+    }
+    // === export-html 扩展（可选，HTML 导出功能） ===
+    if (existsSync(BUNDLED_EXPORT_HTML_EXTENSION)) {
+        paths.push(BUNDLED_EXPORT_HTML_EXTENSION);
+    }
+    else {
+        const exportHtmlTs = join(__dirname, "extensions", "optional", "export-html", "index.ts");
+        if (existsSync(exportHtmlTs))
+            paths.push(exportHtmlTs);
+    }
+    return paths;
+}
+/**
+ * @deprecated 请使用 getBuiltinExtensionPaths()
+ */
+export function getNanopencilDefaultExtensionPaths() {
+    return getBuiltinExtensionPaths();
+}
+//# sourceMappingURL=builtin-extensions.js.map

package/dist/cli/config-selector.d.ts

@@ -2,7 +2,7 @@
  * TUI config selector for `pi config` command
  */
 import type { ResolvedPaths } from "../core/package-manager.js";
-import type { SettingsManager } from "../core/settings-manager.js";
+import type { SettingsManager } from "../core/config/settings-manager.js";
 export interface ConfigSelectorOptions {
     resolvedPaths: ResolvedPaths;
     settingsManager: SettingsManager;

package/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 { formatDimensionNote, resizeImage } from "../modes/utils/image-resize.js";
 import { detectSupportedImageMimeTypeFromFile } from "../utils/mime.js";
 /** Process @file arguments into text content and image attachments */
 export async function processFileArguments(fileArgs, options) {

package/dist/cli/session-picker.d.ts

@@ -1,7 +1,7 @@
 /**
  * TUI session selector for --resume flag
  */
-import type { SessionInfo, SessionListProgress } from "../core/session-manager.js";
+import type { SessionInfo, SessionListProgress } from "../core/session/session-manager.js";
 type SessionsLoader = (onProgress?: SessionListProgress) => Promise<SessionInfo[]>;
 /** Show TUI session selector and return selected session path or null if cancelled */
 export declare function selectSession(currentSessionsLoader: SessionsLoader, allSessionsLoader: SessionsLoader): Promise<string | null>;

package/dist/core/bash-executor.js

@@ -11,7 +11,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { spawn } from "child_process";
 import stripAnsi from "strip-ansi";
-import { getShellConfig, getShellEnv, killProcessTree, sanitizeBinaryOutput } from "../utils/shell.js";
+import { getShellConfig, getShellEnv, killProcessTree, sanitizeBinaryOutput } from "./utils/shell.js";
 import { DEFAULT_MAX_BYTES, truncateTail } from "./tools/truncate.js";
 // ============================================================================
 // Implementation

package/dist/core/{auth-storage.js → config/auth-storage.js}

@@ -9,7 +9,7 @@ import { getEnvApiKey, getOAuthApiKey, getOAuthProvider, getOAuthProviders, } fr
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 import lockfile from "proper-lockfile";
-import { getAgentDir } from "../config.js";
+import { getAgentDir } from "../../config.js";
 import { resolveConfigValue } from "./resolve-config-value.js";
 export class FileAuthStorageBackend {
     authPath;

package/dist/core/{resource-loader.d.ts → config/resource-loader.d.ts}

@@ -1,12 +1,12 @@
-import { type Theme } from "../modes/interactive/theme/theme.js";
-import type { ResourceDiagnostic } from "./diagnostics.js";
-export type { ResourceCollision, ResourceDiagnostic } from "./diagnostics.js";
-import { type EventBus } from "./event-bus.js";
-import type { ExtensionFactory, LoadExtensionsResult } from "./extensions/types.js";
-import { type PathMetadata } from "./package-manager.js";
-import type { PromptTemplate } from "./prompt-templates.js";
+import { type Theme } from "../../modes/interactive/theme/theme.js";
+import type { ResourceDiagnostic } from "../diagnostics.js";
+export type { ResourceCollision, ResourceDiagnostic } from "../diagnostics.js";
+import { type EventBus } from "../runtime/event-bus.js";
+import type { ExtensionFactory, LoadExtensionsResult } from "../extensions/types.js";
+import { type PathMetadata } from "../package-manager.js";
+import type { PromptTemplate } from "../prompt/prompt-templates.js";
 import { SettingsManager } from "./settings-manager.js";
-import type { Skill } from "./skills.js";
+import type { Skill } from "../skills.js";
 export interface ResourceExtensionPaths {
     skillPaths?: Array<{
         path: string;

package/dist/core/{resource-loader.js → config/resource-loader.js}

@@ -2,14 +2,14 @@ import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { join, resolve, sep } from "node:path";
 import chalk from "chalk";
-import { CONFIG_DIR_NAME, getAgentDir } from "../config.js";
-import { loadThemeFromPath } from "../modes/interactive/theme/theme.js";
-import { createEventBus } from "./event-bus.js";
-import { createExtensionRuntime, loadExtensionFromFactory, loadExtensions } from "./extensions/loader.js";
-import { DefaultPackageManager } from "./package-manager.js";
-import { loadPromptTemplates } from "./prompt-templates.js";
+import { CONFIG_DIR_NAME, getAgentDir } from "../../config.js";
+import { loadThemeFromPath } from "../../modes/interactive/theme/theme.js";
+import { createEventBus } from "../runtime/event-bus.js";
+import { createExtensionRuntime, loadExtensionFromFactory, loadExtensions } from "../extensions/loader.js";
+import { DefaultPackageManager } from "../package-manager.js";
+import { loadPromptTemplates } from "../prompt/prompt-templates.js";
 import { SettingsManager } from "./settings-manager.js";
-import { loadSkills } from "./skills.js";
+import { loadSkills } from "../skills.js";
 function resolvePromptInput(input, description) {
     if (!input) {
         return undefined;

package/dist/core/{settings-manager.js → config/settings-manager.js}

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
 import lockfile from "proper-lockfile";
-import { APP_NAME, CONFIG_DIR_NAME, getAgentDir } from "../config.js";
+import { APP_NAME, CONFIG_DIR_NAME, getAgentDir } from "../../config.js";
 /** Deep merge settings: project/overrides take precedence, nested objects merge recursively */
 function deepMergeSettings(base, overrides) {
     const result = { ...base };

package/dist/core/export-html/index.d.ts

@@ -1,5 +1,5 @@
 import type { AgentState } from "@pencil-agent/agent-core";
-import { SessionManager } from "../session-manager.js";
+import { SessionManager } from "../session/session-manager.js";
 /**
  * Interface for rendering custom tools to HTML.
  * Used by agent-session to pre-render extension tool output.

package/dist/core/export-html/index.js

@@ -2,7 +2,7 @@ import { existsSync, readFileSync, writeFileSync } from "fs";
 import { basename, join } from "path";
 import { APP_NAME, getExportTemplateDir } from "../../config.js";
 import { getResolvedThemeColors, getThemeExportColors } from "../../modes/interactive/theme/theme.js";
-import { SessionManager } from "../session-manager.js";
+import { SessionManager } from "../session/session-manager.js";
 /** Parse a color string to RGB values. Supports hex (#RRGGBB) and rgb(r,g,b) formats. */
 function parseColor(color) {
     const hexMatch = color.match(/^#([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})$/);

package/dist/core/extensions/loader.d.ts

@@ -3,7 +3,7 @@
  *
  * Uses @mariozechner/jiti fork with virtualModules support for compiled Bun binaries.
  */
-import { type EventBus } from "../event-bus.js";
+import { type EventBus } from "../runtime/event-bus.js";
 import type { Extension, ExtensionFactory, ExtensionRuntime, LoadExtensionsResult } from "./types.js";
 /**
  * Create a runtime with throwing stubs for action methods.

package/dist/core/extensions/loader.js

@@ -20,7 +20,7 @@ import { CONFIG_DIR_NAME, getAgentDir, isBunBinary } from "../../config.js";
 // NOTE: This import works because loader.ts exports are NOT re-exported from index.ts,
 // avoiding a circular dependency. Extensions can import from @pencil-agent/nano-pencil.
 import * as _bundledPiCodingAgent from "../../index.js";
-import { createEventBus } from "../event-bus.js";
+import { createEventBus } from "../runtime/event-bus.js";
 import { execCommand } from "../exec.js";
 /** Modules available to extensions via virtualModules (for compiled Bun binary) */
 const VIRTUAL_MODULES = {

package/dist/core/extensions/runner.d.ts

@@ -7,7 +7,7 @@ import type { KeyId } from "@pencil-agent/tui";
 import type { ResourceDiagnostic } from "../diagnostics.js";
 import type { KeybindingsConfig } from "../keybindings.js";
 import type { ModelRegistry } from "../model-registry.js";
-import type { SessionManager } from "../session-manager.js";
+import type { SessionManager } from "../session/session-manager.js";
 import type { BeforeAgentStartEvent, BeforeAgentStartEventResult, ContextEvent, Extension, ExtensionActions, ExtensionCommandContext, ExtensionCommandContextActions, ExtensionContext, ExtensionContextActions, ExtensionError, ExtensionEvent, ExtensionFlag, ExtensionRuntime, ExtensionShortcut, ExtensionUIContext, InputEvent, InputEventResult, InputSource, MessageRenderer, RegisteredCommand, RegisteredTool, ResourcesDiscoverEvent, SessionBeforeCompactResult, SessionBeforeForkResult, SessionBeforeSwitchResult, SessionBeforeTreeResult, ToolCallEvent, ToolCallEventResult, ToolResultEvent, ToolResultEventResult, UserBashEvent, UserBashEventResult } from "./types.js";
 /** Combined result from all before_agent_start handlers */
 interface BeforeAgentStartCombinedResult {

package/dist/core/extensions/types.d.ts

@@ -13,14 +13,14 @@ import type { AutocompleteItem, Component, EditorComponent, EditorTheme, KeyId,
 import type { Static, TSchema } from "@sinclair/typebox";
 import type { Theme } from "../../modes/interactive/theme/theme.js";
 import type { BashResult } from "../bash-executor.js";
-import type { CompactionPreparation, CompactionResult } from "../compaction/index.js";
-import type { EventBus } from "../event-bus.js";
+import type { CompactionPreparation, CompactionResult } from "../session/compaction/index.js";
+import type { EventBus } from "../runtime/event-bus.js";
 import type { ExecOptions, ExecResult } from "../exec.js";
 import type { ReadonlyFooterDataProvider } from "../footer-data-provider.js";
 import type { KeybindingsManager } from "../keybindings.js";
 import type { CustomMessage } from "../messages.js";
 import type { ModelRegistry } from "../model-registry.js";
-import type { BranchSummaryEntry, CompactionEntry, ReadonlySessionManager, SessionEntry, SessionManager } from "../session-manager.js";
+import type { BranchSummaryEntry, CompactionEntry, ReadonlySessionManager, SessionEntry, SessionManager } from "../session/session-manager.js";
 import type { SlashCommandInfo } from "../slash-commands.js";
 import type { BashOperations } from "../tools/bash.js";
 import type { EditToolDetails } from "../tools/edit.js";
@@ -257,6 +257,8 @@ export interface ToolDefinition<TParams extends TSchema = TSchema, TDetails = un
     description: string;
     /** Parameter schema (TypeBox) */
     parameters: TParams;
+    /** Usage guidance for system prompt (optional) */
+    guidance?: string;
     /** Execute the tool. */
     execute(toolCallId: string, params: Static<TParams>, signal: AbortSignal | undefined, onUpdate: AgentToolUpdateCallback<TDetails> | undefined, ctx: ExtensionContext): Promise<AgentToolResult<TDetails>>;
     /** Custom rendering for tool call display */

package/dist/core/index.d.ts

@@ -1,10 +1,10 @@
 /**
  * Core modules shared between all run modes.
  */
-export { AgentSession, type AgentSessionConfig, type AgentSessionEvent, type AgentSessionEventListener, type ModelCycleResult, type PromptOptions, type SessionStats, } from "./agent-session.js";
+export { AgentSession, type AgentSessionConfig, type AgentSessionEvent, type AgentSessionEventListener, type ModelCycleResult, type PromptOptions, type SessionStats, } from "./runtime/agent-session.js";
 export { type BashExecutorOptions, type BashResult, executeBash, executeBashWithOperations, } from "./bash-executor.js";
-export type { CompactionResult } from "./compaction/index.js";
-export { createEventBus, type EventBus, type EventBusController, } from "./event-bus.js";
+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 type { MCPServerConfig, MCPTool, MCPToolResult, } from "./mcp/mcp-client.js";

package/dist/core/index.js

@@ -1,9 +1,9 @@
 /**
  * Core modules shared between all run modes.
  */
-export { AgentSession, } from "./agent-session.js";
+export { AgentSession, } from "./runtime/agent-session.js";
 export { executeBash, executeBashWithOperations, } from "./bash-executor.js";
-export { createEventBus, } from "./event-bus.js";
+export { createEventBus, } from "./runtime/event-bus.js";
 // Extensions system
 export { discoverAndLoadExtensions, ExtensionRunner, wrapToolsWithExtensions, } from "./extensions/index.js";
 // MCP (Model Context Protocol) support

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

@@ -0,0 +1,5 @@
+/**
+ * Model management exports
+ */
+export { ModelSwitcher, type ModelCycleResult } from "./switcher.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/core/model/index.js

@@ -0,0 +1,5 @@
+/**
+ * Model management exports
+ */
+export { ModelSwitcher } from "./switcher.js";
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1,80 @@
+/**
+ * Model Switcher
+ *
+ * Encapsulates model selection, cycling, and fallback logic.
+ * This coordinator manages model switching operations.
+ */
+import type { Model } from "@pencil-agent/ai";
+import type { ThinkingLevel } from "@pencil-agent/agent-core";
+export interface ModelCycleResult {
+    model: Model<any>;
+    previousModel: Model<any> | undefined;
+}
+export interface ModelSwitcherOptions {
+    /** Get API key for a model */
+    getApiKey: (model: Model<any>) => Promise<string | undefined>;
+    /** Get API key for a provider */
+    getApiKeyForProvider: (provider: string) => Promise<string | undefined>;
+    /** Get all available models */
+    getAvailableModels: () => Model<any>[];
+    /** Set the model on the agent */
+    setModelOnAgent: (model: Model<any>) => void;
+    /** Get current model */
+    getCurrentModel: () => Model<any> | undefined;
+    /** Scoped models from --models flag */
+    scopedModels?: Array<{
+        model: Model<any>;
+        thinkingLevel: ThinkingLevel;
+    }>;
+}
+export declare class ModelSwitcher {
+    private options;
+    private _scopedModels;
+    constructor(options: ModelSwitcherOptions);
+    /**
+     * Get current model
+     */
+    getModel(): Model<any> | undefined;
+    /**
+     * Check if a model has an API key
+     */
+    hasApiKey(model: Model<any>): Promise<boolean>;
+    /**
+     * Get models with API keys
+     */
+    getModelsWithApiKey(): Promise<Model<any>[]>;
+    /**
+     * Get scoped models with API keys
+     */
+    getScopedModelsWithApiKey(): Promise<Array<{
+        model: Model<any>;
+        thinkingLevel: ThinkingLevel;
+    }>>;
+    /**
+     * Cycle to next/previous model
+     */
+    cycleModel(direction?: "forward" | "backward"): Promise<ModelCycleResult | undefined>;
+    /**
+     * Cycle through scoped models
+     */
+    private cycleScopedModel;
+    /**
+     * Cycle through all available models
+     */
+    private cycleAvailableModel;
+    /**
+     * Set scoped models
+     */
+    setScopedModels(models: Array<{
+        model: Model<any>;
+        thinkingLevel: ThinkingLevel;
+    }>): void;
+    /**
+     * Get scoped models
+     */
+    getScopedModels(): Array<{
+        model: Model<any>;
+        thinkingLevel: ThinkingLevel;
+    }>;
+}
+//# sourceMappingURL=switcher.d.ts.map

package/dist/core/model/switcher.js

@@ -0,0 +1,133 @@
+/**
+ * Model Switcher
+ *
+ * Encapsulates model selection, cycling, and fallback logic.
+ * This coordinator manages model switching operations.
+ */
+import { modelsAreEqual } from "@pencil-agent/ai";
+export class ModelSwitcher {
+    options;
+    _scopedModels;
+    constructor(options) {
+        this.options = options;
+        this._scopedModels = options.scopedModels || [];
+    }
+    /**
+     * Get current model
+     */
+    getModel() {
+        return this.options.getCurrentModel();
+    }
+    /**
+     * Check if a model has an API key
+     */
+    async hasApiKey(model) {
+        const apiKey = await this.options.getApiKey(model);
+        return !!apiKey;
+    }
+    /**
+     * Get models with API keys
+     */
+    async getModelsWithApiKey() {
+        const available = this.options.getAvailableModels();
+        const result = [];
+        for (const model of available) {
+            if (await this.hasApiKey(model)) {
+                result.push(model);
+            }
+        }
+        return result;
+    }
+    /**
+     * Get scoped models with API keys
+     */
+    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.options.getApiKeyForProvider(provider);
+                apiKeysByProvider.set(provider, apiKey);
+            }
+            if (apiKey) {
+                result.push(scoped);
+            }
+        }
+        return result;
+    }
+    /**
+     * Cycle to next/previous model
+     */
+    async cycleModel(direction = "forward") {
+        if (this._scopedModels.length > 0) {
+            return this.cycleScopedModel(direction);
+        }
+        return this.cycleAvailableModel(direction);
+    }
+    /**
+     * Cycle through scoped models
+     */
+    async cycleScopedModel(direction) {
+        const scopedModels = await this.getScopedModelsWithApiKey();
+        if (scopedModels.length <= 1)
+            return undefined;
+        const currentModel = this.getModel();
+        let currentIndex = scopedModels.findIndex((sm) => modelsAreEqual(sm.model, currentModel));
+        if (currentIndex === -1)
+            currentIndex = 0;
+        const len = scopedModels.length;
+        const nextIndex = direction === "forward"
+            ? (currentIndex + 1) % len
+            : (currentIndex - 1 + len) % len;
+        const next = scopedModels[nextIndex];
+        const previousModel = currentModel;
+        // Set the new model
+        this.options.setModelOnAgent(next.model);
+        return {
+            model: next.model,
+            previousModel,
+        };
+    }
+    /**
+     * Cycle through all available models
+     */
+    async cycleAvailableModel(direction) {
+        const available = await this.getModelsWithApiKey();
+        if (available.length <= 1)
+            return undefined;
+        const currentModel = this.getModel();
+        let currentIndex = available.findIndex((m) => modelsAreEqual(m, currentModel));
+        if (currentIndex === -1)
+            currentIndex = 0;
+        const len = available.length;
+        const nextIndex = direction === "forward"
+            ? (currentIndex + 1) % len
+            : (currentIndex - 1 + len) % len;
+        const next = available[nextIndex];
+        const previousModel = currentModel;
+        // Set the new model
+        this.options.setModelOnAgent(next);
+        return {
+            model: next,
+            previousModel,
+        };
+    }
+    /**
+     * Set scoped models
+     */
+    setScopedModels(models) {
+        this._scopedModels = models;
+    }
+    /**
+     * Get scoped models
+     */
+    getScopedModels() {
+        return this._scopedModels;
+    }
+}
+//# sourceMappingURL=switcher.js.map

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

@@ -2,8 +2,8 @@
  * Model registry - manages built-in and custom models, provides API key resolution.
  */
 import { type Api, type AssistantMessageEventStream, type Context, type Model, type OAuthProviderInterface, type SimpleStreamOptions } from "@pencil-agent/ai";
-import type { AuthStorage } from "./auth-storage.js";
-import { clearConfigValueCache } from "./resolve-config-value.js";
+import type { AuthStorage } from "./config/auth-storage.js";
+import { clearConfigValueCache } from "./config/resolve-config-value.js";
 /** Clear the config value command cache. Exported for testing. */
 export declare const clearApiKeyCache: typeof clearConfigValueCache;
 /**

package/dist/core/model-registry.js

@@ -7,7 +7,7 @@ import AjvModule from "ajv";
 import { existsSync, readFileSync } from "fs";
 import { join } from "path";
 import { getAgentDir } from "../config.js";
-import { clearConfigValueCache, resolveConfigValue, resolveHeaders } from "./resolve-config-value.js";
+import { clearConfigValueCache, resolveConfigValue, resolveHeaders } from "./config/resolve-config-value.js";
 const Ajv = AjvModule.default || AjvModule;
 // Schema for OpenRouter routing preferences
 const OpenRouterRoutingSchema = Type.Object({