@code-yeongyu/senpi 2026.8.26 → 2026.8.28-2

package/dist/modes/rpc/rpc-client.d.ts

@@ -5,7 +5,7 @@
  */
 import type { AgentMessage, ThinkingLevel } from "@earendil-works/pi-agent-core";
 import type { ImageContent } from "@earendil-works/pi-ai";
-import type { SessionStats } from "../../core/agent-session.ts";
+import type { PromptDisposition, SessionStats } from "../../core/agent-session.ts";
 import type { BashResult } from "../../core/bash-executor.ts";
 import type { CompactionResult } from "../../core/compaction/index.ts";
 import type { ServiceTier } from "../../core/extensions/builtin/service-tier.ts";
@@ -13,6 +13,8 @@ import type { SessionEntry, SessionTreeNode } from "../../core/session-manager.t
 import type { JsonAgentSessionEvent } from "../json-event.ts";
 import type { RpcAccountFailoverEvent, RpcAuthAccountsChangedEvent, RpcExtensionEvent, RpcProviderAccount, RpcSessionState, RpcSlashCommand } from "./rpc-types.ts";
 export interface RpcClientOptions {
+    /** Connect to an existing multi-session Unix socket instead of spawning a child. */
+    socketPath?: string;
     /** Path to the CLI entry point (default: searches for dist/cli.js) */
     cliPath?: string;
     /** Working directory for the agent */
@@ -33,15 +35,29 @@ export interface ModelInfo {
     reasoning: boolean;
     supportedThinkingLevels?: ThinkingLevel[];
 }
+type PromptOptions = {
+    images?: ImageContent[];
+    streamingBehavior?: "steer" | "followUp";
+    thinkingLevel?: ThinkingLevel;
+    promptDisposition?: (disposition: PromptDisposition) => void;
+    preflightResult?: (success: boolean) => void;
+    expandPromptTemplates?: boolean;
+};
 export type RpcProviderAccountEvent = RpcAuthAccountsChangedEvent | RpcAccountFailoverEvent;
-export type RpcClientEvent = JsonAgentSessionEvent | RpcProviderAccountEvent | RpcExtensionEvent;
+export type RpcClientEvent = JsonAgentSessionEvent | RpcProviderAccountEvent | RpcExtensionEvent | {
+    type: "bash_start";
+} | {
+    type: "bash_end";
+};
 export type RpcEventListener = (event: RpcClientEvent) => void;
 export declare class RpcClient {
     private process;
+    private socket;
     private stopReadingStdout;
     private eventListeners;
     private pendingRequests;
     private requestId;
+    private sessionId;
     private stderr;
     private exitError;
     private options;
@@ -54,6 +70,7 @@ export declare class RpcClient {
      * Stop the RPC agent process.
      */
     stop(): Promise<void>;
+    private startSocket;
     /**
      * Subscribe to agent events.
      */
@@ -62,31 +79,95 @@ export declare class RpcClient {
      * Get collected stderr output (useful for debugging).
      */
     getStderr(): string;
+    openSession(options: {
+        sessionPath?: string;
+        cwd?: string;
+        provider?: string;
+        modelId?: string;
+        thinkingLevel?: ThinkingLevel;
+        permissionPreset?: string;
+    }): Promise<{
+        sessionId: string;
+        state: RpcSessionState;
+        attached?: boolean;
+    }>;
+    closeSession(sessionId?: string | undefined): Promise<void>;
+    listSessions(): Promise<Array<{
+        sessionId: string;
+        durableSessionId?: string;
+        sessionPath?: string;
+        cwd: string;
+        name?: string;
+        status: "opening" | "open" | "closing" | "closed";
+    }>>;
     /**
      * Send a prompt to the agent.
      * Returns immediately after sending; use onEvent() to receive streaming events.
      * Use waitForIdle() to wait for completion.
+     *
+     * The disposition/preflight callbacks mirror AgentSession's local prompt contract:
+     * they fire synchronously while the response frame is dispatched — before any
+     * queued message_start event — so optimistic-echo eligibility is settled in wire
+     * order. A success response without a disposition (older host) maps to "handled"
+     * so the echo degrades to canonical-only rendering instead of double-rendering.
      */
     prompt(message: string, images?: ImageContent[]): Promise<void>;
+    prompt(message: string, options?: PromptOptions): Promise<void>;
+    appendUserMessage(content: unknown): Promise<void>;
+    appendSessionEntry(entry: import("../../core/session-manager.ts").SessionEntry): Promise<void>;
+    sendCustomMessage<T = unknown>(message: {
+        customType: string;
+        content: unknown;
+        display: boolean;
+        details?: T;
+    }, options?: {
+        triggerTurn?: boolean;
+        deliverAs?: "steer" | "followUp" | "nextTurn";
+    }): Promise<void>;
     /**
      * Queue a steering message to interrupt the agent mid-run.
      */
-    steer(message: string, images?: ImageContent[]): Promise<void>;
+    steer(message: string, images?: ImageContent[], recovery?: {
+        enqueueOrder?: number;
+    }): Promise<void>;
     /**
      * Queue a follow-up message to be processed after the agent finishes.
      */
-    followUp(message: string, images?: ImageContent[]): Promise<void>;
+    followUp(message: string, images?: ImageContent[], recovery?: {
+        enqueueOrder?: number;
+    }): Promise<void>;
     /**
      * Abort current operation.
      */
     abort(): Promise<void>;
+    abortCompaction(): Promise<void>;
+    reload(): Promise<{
+        cancelled: boolean;
+        reason?: string;
+    }>;
+    checkReloadVeto(): Promise<{
+        cancelled: boolean;
+        reason?: string;
+    }>;
     /**
      * Clear queued steering and follow-up messages, returning their text.
      */
-    clearQueue(): Promise<{
+    clearQueue(options?: {
+        abortWillFollow?: boolean;
+    }): Promise<{
         steering: string[];
         followUp: string[];
+        ordered: Array<{
+            text: string;
+            mode: "steer" | "followUp";
+            enqueueOrder: number;
+        }>;
     }>;
+    getSteeringMessages(): Promise<string[]>;
+    getFollowUpMessages(): Promise<string[]>;
+    abortBranchSummary(): Promise<void>;
+    recordBashResult(command: string, result: BashResult, excludeFromContext?: boolean): Promise<void>;
+    setLabel(entryId: string, label?: string): Promise<void>;
     /**
      * Start a new session, optionally with parent tracking.
      * @param parentSession - Optional parent session path for lineage tracking
@@ -105,6 +186,7 @@ export declare class RpcClient {
     setModel(provider: string, modelId: string): Promise<{
         provider: string;
         id: string;
+        systemPromptName?: string;
     }>;
     /**
      * Cycle to next model.
@@ -186,7 +268,21 @@ export declare class RpcClient {
     /**
      * Execute a bash command.
      */
-    bash(command: string): Promise<BashResult>;
+    bash(command: string, options?: {
+        excludeFromContext?: boolean;
+        operations?: Record<string, unknown>;
+    }): Promise<BashResult>;
+    navigateTree(targetId: string, options?: {
+        summarize?: boolean;
+        customInstructions?: string;
+        replaceInstructions?: boolean;
+        label?: string;
+    }): Promise<{
+        cancelled: boolean;
+        editorText?: string;
+        aborted?: boolean;
+        summaryEntry?: unknown;
+    }>;
     /**
      * Abort running bash command.
      */
@@ -201,18 +297,25 @@ export declare class RpcClient {
     exportHtml(outputPath?: string): Promise<{
         path: string;
     }>;
+    exportJsonl(outputPath?: string): Promise<{
+        path: string;
+    }>;
     /**
      * Switch to a different session file.
      * @returns Object with `cancelled: true` if an extension cancelled the switch
      */
-    switchSession(sessionPath: string): Promise<{
+    switchSession(sessionPath: string, options?: {
+        cwdOverride?: string;
+    }): Promise<{
         cancelled: boolean;
     }>;
     /**
      * Fork from a specific message.
      * @returns Object with `text` (the message text) and `cancelled` (if extension cancelled)
      */
-    fork(entryId: string): Promise<{
+    fork(entryId: string, options?: {
+        position?: "before" | "at";
+    }): Promise<{
         text: string;
         cancelled: boolean;
     }>;
@@ -252,6 +355,9 @@ export declare class RpcClient {
      * Set the session display name.
      */
     setSessionName(name: string): Promise<void>;
+    importJsonl(inputPath: string, cwdOverride?: string): Promise<{
+        cancelled: boolean;
+    }>;
     /**
      * Get all messages in the session.
      */
@@ -287,4 +393,5 @@ export declare class RpcClient {
     private send;
     private getData;
 }
+export {};
 //# sourceMappingURL=rpc-client.d.ts.map

package/dist/modes/rpc/rpc-client.d.ts.map

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

package/dist/modes/rpc/rpc-client.js

@@ -4,6 +4,8 @@
  * Spawns the agent in RPC mode and provides a typed API for all operations.
  */
 import { spawn } from "node:child_process";
+import { createConnection } from "node:net";
+import { MissingSessionCwdError } from "../../core/session-cwd.js";
 import { attachJsonlLineReader, serializeJsonLine } from "./jsonl.js";
 function isProviderAccountEvent(event) {
     return event.type === "auth_accounts_changed" || event.type === "account_failover";
@@ -14,6 +16,7 @@ function isProviderAccountEvent(event) {
 export class RpcClient {
     constructor(options = {}) {
         this.process = null;
+        this.socket = null;
         this.stopReadingStdout = null;
         this.eventListeners = [];
         this.pendingRequests = new Map();
@@ -26,10 +29,14 @@ export class RpcClient {
      * Start the RPC agent process.
      */
     async start() {
-        if (this.process) {
+        if (this.process || this.socket) {
             throw new Error("Client already started");
         }
         this.exitError = null;
+        if (this.options.socketPath) {
+            await this.startSocket(this.options.socketPath);
+            return;
+        }
         const cliPath = this.options.cliPath ?? "dist/cli.js";
         const args = ["--mode", "rpc"];
         if (this.options.provider) {
@@ -89,6 +96,15 @@ export class RpcClient {
      * Stop the RPC agent process.
      */
     async stop() {
+        if (this.socket) {
+            this.stopReadingStdout?.();
+            this.stopReadingStdout = null;
+            this.socket.destroy();
+            this.socket = null;
+            this.sessionId = undefined;
+            this.rejectPendingRequests(new Error("RPC socket client stopped"));
+            return;
+        }
         if (!this.process)
             return;
         this.stopReadingStdout?.();
@@ -108,6 +124,40 @@ export class RpcClient {
         this.process = null;
         this.pendingRequests.clear();
     }
+    async startSocket(path) {
+        const socket = createConnection(path);
+        this.socket = socket;
+        await new Promise((resolve, reject) => {
+            const onConnect = () => {
+                cleanup();
+                resolve();
+            };
+            const onError = (error) => {
+                cleanup();
+                this.socket = null;
+                reject(error);
+            };
+            const cleanup = () => {
+                socket.off("connect", onConnect);
+                socket.off("error", onError);
+            };
+            socket.once("connect", onConnect);
+            socket.once("error", onError);
+        });
+        this.stopReadingStdout = attachJsonlLineReader(socket, (line) => this.handleLine(line));
+        socket.once("close", () => {
+            if (this.socket !== socket)
+                return;
+            this.socket = null;
+            this.rejectPendingRequests(new Error("RPC socket closed"));
+        });
+        socket.once("error", (error) => {
+            if (this.socket !== socket)
+                return;
+            this.exitError = error;
+            this.rejectPendingRequests(error);
+        });
+    }
     /**
      * Subscribe to agent events.
      */
@@ -129,25 +179,74 @@ export class RpcClient {
     // =========================================================================
     // Command Methods
     // =========================================================================
-    /**
-     * Send a prompt to the agent.
-     * Returns immediately after sending; use onEvent() to receive streaming events.
-     * Use waitForIdle() to wait for completion.
-     */
-    async prompt(message, images) {
-        await this.send({ type: "prompt", message, images });
+    async openSession(options) {
+        const response = await this.send({ type: "open_session", ...options }, false);
+        const opened = this.getData(response);
+        this.sessionId = opened.sessionId;
+        return opened;
+    }
+    async closeSession(sessionId = this.sessionId) {
+        if (!sessionId)
+            return;
+        await this.send({ type: "close_session", sessionId }, false);
+        if (this.sessionId === sessionId)
+            this.sessionId = undefined;
+    }
+    async listSessions() {
+        const response = await this.send({ type: "list_sessions" }, false);
+        return this.getData(response).sessions;
+    }
+    async prompt(message, optionsOrImages) {
+        const options = Array.isArray(optionsOrImages)
+            ? { images: optionsOrImages }
+            : (optionsOrImages ?? {});
+        const response = await this.send({
+            type: "prompt",
+            message,
+            ...(options.images ? { images: options.images } : {}),
+            ...(options.streamingBehavior ? { streamingBehavior: options.streamingBehavior } : {}),
+            ...(options.thinkingLevel ? { thinkingLevel: options.thinkingLevel } : {}),
+            ...(options.expandPromptTemplates !== undefined
+                ? { expandPromptTemplates: options.expandPromptTemplates }
+                : {}),
+        }, true, {
+            onResponse: (wireResponse) => {
+                if (!wireResponse.success) {
+                    options?.preflightResult?.(false);
+                    return;
+                }
+                const data = wireResponse.data;
+                options?.promptDisposition?.(data?.disposition ?? "handled");
+                options?.preflightResult?.(true);
+            },
+            onReject: () => {
+                options?.preflightResult?.(false);
+            },
+        });
+        if (!response.success) {
+            throw new Error(response.error);
+        }
+    }
+    async appendUserMessage(content) {
+        await this.send({ type: "append_user_message", content });
+    }
+    async appendSessionEntry(entry) {
+        await this.send({ type: "append_session_entry", entry });
+    }
+    async sendCustomMessage(message, options) {
+        await this.send({ type: "send_custom_message", ...message, ...options });
     }
     /**
      * Queue a steering message to interrupt the agent mid-run.
      */
-    async steer(message, images) {
-        await this.send({ type: "steer", message, images });
+    async steer(message, images, recovery) {
+        await this.send({ type: "steer", message, images, enqueueOrder: recovery?.enqueueOrder });
     }
     /**
      * Queue a follow-up message to be processed after the agent finishes.
      */
-    async followUp(message, images) {
-        await this.send({ type: "follow_up", message, images });
+    async followUp(message, images, recovery) {
+        await this.send({ type: "follow_up", message, images, enqueueOrder: recovery?.enqueueOrder });
     }
     /**
      * Abort current operation.
@@ -155,13 +254,41 @@ export class RpcClient {
     async abort() {
         await this.send({ type: "abort" });
     }
+    async abortCompaction() {
+        await this.send({ type: "abort_compaction" });
+    }
+    async reload() {
+        const response = await this.send({ type: "reload" });
+        return this.getData(response);
+    }
+    async checkReloadVeto() {
+        const response = await this.send({ type: "check_reload_veto" });
+        return this.getData(response);
+    }
     /**
      * Clear queued steering and follow-up messages, returning their text.
      */
-    async clearQueue() {
-        const response = await this.send({ type: "clear_queue" });
+    async clearQueue(options) {
+        const response = await this.send({ type: "clear_queue", abortWillFollow: options?.abortWillFollow });
         return this.getData(response);
     }
+    async getSteeringMessages() {
+        const response = await this.send({ type: "get_steering_messages" });
+        return this.getData(response).messages;
+    }
+    async getFollowUpMessages() {
+        const response = await this.send({ type: "get_follow_up_messages" });
+        return this.getData(response).messages;
+    }
+    async abortBranchSummary() {
+        await this.send({ type: "abort_branch_summary" });
+    }
+    async recordBashResult(command, result, excludeFromContext) {
+        await this.send({ type: "record_bash_result", command, result, excludeFromContext });
+    }
+    async setLabel(entryId, label) {
+        await this.send({ type: "set_label", entryId, label });
+    }
     /**
      * Start a new session, optionally with parent tracking.
      * @param parentSession - Optional parent session path for lineage tracking
@@ -282,8 +409,17 @@ export class RpcClient {
     /**
      * Execute a bash command.
      */
-    async bash(command) {
-        const response = await this.send({ type: "bash", command });
+    async bash(command, options) {
+        const response = await this.send({
+            type: "bash",
+            command,
+            excludeFromContext: options?.excludeFromContext,
+            operations: options?.operations,
+        });
+        return this.getData(response);
+    }
+    async navigateTree(targetId, options) {
+        const response = await this.send({ type: "navigate_tree", targetId, ...options });
         return this.getData(response);
     }
     /**
@@ -306,20 +442,24 @@ export class RpcClient {
         const response = await this.send({ type: "export_html", outputPath });
         return this.getData(response);
     }
+    async exportJsonl(outputPath) {
+        const response = await this.send({ type: "export_jsonl", outputPath });
+        return this.getData(response);
+    }
     /**
      * Switch to a different session file.
      * @returns Object with `cancelled: true` if an extension cancelled the switch
      */
-    async switchSession(sessionPath) {
-        const response = await this.send({ type: "switch_session", sessionPath });
+    async switchSession(sessionPath, options) {
+        const response = await this.send({ type: "switch_session", sessionPath, cwdOverride: options?.cwdOverride });
         return this.getData(response);
     }
     /**
      * Fork from a specific message.
      * @returns Object with `text` (the message text) and `cancelled` (if extension cancelled)
      */
-    async fork(entryId) {
-        const response = await this.send({ type: "fork", entryId });
+    async fork(entryId, options) {
+        const response = await this.send({ type: "fork", entryId, position: options?.position });
         return this.getData(response);
     }
     /**
@@ -364,6 +504,10 @@ export class RpcClient {
     async setSessionName(name) {
         await this.send({ type: "set_session_name", name });
     }
+    async importJsonl(inputPath, cwdOverride) {
+        const response = await this.send({ type: "import_jsonl", inputPath, cwdOverride });
+        return this.getData(response);
+    }
     /**
      * Get all messages in the session.
      */
@@ -433,7 +577,10 @@ export class RpcClient {
                 reject(new Error(`Timeout collecting events. Stderr: ${this.stderr}`));
             }, timeout);
             const unsubscribe = this.onEvent((event) => {
-                if (isProviderAccountEvent(event) || event.type === "extension_event")
+                if (isProviderAccountEvent(event) ||
+                    event.type === "extension_event" ||
+                    event.type === "bash_start" ||
+                    event.type === "bash_end")
                     return;
                 events.push(event);
                 if (event.type === "agent_settled") {
@@ -449,7 +596,7 @@ export class RpcClient {
      */
     async promptAndWait(message, images, timeout = 60000) {
         const eventsPromise = this.collectEvents(timeout);
-        await this.prompt(message, images);
+        await this.prompt(message, images ? { images } : undefined);
         return eventsPromise;
     }
     // =========================================================================
@@ -462,10 +609,17 @@ export class RpcClient {
             if (data.type === "response" && data.id && this.pendingRequests.has(data.id)) {
                 const pending = this.pendingRequests.get(data.id);
                 this.pendingRequests.delete(data.id);
+                // Response hooks run synchronously inside the frame dispatch so ordering-sensitive
+                // contracts (e.g. optimistic-echo disposition) settle before the NEXT frame —
+                // never through the microtask scheduled by resolve().
+                pending.onResponse?.(data);
                 pending.resolve(data);
                 return;
             }
-            // Otherwise it's an event
+            // Otherwise it's an event. Multi-session hosts broadcast all session
+            // events to every connection; a routed client exposes only its lease.
+            if (data.sessionId !== undefined && this.sessionId !== undefined && data.sessionId !== this.sessionId)
+                return;
             for (const listener of this.eventListeners) {
                 listener(data);
             }
@@ -479,35 +633,43 @@ export class RpcClient {
     }
     rejectPendingRequests(error) {
         for (const pending of this.pendingRequests.values()) {
+            pending.onReject?.(error);
             pending.reject(error);
         }
         this.pendingRequests.clear();
     }
-    async send(command) {
+    async send(command, route = true, hooks) {
         const childProcess = this.process;
-        const stdin = childProcess?.stdin;
-        if (!childProcess || !stdin) {
+        const stream = this.socket ?? childProcess?.stdin;
+        if (!stream) {
             throw new Error("Client not started");
         }
         if (this.exitError) {
             throw this.exitError;
         }
-        if (childProcess.exitCode !== null) {
+        if (childProcess?.exitCode !== null && childProcess?.exitCode !== undefined) {
             const error = this.createProcessExitError(childProcess.exitCode, childProcess.signalCode);
             this.exitError = error;
             throw error;
         }
-        if (stdin.destroyed || !stdin.writable) {
-            const error = new Error(`Agent process stdin is not writable. Stderr: ${this.stderr}`);
+        if (stream.destroyed || !stream.writable) {
+            const error = new Error(`RPC transport is not writable. Stderr: ${this.stderr}`);
             this.exitError = error;
             throw error;
         }
         const id = `req_${++this.requestId}`;
-        const fullCommand = { ...command, id };
+        const fullCommand = {
+            ...command,
+            ...(route && this.sessionId && !("sessionId" in command) ? { sessionId: this.sessionId } : {}),
+            id,
+        };
         return new Promise((resolve, reject) => {
             const timeout = setTimeout(() => {
+                const pending = this.pendingRequests.get(id);
                 this.pendingRequests.delete(id);
-                reject(new Error(`Timeout waiting for response to ${command.type}. Stderr: ${this.stderr}`));
+                const timeoutError = new Error(`Timeout waiting for response to ${command.type}. Stderr: ${this.stderr}`);
+                pending?.onReject?.(timeoutError);
+                reject(timeoutError);
             }, 30000);
             this.pendingRequests.set(id, {
                 resolve: (response) => {
@@ -518,14 +680,17 @@ export class RpcClient {
                     clearTimeout(timeout);
                     reject(error);
                 },
+                ...(hooks?.onResponse ? { onResponse: hooks.onResponse } : {}),
+                ...(hooks?.onReject ? { onReject: hooks.onReject } : {}),
             });
             try {
-                stdin.write(serializeJsonLine(fullCommand));
+                stream.write(serializeJsonLine(fullCommand));
             }
             catch (error) {
                 const writeError = error instanceof Error ? error : new Error(String(error));
                 const pending = this.pendingRequests.get(id);
                 this.pendingRequests.delete(id);
+                pending?.onReject?.(writeError);
                 pending?.reject(writeError);
             }
         });
@@ -533,6 +698,9 @@ export class RpcClient {
     getData(response) {
         if (!response.success) {
             const errorResponse = response;
+            if (errorResponse.errorCode === "missing_session_cwd" && errorResponse.errorData) {
+                throw new MissingSessionCwdError(errorResponse.errorData);
+            }
             throw new Error(errorResponse.error);
         }
         // Type assertion: we trust response.data matches T based on the command sent.