aws-runtime-bridge 1.9.9 → 1.9.20

package/dist/adapter/AcodeSdkAdapter.test.js

@@ -1,5 +1,5 @@
 import { EventEmitter } from "node:events";
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
 import { AcodeSdkAdapter, isFailedAcodeTurnComplete, } from "./AcodeSdkAdapter.js";
 class FailedTurnRuntime extends EventEmitter {
     constructor(config) {
@@ -837,7 +837,7 @@ describe("AcodeSdkAdapter turn completion state", () => {
             type: "turn_complete",
             data: { usage: { inputTokens: 31, outputTokens: 58 } },
         });
-        expect(statuses.at(-1)).toEqual({
+        expect(statuses.at(-1)).toMatchObject({
             status: "waiting_input",
             usage: { inputTokens: 31, outputTokens: 58 },
         });
@@ -862,7 +862,7 @@ describe("AcodeSdkAdapter turn completion state", () => {
             });
             await adapter.sendMessage("session-reset-context", "finish work");
             expect(adapter.getConversation("session-reset-context")).toHaveLength(2);
-            expect(statuses.at(-1)).toEqual({
+            expect(statuses.at(-1)).toMatchObject({
                 status: "waiting_input",
                 usage: { inputTokens: 7, outputTokens: 3 },
             });
@@ -872,7 +872,7 @@ describe("AcodeSdkAdapter turn completion state", () => {
             expect(adapter.hasSession("session-reset-context")).toBe(true);
             expect(adapter.getSessionStatus("session-reset-context")).toBe("waiting_input");
             expect(adapter.getConversation("session-reset-context")).toEqual([]);
-            expect(statuses.at(-1)).toEqual({
+            expect(statuses.at(-1)).toMatchObject({
                 status: "waiting_input",
                 usage: { inputTokens: 0, outputTokens: 0 },
             });
@@ -1157,10 +1157,12 @@ describe("AcodeSdkAdapter turn completion state", () => {
                 requestBody: '{"model":"test-model"}',
             },
         });
-        expect(statuses).toContainEqual({
-            status: "thinking",
-            usage: { inputTokens: 6800, outputTokens: 0 },
-        });
+        expect(statuses).toEqual(expect.arrayContaining([
+            expect.objectContaining({
+                status: "thinking",
+                usage: expect.objectContaining({ inputTokens: 6800, outputTokens: 0 }),
+            }),
+        ]));
     });
     it("forwards ACode thinking deltas as realtime thinking provider events", async () => {
         const adapter = new AcodeSdkAdapter();
@@ -1851,3 +1853,148 @@ describe("AcodeSdkAdapter turn completion state", () => {
         }
     });
 });
+/**
+ * 用于验证 AcodeSdkAdapter 在 startSession 阶段传给 ACodeRuntime 的 config 是否符合
+ * "instance > global > default" 优先级。Stub 会在构造时把 model / configPath 缓存到
+ * lastConfig 供断言读取。
+ */
+class CapturingConfigRuntime extends EventEmitter {
+    constructor(config) {
+        super();
+        CapturingConfigRuntime.lastConfig = { ...config };
+    }
+    async start() { }
+    async submit(_message) { }
+    async abort() { }
+    async stop() { }
+}
+describe("AcodeSdkAdapter instance AI configuration priority", () => {
+    let tempDir;
+    let globalAcodePath;
+    let perInstanceAcodePath;
+    beforeEach(async () => {
+        const { mkdir, mkdtemp, writeFile } = await import("node:fs/promises");
+        const os = await import("node:os");
+        const path = await import("node:path");
+        tempDir = await mkdtemp(path.join(os.tmpdir(), "acode-adapter-ai-"));
+        globalAcodePath = path.join(tempDir, "global", ".acode", "config.json");
+        perInstanceAcodePath = path.join(tempDir, "instance-acode-config.json");
+        await mkdir(path.dirname(globalAcodePath), { recursive: true });
+        await writeFile(globalAcodePath, JSON.stringify({
+            provider: {
+                default: {
+                    model: "global-model",
+                    options: {
+                        baseURL: "https://global.example.com/v1",
+                        apiKey: "sk-global",
+                    },
+                },
+            },
+        }), "utf-8");
+        process.env.AWS_RUNTIME_HOME_DIR = tempDir;
+        process.env.AWS_RUNTIME_ACODE_CONFIG_FILE = globalAcodePath;
+    });
+    afterEach(async () => {
+        const { rm } = await import("node:fs/promises");
+        delete process.env.AWS_RUNTIME_HOME_DIR;
+        delete process.env.AWS_RUNTIME_ACODE_CONFIG_FILE;
+        CapturingConfigRuntime.lastConfig = undefined;
+        await rm(tempDir, { recursive: true, force: true });
+    });
+    it("无 instance 覆盖时使用全局 acode.json 的 model 与 configPath", async () => {
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(CapturingConfigRuntime);
+        await adapter.startSession("s-default", {
+            command: "acode",
+            workingDirectory: process.cwd(),
+            autoAccept: true,
+            extraMcpServers: {},
+            envOverrides: {},
+        });
+        expect(CapturingConfigRuntime.lastConfig?.configPath).toBe(globalAcodePath);
+        expect(CapturingConfigRuntime.lastConfig?.model).toBe("global-model");
+        adapter.cleanup();
+    });
+    it("per-instance instanceAiConfig.model 覆盖全局 model", async () => {
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(CapturingConfigRuntime);
+        await adapter.startSession("s-instance-model", {
+            command: "acode",
+            workingDirectory: process.cwd(),
+            autoAccept: true,
+            mcpConfigPath: perInstanceAcodePath,
+            instanceAiConfig: { model: "instance-model" },
+            extraMcpServers: {},
+            envOverrides: {},
+        });
+        // 没有 per-instance 文件时，adapter 仍使用调用方传入的 mcpConfigPath
+        expect(CapturingConfigRuntime.lastConfig?.configPath).toBe(perInstanceAcodePath);
+        expect(CapturingConfigRuntime.lastConfig?.model).toBe("instance-model");
+        adapter.cleanup();
+    });
+    it("per-instance 文件已 deep-merge 时，baseURL/apiKey 从文件读取（instance 优先）", async () => {
+        const { writeFile } = await import("node:fs/promises");
+        await writeFile(perInstanceAcodePath, JSON.stringify({
+            provider: {
+                default: {
+                    model: "instance-file-model",
+                    options: {
+                        baseURL: "https://instance.example.com/v1",
+                        apiKey: "sk-instance",
+                    },
+                },
+            },
+            mcpServers: { "kept-from-global": { type: "stdio", command: "x" } },
+        }), "utf-8");
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(CapturingConfigRuntime);
+        await adapter.startSession("s-instance-file", {
+            command: "acode",
+            workingDirectory: process.cwd(),
+            autoAccept: true,
+            mcpConfigPath: perInstanceAcodePath,
+            extraMcpServers: {},
+            envOverrides: {},
+        });
+        expect(CapturingConfigRuntime.lastConfig?.configPath).toBe(perInstanceAcodePath);
+        // model 走 per-instance 文件的 provider.default.model
+        expect(CapturingConfigRuntime.lastConfig?.model).toBe("instance-file-model");
+        adapter.cleanup();
+    });
+    it("per-session model 优先于 per-instance file model 与全局", async () => {
+        const { writeFile } = await import("node:fs/promises");
+        await writeFile(perInstanceAcodePath, JSON.stringify({
+            provider: {
+                default: { model: "instance-file-model" },
+            },
+        }), "utf-8");
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(CapturingConfigRuntime);
+        await adapter.startSession("s-session-wins", {
+            command: "acode",
+            workingDirectory: process.cwd(),
+            autoAccept: true,
+            mcpConfigPath: perInstanceAcodePath,
+            model: "session-model",
+            extraMcpServers: {},
+            envOverrides: {},
+        });
+        expect(CapturingConfigRuntime.lastConfig?.model).toBe("session-model");
+        adapter.cleanup();
+    });
+    it("全空时回退默认 'acode-default'", async () => {
+        const adapter = new AcodeSdkAdapter();
+        adapter.setRuntimeConstructorForTest(CapturingConfigRuntime);
+        await adapter.startSession("s-all-empty", {
+            command: "acode",
+            workingDirectory: process.cwd(),
+            autoAccept: true,
+            // 指向一个不存在的 per-instance 文件，模拟 instance & global 都为空
+            mcpConfigPath: perInstanceAcodePath,
+            extraMcpServers: {},
+            envOverrides: {},
+        });
+        expect(CapturingConfigRuntime.lastConfig?.model).toBe("acode-default");
+        adapter.cleanup();
+    });
+});

package/dist/adapter/OpencodeSdkAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpencodeSdkAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/OpencodeSdkAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAiB3C,OAAO,EAKL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EAExB,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AA4GpB,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,mBAAmB;IACjF,QAAQ,CAAC,UAAU,cAAc;IACjC,QAAQ,CAAC,WAAW,cAAc;IAElC,OAAO,CAAC,QAAQ,CAA2C;IAC3D,OAAO,CAAC,SAAS,CAAC,CAAoB;IAEhC,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IA+I5E,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA0CzG,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBnE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7F,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAUnG,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAclD,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BxD,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,EAAE;IAIzD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAItC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI3D,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI9D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAOpD,OAAO,IAAI,IAAI;IAaf;;;OAGG;YACW,OAAO;YA2BP,aAAa;IAmB3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAahC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,YAAY;YAYN,UAAU;IAuBxB,OAAO,CAAC,mBAAmB;IA6H3B,OAAO,CAAC,gBAAgB;IAkHxB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kBAAkB;IAuC1B,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,2BAA2B;CAOpC"}
+{"version":3,"file":"OpencodeSdkAdapter.d.ts","sourceRoot":"","sources":["../../src/adapter/OpencodeSdkAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAiB3C,OAAO,EAKL,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EAExB,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AA8HpB,qBAAa,kBAAmB,SAAQ,YAAa,YAAW,mBAAmB;IACjF,QAAQ,CAAC,UAAU,cAAc;IACjC,QAAQ,CAAC,WAAW,cAAc;IAElC,OAAO,CAAC,QAAQ,CAA2C;IAC3D,OAAO,CAAC,SAAS,CAAC,CAAoB;IAEhC,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IA2J5E,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,iBAAiB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDzG,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBnE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7F,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAUnG,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAclD,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BxD,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,mBAAmB,EAAE;IAIzD,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAItC,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI3D,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI9D,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAOpD,OAAO,IAAI,IAAI;IAaf;;;OAGG;YACW,OAAO;YA2BP,aAAa;IAmB3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAO3B;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAahC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,YAAY;YAYN,UAAU;IAuBxB,OAAO,CAAC,mBAAmB;IA6H3B,OAAO,CAAC,gBAAgB;IAkHxB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,kBAAkB;IAuC1B,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,2BAA2B;CAOpC"}

package/dist/adapter/OpencodeSdkAdapter.js

@@ -84,6 +84,23 @@ function hasErrorCode(error) {
 function isMissingPackageError(error, packageName) {
     return hasErrorCode(error) && error.code === 'ERR_MODULE_NOT_FOUND' && error.message.includes(packageName);
 }
+// ============ 模型解析 ============
+/**
+ * 解析 OpenCode 模型规格。
+ * OpenCode 原生格式为 "provider/model"（如 "anthropic/claude-sonnet-4-5"）。
+ * 若用户只提供模型名（不含 "/"），则仅返回 modelID，providerID 留空让 OpenCode 自动选择。
+ */
+function parseOpenCodeModelSpec(model) {
+    if (!model || !model.trim())
+        return undefined;
+    const trimmed = model.trim();
+    const slashIndex = trimmed.indexOf('/');
+    if (slashIndex > 0) {
+        return { providerID: trimmed.slice(0, slashIndex), modelID: trimmed.slice(slashIndex + 1) };
+    }
+    // 纯模型名，无 provider 前缀
+    return { modelID: trimmed };
+}
 // ============ Adapter ============
 export class OpencodeSdkAdapter extends EventEmitter {
     constructor() {
@@ -127,6 +144,14 @@ export class OpencodeSdkAdapter extends EventEmitter {
                 (process.platform === 'win32' && !path.isAbsolute(openCodeCommand));
             console.log(`[OpencodeSdkAdapter] shell=${useShell}`);
             const env = { ...process.env, ...config.envOverrides };
+            // ★ 实例级模型覆盖：通过 OPENCODE_CONFIG_CONTENT 注入（OpenCode 标准 inline config，优先级 6）
+            // 参考：https://opencode.ai/docs/config/ — "Inline config (OPENCODE_CONFIG_CONTENT env var) - runtime overrides"
+            const parsedModel = parseOpenCodeModelSpec(config.model);
+            if (parsedModel?.modelID) {
+                const inlineConfig = { model: config.model.trim() };
+                env.OPENCODE_CONFIG_CONTENT = JSON.stringify(inlineConfig);
+                console.log(`[OpencodeSdkAdapter] ★★★ 实例级模型覆盖 ★★★ OPENCODE_CONFIG_CONTENT=${env.OPENCODE_CONFIG_CONTENT}`);
+            }
             const proc = spawn(openCodeCommand, ['serve', '--port', String(port)], {
                 cwd: config.workingDirectory,
                 stdio: ['ignore', 'pipe', 'pipe'],
@@ -236,11 +261,19 @@ export class OpencodeSdkAdapter extends EventEmitter {
             this.stopIdleDetection(sessionId);
         }
         try {
+            // ★ 实例级模型覆盖：per-message model override
+            // 仅当模型含 "provider/model" 格式时传入（OpenCode SDK 要求 providerID + modelID）
+            const parsedModel = parseOpenCodeModelSpec(session.config.model);
+            const promptBody = {
+                parts: [{ type: 'text', text: message }],
+            };
+            if (parsedModel?.providerID && parsedModel?.modelID) {
+                promptBody.model = { providerID: parsedModel.providerID, modelID: parsedModel.modelID };
+                console.log(`[OpencodeSdkAdapter] ★★★ per-message model ★★★ provider=${parsedModel.providerID}, model=${parsedModel.modelID}`);
+            }
             await session.client.session.prompt({
                 path: { id: session.opencodeSessionId },
-                body: {
-                    parts: [{ type: 'text', text: message }],
-                },
+                body: promptBody,
                 query: { directory: session.workingDirectory },
             });
         }

package/dist/adapter/instance-ai-config-resolver.d.ts

@@ -0,0 +1,49 @@
+/**
+ * Instance AI 配置仲裁器
+ *
+ * 按 "instance > global > default" 三层优先级仲裁 ACode 的
+ * model/baseURL/apiKey 配置。
+ */
+/**
+ * 实例级 AI 配置（来自 per-session model + per-instance instanceAiConfig）。
+ */
+export interface InstanceAiConfig {
+    model?: string;
+    baseURL?: string;
+    apiKey?: string;
+    effort?: string;
+}
+/**
+ * 仲裁结果。
+ */
+export interface ResolvedAcodeProviderConfig {
+    /** 最终选定的 model */
+    model: string;
+    /** 最终选定的 baseURL，可能为空 */
+    baseURL?: string;
+    /** 最终选定的 apiKey，可能为空 */
+    apiKey?: string;
+    /** 最终选定的 effort，可能为空 */
+    effort?: string;
+    /** 各字段的来源标签 */
+    source: {
+        model: string;
+        baseURL: string;
+        apiKey: string;
+        effort: string;
+    };
+}
+/**
+ * 仲裁 ACode provider 配置。
+ *
+ * 优先级：instance > global > default
+ * - instance：来自 per-session model + per-instance instanceAiConfig
+ * - global：来自 acode.json 顶层 provider.default
+ * - default：调用方提供的默认值
+ *
+ * @param instanceConfig 请求级实例配置（含 perSessionModel 覆盖后的 instanceAiConfig）
+ * @param globalConfig 全局 acode.json 中的 provider.default 层
+ * @param defaultModel 兜底默认模型名
+ */
+export declare function resolveAcodeProviderConfig(instanceConfig: InstanceAiConfig, globalConfig: InstanceAiConfig | undefined, defaultModel: string): ResolvedAcodeProviderConfig;
+//# sourceMappingURL=instance-ai-config-resolver.d.ts.map

package/dist/adapter/instance-ai-config-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"instance-ai-config-resolver.d.ts","sourceRoot":"","sources":["../../src/adapter/instance-ai-config-resolver.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,kBAAkB;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wBAAwB;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe;IACf,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAeD;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CACxC,cAAc,EAAE,gBAAgB,EAChC,YAAY,EAAE,gBAAgB,GAAG,SAAS,EAC1C,YAAY,EAAE,MAAM,GACnB,2BAA2B,CAkC7B"}

package/dist/adapter/instance-ai-config-resolver.js

@@ -0,0 +1,46 @@
+/**
+ * Instance AI 配置仲裁器
+ *
+ * 按 "instance > global > default" 三层优先级仲裁 ACode 的
+ * model/baseURL/apiKey 配置。
+ */
+/**
+ * 解析来源标签。
+ */
+function pickSource(instanceVal, globalVal, _defaultLabel) {
+    if (instanceVal !== undefined)
+        return { value: instanceVal, source: "instance" };
+    if (globalVal !== undefined)
+        return { value: globalVal, source: "global" };
+    return { value: undefined, source: _defaultLabel ?? "default" };
+}
+/**
+ * 仲裁 ACode provider 配置。
+ *
+ * 优先级：instance > global > default
+ * - instance：来自 per-session model + per-instance instanceAiConfig
+ * - global：来自 acode.json 顶层 provider.default
+ * - default：调用方提供的默认值
+ *
+ * @param instanceConfig 请求级实例配置（含 perSessionModel 覆盖后的 instanceAiConfig）
+ * @param globalConfig 全局 acode.json 中的 provider.default 层
+ * @param defaultModel 兜底默认模型名
+ */
+export function resolveAcodeProviderConfig(instanceConfig, globalConfig, defaultModel) {
+    const modelResult = pickSource(instanceConfig.model, globalConfig?.model, defaultModel);
+    const baseURLResult = pickSource(instanceConfig.baseURL, globalConfig?.baseURL, undefined);
+    const apiKeyResult = pickSource(instanceConfig.apiKey, globalConfig?.apiKey, undefined);
+    const effortResult = pickSource(instanceConfig.effort, globalConfig?.effort, undefined);
+    return {
+        model: modelResult.value ?? defaultModel,
+        ...(baseURLResult.value ? { baseURL: baseURLResult.value } : {}),
+        ...(apiKeyResult.value ? { apiKey: apiKeyResult.value } : {}),
+        ...(effortResult.value ? { effort: effortResult.value } : {}),
+        source: {
+            model: modelResult.source,
+            baseURL: baseURLResult.source,
+            apiKey: apiKeyResult.source,
+            effort: effortResult.source,
+        },
+    };
+}

package/dist/adapter/types.d.ts

@@ -57,6 +57,8 @@ export declare function getToolActionInfo(toolName: string | undefined, toolInpu
 export interface RuntimeTokenUsage {
     inputTokens: number;
     outputTokens: number;
+    /** Model context window token limit used for the used/limit display. */
+    contextLimit?: number;
 }
 export type CommandOutputStream = "stdout" | "stderr" | "mixed";
 export interface RuntimeStatusActionInfo {
@@ -144,11 +146,27 @@ export interface ProviderEvent {
         commandLineCount?: number;
     };
 }
+/**
+ * 实例自配置 AI provider 覆盖（仅 ACode 适配器消费）。
+ *
+ * 优先级：API 请求体（per-launch）> 环境变量 > bridge 下的 instance-acode-config.json 文件。
+ * 实例配置优先于 acode.json 全局 provider.default 配置；AcodeSdkAdapter 内部按
+ * "instance > global > default" 三层逐字段仲裁 model / baseURL / apiKey。
+ */
+export interface AdapterInstanceAiConfig {
+    model?: string;
+    baseURL?: string;
+    apiKey?: string;
+    /** Per-instance model reasoning effort (minimal|low|medium|high|xhigh) */
+    effort?: string;
+}
 export interface AdapterSessionConfig {
     /** CLI 命令（支持绝对路径） */
     command: string;
     /** 工作目录 */
     workingDirectory: string;
+    /** Agent ID（用于 spillover 文件路径隔离） */
+    agentId?: string;
     /** 初始 prompt（创建会话后自动发送） */
     initialPrompt?: string;
     /** 初始 prompt 是否显示为用户消息 */
@@ -161,14 +179,20 @@ export interface AdapterSessionConfig {
         preset: string;
         append: string;
     };
-    /** 模型名称覆盖 */
+    /** 模型名称覆盖（per-session 粒度，优先级最高） */
     model?: string;
     /** 最大对话轮次（0=无限） */
     maxTurns?: number;
     /** 允许的工具列表（空=全部） */
     allowedTools?: string[];
-    /** MCP 配置路径 */
+    /** MCP 配置路径；如为 per-instance 文件则由 instance-ai-config-service 写入 */
     mcpConfigPath?: string;
+    /**
+     * 实例自配置 AI provider 覆盖（仅 ACode 消费）。AcodeSdkAdapter 内部会按
+     * "instance > global > default" 优先级仲裁，并将 baseURL/apiKey 写入
+     * per-instance acode.json 后作为 configPath 使用。
+     */
+    instanceAiConfig?: AdapterInstanceAiConfig;
     /** Provider 特定参数 */
     providerArgs?: string[];
     /** 环境变量覆盖 */
@@ -199,6 +223,7 @@ export interface AdapterSession {
     totalUsage: {
         inputTokens: number;
         outputTokens: number;
+        contextLimit?: number;
     };
     /** SDK 进程 PID（用于检测进程是否存活） */
     pid?: number;

package/dist/adapter/types.d.ts.map

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

package/dist/index.js

@@ -18,6 +18,7 @@ import { mcpRouter } from "./routes/mcp.js";
 import { terminalRouter, sdkSessions } from "./routes/terminal.js";
 import { sessionsRouter } from "./routes/sessions.js";
 import { gitRouter } from "./routes/git.js";
+import { fileSnapshotRouter } from "./routes/file-snapshot.js";
 import { memoryRouter } from "./routes/memory.js";
 import { fileBrowserRouter } from "./routes/file-browser.js";
 import { aiSourcesRouter } from "./routes/ai-sources.js";
@@ -26,6 +27,7 @@ import { systemMetricsRouter } from "./routes/system-metrics.js";
 import { attachPtyWebSocketServer, closeAllPtySessions, ptyRouter, ptySessions, } from "./routes/pty.js";
 import { runtimeBindingRouter, logRuntimeBindingStartupState, } from "./routes/runtime-binding.js";
 import { dashboardRouter } from "./routes/dashboard.js";
+import { eventsRouter } from "./routes/events.js";
 import { loadPersistedSessions, savePersistedSessions, } from "./services/terminal-persistence.js";
 import { detectOrphanProcesses } from "./services/process-detector.js";
 import { startOrphanMonitor, stopOrphanMonitor, } from "./services/orphan-monitor.js";
@@ -269,10 +271,10 @@ app.use(cors({
             return;
         }
         // 允许 bridge 自身端口的来源（dashboard/登录页面同源请求）
+        // 无论主机名是 localhost、127.0.0.1 还是外部 IP，只要端口匹配就放行
         try {
             const url = new URL(origin);
-            if ((url.hostname === "localhost" || url.hostname === "127.0.0.1") &&
-                url.port === String(port)) {
+            if (url.port === String(port)) {
                 callback(null, true);
                 return;
             }
@@ -295,7 +297,9 @@ app.use("/runtime", terminalRouter);
 app.use("/runtime", sessionsRouter);
 app.use("/runtime", processesRouter);
 app.use("/runtime", systemMetricsRouter);
+app.use("/runtime", eventsRouter);
 app.use("/runtime", gitRouter);
+app.use("/runtime", fileSnapshotRouter);
 app.use("/runtime", memoryRouter);
 app.use("/runtime", aiSourcesRouter);
 app.use("/pty", ptyRouter);
@@ -473,7 +477,7 @@ async function gracefulShutdown(signal, server, preserveSessions = false) {
         logger.info(`[runtime-bridge] 优雅关闭完成 (耗时 ${elapsed}ms)，停止 ${sdkCount} SDK 会话`);
         server.close(() => {
             logger.info("[runtime-bridge] HTTP 服务器已关闭");
-            process.exit(0);
+            process.exit(process.exitCode || 0);
         });
         // 强制退出超时（防止卡住）
         setTimeout(() => {

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

@@ -1 +1 @@
-{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../src/routes/dashboard.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA+EH,eAAO,MAAM,eAAe,4CAAW,CAAC"}
+{"version":3,"file":"dashboard.d.ts","sourceRoot":"","sources":["../../src/routes/dashboard.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAuFH,eAAO,MAAM,eAAe,4CAAW,CAAC"}