fix(daemon): make schtasks fallback baseline-aware in launch observation (#91144)

LiuwqGit · LiuwqGit · commit 97d7e4bd74b5 · 2026-07-16T07:15:26.000+08:00
The previous baseline filter lived only inside hasLaunchEvidence, so a pre-existing verified gateway listener caused readLaunchObservation to report state 'running' (via resolveListenerBackedScheduledTaskRuntime) and short-circuit the fallback poll before the baseline filter was ever consulted — exactly the foreground-listener suppression that #91144 reported. Move task command/port resolution and baseline capture above readLaunchObservation, and treat a listener-backed 'running' whose pid is in the baseline as 'not-yet-run' so the bounded poll continues and hasLaunchEvidence re-checks with baseline filtering. Resolve the baseline from the installed task command port (same as hasLaunchEvidence) so the include check is consistent when argv/env override the configured gateway port. Restore the async resolveScheduledTaskGatewayListenerPids path so inspectPortUsage diagnostics are still used. Add two regression tests: - pre-existing verified gateway listener on the task port still fires the fallback (covers the P1 short-circuit the prior diff missed) - a fresh gateway listener appearing after /Run on a port that had a baseline listener does not relaunch (suppresses false-positive)
diff --git a/src/daemon/schtasks.startup-fallback.test.ts b/src/daemon/schtasks.startup-fallback.test.ts
@@ -405,6 +405,37 @@ describe("Windows startup fallback", () => {
     });
   });
 
+  it("fires the fallback when a pre-existing verified gateway listener holds the task port (#91144)", async () => {
+    await withWindowsEnv("openclaw-win-startup-", async ({ env }) => {
+      fastForwardTaskStartWait();
+      findVerifiedGatewayListenerPidsOnPortSync.mockReturnValue([19444]);
+      addAcceptedRunNeverStartsResponses();
+
+      await installGatewayScheduledTask(env);
+
+      expectStartupFallbackSpawn();
+    });
+  });
+
+  it("does not relaunch the task script when a fresh gateway listener appears after /Run on a port with a baseline listener (#91144)", async () => {
+    await withWindowsEnv("openclaw-win-startup-", async ({ env }) => {
+      fastForwardTaskStartWait();
+      const sequence = [[19444], [19444], [19444, 28112]];
+      let sequenceIndex = 0;
+      findVerifiedGatewayListenerPidsOnPortSync.mockImplementation(() => {
+        const value = sequence[sequenceIndex] ?? [];
+        sequenceIndex += 1;
+        return value;
+      });
+      addAcceptedRunNeverStartsResponses();
+
+      await installGatewayScheduledTask(env);
+
+      expect(spawn).not.toHaveBeenCalled();
+      expect(findVerifiedGatewayListenerPidsOnPortSync).toHaveBeenCalled();
+    });
+  });
+
   it("does not relaunch when the node Scheduled Task process is already running", async () => {
     await withWindowsEnv("openclaw-win-startup-", async ({ env }) => {
       vi.spyOn(process, "platform", "get").mockReturnValue("win32");
diff --git a/src/daemon/schtasks.ts b/src/daemon/schtasks.ts
@@ -1098,12 +1098,48 @@ async function shouldFallbackScheduledTaskLaunch(params: {
   env: GatewayServiceEnv;
   scriptPath: string;
 }): Promise<boolean> {
+  const manageGatewayPort = shouldManageGatewayListenerPort(params.env);
+  const taskCommand = await readScheduledTaskCommand(params.env).catch(() => null);
+  const installedArguments = taskCommand?.programArguments;
+  const taskPort =
+    parsePortFromProgramArguments(installedArguments) ??
+    parsePositivePort(taskCommand?.environment?.OPENCLAW_GATEWAY_PORT) ??
+    resolveConfiguredGatewayPort(params.env);
+  // Capture pre-existing verified gateway listeners on the task port before
+  // polling for launch evidence. A listener that was already bound before the
+  // scheduled-task /Run attempt is not evidence that the task started; it must
+  // be filtered out of later observations so the fallback is not falsely
+  // suppressed (#91144). Resolve the port from the installed task command so
+  // the baseline and the launch-evidence check observe the same port.
+  const baselineGatewayPids =
+    manageGatewayPort && taskPort
+      ? findVerifiedGatewayListenerPidsOnPortSync(taskPort)
+      : [];
+
   const readLaunchObservation = async (): Promise<{
     state: "running" | "not-yet-run" | "other";
     signature: string;
   }> => {
     const runtime = await readScheduledTaskRuntime(params.env).catch(() => null);
     if (runtime?.status === "running") {
+      // readScheduledTaskRuntime reports a listener-backed "running" status
+      // when schtasks itself is not running but a verified gateway listener
+      // holds the port. If that listener was present in the baseline (i.e. it
+      // pre-existed the /Run attempt), it does not prove the scheduled task
+      // launched; treat it as not-yet-run so the fallback poll continues and
+      // hasLaunchEvidence can re-check with baseline filtering (#91144).
+      if (
+        baselineGatewayPids.length > 0 &&
+        typeof runtime.pid === "number" &&
+        baselineGatewayPids.includes(runtime.pid)
+      ) {
+        return {
+          state: "not-yet-run",
+          signature: [runtime.state, runtime.lastRunTime, runtime.lastRunResult, runtime.detail]
+            .filter(Boolean)
+            .join("|"),
+        };
+      }
       return {
         state: "running",
         signature: [runtime.state, runtime.lastRunTime, runtime.lastRunResult, runtime.detail]
@@ -1127,27 +1163,15 @@ async function shouldFallbackScheduledTaskLaunch(params: {
         .join("|"),
     };
   };
-  const manageGatewayPort = shouldManageGatewayListenerPort(params.env);
-  const configuredPort = resolveConfiguredGatewayPort(params.env);
-  const baselineGatewayPids =
-    manageGatewayPort && configuredPort
-      ? findVerifiedGatewayListenerPidsOnPortSync(configuredPort)
-      : [];
 
   const hasLaunchEvidence = async (): Promise<boolean> => {
-    const command = await readScheduledTaskCommand(params.env).catch(() => null);
-    const installedArguments = command?.programArguments;
-    const taskPort =
-      parsePortFromProgramArguments(installedArguments) ??
-      parsePositivePort(command?.environment?.OPENCLAW_GATEWAY_PORT) ??
-      resolveConfiguredGatewayPort(params.env);
     if (manageGatewayPort && taskPort) {
-      const listenerPids = findVerifiedGatewayListenerPidsOnPortSync(taskPort);
-      if (baselineGatewayPids.length > 0) {
-        if (listenerPids.some((pid) => !baselineGatewayPids.includes(pid))) {
-          return true;
-        }
-      } else if (listenerPids.length > 0) {
+      const listenerPids = await resolveScheduledTaskGatewayListenerPids(taskPort);
+      const freshListenerPids =
+        baselineGatewayPids.length > 0
+          ? listenerPids.filter((pid) => !baselineGatewayPids.includes(pid))
+          : listenerPids;
+      if (freshListenerPids.length > 0) {
         return true;
       }
     }
