@pencil-agent/nano-pencil 1.6.2 → 1.6.3

package/dist/core/mcp-manager.js

@@ -4,6 +4,7 @@
  * Manages MCP client lifecycle and tool integration.
  */
 import { MCPClient } from "./mcp/mcp-client.js";
+import { loadMCPTools } from "./mcp/mcp-adapter.js";
 import { listEnabledMCPServers } from "./mcp/mcp-config.js";
 export class MCPManager {
     client;
@@ -25,8 +26,7 @@ export class MCPManager {
             }
         }
         // Load tools from all servers
-        // TODO: MCP tool integration disabled due to type compatibility issues
-        // this.tools = await loadMCPTools(this.client);
+        this.tools = await loadMCPTools(this.client);
     }
     /**
      * Get all MCP tools as NanoPencil ToolDefinitions

package/dist/core/sdk.js

@@ -234,20 +234,20 @@ export async function createAgentSession(options = {}) {
     }
     // Initialize MCP if enabled (before creating AgentSession)
     let mcpManager;
-    // TODO: MCP tool integration disabled due to type compatibility issues
-    // Will be re-enabled after refactoring tool adapter
-    // const mcpTools: ToolDefinition[] = [];
+    const mcpTools = [];
     if (options.enableMCP) {
         try {
             mcpManager = new MCPManager();
             await mcpManager.initialize();
-            // mcpTools.push(...mcpManager.getTools());
+            mcpTools.push(...mcpManager.getTools());
             time("mcp.initialize");
         }
         catch (error) {
             console.warn(`Failed to initialize MCP: ${error}`);
         }
     }
+    // Merge MCP tools with custom tools
+    const allCustomTools = [...(options.customTools || []), ...mcpTools];
     // Initialize Soul if enabled (before creating AgentSession)
     let soulManager;
     if (isSoulEnabled(options)) {
@@ -273,7 +273,7 @@ export async function createAgentSession(options = {}) {
         cwd,
         scopedModels: options.scopedModels,
         resourceLoader,
-        customTools: options.customTools,
+        customTools: allCustomTools,
         modelRegistry,
         initialActiveToolNames,
         extensionRunnerRef,

package/dist/main.js

@@ -4,7 +4,7 @@
  * This file handles CLI argument parsing and translates them into
  * createAgentSession() options. The SDK does the heavy lifting.
  */
-import { modelsAreEqual, supportsXhigh } from "@mariozechner/pi-ai";
+import { modelsAreEqual, supportsXhigh, } from "@mariozechner/pi-ai";
 import chalk from "chalk";
 import { join } from "path";
 import { createInterface } from "readline";
@@ -19,17 +19,17 @@ import { DEFAULT_THINKING_LEVEL } from "./core/defaults.js";
 import { exportFromFile } from "./core/export-html/index.js";
 import { KeybindingsManager } from "./core/keybindings.js";
 import { ModelRegistry } from "./core/model-registry.js";
-import { resolveCliModel, resolveModelScope } from "./core/model-resolver.js";
+import { resolveCliModel, resolveModelScope, } from "./core/model-resolver.js";
 import { DefaultPackageManager } from "./core/package-manager.js";
 import { DefaultResourceLoader } from "./core/resource-loader.js";
-import { createAgentSession } from "./core/sdk.js";
+import { createAgentSession, } from "./core/sdk.js";
 import { SessionManager } from "./core/session-manager.js";
 import { SettingsManager } from "./core/settings-manager.js";
 import { printTimings, time } from "./core/timings.js";
 import { allTools } from "./core/tools/index.js";
 import { runMigrations, showDeprecationWarnings } from "./migrations.js";
 import { InteractiveMode, runPrintMode, runRpcMode } from "./modes/index.js";
-import { initTheme, stopThemeWatcher } from "./modes/interactive/theme/theme.js";
+import { initTheme, stopThemeWatcher, } from "./modes/interactive/theme/theme.js";
 import { ensureNanopencilCodingPlanAuth, ensureNanopencilDefaultConfig, NANOPENCIL_DEFAULT_PROVIDER, } from "./nanopencil-defaults.js";
 import { getNanopencilDefaultExtensionPaths } from "./pencil-mem-integration.js";
 /**
@@ -65,7 +65,9 @@ function reportSettingsErrors(settingsManager, context) {
 function isTruthyEnvFlag(value) {
     if (!value)
         return false;
-    return value === "1" || value.toLowerCase() === "true" || value.toLowerCase() === "yes";
+    return (value === "1" ||
+        value.toLowerCase() === "true" ||
+        value.toLowerCase() === "yes");
 }
 function getPackageCommandUsage(command) {
     switch (command) {
@@ -82,56 +84,59 @@ function getPackageCommandUsage(command) {
 function printPackageCommandHelp(command) {
     switch (command) {
         case "install":
-            console.log(`${chalk.bold("Usage:")}
-  ${getPackageCommandUsage("install")}
-
-Install a package and add it to settings.
-
-Options:
-  -l, --local    Install project-locally (.pi/settings.json)
-
-Examples:
-  ${APP_NAME} install npm:@foo/bar
-  ${APP_NAME} install git:github.com/user/repo
-  ${APP_NAME} install git:git@github.com:user/repo
-  ${APP_NAME} install https://github.com/user/repo
-  ${APP_NAME} install ssh://git@github.com/user/repo
-  ${APP_NAME} install ./local/path
+            console.log(`${chalk.bold("Usage:")}
+  ${getPackageCommandUsage("install")}
+
+Install a package and add it to settings.
+
+Options:
+  -l, --local    Install project-locally (.pi/settings.json)
+
+Examples:
+  ${APP_NAME} install npm:@foo/bar
+  ${APP_NAME} install git:github.com/user/repo
+  ${APP_NAME} install git:git@github.com:user/repo
+  ${APP_NAME} install https://github.com/user/repo
+  ${APP_NAME} install ssh://git@github.com/user/repo
+  ${APP_NAME} install ./local/path
 `);
             return;
         case "remove":
-            console.log(`${chalk.bold("Usage:")}
-  ${getPackageCommandUsage("remove")}
-
-Remove a package and its source from settings.
-
-Options:
-  -l, --local    Remove from project settings (.pi/settings.json)
-
-Example:
-  ${APP_NAME} remove npm:@foo/bar
+            console.log(`${chalk.bold("Usage:")}
+  ${getPackageCommandUsage("remove")}
+
+Remove a package and its source from settings.
+
+Options:
+  -l, --local    Remove from project settings (.pi/settings.json)
+
+Example:
+  ${APP_NAME} remove npm:@foo/bar
 `);
             return;
         case "update":
-            console.log(`${chalk.bold("Usage:")}
-  ${getPackageCommandUsage("update")}
-
-Update installed packages.
-If <source> is provided, only that package is updated.
+            console.log(`${chalk.bold("Usage:")}
+  ${getPackageCommandUsage("update")}
+
+Update installed packages.
+If <source> is provided, only that package is updated.
 `);
             return;
         case "list":
-            console.log(`${chalk.bold("Usage:")}
-  ${getPackageCommandUsage("list")}
-
-List installed packages from user and project settings.
+            console.log(`${chalk.bold("Usage:")}
+  ${getPackageCommandUsage("list")}
+
+List installed packages from user and project settings.
 `);
             return;
     }
 }
 function parsePackageCommand(args) {
     const [command, ...rest] = args;
-    if (command !== "install" && command !== "remove" && command !== "update" && command !== "list") {
+    if (command !== "install" &&
+        command !== "remove" &&
+        command !== "update" &&
+        command !== "list") {
         return undefined;
     }
     let local = false;
@@ -178,7 +183,8 @@ async function handlePackageCommand(args) {
         return true;
     }
     const source = options.source;
-    if ((options.command === "install" || options.command === "remove") && !source) {
+    if ((options.command === "install" || options.command === "remove") &&
+        !source) {
         console.error(chalk.red(`Missing ${options.command} source.`));
         console.error(chalk.dim(`Usage: ${getPackageCommandUsage(options.command)}`));
         process.exitCode = 1;
@@ -188,7 +194,11 @@ async function handlePackageCommand(args) {
     const agentDir = getAgentDir();
     const settingsManager = SettingsManager.create(cwd, agentDir);
     reportSettingsErrors(settingsManager, "package command");
-    const packageManager = new DefaultPackageManager({ cwd, agentDir, settingsManager });
+    const packageManager = new DefaultPackageManager({
+        cwd,
+        agentDir,
+        settingsManager,
+    });
     packageManager.setProgressCallback((event) => {
         if (event.type === "start") {
             process.stdout.write(chalk.dim(`${event.message}\n`));
@@ -203,7 +213,9 @@ async function handlePackageCommand(args) {
                 return true;
             case "remove": {
                 await packageManager.remove(source, { local: options.local });
-                const removed = packageManager.removeSourceFromSettings(source, { local: options.local });
+                const removed = packageManager.removeSourceFromSettings(source, {
+                    local: options.local,
+                });
                 if (!removed) {
                     console.error(chalk.red(`No matching package found for ${source}`));
                     process.exitCode = 1;
@@ -269,7 +281,9 @@ async function prepareInitialMessage(parsed, autoResizeImages) {
     if (parsed.fileArgs.length === 0) {
         return {};
     }
-    const { text, images } = await processFileArguments(parsed.fileArgs, { autoResizeImages });
+    const { text, images } = await processFileArguments(parsed.fileArgs, {
+        autoResizeImages,
+    });
     let initialMessage;
     if (parsed.messages.length > 0) {
         initialMessage = text + parsed.messages[0];
@@ -289,7 +303,9 @@ async function prepareInitialMessage(parsed, autoResizeImages) {
  */
 async function resolveSessionPath(sessionArg, cwd, sessionDir) {
     // If it looks like a file path, use as-is
-    if (sessionArg.includes("/") || sessionArg.includes("\\") || sessionArg.endsWith(".jsonl")) {
+    if (sessionArg.includes("/") ||
+        sessionArg.includes("\\") ||
+        sessionArg.endsWith(".jsonl")) {
         return { type: "path", path: sessionArg };
     }
     // Try to match as session ID in current project first
@@ -357,7 +373,7 @@ async function createSessionManager(parsed, cwd) {
     // Default case (new session) returns undefined, SDK will create one
     return undefined;
 }
-function buildSessionOptions(parsed, scopedModels, sessionManager, modelRegistry, settingsManager) {
+async function buildSessionOptions(parsed, scopedModels, sessionManager, modelRegistry, settingsManager) {
     const options = {};
     let cliThinkingFromModel = false;
     if (sessionManager) {
@@ -389,12 +405,19 @@ function buildSessionOptions(parsed, scopedModels, sessionManager, modelRegistry
             }
         }
     }
-    if (!options.model && scopedModels.length > 0 && !parsed.continue && !parsed.resume) {
+    if (!options.model &&
+        scopedModels.length > 0 &&
+        !parsed.continue &&
+        !parsed.resume) {
         // Check if saved default is in scoped models - use it if so, otherwise first scoped model
         const savedProvider = settingsManager.getDefaultProvider();
         const savedModelId = settingsManager.getDefaultModel();
-        const savedModel = savedProvider && savedModelId ? modelRegistry.find(savedProvider, savedModelId) : undefined;
-        const savedInScope = savedModel ? scopedModels.find((sm) => modelsAreEqual(sm.model, savedModel)) : undefined;
+        const savedModel = savedProvider && savedModelId
+            ? modelRegistry.find(savedProvider, savedModelId)
+            : undefined;
+        const savedInScope = savedModel
+            ? scopedModels.find((sm) => modelsAreEqual(sm.model, savedModel))
+            : undefined;
         if (savedInScope) {
             options.model = savedInScope.model;
             // Use thinking level from scoped model config if explicitly set
@@ -438,6 +461,13 @@ function buildSessionOptions(parsed, scopedModels, sessionManager, modelRegistry
     else if (parsed.tools) {
         options.tools = parsed.tools.map((name) => allTools[name]);
     }
+    // Enable MCP by default if there are enabled MCP servers
+    // Users can disable with --no-mcp flag if needed
+    const { listEnabledMCPServers } = await import("./core/mcp/mcp-config.js");
+    const enabledMcpServers = listEnabledMCPServers();
+    if (enabledMcpServers.length > 0) {
+        options.enableMCP = true;
+    }
     return { options, cliThinkingFromModel };
 }
 async function handleConfigCommand(args) {
@@ -448,7 +478,11 @@ async function handleConfigCommand(args) {
     const agentDir = getAgentDir();
     const settingsManager = SettingsManager.create(cwd, agentDir);
     reportSettingsErrors(settingsManager, "config command");
-    const packageManager = new DefaultPackageManager({ cwd, agentDir, settingsManager });
+    const packageManager = new DefaultPackageManager({
+        cwd,
+        agentDir,
+        settingsManager,
+    });
     const resolvedPaths = await packageManager.resolve();
     await selectConfig({
         resolvedPaths,
@@ -488,14 +522,20 @@ export async function main(args) {
         }
     }
     const modelRegistry = new ModelRegistry(authStorage, getModelsPath(), APP_NAME === "nanopencil"
-        ? { useOnlyCustomModels: true, allowOptionalApiKeyForProvider: NANOPENCIL_DEFAULT_PROVIDER }
+        ? {
+            useOnlyCustomModels: true,
+            allowOptionalApiKeyForProvider: NANOPENCIL_DEFAULT_PROVIDER,
+        }
         : {});
     const defaultExtPaths = APP_NAME === "nanopencil" ? getNanopencilDefaultExtensionPaths() : [];
     const resourceLoader = new DefaultResourceLoader({
         cwd,
         agentDir,
         settingsManager,
-        additionalExtensionPaths: [...defaultExtPaths, ...(firstPass.extensions ?? [])],
+        additionalExtensionPaths: [
+            ...defaultExtPaths,
+            ...(firstPass.extensions ?? []),
+        ],
         additionalSkillPaths: firstPass.skills,
         additionalPromptTemplatePaths: firstPass.promptTemplates,
         additionalThemePaths: firstPass.themes,
@@ -525,7 +565,8 @@ export async function main(args) {
     }
     // Apply pending provider registrations from extensions immediately
     // so they're available for model resolution before AgentSession is created
-    for (const { name, config } of extensionsResult.runtime.pendingProviderRegistrations) {
+    for (const { name, config } of extensionsResult.runtime
+        .pendingProviderRegistrations) {
         modelRegistry.registerProvider(name, config);
     }
     extensionsResult.runtime.pendingProviderRegistrations = [];
@@ -592,7 +633,8 @@ export async function main(args) {
     if (APP_NAME === "nanopencil" && settingsManager.getTheme() === undefined) {
         settingsManager.setTheme("warm");
     }
-    initTheme(settingsManager.getTheme() ?? (APP_NAME === "nanopencil" ? "warm" : undefined), isInteractive);
+    initTheme(settingsManager.getTheme() ??
+        (APP_NAME === "nanopencil" ? "warm" : undefined), isInteractive);
     // Show deprecation warnings in interactive mode
     if (isInteractive && deprecationWarnings.length > 0) {
         await showDeprecationWarnings(deprecationWarnings);
@@ -616,7 +658,7 @@ export async function main(args) {
         }
         sessionManager = SessionManager.open(selectedPath);
     }
-    const { options: sessionOptions, cliThinkingFromModel } = buildSessionOptions(parsed, scopedModels, sessionManager, modelRegistry, settingsManager);
+    const { options: sessionOptions, cliThinkingFromModel } = await buildSessionOptions(parsed, scopedModels, sessionManager, modelRegistry, settingsManager);
     sessionOptions.authStorage = authStorage;
     sessionOptions.modelRegistry = modelRegistry;
     sessionOptions.resourceLoader = resourceLoader;
@@ -655,7 +697,8 @@ export async function main(args) {
         await runRpcMode(session);
     }
     else if (isInteractive) {
-        if (scopedModels.length > 0 && (parsed.verbose || !settingsManager.getQuietStartup())) {
+        if (scopedModels.length > 0 &&
+            (parsed.verbose || !settingsManager.getQuietStartup())) {
             const modelList = scopedModels
                 .map((sm) => {
                 const thinkingStr = sm.thinkingLevel ? `:${sm.thinkingLevel}` : "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pencil-agent/nano-pencil",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "CLI writing agent with read, bash, edit, write tools and session management. Based on pi; supports DashScope Coding Plan. Soul enabled by default for AI personality evolution.",
   "type": "module",
   "bin": {