Persist pending runtime mode and session resume cursors

- Track pending runtime mode on threads
- Preserve provider session resume cursors in projections
- Extend mock ACP agent to exercise permission prompts

Author: ronak-guliani

apps/server/scripts/acp-mock-agent.ts

@@ -18,8 +18,16 @@ const emitInterleavedAssistantToolCalls =
 const emitGenericToolPlaceholders = process.env.T3_ACP_EMIT_GENERIC_TOOL_PLACEHOLDERS === "1";
 const emitAskQuestion = process.env.T3_ACP_EMIT_ASK_QUESTION === "1";
 const emitElicitation = process.env.T3_ACP_EMIT_ELICITATION === "1";
+const permissionRequestCount = Number.parseInt(
+  process.env.T3_ACP_PERMISSION_REQUEST_COUNT ?? "0",
+  10,
+);
+const permissionRequestKind = process.env.T3_ACP_PERMISSION_REQUEST_KIND ?? "execute";
 const failSetConfigOption = process.env.T3_ACP_FAIL_SET_CONFIG_OPTION === "1";
 const exitOnSetConfigOption = process.env.T3_ACP_EXIT_ON_SET_CONFIG_OPTION === "1";
+const ignoreCancel = process.env.T3_ACP_IGNORE_CANCEL === "1";
+const promptDelayMs = Number.parseInt(process.env.T3_ACP_PROMPT_DELAY_MS ?? "0", 10);
+const promptStartedText = process.env.T3_ACP_PROMPT_STARTED_TEXT;
 const promptResponseText = process.env.T3_ACP_PROMPT_RESPONSE_TEXT;
 const authMethods = (process.env.T3_ACP_AUTH_METHODS ?? "")
   .split(",")
@@ -35,6 +43,61 @@ let currentContext = "272k";
 let currentFast = false;
 const cancelledSessions = new Set<string>();
 
+function mockPermissionRequestPayload(kind: string) {
+  switch (kind) {
+    case "edit":
+      return {
+        title: "Edit file",
+        rawInput: {
+          path: "server/package.json",
+        },
+        content: [
+          {
+            type: "content" as const,
+            content: {
+              type: "text" as const,
+              text: "Edit server/package.json",
+            },
+          },
+        ],
+      };
+    default:
+      return {
+        title: "`cat server/package.json`",
+        rawInput: {
+          command: ["cat", "server/package.json"],
+        },
+        content: [
+          {
+            type: "content" as const,
+            content: {
+              type: "text" as const,
+              text: "Not in allowlist: cat server/package.json",
+            },
+          },
+        ],
+      };
+  }
+}
+
+function reasoningEffortOptionsForModel(): ReadonlyArray<{
+  readonly value: string;
+  readonly name: string;
+}> {
+  return /^gpt-5(?:[.-]|$)/u.test(currentModelId)
+    ? [
+        { value: "low", name: "Low" },
+        { value: "medium", name: "Medium" },
+        { value: "high", name: "High" },
+        { value: "xhigh", name: "Extra High" },
+      ]
+    : [
+        { value: "low", name: "Low" },
+        { value: "medium", name: "Medium" },
+        { value: "high", name: "High" },
+      ];
+}
+
 function logExit(reason: string): void {
   if (!exitLogPath) {
     return;
@@ -91,18 +154,12 @@ function configOptions(): ReadonlyArray<AcpSchema.SessionConfigOption> {
         return [
           ...baseOptions,
           {
-            id: "reasoning",
+            id: "reasoning_effort",
             name: "Reasoning",
             category: "thought_level",
             type: "select",
             currentValue: currentReasoning,
-            options: [
-              { value: "none", name: "None" },
-              { value: "low", name: "Low" },
-              { value: "medium", name: "Medium" },
-              { value: "high", name: "High" },
-              { value: "extra-high", name: "Extra High" },
-            ],
+            options: reasoningEffortOptionsForModel(),
           },
           {
             id: "context",
@@ -146,16 +203,12 @@ function configOptions(): ReadonlyArray<AcpSchema.SessionConfigOption> {
         return [
           ...baseOptions,
           {
-            id: "reasoning",
+            id: "reasoning_effort",
             name: "Reasoning",
             category: "thought_level",
             type: "select",
             currentValue: currentReasoning,
-            options: [
-              { value: "low", name: "Low" },
-              { value: "medium", name: "Medium" },
-              { value: "high", name: "High" },
-            ],
+            options: reasoningEffortOptionsForModel(),
           },
           {
             id: "thinking",
@@ -171,6 +224,18 @@ function configOptions(): ReadonlyArray<AcpSchema.SessionConfigOption> {
   }
 
   return [
+    {
+      id: "mode",
+      name: "Mode",
+      category: "mode",
+      type: "select" as const,
+      currentValue: currentModeId,
+      options: availableModes.map((mode) => ({
+        value: mode.id,
+        name: mode.name,
+        ...(mode.description ? { description: mode.description } : {}),
+      })),
+    },
     {
       id: "model",
       name: "Model",
@@ -180,10 +245,19 @@ function configOptions(): ReadonlyArray<AcpSchema.SessionConfigOption> {
       options: [
         { value: "default", name: "Auto" },
         { value: "composer-2", name: "Composer 2" },
-        { value: "composer-2[fast=true]", name: "Composer 2 Fast" },
-        { value: "gpt-5.3-codex[reasoning=medium,fast=false]", name: "Codex 5.3" },
+        { value: "gpt-5.3-codex", name: "Codex 5.3" },
+        { value: "gpt-5.4", name: "GPT-5.4" },
+        { value: "claude-opus-4-6", name: "Opus 4.6" },
       ],
     },
+    {
+      id: "reasoning_effort",
+      name: "Reasoning Effort",
+      category: "thought_level",
+      type: "select" as const,
+      currentValue: currentReasoning,
+      options: reasoningEffortOptionsForModel(),
+    },
   ];
 }
 
@@ -283,7 +357,10 @@ const program = Effect.gen(function* () {
       if (request.configId === "model" && typeof request.value === "string") {
         currentModelId = request.value;
       }
-      if (request.configId === "reasoning" && typeof request.value === "string") {
+      if (
+        (request.configId === "reasoning" || request.configId === "reasoning_effort") &&
+        typeof request.value === "string"
+      ) {
         currentReasoning = request.value;
       }
       if (request.configId === "context" && typeof request.value === "string") {
@@ -314,6 +391,9 @@ const program = Effect.gen(function* () {
 
   yield* agent.handleCancel(({ sessionId }) =>
     Effect.sync(() => {
+      if (ignoreCancel) {
+        return;
+      }
       cancelledSessions.add(String(sessionId ?? "mock-session-1"));
     }),
   );
@@ -322,6 +402,20 @@ const program = Effect.gen(function* () {
     Effect.gen(function* () {
       const requestedSessionId = String(request.sessionId ?? sessionId);
 
+      if (promptStartedText) {
+        yield* agent.client.sessionUpdate({
+          sessionId: requestedSessionId,
+          update: {
+            sessionUpdate: "agent_message_chunk",
+            content: { type: "text", text: promptStartedText },
+          },
+        });
+      }
+
+      if (Number.isFinite(promptDelayMs) && promptDelayMs > 0) {
+        yield* Effect.sleep(`${promptDelayMs} millis`);
+      }
+
       if (emitInterleavedAssistantToolCalls) {
         const toolCallId = "tool-call-1";
 
@@ -453,6 +547,39 @@ const program = Effect.gen(function* () {
         return { stopReason: cancelled ? "cancelled" : "end_turn" };
       }
 
+      if (Number.isFinite(permissionRequestCount) && permissionRequestCount > 0) {
+        for (let index = 0; index < permissionRequestCount; index += 1) {
+          const toolCallId = `permission-tool-call-${index + 1}`;
+          const payload = mockPermissionRequestPayload(permissionRequestKind);
+          yield* agent.client.requestPermission({
+            sessionId: requestedSessionId,
+            toolCall: {
+              toolCallId,
+              title: payload.title,
+              kind: permissionRequestKind as AcpSchema.ToolKind,
+              status: "pending",
+              content: payload.content,
+              rawInput: payload.rawInput,
+            },
+            options: [
+              { optionId: "allow-once", name: "Allow once", kind: "allow_once" },
+              { optionId: "allow-always", name: "Allow always", kind: "allow_always" },
+              { optionId: "reject-once", name: "Reject", kind: "reject_once" },
+            ],
+          });
+        }
+
+        yield* agent.client.sessionUpdate({
+          sessionId: requestedSessionId,
+          update: {
+            sessionUpdate: "agent_message_chunk",
+            content: { type: "text", text: promptResponseText ?? "hello from mock" },
+          },
+        });
+
+        return { stopReason: "end_turn" };
+      }
+
       if (emitGenericToolPlaceholders) {
         const toolCallId = "tool-call-generic-1";
 

apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts

@@ -124,6 +124,7 @@ describe("OrchestrationEngine", () => {
           },
           interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
           runtimeMode: "full-access" as const,
+          pendingRuntimeMode: null,
           branch: null,
           worktreePath: null,
           latestTurn: null,

apps/server/src/orchestration/Layers/ProjectionPipeline.ts

@@ -568,6 +568,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
             title: event.payload.title,
             modelSelection: event.payload.modelSelection,
             runtimeMode: event.payload.runtimeMode,
+            pendingRuntimeMode: event.payload.pendingRuntimeMode,
             interactionMode: event.payload.interactionMode,
             branch: event.payload.branch,
             worktreePath: event.payload.worktreePath,
@@ -645,6 +646,22 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
           yield* projectionThreadRepository.upsert({
             ...existingRow.value,
             runtimeMode: event.payload.runtimeMode,
+            pendingRuntimeMode: null,
+            updatedAt: event.payload.updatedAt,
+          });
+          return;
+        }
+
+        case "thread.pending-runtime-mode-set": {
+          const existingRow = yield* projectionThreadRepository.getById({
+            threadId: event.payload.threadId,
+          });
+          if (Option.isNone(existingRow)) {
+            return;
+          }
+          yield* projectionThreadRepository.upsert({
+            ...existingRow.value,
+            pendingRuntimeMode: event.payload.runtimeMode,
             updatedAt: event.payload.updatedAt,
           });
           return;
@@ -947,6 +964,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
         providerName: event.payload.session.providerName,
         runtimeMode: event.payload.session.runtimeMode,
         activeTurnId: event.payload.session.activeTurnId,
+        resumeCursor: event.payload.session.resumeCursor ?? null,
         lastError: event.payload.session.lastError,
         updatedAt: event.payload.session.updatedAt,
       });