CR: error handling

Author: Rizzen

src/AcpExtensions.ts

@@ -90,7 +90,7 @@ export type SessionSteerRequest = {
 }
 
 export type SessionSteeringResponse = {
-    outcome: "injected" | "startedNewTurn";
+    outcome: "injected" | "startedNewTurn" | "failed";
 }
 
 export type SessionSteeringExtRequest = {

src/CodexAcpServer.ts

@@ -888,13 +888,20 @@ export class CodexAcpServer {
      * check guards against deleting a queue a later request has since reused).
      *
      * @param params The target session id and the prompt to steer with.
-     * @returns Whether the prompt joined the active turn ("injected") or started
-     *     a new one ("startedNewTurn"); see {@link performSteeringRequest}.
+     * @returns Whether the prompt joined the active turn ("injected"), started a
+     *     new one ("startedNewTurn"), or could not be applied ("failed"); see
+     *     {@link performSteeringRequest}.
      */
     async executeOrQueueSteeringRequest(params: SessionSteerRequest): Promise<SessionSteeringResponse> {
         const queue = this.getSteeringQueue(params.sessionId);
         try {
             return await queue.enqueue(params);
+        } catch (error) {
+            if (error instanceof RequestError) {
+                throw error;
+            }
+            logger.error(`Steering request for session ${params.sessionId} failed`, error);
+            return {outcome: "failed"};
         } finally {
             if (queue.isIdle && this.steeringQueues.get(params.sessionId) === queue) {
                 this.steeringQueues.delete(params.sessionId);

src/__tests__/CodexACPAgent/steer-events.test.ts

@@ -192,6 +192,18 @@ describe('_session/steering', () => {
         });
     });
 
+    it('reports failed instead of throwing when steering hits an unexpected error', async () => {
+        const mockFixture = createCodexMockTestFixture();
+        vi.spyOn(mockFixture.getCodexAcpAgent(), "getSessionState").mockImplementation(() => {
+            throw new Error("unexpected boom");
+        });
+
+        await expect(mockFixture.getCodexAcpAgent().extMethod(SESSION_STEERING_METHOD, {
+            sessionId: "session-id",
+            prompt: [{type: "text", text: "keep the agent alive"}],
+        })).resolves.toEqual({outcome: "failed"});
+    });
+
     it('rejects malformed steer params', async () => {
         const mockFixture = createCodexMockTestFixture();