@jingyi0605/codingns4dsh 0.2.1-beta.3 → 0.2.1-beta.5

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

@@ -10,7 +10,7 @@ import { installPeerHostNativeStoreProjection, refreshPeerHostNativeSessions } f
 import { startPeerHostWorkspaceTag } from '../peer-host-workspace-tag.js';
 import { startPeerHostWorkspaceTab } from '../peer-host-workspace-tab.js';
 import { isPeerHostAggregateRefreshRegistered, registerPeerHostAggregateRefresh, requestPeerHostAggregateRefresh } from '../peer-host-aggregate-refresh.js';
-import { useCodingNsTranslator } from '../locale.js';
+import { resolveCodingNsTranslator, useCodingNsTranslator } from '../locale.js';
 import { publishSessionAdapter } from '../session-adapter-cache.js';
 /** 聚合刷新周期；远端资源只影响自身节点，刷新失败不改变本机界面。 */
 const PEER_HOST_AGGREGATE_REFRESH_MS = 30_000;
@@ -45,11 +45,16 @@ 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, context.services.uiContext);
+        const transport = shim === undefined ? undefined : createPeerHostPageTransport(projection, context.services.uiContext, context.services.locale);
         const management = createPeerHostManagementApi(context.services.rpc);
         if (shim !== undefined) {
             shim.activate(transport.hooks);
-            context.resources.add(() => { shim.deactivate(); });
+            context.resources.add(() => {
+                shim.deactivate();
+                // 资源按逆序释放：此时 Desktop 路由和导航订阅已还原，重新加载本机目录，
+                // 避免停用 PeerHost 后仍展示最后一个远端 Host 的全局缓存。
+                refreshDshModelCatalog(context.services.uiContext);
+            });
             // 原生侧栏在插件 apply 时按引用捕获 `workspaces.list`，只能就地投影这个对象；
             // 没有 shim 就没有原生 Remote 路由，此时不注入，避免出现点不开的远端条目。
             context.resources.add(installPeerHostNativeStoreProjection({
@@ -80,6 +85,13 @@ export const peerHostFeature = {
                 if (route !== undefined)
                     context.resources.add(route);
             }
+            // uiWorkspace 可能晚于 CodingNS 就绪；跟随服务生命周期订阅真实选择状态。
+            // 模块请求、右栏保留资源和后台流都不能代替前台导航。
+            const navigation = context.services.uiContext?.inject(['uiWorkspace'], (scope) => {
+                scope.effect(() => transport.watchNavigation(), 'codingns4dsh: PeerHost model catalog navigation');
+            });
+            if (navigation !== undefined)
+                context.resources.add(() => navigation.dispose());
         }
         const panel = startPeerHostManagementPanel({ rpc: context.services.rpc, locale: context.services.locale });
         context.resources.add(() => panel.dispose());
@@ -145,20 +157,18 @@ export const peerHostFeature = {
     settingsPanel: PeerHostPanel,
 };
 /** 将 DSH preboot shim 绑定到当前页面的 Host RPC；不调用 Connection.rpc，避免递归。 */
-export function createPeerHostPageTransport(projection = createPeerHostNativeProjection(), uiContext) {
+export function createPeerHostPageTransport(projection = createPeerHostNativeProjection(), uiContext, locale) {
+    const t = resolveCodingNsTranslator(locale);
     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，因此这里单独记录当前作用域并在变化时失效目录。
+    // 自己的 connection/reset，因此仅按前台导航的 Host 变化使目录失效。
     let activeModelCatalogScopeKey;
     const modelCatalogScopeKey = (scope) => {
         if (scope?.targetHostId === null || scope?.targetHostId === undefined)
             return undefined;
-        return `${scope.targetHostId}:${scope.workspaceId}:${scope.scopeGeneration}`;
+        return scope.targetHostId;
     };
     const refreshModelCatalogForScope = (scope) => {
         const nextKey = modelCatalogScopeKey(scope);
@@ -265,50 +275,42 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
         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;
+        return method === 'session/modelCatalog' && !containsResourceId(value) ? navigationScope() : undefined;
     };
-    const scopeForCliRequest = (endpoint, value) => {
+    const scopeForPluginRequest = (endpoint, value) => {
+        // 调试只按顶层资源选择 Host，配置正文里的字符串不能影响路由。
+        if (isDebugPluginEndpoint(endpoint)) {
+            const input = asRecord(value);
+            return findScope(input?.workspaceId) ?? findScope(input?.sessionId);
+        }
         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);
+        // 显式指定本机 Session 的目录请求保持本机；只有无资源 ID 的工具栏目录
+        // 才跟随前台导航，不能被其他会话的 CLI 请求带到错误 Host。
+        if ((endpoint !== 'cli/catalog' && endpoint !== 'cli/models') || containsResourceId(value))
             return undefined;
-        }
-        return activeRemoteScope;
+        return navigationScope();
     };
-    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 navigationScope = () => {
+        const selection = readNativeNavigationStore(uiContext)?.getSnapshot();
+        // 空选择和本机选择都是明确的本机状态；Desktop/PWA 的根地址不表达导航，
+        // 也不能让旧 URL 覆盖当前会话。新远端会话的 ID 由 pending 作用域补齐。
+        if (selection !== undefined) {
+            const direct = findScope(selection);
+            if (direct !== undefined)
+                return direct;
+            // 目录属于 Host，不依赖会话是否已进入聚合。pending 到期或摘要暂时缺行时，
+            // 虚拟 ID 仍明确携带目标 Host，不能把远端目录静默换成本机目录。
+            const selected = asRecord(selection);
+            const sessionId = selected?.sessionId ?? asRecord(selected?.subagentAddress)?.parentSessionId;
+            const session = typeof sessionId === 'string' ? parseVirtualSessionId(sessionId) : null;
+            const workspace = typeof selected?.workspaceId === 'string' ? parseVirtualWorkspaceId(selected.workspaceId) : null;
+            const hostId = session?.hostId ?? workspace?.targetHostId;
+            return hostId === null || hostId === undefined ? undefined : remoteHostScopes.get(hostId);
         }
+        // 没有原生导航服务的旧宿主只依据显式工作区 URL；从不猜最近请求属于谁。
+        return currentLocationWorkspaceScope();
     };
     const currentLocationWorkspaceScope = () => {
         if (typeof window === 'undefined')
@@ -328,43 +330,20 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
             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) => {
+    const containsResourceId = (value) => {
         if (Array.isArray(value))
-            return value.some(containsLocalWorkspaceId);
+            return value.some(containsResourceId);
         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)
+            if ((key === 'workspaceId' || key === 'sessionId' || key === 'parentSessionId') && typeof child === 'string' && child !== '')
                 return true;
-            if (containsLocalWorkspaceId(child))
+            if (containsResourceId(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);
@@ -378,26 +357,41 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
             return value;
         return Object.fromEntries(Object.entries(record).map(([childKey, child]) => [childKey, rewriteCliPayload(child, scope, childKey)]));
     };
-    const remoteCliRpc = async (scope, endpoint, payload, signal) => {
+    const remotePluginRpc = async (scope, endpoint, payload, signal) => {
         if (scope.targetHostId === null)
-            throw new Error('PeerHost CLI 请求缺少目标 Host');
+            throw new Error('PeerHost 插件请求缺少目标 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) }),
+            body: JSON.stringify({ rpcId: createRequestId(), method: endpoint, payload: endpoint.startsWith('git/')
+                    ? { ...asRecord(payload), workspaceId: scope.workspaceId }
+                    : endpoint.startsWith('cli/') ? rewriteCliPayload(payload, scope) : rewriteDebugPayload(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}`);
+        if (status < 200 || status >= 300) {
+            // Host 代理已经生成脱敏的稳定错误，不能再用裸 HTTP 状态掩盖认证原因。
+            let error = null;
+            try {
+                error = asRecord(asRecord(JSON.parse(body))?.error);
+            }
+            catch { /* 非 JSON 响应继续使用状态码兜底。 */ }
+            if (typeof error?.code === 'string' && typeof error.message === 'string') {
+                return { ok: false, error: { code: error.code, message: error.message } };
+            }
+            throw new Error(`远端 Host 插件 RPC 失败: HTTP ${status}`);
+        }
         try {
             const envelope = asRecord(JSON.parse(body));
-            return envelope?.result;
+            // Git 面板及缓存继续持有虚拟 ID，真实 ID 只出现在目标 Host 的请求中。
+            return endpoint.startsWith('git/')
+                ? projectGitWorkspaceIds(envelope?.result, scope.workspaceId, createVirtualWorkspaceId(scope.targetHostId, scope.workspaceId))
+                : envelope?.result;
         }
         catch {
-            throw new Error('远端 Host CLI RPC 响应不是 JSON');
+            throw new Error('远端 Host 插件 RPC 响应不是 JSON');
         }
     };
     const mergeRemoteAdapterMap = async (localResult, signal) => {
@@ -407,7 +401,7 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
         const rows = [...localEnvelope.value];
         for (const [targetHostId, scope] of remoteHostScopes) {
             try {
-                const remoteEnvelope = asRecord(await remoteCliRpc(scope, 'cli/session/adapter-map', {}, signal));
+                const remoteEnvelope = asRecord(await remotePluginRpc(scope, 'cli/session/adapter-map', {}, signal));
                 if (remoteEnvelope?.ok !== true || !Array.isArray(remoteEnvelope.value))
                     continue;
                 for (const raw of remoteEnvelope.value) {
@@ -474,25 +468,35 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
             // 聚合确认后 scopes 会持有新的对象；只清理仍由 pending 持有的旧作用域。
             if (scopes.get(sessionId) === pending.scope)
                 scopes.delete(sessionId);
+            refreshModelCatalogForScope(navigationScope());
         }, PEER_HOST_PENDING_SESSION_SCOPE_TTL_MS);
         timer.unref?.();
         pendingSessionScopes.set(sessionId, { scope: created, expiresAt, timer });
         scopes.set(sessionId, created);
+        refreshModelCatalogForScope(navigationScope());
     };
     const hooks = {
         rpc: async ({ method, payload, signal }) => {
             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') {
+            const endpoint = peerHostPluginEndpoint(channel, method);
+            if (endpoint === 'cli/session/adapter-map') {
                 return await mergeRemoteAdapterMap(await request(channel, method, body, signal), signal);
             }
-            if (cli !== undefined) {
-                const scope = scopeForCliRequest(cli, body);
+            if (endpoint !== undefined) {
+                if (isDebugPluginEndpoint(endpoint) && hasVirtualDebugScope(body) && scopeForPluginRequest(endpoint, body) === undefined) {
+                    return { ok: false, error: { code: 'PEER_HOST_SCOPE_MISMATCH', message: t('peerHost.debugWorkspaceUnavailable') } };
+                }
+                // Git 只由顶层 workspaceId 决定归属，文件名和提交正文不能参与 Host 选择。
+                const workspaceId = asRecord(body)?.workspaceId;
+                const scope = endpoint.startsWith('git/') ? findScope(workspaceId) : scopeForPluginRequest(endpoint, body);
+                if (endpoint.startsWith('git/') && typeof workspaceId === 'string' && parseVirtualWorkspaceId(workspaceId) !== null && scope === undefined) {
+                    return { ok: false, error: { code: 'PEER_HOST_SCOPE_MISMATCH', message: t('peerHost.gitWorkspaceUnavailable') } };
+                }
                 if (scope !== undefined && scope.targetHostId !== null) {
                     try {
-                        return await remoteCliRpc(scope, cli, body, signal);
+                        return await remotePluginRpc(scope, endpoint, body, signal);
                     }
                     catch (error) {
                         return { ok: false, error: { code: 'gateway/internal', message: error instanceof Error ? error.message : String(error) } };
@@ -501,7 +505,6 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
             }
             if (channel === '/api' && isDshNativeRemoteMethod(method)) {
                 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。
@@ -537,7 +540,6 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
             const body = value?.payload;
             if (channel === '/api' && isDshNativeRemoteMethod(method)) {
                 const scope = scopeForNativeRequest(method, body);
-                rememberNativeScope(method, scope, body);
                 if (scope !== undefined && scope.targetHostId !== null) {
                     const stream = openRemoteStream(method, body, scope, signal);
                     if (method !== 'session/follow')
@@ -577,6 +579,17 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
         hooks,
         /** 该请求是否落在某个远端 Host 的作用域内；Desktop 连接路由用它决定是否分流。 */
         matchesScope(value, method) {
+            const endpoint = method?.replace(/^codingns\//u, '') ?? '';
+            if (isDebugPluginEndpoint(endpoint)) {
+                const scope = scopeForPluginRequest(endpoint, value);
+                // 聚合暂时缺失时仍接管虚拟资源，返回明确错误，禁止回落本机调试服务。
+                return scope === undefined ? hasVirtualDebugScope(value) : scope.targetHostId !== null;
+            }
+            if (method?.startsWith('git/') || method?.startsWith('codingns/git/')) {
+                const workspaceId = asRecord(value)?.workspaceId;
+                // 聚合断线后也要接管虚拟 ID，交给上面的明确错误，不能落回本机 Git。
+                return typeof workspaceId === 'string' && parseVirtualWorkspaceId(workspaceId) !== null;
+            }
             const cli = method === undefined
                 ? undefined
                 : method === 'cli/catalog' || method === 'cli/models'
@@ -584,9 +597,16 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
                     : method.startsWith('codingns/cli/') ? method.slice('codingns/'.length) : undefined;
             const scope = cli === undefined
                 ? scopeForNativeRequest(method ?? '', value)
-                : scopeForCliRequest(cli, value);
+                : scopeForPluginRequest(cli, value);
             return scope !== undefined && scope.targetHostId !== null;
         },
+        watchNavigation() {
+            const store = readNativeNavigationStore(uiContext);
+            const refresh = () => refreshModelCatalogForScope(navigationScope());
+            const stop = store?.subscribe(refresh);
+            refresh();
+            return stop ?? (() => undefined);
+        },
         setAggregate(aggregate, orderedWorkspaceIds) {
             scopes.clear();
             remoteHostScopes.clear();
@@ -607,14 +627,6 @@ 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();
@@ -629,11 +641,59 @@ export function createPeerHostPageTransport(projection = createPeerHostNativePro
                 }
                 scopes.set(sessionId, pending.scope);
             }
-            refreshModelCatalogForScope(activeRemoteScope);
+            refreshModelCatalogForScope(navigationScope());
             return projection.setAggregate(aggregate, orderedWorkspaceIds);
         },
     };
 }
+/** 两种 Connection 通道共用插件白名单，避免页面 Transport 与原生连接分流不一致。 */
+function peerHostPluginEndpoint(channel, method) {
+    const endpoint = channel === '/codingns' ? method
+        : channel === '/api' && method.startsWith('codingns/') ? method.slice('codingns/'.length) : '';
+    return endpoint.startsWith('cli/') || endpoint.startsWith('git/') || endpoint.startsWith('debug/') || endpoint === 'terminal/status' ? endpoint : undefined;
+}
+function isDebugPluginEndpoint(endpoint) {
+    return endpoint.startsWith('debug/') || endpoint === 'terminal/status';
+}
+function hasVirtualDebugScope(value) {
+    const input = asRecord(value);
+    return (typeof input?.workspaceId === 'string' && parseVirtualWorkspaceId(input.workspaceId) !== null)
+        || (typeof input?.sessionId === 'string' && parseVirtualSessionId(input.sessionId) !== null);
+}
+/** 只投影响应中的工作区标识；Diff、提交正文和文件路径均保持原文。 */
+function projectGitWorkspaceIds(value, workspaceId, virtualWorkspaceId) {
+    if (Array.isArray(value))
+        return value.map((item) => projectGitWorkspaceIds(item, workspaceId, virtualWorkspaceId));
+    const record = asRecord(value);
+    if (record === null)
+        return value;
+    return Object.fromEntries(Object.entries(record).map(([key, child]) => [
+        key,
+        key === 'workspaceId' && child === workspaceId ? virtualWorkspaceId : projectGitWorkspaceIds(child, workspaceId, virtualWorkspaceId),
+    ]));
+}
+/** 只还原调试请求顶层资源标识，配置里的命令、参数和环境变量必须原样保存。 */
+function rewriteDebugPayload(value, scope) {
+    const input = asRecord(value);
+    if (input === null)
+        return value;
+    const result = { ...input };
+    const workspace = typeof input.workspaceId === 'string' ? parseVirtualWorkspaceId(input.workspaceId) : null;
+    if (workspace !== null) {
+        if (workspace.hostId !== scope.targetHostId || workspace.workspaceId !== scope.workspaceId)
+            throw new Error('调试请求的 Workspace 与目标 Host 作用域不一致');
+        result.workspaceId = workspace.workspaceId;
+    }
+    for (const key of ['sessionId', 'dshSessionId']) {
+        const session = typeof input[key] === 'string' ? parseVirtualSessionId(input[key]) : null;
+        if (session === null)
+            continue;
+        if (session.hostId !== scope.targetHostId)
+            throw new Error('调试请求的 Session 与目标 Host 作用域不一致');
+        result[key] = session.sessionId;
+    }
+    return result;
+}
 /**
  * Desktop 拓扑下把 PeerHost 聚合路由挂到 DSH 原生 Connection 上。
  *
@@ -661,16 +721,12 @@ export function installPeerHostConnectionRouting(options) {
     const isPeerScoped = (channel, endpoint, payload) => channel === '/api'
         && isDshNativeRemoteMethod(endpoint)
         && 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));
+    const isPeerPlugin = (channel, endpoint, payload) => {
+        const pluginEndpoint = peerHostPluginEndpoint(channel, endpoint);
+        return pluginEndpoint !== undefined && (pluginEndpoint === 'cli/session/adapter-map' || options.matchesScope(payload, endpoint));
     };
     rpc.call = async (channel, endpoint, payload, signal) => {
-        if (isPeerScoped(channel, endpoint, payload) || isPeerCli(channel, endpoint, payload)) {
+        if (isPeerScoped(channel, endpoint, payload) || isPeerPlugin(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);
@@ -717,6 +773,20 @@ function readConnectionHandle(uiContext) {
         return undefined;
     }
 }
+/** 只借用原生导航数据，不修改选择策略，也不从后台保留会话推断前台。 */
+function readNativeNavigationStore(uiContext) {
+    try {
+        const service = asRecord(uiContext?.get('uiWorkspace'));
+        const store = asRecord(service?.selection);
+        if (typeof store?.getSnapshot !== 'function' || typeof store.subscribe !== 'function')
+            return undefined;
+        return store;
+    }
+    catch {
+        // 服务尚未挂载时由注入生命周期稍后订阅；无此服务的宿主退回显式 URL。
+        return undefined;
+    }
+}
 /** 把虚拟会话摘要并入 session/list 结果；形状不符时保持本机结果不变。 */
 function mergeSessionListResult(result, projection) {
     const envelope = asRecord(result);