@jingyi0605/codingns4dsh 0.1.0 → 0.1.1

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

@@ -1,5 +1,6 @@
 import { CodingNsRpcError } from '../rpc-table.js';
 import { CodingNsCliSessionStore } from './session-store.js';
+import { readLegacyImportedAdapterPreferences } from './legacy-session-settings.js';
 const DEFAULT_INSTALLED_CACHE_TTL_MS = 5 * 60_000;
 const DEFAULT_UNINSTALLED_CACHE_TTL_MS = 30_000;
 const DEFAULT_MODEL_CACHE_TTL_MS = 10 * 60_000;
@@ -28,6 +29,8 @@ export class CodingNsCliAdapterRegistry {
     modelTimers = new Map();
     modelGenerations = new Map();
     requestedModelCatalogs = new Set();
+    /** 已切到下一个 DSH step、但仍在继续产出 Provider 流的驱动迭代器。 */
+    segmentedTurns = new Map();
     cacheGeneration = 0;
     disposed = false;
     constructor(drivers, enabled = {}, options = {}) {
@@ -42,7 +45,15 @@ export class CodingNsCliAdapterRegistry {
         this.uninstalledCacheTtlMs = positiveTtl(options.uninstalledCacheTtlMs, DEFAULT_UNINSTALLED_CACHE_TTL_MS);
         this.modelCacheTtlMs = positiveTtl(options.modelCacheTtlMs, DEFAULT_MODEL_CACHE_TTL_MS);
         this.modelRetryTtlMs = positiveTtl(options.modelRetryTtlMs, DEFAULT_MODEL_RETRY_TTL_MS);
-        this.syncPreferences(options.settings?.get().agentAdapterPreferences);
+        const configuredPreferences = options.settings?.get().agentAdapterPreferences;
+        const legacyPreferences = options.settings === undefined ? {} : readLegacyImportedAdapterPreferences();
+        const mergedPreferences = mergePreferenceRecords(legacyPreferences, configuredPreferences);
+        this.syncPreferences(mergedPreferences);
+        // DSH 0.1.7 不会把旧 `codingns` 设置段自动映射到 scoped Config entry。
+        // 先用旧值恢复当前进程，再把缺失值写入新配置，后续重启即可走正常路径。
+        if (options.settings !== undefined && hasMissingPreferences(configuredPreferences, legacyPreferences)) {
+            void options.settings.update({ agentAdapterPreferences: preferenceSnapshot(this.preferences) }).catch(() => undefined);
+        }
         for (const driver of drivers) {
             if (this.drivers.has(driver.descriptor.id))
                 throw new Error(`重复 Agent: ${driver.descriptor.id}`);
@@ -137,6 +148,11 @@ export class CodingNsCliAdapterRegistry {
                     : remembered?.effortId
                         ? { effortId: remembered.effortId }
                         : {}),
+            ...(config.providerId?.trim()
+                ? { providerId: config.providerId.trim() }
+                : sameAdapter && previous?.providerId
+                    ? { providerId: previous.providerId }
+                    : {}),
             ...(providerSessionId ? { providerSessionId } : sameAdapter && previous?.providerSessionId ? { providerSessionId: previous.providerSessionId } : {}),
             ...(config.rawStoreRef?.trim()
                 ? { rawStoreRef: config.rawStoreRef.trim() }
@@ -153,6 +169,10 @@ export class CodingNsCliAdapterRegistry {
     syncPreferences(value) {
         if (value === undefined)
             return;
+        // 0.1.7 ConfigForms 在 entry 重新描述的瞬间可能只返回默认空字典；
+        // 不能让这次短暂快照抹掉当前进程已经恢复的选择。
+        if (Object.keys(value).length === 0 && this.preferences.size > 0)
+            return;
         this.preferences.clear();
         for (const [adapterId, preference] of Object.entries(value)) {
             const modelId = preference?.modelId?.trim();
@@ -194,19 +214,24 @@ export class CodingNsCliAdapterRegistry {
         this.preferences.set(adapterId, preference);
         if (this.settings === undefined)
             return;
-        const snapshot = Object.fromEntries([...this.preferences.entries()].map(([id, value]) => [id, { ...value }]));
+        const snapshot = preferenceSnapshot(this.preferences);
         void this.settings.update({ agentAdapterPreferences: snapshot }).catch(() => undefined);
     }
     getSession(sessionId) {
         const session = this.sessions.get(sessionId);
-        if (session !== undefined && (session.adapterId === 'dsh' || this.isEnabled(session.adapterId)))
-            return session;
+        if (session !== undefined && (session.adapterId === 'dsh' || this.isEnabled(session.adapterId))) {
+            return session.adapterId === 'dsh' ? mergeDshNativeSelection(session, this.nativeSessions?.get(sessionId)) : session;
+        }
         const remembered = this.preferences.get('dsh') ?? this.findRememberedPreference('dsh');
-        return {
+        return mergeDshNativeSelection({
             adapterId: 'dsh',
             ...(remembered?.modelId ? { modelId: remembered.modelId } : {}),
             ...(remembered?.effortId ? { effortId: remembered.effortId } : {}),
-        };
+        }, this.nativeSessions?.get(sessionId));
+    }
+    /** 只有驱动自己维护 Provider turn 边界时，Host 才能把它映射到 DSH step。 */
+    supportsSegmentedTurns(adapterId) {
+        return this.drivers.get(adapterId)?.supportsSegmentedTurns === true;
     }
     async *execute(input) {
         const driver = this.requireEnabledDriver(input.adapterId);
@@ -237,13 +262,15 @@ export class CodingNsCliAdapterRegistry {
                     throw new CodingNsRpcError('CODINGNS_CLI_SESSION_MISSING', '外部 Agent 原始会话已删除，无法继续恢复');
                 }
             }
+            const suspended = this.segmentedTurns.get(input.sessionId);
+            const resumingSegmentedTurn = suspended?.adapterId === input.adapterId;
             this.sessions.set(input.sessionId, current);
             this.sessionStore?.upsert(input.sessionId, {
                 ...current,
                 adapterId: input.adapterId,
                 ...(input.cwd ? { cwd: input.cwd } : {}),
                 status: 'active',
-                title: input.prompt,
+                ...(resumingSegmentedTurn ? {} : { title: input.prompt }),
             });
             // Agent Loop 通常已经创建了同名 DSH 原生会话；直接调用 Registry 时才按需补建。
             // 原生服务失败不能阻断外部 Agent，消息仍由现有 llm/stream 链路处理。
@@ -251,11 +278,31 @@ export class CodingNsCliAdapterRegistry {
                 await this.nativeSessions?.ensure(input.sessionId, input.cwd);
             }
             catch { /* 可选服务降级 */ }
-            for await (const event of driver.executeTurn(input)) {
+            // 每轮都写入稳定的适配器身份。旧日志只有通用 codingns-external 标记，
+            // 这条 request/context 是升级后自动迁移时唯一可靠的回填依据。
+            try {
+                this.nativeSessions?.appendRequestContext?.(input.sessionId, {
+                    provider: input.adapterId,
+                    model: input.modelId ?? input.adapterId,
+                });
+            }
+            catch { /* 原生历史写入失败不应阻断外部 Agent */ }
+            if (suspended !== undefined && suspended.adapterId !== input.adapterId) {
+                this.segmentedTurns.delete(input.sessionId);
+                await closeAgentIterator(suspended.iterator);
+            }
+            const iterator = suspended?.adapterId === input.adapterId
+                ? (this.segmentedTurns.delete(input.sessionId), suspended.iterator)
+                : driver.executeTurn(input)[Symbol.asyncIterator]();
+            while (true) {
+                const next = await iterator.next();
+                if (next.done)
+                    break;
+                const event = next.value;
                 if (event.type === 'session-binding') {
                     const providerIdentityChanged = event.providerSessionId !== current.providerSessionId;
                     const { rawStoreRef: previousRawStoreRef, ...currentWithoutRawStoreRef } = current;
-                    const next = {
+                    const nextConfig = {
                         ...currentWithoutRawStoreRef,
                         providerSessionId: event.providerSessionId,
                         ...(event.rawStoreRef
@@ -264,19 +311,40 @@ export class CodingNsCliAdapterRegistry {
                                 ? { rawStoreRef: previousRawStoreRef }
                                 : {}),
                     };
-                    this.sessions.set(input.sessionId, next);
-                    current = next;
+                    this.sessions.set(input.sessionId, nextConfig);
+                    current = nextConfig;
                     this.sessionStore?.upsert(input.sessionId, {
-                        ...next,
+                        ...nextConfig,
                         status: 'active',
                         providerState: 'available',
                         providerCheckedAt: new Date().toISOString(),
                     });
                 }
-                if (event.type === 'finish')
+                if (event.type === 'finish') {
+                    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，不能再次按工具完成事件切一遍。
+                if (event.type === 'step-boundary') {
+                    await closeAgentIterator(iterator);
+                    yield event;
+                    return;
+                }
+                if (input.splitToolSteps
+                    && driver.supportsSegmentedTurns !== true
+                    && event.type === 'tool-event'
+                    && (event.status === 'completed' || event.status === 'failed')) {
+                    // 先保存迭代器再 yield。即使调用方在工具事件后提前关闭流，
+                    // 下一次 DSH step 仍能从同一个 Provider 进程继续读取正文。
+                    this.segmentedTurns.set(input.sessionId, { adapterId: input.adapterId, iterator });
+                    yield event;
+                    yield { type: 'step-boundary' };
+                    return;
+                }
                 yield event;
             }
+            this.segmentedTurns.delete(input.sessionId);
         }
         catch (error) {
             this.sessionStore?.upsert(input.sessionId, {
@@ -359,6 +427,14 @@ export class CodingNsCliAdapterRegistry {
             throw new CodingNsRpcError('CODINGNS_CLI_UNSUPPORTED', '当前 Agent 不支持中断');
         await driver.interrupt(sessionId);
     }
+    /** 丢弃等待下一步的 Provider 流，避免取消后的旧正文进入新回合。 */
+    discardSegmentedTurn(sessionId) {
+        const suspended = this.segmentedTurns.get(sessionId);
+        if (suspended === undefined)
+            return;
+        this.segmentedTurns.delete(sessionId);
+        void closeAgentIterator(suspended.iterator);
+    }
     async dispose() {
         if (this.disposed)
             return;
@@ -371,6 +447,8 @@ export class CodingNsCliAdapterRegistry {
         this.modelFailures.clear();
         this.modelGenerations.clear();
         this.requestedModelCatalogs.clear();
+        await Promise.all([...this.segmentedTurns.values()].map(({ iterator }) => closeAgentIterator(iterator)));
+        this.segmentedTurns.clear();
         await Promise.all([...this.drivers.values()].map((driver) => driver.dispose?.()));
     }
     async readDetection(driver) {
@@ -631,6 +709,12 @@ function providerProbeKey(record) {
 function delay(milliseconds) {
     return milliseconds <= 0 ? Promise.resolve() : new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
+async function closeAgentIterator(iterator) {
+    try {
+        await iterator.return?.();
+    }
+    catch { /* 驱动清理失败不能阻断 Registry 释放 */ }
+}
 async function forEachConcurrent(values, concurrency, task) {
     let nextIndex = 0;
     const workerCount = Math.min(concurrency, values.length);
@@ -652,6 +736,79 @@ function detectionFingerprint(detection) {
 function catalogHasModels(catalog) {
     return catalog.groups.some((group) => group.models.length > 0);
 }
+function mergePreferenceRecords(legacy, configured) {
+    const merged = {};
+    for (const [adapterId, preference] of Object.entries(legacy)) {
+        const normalized = normalizePreference(preference);
+        if (normalized !== undefined)
+            merged[adapterId] = normalized;
+    }
+    for (const [adapterId, preference] of Object.entries(configured ?? {})) {
+        const normalized = normalizePreference(preference);
+        if (normalized === undefined)
+            continue;
+        merged[adapterId] = { ...merged[adapterId], ...normalized };
+    }
+    return merged;
+}
+function normalizePreference(value) {
+    if (value === undefined)
+        return undefined;
+    const modelId = value.modelId?.trim();
+    const effortId = value.effortId?.trim();
+    if (modelId === undefined && effortId === undefined)
+        return undefined;
+    return {
+        ...(modelId ? { modelId } : {}),
+        ...(effortId ? { effortId } : {}),
+    };
+}
+function hasMissingPreferences(configured, legacy) {
+    for (const [adapterId, legacyPreference] of Object.entries(legacy)) {
+        const current = configured?.[adapterId];
+        if (legacyPreference.modelId !== undefined && !hasText(current?.modelId))
+            return true;
+        if (legacyPreference.effortId !== undefined && !hasText(current?.effortId))
+            return true;
+    }
+    return false;
+}
+function hasText(value) {
+    return value?.trim() !== '' && value !== undefined;
+}
+function preferenceSnapshot(preferences) {
+    return Object.fromEntries([...preferences.entries()].map(([adapterId, preference]) => [adapterId, { ...preference }]));
+}
+/** 从 DSH 原生会话快照补齐当前模型提供商，供订阅分流使用。 */
+function mergeDshNativeSelection(config, session) {
+    if (config.adapterId !== 'dsh' || config.providerId !== undefined && config.modelId !== undefined)
+        return config;
+    const root = asRecord(session);
+    const rows = asRecord(root?.record)?.rows;
+    const selectionRow = asRecord(asRecord(rows)?.modelSelection);
+    const selection = asRecord(root?.modelSelection) ?? selectionRow;
+    const value = asRecord(selection?.val) ?? selection;
+    const lastUsed = asRecord(value?.lastUsed);
+    const next = asRecord(value?.next);
+    const candidate = lastUsed ?? next;
+    if (candidate === null)
+        return config;
+    const providerId = stringValue(candidate.provider);
+    const modelId = stringValue(candidate.model);
+    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 } : {}),
+    };
+}
+function asRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value) ? value : null;
+}
+function stringValue(value) {
+    return typeof value === 'string' && value.trim() !== '' ? value.trim() : undefined;
+}
 function unrefTimer(timer) {
     const nodeTimer = timer;
     nodeTimer.unref?.();

package/data/build/dist/host/cli-adapters/rpc-driver-utils.js

@@ -92,6 +92,13 @@ export function usageChunk(value) {
     if (inputTokens === 0 && outputTokens === 0 && cacheReadTokens === undefined && cacheWriteTokens === undefined)
         return null;
     const totalTokens = optionalNumberValue(usage.totalTokens ?? usage.total_tokens ?? usage.totalTokenCount);
+    const contextWindow = optionalNumberValue(usage.contextWindow ?? usage.context_window ?? usage.contextLimit ?? usage.context_limit);
+    const contextTokens = optionalNumberValue(usage.contextTokens ?? usage.context_tokens);
+    const explicitContextUsageRatio = optionalNumberValue(usage.contextUsageRatio ?? usage.context_usage_ratio);
+    const contextUsageRatio = explicitContextUsageRatio
+        ?? (contextWindow !== undefined && contextTokens !== undefined && contextWindow > 0
+            ? Number(Math.min(1, contextTokens / contextWindow).toFixed(6))
+            : undefined);
     const hasCacheBreakdown = explicitUncachedInputTokens !== undefined || cacheReadTokens !== undefined || cacheWriteTokens !== undefined;
     const cachedInputTokens = (cacheReadTokens ?? 0) + (cacheWriteTokens ?? 0);
     const inputExcludesCache = explicitUncachedInputTokens !== undefined || cacheReadInputTokens !== undefined || cacheWriteInputTokens !== undefined;
@@ -104,6 +111,9 @@ export function usageChunk(value) {
         ...(cacheWriteTokens === undefined ? {} : { cacheWriteTokens }),
         ...(hasCacheBreakdown ? { uncachedInputTokens: inputExcludesCache ? inputTokens : Math.max(0, inputTokens - cachedInputTokens) } : {}),
         ...(totalTokens === undefined && !hasCacheBreakdown ? {} : { totalTokens: totalTokens ?? fullInputTokens + outputTokens }),
+        ...(contextWindow === undefined ? {} : { contextWindow }),
+        ...(contextTokens === undefined ? {} : { contextTokens }),
+        ...(contextUsageRatio === undefined ? {} : { contextUsageRatio }),
         ...(cacheReadTokens === undefined || fullInputTokens <= 0
             ? {}
             : { cacheHitRate: Number((cacheReadTokens / fullInputTokens * 100).toFixed(4)) }),

package/data/build/dist/host/cli-adapters/session-store.d.ts

@@ -18,6 +18,7 @@ export interface CodingNsCliSessionPatch {
     readonly adapterId?: CodingNsCliAdapterId;
     readonly modelId?: string;
     readonly effortId?: string;
+    readonly providerId?: string;
     readonly providerSessionId?: string;
     readonly rawStoreRef?: string;
     readonly title?: string;
@@ -45,6 +46,7 @@ export declare class CodingNsCliSessionStore {
     private readonly records;
     private readonly settings;
     private readonly persistence;
+    private readonly legacyImportedRecords;
     private writeTail;
     constructor(options?: CodingNsCliSessionStoreOptions);
     /** 将设置变更重新载入内存；非法或不完整记录会被忽略。 */
@@ -56,6 +58,11 @@ export declare class CodingNsCliSessionStore {
     }): CodingNsCliSessionRecord[];
     /** 浏览器会话行只需要这两个字段，Host-only 恢复信息不得跨过 RPC 边界。 */
     adapterBindings(): CodingNsSessionAdapterBinding[];
+    /** 启动时把旧 DSH 原生会话中有明确证据的适配器回填到 Host 索引。 */
+    migrateLegacySessions(sessions: readonly unknown[]): {
+        migrated: number;
+        unresolved: number;
+    };
     /** 创建或更新记录；返回值是内存中的规范化记录，持久化在后台串行完成。 */
     upsert(sessionId: string, patch: CodingNsCliSessionPatch & CodingNsCliSessionConfig): CodingNsCliSessionRecord;
     archive(sessionId: string): CodingNsCliSessionRecord | undefined;

package/data/build/dist/host/cli-adapters/session-store.js

@@ -1,3 +1,5 @@
+import { inspectLegacySessionAdapter } from './legacy-session-adapter.js';
+import { readLegacyImportedSessionRecords } from './legacy-session-settings.js';
 /**
  * Host-only 的外部 Agent 会话索引。
  *
@@ -9,10 +11,16 @@ export class CodingNsCliSessionStore {
     records = new Map();
     settings;
     persistence;
+    legacyImportedRecords;
     writeTail = Promise.resolve();
     constructor(options = {}) {
         this.settings = options.settings;
         this.persistence = options.persistence;
+        // DSH 升级时会把旧设置保存为 settings.yaml.imported；先恢复其中的
+        // 外部会话索引，再用当前设置覆盖同 ID 记录，保证用户后续修改优先。
+        this.legacyImportedRecords = options.settings === undefined ? [] : readLegacyImportedSessionRecords();
+        for (const record of this.legacyImportedRecords)
+            this.hydrateRecord(record, true);
         for (const record of options.settings?.get().cliSessions ?? [])
             this.hydrateRecord(record, true);
     }
@@ -21,6 +29,8 @@ export class CodingNsCliSessionStore {
         if (records === undefined)
             return;
         this.records.clear();
+        for (const record of this.legacyImportedRecords)
+            this.hydrateRecord(record, false);
         for (const record of records)
             this.hydrateRecord(record, false);
     }
@@ -36,11 +46,33 @@ export class CodingNsCliSessionStore {
     }
     /** 浏览器会话行只需要这两个字段，Host-only 恢复信息不得跨过 RPC 边界。 */
     adapterBindings() {
-        return this.list().map((record) => ({
+        return this.list({ includeArchived: true }).map((record) => ({
             sessionId: record.dshSessionId,
             adapterId: record.adapterId,
         }));
     }
+    /** 启动时把旧 DSH 原生会话中有明确证据的适配器回填到 Host 索引。 */
+    migrateLegacySessions(sessions) {
+        let migrated = 0;
+        let unresolved = 0;
+        for (const session of sessions) {
+            const evidence = inspectLegacySessionAdapter(session);
+            const existing = evidence === undefined ? undefined : this.records.get(evidence.sessionId);
+            if (evidence === undefined || existing !== undefined && existing.adapterId !== 'dsh')
+                continue;
+            if (evidence.adapterId === undefined) {
+                unresolved += 1;
+                continue;
+            }
+            this.upsert(evidence.sessionId, {
+                adapterId: evidence.adapterId,
+                ...(evidence.cwd === undefined ? {} : { cwd: evidence.cwd }),
+                status: existing?.status ?? 'idle',
+            });
+            migrated += 1;
+        }
+        return { migrated, unresolved };
+    }
     /** 创建或更新记录；返回值是内存中的规范化记录，持久化在后台串行完成。 */
     upsert(sessionId, patch) {
         const now = new Date().toISOString();
@@ -59,6 +91,7 @@ export class CodingNsCliSessionStore {
             adapterId,
             ...(patch.modelId?.trim() ? { modelId: patch.modelId.trim() } : base?.modelId ? { modelId: base.modelId } : {}),
             ...(patch.effortId?.trim() ? { effortId: patch.effortId.trim() } : base?.effortId ? { effortId: base.effortId } : {}),
+            ...(patch.providerId?.trim() ? { providerId: patch.providerId.trim() } : base?.providerId ? { providerId: base.providerId } : {}),
             ...(providerSessionId ? { providerSessionId } : base?.providerSessionId ? { providerSessionId: base.providerSessionId } : {}),
             ...(patch.rawStoreRef?.trim() ? { rawStoreRef: patch.rawStoreRef.trim() } : providerBase?.rawStoreRef ? { rawStoreRef: providerBase.rawStoreRef } : {}),
             ...(patch.title?.trim() ? { title: patch.title.trim() } : base?.title ? { title: base.title } : {}),
@@ -132,6 +165,7 @@ export class CodingNsCliSessionStore {
             adapterId: value.adapterId,
             ...(stringValue(value.modelId) ? { modelId: stringValue(value.modelId) } : {}),
             ...(stringValue(value.effortId) ? { effortId: stringValue(value.effortId) } : {}),
+            ...(stringValue(value.providerId) ? { providerId: stringValue(value.providerId) } : {}),
             ...(stringValue(value.providerSessionId) ? { providerSessionId: stringValue(value.providerSessionId) } : {}),
             ...(stringValue(value.rawStoreRef) ? { rawStoreRef: stringValue(value.rawStoreRef) } : {}),
             ...(stringValue(value.title) ? { title: stringValue(value.title) } : {}),
@@ -156,6 +190,10 @@ export class CodingNsCliSessionStore {
                 await this.persistence.write(snapshot);
             if (this.settings !== undefined)
                 await this.settings.update({ cliSessions: snapshot });
+        })
+            .catch((error) => {
+            // 会话索引是辅助缓存；设置服务短暂不可用不能杀死 Host 或模型探测任务。
+            console.warn('codingns4dsh: 外部会话索引持久化失败', error);
         });
     }
 }

package/data/build/dist/host/cli-adapters/standard-stream-driver.d.ts

@@ -9,6 +9,9 @@ export interface StandardStreamDriverOptions {
     readonly spawn?: typeof spawn;
     readonly versionArgs?: readonly string[];
     readonly modelArgs?: readonly string[];
+    /** Claude 模型发现的配置目录和网络请求注入点。 */
+    readonly claudeConfigDir?: string;
+    readonly fetch?: typeof fetch;
 }
 /**
  * 把采用 JSONL/stream-json 的 CLI 统一成 Codingns4DSH 的最小驱动契约。

package/data/build/dist/host/cli-adapters/stream-normalizer.d.ts

@@ -14,12 +14,15 @@ export declare class CodingNsAgentEventNormalizer {
     private text;
     private reasoningBoundary;
     private textBoundary;
+    private reasoningMessageId;
+    private textMessageId;
     private usage;
     push(chunk: CodingNsAgentEvent): readonly CodingNsNormalizedAgentEvent[];
     /** 流未携带 finish 时仍返回最后一次统计，避免正常结束路径丢失 usage。 */
     flush(): readonly CodingNsNormalizedAgentEvent[];
     private appendSnapshot;
     private takeUsage;
+    private messageBoundary;
 }
 export {};
 //# sourceMappingURL=stream-normalizer.d.ts.map

package/data/build/dist/host/cli-adapters/stream-normalizer.js

@@ -9,17 +9,21 @@ export class CodingNsAgentEventNormalizer {
     text = '';
     reasoningBoundary = false;
     textBoundary = false;
+    reasoningMessageId;
+    textMessageId;
     usage = null;
     push(chunk) {
         if (chunk.type === 'reasoning-delta') {
+            const boundary = this.messageBoundary('reasoning', chunk.messageId);
             this.reasoning = this.reasoningBoundary ? chunk.text : this.reasoning + chunk.text;
             this.reasoningBoundary = false;
-            return chunk.text === '' ? [] : [chunk];
+            return chunk.text === '' ? boundary : [...boundary, chunk];
         }
         if (chunk.type === 'text-delta') {
+            const boundary = this.messageBoundary('text', chunk.messageId);
             this.text = this.textBoundary ? chunk.text : this.text + chunk.text;
             this.textBoundary = false;
-            return chunk.text === '' ? [] : [chunk];
+            return chunk.text === '' ? boundary : [...boundary, chunk];
         }
         if (chunk.type === 'reasoning-snapshot')
             return this.appendSnapshot('reasoning', chunk.text);
@@ -79,5 +83,21 @@ export class CodingNsAgentEventNormalizer {
         this.usage = null;
         return usage;
     }
+    messageBoundary(channel, messageId) {
+        if (messageId === undefined)
+            return [];
+        const previous = channel === 'reasoning' ? this.reasoningMessageId : this.textMessageId;
+        if (channel === 'reasoning')
+            this.reasoningMessageId = messageId;
+        else
+            this.textMessageId = messageId;
+        if (previous === undefined || previous === messageId)
+            return [];
+        if (channel === 'reasoning')
+            this.reasoning = '';
+        else
+            this.text = '';
+        return [{ type: 'message-boundary', channel, messageId }];
+    }
 }
 //# sourceMappingURL=stream-normalizer.js.map

package/data/build/dist/host/control-api-client.d.ts

@@ -1,5 +1,5 @@
 import type { AuthDeviceManagementSnapshotDto, HostBindRequest, HostBindResponse, HostBindingsResponse, HostLabelAvailabilityResponse, HostUnbindResponse, LoginByEmailRequest } from '../shared/contracts/auth.js';
-import type { DshDeviceHeartbeatResponse, DshDeviceListResponse, DshDeviceRegistrationRequest, DshDeviceRegistrationResponse, DshRelayTicketRequest, DshRelayTicketResponse } from '../shared/contracts/dsh-device.js';
+import type { DshDeviceHeartbeatResponse, DshDeviceHeartbeatRequest, DshDeviceListResponse, DshDeviceRegistrationRequest, DshDeviceRegistrationResponse, DshRelayTicketRequest, DshRelayTicketResponse } from '../shared/contracts/dsh-device.js';
 import type { RelaySignalingTicketRequest, RelaySignalingTicketResponse } from '../shared/contracts/signaling.js';
 /** 仅 Host 使用的控制面会话响应；refresh token 不进入 shared/client 类型。 */
 export interface LoginByEmailResponse {
@@ -45,7 +45,7 @@ export interface CodingNsControlApiClient {
     createSignalingTicket(accessToken: string, request: RelaySignalingTicketRequest): Promise<RelaySignalingTicketResponse>;
     registerDshDevice(accessToken: string, request: DshDeviceRegistrationRequest): Promise<DshDeviceRegistrationResponse>;
     listDshDevices(accessToken: string): Promise<DshDeviceListResponse>;
-    heartbeatDshDevice(accessToken: string, deviceId: string, deviceCredential: string): Promise<DshDeviceHeartbeatResponse>;
+    heartbeatDshDevice(accessToken: string, deviceId: string, deviceCredential: string, details?: DshDeviceHeartbeatRequest): Promise<DshDeviceHeartbeatResponse>;
     createDshRelayTicket(accessToken: string, request: DshRelayTicketRequest): Promise<DshRelayTicketResponse>;
 }
 /** 设计文档中的简写名称；保留长名称以明确其 Control API 边界。 */
@@ -77,7 +77,7 @@ export declare class HttpCodingNsControlApiClient implements CodingNsControlApiC
     createSignalingTicket(accessToken: string, request: RelaySignalingTicketRequest): Promise<RelaySignalingTicketResponse>;
     registerDshDevice(accessToken: string, request: DshDeviceRegistrationRequest): Promise<DshDeviceRegistrationResponse>;
     listDshDevices(accessToken: string): Promise<DshDeviceListResponse>;
-    heartbeatDshDevice(accessToken: string, deviceId: string, deviceCredential: string): Promise<DshDeviceHeartbeatResponse>;
+    heartbeatDshDevice(accessToken: string, deviceId: string, deviceCredential: string, details?: DshDeviceHeartbeatRequest): Promise<DshDeviceHeartbeatResponse>;
     createDshRelayTicket(accessToken: string, request: DshRelayTicketRequest): Promise<DshRelayTicketResponse>;
     private request;
 }

package/data/build/dist/host/control-api-client.js

@@ -74,10 +74,11 @@ export class HttpCodingNsControlApiClient {
     listDshDevices(accessToken) {
         return this.request(this.controlBaseUrl, CODINGNS_CONTROL_API_PATHS.dshDevices, { token: accessToken });
     }
-    heartbeatDshDevice(accessToken, deviceId, deviceCredential) {
+    heartbeatDshDevice(accessToken, deviceId, deviceCredential, details) {
         return this.request(this.controlBaseUrl, `${CODINGNS_CONTROL_API_PATHS.dshDevices}/${encodeURIComponent(deviceId)}/heartbeat`, {
             method: 'POST',
             token: accessToken,
+            ...(details === undefined ? {} : { body: details }),
             headers: { 'x-dsh-device-credential': deviceCredential },
         });
     }

package/data/build/dist/host/credential-store.js

@@ -103,7 +103,17 @@ function parseDshCredential(value) {
     if (!isRecord(value) || typeof value.deviceId !== 'string' || typeof value.deviceCredential !== 'string' || typeof value.credentialVersion !== 'number' || !Number.isInteger(value.credentialVersion) || value.credentialVersion < 1 || typeof value.dtlsFingerprint !== 'string' || (typeof value.tunnelDomain !== 'string' && value.tunnelDomain !== null) || typeof value.displayName !== 'string' || typeof value.savedAt !== 'string') {
         throw new Error('DSH device credential 文件格式无效');
     }
-    return { deviceId: value.deviceId, deviceCredential: value.deviceCredential, credentialVersion: value.credentialVersion, dtlsFingerprint: value.dtlsFingerprint, tunnelDomain: value.tunnelDomain, displayName: value.displayName, savedAt: value.savedAt };
+    return {
+        deviceId: value.deviceId,
+        deviceCredential: value.deviceCredential,
+        credentialVersion: value.credentialVersion,
+        dtlsFingerprint: value.dtlsFingerprint,
+        tunnelDomain: value.tunnelDomain,
+        displayName: value.displayName,
+        ...(typeof value.dshVersion === 'string' && value.dshVersion.trim() ? { dshVersion: value.dshVersion } : {}),
+        ...(typeof value.computerName === 'string' && value.computerName.trim() ? { computerName: value.computerName } : {}),
+        savedAt: value.savedAt,
+    };
 }
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);

package/data/build/dist/host/dsh-device-runtime.d.ts

@@ -10,12 +10,16 @@ export interface DshHostDeviceRuntimeOptions {
     readonly accessToken: string;
     /** 认证续期后动态读取最新 access token；未提供时沿用 accessToken。 */
     readonly accessTokenProvider?: () => string | null;
+    /** 对控制面请求统一处理 401 续期；未提供时直接使用当前 token。 */
+    readonly withAccessToken?: <T>(operation: (accessToken: string) => Promise<T>) => Promise<T>;
     readonly credentialStore?: DshDeviceCredentialStore;
     readonly dtlsStore?: HostDtlsIdentityStore;
     readonly displayName?: string;
     readonly protocolVersion?: string;
     /** 当前 DSH 宿主的真实版本，用于 Relay Transport 握手。 */
     readonly dshVersion?: string;
+    /** 覆盖自动获取的计算机名，主要用于测试和受控运行环境。 */
+    readonly computerName?: string;
     readonly capabilities?: readonly string[];
     readonly resources?: Pick<FeatureResourceScope, 'add'>;
     readonly signalingSocketFactory?: Parameters<typeof startHostRelayRuntime>[0]['signalingSocketFactory'];