@ai-workbench/remote-agent 0.8.15 → 0.8.17

package/dist/index.js

@@ -1,4 +1,5 @@
-import { CloseDiagnostics, closeCode, closeErrorCodes, closeFailure } from "./close-diagnostics.js";
+import { connectNeedMessage } from "./connect-need.js";
+import { CloseDiagnostics, withFailureEvidence, withFirstFailureEvidence, failureEvidenceSummary, closeCode, closeErrorCodes, closeFailure } from "./close-diagnostics.js";
 import { runCatalog } from "./catalog-ssh.js";
 import { createCatalogDiagnostics, CatalogDiagnosticsRemote } from "./catalog-diagnostics.js";
 import { SessionId } from '@deepseek-ai/dsh-session';
@@ -254,10 +255,11 @@ export class CodexRemoteAdapter extends LlmAdapter {
         }
         catch (error) {
             if (error instanceof ModelConfigurationError)
-                throw new LlmError(error.message, error.code, { cause: error });
+                throw new LlmError(error.message + (failureEvidenceSummary(error) ? '；' + failureEvidenceSummary(error) : ''), error.code, { cause: error });
             if (error instanceof NeedError) {
                 const rpc = /RPC 错误码 (-?\d+)/u.exec(error.requires)?.[1];
-                const message = employeeFailure(error.code, this.agent.loginProvider) + (rpc ? `（技术详情：RPC 错误码 ${rpc}）` : '');
+                const evidence = failureEvidenceSummary(error);
+                const message = (connectNeedMessage(error) ?? employeeFailure(error.code, this.agent.loginProvider)) + (rpc ? `（技术详情：RPC 错误码 ${rpc}）` : '') + (evidence ? '；' + evidence : '');
                 const login = originalLoginFailure(error);
                 let diagnostic = login?.technical ? JSON.stringify(login.technical) : '';
                 if (login?.technical && this.reportLoginFailure) {
@@ -271,6 +273,8 @@ export class CodexRemoteAdapter extends LlmAdapter {
                 }
                 throw new LlmError(message, error.code, { cause: new Error(`诊断代码：${error.code}；${error.requires}` + (diagnostic ? '；' + diagnostic : '')) });
             }
+            if (error instanceof LlmError && failureEvidenceSummary(error))
+                throw new LlmError(error.failure.message + '；' + failureEvidenceSummary(error), error.code, { cause: error });
             throw error;
         }
     }
@@ -303,6 +307,7 @@ export class CodexRemoteAdapter extends LlmAdapter {
         let catalog;
         let selected;
         let modelConfiguration;
+        let turnFailure;
         let employeeNoticeShown = false;
         const information = [];
         const recordInformation = () => { if (runtime?.details)
@@ -401,8 +406,9 @@ export class CodexRemoteAdapter extends LlmAdapter {
                 throw new ModelConfigurationError('所选模型不在本次可信主机目录中，请重新选择模型');
             if (options.reasoningEffort !== undefined && !selected.reasoning.options.some(option => option.value === options.reasoningEffort))
                 throw new ModelConfigurationError('所选推理等级不在本次模型目录中');
+            catalog.bindSelection?.(selected.id, options.reasoningEffort);
             const observeSignal = (source, initiator, reason) => { const observed = () => { const diagnostic = request?.closeDiagnostics ?? runtime?.closeDiagnostics; if (diagnostic)
-                diagnostic.record({ layer: 'adapter', initiator, reason, action: 'abort', changes: [{ field: 'adapter.turn-aborted', before: false, after: source.aborted }] }); }; source.addEventListener('abort', observed, { once: true }); abortOffs.push(() => source.removeEventListener('abort', observed)); };
+                diagnostic.record({ layer: 'adapter', initiator, reason: catalog?.signal === source ? catalog.revocation?.()?.reason ?? reason : reason, action: 'abort', changedFields: catalog?.signal === source ? catalog.revocation?.()?.fields : undefined, changes: catalog?.signal === source ? catalog.revocation?.()?.changes ?? [{ field: 'adapter.turn-aborted', before: false, after: source.aborted }] : [{ field: 'adapter.turn-aborted', before: false, after: source.aborted }] }); }; source.addEventListener('abort', observed, { once: true }); abortOffs.push(() => source.removeEventListener('abort', observed)); };
             observeSignal(catalog.signal, 'signal.model-catalog', 'MODEL_CATALOG_REVOKED');
             observeSignal(signal, 'signal.turn-composite', 'ABORTED');
             let modelSignal = AbortSignal.any([signal, catalog.signal]);
@@ -421,6 +427,12 @@ export class CodexRemoteAdapter extends LlmAdapter {
                 request.signal = modelSignal;
                 modelSignal.throwIfAborted();
             }
+            if (runtime.contextSignal) {
+                modelSignal = AbortSignal.any([modelSignal, runtime.contextSignal]);
+                options.signal = modelSignal;
+                request.signal = modelSignal;
+                modelSignal.throwIfAborted();
+            }
             catalog.assertCurrent();
             if (runtime.connection && (runtime.connection.instanceId !== catalog.target.instanceId || runtime.connection.epoch !== catalog.target.epoch) || runtime.identity !== `${catalog.target.target.username}@${catalog.target.target.host}:${catalog.target.target.port}`)
                 throw new ModelConfigurationError('模型目录与当前会话可信员工主机不一致');
@@ -568,7 +580,7 @@ export class CodexRemoteAdapter extends LlmAdapter {
                         const resolved = mapping[0].resolvedModel;
                         if (typeof resolved !== 'string' || !resolved.trim())
                             throw new NeedError('MODEL_RESOLUTION_UNCONFIRMED', '主机目录没有提供所选模型的具体型号，本轮未发送', 'CATALOG_RESOLVED_MODEL_MISSING');
-                        modelConfiguration = { selected: { ...selected, ...(options.reasoningEffort === undefined ? {} : { effort: options.reasoningEffort }) }, configured: actual, resolvedModel: resolved, status: 'remote-configured', ...(this.agent.loginProvider === 'claude' ? { resolvedModelSource: 'host-user-catalog', sessionModelReported: false } : {}) };
+                        modelConfiguration = { selected: { ...mapping[0], ...(options.reasoningEffort === undefined ? {} : { effort: options.reasoningEffort }) }, configured: actual, resolvedModel: resolved, status: 'remote-configured', ...(this.agent.loginProvider === 'claude' ? { resolvedModelSource: 'host-user-catalog', sessionModelReported: false } : {}) };
                         details.record({ kind: 'session', severity: 'info', code: 'MODEL_CONFIGURATION_CONFIRMED', summary: '本轮选择已由远端配置回执确认；' + modelResolutionLabel(modelConfiguration) + '；不代表推理效果已验证', payload: modelConfiguration });
                     }
                     catch (error) {
@@ -652,41 +664,44 @@ export class CodexRemoteAdapter extends LlmAdapter {
             yield { type: 'finish', reason: { kind: stop === 'max_tokens' || stop === 'max_turn_requests' ? 'max-tokens' : 'stop' }, replayState: { response: pointer } };
         }
         catch (error) {
+            // ACP cancellation must retain the source revocation that caused it.
+            // User cancellation and unrelated signals keep their existing semantics.
+            const sourceReason = runtime?.contextSignal?.aborted ? runtime.contextSignal.reason : undefined;
+            if (error instanceof NeedError && error.code === 'ABORTED' && sourceReason instanceof NeedError) {
+                error = Object.assign(new NeedError(sourceReason.code, sourceReason.message, sourceReason.requires), { ...(sourceReason.connectNeed ? { connectNeed: sourceReason.connectNeed } : {}), ...(sourceReason.officialReason ? { officialReason: sourceReason.officialReason } : {}), cause: new AggregateError([sourceReason, error], 'HOST_SOURCE_REVOKED') });
+            }
+            turnFailure = error;
             runtime?.closeDiagnostics?.record({ layer: 'adapter', initiator: 'adapter.turn-failure', reason: closeCode(error, signal.aborted ? 'ABORTED' : 'TURN_FAILED'), action: 'failure' });
             recordInformation();
             failureCode = error instanceof NeedError || error instanceof ModelConfigurationError ? error.code : error instanceof LlmError ? error.code : 'TURN_PREPARATION_FAILED';
             if (live && session && session.promptDispatchCount > promptBaseline)
                 live.failure = { cause: error };
-            let reportingFailure;
+            const reporting = [];
             if (request?.recordEarlyFailure) {
                 const record = request.recordEarlyFailure;
                 request.recordEarlyFailure = undefined;
-                const code = error instanceof NeedError || error instanceof ModelConfigurationError ? error.code : error instanceof LlmError ? error.failure.code : signal.aborted ? 'ABORTED' : 'WORKSPACE_SOURCE_CONFIRMATION_FAILED';
                 try {
-                    await record(Object.assign(new NeedError(code, '本轮在执行前失败。', '白名单阶段与错误代码'), { cause: error }), earlyStage);
+                    await record(Object.assign(new NeedError(failureCode ?? 'TURN_PREPARATION_FAILED', '本轮在执行前失败。', '白名单阶段与错误代码'), { cause: error }), earlyStage);
                 }
                 catch (failure) {
-                    reportingFailure = { cause: failure };
+                    reporting.push(failure);
                 }
             }
             try {
                 await runtime?.details?.flush();
             }
             catch (failure) {
-                if (reportingFailure === undefined)
-                    reportingFailure = { cause: failure };
-                else {
-                    const first = reportingFailure.cause;
-                    const originalCode = error instanceof NeedError || error instanceof ModelConfigurationError ? error.code : error instanceof LlmError ? error.failure.code : 'WORKSPACE_SOURCE_CONFIRMATION_FAILED';
-                    const flushCode = failure instanceof NeedError || failure instanceof ModelConfigurationError ? failure.code : failure instanceof LlmError ? failure.failure.code : 'CONVERSATION_DETAILS_FAILED';
-                    reportingFailure = { cause: Object.assign(new NeedError('CONVERSATION_DETAILS_FAILED', '本轮诊断保存及详情收尾失败，已停止。', '原错误代码 ' + originalCode + '；' + (first instanceof NeedError ? first.requires : '早期诊断保存失败') + '；详情收尾代码 ' + flushCode), { cause: new AggregateError([error, first, failure], 'ADMISSION_DIAGNOSTIC_AND_FLUSH_FAILED') }) };
-                }
+                reporting.push(failure);
             }
             if (activeMapper)
                 yield* activeMapper.flush();
-            if (reportingFailure !== undefined)
-                throw reportingFailure.cause;
-            throw error;
+            const firstReason = request?.closeDiagnostics?.first?.reason ?? runtime?.closeDiagnostics?.first?.reason;
+            if (reporting.length) {
+                turnFailure = withFailureEvidence(error, reporting, 'diagnostic', firstReason, failureCode);
+                throw turnFailure;
+            }
+            turnFailure = firstReason && !(error instanceof NeedError || error instanceof ModelConfigurationError || error instanceof LlmError) ? withFailureEvidence(error, [], 'diagnostic', firstReason, failureCode) : withFirstFailureEvidence(error, firstReason, failureCode);
+            throw turnFailure;
         }
         finally {
             for (const off of abortOffs)
@@ -716,6 +731,9 @@ export class CodexRemoteAdapter extends LlmAdapter {
                 if (succeeded && key)
                     this.preparationFailures.delete(key);
             }
+            catch (cleanup) {
+                throw withFailureEvidence(turnFailure ?? cleanup, [cleanup], 'cleanup', request?.closeDiagnostics?.first?.reason ?? runtime?.closeDiagnostics?.first?.reason, failureCode);
+            }
             finally {
                 if (key && this.turns.get(key) === turn)
                     this.turns.delete(key);

package/dist/model-catalog.d.ts

@@ -20,7 +20,14 @@ 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;
@@ -45,7 +52,7 @@ export declare function catalogDiagnostic(issues: readonly CatalogIssue[]): stri
 /** 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';
+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. */
 export declare class ModelCatalog implements ModelDirectory {
     private get;
@@ -62,10 +69,12 @@ export declare class ModelCatalog implements ModelDirectory {
     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);
@@ -73,6 +82,7 @@ export declare class ModelCatalog implements ModelDirectory {
     private trusted;
     private assertFlight;
     private failure;
+    private checkSelections;
     private start;
     read(agent: AgentDefinition, signal?: AbortSignal): Promise<CatalogLease>;
     dispose(): void;

package/dist/model-catalog.js

@@ -93,6 +93,7 @@ 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)
@@ -148,10 +149,12 @@ export class ModelCatalog {
     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 = () => { }) {
@@ -172,7 +175,7 @@ export class ModelCatalog {
         // 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 = JSON.stringify({ state: executionState, capability: info?.modelCatalogTarget, targets: executionTargets });
+        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');
@@ -202,8 +205,10 @@ export class ModelCatalog {
             this.revoking(changedFields, changes);
             this.revision++;
             this.latest.clear();
-            for (const controller of this.active)
+            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);
@@ -242,6 +247,22 @@ export class ModelCatalog {
         // 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 };
@@ -255,6 +276,7 @@ export class ModelCatalog {
                 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())
@@ -278,10 +300,12 @@ export class ModelCatalog {
         return flight;
     }
     async read(agent, signal) {
-        let flight, released = false;
+        let flight, released = false, selection;
+        const selectedController = new AbortController();
         const listeners = new Set();
         const release = () => { if (released || !flight)
-            return; released = true; for (const listener of listeners)
+            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();
@@ -323,7 +347,7 @@ export class ModelCatalog {
             }
             flight ??= this.start(agent, api, target, max, key);
             flight.users++;
-            const own = flight, combined = signal ? AbortSignal.any([signal, own.controller.signal]) : own.controller.signal;
+            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) => {
@@ -334,7 +358,11 @@ export class ModelCatalog {
                     abort();
             });
             assertCurrent();
-            return { target: own.target, models, signal: combined, assertCurrent, release, onInformation: listener => { if (released)
+            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) {
@@ -346,7 +374,7 @@ export class ModelCatalog {
         }
     }
     dispose() { this.disposed = true; this.unsubscribe?.(); this.flights.clear(); for (const controller of this.active)
-        controller.abort(); this.active.clear(); this.information.clear(); }
+        controller.abort(); this.active.clear(); this.selections.clear(); this.information.clear(); }
 }
 export function modelInfo(provider, model) {
     // Official rc.2 represents no reasoning levels by absence, and rejects an empty efforts array.

package/dist/preflight-diagnostic.js

@@ -1,3 +1,4 @@
+import { withFailureEvidence, failureEvidenceSummary, primaryFailureCode } from "./close-diagnostics.js";
 import { SessionId } from '@deepseek-ai/dsh-session';
 import { LlmError } from '@deepseek-ai/dsh-llm';
 import { isDeepStrictEqual } from 'node:util';
@@ -91,12 +92,12 @@ export function createPreflightDiagnostics(options) {
             if (request.preflightFailureRecorded)
                 return;
             request.preflightFailureRecorded = true;
-            const scope = scopeFor(request), code = preflightCode(error);
+            const scope = scopeFor(request), code = primaryFailureCode(error, preflightCode(error));
             try {
-                await record(request, provider, { kind: 'need', severity: 'action-required', code, summary: '本轮在连接前准备阶段停止；原始请求保留，未重发。', payload: { phase: 'workspace-source-admission', stage, ...scope.source, outcome: code === 'ABORTED' ? 'cancelled' : 'failed' } });
+                await record(request, provider, { kind: 'need', severity: 'action-required', code, summary: '本轮在连接前准备阶段停止；原始请求保留，未重发。' + failureEvidenceSummary(error), payload: { phase: 'workspace-source-admission', stage, ...scope.source, outcome: code === 'ABORTED' ? 'cancelled' : 'failed' } });
             }
             catch (diagnostic) {
-                throw Object.assign(new NeedError('CONVERSATION_DETAILS_FAILED', '本轮连接前诊断未能保存，已停止。', '原错误代码 ' + code + '；诊断错误代码 ' + preflightCode(diagnostic)), { cause: new AggregateError([error, diagnostic], 'PREFLIGHT_AND_DIAGNOSTIC_FAILED') });
+                throw withFailureEvidence(error, [diagnostic], 'diagnostic', undefined, preflightCode(error));
             }
         },
         forPreparation(sessionId, context) {

package/dist/presentation.js

@@ -9,11 +9,15 @@ export function employeeFailure(code, brand = 'codex') {
         WORKSPACE_SOURCE_CONFIRMATION_UNAVAILABLE: '我需要打开工作区来源确认，目前无法显示确认动作；本轮未执行，你的原话仍保留。',
         WORKSPACE_SOURCE_SELECTION_UNCONFIRMED: '无法核对工作区来源的确认结果，本轮已停止；你的原话仍保留。',
         WORKSPACE_SOURCE_CONFIRMATION_FAILED: '工作区来源确认未完成，本轮已停止；你的原话仍保留。',
+        PROJECT_BINDING_INVALID: '文件来源已改，请新建会话继续；原会话历史仍可查看。',
         WORKSPACE_LOCATION_REQUIRED: '我需要你确认这个工作区使用哪一个文件夹，本轮未执行；你的原话仍保留。',
         WORKSPACE_LOCATION_CONFLICT: '工作区来源选择已更新，本次确认不能覆盖新的选择；本轮未执行，你的原话仍保留。',
         LOCAL_USER_TURN_CHANGED: '本次输入已变化，本轮已停止，请确认对话后重新发送。',
         LOCAL_USER_TURN_UNCONFIRMED: '无法核对本次员工输入，本轮已停止；请在当前会话重新发送。',
         LOCAL_USER_TURN_ACCEPTANCE_INVALID: '本次输入的核验回执不一致，本轮已停止，请联系管理员。',
+        MODEL_CATALOG_REVOKED: '所选型号已不在当前主机目录中，本轮已停止；请在模型菜单核对选择。',
+        MODEL_CATALOG_SCOPE_CHANGED: '远程主机连接或可信目标已改变，本轮已停止；原输入没有自动重发。',
+        CONVERSATION_DETAILS_FAILED: '本轮已停止，技术详情保存未确认；下方分别列出运行与保存原因。',
         TECHNICAL_DETAILS_UNAVAILABLE: '技术详情暂不可用，请更新远程主机连接组件。',
         REMOTE_DETAIL_STORAGE_FAILED: '技术详情保存失败，本轮已停止，请联系管理员检查。',
         REMOTE_DETAIL_DELIVERY_UNKNOWN: '技术详情的持久结果无法核对，本轮已停止。',

package/dist/provider.d.ts

@@ -29,6 +29,7 @@ export interface EmployeeExecution {
 export interface Runtime {
     identity: string;
     cwd: string;
+    contextSignal?: AbortSignal;
     execution?: EmployeeExecution;
     acpTransport?: {
         writable: WritableStream<Uint8Array>;
@@ -141,7 +142,7 @@ type Result<T> = {
         code: string;
         message: string;
         requires: string;
-    } & Pick<ConnectNeed, 'officialReason'>;
+    } & Partial<Pick<ConnectNeed, 'officialReason' | 'layer' | 'actor' | 'action' | 'lastSeen'>>;
 };
 /** 消费正式connect-api 0.7公开子集；X不响应L登录票据、不直接调用登录。 */
 export interface ConnectApi extends Pick<LConnectApi, 'getConnectionState' | 'getLoginPromptState' | 'requestLoginPrompt' | 'refreshLoginPrompts'>, Partial<NativeWorkspaceApi>, Partial<Pick<LConnectApi, 'getWorkspaceBindingState' | 'getModelCatalogTarget' | 'onConnectionState' | 'onLoginPromptState' | 'appendRemoteConversationDetail' | 'getRemoteConversationDetailReceipt' | 'listRemoteConversationDetails' | 'getWorkspaceLocationState' | 'getLocalWorkspaceContext' | 'onWorkspaceLocationState' | 'acceptLocalWorkspaceUserTurn' | 'selectWorkspaceLocation'>> {

package/dist/provider.js

@@ -1,3 +1,5 @@
+import { hostWorkspaceGuard } from "./host-workspace.js";
+import { connectNeedError } from "./connect-need.js";
 import { loginDiagnostic, loginReason } from "./login-diagnostic.js";
 import { NeedError } from "./remote.js";
 import { CONNECTION_REQUIRED, TEST_HOST_NOTICE } from "./presentation.js";
@@ -38,8 +40,11 @@ function verifiedLogin(api, brand, expected) {
         throw new NeedError('CONNECTION_LOST', 'connection binding changed', 'current employee connection');
     requireLoginState(login);
     const reason = loginReason(login, connection, brand);
-    if (reason)
-        throw Object.assign(new NeedError(reason === 'LOGIN_REQUIRED' ? 'LOGIN_REQUIRED' : 'AUTH_STATUS_INVALID', reason === 'LOGIN_REQUIRED' ? '需要登录，请到设置 → 远程主机连接 点登录' : '无法确认当前品牌的登录状态', 'L核验的本品牌登录状态'), { technical: loginDiagnostic('verified-login', reason, brand, connection, login), ...(typeof login.providerNeeds[brand]?.officialReason === 'string' ? { officialReason: login.providerNeeds[brand].officialReason } : {}) });
+    if (reason) {
+        const original = (reason === 'LOGIN_PROVIDER_NEED' || reason === 'LOGIN_PHASE_BLOCKED') && login.instanceId === connection.instanceId ? login.providerNeeds[brand] : undefined;
+        const error = original ? connectNeedError(original) : new NeedError(reason === 'LOGIN_REQUIRED' ? 'LOGIN_REQUIRED' : 'AUTH_STATUS_INVALID', reason === 'LOGIN_REQUIRED' ? '需要登录，请到设置 → 远程主机连接 点登录' : '无法确认当前品牌的登录状态', 'L核验的本品牌登录状态');
+        throw Object.assign(error, { technical: loginDiagnostic('verified-login', reason, brand, connection, login), ...(typeof login.providerNeeds[brand]?.officialReason === 'string' ? { officialReason: login.providerNeeds[brand].officialReason } : {}) });
+    }
     return { ...connection };
 }
 /** Wait only for L's explicit in-progress evidence. No timer, polling, refresh or authorization. */
@@ -102,12 +107,12 @@ async function waitForLogin(api, brand, expected, get, signal) {
 async function ensureReady(api, brand, signal) {
     const result = await awaitL(() => api.ensureReady(brand), signal);
     if (!result.ok)
-        throw Object.assign(new NeedError(result.error.code, result.error.message, result.error.requires), { technical: loginDiagnostic('ensure-ready', 'L_ENSURE_READY_FAILED', brand, api.getConnectionState(), api.getLoginPromptState(), result.error.officialReason), ...(typeof result.error.officialReason === 'string' ? { officialReason: result.error.officialReason } : {}) });
+        throw Object.assign(connectNeedError(result.error), { technical: loginDiagnostic('ensure-ready', 'L_ENSURE_READY_FAILED', brand, api.getConnectionState(), api.getLoginPromptState(), result.error.officialReason), ...(typeof result.error.officialReason === 'string' ? { officialReason: result.error.officialReason } : {}) });
     return result.value;
 }
 export function unwrap(result) {
     if (!result.ok)
-        throw Object.assign(new NeedError(result.error.code, result.error.message, result.error.requires), typeof result.error.officialReason === 'string' ? { officialReason: result.error.officialReason } : {});
+        throw Object.assign(connectNeedError(result.error), typeof result.error.officialReason === 'string' ? { officialReason: result.error.officialReason } : {});
     return result.value;
 }
 export function validateTarget(t) {
@@ -155,6 +160,30 @@ export function sameTarget(a, b) {
 }
 export function connectProvider(get, options = {}) {
     const agent = options.agent ?? CODEX_AGENT;
+    const hostScopes = new WeakMap();
+    const hostMethods = new WeakMap();
+    const retainHostScope = (runtime, scope) => {
+        hostScopes.get(runtime)?.dispose();
+        hostScopes.set(runtime, scope);
+        runtime.contextSignal = scope.revocation;
+        if (hostMethods.has(runtime))
+            return;
+        const original = { dispose: runtime.dispose, detach: runtime.detach };
+        hostMethods.set(runtime, original);
+        const release = () => { hostScopes.get(runtime)?.dispose(); hostScopes.delete(runtime); };
+        runtime.dispose = async (cause) => { try {
+            await original.dispose?.(cause);
+        }
+        finally {
+            release();
+        } };
+        runtime.detach = async (cause) => { try {
+            await original.detach?.(cause);
+        }
+        finally {
+            release();
+        } };
+    };
     // Keep the legacy source SDK wrapper's strip-only import graph free of broker runtime syntax.
     // Cache the initialization promise so concurrent sessions share this provider's binding lifetimes.
     let employee;
@@ -203,6 +232,9 @@ export function connectProvider(get, options = {}) {
             request.localAdmissionCheck?.();
             admissions.set(request, { api, target, connection });
             sourceStage = 'local-admission';
+            const locations = api.getContractInfo().workspaceLocations === 1 ? api.getWorkspaceLocationState?.() : undefined;
+            if (locations && (locations.phase === 'failed' || locations.phase === 'disposed') && locations.instanceId === connection.instanceId && locations.epoch === connection.epoch && locations.need)
+                throw connectNeedError(locations.need);
             await options.local?.admit?.(request, api, connection, target);
             confirmedSource?.assertCurrent();
         }
@@ -228,88 +260,109 @@ export function connectProvider(get, options = {}) {
         request.localAdmissionCheck?.();
         if (!request.sessionId)
             throw new NeedError('PROJECT_BINDING_REQUIRED', '我需要当前会话和已选择的工作区，请使用原生工作区入口', 'DSH会话与原生工作区');
-        if (options.employee) {
-            employee ??= import("./employee-provider.js").then(module => module.createEmployeeProvider(get, options, agent));
-            const local = await (await employee)({ api, target, connection, request, stable: signal => request.timing.run('connection-confirm', () => waitForLogin(api, agent.loginProvider, connection, get, signal)) });
-            if (local) {
-                local.loginRequired = () => offerLogin(api, request, get, agent);
-                return local;
+        const host = await hostWorkspaceGuard(get, api, connection, target, request, options.workspaceSource?.workspace, agent.loginProvider);
+        try {
+            if (!host && options.employee) {
+                employee ??= import("./employee-provider.js").then(module => module.createEmployeeProvider(get, options, agent));
+                const local = await (await employee)({ api, target, connection, request, stable: signal => request.timing.run('connection-confirm', () => waitForLogin(api, agent.loginProvider, connection, get, signal)) });
+                if (local) {
+                    local.loginRequired = () => offerLogin(api, request, get, agent);
+                    return local;
+                }
             }
-        }
-        if (agent.loginProvider === 'claude' && options.local) {
-            const runtime = await options.local(request, api, connection, target);
-            if (runtime) {
+            if (!host && agent.loginProvider === 'claude' && options.local) {
+                const runtime = await options.local(request, api, connection, target);
+                if (runtime) {
+                    try {
+                        await stable();
+                    }
+                    catch (error) {
+                        await runtime.dispose?.();
+                        throw error;
+                    }
+                    return runtime;
+                }
+            }
+            if (!host) {
+                await options.notice?.reconcile(request, api);
+                await stable();
+            }
+            const resolved = await request.timing.run('workspace-resolve', async () => host ? host.resolve() : unwrap(await awaitL(() => api.resolveSessionProject(request.sessionId, { provider: agent.loginProvider, purpose: 'user-turn' }), request.signal)));
+            await stable();
+            host?.assertCurrent();
+            if (!resolved || resolved.instanceId !== connection.instanceId || resolved.epoch !== connection.epoch)
+                throw new NeedError('CONNECTION_LOST', '工作区解析回复已失效', '当前连接代次');
+            validateTarget(resolved.target);
+            const project = resolved.project;
+            const source = resolved.source;
+            if (resolved.sessionId !== request.sessionId || !resolved.workspaceId || !resolved.bindingId || !Number.isSafeInteger(resolved.bindingRevision) || resolved.bindingRevision < 1 || !sameTarget(target, resolved.target) || !project || (!host && (source !== undefined && source !== 'legacy-host' || typeof project.name !== 'string' || !project.name || project.name === '.' || project.name === '..' || /[\\/\x00-\x1f\x7f]/.test(project.name) || project.path !== resolved.target.projectRoot + '/' + project.name)))
+                throw new NeedError('PROJECT_BINDING_INVALID', '工作区绑定与当前会话或可信主机不一致', 'L核验的原生工作区绑定');
+            if (request.cwd && request.cwd !== project.path || request.bindingId && request.bindingId !== resolved.bindingId || request.workspaceId && request.workspaceId !== resolved.workspaceId)
+                throw new NeedError(host ? 'PROJECT_BINDING_INVALID' : 'SESSION_CONTEXT_MISMATCH', host ? '文件来源已改，请新建会话继续；原会话历史仍可查看。' : '原会话的工作区绑定已改变，请新建会话', '原工作区绑定');
+            const details = await request.timing.run('details-open', async () => options.details?.(request, api, connection, target));
+            try {
+                if (details)
+                    request.timing.bind(detail => details.record(detail));
+                await stable();
+                host?.assertCurrent();
+                let workspaceNotice = undefined;
+                const notice = !host && 'notice' in resolved ? resolved.notice : undefined;
+                if (notice) {
+                    if (!options.notice)
+                        throw new NeedError('DEPENDENCY_REQUIRED', '我需要官方会话持久记录来确认工作区说明', '官方会话与持久化服务');
+                    workspaceNotice = await request.timing.run('workspace-notice', () => options.notice.deliver(notice, resolved, request, api));
+                    await stable();
+                }
+                if (!options.open)
+                    throw new NeedError('RUNTIME_REQUIRED', '我需要主机运行适配器', '主机broker适配');
+                const observedBinding = host ? undefined : api.getWorkspaceBindingState?.();
+                const validateContext = async (ignoreCancellation = false) => {
+                    const check = () => waitForLogin(api, agent.loginProvider, connection, get, ignoreCancellation ? undefined : request.signal);
+                    await check();
+                    if (host && !ignoreCancellation)
+                        await host.resolve();
+                    if (observedBinding) {
+                        const current = api.getWorkspaceBindingState();
+                        if (current.instanceId !== observedBinding.instanceId || !current.items.some(item => item.bindingId === resolved.bindingId && item.workspaceId === resolved.workspaceId && item.status === 'ready'))
+                            throw new NeedError('SESSION_CONTEXT_MISMATCH', '当前工作区绑定已改变，原会话操作未执行', '原生会话原绑定');
+                    }
+                    await check();
+                    if (!ignoreCancellation)
+                        host?.assertCurrent();
+                };
+                host?.assertCurrent();
+                const runtime = await options.open(resolved.target, project, { ...request, ...(host ? { signal: host.signal } : {}), agent, bindingId: resolved.bindingId, workspaceId: resolved.workspaceId, bindingRevision: resolved.bindingRevision, detailChannel: details, validateContext });
                 try {
                     await stable();
+                    host?.observeRuntime(runtime);
                 }
                 catch (error) {
                     await runtime.dispose?.();
                     throw error;
                 }
+                if (host)
+                    retainHostScope(runtime, host);
+                // The transport can outlive a turn; presentation belongs only to this invocation.
+                runtime.workspaceNotice = workspaceNotice || undefined;
+                runtime.details = details ?? runtime.details;
+                runtime.binding = { bindingId: resolved.bindingId, workspaceId: resolved.workspaceId, revision: resolved.bindingRevision };
+                runtime.connection = { ...connection };
+                runtime.loginRequired = () => offerLogin(api, request, get, agent);
                 return runtime;
             }
-        }
-        await options.notice?.reconcile(request, api);
-        await stable();
-        const resolved = await request.timing.run('workspace-resolve', async () => unwrap(await awaitL(() => api.resolveSessionProject(request.sessionId, { provider: agent.loginProvider, purpose: 'user-turn' }), request.signal)));
-        await stable();
-        if (!resolved || resolved.instanceId !== connection.instanceId || resolved.epoch !== connection.epoch)
-            throw new NeedError('CONNECTION_LOST', '工作区解析回复已失效', '当前连接代次');
-        validateTarget(resolved.target);
-        const project = resolved.project;
-        if (resolved.sessionId !== request.sessionId || !resolved.workspaceId || !resolved.bindingId || !Number.isSafeInteger(resolved.bindingRevision) || resolved.bindingRevision < 1 || !sameTarget(target, resolved.target) || !project || typeof project.name !== 'string' || !project.name || project.name === '.' || project.name === '..' || /[\\/\x00-\x1f\x7f]/.test(project.name) || project.path !== resolved.target.projectRoot + '/' + project.name)
-            throw new NeedError('PROJECT_BINDING_INVALID', '工作区绑定与当前会话或可信主机不一致', 'L核验的原生工作区绑定');
-        if (request.cwd && request.cwd !== project.path || request.bindingId && request.bindingId !== resolved.bindingId || request.workspaceId && request.workspaceId !== resolved.workspaceId)
-            throw new NeedError('SESSION_CONTEXT_MISMATCH', '原会话的工作区绑定已改变，请新建会话', '原工作区绑定');
-        const details = await request.timing.run('details-open', async () => options.details?.(request, api, connection, target));
-        try {
-            if (details)
-                request.timing.bind(detail => details.record(detail));
-            await stable();
-            let workspaceNotice = undefined;
-            if (resolved.notice) {
-                if (!options.notice)
-                    throw new NeedError('DEPENDENCY_REQUIRED', '我需要官方会话持久记录来确认工作区说明', '官方会话与持久化服务');
-                workspaceNotice = await request.timing.run('workspace-notice', () => options.notice.deliver(resolved.notice, resolved, request, api));
-                await stable();
-            }
-            if (!options.open)
-                throw new NeedError('RUNTIME_REQUIRED', '我需要主机运行适配器', '主机broker适配');
-            const observedBinding = api.getWorkspaceBindingState?.();
-            const validateContext = async (ignoreCancellation = false) => {
-                const check = () => waitForLogin(api, agent.loginProvider, connection, get, ignoreCancellation ? undefined : request.signal);
-                await check();
-                if (observedBinding) {
-                    const current = api.getWorkspaceBindingState();
-                    if (current.instanceId !== observedBinding.instanceId || !current.items.some(item => item.bindingId === resolved.bindingId && item.workspaceId === resolved.workspaceId && item.status === 'ready'))
-                        throw new NeedError('SESSION_CONTEXT_MISMATCH', '当前工作区绑定已改变，原会话操作未执行', '原生会话原绑定');
-                }
-                await check();
-            };
-            const runtime = await options.open(resolved.target, project, { ...request, agent, bindingId: resolved.bindingId, workspaceId: resolved.workspaceId, bindingRevision: resolved.bindingRevision, detailChannel: details, validateContext });
-            try {
-                await stable();
-            }
             catch (error) {
-                await runtime.dispose?.();
+                try {
+                    await details?.flush();
+                }
+                catch (diagnostic) {
+                    const code = (value) => value instanceof NeedError && /^[A-Z][A-Z0-9_]*$/.test(value.code) ? value.code : 'UNKNOWN_FAILURE';
+                    throw new NeedError('CONVERSATION_DETAILS_FAILED', '技术详情未能保存；本轮已停止', `原错误代码 ${code(error)}；诊断错误代码 ${code(diagnostic)}`);
+                }
                 throw error;
             }
-            // The transport can outlive a turn; presentation belongs only to this invocation.
-            runtime.workspaceNotice = workspaceNotice || undefined;
-            runtime.details = details ?? runtime.details;
-            runtime.binding = { bindingId: resolved.bindingId, workspaceId: resolved.workspaceId, revision: resolved.bindingRevision };
-            runtime.connection = { ...connection };
-            runtime.loginRequired = () => offerLogin(api, request, get, agent);
-            return runtime;
         }
         catch (error) {
-            try {
-                await details?.flush();
-            }
-            catch (diagnostic) {
-                const code = (value) => value instanceof NeedError && /^[A-Z][A-Z0-9_]*$/.test(value.code) ? value.code : 'UNKNOWN_FAILURE';
-                throw new NeedError('CONVERSATION_DETAILS_FAILED', '技术详情未能保存；本轮已停止', `原错误代码 ${code(error)}；诊断错误代码 ${code(diagnostic)}`);
-            }
+            host?.dispose();
             throw error;
         }
     };