aws-runtime-bridge 1.1.11 → 1.2.1

package/dist/adapters/cc-switch/common.d.ts

@@ -30,7 +30,7 @@ export interface OpenCodeConfig {
 }
 export type ClaudecodeLocalServer = OpenCodeLocalServer;
 export type ClaudecodeRemoteServer = OpenCodeRemoteServer;
-export type ClaudecodeServer = OpenCodeServer;
+export type ClaudecodeServer = McpServerSpec;
 export interface ClaudecodeConfig {
     mcpServers?: Record<string, ClaudecodeServer>;
     [key: string]: unknown;

package/dist/adapters/cc-switch/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/common.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEtE,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD,MAAM,WAAW,YAAY;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC3C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,cAAc,GAAG,mBAAmB,GAAG,oBAAoB,CAAC;AAExE,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC5C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAGD,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AACxD,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AAC1D,MAAM,MAAM,gBAAgB,GAAG,cAAc,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC9C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,cAAc,GAAG,aAAa,CAiB1E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,cAAc,CAoBrE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,KAAK,GACX,SAAS,CAQX;AAGD,eAAO,MAAM,uBAAuB,8BAAwB,CAAC;AAC7D,eAAO,MAAM,kBAAkB,yBAAmB,CAAC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/common.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEtE,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEjD,MAAM,WAAW,YAAY;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC3C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,MAAM,cAAc,GAAG,mBAAmB,GAAG,oBAAoB,CAAC;AAExE,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC5C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAGD,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AACxD,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,CAAC;AAC1D,MAAM,MAAM,gBAAgB,GAAG,aAAa,CAAC;AAE7C,MAAM,WAAW,gBAAgB;IAC/B,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAC9C,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,cAAc,GAAG,aAAa,CAiB1E;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,GAAG,cAAc,CAoBrE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,KAAK,GACX,SAAS,CAQX;AAGD,eAAO,MAAM,uBAAuB,8BAAwB,CAAC;AAC7D,eAAO,MAAM,kBAAkB,yBAAmB,CAAC"}

package/dist/adapters/cc-switch/index.d.ts

@@ -11,6 +11,7 @@ export { OpenCodeMcpAdapter } from './mcp-opencode.js';
 export { PlaceholderMcpAdapter } from './mcp-placeholder.js';
 export { ClaudeSkillAdapter } from './skill-claude.js';
 export { ClaudecodeSkillAdapter } from './skill-claudecode.js';
+export { CodexSkillAdapter } from './skill-codex.js';
 export { OpenCodeSkillAdapter } from './skill-opencode.js';
 export { PlaceholderSkillAdapter } from './skill-placeholder.js';
 export * from './common.js';

package/dist/adapters/cc-switch/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAYlF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,cAAc,aAAa,CAAC;AAE5B;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAS7E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,CASjF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAWlF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACjE,cAAc,aAAa,CAAC;AAE5B;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,CAS7E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,CASjF"}

package/dist/adapters/cc-switch/index.js

@@ -3,13 +3,12 @@
  *
  * 提供工厂函数创建所有 MCP 和 Skill 适配器实例
  */
-import { ClaudeMcpAdapter } from './mcp-claude.js';
 import { ClaudecodeMcpAdapter } from './mcp-claudecode.js';
 import { CodexMcpAdapter } from './mcp-codex.js';
 import { OpenCodeMcpAdapter } from './mcp-opencode.js';
 import { PlaceholderMcpAdapter } from './mcp-placeholder.js';
-import { ClaudeSkillAdapter } from './skill-claude.js';
 import { ClaudecodeSkillAdapter } from './skill-claudecode.js';
+import { CodexSkillAdapter } from './skill-codex.js';
 import { OpenCodeSkillAdapter } from './skill-opencode.js';
 import { PlaceholderSkillAdapter } from './skill-placeholder.js';
 // 导出所有适配器类
@@ -20,6 +19,7 @@ export { OpenCodeMcpAdapter } from './mcp-opencode.js';
 export { PlaceholderMcpAdapter } from './mcp-placeholder.js';
 export { ClaudeSkillAdapter } from './skill-claude.js';
 export { ClaudecodeSkillAdapter } from './skill-claudecode.js';
+export { CodexSkillAdapter } from './skill-codex.js';
 export { OpenCodeSkillAdapter } from './skill-opencode.js';
 export { PlaceholderSkillAdapter } from './skill-placeholder.js';
 export * from './common.js';
@@ -28,7 +28,7 @@ export * from './common.js';
  */
 export function createMcpAdapters(paths) {
     return {
-        claude: new ClaudeMcpAdapter(paths.claudeConfigFile),
+        claude: new PlaceholderMcpAdapter("claude"),
         claudecode: new ClaudecodeMcpAdapter(paths.claudecodeConfigFile),
         opencode: new OpenCodeMcpAdapter(paths.opencodeConfigFile),
         codex: new CodexMcpAdapter(paths.codexConfigFile),
@@ -41,10 +41,10 @@ export function createMcpAdapters(paths) {
  */
 export function createSkillAdapters(paths) {
     return {
-        claude: new ClaudeSkillAdapter(paths.claudeSkillsDir),
+        claude: new PlaceholderSkillAdapter("claude"),
         claudecode: new ClaudecodeSkillAdapter(paths.claudecodeSkillsDir),
         opencode: new OpenCodeSkillAdapter(paths.opencodeSkillsDir),
-        codex: new PlaceholderSkillAdapter("codex"),
+        codex: new CodexSkillAdapter(paths.codexSkillsDir),
         gemini: new PlaceholderSkillAdapter("gemini"),
         openclaw: new PlaceholderSkillAdapter("openclaw"),
     };

package/dist/adapters/cc-switch/mcp-claudecode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-claudecode.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/mcp-claudecode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAwC7D,qBAAa,oBAAqB,YAAW,WAAW;IAG1C,OAAO,CAAC,QAAQ,CAAC,UAAU;IAFvC,SAAgB,KAAK,EAAG,YAAY,CAAU;gBAEjB,UAAU,EAAE,MAAM;IAEzC,aAAa,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAmBrC,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5C,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CASrD"}
+{"version":3,"file":"mcp-claudecode.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/mcp-claudecode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAuC7D,qBAAa,oBAAqB,YAAW,WAAW;IAG1C,OAAO,CAAC,QAAQ,CAAC,UAAU;IAFvC,SAAgB,KAAK,EAAG,YAAY,CAAU;gBAEjB,UAAU,EAAE,MAAM;IAEzC,aAAa,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAmBrC,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5C,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CASrD"}

package/dist/adapters/cc-switch/mcp-claudecode.js

@@ -3,7 +3,6 @@
  *
  * 实现 IMcpAdapter 接口，负责 ClaudeCode 的 MCP 配置读写
  */
-import { toMcpSpecFromClaudecode, toClaudecodeServer } from './common.js';
 /**
  * JSON 文件读取工具
  */
@@ -49,7 +48,7 @@ export class ClaudecodeMcpAdapter {
         return entries.map(([name, server]) => ({
             id: createId("mcp"),
             name,
-            server: toMcpSpecFromClaudecode(server),
+            server,
             apps: {
                 claude: false,
                 claudecode: true,
@@ -63,7 +62,7 @@ export class ClaudecodeMcpAdapter {
     async syncServer(server) {
         const config = await readJsonFile(this.configPath, {});
         config.mcpServers = config.mcpServers ?? {};
-        config.mcpServers[server.name] = toClaudecodeServer(server.server);
+        config.mcpServers[server.name] = server.server;
         await writeJsonFile(this.configPath, config);
     }
     async removeServer(server) {

package/dist/adapters/cc-switch/mcp-claudecode.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=mcp-claudecode.test.d.ts.map

package/dist/adapters/cc-switch/mcp-claudecode.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-claudecode.test.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/mcp-claudecode.test.ts"],"names":[],"mappings":""}

package/dist/adapters/cc-switch/mcp-claudecode.test.js

@@ -0,0 +1,74 @@
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { ClaudecodeMcpAdapter } from './mcp-claudecode.js';
+let tempDir;
+let configPath;
+function buildServer(name = 'agents-work-studio') {
+    return {
+        id: 'mcp_test',
+        name,
+        server: {
+            type: 'stdio',
+            command: 'cmd',
+            args: ['/c', 'node', 'D:\\code\\AgentsWorkStudio\\aws-runtime-bridge\\package\\aws-client-agent-mcp\\dist\\index.js'],
+            env: {
+                AWS_SERVER_URL: 'ws://localhost:8080/ws/agent',
+            },
+        },
+        apps: {
+            claude: false,
+            claudecode: true,
+            codex: false,
+            gemini: false,
+            opencode: false,
+            openclaw: false,
+        },
+    };
+}
+beforeEach(async () => {
+    tempDir = await mkdtemp(path.join(os.tmpdir(), 'claudecode-mcp-adapter-'));
+    configPath = path.join(tempDir, '.claude.json');
+});
+afterEach(async () => {
+    await rm(tempDir, { recursive: true, force: true });
+});
+describe('ClaudecodeMcpAdapter', () => {
+    it('syncs MCP servers into Claude Code global mcpServers', async () => {
+        const adapter = new ClaudecodeMcpAdapter(configPath);
+        await adapter.syncServer(buildServer());
+        const written = JSON.parse(await readFile(configPath, 'utf-8'));
+        expect(written.mcpServers?.['agents-work-studio']).toMatchObject({
+            type: 'stdio',
+            command: 'cmd',
+            args: ['/c', 'node', 'D:\\code\\AgentsWorkStudio\\aws-runtime-bridge\\package\\aws-client-agent-mcp\\dist\\index.js'],
+            env: {
+                AWS_SERVER_URL: 'ws://localhost:8080/ws/agent',
+            },
+        });
+    });
+    it('removes MCP servers from Claude Code global mcpServers while preserving other settings', async () => {
+        const adapter = new ClaudecodeMcpAdapter(configPath);
+        await writeFile(configPath, JSON.stringify({
+            env: { ANTHROPIC_MODEL: 'test' },
+            mcpServers: {
+                'agents-work-studio': {
+                    command: 'cmd',
+                    args: ['/c', 'node', 'old.js'],
+                    type: 'stdio',
+                },
+                playwright: {
+                    command: 'cmd',
+                    args: ['/c', 'npx', '@playwright/mcp@latest'],
+                    type: 'stdio',
+                },
+            },
+        }), 'utf-8');
+        await adapter.removeServer(buildServer());
+        const written = JSON.parse(await readFile(configPath, 'utf-8'));
+        expect(written.env?.ANTHROPIC_MODEL).toBe('test');
+        expect(written.mcpServers?.['agents-work-studio']).toBeUndefined();
+        expect(written.mcpServers?.playwright).toBeDefined();
+    });
+});

package/dist/adapters/cc-switch/mcp-opencode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-opencode.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/mcp-opencode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAwC7D,qBAAa,kBAAmB,YAAW,WAAW;IAGxC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAFvC,SAAgB,KAAK,EAAG,UAAU,CAAU;gBAEf,UAAU,EAAE,MAAM;IAE/C;;OAEG;IACH,OAAO,CAAC,SAAS;IAUjB;;OAEG;YACW,UAAU;IAQlB,aAAa,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAmBrC,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5C,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAUrD"}
+{"version":3,"file":"mcp-opencode.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/mcp-opencode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAwC7D,qBAAa,kBAAmB,YAAW,WAAW;IAGxC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAFvC,SAAgB,KAAK,EAAG,UAAU,CAAU;gBAEf,UAAU,EAAE,MAAM;IAE/C;;OAEG;IACH,OAAO,CAAC,SAAS;IAMjB;;OAEG;YACW,UAAU;IAQlB,aAAa,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAmBrC,UAAU,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5C,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAUrD"}

package/dist/adapters/cc-switch/mcp-opencode.js

@@ -47,13 +47,9 @@ export class OpenCodeMcpAdapter {
      * 读取 OpenCode MCP 映射，优先使用合法的 mcp 字段，兼容历史错误写入的 mcpServers。
      */
     getMcpMap(config) {
-        if (config.mcp && typeof config.mcp === "object") {
-            return config.mcp;
-        }
-        if (config.mcpServers && typeof config.mcpServers === "object") {
-            return config.mcpServers;
-        }
-        return {};
+        const mcp = config.mcp && typeof config.mcp === "object" ? config.mcp : {};
+        const legacyMcpServers = config.mcpServers && typeof config.mcpServers === "object" ? config.mcpServers : {};
+        return { ...legacyMcpServers, ...mcp };
     }
     /**
      * 将 MCP 服务器写回 OpenCode 配置，只保留合法的 mcp 字段并清理错误的 mcpServers。

package/dist/adapters/cc-switch/mcp-opencode.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=mcp-opencode.test.d.ts.map

package/dist/adapters/cc-switch/mcp-opencode.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-opencode.test.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/mcp-opencode.test.ts"],"names":[],"mappings":""}

package/dist/adapters/cc-switch/mcp-opencode.test.js

@@ -0,0 +1,61 @@
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { OpenCodeMcpAdapter } from './mcp-opencode.js';
+let tempDir;
+let configPath;
+function buildServer(name = 'new-server') {
+    return {
+        id: 'mcp_test',
+        name,
+        server: { type: 'stdio', command: 'node', args: ['server.js'] },
+        apps: {
+            claude: false,
+            claudecode: false,
+            codex: false,
+            gemini: false,
+            opencode: true,
+            openclaw: false,
+        },
+    };
+}
+beforeEach(async () => {
+    tempDir = await mkdtemp(path.join(os.tmpdir(), 'opencode-mcp-adapter-'));
+    configPath = path.join(tempDir, 'opencode.json');
+});
+afterEach(async () => {
+    await rm(tempDir, { recursive: true, force: true });
+});
+describe('OpenCodeMcpAdapter', () => {
+    it('imports both current mcp and legacy mcpServers maps', async () => {
+        await writeFile(configPath, JSON.stringify({
+            mcp: {
+                current: { type: 'local', command: ['node', 'current.js'] },
+            },
+            mcpServers: {
+                legacy: { type: 'remote', url: 'http://legacy.example.com/sse' },
+            },
+        }), 'utf-8');
+        const adapter = new OpenCodeMcpAdapter(configPath);
+        const imported = await adapter.importServers();
+        expect(imported.map((item) => item.name).sort()).toEqual(['current', 'legacy']);
+    });
+    it('writes merged MCP map back to mcp and removes legacy mcpServers', async () => {
+        await writeFile(configPath, JSON.stringify({
+            theme: 'dark',
+            mcpServers: {
+                legacy: { type: 'remote', url: 'http://legacy.example.com/sse' },
+            },
+        }), 'utf-8');
+        const adapter = new OpenCodeMcpAdapter(configPath);
+        await adapter.syncServer(buildServer());
+        const written = JSON.parse(await readFile(configPath, 'utf-8'));
+        expect(written.theme).toBe('dark');
+        expect(written.mcpServers).toBeUndefined();
+        expect(written.mcp).toMatchObject({
+            legacy: { type: 'remote', url: 'http://legacy.example.com/sse' },
+            'new-server': { type: 'local', command: ['node', 'server.js'] },
+        });
+    });
+});

package/dist/adapters/cc-switch/skill-claude.d.ts

@@ -3,13 +3,8 @@
  *
  * 实现 ISkillAdapter 接口，负责 Claude Desktop 的 Skill 目录管理
  */
-import type { ISkillAdapter, InstalledSkill, SkillSyncMethod } from '@cc-switch/sdk';
-export declare class ClaudeSkillAdapter implements ISkillAdapter {
-    private readonly skillsDir;
-    readonly appId: "claude";
+import { DirectorySkillAdapter } from './skill-directory.js';
+export declare class ClaudeSkillAdapter extends DirectorySkillAdapter {
     constructor(skillsDir: string);
-    importSkills(): Promise<Array<Pick<InstalledSkill, "id" | "name" | "directory" | "description">>>;
-    syncSkill(skill: InstalledSkill, sourceDir: string, method: SkillSyncMethod): Promise<void>;
-    removeSkill(skill: InstalledSkill): Promise<void>;
 }
 //# sourceMappingURL=skill-claude.d.ts.map

package/dist/adapters/cc-switch/skill-claude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skill-claude.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/skill-claude.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAoErF,qBAAa,kBAAmB,YAAW,aAAa;IAG1C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAFtC,SAAgB,KAAK,EAAG,QAAQ,CAAU;gBAEb,SAAS,EAAE,MAAM;IAExC,YAAY,IAAI,OAAO,CAC3B,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,CAAC,CAAC,CACzE;IAmBK,SAAS,CACb,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC;IAMV,WAAW,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAKxD"}
+{"version":3,"file":"skill-claude.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/skill-claude.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,qBAAa,kBAAmB,SAAQ,qBAAqB;gBAC/C,SAAS,EAAE,MAAM;CAG9B"}

package/dist/adapters/cc-switch/skill-claude.js

@@ -3,89 +3,9 @@
  *
  * 实现 ISkillAdapter 接口，负责 Claude Desktop 的 Skill 目录管理
  */
-async function ensureDir(dir) {
-    const fs = await import('node:fs/promises');
-    await fs.mkdir(dir, { recursive: true });
-}
-async function removeIfExists(target) {
-    const fs = await import('node:fs/promises');
-    try {
-        await fs.rm(target, { recursive: true, force: true });
-    }
-    catch {
-        // ignore
-    }
-}
-async function copyDir(source, target) {
-    const fs = await import('node:fs/promises');
-    const path = await import('node:path');
-    await ensureDir(target);
-    const entries = await fs.readdir(source, { withFileTypes: true });
-    for (const entry of entries) {
-        const srcPath = path.join(source, entry.name);
-        const tgtPath = path.join(target, entry.name);
-        if (entry.isDirectory()) {
-            await copyDir(srcPath, tgtPath);
-        }
-        else {
-            await fs.copyFile(srcPath, tgtPath);
-        }
-    }
-}
-function toNameFromPath(pathStr) {
-    const base = pathStr.split(/[/\\]/).pop() || pathStr;
-    return base.replace(/\.skill$/, '').replace(/[-_]/g, ' ');
-}
-async function materializeSkillDir(sourceDir, targetDir, method) {
-    const fs = await import('node:fs/promises');
-    const path = await import('node:path');
-    await removeIfExists(targetDir);
-    await ensureDir(path.dirname(targetDir));
-    if (method === "copy") {
-        await copyDir(sourceDir, targetDir);
-        return;
-    }
-    if (method === "symlink") {
-        await fs.symlink(sourceDir, targetDir, "junction");
-        return;
-    }
-    try {
-        await fs.symlink(sourceDir, targetDir, "junction");
-    }
-    catch {
-        await copyDir(sourceDir, targetDir);
-    }
-}
-export class ClaudeSkillAdapter {
+import { DirectorySkillAdapter } from './skill-directory.js';
+export class ClaudeSkillAdapter extends DirectorySkillAdapter {
     constructor(skillsDir) {
-        this.skillsDir = skillsDir;
-        this.appId = "claude";
-    }
-    async importSkills() {
-        const fs = await import('node:fs/promises');
-        const path = await import('node:path');
-        await ensureDir(this.skillsDir);
-        const entries = await fs.readdir(this.skillsDir, { withFileTypes: true });
-        return entries
-            .filter((entry) => entry.isDirectory() || entry.isSymbolicLink())
-            .map((entry) => {
-            const directory = path.join(this.skillsDir, entry.name);
-            return {
-                id: `skill_import_${entry.name}`,
-                name: toNameFromPath(entry.name),
-                directory,
-                description: undefined,
-            };
-        });
-    }
-    async syncSkill(skill, sourceDir, method) {
-        const path = await import('node:path');
-        const targetDir = path.join(this.skillsDir, skill.name);
-        await materializeSkillDir(sourceDir, targetDir, method);
-    }
-    async removeSkill(skill) {
-        const path = await import('node:path');
-        const targetDir = path.join(this.skillsDir, skill.name);
-        await removeIfExists(targetDir);
+        super('claude', skillsDir);
     }
 }

package/dist/adapters/cc-switch/skill-claudecode.d.ts

@@ -3,13 +3,8 @@
  *
  * 实现 ISkillAdapter 接口，负责 ClaudeCode 的 Skill 目录管理
  */
-import type { ISkillAdapter, InstalledSkill, SkillSyncMethod } from '@cc-switch/sdk';
-export declare class ClaudecodeSkillAdapter implements ISkillAdapter {
-    private readonly skillsDir;
-    readonly appId: "claudecode";
+import { DirectorySkillAdapter } from './skill-directory.js';
+export declare class ClaudecodeSkillAdapter extends DirectorySkillAdapter {
     constructor(skillsDir: string);
-    importSkills(): Promise<Array<Pick<InstalledSkill, "id" | "name" | "directory" | "description">>>;
-    syncSkill(skill: InstalledSkill, sourceDir: string, method: SkillSyncMethod): Promise<void>;
-    removeSkill(skill: InstalledSkill): Promise<void>;
 }
 //# sourceMappingURL=skill-claudecode.d.ts.map

package/dist/adapters/cc-switch/skill-claudecode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skill-claudecode.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/skill-claudecode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAoErF,qBAAa,sBAAuB,YAAW,aAAa;IAG9C,OAAO,CAAC,QAAQ,CAAC,SAAS;IAFtC,SAAgB,KAAK,EAAG,YAAY,CAAU;gBAEjB,SAAS,EAAE,MAAM;IAExC,YAAY,IAAI,OAAO,CAC3B,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,CAAC,CAAC,CACzE;IAmBK,SAAS,CACb,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC;IAMV,WAAW,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAKxD"}
+{"version":3,"file":"skill-claudecode.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/skill-claudecode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,qBAAa,sBAAuB,SAAQ,qBAAqB;gBACnD,SAAS,EAAE,MAAM;CAG9B"}

package/dist/adapters/cc-switch/skill-claudecode.js

@@ -3,89 +3,9 @@
  *
  * 实现 ISkillAdapter 接口，负责 ClaudeCode 的 Skill 目录管理
  */
-async function ensureDir(dir) {
-    const fs = await import('node:fs/promises');
-    await fs.mkdir(dir, { recursive: true });
-}
-async function removeIfExists(target) {
-    const fs = await import('node:fs/promises');
-    try {
-        await fs.rm(target, { recursive: true, force: true });
-    }
-    catch {
-        // ignore
-    }
-}
-async function copyDir(source, target) {
-    const fs = await import('node:fs/promises');
-    const path = await import('node:path');
-    await ensureDir(target);
-    const entries = await fs.readdir(source, { withFileTypes: true });
-    for (const entry of entries) {
-        const srcPath = path.join(source, entry.name);
-        const tgtPath = path.join(target, entry.name);
-        if (entry.isDirectory()) {
-            await copyDir(srcPath, tgtPath);
-        }
-        else {
-            await fs.copyFile(srcPath, tgtPath);
-        }
-    }
-}
-function toNameFromPath(pathStr) {
-    const base = pathStr.split(/[/\\]/).pop() || pathStr;
-    return base.replace(/\.skill$/, '').replace(/[-_]/g, ' ');
-}
-async function materializeSkillDir(sourceDir, targetDir, method) {
-    const fs = await import('node:fs/promises');
-    const path = await import('node:path');
-    await removeIfExists(targetDir);
-    await ensureDir(path.dirname(targetDir));
-    if (method === "copy") {
-        await copyDir(sourceDir, targetDir);
-        return;
-    }
-    if (method === "symlink") {
-        await fs.symlink(sourceDir, targetDir, "junction");
-        return;
-    }
-    try {
-        await fs.symlink(sourceDir, targetDir, "junction");
-    }
-    catch {
-        await copyDir(sourceDir, targetDir);
-    }
-}
-export class ClaudecodeSkillAdapter {
+import { DirectorySkillAdapter } from './skill-directory.js';
+export class ClaudecodeSkillAdapter extends DirectorySkillAdapter {
     constructor(skillsDir) {
-        this.skillsDir = skillsDir;
-        this.appId = "claudecode";
-    }
-    async importSkills() {
-        const fs = await import('node:fs/promises');
-        const path = await import('node:path');
-        await ensureDir(this.skillsDir);
-        const entries = await fs.readdir(this.skillsDir, { withFileTypes: true });
-        return entries
-            .filter((entry) => entry.isDirectory() || entry.isSymbolicLink())
-            .map((entry) => {
-            const directory = path.join(this.skillsDir, entry.name);
-            return {
-                id: `skill_import_${entry.name}`,
-                name: toNameFromPath(entry.name),
-                directory,
-                description: undefined,
-            };
-        });
-    }
-    async syncSkill(skill, sourceDir, method) {
-        const path = await import('node:path');
-        const targetDir = path.join(this.skillsDir, skill.name);
-        await materializeSkillDir(sourceDir, targetDir, method);
-    }
-    async removeSkill(skill) {
-        const path = await import('node:path');
-        const targetDir = path.join(this.skillsDir, skill.name);
-        await removeIfExists(targetDir);
+        super('claudecode', skillsDir);
     }
 }

package/dist/adapters/cc-switch/skill-codex.d.ts

@@ -0,0 +1,5 @@
+import { DirectorySkillAdapter } from './skill-directory.js';
+export declare class CodexSkillAdapter extends DirectorySkillAdapter {
+    constructor(skillsDir: string);
+}
+//# sourceMappingURL=skill-codex.d.ts.map

package/dist/adapters/cc-switch/skill-codex.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-codex.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/skill-codex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAE7D,qBAAa,iBAAkB,SAAQ,qBAAqB;gBAC9C,SAAS,EAAE,MAAM;CAG9B"}

package/dist/adapters/cc-switch/skill-codex.js

@@ -0,0 +1,6 @@
+import { DirectorySkillAdapter } from './skill-directory.js';
+export class CodexSkillAdapter extends DirectorySkillAdapter {
+    constructor(skillsDir) {
+        super('codex', skillsDir);
+    }
+}

package/dist/adapters/cc-switch/skill-directory.d.ts

@@ -0,0 +1,10 @@
+import type { AppId, ISkillAdapter, InstalledSkill, SkillSyncMethod } from '@cc-switch/sdk';
+export declare class DirectorySkillAdapter implements ISkillAdapter {
+    readonly appId: AppId;
+    private readonly skillsDir;
+    constructor(appId: AppId, skillsDir: string);
+    importSkills(): Promise<Array<Pick<InstalledSkill, 'id' | 'name' | 'directory' | 'description'>>>;
+    syncSkill(skill: InstalledSkill, sourceDir: string, method: SkillSyncMethod): Promise<void>;
+    removeSkill(skill: InstalledSkill): Promise<void>;
+}
+//# sourceMappingURL=skill-directory.d.ts.map

package/dist/adapters/cc-switch/skill-directory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-directory.d.ts","sourceRoot":"","sources":["../../../src/adapters/cc-switch/skill-directory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AA4H5F,qBAAa,qBAAsB,YAAW,aAAa;aAEvC,KAAK,EAAE,KAAK;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADV,KAAK,EAAE,KAAK,EACX,SAAS,EAAE,MAAM;IAG9B,YAAY,IAAI,OAAO,CAC3B,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,GAAG,MAAM,GAAG,WAAW,GAAG,aAAa,CAAC,CAAC,CACzE;IA+BK,SAAS,CACb,KAAK,EAAE,cAAc,EACrB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC;IAKV,WAAW,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAIxD"}