@jingyi0605/codingns4dsh 0.1.0 → 0.1.2

package/data/build/dist/host/cli-adapters/dsh-message-projector.js

@@ -10,10 +10,15 @@ export class CodingNsDshMessageProjector {
     options;
     normalizer = new CodingNsAgentEventNormalizer();
     toolHistory;
+    reasoningIndex = 0;
+    textIndex = 1;
+    nextBlockIndex = 2;
+    reasoningText = '';
+    textText = '';
     finished = false;
     constructor(options) {
         this.options = options;
-        this.toolHistory = new CodingNsDshToolHistoryProjector(options.nativeSessions, options.sessionId);
+        this.toolHistory = new CodingNsDshToolHistoryProjector(options.nativeSessions, options.sessionId, options.adapterId);
     }
     get isFinished() {
         return this.finished;
@@ -21,6 +26,8 @@ export class CodingNsDshMessageProjector {
     async push(event) {
         if (this.finished)
             return [];
+        if (event.type === 'usage')
+            this.recordUsageSample(event);
         const projected = [];
         for (const normalized of this.normalizer.push(event)) {
             projected.push(...await this.project(normalized));
@@ -44,7 +51,7 @@ export class CodingNsDshMessageProjector {
         const projected = await this.flushUsage();
         const reason = cancelled ? 'cancel' : 'error';
         if (!cancelled) {
-            projected.push({ type: 'text-delta', index: 1, text: formatExecutionFailure(this.options.adapterId, message) });
+            projected.push(...await this.project({ type: 'text-delta', text: formatExecutionFailure(this.options.adapterId, message) }));
         }
         projected.push(...await this.project({ type: 'finish', reason }, message));
         return projected;
@@ -55,14 +62,55 @@ export class CodingNsDshMessageProjector {
             projected.push(...await this.project(event));
         return projected;
     }
+    /** Provider 的 usage 到达时立即给 token-meter 一个非 surface 采样点。
+     *
+     * DSH 规范要求正式 usage 仍随 assistant/message 在 finish 前结算，因此这里不
+     * 提前向 LLM 流发送第二个 usage，只写入 assistant/attempt 供上下文计量投影使用。
+     */
+    recordUsageSample(event) {
+        const usage = {
+            inputTokens: event.inputTokens,
+            outputTokens: event.outputTokens,
+            ...(event.cacheReadTokens === undefined ? {} : { cacheReadTokens: event.cacheReadTokens }),
+            ...(event.cacheWriteTokens === undefined ? {} : { cacheWriteTokens: event.cacheWriteTokens }),
+            ...(event.uncachedInputTokens === undefined ? {} : { uncachedInputTokens: event.uncachedInputTokens }),
+            ...(event.totalTokens === undefined ? {} : { totalTokens: event.totalTokens }),
+            ...(event.cacheHitRate === undefined ? {} : { cacheHitRate: event.cacheHitRate }),
+            ...(event.contextWindow === undefined ? {} : { contextWindow: event.contextWindow }),
+            ...(event.contextTokens === undefined ? {} : { contextTokens: event.contextTokens }),
+            ...(event.contextUsageRatio === undefined ? {} : { contextUsageRatio: event.contextUsageRatio }),
+        };
+        if (event.contextWindow !== undefined) {
+            this.options.nativeSessions?.appendRequestContext?.(this.options.sessionId, {
+                provider: this.options.adapterId,
+                model: this.options.modelId ?? this.options.adapterId,
+                contextWindow: event.contextWindow,
+            });
+        }
+        this.options.nativeSessions?.appendUsageSample?.(this.options.sessionId, usage);
+    }
     async project(event, failureMessage) {
         switch (event.type) {
             case 'reasoning-delta':
-                return event.text === '' ? [] : [{ type: 'reasoning-delta', index: 0, text: event.text }];
+                if (event.text === '')
+                    return [];
+                return this.appendDelta('reasoning', event.text);
             case 'text-delta':
-                return event.text === '' ? [] : [{ type: 'text-delta', index: 1, text: event.text }];
+                if (event.text === '')
+                    return [];
+                return this.appendDelta('text', event.text);
+            case 'message-boundary':
+                return this.closeMessageBlock(event.channel);
+            case 'step-boundary':
+                // DSH 0.1.7 的 Chat 分组器会把同一 Turn 中没有可见 assistant
+                // 回复的连续工具节点合并到一个 process group。Codex 的工具已经
+                // 在外部进程完成，分段之间没有 DSH 原生 assistant 文本可供分组器
+                // 识别，因此写入一个 Markdown 引用定义作为不可见的回复边界。
+                // 必须从新行开始；DSH UI 会忽略 definition 节点，而不是把 HTML 当注释解析。
+                // 该内容不会显示给用户，也不会改变工具的原生 step 坐标。
+                return this.appendDelta('text', '\n\n[//]: # (codingns-step-boundary)');
             case 'tool-event':
-                return externalToolChunk(this.toolHistory.observe(event));
+                return this.externalToolChunk(this.toolHistory.observe(event));
             case 'permission-request':
                 await this.requestPermission(event);
                 return [];
@@ -70,13 +118,6 @@ export class CodingNsDshMessageProjector {
                 await this.requestQuestions(event);
                 return [];
             case 'usage':
-                if (event.contextWindow !== undefined) {
-                    this.options.nativeSessions?.appendRequestContext?.(this.options.sessionId, {
-                        provider: this.options.adapterId,
-                        model: this.options.modelId ?? this.options.adapterId,
-                        contextWindow: event.contextWindow,
-                    });
-                }
                 return [{
                         type: 'usage',
                         usage: {
@@ -95,11 +136,77 @@ export class CodingNsDshMessageProjector {
             case 'session-binding':
                 return [];
             case 'finish':
+                const closed = [
+                    ...this.closeMessageBlock('reasoning'),
+                    ...this.closeMessageBlock('text'),
+                ];
                 this.finished = true;
                 this.toolHistory.finalize(event.reason, failureMessage);
-                return [{ type: 'finish', reason: toDshFinishReason(event.reason, failureMessage) }];
+                closed.push({ type: 'finish', reason: toDshFinishReason(event.reason, failureMessage) });
+                return closed;
         }
     }
+    appendDelta(channel, text) {
+        const opened = channel === 'reasoning' ? this.reasoningText === '' : this.textText === '';
+        const index = this.openBlock(channel);
+        if (channel === 'reasoning')
+            this.reasoningText += text;
+        else
+            this.textText += text;
+        const delta = { type: `${channel}-delta`, index, text };
+        return opened ? [{ type: 'block-start', index, blockType: channel }, delta] : [delta];
+    }
+    openBlock(channel) {
+        const current = channel === 'reasoning' ? this.reasoningIndex : this.textIndex;
+        if (current !== undefined)
+            return current;
+        const index = this.nextBlockIndex;
+        this.nextBlockIndex += 1;
+        if (channel === 'reasoning')
+            this.reasoningIndex = index;
+        else
+            this.textIndex = index;
+        return index;
+    }
+    closeMessageBlock(channel) {
+        if (channel === 'reasoning') {
+            if (this.reasoningText === '')
+                return [];
+            const index = this.reasoningIndex;
+            if (index === undefined)
+                return [];
+            const chunk = { type: 'block-end', index, block: { type: 'reasoning', text: this.reasoningText } };
+            this.reasoningText = '';
+            this.reasoningIndex = undefined;
+            return [chunk];
+        }
+        if (this.textText === '')
+            return [];
+        const index = this.textIndex;
+        if (index === undefined)
+            return [];
+        const chunk = { type: 'block-end', index, block: { type: 'text', text: this.textText } };
+        this.textText = '';
+        this.textIndex = undefined;
+        return [chunk];
+    }
+    externalToolChunk(marker) {
+        if (marker === null)
+            return [];
+        const index = this.nextBlockIndex;
+        this.nextBlockIndex += 1;
+        return [
+            { type: 'block-start', index, blockType: 'reasoning' },
+            {
+                type: 'reasoning-delta',
+                index,
+                // 空 delta 会被 DSH 的流式聚合器丢弃，空格能保留 live-chunk 但不会显示思考正文。
+                text: ' ',
+                codingnsExternalTool: marker,
+            },
+            { type: 'block-end', index, block: { type: 'reasoning', text: ' ' } },
+        ];
+    }
     async requestPermission(event) {
         const responder = this.options.respondPermission;
         if (responder === undefined)
@@ -129,22 +236,6 @@ export class CodingNsDshMessageProjector {
         await responder(response);
     }
 }
-/**
- * 没有 DSH 原生 Session 时的工具展示回退：使用空白 reasoning chunk 携带私有标记，
- * 只让 Client 的实时 Conversation 投影读取，不会再次执行工具。完整 Host 直接使用
- * 原生 tool/call 与 tool/result，不经过这里。
- */
-function externalToolChunk(marker) {
-    if (marker === null)
-        return [];
-    return [{
-            type: 'reasoning-delta',
-            index: 0,
-            // 空 delta 会被 DSH 的流式聚合器丢弃，空格能保留 live-chunk 但不会显示思考正文。
-            text: ' ',
-            codingnsExternalTool: marker,
-        }];
-}
 function toDshFinishReason(reason, failureMessage) {
     if (reason === 'cancel') {
         return { kind: 'aborted', failure: { message: failureMessage ?? '外部 Agent 执行已取消', code: 'ABORTED' } };

package/data/build/dist/host/cli-adapters/dsh-tool-history.d.ts

@@ -10,6 +10,7 @@ export interface CodingNsDshExternalToolMarker {
     readonly status: 'running' | 'completed' | 'failed';
     readonly output?: string;
     readonly error?: string;
+    readonly adapterId?: string;
 }
 /**
  * 所有外部 Agent 共用的 DSH 工具历史投影器。
@@ -20,6 +21,7 @@ export interface CodingNsDshExternalToolMarker {
 export declare class CodingNsDshToolHistoryProjector {
     private readonly nativeSessions;
     private readonly sessionId;
+    private readonly adapterId?;
     private readonly records;
     private readonly deferNativeAppend;
     private readonly removeNativeEventListener;
@@ -28,7 +30,7 @@ export declare class CodingNsDshToolHistoryProjector {
     private observedCalls;
     private finalized;
     private flushScheduled;
-    constructor(nativeSessions: CodingNsNativeSessionBridge | undefined, sessionId: string);
+    constructor(nativeSessions: CodingNsNativeSessionBridge | undefined, sessionId: string, adapterId?: string | undefined);
     observe(event: CodingNsAgentToolEvent): CodingNsDshExternalToolMarker | null;
     /** 流结束时补齐 Provider 遗漏的终态，避免原生组件永久停留在运行中。 */
     finalize(reason: 'stop' | 'cancel' | 'error', failure?: string): void;
@@ -36,6 +38,7 @@ export declare class CodingNsDshToolHistoryProjector {
     private settle;
     /** 按 Provider 到达顺序把工具调用和结果写入当前 DSH step。 */
     private flushNativeRecords;
+    private hasPendingNativeRecords;
     private persistNativeRecord;
     private scheduleFlush;
     /** 活动 step 晚于首个工具通知时，补写尚未进入 Session 的工具标记。 */

package/data/build/dist/host/cli-adapters/dsh-tool-history.js

@@ -12,6 +12,7 @@ const TRUNCATION_MARKER = '\n...[内容因长度限制已截断]';
 export class CodingNsDshToolHistoryProjector {
     nativeSessions;
     sessionId;
+    adapterId;
     records = new Map();
     deferNativeAppend;
     removeNativeEventListener;
@@ -20,12 +21,13 @@ export class CodingNsDshToolHistoryProjector {
     observedCalls = 0;
     finalized = false;
     flushScheduled = false;
-    constructor(nativeSessions, sessionId) {
+    constructor(nativeSessions, sessionId, adapterId) {
         this.nativeSessions = nativeSessions;
         this.sessionId = sessionId;
-        // 工具事件必须尽早进入当前 step。新桥接优先写入原生 tool/call 与 tool/result；
-        // 自定义标记只负责把这次通知立即送进实时 Conversation。不能把工具伪装成
-        // assistant/attempt，因为 DSH 会把后者当成模型结算，天然排到正文之后。
+        this.adapterId = adapterId;
+        // 工具通知必须在当前 llm/stream 结束前写入原生时间线。若把它延迟到
+        // assistant/message 结算之后，最后一条事件会变成带 tool-call 的合成 assistant，
+        // DSH 会把整步判定为 process，最终正文也会被收进折叠按钮。
         const subscribe = nativeSessions?.supportsEvents === true ? nativeSessions.subscribe : undefined;
         this.deferNativeAppend = nativeSessions?.appendToolCall === undefined && nativeSessions?.appendExternalToolEvent === undefined && subscribe !== undefined;
         this.removeNativeEventListener = subscribe?.call(nativeSessions, {
@@ -93,6 +95,7 @@ export class CodingNsDshToolHistoryProjector {
             name: normalized.name,
             arguments: normalized.arguments,
             status,
+            ...(this.adapterId === undefined ? {} : { adapterId: this.adapterId }),
             ...(record.output === undefined ? {} : { output: record.output }),
             ...(record.error === undefined ? {} : { error: record.error }),
         };
@@ -125,7 +128,6 @@ export class CodingNsDshToolHistoryProjector {
         }
         if (this.nativeSessions?.appendToolCall !== undefined) {
             this.flushNativeRecords();
-            this.removeNativeEventListener?.();
         }
         else if (this.nativeSessions?.appendExternalToolEvent !== undefined) {
             this.flushExternalMarkers();
@@ -160,9 +162,16 @@ export class CodingNsDshToolHistoryProjector {
             return;
         for (const record of this.records.values())
             this.persistNativeRecord(record);
-        if (this.finalized)
+        if (this.finalized && !this.hasPendingNativeRecords())
             this.removeNativeEventListener?.();
     }
+    hasPendingNativeRecords() {
+        for (const record of this.records.values()) {
+            if (record.handle === null || record.settled && !record.resultAppended)
+                return true;
+        }
+        return false;
+    }
     persistNativeRecord(record) {
         const append = this.nativeSessions?.appendToolCall;
         if (append === undefined || this.sessionId.trim() === '')
@@ -221,7 +230,15 @@ export class CodingNsDshToolHistoryProjector {
         if (!record.externalPersisted) {
             const start = marker.phase === 'start'
                 ? marker
-                : { source: marker.source, phase: 'start', callId: marker.callId, name: marker.name, arguments: marker.arguments, status: 'running' };
+                : {
+                    source: marker.source,
+                    phase: 'start',
+                    callId: marker.callId,
+                    name: marker.name,
+                    arguments: marker.arguments,
+                    status: 'running',
+                    ...(this.adapterId === undefined ? {} : { adapterId: this.adapterId }),
+                };
             try {
                 if (!append.call(this.nativeSessions, this.sessionId, start))
                     return false;
@@ -250,6 +267,7 @@ export class CodingNsDshToolHistoryProjector {
                 callId: record.callId,
                 name: normalized.name,
                 arguments: normalized.arguments,
+                ...(this.adapterId === undefined ? {} : { adapterId: this.adapterId }),
             });
         }
         catch {

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

@@ -15,7 +15,7 @@ export function createCliAdaptersFeature(options = {}) {
     return {
         descriptor: {
             name: 'cliAdapters',
-            version: '0.1.0',
+            version: '0.1.1',
             enabledByDefault: true,
             dependencies: [],
             runtime: 'host',
@@ -24,6 +24,13 @@ export function createCliAdaptersFeature(options = {}) {
             const commandCodeSubscription = new CommandCodeSubscriptionService();
             const subscriptions = new ProviderSubscriptionService({ commandCode: commandCodeSubscription });
             const sessionStore = new CodingNsCliSessionStore(context.services.settings === undefined ? {} : { settings: context.services.settings });
+            const nativeSessions = context.services.nativeSessions;
+            if (nativeSessions !== undefined) {
+                const migration = sessionStore.migrateLegacySessions(nativeSessions.list());
+                if (migration.migrated > 0 || migration.unresolved > 0) {
+                    console.info('codingns4dsh: 旧外部会话适配器迁移完成', migration);
+                }
+            }
             const registry = options.registry ?? new CodingNsCliAdapterRegistry([
                 new CommandCodeDriver(),
                 new ClaudeCodeDriver(),
@@ -40,7 +47,6 @@ export function createCliAdaptersFeature(options = {}) {
             });
             registry.applyEnabledSettings(context.services.settings?.get().agentAdapters);
             registry.warmCatalog();
-            const nativeSessions = context.services.nativeSessions;
             if (nativeSessions !== undefined) {
                 const disposeNativeEvents = nativeSessions.subscribe({
                     onEvent: (session, event) => {
@@ -48,6 +54,10 @@ export function createCliAdaptersFeature(options = {}) {
                         const eventType = nativeEventType(event);
                         if (sessionId === undefined || eventType === undefined)
                             return;
+                        // 旧会话可能不在启动时的 SessionStore.list() 中，直到用户点击
+                        // 侧栏才加载。加载事件本身携带完整快照，此时补做一次迁移。
+                        if (sessionStore.get(sessionId) === undefined)
+                            sessionStore.migrateLegacySessions([session]);
                         const current = sessionStore.get(sessionId);
                         if (current === undefined || current.status === 'archived')
                             return;
@@ -69,12 +79,20 @@ export function createCliAdaptersFeature(options = {}) {
                     case 'session/get': return registry.getSession(readSessionId(payload));
                     case 'session/set': return registry.setSession(readSessionId(payload), readSessionConfig(payload));
                     case 'session/list': return registry.listSessions(readSessionListOptions(payload));
-                    case 'session/adapter-map': return sessionStore.adapterBindings();
+                    case 'session/adapter-map':
+                        // DSH 历史会话的 seed 事件不会发布 session/event；每次读取映射时
+                        // 重新检查当前已加载对象，覆盖“用户刚点击打开旧会话”的路径。
+                        if (nativeSessions !== undefined)
+                            sessionStore.migrateLegacySessions(nativeSessions.list());
+                        return sessionStore.adapterBindings();
                     case 'session/archive': return registry.archiveSession(readSessionId(payload));
                     case 'session/steer': return registry.steer(readSessionId(payload), readPrompt(payload), false);
                     case 'session/follow-up': return registry.steer(readSessionId(payload), readPrompt(payload), true);
                     case 'session/interrupt': return registry.interrupt(readSessionId(payload));
-                    case 'subscription': return subscriptions.read(readSubscriptionAdapterId(payload));
+                    case 'subscription': {
+                        const subscription = readSubscriptionRequest(payload);
+                        return subscriptions.read(subscription.adapterId, subscription.providerId);
+                    }
                     default: throw new Error(`未知 CLI RPC: cli/${action}`);
                 }
             }));
@@ -106,6 +124,9 @@ export function createCliAdaptersFeature(options = {}) {
                     }
                     const messages = Array.isArray(value?.messages) ? value.messages.filter(isMessage) : [];
                     const cwd = resolveSessionCwd(context.services.nativeSessions, sessionId, value);
+                    // 只有 Provider 驱动明确维护了稳定的 turn 分段，才把工具边界映射为 DSH step。
+                    // OpenCode、Command Code 会在同一轮连续产出工具和 usage，强行切 step 会让
+                    // token-meter 在下一条 usage 到达前失去投影，表现为上下文组件反复卸载。
                     const input = {
                         sessionId,
                         messages,
@@ -116,6 +137,13 @@ export function createCliAdaptersFeature(options = {}) {
                         ...(config.rawStoreRef ? { rawStoreRef: config.rawStoreRef } : {}),
                         ...(cwd === undefined ? {} : { cwd }),
                         ...(isAbortSignal(value?.signal) ? { signal: value.signal } : {}),
+                        ...(registry.supportsSegmentedTurns(config.adapterId)
+                            && nativeSessions?.available === true
+                            && nativeSessions.injectNextStep !== undefined
+                            && (nativeSessions.canInjectNextStep === undefined
+                                || nativeSessions.canInjectNextStep(sessionId))
+                            ? { splitToolSteps: true }
+                            : {}),
                     };
                     const projector = new CodingNsDshMessageProjector({
                         adapterId: config.adapterId,
@@ -126,8 +154,25 @@ export function createCliAdaptersFeature(options = {}) {
                         respondPermission: (response) => registry.respondPermission(sessionId, response),
                         respondQuestion: (response) => registry.respondQuestion(sessionId, response),
                     });
+                    const discardSuspendedTurn = () => registry.discardSegmentedTurn(sessionId);
+                    input.signal?.addEventListener('abort', discardSuspendedTurn, { once: true });
+                    if (input.signal?.aborted)
+                        discardSuspendedTurn();
                     try {
                         for await (const chunk of registry.execute({ ...input, adapterId: config.adapterId })) {
+                            if (chunk.type === 'step-boundary') {
+                                // Agent Loop 会在本次 llm/stream 返回后关闭当前 step，并在返回前
+                                // 检查 next-step inbox。必须先注入，再发送 finish，不能等 complete()
+                                // 之后再写入，否则 DSH 已经把整个 turn 结算完了。
+                                const injected = nativeSessions?.available === true
+                                    ? nativeSessions.injectNextStep?.(sessionId) ?? false
+                                    : false;
+                                if (!injected)
+                                    discardSuspendedTurn();
+                                for (const dshChunk of await projector.push(chunk))
+                                    yield dshChunk;
+                                continue;
+                            }
                             for (const dshChunk of await projector.push(chunk))
                                 yield dshChunk;
                             // DSH 要求 finish 是唯一且最后一个 chunk。这里 return 也会关闭上游迭代器。
@@ -143,6 +188,9 @@ export function createCliAdaptersFeature(options = {}) {
                         for (const dshChunk of await projector.fail(message, input.signal?.aborted ?? false))
                             yield dshChunk;
                     }
+                    finally {
+                        input.signal?.removeEventListener('abort', discardSuspendedTurn);
+                    }
                 });
                 if (typeof dispose === 'function')
                     context.resources.add(() => { dispose(); });
@@ -157,11 +205,15 @@ function readAdapterId(value) {
         throw new Error('adapterId 不能为空');
     return record.adapterId.trim();
 }
-function readSubscriptionAdapterId(value) {
+function readSubscriptionRequest(value) {
     const record = asRecord(value);
     if (record === null || record.adapterId === undefined)
-        return 'command-code';
-    return readAdapterId(value);
+        return { adapterId: 'command-code' };
+    const adapterId = readAdapterId(value);
+    return {
+        adapterId,
+        ...(typeof record.providerId === 'string' && record.providerId.trim() !== '' ? { providerId: record.providerId.trim() } : {}),
+    };
 }
 function readSessionId(value) {
     const record = asRecord(value);
@@ -176,6 +228,7 @@ function readSessionConfig(value) {
         adapterId,
         ...(typeof record?.modelId === 'string' && record.modelId.trim() ? { modelId: record.modelId.trim() } : {}),
         ...(typeof record?.effortId === 'string' && record.effortId.trim() ? { effortId: record.effortId.trim() } : {}),
+        ...(typeof record?.providerId === 'string' && record.providerId.trim() ? { providerId: record.providerId.trim() } : {}),
         ...(typeof record?.providerSessionId === 'string' && record.providerSessionId.trim() ? { providerSessionId: record.providerSessionId.trim() } : {}),
     };
 }
@@ -215,15 +268,17 @@ function readDshSelection(value) {
     };
     const modelId = read(['model', 'modelId']);
     const effortId = read(['reasoningEffort', 'effortId', 'thinking']);
+    const providerId = read(['provider', 'providerId', 'providerName']);
     return {
         ...(modelId === undefined ? {} : { modelId }),
         ...(effortId === undefined ? {} : { effortId }),
+        ...(providerId === undefined ? {} : { providerId }),
     };
 }
 /** DSH Session 快照把最近选择放在 modelSelection.lastUsed/next。 */
 function readModelSelectionCandidates(value) {
     const result = [];
-    for (const candidate of [value, asRecord(value?.request), asRecord(value?.config), asRecord(value?.header)]) {
+    for (const candidate of [value, asRecord(value?.request), asRecord(value?.config), asRecord(value?.header), asRecord(asRecord(value?.record)?.rows)]) {
         const selection = asRecord(candidate?.modelSelection);
         const lastUsed = asRecord(selection?.lastUsed);
         const next = asRecord(selection?.next);
@@ -247,11 +302,22 @@ async function setAdapterEnabled(settings, registry, value) {
 function extractPrompt(messages) {
     for (let index = messages.length - 1; index >= 0; index -= 1) {
         const message = messages[index];
+        if (message !== undefined && isInjectedStepNotice(message))
+            return extractText(message.content);
         if (message !== undefined && isHumanUserMessage(message))
             return extractText(message.content);
     }
     return '';
 }
+/** DSH 为工具分段注入的继续提示必须成为下一次 Provider 请求的 prompt。 */
+function isInjectedStepNotice(message) {
+    if (message.role !== 'user' || !isRecord(message.source))
+        return false;
+    if (message.source.form !== 'notice')
+        return false;
+    return message.source.kind === 'model-selection'
+        || message.source.kind === 'plugin' && message.source.plugin === 'codingns4dsh';
+}
 function isHumanUserMessage(message) {
     if (message.role !== 'user')
         return false;

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

@@ -25,7 +25,7 @@ export class GeminiCliDriver extends StandardStreamDriver {
         try {
             await rpc.request('initialize', {
                 protocolVersion: 1,
-                clientInfo: { name: 'codingns4dsh', version: '0.1.0' },
+                clientInfo: { name: 'codingns4dsh', version: '0.1.1' },
                 clientCapabilities: {},
             }, { signal: controller.signal });
             const session = await rpc.request('session/new', {
@@ -128,7 +128,7 @@ export class GeminiCliDriver extends StandardStreamDriver {
         try {
             await rpc.request('initialize', {
                 protocolVersion: 1,
-                clientInfo: { name: 'codingns4dsh', version: '0.1.0' },
+                clientInfo: { name: 'codingns4dsh', version: '0.1.1' },
                 clientCapabilities: {},
             }, { signal: input.signal });
             rpc.notify('initialized', {});

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

@@ -34,7 +34,7 @@ export class GrokBuildDriver {
             return emptyCatalog();
         const rpc = new JsonRpcProcess({ command, args: ['agent', '--no-leader', 'stdio'], spawn: this.runSpawn });
         try {
-            await rpc.request('initialize', { protocolVersion: 1, clientInfo: { name: 'codingns4dsh', version: '0.1.0' }, capabilities: {} });
+            await rpc.request('initialize', { protocolVersion: 1, clientInfo: { name: 'codingns4dsh', version: '0.1.1' }, capabilities: {} });
             rpc.notify('initialized', {});
             const session = await rpc.request('session/new', { cwd: process.cwd(), mcpServers: [] });
             const parsed = parseGrokCatalog(session);
@@ -126,7 +126,7 @@ export class GrokBuildDriver {
         const state = { rpc, cwd: input.cwd, providerSessionId: '', requests: new Map() };
         await rpc.request('initialize', {
             protocolVersion: 1,
-            clientInfo: { name: 'codingns4dsh', version: '0.1.0' },
+            clientInfo: { name: 'codingns4dsh', version: '0.1.1' },
             capabilities: {},
         });
         rpc.notify('initialized', {});

package/data/build/dist/host/cli-adapters/json-rpc-process.d.ts

@@ -25,6 +25,8 @@ export interface JsonRpcRequestOptions {
     readonly onNotification?: (message: JsonRpcMessage) => void;
     /** 取消本次请求时是否同时终止整个 Agent 进程；长期会话应关闭此项。 */
     readonly killOnAbort?: boolean;
+    /** Pi 使用 type/data 顶层命令，不是 JSON-RPC method/params。 */
+    readonly wireFormat?: 'jsonrpc' | 'pi';
 }
 /**
  * 统一管理 stdio JSON-RPC 子进程：请求编号、逐行解码、取消和退出清理都在这里完成。
@@ -43,8 +45,8 @@ export declare class JsonRpcProcess {
     private serverRequestHandler;
     constructor(options: JsonRpcProcessOptions);
     request(method: string, params?: unknown, options?: JsonRpcRequestOptions): Promise<unknown>;
-    /** 发送无需响应的 JSON-RPC 通知，例如 initialized 或 cancel。 */
-    notify(method: string, params?: unknown): void;
+    /** 发送无需响应的协议通知，例如 initialized 或 cancel。 */
+    notify(method: string, params?: unknown, wireFormat?: 'jsonrpc' | 'pi'): void;
     /** 注册 Agent 发起的 JSON-RPC 服务端请求处理器，例如 Codex 权限审批。 */
     setServerRequestHandler(handler: ((message: JsonRpcMessage) => unknown | Promise<unknown>) | undefined): void;
     /** 为一段流式请求注册独立监听器，响应先到时也不会提前移除。 */

package/data/build/dist/host/cli-adapters/json-rpc-process.js

@@ -40,14 +40,10 @@ export class JsonRpcProcess {
         else
             options.signal?.addEventListener('abort', onAbort, { once: true });
         try {
-            // Pi 的模型探测命令是自定义 RPC：请求体使用 `type`，不能包成 JSON-RPC
-            // method，否则 Pi 会回报 “Unknown command: undefined”。其余适配器仍走标准 JSON-RPC。
-            if (method === 'get_available_models') {
+            if (options.wireFormat === 'pi')
                 this.write({ id, type: method, ...(isRecord(params) ? params : {}) });
-            }
-            else {
+            else
                 this.write({ jsonrpc: '2.0', id, method, params });
-            }
             const result = await promise;
             if (options.signal?.aborted)
                 throw new Error('请求已取消');
@@ -60,10 +56,13 @@ export class JsonRpcProcess {
             this.pending.delete(id);
         }
     }
-    /** 发送无需响应的 JSON-RPC 通知，例如 initialized 或 cancel。 */
-    notify(method, params = {}) {
+    /** 发送无需响应的协议通知，例如 initialized 或 cancel。 */
+    notify(method, params = {}, wireFormat = 'jsonrpc') {
         this.ensureStarted();
-        this.write({ jsonrpc: '2.0', method, params });
+        if (wireFormat === 'pi')
+            this.write({ type: method, ...(isRecord(params) ? params : {}) });
+        else
+            this.write({ jsonrpc: '2.0', method, params });
     }
     /** 注册 Agent 发起的 JSON-RPC 服务端请求处理器，例如 Codex 权限审批。 */
     setServerRequestHandler(handler) {

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

@@ -137,7 +137,7 @@ export class KimiCliDriver extends StandardStreamDriver {
                 method: 'initialize',
                 params: {
                     protocol_version: '1.10',
-                    client: { name: 'codingns4dsh', version: '0.1.0' },
+                    client: { name: 'codingns4dsh', version: '0.1.1' },
                     capabilities: { supports_question: true },
                 },
             })}\n`);

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

@@ -0,0 +1,17 @@
+import type { CodingNsCliAdapterId } from '../../shared/contracts/cli-adapter.js';
+/** 当前插件注册的适配器；旧日志只能从这些稳定 ID 中选择，不能猜测任意品牌。 */
+export declare const KNOWN_CLI_ADAPTER_IDS: Set<string>;
+export interface LegacySessionAdapterEvidence {
+    readonly sessionId: string;
+    readonly adapterId?: CodingNsCliAdapterId;
+    readonly cwd?: string;
+    readonly createdAt?: string;
+    readonly external: boolean;
+}
+/**
+ * 从 DSH 原生会话快照读取旧版外部 Agent 的适配器证据。
+ * `codingns-external` 只能证明消息来自外部 Agent；只有 source/provider 或
+ * request/context 中出现当前已知适配器 ID 时才回填，避免把 DSH 模型提供方误认成 CLI。
+ */
+export declare function inspectLegacySessionAdapter(value: unknown): LegacySessionAdapterEvidence | undefined;
+//# sourceMappingURL=legacy-session-adapter.d.ts.map