adhdev 0.9.1 → 0.9.4

package/dist/cli/index.js

@@ -1433,8 +1433,8 @@ async function detectIDEs(providerLoader) {
       if ((0, import_fs3.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
     if (!resolvedCli && appPath && os31 === "win32") {
-      const { dirname: dirname10 } = await import("path");
-      const appDir = dirname10(appPath);
+      const { dirname: dirname11 } = await import("path");
+      const appDir = dirname11(appPath);
       const candidates = [
         `${appDir}\\\\bin\\\\${def.cli}.cmd`,
         `${appDir}\\\\bin\\\\${def.cli}`,
@@ -14066,10 +14066,6 @@ ${data.message || ""}`.trim();
             throw new Error(`${this.cliName} is still processing the previous prompt`);
           }
         }
-        const blockingModal = this.activeModal || this.getStartupConfirmationModal(this.terminalScreen.getText() || "");
-        if (blockingModal || this.currentStatus === "waiting_approval") {
-          throw new Error(`${this.cliName} is awaiting confirmation before it can accept a prompt`);
-        }
         this.isWaitingForResponse = true;
         this.responseBuffer = "";
         this.finishRetryCount = 0;
@@ -33907,10 +33903,10 @@ var init_readdirp = __esm({
       }
       async _formatEntry(dirent, path35) {
         let entry;
-        const basename9 = this._isDirent ? dirent.name : dirent;
+        const basename10 = this._isDirent ? dirent.name : dirent;
         try {
-          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path35, basename9));
-          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename9 };
+          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path35, basename10));
+          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename10 };
           entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
         } catch (err) {
           this._onError(err);
@@ -34441,9 +34437,9 @@ var init_handler2 = __esm({
       _watchWithNodeFs(path35, listener) {
         const opts = this.fsw.options;
         const directory = sp.dirname(path35);
-        const basename9 = sp.basename(path35);
+        const basename10 = sp.basename(path35);
         const parent = this.fsw._getWatchedDir(directory);
-        parent.add(basename9);
+        parent.add(basename10);
         const absolutePath = sp.resolve(path35);
         const options = {
           persistent: opts.persistent
@@ -34453,7 +34449,7 @@ var init_handler2 = __esm({
         let closer;
         if (opts.usePolling) {
           const enableBin = opts.interval !== opts.binaryInterval;
-          options.interval = enableBin && isBinaryPath(basename9) ? opts.binaryInterval : opts.interval;
+          options.interval = enableBin && isBinaryPath(basename10) ? opts.binaryInterval : opts.interval;
           closer = setFsWatchFileListener(path35, absolutePath, options, {
             listener,
             rawEmitter: this.fsw._emitRaw
@@ -34475,11 +34471,11 @@ var init_handler2 = __esm({
         if (this.fsw.closed) {
           return;
         }
-        const dirname10 = sp.dirname(file2);
-        const basename9 = sp.basename(file2);
-        const parent = this.fsw._getWatchedDir(dirname10);
+        const dirname11 = sp.dirname(file2);
+        const basename10 = sp.basename(file2);
+        const parent = this.fsw._getWatchedDir(dirname11);
         let prevStats = stats;
-        if (parent.has(basename9))
+        if (parent.has(basename10))
           return;
         const listener = async (path35, newStats) => {
           if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
@@ -34504,9 +34500,9 @@ var init_handler2 = __esm({
                 prevStats = newStats2;
               }
             } catch (error48) {
-              this.fsw._remove(dirname10, basename9);
+              this.fsw._remove(dirname11, basename10);
             }
-          } else if (parent.has(basename9)) {
+          } else if (parent.has(basename10)) {
             const at = newStats.atimeMs;
             const mt = newStats.mtimeMs;
             if (!at || at <= mt || mt !== prevStats.mtimeMs) {
@@ -37821,9 +37817,82 @@ function appendUpgradeLog(message) {
   } catch {
   }
 }
-function getNpmExecutable() {
+function resolveSiblingNpmExecutable(nodeExecutable) {
+  const binDir = path17.dirname(nodeExecutable);
+  const candidates = process.platform === "win32" ? ["npm.cmd", "npm.exe", "npm"] : ["npm"];
+  for (const candidate of candidates) {
+    const candidatePath = path17.join(binDir, candidate);
+    if (fs8.existsSync(candidatePath)) {
+      return candidatePath;
+    }
+  }
   return "npm";
 }
+function findCurrentPackageRoot(currentCliPath, packageName) {
+  if (!currentCliPath) return null;
+  let resolvedPath = currentCliPath;
+  try {
+    resolvedPath = fs8.realpathSync.native(currentCliPath);
+  } catch {
+  }
+  let currentDir = resolvedPath;
+  try {
+    if (fs8.statSync(resolvedPath).isFile()) {
+      currentDir = path17.dirname(resolvedPath);
+    }
+  } catch {
+    currentDir = path17.dirname(resolvedPath);
+  }
+  while (true) {
+    const packageJsonPath = path17.join(currentDir, "package.json");
+    try {
+      if (fs8.existsSync(packageJsonPath)) {
+        const parsed = JSON.parse(fs8.readFileSync(packageJsonPath, "utf8"));
+        if (parsed?.name === packageName) {
+          const normalized = currentDir.replace(/\\/g, "/");
+          return normalized.includes("/node_modules/") ? currentDir : null;
+        }
+      }
+    } catch {
+    }
+    const parentDir = path17.dirname(currentDir);
+    if (parentDir === currentDir) {
+      return null;
+    }
+    currentDir = parentDir;
+  }
+}
+function resolveInstallPrefixFromPackageRoot(packageRoot, packageName) {
+  const nodeModulesDir = packageName.startsWith("@") ? path17.dirname(path17.dirname(packageRoot)) : path17.dirname(packageRoot);
+  if (path17.basename(nodeModulesDir) !== "node_modules") {
+    return null;
+  }
+  const maybeLibDir = path17.dirname(nodeModulesDir);
+  if (path17.basename(maybeLibDir) === "lib") {
+    return path17.dirname(maybeLibDir);
+  }
+  return maybeLibDir;
+}
+function resolveCurrentGlobalInstallSurface(options) {
+  const packageRoot = findCurrentPackageRoot(options.currentCliPath || process.argv[1], options.packageName);
+  return {
+    npmExecutable: resolveSiblingNpmExecutable(options.nodeExecutable || process.execPath),
+    packageRoot,
+    installPrefix: packageRoot ? resolveInstallPrefixFromPackageRoot(packageRoot, options.packageName) : null
+  };
+}
+function buildPinnedGlobalInstallCommand(options) {
+  const surface = resolveCurrentGlobalInstallSurface(options);
+  const args = ["install", "-g", `${options.packageName}@${options.targetVersion || "latest"}`, "--force"];
+  if (surface.installPrefix) {
+    args.push("--prefix", surface.installPrefix);
+  }
+  return {
+    command: surface.npmExecutable,
+    args,
+    surface
+  };
+}
 function getNpmExecOptions() {
   return { shell: process.platform === "win32" };
 }
@@ -37886,11 +37955,12 @@ function removeDaemonPidFile() {
   } catch {
   }
 }
-function cleanupStaleGlobalInstallDirs(pkgName) {
+function cleanupStaleGlobalInstallDirs(pkgName, surface) {
   const npmExecOpts = getNpmExecOptions();
-  const npmRoot = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["root", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
+  const prefixArgs = surface.installPrefix ? ["--prefix", surface.installPrefix] : [];
+  const npmRoot = (0, import_child_process7.execFileSync)(surface.npmExecutable, ["root", "-g", ...prefixArgs], { encoding: "utf8", ...npmExecOpts }).trim();
   if (!npmRoot) return;
-  const npmPrefix = (0, import_child_process7.execFileSync)(getNpmExecutable(), ["prefix", "-g"], { encoding: "utf8", ...npmExecOpts }).trim();
+  const npmPrefix = surface.installPrefix || (0, import_child_process7.execFileSync)(surface.npmExecutable, ["prefix", "-g", ...prefixArgs], { encoding: "utf8", ...npmExecOpts }).trim();
   const binDir = process.platform === "win32" ? npmPrefix : path17.join(npmPrefix, "bin");
   const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
   const binNames = /* @__PURE__ */ new Set([packageBaseName]);
@@ -37915,7 +37985,7 @@ function cleanupStaleGlobalInstallDirs(pkgName) {
   }
   if (fs8.existsSync(binDir)) {
     for (const entry of fs8.readdirSync(binDir)) {
-      if (![...binNames].some((name) => entry.startsWith(`.${name}-`))) continue;
+      if (!Array.from(binNames).some((name) => entry.startsWith(`.${name}-`))) continue;
       fs8.rmSync(path17.join(binDir, entry), { recursive: true, force: true });
       appendUpgradeLog(`Removed stale bin staging entry: ${path17.join(binDir, entry)}`);
     }
@@ -37935,19 +38005,27 @@ function spawnDetachedDaemonUpgradeHelper(payload) {
 async function runDaemonUpgradeHelper(payload) {
   const restartArgv = Array.isArray(payload.restartArgv) ? payload.restartArgv : [];
   const sessionHostAppName = payload.sessionHostAppName || process.env.ADHDEV_SESSION_HOST_NAME || "adhdev";
+  const installCommand = buildPinnedGlobalInstallCommand({
+    packageName: payload.packageName,
+    targetVersion: payload.targetVersion
+  });
   appendUpgradeLog(`Upgrade helper started for ${payload.packageName}@${payload.targetVersion}`);
+  appendUpgradeLog(`Using npm executable: ${installCommand.command}`);
+  if (installCommand.surface.installPrefix) {
+    appendUpgradeLog(`Pinned install prefix: ${installCommand.surface.installPrefix}`);
+  }
   if (Number.isFinite(payload.parentPid) && payload.parentPid > 0) {
     appendUpgradeLog(`Waiting for parent pid ${payload.parentPid} to exit`);
     await waitForPidExit(payload.parentPid, 15e3);
   }
   stopSessionHostProcesses(sessionHostAppName);
   removeDaemonPidFile();
-  cleanupStaleGlobalInstallDirs(payload.packageName);
+  cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
   const spec = `${payload.packageName}@${payload.targetVersion || "latest"}`;
   appendUpgradeLog(`Installing ${spec}`);
   const installOutput = (0, import_child_process7.execFileSync)(
-    getNpmExecutable(),
-    ["install", "-g", spec, "--force"],
+    installCommand.command,
+    installCommand.args,
     {
       encoding: "utf8",
       stdio: "pipe",
@@ -37960,7 +38038,7 @@ async function runDaemonUpgradeHelper(payload) {
   }
   if (process.platform === "win32") {
     await new Promise((resolve18) => setTimeout(resolve18, 500));
-    cleanupStaleGlobalInstallDirs(payload.packageName);
+    cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
   if (restartArgv.length > 0) {
@@ -46848,6 +46926,7 @@ __export(src_exports, {
   buildChatMessageSignature: () => buildChatMessageSignature,
   buildChatTailDeliverySignature: () => buildChatTailDeliverySignature,
   buildMachineInfo: () => buildMachineInfo,
+  buildPinnedGlobalInstallCommand: () => buildPinnedGlobalInstallCommand,
   buildRuntimeSystemChatMessage: () => buildRuntimeSystemChatMessage,
   buildSessionEntries: () => buildSessionEntries,
   buildSessionModalDeliverySignature: () => buildSessionModalDeliverySignature,
@@ -46930,6 +47009,7 @@ __export(src_exports, {
   resetDebugRuntimeConfig: () => resetDebugRuntimeConfig,
   resetState: () => resetState,
   resolveChatMessageKind: () => resolveChatMessageKind,
+  resolveCurrentGlobalInstallSurface: () => resolveCurrentGlobalInstallSurface,
   resolveDebugRuntimeConfig: () => resolveDebugRuntimeConfig,
   resolveSessionHostAppName: () => resolveSessionHostAppName,
   resolveSessionHostAppNameResolution: () => resolveSessionHostAppNameResolution,
@@ -78239,6 +78319,33 @@ var init_open = __esm({
   }
 });
 
+// src/version.ts
+function resolvePackageVersion(options) {
+  const injectedVersion = options?.injectedVersion || "unknown";
+  const dir = options?.dirname || __dirname;
+  const possiblePaths = [
+    (0, import_path3.join)(dir, "..", "..", "package.json"),
+    (0, import_path3.join)(dir, "..", "package.json"),
+    (0, import_path3.join)(dir, "package.json")
+  ];
+  for (const p of possiblePaths) {
+    try {
+      const data = JSON.parse((0, import_fs6.readFileSync)(p, "utf-8"));
+      if (data.version) return data.version;
+    } catch {
+    }
+  }
+  return injectedVersion;
+}
+var import_fs6, import_path3;
+var init_version = __esm({
+  "src/version.ts"() {
+    "use strict";
+    import_fs6 = require("fs");
+    import_path3 = require("path");
+  }
+});
+
 // src/server-connection.ts
 var import_ws2, ServerConnection;
 var init_server_connection = __esm({
@@ -86927,33 +87034,6 @@ var init_session_host_controller = __esm({
   }
 });
 
-// src/version.ts
-function resolvePackageVersion(options) {
-  const injectedVersion = options?.injectedVersion || "unknown";
-  const dir = options?.dirname || __dirname;
-  const possiblePaths = [
-    (0, import_path3.join)(dir, "..", "..", "package.json"),
-    (0, import_path3.join)(dir, "..", "package.json"),
-    (0, import_path3.join)(dir, "package.json")
-  ];
-  for (const p of possiblePaths) {
-    try {
-      const data = JSON.parse((0, import_fs6.readFileSync)(p, "utf-8"));
-      if (data.version) return data.version;
-    } catch {
-    }
-  }
-  return injectedVersion;
-}
-var import_fs6, import_path3;
-var init_version = __esm({
-  "src/version.ts"() {
-    "use strict";
-    import_fs6 = require("fs");
-    import_path3 = require("path");
-  }
-});
-
 // src/adhdev-daemon.ts
 var adhdev_daemon_exports = {};
 __export(adhdev_daemon_exports, {
@@ -87095,7 +87175,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.1" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.4" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -88153,6 +88233,36 @@ function hasCloudMachineAuth() {
   const config2 = loadConfig();
   return Boolean(config2.machineSecret && config2.machineSecret.trim());
 }
+function readLatestPublishedCliVersion(execFileSyncLocal) {
+  const surface = resolveCurrentGlobalInstallSurface({ packageName: "adhdev" });
+  try {
+    return execFileSyncLocal(surface.npmExecutable, ["view", "adhdev", "version"], {
+      encoding: "utf-8",
+      timeout: 5e3,
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+  } catch {
+    return null;
+  }
+}
+function readInstalledGlobalCliVersion(execFileSyncLocal) {
+  const surface = resolveCurrentGlobalInstallSurface({ packageName: "adhdev" });
+  const args = ["list", "-g", "adhdev", "--json"];
+  if (surface.installPrefix) {
+    args.push("--prefix", surface.installPrefix);
+  }
+  try {
+    const result = execFileSyncLocal(surface.npmExecutable, args, {
+      encoding: "utf-8",
+      timeout: 5e3,
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    const parsed = JSON.parse(result);
+    return parsed.dependencies?.adhdev?.version || null;
+  } catch {
+    return null;
+  }
+}
 async function runWizard(options = {}) {
   console.log(LOGO);
   if (isSetupComplete() && hasCloudMachineAuth() && !options.force) {
@@ -88168,27 +88278,10 @@ async function runWizard(options = {}) {
 }
 async function checkForUpdate() {
   try {
-    const { execSync: execSync8 } = await import("child_process");
-    let currentVersion = null;
-    try {
-      currentVersion = execSync8("adhdev --version", {
-        encoding: "utf-8",
-        timeout: 3e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-    } catch {
-      return;
-    }
-    let latestVersion = null;
-    try {
-      latestVersion = execSync8("npm show adhdev version", {
-        encoding: "utf-8",
-        timeout: 5e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-    } catch {
-      return;
-    }
+    const { execFileSync: execFileSync5 } = await import("child_process");
+    const currentVersion = resolvePackageVersion();
+    const latestVersion = readLatestPublishedCliVersion(execFileSync5);
+    if (!latestVersion) return;
     if (!currentVersion || !latestVersion || currentVersion === latestVersion) return;
     console.log(source_default.yellow(`  Update available: ${currentVersion} \u2192 ${latestVersion}`));
     const { doUpdate } = await (await Promise.resolve().then(() => (init_lib(), lib_exports))).default.prompt([{
@@ -88203,7 +88296,8 @@ async function checkForUpdate() {
     }
     const spinner = (await Promise.resolve().then(() => (init_ora(), ora_exports))).default("Updating adhdev CLI...").start();
     try {
-      execSync8("npm install -g adhdev@latest", {
+      const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: "latest" });
+      execFileSync5(installCommand.command, installCommand.args, {
         encoding: "utf-8",
         timeout: 6e4,
         stdio: ["pipe", "pipe", "pipe"]
@@ -88441,18 +88535,8 @@ async function startDaemonFlow() {
   }
 }
 async function installCliOnly() {
-  const { execSync: execSyncLocal } = await import("child_process");
-  let currentVersion = null;
-  try {
-    const result = execSyncLocal("npm list -g adhdev --json 2>/dev/null || npm list -g adhdev --json 2>nul", {
-      encoding: "utf-8",
-      timeout: 5e3,
-      stdio: ["pipe", "pipe", "pipe"]
-    });
-    const parsed = JSON.parse(result);
-    currentVersion = parsed.dependencies?.adhdev?.version || null;
-  } catch {
-  }
+  const { execFileSync: execFileSyncLocal } = await import("child_process");
+  const currentVersion = readInstalledGlobalCliVersion(execFileSyncLocal);
   const isNpx = process.env.npm_execpath?.includes("npx") || process.argv[1]?.includes("npx") || process.argv[1]?.includes("_npx");
   console.log(source_default.bold("\n\u{1F527} ADHDev CLI\n"));
   console.log(source_default.gray("  The `adhdev` command lets you:"));
@@ -88463,15 +88547,7 @@ async function installCliOnly() {
   console.log();
   if (currentVersion) {
     console.log(source_default.green(`  \u2713 Currently installed: v${currentVersion}`));
-    let latestVersion = null;
-    try {
-      latestVersion = execSyncLocal("npm show adhdev version", {
-        encoding: "utf-8",
-        timeout: 5e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-    } catch {
-    }
+    const latestVersion = readLatestPublishedCliVersion(execFileSyncLocal);
     if (latestVersion && currentVersion === latestVersion) {
       console.log(source_default.gray("  (Already up to date)"));
       return;
@@ -88506,20 +88582,13 @@ async function installCliOnly() {
   }
   const installSpinner = ora2("Installing adhdev CLI...").start();
   try {
-    execSyncLocal("npm install -g adhdev@latest", {
+    const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: "latest" });
+    execFileSyncLocal(installCommand.command, installCommand.args, {
       encoding: "utf-8",
       timeout: 6e4,
       stdio: ["pipe", "pipe", "pipe"]
     });
-    let newVersion = "latest";
-    try {
-      newVersion = execSyncLocal("adhdev --version 2>/dev/null || adhdev --version 2>nul", {
-        encoding: "utf-8",
-        timeout: 5e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-    } catch {
-    }
+    const newVersion = readInstalledGlobalCliVersion(execFileSyncLocal) || "latest";
     installSpinner.succeed(`adhdev CLI ${currentVersion ? "updated" : "installed"} \u2713 (v${newVersion})`);
     console.log(source_default.gray("  Try: adhdev daemon"));
     console.log();
@@ -88543,6 +88612,7 @@ var init_wizard = __esm({
     init_ora();
     init_open();
     init_src();
+    init_version();
     SERVER_URL = process.env.ADHDEV_SERVER_URL || "https://api.adhf.dev";
     LOGO = `
 ${source_default.cyan("\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557")}
@@ -88901,14 +88971,25 @@ var init_supported = __esm({
         "source": "docs/site/data/provider-catalog.mjs"
       },
       "cursor-cli": {
-        "status": "unverified",
-        "testedOn": [],
-        "testedVersions": [],
-        "validatedFlows": [],
-        "lastValidated": null,
-        "notes": "",
-        "evidence": "",
-        "owner": "community",
+        "status": "partial",
+        "testedOn": [
+          "macOS 26.4"
+        ],
+        "testedVersions": [
+          "Cursor 3.0.16",
+          "cursor-agent 2026.04.17-787b533"
+        ],
+        "validatedFlows": [
+          "launch",
+          "send_chat",
+          "read_chat",
+          "resume",
+          "list_models"
+        ],
+        "lastValidated": "2026-04-23",
+        "notes": "Provider root was updated to launch `cursor agent` instead of the obsolete standalone `agent` binary. Fresh launch via ADHDev plus headless send/read, explicit UUID resume, plan mode, and model listing were validated locally after Cursor login. Interactive in-session `/model` switching now has provider controls/scripts but still needs a direct ADHDev live-session validation before this provider can move beyond partial.",
+        "evidence": "Manual local validation with `adhdev launch cursor-cli`, `cursor agent --print`, `cursor agent --resume`, `cursor agent --list-models`, and provider contract tests on 2026-04-23",
+        "owner": "core",
         "source": "docs/site/data/provider-catalog.mjs"
       },
       "gemini-cli": {
@@ -89422,7 +89503,7 @@ var init_supported = __esm({
       "aider-cli": "unverified",
       "claude-cli": "partial",
       "codex-cli": "partial",
-      "cursor-cli": "unverified",
+      "cursor-cli": "partial",
       "gemini-cli": "unverified",
       "github-copilot-cli": "unverified",
       "goose-cli": "unverified",
@@ -91512,9 +91593,9 @@ function registerDaemonCommands(program2, pkgVersion3) {
 // src/cli/doctor-commands.ts
 init_source();
 var import_child_process13 = require("child_process");
-var fs25 = __toESM(require("fs"));
-var os29 = __toESM(require("os"));
-var path31 = __toESM(require("path"));
+var fs26 = __toESM(require("fs"));
+var os30 = __toESM(require("os"));
+var path33 = __toESM(require("path"));
 init_src();
 init_session_host();
 
@@ -91588,6 +91669,27 @@ function evaluateNodeInstallDrift(probe) {
     detail: `node install drift: current runtime ${currentNodeVersion} vs resolved binary ${commandNodeVersion}`
   };
 }
+function evaluateServiceDefinitionDrift(probe) {
+  const serviceLabel = probe.serviceKind === "launchd" ? "launchd" : "startup script";
+  const installed = String(probe.installedDefinition || "").trim();
+  const expected = String(probe.expectedDefinition || "").trim();
+  if (!installed || !expected) {
+    return {
+      ok: true,
+      detail: `${serviceLabel} definition unavailable for comparison (${probe.servicePath})`
+    };
+  }
+  if (installed === expected) {
+    return {
+      ok: true,
+      detail: `${serviceLabel} service definition matches current install (${probe.servicePath})`
+    };
+  }
+  return {
+    ok: false,
+    detail: `outdated service definition (${probe.servicePath})`
+  };
+}
 function buildDoctorAdvice(input) {
   const advice = [];
   if (input.adhdevCheck && !input.adhdevCheck.ok) {
@@ -91602,16 +91704,385 @@ function buildDoctorAdvice(input) {
   if (input.nodeDriftCheck && !input.nodeDriftCheck.ok) {
     advice.push("Align the Node version that launches adhdev with the Node install root that owns the PATH binary (for nvm users: run `nvm use <version>` and reopen the shell).");
   }
+  if (input.serviceCheck && !input.serviceCheck.ok) {
+    advice.push(`Reinstall the background service${input.servicePath ? ` at ${input.servicePath}` : ""} so it points at the current adhdev install. Run: adhdev service install`);
+  }
   return advice;
 }
 
+// src/cli/service-commands.ts
+var import_node_fs6 = __toESM(require("fs"));
+var import_node_path4 = __toESM(require("path"));
+var import_node_os6 = __toESM(require("os"));
+var import_node_child_process6 = require("child_process");
+init_source();
+init_src();
+var DEFAULT_LOCAL_DAEMON_HEALTH_TIMEOUT_MS3 = 1500;
+var LAUNCHD_LABEL = "dev.adhf.daemon";
+var ADHDEV_DIR = import_node_path4.default.join(import_node_os6.default.homedir(), ".adhdev");
+var LOG_OUT = import_node_path4.default.join(ADHDEV_DIR, "daemon-launchd.out");
+var LOG_ERR = import_node_path4.default.join(ADHDEV_DIR, "daemon-launchd.err");
+var MAX_LOG_SIZE2 = 10 * 1024 * 1024;
+function getDarwinPlistPath() {
+  return import_node_path4.default.join(import_node_os6.default.homedir(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
+}
+function getWindowsStartupDir() {
+  const appData = process.env.APPDATA || import_node_path4.default.join(import_node_os6.default.homedir(), "AppData", "Roaming");
+  return import_node_path4.default.join(appData, "Microsoft", "Windows", "Start Menu", "Programs", "Startup");
+}
+function getWindowsVbsPath() {
+  return import_node_path4.default.join(getWindowsStartupDir(), "adhdev-daemon.vbs");
+}
+function resolveCliPath() {
+  return import_node_fs6.default.realpathSync(process.argv[1]);
+}
+function ensureDir(dir) {
+  if (!import_node_fs6.default.existsSync(dir)) import_node_fs6.default.mkdirSync(dir, { recursive: true });
+}
+async function fetchHealth() {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), DEFAULT_LOCAL_DAEMON_HEALTH_TIMEOUT_MS3);
+  try {
+    const res = await fetch(`http://127.0.0.1:${DEFAULT_DAEMON_PORT}/health`, { signal: controller.signal });
+    if (!res.ok) return null;
+    return await res.json();
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function getProcessInfo(pid) {
+  try {
+    if (process.platform === "win32") {
+      const out = (0, import_node_child_process6.execSync)(`tasklist /FI "PID eq ${pid}" /FO CSV /NH`, { encoding: "utf-8" });
+      const match = out.match(/"(\d[\d,]+)\sK"/);
+      const memKB = match ? parseInt(match[1].replace(/,/g, ""), 10) : 0;
+      return { uptime: "-", memMB: Math.round(memKB / 1024) };
+    } else {
+      const out = (0, import_node_child_process6.execSync)(`ps -o etime=,rss= -p ${pid}`, { encoding: "utf-8" }).trim();
+      const parts = out.split(/\s+/);
+      const etime = parts[0] || "-";
+      const rssKB = parseInt(parts[1] || "0", 10);
+      return { uptime: formatElapsed(etime), memMB: Math.round(rssKB / 1024) };
+    }
+  } catch {
+    return null;
+  }
+}
+function formatElapsed(etime) {
+  const parts = etime.replace("-", ":").split(":").map(Number);
+  if (parts.length === 4) return `${parts[0]}d ${parts[1]}h ${parts[2]}m`;
+  if (parts.length === 3) return `${parts[0]}h ${parts[1]}m`;
+  if (parts.length === 2) return `${parts[0]}m ${parts[1]}s`;
+  return etime;
+}
+function rotateLogIfNeeded(logPath) {
+  try {
+    if (!import_node_fs6.default.existsSync(logPath)) return;
+    const stat4 = import_node_fs6.default.statSync(logPath);
+    if (stat4.size > MAX_LOG_SIZE2) {
+      const rotated = logPath + ".old";
+      if (import_node_fs6.default.existsSync(rotated)) import_node_fs6.default.unlinkSync(rotated);
+      import_node_fs6.default.renameSync(logPath, rotated);
+      import_node_fs6.default.writeFileSync(logPath, `[log rotated at ${(/* @__PURE__ */ new Date()).toISOString()}]
+`, "utf-8");
+    }
+  } catch {
+  }
+}
+function rotateLogs() {
+  rotateLogIfNeeded(LOG_OUT);
+  rotateLogIfNeeded(LOG_ERR);
+}
+function buildPlist(nodeExe, cliExe) {
+  const brewPrefix = import_node_fs6.default.existsSync("/opt/homebrew/bin") ? "/opt/homebrew/bin" : "/usr/local/bin";
+  const nodeDir = import_node_path4.default.dirname(nodeExe);
+  const pathEntries = /* @__PURE__ */ new Set([nodeDir, brewPrefix, "/usr/local/bin", "/usr/bin", "/bin", "/usr/sbin", "/sbin"]);
+  const pathValue = Array.from(pathEntries).join(":");
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>${LAUNCHD_LABEL}</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>${nodeExe}</string>
+        <string>${cliExe}</string>
+        <string>daemon</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <dict>
+        <key>SuccessfulExit</key>
+        <false/>
+    </dict>
+    <key>ThrottleInterval</key>
+    <integer>30</integer>
+    <key>StandardOutPath</key>
+    <string>${LOG_OUT}</string>
+    <key>StandardErrorPath</key>
+    <string>${LOG_ERR}</string>
+    <key>EnvironmentVariables</key>
+    <dict>
+        <key>PATH</key>
+        <string>${pathValue}</string>
+    </dict>
+</dict>
+</plist>`;
+}
+function installDarwin(nodeExe, cliExe) {
+  const plistPath = getDarwinPlistPath();
+  ensureDir(ADHDEV_DIR);
+  ensureDir(import_node_path4.default.dirname(plistPath));
+  import_node_fs6.default.writeFileSync(plistPath, buildPlist(nodeExe, cliExe), "utf-8");
+  console.log(source_default.gray(`  Plist: ${plistPath}`));
+  try {
+    (0, import_node_child_process6.execSync)(`launchctl unload "${plistPath}" 2>/dev/null`, { stdio: "ignore" });
+  } catch {
+  }
+  try {
+    (0, import_node_child_process6.execSync)(`launchctl load -w "${plistPath}"`, { stdio: "ignore" });
+    console.log(source_default.green("\n  \u2713 Registered as LaunchAgent \u2014 daemon will start on login."));
+    console.log(source_default.gray(`  Logs: ~/.adhdev/daemon-launchd.{out,err}`));
+  } catch (e) {
+    console.log(source_default.red(`
+  \u2717 launchctl load failed: ${e.message}`));
+  }
+}
+function uninstallDarwin() {
+  const plistPath = getDarwinPlistPath();
+  if (!import_node_fs6.default.existsSync(plistPath)) {
+    console.log(source_default.yellow("\n  \u26A0 Service is not installed."));
+    return;
+  }
+  try {
+    (0, import_node_child_process6.execSync)(`launchctl unload "${plistPath}" 2>/dev/null`, { stdio: "ignore" });
+  } catch {
+  }
+  import_node_fs6.default.unlinkSync(plistPath);
+  console.log(source_default.green("\n  \u2713 Removed LaunchAgent. Daemon will no longer auto-start."));
+}
+function isInstalledDarwin() {
+  return import_node_fs6.default.existsSync(getDarwinPlistPath());
+}
+function buildVbs(nodeExe, cliExe) {
+  const logFile = import_node_path4.default.join(ADHDEV_DIR, "daemon-service.log").replace(/\\/g, "\\\\");
+  const escapedNodeExe = nodeExe.replace(/\\/g, "\\\\");
+  const escapedCliExe = cliExe.replace(/\\/g, "\\\\");
+  return `' ADHDev Daemon Auto-Start (generated by adhdev service install)
+Set WshShell = CreateObject("WScript.Shell")
+WshShell.Run "cmd.exe /c """"${escapedNodeExe}"""" """"${escapedCliExe}"""" daemon >> """"${logFile}"""" 2>&1", 0, False
+`;
+}
+function installWindows(nodeExe, cliExe) {
+  const vbsPath = getWindowsVbsPath();
+  ensureDir(ADHDEV_DIR);
+  ensureDir(import_node_path4.default.dirname(vbsPath));
+  import_node_fs6.default.writeFileSync(vbsPath, buildVbs(nodeExe, cliExe), "utf-8");
+  console.log(source_default.gray(`  Startup script: ${vbsPath}`));
+  console.log(source_default.green("\n  \u2713 Registered in Startup folder \u2014 daemon will start on login (hidden)."));
+  console.log(source_default.gray(`  Logs: ${import_node_path4.default.join(ADHDEV_DIR, "daemon-service.log")}`));
+  console.log(source_default.gray("  To start now without rebooting, run: adhdev daemon"));
+}
+function uninstallWindows() {
+  const vbsPath = getWindowsVbsPath();
+  if (!import_node_fs6.default.existsSync(vbsPath)) {
+    console.log(source_default.yellow("\n  \u26A0 Service is not installed."));
+    return;
+  }
+  import_node_fs6.default.unlinkSync(vbsPath);
+  console.log(source_default.green("\n  \u2713 Removed Startup script. Daemon will no longer auto-start."));
+  console.log(source_default.gray("  Note: a currently running daemon is not affected. Stop with: adhdev daemon:stop"));
+}
+function isInstalledWindows() {
+  return import_node_fs6.default.existsSync(getWindowsVbsPath());
+}
+function registerServiceCommands(program2) {
+  const svc = program2.command("service").description("\u{1F50C} Manage ADHDev as an OS background auto-start service");
+  svc.command("install").description("Register ADHDev daemon to start automatically on login").action(async () => {
+    console.log(source_default.bold("\n  \u{1F680} Installing ADHDev Background Service"));
+    const platform13 = import_node_os6.default.platform();
+    const nodeExe = process.execPath;
+    const cliExe = resolveCliPath();
+    console.log(source_default.gray(`  Node:     ${nodeExe}`));
+    console.log(source_default.gray(`  CLI:      ${cliExe}`));
+    console.log(source_default.gray(`  Platform: ${platform13}`));
+    if (platform13 === "darwin") {
+      installDarwin(nodeExe, cliExe);
+    } else if (platform13 === "win32") {
+      installWindows(nodeExe, cliExe);
+    } else {
+      console.log(source_default.yellow("\n  \u26A0 Auto-start service install is not supported on this platform."));
+      console.log(source_default.gray("  On Linux, create a systemd user unit manually:"));
+      console.log(source_default.gray("    ~/.config/systemd/user/adhdev-daemon.service"));
+    }
+    console.log();
+  });
+  svc.command("uninstall").description("Remove the OS background service").action(async () => {
+    console.log(source_default.bold("\n  \u{1F5D1}\uFE0F  Removing ADHDev Background Service"));
+    const platform13 = import_node_os6.default.platform();
+    if (platform13 === "darwin") {
+      uninstallDarwin();
+    } else if (platform13 === "win32") {
+      uninstallWindows();
+    } else {
+      console.log(source_default.yellow("\n  \u26A0 Not supported on this platform."));
+    }
+    console.log();
+  });
+  svc.command("status").description("Show service installation state and live daemon health").action(async () => {
+    const platform13 = import_node_os6.default.platform();
+    const installed = platform13 === "darwin" ? isInstalledDarwin() : platform13 === "win32" ? isInstalledWindows() : false;
+    if (installed) {
+      console.log(source_default.green("\n  \u2713 Service is installed."));
+      if (platform13 === "darwin") console.log(source_default.gray(`  Plist:  ${getDarwinPlistPath()}`));
+      else console.log(source_default.gray(`  Script: ${getWindowsVbsPath()}`));
+    } else {
+      console.log(source_default.gray("\n  \u2717 Service is not installed. Run: adhdev service install"));
+    }
+    const health = await fetchHealth();
+    if (health?.ok && health.pid) {
+      const info = getProcessInfo(health.pid);
+      if (info) {
+        console.log(source_default.green(`  \u2713 Daemon running \u2014 PID ${health.pid}, uptime ${info.uptime}, ${info.memMB} MB`));
+      } else {
+        console.log(source_default.green(`  \u2713 Daemon running \u2014 PID ${health.pid}`));
+      }
+    } else {
+      console.log(source_default.yellow("  \u2717 Daemon is not running."));
+    }
+    const outSize = import_node_fs6.default.existsSync(LOG_OUT) ? import_node_fs6.default.statSync(LOG_OUT).size : 0;
+    const errSize = import_node_fs6.default.existsSync(LOG_ERR) ? import_node_fs6.default.statSync(LOG_ERR).size : 0;
+    if (outSize > 0 || errSize > 0) {
+      console.log(source_default.gray(`  Logs:   stdout ${formatBytes(outSize)}, stderr ${formatBytes(errSize)}`));
+    }
+    console.log();
+  });
+  svc.command("logs").description("View daemon service logs").option("--err", "Show stderr log instead of stdout").option("--clear", "Truncate all log files").option("-n, --lines <count>", "Number of lines to show", "30").action(async (options) => {
+    if (options.clear) {
+      for (const f of [LOG_OUT, LOG_ERR]) {
+        if (import_node_fs6.default.existsSync(f)) import_node_fs6.default.writeFileSync(f, "", "utf-8");
+      }
+      console.log(source_default.green("\n  \u2713 Logs cleared.\n"));
+      return;
+    }
+    const logFile = options.err ? LOG_ERR : LOG_OUT;
+    if (!import_node_fs6.default.existsSync(logFile)) {
+      console.log(source_default.gray(`
+  No log file found: ${logFile}
+`));
+      return;
+    }
+    const lines = parseInt(options.lines, 10) || 30;
+    console.log(source_default.gray(`
+  \u2500\u2500 ${options.err ? "stderr" : "stdout"}: ${logFile} (last ${lines} lines) \u2500\u2500
+`));
+    const content = import_node_fs6.default.readFileSync(logFile, "utf-8");
+    const allLines = content.split("\n");
+    const lastLines = allLines.slice(-lines).join("\n");
+    if (lastLines.trim()) console.log(lastLines);
+    console.log(source_default.gray("\n  (watching for new output, Ctrl+C to stop)\n"));
+    let offset = Buffer.byteLength(content, "utf-8");
+    const watcher = import_node_fs6.default.watchFile(logFile, { interval: 500 }, () => {
+      try {
+        const stat4 = import_node_fs6.default.statSync(logFile);
+        if (stat4.size > offset) {
+          const fd = import_node_fs6.default.openSync(logFile, "r");
+          const buf = Buffer.alloc(stat4.size - offset);
+          import_node_fs6.default.readSync(fd, buf, 0, buf.length, offset);
+          import_node_fs6.default.closeSync(fd);
+          process.stdout.write(buf.toString("utf-8"));
+          offset = stat4.size;
+        } else if (stat4.size < offset) {
+          offset = 0;
+        }
+      } catch {
+      }
+    });
+    const cleanup = () => {
+      import_node_fs6.default.unwatchFile(logFile);
+      process.exit(0);
+    };
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
+  });
+  svc.command("restart").description("Restart the daemon process (service will auto-relaunch)").action(async () => {
+    const platform13 = import_node_os6.default.platform();
+    const installed = platform13 === "darwin" ? isInstalledDarwin() : platform13 === "win32" ? isInstalledWindows() : false;
+    if (!installed) {
+      console.log(source_default.yellow("\n  \u26A0 Service is not installed. Use `adhdev daemon:restart` for manual restart."));
+      console.log(source_default.gray("  Or install the service first: adhdev service install\n"));
+      return;
+    }
+    rotateLogs();
+    const health = await fetchHealth();
+    if (!health?.pid) {
+      console.log(source_default.yellow("\n  \u26A0 Daemon is not currently running."));
+      if (platform13 === "darwin") {
+        console.log(source_default.gray("  Starting via launchctl..."));
+        try {
+          (0, import_node_child_process6.execSync)(`launchctl start ${LAUNCHD_LABEL}`, { stdio: "ignore" });
+          console.log(source_default.green("  \u2713 Started.\n"));
+        } catch {
+          console.log(source_default.red("  \u2717 Failed to start. Check: adhdev service logs --err\n"));
+        }
+      } else {
+        console.log(source_default.gray("  Start with: adhdev daemon\n"));
+      }
+      return;
+    }
+    console.log(source_default.cyan(`
+  Stopping daemon (PID ${health.pid})...`));
+    try {
+      process.kill(health.pid, "SIGTERM");
+    } catch {
+      console.log(source_default.yellow("  Could not send SIGTERM. Process may have already exited."));
+    }
+    await new Promise((r) => setTimeout(r, 2e3));
+    if (platform13 === "win32") {
+      const vbsPath = getWindowsVbsPath();
+      if (import_node_fs6.default.existsSync(vbsPath)) {
+        try {
+          (0, import_node_child_process6.execSync)(`wscript.exe "${vbsPath}"`, { stdio: "ignore", windowsHide: true });
+        } catch {
+        }
+      }
+    }
+    let restarted = false;
+    for (let i = 0; i < 8; i++) {
+      await new Promise((r) => setTimeout(r, 1e3));
+      const newHealth = await fetchHealth();
+      if (newHealth?.ok && newHealth.pid !== health.pid) {
+        restarted = true;
+        const info = getProcessInfo(newHealth.pid);
+        console.log(source_default.green(`  \u2713 Daemon restarted \u2014 new PID ${newHealth.pid}${info ? `, ${info.memMB} MB` : ""}`));
+        break;
+      }
+    }
+    if (!restarted) {
+      console.log(source_default.yellow("  \u26A0 Daemon did not restart within 10s."));
+      console.log(source_default.gray("  Check: adhdev service logs --err"));
+    }
+    console.log();
+  });
+}
+function formatBytes(bytes) {
+  if (bytes === 0) return "0 B";
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+}
+
 // src/cli/doctor-commands.ts
 function resolvePackageRoot() {
-  return path31.resolve(__dirname, "..", "..");
+  return path33.resolve(__dirname, "..", "..");
 }
 function isLinkedInstall(packageRoot) {
-  const normalized = path31.normalize(packageRoot);
-  return !normalized.includes(`${path31.sep}node_modules${path31.sep}adhdev`);
+  const normalized = path33.normalize(packageRoot);
+  return !normalized.includes(`${path33.sep}node_modules${path33.sep}adhdev`);
 }
 function formatCheck(check2) {
   const icon = check2.ok ? source_default.green("\u2713") : source_default.red("\u2717");
@@ -91695,11 +92166,11 @@ function probeSharpRuntime(packageRoot, nativeSharpPackage) {
   }
 }
 function probeConfigAccess() {
-  const configDir = path31.join(os29.homedir(), ".adhdev");
-  const configPath = path31.join(configDir, "config.json");
+  const configDir = path33.join(os30.homedir(), ".adhdev");
+  const configPath = path33.join(configDir, "config.json");
   const checks = [];
   try {
-    fs25.mkdirSync(configDir, { recursive: true });
+    fs26.mkdirSync(configDir, { recursive: true });
     checks.push({
       label: "Config directory",
       ok: true,
@@ -91714,8 +92185,8 @@ function probeConfigAccess() {
     }];
   }
   try {
-    if (fs25.existsSync(configPath)) {
-      fs25.readFileSync(configPath, "utf-8");
+    if (fs26.existsSync(configPath)) {
+      fs26.readFileSync(configPath, "utf-8");
       checks.push({
         label: "Config file",
         ok: true,
@@ -91736,10 +92207,10 @@ function probeConfigAccess() {
       fatal: true
     });
   }
-  const probePath = path31.join(configDir, `.doctor-write-${process.pid}-${Date.now()}.tmp`);
+  const probePath = path33.join(configDir, `.doctor-write-${process.pid}-${Date.now()}.tmp`);
   try {
-    fs25.writeFileSync(probePath, "ok", "utf-8");
-    fs25.rmSync(probePath, { force: true });
+    fs26.writeFileSync(probePath, "ok", "utf-8");
+    fs26.rmSync(probePath, { force: true });
     checks.push({
       label: "Config write",
       ok: true,
@@ -91747,7 +92218,7 @@ function probeConfigAccess() {
     });
   } catch (error48) {
     try {
-      fs25.rmSync(probePath, { force: true });
+      fs26.rmSync(probePath, { force: true });
     } catch {
     }
     checks.push({
@@ -91803,9 +92274,9 @@ function probeCliBinary(commandPath, currentVersion) {
   return probe;
 }
 function readLogHints(logPath) {
-  if (!fs25.existsSync(logPath)) return [];
+  if (!fs26.existsSync(logPath)) return [];
   try {
-    const content = fs25.readFileSync(logPath, "utf-8");
+    const content = fs26.readFileSync(logPath, "utf-8");
     const lines = content.split(/\r?\n/);
     const recent = lines.slice(-400);
     const hits = recent.filter(
@@ -91819,11 +92290,11 @@ function readLogHints(logPath) {
 function buildBrowseProbeChecks() {
   const probes = process.platform === "win32" ? [
     process.env.SystemDrive ? `${process.env.SystemDrive.replace(/[\\/]+$/, "")}\\` : "C:\\",
-    os29.homedir()
-  ] : ["/", os29.homedir()];
+    os30.homedir()
+  ] : ["/", os30.homedir()];
   return probes.map((probePath, index) => {
     try {
-      const entries = fs25.readdirSync(probePath, { withFileTypes: true });
+      const entries = fs26.readdirSync(probePath, { withFileTypes: true });
       const directoryCount = entries.filter((entry) => entry.isDirectory()).length;
       return {
         label: index === 0 ? "Folder browse root" : "Folder browse home",
@@ -91843,7 +92314,7 @@ function buildBrowseProbeChecks() {
 function registerDoctorCommands(program2, pkgVersion3) {
   program2.command("doctor").description("Diagnose install, native dependencies, CLI resolution, and folder browse access").action(async () => {
     const packageRoot = resolvePackageRoot();
-    const cliPath = fs25.realpathSync(process.argv[1]);
+    const cliPath = fs26.realpathSync(process.argv[1]);
     const linked = isLinkedInstall(packageRoot);
     const logPath = getCurrentDaemonLogPath();
     const claudePaths = findCommandPaths("claude");
@@ -91891,6 +92362,8 @@ function registerDoctorCommands(program2, pkgVersion3) {
     let runtimeSurfaceCheck = null;
     let nodeDriftCheck = null;
     let adhmuxHelpCheck = null;
+    let serviceDefinitionCheck = null;
+    let serviceDefinitionPath;
     if (adhdevPaths.length > 0) {
       const runtimeSurfaceProbe = probeCliBinary(adhdevPaths[0], pkgVersion3);
       runtimeSurfaceCheck = evaluateCliDriftCheck(runtimeSurfaceProbe);
@@ -91922,6 +92395,22 @@ function registerDoctorCommands(program2, pkgVersion3) {
         detail: adhmuxHelpCheck.detail
       });
     }
+    if (process.platform === "darwin") {
+      serviceDefinitionPath = path33.join(os30.homedir(), "Library", "LaunchAgents", "dev.adhf.daemon.plist");
+      if (fs26.existsSync(serviceDefinitionPath)) {
+        serviceDefinitionCheck = evaluateServiceDefinitionDrift({
+          serviceKind: "launchd",
+          servicePath: serviceDefinitionPath,
+          installedDefinition: fs26.readFileSync(serviceDefinitionPath, "utf8"),
+          expectedDefinition: buildPlist(process.execPath, cliPath)
+        });
+        checks.push({
+          label: "Service definition",
+          ok: serviceDefinitionCheck.ok,
+          detail: serviceDefinitionCheck.detail
+        });
+      }
+    }
     try {
       const sessionHostPid = getSessionHostPid();
       const probe = await probeSessionHostStatus();
@@ -91976,14 +92465,16 @@ function registerDoctorCommands(program2, pkgVersion3) {
       adhmuxPath: adhmuxPaths[0],
       adhmuxCheck: adhmuxHelpCheck || void 0,
       nodeDriftCheck: nodeDriftCheck || void 0,
+      servicePath: serviceDefinitionPath,
+      serviceCheck: serviceDefinitionCheck || void 0,
       sourceCliExample: "node --import tsx packages/daemon-cloud/src/cli/index.ts doctor"
     });
-    const sessionHostLogPath = path31.join(os29.homedir(), ".adhdev", "logs", "session-host.log");
+    const sessionHostLogPath = path33.join(os30.homedir(), ".adhdev", "logs", "session-host.log");
     console.log(source_default.bold("\n\u{1FA7A} ADHDev Doctor\n"));
     console.log(source_default.gray(`  Version:   ${pkgVersion3}`));
     console.log(source_default.gray(`  Platform:  ${process.platform} ${process.arch}`));
     console.log(source_default.gray(`  Node:      ${process.version}`));
-    console.log(source_default.gray(`  Home:      ${os29.homedir()}`));
+    console.log(source_default.gray(`  Home:      ${os30.homedir()}`));
     console.log(source_default.gray(`  Log file:  ${logPath}`));
     console.log(source_default.gray(`  SH log:    ${sessionHostLogPath}`));
     console.log();
@@ -92020,7 +92511,7 @@ function registerDoctorCommands(program2, pkgVersion3) {
 
 // src/cli/provider-commands.ts
 init_source();
-var path33 = __toESM(require("path"));
+var path34 = __toESM(require("path"));
 init_cdp_utils();
 var DEV_SERVER_PORT3 = 19280;
 var IDE_AUTO_FIX_FUNCTIONS = [
@@ -92184,7 +92675,7 @@ function getProviderSourceCandidatePaths(options) {
   const results = [];
   for (const root of roots) {
     for (const name of relativeNames) {
-      results.push(path33.join(root, options.category, options.type, name));
+      results.push(path34.join(root, options.category, options.type, name));
     }
   }
   return results;
@@ -93153,372 +93644,6 @@ function registerCdpCommands(program2) {
   });
 }
 
-// src/cli/service-commands.ts
-var import_node_fs6 = __toESM(require("fs"));
-var import_node_path4 = __toESM(require("path"));
-var import_node_os6 = __toESM(require("os"));
-var import_node_child_process6 = require("child_process");
-init_source();
-init_src();
-var DEFAULT_LOCAL_DAEMON_HEALTH_TIMEOUT_MS3 = 1500;
-var LAUNCHD_LABEL = "dev.adhf.daemon";
-var ADHDEV_DIR = import_node_path4.default.join(import_node_os6.default.homedir(), ".adhdev");
-var LOG_OUT = import_node_path4.default.join(ADHDEV_DIR, "daemon-launchd.out");
-var LOG_ERR = import_node_path4.default.join(ADHDEV_DIR, "daemon-launchd.err");
-var MAX_LOG_SIZE2 = 10 * 1024 * 1024;
-function getDarwinPlistPath() {
-  return import_node_path4.default.join(import_node_os6.default.homedir(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
-}
-function getWindowsStartupDir() {
-  const appData = process.env.APPDATA || import_node_path4.default.join(import_node_os6.default.homedir(), "AppData", "Roaming");
-  return import_node_path4.default.join(appData, "Microsoft", "Windows", "Start Menu", "Programs", "Startup");
-}
-function getWindowsVbsPath() {
-  return import_node_path4.default.join(getWindowsStartupDir(), "adhdev-daemon.vbs");
-}
-function resolveCliPath() {
-  return import_node_fs6.default.realpathSync(process.argv[1]);
-}
-function ensureDir(dir) {
-  if (!import_node_fs6.default.existsSync(dir)) import_node_fs6.default.mkdirSync(dir, { recursive: true });
-}
-async function fetchHealth() {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), DEFAULT_LOCAL_DAEMON_HEALTH_TIMEOUT_MS3);
-  try {
-    const res = await fetch(`http://127.0.0.1:${DEFAULT_DAEMON_PORT}/health`, { signal: controller.signal });
-    if (!res.ok) return null;
-    return await res.json();
-  } catch {
-    return null;
-  } finally {
-    clearTimeout(timer);
-  }
-}
-function getProcessInfo(pid) {
-  try {
-    if (process.platform === "win32") {
-      const out = (0, import_node_child_process6.execSync)(`tasklist /FI "PID eq ${pid}" /FO CSV /NH`, { encoding: "utf-8" });
-      const match = out.match(/"(\d[\d,]+)\sK"/);
-      const memKB = match ? parseInt(match[1].replace(/,/g, ""), 10) : 0;
-      return { uptime: "-", memMB: Math.round(memKB / 1024) };
-    } else {
-      const out = (0, import_node_child_process6.execSync)(`ps -o etime=,rss= -p ${pid}`, { encoding: "utf-8" }).trim();
-      const parts = out.split(/\s+/);
-      const etime = parts[0] || "-";
-      const rssKB = parseInt(parts[1] || "0", 10);
-      return { uptime: formatElapsed(etime), memMB: Math.round(rssKB / 1024) };
-    }
-  } catch {
-    return null;
-  }
-}
-function formatElapsed(etime) {
-  const parts = etime.replace("-", ":").split(":").map(Number);
-  if (parts.length === 4) return `${parts[0]}d ${parts[1]}h ${parts[2]}m`;
-  if (parts.length === 3) return `${parts[0]}h ${parts[1]}m`;
-  if (parts.length === 2) return `${parts[0]}m ${parts[1]}s`;
-  return etime;
-}
-function rotateLogIfNeeded(logPath) {
-  try {
-    if (!import_node_fs6.default.existsSync(logPath)) return;
-    const stat4 = import_node_fs6.default.statSync(logPath);
-    if (stat4.size > MAX_LOG_SIZE2) {
-      const rotated = logPath + ".old";
-      if (import_node_fs6.default.existsSync(rotated)) import_node_fs6.default.unlinkSync(rotated);
-      import_node_fs6.default.renameSync(logPath, rotated);
-      import_node_fs6.default.writeFileSync(logPath, `[log rotated at ${(/* @__PURE__ */ new Date()).toISOString()}]
-`, "utf-8");
-    }
-  } catch {
-  }
-}
-function rotateLogs() {
-  rotateLogIfNeeded(LOG_OUT);
-  rotateLogIfNeeded(LOG_ERR);
-}
-function buildPlist(nodeExe, cliExe) {
-  const brewPrefix = import_node_fs6.default.existsSync("/opt/homebrew/bin") ? "/opt/homebrew/bin" : "/usr/local/bin";
-  const nodeDir = import_node_path4.default.dirname(nodeExe);
-  const pathEntries = /* @__PURE__ */ new Set([nodeDir, brewPrefix, "/usr/local/bin", "/usr/bin", "/bin", "/usr/sbin", "/sbin"]);
-  const pathValue = [...pathEntries].join(":");
-  return `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>Label</key>
-    <string>${LAUNCHD_LABEL}</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>${nodeExe}</string>
-        <string>${cliExe}</string>
-        <string>daemon</string>
-    </array>
-    <key>RunAtLoad</key>
-    <true/>
-    <key>KeepAlive</key>
-    <dict>
-        <key>SuccessfulExit</key>
-        <false/>
-    </dict>
-    <key>ThrottleInterval</key>
-    <integer>30</integer>
-    <key>StandardOutPath</key>
-    <string>${LOG_OUT}</string>
-    <key>StandardErrorPath</key>
-    <string>${LOG_ERR}</string>
-    <key>EnvironmentVariables</key>
-    <dict>
-        <key>PATH</key>
-        <string>${pathValue}</string>
-    </dict>
-</dict>
-</plist>`;
-}
-function installDarwin(nodeExe, cliExe) {
-  const plistPath = getDarwinPlistPath();
-  ensureDir(ADHDEV_DIR);
-  ensureDir(import_node_path4.default.dirname(plistPath));
-  import_node_fs6.default.writeFileSync(plistPath, buildPlist(nodeExe, cliExe), "utf-8");
-  console.log(source_default.gray(`  Plist: ${plistPath}`));
-  try {
-    (0, import_node_child_process6.execSync)(`launchctl unload "${plistPath}" 2>/dev/null`, { stdio: "ignore" });
-  } catch {
-  }
-  try {
-    (0, import_node_child_process6.execSync)(`launchctl load -w "${plistPath}"`, { stdio: "ignore" });
-    console.log(source_default.green("\n  \u2713 Registered as LaunchAgent \u2014 daemon will start on login."));
-    console.log(source_default.gray(`  Logs: ~/.adhdev/daemon-launchd.{out,err}`));
-  } catch (e) {
-    console.log(source_default.red(`
-  \u2717 launchctl load failed: ${e.message}`));
-  }
-}
-function uninstallDarwin() {
-  const plistPath = getDarwinPlistPath();
-  if (!import_node_fs6.default.existsSync(plistPath)) {
-    console.log(source_default.yellow("\n  \u26A0 Service is not installed."));
-    return;
-  }
-  try {
-    (0, import_node_child_process6.execSync)(`launchctl unload "${plistPath}" 2>/dev/null`, { stdio: "ignore" });
-  } catch {
-  }
-  import_node_fs6.default.unlinkSync(plistPath);
-  console.log(source_default.green("\n  \u2713 Removed LaunchAgent. Daemon will no longer auto-start."));
-}
-function isInstalledDarwin() {
-  return import_node_fs6.default.existsSync(getDarwinPlistPath());
-}
-function buildVbs(nodeExe, cliExe) {
-  const logFile = import_node_path4.default.join(ADHDEV_DIR, "daemon-service.log").replace(/\\/g, "\\\\");
-  const escapedNodeExe = nodeExe.replace(/\\/g, "\\\\");
-  const escapedCliExe = cliExe.replace(/\\/g, "\\\\");
-  return `' ADHDev Daemon Auto-Start (generated by adhdev service install)
-Set WshShell = CreateObject("WScript.Shell")
-WshShell.Run "cmd.exe /c """"${escapedNodeExe}"""" """"${escapedCliExe}"""" daemon >> """"${logFile}"""" 2>&1", 0, False
-`;
-}
-function installWindows(nodeExe, cliExe) {
-  const vbsPath = getWindowsVbsPath();
-  ensureDir(ADHDEV_DIR);
-  ensureDir(import_node_path4.default.dirname(vbsPath));
-  import_node_fs6.default.writeFileSync(vbsPath, buildVbs(nodeExe, cliExe), "utf-8");
-  console.log(source_default.gray(`  Startup script: ${vbsPath}`));
-  console.log(source_default.green("\n  \u2713 Registered in Startup folder \u2014 daemon will start on login (hidden)."));
-  console.log(source_default.gray(`  Logs: ${import_node_path4.default.join(ADHDEV_DIR, "daemon-service.log")}`));
-  console.log(source_default.gray("  To start now without rebooting, run: adhdev daemon"));
-}
-function uninstallWindows() {
-  const vbsPath = getWindowsVbsPath();
-  if (!import_node_fs6.default.existsSync(vbsPath)) {
-    console.log(source_default.yellow("\n  \u26A0 Service is not installed."));
-    return;
-  }
-  import_node_fs6.default.unlinkSync(vbsPath);
-  console.log(source_default.green("\n  \u2713 Removed Startup script. Daemon will no longer auto-start."));
-  console.log(source_default.gray("  Note: a currently running daemon is not affected. Stop with: adhdev daemon:stop"));
-}
-function isInstalledWindows() {
-  return import_node_fs6.default.existsSync(getWindowsVbsPath());
-}
-function registerServiceCommands(program2) {
-  const svc = program2.command("service").description("\u{1F50C} Manage ADHDev as an OS background auto-start service");
-  svc.command("install").description("Register ADHDev daemon to start automatically on login").action(async () => {
-    console.log(source_default.bold("\n  \u{1F680} Installing ADHDev Background Service"));
-    const platform13 = import_node_os6.default.platform();
-    const nodeExe = process.execPath;
-    const cliExe = resolveCliPath();
-    console.log(source_default.gray(`  Node:     ${nodeExe}`));
-    console.log(source_default.gray(`  CLI:      ${cliExe}`));
-    console.log(source_default.gray(`  Platform: ${platform13}`));
-    if (platform13 === "darwin") {
-      installDarwin(nodeExe, cliExe);
-    } else if (platform13 === "win32") {
-      installWindows(nodeExe, cliExe);
-    } else {
-      console.log(source_default.yellow("\n  \u26A0 Auto-start service install is not supported on this platform."));
-      console.log(source_default.gray("  On Linux, create a systemd user unit manually:"));
-      console.log(source_default.gray("    ~/.config/systemd/user/adhdev-daemon.service"));
-    }
-    console.log();
-  });
-  svc.command("uninstall").description("Remove the OS background service").action(async () => {
-    console.log(source_default.bold("\n  \u{1F5D1}\uFE0F  Removing ADHDev Background Service"));
-    const platform13 = import_node_os6.default.platform();
-    if (platform13 === "darwin") {
-      uninstallDarwin();
-    } else if (platform13 === "win32") {
-      uninstallWindows();
-    } else {
-      console.log(source_default.yellow("\n  \u26A0 Not supported on this platform."));
-    }
-    console.log();
-  });
-  svc.command("status").description("Show service installation state and live daemon health").action(async () => {
-    const platform13 = import_node_os6.default.platform();
-    const installed = platform13 === "darwin" ? isInstalledDarwin() : platform13 === "win32" ? isInstalledWindows() : false;
-    if (installed) {
-      console.log(source_default.green("\n  \u2713 Service is installed."));
-      if (platform13 === "darwin") console.log(source_default.gray(`  Plist:  ${getDarwinPlistPath()}`));
-      else console.log(source_default.gray(`  Script: ${getWindowsVbsPath()}`));
-    } else {
-      console.log(source_default.gray("\n  \u2717 Service is not installed. Run: adhdev service install"));
-    }
-    const health = await fetchHealth();
-    if (health?.ok && health.pid) {
-      const info = getProcessInfo(health.pid);
-      if (info) {
-        console.log(source_default.green(`  \u2713 Daemon running \u2014 PID ${health.pid}, uptime ${info.uptime}, ${info.memMB} MB`));
-      } else {
-        console.log(source_default.green(`  \u2713 Daemon running \u2014 PID ${health.pid}`));
-      }
-    } else {
-      console.log(source_default.yellow("  \u2717 Daemon is not running."));
-    }
-    const outSize = import_node_fs6.default.existsSync(LOG_OUT) ? import_node_fs6.default.statSync(LOG_OUT).size : 0;
-    const errSize = import_node_fs6.default.existsSync(LOG_ERR) ? import_node_fs6.default.statSync(LOG_ERR).size : 0;
-    if (outSize > 0 || errSize > 0) {
-      console.log(source_default.gray(`  Logs:   stdout ${formatBytes(outSize)}, stderr ${formatBytes(errSize)}`));
-    }
-    console.log();
-  });
-  svc.command("logs").description("View daemon service logs").option("--err", "Show stderr log instead of stdout").option("--clear", "Truncate all log files").option("-n, --lines <count>", "Number of lines to show", "30").action(async (options) => {
-    if (options.clear) {
-      for (const f of [LOG_OUT, LOG_ERR]) {
-        if (import_node_fs6.default.existsSync(f)) import_node_fs6.default.writeFileSync(f, "", "utf-8");
-      }
-      console.log(source_default.green("\n  \u2713 Logs cleared.\n"));
-      return;
-    }
-    const logFile = options.err ? LOG_ERR : LOG_OUT;
-    if (!import_node_fs6.default.existsSync(logFile)) {
-      console.log(source_default.gray(`
-  No log file found: ${logFile}
-`));
-      return;
-    }
-    const lines = parseInt(options.lines, 10) || 30;
-    console.log(source_default.gray(`
-  \u2500\u2500 ${options.err ? "stderr" : "stdout"}: ${logFile} (last ${lines} lines) \u2500\u2500
-`));
-    const content = import_node_fs6.default.readFileSync(logFile, "utf-8");
-    const allLines = content.split("\n");
-    const lastLines = allLines.slice(-lines).join("\n");
-    if (lastLines.trim()) console.log(lastLines);
-    console.log(source_default.gray("\n  (watching for new output, Ctrl+C to stop)\n"));
-    let offset = Buffer.byteLength(content, "utf-8");
-    const watcher = import_node_fs6.default.watchFile(logFile, { interval: 500 }, () => {
-      try {
-        const stat4 = import_node_fs6.default.statSync(logFile);
-        if (stat4.size > offset) {
-          const fd = import_node_fs6.default.openSync(logFile, "r");
-          const buf = Buffer.alloc(stat4.size - offset);
-          import_node_fs6.default.readSync(fd, buf, 0, buf.length, offset);
-          import_node_fs6.default.closeSync(fd);
-          process.stdout.write(buf.toString("utf-8"));
-          offset = stat4.size;
-        } else if (stat4.size < offset) {
-          offset = 0;
-        }
-      } catch {
-      }
-    });
-    const cleanup = () => {
-      import_node_fs6.default.unwatchFile(logFile);
-      process.exit(0);
-    };
-    process.on("SIGINT", cleanup);
-    process.on("SIGTERM", cleanup);
-  });
-  svc.command("restart").description("Restart the daemon process (service will auto-relaunch)").action(async () => {
-    const platform13 = import_node_os6.default.platform();
-    const installed = platform13 === "darwin" ? isInstalledDarwin() : platform13 === "win32" ? isInstalledWindows() : false;
-    if (!installed) {
-      console.log(source_default.yellow("\n  \u26A0 Service is not installed. Use `adhdev daemon:restart` for manual restart."));
-      console.log(source_default.gray("  Or install the service first: adhdev service install\n"));
-      return;
-    }
-    rotateLogs();
-    const health = await fetchHealth();
-    if (!health?.pid) {
-      console.log(source_default.yellow("\n  \u26A0 Daemon is not currently running."));
-      if (platform13 === "darwin") {
-        console.log(source_default.gray("  Starting via launchctl..."));
-        try {
-          (0, import_node_child_process6.execSync)(`launchctl start ${LAUNCHD_LABEL}`, { stdio: "ignore" });
-          console.log(source_default.green("  \u2713 Started.\n"));
-        } catch {
-          console.log(source_default.red("  \u2717 Failed to start. Check: adhdev service logs --err\n"));
-        }
-      } else {
-        console.log(source_default.gray("  Start with: adhdev daemon\n"));
-      }
-      return;
-    }
-    console.log(source_default.cyan(`
-  Stopping daemon (PID ${health.pid})...`));
-    try {
-      process.kill(health.pid, "SIGTERM");
-    } catch {
-      console.log(source_default.yellow("  Could not send SIGTERM. Process may have already exited."));
-    }
-    await new Promise((r) => setTimeout(r, 2e3));
-    if (platform13 === "win32") {
-      const vbsPath = getWindowsVbsPath();
-      if (import_node_fs6.default.existsSync(vbsPath)) {
-        try {
-          (0, import_node_child_process6.execSync)(`wscript.exe "${vbsPath}"`, { stdio: "ignore", windowsHide: true });
-        } catch {
-        }
-      }
-    }
-    let restarted = false;
-    for (let i = 0; i < 8; i++) {
-      await new Promise((r) => setTimeout(r, 1e3));
-      const newHealth = await fetchHealth();
-      if (newHealth?.ok && newHealth.pid !== health.pid) {
-        restarted = true;
-        const info = getProcessInfo(newHealth.pid);
-        console.log(source_default.green(`  \u2713 Daemon restarted \u2014 new PID ${newHealth.pid}${info ? `, ${info.memMB} MB` : ""}`));
-        break;
-      }
-    }
-    if (!restarted) {
-      console.log(source_default.yellow("  \u26A0 Daemon did not restart within 10s."));
-      console.log(source_default.gray("  Check: adhdev service logs --err"));
-    }
-    console.log();
-  });
-}
-function formatBytes(bytes) {
-  if (bytes === 0) return "0 B";
-  if (bytes < 1024) return `${bytes} B`;
-  if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
-  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
-}
-
 // src/cli/index.ts
 init_version();
 var pkgVersion2 = resolvePackageVersion();