@jingyi0605/codingns4dsh 0.2.1-beta.10 → 0.2.1-beta.11

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

@@ -31,7 +31,9 @@ import { containsDelegationCarrier, delegationAdapterIds, rewriteDelegationMessa
 import { clearDelegationAuthorization, setDelegationAuthorization } from './delegation-authorization.js';
 import { debugInfo } from '../../shared/debug.js';
 import { hasLegacySessionAdapterHint } from './legacy-session-adapter.js';
-import {} from '../../shared/contracts/session-translation.js';
+import { DSH_NATIVE_SESSION_ADAPTER_ID, formatSessionTranslationOutput, readSessionTranslationMetrics, } from '../../shared/contracts/session-translation.js';
+import { createInteractionTranslation } from '../features/interaction-translation.js';
+import { ASSISTANT_AGENT_PREFIX } from '../../dsh-capabilities/host/assistant-agent-adapter.js';
 export function createCliAdaptersFeature(options = {}) {
     return {
         descriptor: {
@@ -130,8 +132,10 @@ export function createCliAdaptersFeature(options = {}) {
                 });
                 context.resources.add(disposeNativeEvents);
             }
-            registerDelegationAgentHooks(context.services.dshContext, registry, context.resources, publishExternalStatus, translation);
-            context.resources.add(context.services.rpc.register('cli', (action, payload) => {
+            registerDelegationAgentHooks(context.services.dshContext, registry, context.resources, publishExternalStatus, translation, nativeSessions);
+            const interactionTranslation = createInteractionTranslation(translation, sessionId => registry.getSession(sessionId));
+            context.resources.add(() => interactionTranslation.dispose());
+            context.resources.add(context.services.rpc.register('cli', (action, payload, rpcContext) => {
                 switch (action) {
                     case 'catalog': return registry.catalog();
                     case 'catalog/refresh': return registry.refreshCatalog(asRecord(payload)?.adapterId === undefined ? undefined : readAdapterId(payload)).then((catalog) => {
@@ -143,6 +147,10 @@ export function createCliAdaptersFeature(options = {}) {
                         return adapterId === 'dsh' ? readDshModelCatalog(context.services.dshContext) : registry.models(adapterId);
                     }
                     case 'translation/models': return context.services.sessionTranslation?.catalog() ?? { models: [], default: null, errors: ['翻译模型目录不可用'] };
+                    case 'translation/fields': {
+                        const signal = asRecord(rpcContext)?.signal;
+                        return interactionTranslation.translate(payload, isAbortSignal(signal) ? signal : undefined);
+                    }
                     case 'skills': {
                         const request = readSkillsRequest(payload);
                         const cwd = resolveSessionCwd(context.services.nativeSessions, request.sessionId, null);
@@ -344,6 +352,18 @@ export function createCliAdaptersFeature(options = {}) {
                         if (sessionId !== '' && (selection.modelId !== undefined || selection.effortId !== undefined)) {
                             registry.setSession(sessionId, { adapterId: 'dsh', ...selection });
                         }
+                        // Native-session output translation wraps only DSH's own Provider stream:
+                        // preserve text/reasoning and attach the translation record; the client renders it.
+                        if (!isSessionTranslationLlmRequest(value)
+                            && translation !== undefined
+                            && translation.enabled
+                            && (config.translationEnabled ?? translation.nativeEnabled === true)
+                            && sessionId !== ''
+                            && !isAssistantSession(sessionId)
+                            && readNativeSessionHeader(nativeSessions, sessionId)?.origin !== 'subagent') {
+                            yield* guardDshNativeStream(() => translateNativeStream(next(), translation, translation.bilingual === true, isAbortSignal(value?.signal) ? value.signal : undefined));
+                            return;
+                        }
                         yield* guardDshNativeStream(next);
                         return;
                     }
@@ -526,7 +546,7 @@ function createExternalSessionStatusPublisher(events, registry, sessionStore) {
  * `messages`，会直接抛出只读属性异常。`agent/pre-step` 返回的新消息保留用户原文，并把
  * 译文写入 source 元数据；外部适配器再据此构造发给 Agent 的译文。
  */
-function registerDelegationAgentHooks(dshContext, registry, resources, publishExternalStatus, translation) {
+function registerDelegationAgentHooks(dshContext, registry, resources, publishExternalStatus, translation, nativeSessions) {
     if (dshContext === undefined || typeof dshContext.on !== 'function')
         return;
     const disposers = [];
@@ -588,7 +608,7 @@ function registerDelegationAgentHooks(dshContext, registry, resources, publishEx
                 messages = [...delegation.value.messages];
             }
         }
-        const translatedInput = await translatePreStepInput(translation, registry, sessionId, messages, dshContext, isAbortSignal(record?.signal) ? record.signal : undefined);
+        const translatedInput = await translatePreStepInput(translation, registry, sessionId, messages, dshContext, isAbortSignal(record?.signal) ? record.signal : undefined, nativePreStepContext(translation, registry, sessionId, nativeSessions));
         if (translatedInput !== undefined)
             messages = [...translatedInput];
         const decision = await next();
@@ -999,9 +1019,42 @@ async function translateSteerPrompt(translation, registry, sessionId, prompt, fo
  * DSH 随后会把返回的消息写入 `user/message`。正文只放实际发送的译文；原文和模型
  * 记录在 source 元数据中供 Client 详情按钮读取。外部 CLI 边界也会移除该元数据。
  */
-async function translatePreStepInput(translation, registry, sessionId, messages, dshContext, signal) {
+async function translatePreStepInput(translation, registry, sessionId, messages, dshContext, signal, nativeSession) {
     if (translation === undefined || !translation.enabled || sessionId.trim() === '')
         return undefined;
+    const messageIndex = findLatestHumanMessage(messages);
+    const current = messageIndex < 0 ? undefined : messages[messageIndex];
+    if (current === undefined || readInputTranslation(current.source) !== undefined)
+        return undefined;
+    if (nativeSession !== undefined) {
+        // DSH 原生会话：消息本身就是发给 Provider 的正文，直接替换为译文并把原文留在元数据。
+        if (nativeSession.translationEnabled !== true)
+            return undefined;
+        const input = extractTurnInput(messages, dshContext);
+        if (input.translationPrompt.trim() === '')
+            return undefined;
+        const result = await runInputTranslation(translation, nativeSession.adapterId, input.translationPrompt, signal);
+        const translated = [result.translated, input.untranslatedPrompt].filter((part) => part.trim() !== '').join('\n\n').trim();
+        if (translated === '')
+            return undefined;
+        const record = {
+            original: input.prompt,
+            translated,
+            ...(result.sourceLanguage === undefined ? {} : { sourceLanguage: result.sourceLanguage }),
+            targetLanguage: readInputTargetLanguage(translation),
+            ...(result.alreadyTargetLanguage === true ? { alreadyTargetLanguage: true } : {}),
+            ...(result.model === undefined ? {} : { model: result.model }),
+            ...readSessionTranslationMetrics(result),
+            ...(result.failed === true ? { failed: true } : {}),
+        };
+        const next = [...messages];
+        next[messageIndex] = {
+            ...current,
+            content: [{ type: 'text', text: translated }],
+            source: { ...(current.source ?? {}), kind: 'user', codingnsTranslationInput: record },
+        };
+        return next;
+    }
     let session;
     try {
         session = registry.getSession(sessionId);
@@ -1011,37 +1064,11 @@ async function translatePreStepInput(translation, registry, sessionId, messages,
     }
     if (session.adapterId === 'dsh' || session.translationEnabled !== true)
         return undefined;
-    const messageIndex = findLatestHumanMessage(messages);
-    const current = messageIndex < 0 ? undefined : messages[messageIndex];
-    if (current === undefined || readInputTranslation(current.source) !== undefined)
-        return undefined;
     const input = extractTurnInput(messages, dshContext);
     if (input.translationPrompt.trim() === '')
         return undefined;
-    let translatedNatural;
-    let translationSourceLanguage = undefined;
-    let alreadyTargetLanguage = false;
-    let translationModel;
-    let translationFailed = false;
-    try {
-        if (translation.translateInputDetailed !== undefined) {
-            const detailed = await translation.translateInputDetailed(session.adapterId, input.translationPrompt, signal, true);
-            translatedNatural = detailed.translated;
-            translationSourceLanguage = detailed.sourceLanguage;
-            alreadyTargetLanguage = detailed.alreadyTargetLanguage === true;
-            translationModel = detailed.model;
-            translationFailed = detailed.failed === true;
-        }
-        else {
-            translatedNatural = await translation.translateInput(session.adapterId, input.translationPrompt, signal, true);
-        }
-    }
-    catch {
-        // 翻译只是增强能力；异常时保持现有外部 Agent 回合继续使用原文。
-        translatedNatural = input.translationPrompt;
-        translationFailed = true;
-    }
-    const translated = [translatedNatural, input.untranslatedPrompt]
+    const result = await runInputTranslation(translation, session.adapterId, input.translationPrompt, signal);
+    const translated = [result.translated, input.untranslatedPrompt]
         .filter((part) => part.trim() !== '')
         .join('\n\n')
         .trim();
@@ -1050,11 +1077,12 @@ async function translatePreStepInput(translation, registry, sessionId, messages,
     const record = {
         original: input.prompt,
         translated,
-        ...(translationSourceLanguage === undefined ? {} : { sourceLanguage: translationSourceLanguage }),
-        targetLanguage: translation.inputLanguage ?? 'en',
-        ...(alreadyTargetLanguage ? { alreadyTargetLanguage: true } : {}),
-        ...(translationModel === undefined ? {} : { model: translationModel }),
-        ...(translationFailed ? { failed: true } : {}),
+        ...(result.sourceLanguage === undefined ? {} : { sourceLanguage: result.sourceLanguage }),
+        targetLanguage: readInputTargetLanguage(translation),
+        ...(result.alreadyTargetLanguage === true ? { alreadyTargetLanguage: true } : {}),
+        ...(result.model === undefined ? {} : { model: result.model }),
+        ...readSessionTranslationMetrics(result),
+        ...(result.failed === true ? { failed: true } : {}),
     };
     const next = [...messages];
     next[messageIndex] = {
@@ -1067,6 +1095,191 @@ async function translatePreStepInput(translation, registry, sessionId, messages,
     };
     return next;
 }
+/** 输入翻译统一入口：翻译只是增强能力，异常时回退原文并标记失败。 */
+async function runInputTranslation(translation, adapterId, text, signal) {
+    try {
+        if (translation.translateInputDetailed !== undefined) {
+            const detailed = await translation.translateInputDetailed(adapterId, text, signal, true);
+            return {
+                translated: detailed.translated,
+                ...(detailed.sourceLanguage === undefined ? {} : { sourceLanguage: detailed.sourceLanguage }),
+                ...(detailed.alreadyTargetLanguage === true ? { alreadyTargetLanguage: true } : {}),
+                ...(detailed.model === undefined ? {} : { model: detailed.model }),
+                ...(detailed.failed === true ? { failed: true } : {}),
+                ...readSessionTranslationMetrics(detailed),
+            };
+        }
+        return { translated: await translation.translateInput(adapterId, text, signal, true) };
+    }
+    catch {
+        return { translated: text, failed: true };
+    }
+}
+/** 旧测试替身没有 inputLanguage 时沿用历史默认值英语。 */
+function readInputTargetLanguage(translation) {
+    const language = translation.inputLanguage;
+    return language === undefined ? 'en' : language;
+}
+/**
+ * 判断本次 pre-step 是否按 DSH 原生会话翻译。
+ *
+ * 原生会话的翻译记录来自全局 `nativeEnabled` 与适配器偏好（会话索引对 `dsh` 不落盘），
+ * 子代理与插件自己的助理会话必须排除，避免把内部执行流水线翻译掉。
+ */
+function nativePreStepContext(translation, registry, sessionId, nativeSessions) {
+    if (translation === undefined || !translation.enabled || sessionId.trim() === '')
+        return undefined;
+    if (isAssistantSession(sessionId))
+        return undefined;
+    if (readNativeSessionHeader(nativeSessions, sessionId)?.origin === 'subagent')
+        return undefined;
+    let session;
+    try {
+        session = registry.getSession(sessionId);
+    }
+    catch {
+        return undefined;
+    }
+    if (session.adapterId !== DSH_NATIVE_SESSION_ADAPTER_ID)
+        return undefined;
+    return {
+        adapterId: DSH_NATIVE_SESSION_ADAPTER_ID,
+        // 会话级开关优先；用户没有单独设置过该会话时跟随「DSH 原生会话」总开关。
+        translationEnabled: session.translationEnabled ?? translation.nativeEnabled === true,
+    };
+}
+/** 读取原生会话 header；测试替身或会话尚未装载时返回 undefined。 */
+function readNativeSessionHeader(nativeSessions, sessionId) {
+    if (nativeSessions === undefined)
+        return undefined;
+    try {
+        return asRecord(asRecord(nativeSessions.get(sessionId))?.header) ?? undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** 插件自己的全局助理会话不属于用户对话，不能被翻译改写。 */
+function isAssistantSession(sessionId) {
+    // 复用助理适配器导出的会话前缀常量：会话身份的唯一定义在那里，重复字面量会漂移。
+    return sessionId.startsWith(ASSISTANT_AGENT_PREFIX);
+}
+/**
+ * DSH 原生会话的输出翻译。
+ *
+ * 原生回复由 DSH 自己组装成 `assistant/message`，插件只能在 Provider 流边界改写：
+ * 文本与思考增量先缓存，块结束时一次性发出原文，并把译文放进记录供客户端显示；
+ * 工具调用、usage 与 finish 原样透传。翻译失败、流中断或异常都会补发原文块，保证回复不丢失。
+ */
+async function* translateNativeStream(stream, translation, bilingual, signal) {
+    const blocks = new Map();
+    const bufferOf = (index, kind) => {
+        const existing = blocks.get(index);
+        if (existing !== undefined)
+            return existing.kind === kind && !existing.closed ? existing : undefined;
+        const created = { index, kind, text: '', closed: false };
+        blocks.set(index, created);
+        return created;
+    };
+    const translateBlock = async (block) => {
+        const original = block.text;
+        if (original.trim() === '')
+            return [];
+        const kind = block.kind === 'reasoning' ? 'reasoning' : 'assistant';
+        let record;
+        try {
+            const result = await translation.translateOutput(DSH_NATIVE_SESSION_ADAPTER_ID, kind, original, signal, true);
+            if (result !== null && result !== undefined) {
+                record = {
+                    original: result.original,
+                    translated: result.translated,
+                    ...(result.sourceLanguage === undefined ? {} : { sourceLanguage: result.sourceLanguage }),
+                    targetLanguage: result.targetLanguage,
+                    outputKind: kind,
+                    bilingual: result.bilingual,
+                    ...(result.alreadyTargetLanguage === true ? { alreadyTargetLanguage: true } : {}),
+                    ...(result.model === undefined ? {} : { model: result.model }),
+                    ...readSessionTranslationMetrics(result),
+                    ...(result.failed === true ? { failed: true } : {}),
+                };
+            }
+        }
+        catch {
+            record = { original, translated: original, targetLanguage: translation.outputLanguage ?? 'zh', outputKind: kind, bilingual, failed: true };
+        }
+        if (record === undefined)
+            return [];
+        const visible = formatSessionTranslationOutput(record);
+        if (visible.trim() === '' || visible === original)
+            return [];
+        return [
+            // Keep the provider text in the native history. The client chooses the translated
+            // text for display from codingnsTranslation.translated.
+            { type: `${block.kind}-delta`, index: block.index, text: original, codingnsTranslation: record },
+            { type: 'block-end', index: block.index, block: { type: block.kind, text: original, codingnsTranslation: record }, codingnsTranslation: record },
+        ];
+    };
+    try {
+        for await (const chunk of stream) {
+            const record = asRecord(chunk);
+            const type = typeof record?.type === 'string' ? record.type : '';
+            const index = typeof record?.index === 'number' ? record.index : undefined;
+            if (type === 'text-delta' || type === 'reasoning-delta') {
+                if (index === undefined || typeof record?.text !== 'string') {
+                    yield chunk;
+                    continue;
+                }
+                const kind = type === 'text-delta' ? 'text' : 'reasoning';
+                const block = bufferOf(index, kind);
+                if (block === undefined) {
+                    yield chunk;
+                    continue;
+                }
+                block.text += record.text;
+                continue;
+            }
+            if (type === 'block-end' && index !== undefined) {
+                const block = blocks.get(index);
+                if (block !== undefined && !block.closed) {
+                    block.closed = true;
+                    if (block.text.trim() !== '') {
+                        const emitted = await translateBlock(block);
+                        for (const item of emitted)
+                            yield item;
+                        if (emitted.length > 0)
+                            continue;
+                    }
+                }
+                yield chunk;
+                continue;
+            }
+            yield chunk;
+        }
+    }
+    catch (error) {
+        // 流异常时先把缓存正文按原文补发，再把原始错误交给 DSH，保证回复不丢失。
+        for (const item of flushBuffered())
+            yield item;
+        throw error;
+    }
+    for (const item of flushBuffered())
+        yield item;
+    /**
+     * Provider 未发送 block-end（中断或异常）时，把缓存正文按原文补发。
+     *
+     * 不能用 `finally` 里的 `yield`：异常正在传播时生成器已经结束，后续 yield 会被
+     * 直接丢弃，用户会看不到已经生成的半截回复。
+     */
+    function* flushBuffered() {
+        for (const block of [...blocks.values()]) {
+            if (block.closed || block.text.trim() === '')
+                continue;
+            block.closed = true;
+            yield { type: `${block.kind}-delta`, index: block.index, text: block.text };
+            yield { type: 'block-end', index: block.index, block: { type: block.kind, text: block.text } };
+        }
+    }
+}
 function extractTurnInput(messages, dshContext) {
     for (let index = messages.length - 1; index >= 0; index -= 1) {
         const message = messages[index];