Resolve Scoop executable shims on Windows

src/supervisor/agents/base.windows-path.test.ts

@@ -153,6 +153,44 @@ describe.skipIf(process.platform !== "win32")("Windows executable path fallback"
     expect(resolveExecutablePath("claude")).toBe(exePath);
   });
 
+  it("resolves Scoop .exe shims to their executable target", () => {
+    const root = mkdtempSync(join(tmpdir(), "poracode-scoop-shim-"));
+    tempDirs.push(root);
+    const shimDir = join(root, "scoop", "shims");
+    const target = join(root, "scoop", "apps", "opencode", "current", "opencode.exe");
+    mkdirSync(shimDir, { recursive: true });
+    mkdirSync(join(target, ".."), { recursive: true });
+    writeFileSync(join(shimDir, "opencode.exe"), "");
+    writeFileSync(join(shimDir, "opencode.shim"), `path = "${target}"\n`);
+    writeFileSync(target, "");
+    spawnSyncMock.mockReturnValueOnce({
+      error: undefined,
+      status: 0,
+      stdout: `${join(shimDir, "opencode.exe")}\r\n`,
+      stderr: "",
+    });
+
+    expect(resolveExecutablePath("opencode")).toBe(target);
+  });
+
+  it("keeps Scoop shims that supply fixed arguments", () => {
+    const root = mkdtempSync(join(tmpdir(), "poracode-scoop-args-shim-"));
+    tempDirs.push(root);
+    const shim = join(root, "tool.exe");
+    const target = join(root, "target.exe");
+    writeFileSync(shim, "");
+    writeFileSync(join(root, "tool.shim"), `path = "${target}"\nargs = "--fixed"\n`);
+    writeFileSync(target, "");
+    spawnSyncMock.mockReturnValueOnce({
+      error: undefined,
+      status: 0,
+      stdout: `${shim}\r\n`,
+      stderr: "",
+    });
+
+    expect(resolveExecutablePath("tool")).toBe(shim);
+  });
+
   it("keeps the .cmd path for npm node-shim wrappers (e.g. command-code.cmd → node index.mjs)", () => {
     // Regression: a previous version of resolveWindowsCmdExeTarget greedily
     // matched `"%dp0%\node.exe"` in npm's standard Node-script shim and

src/supervisor/agents/base/processRuntime.ts

@@ -284,7 +284,23 @@ function parseWindowsExecutablePath(stdout: string): string | undefined {
     .filter((line) => line.length > 0);
   const resolved =
     lines.findLast((line) => /\.(?:bat|cmd|com|exe|ps1)$/i.test(line)) ?? lines.at(-1);
-  return resolveWindowsCmdExeTarget(resolved) ?? resolved;
+  return (
+    resolveWindowsScoopShimTarget(resolved) ?? resolveWindowsCmdExeTarget(resolved) ?? resolved
+  );
+}
+
+function resolveWindowsScoopShimTarget(path: string | undefined): string | undefined {
+  if (!path || !/\.exe$/i.test(path)) return undefined;
+  const shimPath = path.replace(/\.exe$/i, ".shim");
+  if (!existsSync(shimPath)) return undefined;
+  try {
+    const body = readFileSync(shimPath, "utf8");
+    if (/^\s*args\s*=/im.test(body)) return undefined;
+    const target = /^\s*path\s*=\s*"([^"]+)"\s*$/im.exec(body)?.[1];
+    return target && /\.(?:com|exe)$/i.test(target) && existsSync(target) ? target : undefined;
+  } catch {
+    return undefined;
+  }
 }
 
 /**