@alas-ide/codex-acp 2.1.1-alas.1 → 2.1.1-alas.2

package/dist/index.js

@@ -33523,7 +33523,7 @@ var package_default = {
   publishConfig: {
     access: "public"
   },
-  version: "2.1.1-alas.1",
+  version: "2.1.1-alas.2",
   description: "",
   main: "dist/index.js",
   bin: {
@@ -33559,6 +33559,7 @@ var package_default = {
     "generate-types": "./node_modules/.bin/codex app-server generate-ts --out src/app-server",
     "release:preflight": "bash scripts/release-preflight.sh",
     test: "vitest run --no-file-parallelism --retry=2",
+    "test:maintenance": "vitest run --no-file-parallelism scripts/*.test.mjs",
     "test:e2e": "npm run build && RUN_E2E_TESTS=true vitest run --no-file-parallelism --retry=2 src/__tests__/CodexACPAgent/e2e",
     "test:watch": "vitest",
     typecheck: "tsc --noEmit && tsc --noEmit -p examples/tsconfig.json",
@@ -33597,7 +33598,7 @@ var package_default = {
   alasDownstream: {
     upstreamVersion: "2.1.1",
     upstreamCommit: "68d7d2d5ddfc0ed5746f9f6130892dda685e65dd",
-    sourceCommit: "4461c5be6a2c567b60f27039ee5ba18c63ba0959"
+    sourceCommit: "6f9ea3170aab4f0a4172456b509a2d11ec4ed905"
   }
 };
 
@@ -38394,6 +38395,7 @@ var CodexAcpServer = class {
         if (!sessionState) {
           throw RequestError.invalidParams(void 0, `Unknown session: ${methodRequest.params.sessionId}`);
         }
+        await this.ensureSessionEventSubscription(sessionState);
         const sessionGeneration = this.getSessionGeneration(sessionState.sessionId);
         const goalControlGeneration = this.bumpGoalControlGeneration(sessionState.sessionId);
         if (methodRequest.params.action === "set") {
@@ -39592,6 +39594,61 @@ Check ${configPath} and project .codex directories, especially their config.toml
     await this.startNewTurnFromExternalPrompt(params, "Steering");
     return { outcome: "startedNewTurn" };
   }
+  /**
+   * Subscribes a session that has not run a prompt yet to its app-server notifications.
+   *
+   * A prompt subscribes the thread and its handler keeps forwarding session-scoped
+   * notifications after the prompt ends. Before the first prompt nothing is subscribed, so
+   * goal control would drop the goal update and the goal turn app-server starts for it.
+   * The next prompt replaces this handler.
+   */
+  ensureSessionEventSubscription(sessionState) {
+    sessionState.eventSubscription ??= this.subscribeSessionEvents(sessionState).catch((error62) => {
+      delete sessionState.eventSubscription;
+      throw error62;
+    });
+    return sessionState.eventSubscription;
+  }
+  async subscribeSessionEvents(sessionState) {
+    const eventHandler = new CodexEventHandler(
+      this.connection,
+      sessionState,
+      clientSupportsTypedSessionFailures(this.clientCapabilities),
+      this.sessionFailureEpoch,
+      sessionState.subagents,
+      (accountUpdated) => this.handleAccountUpdated(accountUpdated),
+      false,
+      clientSupportsCompaction(this.clientCapabilities),
+      clientSupportsNotices(this.clientCapabilities)
+    );
+    const permissionContext = this.permissionLifecycleContext(sessionState).beginPrompt();
+    const toolCallRenderer = new AcpToolCallRenderer(this.capabilities);
+    const signal = new AbortController().signal;
+    const approvalHandler = new CodexApprovalHandler(this.connection, permissionContext, signal, toolCallRenderer);
+    const elicitationHandler = new CodexElicitationHandler(
+      this.connection,
+      permissionContext,
+      this.clientCapabilities,
+      signal,
+      toolCallRenderer
+    );
+    const observeInteraction = async (event) => {
+      permissionContext.handleNotification(event);
+      await elicitationHandler.handleNotification(event);
+    };
+    await this.codexAcpClient.subscribeToSessionEvents(
+      sessionState.sessionId,
+      async (event) => {
+        await observeInteraction(event);
+        await eventHandler.handleSessionScopedNotification(event);
+      },
+      approvalHandler,
+      elicitationHandler,
+      clientSupportsSubagents(this.clientCapabilities),
+      observeInteraction,
+      (childThreadId) => eventHandler.waitForNativeSubagentSession(childThreadId)
+    );
+  }
   async startGoalContinuationIfCurrent(sessionState, sessionGeneration, goalControlGeneration, expectedGoal) {
     await this.startNewTurnFromExternalPrompt({
       sessionId: sessionState.sessionId,
@@ -40530,6 +40587,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
         observeInteraction,
         (childThreadId) => promptEventHandler.waitForNativeSubagentSession(childThreadId)
       );
+      sessionState.eventSubscription = Promise.resolve();
       if (activePrompt.signal.aborted) {
         return cancelledPromptResponse();
       }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.1.1-alas.1",
+  "version": "2.1.1-alas.2",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -39,6 +39,7 @@
     "generate-types": "./node_modules/.bin/codex app-server generate-ts --out src/app-server",
     "release:preflight": "bash scripts/release-preflight.sh",
     "test": "vitest run --no-file-parallelism --retry=2",
+    "test:maintenance": "vitest run --no-file-parallelism scripts/*.test.mjs",
     "test:e2e": "npm run build && RUN_E2E_TESTS=true vitest run --no-file-parallelism --retry=2 src/__tests__/CodexACPAgent/e2e",
     "test:watch": "vitest",
     "typecheck": "tsc --noEmit && tsc --noEmit -p examples/tsconfig.json",
@@ -77,6 +78,6 @@
   "alasDownstream": {
     "upstreamVersion": "2.1.1",
     "upstreamCommit": "68d7d2d5ddfc0ed5746f9f6130892dda685e65dd",
-    "sourceCommit": "4461c5be6a2c567b60f27039ee5ba18c63ba0959"
+    "sourceCommit": "6f9ea3170aab4f0a4172456b509a2d11ec4ed905"
   }
 }