@jskit-ai/assistant-core 0.2.6 → 0.2.8

package/src/server/conversation/codexObservationControl.js

@@ -8,8 +8,20 @@ import {
   CODEX_APP_SERVER_RUN_STATE
 } from "./codexTurnState.js";
 
-// Original observation-loss barriers, stop settlement and saved-stop inspection.
-// The shared conversation registry and journal remain their existing owners.
+/**
+ * Observation-loss barriers, stop settlement and saved-stop inspection. The conversation registry and the run
+ * journal own the state they change.
+ * @param {object} dependencies
+ * @param {import("./codexConversations.js").CodexConversationCommands} dependencies.conversations
+ * @param {import("./codexOutput.js").CodexAppServerOutput} dependencies.output
+ * @param {import("./codexRunJournal.js").CodexRunJournal} dependencies.journal
+ * @param {import("./codexTurn.js").CodexSessionNamespace} dependencies.namespace
+ * @param {import("./codexTurn.js").CodexCreateRuntime} dependencies.createRuntime
+ * @param {import("./codexTurn.js").CodexPublish} dependencies.publish
+ * @param {import("./codexTurn.js").CodexRunInContext} dependencies.runInContext
+ * @param {import("./codexTurn.js").CodexTurnStateReader} dependencies.turnState
+ * @param {string} dependencies.errorPrefix
+ */
 export function createCodexObservationControl({
   conversations,
   output,
@@ -22,11 +34,6 @@ export function createCodexObservationControl({
   errorPrefix
 }) {
   const { codexAppServerConversations } = conversations;
-  const { readAgentRunForSession: readCodexAppServerAgentRunForSession } = output;
-  const {
-    agentRunRealtimePayload: codexAppServerAgentRunRealtimePayload,
-    clearActiveTimer: clearCodexAppServerActiveTimer
-  } = journal;
 
   function assertCodexAppServerThreadCanResume(run, threadId) {
     if (run?.providerThreadId === threadId && run.providerStatus === "observation_lost") {
@@ -38,90 +45,97 @@ export function createCodexObservationControl({
 
   function createCodexAppServerObservation(sessionId, context = {}) {
     const { projectContext, target, retireProvider } = context;
-    return {
-      prepare({ provider, error, threadIds }) {
-        return runInContext(projectContext, async () => {
-          const managed = target(error);
-          const threads = new Map();
-          for (const entry of codexAppServerConversations.get(namespace(sessionId))?.values() || []) {
-            if (entry.provider !== provider || threadIds && !threadIds.includes(entry.conversationId)) continue;
-            threads.set(entry.conversationId, entry.runId);
-            if (codexAppServerConversationTurnIsActive(entry.status) || entry.goal?.status === "active") {
-              entry.error = managed.pendingMessage;
-            }
-          }
-          // A helper owns only its own threads. Main chat belongs to its managed provider.
-          if (managed.threadId && (!threadIds || threadIds.includes(managed.threadId))) {
-            const runtime = await createRuntime();
-            const turn = turnState(await runtime.getSession(sessionId));
-            threads.set(managed.threadId, turn.turnId);
-            if (turn.active || codexAppServerTurnOwnsActiveGoal(turn, managed.threadId)) {
-              await runtime.store.writeAgentRunEvent(sessionId, CODEX_APP_SERVER_AGENT_RUN_ID, {
-                event: { kind: "observation-lost", message: error.message },
-                patch: { providerStatus: "observation_lost", error: managed.pendingMessage }
-              });
-              await publish(sessionId, { reason: "codex-observation-lost" });
-            }
+
+    function prepare({ provider, error, threadIds }) {
+      return runInContext(projectContext, async () => {
+        const managed = target(error);
+        const threads = new Map();
+        for (const entry of codexAppServerConversations.get(namespace(sessionId))?.values() || []) {
+          if (entry.provider !== provider || threadIds && !threadIds.includes(entry.conversationId)) continue;
+          threads.set(entry.conversationId, entry.runId);
+          if (codexAppServerConversationTurnIsActive(entry.status) || entry.goal?.status === "active") {
+            entry.error = managed.pendingMessage;
           }
-          return threads;
-        });
-      },
-      barrier({ error, threadIds }) {
-        return runInContext(projectContext, async () => {
-          const managed = target(error);
-          if (!managed.threadId || threadIds && !threadIds.includes(managed.threadId)) return;
+        }
+        // A helper owns only its own threads. Main chat belongs to its managed provider.
+        if (managed.threadId && (!threadIds || threadIds.includes(managed.threadId))) {
           const runtime = await createRuntime();
           const turn = turnState(await runtime.getSession(sessionId));
-          if (!turn.active && !codexAppServerTurnOwnsActiveGoal(turn, managed.threadId)) return;
-          await runtime.store.writeAgentRunEvent(sessionId, CODEX_APP_SERVER_AGENT_RUN_ID, {
-            event: { kind: "observation-lost", message: error.message },
-            patch: { providerStatus: "observation_lost", error: managed.pendingMessage }
-          });
-        });
-      },
-      complete({ provider, error, sharedStop, threadIds }) {
-        return runInContext(projectContext, async () => {
-          const managed = target(error);
-          let stoppedRun = null;
-          let conversationStream = null;
-          if (managed.threadId && (!threadIds || threadIds.includes(managed.threadId))) {
-            const runtime = await createRuntime();
-            stoppedRun = await runtime.store.mutateSession(sessionId, async () => {
-              const run = await readCodexAppServerAgentRunForSession(runtime.store, sessionId);
-              if (run?.providerThreadId !== managed.threadId || run.providerStatus !== "observation_lost") return null;
-              const stopped = await runtime.store.writeAgentRunEvent(sessionId, CODEX_APP_SERVER_AGENT_RUN_ID, {
-                event: { kind: "codex-observation-stopped", state: CODEX_APP_SERVER_RUN_STATE.INTERRUPTED },
-                patch: {
-                  error: sharedStop ? `${managed.message} Its shared service was stopped, affecting other sessions using it.` : managed.message,
-                  providerStatus: "observation_lost", state: CODEX_APP_SERVER_RUN_STATE.INTERRUPTED
-                }
-              });
-              conversationStream = runtime.store.clearConversationStream(sessionId);
-              return stopped;
+          threads.set(managed.threadId, turn.turnId);
+          if (turn.active || codexAppServerTurnOwnsActiveGoal(turn, managed.threadId)) {
+            await runtime.store.writeAgentRunEvent(sessionId, CODEX_APP_SERVER_AGENT_RUN_ID, {
+              event: { kind: "observation-lost", message: error.message },
+              patch: { providerStatus: "observation_lost", error: managed.pendingMessage }
             });
+            await publish(sessionId, { reason: "codex-observation-lost" });
           }
-          // Retain the stop owner until the stopped state is durable. Make the
-          // provider ready for explicit control before publishing that state.
-          if (sharedStop) await retireProvider(provider);
-          else provider.observationFailure = null;
-          for (const entry of codexAppServerConversations.get(namespace(sessionId))?.values() || []) {
-            if (entry.provider === provider && (!threadIds || threadIds.includes(entry.conversationId)) && (
-              codexAppServerConversationTurnIsActive(entry.status) || entry.goal?.status === "active"
-            )) {
-              entry.status = "interrupted";
-              entry.error = managed.message;
-              entry.watcher?.failNow(error);
-            }
-          }
-          if (stoppedRun) {
-            await publish(sessionId, {
-              payload: { ...codexAppServerAgentRunRealtimePayload(stoppedRun), conversationStream },
-              reason: "codex-observation-stopped"
+        }
+        return threads;
+      });
+    }
+
+    function barrier({ error, threadIds }) {
+      return runInContext(projectContext, async () => {
+        const managed = target(error);
+        if (!managed.threadId || threadIds && !threadIds.includes(managed.threadId)) return;
+        const runtime = await createRuntime();
+        const turn = turnState(await runtime.getSession(sessionId));
+        if (!turn.active && !codexAppServerTurnOwnsActiveGoal(turn, managed.threadId)) return;
+        await runtime.store.writeAgentRunEvent(sessionId, CODEX_APP_SERVER_AGENT_RUN_ID, {
+          event: { kind: "observation-lost", message: error.message },
+          patch: { providerStatus: "observation_lost", error: managed.pendingMessage }
+        });
+      });
+    }
+
+    function complete({ provider, error, sharedStop, threadIds }) {
+      return runInContext(projectContext, async () => {
+        const managed = target(error);
+        let stoppedRun = null;
+        let conversationStream = null;
+        if (managed.threadId && (!threadIds || threadIds.includes(managed.threadId))) {
+          const runtime = await createRuntime();
+          stoppedRun = await runtime.store.mutateSession(sessionId, async () => {
+            const run = await output.readAgentRunForSession(runtime.store, sessionId);
+            if (run?.providerThreadId !== managed.threadId || run.providerStatus !== "observation_lost") return null;
+            const stopped = await runtime.store.writeAgentRunEvent(sessionId, CODEX_APP_SERVER_AGENT_RUN_ID, {
+              event: { kind: "codex-observation-stopped", state: CODEX_APP_SERVER_RUN_STATE.INTERRUPTED },
+              patch: {
+                error: sharedStop ? `${managed.message} Its shared service was stopped, affecting other sessions using it.` : managed.message,
+                providerStatus: "observation_lost", state: CODEX_APP_SERVER_RUN_STATE.INTERRUPTED
+              }
             });
+            conversationStream = runtime.store.clearConversationStream(sessionId);
+            return stopped;
+          });
+        }
+        // Retain the stop owner until the stopped state is durable. Make the
+        // provider ready for explicit control before publishing that state.
+        if (sharedStop) await retireProvider(provider);
+        else provider.observationFailure = null;
+        for (const entry of codexAppServerConversations.get(namespace(sessionId))?.values() || []) {
+          if (entry.provider === provider && (!threadIds || threadIds.includes(entry.conversationId)) && (
+            codexAppServerConversationTurnIsActive(entry.status) || entry.goal?.status === "active"
+          )) {
+            entry.status = "interrupted";
+            entry.error = managed.message;
+            entry.watcher?.failNow(error);
           }
-        });
-      }
-    };
+        }
+        if (stoppedRun) {
+          await publish(sessionId, {
+            payload: { ...journal.agentRunRealtimePayload(stoppedRun), conversationStream },
+            reason: "codex-observation-stopped"
+          });
+        }
+      });
+    }
+
+    return Object.freeze({
+      prepare,
+      barrier,
+      complete
+    });
   }
 
   async function recoverCodexAppServerObservationLoss(runtime, session, context = {}) {
@@ -140,7 +154,7 @@ export function createCodexObservationControl({
     if (!codexAppServerTurnStatusIsSuccessfulComplete(status)) return current;
 
     const stoppedRun = await runtime.store.mutateSession(sessionId, async () => {
-      const latest = await readCodexAppServerAgentRunForSession(runtime.store, sessionId);
+      const latest = await output.readAgentRunForSession(runtime.store, sessionId);
       if (JSON.stringify(latest) !== JSON.stringify(codexAppServerAgentRun(current))) return null;
       return runtime.store.writeAgentRunEvent(sessionId, CODEX_APP_SERVER_AGENT_RUN_ID, {
         event: { kind: "codex-observation-stop-recovered", message: "Codex confirmed that the conversation is stopped." },
@@ -154,10 +168,10 @@ export function createCodexObservationControl({
       });
     });
     if (stoppedRun) {
-      clearCodexAppServerActiveTimer(sessionId);
+      journal.clearActiveTimer(sessionId);
       await publish(sessionId, {
         payload: {
-          ...codexAppServerAgentRunRealtimePayload(stoppedRun),
+          ...journal.agentRunRealtimePayload(stoppedRun),
           conversationStream: runtime.store.clearConversationStream(sessionId)
         },
         reason: "codex-observation-stop-recovered"
@@ -166,9 +180,11 @@ export function createCodexObservationControl({
     return runtime.getSession(sessionId);
   }
 
-  return {
+  return Object.freeze({
     assertThreadCanResume: assertCodexAppServerThreadCanResume,
     createObservation: createCodexAppServerObservation,
     recoverObservationLoss: recoverCodexAppServerObservationLoss
-  };
+  });
 }
+
+/** @typedef {ReturnType<typeof createCodexObservationControl>} CodexObservationControl */