fix(ui): scope global agent model controls

steipete · steipete · commit 4932391e8a78 · 2026-05-31T22:25:43.000-04:00
diff --git a/ui/src/ui/chat/session-controls.ts b/ui/src/ui/chat/session-controls.ts
@@ -1378,6 +1378,7 @@ async function switchChatModel(state: AppViewState, nextModel: string): Promise<
     try {
       await client.request("sessions.patch", {
         key: targetSessionKey,
+        ...scopedAgentParamsForSession(state, targetSessionKey),
         model: nextModel || null,
       });
       void refreshVisibleToolsEffectiveForCurrentSessionLazy(state);
@@ -1439,6 +1440,7 @@ async function switchChatThinkingLevel(state: AppViewState, nextThinkingLevel: s
   try {
     await state.client.request("sessions.patch", {
       key: targetSessionKey,
+      ...scopedAgentParamsForSession(state, targetSessionKey),
       thinkingLevel: normalizedNext ?? null,
     });
     await refreshSessionOptions(state);
diff --git a/ui/src/ui/views/chat.test.ts b/ui/src/ui/views/chat.test.ts
@@ -2543,6 +2543,67 @@ describe("chat session controls", () => {
     });
   });
 
+  it("scopes composer model changes for a selected global-session agent", async () => {
+    const { state, request } = createChatHeaderState();
+    state.sessionKey = "global";
+    state.settings.sessionKey = "global";
+    state.assistantAgentId = "beta";
+    state.sessionsResult = createSessionsResultFromRows([
+      {
+        key: "global",
+        kind: "global",
+        modelProvider: "minimax",
+        model: "MiniMax-M2.7",
+        updatedAt: 1,
+      },
+    ]);
+    const container = document.createElement("div");
+    render(renderChatSessionSelect(state), container);
+
+    clickChatModelOption(container, "openai/gpt-5-mini");
+
+    expect(request).toHaveBeenCalledWith("sessions.patch", {
+      key: "global",
+      agentId: "beta",
+      model: "openai/gpt-5-mini",
+    });
+  });
+
+  it("scopes composer thinking changes for a selected global-session agent", async () => {
+    const { state, request } = createChatHeaderState();
+    state.sessionKey = "global";
+    state.settings.sessionKey = "global";
+    state.assistantAgentId = "beta";
+    state.sessionsResult = createSessionsResultFromRows([
+      {
+        key: "global",
+        kind: "global",
+        modelProvider: "openai",
+        model: "gpt-5",
+        thinkingLevel: "off",
+        thinkingLevels: [
+          { id: "off", label: "off" },
+          { id: "adaptive", label: "adaptive" },
+        ],
+        updatedAt: 1,
+      },
+    ]);
+    const container = document.createElement("div");
+    render(renderChatSessionSelect(state), container);
+
+    const adaptive = getThinkingOptions(container).find(
+      (option) => option.dataset.chatThinkingOption === "adaptive",
+    );
+    expect(adaptive).toBeInstanceOf(HTMLButtonElement);
+    adaptive?.click();
+
+    expect(request).toHaveBeenCalledWith("sessions.patch", {
+      key: "global",
+      agentId: "beta",
+      thinkingLevel: "adaptive",
+    });
+  });
+
   it("shows existing speed overrides for providers outside the fast-mode allowlist", async () => {
     const { state, request } = createChatHeaderState();
     state.sessionsResult = createSessionsResultFromRows([
