fix(gateway): honor remote status probe timeout

mushuiyu886 · steipete · commit 056707dbc763 · 2026-06-22T05:21:34.000-04:00
diff --git a/src/commands/gateway-status.test.ts b/src/commands/gateway-status.test.ts
@@ -983,6 +983,15 @@ describe("gateway-status command", () => {
     ]);
   });
 
+  it("passes the full caller timeout through to active configured remote probes", async () => {
+    const { runtime } = createRuntimeCapture();
+    probeGateway.mockClear();
+
+    await runGatewayStatus(runtime, { timeout: "15000", json: true });
+
+    expect(requireProbeCall("wss://remote.example:18789").timeoutMs).toBe(15_000);
+  });
+
   it("uses configured handshake timeout as the default local probe budget", async () => {
     const { runtime } = createRuntimeCapture();
     probeGateway.mockClear();
diff --git a/src/commands/gateway-status/helpers.test.ts b/src/commands/gateway-status/helpers.test.ts
@@ -436,20 +436,30 @@ describe("resolveProbeBudgetMs", () => {
     ).toBe(2_500);
   });
 
-  it("keeps non-local probe caps unchanged", () => {
+  it("lets active remote probes use the full caller budget", () => {
     expect(
       resolveProbeBudgetMs(15_000, {
         kind: "configRemote",
         active: true,
         url: "wss://gateway.example/ws",
       }),
-    ).toBe(1500);
+    ).toBe(15_000);
     expect(
       resolveProbeBudgetMs(15_000, {
         kind: "explicit",
         active: true,
         url: "wss://gateway.example/ws",
       }),
+    ).toBe(15_000);
+  });
+
+  it("keeps inactive remote and SSH tunnel probes on the short cap", () => {
+    expect(
+      resolveProbeBudgetMs(15_000, {
+        kind: "configRemote",
+        active: false,
+        url: "wss://gateway.example/ws",
+      }),
     ).toBe(1500);
     expect(
       resolveProbeBudgetMs(15_000, {
diff --git a/src/commands/gateway-status/helpers.ts b/src/commands/gateway-status/helpers.ts
@@ -150,15 +150,15 @@ export function resolveProbeBudgetMs(
   if (target.kind === "sshTunnel") {
     return Math.min(2000, overallMs);
   }
-  if (!isLoopbackProbeTarget(target)) {
-    return Math.min(1500, overallMs);
+  if (target.active) {
+    return overallMs;
   }
-  if (target.kind === "localLoopback" && !target.active) {
+  if (target.kind === "localLoopback") {
     return Math.min(800, overallMs);
   }
-  // Active/discovered loopback probes and explicit loopback URLs should honor
-  // the caller budget because healthy local detail RPCs can legitimately take
-  // longer than the legacy short caps.
+  if (!isLoopbackProbeTarget(target)) {
+    return Math.min(1500, overallMs);
+  }
   return overallMs;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -150,15 +150,15 @@ export function resolveProbeBudgetMs(`
`150`	`150`	`if (target.kind === "sshTunnel") {`
`151`	`151`	`return Math.min(2000, overallMs);`
`152`	`152`	`}`
`153`		`- if (!isLoopbackProbeTarget(target)) {`
`154`		`- return Math.min(1500, overallMs);`
	`153`	`+ if (target.active) {`
	`154`	`+ return overallMs;`
`155`	`155`	`}`
`156`		`- if (target.kind === "localLoopback" && !target.active) {`
	`156`	`+ if (target.kind === "localLoopback") {`
`157`	`157`	`return Math.min(800, overallMs);`
`158`	`158`	`}`
`159`		`- // Active/discovered loopback probes and explicit loopback URLs should honor`
`160`		`- // the caller budget because healthy local detail RPCs can legitimately take`
`161`		`- // longer than the legacy short caps.`
	`159`	`+ if (!isLoopbackProbeTarget(target)) {`
	`160`	`+ return Math.min(1500, overallMs);`
	`161`	`+ }`
`162`	`162`	`return overallMs;`
`163`	`163`	`}`
`164`	`164`