aws-runtime-bridge 1.9.40 → 1.9.45

package/dist/routes/sub-agents.js

@@ -46,6 +46,7 @@ subAgentsRouter.get("/sub-agents/:agentId", validateToken, async (req, res) => {
             status: e.status,
             startedAt: e.startedAt,
             contextSnapshot: e.contextSnapshot,
+            availableTools: e.availableTools,
         }));
         const history = allRecords.filter((r) => !runningIds.has(r.subId));
         const doc = await subAgentStore.read(agentId);
@@ -163,6 +164,7 @@ subAgentsRouter.get("/sub-agents/:agentId/:subId", validateToken, async (req, re
                     status: entry.status,
                     startedAt: entry.startedAt,
                     contextSnapshot: entry.contextSnapshot,
+                    availableTools: entry.availableTools,
                 },
             });
             return;
@@ -201,7 +203,18 @@ subAgentsRouter.get("/sub-agents/:agentId/:subId/events", validateToken, async (
         "X-Accel-Buffering": "no", // nginx 关闭缓冲
     });
     res.write(": connected\n\n");
-    // 发送当前状态（如果已存在）
+    // 1. 补发历史 tool 事件（从 store 读取，按时间升序）
+    try {
+        const record = await subAgentStore.get(agentId, subId);
+        const historyEvents = record?.events ?? [];
+        for (const ev of historyEvents) {
+            res.write(`data: ${JSON.stringify(ev)}\n\n`);
+        }
+    }
+    catch (err) {
+        log.error("[sub-agents] 补发历史事件失败: %s", err.message);
+    }
+    // 2. 发送当前状态（如果 entry 仍在内存中）
     const entry = subAgentManager.getSubAgent(subId);
     if (entry) {
         res.write(`data: ${JSON.stringify({
@@ -211,6 +224,7 @@ subAgentsRouter.get("/sub-agents/:agentId/:subId/events", validateToken, async (
             data: { snapshot: entry.contextSnapshot },
         })}\n\n`);
     }
+    // 3. 实时订阅
     const unsubscribe = subAgentManager.subscribe(subId, (event) => {
         res.write(`data: ${JSON.stringify(event)}\n\n`);
     });

package/dist/routes/terminal.d.ts

@@ -59,6 +59,9 @@ export declare function resolveStatusChangeUsage(actionInfo?: RuntimeStatusActio
     inputTokens: number;
     outputTokens: number;
     contextLimit?: number;
+    maxOutput?: number;
+    inputLimit?: number;
+    compactionThreshold?: number;
 } | undefined;
 export declare function resolveStatusChangeRuntimeState(status: string, actionInfo?: RuntimeStatusActionInfo): {
     status: string;
@@ -114,6 +117,18 @@ export interface PersistedSessionReuseDecision {
  * Main flow: require a live PID, then reject in-process providers whose adapter control channel cannot be restored.
  */
 export declare function evaluatePersistedSessionReuse(session: Pick<PersistedSession, "pid"> & Partial<Pick<PersistedSession, "command">>, isPidRunning?: (pid: number) => boolean): PersistedSessionReuseDecision;
+/**
+ * 根据 agentId 清理 SDK 会话的所有内存状态。
+ *
+ * 用于强制停止（force-kill）场景：当进程已被外部/强制手段终止后，
+ * 此函数清理 bridge 内部的内存残留（sdkSessions、statusRefreshTimers、
+ * startingAgents、terminalCommandStates），防止下次启动时
+ * findActiveSdkSessionByAgentId 命中旧条目导致「无法上线」。
+ *
+ * @param agentId - 要清理的 Agent ID
+ * @returns 如果找到并清理了会话则返回 sessionId，否则返回 undefined
+ */
+export declare function cleanupSdkSessionByAgentId(agentId: string): string | undefined;
 /**
  * 生成显示在终端输出流中的工作目录提示符。
  */

package/dist/routes/terminal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/routes/terminal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/routes/terminal.ts"],"names":[],"mappings":"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"}

package/dist/routes/terminal.js

@@ -27,6 +27,56 @@ import { logger as log } from "../utils/logger.js";
 export const terminalRouter = Router();
 // 导出 SDK 会话存储，供其他模块使用（如 sessions.ts）
 export const sdkSessions = new Map();
+// ── 活跃状态定期刷新，防止长时间 LLM 调用期间 WebSocket 心跳超时导致 LOST ──
+/**
+ * 状态刷新间隔（毫秒）。
+ * 服务端 WebSocket 空闲超时默认 60 秒（maxIdleTimeMs），取 45 秒作为刷新周期，
+ * 留出足够的余量防止因网络抖动或事件循环延迟导致的超时。
+ */
+const STATUS_REFRESH_INTERVAL_MS = 45_000;
+/** 每个 session 的定期刷新定时器，仅在 thinking/tool_using/compacting 时运行 */
+const statusRefreshTimers = new Map();
+/**
+ * 启动 session 定期状态刷新。
+ * 每隔 STATUS_REFRESH_INTERVAL_MS 向服务端发送一次当前运行状态，
+ * 刷新服务端 WebSocket 会话的 lastActiveTime，避免长时间无消息导致连接断开 → LOST。
+ */
+function startStatusRefresh(sessionId) {
+    if (statusRefreshTimers.has(sessionId))
+        return;
+    const timer = setInterval(() => {
+        const entry = sdkSessions.get(sessionId);
+        if (!entry) {
+            stopStatusRefresh(sessionId);
+            return;
+        }
+        const status = entry.currentRuntimeStatus;
+        // 仅活跃状态需要刷新：thinking / tool_using / compacting
+        if (status !== "thinking" && status !== "tool_using" && status !== "compacting") {
+            stopStatusRefresh(sessionId);
+            return;
+        }
+        // 发送轻量级状态刷新（不带 actionInfo），保持 WebSocket 会话活跃
+        void sendStatus(entry.agentId, sessionId, status, undefined, // 不传 actionInfo，避免创建额外时间线条目
+        undefined, {
+            runtimeAccessToken: entry.runtimeAccessToken,
+            schedulerBaseUrl: entry.schedulerBaseUrl,
+        }).catch(() => {
+            // sendStatus 失败静默处理，不影响主流程
+        });
+    }, STATUS_REFRESH_INTERVAL_MS);
+    statusRefreshTimers.set(sessionId, timer);
+}
+/**
+ * 停止 session 定期状态刷新。
+ */
+function stopStatusRefresh(sessionId) {
+    const timer = statusRefreshTimers.get(sessionId);
+    if (timer) {
+        clearInterval(timer);
+        statusRefreshTimers.delete(sessionId);
+    }
+}
 const TOOL_RESULT_PREVIEW_MAX_LENGTH = 4000;
 const AI_REQUEST_BODY_MARKER = "\n\n请求体:\n";
 /**
@@ -235,13 +285,23 @@ export function resolveStatusChangeUsage(actionInfo) {
     const outputTokens = Number.isFinite(usage.outputTokens)
         ? usage.outputTokens
         : 0;
-    if (inputTokens <= 0 && outputTokens <= 0 && !usage.contextLimit) {
+    // ★ 即使 input/output token 都为 0（如 session_started 初始状态），只要有任一压缩配置字段也应传出，
+    //   否则前端拿不到 compactionThreshold，压缩点竖线无法显示。
+    if (inputTokens <= 0 &&
+        outputTokens <= 0 &&
+        !usage.contextLimit &&
+        !usage.maxOutput &&
+        !usage.inputLimit &&
+        !usage.compactionThreshold) {
         return undefined;
     }
     const result = {
         inputTokens,
         outputTokens,
         ...(usage.contextLimit ? { contextLimit: usage.contextLimit } : {}),
+        ...(usage.maxOutput ? { maxOutput: usage.maxOutput } : {}),
+        ...(usage.inputLimit ? { inputLimit: usage.inputLimit } : {}),
+        ...(usage.compactionThreshold ? { compactionThreshold: usage.compactionThreshold } : {}),
     };
     return result;
 }
@@ -491,6 +551,46 @@ export function evaluatePersistedSessionReuse(session, isPidRunning = isProcessR
     }
     return { reusable: true, reason: "active-pid" };
 }
+/**
+ * 根据 agentId 清理 SDK 会话的所有内存状态。
+ *
+ * 用于强制停止（force-kill）场景：当进程已被外部/强制手段终止后，
+ * 此函数清理 bridge 内部的内存残留（sdkSessions、statusRefreshTimers、
+ * startingAgents、terminalCommandStates），防止下次启动时
+ * findActiveSdkSessionByAgentId 命中旧条目导致「无法上线」。
+ *
+ * @param agentId - 要清理的 Agent ID
+ * @returns 如果找到并清理了会话则返回 sessionId，否则返回 undefined
+ */
+export function cleanupSdkSessionByAgentId(agentId) {
+    // 1. 从 sdkSessions 查找该 agentId 的会话
+    const entry = findActiveSdkSessionByAgentId(agentId);
+    if (!entry) {
+        // 可能不在 sdkSessions 中但还在 other 状态缓存里，继续清理
+        log.info(`[cleanupSdkSessionByAgentId] No active SDK session found for agentId=${agentId}, cleaning residual state anyway`);
+    }
+    else {
+        const sessionId = entry.sessionId;
+        log.info(`[cleanupSdkSessionByAgentId] Cleaning up SDK session for agentId=${agentId}, sessionId=${sessionId}`);
+        // 2. 停止状态刷新定时器
+        stopStatusRefresh(sessionId);
+        // 3. 从 sdkSessions 中移除
+        sdkSessions.delete(sessionId);
+        // 4. 清理终端命令进程
+        stopTerminalCommandProcess(sessionId);
+        // 5. 清理持久化会话
+        removePersistedSession(sessionId).catch((err) => {
+            log.warn(`[cleanupSdkSessionByAgentId] Failed to remove persisted session for agentId=${agentId}: ${err}`);
+        });
+        return sessionId;
+    }
+    // 6. 确保 startingAgents 锁也被释放（防止 Phase 1 锁定后进程被杀导致锁残留）
+    if (startingAgents.has(agentId)) {
+        startingAgents.delete(agentId);
+        log.info(`[cleanupSdkSessionByAgentId] Released startingAgents lock for agentId=${agentId}`);
+    }
+    return undefined;
+}
 function stopTerminalCommandProcess(sessionId) {
     const state = terminalCommandStates.get(sessionId);
     if (!state?.runningProcess) {
@@ -1091,17 +1191,45 @@ function isWaitingInputProgressEvent(event, currentRuntimeStatus) {
     }
     return event.type === "thinking" || event.type === "text_delta";
 }
+/**
+ * 从事件 data 中提取 estimatedContextTokens（兼容多种字段名）。
+ * 返回 undefined 表示无有效值，使调用方能区分"无数据"和"0"。
+ */
+function extractEstimatedContextTokens(data) {
+    for (const key of [
+        "estimatedContextTokens",
+        "contextTokens",
+        "context_tokens",
+        "contextUsedTokens",
+        "context_used_tokens",
+    ]) {
+        const value = data[key];
+        const count = Number(value);
+        if (Number.isFinite(count) && count > 0) {
+            return count;
+        }
+    }
+    return undefined;
+}
 export function resolveRuntimeStatusFromProviderEvent(event, currentRuntimeStatus) {
     if (isWaitingInputProgressEvent(event, currentRuntimeStatus)) {
         return undefined;
     }
     if (event.type === "ai_request") {
+        // ★ 从 event.data 提取 estimatedContextTokens 构建 usage，
+        //   确保 event handler 路径也能传递 token 用量到前端。
+        //   这对压缩后面板刷新尤为关键：压缩后 ai_request 的 estimatedContextTokens
+        //   反映了压缩后的真实上下文大小，前端据此更新进度条。
+        const estimatedTokens = extractEstimatedContextTokens(event.data);
         return {
             status: "thinking",
             actionInfo: {
                 actionType: "ai_request",
                 actionLabel: "AI请求",
                 actionDetail: formatAiRequestDetail(event.data),
+                ...(estimatedTokens !== undefined
+                    ? { usage: { inputTokens: estimatedTokens, outputTokens: 0 } }
+                    : {}),
             },
         };
     }
@@ -1308,7 +1436,7 @@ function wireSdkAdapterEvents(adapter, definition) {
         const entry = sdkSessions.get(event.sessionId);
         if (entry) {
             console.log(`[${definition.displayName} Adapter] Event: ${event.type} for session ${event.sessionId}`);
-            // Skip sendStatus for thinking/text_delta/tool_use_start/context_compaction events — the status-change
+            // Skip sendStatus for thinking/text_delta/tool_use_start/context_compaction/ai_request events — the status-change
             // listener already emits the authoritative status with restored actionInfo,
             // avoiding duplicate timeline entries in agentEventStore.
             // ★ context_compaction 加入此列表：adapter 对每个压缩事件（start/phase/end）都会同时
@@ -1316,7 +1444,14 @@ function wireSdkAdapterEvents(adapter, definition) {
             //    两条路径都会 sendStatus，导致 Bridge 收到重复事件。虽然前端 seenActionIds 会去重，
             //    但异步 sendStatus 到达顺序不确定，会造成同时间戳事件顺序错乱（如 prune_end 排在 prune_start 前）。
             //    只保留 status-change 路径（含完整 actionId/parentId），确保父子事件正确匹配与排序。
-            const isDeferredStatusEvent = event.type === "thinking" || event.type === "text_delta" || event.type === "tool_use_start" || event.type === "context_compaction";
+            // ★ ai_request 加入此列表（修复 BUG：Agent 永久卡在 "AI请求" 状态）：
+            //    ai_request 同时触发 provider event 路径和 status-change 路径两条 sendStatus，
+            //    而 tool_use_start（编辑文件等）仅通过 status-change 路径发送。
+            //    异步 HTTP 乱序导致 ai_request 的 provider-event sendStatus 可能晚于 tool_use_start 到达，
+            //    覆盖前端状态为 "AI请求"，而时间线正确显示 "编辑文件"。
+            //    将 ai_request 加入 deferred 列表，使其仅通过 status-change 路径发送，
+            //    与 tool_use_start 保持一致，消除双路径竞态。
+            const isDeferredStatusEvent = event.type === "thinking" || event.type === "text_delta" || event.type === "tool_use_start" || event.type === "context_compaction" || event.type === "ai_request";
             if (!isDeferredStatusEvent) {
                 // ★ 修复时序竞争：runtime_capabilities 事件缓存 actionDetail，
                 //   用于 session 稳定后重发（防止 "starting" 状态尚未更新 runtime_session_id
@@ -1355,6 +1490,13 @@ function wireSdkAdapterEvents(adapter, definition) {
     adapter.on("status-change", (sessionId, status, actionInfo) => {
         const entry = sdkSessions.get(sessionId);
         if (entry) {
+            // ★ 活跃状态定期刷新：防止长时间 LLM 调用期间服务端 WebSocket 空闲超时导致 LOST
+            if (status === "thinking" || status === "tool_using" || status === "compacting") {
+                startStatusRefresh(sessionId);
+            }
+            else {
+                stopStatusRefresh(sessionId);
+            }
             const runtimeState = resolveStatusChangeRuntimeState(status, actionInfo);
             entry.currentRuntimeStatus = runtimeState.status;
             // 当新状态未携带动作且进入 thinking 时,保留上一个 idle 类动作(如 poll_message),
@@ -1470,7 +1612,7 @@ function wireSdkAdapterEvents(adapter, definition) {
             void sendQuestionRequest(entry.agentId, data.sessionId, Array.isArray(data.questions) ? data.questions : [], {
                 runtimeAccessToken: entry.runtimeAccessToken,
                 schedulerBaseUrl: entry.schedulerBaseUrl,
-            });
+            }, data.toolCallId);
         }
     });
     adapter.on("permission-request", (data) => {
@@ -1537,7 +1679,9 @@ async function startSdkSession(req, res) {
     // Per-agent model override（优先于全局配置）
     model: perAgentModel, 
     // Per-instance AI provider 覆盖（仅 ACode 消费；优先级：api > env > file > global）
-    instanceAiConfig: perInstanceAiConfig, } = req.body || {};
+    instanceAiConfig: perInstanceAiConfig, 
+    // Sub Agent 模型/强度覆盖（仅 ACode 消费，空值=继承主 Agent）
+    subAgentModel: perAgentSubAgentModel, subAgentEffort: perAgentSubAgentEffort, } = req.body || {};
     const _dbg = getInstanceAiConfigDebugLogger();
     void _dbg.log({
         level: "info",
@@ -1745,6 +1889,13 @@ async function startSdkSession(req, res) {
             ...(resolvedInstanceAiConfig
                 ? { instanceAiConfig: resolvedInstanceAiConfig }
                 : {}),
+            // Sub Agent 模型/强度覆盖（仅 ACode 消费）
+            ...(typeof perAgentSubAgentModel === "string" && perAgentSubAgentModel.trim()
+                ? { subAgentModel: perAgentSubAgentModel.trim() }
+                : {}),
+            ...(typeof perAgentSubAgentEffort === "string" && perAgentSubAgentEffort.trim()
+                ? { subAgentEffort: perAgentSubAgentEffort.trim() }
+                : {}),
             extraMcpServers: extraMcpServers || {},
             envOverrides: buildRuntimeEnv(String(agentId), String(workspacePath), process.env, effectiveEnvOverrides),
         };
@@ -1799,6 +1950,7 @@ async function startSdkSession(req, res) {
     catch (error) {
         // 同步错误处理（校验失败等）
         if (sessionId) {
+            stopStatusRefresh(sessionId);
             sdkSessions.delete(sessionId);
         }
         if (normalizedAgentId) {
@@ -1890,6 +2042,7 @@ async function startSdkSessionBg(params) {
     }
     catch (error) {
         // 后台启动失败：清理本地状态 + 通知 server
+        stopStatusRefresh(sessionId);
         sdkSessions.delete(sessionId);
         await removePersistedSession(sessionId);
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -2091,6 +2244,7 @@ terminalRouter.post("/sdk/stop", validateToken, async (req, res) => {
         // 如果有活跃 AI 请求，先立即中止（fire-and-forget），再清理资源
         adapter.abortCurrentTurn(sessionId).catch(() => { });
         await adapter.terminateSession(sessionId);
+        stopStatusRefresh(sessionId);
         sdkSessions.delete(sessionId);
         stopTerminalCommandProcess(sessionId);
         await removePersistedSession(sessionId);
@@ -2210,6 +2364,7 @@ terminalRouter.get("/sdk/pending-questions/:sessionId", validateToken, (req, res
             agentId: entry.agentId,
             pendingQuestion: pendingQuestion
                 ? {
+                    toolCallId: pendingQuestion.toolCallId,
                     questions: pendingQuestion.questions,
                 }
                 : null,
@@ -2425,6 +2580,7 @@ terminalRouter.post("/stop", validateToken, async (req, res) => {
         // 如果有活跃 AI 请求，先立即中止（fire-and-forget），再清理资源
         adapter.abortCurrentTurn(sessionId).catch(() => { });
         await adapter.terminateSession(sessionId);
+        stopStatusRefresh(sessionId);
         sdkSessions.delete(sessionId);
         stopTerminalCommandProcess(sessionId);
         await removePersistedSession(sessionId);
@@ -2475,6 +2631,7 @@ terminalRouter.post("/stop-all", validateToken, async (_req, res) => {
             // 如果有活跃 AI 请求，先立即中止（fire-and-forget），再清理资源
             adapter.abortCurrentTurn(sessionId).catch(() => { });
             await adapter.terminateSession(sessionId);
+            stopStatusRefresh(sessionId);
             sdkSessions.delete(sessionId);
             stopTerminalCommandProcess(sessionId);
             stoppedSdk.push(sessionId);

package/dist/services/acode-package.d.ts

@@ -1,7 +1,14 @@
+/**
+ * 获取 ACode 入口文件路径。
+ * 本地开发模式：直接使用项目下 package/acode/dist/index.js（修改即生效，无需复制）。
+ * 部署模式：~/.aws-bridge/acode/dist/index.js。
+ */
 export declare function getReleasedAcodeEntryPath(): string;
 /**
  * 释放随 bridge 打包的内置 ACode runtime。
- * 主流程：检查 bundled dist -> 复制 dist 与 metadata -> 链接 bridge node_modules，
+ *
+ * 本地开发模式：直接使用项目下 package/acode/dist，跳过复制（修改源码后重新 build 即生效）。
+ * 部署模式：复制 dist 与 metadata 到 ~/.aws-bridge/acode，链接 bridge node_modules，
  * 确保 ACode 无需安装即可被 Adapter 动态加载。
  */
 export declare function ensureAcodePackageReleased(): string | null;

package/dist/services/acode-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acode-package.d.ts","sourceRoot":"","sources":["../../src/services/acode-package.ts"],"names":[],"mappings":"AAyDA,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,GAAG,IAAI,CAwB1D"}
+{"version":3,"file":"acode-package.d.ts","sourceRoot":"","sources":["../../src/services/acode-package.ts"],"names":[],"mappings":"AAqEA;;;;GAIG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CAMlD;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,GAAG,IAAI,CAgC1D"}

package/dist/services/acode-package.js

@@ -10,8 +10,19 @@ function getBridgePackageRoot() {
 function getBundledAcodeRoot(packageRoot = getBridgePackageRoot()) {
     return path.join(packageRoot, 'package', 'acode');
 }
+/**
+ * 判断当前是否为本地开发模式（从项目源码目录运行）。
+ * 本地开发模式下 bridge packageRoot 下存在 src/ 目录，部署产物只有 dist/。
+ */
+function isLocalDevMode(packageRoot = getBridgePackageRoot()) {
+    return existsSync(path.join(packageRoot, 'src'));
+}
+/**
+ * 部署模式下的 released 根目录：~/.aws-bridge/acode
+ * 与 aws-client-agent-mcp 的 ~/.aws-bridge/mcp 路径保持一致。
+ */
 function getReleasedAcodeRoot() {
-    return path.join(getRuntimeHomeDir(), '.agentswork', 'runtime-bridge', 'packages', 'acode');
+    return path.join(getRuntimeHomeDir(), '.aws-bridge', 'acode');
 }
 function shouldReplaceNodeModulesLink(targetPath) {
     if (!existsSync(targetPath)) {
@@ -48,12 +59,23 @@ function ensureReleasedNodeModules(packageRoot, releasedRoot) {
     rmSync(releasedNodeModules, { recursive: true, force: true });
     symlinkSync(sourceNodeModules, releasedNodeModules, process.platform === 'win32' ? 'junction' : 'dir');
 }
+/**
+ * 获取 ACode 入口文件路径。
+ * 本地开发模式：直接使用项目下 package/acode/dist/index.js（修改即生效，无需复制）。
+ * 部署模式：~/.aws-bridge/acode/dist/index.js。
+ */
 export function getReleasedAcodeEntryPath() {
+    const packageRoot = getBridgePackageRoot();
+    if (isLocalDevMode(packageRoot)) {
+        return path.join(getBundledAcodeRoot(packageRoot), 'dist', 'index.js');
+    }
     return path.join(getReleasedAcodeRoot(), 'dist', 'index.js');
 }
 /**
  * 释放随 bridge 打包的内置 ACode runtime。
- * 主流程：检查 bundled dist -> 复制 dist 与 metadata -> 链接 bridge node_modules，
+ *
+ * 本地开发模式：直接使用项目下 package/acode/dist，跳过复制（修改源码后重新 build 即生效）。
+ * 部署模式：复制 dist 与 metadata 到 ~/.aws-bridge/acode，链接 bridge node_modules，
  * 确保 ACode 无需安装即可被 Adapter 动态加载。
  */
 export function ensureAcodePackageReleased() {
@@ -65,6 +87,12 @@ export function ensureAcodePackageReleased() {
         logger.warn(`[runtime-bridge] 未找到 bundled ACode dist，ACode 启动可能失败: ${bundledEntry}`);
         return null;
     }
+    // 本地开发模式：直接使用项目下 dist，无需复制
+    if (isLocalDevMode(packageRoot)) {
+        logger.info(`[runtime-bridge] ACode 本地开发模式，直接使用项目 dist: ${bundledEntry}`);
+        return bundledEntry;
+    }
+    // 部署模式：复制到 ~/.aws-bridge/acode
     const releasedRoot = getReleasedAcodeRoot();
     const releasedDist = path.join(releasedRoot, 'dist');
     mkdirSync(releasedRoot, { recursive: true });
@@ -77,6 +105,7 @@ export function ensureAcodePackageReleased() {
         }
     }
     ensureReleasedNodeModules(packageRoot, releasedRoot);
-    logger.info(`[runtime-bridge] ACode 已准备: ${getReleasedAcodeEntryPath()}`);
-    return getReleasedAcodeEntryPath();
+    const releasedEntry = path.join(releasedDist, 'index.js');
+    logger.info(`[runtime-bridge] ACode 已准备: ${releasedEntry}`);
+    return releasedEntry;
 }

package/dist/services/aws-client-agent-mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aws-client-agent-mcp.d.ts","sourceRoot":"","sources":["../../src/services/aws-client-agent-mcp.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAqB7C,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,sCAAsC;IACrD,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,sCAAsC;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAaD,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;CAC3C;AAuBD,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C;AAgLD,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,MAAM,GAAG,IAAI,CAoDf;AAgGD,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAEpB;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,uBAAuB,GAC7B,kBAAkB,CAsBpB;AAED,wBAAgB,+BAA+B,IAAI,IAAI,CAgBtD"}
+{"version":3,"file":"aws-client-agent-mcp.d.ts","sourceRoot":"","sources":["../../src/services/aws-client-agent-mcp.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAqB7C,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,sCAAsC;IACrD,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,sCAAsC;IACrD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAaD,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC3D,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;CAC3C;AAuBD,wBAAgB,sBAAsB,IAAI,MAAM,CAE/C;AAgLD,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,MAAM,GAAG,IAAI,CA+Df;AAgGD,wBAAgB,+BAA+B,CAC7C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAEpB;AAED,wBAAgB,gCAAgC,CAC9C,OAAO,GAAE,sCAA2C,GACnD,kBAAkB,CAsBpB;AAED,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,uBAAuB,GAC7B,kBAAkB,CAsBpB;AAED,wBAAgB,+BAA+B,IAAI,IAAI,CAgBtD"}

package/dist/services/aws-client-agent-mcp.js

@@ -172,13 +172,20 @@ function shouldRefreshReleasedMcp(releasedEntry, manifest, nextManifest) {
 }
 export function releaseBundledAwsClientAgentMcp(options = {}) {
     const packageRoot = options.packageRoot || getPackageRoot();
-    const releasedRoot = options.releasedRoot || getReleasedMcpRoot();
     const bundledDist = path.dirname(getBundledEntryPath(packageRoot));
-    const releasedDist = path.join(releasedRoot, "dist");
-    const releasedEntry = path.join(releasedDist, "index.js");
-    if (!existsSync(path.join(bundledDist, "index.js"))) {
+    const bundledEntry = path.join(bundledDist, "index.js");
+    if (!existsSync(bundledEntry)) {
         return null;
     }
+    // 本地开发模式：直接使用项目下 dist，无需复制
+    if (existsSync(path.join(packageRoot, "src"))) {
+        logger.info(`[runtime-bridge] ${AWS_MCP_SERVER_NAME} MCP 本地开发模式，直接使用项目 dist: ${bundledEntry}`);
+        return bundledEntry;
+    }
+    // 部署模式：复制到 ~/.aws-bridge/mcp
+    const releasedRoot = options.releasedRoot || getReleasedMcpRoot();
+    const releasedDist = path.join(releasedRoot, "dist");
+    const releasedEntry = path.join(releasedDist, "index.js");
     const nextManifest = {
         bridgeVersion: getBridgeVersion(packageRoot),
         mcpVersion: getBundledMcpVersion(packageRoot),

package/dist/services/fileSnapshotStore.js

@@ -18,7 +18,7 @@ function resolveSnapshotRoot() {
     const envRoot = String(process.env.AWS_RUNTIME_SNAPSHOT_ROOT || "").trim();
     if (envRoot)
         return envRoot;
-    return path.join(homedir(), ".agentswork", "snapshots");
+    return path.join(homedir(), ".aws-bridge", "snapshots");
 }
 /** 快照操作超时（毫秒），默认 120s */
 function resolveSnapshotTimeoutMs() {

package/dist/services/legacy-path-migration.d.ts

@@ -0,0 +1,3 @@
+/** 启动时调用：迁移所有旧路径配置 */
+export declare function migrateOldPathsOnStartup(): void;
+//# sourceMappingURL=legacy-path-migration.d.ts.map

package/dist/services/legacy-path-migration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy-path-migration.d.ts","sourceRoot":"","sources":["../../src/services/legacy-path-migration.ts"],"names":[],"mappings":"AAwDA,sBAAsB;AACtB,wBAAgB,wBAAwB,IAAI,IAAI,CAc/C"}

package/dist/services/legacy-path-migration.js

@@ -0,0 +1,66 @@
+/**
+ * 旧路径迁移：将 ~/.agentswork/ 下的全局配置文件迁移到 ~/.aws-bridge/。
+ *
+ * 迁移范围：
+ *   1. binding.json、runtime-tokens.properties（由 migrateOldBindingDir 处理）
+ *   2. lifecycle-state.json
+ *   3. snapshots/ 目录
+ *
+ * 仅在旧路径存在且新路径不存在时执行，避免覆盖已有配置。
+ * 迁移后旧文件保留不动。
+ */
+import { existsSync, mkdirSync, copyFileSync, readdirSync } from "node:fs";
+import path from "node:path";
+import { getRuntimeHomeDir } from "../config.js";
+import { createLogger } from "../utils/logger.js";
+import { migrateOldBindingDir } from "./runtime-binding.js";
+const log = createLogger("legacy-path-migration");
+function oldRootDir() {
+    return path.join(getRuntimeHomeDir(), ".agentswork", "runtime-bridge");
+}
+function newRootDir() {
+    return path.join(getRuntimeHomeDir(), ".aws-bridge");
+}
+function migrateLifecycleState() {
+    const oldFile = path.join(oldRootDir(), "lifecycle-state.json");
+    const newFile = path.join(newRootDir(), "lifecycle-state.json");
+    if (existsSync(oldFile) && !existsSync(newFile)) {
+        mkdirSync(newRootDir(), { recursive: true });
+        copyFileSync(oldFile, newFile);
+        log.info(`[runtime-bridge] 已迁移 lifecycle-state.json → ${newFile}`);
+    }
+}
+function migrateSnapshots() {
+    const oldDir = path.join(getRuntimeHomeDir(), ".agentswork", "snapshots");
+    const newDir = path.join(newRootDir(), "snapshots");
+    if (existsSync(oldDir) && !existsSync(newDir)) {
+        mkdirSync(newDir, { recursive: true });
+        try {
+            const entries = readdirSync(oldDir);
+            for (const entry of entries) {
+                const src = path.join(oldDir, entry);
+                const dest = path.join(newDir, entry);
+                copyFileSync(src, dest);
+            }
+            log.info(`[runtime-bridge] 已迁移 snapshots/ 到 ${newDir}`);
+        }
+        catch {
+            log.warn(`[runtime-bridge] snapshots/ 迁移失败（部分文件可能被跳过）`);
+        }
+    }
+}
+/** 启动时调用：迁移所有旧路径配置 */
+export function migrateOldPathsOnStartup() {
+    // 旧目录不存在则跳过
+    const oldRoot = oldRootDir();
+    if (!existsSync(oldRoot)) {
+        const oldSnapshots = path.join(getRuntimeHomeDir(), ".agentswork", "snapshots");
+        if (!existsSync(oldSnapshots)) {
+            return;
+        }
+    }
+    log.info("[runtime-bridge] 检测到旧路径 ~/.agentswork/，正在迁移到 ~/.aws-bridge/ ...");
+    migrateOldBindingDir();
+    migrateLifecycleState();
+    migrateSnapshots();
+}

package/dist/services/lifecycle-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle-state.d.ts","sourceRoot":"","sources":["../../src/services/lifecycle-state.ts"],"names":[],"mappings":"AAcA,MAAM,MAAM,4BAA4B,GAAG,QAAQ,GAAG,SAAS,CAAC;AAChE,MAAM,MAAM,8BAA8B,GACtC,UAAU,GACV,SAAS,GACT,WAAW,GACX,QAAQ,GACR,mBAAmB,CAAC;AAExB,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,4BAA4B,CAAC;IAC5C,MAAM,EAAE,8BAA8B,CAAC;IACvC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAuCD,wBAAgB,8BAA8B,CAAC,KAAK,EAAE;IACpD,aAAa,EAAE,4BAA4B,CAAC;IAC5C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,MAAM,CAAC,EAAE,8BAA8B,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,wBAAwB,CAgB3B;AAED,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,wBAAwB,GAClC,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,8BAA8B,CAClD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAKf;AAiCD;;;GAGG;AACH,wBAAsB,0CAA0C,IAAI,OAAO,CAAC,IAAI,CAAC,CA2BhF"}
+{"version":3,"file":"lifecycle-state.d.ts","sourceRoot":"","sources":["../../src/services/lifecycle-state.ts"],"names":[],"mappings":"AAcA,MAAM,MAAM,4BAA4B,GAAG,QAAQ,GAAG,SAAS,CAAC;AAChE,MAAM,MAAM,8BAA8B,GACtC,UAAU,GACV,SAAS,GACT,WAAW,GACX,QAAQ,GACR,mBAAmB,CAAC;AAExB,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,4BAA4B,CAAC;IAC5C,MAAM,EAAE,8BAA8B,CAAC;IACvC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAsCD,wBAAgB,8BAA8B,CAAC,KAAK,EAAE;IACpD,aAAa,EAAE,4BAA4B,CAAC;IAC5C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,MAAM,CAAC,EAAE,8BAA8B,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,wBAAwB,CAgB3B;AAED,wBAAsB,8BAA8B,CAClD,SAAS,EAAE,wBAAwB,GAClC,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,8BAA8B,CAClD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAKf;AAiCD;;;GAGG;AACH,wBAAsB,0CAA0C,IAAI,OAAO,CAAC,IAAI,CAAC,CA2BhF"}

package/dist/services/lifecycle-state.js

@@ -7,7 +7,7 @@ import { getRuntimeAccessToken, loadRuntimeBinding, normalizeSchedulerBaseUrl, }
 import { createLogger } from "../utils/logger.js";
 const log = createLogger("bridge-lifecycle");
 function lifecycleStateFile() {
-    return path.join(getRuntimeHomeDir(), ".agentswork", "runtime-bridge", "lifecycle-state.json");
+    return path.join(getRuntimeHomeDir(), ".aws-bridge", "lifecycle-state.json");
 }
 function normalizeText(value) {
     const normalized = String(value || "").trim();

package/dist/services/runtime-binding.d.ts

@@ -41,4 +41,9 @@ export declare function saveRuntimeBinding(input: {
     schedulerBaseUrl?: string;
 }): RuntimeBindingState;
 export declare function clearRuntimeBinding(): void;
+/**
+ * 将旧路径 ~/.agentswork/runtime-bridge/ 下的配置文件迁移到新路径 ~/.aws-bridge/。
+ * 仅在旧路径存在且新路径不存在时执行，避免覆盖已有配置。
+ */
+export declare function migrateOldBindingDir(): void;
 //# sourceMappingURL=runtime-binding.d.ts.map

package/dist/services/runtime-binding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-binding.d.ts","sourceRoot":"","sources":["../../src/services/runtime-binding.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,UAAU,GAAG,QAAQ,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAmEF,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAqB5E;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAED,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,wBAAgB,4BAA4B,IAAI,MAAM,CAErD;AAiCD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,OAAO,EACf,aAAa,EAAE,OAAO,GACrB,MAAM,CAYR;AAsCD,wBAAgB,4BAA4B,CAAC,KAAK,EAAE;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAWT;AAED,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,OAAO,EACf,aAAa,EAAE,OAAO,GACrB,MAAM,GAAG,SAAS,CAUpB;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,OAAO,EACf,aAAa,EAAE,OAAO,GACrB,OAAO,CAeT;AAcD,wBAAgB,kBAAkB,IAAI,mBAAmB,CAgBxD;AAED,wBAAgB,4BAA4B,IAAI,IAAI,CAClD,mBAAmB,EACnB,WAAW,GAAG,aAAa,CAC5B,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,CAWtB;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAG3C;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAcnE;AAED,wBAAgB,qBAAqB,CACnC,MAAM,CAAC,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,OAAO,GACtB,MAAM,GAAG,SAAS,CAyBpB;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAEjE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,GAAG,mBAAmB,CAwCtB;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAkB1C"}
+{"version":3,"file":"runtime-binding.d.ts","sourceRoot":"","sources":["../../src/services/runtime-binding.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,UAAU,GAAG,QAAQ,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAmEF,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAqB5E;AAED,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAED,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,wBAAgB,4BAA4B,IAAI,MAAM,CAErD;AAiCD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,OAAO,EACf,aAAa,EAAE,OAAO,GACrB,MAAM,CAYR;AAsCD,wBAAgB,4BAA4B,CAAC,KAAK,EAAE;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,MAAM,CAWT;AAED,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,OAAO,EACf,aAAa,EAAE,OAAO,GACrB,MAAM,GAAG,SAAS,CAUpB;AAED,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,OAAO,EACf,aAAa,EAAE,OAAO,GACrB,OAAO,CAeT;AAcD,wBAAgB,kBAAkB,IAAI,mBAAmB,CAgBxD;AAED,wBAAgB,4BAA4B,IAAI,IAAI,CAClD,mBAAmB,EACnB,WAAW,GAAG,aAAa,CAC5B,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,CAWtB;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAG3C;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAcnE;AAED,wBAAgB,qBAAqB,CACnC,MAAM,CAAC,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,OAAO,GACtB,MAAM,GAAG,SAAS,CAyBpB;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAEjE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,GAAG,mBAAmB,CAwCtB;AAED,wBAAgB,mBAAmB,IAAI,IAAI,CAkB1C;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CA0B3C"}