@ai-workbench/connect 0.7.7 → 0.7.9

package/lib/connect.js

@@ -14,6 +14,7 @@ export function validEnrollment(e) {
 export function createConnect(ports, emit, options = {}) {
     let state = { phase: 'idle' }, generation = 0, disposed = false;
     let flight;
+    let trustedTarget;
     const instanceId = randomUUID();
     let connection = { instanceId, phase: 'unavailable', epoch: 0 };
     const connectionListeners = new Set();
@@ -22,6 +23,8 @@ export function createConnect(ports, emit, options = {}) {
         const next = { instanceId, phase, epoch: generation, ...(need ? { need } : {}) };
         if (JSON.stringify(next) === JSON.stringify(connection))
             return;
+        if (phase !== 'connected')
+            trustedTarget = undefined;
         connection = structuredClone(next);
         startup?.connectionChanged(next);
         options.onConnectionState?.(structuredClone(next));
@@ -51,18 +54,24 @@ export function createConnect(ports, emit, options = {}) {
     const connect = () => {
         if (disposed)
             return Promise.resolve(fail('DISPOSED'));
-        if (state.target)
-            return Promise.resolve(ok(structuredClone(state.target)));
+        if (state.target && connection.phase === 'connected' && trustedTarget)
+            return Promise.resolve(ok(structuredClone(trustedTarget)));
         if (flight)
             return flight;
+        // Replacing an established transport is a new trusted generation, even without a network-lost event.
+        if (connection.phase === 'connected') {
+            generation++;
+            controller.abort();
+            controller = new AbortController();
+            loginFlights.clear();
+        }
         const g = generation, signal = controller.signal;
-        if (connection.phase !== 'connected')
-            setConnection('connecting');
+        setConnection('connecting');
         const run = async () => {
             if (!ports.enrollment)
-                return transportBlock(dependency('S host-layout/enroll.json 适配器'));
+                return transportBlock(dependency('管理员发放的主机连接资料'));
             if (!ports.network)
-                return transportBlock(dependency('N net-helper 生命周期/状态适配器'));
+                return transportBlock(dependency('远程网络连接服务'));
             if (!ports.ssh)
                 return transportBlock(dependency('系统 SSH 适配器'));
             try {
@@ -83,7 +92,7 @@ export function createConnect(ports, emit, options = {}) {
                 if (!n.ok)
                     return transportBlock(n);
                 if (typeof n.value.proxyCommand !== 'string' || n.value.proxyCommand.length === 0 || /[\r\n\x00]/.test(n.value.proxyCommand))
-                    return transportBlock(dependency('有效的 N ProxyCommand'));
+                    return transportBlock(dependency('有效的远程网络连接通道'));
                 const { host, username, port, projectRoot, knownHostsFile, session, hostContext } = e.value;
                 const target = { host, username, port, projectRoot, knownHostsFile, session, ...(hostContext ? { hostContext } : {}), proxyCommand: n.value.proxyCommand };
                 publish({ phase: 'ssh' });
@@ -94,11 +103,12 @@ export function createConnect(ports, emit, options = {}) {
                 if (!verified.ok)
                     return transportBlock(verified);
                 publish({ phase: 'connected', target });
+                trustedTarget = structuredClone(target);
                 setConnection('connected');
                 return ok(structuredClone(target));
             }
             catch {
-                return invalid(g) ?? transportBlock(dependency('提供方调用失败，根因未查明；请检查 S/N/SSH 适配器'));
+                return invalid(g) ?? transportBlock(dependency('连接服务调用失败，根因未查明；请管理员检查连接资料、网络连接服务和 SSH 通道'));
             }
         };
         const promise = track(run());
@@ -111,8 +121,8 @@ export function createConnect(ports, emit, options = {}) {
     const checkLogin = async (provider) => {
         if (provider !== 'claude' && provider !== 'codex')
             return fail('AUTH_STATUS_INVALID');
-        const g = generation;
-        const connected = await connect();
+        const connecting = connect(), g = generation;
+        const connected = await connecting;
         const staleConnection = invalid(g);
         if (staleConnection)
             return staleConnection;
@@ -143,8 +153,8 @@ export function createConnect(ports, emit, options = {}) {
         if (prior)
             return prior;
         const run = async () => {
-            const g = generation;
-            const connected = await connect();
+            const connecting = connect(), g = generation;
+            const connected = await connecting;
             const staleConnection = invalid(g);
             if (staleConnection)
                 return staleConnection;
@@ -160,7 +170,9 @@ export function createConnect(ports, emit, options = {}) {
                     return stale;
                 if (!r.ok)
                     return ['network', 'ssh', 'enrollment'].includes(r.error.layer) ? transportBlock(r) : block(r);
-                const checked = await checkLogin(provider);
+                const checked = await checkLogin(provider), staleChecked = invalid(g);
+                if (staleChecked)
+                    return staleChecked;
                 return checked.ok && !checked.value.loggedIn ? block(fail('LOGIN_FAILED')) : checked;
             }
             catch {
@@ -179,7 +191,7 @@ export function createConnect(ports, emit, options = {}) {
             return fail('DISPOSED');
         if (operation === 'create' && !isProjectName(name))
             return fail('PROJECT_NAME_INVALID');
-        const g = generation, connected = await connect();
+        const connecting = connect(), g = generation, connected = await connecting;
         const stale = invalid(g);
         if (stale)
             return stale;
@@ -215,6 +227,19 @@ export function createConnect(ports, emit, options = {}) {
     startup = createStartup(operations, options.providers ?? ['codex', 'claude'], options.onPromptState, options.onPromptResult, instanceId);
     return {
         ...operations,
+        getModelCatalogTarget: provider => {
+            if (disposed)
+                return fail('DISPOSED');
+            if (provider !== 'claude' && provider !== 'codex')
+                return fail('MODEL_CATALOG_CONTEXT_INVALID');
+            if (connection.phase !== 'connected' || !trustedTarget)
+                return fail('CONNECTION_LOST');
+            return ok({ version: 1, purpose: 'model-catalog', scope: 'host-user', instanceId, epoch: connection.epoch, provider, target: structuredClone(trustedTarget) });
+        },
+        appendRemoteConversationDetail: async () => dependency('官方会话存储与持久诊断记录'),
+        getRemoteConversationDetailReceipt: async () => dependency('官方会话存储与持久诊断记录'),
+        getRemoteConversationDetailState: () => ({ instanceId, epoch: connection.epoch, revision: 0, phase: disposed ? 'disposed' : 'unavailable', sessions: [], need: need(disposed ? 'DISPOSED' : 'DEPENDENCY_REQUIRED') }),
+        onRemoteConversationDetailState: () => () => { }, listRemoteConversationDetails: async () => dependency('官方会话存储与持久诊断记录'),
         getContractInfo: () => ({ apiVersion: '0.7.0', status: 'implemented', workspaceBinding: 'native-local-v1' }),
         getEnrollmentState: () => ({ instanceId, revision: 0, phase: 'blocked', need: need('DEPENDENCY_REQUIRED') }), onEnrollmentState: () => () => { },
         importEnrollment: async () => dependency('官方profileContext与原生目录选择服务'),
@@ -227,8 +252,8 @@ export function createConnect(ports, emit, options = {}) {
         login: async (provider) => { const request = await startup.request(provider, 'automatic'); if (!request.ok)
             return request; return request.value.logins[provider] === true ? ok({ provider, loggedIn: true }) : fail('LOGIN_REQUIRED'); },
         ensureReady: provider => track((async () => {
-            const g = generation;
-            const r = await checkLogin(provider);
+            const checking = checkLogin(provider), g = generation;
+            const r = await checking;
             const stale = invalid(g);
             if (stale)
                 return stale;
@@ -238,7 +263,8 @@ export function createConnect(ports, emit, options = {}) {
                 const request = await startup.request(provider, 'automatic');
                 return invalid(g) ?? (!request.ok ? request : fail('LOGIN_REQUIRED'));
             }
-            return connect();
+            const connected = await connect();
+            return invalid(g) ?? connected;
         })()),
         dispose: () => { if (disposal)
             return disposal; startup.stop(); disposed = true; generation++; controller.abort(); unsubscribe?.(); publish({ phase: 'disposed' }); setConnection('disposed'); connectionListeners.clear(); disposal = Promise.allSettled([...pending]).then(() => startup.dispose()); return disposal; },

package/lib/conversation-detail-settings.d.ts

@@ -0,0 +1,32 @@
+export interface ConversationDetailSettingsValues {
+    maxEventBytes: number;
+    pageSize: number;
+}
+export interface ConversationDetailSettingsState {
+    instanceId: string;
+    revision: number;
+    phase: 'loading' | 'ready' | 'saving' | 'failed' | 'disposed';
+    values?: ConversationDetailSettingsValues;
+    source: 'config' | 'saved';
+    errorCode?: 'SETTINGS_REQUIRED' | 'REMOTE_DETAIL_STORAGE_FAILED';
+}
+export declare function validDetailSettings(v: any): v is ConversationDetailSettingsValues;
+export declare function createConversationDetailSettings(options: {
+    profileDir?: string;
+    initial?: Partial<ConversationDetailSettingsValues>;
+    metadataMaxBytes?: number;
+}): {
+    ready: Promise<void>;
+    getState: () => ConversationDetailSettingsState;
+    values: () => ConversationDetailSettingsValues | undefined;
+    onState(fn: () => void): () => void;
+    save: (input: ConversationDetailSettingsValues) => Promise<{
+        ok: false;
+        error: import("./api.ts").ConnectNeed;
+    } | {
+        ok: true;
+        value: undefined;
+    }>;
+    dispose(): Promise<void>;
+};
+export type ConversationDetailSettings = ReturnType<typeof createConversationDetailSettings>;

package/lib/conversation-detail-settings.js

@@ -0,0 +1,119 @@
+import { join, isAbsolute } from 'node:path';
+import { lstat, open, realpath, rename, rm } from 'node:fs/promises';
+import { constants } from 'node:fs';
+import { randomUUID } from 'node:crypto';
+import { CONVERSATION_DETAIL_DEFAULTS, L_DEFAULTS } from "./defaults.js";
+import { privateDirectory, readPrivate } from "./private-files.js";
+import { fail, ok } from "./needs.js";
+const queues = new Map();
+export function validDetailSettings(v) { return !!v && typeof v === 'object' && Object.keys(v).sort().join(',') === 'maxEventBytes,pageSize' && [v.maxEventBytes, v.pageSize].every(n => Number.isSafeInteger(n) && n > 0); }
+export function createConversationDetailSettings(options) {
+    const root = options.profileDir ? join(options.profileDir, 'ai-workbench-connect') : undefined, file = root ? join(root, 'conversation-detail-settings.json') : undefined;
+    let state = { instanceId: randomUUID(), revision: 0, phase: 'loading', source: 'config' }, disposed = false, tail = Promise.resolve();
+    const listeners = new Set();
+    function publish(next) { state = { ...state, ...next, revision: state.revision + 1 }; for (const fn of listeners)
+        fn(); }
+    async function directory() { if (!options.profileDir || !root || !isAbsolute(options.profileDir) || await realpath(options.profileDir) !== options.profileDir)
+        throw Error('SETTINGS_PROFILE_INVALID'); await privateDirectory(root); if (await realpath(root) !== root)
+        throw Error('SETTINGS_PATH_INVALID'); const st = await lstat(root); if ((st.mode & 0o777) !== 0o700)
+        throw Error('SETTINGS_PATH_INVALID'); const parent = await open(options.profileDir, constants.O_RDONLY | constants.O_NOFOLLOW); try {
+        await parent.sync();
+    }
+    finally {
+        await parent.close();
+    } }
+    async function existing() { const st = await lstat(file); if (!st.isFile() || st.isSymbolicLink() || st.nlink !== 1 || (st.mode & 0o777) !== 0o600)
+        throw Error('SETTINGS_PATH_INVALID'); }
+    const ready = (async () => {
+        try {
+            await directory();
+            let values = { ...CONVERSATION_DETAIL_DEFAULTS, ...options.initial }, source = 'config';
+            try {
+                await existing();
+                const saved = JSON.parse(await readPrivate(file, options.metadataMaxBytes ?? L_DEFAULTS.enrollmentMetadataMaxBytes));
+                if (saved.version !== 1 || !validDetailSettings(saved.values))
+                    throw Error('SETTINGS_INVALID');
+                values = saved.values;
+                source = 'saved';
+            }
+            catch (e) {
+                if (e.code !== 'ENOENT')
+                    throw e;
+            }
+            if (!validDetailSettings(values))
+                throw Error('SETTINGS_INVALID');
+            if (!disposed)
+                publish({ phase: 'ready', values, source });
+        }
+        catch {
+            if (!disposed)
+                publish({ phase: 'failed', values: undefined, errorCode: 'REMOTE_DETAIL_STORAGE_FAILED' });
+        }
+    })();
+    function save(input) {
+        if (!validDetailSettings(input))
+            return Promise.resolve(fail('SETTINGS_REQUIRED'));
+        const values = structuredClone(input);
+        const task = (queues.get(file ?? '') ?? Promise.resolve()).then(async () => {
+            await ready;
+            if (disposed)
+                return fail('DISPOSED');
+            if (state.phase === 'failed')
+                return fail('REMOTE_DETAIL_STORAGE_FAILED');
+            publish({ phase: 'saving', errorCode: undefined });
+            let temp;
+            try {
+                await directory();
+                try {
+                    await existing();
+                }
+                catch (e) {
+                    if (e.code !== 'ENOENT')
+                        throw e;
+                }
+                const bytes = JSON.stringify({ version: 1, values }) + '\n';
+                if (Buffer.byteLength(bytes) > (options.metadataMaxBytes ?? L_DEFAULTS.enrollmentMetadataMaxBytes))
+                    throw Error('SETTINGS_LIMIT');
+                temp = join(root, '.conversation-detail-settings-' + randomUUID());
+                const h = await open(temp, 'wx', 0o600);
+                try {
+                    await h.writeFile(bytes);
+                    await h.sync();
+                }
+                finally {
+                    await h.close();
+                }
+                if (disposed)
+                    return fail('DISPOSED');
+                await rename(temp, file);
+                temp = undefined;
+                const dir = await open(root, constants.O_RDONLY | constants.O_NOFOLLOW);
+                try {
+                    await dir.sync();
+                }
+                finally {
+                    await dir.close();
+                }
+                if (disposed)
+                    return fail('DISPOSED');
+                publish({ phase: 'ready', values, source: 'saved', errorCode: undefined });
+                return ok(undefined);
+            }
+            catch {
+                publish({ phase: 'failed', values: undefined, errorCode: 'REMOTE_DETAIL_STORAGE_FAILED' });
+                return fail('REMOTE_DETAIL_STORAGE_FAILED');
+            }
+            finally {
+                if (temp)
+                    await rm(temp, { force: true });
+            }
+        });
+        const done = task.then(() => { }, () => { });
+        queues.set(file ?? '', done);
+        tail = done;
+        void done.then(() => { if (queues.get(file ?? '') === done)
+            queues.delete(file ?? ''); });
+        return task;
+    }
+    return { ready, getState: () => structuredClone(state), values: () => state.phase === 'ready' ? structuredClone(state.values) : undefined, onState(fn) { listeners.add(fn); return () => { listeners.delete(fn); }; }, save, async dispose() { disposed = true; await ready; await tail; publish({ phase: 'disposed', values: undefined }); listeners.clear(); } };
+}

package/lib/conversation-details.d.ts

@@ -0,0 +1,21 @@
+import type { ConnectApi, ConnectionState, Provider, RemoteConversationDetail, RemoteConversationDetailState, Result } from './api.ts';
+export interface ConversationDetailOptions {
+    profileDir: string;
+    maxEventBytes: number;
+    pageSize: number;
+    getConnectionState: () => ConnectionState;
+    context: () => Promise<Result<{
+        identity: string;
+    }>>;
+    scope: (sessionId: string, provider: Provider) => Promise<Result<{
+        identity: string;
+    }>>;
+    onState?: (state: RemoteConversationDetailState) => void;
+}
+export declare function validRemoteConversationDetail(v: any): v is RemoteConversationDetail;
+type DetailsApi = Pick<ConnectApi, 'appendRemoteConversationDetail' | 'getRemoteConversationDetailReceipt' | 'getRemoteConversationDetailState' | 'onRemoteConversationDetailState' | 'listRemoteConversationDetails'>;
+export declare function createConversationDetails(options: ConversationDetailOptions): DetailsApi & {
+    observeConnection: (state: ConnectionState) => void;
+    dispose: () => Promise<void>;
+};
+export {};