@jingyi0605/codingns4dsh 0.1.0 → 0.1.1

package/data/build/dist/host/index.d.ts

@@ -7,17 +7,21 @@
  */
 import type { Context } from '@deepseek-ai/cordis';
 export declare function apply(ctx?: Context): void;
-export { HOST_FEATURES, createAuthFeature, createLanAccessDshFeature, createTerminalStatusFeature, createHostFeatures, createCliAdaptersFeature, createTerminalProcessFeature, } from './features/index.js';
+export { HOST_FEATURES, createAuthFeature, createLanAccessDshFeature, createTerminalStatusFeature, createHostFeatures, createCliAdaptersFeature, createTerminalProcessFeature, createGitManagementFeature, } from './features/index.js';
 export type { CodingNsHostServices } from './features/index.js';
 export { CodingNsSettingsSchema, registerCodingNsSettings } from './settings.js';
 export { createCodingNsRpcHandler, createCodingNsSettingsRpcHandler, registerCodingNsRpc } from './rpc.js';
 export { DebugWorkspaceService, NodeDebugPortInspector, type DebugPortCheck, type DebugPortInspector, type DebugPortProcess, type DebugProxyBinding, } from './debug.js';
 export { CodingNsRpcError, CodingNsRpcTable, type CodingNsRpcHandler, type CodingNsRpcTarget, } from './rpc-table.js';
 export { CodingNsAuthSession } from './auth-session.js';
-export { createCodingNsNativeSessionBridge, type CodingNsNativeSessionBridge, type CodingNsNativeSessionController, type CodingNsNativeSessionStore, type CodingNsNativeWorkspaceController, type CodingNsNativeRequestContext, } from './native-session-bridge.js';
+export { createCodingNsNativeSessionBridge, type CodingNsNativeSessionBridge, type CodingNsNativeSessionController, type CodingNsNativeSessionStore, type CodingNsNativeWorkspaceController, type CodingNsNativeRequestContext, type CodingNsNativeUsageSample, } from './native-session-bridge.js';
+export { repairLegacySessionLog, repairLegacySessionLogs, type LegacySessionRepairOptions, type LegacySessionRepairReport, } from './session-migration-repair.js';
+export { defaultLegacySettingsPath, parseLegacyImportedSessionRecords, readLegacyImportedSessionRecords, } from './cli-adapters/legacy-session-settings.js';
 export { CommandCodeDriver } from './cli-adapters/command-code-driver.js';
 export { CommandCodeSubscriptionService, readCommandCodeApiKey } from './cli-adapters/command-code-subscription.js';
-export { ProviderSubscriptionService, CodexSubscriptionService, ClaudeCodeSubscriptionService, Sub2ApiUsageService, OpenCodeSubscriptionService, type Sub2ApiSource, type Sub2ApiUsageOptions, } from './cli-adapters/provider-subscription.js';
+export { ProviderSubscriptionService, CodexSubscriptionService, ClaudeCodeSubscriptionService, DeepseekSubscriptionService, Sub2ApiUsageService, OpenCodeSubscriptionService, type DeepseekSubscriptionOptions, type Sub2ApiSource, type Sub2ApiUsageOptions, } from './cli-adapters/provider-subscription.js';
+export { OfficialProviderSubscriptionService, type OfficialProviderSubscriptionOptions } from './cli-adapters/official-provider-subscription.js';
+export { MODEL_PROVIDER_DEFINITIONS, identifyModelProvider, normalizeProviderBaseUrl, normalizeProviderName, thirdPartyProvider, type ProviderDefinition, type ProviderIdentity, type ProviderSubscriptionCapability, type ProviderSubscriptionReader, } from './cli-adapters/provider-registry.js';
 export { ClaudeCodeDriver } from './cli-adapters/claude-driver.js';
 export { KimiCliDriver } from './cli-adapters/kimi-driver.js';
 export { GeminiCliDriver } from './cli-adapters/gemini-driver.js';

package/data/build/dist/host/index.js

@@ -8,30 +8,76 @@ import { createCodingNsNativeSessionBridge } from './native-session-bridge.js';
 import { installTerminalController } from './terminal/startup.js';
 import { DebugWorkspaceService } from './debug.js';
 import { detectRuntimeDshVersion, DSH_VERSION_INJECTION_NAME } from './dsh-runtime-version.js';
+import { createDshCapabilityRegistry } from '../dsh-capabilities/index.js';
+import { debugInfo } from '../shared/debug.js';
+import { repairLegacySessionLogs } from './session-migration-repair.js';
 export function apply(ctx) {
     if (ctx === undefined)
         return;
     const dshVersion = detectRuntimeDshVersion();
-    console.error('codingns4dsh: host apply entered');
+    debugInfo('codingns4dsh: host apply entered', { dshVersion });
+    // DSH 0.1.7 的官方 v3->v4 迁移器要求每个 tool/call 先有 assistant/message
+    // 声明。旧版外部 Agent 曾直接写入 tool/call，必须在任何会话 open 前修复。
+    ctx.inject(['sessionPersistence'], async (sessionCtx) => {
+        const persistence = sessionCtx.get('sessionPersistence');
+        if (!isRecord(persistence) || typeof persistence.root !== 'string')
+            return;
+        const open = persistence.open;
+        if (typeof open !== 'function')
+            return;
+        let repair;
+        const repairBeforeOpen = () => {
+            repair ??= repairLegacySessionLogs({
+                root: persistence.root,
+                logger: (message, error) => console.warn('codingns4dsh:', message, error),
+            }).catch((error) => {
+                console.warn('codingns4dsh: 历史会话扫描失败', error);
+                return undefined;
+            });
+            return repair;
+        };
+        // DSH 的 v3->v4 转换发生在 persistence.open 内部。只在启动时异步扫描
+        // 会晚于第一次点击历史会话，因此必须把修复挂到真正的读取边界之前。
+        try {
+            persistence.open = async function (...args) {
+                await repairBeforeOpen();
+                return open.apply(this, args);
+            };
+        }
+        catch (error) {
+            // 某些 Host 会冻结 Service 实例；启动扫描仍然可修复磁盘上的旧日志。
+            console.warn('codingns4dsh: 无法包装 sessionPersistence.open', error);
+        }
+        const report = await repairBeforeOpen();
+        debugInfo('codingns4dsh: legacy session repair finished', report);
+    });
     ctx.inject(['settings', 'connection', 'webServer'], async (hostCtx) => {
-        console.error('codingns4dsh: host inject ready', {
+        debugInfo('codingns4dsh: host inject ready', {
             hasConnection: hostCtx.connection !== undefined,
+            hasSettings: hostCtx.settings !== undefined,
+            hasWebServer: hostCtx.webServer !== undefined,
         });
         const webServerPort = hostCtx.webServer.port;
-        // LAN 入口和中继 Web 页面可能使用非 loopback URL，但它们都已经经过
-        // DSH Host 的认证边界并回到本机 Host。通过启动页注入 transport 所有权，
-        // 让 DSH 原生 ui-settings 保持 host 模式，而不是错误降级为 memory 模式。
+        // Desktop 自己会通过 dshDesktopBoot 注入带 streamBaseUrl 的 __DSH_TRANSPORT__。
+        // 插件不能用只有 ownsHost 的对象覆盖它，否则 Desktop 的 /api/remote.mux
+        // 会退回 dsh-app://app 并返回 404。远程 iframe 的 transport 由自身桥接代码注入。
         const indexInjectionEvents = hostCtx;
+        debugInfo('codingns4dsh: host index injection registration begin');
         indexInjectionEvents.on('webserver/index-inject', (table) => {
-            table.push({ kind: 'global', name: '__DSH_TRANSPORT__', value: { ownsHost: true } });
             table.push({ kind: 'global', name: DSH_VERSION_INJECTION_NAME, value: dshVersion });
         });
+        debugInfo('codingns4dsh: host index injection registration ready');
+        debugInfo('codingns4dsh: host settings registration begin');
         const settings = registerCodingNsSettings(hostCtx);
+        debugInfo('codingns4dsh: host settings registered');
+        const workspaceRoots = new Map();
         // controller 必须在功能模块和浏览器 Client 开始消费状态前完成装配。
         // 工厂在本次启动只读取一次开关，设置 watcher 不会热切同名 service。
         const terminal = await installTerminalController(hostCtx, settings, hostCtx.settings, {
-            resolveWorkspaceRoot: (workspaceId) => resolveWorkspaceRoot(hostCtx, workspaceId),
+            resolveWorkspaceRoot: (workspaceId) => workspaceRoots.get(workspaceId) ?? resolveWorkspaceRoot(hostCtx, workspaceId),
+            registerWorkspaceRoot: (workspaceId, cwd) => workspaceRoots.set(workspaceId, cwd),
         });
+        debugInfo('codingns4dsh: host terminal controller ready', { mode: terminal.mode });
         const services = {
             rpc: new CodingNsRpcTable(),
             dshVersion,
@@ -40,9 +86,9 @@ export function apply(ctx) {
             dshWebPort: webServerPort,
             dshWebAuthenticatedUrl: hostCtx.connection.authenticatedUrl(`http://127.0.0.1:${String(webServerPort)}`),
             events: { on: hostCtx.on.bind(hostCtx) },
-            nativeSessions: createCodingNsNativeSessionBridge(hostCtx),
+            nativeSessions: createCodingNsNativeSessionBridge(hostCtx, dshVersion),
             terminalProcesses: terminal.processService,
-            resolveWorkspaceRoot: (workspaceId) => resolveWorkspaceRoot(hostCtx, workspaceId),
+            resolveWorkspaceRoot: (workspaceId) => workspaceRoots.get(workspaceId) ?? resolveWorkspaceRoot(hostCtx, workspaceId),
             registerDebugProxyRoute: (handler) => hostCtx.connection.fetch.register({
                 path: '/api/codingns/debug-proxy',
                 methods: ['GET', 'HEAD', 'POST'],
@@ -51,22 +97,31 @@ export function apply(ctx) {
             }),
         };
         const debug = new DebugWorkspaceService({
-            resolveWorkspaceRoot: (workspaceId) => resolveWorkspaceRoot(hostCtx, workspaceId),
+            resolveWorkspaceRoot: (workspaceId) => workspaceRoots.get(workspaceId) ?? resolveWorkspaceRoot(hostCtx, workspaceId),
             terminalProcesses: terminal.processService,
         });
         const servicesWithDebug = { ...services, debug };
-        const registry = new FeatureRegistry(servicesWithDebug);
+        const capabilityProfile = createDshCapabilityRegistry(dshVersion, 'host', hostCtx).getProfile(hostCtx);
+        debugInfo('codingns4dsh: host capabilities resolved', {
+            dshVersion,
+            capabilities: [...capabilityProfile.capabilities.entries()].map(([capability, resolution]) => ({ capability, status: resolution.status, route: resolution.routeId, reason: resolution.reason ?? null })),
+            diagnostics: capabilityProfile.diagnostics,
+        });
+        const registry = new FeatureRegistry(servicesWithDebug, capabilityProfile);
         registry.registerMany(createHostFeatures({
             terminalStatus: {
                 controllerMode: terminal.mode,
                 effectiveEnabled: terminal.mode === 'enhanced',
+                runtimeTypes: terminal.runtimeTypes,
+                ...(terminal.runtimeWarning === undefined ? {} : { runtimeWarning: terminal.runtimeWarning }),
             },
         }));
         registry.validate();
+        debugInfo('codingns4dsh: host feature registry ready', { features: registry.descriptors().map((item) => item.name) });
         const restartStates = captureRestartFeatureStates(registry.descriptors(), settings.get(), dshVersion);
         try {
             registerCodingNsRpc(hostCtx, services.rpc, services.settingsProvider);
-            console.error('codingns4dsh: host RPC registration requested');
+            debugInfo('codingns4dsh: host RPC registration requested');
         }
         catch (error) {
             console.error('codingns4dsh: host RPC registration failed', error);
@@ -74,8 +129,10 @@ export function apply(ctx) {
         }
         hostCtx.effect(() => {
             const sync = () => {
+                const enabled = enabledFeatureNames(registry.descriptors(), settings.get(), restartStates, dshVersion);
+                debugInfo('codingns4dsh: host feature sync', { enabled, states: registry.list() });
                 void registry
-                    .reconcile(enabledFeatureNames(registry.descriptors(), settings.get(), restartStates, dshVersion))
+                    .reconcile(enabled)
                     .catch((error) => {
                     console.error('codingns4dsh: 功能模块状态同步失败', error);
                 });
@@ -85,6 +142,9 @@ export function apply(ctx) {
         }, 'codingns4dsh: 功能模块启停同步');
     });
 }
+function isRecord(value) {
+    return typeof value === 'object' && value !== null;
+}
 function resolveWorkspaceRoot(ctx, workspaceId) {
     try {
         const registry = ctx.get('workspaceRegistry');
@@ -102,16 +162,20 @@ function resolveWorkspaceRoot(ctx, workspaceId) {
     }
     return null;
 }
-export { HOST_FEATURES, createAuthFeature, createLanAccessDshFeature, createTerminalStatusFeature, createHostFeatures, createCliAdaptersFeature, createTerminalProcessFeature, } from './features/index.js';
+export { HOST_FEATURES, createAuthFeature, createLanAccessDshFeature, createTerminalStatusFeature, createHostFeatures, createCliAdaptersFeature, createTerminalProcessFeature, createGitManagementFeature, } from './features/index.js';
 export { CodingNsSettingsSchema, registerCodingNsSettings } from './settings.js';
 export { createCodingNsRpcHandler, createCodingNsSettingsRpcHandler, registerCodingNsRpc } from './rpc.js';
 export { DebugWorkspaceService, NodeDebugPortInspector, } from './debug.js';
 export { CodingNsRpcError, CodingNsRpcTable, } from './rpc-table.js';
 export { CodingNsAuthSession } from './auth-session.js';
 export { createCodingNsNativeSessionBridge, } from './native-session-bridge.js';
+export { repairLegacySessionLog, repairLegacySessionLogs, } from './session-migration-repair.js';
+export { defaultLegacySettingsPath, parseLegacyImportedSessionRecords, readLegacyImportedSessionRecords, } from './cli-adapters/legacy-session-settings.js';
 export { CommandCodeDriver } from './cli-adapters/command-code-driver.js';
 export { CommandCodeSubscriptionService, readCommandCodeApiKey } from './cli-adapters/command-code-subscription.js';
-export { ProviderSubscriptionService, CodexSubscriptionService, ClaudeCodeSubscriptionService, Sub2ApiUsageService, OpenCodeSubscriptionService, } from './cli-adapters/provider-subscription.js';
+export { ProviderSubscriptionService, CodexSubscriptionService, ClaudeCodeSubscriptionService, DeepseekSubscriptionService, Sub2ApiUsageService, OpenCodeSubscriptionService, } from './cli-adapters/provider-subscription.js';
+export { OfficialProviderSubscriptionService } from './cli-adapters/official-provider-subscription.js';
+export { MODEL_PROVIDER_DEFINITIONS, identifyModelProvider, normalizeProviderBaseUrl, normalizeProviderName, thirdPartyProvider, } from './cli-adapters/provider-registry.js';
 export { ClaudeCodeDriver } from './cli-adapters/claude-driver.js';
 export { KimiCliDriver } from './cli-adapters/kimi-driver.js';
 export { GeminiCliDriver } from './cli-adapters/gemini-driver.js';

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

@@ -266,6 +266,15 @@ export class LanAccessDshProxy {
     }
     authorize(request, localAddress) {
         const config = this.loginConfig;
+        if (request.path === '/__codingns/session' && request.method === 'GET') {
+            const token = readCookie(request.headers.cookie, 'dsh_codingns_session');
+            const authenticated = !localAddress && config !== null && config.enabled && config.scopes.lan
+                && token !== undefined && !this.revokedSessions.has(token)
+                && verifySignedSessionToken(token, config, 'lan');
+            return loginJsonResponse(200, authenticated
+                ? { authenticated: true, username: config.username }
+                : { authenticated: false });
+        }
         if (localAddress || config === null || !config.enabled || !config.scopes.lan)
             return 'pass';
         if (request.path === '/__codingns/login' && request.method === 'POST') {
@@ -280,16 +289,16 @@ export class LanAccessDshProxy {
             return loginResponse(303, '', { 'Set-Cookie': sessionCookie(token, config.timeoutSeconds), Location: '/' });
         }
         if (request.path === '/__codingns/logout') {
-            const token = readCookie(request.headers.cookie, 'codingns4dsh_session');
+            const token = readCookie(request.headers.cookie, 'dsh_codingns_session');
             if (token !== undefined && verifySignedSessionToken(token, config, 'lan'))
                 this.revokedSessions.add(token);
-            return loginResponse(303, '', { 'Set-Cookie': 'codingns4dsh_session=; Path=/; HttpOnly; SameSite=Strict; Max-Age=0', Location: '/' });
+            return loginResponse(303, '', { 'Set-Cookie': 'dsh_codingns_session=; Path=/; HttpOnly; SameSite=Strict; Max-Age=0', Location: '/' });
         }
         // 浏览器会在页面刷新时独立请求 Web App manifest；它只包含静态元数据，
         // 不应因为登录保护缺少 Cookie 而产生 401 控制台噪声。
         if (request.path === '/manifest.webmanifest' && request.method === 'GET')
             return 'pass';
-        const token = readCookie(request.headers.cookie, 'codingns4dsh_session');
+        const token = readCookie(request.headers.cookie, 'dsh_codingns_session');
         if (token !== undefined && !this.revokedSessions.has(token) && verifySignedSessionToken(token, config, 'lan')) {
             return 'pass';
         }
@@ -389,7 +398,7 @@ function readCookie(value, name) {
     return undefined;
 }
 function sessionCookie(token, timeoutSeconds) {
-    return `codingns4dsh_session=${token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${timeoutSeconds}`;
+    return `dsh_codingns_session=${token}; Path=/; HttpOnly; SameSite=Strict; Max-Age=${timeoutSeconds}`;
 }
 function getSetCookie(headers) {
     const extended = headers;
@@ -398,7 +407,8 @@ function getSetCookie(headers) {
 }
 function loginResponse(status, body, extra = {}) {
     const isHtml = body.startsWith('<!doctype html>');
-    const content = new TextEncoder().encode(isHtml ? body : escapeHtml(body));
+    const isJson = extra['Content-Type']?.startsWith('application/json') === true;
+    const content = new TextEncoder().encode(isHtml || isJson ? body : escapeHtml(body));
     const headers = {
         'Content-Type': isHtml ? 'text/html; charset=utf-8' : 'text/plain; charset=utf-8',
         'Content-Length': String(content.length),
@@ -413,6 +423,9 @@ function loginResponse(status, body, extra = {}) {
     const head = encodeLatin1(`HTTP/1.1 ${status} ${statusText(status)}\r\n${Object.entries(headers).map(([key, value]) => `${key}: ${value}`).join('\r\n')}\r\n\r\n`);
     return concatBytes(head, content);
 }
+function loginJsonResponse(status, value) {
+    return loginResponse(status, JSON.stringify(value), { 'Content-Type': 'application/json; charset=utf-8' });
+}
 function loginPage() {
     // 视觉规则直接复用 codingns4dsh-h5/styles.css 的 Cyber 登录区，只把 Connect
     // 账号字段替换成本地用户名/密码；不能依赖外部 CSS，避免局域网入口离线时失效。

package/data/build/dist/host/native-session-bridge.d.ts

@@ -17,6 +17,8 @@ export interface CodingNsNativeToolCall {
     readonly callId: string;
     readonly name: string;
     readonly arguments: string;
+    /** 外部适配器 ID；旧调用方缺省时保持通用来源标记。 */
+    readonly adapterId?: string;
 }
 /** 一次工具调用在 DSH Session 中的稳定位置。 */
 export interface CodingNsNativeToolCallHandle {
@@ -42,6 +44,7 @@ export interface CodingNsNativeExternalToolEvent {
     readonly status: 'running' | 'completed' | 'failed';
     readonly output?: string;
     readonly error?: string;
+    readonly adapterId?: string;
 }
 export type CodingNsNativeApprovalOutcome = 'allowed-once' | 'rejected' | 'cancelled' | 'unavailable';
 /** 公共消息投影层交给 DSH 原生权限服务的请求。 */
@@ -64,6 +67,19 @@ export interface CodingNsNativeRequestContext {
     readonly model: string;
     readonly contextWindow?: number;
 }
+/** 外部 Provider 已报告的用量采样；写入 assistant/attempt，不加入模型可见 surface。 */
+export interface CodingNsNativeUsageSample {
+    readonly inputTokens: number;
+    readonly outputTokens: number;
+    readonly cacheReadTokens?: number;
+    readonly cacheWriteTokens?: number;
+    readonly uncachedInputTokens?: number;
+    readonly totalTokens?: number;
+    readonly cacheHitRate?: number;
+    readonly contextWindow?: number;
+    readonly contextTokens?: number;
+    readonly contextUsageRatio?: number;
+}
 export interface CodingNsNativeSessionController {
     create?(request: {
         readonly sessionId?: string;
@@ -112,6 +128,12 @@ export interface CodingNsNativeSessionBridge {
     appendExternalToolEvent?(sessionId: string, event: CodingNsNativeExternalToolEvent): boolean;
     /** 写入当前原生步骤的路由上下文元数据，不携带凭据或消息正文。 */
     appendRequestContext?(sessionId: string, context: CodingNsNativeRequestContext): boolean;
+    /** 在当前步骤即时记录外部 Provider 用量；该事件不进入模型可见 surface。 */
+    appendUsageSample?(sessionId: string, usage: CodingNsNativeUsageSample): boolean;
+    /** 判断指定会话是否真的具备下一步注入能力。 */
+    canInjectNextStep?(sessionId: string): boolean;
+    /** 在当前 Agent turn 的下一个合法 step 注入插件上下文，不唤醒空闲 Agent。 */
+    injectNextStep?(sessionId: string, summary?: string): boolean;
     /** 使用 DSH 原生 approval 组件请求一次权限决定；服务不可用时拒绝。 */
     requestApproval?(sessionId: string, request: CodingNsNativeApprovalRequest): Promise<CodingNsNativeApprovalOutcome>;
     /** 使用 DSH 原生 userQuestions 组件提问；服务不可用或取消时返回 null。 */
@@ -126,5 +148,5 @@ export interface CodingNsNativeSessionBridge {
         readonly onFlush?: (session: unknown) => void | Promise<void>;
     }): () => void;
 }
-export declare function createCodingNsNativeSessionBridge(ctx: Context): CodingNsNativeSessionBridge;
+export declare function createCodingNsNativeSessionBridge(ctx: Context, dshVersion?: string): CodingNsNativeSessionBridge;
 //# sourceMappingURL=native-session-bridge.d.ts.map

package/data/build/dist/host/native-session-bridge.js

@@ -1,4 +1,5 @@
-export function createCodingNsNativeSessionBridge(ctx) {
+import { randomUUID } from 'node:crypto';
+export function createCodingNsNativeSessionBridge(ctx, dshVersion) {
     // Cordis Context 是运行时代理，直接读取未在 inject 中声明的可选服务会抛错。
     // get() 专门用于无强制依赖的服务探测，精简 Host 缺少服务时会返回 undefined。
     const storeValue = ctx.get('sessions');
@@ -15,11 +16,36 @@ export function createCodingNsNativeSessionBridge(ctx) {
         ? ctx.on.bind(ctx)
         : undefined;
     const externalHandles = new Map();
+    let injectedStepSequence = 0;
+    const modernInjectedSource = isModernDshVersion(dshVersion);
     const appendNativeToolCall = (sessionId, call) => {
         const session = appendableSession(store?.get(sessionId));
         const position = session === null ? null : activeStep(session);
         if (session === null || position === null)
             return null;
+        // DSH 的工具生命周期由 assistant/message 先声明，再由 tool/call 开始。
+        // 外部 Agent 已经在自身进程执行完请求，这条消息只用于持久化声明，绝不触发 DSH 执行器。
+        session.append('assistant/message', {
+            turn: position.turn,
+            step: position.step,
+            message: {
+                id: `external-tool-${call.callId}-${position.turn}-${position.step}`,
+                role: 'assistant',
+                content: [{
+                        type: 'tool-call',
+                        id: call.callId,
+                        name: call.name,
+                        arguments: call.arguments,
+                    }],
+                source: {
+                    kind: 'model',
+                    plugin: 'codingns4dsh',
+                    provider: call.adapterId?.trim() || 'codingns-external',
+                    model: call.adapterId?.trim() || 'external-agent',
+                },
+            },
+            stream: [],
+        }, { surfaceOp: 'append' });
         const event = session.append('tool/call', {
             turn: position.turn,
             step: position.step,
@@ -40,14 +66,11 @@ export function createCodingNsNativeSessionBridge(ctx) {
             step: handle.step,
             message: {
                 id: `${handle.callId}-result-${handle.turn}-${handle.step}`,
-                role: 'user',
-                content: [{
-                        type: 'tool-result',
-                        toolCallId: handle.callId,
-                        content: [{ type: 'text', text: result.output }],
-                        ...(result.isError ? { isError: true } : {}),
-                    }],
+                role: 'tool',
+                toolCallId: handle.callId,
+                content: [{ type: 'text', text: result.output }],
                 source: { kind: 'tool', callId: handle.callId },
+                ...(result.isError ? { isError: true } : {}),
             },
             ...(result.isError
                 ? { error: { name: 'ExternalToolError', code: 'EXTERNAL_TOOL_FAILED', ...(error ? { reason: error } : {}) } }
@@ -64,10 +87,69 @@ export function createCodingNsNativeSessionBridge(ctx) {
         if (session === null || context.provider.trim() === '' || context.model.trim() === '')
             return false;
         try {
+            // request/context 是 token-meter 的容量来源。相同路由重复追加会让
+            // 投影先清空旧 pressure，再等待下一条 usage，ContextMeter 因而闪烁。
+            // 保留已有容量并跳过等价事件，让用量更新直接落到同一个组件上。
+            const previous = latestRequestContext(session);
+            if (previous !== null
+                && previous.provider === context.provider
+                && previous.model === context.model
+                && (context.contextWindow === undefined || previous.contextWindow === context.contextWindow))
+                return true;
+            // Registry 在一轮开始时只能提供适配器身份，不能提供 Provider 容量。
+            // 继承上一条已知容量，避免先写无容量事件导致 ContextMeter 卸载；
+            // 真正的 usage 到达后，投影器会用 Provider 的最新容量覆盖它。
+            const contextWindow = context.contextWindow ?? previous?.contextWindow;
             session.append('request/context', {
                 provider: context.provider,
                 model: context.model,
-                ...(context.contextWindow === undefined ? {} : { contextWindow: context.contextWindow }),
+                ...(contextWindow === undefined ? {} : { contextWindow }),
+            });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    };
+    const appendNativeUsageSample = (sessionId, usage) => {
+        const session = appendableSession(store?.get(sessionId));
+        const position = session === null ? null : activeStep(session);
+        if (session === null || position === null)
+            return false;
+        try {
+            session.append('assistant/attempt', {
+                turn: position.turn,
+                step: position.step,
+                stream: [{
+                        type: 'chunk',
+                        time: Date.now(),
+                        chunk: {
+                            type: 'usage',
+                            usage: compactUsage(usage),
+                        },
+                    }],
+            });
+            return true;
+        }
+        catch {
+            return false;
+        }
+    };
+    const injectNativeNextStep = (sessionId, summary = '外部工具已完成，继续处理当前任务。') => {
+        const agent = nativeAgent(ctx, sessionId);
+        if (agent === null || typeof agent.inject !== 'function')
+            return false;
+        injectedStepSequence += 1;
+        const boundedSummary = summary.trim().slice(0, 120) || '外部工具已完成，继续处理当前任务。';
+        try {
+            ;
+            agent.inject({
+                id: `codingns-external-step-${injectedStepSequence}-${randomUUID()}`,
+                role: 'user',
+                content: [{ type: 'text', text: boundedSummary }],
+                source: modernInjectedSource
+                    ? { kind: 'model-selection', form: 'notice', summary: boundedSummary }
+                    : { kind: 'plugin', plugin: 'codingns4dsh', form: 'notice', summary: boundedSummary },
             });
             return true;
         }
@@ -75,6 +157,10 @@ export function createCodingNsNativeSessionBridge(ctx) {
             return false;
         }
     };
+    const canInjectNativeNextStep = (sessionId) => {
+        const agent = nativeAgent(ctx, sessionId);
+        return agent !== null && typeof agent.inject === 'function';
+    };
     return {
         get available() {
             return store !== undefined || controller !== undefined || currentWorkspaceController() !== undefined;
@@ -133,9 +219,18 @@ export function createCodingNsNativeSessionBridge(ctx) {
         appendRequestContext(sessionId, context) {
             return appendNativeRequestContext(sessionId, context);
         },
+        appendUsageSample(sessionId, usage) {
+            return appendNativeUsageSample(sessionId, usage);
+        },
+        canInjectNextStep(sessionId) {
+            return canInjectNativeNextStep(sessionId);
+        },
+        injectNextStep(sessionId, summary) {
+            return injectNativeNextStep(sessionId, summary);
+        },
         appendExternalToolEvent(sessionId, externalTool) {
             try {
-                // 兼容旧调用方，但仍然写入 DSH 原生工具事件，绝不能伪造 assistant/attempt。
+                // 兼容旧调用方；声明 assistant 工具生命周期，但绝不伪造 assistant/attempt 结算。
                 const key = `${sessionId}:${externalTool.callId}`;
                 if (externalTool.phase === 'start') {
                     if (externalHandles.has(key))
@@ -144,6 +239,7 @@ export function createCodingNsNativeSessionBridge(ctx) {
                         callId: externalTool.callId,
                         name: externalTool.name,
                         arguments: externalTool.arguments,
+                        ...(externalTool.adapterId === undefined ? {} : { adapterId: externalTool.adapterId }),
                     });
                     if (handle === null)
                         return false;
@@ -240,6 +336,32 @@ function appendableSession(value) {
         return null;
     return value;
 }
+function latestRequestContext(session) {
+    let events;
+    try {
+        events = session.snapshotEvents();
+    }
+    catch {
+        return null;
+    }
+    for (let index = events.length - 1; index >= 0; index -= 1) {
+        const candidate = events[index];
+        const event = isRecord(candidate) ? candidate : null;
+        if (event?.type !== 'request/context')
+            continue;
+        const data = isRecord(event.data) ? event.data : null;
+        if (typeof data?.provider !== 'string' || typeof data.model !== 'string')
+            return null;
+        return {
+            provider: data.provider,
+            model: data.model,
+            ...(typeof data.contextWindow === 'number' && Number.isFinite(data.contextWindow) && data.contextWindow > 0
+                ? { contextWindow: data.contextWindow }
+                : {}),
+        };
+    }
+    return null;
+}
 function activeStep(session) {
     let events;
     try {
@@ -271,6 +393,20 @@ function eventSeq(value) {
 function finiteInteger(value) {
     return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0 ? value : null;
 }
+function compactUsage(usage) {
+    return {
+        inputTokens: usage.inputTokens,
+        outputTokens: usage.outputTokens,
+        ...(usage.cacheReadTokens === undefined ? {} : { cacheReadTokens: usage.cacheReadTokens }),
+        ...(usage.cacheWriteTokens === undefined ? {} : { cacheWriteTokens: usage.cacheWriteTokens }),
+        ...(usage.uncachedInputTokens === undefined ? {} : { uncachedInputTokens: usage.uncachedInputTokens }),
+        ...(usage.totalTokens === undefined ? {} : { totalTokens: usage.totalTokens }),
+        ...(usage.cacheHitRate === undefined ? {} : { cacheHitRate: usage.cacheHitRate }),
+        ...(usage.contextWindow === undefined ? {} : { contextWindow: usage.contextWindow }),
+        ...(usage.contextTokens === undefined ? {} : { contextTokens: usage.contextTokens }),
+        ...(usage.contextUsageRatio === undefined ? {} : { contextUsageRatio: usage.contextUsageRatio }),
+    };
+}
 function isSessionStore(value) {
     return isRecord(value) && typeof value.get === 'function' && typeof value.list === 'function';
 }
@@ -283,6 +419,17 @@ function isWorkspaceController(value) {
 function isRecord(value) {
     return typeof value === 'object' && value !== null;
 }
+function isModernDshVersion(value) {
+    if (value === undefined)
+        return false;
+    const match = /^(\d+)\.(\d+)\.(\d+)/u.exec(value.trim());
+    if (match === null)
+        return false;
+    const major = Number(match[1]);
+    const minor = Number(match[2]);
+    const patch = Number(match[3]);
+    return major > 0 || minor > 1 || minor === 1 && patch >= 7;
+}
 function nativeAgent(ctx, sessionId) {
     const value = ctx.get('agents');
     if (!isRecord(value) || typeof value.get !== 'function')

package/data/build/dist/host/rpc-table.d.ts

@@ -4,7 +4,7 @@
  * 每个功能模块在启动时登记自己的命名空间，主 handler 只做一次 `namespace/action`
  * 前缀解析。新增模块只登记新命名空间，不需要修改中心分发代码。
  */
-export type CodingNsRpcHandler = (action: string, payload: unknown) => unknown | Promise<unknown>;
+export type CodingNsRpcHandler = (action: string, payload: unknown, context?: unknown) => unknown | Promise<unknown>;
 export interface CodingNsRpcTarget {
     readonly handler: CodingNsRpcHandler;
     readonly action: string;