@jingyi0605/codingns4dsh 0.2.1-beta.9 → 0.2.1-rc.2

package/data/build/dist/host/cli-adapters/registry.js

@@ -4,7 +4,8 @@ import { CodingNsRpcError } from '../rpc-table.js';
 import { debugInfo } from '../../shared/debug.js';
 import { CodingNsCliSessionStore } from './session-store.js';
 import { readLegacyImportedAdapterPreferences } from './legacy-session-settings.js';
-import { knownAntigravityContextWindow, knownCodexContextWindow, knownCommandCodeContextWindow, knownOpenCodeContextWindow } from './model-catalog.js';
+import { knownAntigravityContextWindow, knownClaudeContextWindow, knownCodexContextWindow, knownCommandCodeContextWindow, knownOpenCodeContextWindow } from './model-catalog.js';
+import { toCliProviderId } from '../../shared/cli-provider-route.js';
 export class CodingNsCliAdapterRegistry {
     drivers = new Map();
     sessions = new Map();
@@ -15,7 +16,8 @@ export class CodingNsCliAdapterRegistry {
     providerProbeTimeoutMs;
     providerProbeConcurrency;
     probes = new Map();
-    executingSessions = new Set();
+    executingSessions = new Map();
+    maintenanceAdapters = new Set();
     archivingSessions = new Set();
     detectionCache = new Map();
     detectionRefreshes = new Map();
@@ -126,6 +128,19 @@ export class CodingNsCliAdapterRegistry {
         }));
         return this.catalog();
     }
+    /** Serialize installation changes against active and suspended Agent turns. */
+    beginMaintenance(adapterId) {
+        if (this.disposed)
+            throw new CodingNsRpcError('CODINGNS_CLI_MANAGEMENT_UNAVAILABLE', 'The Agent registry is stopped.');
+        this.requireDriver(adapterId);
+        if (this.maintenanceAdapters.has(adapterId)
+            || [...this.executingSessions.values()].includes(adapterId)
+            || [...this.segmentedTurns.values()].some((turn) => turn.adapterId === adapterId)) {
+            throw new CodingNsRpcError('CODINGNS_CLI_MANAGEMENT_BUSY', 'Wait for this Agent to finish its active tasks before installing or updating it.');
+        }
+        this.maintenanceAdapters.add(adapterId);
+        return () => { this.maintenanceAdapters.delete(adapterId); };
+    }
     async models(adapterId) {
         const driver = this.requireEnabledDriver(adapterId);
         // Provider 配置（供应商、登录方式、默认档位）变化时必须先作废目录，否则
@@ -196,18 +211,24 @@ export class CodingNsCliAdapterRegistry {
             message: '当前插件仅提供外部 CLI 会话适配器，尚未接入 DSH 0.2 原生 Agent Team 生命周期。',
         };
     }
-    setSession(sessionId, config) {
+    setSession(sessionId, config, options = {}) {
         if (sessionId.trim() === '')
             throw new CodingNsRpcError('CODINGNS_CLI_INVALID_SESSION', 'sessionId 不能为空');
         // dsh 是 DSH 自带的默认 Agent，不对应一个外部驱动，但仍需要作为会话
         // 配置保存值，方便 Client 从外部 CLI 切回默认 Agent。
         if (config.adapterId !== 'dsh')
             this.requireEnabledDriver(config.adapterId);
-        const previous = this.sessions.get(sessionId);
+        const storedTeam = this.sessionStore?.get(sessionId);
+        const previous = this.sessions.get(sessionId) ?? (storedTeam?.teamId && storedTeam.adapterId === config.adapterId ? this.getSession(sessionId) : undefined);
         const sameAdapter = previous?.adapterId === config.adapterId;
         if (previous !== undefined && !sameAdapter)
             this.lastUsages.delete(sessionId);
         const remembered = this.preferences.get(config.adapterId) ?? this.findRememberedPreference(config.adapterId);
+        // A resolved child route owns its complete model selection. An omitted
+        // effort must remain omitted instead of borrowing another model's choice.
+        const previousSelection = options.inheritSelection === false ? undefined : sameAdapter ? previous : undefined;
+        const ownsNativeTeamSelection = config.adapterId === 'dsh' && Boolean(config.teamId ?? previous?.teamId);
+        const rememberedSelection = options.inheritSelection === false || ownsNativeTeamSelection ? undefined : remembered;
         const providerSessionId = config.providerSessionId?.trim();
         const providerIdentityChanged = providerSessionId !== undefined
             && providerSessionId !== previous?.providerSessionId;
@@ -215,26 +236,26 @@ export class CodingNsCliAdapterRegistry {
             adapterId: config.adapterId,
             ...(config.modelId?.trim()
                 ? { modelId: config.modelId.trim() }
-                : sameAdapter && previous?.modelId
-                    ? { modelId: previous.modelId }
-                    : remembered?.modelId
-                        ? { modelId: remembered.modelId }
+                : previousSelection?.modelId
+                    ? { modelId: previousSelection.modelId }
+                    : rememberedSelection?.modelId
+                        ? { modelId: rememberedSelection.modelId }
                         : {}),
             ...(config.effortId?.trim()
                 ? { effortId: config.effortId.trim() }
-                : sameAdapter && previous?.effortId
-                    ? { effortId: previous.effortId }
-                    : remembered?.effortId
-                        ? { effortId: remembered.effortId }
+                : previousSelection?.effortId
+                    ? { effortId: previousSelection.effortId }
+                    : rememberedSelection?.effortId
+                        ? { effortId: rememberedSelection.effortId }
                         : {}),
             // 服务档位是“显式选择”而不是“可回退的最近值”：`default` 表示标准速度，
             // 与 undefined（Host 没有该选择）语义不同，必须原样保留，不能被记忆值覆盖。
             ...(config.serviceTierId?.trim()
                 ? { serviceTierId: config.serviceTierId.trim() }
-                : sameAdapter && previous?.serviceTierId
-                    ? { serviceTierId: previous.serviceTierId }
-                    : remembered?.serviceTierId
-                        ? { serviceTierId: remembered.serviceTierId }
+                : previousSelection?.serviceTierId
+                    ? { serviceTierId: previousSelection.serviceTierId }
+                    : rememberedSelection?.serviceTierId
+                        ? { serviceTierId: rememberedSelection.serviceTierId }
                         : {}),
             ...(config.translationEnabled !== undefined
                 ? { translationEnabled: config.translationEnabled }
@@ -275,7 +296,8 @@ export class CodingNsCliAdapterRegistry {
         };
         this.sessions.set(sessionId, normalized);
         this.sessionStore?.upsert(sessionId, normalized);
-        this.rememberPreference(config.adapterId, normalized);
+        if (options.rememberPreference !== false && normalized.teamId === undefined)
+            this.rememberPreference(config.adapterId, normalized);
         return normalized;
     }
     /** 设置服务变更后重新载入适配器级默认选择。 */
@@ -303,7 +325,7 @@ export class CodingNsCliAdapterRegistry {
         }
     }
     findRememberedPreference(adapterId) {
-        const records = this.sessionStore?.list({ includeArchived: true, adapterId }) ?? [];
+        const records = this.sessionStore?.list({ includeArchived: true, adapterId }).filter(record => record.teamId === undefined) ?? [];
         for (const record of records) {
             if (record.modelId !== undefined || record.effortId !== undefined || record.serviceTierId !== undefined || record.translationEnabled !== undefined) {
                 const preference = {
@@ -363,6 +385,10 @@ export class CodingNsCliAdapterRegistry {
         }
     }
     getSession(sessionId) {
+        const teamRecord = this.sessions.get(sessionId) ?? this.sessionStore?.get(sessionId);
+        if (teamRecord?.teamId && teamRecord.adapterId !== 'dsh' && !this.isEnabled(teamRecord.adapterId)) {
+            throw new CodingNsRpcError('TEAM_ADAPTER_UNAVAILABLE', 'The Team participant adapter is disabled.');
+        }
         const session = this.sessions.get(sessionId);
         if (session !== undefined && (session.adapterId === 'dsh' || this.isEnabled(session.adapterId))) {
             if (session.adapterId === 'dsh')
@@ -375,7 +401,7 @@ export class CodingNsCliAdapterRegistry {
         // 刚被加载）。此时必须读取 SessionStore，否则子会话会被当成 DSH 主会话，
         // 用户看到的仍是“默认 DSH Agent”。
         const stored = this.sessionStore?.get(sessionId);
-        if (stored !== undefined && stored.adapterId !== 'dsh' && this.isEnabled(stored.adapterId)) {
+        if (stored !== undefined && (stored.adapterId === 'dsh' ? stored.teamId !== undefined : this.isEnabled(stored.adapterId))) {
             const config = {
                 adapterId: stored.adapterId,
                 ...(stored.modelId === undefined ? {} : { modelId: stored.modelId }),
@@ -386,6 +412,9 @@ export class CodingNsCliAdapterRegistry {
                 ...(stored.providerSessionId === undefined ? {} : { providerSessionId: stored.providerSessionId }),
                 ...(stored.rawStoreRef === undefined ? {} : { rawStoreRef: stored.rawStoreRef }),
                 ...(stored.parentSessionId === undefined ? {} : { parentSessionId: stored.parentSessionId }),
+                ...(stored.origin === undefined ? {} : { origin: stored.origin }),
+                ...(stored.teamId === undefined ? {} : { teamId: stored.teamId }),
+                ...(stored.teamMemberId === undefined ? {} : { teamMemberId: stored.teamMemberId }),
             };
             this.sessions.set(sessionId, config);
             return { ...config, ...lastUsageField(this.lastUsages.get(sessionId)) };
@@ -396,11 +425,14 @@ export class CodingNsCliAdapterRegistry {
             ...(remembered?.modelId ? { modelId: remembered.modelId } : {}),
             ...(remembered?.effortId ? { effortId: remembered.effortId } : {}),
             ...(remembered?.serviceTierId ? { serviceTierId: remembered.serviceTierId } : {}),
+            // 原生会话没有插件会话索引，翻译开关按适配器偏好持久化并在这里回读。
+            ...(remembered?.translationEnabled === undefined ? {} : { translationEnabled: remembered.translationEnabled }),
         }, this.nativeSessions?.get(sessionId));
     }
     /** 只有已验证能维护连续事件流的驱动，Host 才把工具边界映射到 DSH step。 */
     supportsSegmentedTurns(adapterId) {
-        return this.drivers.get(adapterId)?.supportsSegmentedTurns === true;
+        const driver = this.drivers.get(adapterId);
+        return driver?.supportsSegmentedTurns === true || driver?.supportsStreamStepSplitting === true;
     }
     /** Qoder 等 ACP 驱动由 Registry 挂起同一个迭代器完成通用工具分步。 */
     supportsToolStepSplitting(adapterId) {
@@ -408,22 +440,35 @@ export class CodingNsCliAdapterRegistry {
     }
     /** 供原生 Subagent Provider 执行首轮；不创建普通外部会话索引。 */
     async *runSubagentTurn(input) {
+        if (this.maintenanceAdapters.has(input.adapterId) || this.executingSessions.has(input.sessionId)) {
+            throw new CodingNsRpcError('CODINGNS_CLI_MANAGEMENT_BUSY', 'This Agent or session is already busy.');
+        }
         const driver = this.requireEnabledDriver(input.adapterId);
-        yield* driver.executeTurn(input);
+        this.executingSessions.set(input.sessionId, input.adapterId);
+        try {
+            yield* driver.executeTurn(withCodexContextWindow(input, input.adapterId));
+        }
+        finally {
+            this.executingSessions.delete(input.sessionId);
+        }
     }
     /** 子会话 Provider 绑定完成后立即落盘，确保冷恢复不会丢失适配器身份。 */
     async flushSessionBindings() {
         await this.sessionStore?.flush();
     }
     async *execute(input) {
+        if (this.maintenanceAdapters.has(input.adapterId)) {
+            throw new CodingNsRpcError('CODINGNS_CLI_MANAGEMENT_BUSY', 'This Agent is being installed or updated. Wait for it to finish.');
+        }
         const driver = this.requireEnabledDriver(input.adapterId);
+        const driverInput = withCodexContextWindow(input, input.adapterId);
         if (this.archivingSessions.has(input.sessionId)) {
             throw new CodingNsRpcError('CODINGNS_CLI_INVALID_SESSION', '外部会话正在归档，不能开始新一轮执行');
         }
         if (this.executingSessions.has(input.sessionId)) {
             throw new CodingNsRpcError('CODINGNS_CLI_INVALID_SESSION', '外部会话已有一轮执行正在进行');
         }
-        this.executingSessions.add(input.sessionId);
+        this.executingSessions.set(input.sessionId, input.adapterId);
         const previous = this.sessions.get(input.sessionId);
         if (previous !== undefined && previous.adapterId !== input.adapterId)
             this.lastUsages.delete(input.sessionId);
@@ -440,10 +485,12 @@ export class CodingNsCliAdapterRegistry {
         };
         // 除了 Client 的 session/set，Host 内部和未来的调用方也可能直接执行一轮。
         // 最近使用应由真实执行参数更新，不能依赖某个 UI 一定先发 RPC。
-        this.rememberPreference(input.adapterId, input);
+        if (current.teamId === undefined)
+            this.rememberPreference(input.adapterId, input);
         // 手动 next() 不会自动转发外层的 return()；本轮持有的迭代器必须在 finally 关闭。
         // 只有显式交给 segmentedTurns 的流才能跨 DSH step 保留。
         let iterator;
+        let nativeSessionReady = false;
         try {
             const stored = this.sessionStore?.get(input.sessionId);
             if (stored?.status === 'archived') {
@@ -457,6 +504,18 @@ export class CodingNsCliAdapterRegistry {
             }
             const suspended = this.segmentedTurns.get(input.sessionId);
             const resumingSegmentedTurn = suspended?.adapterId === input.adapterId;
+            let deferredPeerInput = resumingSegmentedTurn ? suspended?.deferredPeerInput : undefined;
+            if (resumingSegmentedTurn && input.peerInput) {
+                if (suspended?.iterator !== null && driver.steer !== undefined) {
+                    await driver.steer(input.sessionId, input.prompt);
+                }
+                else if (driver.steer === undefined) {
+                    deferredPeerInput = deferredPeerInput ? {
+                        ...input, prompt: `${deferredPeerInput.prompt}\n\n${input.prompt}`,
+                        attachments: [...(deferredPeerInput.attachments ?? []), ...(input.attachments ?? [])],
+                    } : input;
+                }
+            }
             // 驱动自行分段时，续段必须由 Host 显式声明；驱动不能靠猜输入形状决定是否
             // 复用旧进程，否则注入失败后的新用户消息会被拼进上一次运行。
             const resumingDriverTurn = resumingSegmentedTurn && suspended !== undefined && suspended.iterator === null;
@@ -473,26 +532,29 @@ export class CodingNsCliAdapterRegistry {
             // Agent Loop 通常已经创建了同名 DSH 原生会话；直接调用 Registry 时才按需补建。
             // 原生服务失败不能阻断外部 Agent，消息仍由现有 llm/stream 链路处理。
             try {
-                await this.nativeSessions?.ensure(input.sessionId, input.cwd);
+                nativeSessionReady = await this.nativeSessions?.ensure(input.sessionId, input.cwd) === input.sessionId;
             }
-            catch { /* 可选服务降级 */ }
+            catch { /* Optional native projection is unavailable. */ }
             // 每轮都写入稳定的适配器身份。旧日志只有通用 codingns-external 标记，
             // 这条 request/context 是升级后自动迁移时唯一可靠的回填依据。
             try {
                 const contextWindow = input.adapterId === 'codex'
-                    ? knownCodexContextWindow(input.modelId)
+                    ? driverInput.modelContextWindow
                     : input.adapterId === 'command-code'
                         ? knownCommandCodeContextWindow(input.modelId)
                         : input.adapterId === 'antigravity'
                             ? knownAntigravityContextWindow(input.modelId)
                             : input.adapterId === 'opencode'
                                 ? knownOpenCodeContextWindow(input.modelId)
-                                : undefined;
-                this.nativeSessions?.appendRequestContext?.(input.sessionId, {
-                    provider: input.adapterId,
-                    model: input.modelId ?? input.adapterId,
-                    ...(contextWindow === undefined ? {} : { contextWindow, confirmed: true, source: 'catalog' }),
-                });
+                                : input.adapterId === 'claude-code'
+                                    ? knownClaudeContextWindow(input.modelId)
+                                    : undefined;
+                if (nativeSessionReady)
+                    this.nativeSessions?.appendRequestContext?.(input.sessionId, {
+                        provider: toCliProviderId(input.adapterId),
+                        model: input.modelId ?? input.adapterId,
+                        ...(contextWindow === undefined ? {} : { contextWindow, confirmed: true, source: 'catalog' }),
+                    });
             }
             catch { /* 原生历史写入失败不应阻断外部 Agent */ }
             if (suspended !== undefined && suspended.adapterId !== input.adapterId) {
@@ -510,13 +572,25 @@ export class CodingNsCliAdapterRegistry {
                 iterator = suspended.iterator;
             }
             else {
-                iterator = driver.executeTurn({ ...input, ...(resumingDriverTurn ? { resumeSegmentedTurn: true } : {}) })[Symbol.asyncIterator]();
+                iterator = driver.executeTurn({ ...driverInput, ...(resumingDriverTurn ? { resumeSegmentedTurn: true } : {}) })[Symbol.asyncIterator]();
             }
             while (true) {
                 const next = await iterator.next();
-                if (next.done) {
-                    iterator = undefined;
-                    break;
+                if (next.done || next.value.type === 'finish') {
+                    if (deferredPeerInput) {
+                        if (!next.done && next.value.type === 'finish' && next.value.reason !== 'stop') {
+                            throw new CodingNsRpcError('TEAM_DELIVERY_UNCERTAIN', 'The provider turn ended unsuccessfully before pending Team input could be delivered. Inspect the session before resending.');
+                        }
+                        await closeAgentIterator(iterator);
+                        const pending = deferredPeerInput;
+                        deferredPeerInput = undefined;
+                        iterator = driver.executeTurn(withCodexContextWindow({ ...pending, ...(current.providerSessionId ? { providerSessionId: current.providerSessionId } : {}), resumeSegmentedTurn: false }, input.adapterId))[Symbol.asyncIterator]();
+                        continue;
+                    }
+                    if (next.done) {
+                        iterator = undefined;
+                        break;
+                    }
                 }
                 const event = next.value;
                 if (event.type === 'usage')
@@ -549,25 +623,28 @@ export class CodingNsCliAdapterRegistry {
                     this.segmentedTurns.delete(input.sessionId);
                     this.sessionStore?.upsert(input.sessionId, { ...this.sessions.get(input.sessionId) ?? current, status: event.reason === 'error' ? 'error' : 'idle' });
                 }
-                // Codex 等驱动已经把同一个 Provider turn 切成了多个段。边界本身
-                // 直接交给 Feature，不能再次按工具完成事件切一遍。
+                // Explicit boundaries preserve the driver's grouping of messages and tool batches.
                 if (event.type === 'step-boundary') {
-                    await closeAgentIterator(iterator);
+                    if (driver.supportsStreamStepSplitting === true) {
+                        this.segmentedTurns.set(input.sessionId, { adapterId: input.adapterId, iterator, ...(deferredPeerInput ? { deferredPeerInput } : {}) });
+                    }
+                    else {
+                        await closeAgentIterator(iterator);
+                        // Driver-owned segments resume through a new executeTurn call.
+                        this.segmentedTurns.set(input.sessionId, { adapterId: input.adapterId, iterator: null, ...(deferredPeerInput ? { deferredPeerInput } : {}) });
+                    }
                     iterator = undefined;
-                    // 驱动自己持有 Provider 进程与段状态：这里只登记续段意图，下一次
-                    // llm/stream 再显式要求驱动恢复；注入失败时 discardSegmentedTurn
-                    // 会同时丢弃 Registry 意图和驱动内的进程。
-                    this.segmentedTurns.set(input.sessionId, { adapterId: input.adapterId, iterator: null });
                     yield event;
                     return;
                 }
                 if (input.splitToolSteps
                     && driver.supportsSegmentedTurns !== true
+                    && driver.supportsStreamStepSplitting !== true
                     && event.type === 'tool-event'
                     && (event.status === 'completed' || event.status === 'failed')) {
                     // 先保存迭代器再 yield。即使调用方在工具事件后提前关闭流，
                     // 下一次 DSH step 仍能从同一个 Provider 进程继续读取正文。
-                    this.segmentedTurns.set(input.sessionId, { adapterId: input.adapterId, iterator });
+                    this.segmentedTurns.set(input.sessionId, { adapterId: input.adapterId, iterator, ...(deferredPeerInput ? { deferredPeerInput } : {}) });
                     // 所有权交给续段表，当前调用结束不得关闭需要继续消费的 Provider 流。
                     iterator = undefined;
                     yield event;
@@ -591,7 +668,8 @@ export class CodingNsCliAdapterRegistry {
                 await closeAgentIterator(iterator);
             this.executingSessions.delete(input.sessionId);
             try {
-                await this.nativeSessions?.flush(input.sessionId);
+                if (nativeSessionReady)
+                    await this.nativeSessions?.flush(input.sessionId);
             }
             catch { /* DSH 自身检查点策略负责重试 */ }
         }
@@ -1118,9 +1196,9 @@ function hasText(value) {
 function preferenceSnapshot(preferences) {
     return Object.fromEntries([...preferences.entries()].map(([adapterId, preference]) => [adapterId, { ...preference }]));
 }
-/** 从 DSH 原生会话快照补齐当前模型提供商，供订阅分流使用。 */
+/** Overlay DSH's current native route so subscription checks use the selected model. */
 function mergeDshNativeSelection(config, session) {
-    if (config.adapterId !== 'dsh' || config.providerId !== undefined && config.modelId !== undefined)
+    if (config.adapterId !== 'dsh')
         return config;
     const root = asRecord(session);
     const rows = asRecord(root?.record)?.rows;
@@ -1129,7 +1207,10 @@ function mergeDshNativeSelection(config, session) {
     const value = asRecord(selection?.val) ?? selection;
     const lastUsed = asRecord(value?.lastUsed);
     const next = asRecord(value?.next);
-    const candidate = lastUsed ?? next;
+    const pending = asRecord(value?.pending);
+    // Prefer the explicit pending/next route; lastUsed can describe a previous
+    // model until DSH consumes the newly selected one.
+    const candidate = pending ?? next ?? lastUsed;
     if (candidate === null)
         return config;
     const providerId = stringValue(candidate.provider);
@@ -1137,9 +1218,9 @@ function mergeDshNativeSelection(config, session) {
     const effortId = stringValue(candidate.reasoningEffort);
     return {
         ...config,
-        ...(config.providerId === undefined && providerId !== undefined ? { providerId } : {}),
-        ...(config.modelId === undefined && modelId !== undefined ? { modelId } : {}),
-        ...(config.effortId === undefined && effortId !== undefined ? { effortId } : {}),
+        ...(providerId === undefined ? {} : { providerId }),
+        ...(modelId === undefined ? {} : { modelId }),
+        ...(effortId === undefined ? {} : { effortId }),
     };
 }
 /** 以内存配置为主、用持久化记录补齐 Provider 续接所需的身份字段。 */
@@ -1156,6 +1237,15 @@ function mergeStoredSessionFields(config, stored) {
         ...(config.translationEnabled === undefined && stored.translationEnabled !== undefined ? { translationEnabled: stored.translationEnabled } : {}),
     };
 }
+function withCodexContextWindow(input, adapterId) {
+    if (adapterId !== 'codex')
+        return input;
+    const supplied = input.modelContextWindow;
+    const contextWindow = typeof supplied === 'number' && Number.isSafeInteger(supplied) && supplied > 0
+        ? supplied
+        : knownCodexContextWindow(input.modelId);
+    return contextWindow === undefined ? input : { ...input, modelContextWindow: contextWindow };
+}
 function usageSnapshot(event) {
     return {
         inputTokens: event.inputTokens,