@ai-workbench/remote-agent 0.8.19 → 0.8.23

package/dist/input.js

@@ -1,5 +1,4 @@
 import { NeedError } from "./remote.js";
-import { isWorkspaceNoticeMessage, withoutWorkspaceNotice } from "./workspace-notice.js";
 function runtimeSections(message) {
     const source = message.source;
     if (message.role !== 'user' || source?.kind !== 'runtime-context' || source.form !== 'snapshot' || !Array.isArray(source.sections) || message.content.length !== 1 || message.content[0].type !== 'text')
@@ -52,7 +51,7 @@ async function publicBlock(block, options, readImage, history = false) {
 }
 /** Role-labelled public history only; never serialize source/replay/tool internals. */
 export async function prepareContinuation(options, input, readImage) {
-    const messages = options.messages.filter(message => !isWorkspaceNoticeMessage(message)).map(withoutWorkspaceNotice);
+    const messages = options.messages;
     for (const message of messages)
         if (!['user', 'assistant', 'system', 'developer'].includes(message.role))
             throw new NeedError('HISTORY_CONTENT_UNSUPPORTED', `此前含有无法可靠承接的历史角色：${message.role}；本轮未新建或发送`, '完整公开的用户及助手历史；工具记录的公开内容映射');
@@ -94,7 +93,7 @@ export async function prepareContinuation(options, input, readImage) {
 /** The attachment service supplies verified bytes; client paths never cross SSH. */
 export async function prepareInput(options, readImage) {
     options.signal?.throwIfAborted();
-    const messages = options.messages.filter(message => !isWorkspaceNoticeMessage(message)).map(withoutWorkspaceNotice);
+    const messages = options.messages;
     const context = [];
     if (options.system)
         context.push('系统上下文：\n' + options.system);

package/dist/local-user-turn.js

@@ -42,14 +42,13 @@ export async function readLocalUserTurn(ctx, request) {
                 step = undefined;
                 input = undefined;
             }
-            else if (e.type === 'step/start') {
+            // Human proof belongs to the native turn; approval continuations add a new
+            // step without re-emitting that human message. An active own step is still
+            // required, and turn/start/end above permanently clear the previous input.
+            else if (e.type === 'step/start')
                 step = e;
-                input = undefined;
-            }
-            else if (e.type === 'step/end') {
+            else if (e.type === 'step/end')
                 step = undefined;
-                input = undefined;
-            }
             else if (e.type === 'user/message' && step && e.data.source.kind === 'user')
                 input = e;
             else if (e.type === 'request/header')

package/dist/mapping.d.ts

@@ -1,6 +1,5 @@
 import type { StreamChunk } from '@deepseek-ai/dsh-llm';
 import type { PromptResponse, SessionUpdate } from '@agentclientprotocol/sdk/unstable';
-import type { ThreadEvent } from '@openai/codex-sdk';
 import { type SanitizedObservation } from './conversation-details.ts';
 /** Persist alongside the exact remote session identity; null means no trusted baseline. */
 export type UsageSnapshot = {
@@ -23,9 +22,11 @@ export type UsageSnapshot = {
 export declare class StreamMapper {
     private index;
     private active;
-    private seen;
     private baseline;
     private readonly observations;
+    private readonly modelMetadata;
+    private anonymousMetadata;
+    private lastMetadataType;
     private readonly onDiagnostic;
     /** Omitted argument is exclusively for a known new session; pass null on unknown resume. */
     constructor(previousUsage?: UsageSnapshot | null, onDiagnostic?: (observation: Readonly<SanitizedObservation>) => void);
@@ -33,6 +34,8 @@ export declare class StreamMapper {
     get diagnostics(): readonly Readonly<SanitizedObservation>[];
     private diagnostic;
     private usageWarning;
+    /** One durable observation per official message; keep ordered, sanitized fragment snapshots. */
+    flushMetadata(): void;
     text(text: string, reasoning?: boolean): StreamChunk[];
     /** Close the current text or reasoning block once, before the stream settles. */
     flush(): StreamChunk[];
@@ -42,5 +45,4 @@ export declare class StreamMapper {
     private usageGap;
     private cumulativeUsage;
     private usage;
-    sdk(event: ThreadEvent): StreamChunk[];
 }

package/dist/mapping.js

@@ -6,9 +6,11 @@ const optionalUsageCounters = ['cachedReadTokens', 'cachedWriteTokens', 'thought
 export class StreamMapper {
     index = 0;
     active;
-    seen = new Map();
     baseline;
     observations = [];
+    modelMetadata = new Map();
+    anonymousMetadata = 0;
+    lastMetadataType;
     onDiagnostic;
     /** Omitted argument is exclusively for a known new session; pass null on unknown resume. */
     constructor(previousUsage = { version: 1, kind: 'zero' }, onDiagnostic) {
@@ -30,6 +32,15 @@ export class StreamMapper {
     usageWarning(summary) {
         return this.diagnostic({ kind: 'usage', severity: 'warning', code: 'USAGE_UNAVAILABLE', summary });
     }
+    /** One durable observation per official message; keep ordered, sanitized fragment snapshots. */
+    flushMetadata() {
+        for (const [key, payload] of this.modelMetadata) {
+            // A throwing sink may already have enqueued its write. Never replay that message.
+            this.modelMetadata.delete(key);
+            this.diagnostic({ kind: 'extension', severity: 'info', code: 'ACP_MODEL_METADATA', summary: '远端模型消息扩展（按消息汇总）', method: 'session/update', payload });
+        }
+        this.lastMetadataType = undefined;
+    }
     text(text, reasoning = false) {
         if (!text)
             return [];
@@ -55,15 +66,31 @@ export class StreamMapper {
     acp(update) {
         if (update.sessionUpdate === 'agent_message_chunk' || update.sessionUpdate === 'agent_thought_chunk') {
             if (update.content.type === 'text' && typeof update.content.text === 'string') {
-                // The whole update preserves every extension layer without inventing a display mapping.
+                const messageId = typeof update.messageId === 'string' ? update.messageId : undefined;
+                if (messageId !== undefined)
+                    this.lastMetadataType = undefined;
+                else {
+                    if (this.lastMetadataType !== update.sessionUpdate)
+                        this.anonymousMetadata++;
+                    this.lastMetadataType = update.sessionUpdate;
+                }
+                // Capture each extension layer now, before the caller can mutate it. Text mapping is unchanged.
                 if (Object.keys(update).some(key => key !== 'sessionUpdate' && key !== 'content')
                     || Object.keys(update.content).some(key => key !== 'type' && key !== 'text')) {
-                    this.diagnostic({ kind: 'extension', severity: 'info', code: 'ACP_MODEL_METADATA', summary: '远端模型消息扩展', method: 'session/update', payload: update });
+                    const key = JSON.stringify(messageId !== undefined ? ['message', messageId] : ['segment', this.anonymousMetadata]);
+                    let pending = this.modelMetadata.get(key);
+                    if (!pending) {
+                        pending = { sessionUpdate: update.sessionUpdate, ...(messageId !== undefined ? { messageId } : {}), fragments: [] };
+                        this.modelMetadata.set(key, pending);
+                    }
+                    pending.fragments.push(sanitizeObservation({ kind: 'extension', severity: 'info', code: 'ACP_MODEL_METADATA', summary: '远端模型消息扩展', payload: update }).payload);
                 }
                 return this.text(update.content.text, update.sessionUpdate === 'agent_thought_chunk');
             }
+            this.lastMetadataType = undefined;
             return this.diagnostic({ kind: 'extension', severity: 'warning', code: 'ACP_CONTENT_UNSUPPORTED', summary: '远端非文本内容，需要对应的公开显示映射', method: 'session/update', payload: update });
         }
+        this.lastMetadataType = undefined;
         let kind = 'session';
         let code = 'ACP_SESSION_UPDATE';
         let summary = '远端会话事件';
@@ -111,6 +138,7 @@ export class StreamMapper {
     }
     /** ACP usage and the fixed Claude quota both accumulate across the session, not per turn. */
     acpResponse(response) {
+        this.flushMetadata();
         this.diagnostic({ kind: 'usage', severity: 'info', code: 'ACP_PROMPT_RESPONSE', summary: '远端响应与真实用量', method: 'session/prompt', payload: response });
         const quota = record(response._meta?.quota);
         const tokens = record(quota?.token_count);
@@ -180,39 +208,6 @@ export class StreamMapper {
                     ...(read == null ? {} : { cacheReadTokens: read }), ...(write == null ? {} : { cacheWriteTokens: write }),
                     ...(thought == null ? {} : { reasoningTokens: thought }) } }];
     }
-    sdk(event) {
-        if (event.type === 'item.started' || event.type === 'item.updated' || event.type === 'item.completed') {
-            const item = event.item;
-            if ((item.type === 'agent_message' || item.type === 'reasoning') && typeof item.text === 'string') {
-                if (Object.keys(event).some(key => key !== 'type' && key !== 'item')
-                    || Object.keys(item).some(key => key !== 'id' && key !== 'type' && key !== 'text')) {
-                    this.diagnostic({ kind: 'extension', severity: 'info', code: 'SDK_MODEL_METADATA', summary: '远端模型消息扩展', method: event.type, payload: event });
-                }
-                const previous = this.seen.get(item.id) ?? '';
-                if (!item.text.startsWith(previous))
-                    throw new NeedError('EVENT_REWRITE_UNSUPPORTED', '远端更改了已输出的文本，当前流不能无损替换', '支持文本替换的展示适配器');
-                this.seen.set(item.id, item.text);
-                return this.text(item.text.slice(previous.length), item.type === 'reasoning');
-            }
-            const tool = item.type === 'command_execution' || item.type === 'file_change' || item.type === 'mcp_tool_call';
-            this.diagnostic({ kind: tool ? 'tool' : 'session', severity: item.type === 'error' ? 'warning' : 'info', code: tool ? 'SDK_TOOL' : 'SDK_ITEM', summary: '远端非模型事件', method: event.type, payload: event });
-            if (item.type === 'error')
-                throw new NeedError('ONESHOT_FAILED', 'Codex 返回了错误，根因未查明', '远端诊断');
-            return [];
-        }
-        this.diagnostic({ kind: event.type === 'turn.completed' ? 'usage' : 'session', severity: event.type === 'error' || event.type === 'turn.failed' ? 'warning' : 'info', code: 'SDK_EVENT', summary: '远端会话事件', method: event.type, payload: event });
-        if (event.type === 'turn.completed') {
-            const u = event.usage;
-            const write = u.cache_write_input_tokens ?? 0;
-            const uncached = u.input_tokens - u.cached_input_tokens - write;
-            if (![u.input_tokens, u.cached_input_tokens, write, u.output_tokens, uncached].every(n => Number.isSafeInteger(n) && n >= 0))
-                throw new NeedError('USAGE_INVALID', '远端用量计数不一致', '有效的 Codex 用量');
-            return [{ type: 'usage', usage: { inputTokens: uncached, cacheReadTokens: u.cached_input_tokens, outputTokens: u.output_tokens,
-                        ...(u.cache_write_input_tokens !== undefined ? { cacheWriteTokens: write } : {}),
-                        ...(u.reasoning_output_tokens !== undefined ? { reasoningTokens: u.reasoning_output_tokens } : {}) } }];
-        }
-        return [];
-    }
 }
 function validCount(value) { return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0; }
 function validUsageSnapshot(value) {

package/dist/model-catalog.d.ts

@@ -1,9 +1,7 @@
-import type { CloseChange } from './close-diagnostics.ts';
 import { type LlmResolvedModelInfo } from '@deepseek-ai/dsh-llm';
 import type { ModelCatalogTarget } from '@ai-workbench/connect/api';
 import type { AgentDefinition } from './agents.ts';
 import { type ConnectApi, type ConnectTarget } from './provider.ts';
-import type { DetailObservation } from './conversation-details.ts';
 export { runCatalog } from './catalog-ssh.ts';
 export interface HostModel {
     id: string;
@@ -20,20 +18,11 @@ export interface HostModel {
     };
     source: unknown;
 }
-export interface CatalogRevocation {
-    readonly fields: readonly CatalogChangeField[];
-    readonly changes: readonly CloseChange[];
-    readonly reason?: 'MODEL_CATALOG_REVOKED' | 'MODEL_CATALOG_SCOPE_CHANGED';
-}
 export interface CatalogLease {
-    revocation?(): CatalogRevocation | undefined;
-    bindSelection?(id: string, effort?: string): void;
     readonly target: ModelCatalogTarget;
     readonly models: readonly HostModel[];
     readonly signal: AbortSignal;
-    assertCurrent(): void;
     release(): void;
-    onInformation?(listener: (entry: DetailObservation) => void): () => void;
 }
 export interface ModelDirectory {
     read(agent: AgentDefinition, signal?: AbortSignal): Promise<CatalogLease>;
@@ -49,41 +38,13 @@ export interface ParsedCatalog {
     readonly issues: readonly CatalogIssue[];
 }
 export declare function catalogDiagnostic(issues: readonly CatalogIssue[]): string | undefined;
-/** Defaults are provider declarations, never catalog order or display names. */
-export declare function declaredDefault(agent: AgentDefinition, models: readonly HostModel[]): HostModel | undefined;
 export declare function parseHostCatalog(input: string, provider: string, username: string): ParsedCatalog;
-export type CatalogChangeField = 'api-instance' | 'connection-instance' | 'connection-epoch' | 'connection-phase' | 'connection-need-code' | 'catalog-capability' | 'codex-target' | 'claude-target' | 'other-metadata' | 'selected-model';
-/** Share only pending work; settled results are never cached. */
+/** Queried at startup and by the model menu. No execution admission or revocation. */
 export declare class ModelCatalog implements ModelDirectory {
     private get;
     private maxBytes;
     private run;
-    private changed;
-    private diagnostic;
-    private loaded;
-    private revoking;
-    private api?;
-    private unsubscribe?;
-    private signature?;
-    private revision;
-    private disposed;
-    private initialized;
-    private active;
-    private revocations;
-    private presentation?;
-    private presentationNeedCode?;
-    private information;
-    private flights;
-    private selections;
-    private serial;
-    private latest;
-    constructor(get: () => ConnectApi | undefined, maxBytes: () => number | undefined, run?: CatalogRunner, changed?: () => void, diagnostic?: (provider: 'claude' | 'codex', message: string | undefined) => void, loaded?: (agent: AgentDefinition, models: readonly HostModel[], assertCurrent: () => void) => void | Promise<void>, revoking?: (fields: readonly CatalogChangeField[], changes: readonly CloseChange[]) => void);
-    refresh(): void;
-    private trusted;
-    private assertFlight;
-    private failure;
-    private checkSelections;
-    private start;
+    constructor(get: () => ConnectApi | undefined, maxBytes: () => number | undefined, run?: CatalogRunner);
     read(agent: AgentDefinition, signal?: AbortSignal): Promise<CatalogLease>;
     dispose(): void;
 }

package/dist/model-catalog.js

@@ -1,8 +1,6 @@
-import { createHash } from 'node:crypto';
 import { LlmError, ReasoningEffortId } from '@deepseek-ai/dsh-llm';
-import { sameTarget, validateTarget } from "./provider.js";
-import { ModelConfigurationError } from "./model-configuration.js";
-import { runCatalog, CatalogSshError, catalogSafeText } from "./catalog-ssh.js";
+import { validateTarget } from "./provider.js";
+import { runCatalog, catalogSafeText } from "./catalog-ssh.js";
 export { runCatalog } from "./catalog-ssh.js";
 const object = (value) => !!value && typeof value === 'object' && !Array.isArray(value);
 const text = (value) => typeof value === 'string' && value.trim().length > 0;
@@ -20,11 +18,6 @@ function freeze(value) { if (value && typeof value === 'object') {
 export function catalogDiagnostic(issues) {
     return issues.length ? '以下模型未加入可选列表：\n' + issues.map(issue => `模型「${issue.modelName}」：${issue.reason}（诊断代码：${issue.code}）`).join('\n') : undefined;
 }
-/** Defaults are provider declarations, never catalog order or display names. */
-export function declaredDefault(agent, models) {
-    const selected = models.filter(model => agent.loginProvider === 'claude' ? model.value === 'default' : object(model.source) && model.source.isDefault === true);
-    return selected.length === 1 ? selected[0] : undefined;
-}
 export function parseHostCatalog(input, provider, username) {
     let wire;
     try {
@@ -39,7 +32,7 @@ export function parseHostCatalog(input, provider, username) {
         const error = object(wire.error) ? wire.error : undefined;
         const code = typeof error?.code === 'string' && /^[A-Z][A-Z0-9_]*$/.test(error.code) ? error.code : 'PROTOCOL_INVALID';
         const reason = text(error?.message) ? safe(error.message) : '主机未提供失败说明';
-        fail('主机目录查询失败，请到设置 → 模型查看诊断。', `主机目录查询失败（诊断代码：${code}）：${reason}`);
+        fail('主机目录查询失败，请检查连接后重新打开模型菜单。', `主机目录查询失败（诊断代码：${code}）：${reason}`);
     }
     if (wire.ok !== true || wire.permissionProbe !== false || !object(wire.subject) || wire.subject.username !== username || !Number.isSafeInteger(wire.subject.uid) || !text(wire.observedAt) || !object(wire.source) || !object(wire.settings) || !Array.isArray(wire.models))
         fail('主机目录缺少完整元数据');
@@ -93,288 +86,37 @@ export function parseHostCatalog(input, provider, username) {
     }
     return freeze(structuredClone({ models, issues }));
 }
-function semanticJson(value) { const sort = (item) => Array.isArray(item) ? item.map(sort) : object(item) ? Object.fromEntries(Object.keys(item).sort().map(key => [key, sort(item[key])])) : item; return JSON.stringify(sort(value)); }
-function changedCatalogFields(previous, next, switched) {
-    const before = previous ? JSON.parse(previous) : {}, after = JSON.parse(next), fields = [];
-    if (switched)
-        fields.push('api-instance');
-    for (const [key, label] of [['instanceId', 'connection-instance'], ['epoch', 'connection-epoch'], ['phase', 'connection-phase'], ['needCode', 'connection-need-code']])
-        if (JSON.stringify(before.state?.[key]) !== JSON.stringify(after.state?.[key]))
-            fields.push(label);
-    if (before.capability !== after.capability)
-        fields.push('catalog-capability');
-    for (const [index, label] of [[0, 'codex-target'], [1, 'claude-target']])
-        if (JSON.stringify(before.targets?.[index]) !== JSON.stringify(after.targets?.[index]))
-            fields.push(label);
-    return fields.length ? fields : ['other-metadata'];
-}
-function catalogChanges(previous, next, switched) {
-    const before = previous ? JSON.parse(previous) : {}, after = JSON.parse(next), changes = [];
-    const scalar = (value) => typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean' ? value : null;
-    const compare = (field, old, current) => { if (JSON.stringify(old) !== JSON.stringify(current))
-        changes.push({ field, before: scalar(old), after: scalar(current) }); };
-    const fingerprint = (value) => value === undefined ? null : createHash('sha256').update(JSON.stringify(value)).digest('hex');
-    if (switched)
-        changes.push({ field: 'catalog.api-replaced', before: false, after: true });
-    for (const [key, name] of [['instanceId', 'instance-id'], ['epoch', 'epoch'], ['phase', 'phase'], ['needCode', 'need-code']])
-        compare('connection.' + name, before.state?.[key], after.state?.[key]);
-    compare('catalog.capability', before.capability, after.capability);
-    for (const [index, provider] of [[0, 'codex'], [1, 'claude']]) {
-        const a = before.targets?.[index], b = after.targets?.[index], prefix = 'catalog.' + provider + '.';
-        compare(prefix + 'ok', a?.ok, b?.ok);
-        compare(prefix + 'error-code', a?.code, b?.code);
-        for (const [key, name] of [['instanceId', 'instance-id'], ['epoch', 'epoch'], ['provider', 'provider']])
-            compare(prefix + name, a?.value?.[key], b?.value?.[key]);
-        // Protect executable argv, trust/config paths and arbitrary future metadata: values are digests.
-        compare(prefix + 'target-sha256', fingerprint(a?.value?.target), fingerprint(b?.value?.target));
-        compare(prefix + 'metadata-sha256', fingerprint(a), fingerprint(b));
-    }
-    if (!changes.length)
-        changes.push({ field: 'catalog.signature-sha256', before: fingerprint(before), after: fingerprint(after) });
-    return changes;
-}
-/** Share only pending work; settled results are never cached. */
+/** Queried at startup and by the model menu. No execution admission or revocation. */
 export class ModelCatalog {
     get;
     maxBytes;
     run;
-    changed;
-    diagnostic;
-    loaded;
-    revoking;
-    api;
-    unsubscribe;
-    signature;
-    revision = 0;
-    disposed = false;
-    initialized = false;
-    active = new Set();
-    revocations = new WeakMap();
-    presentation;
-    presentationNeedCode;
-    information = new Set();
-    flights = new Map();
-    selections = new Set();
-    serial = 0;
-    latest = new Map();
-    constructor(get, maxBytes, run = runCatalog, changed = () => { }, diagnostic = () => { }, loaded = () => { }, revoking = () => { }) {
+    constructor(get, maxBytes, run = runCatalog) {
         this.get = get;
         this.maxBytes = maxBytes;
         this.run = run;
-        this.changed = changed;
-        this.diagnostic = diagnostic;
-        this.loaded = loaded;
-        this.revoking = revoking;
-        this.refresh();
-    }
-    refresh() {
-        const api = this.get();
-        const state = api?.getConnectionState?.();
-        const info = api?.getContractInfo?.();
-        const targets = info?.modelCatalogTarget === 1 && api?.getModelCatalogTarget ? ['codex', 'claude'].map(brand => api.getModelCatalogTarget(brand)) : undefined;
-        // L's same-epoch recovery wording is presentation metadata, not an execution change.
-        const executionState = state && { instanceId: state.instanceId, epoch: state.epoch, phase: state.phase };
-        const executionTargets = targets?.map(result => result.ok ? result : { ok: false, code: result.error.code });
-        const signature = semanticJson({ state: executionState, capability: info?.modelCatalogTarget, targets: executionTargets });
-        const switched = api !== this.api;
-        const changed = this.initialized && (switched || signature !== this.signature);
-        const presentation = createHash('sha256').update(JSON.stringify({ need: { code: state?.need?.code, message: state?.need?.message, requires: state?.need?.requires }, recovery: state?.recovery && { phase: state.recovery.phase, message: state.recovery.message, startedAt: state.recovery.startedAt, administratorAfterMs: state.recovery.administratorAfterMs } })).digest('hex');
-        if (this.initialized && !changed && presentation !== this.presentation) {
-            const entry = { kind: 'session', severity: 'info', code: 'CATALOG_SCOPE_INFORMATION', summary: '连接说明已变化；主机身份、连接代际和可信目标未变，本轮继续。', payload: { reason: 'CATALOG_PRESENTATION_CHANGED', before: { needCode: this.presentationNeedCode ?? null, presentationSha256: this.presentation ?? null }, after: { needCode: state?.need?.code ?? null, presentationSha256: presentation } } };
-            for (const listener of this.information)
-                listener(entry);
-        }
-        this.presentation = presentation;
-        this.presentationNeedCode = state?.need?.code;
-        this.initialized = true;
-        if (switched) {
-            this.unsubscribe?.();
-            this.unsubscribe = undefined;
-            this.api = api;
-            const off = [];
-            if (typeof api?.onConnectionState === 'function')
-                off.push(api.onConnectionState(() => this.refresh()));
-            if (typeof api?.onLoginPromptState === 'function')
-                off.push(api.onLoginPromptState(() => this.refresh()));
-            this.unsubscribe = () => { for (const stop of off)
-                stop(); };
-        }
-        const changedFields = changed ? changedCatalogFields(this.signature, signature, switched) : [], changes = changed ? catalogChanges(this.signature, signature, switched) : [];
-        this.signature = signature;
-        if (changed) {
-            this.revoking(changedFields, changes);
-            this.revision++;
-            this.latest.clear();
-            for (const controller of this.active) {
-                this.revocations.set(controller, freeze({ fields: changedFields, changes, reason: 'MODEL_CATALOG_SCOPE_CHANGED' }));
-                controller.abort();
-            }
-            this.active.clear();
-            this.diagnostic('claude', undefined);
-            this.diagnostic('codex', undefined);
-            this.changed();
-        }
-    }
-    trusted(agent, api) {
-        const info = api.getContractInfo?.();
-        if (info?.modelCatalogTarget !== 1 || typeof api.getModelCatalogTarget !== 'function')
-            fail('远程主机连接组件尚未提供模型目录目标能力');
-        const state = api.getConnectionState();
-        if (state.phase !== 'connected' || !text(state.instanceId) || !Number.isSafeInteger(state.epoch) || state.epoch < 0)
-            fail('当前没有已验证的远程主机连接');
-        const result = api.getModelCatalogTarget(agent.loginProvider);
-        if (!result.ok)
-            fail('远程主机连接暂未提供可信的模型目录目标，请到设置 → 模型查看诊断。', `模型目录目标不可用（诊断代码：${safe(result.error.code)}）：${safe(result.error.message)}`);
-        const target = result.value;
-        if (target.version !== 1 || target.purpose !== 'model-catalog' || target.scope !== 'host-user' || target.provider !== agent.loginProvider || target.instanceId !== state.instanceId || target.epoch !== state.epoch)
-            fail('模型目录目标与当前连接或品牌不匹配');
-        try {
-            validateTarget(target.target);
-        }
-        catch {
-            fail('模型目录的可信 SSH 目标不完整');
-        }
-        return structuredClone(target);
-    }
-    assertFlight(flight) {
-        if (flight.controller.signal.aborted || this.disposed || this.get() !== flight.api || flight.revision !== this.revision)
-            fail('连接已改变，原模型目录已失效');
-        const agent = { loginProvider: flight.target.provider }, current = this.trusted(agent, flight.api);
-        if (current.instanceId !== flight.target.instanceId || current.epoch !== flight.target.epoch || current.provider !== flight.target.provider || !sameTarget(current.target, flight.target.target))
-            fail('可信目标或连接代次已改变，原模型目录已失效');
-    }
-    failure(error) {
-        // Each consumer needs its own Error identity for its original input/signal proof.
-        return new CatalogError(error instanceof CatalogError || error instanceof ModelConfigurationError ? error.message.replace(/^无法获取模型列表：/, '') : '目录查询失败，请到设置 → 模型查看诊断。', error instanceof CatalogError ? error.diagnostic : error instanceof CatalogSshError ? error.diagnostic : error instanceof Error ? `${error instanceof LlmError ? error.code : 'MODEL_CATALOG_QUERY_FAILED'}：${safe(error.message)}` : 'MODEL_CATALOG_QUERY_FAILED：目录查询失败，根因未查明');
-    }
-    checkSelections(agent, api, target, models, serial) {
-        for (const lease of this.selections) {
-            const chosen = lease.selected, old = lease.flight.target;
-            if (lease.controller.signal.aborted || lease.flight.serial > serial || (lease.observed?.serial ?? 0) > serial || lease.flight.api !== api || old.provider !== agent.loginProvider || old.instanceId !== target.instanceId || old.epoch !== target.epoch || !sameTarget(old.target, target.target))
-                continue;
-            lease.observed = { serial, models };
-            if (!chosen)
-                continue;
-            const current = models.find(model => model.id === chosen.id && model.value === chosen.value);
-            if (current)
-                continue;
-            const changes = [{ field: 'catalog.' + agent.loginProvider + '.selected-model-valid', before: true, after: false }];
-            this.revocations.set(lease.controller, freeze({ fields: ['selected-model'], changes, reason: 'MODEL_CATALOG_REVOKED' }));
-            lease.controller.abort();
-        }
-    }
-    start(agent, api, target, max, key) {
-        const deferred = Promise.withResolvers(), controller = new AbortController();
-        const flight = { key, api, target, revision: this.revision, serial: ++this.serial, controller, pending: true, users: 0, promise: deferred.promise };
-        this.latest.set(agent.loginProvider, flight.serial);
-        this.flights.set(key, flight);
-        this.active.add(controller);
-        const current = () => !this.disposed && flight.revision === this.revision && api === this.get() && this.latest.get(agent.loginProvider) === flight.serial && !controller.signal.aborted;
-        const query = async () => {
-            try {
-                this.assertFlight(flight);
-                const output = await this.run(target.target, '/usr/local/aw-host/bin/aw-model-catalog --provider ' + agent.loginProvider, controller.signal, max);
-                this.assertFlight(flight);
-                const parsed = parseHostCatalog(output, agent.loginProvider, target.target.username), diagnostic = catalogDiagnostic(parsed.issues);
-                this.checkSelections(agent, api, target, parsed.models, flight.serial);
-                if (!parsed.models.length)
-                    fail('当前没有可选模型，请到设置 → 模型查看诊断。', diagnostic ?? '主机返回的完整模型目录为空（诊断代码：MODEL_CATALOG_EMPTY）');
-                if (current())
-                    this.diagnostic(agent.loginProvider, diagnostic);
-                if (current())
-                    await this.loaded(agent, parsed.models, () => this.assertFlight(flight));
-                this.assertFlight(flight);
-                return parsed.models;
-            }
-            catch (error) {
-                const failure = this.failure(error);
-                if (current())
-                    this.diagnostic(agent.loginProvider, failure.diagnostic);
-                throw failure;
-            }
-        };
-        const settled = () => { flight.pending = false; if (this.flights.get(key) === flight)
-            this.flights.delete(key); if (!flight.users)
-            this.active.delete(controller); };
-        void query().then(models => { settled(); deferred.resolve(models); }, error => { settled(); deferred.reject(error); });
-        return flight;
     }
     async read(agent, signal) {
-        let flight, released = false, selection;
-        const selectedController = new AbortController();
-        const listeners = new Set();
-        const release = () => { if (released || !flight)
-            return; released = true; if (selection)
-            this.selections.delete(selection); for (const listener of listeners)
-            this.information.delete(listener); listeners.clear(); flight.users--; if (!flight.users) {
-            if (flight.pending)
-                flight.controller.abort();
-            else
-                this.active.delete(flight.controller);
-        } };
-        try {
-            if (this.disposed)
-                fail('远程模型插件已关闭');
-            signal?.throwIfAborted();
-            this.refresh();
-            const api = this.get();
-            if (!api)
-                fail('远程主机连接组件没有装好');
-            const target = freeze(this.trusted(agent, api)), max = this.maxBytes();
-            if (!Number.isSafeInteger(max) || max < 1)
-                fail('acpMaxMessageBytes 设置无效');
-            const key = JSON.stringify([agent.loginProvider, target.instanceId, target.epoch]);
-            flight = this.flights.get(key);
-            if (flight && (flight.api !== api || flight.revision !== this.revision || !sameTarget(flight.target.target, target.target) || flight.controller.signal.aborted)) {
-                const closing = flight;
-                closing.controller.abort();
-                flight = undefined;
-                // Closing work owns the tuple until SSH/runner actually settles. This new
-                // caller waits for cleanup, then begins its own query; it never uses old data.
-                const waiting = new AbortController(), revision = this.revision;
-                this.active.add(waiting);
-                const waitSignal = signal ? AbortSignal.any([signal, waiting.signal]) : waiting.signal;
-                try {
-                    await new Promise((resolve, reject) => { const abort = () => { waitSignal.removeEventListener('abort', abort); reject(new ModelConfigurationError('目录查询已取消')); }; waitSignal.addEventListener('abort', abort, { once: true }); closing.promise.then(() => { }, () => { }).then(() => { waitSignal.removeEventListener('abort', abort); resolve(); }); if (waitSignal.aborted)
-                        abort(); });
-                }
-                finally {
-                    this.active.delete(waiting);
-                }
-                if (revision !== this.revision || this.get() !== api)
-                    fail('连接已改变，原模型目录已失效');
-                return this.read(agent, signal);
-            }
-            flight ??= this.start(agent, api, target, max, key);
-            flight.users++;
-            const own = flight, combined = AbortSignal.any([own.controller.signal, selectedController.signal, ...(signal ? [signal] : [])]);
-            const assertCurrent = () => { if (combined.aborted)
-                fail('目录查询已取消'); this.assertFlight(own); };
-            const models = await new Promise((resolve, reject) => {
-                const abort = () => { combined.removeEventListener('abort', abort); reject(new ModelConfigurationError('目录查询已取消')); };
-                combined.addEventListener('abort', abort, { once: true });
-                own.promise.then(value => { combined.removeEventListener('abort', abort); resolve(value); }, error => { combined.removeEventListener('abort', abort); reject(error); });
-                if (combined.aborted)
-                    abort();
-            });
-            assertCurrent();
-            selection = { flight: own, controller: selectedController };
-            this.selections.add(selection);
-            return { target: own.target, get models() { return selection?.observed?.models ?? models; }, signal: combined, assertCurrent, release, bindSelection: (id, effort) => { assertCurrent(); if (released)
-                    fail('模型目录租约已经释放'); const observed = selection.observed?.models ?? models, model = observed.find(model => model.id === id); if (!model || effort !== undefined && !model.reasoning.options.some(option => option.value === effort))
-                    fail('所选型号或推理等级已不在当前主机目录中，请重新选择'); selection.selected = { id: model.id, value: model.value }; }, revocation: () => this.revocations.get(selectedController) ?? this.revocations.get(own.controller), onInformation: listener => { if (released)
-                    return () => { }; listeners.add(listener); this.information.add(listener); return () => { listeners.delete(listener); this.information.delete(listener); }; } };
-        }
-        catch (error) {
-            release();
-            const failure = this.failure(error);
-            if (!flight && !this.disposed)
-                this.diagnostic(agent.loginProvider, failure.diagnostic);
-            throw failure;
-        }
+        signal?.throwIfAborted();
+        const api = this.get();
+        if (!api || typeof api.getModelCatalogTarget !== 'function')
+            fail('远程主机连接组件没有提供模型目录');
+        const reply = api.getModelCatalogTarget(agent.loginProvider);
+        if (!reply.ok)
+            fail(reply.error.message);
+        const target = reply.value;
+        validateTarget(target.target);
+        const controller = new AbortController(), combined = signal ? AbortSignal.any([signal, controller.signal]) : controller.signal;
+        const max = this.maxBytes();
+        if (!Number.isSafeInteger(max) || max < 1)
+            fail('模型目录容量设置无效');
+        const output = await this.run(target.target, '/usr/local/aw-host/bin/aw-model-catalog --provider ' + agent.loginProvider, combined, max);
+        const parsed = parseHostCatalog(output, agent.loginProvider, target.target.username);
+        if (parsed.issues.length)
+            console.warn('[remote-agent] 模型菜单部分条目无效：' + parsed.issues.map(issue => issue.code).join(','));
+        return { target, models: parsed.models, signal: combined, release() { } };
     }
-    dispose() { this.disposed = true; this.unsubscribe?.(); this.flights.clear(); for (const controller of this.active)
-        controller.abort(); this.active.clear(); this.selections.clear(); this.information.clear(); }
+    dispose() { }
 }
 export function modelInfo(provider, model) {
     // Official rc.2 represents no reasoning levels by absence, and rejects an empty efforts array.

package/dist/model-configuration.d.ts

@@ -55,10 +55,7 @@ export declare class ModelConfiguration {
     /** A different ACP session cannot inherit selector-role discovery or ACKs. */
     invalidate(clearRoles?: boolean): void;
     private fail;
-    private checkAckRevision;
     private set;
     select(model: string, effort?: string): Promise<ModelConfigurationSnapshot>;
-    /** Call immediately before prompt; an idle/new/load/resume update withdraws the ACK. */
-    assertSelection(model: string, effort?: string): void;
 }
 export {};