copilot-hub 0.1.31 → 0.1.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "copilot-hub",
-  "version": "0.1.31",
+  "version": "0.1.32",
   "description": "Copilot Hub CLI and runtime bundle",
   "license": "MIT",
   "repository": {

package/scripts/dist/daemon.mjs

@@ -7,6 +7,7 @@ import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
 import { codexInstallPackageSpec } from "./codex-version.mjs";
 import { initializeCopilotHubLayout, resolveCopilotHubLayout } from "./install-layout.mjs";
+import { isManagedProcessRunning, isProcessRunning, normalizePid } from "./process-identity.mjs";
 import { buildCodexCompatibilityError, probeCodexVersion, resolveCodexBinForStart, resolveCompatibleInstalledCodexBin, } from "./codex-runtime.mjs";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -124,6 +125,8 @@ async function runDaemonLoop() {
         pid: process.pid,
         startedAt: new Date().toISOString(),
         command: `${nodeBin} ${daemonScriptPath} run`,
+        executablePath: nodeBin,
+        entryScript: daemonScriptPath,
     });
     const state = { stopping: false, shuttingDown: false };
     setupSignalHandlers(state);
@@ -191,8 +194,9 @@ async function stopDaemonProcess() {
         console.log("[daemon] not running.");
         return;
     }
+    const state = readDaemonState();
     await terminateProcess(pid);
-    if (isProcessRunning(pid)) {
+    if (isManagedProcessRunning(state)) {
         throw new Error(`Daemon did not stop cleanly (pid ${pid}).`);
     }
     removeDaemonState();
@@ -278,7 +282,7 @@ function getRunningDaemonPid() {
     if (pid <= 0) {
         return 0;
     }
-    return isProcessRunning(pid) ? pid : 0;
+    return isManagedProcessRunning(state) ? pid : 0;
 }
 function readDaemonState() {
     if (!fs.existsSync(daemonStatePath)) {
@@ -301,28 +305,6 @@ function removeDaemonState() {
     }
     fs.rmSync(daemonStatePath, { force: true });
 }
-function normalizePid(value) {
-    const pid = Number.parseInt(String(value ?? ""), 10);
-    if (!Number.isFinite(pid) || pid <= 0) {
-        return 0;
-    }
-    return pid;
-}
-function isProcessRunning(pid) {
-    if (!Number.isInteger(pid) || pid <= 0) {
-        return false;
-    }
-    try {
-        process.kill(pid, 0);
-        return true;
-    }
-    catch (error) {
-        if (error && typeof error === "object" && "code" in error && error.code === "EPERM") {
-            return true;
-        }
-        return false;
-    }
-}
 async function terminateProcess(pid) {
     if (process.platform === "win32") {
         await killTreeWindows(pid);

package/scripts/dist/process-identity.mjs

@@ -0,0 +1,226 @@
+import path from "node:path";
+import process from "node:process";
+import { spawnSync } from "node:child_process";
+const PROCESS_START_TOLERANCE_MS = 120_000;
+export function normalizePid(value) {
+    const pid = Number.parseInt(String(value ?? ""), 10);
+    if (!Number.isFinite(pid) || pid <= 0) {
+        return 0;
+    }
+    return pid;
+}
+export function isManagedProcessRunning(state, platform = process.platform) {
+    const pid = normalizePid(state?.pid);
+    if (pid <= 0) {
+        return false;
+    }
+    if (!isProcessRunning(pid)) {
+        return false;
+    }
+    const identity = inspectProcess(pid, platform);
+    if (!identity) {
+        return true;
+    }
+    return matchesManagedProcessState(state, identity, platform);
+}
+export function matchesManagedProcessState(state, identity, platform = process.platform) {
+    const pid = normalizePid(state?.pid);
+    if (pid <= 0 || !identity) {
+        return false;
+    }
+    if (normalizePid(identity.pid) !== pid) {
+        return false;
+    }
+    const checks = [];
+    const expectedScript = normalizeCommandToken(state?.entryScript ?? extractScriptToken(state?.command), platform);
+    if (expectedScript) {
+        checks.push(commandLineContains(identity.commandLine, expectedScript, platform));
+    }
+    const expectedExecutablePath = normalizeCommandToken(state?.executablePath ?? extractExecutableToken(state?.command), platform);
+    if (expectedExecutablePath) {
+        const actualExecutablePath = normalizeCommandToken(identity.executablePath, platform);
+        if (actualExecutablePath) {
+            checks.push(actualExecutablePath === expectedExecutablePath ||
+                pathBasename(actualExecutablePath, platform) ===
+                    pathBasename(expectedExecutablePath, platform));
+        }
+        else {
+            checks.push(commandLineContains(identity.commandLine, expectedExecutablePath, platform));
+        }
+    }
+    const expectedStartedAt = parseTimestamp(state?.startedAt);
+    const actualStartedAt = parseTimestamp(identity.startedAt);
+    if (expectedStartedAt !== null && actualStartedAt !== null) {
+        checks.push(Math.abs(actualStartedAt - expectedStartedAt) <= PROCESS_START_TOLERANCE_MS);
+    }
+    if (checks.length === 0) {
+        return true;
+    }
+    return checks.every(Boolean);
+}
+export function isProcessRunning(pid) {
+    if (!Number.isInteger(pid) || pid <= 0) {
+        return false;
+    }
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        if (error && typeof error === "object" && "code" in error && error.code === "EPERM") {
+            return true;
+        }
+        return false;
+    }
+}
+function inspectProcess(pid, platform) {
+    if (platform === "win32") {
+        return inspectWindowsProcess(pid);
+    }
+    if (platform === "linux" || platform === "darwin") {
+        return inspectPosixProcess(pid);
+    }
+    return null;
+}
+function inspectWindowsProcess(pid) {
+    const script = [
+        `$p = Get-CimInstance Win32_Process -Filter "ProcessId = ${pid}" -ErrorAction SilentlyContinue`,
+        "if ($null -eq $p) { exit 3 }",
+        "$created = ''",
+        "if ($p.CreationDate) {",
+        "  try { $created = $p.CreationDate.ToString('o') } catch { $created = '' }",
+        "}",
+        "[pscustomobject]@{",
+        "  pid = $p.ProcessId",
+        "  commandLine = $p.CommandLine",
+        "  executablePath = $p.ExecutablePath",
+        "  startedAt = $created",
+        "} | ConvertTo-Json -Compress",
+    ].join("\n");
+    for (const shell of resolveWindowsPowerShellCandidates()) {
+        const result = spawnSync(shell, ["-NoProfile", "-NonInteractive", "-Command", script], {
+            encoding: "utf8",
+            windowsHide: true,
+            shell: false,
+        });
+        if (result.error || result.status !== 0) {
+            continue;
+        }
+        const stdout = String(result.stdout ?? "").trim();
+        if (!stdout) {
+            continue;
+        }
+        try {
+            const parsed = JSON.parse(stdout);
+            return {
+                pid: normalizePid(parsed.pid),
+                commandLine: String(parsed.commandLine ?? ""),
+                executablePath: normalizeOptionalString(parsed.executablePath),
+                startedAt: normalizeOptionalString(parsed.startedAt),
+            };
+        }
+        catch {
+            continue;
+        }
+    }
+    return null;
+}
+function inspectPosixProcess(pid) {
+    const commandResult = spawnSync("ps", ["-p", String(pid), "-o", "args="], {
+        encoding: "utf8",
+        shell: false,
+    });
+    if (commandResult.error || commandResult.status !== 0) {
+        return null;
+    }
+    const commandLine = String(commandResult.stdout ?? "").trim();
+    if (!commandLine) {
+        return null;
+    }
+    const startedAtResult = spawnSync("ps", ["-p", String(pid), "-o", "lstart="], {
+        encoding: "utf8",
+        shell: false,
+    });
+    const executablePathResult = spawnSync("ps", ["-p", String(pid), "-o", "comm="], {
+        encoding: "utf8",
+        shell: false,
+    });
+    return {
+        pid,
+        commandLine,
+        executablePath: normalizeOptionalString(executablePathResult.stdout),
+        startedAt: normalizeOptionalString(startedAtResult.stdout),
+    };
+}
+function resolveWindowsPowerShellCandidates() {
+    const candidates = [
+        path.join(process.env.SystemRoot ?? "C:\\Windows", "System32", "WindowsPowerShell", "v1.0", "powershell.exe"),
+        "powershell.exe",
+        "pwsh.exe",
+    ];
+    return [...new Set(candidates)];
+}
+function extractScriptToken(value) {
+    const tokens = tokenizeCommandLine(value);
+    for (const token of tokens) {
+        if (/\.(?:[cm]?js|mts)$/i.test(token)) {
+            return token;
+        }
+    }
+    return null;
+}
+function extractExecutableToken(value) {
+    const [first] = tokenizeCommandLine(value);
+    return first ? normalizeOptionalString(first) : null;
+}
+function tokenizeCommandLine(value) {
+    const text = String(value ?? "").trim();
+    if (!text) {
+        return [];
+    }
+    const tokens = [];
+    const pattern = /"([^"]*)"|'([^']*)'|[^\s]+/g;
+    let match = null;
+    while ((match = pattern.exec(text)) !== null) {
+        const token = match[1] ?? match[2] ?? match[0] ?? "";
+        const normalized = normalizeOptionalString(token);
+        if (normalized) {
+            tokens.push(normalized);
+        }
+    }
+    return tokens;
+}
+function parseTimestamp(value) {
+    const text = normalizeOptionalString(value);
+    if (!text) {
+        return null;
+    }
+    const timestamp = Date.parse(text);
+    if (!Number.isFinite(timestamp)) {
+        return null;
+    }
+    return timestamp;
+}
+function normalizeOptionalString(value) {
+    const normalized = String(value ?? "").trim();
+    return normalized ? normalized : null;
+}
+function normalizeCommandToken(value, platform) {
+    const normalized = normalizeOptionalString(value);
+    if (!normalized) {
+        return null;
+    }
+    const unquoted = normalized.replace(/^["']+|["']+$/g, "");
+    const slashed = platform === "win32" ? unquoted.replace(/\\/g, "/") : unquoted;
+    return platform === "win32" ? slashed.toLowerCase() : slashed;
+}
+function commandLineContains(commandLine, expectedToken, platform) {
+    const normalizedCommandLine = normalizeCommandToken(commandLine, platform);
+    if (!normalizedCommandLine) {
+        return false;
+    }
+    return normalizedCommandLine.includes(expectedToken);
+}
+function pathBasename(value, platform) {
+    return (platform === "win32" ? path.win32.basename(value) : path.posix.basename(value)).toLowerCase();
+}

package/scripts/dist/supervisor.mjs

@@ -5,6 +5,7 @@ import process from "node:process";
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { initializeCopilotHubLayout, resolveCopilotHubLayout } from "./install-layout.mjs";
+import { isManagedProcessRunning, isProcessRunning, normalizePid } from "./process-identity.mjs";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const repoRoot = path.resolve(__dirname, "..", "..");
@@ -106,7 +107,7 @@ function showStatus() {
     for (const service of SERVICES) {
         const state = readState(service);
         const pid = normalizePid(state?.pid);
-        const running = pid > 0 && isProcessRunning(pid);
+        const running = pid > 0 && isManagedProcessRunning(state);
         if (state && !running) {
             removeState(service);
         }
@@ -127,7 +128,7 @@ async function startService(service, options = {}) {
     const suppressAlreadyRunning = options?.suppressAlreadyRunning === true;
     const existing = readState(service);
     const existingPid = normalizePid(existing?.pid);
-    if (existingPid > 0 && isProcessRunning(existingPid)) {
+    if (existingPid > 0 && isManagedProcessRunning(existing)) {
         if (!suppressAlreadyRunning) {
             console.log(`[${service.id}] already running (pid ${existingPid})`);
         }
@@ -163,9 +164,11 @@ async function startService(service, options = {}) {
         pid,
         startedAt: new Date().toISOString(),
         command: `${process.execPath} ${service.entryScript}`,
+        executablePath: process.execPath,
+        entryScript: service.entryScript,
     });
     await sleep(250);
-    if (!isProcessRunning(pid)) {
+    if (!isManagedProcessRunning(readState(service))) {
         removeState(service);
         console.error(`[${service.id}] exited immediately. Check logs: ${service.logFile}`);
         return false;
@@ -185,7 +188,7 @@ async function stopService(service) {
         console.log(`[${service.id}] removed invalid pid file`);
         return;
     }
-    if (!isProcessRunning(pid)) {
+    if (!isManagedProcessRunning(state)) {
         removeState(service);
         console.log(`[${service.id}] not running (stale pid ${pid})`);
         return;
@@ -267,28 +270,6 @@ function removeState(service) {
         fs.rmSync(service.pidFile, { force: true });
     }
 }
-function normalizePid(value) {
-    const pid = Number.parseInt(String(value ?? ""), 10);
-    if (!Number.isFinite(pid) || pid <= 0) {
-        return 0;
-    }
-    return pid;
-}
-function isProcessRunning(pid) {
-    if (!Number.isInteger(pid) || pid <= 0) {
-        return false;
-    }
-    try {
-        process.kill(pid, 0);
-        return true;
-    }
-    catch (error) {
-        if (error && typeof error === "object" && "code" in error && error.code === "EPERM") {
-            return true;
-        }
-        return false;
-    }
-}
 function ensureRuntimeDirs() {
     fs.mkdirSync(runtimeDir, { recursive: true });
     fs.mkdirSync(pidsDir, { recursive: true });

package/scripts/src/daemon.mts

@@ -7,6 +7,7 @@ import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
 import { codexInstallPackageSpec } from "./codex-version.mjs";
 import { initializeCopilotHubLayout, resolveCopilotHubLayout } from "./install-layout.mjs";
+import { isManagedProcessRunning, isProcessRunning, normalizePid } from "./process-identity.mjs";
 import {
   buildCodexCompatibilityError,
   probeCodexVersion,
@@ -147,6 +148,8 @@ async function runDaemonLoop() {
     pid: process.pid,
     startedAt: new Date().toISOString(),
     command: `${nodeBin} ${daemonScriptPath} run`,
+    executablePath: nodeBin,
+    entryScript: daemonScriptPath,
   });
 
   const state = { stopping: false, shuttingDown: false };
@@ -227,8 +230,9 @@ async function stopDaemonProcess() {
     return;
   }
 
+  const state = readDaemonState();
   await terminateProcess(pid);
-  if (isProcessRunning(pid)) {
+  if (isManagedProcessRunning(state)) {
     throw new Error(`Daemon did not stop cleanly (pid ${pid}).`);
   }
 
@@ -336,7 +340,7 @@ function getRunningDaemonPid() {
   if (pid <= 0) {
     return 0;
   }
-  return isProcessRunning(pid) ? pid : 0;
+  return isManagedProcessRunning(state) ? pid : 0;
 }
 
 function readDaemonState() {
@@ -362,29 +366,6 @@ function removeDaemonState() {
   fs.rmSync(daemonStatePath, { force: true });
 }
 
-function normalizePid(value) {
-  const pid = Number.parseInt(String(value ?? ""), 10);
-  if (!Number.isFinite(pid) || pid <= 0) {
-    return 0;
-  }
-  return pid;
-}
-
-function isProcessRunning(pid) {
-  if (!Number.isInteger(pid) || pid <= 0) {
-    return false;
-  }
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (error) {
-    if (error && typeof error === "object" && "code" in error && error.code === "EPERM") {
-      return true;
-    }
-    return false;
-  }
-}
-
 async function terminateProcess(pid) {
   if (process.platform === "win32") {
     await killTreeWindows(pid);

package/scripts/src/process-identity.mts

@@ -0,0 +1,296 @@
+import path from "node:path";
+import process from "node:process";
+import { spawnSync } from "node:child_process";
+
+const PROCESS_START_TOLERANCE_MS = 120_000;
+
+export type ManagedProcessState = {
+  pid?: unknown;
+  startedAt?: unknown;
+  command?: unknown;
+  executablePath?: unknown;
+  entryScript?: unknown;
+};
+
+type ProcessIdentity = {
+  pid: number;
+  commandLine: string;
+  executablePath: string | null;
+  startedAt: string | null;
+};
+
+export function normalizePid(value: unknown): number {
+  const pid = Number.parseInt(String(value ?? ""), 10);
+  if (!Number.isFinite(pid) || pid <= 0) {
+    return 0;
+  }
+  return pid;
+}
+
+export function isManagedProcessRunning(
+  state: ManagedProcessState | null,
+  platform: NodeJS.Platform = process.platform,
+): boolean {
+  const pid = normalizePid(state?.pid);
+  if (pid <= 0) {
+    return false;
+  }
+  if (!isProcessRunning(pid)) {
+    return false;
+  }
+
+  const identity = inspectProcess(pid, platform);
+  if (!identity) {
+    return true;
+  }
+
+  return matchesManagedProcessState(state, identity, platform);
+}
+
+export function matchesManagedProcessState(
+  state: ManagedProcessState | null,
+  identity: ProcessIdentity | null,
+  platform: NodeJS.Platform = process.platform,
+): boolean {
+  const pid = normalizePid(state?.pid);
+  if (pid <= 0 || !identity) {
+    return false;
+  }
+  if (normalizePid(identity.pid) !== pid) {
+    return false;
+  }
+
+  const checks: boolean[] = [];
+  const expectedScript = normalizeCommandToken(
+    state?.entryScript ?? extractScriptToken(state?.command),
+    platform,
+  );
+  if (expectedScript) {
+    checks.push(commandLineContains(identity.commandLine, expectedScript, platform));
+  }
+
+  const expectedExecutablePath = normalizeCommandToken(
+    state?.executablePath ?? extractExecutableToken(state?.command),
+    platform,
+  );
+  if (expectedExecutablePath) {
+    const actualExecutablePath = normalizeCommandToken(identity.executablePath, platform);
+    if (actualExecutablePath) {
+      checks.push(
+        actualExecutablePath === expectedExecutablePath ||
+          pathBasename(actualExecutablePath, platform) ===
+            pathBasename(expectedExecutablePath, platform),
+      );
+    } else {
+      checks.push(commandLineContains(identity.commandLine, expectedExecutablePath, platform));
+    }
+  }
+
+  const expectedStartedAt = parseTimestamp(state?.startedAt);
+  const actualStartedAt = parseTimestamp(identity.startedAt);
+  if (expectedStartedAt !== null && actualStartedAt !== null) {
+    checks.push(Math.abs(actualStartedAt - expectedStartedAt) <= PROCESS_START_TOLERANCE_MS);
+  }
+
+  if (checks.length === 0) {
+    return true;
+  }
+  return checks.every(Boolean);
+}
+
+export function isProcessRunning(pid: number): boolean {
+  if (!Number.isInteger(pid) || pid <= 0) {
+    return false;
+  }
+
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    if (error && typeof error === "object" && "code" in error && error.code === "EPERM") {
+      return true;
+    }
+    return false;
+  }
+}
+
+function inspectProcess(pid: number, platform: NodeJS.Platform): ProcessIdentity | null {
+  if (platform === "win32") {
+    return inspectWindowsProcess(pid);
+  }
+  if (platform === "linux" || platform === "darwin") {
+    return inspectPosixProcess(pid);
+  }
+  return null;
+}
+
+function inspectWindowsProcess(pid: number): ProcessIdentity | null {
+  const script = [
+    `$p = Get-CimInstance Win32_Process -Filter "ProcessId = ${pid}" -ErrorAction SilentlyContinue`,
+    "if ($null -eq $p) { exit 3 }",
+    "$created = ''",
+    "if ($p.CreationDate) {",
+    "  try { $created = $p.CreationDate.ToString('o') } catch { $created = '' }",
+    "}",
+    "[pscustomobject]@{",
+    "  pid = $p.ProcessId",
+    "  commandLine = $p.CommandLine",
+    "  executablePath = $p.ExecutablePath",
+    "  startedAt = $created",
+    "} | ConvertTo-Json -Compress",
+  ].join("\n");
+
+  for (const shell of resolveWindowsPowerShellCandidates()) {
+    const result = spawnSync(shell, ["-NoProfile", "-NonInteractive", "-Command", script], {
+      encoding: "utf8",
+      windowsHide: true,
+      shell: false,
+    });
+    if (result.error || result.status !== 0) {
+      continue;
+    }
+    const stdout = String(result.stdout ?? "").trim();
+    if (!stdout) {
+      continue;
+    }
+    try {
+      const parsed = JSON.parse(stdout) as Record<string, unknown>;
+      return {
+        pid: normalizePid(parsed.pid),
+        commandLine: String(parsed.commandLine ?? ""),
+        executablePath: normalizeOptionalString(parsed.executablePath),
+        startedAt: normalizeOptionalString(parsed.startedAt),
+      };
+    } catch {
+      continue;
+    }
+  }
+
+  return null;
+}
+
+function inspectPosixProcess(pid: number): ProcessIdentity | null {
+  const commandResult = spawnSync("ps", ["-p", String(pid), "-o", "args="], {
+    encoding: "utf8",
+    shell: false,
+  });
+  if (commandResult.error || commandResult.status !== 0) {
+    return null;
+  }
+
+  const commandLine = String(commandResult.stdout ?? "").trim();
+  if (!commandLine) {
+    return null;
+  }
+
+  const startedAtResult = spawnSync("ps", ["-p", String(pid), "-o", "lstart="], {
+    encoding: "utf8",
+    shell: false,
+  });
+  const executablePathResult = spawnSync("ps", ["-p", String(pid), "-o", "comm="], {
+    encoding: "utf8",
+    shell: false,
+  });
+
+  return {
+    pid,
+    commandLine,
+    executablePath: normalizeOptionalString(executablePathResult.stdout),
+    startedAt: normalizeOptionalString(startedAtResult.stdout),
+  };
+}
+
+function resolveWindowsPowerShellCandidates(): string[] {
+  const candidates = [
+    path.join(
+      process.env.SystemRoot ?? "C:\\Windows",
+      "System32",
+      "WindowsPowerShell",
+      "v1.0",
+      "powershell.exe",
+    ),
+    "powershell.exe",
+    "pwsh.exe",
+  ];
+  return [...new Set(candidates)];
+}
+
+function extractScriptToken(value: unknown): string | null {
+  const tokens = tokenizeCommandLine(value);
+  for (const token of tokens) {
+    if (/\.(?:[cm]?js|mts)$/i.test(token)) {
+      return token;
+    }
+  }
+  return null;
+}
+
+function extractExecutableToken(value: unknown): string | null {
+  const [first] = tokenizeCommandLine(value);
+  return first ? normalizeOptionalString(first) : null;
+}
+
+function tokenizeCommandLine(value: unknown): string[] {
+  const text = String(value ?? "").trim();
+  if (!text) {
+    return [];
+  }
+
+  const tokens: string[] = [];
+  const pattern = /"([^"]*)"|'([^']*)'|[^\s]+/g;
+  let match: RegExpExecArray | null = null;
+  while ((match = pattern.exec(text)) !== null) {
+    const token = match[1] ?? match[2] ?? match[0] ?? "";
+    const normalized = normalizeOptionalString(token);
+    if (normalized) {
+      tokens.push(normalized);
+    }
+  }
+  return tokens;
+}
+
+function parseTimestamp(value: unknown): number | null {
+  const text = normalizeOptionalString(value);
+  if (!text) {
+    return null;
+  }
+  const timestamp = Date.parse(text);
+  if (!Number.isFinite(timestamp)) {
+    return null;
+  }
+  return timestamp;
+}
+
+function normalizeOptionalString(value: unknown): string | null {
+  const normalized = String(value ?? "").trim();
+  return normalized ? normalized : null;
+}
+
+function normalizeCommandToken(value: unknown, platform: NodeJS.Platform): string | null {
+  const normalized = normalizeOptionalString(value);
+  if (!normalized) {
+    return null;
+  }
+
+  const unquoted = normalized.replace(/^["']+|["']+$/g, "");
+  const slashed = platform === "win32" ? unquoted.replace(/\\/g, "/") : unquoted;
+  return platform === "win32" ? slashed.toLowerCase() : slashed;
+}
+
+function commandLineContains(
+  commandLine: string,
+  expectedToken: string,
+  platform: NodeJS.Platform,
+): boolean {
+  const normalizedCommandLine = normalizeCommandToken(commandLine, platform);
+  if (!normalizedCommandLine) {
+    return false;
+  }
+  return normalizedCommandLine.includes(expectedToken);
+}
+
+function pathBasename(value: string, platform: NodeJS.Platform): string {
+  return (
+    platform === "win32" ? path.win32.basename(value) : path.posix.basename(value)
+  ).toLowerCase();
+}

package/scripts/src/supervisor.mts

@@ -5,6 +5,7 @@ import process from "node:process";
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { initializeCopilotHubLayout, resolveCopilotHubLayout } from "./install-layout.mjs";
+import { isManagedProcessRunning, isProcessRunning, normalizePid } from "./process-identity.mjs";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -121,7 +122,7 @@ function showStatus() {
   for (const service of SERVICES) {
     const state = readState(service);
     const pid = normalizePid(state?.pid);
-    const running = pid > 0 && isProcessRunning(pid);
+    const running = pid > 0 && isManagedProcessRunning(state);
 
     if (state && !running) {
       removeState(service);
@@ -147,7 +148,7 @@ async function startService(service, options: { suppressAlreadyRunning?: boolean
   const suppressAlreadyRunning = options?.suppressAlreadyRunning === true;
   const existing = readState(service);
   const existingPid = normalizePid(existing?.pid);
-  if (existingPid > 0 && isProcessRunning(existingPid)) {
+  if (existingPid > 0 && isManagedProcessRunning(existing)) {
     if (!suppressAlreadyRunning) {
       console.log(`[${service.id}] already running (pid ${existingPid})`);
     }
@@ -188,11 +189,13 @@ async function startService(service, options: { suppressAlreadyRunning?: boolean
     pid,
     startedAt: new Date().toISOString(),
     command: `${process.execPath} ${service.entryScript}`,
+    executablePath: process.execPath,
+    entryScript: service.entryScript,
   });
 
   await sleep(250);
 
-  if (!isProcessRunning(pid)) {
+  if (!isManagedProcessRunning(readState(service))) {
     removeState(service);
     console.error(`[${service.id}] exited immediately. Check logs: ${service.logFile}`);
     return false;
@@ -216,7 +219,7 @@ async function stopService(service) {
     return;
   }
 
-  if (!isProcessRunning(pid)) {
+  if (!isManagedProcessRunning(state)) {
     removeState(service);
     console.log(`[${service.id}] not running (stale pid ${pid})`);
     return;
@@ -311,30 +314,6 @@ function removeState(service) {
   }
 }
 
-function normalizePid(value) {
-  const pid = Number.parseInt(String(value ?? ""), 10);
-  if (!Number.isFinite(pid) || pid <= 0) {
-    return 0;
-  }
-  return pid;
-}
-
-function isProcessRunning(pid) {
-  if (!Number.isInteger(pid) || pid <= 0) {
-    return false;
-  }
-
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (error) {
-    if (error && typeof error === "object" && "code" in error && error.code === "EPERM") {
-      return true;
-    }
-    return false;
-  }
-}
-
 function ensureRuntimeDirs() {
   fs.mkdirSync(runtimeDir, { recursive: true });
   fs.mkdirSync(pidsDir, { recursive: true });

package/scripts/test/process-identity.test.mjs

@@ -0,0 +1,61 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { matchesManagedProcessState, normalizePid } from "../dist/process-identity.mjs";
+
+test("normalizePid accepts valid positive integers only", () => {
+  assert.equal(normalizePid("123"), 123);
+  assert.equal(normalizePid(0), 0);
+  assert.equal(normalizePid(-1), 0);
+  assert.equal(normalizePid("abc"), 0);
+});
+
+test("matchesManagedProcessState accepts a matching managed daemon process", () => {
+  const state = {
+    pid: 2444,
+    startedAt: "2026-03-14T16:13:37.301Z",
+    executablePath: "C:/Program Files/nodejs/node.exe",
+    entryScript: "C:/Users/amine/Desktop/copilot_hub/scripts/dist/daemon.mjs",
+  };
+  const identity = {
+    pid: 2444,
+    executablePath: "C:\\Program Files\\nodejs\\node.exe",
+    commandLine:
+      '"C:\\Program Files\\nodejs\\node.exe" "C:\\Users\\amine\\Desktop\\copilot_hub\\scripts\\dist\\daemon.mjs" run',
+    startedAt: "2026-03-14T16:13:37.900Z",
+  };
+
+  assert.equal(matchesManagedProcessState(state, identity, "win32"), true);
+});
+
+test("matchesManagedProcessState rejects a reused pid for an unrelated process", () => {
+  const state = {
+    pid: 2444,
+    startedAt: "2026-03-14T16:13:37.301Z",
+    command:
+      "C:\\Program Files\\nodejs\\node.exe C:\\Users\\amine\\Desktop\\copilot_hub\\scripts\\dist\\daemon.mjs run",
+  };
+  const identity = {
+    pid: 2444,
+    executablePath: "C:\\Windows\\System32\\IntelCpHDCPSvc.exe",
+    commandLine: "C:\\Windows\\System32\\IntelCpHDCPSvc.exe",
+    startedAt: "2026-03-14T16:55:00.000Z",
+  };
+
+  assert.equal(matchesManagedProcessState(state, identity, "win32"), false);
+});
+
+test("matchesManagedProcessState supports legacy states that only stored command", () => {
+  const state = {
+    pid: 17044,
+    startedAt: "2026-03-14T12:00:00.000Z",
+    command: "/usr/bin/node /opt/copilot-hub/scripts/dist/daemon.mjs run",
+  };
+  const identity = {
+    pid: 17044,
+    executablePath: "/usr/bin/node",
+    commandLine: "/usr/bin/node /opt/copilot-hub/scripts/dist/daemon.mjs run",
+    startedAt: "Fri Mar 14 12:00:00 2026",
+  };
+
+  assert.equal(matchesManagedProcessState(state, identity, "linux"), true);
+});