@jingyi0605/codingns4dsh 0.2.0-beta.2 → 0.2.0-rc.3

package/data/build/dist/client/features/peer-host.js

@@ -3,17 +3,21 @@ import { startPeerHostManagementPanel } from '../peer-host-management-panel.js';
 import { createPeerHostManagementApi } from '../peer-host-management-api.js';
 import { DSH_PEER_HOST_PREBOOT_SHIM_GLOBAL, readDshPeerHostPrebootShimMode, readDshPeerHostPrebootShimState } from '../../bootstrap/dsh-peer-host-preboot-shim.js';
 import { dshSettingsNoteStyle, dshThemeColor } from '../theme.js';
-import { createVirtualSessionId, createVirtualWorkspaceId, parseVirtualSessionId } from '../../shared/index.js';
+import { createVirtualSessionId, createVirtualWorkspaceId, parseVirtualSessionId, parseVirtualWorkspaceId } from '../../shared/index.js';
 import { decodeNativeResponseBytes, isDshNativeRemoteMethod } from '../../host/modules/peer-host/peer-host-native-protocol.js';
 import { createPeerHostNativeProjection } from '../peer-host-native-projection.js';
 import { installPeerHostNativeStoreProjection, refreshPeerHostNativeSessions } from '../peer-host-native-store-projection.js';
 import { startPeerHostWorkspaceTag } from '../peer-host-workspace-tag.js';
 import { startPeerHostWorkspaceTab } from '../peer-host-workspace-tab.js';
-import { registerPeerHostAggregateRefresh, requestPeerHostAggregateRefresh } from '../peer-host-aggregate-refresh.js';
+import { isPeerHostAggregateRefreshRegistered, registerPeerHostAggregateRefresh, requestPeerHostAggregateRefresh } from '../peer-host-aggregate-refresh.js';
+import { useCodingNsTranslator } from '../locale.js';
+import { publishSessionAdapter } from '../session-adapter-cache.js';
 /** 聚合刷新周期；远端资源只影响自身节点，刷新失败不改变本机界面。 */
 const PEER_HOST_AGGREGATE_REFRESH_MS = 30_000;
 /** 新建会话尚未出现在聚合摘要时，临时保留其远端作用域的最长时间。 */
 const PEER_HOST_PENDING_SESSION_SCOPE_TTL_MS = 30_000;
+/** 远端会话流刷新聚合的合并窗口，避免每个文本增量都触发完整摘要读取。 */
+const PEER_HOST_SESSION_REFRESH_DEBOUNCE_MS = 200;
 /** PeerHost Client 模块的边界声明；远端凭据和目标连接始终由 Host 侧持有。 */
 export const peerHostFeature = {
     descriptor: {
@@ -30,8 +34,10 @@ export const peerHostFeature = {
             { capability: 'peer-host.remote-web-context-fallback', required: false, fallback: 'degrade' },
         ],
         ui: {
-            label: '管理其他 DSH Host',
-            description: '聚合多个 Host 会话',
+            label: 'Manage other DSH Hosts',
+            labelKey: 'feature.peerHost.label',
+            description: 'Aggregate sessions from multiple Hosts',
+            descriptionKey: 'feature.peerHost.description',
             order: 50,
             defaultOpen: false,
         },
@@ -39,13 +45,26 @@ export const peerHostFeature = {
     start: async (context) => {
         const shim = globalThis[DSH_PEER_HOST_PREBOOT_SHIM_GLOBAL];
         const projection = createPeerHostNativeProjection();
-        const transport = shim === undefined ? undefined : createPeerHostPageTransport(projection);
+        const transport = shim === undefined ? undefined : createPeerHostPageTransport(projection, context.services.uiContext);
+        const management = createPeerHostManagementApi(context.services.rpc);
         if (shim !== undefined) {
             shim.activate(transport.hooks);
             context.resources.add(() => { shim.deactivate(); });
             // 原生侧栏在插件 apply 时按引用捕获 `workspaces.list`，只能就地投影这个对象；
             // 没有 shim 就没有原生 Remote 路由，此时不注入，避免出现点不开的远端条目。
-            context.resources.add(installPeerHostNativeStoreProjection({ uiContext: context.services.uiContext, projection }));
+            context.resources.add(installPeerHostNativeStoreProjection({
+                uiContext: context.services.uiContext,
+                projection,
+                moveWorkspace: (workspaceId, beforeWorkspaceId) => management.moveWorkspace(workspaceId, beforeWorkspaceId),
+                refreshWorkspaceOrder: async () => {
+                    // 原生侧栏可能在首次聚合完成前就收到远端 Workspace；拖拽入口此时
+                    // 先补一次聚合和顺序快照，再继续原操作，避免把虚拟 ID误判成未知项。
+                    const aggregate = await management.aggregate();
+                    const order = await management.workspaceOrder();
+                    transport.setAggregate(aggregate, order.orderedWorkspaceIds);
+                    return order.orderedWorkspaceIds;
+                },
+            }));
             // Desktop 的 Transport 只有 `{ ownsHost, streamBaseUrl }`，shim 不提供 `rpc`，
             // 因此 DSH 用原生 `createWebConnectionRpc` 建立了 Connection。这里在 Connection
             // 就绪后就地补聚合分流：`rpc.call` 上放行聚合请求，本机流在 Remote 服务的
@@ -62,9 +81,8 @@ export const peerHostFeature = {
                     context.resources.add(route);
             }
         }
-        const panel = startPeerHostManagementPanel({ rpc: context.services.rpc });
+        const panel = startPeerHostManagementPanel({ rpc: context.services.rpc, locale: context.services.locale });
         context.resources.add(() => panel.dispose());
-        const management = createPeerHostManagementApi(context.services.rpc);
         // 工作区标签：远端工作区不再把 Host 名写进标题文本，改由彩色标签表达归属。
         const tag = startPeerHostWorkspaceTag();
         context.resources.add(() => tag.dispose());
@@ -72,15 +90,35 @@ export const peerHostFeature = {
         const workspaceTab = startPeerHostWorkspaceTab({
             api: management,
             onWorkspaceAdded: () => refresh(),
+            locale: context.services.locale,
         });
         context.resources.add(() => workspaceTab.dispose());
         // 虚拟会话必须进入原生 SessionManager 目录（否则 sessions.retain 解析失败），
         // 因此聚合变化后触发一次原生列表刷新，由页面 Transport 在 session/list 响应里补齐。
+        let refreshGeneration = 0;
         const refresh = async () => {
+            const generation = ++refreshGeneration;
+            const orderReference = projection.workspaceOrder();
             try {
                 const aggregate = await management.aggregate();
+                // Host 端先完成 aggregate 再 hydrate 顺序；按同一顺序读取可避免拿到空的初始 order，
+                // 同时保持 aggregate 的旧返回形状，旧 Host 不支持该 RPC 时仍回退为追加远端项。
+                let orderedWorkspaceIds;
+                try {
+                    orderedWorkspaceIds = (await management.workspaceOrder()).orderedWorkspaceIds;
+                }
+                catch {
+                    orderedWorkspaceIds = undefined;
+                }
+                // 定时器、可见性事件和原生归档事件可能并发触发刷新；旧请求不能覆盖
+                // 更新的聚合或拖拽顺序，否则列表会短暂跳回旧位置。
+                if (generation !== refreshGeneration)
+                    return;
+                // 聚合读取期间如果用户完成了一次拖拽，保留本地刚确认的顺序；本轮只更新
+                // 工作区内容，下一轮再从 Host 读取顺序，避免旧的 order 响应覆盖拖拽结果。
+                const refreshedOrder = projection.workspaceOrder() === orderReference ? orderedWorkspaceIds : undefined;
                 tag.setAggregate(aggregate);
-                if (transport?.setAggregate(aggregate) === true) {
+                if (transport?.setAggregate(aggregate, refreshedOrder) === true) {
                     await refreshPeerHostNativeSessions(context.services.uiContext);
                 }
             }
@@ -107,9 +145,67 @@ export const peerHostFeature = {
     settingsPanel: PeerHostPanel,
 };
 /** 将 DSH preboot shim 绑定到当前页面的 Host RPC；不调用 Connection.rpc，避免递归。 */
-export function createPeerHostPageTransport(projection = createPeerHostNativeProjection()) {
+export function createPeerHostPageTransport(projection = createPeerHostNativeProjection(), uiContext) {
     const fetchImpl = typeof globalThis.fetch === 'function' ? globalThis.fetch.bind(globalThis) : undefined;
     const scopes = new Map();
+    const remoteHostScopes = new Map();
+    // `session/modelCatalog`、`cli/catalog` 和 `cli/models` 在新建会话阶段可能没有
+    // Session 参数；记录最近一次远程工作区作用域，供这些无参数请求复用。
+    let activeRemoteScope;
+    // DSH 的模型目录是 Host generation 级缓存；PeerHost 工作区切换不会触发 DSH
+    // 自己的 connection/reset，因此这里单独记录当前作用域并在变化时失效目录。
+    let activeModelCatalogScopeKey;
+    const modelCatalogScopeKey = (scope) => {
+        if (scope?.targetHostId === null || scope?.targetHostId === undefined)
+            return undefined;
+        return `${scope.targetHostId}:${scope.workspaceId}:${scope.scopeGeneration}`;
+    };
+    const refreshModelCatalogForScope = (scope) => {
+        const nextKey = modelCatalogScopeKey(scope);
+        if (nextKey === activeModelCatalogScopeKey)
+            return;
+        activeModelCatalogScopeKey = nextKey;
+        refreshDshModelCatalog(uiContext);
+    };
+    let aggregateRefreshTimer;
+    let aggregateRefreshInFlight;
+    let aggregateRefreshQueued = false;
+    let aggregateRefreshLastStartedAt;
+    const scheduleAggregateRefresh = () => {
+        if (!isPeerHostAggregateRefreshRegistered())
+            return;
+        aggregateRefreshQueued = true;
+        if (aggregateRefreshTimer !== undefined || aggregateRefreshInFlight !== undefined)
+            return;
+        const elapsed = aggregateRefreshLastStartedAt === undefined ? 0 : Date.now() - aggregateRefreshLastStartedAt;
+        const delay = Math.max(0, PEER_HOST_SESSION_REFRESH_DEBOUNCE_MS - elapsed);
+        aggregateRefreshTimer = setTimeout(() => {
+            aggregateRefreshTimer = undefined;
+            if (!aggregateRefreshQueued)
+                return;
+            aggregateRefreshQueued = false;
+            if (!isPeerHostAggregateRefreshRegistered())
+                return;
+            aggregateRefreshLastStartedAt = Date.now();
+            let result;
+            try {
+                result = requestPeerHostAggregateRefresh();
+            }
+            catch {
+                result = undefined;
+            }
+            if (result === undefined) {
+                if (aggregateRefreshQueued)
+                    scheduleAggregateRefresh();
+                return;
+            }
+            aggregateRefreshInFlight = Promise.resolve(result).catch(() => undefined).finally(() => {
+                aggregateRefreshInFlight = undefined;
+                if (aggregateRefreshQueued)
+                    scheduleAggregateRefresh();
+            });
+        }, delay);
+    };
     const request = async (channel, endpoint, payload, signal) => {
         if (fetchImpl === undefined)
             throw new Error('当前页面没有 fetch');
@@ -123,7 +219,7 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
         }
         if (response === undefined || !response.ok)
             throw new Error(`transport failure: HTTP ${response?.status ?? 500}`);
-        const envelope = await response.json();
+        const envelope = await readPageRpcResponse(response);
         return envelope.result;
     };
     const codingNsCall = async (endpoint, payload, signal) => {
@@ -165,6 +261,169 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
         }
         return undefined;
     };
+    const scopeForNativeRequest = (method, value) => {
+        const direct = findScope(value);
+        if (direct !== undefined)
+            return direct;
+        if (method === 'session/modelCatalog') {
+            // 新建空白会话时模型目录先于 session/create 请求加载；当前路由中的虚拟
+            // workspace 是这时唯一可用的目标线索，优先于上一次请求留下的作用域。
+            const locationScope = currentLocationWorkspaceScope();
+            if (locationScope !== undefined)
+                return locationScope;
+            if (currentLocationIsLocalWorkspace()) {
+                activeRemoteScope = undefined;
+                refreshModelCatalogForScope(undefined);
+                return undefined;
+            }
+            if (activeRemoteScope !== undefined)
+                return activeRemoteScope;
+        }
+        return undefined;
+    };
+    const scopeForCliRequest = (endpoint, value) => {
+        const direct = findScope(value);
+        if (direct !== undefined)
+            return direct;
+        // 新建远程会话的工具栏先于 session/create 拿到 sessionId；此时 catalog/models
+        // 只有 adapterId 或空对象，沿用当前远程工作区作用域，不能回落到本机 Host。
+        if (endpoint !== 'cli/catalog' && endpoint !== 'cli/models')
+            return undefined;
+        if (currentLocationIsLocalWorkspace()) {
+            activeRemoteScope = undefined;
+            refreshModelCatalogForScope(undefined);
+            return undefined;
+        }
+        return activeRemoteScope;
+    };
+    const rememberNativeScope = (method, scope, value) => {
+        if (scope !== undefined && scope.targetHostId !== null) {
+            activeRemoteScope = scope;
+            refreshModelCatalogForScope(scope);
+            return;
+        }
+        // workspace/follow 和 session/follow 是 DSH 的长期基线/后台流，不代表当前导航。
+        // 只有显式携带本机 workspaceId 的导航才清理远程作用域，不能因本机旧会话的
+        // 后台流抵达，就清掉正在创建的远程会话作用域。
+        if (method === 'workspace/follow' && scope === undefined && containsLocalWorkspaceId(value)) {
+            activeRemoteScope = undefined;
+            refreshModelCatalogForScope(undefined);
+        }
+    };
+    const currentLocationWorkspaceScope = () => {
+        if (typeof window === 'undefined')
+            return undefined;
+        const match = window.location.pathname.match(/\/workspaces\/([^/]+)/u);
+        if (match?.[1] === undefined)
+            return undefined;
+        let workspaceId;
+        try {
+            workspaceId = decodeURIComponent(match[1]);
+        }
+        catch {
+            return undefined;
+        }
+        const parsed = parseVirtualWorkspaceId(workspaceId);
+        if (parsed === null || parsed.targetHostId === null)
+            return undefined;
+        return findScope(parsed.virtualWorkspaceId);
+    };
+    const currentLocationIsLocalWorkspace = () => {
+        if (typeof window === 'undefined')
+            return false;
+        const match = window.location.pathname.match(/\/workspaces\/([^/]+)/u);
+        if (match?.[1] === undefined)
+            return false;
+        let workspaceId;
+        try {
+            workspaceId = decodeURIComponent(match[1]);
+        }
+        catch {
+            return false;
+        }
+        const parsed = parseVirtualWorkspaceId(workspaceId);
+        return parsed === null || parsed.targetHostId === null;
+    };
+    const containsLocalWorkspaceId = (value) => {
+        if (Array.isArray(value))
+            return value.some(containsLocalWorkspaceId);
+        const record = asRecord(value);
+        if (record === null)
+            return false;
+        for (const [key, child] of Object.entries(record)) {
+            if (key === 'workspaceId' && typeof child === 'string' && parseVirtualWorkspaceId(child) === null)
+                return true;
+            if (containsLocalWorkspaceId(child))
+                return true;
+        }
+        return false;
+    };
+    const cliEndpoint = (channel, endpoint) => {
+        if (channel === '/codingns' && endpoint.startsWith('cli/'))
+            return endpoint;
+        if (channel === '/api' && endpoint.startsWith('codingns/cli/'))
+            return endpoint.slice('codingns/'.length);
+        return undefined;
+    };
+    const rewriteCliPayload = (value, scope, key = '') => {
+        if (typeof value === 'string') {
+            const parsed = parseVirtualSessionId(value);
+            const isSessionField = key === 'sessionId' || key === 'parentSessionId' || key === 'childSessionId';
+            return isSessionField && parsed !== null && parsed.hostId === (scope.targetHostId ?? scope.hostId) ? parsed.sessionId : value;
+        }
+        if (Array.isArray(value))
+            return value.map((item) => rewriteCliPayload(item, scope, key));
+        const record = asRecord(value);
+        if (record === null)
+            return value;
+        return Object.fromEntries(Object.entries(record).map(([childKey, child]) => [childKey, rewriteCliPayload(child, scope, childKey)]));
+    };
+    const remoteCliRpc = async (scope, endpoint, payload, signal) => {
+        if (scope.targetHostId === null)
+            throw new Error('PeerHost CLI 请求缺少目标 Host');
+        const response = asRecord(await codingNsCall('peerHost/request', {
+            peerHostId: scope.targetHostId,
+            scope,
+            path: `/api/codingns/${endpoint}`,
+            method: 'POST',
+            body: JSON.stringify({ rpcId: createRequestId(), method: endpoint, payload: rewriteCliPayload(payload, scope) }),
+        }, signal));
+        const status = typeof response?.status === 'number' ? response.status : 500;
+        const body = typeof response?.body === 'string' ? response.body : '';
+        if (status < 200 || status >= 300)
+            throw new Error(`远端 Host CLI RPC 失败: HTTP ${status}`);
+        try {
+            const envelope = asRecord(JSON.parse(body));
+            return envelope?.result;
+        }
+        catch {
+            throw new Error('远端 Host CLI RPC 响应不是 JSON');
+        }
+    };
+    const mergeRemoteAdapterMap = async (localResult, signal) => {
+        const localEnvelope = asRecord(localResult);
+        if (localEnvelope?.ok !== true || !Array.isArray(localEnvelope.value))
+            return localResult;
+        const rows = [...localEnvelope.value];
+        for (const [targetHostId, scope] of remoteHostScopes) {
+            try {
+                const remoteEnvelope = asRecord(await remoteCliRpc(scope, 'cli/session/adapter-map', {}, signal));
+                if (remoteEnvelope?.ok !== true || !Array.isArray(remoteEnvelope.value))
+                    continue;
+                for (const raw of remoteEnvelope.value) {
+                    const row = asRecord(raw);
+                    const sessionId = typeof row?.sessionId === 'string' ? row.sessionId : '';
+                    const adapterId = typeof row?.adapterId === 'string' ? row.adapterId : '';
+                    if (sessionId !== '' && adapterId !== '')
+                        rows.push({ sessionId: createVirtualSessionId(targetHostId, sessionId), adapterId });
+                }
+            }
+            catch {
+                // 旧版目标 Host 没有 CLI 映射时保留本机结果，远端会话仍可打开。
+            }
+        }
+        return { ...localEnvelope, value: rows };
+    };
     const openRemoteStream = (method, payload, scope, signal) => (async function* () {
         const opened = asRecord(await codingNsCall('peerHost/nativeStream', { method, payload, scope }, signal));
         const streamId = typeof opened?.streamId === 'string' ? opened.streamId : '';
@@ -225,8 +484,24 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
             const value = asRecord(payload);
             const channel = typeof value?.channel === 'string' ? value.channel : '/codingns';
             const body = value?.payload;
+            const cli = cliEndpoint(channel, method);
+            if (cli === 'cli/session/adapter-map') {
+                return await mergeRemoteAdapterMap(await request(channel, method, body, signal), signal);
+            }
+            if (cli !== undefined) {
+                const scope = scopeForCliRequest(cli, body);
+                if (scope !== undefined && scope.targetHostId !== null) {
+                    try {
+                        return await remoteCliRpc(scope, cli, body, signal);
+                    }
+                    catch (error) {
+                        return { ok: false, error: { code: 'gateway/internal', message: error instanceof Error ? error.message : String(error) } };
+                    }
+                }
+            }
             if (channel === '/api' && isDshNativeRemoteMethod(method)) {
-                const scope = findScope(body);
+                const scope = scopeForNativeRequest(method, body);
+                rememberNativeScope(method, scope, body);
                 if (scope !== undefined && scope.targetHostId !== null) {
                     // DSH 的 client 契约要求 unary 结果是 `{ok, value}` / `{ok:false, error}` 信封：
                     // 返回裸值会让网关在 `rebuiltFailure(result.error)` 读 undefined.code 而崩成 carrierFailure。
@@ -261,9 +536,29 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
             const channel = typeof value?.channel === 'string' ? value.channel : '/api';
             const body = value?.payload;
             if (channel === '/api' && isDshNativeRemoteMethod(method)) {
-                const scope = findScope(body);
+                const scope = scopeForNativeRequest(method, body);
+                rememberNativeScope(method, scope, body);
                 if (scope !== undefined && scope.targetHostId !== null) {
-                    return openRemoteStream(method, body, scope, signal);
+                    const stream = openRemoteStream(method, body, scope, signal);
+                    if (method !== 'session/follow')
+                        return stream;
+                    // session/follow 承载远端新建、续接过程中的实时事件。聚合摘要本身仍按轮询
+                    // 读取，但由这里把事件转成合并刷新，侧栏无需切换到别的会话才能更新状态。
+                    return (async function* () {
+                        let emitted = false;
+                        try {
+                            for await (const chunk of stream) {
+                                emitted = true;
+                                scheduleAggregateRefresh();
+                                yield chunk;
+                            }
+                        }
+                        finally {
+                            // 某些实现只在回合结束时写入 updatedAt/status，流结束也必须补一次刷新。
+                            if (!emitted)
+                                scheduleAggregateRefresh();
+                        }
+                    })();
                 }
             }
             // 本机流（含 $events 等非白名单流）必须回到 DSH Gateway：本地 baseline 不能
@@ -281,13 +576,24 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
     return {
         hooks,
         /** 该请求是否落在某个远端 Host 的作用域内；Desktop 连接路由用它决定是否分流。 */
-        matchesScope(value) {
-            const scope = findScope(value);
+        matchesScope(value, method) {
+            const cli = method === undefined
+                ? undefined
+                : method === 'cli/catalog' || method === 'cli/models'
+                    ? method
+                    : method.startsWith('codingns/cli/') ? method.slice('codingns/'.length) : undefined;
+            const scope = cli === undefined
+                ? scopeForNativeRequest(method ?? '', value)
+                : scopeForCliRequest(cli, value);
             return scope !== undefined && scope.targetHostId !== null;
         },
-        setAggregate(aggregate) {
+        setAggregate(aggregate, orderedWorkspaceIds) {
             scopes.clear();
+            remoteHostScopes.clear();
             for (const host of aggregate) {
+                if (host.targetHostId !== null) {
+                    remoteHostScopes.set(host.targetHostId, { hostId: host.hostId, targetHostId: host.targetHostId, workspaceId: '__aggregate__', sessionId: null, scopeGeneration: 0 });
+                }
                 for (const workspace of host.workspaces) {
                     const virtualHostId = host.targetHostId ?? host.hostId;
                     const virtualWorkspaceId = createVirtualWorkspaceId(virtualHostId, workspace.workspaceId);
@@ -301,6 +607,14 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
                     }
                 }
             }
+            const locationScope = currentLocationWorkspaceScope();
+            if (locationScope !== undefined && locationScope.targetHostId !== null)
+                activeRemoteScope = locationScope;
+            if (activeRemoteScope !== undefined && activeRemoteScope.targetHostId !== null) {
+                const activeWorkspaceId = createVirtualWorkspaceId(activeRemoteScope.targetHostId, activeRemoteScope.workspaceId);
+                if (!scopes.has(activeWorkspaceId))
+                    activeRemoteScope = undefined;
+            }
             // 刚创建、尚未进入聚合的会话要保住作用域；聚合里已存在的以聚合为准。
             // 一旦聚合确认，pending 记录立即清掉；之后远端删除会随下一次聚合重建自然移除。
             const now = Date.now();
@@ -315,7 +629,8 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
                 }
                 scopes.set(sessionId, pending.scope);
             }
-            return projection.setAggregate(aggregate);
+            refreshModelCatalogForScope(activeRemoteScope);
+            return projection.setAggregate(aggregate, orderedWorkspaceIds);
         },
     };
 }
@@ -345,9 +660,17 @@ export function installPeerHostConnectionRouting(options) {
     const originalCallRemote = remote.openRemoteStream;
     const isPeerScoped = (channel, endpoint, payload) => channel === '/api'
         && isDshNativeRemoteMethod(endpoint)
-        && options.matchesScope(payload);
+        && options.matchesScope(payload, endpoint);
+    const isPeerCli = (channel, endpoint, payload) => {
+        const cliEndpoint = channel === '/codingns' && endpoint.startsWith('cli/')
+            ? endpoint
+            : channel === '/api' && endpoint.startsWith('codingns/cli/')
+                ? endpoint.slice('codingns/'.length)
+                : undefined;
+        return cliEndpoint !== undefined && (cliEndpoint === 'cli/session/adapter-map' || options.matchesScope(payload, endpoint));
+    };
     rpc.call = async (channel, endpoint, payload, signal) => {
-        if (isPeerScoped(channel, endpoint, payload)) {
+        if (isPeerScoped(channel, endpoint, payload) || isPeerCli(channel, endpoint, payload)) {
             return await options.hooks.rpc({ method: endpoint, payload: { channel, payload }, ...(signal === undefined ? {} : { signal }) });
         }
         const result = await originalCall.call(rpc, channel, endpoint, payload, signal);
@@ -409,6 +732,10 @@ function mergeSessionListResult(result, projection) {
         const id = asRecord(item)?.sessionId;
         return typeof id === 'string' ? [id] : [];
     }));
+    for (const session of virtual) {
+        if (session.adapterId !== undefined)
+            publishSessionAdapter(session.sessionId, session.adapterId);
+    }
     const items = [...value.items, ...virtual.filter((session) => !known.has(session.sessionId))];
     return { ...envelope, value: { ...value, items } };
 }
@@ -418,6 +745,110 @@ function createRequestId() {
 function asRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value) ? value : null;
 }
+/**
+ * 解析页面 DSH Gateway 的 JSON 或 multipart 响应。
+ *
+ * `workspaceFiles/readBytes` 等 Remote 会把 Uint8Array 放到 multipart 附件里；
+ * 页面 Transport 不能直接调用 `response.json()`，否则 multipart 的 `--` 边界会被
+ * JSON 解析器当成负数开头，产生误导性的“No number after minus sign”错误。
+ */
+async function readPageRpcResponse(response) {
+    const contentType = response.headers.get('content-type')?.split(';', 1)[0]?.trim().toLowerCase();
+    if (contentType !== 'multipart/form-data')
+        return await response.json();
+    const fields = new Map();
+    for (const [name, value] of (await response.formData()).entries()) {
+        if (fields.has(name))
+            throw new TypeError('connection: invalid binary response fields');
+        fields.set(name, value);
+    }
+    const metadata = fields.get('metadata');
+    if (typeof metadata !== 'string')
+        throw new TypeError('connection: invalid binary response fields');
+    const envelope = asRecord(JSON.parse(metadata));
+    const result = asRecord(envelope?.result);
+    if (envelope === null || result === null)
+        throw new TypeError('connection: invalid server-response envelope');
+    fields.delete('metadata');
+    if (result.ok !== true) {
+        if (fields.size !== 0)
+            throw new TypeError('connection: invalid binary response fields');
+        return envelope;
+    }
+    const attachments = envelope.attachments;
+    if (!Array.isArray(attachments) || attachments.length === 0)
+        throw new TypeError('connection: invalid binary response result');
+    const root = { value: result.value };
+    for (const rawAttachment of attachments) {
+        const attachment = asRecord(rawAttachment);
+        const path = attachment?.path;
+        const part = attachment?.part;
+        if (attachment?.codec !== 'bytes' || typeof part !== 'string' || !Array.isArray(path)) {
+            throw new TypeError('connection: invalid binary response attachment');
+        }
+        const data = fields.get(part);
+        if (!(data instanceof Blob))
+            throw new TypeError('connection: invalid binary response fields');
+        let parent = root;
+        let key = 'value';
+        for (const segment of path) {
+            const value = Reflect.get(parent, key);
+            if (typeof value !== 'object' || value === null)
+                throw new TypeError('connection: invalid binary response path');
+            if (Array.isArray(value)) {
+                if (typeof segment !== 'number' || !Number.isSafeInteger(segment) || segment < 0 || segment >= value.length) {
+                    throw new TypeError('connection: invalid binary response path');
+                }
+            }
+            else if (typeof segment !== 'string') {
+                throw new TypeError('connection: invalid binary response path');
+            }
+            if (!Object.hasOwn(value, segment))
+                throw new TypeError('connection: invalid binary response path');
+            parent = value;
+            key = segment;
+        }
+        if (Reflect.get(parent, key) !== null)
+            throw new TypeError('connection: invalid binary response placeholder');
+        Object.defineProperty(parent, key, {
+            value: new Uint8Array(await data.arrayBuffer()),
+            enumerable: true,
+            writable: true,
+            configurable: true,
+        });
+        fields.delete(part);
+    }
+    if (fields.size !== 0)
+        throw new TypeError('connection: invalid binary response fields');
+    return { ...envelope, result: { ...result, value: root.value } };
+}
+/**
+ * 让 DSH 原生模型目录丢弃上一工作区的缓存并立即读取新作用域。
+ *
+ * `modelDirectories.catalog` 在 DSH 类型中是内部字段，这里只做运行时结构探测，
+ * 这样旧版 DSH 或 Desktop 没有该服务时仍保持原有路由行为。
+ */
+function refreshDshModelCatalog(uiContext) {
+    if (uiContext === undefined)
+        return;
+    try {
+        const service = asRecord(uiContext.get('modelDirectories'));
+        const catalog = service === null ? null : asRecord(service.catalog);
+        if (catalog === null)
+            return;
+        const resetGeneration = catalog.resetGeneration;
+        const refresh = catalog.refresh;
+        if (typeof resetGeneration === 'function') {
+            resetGeneration.call(catalog);
+            return;
+        }
+        if (typeof refresh === 'function')
+            refresh.call(catalog);
+    }
+    catch {
+        // 模型选择插件未挂载或 DSH 版本没有该内部服务时，不影响远程请求本身。
+    }
+}
 /** 打开当前页面 DSH Gateway 的单个 Remote 流；协议与 dsh-api-gateway 保持一致。 */
 function openDshGatewayStream(endpoint, payload, signal) {
     const streamId = `codingns_${Date.now()}_${Math.random().toString(36).slice(2)}`;
@@ -502,23 +933,24 @@ function isDesktopTopologyPage() {
     }
 }
 /** PeerHost 启用状态说明；安装动作发生在启动页 preboot 阶段。 */
-function PeerHostPanel({ enabled }) {
+function PeerHostPanel({ services, enabled }) {
+    const t = useCodingNsTranslator(services.locale);
     // shim 状态在启用变化后可能改变（刚激活为 active），每次渲染都重读全局。
     const state = readDshPeerHostPrebootShimState();
     const mode = readDshPeerHostPrebootShimMode();
     const desktop = mode === 'desktop' || isDesktopTopologyPage();
     const structural = state === 'external' || state === 'not-installed';
     const message = state === 'external'
-        ? '当前页面的 Transport 结构不受支持，插件无法包装它，PeerHost 聚合已停用；刷新页面不会改变结果。'
+        ? t('peerHost.stateExternal')
         : state === 'not-installed'
             ? desktop
-                ? '当前 Desktop 页面没有安装 preboot shim；请重启 DSH Desktop 后再打开页面。'
-                : '当前页面未安装 preboot shim；请刷新 DSH Web 后再启用 PeerHost。'
+                ? t('peerHost.stateNotInstalledDesktop')
+                : t('peerHost.stateNotInstalledWeb')
             : state === 'requires-reload'
-                ? 'preboot shim 已安装，但当前 Connection 尚未绑定聚合 Transport；请刷新 DSH Web 后再操作远端工作区。'
+                ? t('peerHost.stateRequiresReload')
                 : state === 'active'
-                    ? 'preboot shim 已接管页面 Transport；本次页面的原生 Connection 将继续复用同一实例。'
-                    : 'preboot shim 已随 CodingNS 安装；启用 PeerHost 后立即生效，原生工作区会直接读取聚合 Transport。';
+                    ? t('peerHost.stateActive')
+                    : t('peerHost.statePending');
     return createElement('div', {
         role: structural ? 'alert' : 'status',
         'aria-disabled': !enabled,