@pencil-agent/nano-pencil 1.10.6 → 1.10.7

package/dist/core/mcp/mcp-guidance.js

@@ -12,23 +12,23 @@ export const API_KEY_GUIDANCE = {
         serverName: "GitHub",
         required: false,
         envVar: "GITHUB_TOKEN",
-        instructions: `GitHub Token 用于访问 GitHub 仓库、issues 和 PRs。
-
-**获取步骤:**
-1. 访问 https://github.com/settings/tokens
-2. 点击 "Generate new token" (classic)
-3. 勾选权限:
-   - ✅ repo (Full control of private repositories)
-   - ✅ public_repo (Access public repositories)
-4. 点击 "Generate token"
-5. 复制 token (格式: ghp_xxxxxxxxxxxxxxxxxxxx)
-6. 在 mcp.json 中配置:
-   {
-     "id": "github",
-     "enabled": true,
-     "env": {
-       "GITHUB_TOKEN": "你的token"
-     }
+        instructions: `GitHub Token 用于访问 GitHub 仓库、issues 和 PRs。
+
+**获取步骤:**
+1. 访问 https://github.com/settings/tokens
+2. 点击 "Generate new token" (classic)
+3. 勾选权限:
+   - ✅ repo (Full control of private repositories)
+   - ✅ public_repo (Access public repositories)
+4. 点击 "Generate token"
+5. 复制 token (格式: ghp_xxxxxxxxxxxxxxxxxxxx)
+6. 在 mcp.json 中配置:
+   {
+     "id": "github",
+     "enabled": true,
+     "env": {
+       "GITHUB_TOKEN": "你的token"
+     }
    }`,
         getKeyUrl: "https://github.com/settings/tokens",
         freeTier: "✅ 完全免费",
@@ -39,20 +39,20 @@ export const API_KEY_GUIDANCE = {
         serverName: "Brave Search",
         required: false,
         envVar: "BRAVE_API_KEY",
-        instructions: `Brave Search API Key 用于网页搜索功能。
-
-**获取步骤:**
-1. 访问 https://api.search.brave.com/app/keys
-2. 注册账号（或登录）
-3. 点击 "Create API Key"
-4. 复制 API Key (格式: BSxxxxx)
-5. 在 mcp.json 中配置:
-   {
-     "id": "brave-search",
-     "enabled": true,
-     "env": {
-       "BRAVE_API_KEY": "你的API key"
-     }
+        instructions: `Brave Search API Key 用于网页搜索功能。
+
+**获取步骤:**
+1. 访问 https://api.search.brave.com/app/keys
+2. 注册账号（或登录）
+3. 点击 "Create API Key"
+4. 复制 API Key (格式: BSxxxxx)
+5. 在 mcp.json 中配置:
+   {
+     "id": "brave-search",
+     "enabled": true,
+     "env": {
+       "BRAVE_API_KEY": "你的API key"
+     }
    }`,
         getKeyUrl: "https://api.search.brave.com/app/keys",
         freeTier: "✅ 免费额度: 每月 2000 次查询",
@@ -63,19 +63,19 @@ export const API_KEY_GUIDANCE = {
         serverName: "PostgreSQL",
         required: false,
         envVar: "POSTGRES_CONNECTION_STRING",
-        instructions: `PostgreSQL 连接字符串用于连接本地数据库。
-
-**配置步骤:**
-1. 确保已安装 PostgreSQL
-2. 准备连接字符串，格式:
-   postgresql://user:password@localhost:5432/dbname
-3. 在 mcp.json 中配置:
-   {
-     "id": "postgres",
-     "enabled": true,
-     "env": {
-       "POSTGRES_CONNECTION_STRING": "你的连接字符串"
-     }
+        instructions: `PostgreSQL 连接字符串用于连接本地数据库。
+
+**配置步骤:**
+1. 确保已安装 PostgreSQL
+2. 准备连接字符串，格式:
+   postgresql://user:password@localhost:5432/dbname
+3. 在 mcp.json 中配置:
+   {
+     "id": "postgres",
+     "enabled": true,
+     "env": {
+       "POSTGRES_CONNECTION_STRING": "你的连接字符串"
+     }
    }`,
         freeTier: "✅ 完全免费 (本地数据库)",
         alternative: "使用 SQLite (默认启用)",

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

@@ -12,8 +12,8 @@ export declare const clearApiKeyCache: typeof clearConfigValueCache;
 export interface ModelRegistryOptions {
     /** When true, only load models from models.json (no built-in providers). Used by NanoPencil. */
     useOnlyCustomModels?: boolean;
-    /** Provider id for which apiKey is optional in models.json (key stored in auth.json later). Used by NanoPencil. */
-    allowOptionalApiKeyForProvider?: string;
+    /** Provider id(s) for which apiKey is optional in models.json (key stored in auth.json later). Used by NanoPencil. */
+    allowOptionalApiKeyForProvider?: string | string[];
 }
 export declare class ModelRegistry {
     readonly authStorage: AuthStorage;

package/dist/core/model-registry.js

@@ -309,8 +309,11 @@ export class ModelRegistry {
                 if (!providerConfig.baseUrl) {
                     throw new Error(`Provider ${providerName}: "baseUrl" is required when defining custom models.`);
                 }
-                const apiKeyOptional = this.allowOptionalApiKeyForProvider !== undefined &&
-                    providerName === this.allowOptionalApiKeyForProvider;
+                const allowed = this.allowOptionalApiKeyForProvider !== undefined &&
+                    (Array.isArray(this.allowOptionalApiKeyForProvider)
+                        ? this.allowOptionalApiKeyForProvider.includes(providerName)
+                        : providerName === this.allowOptionalApiKeyForProvider);
+                const apiKeyOptional = !!allowed;
                 if (!apiKeyOptional && !providerConfig.apiKey) {
                     throw new Error(`Provider ${providerName}: "apiKey" is required when defining custom models.`);
                 }

package/dist/core/usage-tracker.d.ts

@@ -0,0 +1,39 @@
+import type { Usage } from "@pencil-agent/ai";
+export interface UsageTotals {
+    input: number;
+    output: number;
+    cacheRead: number;
+    cacheWrite: number;
+    cost: number;
+}
+export interface UsageStats {
+    total: UsageTotals;
+    byDay: Record<string, UsageTotals>;
+    byMonth: Record<string, UsageTotals>;
+}
+/**
+ * Tracks token usage across all sessions and runs.
+ *
+ * Writes an append-only JSONL log (usage.jsonl) plus a small running total file
+ * (usage-total.json) for fast "global total" queries.
+ */
+export declare class UsageTracker {
+    private agentDir;
+    private usageLogPath;
+    private totalPath;
+    constructor(agentDir: string);
+    /**
+     * Record usage for a single assistant response.
+     *
+     * Safe to call frequently; errors are swallowed so as not to affect the agent.
+     */
+    record(usage: Usage, timestampMs?: number): void;
+    /**
+     * Get aggregated usage statistics:
+     * - total: global totals across all time
+     * - byDay: grouped by YYYY-MM-DD
+     * - byMonth: grouped by YYYY-MM
+     */
+    getUsageStats(): UsageStats;
+}
+//# sourceMappingURL=usage-tracker.d.ts.map

package/dist/core/usage-tracker.js

@@ -0,0 +1,168 @@
+import { mkdirSync, existsSync, readFileSync, writeFileSync, appendFileSync } from "node:fs";
+import { join } from "node:path";
+function emptyTotals() {
+    return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
+}
+function addInto(target, delta) {
+    target.input += delta.input;
+    target.output += delta.output;
+    target.cacheRead += delta.cacheRead;
+    target.cacheWrite += delta.cacheWrite;
+    target.cost += delta.cost;
+}
+/**
+ * Tracks token usage across all sessions and runs.
+ *
+ * Writes an append-only JSONL log (usage.jsonl) plus a small running total file
+ * (usage-total.json) for fast "global total" queries.
+ */
+export class UsageTracker {
+    agentDir;
+    usageLogPath;
+    totalPath;
+    constructor(agentDir) {
+        this.agentDir = agentDir;
+        this.usageLogPath = join(agentDir, "usage.jsonl");
+        this.totalPath = join(agentDir, "usage-total.json");
+    }
+    /**
+     * Record usage for a single assistant response.
+     *
+     * Safe to call frequently; errors are swallowed so as not to affect the agent.
+     */
+    record(usage, timestampMs) {
+        try {
+            // Ensure base directory exists
+            if (!existsSync(this.agentDir)) {
+                mkdirSync(this.agentDir, { recursive: true });
+            }
+            const date = timestampMs ? new Date(timestampMs) : new Date();
+            const iso = date.toISOString();
+            const day = iso.slice(0, 10); // YYYY-MM-DD
+            const month = iso.slice(0, 7); // YYYY-MM
+            const delta = {
+                input: usage.input ?? 0,
+                output: usage.output ?? 0,
+                cacheRead: usage.cacheRead ?? 0,
+                cacheWrite: usage.cacheWrite ?? 0,
+                cost: usage.cost?.total ?? 0,
+            };
+            // Append one line to usage.jsonl
+            const logEntry = JSON.stringify({
+                date: day,
+                month,
+                input: delta.input,
+                output: delta.output,
+                cacheRead: delta.cacheRead,
+                cacheWrite: delta.cacheWrite,
+                cost: delta.cost,
+            });
+            appendFileSync(this.usageLogPath, logEntry + "\n");
+            // Update running total (best-effort)
+            let total = emptyTotals();
+            if (existsSync(this.totalPath)) {
+                try {
+                    const raw = readFileSync(this.totalPath, "utf8");
+                    const parsed = JSON.parse(raw);
+                    total = {
+                        input: parsed.input ?? 0,
+                        output: parsed.output ?? 0,
+                        cacheRead: parsed.cacheRead ?? 0,
+                        cacheWrite: parsed.cacheWrite ?? 0,
+                        cost: parsed.cost ?? 0,
+                    };
+                }
+                catch {
+                    // Ignore parse errors and start fresh
+                    total = emptyTotals();
+                }
+            }
+            addInto(total, delta);
+            writeFileSync(this.totalPath, JSON.stringify(total));
+        }
+        catch {
+            // Swallow all errors - usage tracking must never break the agent
+        }
+    }
+    /**
+     * Get aggregated usage statistics:
+     * - total: global totals across all time
+     * - byDay: grouped by YYYY-MM-DD
+     * - byMonth: grouped by YYYY-MM
+     */
+    getUsageStats() {
+        const total = emptyTotals();
+        const byDay = Object.create(null);
+        const byMonth = Object.create(null);
+        // Load global total if available
+        if (existsSync(this.totalPath)) {
+            try {
+                const raw = readFileSync(this.totalPath, "utf8");
+                const parsed = JSON.parse(raw);
+                total.input = parsed.input ?? 0;
+                total.output = parsed.output ?? 0;
+                total.cacheRead = parsed.cacheRead ?? 0;
+                total.cacheWrite = parsed.cacheWrite ?? 0;
+                total.cost = parsed.cost ?? 0;
+            }
+            catch {
+                // Ignore and fall back to computing from log
+                total.input = 0;
+                total.output = 0;
+                total.cacheRead = 0;
+                total.cacheWrite = 0;
+                total.cost = 0;
+            }
+        }
+        if (existsSync(this.usageLogPath)) {
+            try {
+                const raw = readFileSync(this.usageLogPath, "utf8");
+                const lines = raw.split("\n");
+                for (const line of lines) {
+                    const trimmed = line.trim();
+                    if (!trimmed)
+                        continue;
+                    let entry;
+                    try {
+                        entry = JSON.parse(trimmed);
+                    }
+                    catch {
+                        continue;
+                    }
+                    const day = typeof entry.date === "string" ? entry.date : undefined;
+                    const month = typeof entry.month === "string" ? entry.month : undefined;
+                    const delta = {
+                        input: Number(entry.input) || 0,
+                        output: Number(entry.output) || 0,
+                        cacheRead: Number(entry.cacheRead) || 0,
+                        cacheWrite: Number(entry.cacheWrite) || 0,
+                        cost: Number(entry.cost) || 0,
+                    };
+                    // If total file was missing or corrupt, rebuild it from log
+                    if (!existsSync(this.totalPath)) {
+                        addInto(total, delta);
+                    }
+                    if (day) {
+                        if (!byDay[day])
+                            byDay[day] = emptyTotals();
+                        addInto(byDay[day], delta);
+                    }
+                    if (month) {
+                        if (!byMonth[month])
+                            byMonth[month] = emptyTotals();
+                        addInto(byMonth[month], delta);
+                    }
+                }
+                // If we had to rebuild total, persist it for next time
+                if (!existsSync(this.totalPath)) {
+                    writeFileSync(this.totalPath, JSON.stringify(total));
+                }
+            }
+            catch {
+                // Ignore log read errors
+            }
+        }
+        return { total, byDay, byMonth };
+    }
+}
+//# sourceMappingURL=usage-tracker.js.map

package/dist/extensions/agent-reach/index.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Agent Reach extension - installs and configures Agent Reach
+ * Adds /link-world command to give the AI agent internet access capabilities
+ */
+import type { ExtensionAPI } from "../../core/extensions/types.js";
+/**
+ * Agent Reach extension factory (default export)
+ */
+export default function agentReachExtension(pi: ExtensionAPI): Promise<void>;
+//# sourceMappingURL=index.d.ts.map

package/dist/extensions/agent-reach/index.js

@@ -0,0 +1,216 @@
+/**
+ * Agent Reach extension - installs and configures Agent Reach
+ * Adds /link-world command to give the AI agent internet access capabilities
+ */
+/**
+ * Agent Reach extension factory (default export)
+ */
+export default async function agentReachExtension(pi) {
+    // Register the /link-world command
+    pi.registerCommand("link-world", {
+        description: "Install Agent Reach to give the AI agent full internet access (Twitter, YouTube, Bilibili, Reddit, GitHub, 小红书, 抖音, etc.)",
+        handler: async (_args, ctx) => {
+            await handleLinkWorld(ctx, pi);
+        },
+    });
+}
+;
+/**
+ * Handle the /link-world command
+ * Installs Agent Reach and configures it
+ */
+async function handleLinkWorld(_ctx, pi) {
+    // Send initial message
+    pi.sendMessage({
+        customType: "agent-reach-install",
+        content: [
+            {
+                type: "text",
+                text: `🌐 **正在安装 Agent Reach...**
+
+Agent Reach 是一个让 AI 代理具备互联网访问能力的工具，支持以下平台：
+- **Twitter/X** - 搜索和发布推文
+- **YouTube** - 视频信息获取
+- **Bilibili** - 视频信息获取
+- **Reddit** - 帖子读取
+- **GitHub** - 代码仓库搜索
+- **小红书** - 帖子搜索
+- **抖音** - 视频解析
+- **LinkedIn** - 职位信息
+- **Boss直聘** - 职位搜索
+- **Exa Search** - AI 网页搜索
+
+正在执行安装...`,
+            },
+        ],
+        display: true,
+    });
+    try {
+        // Step 1: Install Agent Reach via pip
+        pi.sendMessage({
+            customType: "agent-reach-step",
+            content: [{ type: "text", text: "\n📦 **步骤 1/3**: 安装 Agent Reach..." }],
+            display: true,
+        });
+        const installResult = await pi.exec("pip", ["install", "https://github.com/Panniantong/agent-reach/archive/main.zip"]);
+        if (installResult.code !== 0) {
+            throw new Error(`安装失败: ${installResult.stderr}`);
+        }
+        pi.sendMessage({
+            customType: "agent-reach-step",
+            content: [{ type: "text", text: "✅ Agent Reach 安装成功" }],
+            display: true,
+        });
+        // Step 2: Run agent-reach install
+        pi.sendMessage({
+            customType: "agent-reach-step",
+            content: [
+                {
+                    type: "text",
+                    text: "\n⚙️ **步骤 2/3**: 配置环境（自动检测并安装依赖）...",
+                },
+            ],
+            display: true,
+        });
+        const configResult = await pi.exec("agent-reach", ["install", "--env=auto"]);
+        if (configResult.code !== 0) {
+            // If auto-install fails, try safe mode
+            pi.sendMessage({
+                customType: "agent-reach-step",
+                content: [
+                    {
+                        type: "text",
+                        text: "⚠️ 自动安装遇到问题，尝试安全模式（不会自动安装系统包）...",
+                    },
+                ],
+                display: true,
+            });
+            const safeResult = await pi.exec("agent-reach", ["install", "--env=auto", "--safe"]);
+            if (safeResult.code !== 0) {
+                pi.sendMessage({
+                    customType: "agent-reach-warning",
+                    content: [
+                        {
+                            type: "text",
+                            text: `⚠️ 配置过程中遇到一些问题：
+
+\`\`\`
+${safeResult.stderr}
+\`\`\`
+
+你可以稍后手动运行以下命令完成配置：
+\`\`\`bash
+agent-reach doctor
+\`\`\`
+`,
+                        },
+                    ],
+                    display: true,
+                });
+                return;
+            }
+        }
+        pi.sendMessage({
+            customType: "agent-reach-step",
+            content: [{ type: "text", text: "✅ 环境配置完成" }],
+            display: true,
+        });
+        // Step 3: Run agent-reach doctor to show status
+        pi.sendMessage({
+            customType: "agent-reach-step",
+            content: [
+                { type: "text", text: "\n🏥 **步骤 3/3**: 检查各通道状态..." },
+            ],
+            display: true,
+        });
+        const doctorResult = await pi.exec("agent-reach", ["doctor"]);
+        // Show doctor results
+        pi.sendMessage({
+            customType: "agent-reach-result",
+            content: [
+                {
+                    type: "text",
+                    text: `📊 **通道状态报告：**
+
+\`\`\`
+${doctorResult.stdout}
+\`\`\`
+`,
+                },
+            ],
+            display: true,
+        });
+        // Final message with next steps
+        pi.sendMessage({
+            customType: "agent-reach-complete",
+            content: [
+                {
+                    type: "text",
+                    text: `
+🎉 **Agent Reach 安装完成！**
+
+**可用命令：**
+- \`agent-reach doctor\` - 查看通道状态
+- \`agent-reach watch\` - 快速健康检查
+- \`agent-reach check-update\` - 检查更新
+
+**配置额外功能（可选）：**
+部分平台需要额外配置才能使用：
+
+🔑 **Twitter** - 需要 Cookie:
+\`\`\`bash
+agent-reach configure twitter-cookies "YOUR_COOKIE_STRING"
+\`\`\`
+
+🔑 **小红书** - 需要 Docker + MCP 服务:
+\`\`\`bash
+docker run -d --name xiaohongshu-mcp -p 18060:18060 xpzouying/xiaohongshu-mcp
+mcporter config add xiaohongshu http://localhost:18060/mcp
+\`\`\`
+
+🔑 **抖音** - 需要安装 MCP 服务:
+\`\`\`bash
+pip install douyin-mcp-server
+# 启动服务（详见 Agent Reach 文档）
+\`\`\`
+
+🌐 **代理配置（如需要）:**
+\`\`\`bash
+agent-reach configure proxy http://user:pass@ip:port
+\`\`\`
+
+详细文档：https://github.com/Panniantong/agent-reach
+`,
+                },
+            ],
+            display: true,
+        });
+    }
+    catch (error) {
+        pi.sendMessage({
+            customType: "agent-reach-error",
+            content: [
+                {
+                    type: "text",
+                    text: `❌ **安装失败**
+
+错误信息: ${error instanceof Error ? error.message : String(error)}
+
+请检查：
+1. 是否已安装 Python 和 pip
+2. 网络连接是否正常
+3. 是否有足够的权限
+
+你可以手动安装：
+\`\`\`bash
+pip install https://github.com/Panniantong/agent-reach/archive/main.zip
+agent-reach install --env=auto
+\`\`\`
+`,
+                },
+            ],
+            display: true,
+        });
+    }
+}
+//# sourceMappingURL=index.js.map

package/dist/extensions/link-world/index.d.ts

@@ -1,5 +1,6 @@
 /**
  * link-world 扩展：执行 /link-world 时让 AI 读取同目录下的安装文档并按要求安装。
+ * 安装后自动提供 internet-search Skill。
  */
 import type { ExtensionAPI } from "../../core/extensions/types.js";
 export default function linkWorldExtension(pi: ExtensionAPI): void;

package/dist/extensions/link-world/index.js

@@ -1,12 +1,15 @@
 /**
  * link-world 扩展：执行 /link-world 时让 AI 读取同目录下的安装文档并按要求安装。
+ * 安装后自动提供 internet-search Skill。
  */
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
+import { execSync } from "child_process";
 import { Box, Container, Spacer, Text } from "@pencil-agent/tui";
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const DOC_PATH = join(__dirname, "linkworld.md");
+const SKILL_PATH = join(__dirname, "skills", "internet-search.md");
 const LINK_WORLD_CUSTOM_TYPE = "link-world-install";
 function getInstallDoc() {
     try {
@@ -16,6 +19,19 @@ function getInstallDoc() {
         return "";
     }
 }
+/**
+ * 检查 agent-reach 是否已安装
+ */
+function isAgentReachInstalled() {
+    try {
+        // 检查 agent-reach CLI 是否可用
+        execSync("agent-reach --version", { encoding: "utf-8", stdio: "pipe" });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 export default function linkWorldExtension(pi) {
     /** TUI 仅显示简短提示，不展示完整安装文档内容 */
     pi.registerMessageRenderer(LINK_WORLD_CUSTOM_TYPE, (message, _options, theme) => {
@@ -29,6 +45,22 @@ export default function linkWorldExtension(pi) {
         container.addChild(box);
         return container;
     });
+    // 注册 resources_discover 事件：当 agent-reach 已安装时，提供 internet-search skill
+    pi.on("resources_discover", async (_event) => {
+        // 检查 agent-reach 是否已安装
+        if (!isAgentReachInstalled()) {
+            // 未安装，不提供 skill
+            return {};
+        }
+        // 检查 skill 文件是否存在
+        if (!existsSync(SKILL_PATH)) {
+            return {};
+        }
+        // 返回 skill 路径
+        return {
+            skillPaths: [SKILL_PATH],
+        };
+    });
     pi.registerCommand("link-world", {
         description: "安装 link-world，为 AI 提供互联网访问（Twitter、YouTube、Bilibili、小红书、抖音等）",
         handler: async (_args, _ctx) => {

package/dist/main.js

@@ -30,7 +30,7 @@ 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 { ensureNanopencilCodingPlanAuth, ensureNanopencilDefaultConfig, NANOPENCIL_DEFAULT_PROVIDER, } from "./nanopencil-defaults.js";
+import { ensureNanopencilCodingPlanAuth, ensureNanopencilDefaultConfig, NANOPENCIL_ARK_CODING_PROVIDER, NANOPENCIL_DEFAULT_PROVIDER, NANOPENCIL_QIANFAN_CODING_PROVIDER, } from "./nanopencil-defaults.js";
 import { getNanopencilDefaultExtensionPaths } from "./pencil-mem-integration.js";
 // Check if running in development mode (not production)
 const isDevelopment = process.env.NODE_ENV !== "production";
@@ -507,7 +507,14 @@ 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,
+                NANOPENCIL_QIANFAN_CODING_PROVIDER,
+                NANOPENCIL_ARK_CODING_PROVIDER,
+            ],
+        }
         : {});
     const defaultExtPaths = APP_NAME === "nanopencil" ? getNanopencilDefaultExtensionPaths() : [];
     const resourceLoader = new DefaultResourceLoader({