@calliopelabs/cli 3.3.1 → 3.4.0

package/dist/attach.d.ts

@@ -22,6 +22,7 @@
  */
 /** Protocol versions offered in `initialize`; keep in step with calliope-vscode scripts/ahp-supported-versions.json. */
 export declare const SUPPORTED_VERSIONS: string[];
+export declare const ATTACH_TIMEOUT_MS = 60000;
 export type FallbackReason = 'disabled' | 'unentitled' | 'auth' | 'version' | 'unreachable';
 export declare const FALLBACK_EXIT = 3;
 type Fail = {
@@ -33,10 +34,13 @@ export declare function isDisabled(env?: NodeJS.ProcessEnv): boolean;
 /** A session's default chat channel: `ahp-chat://default/<base64url(session)>`. */
 export declare function defaultChatUri(session: string): string;
 /**
- * Node's WebSocket hides the status of a refused upgrade, so ask plainly first:
- * an authorized agent-host route answers a plain GET with 426 Upgrade Required.
+ * Classify authentication refusals before upgrading the transport. An authorized
+ * agent-host route answers a plain GET with 426 Upgrade Required.
  */
-export declare function preflight(wsUrl: string, headers: Record<string, string>, fetchImpl?: typeof fetch): Promise<Fail | undefined>;
+export declare function preflight(wsUrl: string, headers: Record<string, string>, fetchImpl?: typeof fetch, options?: {
+    timeoutMs?: number;
+    signal?: AbortSignal;
+}): Promise<Fail | undefined>;
 /** Find (or start) the user's agent host on a JupyterHub; returns its WebSocket URL. */
 export declare function resolveHubHost(opts: {
     hubUrl: string;
@@ -59,19 +63,27 @@ interface Message {
         message: string;
     };
 }
+interface AttachSocket {
+    send(data: string): void;
+    close(): void;
+    terminate?(): void;
+    addEventListener(type: string, fn: (ev: any) => void): void;
+}
 /** The minimal JSON-RPC client attach needs, over any WebSocket-shaped object. */
 export declare class AhpConnection {
     private readonly ws;
     private nextId;
     private readonly pending;
+    private failure?;
+    private onClosed?;
     readonly actions: Array<(action: any, channel: string, serverSeq?: number) => void>;
-    closed?: (detail: string) => void;
-    constructor(ws: {
-        send(data: string): void;
-        close(): void;
-        addEventListener(type: string, fn: (ev: any) => void): void;
-    });
-    call(method: string, params: Record<string, unknown>): Promise<Message>;
+    set closed(callback: ((detail: string) => void) | undefined);
+    constructor(ws: AttachSocket);
+    private stop;
+    call(method: string, params: Record<string, unknown>, options?: {
+        timeoutMs?: number;
+        signal?: AbortSignal;
+    }): Promise<Message>;
     dispatch(channel: string, clientSeq: number, action: Record<string, unknown>): void;
     close(): void;
 }
@@ -144,6 +156,9 @@ export interface SessionSnapshot {
 export declare function follow(conn: AhpConnection, session: string, io: FollowIo, subscribed?: Promise<ChatSnapshot | undefined>, sessionSubscribed?: Promise<SessionSnapshot | undefined>): {
     done: Promise<string>;
 };
-export declare function runAttach(args: string[], env?: NodeJS.ProcessEnv): Promise<number>;
+export declare function runAttach(args: string[], env?: NodeJS.ProcessEnv, options?: {
+    timeoutMs?: number;
+    createSocket?: (url: string, headers: Record<string, string>) => AttachSocket;
+}): Promise<number>;
 export {};
 //# sourceMappingURL=attach.d.ts.map

package/dist/attach.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attach.d.ts","sourceRoot":"","sources":["../src/attach.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"attach.d.ts","sourceRoot":"","sources":["../src/attach.ts"],"names":[],"mappings":"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"}

package/dist/attach.js

@@ -21,8 +21,10 @@
  * CALLIOPE_AHP=off is the kill switch.
  */
 import * as readline from 'readline';
+import WebSocket from 'ws';
 /** Protocol versions offered in `initialize`; keep in step with calliope-vscode scripts/ahp-supported-versions.json. */
-export const SUPPORTED_VERSIONS = ['1.0.0', '0.6.0'];
+export const SUPPORTED_VERSIONS = ['1.0.0', '0.9.0', '0.6.0'];
+export const ATTACH_TIMEOUT_MS = 60_000;
 export const FALLBACK_EXIT = 3;
 const ROOT = 'ahp-root://';
 const UNSUPPORTED_PROTOCOL_VERSION = -32005;
@@ -35,13 +37,17 @@ export function defaultChatUri(session) {
     return `ahp-chat://default/${Buffer.from(session).toString('base64url')}`;
 }
 /**
- * Node's WebSocket hides the status of a refused upgrade, so ask plainly first:
- * an authorized agent-host route answers a plain GET with 426 Upgrade Required.
+ * Classify authentication refusals before upgrading the transport. An authorized
+ * agent-host route answers a plain GET with 426 Upgrade Required.
  */
-export async function preflight(wsUrl, headers, fetchImpl = fetch) {
+export async function preflight(wsUrl, headers, fetchImpl = fetch, options = {}) {
     const http = wsUrl.replace(/^ws/, 'http');
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), options.timeoutMs ?? ATTACH_TIMEOUT_MS);
+    const signal = options.signal ? AbortSignal.any([options.signal, controller.signal]) : controller.signal;
     try {
-        const res = await fetchImpl(http, { headers, redirect: 'manual' });
+        const res = await fetchImpl(http, { headers, redirect: 'manual', signal });
+        void res.body?.cancel().catch(() => { });
         if (res.status === 426 || res.ok) {
             return undefined;
         }
@@ -49,8 +55,12 @@ export async function preflight(wsUrl, headers, fetchImpl = fetch) {
         const toLogin = res.status >= 300 && res.status < 400 && /\/(hub\/)?login|oauth/.test(res.headers.get('location') ?? '');
         return fail(res.status === 401 || res.status === 403 || toLogin ? 'auth' : 'unreachable', `the host route answered HTTP ${res.status}`);
     }
-    catch (err) {
-        return fail('unreachable', `cannot reach ${http}: ${err.message}`);
+    catch {
+        return fail('unreachable', signal.aborted ? 'host preflight timed out' : 'host preflight failed');
+    }
+    finally {
+        clearTimeout(timer);
+        controller.abort();
     }
 }
 /** Find (or start) the user's agent host on a JupyterHub; returns its WebSocket URL. */
@@ -58,10 +68,30 @@ export async function resolveHubHost(opts) {
     const { hubUrl, user, token, serverName = 'agenthost', fetchImpl = fetch, timeoutMs = 60_000 } = opts;
     const api = new URL('hub/api/', hubUrl.endsWith('/') ? hubUrl : `${hubUrl}/`);
     const headers = { Authorization: `token ${token}` };
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    const request = (url, init = {}) => fetchImpl(url, {
+        ...init, signal: controller.signal, redirect: 'error', credentials: 'omit',
+    });
     const deadline = Date.now() + timeoutMs;
     try {
+        const tap = await request(new URL('/agent-host/status', hubUrl), { headers });
+        if (tap.status === 401)
+            return fail('auth', 'hub tap refused the credential');
+        if (tap.status !== 404) {
+            const body = await tap.json();
+            if (tap.ok && body?.enabled === true && body.endpoint === '/agent-host/') {
+                const ws = new URL('/agent-host/', hubUrl);
+                ws.protocol = ws.protocol === 'https:' ? 'wss:' : 'ws:';
+                return { ok: true, url: ws.toString() };
+            }
+            const reason = body?.reason === 'disabled' || body?.reason === 'unentitled' || body?.reason === 'auth'
+                ? body.reason : tap.status === 403 ? 'auth' : 'unreachable';
+            return fail(reason, `hub tap answered ${tap.status}`);
+        }
         for (let spawned = false;;) {
-            const res = await fetchImpl(new URL(`users/${encodeURIComponent(user)}`, api), { headers });
+            controller.signal.throwIfAborted();
+            const res = await request(new URL(`users/${encodeURIComponent(user)}`, api), { headers });
             if (!res.ok) {
                 return fail(res.status === 401 || res.status === 403 ? 'auth' : 'unreachable', `hub user lookup answered ${res.status}`);
             }
@@ -69,30 +99,35 @@ export async function resolveHubHost(opts) {
             const server = body.servers?.[serverName];
             if (server?.ready && server.url) {
                 const ws = new URL(`${server.url}agent-host/`, hubUrl);
+                if (ws.origin !== new URL(hubUrl).origin)
+                    return fail('unreachable', 'hub answered a foreign server URL');
                 ws.protocol = ws.protocol === 'https:' ? 'wss:' : 'ws:';
                 return { ok: true, url: ws.toString() };
             }
-            if (!spawned) {
-                const spawn = await fetchImpl(new URL(`users/${encodeURIComponent(user)}/servers/${encodeURIComponent(serverName)}`, api), { method: 'POST', headers });
-                if (spawn.status === 401) {
+            if (!spawned && !server?.pending) {
+                const spawn = await request(new URL(`users/${encodeURIComponent(user)}/servers/${encodeURIComponent(serverName)}`, api), {
+                    method: 'POST', headers: { ...headers, 'Content-Type': 'application/json' }, body: JSON.stringify({ profile: serverName }),
+                });
+                if (spawn.status === 401)
                     return fail('auth', 'hub refused the token');
-                }
                 if (spawn.status === 403 || (spawn.status === 400 && !server)) {
                     return fail('unentitled', `hub refused to start ${serverName}: ${spawn.status}`);
                 }
-                if (!spawn.ok && spawn.status !== 400) {
+                if (!spawn.ok && spawn.status !== 400)
                     return fail('unreachable', `hub could not start ${serverName}: ${spawn.status}`);
-                }
                 spawned = true;
             }
-            if (Date.now() >= deadline) {
+            if (Date.now() >= deadline)
                 return fail('unreachable', `${serverName} not ready within ${Math.round(timeoutMs / 1000)}s`);
-            }
-            await new Promise(resolve => setTimeout(resolve, 1000));
+            await new Promise(resolve => setTimeout(resolve, Math.min(1000, Math.max(0, deadline - Date.now()))));
         }
     }
     catch (err) {
-        return fail('unreachable', `hub unreachable: ${err.message}`);
+        return fail('unreachable', controller.signal.aborted ? 'hub discovery timed out' : `hub unreachable: ${err.message}`);
+    }
+    finally {
+        clearTimeout(timer);
+        controller.abort();
     }
 }
 /** The minimal JSON-RPC client attach needs, over any WebSocket-shaped object. */
@@ -100,15 +135,34 @@ export class AhpConnection {
     ws;
     nextId = 1;
     pending = new Map();
+    failure;
+    onClosed;
     actions = [];
-    closed;
+    set closed(callback) {
+        this.onClosed = callback;
+        if (this.failure)
+            callback?.(this.failure);
+    }
     constructor(ws) {
         this.ws = ws;
         ws.addEventListener('message', ev => {
-            const msg = JSON.parse(String(ev.data));
+            if (this.failure)
+                return;
+            let msg;
+            try {
+                msg = JSON.parse(String(ev.data));
+                if (!msg || typeof msg !== 'object' || Array.isArray(msg))
+                    throw new Error('invalid frame');
+            }
+            catch {
+                this.stop('invalid host message');
+                return;
+            }
             if (msg.id !== undefined && this.pending.has(msg.id)) {
-                this.pending.get(msg.id).resolve(msg);
+                const pending = this.pending.get(msg.id);
                 this.pending.delete(msg.id);
+                pending.cleanup();
+                pending.resolve(msg);
                 return;
             }
             if (msg.method === 'action' && msg.params?.action) {
@@ -117,20 +171,51 @@ export class AhpConnection {
                 }
             }
         });
-        ws.addEventListener('close', ev => this.closed?.(`connection closed (${ev.code ?? 'unknown'})`));
+        ws.addEventListener('close', ev => this.stop(`connection closed (${ev.code ?? 'unknown'})`));
+        ws.addEventListener('error', () => this.stop('host transport failed'));
     }
-    call(method, params) {
+    stop(detail) {
+        if (this.failure)
+            return;
+        this.failure = detail;
+        for (const pending of this.pending.values()) {
+            pending.cleanup();
+            pending.resolve({ error: { code: -32000, message: detail } });
+        }
+        this.pending.clear();
+        this.onClosed?.(detail);
+        try {
+            this.ws.terminate ? this.ws.terminate() : this.ws.close();
+        }
+        catch { /* Already closed. */ }
+    }
+    call(method, params, options = {}) {
+        if (this.failure)
+            return Promise.resolve({ error: { code: -32000, message: this.failure } });
+        if (options.signal?.aborted) {
+            this.stop('host setup timed out');
+            return Promise.resolve({ error: { code: -32000, message: this.failure } });
+        }
         const id = this.nextId++;
         return new Promise(resolve => {
-            this.pending.set(id, { resolve });
-            this.ws.send(JSON.stringify({ jsonrpc: '2.0', id, method, params }));
+            const aborted = () => this.stop('host setup timed out');
+            const timer = setTimeout(() => this.stop('host request timed out'), options.timeoutMs ?? ATTACH_TIMEOUT_MS);
+            const cleanup = () => { clearTimeout(timer); options.signal?.removeEventListener('abort', aborted); };
+            this.pending.set(id, { resolve, cleanup });
+            options.signal?.addEventListener('abort', aborted, { once: true });
+            try {
+                this.ws.send(JSON.stringify({ jsonrpc: '2.0', id, method, params }));
+            }
+            catch {
+                this.stop('host request failed');
+            }
         });
     }
     dispatch(channel, clientSeq, action) {
         this.ws.send(JSON.stringify({ jsonrpc: '2.0', method: 'dispatchAction', params: { channel, clientSeq, action } }));
     }
     close() {
-        this.ws.close();
+        this.stop('connection closed');
     }
 }
 /** Classify the `initialize` answer; undefined when the host is usable. */
@@ -162,6 +247,7 @@ export function follow(conn, session, io, subscribed, sessionSubscribed) {
     const chat = defaultChatUri(session);
     let seq = 0;
     let finish;
+    let ended = false;
     const done = new Promise(resolve => { finish = resolve; });
     // Confirmations this client knows are open, by tool call, each able to
     // withdraw its prompt. One prompt at a time: a snapshot can hold several, and
@@ -191,11 +277,14 @@ export function follow(conn, session, io, subscribed, sessionSubscribed) {
     };
     // Following is over: no prompt outlives it, or its readline keeps the process alive.
     const end = (reason) => {
+        if (ended)
+            return;
+        ended = true;
         settleAll();
         finish(reason);
     };
     const confirm = (target, turnId, toolCallId, confirmationTitle, toolInput, request) => {
-        if (open.has(toolCallId)) {
+        if (ended || open.has(toolCallId)) {
             return;
         }
         const asked = new AbortController();
@@ -231,8 +320,8 @@ export function follow(conn, session, io, subscribed, sessionSubscribed) {
                 io.write(action.content ?? '');
                 break;
             case 'chat/toolCallReady':
-                if (action.confirmationTitle !== undefined) {
-                    confirm(chat, action.turnId, action.toolCallId, action.confirmationTitle, action.toolInput);
+                if (!action.confirmed) {
+                    confirm(chat, action.turnId, action.toolCallId, action.confirmationTitle ?? action.invocationMessage, action.toolInput);
                 }
                 break;
             case 'chat/toolCallConfirmed':
@@ -244,6 +333,9 @@ export function follow(conn, session, io, subscribed, sessionSubscribed) {
                 break;
             case 'chat/turnCancelled':
                 settleTurn();
+                io.write('\n[turn cancelled]\n');
+                if (io.once)
+                    end('cancelled');
                 break;
             case 'chat/turnComplete':
                 settleTurn();
@@ -254,7 +346,7 @@ export function follow(conn, session, io, subscribed, sessionSubscribed) {
                 break;
             case 'chat/error':
                 settleTurn();
-                io.write(`\n[turn error] ${JSON.stringify(action.error ?? action).slice(0, 200)}\n`);
+                io.write(`\n[turn error] ${JSON.stringify(action.part?.error ?? action.error ?? action).slice(0, 200)}\n`);
                 if (io.once) {
                     end('error');
                 }
@@ -293,7 +385,7 @@ export function follow(conn, session, io, subscribed, sessionSubscribed) {
     const track = (channel, onAction, seed, snapshot) => {
         let held = snapshot ? [] : undefined;
         conn.actions.push((action, from, serverSeq) => {
-            if (from !== channel) {
+            if (ended || from !== channel) {
                 return;
             }
             if (held) {
@@ -303,6 +395,8 @@ export function follow(conn, session, io, subscribed, sessionSubscribed) {
             onAction(action);
         });
         const join = (joined) => {
+            if (ended)
+                return;
             seed(joined);
             const early = held ?? [];
             held = undefined;
@@ -364,7 +458,7 @@ function askYesNo(title, input, signal) {
         rl.question(`\n${title}\n  ${input}\nApprove? [y/N] `, answer => end(/^y(es)?$/i.test(answer.trim())));
     });
 }
-export async function runAttach(args, env = process.env) {
+export async function runAttach(args, env = process.env, options = {}) {
     const opts = parseArgs(args);
     const err = (s) => process.stderr.write(`${s}\n`);
     const fallback = (f) => {
@@ -372,79 +466,106 @@ export async function runAttach(args, env = process.env) {
         err('Falling back: run `calliope` to work locally.');
         return FALLBACK_EXIT;
     };
-    if (isDisabled(env)) {
+    if (isDisabled(env))
         return fallback(fail('disabled', 'CALLIOPE_AHP is off'));
+    const timeoutMs = options.timeoutMs ?? ATTACH_TIMEOUT_MS;
+    if (!Number.isSafeInteger(timeoutMs) || timeoutMs < 1 || timeoutMs > 120_000) {
+        return fallback(fail('unreachable', 'invalid attach setup timeout'));
     }
-    const token = env[opts.tokenEnv];
-    const headers = token ? { Authorization: `token ${token}` } : {};
-    let url = opts.url;
-    if (!url && opts.hub && opts.user) {
-        if (!token) {
-            return fallback(fail('auth', `set ${opts.tokenEnv} to a hub API token`));
+    const controller = new AbortController();
+    const deadline = Date.now() + timeoutMs;
+    const remaining = () => Math.max(1, deadline - Date.now());
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
+    let ws;
+    let conn;
+    try {
+        const token = env[opts.tokenEnv];
+        const headers = token ? { Authorization: `token ${token}` } : {};
+        let url = opts.url;
+        if (!url && opts.hub && opts.user) {
+            if (!token)
+                return fallback(fail('auth', `set ${opts.tokenEnv} to a hub API token`));
+            const resolved = await resolveHubHost({ hubUrl: opts.hub, user: opts.user, token, timeoutMs: remaining() });
+            if (!resolved.ok)
+                return fallback(resolved);
+            url = resolved.url;
         }
-        const resolved = await resolveHubHost({ hubUrl: opts.hub, user: opts.user, token });
-        if (!resolved.ok) {
-            return fallback(resolved);
+        if (!url) {
+            err('usage: calliope attach (--url <ws-url> | --hub <url> --user <name>) [session-uri] [--read-only]');
+            return 1;
         }
-        url = resolved.url;
-    }
-    if (!url) {
-        err('usage: calliope attach (--url <ws-url> | --hub <url> --user <name>) [session-uri] [--read-only]');
-        return 1;
-    }
-    const refused = await preflight(url, headers);
-    if (refused) {
-        return fallback(refused);
-    }
-    const ws = new WebSocket(url, { headers });
-    const opened = await new Promise(resolve => {
-        ws.addEventListener('open', () => resolve(true));
-        ws.addEventListener('error', () => resolve(false));
-    });
-    if (!opened) {
-        return fallback(fail('unreachable', 'the WebSocket upgrade failed'));
+        const refused = await preflight(url, headers, fetch, { signal: controller.signal, timeoutMs: remaining() });
+        if (refused)
+            return fallback(refused);
+        controller.signal.throwIfAborted();
+        ws = options.createSocket ? options.createSocket(url, headers) : new WebSocket(url, { headers });
+        const socket = ws;
+        const opened = await new Promise(resolve => {
+            const finish = (ok) => { controller.signal.removeEventListener('abort', aborted); resolve(ok); };
+            const aborted = () => { try {
+                socket.terminate ? socket.terminate() : socket.close();
+            }
+            catch { /* Already closed. */ } finish(false); };
+            socket.addEventListener('open', () => finish(true));
+            socket.addEventListener('error', () => finish(false));
+            socket.addEventListener('close', () => finish(false));
+            controller.signal.addEventListener('abort', aborted, { once: true });
+            if (controller.signal.aborted)
+                aborted();
+        });
+        if (!opened)
+            return fallback(fail('unreachable', controller.signal.aborted ? 'host setup timed out' : 'the WebSocket upgrade failed'));
+        conn = new AhpConnection(socket);
+        const call = (method, params) => conn.call(method, params, { signal: controller.signal, timeoutMs: remaining() });
+        const init = await call('initialize', {
+            channel: ROOT, protocolVersions: SUPPORTED_VERSIONS, clientId: `calliope-cli-${process.pid}`,
+            clientInfo: { name: 'calliope-cli', version: '1' }, initialSubscriptions: [ROOT],
+        });
+        const bad = checkInitialize(init);
+        if (bad)
+            return fallback(bad);
+        if (!opts.session) {
+            const list = await call('listSessions', { channel: ROOT });
+            if (list.error)
+                return fallback(fail('unreachable', 'the host could not list sessions'));
+            const items = (list.result?.items ?? []);
+            process.stdout.write(items.length ? '' : 'No sessions on this host.\n');
+            for (const session of items)
+                process.stdout.write(`${session.resource}  ${session.title ?? ''}  ${session.modifiedAt ?? ''}\n`);
+            return 0;
+        }
+        // Register follow before either subscription answers: frames may follow a
+        // snapshot in the same network read. Keep the setup deadline through both.
+        const chat = defaultChatUri(opts.session);
+        const sessionAnswer = call('subscribe', { channel: opts.session });
+        const chatAnswer = sessionAnswer.then(answer => answer.error ? answer : call('subscribe', { channel: chat }));
+        const { done } = follow(conn, opts.session, {
+            write: s => process.stdout.write(s), approve: opts.readOnly ? undefined : askYesNo, once: opts.once,
+        }, chatAnswer.then(answer => answer.result?.snapshot), sessionAnswer.then(answer => answer.result?.snapshot));
+        const answers = await Promise.all([sessionAnswer, chatAnswer]);
+        if (answers.some(answer => answer.error))
+            return fallback(fail('unreachable', 'the host could not subscribe to the session'));
+        clearTimeout(timer);
+        process.stderr.write(`attached to ${opts.session} (AHP ${init.result.protocolVersion}); Ctrl+C to detach\n`);
+        const ended = await done;
+        if (ended.startsWith('connection') || ended.startsWith('host') || ended.startsWith('invalid')) {
+            return fallback(fail('unreachable', 'the host connection was lost; the run remains on its host'));
+        }
+        return ended === 'turnComplete' ? 0 : 1;
     }
-    const conn = new AhpConnection(ws);
-    const init = await conn.call('initialize', {
-        channel: ROOT, protocolVersions: SUPPORTED_VERSIONS, clientId: `calliope-cli-${process.pid}`,
-        clientInfo: { name: 'calliope-cli', version: '1' }, initialSubscriptions: [ROOT],
-    });
-    const bad = checkInitialize(init);
-    if (bad) {
-        conn.close();
-        return fallback(bad);
+    catch {
+        return fallback(fail('unreachable', controller.signal.aborted ? 'host setup timed out' : 'host attachment failed'));
     }
-    if (!opts.session) {
-        const list = await conn.call('listSessions', { channel: ROOT });
-        if (list.error) {
-            err(`calliope attach: the host could not list sessions: ${list.error.message.split('\n')[0]}`);
-            conn.close();
-            return 1;
-        }
-        const items = (list.result?.items ?? []);
-        process.stdout.write(items.length ? '' : 'No sessions on this host.\n');
-        for (const s of items) {
-            process.stdout.write(`${s.resource}  ${s.title ?? ''}  ${s.modifiedAt ?? ''}\n`);
+    finally {
+        clearTimeout(timer);
+        controller.abort();
+        conn?.close();
+        if (!conn && ws) {
+            try {
+                ws.terminate ? ws.terminate() : ws.close();
+            }
+            catch { /* Already closed. */ }
         }
-        conn.close();
-        return 0;
     }
-    // The session snapshot lists the input waiting in every chat, a subagent's
-    // included; the chat snapshot holds the confirmations waiting on the default
-    // chat, which is subscribed once the session answers. follow() listens from
-    // the moment the first request goes out: an action can share a network read
-    // with an answer, and Node delivers it before an awaited call resumes.
-    const chat = defaultChatUri(opts.session);
-    const sessionAnswer = conn.call('subscribe', { channel: opts.session });
-    const chatAnswer = sessionAnswer.then(() => conn.call('subscribe', { channel: chat }));
-    const { done } = follow(conn, opts.session, {
-        write: s => process.stdout.write(s),
-        approve: opts.readOnly ? undefined : askYesNo,
-        once: opts.once,
-    }, chatAnswer.then(answer => answer.result?.snapshot), sessionAnswer.then(answer => answer.result?.snapshot));
-    process.stderr.write(`attached to ${opts.session} (AHP ${init.result.protocolVersion}); Ctrl+C to detach\n`);
-    const ended = await done;
-    conn.close();
-    return ended === 'turnComplete' ? 0 : 1;
 }
 //# sourceMappingURL=attach.js.map