npm - @next-open-ai/openbot - Versions diffs - 0.6.16 → 0.6.66 - Mend

@next-open-ai/openbot 0.6.16 → 0.6.66

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (95) hide show

package/README.md +4 -4
package/apps/desktop/renderer/dist/assets/index-CxDZnMBH.css +10 -0
package/apps/desktop/renderer/dist/assets/index-k47Qiokg.js +93 -0
package/apps/desktop/renderer/dist/index.html +2 -2
package/dist/cli/cli.js +136 -0
package/dist/cli/extension-cmd.d.ts +15 -0
package/dist/cli/extension-cmd.js +107 -0
package/dist/core/agent/agent-dir.d.ts +6 -0
package/dist/core/agent/agent-dir.js +8 -0
package/dist/core/agent/agent-manager.d.ts +13 -0
package/dist/core/agent/agent-manager.js +88 -7
package/dist/core/agent/proxy/adapters/claude-code-adapter.d.ts +2 -0
package/dist/core/agent/proxy/adapters/claude-code-adapter.js +186 -0
package/dist/core/agent/proxy/adapters/local-adapter.js +3 -1
package/dist/core/agent/proxy/adapters/openclawx-adapter.js +3 -3
package/dist/core/agent/proxy/adapters/opencode-adapter.js +65 -29
package/dist/core/agent/proxy/adapters/opencode-local-runner.js +9 -0
package/dist/core/agent/proxy/index.js +2 -0
package/dist/core/agent/token-usage-log-extension.d.ts +14 -0
package/dist/core/agent/token-usage-log-extension.js +61 -0
package/dist/core/config/agent-reload-pending.js +3 -2
package/dist/core/config/desktop-config.d.ts +29 -6
package/dist/core/config/desktop-config.js +188 -27
package/dist/core/config/provider-support-default.js +27 -0
package/dist/core/extensions/index.d.ts +1 -0
package/dist/core/extensions/index.js +1 -0
package/dist/core/extensions/load.d.ts +11 -0
package/dist/core/extensions/load.js +101 -0
package/dist/core/local-llm-server/download-model.d.ts +16 -0
package/dist/core/local-llm-server/download-model.js +37 -0
package/dist/core/local-llm-server/index.d.ts +32 -0
package/dist/core/local-llm-server/index.js +152 -0
package/dist/core/local-llm-server/llm-context.d.ts +66 -0
package/dist/core/local-llm-server/llm-context.js +270 -0
package/dist/core/local-llm-server/model-resolve.d.ts +27 -0
package/dist/core/local-llm-server/model-resolve.js +90 -0
package/dist/core/local-llm-server/server.d.ts +1 -0
package/dist/core/local-llm-server/server.js +234 -0
package/dist/core/local-llm-server/start-from-config.d.ts +5 -0
package/dist/core/local-llm-server/start-from-config.js +50 -0
package/dist/core/mcp/adapter.d.ts +4 -2
package/dist/core/mcp/adapter.js +10 -4
package/dist/core/mcp/index.d.ts +2 -0
package/dist/core/mcp/index.js +1 -0
package/dist/core/mcp/operator.d.ts +11 -0
package/dist/core/mcp/operator.js +41 -7
package/dist/core/mcp/transport/stdio.d.ts +6 -0
package/dist/core/mcp/transport/stdio.js +125 -28
package/dist/core/memory/local-embedding-llama.js +8 -6
package/dist/core/memory/local-embedding.d.ts +4 -3
package/dist/core/memory/local-embedding.js +43 -3
package/dist/core/tools/index.d.ts +1 -0
package/dist/core/tools/index.js +1 -0
package/dist/core/tools/truncate-result.d.ts +14 -0
package/dist/core/tools/truncate-result.js +27 -0
package/dist/core/tools/web-search/create-web-search-tool.d.ts +17 -0
package/dist/core/tools/web-search/create-web-search-tool.js +87 -0
package/dist/core/tools/web-search/index.d.ts +4 -0
package/dist/core/tools/web-search/index.js +2 -0
package/dist/core/tools/web-search/providers/brave.d.ts +2 -0
package/dist/core/tools/web-search/providers/brave.js +87 -0
package/dist/core/tools/web-search/providers/duck-duck-scrape.d.ts +2 -0
package/dist/core/tools/web-search/providers/duck-duck-scrape.js +47 -0
package/dist/core/tools/web-search/providers/index.d.ts +5 -0
package/dist/core/tools/web-search/providers/index.js +13 -0
package/dist/core/tools/web-search/types.d.ts +35 -0
package/dist/core/tools/web-search/types.js +4 -0
package/dist/gateway/methods/agent-chat.js +110 -42
package/dist/gateway/methods/run-scheduled-task.js +2 -0
package/dist/gateway/server.js +60 -13
package/dist/server/agent-config/agent-config.controller.d.ts +9 -1
package/dist/server/agent-config/agent-config.controller.js +11 -0
package/dist/server/agent-config/agent-config.service.d.ts +29 -5
package/dist/server/agent-config/agent-config.service.js +41 -1
package/dist/server/agents/agents.gateway.js +1 -1
package/dist/server/bootstrap.d.ts +1 -0
package/dist/server/bootstrap.js +19 -2
package/dist/server/config/config.controller.d.ts +107 -4
package/dist/server/config/config.controller.js +185 -3
package/dist/server/config/config.module.js +3 -2
package/dist/server/config/config.service.d.ts +18 -1
package/dist/server/config/config.service.js +68 -9
package/dist/server/config/local-models.service.d.ts +67 -0
package/dist/server/config/local-models.service.js +242 -0
package/package.json +3 -1
package/presets/preset-agents.json +125 -91
package/presets/preset-config.json +24 -6
package/presets/preset-providers.json +7 -0
package/presets/recommended-local-models.json +36 -0
package/presets/workspaces/download-assistant/skills/downloader/SKILL.md +2 -2
package/presets/workspaces/office-automation/skills/rpa-helper/SKILL.md +9 -0
package/presets/workspaces/self-media-bot/skills/self-media-tools/SKILL.md +9 -0
package/skills/url-bookmark/SKILL.md +12 -12
package/apps/desktop/renderer/dist/assets/index-BxqMW-uy.css +0 -10
package/apps/desktop/renderer/dist/assets/index-DJs-wX3R.js +0 -89

package/apps/desktop/renderer/dist/index.html CHANGED Viewed

@@ -11,8 +11,8 @@
     <link
         href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&family=Roboto+Mono:wght@400;500&display=swap"
         rel="stylesheet">
-  <script type="module" crossorigin src="/assets/index-DJs-wX3R.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/index-BxqMW-uy.css">
+  <script type="module" crossorigin src="/assets/index-k47Qiokg.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/index-CxDZnMBH.css">
 </head>
 <body>

package/dist/cli/cli.js CHANGED Viewed

@@ -6,7 +6,11 @@ import { Command } from "commander";
 import { getOpenbotAgentDir } from "../core/agent/agent-dir.js";
 import { run } from "../core/agent/run.js";
 import { loadDesktopAgentConfig, getBoundAgentIdForCli, setProviderApiKey, setDefaultModel, getDesktopConfigList, syncDesktopConfigToModelsJson, ensureDesktopConfigInitialized, } from "../core/config/desktop-config.js";
+import { downloadModel, DEFAULT_LLM_MODEL_URI, } from "../core/local-llm-server/download-model.js";
+import { startLocalLlmServer, stopLocalLlmServer, } from "../core/local-llm-server/index.js";
+import { LOCAL_LLM_CACHE_DIR, isModelFileInCache, toModelPathForStart, } from "../core/local-llm-server/model-resolve.js";
 import { writeGatewayPid, removeGatewayPidFile, serviceInstall, serviceUninstall, serviceStop, } from "./service.js";
+import { installExtension, listExtensions, uninstallExtension } from "./extension-cmd.js";
 const require = createRequire(import.meta.url);
 const PKG = require("../../package.json");
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -189,6 +193,138 @@ configCmd
     await syncDesktopConfigToModelsJson();
     console.log("[openbot] Synced desktop providers to agent models.json");
 });
+// Extension: 在 ~/.openbot/plugins 下通过 npm 包安装/列出/卸载扩展，Server 运行时从该目录加载
+const extensionCmd = program
+    .command("extension")
+    .description("Install, list, or uninstall extensions (npm packages in ~/.openbot/plugins)");
+extensionCmd
+    .command("install <pkg>")
+    .description("Install an extension package (e.g. openbot extension install my-extension)")
+    .action((pkg) => {
+    installExtension(pkg);
+});
+extensionCmd
+    .command("list")
+    .description("List installed extensions")
+    .action(() => {
+    const list = listExtensions();
+    if (list.length === 0) {
+        console.log("No extensions installed. Run: openbot extension install <package>");
+        return;
+    }
+    console.log("Installed extensions:\n");
+    console.table(list.map((r) => ({ Package: r.name, Spec: r.spec })));
+});
+extensionCmd
+    .command("uninstall <pkg>")
+    .description("Uninstall an extension package")
+    .action((pkg) => {
+    uninstallExtension(pkg);
+});
+// 本地模型：下载与启动服务
+const localCmd = program
+    .command("local")
+    .description("下载本地 GGUF 模型与启动本地 LLM 服务");
+localCmd
+    .command("download")
+    .description("下载推荐模型到 ~/.openbot/.cached_models/，不指定模型时下载 Qwen 3.5 4B")
+    .argument("[modelUri]", "模型 URI（如 hf:unsloth/Qwen3.5-4B-GGUF/Qwen3.5-4B-Q5_K_M.gguf），不传则下载 Qwen 3.5 4B")
+    .option("--mirror", "使用国内镜像 hf-mirror.com 下载")
+    .action(async (modelUri, opts) => {
+    const uri = (modelUri || "").trim() || DEFAULT_LLM_MODEL_URI;
+    console.log(`[openbot] 下载模型: ${uri}`);
+    if (opts.mirror)
+        console.log("[openbot] 使用国内镜像 hf-mirror.com");
+    try {
+        const path = await downloadModel(uri, {
+            useMirror: opts.mirror,
+            onProgress: (p) => {
+                const percent = p.totalSize ? Math.round((p.downloadedSize / p.totalSize) * 100) : (p.percent ?? 0);
+                const mb = (p.downloadedSize / 1024 / 1024).toFixed(1);
+                const totalMb = p.totalSize ? (p.totalSize / 1024 / 1024).toFixed(1) : "?";
+                process.stderr.write(`\r[openbot] 下载中 ${percent}% (${mb} / ${totalMb} MB)`);
+            },
+        });
+        console.log(`\n[openbot] 已保存: ${path}`);
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        console.error("\n[openbot] 下载失败:", msg);
+        process.exit(1);
+    }
+});
+localCmd
+    .command("start")
+    .description("启动本地 LLM 服务（至少指定 --llm 或 --embedding 之一）")
+    .option("--llm <uriOrFile>", "LLM 模型：hf: URI 或已下载文件名，不传则使用桌面缺省模型")
+    .option("--embedding <uriOrFile>", "Embedding 模型：hf: URI 或已下载文件名（可选）")
+    .option("--context-size <n>", "上下文长度（token 数），默认 32768 或环境变量 LOCAL_LLM_CONTEXT_MAX", (v) => parseInt(v, 10) || 32768)
+    .option("--port <port>", "服务端口", "11435")
+    .action(async (opts) => {
+    let llmPath;
+    let embPath;
+    if (opts.llm?.trim()) {
+        const llmArg = opts.llm.trim();
+        if (!llmArg.startsWith("hf:") && !isModelFileInCache(llmArg, LOCAL_LLM_CACHE_DIR)) {
+            console.error("[openbot] 模型未下载或路径不存在，请先执行: openbot local download [modelUri]");
+            process.exit(1);
+        }
+        llmPath = toModelPathForStart(llmArg, LOCAL_LLM_CACHE_DIR);
+    }
+    else {
+        const agentConfig = await loadDesktopAgentConfig("default");
+        const defaultModel = agentConfig?.model?.trim();
+        if (defaultModel) {
+            llmPath = toModelPathForStart(defaultModel, LOCAL_LLM_CACHE_DIR);
+            if (!isModelFileInCache(defaultModel, LOCAL_LLM_CACHE_DIR)) {
+                console.error("[openbot] 缺省模型未下载，请先执行: openbot local download");
+                process.exit(1);
+            }
+        }
+    }
+    if (opts.embedding?.trim()) {
+        const embArg = opts.embedding.trim();
+        if (!embArg.startsWith("hf:") && !isModelFileInCache(embArg, LOCAL_LLM_CACHE_DIR)) {
+            console.error("[openbot] Embedding 模型未下载或路径不存在，请先执行: openbot local download <embedding-uri>");
+            process.exit(1);
+        }
+        embPath = toModelPathForStart(embArg, LOCAL_LLM_CACHE_DIR);
+    }
+    if (!llmPath && !embPath) {
+        console.error("[openbot] 请至少指定 --llm 或 --embedding，或先配置桌面缺省模型");
+        process.exit(1);
+    }
+    const contextSize = opts.contextSize ??
+        (process.env.LOCAL_LLM_CONTEXT_MAX ? parseInt(process.env.LOCAL_LLM_CONTEXT_MAX, 10) : undefined) ??
+        32768;
+    const port = parseInt(opts.port || "11435", 10);
+    try {
+        const handle = await startLocalLlmServer({
+            port,
+            llmModelPath: llmPath,
+            embeddingModelPath: embPath,
+            contextSize,
+        });
+        console.log(`[openbot] 本地模型服务已启动: ${handle.baseUrl}`);
+        console.log("[openbot] 按 Ctrl+C 停止服务");
+        await new Promise((resolve) => {
+            process.on("SIGINT", () => {
+                stopLocalLlmServer();
+                resolve();
+            });
+            process.on("SIGTERM", () => {
+                stopLocalLlmServer();
+                resolve();
+            });
+        });
+        process.exit(0);
+    }
+    catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        console.error("[openbot] 启动失败:", msg);
+        process.exit(1);
+    }
+});
 (async () => {
     await ensureDesktopConfigInitialized();
     await program.parseAsync(process.argv);

package/dist/cli/extension-cmd.d.ts ADDED Viewed

@@ -0,0 +1,15 @@
+/**
+ * 安装扩展：将包加入 dependencies 并在 plugins 目录下执行 npm install
+ */
+export declare function installExtension(pkgSpec: string): void;
+/**
+ * 列出已安装的扩展（package.json 的 dependencies）
+ */
+export declare function listExtensions(): {
+    name: string;
+    spec: string;
+}[];
+/**
+ * 卸载扩展：从 dependencies 移除并在 plugins 目录下执行 npm install
+ */
+export declare function uninstallExtension(pkgName: string): void;

package/dist/cli/extension-cmd.js ADDED Viewed

@@ -0,0 +1,107 @@
+/**
+ * openbot extension install / list / uninstall
+ * 在 ~/.openbot/plugins 下维护 package.json 与 node_modules，Server 运行时从该目录加载扩展。
+ */
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { execSync } from "node:child_process";
+import { join } from "node:path";
+import { getOpenbotPluginsDir } from "../core/agent/agent-dir.js";
+const PLUGINS_PACKAGE_NAME = "openbot-plugins-root";
+function ensurePluginsDir() {
+    const dir = getOpenbotPluginsDir();
+    if (!existsSync(dir)) {
+        mkdirSync(dir, { recursive: true });
+    }
+    const pkgPath = join(dir, "package.json");
+    if (!existsSync(pkgPath)) {
+        writeFileSync(pkgPath, JSON.stringify({
+            name: PLUGINS_PACKAGE_NAME,
+            version: "1.0.0",
+            private: true,
+            description: "OpenBot extension packages (managed by openbot extension install)",
+            dependencies: {},
+        }, null, 2), "utf-8");
+    }
+    return dir;
+}
+function readPluginsPackageJson(pluginsDir) {
+    const pkgPath = join(pluginsDir, "package.json");
+    if (!existsSync(pkgPath))
+        return {};
+    try {
+        return JSON.parse(readFileSync(pkgPath, "utf-8"));
+    }
+    catch {
+        return {};
+    }
+}
+function writePluginsPackageJson(pluginsDir, pkg) {
+    const pkgPath = join(pluginsDir, "package.json");
+    const full = {
+        name: PLUGINS_PACKAGE_NAME,
+        version: "1.0.0",
+        private: true,
+        description: "OpenBot extension packages (managed by openbot extension install)",
+        ...pkg,
+    };
+    writeFileSync(pkgPath, JSON.stringify(full, null, 2), "utf-8");
+}
+/**
+ * 解析用户输入的 pkgSpec（如 "foo" 或 "foo@1.0.0"）为 { name, spec }。
+ */
+function parsePkgSpec(pkgSpec) {
+    const at = pkgSpec.indexOf("@");
+    if (at === -1)
+        return { name: pkgSpec.trim(), spec: "*" };
+    return { name: pkgSpec.slice(0, at).trim(), spec: pkgSpec.slice(at + 1).trim() || "*" };
+}
+/**
+ * 安装扩展：将包加入 dependencies 并在 plugins 目录下执行 npm install
+ */
+export function installExtension(pkgSpec) {
+    const pluginsDir = ensurePluginsDir();
+    const { name, spec } = parsePkgSpec(pkgSpec);
+    const pkg = readPluginsPackageJson(pluginsDir);
+    const deps = { ...pkg.dependencies };
+    deps[name] = spec; // 覆盖为本次指定的版本
+    writePluginsPackageJson(pluginsDir, { ...pkg, dependencies: deps });
+    execSync("npm install", {
+        cwd: pluginsDir,
+        stdio: "inherit",
+    });
+    console.log(`[openbot] Installed extension: ${name} (in ${pluginsDir})`);
+}
+/**
+ * 列出已安装的扩展（package.json 的 dependencies）
+ */
+export function listExtensions() {
+    const pluginsDir = getOpenbotPluginsDir();
+    if (!existsSync(pluginsDir))
+        return [];
+    const pkg = readPluginsPackageJson(pluginsDir);
+    const deps = pkg.dependencies ?? {};
+    return Object.entries(deps).map(([name, spec]) => ({ name, spec }));
+}
+/**
+ * 卸载扩展：从 dependencies 移除并在 plugins 目录下执行 npm install
+ */
+export function uninstallExtension(pkgName) {
+    const pluginsDir = getOpenbotPluginsDir();
+    if (!existsSync(pluginsDir)) {
+        console.warn("[openbot] No plugins directory found.");
+        return;
+    }
+    const pkg = readPluginsPackageJson(pluginsDir);
+    const deps = { ...(pkg.dependencies ?? {}) };
+    if (!(pkgName in deps)) {
+        console.warn(`[openbot] Extension "${pkgName}" is not installed.`);
+        return;
+    }
+    delete deps[pkgName];
+    writePluginsPackageJson(pluginsDir, { ...pkg, dependencies: deps });
+    execSync("npm install", {
+        cwd: pluginsDir,
+        stdio: "inherit",
+    });
+    console.log(`[openbot] Uninstalled extension: ${pkgName}`);
+}

package/dist/core/agent/agent-dir.d.ts CHANGED Viewed

@@ -8,6 +8,12 @@ export declare function getOpenbotAgentDir(): string;
  * 可通过环境变量 OPENBOT_WORKSPACE_DIR 覆盖
  */
 export declare function getOpenbotWorkspaceDir(): string;
+/**
+ * 获取 openbot 扩展（插件）目录（默认 ~/.openbot/plugins）
+ * 可通过环境变量 OPENBOT_PLUGINS_DIR 覆盖
+ * openbot extension install 会在此目录下维护 package.json 与 node_modules
+ */
+export declare function getOpenbotPluginsDir(): string;
 /**
  * 确保 agent 目录存在，并创建默认配置文件
  */

package/dist/core/agent/agent-dir.js CHANGED Viewed

@@ -15,6 +15,14 @@ export function getOpenbotAgentDir() {
 export function getOpenbotWorkspaceDir() {
     return process.env.OPENBOT_WORKSPACE_DIR ?? join(homedir(), ".openbot", "workspace");
 }
+/**
+ * 获取 openbot 扩展（插件）目录（默认 ~/.openbot/plugins）
+ * 可通过环境变量 OPENBOT_PLUGINS_DIR 覆盖
+ * openbot extension install 会在此目录下维护 package.json 与 node_modules
+ */
+export function getOpenbotPluginsDir() {
+    return process.env.OPENBOT_PLUGINS_DIR ?? join(homedir(), ".openbot", "plugins");
+}
 /**
  * 确保 agent 目录存在，并创建默认配置文件
  */

package/dist/core/agent/agent-manager.d.ts CHANGED Viewed

@@ -60,10 +60,23 @@ export declare class AgentManager {
         maxSessions?: number;
         targetAgentId?: string;
         mcpServers?: McpServerConfig[] | McpServersStandardFormat;
+        /** MCP 单次返回最大 token；不配置则不限制 */
+        mcpMaxResultTokens?: number;
         /** 自定义系统提示词（来自 agent 配置），会与技能等一起组成最终 systemPrompt */
         systemPrompt?: string;
         /** 是否使用长记忆（memory_recall/save_experience）；默认 true */
         useLongMemory?: boolean;
+        /** 在线搜索：启用时注册 web_search 工具 */
+        webSearch?: {
+            enabled: boolean;
+            provider: "brave" | "duck-duck-scrape";
+            apiKey?: string;
+            timeoutSeconds?: number;
+            cacheTtlMinutes?: number;
+            maxResults?: number;
+            /** 单次搜索返回最大 token；不配置则不限制；前端默认 64K */
+            maxResultTokens?: number;
+        };
     }): Promise<AgentSession>;
     /** 按复合 key 获取（key = sessionId + "::" + agentId） */
     getSession(compositeKey: string): AgentSession | undefined;

package/dist/core/agent/agent-manager.js CHANGED Viewed

@@ -1,10 +1,11 @@
-import { createAgentSession, AuthStorage, DefaultResourceLoader, ModelRegistry, SessionManager as CoreSessionManager, createReadTool, createWriteTool, createEditTool, createBashTool, createFindTool, createGrepTool, createLsTool } from "@mariozechner/pi-coding-agent";
+import { createAgentSession, AuthStorage, DefaultResourceLoader, ModelRegistry, SessionManager as CoreSessionManager, SettingsManager, createReadTool, createWriteTool, createEditTool, createBashTool, createFindTool, createGrepTool, createLsTool } from "@mariozechner/pi-coding-agent";
 import { join } from "node:path";
 import { existsSync, mkdirSync } from "node:fs";
 import { createCompactionMemoryExtensionFactory } from "../memory/compaction-extension.js";
+import { loadExtensionFactories } from "../extensions/index.js";
 import { addMemory } from "../memory/index.js";
 import { persistStoredCompactionForSession, persistStoredCompactionForBusinessSession, } from "../memory/persist-compaction-on-close.js";
-import { createBrowserTool, createSaveExperienceTool, createMemoryRecallTool, createInstallSkillTool, createSwitchAgentTool, createListAgentsTool, createCreateAgentTool, createGetBookmarkTagsTool, createSaveBookmarkTool, createAddBookmarkTagTool } from "../tools/index.js";
+import { createBrowserTool, createSaveExperienceTool, createMemoryRecallTool, createInstallSkillTool, createSwitchAgentTool, createListAgentsTool, createCreateAgentTool, createGetBookmarkTagsTool, createSaveBookmarkTool, createAddBookmarkTagTool, createWebSearchTool } from "../tools/index.js";
 /** Agent Session 缓存 key：sessionId + "::" + agentId，同一业务 session 下不同 agent 各自一个 Core Session */
 const COMPOSITE_KEY_SEP = "::";
 function toCompositeKey(sessionId, agentId) {
@@ -12,10 +13,16 @@ function toCompositeKey(sessionId, agentId) {
 }
 import { createMcpToolsForSession } from "../mcp/index.js";
 import { registerBuiltInApiProviders } from "@mariozechner/pi-ai/dist/providers/register-builtins.js";
-import { getOpenbotAgentDir, getOpenbotWorkspaceDir, ensureDefaultAgentDir } from "./agent-dir.js";
+import { getOpenbotAgentDir, getOpenbotWorkspaceDir } from "./agent-dir.js";
 import { formatSkillsForPrompt } from "./skills.js";
+import { createTokenUsageLogExtensionFactory, setTokenUsageInitialStats, } from "./token-usage-log-extension.js";
 // Ensure all built-in providers are registered
 registerBuiltInApiProviders();
+/** 粗略按字符估算 token（中英混合约 1/3，纯英文约 1/4） */
+function estTokensFromChars(chars) {
+    return Math.ceil(chars / 3);
+}
+const TOKEN_USAGE_LOG_PREFIX = "[token-usage]";
 /** system prompt 中每个技能描述最大字符数，超出截断以省 token */
 const MAX_SKILL_DESC_IN_PROMPT = 250;
 /**
@@ -123,9 +130,17 @@ For downloads, provide either a direct URL or a selector to click.`;
             agentDir: this.agentDir,
             noSkills: true, // Disable SDK's built-in skills logic to take full control
             additionalSkillPaths: this.resolveSkillPaths(workspaceDir),
-            extensionFactories: sessionId && onUpdateLatestCompaction
-                ? [createCompactionMemoryExtensionFactory(sessionId, onUpdateLatestCompaction)]
-                : [],
+            extensionFactories: (() => {
+                const compositeKeyForLoader = sessionId && identity?.agentId
+                    ? sessionId + COMPOSITE_KEY_SEP + identity.agentId
+                    : "";
+                const tokenLog = createTokenUsageLogExtensionFactory(compositeKeyForLoader);
+                const base = sessionId && onUpdateLatestCompaction
+                    ? [createCompactionMemoryExtensionFactory(sessionId, onUpdateLatestCompaction)]
+                    : [];
+                const pluginFactories = loadExtensionFactories();
+                return [tokenLog, ...base, ...pluginFactories];
+            })(),
             systemPromptOverride: (base) => {
                 const loadedSkills = loader.getSkills().skills;
                 const basePrompt = this.buildSystemPrompt(loadedSkills);
@@ -203,13 +218,22 @@ For downloads, provide either a direct URL or a selector to click.`;
         const provider = options.provider ?? process.env.OPENBOT_PROVIDER ?? "deepseek";
         const modelId = options.modelId ?? process.env.OPENBOT_MODEL ?? "deepseek-chat";
         const apiKey = options.apiKey;
-        ensureDefaultAgentDir(this.agentDir);
+        // local provider：指向本地 node-llama-cpp 子进程服务
+        if (provider === "local") {
+            const localBaseUrl = process.env.LOCAL_LLM_BASE_URL ?? "http://127.0.0.1:11435/v1";
+            process.env.OPENAI_API_KEY = process.env.OPENAI_API_KEY || "local";
+            process.env.OPENAI_BASE_URL = localBaseUrl;
+        }
         const authPath = join(this.agentDir, "auth.json");
         const modelsPath = join(this.agentDir, "models.json");
         const authStorage = new AuthStorage(authPath);
         if (apiKey) {
             authStorage.setRuntimeApiKey(provider, apiKey);
         }
+        // local 无需真实 API Key，显式设置占位凭证，避免 SDK 走默认凭证链（如 AWS）导致 "Could not load credentials from any providers"
+        if (provider === "local") {
+            authStorage.setRuntimeApiKey("local", process.env.OPENAI_API_KEY || "local");
+        }
         if (await authStorage.hasAuth(provider)) {
             const key = await authStorage.getApiKey(provider);
             if (key) {
@@ -245,6 +269,8 @@ For downloads, provide either a direct URL or a selector to click.`;
                 return process.env.MOONSHOT_API_KEY || process.env.KIMI_API_KEY || process.env.OPENAI_API_KEY;
             if (p === "openai" || p === "openai-custom")
                 return process.env.OPENAI_API_KEY;
+            if (p === "local")
+                return process.env.OPENAI_API_KEY || "local";
             return process.env.OPENAI_API_KEY;
         });
         const loader = this.createResourceLoader(sessionWorkspaceDir, sessionId, options.systemPrompt, { agentId, workspace: workspaceName }, (summary) => this.sessionLatestCompactionSummary.set(compositeKey, summary));
@@ -262,7 +288,9 @@ For downloads, provide either a direct URL or a selector to click.`;
         const mcpTools = await createMcpToolsForSession({
             mcpServers: options.mcpServers,
             sessionId,
+            mcpMaxResultTokens: options.mcpMaxResultTokens,
         });
+        const webSearchTool = options.webSearch?.enabled === true ? createWebSearchTool(options.webSearch) : null;
         const customTools = [
             createBrowserTool(sessionWorkspaceDir),
             createSaveExperienceTool(sessionId),
@@ -274,11 +302,57 @@ For downloads, provide either a direct URL or a selector to click.`;
             createGetBookmarkTagsTool(),
             createSaveBookmarkTool(),
             createAddBookmarkTagTool(),
+            ...(webSearchTool ? [webSearchTool] : []),
             ...mcpTools,
         ];
+        // 分类打印 token 占用估算（字符数 + 估算 token），便于分析超长请求来源
+        try {
+            const loadedSkills = loader.getSkills().skills;
+            const shortSkills = loadedSkills.map((s) => ({
+                ...s,
+                description: s.description.length <= MAX_SKILL_DESC_IN_PROMPT
+                    ? s.description
+                    : s.description.slice(0, MAX_SKILL_DESC_IN_PROMPT) + "…",
+            }));
+            const skillsBlock = formatSkillsForPrompt(shortSkills);
+            const basePrompt = this.buildSystemPrompt(loadedSkills);
+            const withCustom = options.systemPrompt?.trim()
+                ? options.systemPrompt.trim() + "\n\n" + basePrompt
+                : basePrompt;
+            const sessionIdentity = { agentId, workspace: workspaceName };
+            const withIdentity = sessionIdentity?.agentId
+                ? `[Session identity] You are the agent with ID: ${sessionIdentity.agentId}, workspace: ${sessionIdentity.workspace || sessionIdentity.agentId}. When asked which agent you are, answer according to this identity.\n\n` + withCustom
+                : withCustom;
+            const systemPromptChars = withIdentity.length;
+            const toolsDefs = [
+                ...Object.values(coreTools),
+                ...customTools,
+            ].map((t) => ({
+                name: t?.name ?? "",
+                description: typeof t?.description === "string" ? t.description : "",
+                parameters: t?.parameters ?? {},
+            }));
+            const toolsJsonChars = JSON.stringify(toolsDefs).length;
+            const systemPromptEstTokens = estTokensFromChars(systemPromptChars);
+            const skillsBlockEstTokens = estTokensFromChars(skillsBlock.length);
+            const toolsDefsEstTokens = estTokensFromChars(toolsJsonChars);
+            console.log(`${TOKEN_USAGE_LOG_PREFIX} session create (${compositeKey}) | systemPrompt chars=${systemPromptChars} estTokens=${systemPromptEstTokens} | skillsBlock chars=${skillsBlock.length} estTokens=${skillsBlockEstTokens} | toolsDefs chars=${toolsJsonChars} estTokens=${toolsDefsEstTokens}`);
+            setTokenUsageInitialStats(compositeKey, {
+                systemPromptEstTokens,
+                skillsBlockEstTokens,
+                toolsDefsEstTokens,
+            });
+            console.log(`${TOKEN_USAGE_LOG_PREFIX} compaction (SDK): 触发条件 contextTokens > contextWindow - reserveTokens (默认 16384)；保留最近 keepRecentTokens (默认 20000)。配置见 pi 文档 settings.json 或传入 settingsManager。`);
+        }
+        catch (e) {
+            console.warn(`${TOKEN_USAGE_LOG_PREFIX} session create log failed:`, e);
+        }
         const { session } = await createAgentSession({
             agentDir: this.agentDir,
             sessionManager: CoreSessionManager.inMemory(),
+            settingsManager: SettingsManager.inMemory({
+                compaction: { enabled: true, reserveTokens: 16384, keepRecentTokens: 20000 },
+            }),
             authStorage,
             modelRegistry,
             cwd: sessionWorkspaceDir,
@@ -291,6 +365,13 @@ For downloads, provide either a direct URL or a selector to click.`;
             console.log(`Setting model to ${model.provider}/${model.id} (workspace: ${workspaceName})`);
             await session.setModel(model);
         }
+        else if (provider && modelId) {
+            // 配置了 provider/model 但在 models.json 中找不到，避免发请求后收到 400 model is required
+            const hint = provider === "ollama" || provider === "openai-custom"
+                ? "若使用 Ollama，请确保模型名与终端中 `ollama list` 显示的名称完全一致（如 qwen3:4b），并在「模型配置」中保存。"
+                : "请检查「模型配置」中该 Provider 下是否已添加并保存该模型。";
+            throw new Error(`未找到模型 ${provider}/${modelId}。${hint}`);
+        }
         this.sessions.set(compositeKey, session);
         this.sessionLastActiveAt.set(compositeKey, now);
         return session;

package/dist/core/agent/proxy/adapters/claude-code-adapter.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ import type { IAgentProxyAdapter } from "../types.js";
2	+ export declare const claudeCodeAdapter: IAgentProxyAdapter;