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

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

@@ -15,23 +15,52 @@ import { QoderCliDriver } from './qoder-driver.js';
 import { AntigravityDriver } from './antigravity-driver.js';
 import { DoubaoAppDriver } from './doubao-driver.js';
 import { CodingNsCliAdapterRegistry } from './registry.js';
+import { CliManagementService } from './management.js';
+import { CliUpdateCheckService } from './update-check.js';
 import { CodingNsCliSessionStore } from './session-store.js';
 import { CodingNsDshMessageProjector } from './dsh-message-projector.js';
 import { CommandCodeSubscriptionService } from './command-code-subscription.js';
 import { ProviderSubscriptionService } from './provider-subscription.js';
+import { attachMagpieSessionNames, MagpieUsageService, magpieAgentForAdapter } from './magpie-usage.js';
+import { readDshProviderSource } from './dsh-config.js';
+import { MagpieManagementService } from './magpie-management.js';
+import { MagpieWebService } from './magpie-web.js';
+import { MagpieUpdateService } from './magpie-update.js';
+import { MagpieInstallDetectionService, normalizeCustomCommand } from './magpie-detection.js';
+import { createMagpieSessionRouting } from './magpie-session-routing.js';
 import { normalizeSubagentBridgeSettings, normalizeSubscriptionUsageSettings } from '../../shared/contracts/config.js';
+import { CodingNsRpcError } from '../rpc-table.js';
 import { setAdapterRegistry } from './registry-holder.js';
 import { createDshVirtualProviderRegistration } from './dsh-virtual-providers.js';
 import { dispatchBridgeSubagent } from '../cli-bridge/dispatch.js';
+import { dispatchBridgeSearch } from '../cli-bridge/search-dispatch.js';
+import { dispatchBridgeFetch } from '../cli-bridge/fetch-dispatch.js';
 import { startSubagentBridgeServer } from '../cli-bridge/bridge-server.js';
-import { setSubagentBridge } from '../cli-bridge/bridge-holder.js';
+import { getSubagentBridge, setSubagentBridge } from '../cli-bridge/bridge-holder.js';
 import { delegateCapability, dispatchDelegateSubagent } from './delegate-dispatch.js';
 import { guardNativeSubagentParentTurn, markNativeSubagentParentTurnStarted, setMaxNativeSubagentsPerParent } from './native-subagent-dispatch.js';
 import { containsDelegationCarrier, delegationAdapterIds, rewriteDelegationMessages } from './delegation-mention-rewrite.js';
 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 { questionTranslationFields } from '../../shared/contracts/interaction-translation.js';
+import { createInteractionTranslation } from '../features/interaction-translation.js';
+import { createSessionTranslationRecovery, SessionTranslationCancelled } from '../features/session-translation-recovery.js';
+import { isSessionTranslationInputEnabled } from '../features/session-translation-service.js';
+import { ASSISTANT_AGENT_PREFIX } from '../../dsh-capabilities/host/assistant-agent-adapter.js';
+import { createDshCapabilityRegistry } from '../../dsh-capabilities/routes.js';
+import { attachmentFileNotice } from '../../shared/attachment-prompts.js';
+import { sessionPromptScope } from '../../dsh-capabilities/host/session-prompt-adapter.js';
+import { createSessionPromptTranslation } from '../features/session-prompt-translation.js';
+import { codexPerformanceProjection } from './codex-performance-projection.js';
+import { grokContextProjection, grokPerformanceProjection } from './grok-performance-projection.js';
+import { fromCliProviderId, toCliProviderId } from '../../shared/cli-provider-route.js';
+import { DshAgentTeamAdapter } from '../../dsh-capabilities/host/agent-team-adapter.js';
+import { CodingNsTeamDispatcher } from '../cli-bridge/team-dispatch.js';
+import { createAgentTeamTool } from '../cli-bridge/team-tool.js';
+import { TeamInputTracker, isTeamInputMessage, pendingPeerInput } from './team-input.js';
+import { withTeamSupport } from '../cli-bridge/team-adapters.js';
 export function createCliAdaptersFeature(options = {}) {
     return {
         descriptor: {
@@ -40,20 +69,86 @@ export function createCliAdaptersFeature(options = {}) {
             enabledByDefault: true,
             dependencies: [],
             runtime: 'host',
+            requires: [
+                { capability: 'agent-team.external-member', required: false, fallback: 'degrade' },
+                { capability: 'agent-team.external-lead', required: false, fallback: 'degrade' },
+                { capability: 'session.external-model-selection', required: false, fallback: 'degrade' },
+                { capability: 'session.external-performance', required: false, fallback: 'degrade' },
+            ],
         },
         async start(context) {
+            const lifetime = new AbortController();
+            const magpieSessionRouting = createMagpieSessionRouting();
+            context.resources.add(() => magpieSessionRouting.dispose());
             // 用量查询超时对所有适配器统一生效：同一个 timeoutMs 下发给全部网络读取器，
             // 设置变更时整体重建，避免旧超时继续生效。
             const buildSubscriptions = (settings) => {
                 const timeoutMs = normalizeSubscriptionUsageSettings(settings?.subscriptionUsage).timeoutSecs * 1000;
                 return new ProviderSubscriptionService({ commandCode: new CommandCodeSubscriptionService({ timeoutMs }), timeoutMs });
             };
-            let subscriptions = buildSubscriptions(context.services.settings?.get());
+            let subscriptions = options.subscriptions ?? buildSubscriptions(context.services.settings?.get());
+            let magpieDetection = options.magpieDetection ?? new MagpieInstallDetectionService(options.magpieDetectionOptions);
+            // 最近一次可用的 Magpie 入口；探测会随用户指定的路径变化而重建，Web 服务总是读最新值。
+            let magpieCommand = null;
+            let magpieVersion = null;
+            const magpieWeb = options.magpieWeb ?? new MagpieWebService({ startupCommand: () => magpieCommand });
+            const magpieUsage = options.magpieUsage ?? new MagpieUsageService({ lifetimeSignal: lifetime.signal, webApi: magpieWeb });
+            const magpieManagement = options.magpieManagement ?? new MagpieManagementService({ webApi: magpieWeb });
+            const magpieUpdates = options.magpieUpdates ?? new MagpieUpdateService({ webApi: magpieWeb, version: () => magpieVersion });
+            let magpieWebDesired = false;
+            let magpieWebSync = Promise.resolve();
+            const scheduleMagpieWebSync = (enabled) => {
+                magpieWebDesired = enabled;
+                if (!enabled) {
+                    magpieUpdates.stopBackgroundChecks();
+                    void magpieWeb.stop().catch(() => undefined);
+                }
+                const next = magpieWebSync.then(async () => {
+                    if (magpieWebDesired !== enabled)
+                        return;
+                    if (!enabled) {
+                        await magpieWeb.stop();
+                        return;
+                    }
+                    try {
+                        await magpieWeb.start();
+                        magpieUpdates.startBackgroundChecks();
+                    }
+                    catch (error) {
+                        console.warn('codingns4dsh: Magpie Web startup failed; the next Web API request will retry', error);
+                    }
+                });
+                magpieWebSync = next.catch(() => undefined);
+            };
+            // 设置里可能保留了“已启用”，但本机没有可用 Magpie（换机、卸载或安装损坏）。
+            // 这种情况下不拉起 Magpie Web，等用户安装后重新检测再启用。
+            let magpieInstalled = await magpieDetection.detect().then((detection) => {
+                const usable = MagpieInstallDetectionService.isUsable(detection);
+                magpieCommand = usable ? detection.command : null;
+                magpieVersion = usable ? detection.version : null;
+                return usable;
+            }, () => false);
+            scheduleMagpieWebSync(context.services.settings?.get().modules.magpieManagement === true && magpieInstalled);
+            context.resources.add(async () => {
+                magpieWebDesired = false;
+                await magpieWeb.stop();
+                await magpieWebSync;
+                await magpieWeb.dispose();
+            });
             let subscriptionSettings = JSON.stringify(context.services.settings?.get().subscriptionUsage ?? null);
             // 注入的 registry 自带 SessionStore；只有自建时才有本地 store 变量。
             const sessionStore = options.registry?.sessionRecords
                 ?? new CodingNsCliSessionStore(context.services.settings === undefined ? {} : { settings: context.services.settings });
             const nativeSessions = context.services.nativeSessions;
+            if (context.services.dshContext !== undefined && context.services.dshVersion !== undefined) {
+                const performance = createDshCapabilityRegistry(context.services.dshVersion, 'host', context.services.dshContext)
+                    .getProfile(context.services.dshContext).capabilities.get('session.external-performance')?.value;
+                if (performance !== undefined) {
+                    for (const projection of [codexPerformanceProjection, grokPerformanceProjection, grokContextProjection]) {
+                        context.resources.add(performance.install(projection));
+                    }
+                }
+            }
             const translation = context.services.sessionTranslation;
             // 启动只恢复持久化索引；旧会话在打开时迁移，禁止在首屏扫描全部历史。
             const registry = options.registry ?? new CodingNsCliAdapterRegistry([
@@ -81,6 +176,45 @@ export function createCliAdaptersFeature(options = {}) {
                 ...(context.services.nativeSessions === undefined ? {} : { nativeSessions: context.services.nativeSessions }),
             });
             setAdapterRegistry(registry);
+            const teamInputs = new TeamInputTracker();
+            context.resources.add(() => teamInputs.clear());
+            let teamAdapter;
+            const teamDispatcher = new CodingNsTeamDispatcher({
+                adapter: () => teamAdapter,
+                registry,
+                enabled: () => !lifetime.signal.aborted && normalizeSubagentBridgeSettings(context.services.settings?.get().subagentBridge).enabled,
+            });
+            const versionSupported = context.services.dshVersion !== undefined && !createDshCapabilityRegistry(context.services.dshVersion, 'host', {}).getProfile({}).diagnostics.some(item => item.capability === 'agent-team.external-member' && item.code === 'CAPABILITY_VERSION_UNSUPPORTED');
+            const teamCatalog = (catalog) => withTeamSupport(catalog, !versionSupported ? 'version' : !normalizeSubagentBridgeSettings(context.services.settings?.get().subagentBridge).enabled ? 'disabled' : !teamAdapter ? 'profile' : undefined, teamAdapter?.supportsLead);
+            const dshContext = context.services.dshContext;
+            if (dshContext?.inject && context.services.dshVersion) {
+                const teamScope = dshContext.inject(['agentTeams', 'agents', 'subagents', 'tools'], scoped => {
+                    const capability = createDshCapabilityRegistry(context.services.dshVersion, 'host', scoped).getProfile(scoped).capabilities.get('agent-team.external-member');
+                    if (capability?.status !== 'ready')
+                        return;
+                    const adapter = capability.value;
+                    teamAdapter = adapter;
+                    const tools = scoped.get('tools');
+                    const unregister = tools.register(createAgentTeamTool(teamDispatcher));
+                    scoped.effect(() => () => {
+                        adapter.dispose();
+                        if (teamAdapter === adapter)
+                            teamAdapter = undefined;
+                        if (typeof unregister === 'function')
+                            unregister();
+                    }, 'CodingNS native Team bridge');
+                });
+                context.resources.add(() => teamScope.dispose());
+            }
+            if (dshContext?.on) {
+                const stopCreated = dshContext.on('agent/created', ((payload) => {
+                    const agent = asRecord(payload)?.agent;
+                    if (agent && typeof agent.id === 'string')
+                        teamDispatcher.initializeNativeChild(agent);
+                }), { global: true });
+                if (typeof stopCreated === 'function')
+                    context.resources.add(stopCreated);
+            }
             context.resources.add(() => {
                 if (registry === undefined)
                     return;
@@ -88,10 +222,30 @@ export function createCliAdaptersFeature(options = {}) {
             });
             registry.applyEnabledSettings(context.services.settings?.get().agentAdapters);
             const virtualProviders = createDshVirtualProviderRegistration(context.services.dshContext);
-            virtualProviders?.setProviders(registry.enabledAdapterIds());
             if (virtualProviders !== undefined)
                 context.resources.add(() => virtualProviders.dispose());
+            virtualProviders?.setProviders(registry.enabledAdapterIds());
+            if (context.services.dshContext !== undefined && context.services.dshVersion !== undefined) {
+                const selection = createDshCapabilityRegistry(context.services.dshVersion, 'host', context.services.dshContext)
+                    .getProfile(context.services.dshContext).capabilities.get('session.external-model-selection')
+                    ?.value;
+                if (selection !== undefined)
+                    context.resources.add(selection.install((sessionId) => {
+                        const config = registry.getSession(sessionId);
+                        if (config.adapterId === 'dsh' && config.teamId && config.providerId && config.modelId)
+                            return {
+                                provider: config.providerId, model: config.modelId, ...(config.effortId ? { reasoningEffort: config.effortId } : {}),
+                            };
+                        if (config.adapterId === 'dsh' || !registry.isEnabled(config.adapterId))
+                            return undefined;
+                        return { provider: toCliProviderId(config.adapterId), model: config.modelId?.trim() || 'provider-default' };
+                    }));
+            }
             registry.warmCatalog();
+            const management = new CliManagementService(registry);
+            context.resources.add(() => management.dispose());
+            const updates = new CliUpdateCheckService(options.updateCheck);
+            context.resources.add(() => updates.dispose());
             // 外部适配器没有经过 DSH 原生 Agent Loop，必须把同一套运行状态投影给
             // subagentCatalog。这里集中去重，避免 llm/stream、原生 session/event 和
             // agent/status 同时到达时反复刷新同一个子 Agent。
@@ -130,19 +284,57 @@ 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) => {
+            const translationRecovery = createSessionTranslationRecovery(translation, sessionId => registry.getSession(sessionId));
+            context.resources.add(() => translationRecovery.dispose());
+            const promptTranslation = createSessionPromptTranslation(translation, sessionId => {
+                if (!sessionId || isAssistantSession(sessionId) || readNativeSessionHeader(nativeSessions, sessionId)?.origin === 'subagent')
+                    return undefined;
+                const config = registry.getSession(sessionId);
+                return (config.translationEnabled ?? (config.adapterId === 'dsh' && translation?.nativeEnabled === true)) ? config.adapterId : undefined;
+            });
+            context.resources.add(() => promptTranslation.dispose());
+            if (context.services.dshContext !== undefined && context.services.dshVersion !== undefined) {
+                const adapter = createDshCapabilityRegistry(context.services.dshVersion, 'host', context.services.dshContext)
+                    .getProfile(context.services.dshContext).capabilities.get('session.prompt-assembly')?.value;
+                if (adapter !== undefined)
+                    context.resources.add(adapter.install((assembly, scope) => promptTranslation.translateAssembly(assembly, scope)));
+            }
+            registerDelegationAgentHooks(context.services.dshContext, registry, context.resources, publishExternalStatus, translation, translationRecovery, promptTranslation, nativeSessions, teamInputs);
+            const interactionTranslation = createInteractionTranslation(translation, sessionId => registry.getSession(sessionId));
+            context.resources.add(() => interactionTranslation.dispose());
+            context.resources.add(context.services.rpc.register('cli', async (action, payload, rpcContext) => {
+                const rpcSignal = asRecord(rpcContext)?.signal;
+                const signal = isAbortSignal(rpcSignal) ? rpcSignal : undefined;
                 switch (action) {
-                    case 'catalog': return registry.catalog();
+                    case 'management/plan':
+                    case 'management/start':
+                    case 'management/status':
+                    case 'management/cancel': return management.rpc(action, payload);
+                    case 'catalog': return registry.catalog().then(catalog => updates.catalog(teamCatalog(catalog)));
                     case 'catalog/refresh': return registry.refreshCatalog(asRecord(payload)?.adapterId === undefined ? undefined : readAdapterId(payload)).then((catalog) => {
                         subscriptions = buildSubscriptions(context.services.settings?.get());
-                        return catalog;
+                        return asRecord(payload)?.checkUpdates === true
+                            ? updates.refresh(teamCatalog(catalog), asRecord(payload)?.adapterId)
+                            : updates.catalog(teamCatalog(catalog));
                     });
                     case 'models': {
                         const adapterId = readAdapterId(payload);
-                        return adapterId === 'dsh' ? readDshModelCatalog(context.services.dshContext) : registry.models(adapterId);
+                        const catalog = adapterId === 'dsh'
+                            ? readDshModelCatalog(context.services.dshContext)
+                            : registry.models(adapterId);
+                        if (asRecord(payload)?.stage === 'base') {
+                            const base = await catalog;
+                            return magpieAgentForAdapter(adapterId) === null ? base : { ...base, magpiePending: true };
+                        }
+                        return typeof magpieUsage.enrichModelCatalog === 'function'
+                            ? magpieUsage.enrichModelCatalog(adapterId, catalog, signal ?? lifetime.signal)
+                            : catalog;
                     }
                     case 'translation/models': return context.services.sessionTranslation?.catalog() ?? { models: [], default: null, errors: ['翻译模型目录不可用'] };
+                    case 'translation/pending': return translationRecovery.pending(payload);
+                    case 'translation/resolve': return translationRecovery.resolve(payload);
+                    case 'translation/retry-output': return translationRecovery.retryOutput(payload, signal);
+                    case 'translation/fields': return interactionTranslation.translate(payload, signal);
                     case 'skills': {
                         const request = readSkillsRequest(payload);
                         const cwd = resolveSessionCwd(context.services.nativeSessions, request.sessionId, null);
@@ -160,15 +352,27 @@ export function createCliAdaptersFeature(options = {}) {
                         }
                         return registry.getSession(sessionId);
                     }
-                    case 'session/set': return registry.setSession(readSessionId(payload), readSessionConfig(payload));
+                    case 'session/set': {
+                        const sessionId = readSessionId(payload);
+                        const previous = registry.getSession(sessionId);
+                        const config = readSessionConfig(payload);
+                        const saved = registry.setSession(sessionId, config);
+                        if (config.translationEnabled === false || previous.adapterId !== config.adapterId)
+                            translationRecovery.cancelSession(sessionId);
+                        return saved;
+                    }
                     case 'session/list': return registry.listSessions(readSessionListOptions(payload));
                     case 'session/adapter-map':
                         // 列表查询只返回持久化索引，不能触发会话加载或历史解析。
                         return sessionStore.adapterBindings();
                     case 'session/archive': return registry.archiveSession(readSessionId(payload));
-                    case 'session/steer': return translateSteerPrompt(translation, registry, readSessionId(payload), readPrompt(payload), false);
-                    case 'session/follow-up': return translateSteerPrompt(translation, registry, readSessionId(payload), readPrompt(payload), true);
-                    case 'session/interrupt': return registry.interrupt(readSessionId(payload));
+                    case 'session/steer': return translateSteerPrompt(translationRecovery, registry, readSessionId(payload), readPrompt(payload), false, signal);
+                    case 'session/follow-up': return translateSteerPrompt(translationRecovery, registry, readSessionId(payload), readPrompt(payload), true, signal);
+                    case 'session/interrupt': {
+                        const sessionId = readSessionId(payload);
+                        translationRecovery.cancelSession(sessionId);
+                        return registry.interrupt(sessionId);
+                    }
                     case 'team/status': return context.services.nativeTeam?.diagnostic() ?? registry.teamDiagnostic();
                     case 'team/members': return requireTeam(context).invoke('members', payload);
                     case 'team/tasks': return requireTeam(context).invoke('tasks', payload);
@@ -181,7 +385,23 @@ export function createCliAdaptersFeature(options = {}) {
                     case 'team/interrupt': return requireTeam(context).invoke('interrupt', payload);
                     case 'subscription': {
                         const subscription = readSubscriptionRequest(payload);
-                        return subscriptions.read(subscription.adapterId, subscription.providerId, subscription.modelId);
+                        const requestSignal = signal ?? lifetime.signal;
+                        const session = subscription.sessionId === undefined ? undefined : registry.getSession(subscription.sessionId);
+                        if (context.services.settings?.get().modules.magpieManagement === true
+                            && session !== undefined && session.adapterId === subscription.adapterId) {
+                            const magpie = await magpieUsage.read(session, requestSignal, subscription.includeRoute, subscription.sessionId);
+                            requestSignal.throwIfAborted();
+                            const snapshot = magpie ?? (subscription.sessionId === undefined
+                                ? null
+                                : await pendingMagpieUsage(magpieUsage, nativeSessions, subscription.sessionId, session, requestSignal));
+                            if (snapshot !== null) {
+                                const sessionName = subscription.sessionId === undefined ? undefined : readDshSessionDisplayName(subscription.sessionId, sessionStore, nativeSessions);
+                                return { providerUsage: null, magpie: sessionName === undefined ? snapshot : { ...snapshot, sessionName } };
+                            }
+                        }
+                        requestSignal.throwIfAborted();
+                        const providerUsage = await subscriptions.read(subscription.adapterId, subscription.providerId, subscription.modelId);
+                        return { providerUsage, magpie: null };
                     }
                     case 'subscription/reset': {
                         const subscription = readSubscriptionResetRequest(payload);
@@ -204,6 +424,59 @@ export function createCliAdaptersFeature(options = {}) {
                     default: throw new Error(`未知 CLI RPC: cli/${action}`);
                 }
             }));
+            context.resources.add(context.services.rpc.register('magpie', async (action, payload, rpcContext) => {
+                const rpcSignal = asRecord(rpcContext)?.signal;
+                const signal = isAbortSignal(rpcSignal) ? rpcSignal : lifetime.signal;
+                // 安装探测本身就是启用前的判断依据，因此不要求模块已启用。
+                if (action === 'management/detection') {
+                    const request = readMagpieDetectionRequest(payload);
+                    const force = readMagpieDetectionForce(payload);
+                    // A custom path is request-scoped; it must not poison later automatic detection.
+                    const customCommand = normalizeCustomCommand(request.commandPath);
+                    const detectionService = customCommand === null
+                        ? magpieDetection
+                        : new MagpieInstallDetectionService({ ...options.magpieDetectionOptions, customCommand });
+                    const detection = await detectionService.detect(customCommand === null ? {} : { commandPath: customCommand }, { force: force || customCommand !== null });
+                    magpieCommand = MagpieInstallDetectionService.isUsable(detection) ? detection.command : null;
+                    magpieVersion = MagpieInstallDetectionService.isUsable(detection) ? detection.version : null;
+                    return detection;
+                }
+                if (context.services.settings?.get().modules.magpieManagement !== true) {
+                    throw new CodingNsRpcError('CODINGNS_MAGPIE_DISABLED', 'Magpie management is disabled');
+                }
+                switch (action) {
+                    case 'usage/dashboard': {
+                        const dashboard = await magpieUsage.readDashboard(readMagpieDashboardPeriod(payload), signal);
+                        return attachMagpieSessionNames(dashboard, await magpieSessionNameBindings(sessionStore, nativeSessions, signal));
+                    }
+                    case 'usage/dashboard/stream': {
+                        const input = asRecord(payload);
+                        const period = readMagpieDashboardPeriod(payload);
+                        const force = input?.force === true;
+                        return streamMagpieDashboard(magpieUsage, period, signal, force, sessionStore, nativeSessions);
+                    }
+                    case 'usage/requests':
+                        return magpieUsage.readRequestPage(readMagpieRequestOptions(payload), signal);
+                    case 'management/snapshot':
+                        return magpieManagement.readSnapshot(signal);
+                    case 'management/provider/update':
+                        return magpieManagement.updateProvider(payload, signal);
+                    case 'management/group/update':
+                        return magpieManagement.updateGroup(payload, signal);
+                    case 'management/account/update':
+                        return magpieManagement.updateAccount(payload, signal);
+                    case 'update/status':
+                        return magpieUpdates.readStatus(signal);
+                    case 'update/notes':
+                        return magpieUpdates.readNotes(signal);
+                    case 'update/check':
+                        return magpieUpdates.checkForUpdate(signal);
+                    case 'update/install':
+                        return magpieUpdates.installUpdate(payload, signal);
+                    default:
+                        throw new CodingNsRpcError('CODINGNS_RPC_NOT_FOUND', `Unknown Magpie RPC: ${action}`);
+                }
+            }));
             // 外部 CLI 子代理托管：开启时启动本机回环桥接，把外部 CLI 的子代理调用
             // 转投成 DSH 原生可续子会话；关闭或模块停用时收回端口并清空驱动句柄。
             let bridgeServer;
@@ -221,10 +494,18 @@ export function createCliAdaptersFeature(options = {}) {
                 try {
                     const agents = readOptionalContextService(context.services.dshContext, 'agents');
                     const server = await startSubagentBridgeServer({
+                        teamAccess: (sessionId) => teamDispatcher.access(sessionId),
+                        teamDispatch: (sessionId, input, signal) => teamDispatcher.dispatch(sessionId, input, signal),
                         dispatch: (request) => dispatchBridgeSubagent(request, {
                             agents: agents,
                             nativeSessions: context.services.nativeSessions,
                         }),
+                        search: (input, signal) => dispatchBridgeSearch(input, {
+                            web: readOptionalContextService(context.services.dshContext, 'web'),
+                        }, signal),
+                        fetch: (input, signal) => dispatchBridgeFetch(input, {
+                            web: readOptionalContextService(context.services.dshContext, 'web'),
+                        }, signal),
                     });
                     bridgeServer = server;
                     setSubagentBridge(server.runtime);
@@ -259,12 +540,24 @@ export function createCliAdaptersFeature(options = {}) {
                     virtualProviders?.setProviders(registry.enabledAdapterIds());
                     registry.syncPreferences(next.agentAdapterPreferences);
                     sessionStore.sync(next.cliSessions);
+                    translationRecovery.cancelDisabled(next.sessionTranslation);
                     const nextSubscriptionSettings = JSON.stringify(next.subscriptionUsage ?? null);
                     if (nextSubscriptionSettings !== subscriptionSettings) {
                         subscriptionSettings = nextSubscriptionSettings;
                         subscriptions = buildSubscriptions(next);
                     }
                     syncSubagentBridgeSettings(next.subagentBridge);
+                    const magpieWanted = next.modules.magpieManagement === true;
+                    // 只在“需要启动”时重新探测；停用时立即回收，退出探测的旧结果不覆盖新状态。
+                    void (magpieWanted && !magpieInstalled
+                        ? magpieDetection.detect({}, { force: true }).then(detection => MagpieInstallDetectionService.isUsable(detection), () => false)
+                        : Promise.resolve(magpieInstalled)).then((installed) => {
+                        magpieInstalled = installed;
+                        if (next.modules.magpieManagement !== true)
+                            scheduleMagpieWebSync(false);
+                        else if (installed)
+                            scheduleMagpieWebSync(true);
+                    });
                 }));
             }
             const events = context.services.events;
@@ -317,7 +610,7 @@ export function createCliAdaptersFeature(options = {}) {
                     }
                     else if (sessionId !== '')
                         clearDelegationAuthorization(sessionId);
-                    const selectedExternalAdapter = selectExternalAdapter(dshSelection.providerId, inferMessageAdapter(messages), registry);
+                    const selectedExternalAdapter = storedConfig.adapterId === 'dsh' && storedConfig.teamId ? undefined : selectExternalAdapter(fromCliProviderId(dshSelection.providerId), inferMessageAdapter(messages), registry);
                     // DSH 的 modelSelection 只描述 DSH 自己那条模型路由（例如 glor/deepseek）。
                     // 只有它明确指向即将接管的外部适配器时，model/effort 才属于该适配器；
                     // 当适配器是从会话历史推断出来的（fork 子会话继承父会话的外部消息，而
@@ -325,7 +618,7 @@ export function createCliAdaptersFeature(options = {}) {
                     // 写进外部 Agent——Codex 会用它 thread/start 并直接 404，整个会话从此
                     // 无法继续。此时必须留空，由适配器自己的偏好决定模型。
                     const selectionOwnedByAdapter = selectedExternalAdapter !== undefined
-                        && dshSelection.providerId === selectedExternalAdapter;
+                        && (fromCliProviderId(dshSelection.providerId) ?? dshSelection.providerId) === selectedExternalAdapter;
                     let config = storedConfig.adapterId === 'dsh' && selectedExternalAdapter !== undefined
                         ? {
                             adapterId: selectedExternalAdapter,
@@ -339,35 +632,65 @@ export function createCliAdaptersFeature(options = {}) {
                     if (sessionId !== '' && storedConfig.adapterId === 'dsh' && selectedExternalAdapter !== undefined) {
                         config = registry.setSession(sessionId, config);
                     }
+                    if (config.teamId && !teamDispatcher.identity(sessionId)) {
+                        throw Object.assign(new Error('The native Team identity is unavailable. Restore its Team profile and adapter before continuing.'), { code: 'TEAM_SERVICE_UNAVAILABLE' });
+                    }
                     if (config.adapterId === 'dsh') {
                         const selection = dshSelection;
                         if (sessionId !== '' && (selection.modelId !== undefined || selection.effortId !== undefined)) {
                             registry.setSession(sessionId, { adapterId: 'dsh', ...selection });
                         }
-                        yield* guardDshNativeStream(next);
+                        // 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(magpieSessionRouting.wrap(sessionId, next()), translation, translation.bilingual === true, isAbortSignal(value?.signal) ? value.signal : undefined));
+                            return;
+                        }
+                        yield* guardDshNativeStream(() => magpieSessionRouting.wrap(sessionId, next()));
                         return;
                     }
                     const cwd = resolveSessionCwd(context.services.nativeSessions, sessionId, value);
-                    const turnInput = extractTurnInput(messages, context.services.dshContext);
+                    const turnInput = extractTurnInput(messages, context.services.dshContext, teamInputs.take(sessionId, messages));
                     const turnOptions = readCliTurnOptions(value);
                     const runtimeEnv = readCliRuntimeEnv(value);
-                    const requestSignal = isAbortSignal(value?.signal) ? value.signal : undefined;
+                    const requestSignal = isAbortSignal(value?.signal)
+                        ? AbortSignal.any([value.signal, lifetime.signal])
+                        : lifetime.signal;
+                    const translationLanguage = translation?.enabled && isSessionTranslationInputEnabled(translation, config.adapterId) && config.translationEnabled === true ? readInputTargetLanguage(translation) : undefined;
                     let translatedPrompt = turnInput.translationPrompt;
-                    if (turnInput.translatePrompt && translation !== undefined) {
+                    if (turnInput.translatePrompt && turnInput.translationPrompt.trim() !== '' && translationLanguage !== undefined) {
                         try {
-                            translatedPrompt = await translation.translateInput(config.adapterId, turnInput.translationPrompt, requestSignal, config.translationEnabled === true);
+                            translatedPrompt = (await translationRecovery.translateInput(sessionId, config.adapterId, turnInput.translationPrompt, requestSignal)).translated;
                         }
-                        catch {
-                            // 翻译服务异常不能阻断外部 Agent 主任务；本轮直接发送原文。
-                            translatedPrompt = turnInput.translationPrompt;
+                        catch (error) {
+                            if (!(error instanceof SessionTranslationCancelled) && !requestSignal?.aborted)
+                                throw error;
+                            yield { type: 'finish', reason: { kind: 'stop' } };
+                            return;
                         }
                     }
                     const prompt = turnInput.translatePrompt
-                        ? [translatedPrompt, turnInput.untranslatedPrompt].filter((part) => part.trim() !== '').join('\n\n')
+                        ? [translatedPrompt, translationLanguage === undefined ? turnInput.untranslatedPrompt : attachmentNotices(turnInput.attachments, translationLanguage)].filter((part) => part.trim() !== '').join('\n\n')
                         : turnInput.prompt;
                     // 权限状态必须与 DSH 会话当前生效值同源。驱动不能自行假设“完全权限”，
                     // 也不能把缺省当成“已确认无限制”：解析失败时留空，由驱动沿用保守默认。
                     const permission = resolveSessionPermission(context.services.dshContext, sessionId);
+                    let magpieCodexContextWindow;
+                    if (config.adapterId === 'codex' && config.modelId !== undefined && typeof magpieUsage.readModelMetadata === 'function') {
+                        try {
+                            magpieCodexContextWindow = (await magpieUsage.readModelMetadata('codex', config.modelId, requestSignal))?.contextWindow;
+                        }
+                        catch (error) {
+                            if (!requestSignal.aborted)
+                                throw error;
+                        }
+                    }
                     // 只有 Provider 驱动明确声明可以维护连续事件流，才把工具边界映射为 DSH step。
                     // Command Code、Codex 自己维护 assistant 消息边界；OpenCode 由 Registry
                     // 挂起并续读同一条 SSE。其他驱动仍把整轮保持在一个 step，避免 token-meter
@@ -376,6 +699,8 @@ export function createCliAdaptersFeature(options = {}) {
                         sessionId,
                         messages: turnInput.messages,
                         prompt,
+                        ...(turnInput.peerInput ? { peerInput: true } : {}),
+                        ...(translationLanguage === undefined ? {} : { translationLanguage }),
                         ...(turnInput.attachments.length === 0 ? {} : { attachments: turnInput.attachments }),
                         ...(permission === undefined ? {} : { permission }),
                         ...(turnOptions.plan === true ? { plan: true } : {}),
@@ -383,6 +708,7 @@ export function createCliAdaptersFeature(options = {}) {
                         ...(turnOptions.enableAskUserQuestion === true ? { enableAskUserQuestion: true } : {}),
                         ...(runtimeEnv === undefined ? {} : { runtimeEnv }),
                         ...(config.modelId ? { modelId: config.modelId } : {}),
+                        ...(magpieCodexContextWindow === undefined ? {} : { modelContextWindow: magpieCodexContextWindow }),
                         ...(config.effortId ? { effortId: config.effortId } : {}),
                         ...(config.serviceTierId ? { serviceTierId: config.serviceTierId } : {}),
                         ...(config.translationEnabled === undefined ? {} : { translationEnabled: config.translationEnabled }),
@@ -411,6 +737,12 @@ export function createCliAdaptersFeature(options = {}) {
                         respondQuestion: (response) => registry.respondQuestion(sessionId, response),
                         ...(translation === undefined ? {} : { translation }),
                         ...(translation === undefined ? {} : { translationEnabled: config.translationEnabled === true }),
+                        prefetchQuestionTranslation: questions => {
+                            const fields = questionTranslationFields(questions);
+                            if (fields.length === 0)
+                                return;
+                            interactionTranslation.prefetch({ sessionId, direction: 'output', fields });
+                        },
                     });
                     const discardSuspendedTurn = () => registry.discardSegmentedTurn(sessionId);
                     input.signal?.addEventListener('abort', discardSuspendedTurn, { once: true });
@@ -472,6 +804,11 @@ export function createCliAdaptersFeature(options = {}) {
                 // DSH 先停用设置上下文再执行异步资源清理时，旧的写队列不能继续调用
                 // configEditor，否则会出现 inactive context 并污染退出日志。
                 sessionStore.dispose();
+                // Close native interaction cards before unloading their provider transports.
+                lifetime.abort();
+                updates.dispose();
+                magpieUpdates.dispose();
+                await management.dispose();
                 await registry.dispose();
                 await sessionStore.flush();
                 setAdapterRegistry(undefined);
@@ -526,12 +863,13 @@ 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, translationRecovery, promptTranslation, nativeSessions, teamInputs) {
     if (dshContext === undefined || typeof dshContext.on !== 'function')
         return;
     const disposers = [];
     const register = (name, listener) => {
-        const disposer = dshContext.on(name, listener, { global: true });
+        // Wrap existing pre-step producers so their after-next catalogs are visible.
+        const disposer = dshContext.on(name, listener, { global: true, prepend: name === 'agent/pre-step' });
         if (typeof disposer === 'function')
             disposers.push(disposer);
     };
@@ -553,10 +891,15 @@ function registerDelegationAgentHooks(dshContext, registry, resources, publishEx
         catch {
             return config;
         }
+        if (session.adapterId === 'dsh' && session.teamId && session.providerId && session.modelId) {
+            const { reasoningEffort: _effort, ...nativeConfig } = config;
+            return { ...nativeConfig, provider: session.providerId, model: session.modelId, ...(session.effortId ? { reasoningEffort: session.effortId } : {}) };
+        }
+        const providerAdapter = fromCliProviderId(config.provider);
         const configuredAdapter = session.adapterId !== 'dsh' && registry.isEnabled(session.adapterId)
             ? session.adapterId
-            : typeof config.provider === 'string' && registry.isEnabled(config.provider)
-                ? config.provider
+            : providerAdapter !== undefined && registry.isEnabled(providerAdapter)
+                ? providerAdapter
                 : undefined;
         if (configuredAdapter === undefined)
             return config;
@@ -567,7 +910,12 @@ function registerDelegationAgentHooks(dshContext, registry, resources, publishEx
             });
         }
         const model = session.modelId?.trim() || (typeof config.model === 'string' && config.model.trim() !== '' ? config.model.trim() : configuredAdapter);
-        return { ...config, provider: configuredAdapter, model };
+        // reasoningEffort 属于被改写掉的那条 DSH 原生路由（例如全局默认模型 glor/deepseek-v4.1-flash
+        // 的 max）。外部 CLI 的虚拟 Provider 不声明任何思考强度，DSH 会在准入阶段以
+        // UNSUPPORTED_REASONING_EFFORT 拒绝整轮；外部 Agent 的思考强度由适配器自己的
+        // effortId 偏好驱动，因此这里必须丢弃继承值，只改写 provider/model。
+        const { reasoningEffort: _inheritedReasoningEffort, ...routeConfig } = config;
+        return { ...routeConfig, provider: toCliProviderId(configuredAdapter), model };
     });
     register('agent/pre-step', async (payload, next) => {
         const record = asRecord(payload);
@@ -583,20 +931,49 @@ 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);
-        if (translatedInput !== undefined)
-            messages = [...translatedInput];
+        let translatedInput;
+        try {
+            translatedInput = await translatePreStepInput(translation, translationRecovery, registry, sessionId, messages, dshContext, isAbortSignal(record?.signal) ? record.signal : undefined, nativePreStepContext(translation, registry, sessionId, nativeSessions));
+        }
+        catch (error) {
+            if (error instanceof SessionTranslationCancelled || record?.signal?.aborted === true)
+                return { kind: 'reject' };
+            throw error;
+        }
         const decision = await next();
         if (!isEnterPreStepDecision(decision))
             return decision;
-        if (delegation?.kind !== 'rewritten' && translatedInput === undefined)
-            return decision;
-        // `next()` 可能已经追加系统上下文或模型切换通知，只替换它前面的本轮用户消息。
-        const suffix = decision.messages.slice(messages.length);
-        return {
-            ...decision,
-            messages: [...messages, ...suffix],
-        };
+        // Match producer-owned messages by identity. Downstream middleware may insert
+        // instructions before the human message, so a positional prefix loses data.
+        const incoming = Array.isArray(record?.messages) ? record.messages.filter(isMessage) : [];
+        const replaced = new Set();
+        const replacements = translatedInput ?? messages;
+        const accepted = delegation?.kind === 'rewritten' || translatedInput !== undefined
+            ? decision.messages.flatMap(message => {
+                const index = incoming.findIndex((original, position) => !replaced.has(position) && (original === message || typeof original.id === 'string' && original.id === message.id
+                    // Legacy callers can return detached messages without durable IDs.
+                    || original.id === undefined && message.id === undefined && original.role === message.role
+                        && original.source?.kind === message.source?.kind && original.source?.form === message.source?.form
+                        && JSON.stringify(original.content) === JSON.stringify(message.content)));
+                if (index >= 0)
+                    replaced.add(index);
+                if (index < 0)
+                    return [message];
+                const replacement = replacements[index];
+                return replacement === undefined ? [] : [replacement];
+            }) : decision.messages;
+        try {
+            const scope = sessionPromptScope(record?.agent, isAbortSignal(record?.signal) ? record.signal : undefined);
+            const translated = await promptTranslation.translateMessages(accepted, scope);
+            if (registry.getSession(sessionId).adapterId !== 'dsh')
+                teamInputs?.accept(sessionId, translated);
+            return { ...decision, messages: translated };
+        }
+        catch (error) {
+            if (error instanceof SessionTranslationCancelled || record?.signal?.aborted === true)
+                return { kind: 'reject' };
+            throw error;
+        }
     });
     // 正常结束、异常结束和中断最终都会进入 idle；在此清理本轮授权，避免下一轮
     // 没有 carrier 时继承上一轮的目标白名单。
@@ -606,12 +983,16 @@ function registerDelegationAgentHooks(dshContext, registry, resources, publishEx
         if (record?.status === 'running')
             publishExternalStatus(sessionId, true);
         else if (record?.status === 'idle') {
+            translationRecovery.cancelSession(sessionId);
             publishExternalStatus(sessionId, false);
             clearDelegationAuthorization(sessionId);
         }
     });
     register('agent/disposed', (payload) => {
         const sessionId = readAgentSessionId(asRecord(payload)?.agent);
+        teamInputs?.release(sessionId);
+        getSubagentBridge()?.revokeTeamSession?.(sessionId);
+        translationRecovery.cancelSession(sessionId);
         // disposed 只代表运行时释放；subagentCatalog 没有删除语义，保留目录项并
         // 把它标成 idle，后续若 DSH 重新激活会再次收到 running。
         publishExternalStatus(sessionId, false);
@@ -711,12 +1092,25 @@ function normalizeDshModelGroup(value) {
 /**
  * DSH 原生 Provider 可能只返回一个 finish(stop)。不能把这个空回合当作成功，
  * 否则 Session 会落下一条空 assistant/message，用户只能看到“一秒结束”。
+ *
+ * error finish 携带 Provider 的真实失败原因（状态码、上游错误消息、错误码），
+ * 必须原样透传：替换成统一文案会把 400/429/凭证失效等不同故障折叠成同一句
+ * “未返回任何有效事件”，既无法排查也不可分类告警。统一兜底文案只用于一种
+ * 情形——流以 stop（或无 finish）干净结束且没有任何有效事件，此时没有任何
+ * 原始错误可透传。
  */
 async function* guardDshNativeStream(next) {
     let meaningful = false;
     const terminal = [];
     for await (const chunk of next()) {
         if (isDshFinishChunk(chunk)) {
+            // error finish 本身就是“有效事件”：立即透传，并标记 meaningful，
+            // 让此前缓冲的非 error finish（正常情况下不会出现）也在收尾时放出。
+            if (isDshErrorFinishChunk(chunk)) {
+                meaningful = true;
+                yield chunk;
+                continue;
+            }
             terminal.push(chunk);
             continue;
         }
@@ -745,15 +1139,20 @@ function isDshFinishChunk(value) {
     const record = asRecord(value);
     return record?.type === 'finish';
 }
+/** error finish（reason.kind === 'error'）携带 Provider 的原始失败，是必须透传的有效事件。 */
+function isDshErrorFinishChunk(value) {
+    const record = asRecord(value);
+    return record?.type === 'finish' && asRecord(record.reason)?.kind === 'error';
+}
 function isMeaningfulDshChunk(value) {
     const record = asRecord(value);
     if (record === null)
         return false;
-    if (record.type === 'text-delta' || record.type === 'reasoning-delta' || record.type === 'usage' || record.type === 'tool-call' || record.type === 'tool-result')
+    if (record.type === 'text-delta' || record.type === 'reasoning-delta' || record.type === 'usage' || record.type === 'tool-call-delta' || record.type === 'tool-call' || record.type === 'tool-result')
         return true;
     if (record.type === 'block-end') {
         const block = asRecord(record.block);
-        return typeof block?.text === 'string' && block.text !== '';
+        return block?.type === 'tool-call' || block?.type === 'tool-result' || typeof block?.text === 'string' && block.text !== '';
     }
     return false;
 }
@@ -766,10 +1165,12 @@ function readAdapterId(value) {
 function readSubscriptionRequest(value) {
     const record = asRecord(value);
     if (record === null || record.adapterId === undefined)
-        return { adapterId: 'command-code' };
+        return { adapterId: 'command-code', includeRoute: false };
     const adapterId = readAdapterId(value);
     return {
         adapterId,
+        ...(typeof record.sessionId === 'string' && record.sessionId.trim() !== '' ? { sessionId: record.sessionId.trim() } : {}),
+        includeRoute: record.includeRoute === true,
         ...(typeof record.providerId === 'string' && record.providerId.trim() !== '' ? { providerId: record.providerId.trim() } : {}),
         // Antigravity 用会话模型区分 Gemini 与 Claude/GPT 两个独立配额组。
         ...(typeof record.modelId === 'string' && record.modelId.trim() !== '' ? { modelId: record.modelId.trim() } : {}),
@@ -899,7 +1300,7 @@ function readCliRuntimeEnv(value) {
     const entries = Object.entries(candidate).filter(([, item]) => typeof item === 'string');
     return entries.length === 0 ? undefined : Object.fromEntries(entries);
 }
-/** DSH Session 快照把最近选择放在 modelSelection.lastUsed/next。 */
+/** Prefer the pending/next DSH route because lastUsed may still be stale. */
 function readModelSelectionCandidates(value) {
     const result = [];
     for (const candidate of [value, asRecord(value?.request), asRecord(value?.config), asRecord(value?.header), asRecord(asRecord(value?.record)?.rows)]) {
@@ -909,12 +1310,12 @@ function readModelSelectionCandidates(value) {
         const lastUsed = asRecord(selection?.lastUsed);
         const next = asRecord(selection?.next);
         const pending = asRecord(selection?.pending);
-        if (lastUsed !== null)
-            result.push(lastUsed);
-        if (next !== null)
-            result.push(next);
         if (pending !== null)
             result.push(pending);
+        if (next !== null)
+            result.push(next);
+        if (lastUsed !== null)
+            result.push(lastUsed);
     }
     return result;
 }
@@ -953,13 +1354,14 @@ function selectExternalAdapter(selectedProvider, messageAdapter, registry) {
 function inferMessageAdapter(messages) {
     for (let index = messages.length - 1; index >= 0; index -= 1) {
         const source = asRecord(messages[index].source);
-        // 旧会话和 DSH 原生投影的 source 形状不完全一致；只要是模型消息就读取
-        // provider，最终仍由 selectExternalAdapter 校验是否为已启用外部适配器。
         if (source?.kind !== 'model')
             continue;
-        const provider = source.provider;
-        if (typeof provider === 'string' && provider.trim() !== '')
-            return provider.trim();
+        const provider = typeof source.provider === 'string' ? source.provider.trim() : undefined;
+        // Legacy raw providers need explicit plugin metadata; native API brands can
+        // have the same names as CLI adapters. The latest model source is decisive.
+        return fromCliProviderId(provider)
+            ?? (typeof source.adapterId === 'string' ? source.adapterId : undefined)
+            ?? (source.plugin === 'codingns4dsh' ? provider : undefined);
     }
     return undefined;
 }
@@ -974,18 +1376,20 @@ async function setAdapterEnabled(settings, registry, value) {
     return { adapterId, enabled };
 }
 /** 运行中的外部 Agent 插话也必须经过同一条输入翻译路径。 */
-async function translateSteerPrompt(translation, registry, sessionId, prompt, followUp) {
+async function translateSteerPrompt(translationRecovery, registry, sessionId, prompt, followUp, signal) {
     const session = registry.getSession(sessionId);
     let translated = prompt;
-    if (translation !== undefined) {
+    if (session.translationEnabled === true) {
         try {
-            translated = await translation.translateInput(session.adapterId, prompt, undefined, session.translationEnabled === true);
+            translated = (await translationRecovery.translateInput(sessionId, session.adapterId, prompt, signal)).translated;
         }
-        catch {
-            // 插话翻译失败时仍把用户原文交给外部 Agent。
-            translated = prompt;
+        catch (error) {
+            if (error instanceof SessionTranslationCancelled)
+                return;
+            throw error;
         }
     }
+    signal?.throwIfAborted();
     await registry.steer(sessionId, translated, followUp);
 }
 /**
@@ -994,9 +1398,63 @@ 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, translationRecovery, registry, sessionId, messages, dshContext, signal, nativeSession) {
     if (translation === undefined || !translation.enabled || sessionId.trim() === '')
         return undefined;
+    if (messages.some(isTeamInputMessage)) {
+        const next = [];
+        for (const message of messages) {
+            // Team protocol text keeps its sender and machine-owned body. Human
+            // messages accepted at the same boundary still use submission recovery.
+            try {
+                const translated = isHumanUserMessage(message)
+                    ? await translatePreStepInput(translation, translationRecovery, registry, sessionId, [message], dshContext, signal, nativeSession)
+                    : undefined;
+                next.push(translated?.[0] ?? message);
+            }
+            catch (error) {
+                if (!(error instanceof SessionTranslationCancelled) || signal?.aborted)
+                    throw error;
+                // Cancelling one submission does not cancel independently accepted
+                // Team work. Keep the original positions until pre-step producers merge.
+                next.push(undefined);
+            }
+        }
+        return next.some((message, index) => message !== messages[index]) ? next : 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 || !isSessionTranslationInputEnabled(translation, nativeSession.adapterId))
+            return undefined;
+        const input = extractTurnInput(messages, dshContext);
+        if (input.prompt.trim() === '')
+            return undefined;
+        const result = await translationRecovery.translateInput(sessionId, nativeSession.adapterId, input.translationPrompt, signal);
+        const translated = [result.translated, attachmentNotices(input.attachments, readInputTargetLanguage(translation))].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: result.failed ? current.content : replaceInputTranslationContent(nativeTranslationContent(current.content, dshContext), translated),
+            source: { ...(current.source ?? {}), kind: 'user', codingnsTranslationInput: record },
+        };
+        return next;
+    }
     let session;
     try {
         session = registry.getSession(sessionId);
@@ -1004,39 +1462,13 @@ async function translatePreStepInput(translation, registry, sessionId, messages,
     catch {
         return undefined;
     }
-    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)
+    if (session.adapterId === 'dsh' || session.translationEnabled !== true || !isSessionTranslationInputEnabled(translation, session.adapterId))
         return undefined;
     const input = extractTurnInput(messages, dshContext);
-    if (input.translationPrompt.trim() === '')
+    if (input.prompt.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 translationRecovery.translateInput(sessionId, session.adapterId, input.translationPrompt, signal);
+    const translated = [result.translated, attachmentNotices(input.attachments, readInputTargetLanguage(translation))]
         .filter((part) => part.trim() !== '')
         .join('\n\n')
         .trim();
@@ -1045,11 +1477,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] = {
@@ -1062,7 +1495,285 @@ async function translatePreStepInput(translation, registry, sessionId, messages,
     };
     return next;
 }
-function extractTurnInput(messages, dshContext) {
+/** 旧测试替身没有 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,
+    };
+}
+function readOptionalText(value) {
+    return typeof value === 'string' ? value.trim() || undefined : undefined;
+}
+/** 原生 Provider 选中的模型，用于在 Magpie 会话身份可读之前判断该模型是否由 Magpie 提供。 */
+function readNativeModelSelection(nativeSessions, sessionId) {
+    if (nativeSessions === undefined)
+        return undefined;
+    let session;
+    try {
+        session = nativeSessions.get(sessionId);
+    }
+    catch {
+        return undefined;
+    }
+    const root = asRecord(session);
+    const selection = asRecord(root?.modelSelection) ?? asRecord(asRecord(asRecord(root?.record)?.rows)?.modelSelection);
+    const value = asRecord(selection?.val) ?? selection;
+    // 待用的 pending/next 优先；lastUsed 可能仍描述上一个模型。
+    for (const candidate of [asRecord(value?.pending), asRecord(value?.next), asRecord(value?.lastUsed)]) {
+        const modelId = readOptionalText(candidate?.model);
+        if (modelId === undefined)
+            continue;
+        const providerId = readOptionalText(candidate?.provider);
+        return providerId === undefined ? { modelId } : { providerId, modelId };
+    }
+    return undefined;
+}
+/** Magpie 网关只监听本机回环；Provider 指向这里时才算 Magpie 自己的路由。 */
+const MAGPIE_GATEWAY_HOSTS = new Set(['127.0.0.1', 'localhost', '[::1]', '::1']);
+function isMagpieGateway(baseUrl) {
+    try {
+        const target = new URL(baseUrl);
+        // 端口由 `magpie web` 绑定（默认 3425），配置里改端口也应视为同一网关，
+        // 因此这里只要求回环地址，不再硬编码端口。
+        return MAGPIE_GATEWAY_HOSTS.has(target.hostname);
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * Provider ID 本身可能是任意用户命名，因此先看 DSH 配置里的 baseURL；
+ * 配置读不到时只接受与 `readDshDefaultProvider()` 相同的 Magpie 名称约定。
+ */
+function isMagpieGatewayProvider(providerId) {
+    const source = readDshProviderSource(providerId);
+    if (source !== null)
+        return isMagpieGateway(source.baseUrl);
+    return /^magpie(?:[-_.].*)?$/iu.test(providerId);
+}
+/**
+ * 读到用量之后仍然要判断「这个模型是不是 Magpie 的」。
+ *
+ * `magpieUsage.read()` 只有在会话身份（Provider 会话 ID 或 DSH 会话 ID）已经出现在
+ * Magpie 账本里时才返回快照。新会话的首个请求可能还没被 Magpie Web 记账，或者两边的
+ * 会话 ID 在滚动升级期间并不相等，这时返回 null 会让 Host 直接回退到官方余量。
+ * 只有确认模型由 Magpie 提供时才下发占位快照，避免官方数字抢占首屏。
+ */
+async function pendingMagpieUsage(magpie, nativeSessions, sessionId, session, signal) {
+    const agent = magpieAgentForAdapter(session.adapterId);
+    const modelId = session.modelId?.trim();
+    if (agent === null || modelId === undefined || modelId === '')
+        return null;
+    try {
+        const selectedProviderId = session.providerId?.trim();
+        const providerId = selectedProviderId === undefined || selectedProviderId === ''
+            ? readNativeModelSelection(nativeSessions, sessionId)?.providerId
+            : selectedProviderId;
+        if (providerId === undefined || !isMagpieGatewayProvider(providerId))
+            return null;
+        const confirmed = await magpie.readModelMetadata(session.adapterId, modelId, signal);
+        signal.throwIfAborted();
+        return confirmed === null ? null : pendingMagpieSnapshot(agent, modelId);
+    }
+    catch {
+        // 目录不可读、超时或请求被取消：保持原有回退语义，不伪造 Magpie 用量。
+        return null;
+    }
+}
+/** Magpie 已经确认提供该模型、但会话身份还读不到时下发的占位快照。 */
+function pendingMagpieSnapshot(agent, modelId) {
+    const capturedAt = new Date().toISOString();
+    return {
+        agent,
+        modelId,
+        capturedAt,
+        usageStatus: 'unavailable',
+        aggregate: null,
+        sessionId: null,
+        session: null,
+        routeStatus: 'not-requested',
+        route: null,
+        upstreamProvider: null,
+        upstreamProviders: [],
+        // 客户端据此在 3 秒内带路由补读，而不是停留在官方余额上。
+        quotaStatus: 'provider-unavailable',
+        quotas: [],
+    };
+}
+/** 读取原生会话 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);
+}
+/** Translate completed native output blocks without buffering their visible deltas. */
+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,
+            translate: translation.shouldTranslate(DSH_NATIVE_SESSION_ADAPTER_ID, kind === 'reasoning' ? 'reasoning' : 'assistant', true),
+        };
+        blocks.set(index, created);
+        return created;
+    };
+    const translateBlock = async (block) => {
+        const original = block.text;
+        if (original.trim() === '')
+            return undefined;
+        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 undefined;
+        const visible = formatSessionTranslationOutput(record);
+        if (visible.trim() === '' || visible === original && record.failed !== true)
+            return undefined;
+        return 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);
+                // Decide once per block: changing settings must not translate only a suffix
+                // or drop a prefix that was already buffered.
+                if (block === undefined || !block.translate) {
+                    yield chunk;
+                    continue;
+                }
+                block.text += record.text;
+                // Keep provider deltas visible while the completed block is being translated.
+                yield chunk;
+                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 translationRecord = await translateBlock(block);
+                        if (translationRecord !== undefined) {
+                            const finalBlock = asRecord(record?.block);
+                            yield {
+                                ...(record ?? {}),
+                                block: {
+                                    ...(finalBlock ?? {}),
+                                    type: block.kind,
+                                    text: block.text,
+                                    codingnsTranslation: translationRecord,
+                                },
+                                codingnsTranslation: translationRecord,
+                            };
+                            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-end', index: block.index, block: { type: block.kind, text: block.text } };
+        }
+    }
+}
+function extractTurnInput(messages, dshContext, acceptedPeerInput = pendingPeerInput(messages)) {
+    if (acceptedPeerInput.some(isTeamInputMessage)) {
+        const parts = acceptedPeerInput.map(message => {
+            const part = extractMessageInput(message.content, dshContext);
+            const translated = isHumanUserMessage(message) ? readInputTranslation(message.source) : undefined;
+            return translated ? { ...part, prompt: translated.translated } : part;
+        });
+        const prompt = parts.map(part => part.prompt).filter(text => text.trim() !== '').join('\n\n');
+        return { prompt, peerInput: true, translationPrompt: prompt, untranslatedPrompt: '', attachments: parts.flatMap(part => part.attachments), translatePrompt: false, messages: stripInputTranslationDisplay(messages) };
+    }
     for (let index = messages.length - 1; index >= 0; index -= 1) {
         const message = messages[index];
         if (message !== undefined && isInjectedStepNotice(message)) {
@@ -1085,9 +1796,10 @@ function extractTurnInput(messages, dshContext) {
                 : messages.filter((_candidate, candidateIndex) => !referenceIndexes.includes(candidateIndex));
             const translatedInput = readInputTranslation(message.source);
             if (translatedInput !== undefined) {
+                const prompt = [translatedInput.translated, ...referenceText].join('\n\n');
                 return {
-                    prompt: translatedInput.translated,
-                    translationPrompt: translatedInput.translated,
+                    prompt,
+                    translationPrompt: prompt,
                     untranslatedPrompt: '',
                     attachments: direct.attachments,
                     translatePrompt: false,
@@ -1120,7 +1832,7 @@ function readInputTranslation(value) {
         return undefined;
     if (candidate.original.trim() === '' || candidate.translated.trim() === '')
         return undefined;
-    const targetLanguage = candidate.targetLanguage === 'fr' || candidate.targetLanguage === 'de' || candidate.targetLanguage === 'ja'
+    const targetLanguage = candidate.targetLanguage === 'fr' || candidate.targetLanguage === 'de' || candidate.targetLanguage === 'ja' || candidate.targetLanguage === 'zh'
         ? candidate.targetLanguage
         : 'en';
     const sourceLanguage = candidate.sourceLanguage === 'zh' || candidate.sourceLanguage === 'en' || candidate.sourceLanguage === 'fr' || candidate.sourceLanguage === 'de' || candidate.sourceLanguage === 'ja'
@@ -1170,6 +1882,19 @@ function replaceInputTranslationContent(content, text) {
     });
     return replaced ? blocks : [{ type: 'text', text }, ...content];
 }
+/** Resolved files already have localized path notices. Leaving their file blocks
+ * would make DSH append another, English-only file notice at adapter dispatch.
+ * Preserve images and unresolved files so DSH retains modality/error handling.
+ */
+function nativeTranslationContent(content, dshContext) {
+    if (!Array.isArray(content))
+        return content;
+    return content.filter(part => {
+        if (!isRecord(part) || part.type !== 'file')
+            return true;
+        return resolveDshAttachmentPath(dshContext, 'file', isRecord(part.attachment) ? part.attachment : part) === undefined;
+    });
+}
 /** DSH 为工具分段注入的继续提示必须成为下一次 Provider 请求的 prompt。 */
 function isInjectedStepNotice(message) {
     if (message.role !== 'user' || !isRecord(message.source))
@@ -1225,11 +1950,13 @@ function extractMessageInput(content, dshContext) {
         const mimeType = typeof reference.mediaType === 'string' && reference.mediaType.trim() !== '' ? reference.mediaType.trim() : undefined;
         attachments.push({ kind, path, ...(name === undefined ? {} : { name }), ...(mimeType === undefined ? {} : { mimeType }) });
     }
-    const fileNotes = attachments.filter((attachment) => attachment.kind === 'file').map((attachment) => `附件文件${attachment.name === undefined ? '' : `「${attachment.name}」`}位于：${attachment.path}\n请使用工具读取该文件的内容。`);
     const translationPrompt = text.join('\n\n').trim();
-    const untranslatedPrompt = fileNotes.join('\n\n').trim();
+    const untranslatedPrompt = attachmentNotices(attachments);
     return { prompt: [translationPrompt, untranslatedPrompt].filter(value => value !== '').join('\n\n'), translationPrompt, untranslatedPrompt, attachments };
 }
+function attachmentNotices(attachments, language) {
+    return attachments.filter(attachment => attachment.kind === 'file').map(attachment => attachmentFileNotice(attachment, language)).join('\n\n');
+}
 function resolveDshAttachmentPath(dshContext, kind, reference) {
     if (dshContext === undefined || typeof reference.attachmentId !== 'string')
         return undefined;
@@ -1395,6 +2122,149 @@ function findCwdInValue(value, depth) {
     }
     return undefined;
 }
+function readMagpieDashboardPeriod(payload) {
+    const value = asRecord(payload)?.period;
+    if (value === 'today' || value === 'week' || value === 'month' || value === 'all')
+        return value;
+    throw new TypeError('Magpie usage period must be today, week, month, or all');
+}
+async function* streamMagpieDashboard(service, period, signal, force, sessionStore, nativeSessions) {
+    const names = magpieSessionNameBindings(sessionStore, nativeSessions, signal).catch(() => []);
+    let latest;
+    for await (const chunk of service.readDashboardStream(period, signal, force)) {
+        latest = chunk.dashboard;
+        yield chunk;
+    }
+    if (latest !== undefined) {
+        const named = attachMagpieSessionNames(latest, await names);
+        if (named !== latest)
+            yield { part: 'sessions', dashboard: named, stale: false };
+    }
+}
+/** 探测载荷只接受可选入口路径；其余字段一律忽略，避免把参数带进命令行。 */
+function readMagpieDetectionRequest(payload) {
+    const record = asRecord(payload);
+    if (record === null || typeof record.commandPath !== 'string')
+        return {};
+    const commandPath = record.commandPath.trim();
+    return commandPath === '' ? {} : { commandPath };
+}
+/** `force` 只在用户主动重新检测时出现；缺省复用短期探测结果。 */
+function readMagpieDetectionForce(payload) {
+    return asRecord(payload)?.force === true;
+}
+function readMagpieRequestOptions(payload) {
+    const record = asRecord(payload);
+    if (record === null)
+        throw new TypeError('Magpie request page must be an object');
+    const period = readMagpieDashboardPeriod(record);
+    const offset = record.offset === undefined ? 0 : record.offset;
+    const limit = record.limit === undefined ? 50 : record.limit;
+    if (typeof offset !== 'number' || !Number.isSafeInteger(offset) || offset < 0 || offset > 1_000_000) {
+        throw new TypeError('Magpie request offset is out of bounds');
+    }
+    if (typeof limit !== 'number' || !Number.isSafeInteger(limit) || limit < 1 || limit > 100) {
+        throw new TypeError('Magpie request limit must be between 1 and 100');
+    }
+    const sessionId = readOptionalMagpieIdentity(record.sessionId, 512);
+    const sessionAgent = readOptionalMagpieIdentity(record.sessionAgent, 64);
+    if ((sessionId === undefined) !== (sessionAgent === undefined)) {
+        throw new TypeError('Magpie session details require both sessionId and sessionAgent');
+    }
+    if (sessionAgent !== undefined && !/^[a-z0-9][a-z0-9-]*$/u.test(sessionAgent)) {
+        throw new TypeError('Magpie session Agent is invalid');
+    }
+    return {
+        period,
+        offset,
+        limit,
+        ...(sessionId === undefined ? {} : { sessionId }),
+        ...(sessionAgent === undefined ? {} : { sessionAgent }),
+    };
+}
+function readOptionalMagpieIdentity(value, maxLength) {
+    if (value === undefined)
+        return undefined;
+    if (typeof value !== 'string')
+        throw new TypeError('Magpie session identity must be text');
+    const text = value.trim();
+    if (text === '' || text.length > maxLength || /[\u0000-\u001f\u007f]/u.test(text)) {
+        throw new TypeError('Magpie session identity is invalid');
+    }
+    return text;
+}
+async function magpieSessionNameBindings(sessionStore, nativeSessions, signal) {
+    const records = sessionStore.list({ includeArchived: true });
+    const bindings = [];
+    const knownSessionIds = new Set();
+    let nativeValues = nativeSessions?.list() ?? [];
+    if (nativeSessions?.listRemote !== undefined) {
+        try {
+            nativeValues = await nativeSessions.listRemote(signal);
+        }
+        catch {
+            signal?.throwIfAborted();
+        }
+    }
+    const nativeNames = new Map();
+    for (const value of nativeValues) {
+        const sessionId = nativeSessionId(value);
+        const name = readNativeSessionDisplayName(value);
+        if (sessionId !== undefined && name !== undefined)
+            nativeNames.set(sessionId, name);
+    }
+    for (const record of records) {
+        knownSessionIds.add(record.dshSessionId);
+        const name = nativeNames.get(record.dshSessionId) ?? readDshSessionDisplayName(record.dshSessionId, sessionStore, nativeSessions);
+        if (name === undefined)
+            continue;
+        bindings.push({
+            dshSessionId: record.dshSessionId,
+            adapterId: record.adapterId,
+            ...(record.providerSessionId === undefined ? {} : { providerSessionId: record.providerSessionId }),
+            name,
+        });
+    }
+    // Native DSH sessions do not always have a CodingNS session-index record. They
+    // still use the DSH session ID as Magpie's identity, so include their title
+    // only when no external adapter binding claims the same DSH session.
+    for (const value of nativeValues) {
+        const sessionId = nativeSessionId(value);
+        if (sessionId === undefined || knownSessionIds.has(sessionId))
+            continue;
+        const name = readNativeSessionDisplayName(value);
+        if (name === undefined)
+            continue;
+        bindings.push({ dshSessionId: sessionId, adapterId: 'dsh', name });
+    }
+    return bindings;
+}
+function readDshSessionDisplayName(sessionId, sessionStore, nativeSessions) {
+    return readNativeSessionDisplayName(nativeSessions?.get(sessionId)) ?? cleanDisplayName(sessionStore.get(sessionId)?.title);
+}
+function readNativeSessionDisplayName(value) {
+    const root = asRecord(value);
+    if (root === null)
+        return undefined;
+    const projection = asRecord(root.projections) ?? asRecord(asRecord(root.record)?.projections);
+    const values = asRecord(projection?.values);
+    const record = asRecord(root.record);
+    const rows = asRecord(record?.rows);
+    const rowProjection = asRecord(rows?.projections);
+    const rowValues = asRecord(rowProjection?.values);
+    for (const candidate of [values?.title, rowValues?.title, root.title, root.name, root.displayName, record?.title, record?.name]) {
+        const title = cleanDisplayName(candidate);
+        if (title !== undefined)
+            return title;
+    }
+    return undefined;
+}
+function cleanDisplayName(value) {
+    if (typeof value !== 'string')
+        return undefined;
+    const name = value.trim().replace(/[\u0000-\u001f\u007f]/gu, '').slice(0, 240);
+    return name === '' ? undefined : name;
+}
 function asRecord(value) { return typeof value === 'object' && value !== null && !Array.isArray(value) ? value : null; }
 function isRecord(value) { return asRecord(value) !== null; }
 function nativeSessionId(value) {