@jingyi0605/codingns4dsh 0.2.0-beta.2 → 0.2.0-rc3

package/data/build/dist/host/cli-bridge/mcp-stdio-entry.js

@@ -0,0 +1,170 @@
+/**
+ * 最小 MCP stdio server：把外部 CLI 的子代理调用转发到 Host 桥接端点。
+ *
+ * 只依赖 Node 内置能力，由外部 CLI 以 `node <entry.js>` 直接启动；桥接地址、
+ * 令牌和 DSH 会话身份全部来自进程环境，不读取磁盘上的任何配置。
+ */
+const BRIDGE_URL = (process.env.CODINGNS_BRIDGE_URL ?? '').replace(/\/+$/u, '');
+const BRIDGE_TOKEN = process.env.CODINGNS_BRIDGE_TOKEN ?? '';
+const SESSION_ID = process.env.CODINGNS_DSH_SESSION_ID ?? '';
+const ADAPTER_ID = process.env.CODINGNS_ADAPTER_ID ?? '';
+const DISPATCH_TIMEOUT_MS = 16 * 60_000;
+const TOOL_DEFINITION = {
+    name: 'agent_subagent',
+    description: 'Plan and execute external Agent subtasks in independent DSH sessions. Use action=start to create, action=wait to await a child session, and action=read to inspect it. Respect depends_on before starting dependent work.',
+    inputSchema: {
+        type: 'object',
+        properties: {
+            prompt: { type: 'string', description: '完整、自包含的子任务说明。' },
+            agent: { type: 'string', description: '外部编码 Agent id；缺省沿用当前会话的 Agent。' },
+            model: { type: 'string', description: '可选模型覆盖。' },
+            description: { type: 'string', description: '给子代理的简短标题。' },
+            subagent_type: { type: 'string', description: '子代理类型提示（explore/plan/general）。' },
+            action: { type: 'string', enum: ['start', 'wait', 'read'] },
+            child_session_id: { type: 'string' },
+            timeout_ms: { type: 'number' },
+            depends_on: { type: 'array', items: { type: 'string' } },
+        },
+        required: [],
+        additionalProperties: false,
+    },
+};
+let buffer = '';
+process.stdin.setEncoding('utf8');
+process.stdin.on('data', (chunk) => {
+    buffer += chunk;
+    let index = buffer.indexOf('\n');
+    while (index >= 0) {
+        const line = buffer.slice(0, index).trim();
+        buffer = buffer.slice(index + 1);
+        if (line !== '')
+            void handleLine(line);
+        index = buffer.indexOf('\n');
+    }
+});
+process.stdin.on('end', () => process.exit(0));
+async function handleLine(line) {
+    let message;
+    try {
+        message = JSON.parse(line);
+    }
+    catch {
+        return;
+    }
+    if (typeof message !== 'object' || message === null)
+        return;
+    const request = message;
+    const id = request.id;
+    // 通知没有 id，不需要响应。
+    if (id === undefined || id === null)
+        return;
+    const method = typeof request.method === 'string' ? request.method : '';
+    try {
+        if (method === 'initialize') {
+            respond(id, {
+                protocolVersion: readProtocolVersion(request.params),
+                capabilities: { tools: {} },
+                serverInfo: { name: 'codingns-subagent-bridge', version: '0.2.0' },
+            });
+            return;
+        }
+        if (method === 'ping') {
+            respond(id, {});
+            return;
+        }
+        if (method === 'tools/list') {
+            respond(id, { tools: [TOOL_DEFINITION] });
+            return;
+        }
+        if (method === 'tools/call') {
+            respond(id, await callTool(request.params));
+            return;
+        }
+        respondError(id, -32601, `Method not found: ${method}`);
+    }
+    catch (error) {
+        respondError(id, -32603, error instanceof Error ? error.message : String(error));
+    }
+}
+async function callTool(params) {
+    const record = asRecord(params);
+    const name = typeof record?.name === 'string' ? record.name : '';
+    if (name !== TOOL_DEFINITION.name)
+        return textResult(`未知工具: ${name}`, true);
+    const args = asRecord(record?.arguments) ?? {};
+    const action = args.action === 'wait' || args.action === 'read' ? args.action : 'start';
+    const prompt = typeof args.prompt === 'string' ? args.prompt : '';
+    if (action === 'start' && prompt.trim() === '')
+        return textResult('start 操作的 prompt 不能为空', true);
+    if (BRIDGE_URL === '' || BRIDGE_TOKEN === '' || SESSION_ID === '')
+        return textResult('Codingns4DSH 子代理桥接未配置', true);
+    try {
+        const response = await fetch(`${BRIDGE_URL}/v1/dispatch`, {
+            method: 'POST',
+            headers: { authorization: `Bearer ${BRIDGE_TOKEN}`, 'content-type': 'application/json' },
+            body: JSON.stringify({
+                sessionId: SESSION_ID,
+                prompt,
+                action,
+                ...(typeof args.child_session_id === 'string' && args.child_session_id.trim() !== '' ? { childSessionId: args.child_session_id.trim() } : {}),
+                ...(Array.isArray(args.depends_on) ? { dependsOn: args.depends_on.filter((item) => typeof item === 'string' && item.trim() !== '').map((item) => item.trim()) } : {}),
+                ...(typeof args.timeout_ms === 'number' && Number.isFinite(args.timeout_ms) ? { timeoutMs: args.timeout_ms } : {}),
+                ...(typeof args.agent === 'string' && args.agent.trim() !== '' ? { agent: args.agent.trim() } : { agent: ADAPTER_ID }),
+                ...(typeof args.model === 'string' && args.model.trim() !== '' ? { model: args.model.trim() } : {}),
+                ...(typeof args.description === 'string' && args.description.trim() !== '' ? { description: args.description.trim() } : {}),
+                ...(typeof args.subagent_type === 'string' && args.subagent_type.trim() !== '' ? { subagentType: args.subagent_type.trim() } : {}),
+            }),
+            signal: AbortSignal.timeout(DISPATCH_TIMEOUT_MS),
+        });
+        const payload = await readJsonRecord(response);
+        if (!response.ok) {
+            const detail = typeof payload?.error === 'string' && payload.error.trim() !== '' ? payload.error.trim() : `HTTP ${String(response.status)}`;
+            return textResult(`子代理桥接请求失败：${detail}`, true);
+        }
+        if (payload?.ok !== true) {
+            const safePayload = payload ?? {};
+            const status = safePayload.status;
+            if (status === 'creating' || status === 'running') {
+                return textResult(JSON.stringify({
+                    status,
+                    completed: safePayload.completed === true,
+                    ...(typeof safePayload.childSessionId === 'string' ? { childSessionId: safePayload.childSessionId } : {}),
+                    text: typeof safePayload.text === 'string' ? safePayload.text : '子代理仍在运行。',
+                }), false);
+            }
+            const detail = typeof safePayload.error === 'string' && safePayload.error.trim() !== '' ? safePayload.error.trim() : '桥接端未返回具体错误。';
+            return textResult(`子代理执行失败：${detail}`, true);
+        }
+        const text = typeof payload.text === 'string' && payload.text.trim() !== '' ? payload.text : '子代理已完成，但没有文本输出。';
+        return textResult(text, false);
+    }
+    catch (error) {
+        return textResult(`子代理桥接不可达：${error instanceof Error ? error.message : String(error)}`, true);
+    }
+}
+function textResult(text, isError) {
+    return { content: [{ type: 'text', text }], ...(isError ? { isError: true } : {}) };
+}
+async function readJsonRecord(response) {
+    try {
+        return asRecord(await response.json());
+    }
+    catch {
+        return undefined;
+    }
+}
+function readProtocolVersion(params) {
+    const record = asRecord(params);
+    return typeof record?.protocolVersion === 'string' && record.protocolVersion !== '' ? record.protocolVersion : '2024-11-05';
+}
+function respond(id, result) {
+    process.stdout.write(`${JSON.stringify({ jsonrpc: '2.0', id, result })}\n`);
+}
+function respondError(id, code, message) {
+    process.stdout.write(`${JSON.stringify({ jsonrpc: '2.0', id, error: { code, message } })}\n`);
+}
+function asRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value) ? value : undefined;
+}
+export {};
+//# sourceMappingURL=mcp-stdio-entry.js.map

package/data/build/dist/host/cli-bridge/mcp-stdio-entry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-stdio-entry.js","sourceRoot":"","sources":["../../../../../src/host/cli-bridge/mcp-stdio-entry.ts"],"names":[],"mappings":"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"}

package/data/build/dist/host/features/lan-access-dsh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lan-access-dsh.d.ts","sourceRoot":"","sources":["../../../../../src/host/features/lan-access-dsh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AAEtE,OAAO,EAA8G,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAG3K,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,8CAA8C;AAC9C,wBAAgB,yBAAyB,CAAC,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,mBAAmB,CAAA;CAAO,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAwD9H"}
+{"version":3,"file":"lan-access-dsh.d.ts","sourceRoot":"","sources":["../../../../../src/host/features/lan-access-dsh.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AAEtE,OAAO,EAA8G,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAI3K,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEtD,8CAA8C;AAC9C,wBAAgB,yBAAyB,CAAC,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,mBAAmB,CAAA;CAAO,GAAG,aAAa,CAAC,oBAAoB,CAAC,CA2D9H"}

package/data/build/dist/host/features/lan-access-dsh.js

@@ -2,6 +2,7 @@ import { DEFAULT_LAN_ACCESS_DSH_PWA_SETTINGS } from '../../shared/contracts/conf
 import { createLanAccessDshRpcHandler, createNodeLanAccessDshRuntime, FileLanAccessDshLoginStore, LanAccessDshProxy } from '../lan-access-dsh.js';
 import { createLanAccessDshPwaProvider, PwaPushService } from '../modules/pwa/index.js';
 import { createPwaSessionNotification } from '../modules/pwa/pwa-session-notifications.js';
+import { resolveHostPushLocale } from '../browser-text.js';
 /** Host 侧“局域网访问 DSH”模块，只管理一条 DSH Web 监听映射。 */
 export function createLanAccessDshFeature(options = {}) {
     return {
@@ -25,7 +26,10 @@ export function createLanAccessDshFeature(options = {}) {
             proxy.setLoginConfig(loginConfig);
             // 推送只保存订阅与 VAPID 私钥；是否真的订阅由浏览器侧在用户开启时决定。
             const push = new PwaPushService();
-            context.resources.add(context.services.rpc.register('lanAccessDsh', createLanAccessDshRpcHandler(proxy, settings, loginStore, { push })));
+            context.resources.add(context.services.rpc.register('lanAccessDsh', createLanAccessDshRpcHandler(proxy, settings, loginStore, {
+                push,
+                resolveLocale: () => resolveHostPushLocale(context.services.settingsProvider),
+            })));
             // 推送订阅由浏览器显式开启；开启后把原生会话完成/等待输入事件转成通知。
             // 事件监听属于局域网功能生命周期，停用模块时随资源一起释放。
             const nativeSessions = context.services.nativeSessions;
@@ -35,7 +39,7 @@ export function createLanAccessDshFeature(options = {}) {
                         const pwa = settings?.get().lanAccessDsh.pwa;
                         if (pwa?.enabled !== true || pwa.notifications !== 'push')
                             return;
-                        const payload = createPwaSessionNotification({ session, event });
+                        const payload = createPwaSessionNotification({ session, event, locale: resolveHostPushLocale(context.services.settingsProvider) });
                         if (payload === null)
                             return;
                         void push.sendToAll(payload).catch((error) => {

package/data/build/dist/host/features/lan-access-dsh.js.map

@@ -1 +1 @@
-{"version":3,"file":"lan-access-dsh.js","sourceRoot":"","sources":["../../../../../src/host/features/lan-access-dsh.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lan-access-dsh.js","sourceRoot":"","sources":["../../../../../src/host/features/lan-access-dsh.ts"],"names":[],"mappings":"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"}

package/data/build/dist/host/features/peer-host.d.ts

@@ -1,9 +1,12 @@
 import type { FeatureModule } from '../../shared/contracts/feature.js';
 import type { CodingNsHostServices } from './types.js';
-import type { PeerHostRecord, PeerHostClientRecord } from '../../shared/contracts/peer-host.js';
+import type { AggregateHostResult, PeerHostRecord, PeerHostClientRecord } from '../../shared/contracts/peer-host.js';
+import { type HostScope } from '../../shared/contracts/peer-host.js';
 import type { AggregateHostSource } from '../modules/peer-host/peer-host-aggregate-service.js';
+import { VirtualWorkspaceRegistry } from '../modules/peer-host/peer-host-virtual-registry.js';
 import { type PeerHostRemoteConnector } from '../modules/peer-host/host-ws-proxy-service.js';
 import { type PeerHostRelayTransportFactory } from '../modules/peer-host/peer-host-relay.js';
+import { type VirtualIdResolver } from '../modules/peer-host/peer-host-native-protocol.js';
 export interface PeerHostFeatureOptions {
     readonly stateDirectory?: string;
     readonly ownerUserId?: string;
@@ -18,5 +21,22 @@ export interface PeerHostFeatureOptions {
 }
 /** PeerHost Host 模块；配置、握手和目标登录态只在 Host 进程内装配。 */
 export declare function createPeerHostFeature(options?: PeerHostFeatureOptions): FeatureModule<CodingNsHostServices>;
+/**
+ * 为原生 Remote 请求补充“聚合尚未确认”的临时 ID 解析。
+ *
+ * session/create 返回后，客户端会马上打开 session/follow；此时 Host 侧聚合
+ * Registry 可能还没有新会话，但请求 scope 已经携带了真实 sessionId。只允许
+ * 解析与当前目标 Host、工作区和会话 scope 完全匹配的虚拟 ID，避免把任意旧 ID
+ * 当成可路由资源。
+ */
+export declare function createScopedNativeIdResolver(registry: VirtualWorkspaceRegistry, scope: HostScope): VirtualIdResolver;
+/**
+ * 用 DSH 原生注册表补齐本地工作区。
+ *
+ * 本地摘要还在启动、会话服务暂时不可读时，聚合 source 可能只返回远端结果。
+ * 顺序 Registry 仍必须知道本地 ID，否则客户端无法把本地项转换成混合顺序中的
+ * 虚拟 ID。这里仅补齐排序所需的最小记录，真实会话仍由本机 DSH Store 提供。
+ */
+export declare function ensureLocalWorkspaceSummaries(results: readonly AggregateHostResult[], ctx: CodingNsHostServices['dshContext']): readonly AggregateHostResult[];
 export declare function toPeerHostClientRecord(record: PeerHostRecord): PeerHostClientRecord;
 //# sourceMappingURL=peer-host.d.ts.map

package/data/build/dist/host/features/peer-host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"peer-host.d.ts","sourceRoot":"","sources":["../../../../../src/host/features/peer-host.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAetD,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAA;AAG/F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAA;AAM9F,OAAO,EAAgD,KAAK,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AAE1I,OAAO,EAA0D,KAAK,6BAA6B,EAAE,MAAM,yCAAyC,CAAA;AAcpJ,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAA;IACnC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;IACjC,0DAA0D;IAC1D,QAAQ,CAAC,aAAa,CAAC,EAAE,uBAAuB,CAAA;IAChD,mDAAmD;IACnD,QAAQ,CAAC,cAAc,CAAC,EAAE,6BAA6B,CAAA;IACvD,8CAA8C;IAC9C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,SAAS,mBAAmB,EAAE,CAAC,CAAA;CAC1E;AAED,iDAAiD;AACjD,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,sBAA2B,GAAG,aAAa,CAAC,oBAAoB,CAAC,CA+X/G;AAyLD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,cAAc,GAAG,oBAAoB,CAOnF"}
+{"version":3,"file":"peer-host.d.ts","sourceRoot":"","sources":["../../../../../src/host/features/peer-host.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAA;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAetD,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAA;AAEpH,OAAO,EAA4H,KAAK,SAAS,EAAE,MAAM,qCAAqC,CAAA;AAC9L,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAA;AAG9F,OAAO,EAAoC,wBAAwB,EAAE,MAAM,oDAAoD,CAAA;AAG/H,OAAO,EAAgD,KAAK,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AAE1I,OAAO,EAA0D,KAAK,6BAA6B,EAAE,MAAM,yCAAyC,CAAA;AASpJ,OAAO,EAAyG,KAAK,iBAAiB,EAAE,MAAM,mDAAmD,CAAA;AAMjM,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAA;IACnC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAA;IACjC,0DAA0D;IAC1D,QAAQ,CAAC,aAAa,CAAC,EAAE,uBAAuB,CAAA;IAChD,mDAAmD;IACnD,QAAQ,CAAC,cAAc,CAAC,EAAE,6BAA6B,CAAA;IACvD,8CAA8C;IAC9C,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,OAAO,CAAC,SAAS,mBAAmB,EAAE,CAAC,CAAA;CAC1E;AAED,iDAAiD;AACjD,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,sBAA2B,GAAG,aAAa,CAAC,oBAAoB,CAAC,CAoa/G;AA8KD;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,wBAAwB,EAAE,KAAK,EAAE,SAAS,GAAG,iBAAiB,CAmBpH;AAaD;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,SAAS,mBAAmB,EAAE,EACvC,GAAG,EAAE,oBAAoB,CAAC,YAAY,CAAC,GACtC,SAAS,mBAAmB,EAAE,CAoChC;AAoBD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,cAAc,GAAG,oBAAoB,CAOnF"}

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

@@ -7,7 +7,7 @@ import { PeerHostHandshakeService } from '../modules/peer-host/peer-host-handsha
 import { PeerHostSessionService } from '../modules/peer-host/peer-host-session.js';
 import { PeerHostHttpProxyService } from '../modules/peer-host/host-api-proxy-service.js';
 import { EncryptedFilePeerHostCredentialStore, FilePeerHostRecordStore, PeerHostStore, } from '../modules/peer-host/peer-host-store.js';
-import { createVirtualSessionId, createVirtualWorkspaceId, normalizePeerHostColor } from '../../shared/contracts/peer-host.js';
+import { createVirtualSessionId, createVirtualWorkspaceId, normalizePeerHostColor, parseVirtualSessionId, parseVirtualWorkspaceId } from '../../shared/contracts/peer-host.js';
 import { PeerHostAggregateService } from '../modules/peer-host/peer-host-aggregate-service.js';
 import { resolveDshNativeDispatch } from '../modules/peer-host/peer-host-native-dispatch.js';
 import { FileAggregateWorkspaceOrderStore, VirtualWorkspaceRegistry } from '../modules/peer-host/peer-host-virtual-registry.js';
@@ -22,9 +22,10 @@ import { createPeerHostDiagnosticSink, toPeerHostDiagnosticSnapshot } from '../m
 import { AggregatedHostTransportService } from '../modules/peer-host/aggregated-host-transport.js';
 import { createDshNativeSummarySource } from '../modules/peer-host/dsh-native-summary-source.js';
 import { createPeerHostRemoteSummarySource, readPeerHostRemoteWorkspaceCandidates } from '../modules/peer-host/peer-host-remote-summary-source.js';
-import { callPeerNativeRpc, openPeerNativeStream, readNativeRpcEnvelope } from '../modules/peer-host/peer-host-native-transport.js';
+import { callPeerCliRpc, callPeerNativeRpc, openPeerNativeStream, readNativeRpcEnvelope } from '../modules/peer-host/peer-host-native-transport.js';
 import { createAggregateHostSource } from '../modules/peer-host/peer-host-aggregate-service.js';
 import { encodeNativeResponseBytes, isDshNativeRemoteMethod, rewriteNativeRequestIds, rewriteNativeResponseIds } from '../modules/peer-host/peer-host-native-protocol.js';
+import { resolveCodingNsDebugLevel } from '../../shared/debug.js';
 /** 原生 Remote 流句柄的存活窗口；每次轮询续期，超时仍未再被轮询即回收。 */
 const NATIVE_STREAM_TTL_MS = 600_000;
 /** PeerHost Host 模块；配置、握手和目标登录态只在 Host 进程内装配。 */
@@ -36,17 +37,12 @@ export function createPeerHostFeature(options = {}) {
             enabledByDefault: false,
             dependencies: [],
             runtime: 'host',
-            requires: [
-                { capability: 'peer-host.store', required: false, fallback: 'degrade' },
-                { capability: 'peer-host.handshake', required: false, fallback: 'degrade' },
-                { capability: 'peer-host.http-proxy', required: false, fallback: 'degrade' },
-                { capability: 'peer-host.ws-proxy', required: false, fallback: 'degrade' },
-                { capability: 'peer-host.aggregate', required: false, fallback: 'degrade' },
-                { capability: 'peer-host.aggregated-transport', required: false, fallback: 'degrade' },
-                { capability: 'peer-host.target-capabilities', required: false, fallback: 'degrade' },
-                { capability: 'peer-host.local-plugin-baseline', required: false, fallback: 'degrade' },
-                { capability: 'peer-host.relay-route', required: false, fallback: 'degrade' },
-            ],
+            // PeerHost 的 Host 服务由本 Feature 在 start() 中按当前状态目录创建，
+            // 不属于 DSH Context 的启动前注入能力。把它们写进 requires 会在
+            // capabilityProfile 已经冻结之后才去查找尚未创建的局部实例，导致每次
+            // 启动都产生 CAPABILITY_UNAVAILABLE，但对实际启动没有任何帮助。
+            // 真正由 DSH 提供的能力仍由 capability registry 在入口处统一探测；
+            // Relay 也继续在连接器内部按显式 transport 注入情况降级。
         },
         async start(context) {
             const stateDirectory = options.stateDirectory ?? process.env.CODINGNS4DSH_STATE_DIR?.trim() ?? join(homedir(), '.config', 'codingns4dsh');
@@ -71,9 +67,18 @@ export function createPeerHostFeature(options = {}) {
             let workspaceOrderHydrated = false;
             const nativeStreams = new Map();
             const dshNativeDispatch = resolveDshNativeDispatch(context.services.dshContext);
+            const debugLevel = resolveCodingNsDebugLevel();
             const diagnostics = createPeerHostDiagnosticSink({
-                enabled: process.env.CODINGNS4DSH_DEBUG === '1',
-                sink: (event, snapshot) => console.info('[codingns4dsh:peer-host]', { event, ...snapshot }),
+                enabled: debugLevel !== 'off',
+                sink: (event, snapshot) => {
+                    const failed = snapshot.status !== 'ready' || snapshot.lastErrorCode !== null;
+                    if (debugLevel === 'warn' && !failed)
+                        return;
+                    if (failed)
+                        console.warn('[codingns4dsh:peer-host]', { event, ...snapshot });
+                    else
+                        console.info('[codingns4dsh:peer-host]', { event, ...snapshot });
+                },
             });
             const lanConnector = options.connectRemote ?? createPeerHostRemoteConnector();
             const relayConnector = createPeerHostRelayConnector({ ...(options.relayTransport === undefined ? {} : { transport: options.relayTransport }) });
@@ -82,6 +87,38 @@ export function createPeerHostFeature(options = {}) {
                 : lanConnector(record, accessToken, scope);
             const localHostId = process.env.CODINGNS4DSH_HOST_ID?.trim() || ownerUserId;
             const localSummarySource = createDshNativeSummarySource(context.services.dshContext, context.services.nativeSessions);
+            /**
+             * 聚合前确保目标 Host 已完成握手和认证。
+             *
+             * PeerHost 的记录状态是运行时缓存，不是登录凭据本身：远端返回 401 后
+             * 状态会暂时变成 session_required，下一次聚合必须主动用持久化的 refresh
+             * token/账号密码恢复，否则只要没有手工点“测试”，该目标就会永远被跳过。
+             */
+            const preparePeerHost = async (input) => {
+                if (input.status === 'disabled' || input.status === 'identity_changed')
+                    return null;
+                let record = input;
+                if (record.status === 'session_required') {
+                    await sessions.refresh(record.id).catch(() => undefined);
+                    record = (await store.get(record.id)) ?? record;
+                }
+                else if (record.status !== 'ready') {
+                    // configured/unreachable/version_mismatch 等状态都可能只是上一次启动
+                    // 或网络抖动留下的缓存；自动重试等价于管理面板的“测试”。
+                    record = await handshake.check(record.id);
+                }
+                if (record.status !== 'ready')
+                    return null;
+                // 即使 access token 尚未到期，也检查一次当前认证状态；临近过期时这里
+                // 会 refresh，refresh token 失效时会用保存的账号密码静默重登。
+                try {
+                    await sessions.getAccessToken(record.id);
+                }
+                catch {
+                    return null;
+                }
+                return (await store.get(record.id)) ?? record;
+            };
             const buildSources = async () => {
                 if (options.aggregateSources !== undefined)
                     return options.aggregateSources();
@@ -91,8 +128,9 @@ export function createPeerHostFeature(options = {}) {
                         hostLabel: '当前 Host',
                         source: localSummarySource,
                     })];
-                for (const record of await store.list()) {
-                    if (record.status !== 'ready')
+                const preparedRecords = await Promise.all((await store.list()).map((record) => preparePeerHost(record).catch(() => null)));
+                for (const record of preparedRecords) {
+                    if (record === null || record.status !== 'ready')
                         continue;
                     sources.push(createAggregateHostSource({
                         hostId: localHostId,
@@ -104,6 +142,7 @@ export function createPeerHostFeature(options = {}) {
                             transport: {
                                 rpc: (request) => callPeerNativeRpc(httpProxy, record.id, request),
                                 stream: (request) => openPeerNativeStream(httpProxy, record.id, request),
+                                cli: (request) => callPeerCliRpc(httpProxy, record.id, request),
                             },
                             // 默认只投影用户显式添加的远端工作区；未添加时不展示该 Host 的任何工作区。
                             visibleWorkspaceIds: record.visibleWorkspaceIds ?? [],
@@ -114,15 +153,10 @@ export function createPeerHostFeature(options = {}) {
             };
             /** 远端工作区候选的唯一读取入口；不过滤可见性，供"添加工作区"选择器使用。 */
             const readRemoteWorkspaceCandidates = async (peerHostId) => {
-                let record = await store.get(peerHostId);
-                if (record === null)
+                const configured = await store.get(peerHostId);
+                if (configured === null)
                     throw new CodingNsRpcError('PEER_HOST_NOT_FOUND', 'PeerHost 不存在');
-                // 票据过期但保存过账号时先静默重登：用户不该为了看一眼工作区列表
-                // 再回管理面板手工登录一次。
-                if (record.status === 'session_required') {
-                    await sessions.refresh(peerHostId).catch(() => undefined);
-                    record = await store.get(peerHostId);
-                }
+                const record = await preparePeerHost(configured);
                 if (record === null || record.status !== 'ready') {
                     throw new CodingNsRpcError('PEER_HOST_NOT_READY', 'PeerHost 尚未通过握手检查');
                 }
@@ -297,7 +331,10 @@ export function createPeerHostFeature(options = {}) {
                     }
                     case 'wsEndpoint': return wsEndpoint;
                     case 'aggregate': {
-                        const results = await aggregate.load(await buildSources());
+                        // 顺序 Registry 必须认识本地工作区，即使本地 session 摘要在启动瞬间
+                        // 还没有准备好。否则 order 只会留下远端 ID，客户端拖拽到本地项时
+                        // 只能拒绝请求，表现为远端永远被固定在列表顶部。
+                        const results = ensureLocalWorkspaceSummaries(await aggregate.load(await buildSources()), context.services.dshContext);
                         workspaceRegistry.replace(results);
                         if (!workspaceOrderHydrated) {
                             await workspaceRegistry.hydrateOrder();
@@ -309,15 +346,16 @@ export function createPeerHostFeature(options = {}) {
                         const action = input.action === undefined ? 'get' : requiredString(input.action, 'action');
                         if (action === 'get') {
                             return {
-                                orderedWorkspaceIds: workspaceRegistry.listWorkspaceIds(),
+                                // 返回完整墓碑顺序；远端摘要短暂缺失时，客户端仍需知道其拖拽位置。
+                                orderedWorkspaceIds: workspaceRegistry.listPersistedWorkspaceIds(),
                                 persistedWorkspaceIds: workspaceRegistry.listPersistedWorkspaceIds(),
                             };
                         }
                         if (action === 'move') {
-                            const workspaceId = requiredString(input.virtualWorkspaceId, 'virtualWorkspaceId');
+                            const workspaceId = resolveWorkspaceOrderId(requiredString(input.virtualWorkspaceId, 'virtualWorkspaceId'), workspaceRegistry, localHostId);
                             const before = input.beforeVirtualWorkspaceId === null || input.beforeVirtualWorkspaceId === undefined
                                 ? null
-                                : requiredString(input.beforeVirtualWorkspaceId, 'beforeVirtualWorkspaceId');
+                                : resolveWorkspaceOrderId(requiredString(input.beforeVirtualWorkspaceId, 'beforeVirtualWorkspaceId'), workspaceRegistry, localHostId);
                             return { orderedWorkspaceIds: await workspaceRegistry.move(workspaceId, before) };
                         }
                         throw new CodingNsRpcError('CODINGNS_RPC_NOT_FOUND', `未知 PeerHost workspaceOrder 操作: ${action}`);
@@ -349,7 +387,7 @@ export function createPeerHostFeature(options = {}) {
                         const scope = parseScope(input.scope);
                         // 远端流与 unary 一样需要双向 ID 改写：请求要换回目标 Host 的真实 ID，
                         // 帧里的 ID 要重新编码成虚拟 ID，否则原生会话流认不出目标 Host 的会话。
-                        const payload = rewriteNativeRequestIds(method, input.payload, workspaceRegistry);
+                        const payload = rewriteNativeRequestIds(method, input.payload, createScopedNativeIdResolver(workspaceRegistry, scope));
                         // 句柄由 nativeStreamNext/Close 轮询管理，不绑定本次 HTTP 请求的 signal：
                         // 该 signal 会在 nativeStream 响应返回后立即中止，导致第一次 next 直接结束。
                         const stream = aggregatedTransport.openStream({ scope, method, payload });
@@ -410,7 +448,7 @@ export function createPeerHostFeature(options = {}) {
                         if (!isDshNativeRemoteMethod(method))
                             throw new CodingNsRpcError('CODINGNS_RPC_NOT_FOUND', `未知 DSH 原生 Remote 方法: ${method}`);
                         const scope = parseScope(input.scope);
-                        const rewritten = rewriteNativeRequestIds(method, input.payload, workspaceRegistry);
+                        const rewritten = rewriteNativeRequestIds(method, input.payload, createScopedNativeIdResolver(workspaceRegistry, scope));
                         const value = await aggregatedTransport.rpc({ scope, method, payload: rewritten });
                         const virtualHostId = scope.targetHostId ?? scope.hostId;
                         return encodeNativeResponseBytes(rewriteNativeResponseIds(value, (id) => createVirtualWorkspaceId(virtualHostId, id), (id) => createVirtualSessionId(virtualHostId, id)));
@@ -611,6 +649,40 @@ function requiredString(value, field) {
         throw new TypeError(`${field} 不能为空`);
     return value.trim();
 }
+/**
+ * 为原生 Remote 请求补充“聚合尚未确认”的临时 ID 解析。
+ *
+ * session/create 返回后，客户端会马上打开 session/follow；此时 Host 侧聚合
+ * Registry 可能还没有新会话，但请求 scope 已经携带了真实 sessionId。只允许
+ * 解析与当前目标 Host、工作区和会话 scope 完全匹配的虚拟 ID，避免把任意旧 ID
+ * 当成可路由资源。
+ */
+export function createScopedNativeIdResolver(registry, scope) {
+    return {
+        resolveWorkspace(id) {
+            const known = registry.resolveWorkspace(id);
+            if (known !== null)
+                return known;
+            if (scope.targetHostId === null)
+                return null;
+            const parsed = parseVirtualWorkspaceId(id);
+            if (parsed === null || parsed.hostId !== scope.targetHostId || parsed.workspaceId !== scope.workspaceId)
+                return null;
+            return { workspaceId: parsed.workspaceId, targetHostId: scope.targetHostId };
+        },
+        resolveSession(id) {
+            const known = registry.resolveSession(id);
+            if (known !== null)
+                return known;
+            if (scope.targetHostId === null || scope.sessionId === null)
+                return null;
+            const parsed = parseVirtualSessionId(id);
+            if (parsed === null || parsed.hostId !== scope.targetHostId || parsed.sessionId !== scope.sessionId)
+                return null;
+            return { sessionId: parsed.sessionId, targetHostId: scope.targetHostId };
+        },
+    };
+}
 function parseScope(value) {
     if (typeof value !== 'object' || value === null || Array.isArray(value))
         throw new TypeError('scope 必须是对象');
@@ -623,6 +695,79 @@ function parseScope(value) {
         throw new TypeError('scope.scopeGeneration 无效');
     return { hostId, targetHostId, workspaceId, sessionId, scopeGeneration: scope.scopeGeneration };
 }
+/**
+ * 用 DSH 原生注册表补齐本地工作区。
+ *
+ * 本地摘要还在启动、会话服务暂时不可读时，聚合 source 可能只返回远端结果。
+ * 顺序 Registry 仍必须知道本地 ID，否则客户端无法把本地项转换成混合顺序中的
+ * 虚拟 ID。这里仅补齐排序所需的最小记录，真实会话仍由本机 DSH Store 提供。
+ */
+export function ensureLocalWorkspaceSummaries(results, ctx) {
+    if (ctx === undefined)
+        return results;
+    const local = results.find((host) => host.targetHostId === null);
+    if (local === undefined)
+        return results;
+    let registry;
+    try {
+        registry = ctx.get('workspaceRegistry');
+    }
+    catch {
+        return results;
+    }
+    if (!isRecordValue(registry) || typeof registry.list !== 'function')
+        return results;
+    let raw;
+    try {
+        const listed = registry.list();
+        raw = Array.isArray(listed) ? listed : [];
+    }
+    catch {
+        return results;
+    }
+    const known = new Set(local.workspaces.map((workspace) => workspace.workspaceId));
+    const missing = raw.flatMap((item) => {
+        if (!isRecordValue(item))
+            return [];
+        const workspaceId = textValue(item.id) ?? textValue(item.workspaceId) ?? textValue(item.key);
+        if (workspaceId === undefined || known.has(workspaceId))
+            return [];
+        const path = textValue(item.path) ?? textValue(item.cwd) ?? workspaceId;
+        return [{
+                key: `${local.hostId}:${workspaceId}`,
+                hostId: local.hostId,
+                targetHostId: null,
+                workspaceId,
+                displayName: textValue(item.displayName) ?? textValue(item.title) ?? textValue(item.name) ?? workspaceId,
+                path,
+                hostLabel: local.hostLabel,
+                availability: 'ready',
+                sessions: [],
+            }];
+    });
+    if (missing.length === 0)
+        return results;
+    return results.map((host) => host.targetHostId === null
+        ? { ...host, workspaces: [...host.workspaces, ...missing] }
+        : host);
+}
+function isRecordValue(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function textValue(value) {
+    return typeof value === 'string' && value.trim() !== '' ? value.trim() : undefined;
+}
+/** 将初始化竞态期间原生列表传来的本地裸 ID解析为顺序 Registry 的虚拟 ID。 */
+function resolveWorkspaceOrderId(value, registry, localHostId) {
+    if (parseVirtualWorkspaceId(value) !== null)
+        return value;
+    const local = registry.list().find((workspace) => workspace.targetHostId === null && workspace.workspaceId === value);
+    if (local !== undefined)
+        return local.virtualWorkspaceId;
+    // 启动竞态下 Registry 可能还没有完成首轮 aggregate；本地 Host ID 是稳定的，
+    // 先生成同一格式的虚拟 ID并写入墓碑顺序，后续 aggregate 会补齐记录。
+    return createVirtualWorkspaceId(localHostId, value);
+}
 export function toPeerHostClientRecord(record) {
     return {
         ...record,