@calliopelabs/cli 3.3.0 → 3.4.0

package/dist/attach.d.ts

@@ -4,7 +4,8 @@
  * `calliope attach` connects to a running agent host over the Agent Host
  * Protocol (JSON-RPC over WebSocket) and follows a session another surface
  * started (the IDE, desktop, AGTerm, Chat Studio), answering its tool-call
- * confirmations from the terminal.
+ * confirmations from the terminal, including any already waiting when it joins
+ * and those inside a subagent, which the session's `inputNeeded` lists (#394).
  *
  *   calliope attach --url <ws-url>                 list the host's sessions
  *   calliope attach --url <ws-url> <session-uri>   follow one, approve its tool calls
@@ -21,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 = {
@@ -32,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;
@@ -58,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;
-    readonly actions: Array<(action: any, channel: string) => 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>;
+    private failure?;
+    private onClosed?;
+    readonly actions: Array<(action: any, channel: string, serverSeq?: number) => void>;
+    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;
 }
@@ -78,18 +91,74 @@ export declare class AhpConnection {
 export declare function checkInitialize(msg: Message, supported?: string[]): Fail | undefined;
 export interface FollowIo {
     write: (s: string) => void;
-    /** Ask the user; resolves true to approve. Absent means read-only. */
-    approve?: (title: string, input: string) => Promise<boolean>;
+    /**
+     * Ask the user; resolves true to approve. Absent means read-only. `signal`
+     * aborts when the answer is no longer needed (answered elsewhere, turn over,
+     * connection closed); the prompt should then close and resolve false.
+     */
+    approve?: (title: string, input: string, signal: AbortSignal) => Promise<boolean>;
     /** Resolve after the next turn instead of following until the connection closes. */
     once?: boolean;
 }
+/** A tool call as a chat snapshot or a session `inputNeeded` entry carries it. */
+interface ToolCallState {
+    toolCallId: string;
+    status: string;
+    confirmationTitle?: unknown;
+    invocationMessage?: unknown;
+    toolInput?: unknown;
+}
+/** The part of a chat channel's `subscribe` snapshot (`result.snapshot`) that attach reads. */
+export interface ChatSnapshot {
+    /** The snapshot's server sequence; later actions carry `serverSeq > fromSeq`. */
+    fromSeq?: number;
+    state?: {
+        activeTurn?: {
+            id: string;
+            responseParts?: Array<{
+                kind: string;
+                toolCall?: ToolCallState;
+            }>;
+        };
+    };
+}
+/**
+ * One entry of a session's `inputNeeded`: input the session waits on in one of
+ * its chats, a subagent's included. A `toolConfirmation` is answered on `chat`,
+ * with `turnId`, without subscribing to that chat.
+ */
+export interface SessionInputRequest {
+    id: string;
+    kind: string;
+    chat: string;
+    turnId?: string;
+    toolCall?: ToolCallState;
+}
+/** The part of the session channel's `subscribe` snapshot that attach reads. */
+export interface SessionSnapshot {
+    fromSeq?: number;
+    state?: {
+        inputNeeded?: SessionInputRequest[];
+    };
+}
 /**
  * Render a session's chat actions and answer tool confirmations. Resolves when
  * the connection closes, or after the next turn with `once`.
+ *
+ * `subscribed` is the chat channel's `subscribe` snapshot for a client joining
+ * a session already under way: the confirmations it shows waiting are asked
+ * first. `sessionSubscribed` is the session channel's: its `inputNeeded` lists
+ * the confirmations waiting in the session's other chats (a subagent's), which
+ * are answered on their own chat. Each channel's actions that arrive before its
+ * snapshot are held, then applied after it, skipping any the snapshot already
+ * includes.
  */
-export declare function follow(conn: AhpConnection, session: string, io: FollowIo): {
+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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"}