@automatalabs/pi-acp 0.5.0 → 0.6.0

package/README.md

@@ -69,19 +69,17 @@ Load replay is the active linear branch and excludes branch topology and compact
 ### 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
+`_meta: { steering: { supported: true } }`, with strict active-turn-only 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.
+consume it — the server removes any unconsumed native queue entry and returns
+`{ outcome: "promptRequired", reason: "noRunningTurn" }`. It never calls `prompt()`, `followUp()`, or
+another turn-start helper from steering, so steering cannot create hidden work or prepend input to a
+later prompt. Cancellation races use the same `promptRequired/noRunningTurn` response when no active
+turn accepted the instruction. Unexpected internal failures reject the JSON-RPC request through the
+normal structured error path.
 
 ### Loaded-session turn-terminal state (`_session/loaded_turn`)
 

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;AAS3C,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,KAAK,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGjF,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;yEACqE;IACrE,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,sBAAsB,CAAC,GAAG;QACrE,MAAM,EAAE,gBAAgB,CAAC;KAC1B;IAID,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;AACvE,OAAO,KAAK,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGjF,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;IAQ/E;yEACqE;IACrE,eAAe,CAAC,OAAO,EAAE,mBAAmB,CAAC,sBAAsB,CAAC,GAAG;QACrE,MAAM,EAAE,gBAAgB,CAAC;KAC1B;IAID,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

@@ -646,10 +646,7 @@ export class PiAcpAgent {
             .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" };
+            throw unexpectedError(error);
         });
     }
     /** `_session/loaded_turn/query` (see `src/loaded-turn.ts`): the loaded

package/dist/session.d.ts

@@ -40,7 +40,6 @@ export declare class PiSession {
     private unsubscribe;
     private activeTurn;
     private steerChain;
-    private readonly pendingSteerImages;
     private configReserved;
     private cleanupDirty;
     private cleanupGeneration;
@@ -94,33 +93,15 @@ export declare class PiSession {
     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. */
+     *  job: prompt() rejects while busy. Steering never calls this method. */
     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. */
+    /** `_session/steering`: inject only into the live turn. Requests are serialized per
+     *  session so concurrent steering calls cannot cross a turn boundary. */
     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;
+    /** Remove native Pi queue residue at a turn boundary. Nothing left by steering may be
+     *  consumed by a later public prompt. Unexpected cleanup failures stay exceptional. */
+    private discardOrphanedSteering;
     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":"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"}
+{"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;AACjG,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AA2B1B,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,UAAU,CAAoC;IACtD,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;IACtD;;;;;qCAKiC;IACjC,OAAO,CAAC,yBAAyB,CAAS;gBAE9B,OAAO,EAAE,gBAAgB;IAuCrC,IAAI,IAAI,IAAI,OAAO,CAElB;IAED;;;;;;;;;;;;;;;OAeG;IACH,gBAAgB,IAAI,gBAAgB;IAiBpC,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;IAuCd,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,SAAS;IASjB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,WAAW;IA6GnB,OAAO,CAAC,SAAS;IAiBjB,OAAO,CAAC,WAAW;YAOL,aAAa;YAQb,gBAAgB;YAoBhB,gBAAgB;IA0BxB,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC;IAKxF;;8EAE0E;IAC1E,OAAO,CAAC,SAAS;IAgFjB;6EACyE;IACnE,KAAK,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;YASjD,YAAY;IA6B1B;2FACuF;IACvF,OAAO,CAAC,uBAAuB;IAI/B,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"}

package/dist/session.js

@@ -31,7 +31,6 @@ export class PiSession {
     unsubscribe;
     activeTurn;
     steerChain = Promise.resolve();
-    pendingSteerImages = new Map();
     configReserved = false;
     cleanupDirty = false;
     cleanupGeneration;
@@ -320,7 +319,6 @@ export class PiSession {
         if (turn && !turn.controller.signal.aborted)
             turn.controller.abort();
         let clearQueuePi = Promise.resolve();
-        this.pendingSteerImages.clear();
         try {
             this.pi.clearQueue();
         }
@@ -437,9 +435,8 @@ export class PiSession {
                 return;
             const terminal = terminalAssistant(messages);
             const stopReason = stopReasonFor(terminal, turn.controller.signal.aborted);
+            this.discardOrphanedSteering();
             this.finish(turn, { response: { stopReason, usage: promptUsage(messages) } });
-            if (!turn.controller.signal.aborted)
-                this.redispatchOrphanedSteering();
         }
         catch (error) {
             if (this.pumpFailure !== undefined)
@@ -455,8 +452,8 @@ export class PiSession {
             turn.diagnosticOpen = false;
             try {
                 await this.drain();
+                this.discardOrphanedSteering();
                 this.finish(turn, { error: classifyPreflight(error) });
-                this.redispatchOrphanedSteering();
             }
             catch {
                 this.notificationFailure();
@@ -486,9 +483,7 @@ export class PiSession {
     }
     /** 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. */
+     *  job: prompt() rejects while busy. Steering never calls this method. */
     startTurn(converted, opts) {
         const text = converted.text;
         let startMessageIndex;
@@ -554,10 +549,7 @@ export class PiSession {
             }
             let piPromise;
             try {
-                piPromise = this.pi.prompt(text, {
-                    images: converted.images,
-                    ...(opts.preflightResult ? { preflightResult: opts.preflightResult } : {}),
-                });
+                piPromise = this.pi.prompt(text, { images: converted.images });
             }
             catch (error) {
                 await this.handlePiRejected(turn, error);
@@ -567,149 +559,46 @@ 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. */
+    /** `_session/steering`: inject only into the live turn. Requests are serialized per
+     *  session so concurrent steering calls cannot cross a turn boundary. */
     async steer(params) {
-        const converted = convertPromptContent(params.prompt);
-        const run = this.steerChain.then(() => this.performSteer(converted));
+        const run = this.steerChain.then(() => this.performSteer(params));
         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;
+    async performSteer(params) {
+        if (this.closing || this.disposed)
+            throw adapterError("session_terminated");
+        const turn = this.activeTurn;
+        if (!turn || turn.completed || turn.controller.signal.aborted) {
+            return { outcome: "promptRequired", reason: "noRunningTurn" };
         }
-    }
-    /** 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;
+        const converted = convertPromptContent(params.prompt);
+        // 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.
         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) ?? []);
+            await this.pi.steer(converted.text, converted.images);
         }
         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));
+            if (this.activeTurn !== turn || turn.completed || turn.controller.signal.aborted) {
+                this.discardOrphanedSteering();
+            }
+            throw error;
         }
-        catch (error) {
-            console.error("pi-acp orphaned steering turn failed:", error);
+        if (this.activeTurn === turn && !turn.completed && !turn.controller.signal.aborted) {
+            return { outcome: "injected" };
         }
+        // The run settled (or cancellation won) underneath the native enqueue. Pi only polls
+        // this queue from an active run, so leaving any residue would prepend hidden input to a
+        // later session/prompt. Remove it and require the caller to issue an explicit prompt.
+        this.discardOrphanedSteering();
+        return { outcome: "promptRequired", reason: "noRunningTurn" };
+    }
+    /** Remove native Pi queue residue at a turn boundary. Nothing left by steering may be
+     *  consumed by a later public prompt. Unexpected cleanup failures stay exceptional. */
+    discardOrphanedSteering() {
+        if (this.pi.pendingMessageCount > 0)
+            this.pi.clearQueue();
     }
     cancel() {
         if (this.activeTurn)

package/dist/steering.d.ts

@@ -1,14 +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;
-}
+export type SteeringResponse = {
+    outcome: "injected";
+} | {
+    outcome: "promptRequired";
+    reason: "noRunningTurn";
+};
 /** Runtime parser used by the ACP SDK's custom-request overload. */
 export declare const steeringRequestParser: {
     parse(value: unknown): SteeringRequest;

package/dist/steering.d.ts.map

@@ -1 +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"}
+{"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,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,MAAM,gBAAgB,GACxB;IAAE,OAAO,EAAE,UAAU,CAAA;CAAE,GACvB;IAAE,OAAO,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC;AA2B3D,oEAAoE;AACpE,eAAO,MAAM,qBAAqB;iBACnB,OAAO,GAAG,eAAe;CAgBvC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automatalabs/pi-acp",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "license": "Apache-2.0",
   "engines": {
     "node": ">=22.19.0"
@@ -31,13 +31,13 @@
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "1.4.0",
-    "@earendil-works/pi-ai": "0.84.2",
-    "@earendil-works/pi-coding-agent": "0.84.2",
+    "@earendil-works/pi-ai": "0.84.3",
+    "@earendil-works/pi-coding-agent": "0.84.3",
     "@modelcontextprotocol/sdk": "1.29.0",
     "typebox": "1.3.2"
   },
   "devDependencies": {
-    "@earendil-works/pi-agent-core": "0.84.2"
+    "@earendil-works/pi-agent-core": "0.84.3"
   },
   "scripts": {
     "build": "tsc -b",