fix(doctor): authorize doctor/agent-setup fix dispatch against trusted state and enforce runtime policy

src/features/providers/api/agentSetup.ts

@@ -34,11 +34,10 @@ export interface AgentSetupOperation {
   error: string | null;
 }
 
-export interface AgentSetupUpdateCommand {
-  // `'updateMain'` or `'updateBridge'`, paired with the readout's command.
-  fixType: Extract<FixType, "updateMain" | "updateBridge">;
-  command: string;
-}
+export type AgentSetupUpdateFixType = Extract<
+  FixType,
+  "updateMain" | "updateBridge"
+>;
 
 // The execution recipe captured at click time. The card derives this from the
 // doctor report's actionable readouts, so the backend never has to re-derive
@@ -47,7 +46,11 @@ export interface AgentSetupPlan {
   // The install recipe to seed the install loop with, or null for a pure
   // update / auth.
   installFixType: Extract<FixType, "command" | "bridge"> | null;
-  updateCommands: AgentSetupUpdateCommand[];
+  // Which per-readout updates to run after the install loop (`updateMain` /
+  // `updateBridge`). The card names only the readout slot; the backend resolves
+  // the exact source-aware command from the crate's trusted freshness readout,
+  // so no renderer-supplied shell command crosses the wire.
+  updateFixTypes: AgentSetupUpdateFixType[];
   // Whether the backend probes PATH after the fix to confirm the agent landed.
   // `hasBinary && !isBuiltIn`: a built-in or binary-less provider has nothing to
   // resolve on disk, so the backend skips verification and takes a clean run as

src/features/providers/stores/agentSetupStore.test.ts

@@ -99,7 +99,7 @@ describe("useAgentSetupStore", () => {
     await useAgentSetupStore.getState().init();
     await useAgentSetupStore.getState().startSetup("claude-acp", "install", {
       installFixType: "command",
-      updateCommands: [],
+      updateFixTypes: [],
       verifyInstall: true,
     });
 

src/features/settings/ui/AgentProviderCard.tsx

@@ -32,7 +32,7 @@ import {
 import { ArrowUpCircle } from "lucide-react";
 import type {
   AgentSetupAction,
-  AgentSetupUpdateCommand,
+  AgentSetupUpdateFixType,
 } from "@/features/providers/api/agentSetup";
 import { useAgentSetupStore } from "@/features/providers/stores/agentSetupStore";
 import {
@@ -213,15 +213,16 @@ export function AgentProviderCard({
   const installFixType: Extract<FixType, "command" | "bridge"> =
     versionCheck?.fixType === "bridge" ? "bridge" : "command";
 
-  // Build the per-readout update commands the backend runs after the install
-  // loop. Readout *derivation* stays here (it already has the doctor report);
-  // only the resulting recipe crosses to Rust.
-  function buildUpdateCommands(): AgentSetupUpdateCommand[] {
+  // Build the per-readout update fix identities the backend runs after the
+  // install loop. Readout *derivation* stays here (it already has the doctor
+  // report) to decide *whether* an update is actionable; only the typed fix
+  // slot crosses to Rust, which re-resolves the exact command from the crate's
+  // trusted freshness readout.
+  function buildUpdateFixTypes(): AgentSetupUpdateFixType[] {
     return actionableReadouts.flatMap((readout) =>
-      (readout.updateFixType === "updateMain" ||
-        readout.updateFixType === "updateBridge") &&
-      readout.updateCommand
-        ? [{ fixType: readout.updateFixType, command: readout.updateCommand }]
+      readout.updateFixType === "updateMain" ||
+      readout.updateFixType === "updateBridge"
+        ? [readout.updateFixType]
         : [],
     );
   }
@@ -256,7 +257,7 @@ export function AgentProviderCard({
     try {
       await startSetup(provider.id, "install", {
         installFixType,
-        updateCommands: buildUpdateCommands(),
+        updateFixTypes: buildUpdateFixTypes(),
         verifyInstall,
         ...(bundledBridge ? { bundledBridge } : {}),
       });
@@ -348,7 +349,7 @@ export function AgentProviderCard({
     }
     void startSetup(provider.id, "update", {
       installFixType: null,
-      updateCommands: buildUpdateCommands(),
+      updateFixTypes: buildUpdateFixTypes(),
       verifyInstall,
       ...(bundledBridge ? { bundledBridge } : {}),
     });
@@ -362,7 +363,7 @@ export function AgentProviderCard({
     }
     void startSetup(provider.id, "auth", {
       installFixType: null,
-      updateCommands: [],
+      updateFixTypes: [],
       verifyInstall,
       ...(bundledBridge ? { bundledBridge } : {}),
     });

src/features/settings/ui/DoctorCheckRow.tsx

@@ -53,7 +53,6 @@ export function DoctorCheckRow({ check, onFixed }: DoctorCheckRowProps) {
   const [activeFix, setActiveFix] = useState<{
     fixType: FixType;
     command: string;
-    commandOverride: string | null;
   } | null>(null);
 
   const Icon = STATUS_ICON[check.status];
@@ -65,7 +64,6 @@ export function DoctorCheckRow({ check, onFixed }: DoctorCheckRowProps) {
     setActiveFix({
       fixType: check.fixType,
       command: check.fixCommand,
-      commandOverride: null,
     });
     setShowFixDialog(true);
   }
@@ -75,11 +73,7 @@ export function DoctorCheckRow({ check, onFixed }: DoctorCheckRowProps) {
     setFixing(true);
     setFixError(null);
     try {
-      await runDoctorFix(
-        check.id,
-        activeFix.fixType,
-        activeFix.commandOverride ?? undefined,
-      );
+      await runDoctorFix(check.id, activeFix.fixType);
       setShowFixDialog(false);
       onFixed?.();
     } catch (e) {

src/features/settings/ui/__tests__/AgentProviderCard.test.tsx

@@ -409,7 +409,7 @@ describe("AgentProviderCard", () => {
     await waitFor(() => {
       expect(startAgentSetup).toHaveBeenCalledWith("claude-acp", "auth", {
         installFixType: null,
-        updateCommands: [],
+        updateFixTypes: [],
         verifyInstall: true,
       });
     });
@@ -463,7 +463,7 @@ describe("AgentProviderCard", () => {
     await waitFor(() => {
       expect(startAgentSetup).toHaveBeenCalledWith("claude-acp", "install", {
         installFixType: "command",
-        updateCommands: [],
+        updateFixTypes: [],
         verifyInstall: true,
       });
     });
@@ -494,7 +494,7 @@ describe("AgentProviderCard", () => {
     await waitFor(() => {
       expect(startAgentSetup).toHaveBeenCalledWith("claude-acp", "install", {
         installFixType: "command",
-        updateCommands: [],
+        updateFixTypes: [],
         verifyInstall: true,
       });
     });
@@ -618,7 +618,7 @@ describe("AgentProviderCard", () => {
     await waitFor(() => {
       expect(startAgentSetup).toHaveBeenCalledWith("claude-acp", "install", {
         installFixType: "command",
-        updateCommands: [],
+        updateFixTypes: [],
         verifyInstall: true,
       });
     });
@@ -680,12 +680,7 @@ describe("AgentProviderCard", () => {
     await waitFor(() => {
       expect(startAgentSetup).toHaveBeenCalledWith("claude-acp", "update", {
         installFixType: null,
-        updateCommands: [
-          {
-            fixType: "updateMain",
-            command: "npm install -g @anthropic-ai/claude-code@latest",
-          },
-        ],
+        updateFixTypes: ["updateMain"],
         verifyInstall: true,
       });
     });
@@ -785,12 +780,7 @@ describe("AgentProviderCard", () => {
     await waitFor(() => {
       expect(startAgentSetup).toHaveBeenCalledWith("claude-acp", "update", {
         installFixType: null,
-        updateCommands: [
-          {
-            fixType: "updateMain",
-            command: "npm install -g @anthropic-ai/claude-code@latest",
-          },
-        ],
+        updateFixTypes: ["updateMain"],
         verifyInstall: true,
       });
     });
@@ -809,7 +799,7 @@ describe("AgentProviderCard", () => {
     await waitFor(() => {
       expect(startAgentSetup).toHaveBeenCalledWith("claude-acp", "auth", {
         installFixType: null,
-        updateCommands: [],
+        updateFixTypes: [],
         verifyInstall: true,
       });
     });
@@ -921,9 +911,7 @@ describe("AgentProviderCard", () => {
     await waitFor(() => {
       expect(startAgentSetup).toHaveBeenCalledWith("codex-acp", "install", {
         installFixType: "bridge",
-        updateCommands: [
-          { fixType: "updateMain", command: "brew upgrade codex" },
-        ],
+        updateFixTypes: ["updateMain"],
         verifyInstall: true,
       });
     });
@@ -966,7 +954,7 @@ describe("AgentProviderCard", () => {
     await waitFor(() => {
       expect(startAgentSetup).toHaveBeenCalledWith("codex-acp", "install", {
         installFixType: "command",
-        updateCommands: [],
+        updateFixTypes: [],
         verifyInstall: true,
         // The backend's post-install verification mirrors the readiness gate:
         // a bundled-bridge provider must resolve its only binary under `path`,
@@ -1062,7 +1050,7 @@ describe("AgentProviderCard", () => {
     await waitFor(() => {
       expect(startAgentSetup).toHaveBeenCalledWith("codex-acp", "install", {
         installFixType: "command",
-        updateCommands: [],
+        updateFixTypes: [],
         verifyInstall: true,
       });
     });
@@ -1175,16 +1163,7 @@ describe("AgentProviderCard", () => {
     await waitFor(() => {
       expect(startAgentSetup).toHaveBeenCalledWith("claude-acp", "update", {
         installFixType: null,
-        updateCommands: [
-          {
-            fixType: "updateMain",
-            command: "curl -fsSL https://example.com/install.sh | bash",
-          },
-          {
-            fixType: "updateBridge",
-            command: "npm install -g claude-agent-acp@latest",
-          },
-        ],
+        updateFixTypes: ["updateMain", "updateBridge"],
         verifyInstall: true,
       });
     });

src/shared/api/__tests__/doctor.test.ts

@@ -35,6 +35,28 @@ describe("doctor API", () => {
     });
   });
 
+  it("never forwards a renderer-supplied command to run_doctor_fix", async () => {
+    // Regression for finding 7: the wire contract carries only the typed
+    // (checkId, fixType) identity. Even for an update fix — whose command used
+    // to ride along as `commandOverride` — no command string may cross to the
+    // backend, so a compromised renderer has no shell escape hatch.
+    mockedInvoke.mockResolvedValue(undefined);
+
+    const { runDoctorFix } = await import("../doctor");
+    await runDoctorFix("ai-agent-claude", "updateMain");
+
+    const payload = mockedInvoke.mock.calls.at(-1)?.[1] as Record<
+      string,
+      unknown
+    >;
+    expect(payload).toEqual({
+      checkId: "ai-agent-claude",
+      fixType: "updateMain",
+    });
+    expect(payload).not.toHaveProperty("commandOverride");
+    expect(payload).not.toHaveProperty("command");
+  });
+
   it("detects synthetic doctor timeout reports", async () => {
     const { isDoctorTimeoutReport } = await import("../useDoctorReport");
 

src/shared/api/doctor.ts

@@ -95,7 +95,6 @@ export async function runDoctorFresh(): Promise<DoctorReport> {
 export async function runDoctorFix(
   checkId: string,
   fixType: FixType,
-  commandOverride?: string,
 ): Promise<void> {
-  return invoke("run_doctor_fix", { checkId, fixType, commandOverride });
+  return invoke("run_doctor_fix", { checkId, fixType });
 }