fix(doctor): narrow noninteractive restart guard

steipete · steipete · commit d4a539fc8021 · 2026-06-22T03:30:33.000-04:00
diff --git a/src/commands/doctor-gateway-daemon-flow.test.ts b/src/commands/doctor-gateway-daemon-flow.test.ts
@@ -245,16 +245,16 @@ describe("maybeRepairGatewayDaemon", () => {
     });
   }
 
-  async function runAutoRepair() {
+  async function runAutoRepair(options: { repair?: boolean; yes?: boolean } = { repair: true }) {
     const runtime = { log: vi.fn(), error: vi.fn(), exit: vi.fn() };
     await maybeRepairGatewayDaemon({
       cfg: { gateway: {} },
       runtime,
       prompter: createDoctorPrompter({
         runtime,
-        options: { repair: true },
+        options,
       }),
-      options: { deep: false, repair: true },
+      options: { deep: false, ...options },
       gatewayDetailsMessage: "details",
       healthOk: false,
     });
@@ -559,6 +559,22 @@ describe("maybeRepairGatewayDaemon", () => {
     expect(service.restart).toHaveBeenCalledTimes(1);
   });
 
+  it("restarts running service when repair is explicitly approved", async () => {
+    setPlatform("linux");
+
+    await runAutoRepair();
+
+    expect(service.restart).toHaveBeenCalledTimes(1);
+  });
+
+  it("restarts running service when --yes explicitly approves repairs", async () => {
+    setPlatform("linux");
+
+    await runAutoRepair({ yes: true });
+
+    expect(service.restart).toHaveBeenCalledTimes(1);
+  });
+
   it("skips gateway service install when service repair policy is external", async () => {
     setPlatform("linux");
     service.isLoaded.mockResolvedValue(false);
diff --git a/src/commands/doctor-gateway-daemon-flow.ts b/src/commands/doctor-gateway-daemon-flow.ts
@@ -459,13 +459,16 @@ export async function maybeRepairGatewayDaemon(params: {
         // Health probe failed — fall through to the restart prompt below.
       }
     }
+    if (params.options.nonInteractive === true) {
+      // --fix auto-approves runtime repairs; do not let a headless doctor kill its live gateway.
+      return;
+    }
 
     const restart = await confirmDoctorServiceRepair(
       params.prompter,
       {
         message: "Restart gateway service now?",
         initialValue: false,
-        requiresInteractiveConfirmation: true,
       },
       serviceRepairPolicy,
     );

Original file line number	Diff line number	Diff line change
`@@ -459,13 +459,16 @@ export async function maybeRepairGatewayDaemon(params: {`
`459`	`459`	`// Health probe failed — fall through to the restart prompt below.`
`460`	`460`	`}`
`461`	`461`	`}`
	`462`	`+ if (params.options.nonInteractive === true) {`
	`463`	`+ // --fix auto-approves runtime repairs; do not let a headless doctor kill its live gateway.`
	`464`	`+ return;`
	`465`	`+ }`
`462`	`466`
`463`	`467`	`const restart = await confirmDoctorServiceRepair(`
`464`	`468`	`params.prompter,`
`465`	`469`	`{`
`466`	`470`	`message: "Restart gateway service now?",`
`467`	`471`	`initialValue: false,`
`468`		`- requiresInteractiveConfirmation: true,`
`469`	`472`	`},`
`470`	`473`	`serviceRepairPolicy,`
`471`	`474`	`);`