aws-runtime-bridge 1.7.48 → 1.7.50

package/dist/routes/mcp.test.js

@@ -82,7 +82,8 @@ describe('app flags normalization', () => {
         expect(normalizeAppFlags(null)).toEqual([]);
     });
     it('allows supported per-tool toggle app ids', () => {
-        const isSupportedToggleAppId = (appId) => ['claudecode', 'opencode', 'codex'].includes(appId);
+        const isSupportedToggleAppId = (appId) => ['acode', 'claudecode', 'opencode', 'codex'].includes(appId);
+        expect(isSupportedToggleAppId('acode')).toBe(true);
         expect(isSupportedToggleAppId('claudecode')).toBe(true);
         expect(isSupportedToggleAppId('opencode')).toBe(true);
         expect(isSupportedToggleAppId('codex')).toBe(true);

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

@@ -13,8 +13,9 @@ export interface RuntimeTokenRequestResult {
     error?: string;
 }
 /**
- * 主流程：读取当前 scoped token -> 必要时串行刷新 -> 锁内重读 token，避免多个 MCP 进程强刷时互相废弃新 token。
+ * 主流程：MCP Node token 必须通过 /runtime/binding/claim-agent 从启动绑定领取。
+ * 不再返回 bridge/user/server scoped runtime token，避免 MCP Node 降级使用旧 bridge 级凭据。
  */
-export declare function resolveRuntimeTokenRequest(input: RuntimeTokenRequestInput): Promise<RuntimeTokenRequestResult>;
+export declare function resolveRuntimeTokenRequest(input: RuntimeTokenRequestInput): RuntimeTokenRequestResult;
 export declare function logRuntimeBindingStartupState(): void;
 //# sourceMappingURL=runtime-binding.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"runtime-binding.d.ts","sourceRoot":"","sources":["../../src/routes/runtime-binding.ts"],"names":[],"mappings":"AAoBA,eAAO,MAAM,oBAAoB,4CAAW,CAAC;AAE7C,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAqCD;;GAEG;AACH,wBAAsB,0BAA0B,CAC9C,KAAK,EAAE,wBAAwB,GAC9B,OAAO,CAAC,yBAAyB,CAAC,CAyCpC;AAqMD,wBAAgB,6BAA6B,IAAI,IAAI,CAapD"}
+{"version":3,"file":"runtime-binding.d.ts","sourceRoot":"","sources":["../../src/routes/runtime-binding.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,oBAAoB,4CAAW,CAAC;AAE7C,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,KAAK,EAAE,wBAAwB,GAC9B,yBAAyB,CAM3B;AAqMD,wBAAgB,6BAA6B,IAAI,IAAI,CAapD"}

package/dist/routes/runtime-binding.js

@@ -1,67 +1,20 @@
 import { Router } from "express";
 import { validateToken } from "../middleware/auth.js";
-import { requestRuntimeAccessTokenRefresh, requestRuntimeAccessTokenRefreshForServer } from "../services/auto-register.js";
 import { claimMcpLaunchBinding, getMcpLaunchQueueSize } from "../services/mcp-launch-binding-queue.js";
 import { clearRuntimeBinding, getRuntimeAccessToken, getRuntimeBindingPublicState, getRuntimePairingCode, hasRuntimeBinding, saveRuntimeBinding, validateRuntimeBindingToken, validateRuntimePairingCode, } from "../services/runtime-binding.js";
 import { createLogger } from "../utils/logger.js";
 const log = createLogger("runtime-binding-route");
 export const runtimeBindingRouter = Router();
-const runtimeTokenRefreshLocks = new Map();
-function buildRuntimeTokenRefreshLockKey(userId, serverUrl) {
-    return `${String(userId || "").trim()}\n${String(serverUrl || "").trim()}`;
-}
-async function withRuntimeTokenRefreshLock(userId, serverUrl, operation) {
-    const lockKey = buildRuntimeTokenRefreshLockKey(userId, serverUrl);
-    const previous = runtimeTokenRefreshLocks.get(lockKey) ?? Promise.resolve();
-    let release;
-    const current = new Promise((resolve) => {
-        release = resolve;
-    });
-    const chained = previous.then(() => current);
-    runtimeTokenRefreshLocks.set(lockKey, chained);
-    await previous;
-    try {
-        return await operation();
-    }
-    finally {
-        release();
-        if (runtimeTokenRefreshLocks.get(lockKey) === chained) {
-            runtimeTokenRefreshLocks.delete(lockKey);
-        }
-    }
-}
 /**
- * 主流程：读取当前 scoped token -> 必要时串行刷新 -> 锁内重读 token，避免多个 MCP 进程强刷时互相废弃新 token。
+ * 主流程：MCP Node token 必须通过 /runtime/binding/claim-agent 从启动绑定领取。
+ * 不再返回 bridge/user/server scoped runtime token，避免 MCP Node 降级使用旧 bridge 级凭据。
  */
-export async function resolveRuntimeTokenRequest(input) {
-    const { userId, serverUrl, schedulerBaseUrl, forceRefresh } = input;
-    const requestedServerUrl = serverUrl || schedulerBaseUrl;
-    const scopedToken = getRuntimeAccessToken(userId, requestedServerUrl);
-    if (scopedToken && forceRefresh !== true) {
-        return {
-            success: true,
-            runtimeAccessToken: scopedToken,
-            updated: false,
-        };
-    }
-    return await withRuntimeTokenRefreshLock(userId, requestedServerUrl, async () => {
-        const latestScopedToken = getRuntimeAccessToken(userId, requestedServerUrl);
-        const rejectedRuntimeAccessToken = String(input.rejectedRuntimeAccessToken || "").trim();
-        if (forceRefresh === true &&
-            latestScopedToken &&
-            rejectedRuntimeAccessToken &&
-            latestScopedToken !== rejectedRuntimeAccessToken) {
-            return {
-                success: true,
-                runtimeAccessToken: latestScopedToken,
-                updated: false,
-            };
-        }
-        if (requestedServerUrl) {
-            return await requestRuntimeAccessTokenRefreshForServer(String(requestedServerUrl));
-        }
-        return await requestRuntimeAccessTokenRefresh();
-    });
+export function resolveRuntimeTokenRequest(input) {
+    void input;
+    return {
+        success: false,
+        error: "MCP runtime token must be claimed from launch binding; bridge-scoped token refresh is disabled",
+    };
 }
 function extractRuntimeToken(req) {
     const headerToken = req.header("X-Runtime-Token");
@@ -130,7 +83,7 @@ runtimeBindingRouter.post("/binding/request-token", async (req, res) => {
         res.status(403).json({ ok: false, error: "loopback request required" });
         return;
     }
-    const result = await resolveRuntimeTokenRequest(req.body || {});
+    const result = resolveRuntimeTokenRequest(req.body || {});
     if (!result.success || !result.runtimeAccessToken) {
         res.status(400).json({
             ok: false,

package/dist/routes/runtime-binding.test.js

@@ -1,10 +1,6 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-const getRuntimeAccessTokenMock = vi.hoisted(() => vi.fn());
-const requestRuntimeAccessTokenRefreshMock = vi.hoisted(() => vi.fn());
-const requestRuntimeAccessTokenRefreshForServerMock = vi.hoisted(() => vi.fn());
 vi.mock("../services/runtime-binding.js", () => ({
     clearRuntimeBinding: vi.fn(),
-    getRuntimeAccessToken: getRuntimeAccessTokenMock,
     getRuntimeBindingPublicState: vi.fn(() => ({ paired: true })),
     getRuntimePairingCode: vi.fn(() => "000-000"),
     hasRuntimeBinding: vi.fn(() => true),
@@ -12,10 +8,6 @@ vi.mock("../services/runtime-binding.js", () => ({
     validateRuntimeBindingToken: vi.fn(() => true),
     validateRuntimePairingCode: vi.fn(() => true),
 }));
-vi.mock("../services/auto-register.js", () => ({
-    requestRuntimeAccessTokenRefresh: requestRuntimeAccessTokenRefreshMock,
-    requestRuntimeAccessTokenRefreshForServer: requestRuntimeAccessTokenRefreshForServerMock,
-}));
 vi.mock("../services/mcp-launch-binding-queue.js", () => ({
     claimMcpLaunchBinding: vi.fn(),
     getMcpLaunchQueueSize: vi.fn(() => 0),
@@ -24,85 +16,17 @@ afterEach(() => {
     vi.clearAllMocks();
 });
 describe("runtime binding token request", () => {
-    it("reuses a newer scoped token instead of rotating again after another MCP process refreshed it", async () => {
-        getRuntimeAccessTokenMock.mockReturnValue("fresh-token-from-other-process");
-        const { resolveRuntimeTokenRequest } = await import("./runtime-binding.js");
-        const result = await resolveRuntimeTokenRequest({
-            userId: "user-1",
-            serverUrl: "ws://localhost:7380/ws/agent",
-            forceRefresh: true,
-            rejectedRuntimeAccessToken: "stale-token",
-        });
-        expect(result).toEqual({
-            success: true,
-            runtimeAccessToken: "fresh-token-from-other-process",
-            updated: false,
-        });
-        expect(requestRuntimeAccessTokenRefreshForServerMock).not.toHaveBeenCalled();
-        expect(requestRuntimeAccessTokenRefreshMock).not.toHaveBeenCalled();
-    });
-    it("rotates the runtime token when the latest scoped token is the rejected token", async () => {
-        getRuntimeAccessTokenMock.mockReturnValue("stale-token");
-        requestRuntimeAccessTokenRefreshForServerMock.mockResolvedValue({
-            success: true,
-            runtimeAccessToken: "rotated-token",
-            updated: true,
-        });
+    it("rejects bridge-scoped token refresh for MCP nodes", async () => {
         const { resolveRuntimeTokenRequest } = await import("./runtime-binding.js");
-        const result = await resolveRuntimeTokenRequest({
+        const result = resolveRuntimeTokenRequest({
             userId: "user-1",
             serverUrl: "ws://localhost:7380/ws/agent",
             forceRefresh: true,
             rejectedRuntimeAccessToken: "stale-token",
         });
         expect(result).toEqual({
-            success: true,
-            runtimeAccessToken: "rotated-token",
-            updated: true,
-        });
-        expect(requestRuntimeAccessTokenRefreshForServerMock).toHaveBeenCalledWith("ws://localhost:7380/ws/agent");
-    });
-    it("serializes concurrent force refreshes and lets the loser reuse the winner token", async () => {
-        let cachedToken = "stale-token";
-        let releaseRefresh = () => undefined;
-        const refreshGate = new Promise((resolve) => {
-            releaseRefresh = resolve;
-        });
-        getRuntimeAccessTokenMock.mockImplementation(() => cachedToken);
-        requestRuntimeAccessTokenRefreshForServerMock.mockImplementation(async () => {
-            await refreshGate;
-            cachedToken = "winner-token";
-            return {
-                success: true,
-                runtimeAccessToken: "winner-token",
-                updated: true,
-            };
-        });
-        const { resolveRuntimeTokenRequest } = await import("./runtime-binding.js");
-        const first = resolveRuntimeTokenRequest({
-            userId: "user-1",
-            serverUrl: "ws://localhost:7380/ws/agent",
-            forceRefresh: true,
-            rejectedRuntimeAccessToken: "stale-token",
-        });
-        const second = resolveRuntimeTokenRequest({
-            userId: "user-1",
-            serverUrl: "ws://localhost:7380/ws/agent",
-            forceRefresh: true,
-            rejectedRuntimeAccessToken: "stale-token",
-        });
-        releaseRefresh();
-        const [firstResult, secondResult] = await Promise.all([first, second]);
-        expect(firstResult).toEqual({
-            success: true,
-            runtimeAccessToken: "winner-token",
-            updated: true,
-        });
-        expect(secondResult).toEqual({
-            success: true,
-            runtimeAccessToken: "winner-token",
-            updated: false,
+            success: false,
+            error: "MCP runtime token must be claimed from launch binding; bridge-scoped token refresh is disabled",
         });
-        expect(requestRuntimeAccessTokenRefreshForServerMock).toHaveBeenCalledTimes(1);
     });
 });

package/dist/routes/sessions.d.ts

@@ -4,4 +4,9 @@
  * 提供 SDK Agent 会话的查询和恢复功能
  */
 export declare const sessionsRouter: import("express-serve-static-core").Router;
+/**
+ * 解析 active SDK 会话快照状态。
+ * 主流程：优先使用 adapter 细粒度状态，其次使用 terminal 路由内存里的最近 runtimeStatus，最后兼容旧会话回退 running。
+ */
+export declare function resolveActiveSdkSessionSnapshotStatus(adapterStatus?: string, currentRuntimeStatus?: string): string;
 //# sourceMappingURL=sessions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/routes/sessions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAqBH,eAAO,MAAM,cAAc,4CAAW,CAAC"}
+{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/routes/sessions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAqBH,eAAO,MAAM,cAAc,4CAAW,CAAC;AAEvC;;;GAGG;AACH,wBAAgB,qCAAqC,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,oBAAoB,CAAC,EAAE,MAAM,GAAG,MAAM,CAOnH"}

package/dist/routes/sessions.js

@@ -13,6 +13,18 @@ import { createLogger } from '../utils/logger.js';
 import { sdkSessions } from './terminal.js';
 const log = createLogger('sessions');
 export const sessionsRouter = Router();
+/**
+ * 解析 active SDK 会话快照状态。
+ * 主流程：优先使用 adapter 细粒度状态，其次使用 terminal 路由内存里的最近 runtimeStatus，最后兼容旧会话回退 running。
+ */
+export function resolveActiveSdkSessionSnapshotStatus(adapterStatus, currentRuntimeStatus) {
+    const normalizedAdapterStatus = String(adapterStatus || '').trim();
+    if (normalizedAdapterStatus) {
+        return normalizedAdapterStatus;
+    }
+    const normalizedRuntimeStatus = String(currentRuntimeStatus || '').trim();
+    return normalizedRuntimeStatus || 'running';
+}
 /**
  * 获取所有 SDK Agent 会话
  * GET /runtime/sessions
@@ -20,18 +32,22 @@ export const sessionsRouter = Router();
 sessionsRouter.get('/sessions', validateToken, async (_req, res) => {
     try {
         // 1. 获取 SDK 会话
-        const activeSdkSessions = Array.from(sdkSessions.entries()).map(([sessionId, entry]) => ({
-            sessionId,
-            agentId: entry.agentId,
-            workspacePath: entry.workspacePath,
-            status: 'running',
-            runtimeStatus: entry.currentRuntimeStatus,
-            runtimeActionType: entry.currentRuntimeActionType,
-            runtimeActionLabel: entry.currentRuntimeActionLabel,
-            runtimeActionDetail: entry.currentRuntimeActionDetail,
-            mode: 'sdk',
-            startedAt: null,
-        }));
+        const activeSdkSessions = Array.from(sdkSessions.entries()).map(([sessionId, entry]) => {
+            const adapter = adapterRegistry.get(entry.providerId || 'claude-code');
+            const status = resolveActiveSdkSessionSnapshotStatus(adapter.getSessionStatus(sessionId), entry.currentRuntimeStatus);
+            return {
+                sessionId,
+                agentId: entry.agentId,
+                workspacePath: entry.workspacePath,
+                status,
+                runtimeStatus: status,
+                runtimeActionType: entry.currentRuntimeActionType,
+                runtimeActionLabel: entry.currentRuntimeActionLabel,
+                runtimeActionDetail: entry.currentRuntimeActionDetail,
+                mode: 'sdk',
+                startedAt: null,
+            };
+        });
         // 2. SDK-only：活跃会话全部来自 SDK adapter。
         const activeSessions = activeSdkSessions;
         const persistedSessions = await loadPersistedSessions();
@@ -66,14 +82,16 @@ sessionsRouter.post('/sessions/recover', validateToken, async (req, res) => {
         // 1. 检查是否有 SDK 活跃会话
         const existingSdkSession = Array.from(sdkSessions.entries()).find(([, s]) => s.agentId === agentId);
         if (existingSdkSession) {
+            const adapter = adapterRegistry.get(existingSdkSession[1].providerId || 'claude-code');
+            const status = resolveActiveSdkSessionSnapshotStatus(adapter.getSessionStatus(existingSdkSession[0]), existingSdkSession[1].currentRuntimeStatus);
             res.json({
                 ok: true,
                 sessionId: existingSdkSession[0],
                 agentId,
                 workspacePath: existingSdkSession[1].workspacePath,
                 command: existingSdkSession[1].config.command,
-                status: 'running',
-                runtimeStatus: existingSdkSession[1].currentRuntimeStatus,
+                status,
+                runtimeStatus: status,
                 runtimeActionType: existingSdkSession[1].currentRuntimeActionType,
                 runtimeActionLabel: existingSdkSession[1].currentRuntimeActionLabel,
                 runtimeActionDetail: existingSdkSession[1].currentRuntimeActionDetail,
@@ -103,7 +121,7 @@ sessionsRouter.post('/sessions/recover', validateToken, async (req, res) => {
             }
         }
         const resolvedWorkspacePath = workspacePath || persistedSession?.workspacePath;
-        const resolvedCommand = command || persistedSession?.command || 'claude';
+        const resolvedCommand = command || persistedSession?.command || 'acode';
         const resolvedMode = persistedSession?.mode || 'sdk';
         if (!resolvedWorkspacePath) {
             res.status(400).json({ error: 'workspacePath is required (not found in persisted session)' });
@@ -343,12 +361,14 @@ sessionsRouter.get('/sessions/by-agent/:agentId', validateToken, async (req, res
         if (activeSdkSession) {
             const adapter = adapterRegistry.get(activeSdkSession[1].providerId || 'claude-code');
             const pid = adapter.getSessionPid?.(activeSdkSession[0]);
+            const status = resolveActiveSdkSessionSnapshotStatus(adapter.getSessionStatus(activeSdkSession[0]), activeSdkSession[1].currentRuntimeStatus);
             res.json({
                 ok: true,
                 sessionId: activeSdkSession[0],
                 agentId,
                 workspacePath: activeSdkSession[1].workspacePath,
-                status: 'running',
+                status,
+                runtimeStatus: status,
                 isActive: true,
                 mode: 'sdk',
                 pid,

package/dist/routes/sessions.test.js

@@ -2,6 +2,7 @@
  * Sessions 路由单元测试
  */
 import { describe, it, expect } from 'vitest';
+import { resolveActiveSdkSessionSnapshotStatus } from './sessions.js';
 describe('sessions route validation', () => {
     it('requires agentId for recovery', () => {
         const validateRecoverRequest = (body) => {
@@ -48,6 +49,18 @@ describe('session persistence', () => {
         expect(result[0].sessionId).toBe('session-2');
     });
 });
+describe('active SDK session snapshots', () => {
+    it('reports the adapter fine-grained status instead of hardcoded running', () => {
+        expect(resolveActiveSdkSessionSnapshotStatus('waiting_input', 'running')).toBe('waiting_input');
+        expect(resolveActiveSdkSessionSnapshotStatus('tool_using', undefined)).toBe('tool_using');
+    });
+    it('uses current runtime status when adapter status is unavailable', () => {
+        expect(resolveActiveSdkSessionSnapshotStatus(undefined, 'thinking')).toBe('thinking');
+    });
+    it('falls back to running only for legacy sessions without status details', () => {
+        expect(resolveActiveSdkSessionSnapshotStatus(undefined, undefined)).toBe('running');
+    });
+});
 describe('terminal configuration', () => {
     it('selects correct shell for platform', () => {
         const getShellConfig = (platform) => {

package/dist/routes/skills.js

@@ -5,7 +5,7 @@ import { syncLegacyStateFromSdk } from '../services/instance-init-service.js';
 import { resolveSkillSourceDir, ensureDirectoryExists } from '../utils/file-utils.js';
 import { normalizeSdkAppFlags } from '../utils/mcp-utils.js';
 export const skillsRouter = Router();
-const TOGGLEABLE_APP_IDS = new Set(['claudecode', 'opencode']);
+const TOGGLEABLE_APP_IDS = new Set(['acode', 'claudecode', 'opencode']);
 skillsRouter.post('/cc-switch/skills/list', validateToken, async (req, res) => {
     const { agentId } = req.body || {};
     if (!agentId) {
@@ -100,7 +100,7 @@ skillsRouter.post('/cc-switch/skills/toggle-app', validateToken, async (req, res
     try {
         const normalizedAppId = String(appId).trim().toLowerCase();
         if (!TOGGLEABLE_APP_IDS.has(normalizedAppId)) {
-            res.status(400).json({ error: 'appId must be one of claudecode, opencode' });
+            res.status(400).json({ error: 'appId must be one of acode, claudecode, opencode' });
             return;
         }
         const sdk = await loadCcSwitchSdk(agentId);

package/dist/routes/skills.test.js

@@ -40,7 +40,8 @@ describe('skills route validation', () => {
         expect(normalizeApps(['claude', 'opencode'])).toEqual(['claude', 'opencode']);
     });
     it('allows supported per-tool toggle app ids', () => {
-        const isSupportedToggleAppId = (appId) => ['claudecode', 'opencode'].includes(appId);
+        const isSupportedToggleAppId = (appId) => ['acode', 'claudecode', 'opencode'].includes(appId);
+        expect(isSupportedToggleAppId('acode')).toBe(true);
         expect(isSupportedToggleAppId('claudecode')).toBe(true);
         expect(isSupportedToggleAppId('opencode')).toBe(true);
         expect(isSupportedToggleAppId('codex')).toBe(false);

package/dist/routes/terminal.d.ts

@@ -46,20 +46,40 @@ export declare function decodeTerminalOutputChunk(decoder: TextDecoder, chunk?:
  * 解析 cd 命令目标；返回 undefined 表示不是目录切换命令，null 表示仅查看当前目录。
  */
 export declare function parseTerminalDirectoryChangeTarget(command: string): string | null | undefined;
+/**
+ * 解析 SDK 会话对外展示状态。
+ * 主流程：优先使用 adapter 当前细粒度状态，其次使用路由内存记录的最近状态，最后才兼容旧会话回退 running。
+ */
+export declare function resolveSdkSessionDisplayStatus(adapterStatus?: string, currentRuntimeStatus?: string): string;
 export interface PersistedSessionReuseDecision {
     reusable: boolean;
-    reason: 'active-pid' | 'missing-pid' | 'dead-pid';
+    reason: 'active-pid' | 'missing-pid' | 'dead-pid' | 'in-process-provider';
 }
 /**
- * 判断持久化 SDK 会话能否在显式启动请求中复用。
- * 主流程：必须存在 PID 且 OS 仍能确认该进程存活；否则视为重启后遗留的陈旧会话。
+ * Decide whether a persisted SDK session can be reused for a start request.
+ * 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'>, isPidRunning?: (pid: number) => boolean): PersistedSessionReuseDecision;
+export declare function evaluatePersistedSessionReuse(session: Pick<PersistedSession, 'pid'> & Partial<Pick<PersistedSession, 'command'>>, isPidRunning?: (pid: number) => boolean): PersistedSessionReuseDecision;
 /**
  * 生成显示在终端输出流中的工作目录提示符。
  */
 export declare function formatTerminalPrompt(currentDirectory: string): string;
 export declare function buildRuntimeEnv(agentId: string, workspacePath: string | undefined, baseEnv: NodeJS.ProcessEnv, envOverrides?: Record<string, unknown>): Record<string, string>;
+/**
+ * 主流程：SDK 模式输入若只是 mini-term 剪贴板临时文件路径，则展开为文件内容再发给模型。
+ * 具体实现：只处理整串匹配的绝对临时 paste 文件路径，避免影响显式 `type "path"` 等正常命令。
+ */
+export declare function resolveSdkInputMessage(input: unknown): Promise<string>;
+export interface ClaudeCodeLaunchConfig {
+    envOverrides: Record<string, string>;
+    model?: string;
+}
+/**
+ * 主流程：将已持久化的 ClaudeCode AI 配置合并到启动配置，再让请求级覆盖保持最高优先级。
+ */
+export declare function buildClaudeCodeLaunchConfig(savedClaudeConfig: {
+    env?: Record<string, unknown>;
+} | null | undefined, requestEnvOverrides?: Record<string, unknown>): ClaudeCodeLaunchConfig;
 /**
  * 将 SDK 工具结束事件转换为时间线返回数据状态。
  * 主流程：格式化工具结果 -> 保留 MCP 专用展示 -> 其它工具按动作类型追加到对应时间线事件。

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

@@ -1 +1 @@
-{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/routes/terminal.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAKxC,OAAO,EAOL,KAAK,oBAAoB,EAEzB,KAAK,aAAa,EAClB,KAAK,uBAAuB,EAE7B,MAAM,qBAAqB,CAAC;AAc7B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,eAAO,MAAM,cAAc,4CAAW,CAAC;AAIvC,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,oBAAoB,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,0BAA0B,CAAC,EAAE,MAAM,CAAC;CACrC;AAGD,eAAO,MAAM,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAa,CAAC;AAKnE,wBAAgB,wBAAwB,CAAC,UAAU,CAAC,EAAE,uBAAuB;;;cAS5E;AAaD;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEpE;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAMR;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,SAAkC,GAAG,WAAW,CAMnG;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,UAAQ,GAAG,MAAM,CAQnG;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAiB7F;AA2CD,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,YAAY,GAAG,aAAa,GAAG,UAAU,CAAC;CACnD;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,EACtC,YAAY,GAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAA0B,GACxD,6BAA6B,CAU/B;AA4BD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAErE;AAgHD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,OAAO,EAAE,MAAM,CAAC,UAAU,EAC1B,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CA+BxB;AA8BD;;;GAGG;AACH,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,aAAa,GAAG,uBAAuB,GAAG,SAAS,CAiC3G;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,CAU7E;AAYD,wBAAgB,oBAAoB,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAE7D"}
+{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/routes/terminal.ts"],"names":[],"mappings":"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"}

package/dist/routes/terminal.js

@@ -14,6 +14,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { adapterRegistry, getToolActionInfo, isTransientClipboardPasteFilePath, redactTransientClipboardPastePaths, registerSdkProviders, resolveSdkProviderIdByCommand, } from '../adapter/index.js';
 import { validateToken } from '../middleware/auth.js';
 import { getAgentProcessManager } from '../services/agent-process-manager.js';
+import { getAiConfigService } from '../services/cc-switch-sdk.js';
 import { enqueueMcpLaunchBinding } from '../services/mcp-launch-binding-queue.js';
 import { findClaudeCodeProcesses, isProcessRunning } from '../services/process-detector.js';
 import { sendOutput, sendQuestionRequest, sendStatus } from '../services/session-output.js';
@@ -117,10 +118,11 @@ function findActiveSdkSessionByAgentId(agentId) {
 }
 async function buildExistingSessionResponse(entry) {
     const adapter = adapterRegistry.get(entry.providerId || 'claude-code');
+    const status = resolveSdkSessionDisplayStatus(adapter.getSessionStatus(entry.sessionId), entry.currentRuntimeStatus);
     return {
         sessionId: entry.sessionId,
-        status: adapter.getSessionStatus(entry.sessionId) || 'running',
-        runtimeStatus: entry.currentRuntimeStatus,
+        status,
+        runtimeStatus: status,
         runtimeActionType: entry.currentRuntimeActionType,
         runtimeActionLabel: entry.currentRuntimeActionLabel,
         runtimeActionDetail: entry.currentRuntimeActionDetail,
@@ -133,8 +135,20 @@ async function buildExistingSessionResponse(entry) {
     };
 }
 /**
- * 判断持久化 SDK 会话能否在显式启动请求中复用。
- * 主流程：必须存在 PID 且 OS 仍能确认该进程存活；否则视为重启后遗留的陈旧会话。
+ * 解析 SDK 会话对外展示状态。
+ * 主流程：优先使用 adapter 当前细粒度状态，其次使用路由内存记录的最近状态，最后才兼容旧会话回退 running。
+ */
+export function resolveSdkSessionDisplayStatus(adapterStatus, currentRuntimeStatus) {
+    const normalizedAdapterStatus = String(adapterStatus || '').trim();
+    if (normalizedAdapterStatus) {
+        return normalizedAdapterStatus;
+    }
+    const normalizedRuntimeStatus = String(currentRuntimeStatus || '').trim();
+    return normalizedRuntimeStatus || 'running';
+}
+/**
+ * Decide whether a persisted SDK session can be reused for a start request.
+ * Main flow: require a live PID, then reject in-process providers whose adapter control channel cannot be restored.
  */
 export function evaluatePersistedSessionReuse(session, isPidRunning = isProcessRunning) {
     if (!session.pid) {
@@ -143,6 +157,9 @@ export function evaluatePersistedSessionReuse(session, isPidRunning = isProcessR
     if (!isPidRunning(session.pid)) {
         return { reusable: false, reason: 'dead-pid' };
     }
+    if (resolveSdkProviderId(session.command) === 'acode') {
+        return { reusable: false, reason: 'in-process-provider' };
+    }
     return { reusable: true, reason: 'active-pid' };
 }
 function stopTerminalCommandProcess(sessionId) {
@@ -301,6 +318,69 @@ export function buildRuntimeEnv(agentId, workspacePath, baseEnv, envOverrides) {
     env.AWS_MCP_CLAIM_LAUNCH_BINDING = 'true';
     return env;
 }
+function stripWrappingQuotes(value) {
+    const trimmed = value.trim();
+    const first = trimmed[0];
+    const last = trimmed[trimmed.length - 1];
+    if ((first === '"' || first === "'") && first === last) {
+        return trimmed.slice(1, -1);
+    }
+    return trimmed;
+}
+/**
+ * 主流程：SDK 模式输入若只是 mini-term 剪贴板临时文件路径，则展开为文件内容再发给模型。
+ * 具体实现：只处理整串匹配的绝对临时 paste 文件路径，避免影响显式 `type "path"` 等正常命令。
+ */
+export async function resolveSdkInputMessage(input) {
+    const message = String(input);
+    if (!isTransientClipboardPasteFilePath(message)) {
+        return message;
+    }
+    const filePath = stripWrappingQuotes(message);
+    if (!path.isAbsolute(filePath)) {
+        return message;
+    }
+    return fs.readFile(filePath, 'utf-8');
+}
+/**
+ * 主流程：将已持久化的 ClaudeCode AI 配置合并到启动配置，再让请求级覆盖保持最高优先级。
+ */
+export function buildClaudeCodeLaunchConfig(savedClaudeConfig, requestEnvOverrides) {
+    const envOverrides = {};
+    for (const source of [savedClaudeConfig?.env, requestEnvOverrides]) {
+        if (!source) {
+            continue;
+        }
+        for (const [key, value] of Object.entries(source)) {
+            const normalizedKey = key.trim();
+            if (!normalizedKey || value === undefined || value === null) {
+                continue;
+            }
+            const normalizedValue = String(value).trim();
+            if (!normalizedValue) {
+                continue;
+            }
+            envOverrides[normalizedKey] = normalizedValue;
+        }
+    }
+    const model = envOverrides.ANTHROPIC_MODEL?.trim()
+        || envOverrides.CODEX_MODEL?.trim()
+        || undefined;
+    return { envOverrides, model };
+}
+/**
+ * 具体逻辑：读取 ClaudeCode live settings；读取失败不阻断启动，保持原 SDK 启动路径可用。
+ */
+async function readSavedClaudeCodeLaunchConfig() {
+    try {
+        return await getAiConfigService().readClaudeCodeConfig();
+    }
+    catch (error) {
+        const err = error;
+        console.warn(`[Runtime] Failed to read saved ClaudeCode AI config: ${err.message}`);
+        return {};
+    }
+}
 function formatToolResultForTimeline(result) {
     if (result === undefined || result === null) {
         return undefined;
@@ -506,22 +586,29 @@ async function startSdkSession(req, res) {
         }
         startingAgents.add(normalizedAgentId);
         // 根据命令选择对应的 adapter
-        const normalizedCommand = (command || 'claude').toLowerCase();
+        const normalizedCommand = (command || 'acode').toLowerCase();
         const providerId = resolveSdkProviderId(command);
         // ★ 特征日志：明确输出选择的 provider
         console.log(`[Runtime] ★★★ SDK启动 ★★★ command="${command}", normalizedCommand="${normalizedCommand}", providerId="${providerId}"`);
         const adapter = adapterRegistry.get(providerId);
         sessionId = uuidv4();
+        const savedClaudeConfig = providerId === 'claude-code'
+            ? await readSavedClaudeCodeLaunchConfig()
+            : null;
+        const claudeLaunchConfig = providerId === 'claude-code'
+            ? buildClaudeCodeLaunchConfig(savedClaudeConfig, envOverrides)
+            : buildClaudeCodeLaunchConfig(null, envOverrides);
         // 构建SDK配置
         const config = {
-            command: command || 'claude',
+            command: command || 'acode',
             workingDirectory: workspacePath,
             autoAccept: Boolean(autoAccept),
             initialPrompt,
+            model: claudeLaunchConfig.model,
             // MCP 配置：不再默认注入 aws-mcp；由用户在面板中安装/配置
             mcpConfigPath,
             extraMcpServers: extraMcpServers || {},
-            envOverrides: buildRuntimeEnv(String(agentId), String(workspacePath), process.env, envOverrides),
+            envOverrides: buildRuntimeEnv(String(agentId), String(workspacePath), process.env, claudeLaunchConfig.envOverrides),
         };
         // 存储会话信息
         sdkSessions.set(sessionId, {
@@ -559,6 +646,7 @@ async function startSdkSession(req, res) {
             console.warn(`[Runtime] Failed to get SDK PID for agentId=${agentId}:`, pidError);
         }
         // ★ 持久化会话信息（包含 PID）
+        const startedStatus = resolveSdkSessionDisplayStatus(adapter.getSessionStatus(sessionId), sdkSessions.get(sessionId)?.currentRuntimeStatus);
         await upsertPersistedSession({
             sessionId,
             agentId,
@@ -566,7 +654,7 @@ async function startSdkSession(req, res) {
             command: config.command,
             startedAt: new Date().toISOString(),
             status: 'running',
-            runtimeStatus: 'running',
+            runtimeStatus: startedStatus,
             mode: 'sdk',
             pid: sdkPid,
             providerSessionId: adapter.getProviderSessionId(sessionId),
@@ -592,7 +680,8 @@ async function startSdkSession(req, res) {
         }
         res.json({
             sessionId,
-            status: 'running',
+            status: startedStatus,
+            runtimeStatus: startedStatus,
             agentId,
             workspacePath,
             command: config.command,
@@ -844,7 +933,7 @@ terminalRouter.post('/input', validateToken, async (req, res) => {
             res.json({ ok: true, mode: 'shortcut' });
             return;
         }
-        await adapter.sendMessage(sessionId, String(input));
+        await adapter.sendMessage(sessionId, await resolveSdkInputMessage(input));
         res.json({ ok: true, mode: 'sdk' });
     }
     catch (error) {