Lock constructor prompt on abort recovery and share the helper

Author: TheGreatAxios

src/director.test.ts

@@ -510,18 +510,15 @@ describe("chatDirector compaction", () => {
     } as unknown as ReactorInboundEvent;
   }
 
-  function chatDirectorWithContinuation(onContinuation?: () => void) {
-    return createChatDirector("", [], {
+  function chatDirectorWithContinuation(systemPrompt: string, onContinuation?: () => void) {
+    return createChatDirector(systemPrompt, [], {
       onTasksChange: () => {},
       requestContinuation: onContinuation ?? (() => {}),
     });
   }
 
   test("compacts at the tool.done pause once over threshold", async () => {
-    const director = createChatDirector("Corbits operating prompt", [], {
-      onTasksChange: () => {},
-      requestContinuation: () => {},
-    });
+    const director = chatDirectorWithContinuation("Corbits operating prompt");
     await director.decide(overThresholdToolTurn(), longState, mockCapabilities);
     const actions = actionsArray(
       await director.decide(makeToolDoneEvent("t1"), longState, mockCapabilities),
@@ -552,7 +549,7 @@ describe("chatDirector compaction", () => {
   // turn); it now falls through to the base director's terminal
   // checkpoint + reply instead of recovering.
   test("does not re-issue inference for a timeout already exhausted by the harness", async () => {
-    const director = chatDirectorWithContinuation();
+    const director = chatDirectorWithContinuation("");
     const timeout = {
       type: "inference.error",
       error: { category: "timeout", message: "request timed out" },
@@ -564,7 +561,7 @@ describe("chatDirector compaction", () => {
   });
 
   test("recovers an internally aborted inference but keeps explicit abort terminal", async () => {
-    const director = chatDirectorWithContinuation();
+    const director = chatDirectorWithContinuation("Corbits operating prompt");
     const internalAbort = {
       type: "inference.error",
       error: {
@@ -577,6 +574,10 @@ describe("chatDirector compaction", () => {
       await director.decide(internalAbort, longState, mockCapabilities),
     );
     expect(recovered.some((action) => action.type === "infer")).toBe(true);
+    const infer = recovered.find((action) => action.type === "infer");
+    const options: ExtendedInferenceOptions | undefined =
+      infer?.type === "infer" ? infer.options : undefined;
+    expect(options?.systemPrompt).toBe("Corbits operating prompt");
 
     const explicitAbort = {
       type: "abort",
@@ -588,7 +589,7 @@ describe("chatDirector compaction", () => {
   });
 
   test("does not auto-recover user-stop aborted inference errors", async () => {
-    const director = chatDirectorWithContinuation();
+    const director = chatDirectorWithContinuation("");
     const userStopAbort = {
       type: "inference.error",
       error: {
@@ -609,10 +610,10 @@ describe("chatDirector compaction", () => {
 
   test("a context_overflow inference error triggers compact-and-retry, not a terminal reply", async () => {
     let continuations = 0;
-    const director = createChatDirector("Corbits operating prompt", [], {
-      onTasksChange: () => {},
-      requestContinuation: () => continuations++,
-    });
+    const director = chatDirectorWithContinuation(
+      "Corbits operating prompt",
+      () => continuations++,
+    );
     const actions = actionsArray(
       await director.decide(overflowError(), longState, mockCapabilities),
     );
@@ -632,7 +633,7 @@ describe("chatDirector compaction", () => {
   });
 
   test("overflow recovery is bounded so an incompressible history cannot loop forever", async () => {
-    const director = chatDirectorWithContinuation();
+    const director = chatDirectorWithContinuation("");
     for (let i = 0; i < 2; i++) {
       const actions = actionsArray(
         await director.decide(overflowError(), longState, mockCapabilities),
@@ -647,7 +648,7 @@ describe("chatDirector compaction", () => {
   });
 
   test("chat posture is preserved: an idle turn never terminates the session", async () => {
-    const director = chatDirectorWithContinuation();
+    const director = chatDirectorWithContinuation("");
     const idle = actionsArray(
       await director.decide(textInferenceDone(10), longState, mockCapabilities),
     );

tests/unit/codex-responses-adapter.test.ts

@@ -88,6 +88,9 @@ describe("codex-responses buildRequest", () => {
     expect(body["tool_choice"]).toBe("auto");
   });
 
+  // Adapter mapping only: compacted history still uses instructions, not a
+  // developer item. ChatDirector tests own the lock that infer carries the
+  // constructor systemPrompt after compaction or recovery.
   test("sends compacted history with the system prompt as instructions and no developer item", () => {
     const systemPrompt = "Corbits operating prompt";
     const turns: ConversationTurn[] = [