@automatalabs/pi-acp 0.2.8 → 0.3.0

package/README.md

@@ -69,7 +69,24 @@ pi-acp owns the `mcp__` prefix for injected MCP tools. Pi extensions must not re
 
 ## Version 1 limitations
 
-Load replay is the active linear branch and excludes branch topology and compaction summaries. `additionalDirectories` is accepted but ignored because pi is not root-confined. ACP prompt audio is degraded to a text note. Mid-turn steering and terminal-login authentication are not exposed.
+Load replay is the active linear branch and excludes branch topology and compaction summaries. `additionalDirectories` is accepted but ignored because pi is not root-confined. ACP prompt audio is degraded to a text note. Terminal-login authentication is not exposed.
+
+### Native session steering
+
+Pi advertises the `_session/steering` extension at top-level initialize metadata as
+`_meta: { steering: { supported: true } }`, with codex-shaped semantics. While a Pi prompt turn is
+live, the server converts the supplied ACP content with the same text/image conversion as
+`session/prompt` and calls native `AgentSession.steer(text, images)`, returning
+`{ outcome: "injected" }`; the original `session/prompt` still owns all output, usage, and
+settlement. When the session is idle — or a steer arrives just as the turn settles, before pi could
+consume it — the content runs as a fire-and-forget turn instead and the call returns
+`{ outcome: "startedNewTurn" }`: never an error, never dropped, never silently prepended to the next
+prompt. That turn occupies the single turn slot (a concurrent `session/prompt` is `session_busy`)
+and streams through normal `session/update`s with no owned `PromptResponse`. A steer racing an
+in-progress cancel returns `{ outcome: "failed" }` — cancellation wins, and pi's queued steering is
+cleared synchronously before aborting so queued content never restarts generation after
+cancellation. Unexpected internal failures also resolve as `{ outcome: "failed" }` rather than a
+JSON-RPC error.
 
 ## Development
 

package/dist/agent.d.ts

@@ -1,5 +1,6 @@
 import type { AgentNotificationContext, AgentRequestContext, AuthenticateRequest, CloseSessionRequest, ForkSessionRequest, InitializeRequest, ListSessionsRequest, LoadSessionRequest, NewSessionRequest, PromptRequest, ResumeSessionRequest, SetSessionConfigOptionRequest } from "@agentclientprotocol/sdk";
 import type { PiAcpDeps } from "./deps.js";
+import type { SteeringRequest, SteeringResponse } from "./steering.js";
 export { PKG_VERSION } from "./version.js";
 export declare class PiAcpAgent {
     private readonly deps;
@@ -38,6 +39,11 @@ export declare class PiAcpAgent {
             };
         };
         authMethods: import("@agentclientprotocol/sdk").AuthMethod[];
+        _meta: {
+            steering: {
+                supported: boolean;
+            };
+        };
     };
     authenticate(context: AgentRequestContext<AuthenticateRequest>): Record<string, never>;
     private ensureMayOpen;
@@ -81,6 +87,7 @@ export declare class PiAcpAgent {
         configOptions: import("@agentclientprotocol/sdk").SessionConfigOption[];
     }>;
     prompt(context: AgentRequestContext<PromptRequest>): Promise<import("@agentclientprotocol/sdk").PromptResponse>;
+    steer(context: AgentRequestContext<SteeringRequest>): Promise<SteeringResponse>;
     cancel(context: AgentNotificationContext<{
         sessionId: string;
     }>): void;

package/dist/agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,wBAAwB,EACxB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAElB,iBAAiB,EACjB,aAAa,EACb,oBAAoB,EACpB,6BAA6B,EAC9B,MAAM,0BAA0B,CAAC;AAWlC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAW3C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AA0H3C,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAY;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgC;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;IACjE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA+B;IAC5D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmC;IAClE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAM;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,gBAAgB,CAAS;gBAErB,IAAI,EAAE,SAAS;IAI3B,UAAU,CAAC,QAAQ,EAAE,mBAAmB,CAAC,iBAAiB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;IAkB3D,YAAY,CAAC,OAAO,EAAE,mBAAmB,CAAC,mBAAmB,CAAC;IAI9D,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,KAAK;IAMb,OAAO,CAAC,IAAI;YAOE,UAAU;YAkCV,SAAS;IAqLvB,OAAO,CAAC,YAAY;IAKpB,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,iBAAiB,CAAC;;;;;IA6B1D,OAAO,CAAC,QAAQ;IAgDhB,WAAW,CAAC,OAAO,EAAE,mBAAmB,CAAC,kBAAkB,CAAC;;;;IAI5D,aAAa,CAAC,OAAO,EAAE,mBAAmB,CAAC,oBAAoB,CAAC;;;;IAIhE,WAAW,CAAC,OAAO,EAAE,mBAAmB,CAAC,kBAAkB,CAAC;;;;;IA8EtD,YAAY,CAAC,OAAO,EAAE,mBAAmB,CAAC,mBAAmB,CAAC;;;;;;;;IAqC9D,YAAY,CAAC,OAAO,EAAE,mBAAmB,CAAC,mBAAmB,CAAC;IA0BpE,OAAO,CAAC,WAAW;IAOnB,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,6BAA6B,CAAC;;;IAU3E,MAAM,CAAC,OAAO,EAAE,mBAAmB,CAAC,aAAa,CAAC;IAIlD,MAAM,CAAC,OAAO,EAAE,wBAAwB,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI;YAIxD,eAAe;IAwB7B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAWV,iBAAiB;CA4BhC"}
+{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,wBAAwB,EACxB,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,mBAAmB,EACnB,kBAAkB,EAElB,iBAAiB,EACjB,aAAa,EACb,oBAAoB,EACpB,6BAA6B,EAC9B,MAAM,0BAA0B,CAAC;AAWlC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAS3C,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGvE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AA0H3C,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAY;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgC;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA8B;IACtD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;IACjE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAA+B;IAC5D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmC;IAClE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAM;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,gBAAgB,CAAS;gBAErB,IAAI,EAAE,SAAS;IAI3B,UAAU,CAAC,QAAQ,EAAE,mBAAmB,CAAC,iBAAiB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmB3D,YAAY,CAAC,OAAO,EAAE,mBAAmB,CAAC,mBAAmB,CAAC;IAI9D,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,YAAY;IAmBpB,OAAO,CAAC,KAAK;IAMb,OAAO,CAAC,IAAI;YAOE,UAAU;YAkCV,SAAS;IAqLvB,OAAO,CAAC,YAAY;IAKpB,UAAU,CAAC,OAAO,EAAE,mBAAmB,CAAC,iBAAiB,CAAC;;;;;IA6B1D,OAAO,CAAC,QAAQ;IAgDhB,WAAW,CAAC,OAAO,EAAE,mBAAmB,CAAC,kBAAkB,CAAC;;;;IAI5D,aAAa,CAAC,OAAO,EAAE,mBAAmB,CAAC,oBAAoB,CAAC;;;;IAIhE,WAAW,CAAC,OAAO,EAAE,mBAAmB,CAAC,kBAAkB,CAAC;;;;;IA8EtD,YAAY,CAAC,OAAO,EAAE,mBAAmB,CAAC,mBAAmB,CAAC;;;;;;;;IAqC9D,YAAY,CAAC,OAAO,EAAE,mBAAmB,CAAC,mBAAmB,CAAC;IA0BpE,OAAO,CAAC,WAAW;IAOnB,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,6BAA6B,CAAC;;;IAU3E,MAAM,CAAC,OAAO,EAAE,mBAAmB,CAAC,aAAa,CAAC;IAIlD,KAAK,CAAC,OAAO,EAAE,mBAAmB,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAW/E,MAAM,CAAC,OAAO,EAAE,wBAAwB,CAAC;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI;YAIxD,eAAe;IAwB7B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAWV,iBAAiB;CA4BhC"}

package/dist/agent.js

@@ -148,6 +148,7 @@ export class PiAcpAgent {
                 sessionCapabilities: { resume: {}, fork: {}, list: {}, close: {} },
             },
             authMethods: AUTH_METHODS,
+            _meta: { steering: { supported: true } },
         };
     }
     authenticate(context) {
@@ -640,6 +641,17 @@ export class PiAcpAgent {
     prompt(context) {
         return this.requireLive(context.params.sessionId).prompt(context.params, context.signal);
     }
+    steer(context) {
+        return this.requireLive(context.params.sessionId).steer(context.params)
+            .catch((error) => {
+            if (isRequestError(error))
+                throw error;
+            // Codex-shaped catch-all: an unexpected internal failure resolves as a failed
+            // steering outcome; only typed adapter errors surface as JSON-RPC errors.
+            console.error("pi-acp steering failed:", error);
+            return { outcome: "failed" };
+        });
+    }
     cancel(context) {
         this.live.get(context.params.sessionId)?.cancel();
     }

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,MAAM,CAAC,OAAO,GAAE,aAAkB;;;GAoBvD"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,MAAM,EACZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAe,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAGxD,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,MAAM,CAAC,OAAO,GAAE,aAAkB;;;GAqBvD"}

package/dist/server.js

@@ -2,6 +2,7 @@ import { Readable, Writable } from "node:stream";
 import { agent as acpAgent, methods, ndJsonStream, } from "@agentclientprotocol/sdk";
 import { PiAcpAgent } from "./agent.js";
 import { resolveDeps } from "./deps.js";
+import { SESSION_STEERING_METHOD, steeringRequestParser } from "./steering.js";
 export { PiAcpAgent } from "./agent.js";
 export async function runAcp(options = {}) {
     const impl = new PiAcpAgent(await resolveDeps(options.deps));
@@ -16,6 +17,7 @@ export async function runAcp(options = {}) {
         .onRequest(methods.agent.session.close, (context) => impl.closeSession(context))
         .onRequest(methods.agent.session.setConfigOption, (context) => impl.setConfigOption(context))
         .onRequest(methods.agent.session.prompt, (context) => impl.prompt(context))
+        .onRequest(SESSION_STEERING_METHOD, steeringRequestParser, (context) => impl.steer(context))
         .onNotification(methods.agent.session.cancel, (context) => impl.cancel(context));
     const stream = options.stream ?? ndJsonStream(Writable.toWeb(process.stdout), Readable.toWeb(process.stdin));
     const connection = app.connect(stream);

package/dist/session.d.ts

@@ -4,6 +4,7 @@ import type { Api, Model } from "@earendil-works/pi-ai";
 import type { PiAcpDeps } from "./deps.js";
 import type { McpBridge, McpResultProjection } from "./mcp-bridge.js";
 import { type ChildProcessRegistrySlot } from "./child-process-registry.js";
+import type { SteeringRequest, SteeringResponse } from "./steering.js";
 export interface PiSessionOptions {
     sessionId: string;
     session: AgentSession;
@@ -37,6 +38,8 @@ export declare class PiSession {
     private disposed;
     private unsubscribe;
     private activeTurn;
+    private steerChain;
+    private readonly pendingSteerImages;
     private configReserved;
     private cleanupDirty;
     private cleanupGeneration;
@@ -64,6 +67,35 @@ export declare class PiSession {
     private handlePiResolved;
     private handlePiRejected;
     prompt(params: PromptRequest, requestSignal: AbortSignal): Promise<PromptResponse>;
+    /** Open the session's single turn slot and run one pi prompt through the full turn
+     *  machinery (turn boundary, cancellation, settlement, usage). Admission is the caller's
+     *  job: prompt() rejects while busy, and the steering paths start a turn only when the
+     *  slot is free. Steer-started turns pass no requestSignal (cancel() still aborts them)
+     *  and use preflightResult as their turn-committed acceptance signal. */
+    private startTurn;
+    /** `_session/steering`, codex-shaped: inject into the live turn when there is one,
+     *  otherwise start a fire-and-forget turn with the content and answer `startedNewTurn`.
+     *  Requests are serialized per session (pi rejects concurrent runs), so a second steer
+     *  behind an idle one injects into the turn the first one started. */
+    steer(params: SteeringRequest): Promise<SteeringResponse>;
+    private performSteer;
+    /** Pull one undelivered steering message back out of pi's queues. Returns false when pi
+     *  already consumed it (or a settlement drain already redispatched it). clearQueue is
+     *  all-or-nothing, so any other queued texts are re-enqueued untouched (text-only: pi
+     *  surfaces only the text mirror of messages it holds). */
+    private recoverSteer;
+    /** Idle steer: start a normal turn with the content so it occupies the single turn slot
+     *  (session/prompt during it is legitimately busy; cancel/close still work) and resolve
+     *  as soon as the turn is committed — pi's preflightResult is the acceptance signal, the
+     *  analogue of codex's onTurnStarted. The turn itself is fire-and-forget: nothing owns
+     *  its PromptResponse and its output streams through the usual session/update path. */
+    private startTurnFromSteer;
+    /** Settlement-time orphan recovery. pi's steering/follow-up queues are polled only from
+     *  inside a run, so a message still queued when the run settles would silently prepend
+     *  itself to the NEXT session/prompt. Both reference adapters run late content instead of
+     *  leaking or dropping it (codex falls through to a new turn; claude's streaming input
+     *  absorbs it as background generation), so redispatch it as a fire-and-forget turn. */
+    private redispatchOrphanedSteering;
     cancel(): void;
     childCleanupFailure(): void;
     dispose(): Promise<void>;

package/dist/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAClG,OAAO,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAc3C,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAuB,KAAK,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AA4BjG,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IACnD,eAAe,EAAE,SAAS,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;IACvC,aAAa,EAAE,wBAAwB,CAAC;IACxC,mBAAmB,EAAE,eAAe,CAAC;IACrC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/F;AAED,qBAAa,SAAS;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,EAAE,YAAY,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAY;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmC;IACpE,OAAO,CAAC,eAAe,CAAwB;IAC/C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA2B;IACzD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAkB;IACtD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA+B;IACxD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAuB;IAC/C,OAAO,CAAC,IAAI,CAA4B;IACxC,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,WAAW,CAA2B;IAC9C,OAAO,CAAC,UAAU,CAAyB;IAC3C,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,iBAAiB,CAAgC;IACzD,OAAO,CAAC,sBAAsB,CAA4B;IAC1D,OAAO,CAAC,kBAAkB,CAA4B;gBAE1C,OAAO,EAAE,gBAAgB;IAuCrC,IAAI,IAAI,IAAI,OAAO,CAElB;IAED,aAAa;IAIb,sBAAsB,CAAC,MAAM,EAAE,SAAS,KAAK,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI;IAI3D,gBAAgB,IAAI,WAAW,GAAG,SAAS;IAE3C,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IASrC,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI;IAMpC,OAAO,CAAC,SAAS;IAwBX,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,MAAM,CAAC,OAAO,EAAE,SAAS,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAWvD,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO;IAkBzD,OAAO,CAAC,MAAM;IAmBd,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,WAAW;IAmGnB,OAAO,CAAC,SAAS;IAiBjB,OAAO,CAAC,WAAW;YAOL,aAAa;YAQb,gBAAgB;YAmBhB,gBAAgB;IAyBxB,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC;IA4ExF,MAAM,IAAI,IAAI;IAId,mBAAmB,IAAI,IAAI;IASrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBxB,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjD,IAAI,iBAAiB,IAAI,MAAM,CAAiD;IAEhF,IAAI,oBAAoB,IAAI,OAAO,CAElC;IAEK,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCvC,MAAM,IAAI,IAAI;CAOf"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}

package/dist/session.js

@@ -29,6 +29,8 @@ export class PiSession {
     disposed = false;
     unsubscribe;
     activeTurn;
+    steerChain = Promise.resolve();
+    pendingSteerImages = new Map();
     configReserved = false;
     cleanupDirty = false;
     cleanupGeneration;
@@ -259,6 +261,15 @@ export class PiSession {
         const turn = this.activeTurn;
         if (turn && !turn.controller.signal.aborted)
             turn.controller.abort();
+        let clearQueuePi = Promise.resolve();
+        this.pendingSteerImages.clear();
+        try {
+            this.pi.clearQueue();
+        }
+        catch (error) {
+            clearQueuePi = Promise.reject(error);
+        }
+        clearQueuePi.catch(() => undefined);
         let abortPi;
         try {
             abortPi = this.pi.abort();
@@ -267,7 +278,10 @@ export class PiSession {
             abortPi = Promise.reject(error);
         }
         abortPi.catch(() => undefined);
-        const operations = Promise.allSettled([abortPi, captured.drain]);
+        // Keep the established abort-before-child-drain failure precedence. Queue
+        // clearing is invoked first, but its failure is considered only after both
+        // pre-existing cleanup operations.
+        const operations = Promise.allSettled([abortPi, captured.drain, clearQueuePi]);
         generation.promise = new Promise((resolve, reject) => {
             let claimed = false;
             const fail = (error) => {
@@ -366,6 +380,8 @@ export class PiSession {
             const terminal = terminalAssistant(messages);
             const stopReason = stopReasonFor(terminal, turn.controller.signal.aborted);
             this.finish(turn, { response: { stopReason, usage: promptUsage(messages) } });
+            if (!turn.controller.signal.aborted)
+                this.redispatchOrphanedSteering();
         }
         catch (error) {
             if (this.pumpFailure !== undefined)
@@ -382,6 +398,7 @@ export class PiSession {
             try {
                 await this.drain();
                 this.finish(turn, { error: classifyPreflight(error) });
+                this.redispatchOrphanedSteering();
             }
             catch {
                 this.notificationFailure();
@@ -407,7 +424,14 @@ export class PiSession {
     async prompt(params, requestSignal) {
         if (this.busy)
             throw adapterError("session_busy");
-        const converted = convertPromptContent(params.prompt);
+        return this.startTurn(convertPromptContent(params.prompt), { requestSignal });
+    }
+    /** Open the session's single turn slot and run one pi prompt through the full turn
+     *  machinery (turn boundary, cancellation, settlement, usage). Admission is the caller's
+     *  job: prompt() rejects while busy, and the steering paths start a turn only when the
+     *  slot is free. Steer-started turns pass no requestSignal (cancel() still aborts them)
+     *  and use preflightResult as their turn-committed acceptance signal. */
+    startTurn(converted, opts) {
         const text = converted.text;
         let startMessageIndex;
         try {
@@ -439,12 +463,15 @@ export class PiSession {
             startMessageIndex,
         };
         this.activeTurn = turn;
-        const abortFromRequest = () => this.abortTurn(turn);
-        if (requestSignal.aborted)
-            abortFromRequest();
-        else {
-            requestSignal.addEventListener("abort", abortFromRequest, { once: true });
-            turn.removeRequestAbort = () => requestSignal.removeEventListener("abort", abortFromRequest);
+        const requestSignal = opts.requestSignal;
+        if (requestSignal) {
+            const abortFromRequest = () => this.abortTurn(turn);
+            if (requestSignal.aborted)
+                abortFromRequest();
+            else {
+                requestSignal.addEventListener("abort", abortFromRequest, { once: true });
+                turn.removeRequestAbort = () => requestSignal.removeEventListener("abort", abortFromRequest);
+            }
         }
         this.runTurnTask(turn, (async () => {
             turn.releaseBoundary = await this.mcpBridge.acquireTurnBoundary();
@@ -469,7 +496,10 @@ export class PiSession {
             }
             let piPromise;
             try {
-                piPromise = this.pi.prompt(text, { images: converted.images });
+                piPromise = this.pi.prompt(text, {
+                    images: converted.images,
+                    ...(opts.preflightResult ? { preflightResult: opts.preflightResult } : {}),
+                });
             }
             catch (error) {
                 await this.handlePiRejected(turn, error);
@@ -479,6 +509,150 @@ export class PiSession {
         })());
         return result;
     }
+    /** `_session/steering`, codex-shaped: inject into the live turn when there is one,
+     *  otherwise start a fire-and-forget turn with the content and answer `startedNewTurn`.
+     *  Requests are serialized per session (pi rejects concurrent runs), so a second steer
+     *  behind an idle one injects into the turn the first one started. */
+    async steer(params) {
+        const converted = convertPromptContent(params.prompt);
+        const run = this.steerChain.then(() => this.performSteer(converted));
+        this.steerChain = run.then(() => undefined, () => undefined);
+        return run;
+    }
+    async performSteer(converted) {
+        for (;;) {
+            if (this.closing || this.disposed)
+                throw adapterError("session_terminated");
+            const turn = this.activeTurn;
+            if (!turn) {
+                if (this.busy)
+                    throw adapterError("session_busy");
+                return this.startTurnFromSteer(converted);
+            }
+            if (turn.completed) {
+                await turn.settlement;
+                continue;
+            }
+            if (turn.controller.signal.aborted) {
+                // Cancellation wins: cleanupTurn clears pi's queues so a steer racing a cancel
+                // must not restart the generation the user just stopped. The steer did not take.
+                return { outcome: "failed" };
+            }
+            // A committed-but-not-yet-streaming turn is steerable too: pi's run loop polls the
+            // steering queue before its first LLM call, so the message joins the imminent turn.
+            this.pendingSteerImages.set(converted.text, converted.images);
+            await this.pi.steer(converted.text, converted.images);
+            if (this.activeTurn === turn && !turn.completed && !turn.controller.signal.aborted) {
+                return { outcome: "injected" };
+            }
+            if (turn.controller.signal.aborted) {
+                this.recoverSteer(converted.text);
+                return { outcome: "failed" };
+            }
+            // The run settled underneath the enqueue. pi's queues are polled only from inside a
+            // run, so an undelivered message would silently prepend itself to the next
+            // session/prompt; recover it and place it into a live turn or a new one instead.
+            if (!this.recoverSteer(converted.text))
+                return { outcome: "injected" };
+        }
+    }
+    /** Pull one undelivered steering message back out of pi's queues. Returns false when pi
+     *  already consumed it (or a settlement drain already redispatched it). clearQueue is
+     *  all-or-nothing, so any other queued texts are re-enqueued untouched (text-only: pi
+     *  surfaces only the text mirror of messages it holds). */
+    recoverSteer(text) {
+        try {
+            if (!this.pi.getSteeringMessages().includes(text)) {
+                this.pendingSteerImages.delete(text);
+                return false;
+            }
+            const cleared = this.pi.clearQueue();
+            const steering = [...cleared.steering];
+            const index = steering.indexOf(text);
+            if (index !== -1)
+                steering.splice(index, 1);
+            for (const other of steering)
+                void this.pi.steer(other).catch(() => undefined);
+            for (const other of cleared.followUp)
+                void this.pi.followUp(other).catch(() => undefined);
+            this.pendingSteerImages.delete(text);
+            return index !== -1;
+        }
+        catch (error) {
+            console.error("pi-acp steering recovery error:", error);
+            return false;
+        }
+    }
+    /** Idle steer: start a normal turn with the content so it occupies the single turn slot
+     *  (session/prompt during it is legitimately busy; cancel/close still work) and resolve
+     *  as soon as the turn is committed — pi's preflightResult is the acceptance signal, the
+     *  analogue of codex's onTurnStarted. The turn itself is fire-and-forget: nothing owns
+     *  its PromptResponse and its output streams through the usual session/update path. */
+    async startTurnFromSteer(converted) {
+        let commit;
+        const committed = new Promise((resolve) => {
+            commit = (result) => resolve({ kind: result });
+        });
+        const done = this.startTurn(converted, {
+            preflightResult: (success) => commit(success ? "committed" : "preflight-failed"),
+        });
+        const doneTagged = done.then((response) => ({ kind: "settled", response }), (error) => ({ kind: "rejected", error }));
+        const raced = await Promise.race([committed, doneTagged]);
+        switch (raced.kind) {
+            case "committed":
+                done.catch((error) => console.error("pi-acp steer-started turn failed:", error));
+                return { outcome: "startedNewTurn" };
+            case "settled":
+                // The prompt finished without a generation (e.g. extension-handled input). A
+                // cancel that beat the turn start means the steer never took.
+                return raced.response.stopReason === "cancelled"
+                    ? { outcome: "failed" }
+                    : { outcome: "startedNewTurn" };
+            case "preflight-failed": {
+                // Surface the same mapped preflight rejection a prompt() caller would see.
+                const settled = await doneTagged;
+                if (settled.kind === "rejected")
+                    throw settled.error;
+                return { outcome: "startedNewTurn" };
+            }
+            case "rejected":
+                throw raced.error;
+        }
+    }
+    /** Settlement-time orphan recovery. pi's steering/follow-up queues are polled only from
+     *  inside a run, so a message still queued when the run settles would silently prepend
+     *  itself to the NEXT session/prompt. Both reference adapters run late content instead of
+     *  leaking or dropping it (codex falls through to a new turn; claude's streaming input
+     *  absorbs it as background generation), so redispatch it as a fire-and-forget turn. */
+    redispatchOrphanedSteering() {
+        if (this.closing || this.disposed || this.busy)
+            return;
+        let texts;
+        let images;
+        try {
+            if (this.pi.pendingMessageCount === 0) {
+                this.pendingSteerImages.clear();
+                return;
+            }
+            const cleared = this.pi.clearQueue();
+            texts = [...cleared.steering, ...cleared.followUp].filter((text) => text.length > 0);
+            images = cleared.steering.flatMap((text) => this.pendingSteerImages.get(text) ?? []);
+        }
+        catch (error) {
+            console.error("pi-acp orphaned steering recovery error:", error);
+            return;
+        }
+        this.pendingSteerImages.clear();
+        if (texts.length === 0)
+            return;
+        try {
+            const done = this.startTurn({ text: texts.join("\n\n"), images }, {});
+            done.catch((error) => console.error("pi-acp orphaned steering turn failed:", error));
+        }
+        catch (error) {
+            console.error("pi-acp orphaned steering turn failed:", error);
+        }
+    }
     cancel() {
         if (this.activeTurn)
             this.abortTurn(this.activeTurn);

package/dist/steering.d.ts

@@ -0,0 +1,16 @@
+import { type ContentBlock, type PromptRequest } from "@agentclientprotocol/sdk";
+export declare const SESSION_STEERING_METHOD: "_session/steering";
+export type SteeringOutcome = "injected" | "startedNewTurn" | "failed";
+export interface SteeringRequest {
+    sessionId: string;
+    prompt: ContentBlock[];
+    _meta?: PromptRequest["_meta"];
+}
+export interface SteeringResponse {
+    outcome: SteeringOutcome;
+}
+/** Runtime parser used by the ACP SDK's custom-request overload. */
+export declare const steeringRequestParser: {
+    parse(value: unknown): SteeringRequest;
+};
+//# sourceMappingURL=steering.d.ts.map

package/dist/steering.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"steering.d.ts","sourceRoot":"","sources":["../src/steering.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,aAAa,EACnB,MAAM,0BAA0B,CAAC;AAElC,eAAO,MAAM,uBAAuB,EAAG,mBAA4B,CAAC;AAEpE,MAAM,MAAM,eAAe,GAAG,UAAU,GAAG,gBAAgB,GAAG,QAAQ,CAAC;AAEvE,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,KAAK,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,eAAe,CAAC;CAC1B;AA2BD,oEAAoE;AACpE,eAAO,MAAM,qBAAqB;iBACnB,OAAO,GAAG,eAAe;CAgBvC,CAAC"}

package/dist/steering.js

@@ -0,0 +1,41 @@
+import { RequestError, } from "@agentclientprotocol/sdk";
+export const SESSION_STEERING_METHOD = "_session/steering";
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isContentBlock(value) {
+    if (!isRecord(value) || typeof value.type !== "string")
+        return false;
+    switch (value.type) {
+        case "text":
+            return typeof value.text === "string";
+        case "image":
+        case "audio":
+            return typeof value.data === "string" && typeof value.mimeType === "string";
+        case "resource_link":
+            return typeof value.uri === "string" && typeof value.name === "string";
+        case "resource": {
+            const resource = value.resource;
+            return isRecord(resource)
+                && typeof resource.uri === "string"
+                && (typeof resource.text === "string" || typeof resource.blob === "string");
+        }
+        default:
+            return false;
+    }
+}
+/** Runtime parser used by the ACP SDK's custom-request overload. */
+export const steeringRequestParser = {
+    parse(value) {
+        if (!isRecord(value)
+            || typeof value.sessionId !== "string"
+            || !Array.isArray(value.prompt)
+            || !value.prompt.every(isContentBlock)
+            || (value._meta !== undefined
+                && value._meta !== null
+                && !isRecord(value._meta))) {
+            throw RequestError.invalidParams(undefined, "invalid _session/steering request");
+        }
+        return value;
+    },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automatalabs/pi-acp",
-  "version": "0.2.8",
+  "version": "0.3.0",
   "license": "Apache-2.0",
   "engines": {
     "node": ">=22.19.0"