aws-runtime-bridge 1.9.79 → 1.9.81

package/dist/services/instance-ai-config-service.js

@@ -1,174 +1,2 @@
-/**
- * AI 配置服务
- *
- * 管理 ACode 实例的 AI provider 配置（model/baseURL/apiKey）。
- * 支持三层来源（api > env > file）仲裁，deep-merge 后写入
- * per-instance acode.json 供 ACode runtime 加载。
- */
-import fs from "node:fs/promises";
-import path from "node:path";
-import { getAcodeConfigFile, getRuntimeHomeDir } from "../config.js";
-import { getInstanceAiConfigDebugLogger } from "../utils/instance-ai-config-debug-logger.js";
-// ── 敏感信息脱敏 ─────────────────────────────────────────
-const SENSITIVE_KEYS = new Set([
-    "apiKey", "api_key", "apikey",
-    "key", "secret", "token", "password",
-]);
-/**
- * 脱敏日志中的敏感字段（apiKey / secret / token / password）。
- * 返回新对象，不修改原对象。
- */
-export function redactForLog(obj) {
-    const result = { ...obj };
-    for (const key of Object.keys(result)) {
-        if (SENSITIVE_KEYS.has(key)) {
-            const val = result[key];
-            if (typeof val === "string" && val.length > 0) {
-                result[key] = val.length > 8
-                    ? `${val.slice(0, 4)}...${val.slice(-4)}`
-                    : "***";
-            }
-        }
-        else if (typeof result[key] === "object" && result[key] !== null) {
-            result[key] = redactForLog(result[key]);
-        }
-    }
-    return result;
-}
-// ── 配置准备 ─────────────────────────────────────────────
-function loadEnvLayer() {
-    return {
-        ...(process.env.ACODE_MODEL ? { model: process.env.ACODE_MODEL } : {}),
-        ...(process.env.ACODE_BASE_URL ? { baseURL: process.env.ACODE_BASE_URL } : {}),
-        ...(process.env.ACODE_API_KEY ? { apiKey: process.env.ACODE_API_KEY } : {}),
-        ...(process.env.ACODE_EFFORT ? { effort: process.env.ACODE_EFFORT } : {}),
-    };
-}
-async function loadFileLayer(acodeConfigPath) {
-    try {
-        const raw = await fs.readFile(acodeConfigPath, "utf-8");
-        const parsed = JSON.parse(raw);
-        const provider = parsed.provider;
-        const def = provider?.default;
-        const opts = def?.options;
-        return {
-            ...(def?.model ? { model: def.model } : {}),
-            ...(opts?.baseURL || opts?.baseUrl ? { baseURL: opts.baseURL || opts.baseUrl } : {}),
-            ...(opts?.apiKey ? { apiKey: opts.apiKey } : {}),
-        };
-    }
-    catch {
-        return {};
-    }
-}
-/**
- * 仲裁来源标签。优先级：api > env > file > default
- */
-function resolveSourceLabel(key, apiVal, envVal, fileVal) {
-    if (apiVal !== undefined)
-        return "api";
-    if (envVal !== undefined)
-        return "env";
-    if (fileVal !== undefined)
-        return "file";
-    return "default";
-}
-/**
- * 准备 ACode 实例配置。
- *
- * 主流程：
- * 1. 从 apiOverrides（请求体）、env（环境变量）、file（acode.json）三层收集配置
- * 2. 按 api > env > file 优先级仲裁每个字段
- * 3. 将仲裁结果 deep-merge 写入 per-instance acode.json
- * 4. 返回合并后的 config 和 per-instance 文件路径
- */
-export async function prepareAcodeInstanceConfig(options) {
-    const runtimeHome = getRuntimeHomeDir();
-    const globalConfigPath = getAcodeConfigFile(runtimeHome);
-    const perInstanceDir = path.join(runtimeHome, ".aws-bridge", "instances", options.agentId);
-    const perInstanceConfigPath = path.join(perInstanceDir, "acode.json");
-    // 收集三层配置
-    const apiLayer = options.apiOverrides ?? {};
-    const envLayer = loadEnvLayer();
-    const fileLayer = await loadFileLayer(globalConfigPath);
-    // 逐字段仲裁（api > env > file）
-    const model = apiLayer.model ?? envLayer.model ?? fileLayer.model;
-    const baseURL = apiLayer.baseURL ?? envLayer.baseURL ?? fileLayer.baseURL;
-    const apiKey = apiLayer.apiKey ?? envLayer.apiKey ?? fileLayer.apiKey;
-    const effort = apiLayer.effort ?? envLayer.effort;
-    const resolvedConfig = {};
-    if (model)
-        resolvedConfig.model = model;
-    if (baseURL)
-        resolvedConfig.baseURL = baseURL;
-    if (apiKey)
-        resolvedConfig.apiKey = apiKey;
-    if (effort)
-        resolvedConfig.effort = effort;
-    const source = {
-        model: resolveSourceLabel("model", apiLayer.model, envLayer.model, fileLayer.model),
-        baseURL: resolveSourceLabel("baseURL", apiLayer.baseURL, envLayer.baseURL, fileLayer.baseURL),
-        apiKey: resolveSourceLabel("apiKey", apiLayer.apiKey, envLayer.apiKey, fileLayer.apiKey),
-        effort: resolveSourceLabel("effort", apiLayer.effort, envLayer.effort, undefined),
-    };
-    // 写入 per-instance acode.json（deep-merge 全局配置 + 仲裁结果）
-    const dbg = getInstanceAiConfigDebugLogger();
-    try {
-        await fs.mkdir(perInstanceDir, { recursive: true });
-        // 读取全局 acode.json 作为 base
-        let baseConfig = {};
-        try {
-            const globalRaw = await fs.readFile(globalConfigPath, "utf-8");
-            baseConfig = JSON.parse(globalRaw);
-        }
-        catch {
-            // 全局文件不存在则用空对象
-        }
-        // deep-merge provider.default.options
-        const mergedConfig = JSON.parse(JSON.stringify(baseConfig));
-        const provider = (mergedConfig.provider ?? {});
-        const def = (provider.default ?? {});
-        const options_ = (def.options ?? {});
-        if (model)
-            options_.model = model;
-        if (baseURL)
-            options_.baseURL = baseURL;
-        if (apiKey)
-            options_.apiKey = apiKey;
-        if (effort)
-            options_.effort = effort;
-        def.options = options_;
-        provider.default = def;
-        mergedConfig.provider = provider;
-        await fs.writeFile(perInstanceConfigPath, JSON.stringify(mergedConfig, null, 2), "utf-8");
-        void dbg.log({
-            level: "info",
-            category: "apply",
-            message: "per-instance acode.json 已写入",
-            source: "bridge",
-            agentId: options.agentId,
-            sessionId: options.sessionId,
-            details: {
-                perInstanceConfigPath,
-                source,
-            },
-        });
-    }
-    catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
-        void dbg.log({
-            level: "error",
-            category: "apply",
-            message: `per-instance acode.json 写入失败: ${message}`,
-            source: "bridge",
-            agentId: options.agentId,
-        });
-    }
-    return {
-        instanceConfig: {
-            config: resolvedConfig,
-            source,
-        },
-        perInstanceConfigPath,
-    };
-}
+import m from"node:fs/promises";import K from"node:path";import{getAcodeConfigFile as U,getRuntimeHomeDir as C}from"../config.js";import{getInstanceAiConfigDebugLogger as A}from"../utils/instance-ai-config-debug-logger.js";const I=new Set(["apiKey","api_key","apikey","key","secret","token","password"]);function _(t){const e={...t};for(const r of Object.keys(e))if(I.has(r)){const n=e[r];typeof n=="string"&&n.length>0&&(e[r]=n.length>8?`${n.slice(0,4)}...${n.slice(-4)}`:"***")}else typeof e[r]=="object"&&e[r]!==null&&(e[r]=_(e[r]));return e}function D(){return{...process.env.ACODE_MODEL?{model:process.env.ACODE_MODEL}:{},...process.env.ACODE_BASE_URL?{baseURL:process.env.ACODE_BASE_URL}:{},...process.env.ACODE_API_KEY?{apiKey:process.env.ACODE_API_KEY}:{},...process.env.ACODE_EFFORT?{effort:process.env.ACODE_EFFORT}:{}}}async function S(t){try{const e=await m.readFile(t,"utf-8"),a=JSON.parse(e).provider?.default,o=a?.options;return{...a?.model?{model:a.model}:{},...o?.baseURL||o?.baseUrl?{baseURL:o.baseURL||o.baseUrl}:{},...o?.apiKey?{apiKey:o.apiKey}:{}}}catch{return{}}}function b(t,e,r,n){return e!==void 0?"api":r!==void 0?"env":n!==void 0?"file":"default"}async function j(t){const e=C(),r=U(e),n=K.join(e,".aws-bridge","instances",t.agentId),a=K.join(n,"acode.json"),o=t.apiOverrides??{},s=D(),i=await S(r),l=o.model??s.model??i.model,g=o.baseURL??s.baseURL??i.baseURL,y=o.apiKey??s.apiKey??i.apiKey,u=o.effort??s.effort,f={};l&&(f.model=l),g&&(f.baseURL=g),y&&(f.apiKey=y),u&&(f.effort=u);const E={model:b("model",o.model,s.model,i.model),baseURL:b("baseURL",o.baseURL,s.baseURL,i.baseURL),apiKey:b("apiKey",o.apiKey,s.apiKey,i.apiKey),effort:b("effort",o.effort,s.effort,void 0)},R=A();try{await m.mkdir(n,{recursive:!0});let c={};try{const O=await m.readFile(r,"utf-8");c=JSON.parse(O)}catch{}const d=JSON.parse(JSON.stringify(c)),L=d.provider??{},v=L.default??{},p=v.options??{};l&&(p.model=l),g&&(p.baseURL=g),y&&(p.apiKey=y),u&&(p.effort=u),v.options=p,L.default=v,d.provider=L,await m.writeFile(a,JSON.stringify(d,null,2),"utf-8"),R.log({level:"info",category:"apply",message:"per-instance acode.json \u5DF2\u5199\u5165",source:"bridge",agentId:t.agentId,sessionId:t.sessionId,details:{perInstanceConfigPath:a,source:E}})}catch(c){const d=c instanceof Error?c.message:String(c);R.log({level:"error",category:"apply",message:`per-instance acode.json \u5199\u5165\u5931\u8D25: ${d}`,source:"bridge",agentId:t.agentId})}return{instanceConfig:{config:f,source:E},perInstanceConfigPath:a}}export{j as prepareAcodeInstanceConfig,_ as redactForLog};
+

package/dist/services/instance-init-service.d.ts

@@ -32,4 +32,3 @@ export declare function initInstance(agentId: string, workspacePath: string, opt
         mcpServers: LegacyMcpStateItem[];
     };
 }>;
-//# sourceMappingURL=instance-init-service.d.ts.map

package/dist/services/instance-init-service.js

@@ -1,193 +1,2 @@
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { ensureDir, installSkillPackageToSdk } from '../utils/file-utils.js';
-import { buildMcpConfigContent, normalizeSdkMcpServerSpec, toLegacyMcpStateItem, toLegacySkillStateItem } from '../utils/mcp-utils.js';
-import { normalizeMcpPayload } from '../utils/mcp-utils.js';
-import { ensureEnabledTools, parseBoolean } from '../utils/validation.js';
-import { loadCcSwitchSdk, runCcSwitchAdapter, toSdkAppsFromEnabledTools } from './cc-switch-sdk.js';
-import { getAgentInitRoot, loadInstanceState, saveInstanceState } from './instance-state.js';
-import { detectToolStatuses } from './tool-installer.js';
-function pickInstalledTools(requestedTools, toolStatus) {
-    const installed = new Set(Object.values(toolStatus)
-        .filter((item) => item.installed)
-        .map((item) => item.tool));
-    return requestedTools.filter((tool) => installed.has(tool));
-}
-export async function syncLegacyStateFromSdk(agentId, sdk) {
-    const state = await loadInstanceState(agentId);
-    const mcpServers = sdk.getAllMcpServers().map((item) => toLegacyMcpStateItem(item));
-    const skills = sdk.getAllSkills().map((item) => toLegacySkillStateItem(item));
-    state.mcpServers = mcpServers;
-    state.skills = skills;
-    const initRoot = getAgentInitRoot(agentId);
-    const mcpDir = await ensureDir(path.join(initRoot, 'mcp'));
-    const mcpConfigPath = path.join(mcpDir, 'mcp-servers.json');
-    await fs.writeFile(mcpConfigPath, buildMcpConfigContent(mcpServers), 'utf-8');
-    const saved = await saveInstanceState(agentId, state);
-    return {
-        state: saved,
-        configPath: mcpConfigPath,
-        skills,
-        mcpServers,
-    };
-}
-export async function initInstance(agentId, workspacePath, options) {
-    const normalizedWorkspace = path.resolve(workspacePath);
-    const initRoot = getAgentInitRoot(agentId);
-    const logs = [];
-    function pushLog(step, status, message, details) {
-        logs.push({
-            step,
-            status,
-            message,
-            timestamp: new Date().toISOString(),
-            details,
-        });
-    }
-    pushLog('prepare', 'running', '开始初始化实例', {
-        agentId: String(agentId),
-        workspacePath: normalizedWorkspace,
-    });
-    await ensureDir(initRoot);
-    pushLog('prepare', 'success', '初始化目录已就绪', { initRoot });
-    const tools = ensureEnabledTools(options.ccSwitchEnabledTools);
-    pushLog('detect-tools', 'running', '开始检测工具安装状态', { tools });
-    const detectedToolStatus = await detectToolStatuses(tools);
-    pushLog('detect-tools', 'success', '工具安装状态检测完成', {
-        installedTools: Object.values(detectedToolStatus).filter((item) => item.installed).map((item) => item.tool),
-        missingTools: Object.values(detectedToolStatus).filter((item) => !item.installed).map((item) => item.tool),
-    });
-    const installedTools = pickInstalledTools(tools, detectedToolStatus);
-    const missingTools = Object.values(detectedToolStatus).filter((item) => !item.installed);
-    const initResult = {
-        ok: true,
-        agentId: String(agentId),
-        workspacePath: normalizedWorkspace,
-        initRoot,
-        enabledTools: tools,
-        toolStatus: detectedToolStatus,
-        logs,
-        skill: {
-            enabled: parseBoolean(options.skillEnabled, true),
-            packagePresent: false,
-        },
-        mcp: {
-            enabled: parseBoolean(options.mcpEnabled, true),
-            configPath: null,
-        },
-    };
-    const state = await loadInstanceState(agentId);
-    if (missingTools.length > 0) {
-        pushLog('skip-uninstalled-tools', 'skipped', '已跳过未安装工具', {
-            skippedTools: missingTools.map((item) => ({ tool: item.tool, error: item.error })),
-        });
-    }
-    pushLog('select-installed-tools', 'success', '已选择可初始化工具', {
-        enabledTools: tools,
-        installedTools,
-    });
-    pushLog('load-sdk', 'running', '开始加载 CC Switch SDK');
-    const sdk = await loadCcSwitchSdk(agentId);
-    const sdkApps = toSdkAppsFromEnabledTools(installedTools);
-    pushLog('load-sdk', 'success', 'CC Switch SDK 加载完成', { sdkApps });
-    if (initResult.skill.enabled) {
-        pushLog('install-skills', 'running', '开始安装技能包', {
-            count: Array.isArray(options.skillPackages) ? options.skillPackages.length : (options.skillPackage ? 1 : 0),
-        });
-        const skillDir = await ensureDir(path.join(initRoot, 'skills'));
-        const skillCandidates = Array.isArray(options.skillPackages) && options.skillPackages.length > 0
-            ? options.skillPackages
-            : (options.skillPackage ? [options.skillPackage] : []);
-        const installedSkills = [];
-        for (const candidate of skillCandidates) {
-            const installed = await installSkillPackageToSdk(sdk, candidate, skillDir, sdkApps);
-            if (!installed) {
-                continue;
-            }
-            installedSkills.push(toLegacySkillStateItem(installed));
-        }
-        if (installedSkills.length > 0) {
-            initResult.skill.packagePresent = true;
-            initResult.skill.installedCount = installedSkills.length;
-            initResult.skill.installed = installedSkills;
-            pushLog('install-skills', 'success', '技能包安装完成', {
-                installedCount: installedSkills.length,
-                skills: installedSkills.map((item) => item.name),
-            });
-        }
-        else {
-            pushLog('install-skills', 'skipped', '没有可安装的技能包');
-        }
-    }
-    else {
-        pushLog('install-skills', 'skipped', '已跳过技能包安装（skillEnabled=false）');
-    }
-    if (initResult.mcp.enabled) {
-        pushLog('install-mcp', 'running', '开始写入 MCP 配置', {
-            count: Array.isArray(options.mcpServers) ? options.mcpServers.length : 0,
-        });
-        const normalizedMcpServers = (Array.isArray(options.mcpServers) ? options.mcpServers : [])
-            .map((item) => normalizeMcpPayload(item))
-            .filter((item) => item !== null);
-        const appliedMcp = [];
-        for (const item of normalizedMcpServers) {
-            const allMcps = sdk.getAllMcpServers();
-            const existing = allMcps.find((server) => String(server?.name || '').trim() === item.name);
-            const mcpInput = {
-                name: item.name,
-                server: normalizeSdkMcpServerSpec(item),
-                apps: sdkApps,
-            };
-            const existingId = String(existing?.id || '').trim();
-            const upserted = existingId
-                ? await sdk.updateMcpServer(existingId, mcpInput)
-                : await sdk.createMcpServer(mcpInput);
-            appliedMcp.push(toLegacyMcpStateItem(upserted));
-        }
-        initResult.mcp.installedCount = appliedMcp.length;
-        pushLog('install-mcp', 'success', 'MCP 配置写入完成', {
-            installedCount: appliedMcp.length,
-            mcpServers: appliedMcp.map((item) => item.name),
-        });
-    }
-    else {
-        pushLog('install-mcp', 'skipped', '已跳过 MCP 配置（mcpEnabled=false）');
-    }
-    pushLog('persist-state', 'running', '开始保存实例状态');
-    state.initialized = true;
-    state.enabledTools = tools;
-    state.toolStatus = detectedToolStatus;
-    state.skillEnabled = initResult.skill.enabled;
-    state.mcpEnabled = initResult.mcp.enabled;
-    await saveInstanceState(agentId, state);
-    pushLog('persist-state', 'success', '实例状态保存完成');
-    pushLog('sync-state', 'running', '开始同步 CC Switch 状态快照');
-    const synced = await syncLegacyStateFromSdk(agentId, sdk);
-    const savedState = synced.state;
-    initResult.mcp.configPath = synced.configPath;
-    pushLog('sync-state', 'success', 'CC Switch 状态同步完成', {
-        skillCount: savedState.skills.length,
-        mcpCount: savedState.mcpServers.length,
-        configPath: synced.configPath,
-    });
-    pushLog('adapter', 'running', '开始执行适配器回写');
-    const adapterResult = await runCcSwitchAdapter('init-instance', agentId, {
-        enabledTools: savedState.enabledTools,
-        skillEnabled: savedState.skillEnabled,
-        mcpEnabled: savedState.mcpEnabled,
-        skillCount: savedState.skills.length,
-        mcpCount: savedState.mcpServers.length,
-    }, sdk);
-    pushLog('adapter', 'success', '适配器回写完成', {
-        snapshot: adapterResult.snapshot,
-    });
-    pushLog('complete', 'success', missingTools.length > 0 ? '实例初始化完成，未安装工具已跳过' : '实例初始化完成');
-    return {
-        ...initResult,
-        adapterResult,
-        installed: {
-            skills: savedState.skills,
-            mcpServers: savedState.mcpServers,
-        },
-    };
-}
+import{promises as L}from"node:fs";import b from"node:path";import{ensureDir as P,installSkillPackageToSdk as F}from"../utils/file-utils.js";import{buildMcpConfigContent as I,normalizeSdkMcpServerSpec as K,toLegacyMcpStateItem as M,toLegacySkillStateItem as E}from"../utils/mcp-utils.js";import{normalizeMcpPayload as B}from"../utils/mcp-utils.js";import{ensureEnabledTools as W,parseBoolean as j}from"../utils/validation.js";import{loadCcSwitchSdk as q,runCcSwitchAdapter as G,toSdkAppsFromEnabledTools as H}from"./cc-switch-sdk.js";import{getAgentInitRoot as D,loadInstanceState as z,saveInstanceState as O}from"./instance-state.js";import{detectToolStatuses as J}from"./tool-installer.js";function N(a,m){const s=new Set(Object.values(m).filter(n=>n.installed).map(n=>n.tool));return a.filter(n=>s.has(n))}async function Q(a,m){const s=await z(a),n=m.getAllMcpServers().map(k=>M(k)),p=m.getAllSkills().map(k=>E(k));s.mcpServers=n,s.skills=p;const f=D(a),e=await P(b.join(f,"mcp")),c=b.join(e,"mcp-servers.json");return await L.writeFile(c,I(n),"utf-8"),{state:await O(a,s),configPath:c,skills:p,mcpServers:n}}async function te(a,m,s){const n=b.resolve(m),p=D(a),f=[];function e(t,r,l,S){f.push({step:t,status:r,message:l,timestamp:new Date().toISOString(),details:S})}e("prepare","running","\u5F00\u59CB\u521D\u59CB\u5316\u5B9E\u4F8B",{agentId:String(a),workspacePath:n}),await P(p),e("prepare","success","\u521D\u59CB\u5316\u76EE\u5F55\u5DF2\u5C31\u7EEA",{initRoot:p});const c=W(s.ccSwitchEnabledTools);e("detect-tools","running","\u5F00\u59CB\u68C0\u6D4B\u5DE5\u5177\u5B89\u88C5\u72B6\u6001",{tools:c});const d=await J(c);e("detect-tools","success","\u5DE5\u5177\u5B89\u88C5\u72B6\u6001\u68C0\u6D4B\u5B8C\u6210",{installedTools:Object.values(d).filter(t=>t.installed).map(t=>t.tool),missingTools:Object.values(d).filter(t=>!t.installed).map(t=>t.tool)});const k=N(c,d),v=Object.values(d).filter(t=>!t.installed),i={ok:!0,agentId:String(a),workspacePath:n,initRoot:p,enabledTools:c,toolStatus:d,logs:f,skill:{enabled:j(s.skillEnabled,!0),packagePresent:!1},mcp:{enabled:j(s.mcpEnabled,!0),configPath:null}},u=await z(a);v.length>0&&e("skip-uninstalled-tools","skipped","\u5DF2\u8DF3\u8FC7\u672A\u5B89\u88C5\u5DE5\u5177",{skippedTools:v.map(t=>({tool:t.tool,error:t.error}))}),e("select-installed-tools","success","\u5DF2\u9009\u62E9\u53EF\u521D\u59CB\u5316\u5DE5\u5177",{enabledTools:c,installedTools:k}),e("load-sdk","running","\u5F00\u59CB\u52A0\u8F7D CC Switch SDK");const g=await q(a),w=H(k);if(e("load-sdk","success","CC Switch SDK \u52A0\u8F7D\u5B8C\u6210",{sdkApps:w}),i.skill.enabled){e("install-skills","running","\u5F00\u59CB\u5B89\u88C5\u6280\u80FD\u5305",{count:Array.isArray(s.skillPackages)?s.skillPackages.length:s.skillPackage?1:0});const t=await P(b.join(p,"skills")),r=Array.isArray(s.skillPackages)&&s.skillPackages.length>0?s.skillPackages:s.skillPackage?[s.skillPackage]:[],l=[];for(const S of r){const h=await F(g,S,t,w);h&&l.push(E(h))}l.length>0?(i.skill.packagePresent=!0,i.skill.installedCount=l.length,i.skill.installed=l,e("install-skills","success","\u6280\u80FD\u5305\u5B89\u88C5\u5B8C\u6210",{installedCount:l.length,skills:l.map(S=>S.name)})):e("install-skills","skipped","\u6CA1\u6709\u53EF\u5B89\u88C5\u7684\u6280\u80FD\u5305")}else e("install-skills","skipped","\u5DF2\u8DF3\u8FC7\u6280\u80FD\u5305\u5B89\u88C5\uFF08skillEnabled=false\uFF09");if(i.mcp.enabled){e("install-mcp","running","\u5F00\u59CB\u5199\u5165 MCP \u914D\u7F6E",{count:Array.isArray(s.mcpServers)?s.mcpServers.length:0});const t=(Array.isArray(s.mcpServers)?s.mcpServers:[]).map(l=>B(l)).filter(l=>l!==null),r=[];for(const l of t){const h=g.getAllMcpServers().find(x=>String(x?.name||"").trim()===l.name),T={name:l.name,server:K(l),apps:w},A=String(h?.id||"").trim(),R=A?await g.updateMcpServer(A,T):await g.createMcpServer(T);r.push(M(R))}i.mcp.installedCount=r.length,e("install-mcp","success","MCP \u914D\u7F6E\u5199\u5165\u5B8C\u6210",{installedCount:r.length,mcpServers:r.map(l=>l.name)})}else e("install-mcp","skipped","\u5DF2\u8DF3\u8FC7 MCP \u914D\u7F6E\uFF08mcpEnabled=false\uFF09");e("persist-state","running","\u5F00\u59CB\u4FDD\u5B58\u5B9E\u4F8B\u72B6\u6001"),u.initialized=!0,u.enabledTools=c,u.toolStatus=d,u.skillEnabled=i.skill.enabled,u.mcpEnabled=i.mcp.enabled,await O(a,u),e("persist-state","success","\u5B9E\u4F8B\u72B6\u6001\u4FDD\u5B58\u5B8C\u6210"),e("sync-state","running","\u5F00\u59CB\u540C\u6B65 CC Switch \u72B6\u6001\u5FEB\u7167");const C=await Q(a,g),o=C.state;i.mcp.configPath=C.configPath,e("sync-state","success","CC Switch \u72B6\u6001\u540C\u6B65\u5B8C\u6210",{skillCount:o.skills.length,mcpCount:o.mcpServers.length,configPath:C.configPath}),e("adapter","running","\u5F00\u59CB\u6267\u884C\u9002\u914D\u5668\u56DE\u5199");const y=await G("init-instance",a,{enabledTools:o.enabledTools,skillEnabled:o.skillEnabled,mcpEnabled:o.mcpEnabled,skillCount:o.skills.length,mcpCount:o.mcpServers.length},g);return e("adapter","success","\u9002\u914D\u5668\u56DE\u5199\u5B8C\u6210",{snapshot:y.snapshot}),e("complete","success",v.length>0?"\u5B9E\u4F8B\u521D\u59CB\u5316\u5B8C\u6210\uFF0C\u672A\u5B89\u88C5\u5DE5\u5177\u5DF2\u8DF3\u8FC7":"\u5B9E\u4F8B\u521D\u59CB\u5316\u5B8C\u6210"),{...i,adapterResult:y,installed:{skills:o.skills,mcpServers:o.mcpServers}}}export{te as initInstance,Q as syncLegacyStateFromSdk};
+

package/dist/services/instance-service.d.ts

@@ -85,4 +85,3 @@ export declare class InstanceService {
     updateState(partial: Partial<InstanceState>): Promise<InstanceState>;
     reset(): Promise<void>;
 }
-//# sourceMappingURL=instance-service.d.ts.map

package/dist/services/instance-service.js

@@ -1,237 +1,2 @@
-/**
- * InstanceService - Agent 实例初始化服务
- *
- * 负责 Agent 实例的生命周期管理：
- * - 实例根目录、workspace 路径管理
- * - 实例状态持久化
- * - Skill/MCP 包安装流程
- *
- * 注意：此服务属于 Agent 运行时层，不属于 cc-switch-sdk 配置管理层
- */
-import path from "node:path";
-import { promises as fs } from "node:fs";
-/**
- * 生成唯一 ID
- */
-function generateId(prefix = "inst") {
-    const timestamp = Date.now().toString(36);
-    const random = Math.random().toString(36).slice(2, 8);
-    return `${prefix}_${timestamp}_${random}`;
-}
-/**
- * 检查路径是否存在
- */
-async function pathExists(target) {
-    try {
-        await fs.access(target);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-/**
- * 递归复制目录
- */
-async function copyDir(source, target) {
-    await fs.mkdir(target, { recursive: true });
-    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);
-        }
-    }
-}
-/**
- * 删除路径（如果存在）
- */
-async function removeIfExists(target) {
-    try {
-        await fs.rm(target, { recursive: true, force: true });
-    }
-    catch {
-        // ignore
-    }
-}
-export class InstanceService {
-    constructor(sdk, instanceRoot, workspacePath) {
-        this.sdk = sdk;
-        this.instanceRoot = instanceRoot;
-        this.workspacePath = workspacePath;
-    }
-    getPaths() {
-        return {
-            instanceRoot: this.instanceRoot,
-            stateFile: path.join(this.instanceRoot, "instance-state.json"),
-            skillsDir: path.join(this.instanceRoot, "skills"),
-            mcpDir: path.join(this.instanceRoot, "mcp"),
-        };
-    }
-    async loadState() {
-        const paths = this.getPaths();
-        try {
-            const raw = await fs.readFile(paths.stateFile, "utf-8");
-            const parsed = JSON.parse(raw);
-            return parsed;
-        }
-        catch {
-            return {
-                initialized: false,
-                skills: [],
-                mcpServers: [],
-                enabledApps: [],
-                skillEnabled: true,
-                mcpEnabled: true,
-                updatedAt: null,
-            };
-        }
-    }
-    async saveState(state) {
-        const paths = this.getPaths();
-        state.updatedAt = new Date().toISOString();
-        await fs.mkdir(path.dirname(paths.stateFile), { recursive: true });
-        await fs.writeFile(paths.stateFile, JSON.stringify(state, null, 2), "utf-8");
-        return state;
-    }
-    async ensureInstanceRoot() {
-        await fs.mkdir(this.instanceRoot, { recursive: true });
-    }
-    toAppFlags(appIds) {
-        return {
-            acode: appIds.includes("acode"),
-            claude: appIds.includes("claude"),
-            claudecode: appIds.includes("claudecode"),
-            codex: appIds.includes("codex"),
-            gemini: appIds.includes("gemini"),
-            opencode: appIds.includes("opencode"),
-            openclaw: appIds.includes("openclaw"),
-        };
-    }
-    async initialize(options = {}) {
-        await this.ensureInstanceRoot();
-        const paths = this.getPaths();
-        const enabledApps = options.enabledApps ?? ["claudecode", "opencode"];
-        const appFlags = this.toAppFlags(enabledApps);
-        const result = {
-            ok: true,
-            instanceId: generateId(),
-            workspacePath: this.workspacePath,
-            instanceRoot: this.instanceRoot,
-            enabledApps,
-            skill: {
-                enabled: options.skillEnabled ?? true,
-                packagePresent: false,
-            },
-            mcp: {
-                enabled: options.mcpEnabled ?? true,
-            },
-        };
-        const state = await this.loadState();
-        state.initialized = true;
-        state.enabledApps = enabledApps;
-        state.skillEnabled = result.skill.enabled;
-        state.mcpEnabled = result.mcp.enabled;
-        if (result.skill.enabled) {
-            await fs.mkdir(paths.skillsDir, { recursive: true });
-            const skillCandidates = Array.isArray(options.skillPackages) && options.skillPackages.length > 0
-                ? options.skillPackages
-                : options.skillPackage
-                    ? [options.skillPackage]
-                    : [];
-            const installedSkills = [];
-            for (const candidate of skillCandidates) {
-                const installed = await this.installSkillPackage(candidate, paths.skillsDir, appFlags);
-                if (installed) {
-                    installedSkills.push(installed);
-                }
-            }
-            if (installedSkills.length > 0) {
-                result.skill.packagePresent = true;
-                result.skill.installedCount = installedSkills.length;
-                result.skill.installed = installedSkills;
-                state.skills = installedSkills;
-            }
-        }
-        if (result.mcp.enabled) {
-            const mcpServers = Array.isArray(options.mcpServers)
-                ? options.mcpServers
-                : [];
-            const installedMcps = [];
-            for (const input of mcpServers) {
-                const server = await this.upsertMcpServer(input, appFlags);
-                if (server) {
-                    installedMcps.push(server);
-                }
-            }
-            if (installedMcps.length > 0) {
-                result.mcp.installedCount = installedMcps.length;
-                result.mcp.installed = installedMcps;
-                state.mcpServers = installedMcps;
-            }
-        }
-        await this.saveState(state);
-        return result;
-    }
-    async installSkillPackage(pkg, targetDir, apps) {
-        const sourceDir = pkg.localPath;
-        if (!sourceDir || !(await pathExists(sourceDir))) {
-            return null;
-        }
-        const skillName = pkg.skillName || path.basename(sourceDir).replace(/\.skill$/, "");
-        const skillId = generateId("skill");
-        const targetSkillDir = path.join(targetDir, skillName);
-        await copyDir(sourceDir, targetSkillDir);
-        const installed = await this.sdk.installSkill({
-            sourceDir: targetSkillDir,
-            name: skillName,
-            apps,
-        });
-        return installed;
-    }
-    async upsertMcpServer(input, apps) {
-        const name = String(input.name || "").trim();
-        if (!name) {
-            return null;
-        }
-        const existingMcps = this.sdk.getAllMcpServers();
-        const existing = existingMcps.find((s) => s.name === name);
-        const serverSpec = {
-            type: input.transport || "stdio",
-            command: input.command,
-            url: input.url,
-            args: input.args,
-            env: input.env,
-        };
-        if (existing) {
-            return this.sdk.updateMcpServer(existing.id, {
-                name,
-                server: serverSpec,
-                apps,
-            });
-        }
-        return this.sdk.createMcpServer({
-            name,
-            server: serverSpec,
-            apps,
-        });
-    }
-    async getState() {
-        return this.loadState();
-    }
-    async updateState(partial) {
-        const state = await this.loadState();
-        Object.assign(state, partial);
-        return this.saveState(state);
-    }
-    async reset() {
-        const paths = this.getPaths();
-        await removeIfExists(paths.stateFile);
-        await removeIfExists(paths.skillsDir);
-        await removeIfExists(paths.mcpDir);
-    }
-}
+import d from"node:path";import{promises as l}from"node:fs";function p(c="inst"){const e=Date.now().toString(36),t=Math.random().toString(36).slice(2,8);return`${c}_${e}_${t}`}async function g(c){try{return await l.access(c),!0}catch{return!1}}async function m(c,e){await l.mkdir(e,{recursive:!0});const t=await l.readdir(c,{withFileTypes:!0});for(const a of t){const n=d.join(c,a.name),s=d.join(e,a.name);a.isDirectory()?await m(n,s):await l.copyFile(n,s)}}async function k(c){try{await l.rm(c,{recursive:!0,force:!0})}catch{}}class f{constructor(e,t,a){this.sdk=e,this.instanceRoot=t,this.workspacePath=a}getPaths(){return{instanceRoot:this.instanceRoot,stateFile:d.join(this.instanceRoot,"instance-state.json"),skillsDir:d.join(this.instanceRoot,"skills"),mcpDir:d.join(this.instanceRoot,"mcp")}}async loadState(){const e=this.getPaths();try{const t=await l.readFile(e.stateFile,"utf-8");return JSON.parse(t)}catch{return{initialized:!1,skills:[],mcpServers:[],enabledApps:[],skillEnabled:!0,mcpEnabled:!0,updatedAt:null}}}async saveState(e){const t=this.getPaths();return e.updatedAt=new Date().toISOString(),await l.mkdir(d.dirname(t.stateFile),{recursive:!0}),await l.writeFile(t.stateFile,JSON.stringify(e,null,2),"utf-8"),e}async ensureInstanceRoot(){await l.mkdir(this.instanceRoot,{recursive:!0})}toAppFlags(e){return{acode:e.includes("acode"),claude:e.includes("claude"),claudecode:e.includes("claudecode"),codex:e.includes("codex"),gemini:e.includes("gemini"),opencode:e.includes("opencode"),openclaw:e.includes("openclaw")}}async initialize(e={}){await this.ensureInstanceRoot();const t=this.getPaths(),a=e.enabledApps??["claudecode","opencode"],n=this.toAppFlags(a),s={ok:!0,instanceId:p(),workspacePath:this.workspacePath,instanceRoot:this.instanceRoot,enabledApps:a,skill:{enabled:e.skillEnabled??!0,packagePresent:!1},mcp:{enabled:e.mcpEnabled??!0}},r=await this.loadState();if(r.initialized=!0,r.enabledApps=a,r.skillEnabled=s.skill.enabled,r.mcpEnabled=s.mcp.enabled,s.skill.enabled){await l.mkdir(t.skillsDir,{recursive:!0});const o=Array.isArray(e.skillPackages)&&e.skillPackages.length>0?e.skillPackages:e.skillPackage?[e.skillPackage]:[],i=[];for(const h of o){const u=await this.installSkillPackage(h,t.skillsDir,n);u&&i.push(u)}i.length>0&&(s.skill.packagePresent=!0,s.skill.installedCount=i.length,s.skill.installed=i,r.skills=i)}if(s.mcp.enabled){const o=Array.isArray(e.mcpServers)?e.mcpServers:[],i=[];for(const h of o){const u=await this.upsertMcpServer(h,n);u&&i.push(u)}i.length>0&&(s.mcp.installedCount=i.length,s.mcp.installed=i,r.mcpServers=i)}return await this.saveState(r),s}async installSkillPackage(e,t,a){const n=e.localPath;if(!n||!await g(n))return null;const s=e.skillName||d.basename(n).replace(/\.skill$/,""),r=p("skill"),o=d.join(t,s);return await m(n,o),await this.sdk.installSkill({sourceDir:o,name:s,apps:a})}async upsertMcpServer(e,t){const a=String(e.name||"").trim();if(!a)return null;const s=this.sdk.getAllMcpServers().find(o=>o.name===a),r={type:e.transport||"stdio",command:e.command,url:e.url,args:e.args,env:e.env};return s?this.sdk.updateMcpServer(s.id,{name:a,server:r,apps:t}):this.sdk.createMcpServer({name:a,server:r,apps:t})}async getState(){return this.loadState()}async updateState(e){const t=await this.loadState();return Object.assign(t,e),this.saveState(t)}async reset(){const e=this.getPaths();await k(e.stateFile),await k(e.skillsDir),await k(e.mcpDir)}}export{f as InstanceService};
+

package/dist/services/instance-state.d.ts

@@ -33,4 +33,3 @@ export declare function saveInstanceState(agentId: string, state: Partial<Instan
  * @returns 初始化根目录路径
  */
 export declare function getAgentInitRoot(agentId: string): string;
-//# sourceMappingURL=instance-state.d.ts.map