npm - @next-open-ai/openbot - Versions diffs - 0.2.8 → 0.6.6 - Mend

@next-open-ai/openbot 0.2.8 → 0.6.6

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 (94) hide show

package/README.md +13 -3
package/apps/desktop/renderer/dist/assets/index-BNuvb6Ay.css +10 -0
package/apps/desktop/renderer/dist/assets/index-DvQjslfT.js +89 -0
package/apps/desktop/renderer/dist/index.html +2 -2
package/dist/core/agent/agent-manager.d.ts +17 -6
package/dist/core/agent/agent-manager.js +62 -25
package/dist/core/agent/run.js +2 -2
package/dist/core/config/desktop-config.d.ts +17 -0
package/dist/core/config/desktop-config.js +23 -1
package/dist/core/installer/index.d.ts +1 -1
package/dist/core/installer/index.js +1 -1
package/dist/core/installer/skill-installer.d.ts +9 -0
package/dist/core/installer/skill-installer.js +94 -0
package/dist/core/mcp/adapter.d.ts +17 -0
package/dist/core/mcp/adapter.js +49 -0
package/dist/core/mcp/client.d.ts +24 -0
package/dist/core/mcp/client.js +70 -0
package/dist/core/mcp/config.d.ts +22 -0
package/dist/core/mcp/config.js +69 -0
package/dist/core/mcp/index.d.ts +18 -0
package/dist/core/mcp/index.js +20 -0
package/dist/core/mcp/operator.d.ts +15 -0
package/dist/core/mcp/operator.js +72 -0
package/dist/core/mcp/transport/index.d.ts +11 -0
package/dist/core/mcp/transport/index.js +16 -0
package/dist/core/mcp/transport/sse.d.ts +20 -0
package/dist/core/mcp/transport/sse.js +82 -0
package/dist/core/mcp/transport/stdio.d.ts +32 -0
package/dist/core/mcp/transport/stdio.js +132 -0
package/dist/core/mcp/types.d.ts +72 -0
package/dist/core/mcp/types.js +5 -0
package/dist/core/session-current-agent.d.ts +34 -0
package/dist/core/session-current-agent.js +32 -0
package/dist/core/tools/bookmark-tool.d.ts +9 -0
package/dist/core/tools/bookmark-tool.js +118 -0
package/dist/core/tools/create-agent-tool.d.ts +6 -0
package/dist/core/tools/create-agent-tool.js +97 -0
package/dist/core/tools/index.d.ts +4 -0
package/dist/core/tools/index.js +4 -0
package/dist/core/tools/list-agents-tool.d.ts +5 -0
package/dist/core/tools/list-agents-tool.js +45 -0
package/dist/core/tools/switch-agent-tool.d.ts +6 -0
package/dist/core/tools/switch-agent-tool.js +54 -0
package/dist/gateway/channel/adapters/feishu.d.ts +11 -0
package/dist/gateway/channel/adapters/feishu.js +218 -0
package/dist/gateway/channel/channel-core.d.ts +9 -0
package/dist/gateway/channel/channel-core.js +127 -0
package/dist/gateway/channel/registry.d.ts +16 -0
package/dist/gateway/channel/registry.js +54 -0
package/dist/gateway/channel/run-agent.d.ts +26 -0
package/dist/gateway/channel/run-agent.js +137 -0
package/dist/gateway/channel/session-persistence.d.ts +36 -0
package/dist/gateway/channel/session-persistence.js +46 -0
package/dist/gateway/channel/types.d.ts +70 -0
package/dist/gateway/channel/types.js +4 -0
package/dist/gateway/channel-handler.d.ts +3 -4
package/dist/gateway/channel-handler.js +8 -2
package/dist/gateway/methods/agent-chat.js +31 -12
package/dist/gateway/methods/install-skill-from-upload.d.ts +14 -0
package/dist/gateway/methods/install-skill-from-upload.js +13 -0
package/dist/gateway/methods/run-scheduled-task.js +5 -2
package/dist/gateway/server.js +74 -1
package/dist/server/agent-config/agent-config.controller.d.ts +6 -1
package/dist/server/agent-config/agent-config.service.d.ts +15 -1
package/dist/server/agent-config/agent-config.service.js +12 -3
package/dist/server/agents/agents.controller.d.ts +10 -0
package/dist/server/agents/agents.controller.js +36 -4
package/dist/server/agents/agents.gateway.js +18 -4
package/dist/server/agents/agents.service.d.ts +5 -1
package/dist/server/agents/agents.service.js +20 -2
package/dist/server/app.module.js +2 -0
package/dist/server/config/config.controller.d.ts +2 -0
package/dist/server/config/config.service.d.ts +3 -0
package/dist/server/config/config.service.js +3 -1
package/dist/server/database/database.service.d.ts +7 -0
package/dist/server/database/database.service.js +54 -5
package/dist/server/saved-items/saved-items.controller.d.ts +57 -0
package/dist/server/saved-items/saved-items.controller.js +229 -0
package/dist/server/saved-items/saved-items.module.d.ts +2 -0
package/dist/server/saved-items/saved-items.module.js +25 -0
package/dist/server/saved-items/saved-items.service.d.ts +31 -0
package/dist/server/saved-items/saved-items.service.js +105 -0
package/dist/server/saved-items/tags.controller.d.ts +30 -0
package/dist/server/saved-items/tags.controller.js +85 -0
package/dist/server/saved-items/tags.service.d.ts +24 -0
package/dist/server/saved-items/tags.service.js +84 -0
package/dist/server/skills/skills.service.d.ts +2 -0
package/dist/server/skills/skills.service.js +80 -16
package/dist/server/workspace/workspace.service.d.ts +11 -0
package/dist/server/workspace/workspace.service.js +40 -1
package/package.json +6 -1
package/skills/url-bookmark/SKILL.md +36 -0
package/apps/desktop/renderer/dist/assets/index-BOS-F8a4.js +0 -89
package/apps/desktop/renderer/dist/assets/index-DxqxayUL.css +0 -10

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-BOS-F8a4.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/index-DxqxayUL.css">
+  <script type="module" crossorigin src="/assets/index-DvQjslfT.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/index-BNuvb6Ay.css">
 </head>
 <body>

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

@@ -1,4 +1,5 @@
 import type { AgentSession } from "@mariozechner/pi-coding-agent";
+import type { McpServerConfig } from "../mcp/index.js";
 import type { Skill } from "./skills.js";
 export interface AgentManagerOptions {
     agentDir?: string;
@@ -41,21 +42,31 @@ export declare class AgentManager {
     private resolveSkillPaths;
     /**
      * Get or create an agent session.
-     * @param options.workspace 该会话绑定的工作区名（来自 agent 配置），不传则用 default，创建时 cwd/技能路径依此
-     * @param options.provider / options.modelId 来自 agent 配置的大模型，不传则用环境变量默认
-     * @param options.maxSessions 若提供且当前 session 数 >= 该值，会先淘汰最后调用时间最早的 session 再创建新的
-     * @param options.targetAgentId 创建时绑定到 install_skill 工具，用于安装目标（具体 agentId 或 global）
+     * 缓存 key 为 sessionId + "::" + agentId，同一业务 session 下可切换 agent 且各自保留上下文。
+     * @param sessionId 业务会话 ID（桌面 UUID 或 channel:feishu:threadId 等）
+     * @param options.agentId 当前使用的 agent，与 sessionId 组成复合 key，必传或默认 "default"
+     * @param options.workspace 该会话绑定的工作区名（来自 agent 配置）
+     * @param options.maxSessions 若提供且当前 session 数 >= 该值，按 LRU 淘汰
+     * @param options.targetAgentId 创建时绑定到 install_skill 工具
      */
     getOrCreateSession(sessionId: string, options?: {
+        agentId?: string;
         workspace?: string;
         provider?: string;
         modelId?: string;
         apiKey?: string;
         maxSessions?: number;
         targetAgentId?: string;
+        mcpServers?: McpServerConfig[];
+        /** 自定义系统提示词（来自 agent 配置），会与技能等一起组成最终 systemPrompt */
+        systemPrompt?: string;
     }): Promise<AgentSession>;
-    getSession(sessionId: string): AgentSession | undefined;
-    deleteSession(sessionId: string): boolean;
+    /** 按复合 key 获取（key = sessionId + "::" + agentId） */
+    getSession(compositeKey: string): AgentSession | undefined;
+    /** 删除一个 Agent Session（传入复合 key） */
+    deleteSession(compositeKey: string): boolean;
+    /** 按业务 sessionId 删除该会话下所有 agent 的 Core Session（如删除会话时） */
+    deleteSessionsByBusinessId(sessionId: string): void;
     clearAll(): void;
 }
 export declare const agentManager: AgentManager;

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

@@ -3,7 +3,13 @@ import { join } from "node:path";
 import { existsSync, mkdirSync } from "node:fs";
 import { createCompactionMemoryExtensionFactory } from "../memory/compaction-extension.js";
 import { getCompactionContextForSystemPrompt } from "../memory/index.js";
-import { createBrowserTool, createSaveExperienceTool, createInstallSkillTool } from "../tools/index.js";
+import { createBrowserTool, createSaveExperienceTool, createInstallSkillTool, createSwitchAgentTool, createListAgentsTool, createCreateAgentTool, createGetBookmarkTagsTool, createSaveBookmarkTool } from "../tools/index.js";
+/** Agent Session 缓存 key：sessionId + "::" + agentId，同一业务 session 下不同 agent 各自一个 Core Session */
+const COMPOSITE_KEY_SEP = "::";
+function toCompositeKey(sessionId, agentId) {
+    return sessionId + COMPOSITE_KEY_SEP + 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 { formatSkillsForPrompt } from "./skills.js";
@@ -100,7 +106,7 @@ For downloads, provide either a direct URL or a selector to click.`;
         const systemPrompt = this.buildSystemPrompt(loadedSkills);
         return { systemPrompt, skills: loadedSkills };
     }
-    createResourceLoader(workspaceDir, sessionId, compactionBlock) {
+    createResourceLoader(workspaceDir, sessionId, compactionBlock, customAgentPrompt, identity) {
         const loader = new DefaultResourceLoader({
             cwd: workspaceDir,
             agentDir: this.agentDir,
@@ -109,11 +115,18 @@ For downloads, provide either a direct URL or a selector to click.`;
             extensionFactories: sessionId ? [createCompactionMemoryExtensionFactory(sessionId)] : [],
             systemPromptOverride: (base) => {
                 const loadedSkills = loader.getSkills().skills;
-                let customPrompt = this.buildSystemPrompt(loadedSkills);
+                let basePrompt = this.buildSystemPrompt(loadedSkills);
+                const withCustom = customAgentPrompt && customAgentPrompt.trim()
+                    ? customAgentPrompt.trim() + "\n\n" + basePrompt
+                    : basePrompt;
+                const withIdentity = identity && identity.agentId
+                    ? `[Session identity] You are the agent with ID: ${identity.agentId}, workspace: ${identity.workspace || identity.agentId}. When asked which agent you are, answer according to this identity.\n\n` +
+                        withCustom
+                    : withCustom;
                 if (compactionBlock?.trim()) {
-                    customPrompt = customPrompt + "\n\n" + compactionBlock.trim();
+                    return withIdentity + "\n\n" + compactionBlock.trim();
                 }
-                return customPrompt;
+                return withIdentity;
             },
         });
         return loader;
@@ -143,16 +156,20 @@ For downloads, provide either a direct URL or a selector to click.`;
     }
     /**
      * Get or create an agent session.
-     * @param options.workspace 该会话绑定的工作区名（来自 agent 配置），不传则用 default，创建时 cwd/技能路径依此
-     * @param options.provider / options.modelId 来自 agent 配置的大模型，不传则用环境变量默认
-     * @param options.maxSessions 若提供且当前 session 数 >= 该值，会先淘汰最后调用时间最早的 session 再创建新的
-     * @param options.targetAgentId 创建时绑定到 install_skill 工具，用于安装目标（具体 agentId 或 global）
+     * 缓存 key 为 sessionId + "::" + agentId，同一业务 session 下可切换 agent 且各自保留上下文。
+     * @param sessionId 业务会话 ID（桌面 UUID 或 channel:feishu:threadId 等）
+     * @param options.agentId 当前使用的 agent，与 sessionId 组成复合 key，必传或默认 "default"
+     * @param options.workspace 该会话绑定的工作区名（来自 agent 配置）
+     * @param options.maxSessions 若提供且当前 session 数 >= 该值，按 LRU 淘汰
+     * @param options.targetAgentId 创建时绑定到 install_skill 工具
      */
     async getOrCreateSession(sessionId, options = {}) {
+        const agentId = options.agentId ?? "default";
+        const compositeKey = toCompositeKey(sessionId, agentId);
         const now = Date.now();
-        if (this.sessions.has(sessionId)) {
-            this.sessionLastActiveAt.set(sessionId, now);
-            return this.sessions.get(sessionId);
+        if (this.sessions.has(compositeKey)) {
+            this.sessionLastActiveAt.set(compositeKey, now);
+            return this.sessions.get(compositeKey);
         }
         const { maxSessions } = options;
         if (typeof maxSessions === "number" && maxSessions > 0 && this.sessions.size >= maxSessions) {
@@ -222,7 +239,7 @@ For downloads, provide either a direct URL or a selector to click.`;
             return process.env.OPENAI_API_KEY;
         });
         const compactionBlock = await getCompactionContextForSystemPrompt(sessionId);
-        const loader = this.createResourceLoader(sessionWorkspaceDir, sessionId, compactionBlock);
+        const loader = this.createResourceLoader(sessionWorkspaceDir, sessionId, compactionBlock, options.systemPrompt, { agentId, workspace: workspaceName });
         await loader.reload();
         const coreTools = {
             read: createReadTool(sessionWorkspaceDir),
@@ -233,6 +250,18 @@ For downloads, provide either a direct URL or a selector to click.`;
             grep: createGrepTool(sessionWorkspaceDir),
             ls: createLsTool(sessionWorkspaceDir),
         };
+        const mcpTools = await createMcpToolsForSession({ mcpServers: options.mcpServers });
+        const customTools = [
+            createBrowserTool(sessionWorkspaceDir),
+            createSaveExperienceTool(sessionId),
+            createInstallSkillTool(options.targetAgentId ?? agentId),
+            createSwitchAgentTool(sessionId),
+            createListAgentsTool(),
+            createCreateAgentTool(),
+            createGetBookmarkTagsTool(),
+            createSaveBookmarkTool(),
+            ...mcpTools,
+        ];
         const { session } = await createAgentSession({
             agentDir: this.agentDir,
             sessionManager: CoreSessionManager.inMemory(),
@@ -240,11 +269,7 @@ For downloads, provide either a direct URL or a selector to click.`;
             modelRegistry,
             cwd: sessionWorkspaceDir,
             resourceLoader: loader,
-            customTools: [
-                createBrowserTool(sessionWorkspaceDir),
-                createSaveExperienceTool(sessionId),
-                createInstallSkillTool(options.targetAgentId),
-            ],
+            customTools,
             baseToolsOverride: coreTools,
         });
         const model = modelRegistry.find(provider, modelId);
@@ -252,16 +277,28 @@ 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);
         }
-        this.sessions.set(sessionId, session);
-        this.sessionLastActiveAt.set(sessionId, now);
+        this.sessions.set(compositeKey, session);
+        this.sessionLastActiveAt.set(compositeKey, now);
         return session;
     }
-    getSession(sessionId) {
-        return this.sessions.get(sessionId);
+    /** 按复合 key 获取（key = sessionId + "::" + agentId） */
+    getSession(compositeKey) {
+        return this.sessions.get(compositeKey);
+    }
+    /** 删除一个 Agent Session（传入复合 key） */
+    deleteSession(compositeKey) {
+        this.sessionLastActiveAt.delete(compositeKey);
+        return this.sessions.delete(compositeKey);
     }
-    deleteSession(sessionId) {
-        this.sessionLastActiveAt.delete(sessionId);
-        return this.sessions.delete(sessionId);
+    /** 按业务 sessionId 删除该会话下所有 agent 的 Core Session（如删除会话时） */
+    deleteSessionsByBusinessId(sessionId) {
+        const prefix = sessionId + COMPOSITE_KEY_SEP;
+        for (const key of Array.from(this.sessions.keys())) {
+            if (key.startsWith(prefix)) {
+                this.sessionLastActiveAt.delete(key);
+                this.sessions.delete(key);
+            }
+        }
     }
     clearAll() {
         this.sessions.clear();

package/dist/core/agent/run.js CHANGED Viewed

@@ -17,6 +17,7 @@ export async function run(options) {
     // Create a temporary session for this run
     const sessionId = `cli-${Date.now()}`;
     const session = await manager.getOrCreateSession(sessionId, {
+        agentId: "default",
         provider,
         modelId,
         apiKey,
@@ -58,8 +59,7 @@ export async function run(options) {
     });
     // Send prompt and wait for completion
     await session.prompt(userPrompt);
-    // Clean up session
-    manager.deleteSession(sessionId);
+    manager.deleteSession(sessionId + "::" + "default");
     result.assistantContent = assistantContent.trim();
     return result;
 }

package/dist/core/config/desktop-config.d.ts CHANGED Viewed

@@ -7,6 +7,17 @@ export interface RagEmbeddingConfig {
     apiKey?: string;
     baseUrl?: string;
 }
+/** 通道配置：各 IM 通道的 token、key 等，与设置页「通道配置」一致 */
+export interface ChannelsConfig {
+    feishu?: {
+        enabled?: boolean;
+        appId?: string;
+        appSecret?: string;
+        defaultAgentId?: string;
+    };
+}
+/** MCP 服务器配置（与 core/mcp 类型一致，避免 core/config 依赖 core/mcp 实现） */
+export type DesktopMcpServerConfig = import("../mcp/index.js").McpServerConfig;
 /**
  * 同步读取桌面全局配置中的 maxAgentSessions 等。
  * Gateway 进程内使用，用于会话上限等。
@@ -14,6 +25,8 @@ export interface RagEmbeddingConfig {
 export declare function getDesktopConfig(): {
     maxAgentSessions: number;
 };
+/** 同步读取通道配置（Gateway 启动时用） */
+export declare function getChannelsConfigSync(): ChannelsConfig;
 /** 同步读取 RAG embedding 配置；未配置或无效时返回 null，长记忆将空转 */
 export declare function getRagEmbeddingConfigSync(): RagEmbeddingConfig | null;
 export interface DesktopAgentConfig {
@@ -22,6 +35,10 @@ export interface DesktopAgentConfig {
     apiKey?: string;
     /** 工作区名，来自 agents.json 的 agent.workspace 或 agent.id */
     workspace?: string;
+    /** MCP 服务器配置，创建 Session 时传入 */
+    mcpServers?: DesktopMcpServerConfig[];
+    /** 自定义系统提示词，会与技能等一起组成最终 systemPrompt */
+    systemPrompt?: string;
 }
 /**
  * 从 config.json 读取缺省智能体 id（defaultAgentId）。

package/dist/core/config/desktop-config.js CHANGED Viewed

@@ -43,6 +43,20 @@ export function getDesktopConfig() {
         return { maxAgentSessions: DEFAULT_MAX_AGENT_SESSIONS };
     }
 }
+/** 同步读取通道配置（Gateway 启动时用） */
+export function getChannelsConfigSync() {
+    try {
+        const configPath = getConfigPath();
+        if (!existsSync(configPath))
+            return {};
+        const content = readFileSync(configPath, "utf-8");
+        const data = JSON.parse(content);
+        return data.channels ?? {};
+    }
+    catch {
+        return {};
+    }
+}
 /** 同步读取 RAG embedding 配置；未配置或无效时返回 null，长记忆将空转 */
 export function getRagEmbeddingConfigSync() {
     try {
@@ -145,6 +159,8 @@ export async function loadDesktopAgentConfig(agentId) {
         }
     }
     let workspaceName = resolvedAgentId;
+    let mcpServers;
+    let systemPrompt;
     if (existsSync(agentsPath)) {
         try {
             const raw = await readFile(agentsPath, "utf-8");
@@ -156,6 +172,12 @@ export async function loadDesktopAgentConfig(agentId) {
                     workspaceName = agent.workspace;
                 else if (agent.id)
                     workspaceName = agent.id;
+                if (agent.mcpServers && Array.isArray(agent.mcpServers)) {
+                    mcpServers = agent.mcpServers;
+                }
+                if (agent.systemPrompt && typeof agent.systemPrompt === "string") {
+                    systemPrompt = agent.systemPrompt.trim();
+                }
                 if (agent.modelItemCode && Array.isArray(config.configuredModels)) {
                     const configured = config.configuredModels.find((m) => m.modelItemCode === agent.modelItemCode);
                     if (configured) {
@@ -185,7 +207,7 @@ export async function loadDesktopAgentConfig(agentId) {
     const apiKey = provConfig?.apiKey && typeof provConfig.apiKey === "string" && provConfig.apiKey.trim()
         ? provConfig.apiKey.trim()
         : undefined;
-    return { provider, model, apiKey: apiKey ?? undefined, workspace: workspaceName };
+    return { provider, model, apiKey: apiKey ?? undefined, workspace: workspaceName, mcpServers, systemPrompt };
 }
 function ensureDesktopDir() {
     const desktopDir = getDesktopDir();

package/dist/core/installer/index.d.ts CHANGED Viewed

	@@ -1 +1 @@
1	- export { resolveInstallTarget, installSkillByUrl, installSkillFromPath, type InstallByUrlOptions, type InstallByUrlResult, type InstallFromPathOptions, type InstallFromPathResult, } from "./skill-installer.js";
1	+ export { resolveInstallTarget, installSkillByUrl, installSkillFromPath, installSkillFromUpload, type InstallByUrlOptions, type InstallByUrlResult, type InstallFromPathOptions, type InstallFromPathResult, type InstallFromUploadOptions, } from "./skill-installer.js";

package/dist/core/installer/index.js CHANGED Viewed

	@@ -1 +1 @@
1	- export { resolveInstallTarget, installSkillByUrl, installSkillFromPath, } from "./skill-installer.js";
1	+ export { resolveInstallTarget, installSkillByUrl, installSkillFromPath, installSkillFromUpload, } from "./skill-installer.js";

package/dist/core/installer/skill-installer.d.ts CHANGED Viewed

@@ -28,3 +28,12 @@ export interface InstallFromPathResult {
  * 从本地目录安装技能：将指定目录复制到目标 skills 目录。
  */
 export declare function installSkillFromPath(localPath: string, options?: InstallFromPathOptions): Promise<InstallFromPathResult>;
+export interface InstallFromUploadOptions {
+    scope: "global" | "workspace";
+    workspace?: string;
+}
+/**
+ * 从上传的 zip 安装技能：解压到临时目录，校验为单个技能目录（含 SKILL.md），再复制到目标。
+ * 支持两种 zip 结构：① 单个顶层目录且内含 SKILL.md；② 根目录直接含 SKILL.md（将视为技能根目录）。
+ */
+export declare function installSkillFromUpload(zipBuffer: Buffer, options?: InstallFromUploadOptions): Promise<InstallFromPathResult>;

package/dist/core/installer/skill-installer.js CHANGED Viewed

@@ -7,6 +7,7 @@ import { existsSync } from "fs";
 import { join, resolve, basename } from "path";
 import { tmpdir } from "os";
 import { randomUUID } from "crypto";
+import AdmZip from "adm-zip";
 import { exec } from "child_process";
 import { promisify } from "util";
 import { homedir } from "os";
@@ -119,3 +120,96 @@ export async function installSkillFromPath(localPath, options = { scope: "global
     await cp(srcResolved, destPath, { recursive: true });
     return { installDir: targetDir, name: baseName };
 }
+/** 上传 zip 包最大体积（字节） */
+const MAX_UPLOAD_ZIP_BYTES = 10 * 1024 * 1024;
+/** 解压后忽略的条目（系统/打包产生的噪音） */
+const IGNORED_ZIP_ENTRIES = new Set(["__MACOSX", ".DS_Store", ".git", "Thumbs.db"]);
+function isIgnoredZipEntry(name) {
+    if (!name || name.includes(".."))
+        return true;
+    if (IGNORED_ZIP_ENTRIES.has(name))
+        return true;
+    if (name.startsWith("."))
+        return true;
+    return false;
+}
+/**
+ * 从上传的 zip 安装技能：解压到临时目录，校验为单个技能目录（含 SKILL.md），再复制到目标。
+ * 支持两种 zip 结构：① 单个顶层目录且内含 SKILL.md；② 根目录直接含 SKILL.md（将视为技能根目录）。
+ */
+export async function installSkillFromUpload(zipBuffer, options = { scope: "global", workspace: "default" }) {
+    if (zipBuffer.length > MAX_UPLOAD_ZIP_BYTES) {
+        throw new Error("zip 包不能超过 10MB");
+    }
+    const tempDir = join(tmpdir(), `openbot-upload-${randomUUID()}`);
+    try {
+        await mkdir(tempDir, { recursive: true });
+        const zip = new AdmZip(zipBuffer);
+        zip.extractAllTo(tempDir, true);
+        const allEntries = await readdir(tempDir);
+        const entries = allEntries.filter((e) => !isIgnoredZipEntry(e));
+        let skillPath;
+        if (entries.length === 0) {
+            throw new Error("zip 解压后未得到有效内容，请检查 zip 是否包含技能目录或 SKILL.md");
+        }
+        if (entries.length === 1) {
+            const singleName = entries[0];
+            const candidatePath = join(tempDir, singleName);
+            const statEntry = await stat(candidatePath);
+            if (statEntry.isDirectory()) {
+                const skillMdInDir = join(candidatePath, "SKILL.md");
+                if (existsSync(skillMdInDir)) {
+                    skillPath = candidatePath;
+                }
+                else {
+                    throw new Error("该目录下未找到 SKILL.md，请确保 zip 内技能目录根目录含有 SKILL.md 文件");
+                }
+            }
+            else {
+                if (existsSync(join(tempDir, "SKILL.md"))) {
+                    throw new Error("zip 根目录含有 SKILL.md，但根目录下还有其它文件，请将整个技能放在一个子目录内再打包");
+                }
+                throw new Error("zip 内未找到包含 SKILL.md 的技能目录，请检查打包方式");
+            }
+        }
+        else {
+            const skillMdAtRoot = existsSync(join(tempDir, "SKILL.md"));
+            const dirsWithSkillMd = [];
+            for (const e of entries) {
+                const p = join(tempDir, e);
+                const st = await stat(p).catch(() => null);
+                if (st?.isDirectory() && existsSync(join(p, "SKILL.md")))
+                    dirsWithSkillMd.push(p);
+            }
+            if (dirsWithSkillMd.length === 1) {
+                skillPath = dirsWithSkillMd[0];
+            }
+            else if (dirsWithSkillMd.length > 1) {
+                throw new Error("zip 内包含多个技能目录，请只保留一个技能目录再打包");
+            }
+            else if (skillMdAtRoot) {
+                skillPath = tempDir;
+            }
+            else {
+                throw new Error("zip 内未找到包含 SKILL.md 的技能目录；若为多文件打包，请将 SKILL.md 放在 zip 根目录或单个子目录内");
+            }
+        }
+        if (skillPath === tempDir) {
+            const baseName = "skill";
+            const wrappedDir = join(tmpdir(), `openbot-skill-wrap-${randomUUID()}`);
+            try {
+                await mkdir(wrappedDir, { recursive: true });
+                const destPath = join(wrappedDir, baseName);
+                await cp(tempDir, destPath, { recursive: true });
+                return await installSkillFromPath(destPath, options);
+            }
+            finally {
+                await rm(wrappedDir, { recursive: true, force: true }).catch(() => { });
+            }
+        }
+        return await installSkillFromPath(skillPath, options);
+    }
+    finally {
+        await rm(tempDir, { recursive: true, force: true }).catch(() => { });
+    }
+}

package/dist/core/mcp/adapter.d.ts ADDED Viewed

@@ -0,0 +1,17 @@
+/**
+ * MCP Tool 转为 pi-coding-agent ToolDefinition 的适配层。
+ */
+import type { ToolDefinition } from "@mariozechner/pi-coding-agent";
+import type { McpTool } from "./types.js";
+import type { McpClient } from "./client.js";
+/**
+ * 将单个 MCP 工具封装为 pi-coding-agent 的 ToolDefinition。
+ * @param tool MCP tools/list 返回的项
+ * @param client 已连接的 McpClient，用于 callTool
+ * @param serverId 可选前缀，用于避免多 MCP 时工具名冲突
+ */
+export declare function mcpToolToToolDefinition(tool: McpTool, client: McpClient, serverId?: string): ToolDefinition;
+/**
+ * 将某 MCP 客户端的全部工具转为 ToolDefinition 数组。
+ */
+export declare function mcpToolsToToolDefinitions(tools: McpTool[], client: McpClient, serverId?: string): ToolDefinition[];

package/dist/core/mcp/adapter.js ADDED Viewed

@@ -0,0 +1,49 @@
+/**
+ * MCP Tool 转为 pi-coding-agent ToolDefinition 的适配层。
+ */
+import { Type } from "@sinclair/typebox";
+/** 通用参数：MCP 工具接受任意 JSON 对象作为 arguments */
+const McpToolParamsSchema = Type.Record(Type.String(), Type.Any());
+/**
+ * 将单个 MCP 工具封装为 pi-coding-agent 的 ToolDefinition。
+ * @param tool MCP tools/list 返回的项
+ * @param client 已连接的 McpClient，用于 callTool
+ * @param serverId 可选前缀，用于避免多 MCP 时工具名冲突
+ */
+export function mcpToolToToolDefinition(tool, client, serverId) {
+    const name = serverId ? `${serverId}_${tool.name}` : tool.name;
+    const description = (tool.description ?? "").trim() || `MCP tool: ${tool.name}`;
+    return {
+        name,
+        label: tool.name,
+        description,
+        parameters: McpToolParamsSchema,
+        execute: async (_toolCallId, params, _signal, _onUpdate, _ctx) => {
+            const args = params && typeof params === "object" ? params : {};
+            try {
+                const result = await client.callTool(tool.name, args);
+                const text = result.content
+                    ?.filter((c) => c.type === "text")
+                    .map((c) => c.text)
+                    .join("\n") ?? (result.isError ? "MCP 调用返回错误" : "");
+                return {
+                    content: [{ type: "text", text }],
+                    details: result.isError ? { isError: true } : undefined,
+                };
+            }
+            catch (err) {
+                const msg = err instanceof Error ? err.message : String(err);
+                return {
+                    content: [{ type: "text", text: `MCP 调用失败: ${msg}` }],
+                    details: undefined,
+                };
+            }
+        },
+    };
+}
+/**
+ * 将某 MCP 客户端的全部工具转为 ToolDefinition 数组。
+ */
+export function mcpToolsToToolDefinitions(tools, client, serverId) {
+    return tools.map((t) => mcpToolToToolDefinition(t, client, serverId));
+}

package/dist/core/mcp/client.d.ts ADDED Viewed

@@ -0,0 +1,24 @@
+/**
+ * MCP 客户端：连接、list_tools、call_tool、断开。
+ * 支持 stdio（本地进程）与 sse（远程 HTTP）两种传输。
+ */
+import type { McpTool, McpToolCallResult, IMcpTransport } from "./types.js";
+import type { McpServerConfig } from "./types.js";
+export interface McpClientOptions {
+    initTimeoutMs?: number;
+    requestTimeoutMs?: number;
+}
+export declare class McpClient {
+    private transport;
+    private _tools;
+    private _requestId;
+    constructor(configOrTransport: McpServerConfig | IMcpTransport, options?: McpClientOptions);
+    /** 建立连接并完成握手；成功后可使用 listTools / callTool */
+    connect(): Promise<void>;
+    /** 获取工具列表（会缓存；断开重连后需重新 list） */
+    listTools(): Promise<McpTool[]>;
+    /** 调用指定工具 */
+    callTool(name: string, args: Record<string, unknown>): Promise<McpToolCallResult>;
+    close(): Promise<void>;
+    get isConnected(): boolean;
+}

package/dist/core/mcp/client.js ADDED Viewed

@@ -0,0 +1,70 @@
+/**
+ * MCP 客户端：连接、list_tools、call_tool、断开。
+ * 支持 stdio（本地进程）与 sse（远程 HTTP）两种传输。
+ */
+import { createTransport } from "./transport/index.js";
+export class McpClient {
+    transport;
+    _tools = null;
+    _requestId = 0;
+    constructor(configOrTransport, options = {}) {
+        if (typeof configOrTransport.request === "function" &&
+            typeof configOrTransport.start === "function") {
+            this.transport = configOrTransport;
+        }
+        else {
+            this.transport = createTransport(configOrTransport, {
+                initTimeoutMs: options.initTimeoutMs,
+                requestTimeoutMs: options.requestTimeoutMs,
+            });
+        }
+    }
+    /** 建立连接并完成握手；成功后可使用 listTools / callTool */
+    async connect() {
+        await this.transport.start();
+    }
+    /** 获取工具列表（会缓存；断开重连后需重新 list） */
+    async listTools() {
+        if (this._tools !== null) {
+            return this._tools;
+        }
+        const res = await this.transport.request({
+            jsonrpc: "2.0",
+            id: ++this._requestId,
+            method: "tools/list",
+        });
+        if (res.error) {
+            throw new Error(`MCP tools/list failed: ${res.error.message}`);
+        }
+        const list = res.result?.tools;
+        this._tools = Array.isArray(list) ? list : [];
+        return this._tools;
+    }
+    /** 调用指定工具 */
+    async callTool(name, args) {
+        const res = await this.transport.request({
+            jsonrpc: "2.0",
+            id: ++this._requestId,
+            method: "tools/call",
+            params: { name, arguments: args ?? {} },
+        });
+        if (res.error) {
+            return {
+                content: [{ type: "text", text: `MCP call_tool error: ${res.error.message}` }],
+                isError: true,
+            };
+        }
+        const result = res.result;
+        if (!result || !Array.isArray(result.content)) {
+            return { content: [{ type: "text", text: "Invalid MCP tools/call result" }], isError: true };
+        }
+        return result;
+    }
+    async close() {
+        this._tools = null;
+        await this.transport.close();
+    }
+    get isConnected() {
+        return this.transport.isConnected;
+    }
+}

package/dist/core/mcp/config.d.ts ADDED Viewed

@@ -0,0 +1,22 @@
+/**
+ * MCP 配置解析与校验。
+ * 从 getOrCreateSession 的 options.mcpServers 中取出并规范化，支持 stdio 与 sse。
+ */
+import type { McpServerConfig, McpServerConfigStdio, McpServerConfigSse } from "./types.js";
+/**
+ * 从会话选项里解析出本会话启用的 MCP 服务器配置列表。
+ * 支持 stdio（本地进程）与 sse（远程 HTTP）。
+ */
+export declare function resolveMcpServersForSession(mcpServers: McpServerConfig[] | undefined): McpServerConfig[];
+/**
+ * 为 stdio 配置生成缓存键（用于 Operator 复用同一进程连接）
+ */
+export declare function stdioConfigKey(config: McpServerConfigStdio): string;
+/**
+ * 为 sse 配置生成缓存键
+ */
+export declare function sseConfigKey(config: McpServerConfigSse): string;
+/**
+ * 任意 MCP 配置的缓存键
+ */
+export declare function mcpConfigKey(config: McpServerConfig): string;