Add default collaboration mode preset for Codex turn starts

- Send `collaborationMode` for both `default` and `plan` interactions - Add default-mode developer instructions and preserve plan-mode behavior - Update server/web tests for default collaboration mode and model constant usage

Julius Marminge committed 8 months ago

Commit 551aebc1 parent 9de85ea3 files · +60 −7Browse files

Unified · Split

3 files

apps/server/src/codexAppServerManager.test.ts +31 −0
apps/server/src/codexAppServerManager.ts +21 −5
apps/web/src/store.test.ts +8 −2

apps/server/src/codexAppServerManager.test.ts+31−0

@@ -7,6 +7,7 @@ import { ApprovalRequestId, ThreadId } from "@t3tools/contracts"; · 6 unmodified lines
7		7
8	import {	8	import {
9	buildCodexInitializeParams,	9	buildCodexInitializeParams,
		10	CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS,
10	CODEX_PLAN_MODE_DEVELOPER_INSTRUCTIONS,	11	CODEX_PLAN_MODE_DEVELOPER_INSTRUCTIONS,
11	CodexAppServerManager,	12	CodexAppServerManager,
12	classifyCodexStderrLine,	13	classifyCodexStderrLine,
@@ -346,6 +347,36 @@ describe("sendTurn", () => { · 333 unmodified lines
346	});	347	});
347	});	348	});
348		349
		350	it("passes Codex default mode as a collaboration preset on turn/start", async () => {
		351	const { manager, context, sendRequest } = createSendTurnHarness();
		352
		353	await manager.sendTurn({
		354	threadId: asThreadId("thread_1"),
		355	input: "PLEASE IMPLEMENT THIS PLAN:\n- step 1",
		356	interactionMode: "default",
		357	});
		358
		359	expect(sendRequest).toHaveBeenCalledWith(context, "turn/start", {
		360	threadId: "thread_1",
		361	input: [
		362	{
		363	type: "text",
		364	text: "PLEASE IMPLEMENT THIS PLAN:\n- step 1",
		365	text_elements: [],
		366	},
		367	],
		368	model: "gpt-5.3-codex",
		369	collaborationMode: {
		370	mode: "default",
		371	settings: {
		372	model: "gpt-5.3-codex",
		373	reasoning_effort: "medium",
		374	developer_instructions: CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS,
		375	},
		376	},
		377	});
		378	});
		379
349	it("rejects empty turn input", async () => {	380	it("rejects empty turn input", async () => {
350	const { manager } = createSendTurnHarness();	381	const { manager } = createSendTurnHarness();
351		382

apps/server/src/codexAppServerManager.ts+21−5

 Only produce at most one \`<proposed_plan>\` block per turn, and only when you are presenting a complete spec.
 </collaboration_mode>`;
+export const CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS = `<collaboration_mode># Collaboration Mode: Default
+You are now in Default mode. Any previous instructions for other modes (e.g. Plan mode) are no longer active.
+Your active mode changes only when new developer instructions with a different \`<collaboration_mode>...</collaboration_mode>\` change it; user requests or tool descriptions do not change mode by themselves. Known mode names are Default and Plan.
+## request_user_input availability
+The \`request_user_input\` tool is unavailable in Default mode. If you call it while in Default mode, it will return an error.
+In Default mode, strongly prefer making reasonable assumptions and executing the user's request rather than stopping to ask questions. If you absolutely must ask a question because the answer cannot be discovered from local context and a reasonable assumption would be risky, ask the user directly with a concise plain-text question. Never write a multiple choice question as a textual assistant message.
+</collaboration_mode>`;
 function mapCodexRuntimeMode(runtimeMode: RuntimeMode): {
   readonly approvalPolicy: "on-request" | "never";
   readonly sandbox: "workspace-write" | "danger-full-access";
   readonly effort?: string;
 }):
   | {
-      mode: "plan";
+      mode: "default" | "plan";
       settings: {
         model: string;
         reasoning_effort: string;
       };
     }
   | undefined {
-  if (input.interactionMode !== "plan") {
+  if (input.interactionMode === undefined) {
     return undefined;
   }
   const model = normalizeCodexModelSlug(input.model) ?? "gpt-5.3-codex";
   return {
-    mode: "plan",
+    mode: input.interactionMode,
     settings: {
       model,
       reasoning_effort: input.effort ?? "medium",
-      developer_instructions: CODEX_PLAN_MODE_DEVELOPER_INSTRUCTIONS,
+      developer_instructions:
+        input.interactionMode === "plan"
+          ? CODEX_PLAN_MODE_DEVELOPER_INSTRUCTIONS
+          : CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS,
     },
   };
 }
       effort?: string;
       serviceTier?: string;
       collaborationMode?: {
-        mode: "plan";
+        mode: "default" | "plan";
         settings: {
           model: string;
           reasoning_effort: string;

apps/web/src/store.test.ts+8−2

-import { ProjectId, ThreadId, TurnId, type OrchestrationReadModel } from "@t3tools/contracts";
+import {
+  DEFAULT_MODEL_BY_PROVIDER,
+  ProjectId,
+  ThreadId,
+  TurnId,
+  type OrchestrationReadModel,
+} from "@t3tools/contracts";
 import { describe, expect, it } from "vitest";
 import { markThreadUnread, syncServerReadModel, type AppState } from "./store";
     const next = syncServerReadModel(initialState, readModel);
-    expect(next.threads[0]?.model).toBe("gpt-5.3-codex");
+    expect(next.threads[0]?.model).toBe(DEFAULT_MODEL_BY_PROVIDER.codex);
   });
 });