adhdev 0.9.2 → 0.9.5

package/dist/cli/index.js

@@ -1249,35 +1249,6 @@ var init_saved_sessions = __esm({
   }
 });
 
-// ../../oss/packages/daemon-core/src/providers/provider-session-id.ts
-function normalizeProviderSessionId(providerType, providerSessionId) {
-  const normalizedProviderType = typeof providerType === "string" ? providerType.trim() : "";
-  const normalizedId = typeof providerSessionId === "string" ? providerSessionId.trim() : "";
-  if (!normalizedId) return "";
-  const lowered = normalizedId.toLowerCase();
-  if (lowered === "undefined" || lowered === "null") return "";
-  if (normalizedProviderType === "hermes-cli" && !HERMES_SESSION_ID_RE.test(normalizedId)) {
-    return "";
-  }
-  if (normalizedProviderType === "claude-cli" && !CLAUDE_SESSION_ID_RE.test(normalizedId)) {
-    return "";
-  }
-  return normalizedId;
-}
-function isLegacyVolatileSessionReadKey(key) {
-  const normalizedKey = typeof key === "string" ? key.trim() : "";
-  if (!normalizedKey) return false;
-  return normalizedKey.startsWith("provider:codex:vscode-webview://");
-}
-var HERMES_SESSION_ID_RE, CLAUDE_SESSION_ID_RE;
-var init_provider_session_id = __esm({
-  "../../oss/packages/daemon-core/src/providers/provider-session-id.ts"() {
-    "use strict";
-    HERMES_SESSION_ID_RE = /^\d{8}_\d{6}_[a-z0-9]+$/i;
-    CLAUDE_SESSION_ID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-  }
-});
-
 // ../../oss/packages/daemon-core/src/config/state-store.ts
 function isPlainObject2(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
@@ -1289,31 +1260,24 @@ function normalizeState(raw) {
   const parsed = isPlainObject2(raw) ? raw : {};
   const recentActivity = (Array.isArray(parsed.recentActivity) ? parsed.recentActivity : []).filter((entry) => {
     if (!isPlainObject2(entry)) return false;
-    const normalizedId = normalizeProviderSessionId(
-      typeof entry.providerType === "string" ? entry.providerType : "",
-      typeof entry.providerSessionId === "string" ? entry.providerSessionId : ""
-    );
-    if (typeof entry.providerSessionId === "string" && !normalizedId) return false;
+    if (typeof entry.providerSessionId === "string" && !entry.providerSessionId.trim()) return false;
     return true;
   });
   const savedProviderSessions = (Array.isArray(parsed.savedProviderSessions) ? parsed.savedProviderSessions : []).filter((entry) => {
     if (!isPlainObject2(entry)) return false;
-    return !!normalizeProviderSessionId(
-      typeof entry.providerType === "string" ? entry.providerType : "",
-      typeof entry.providerSessionId === "string" ? entry.providerSessionId : ""
-    );
+    return typeof entry.providerSessionId === "string" && !!entry.providerSessionId.trim();
   });
   const sessionReads = Object.fromEntries(
-    Object.entries(isPlainObject2(parsed.sessionReads) ? parsed.sessionReads : {}).filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === "number" && Number.isFinite(value))
+    Object.entries(isPlainObject2(parsed.sessionReads) ? parsed.sessionReads : {}).filter(([, value]) => typeof value === "number" && Number.isFinite(value))
   );
   const sessionReadMarkers = Object.fromEntries(
-    Object.entries(isPlainObject2(parsed.sessionReadMarkers) ? parsed.sessionReadMarkers : {}).filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === "string")
+    Object.entries(isPlainObject2(parsed.sessionReadMarkers) ? parsed.sessionReadMarkers : {}).filter(([, value]) => typeof value === "string")
   );
   const sessionNotificationDismissals = Object.fromEntries(
-    Object.entries(isPlainObject2(parsed.sessionNotificationDismissals) ? parsed.sessionNotificationDismissals : {}).filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === "string" && value.length > 0)
+    Object.entries(isPlainObject2(parsed.sessionNotificationDismissals) ? parsed.sessionNotificationDismissals : {}).filter(([, value]) => typeof value === "string" && value.length > 0)
   );
   const sessionNotificationUnreadOverrides = Object.fromEntries(
-    Object.entries(isPlainObject2(parsed.sessionNotificationUnreadOverrides) ? parsed.sessionNotificationUnreadOverrides : {}).filter(([key, value]) => !isLegacyVolatileSessionReadKey(key) && typeof value === "string" && value.length > 0)
+    Object.entries(isPlainObject2(parsed.sessionNotificationUnreadOverrides) ? parsed.sessionNotificationUnreadOverrides : {}).filter(([, value]) => typeof value === "string" && value.length > 0)
   );
   return {
     recentActivity,
@@ -1351,7 +1315,6 @@ var init_state_store = __esm({
     import_fs2 = require("fs");
     import_path2 = require("path");
     init_config();
-    init_provider_session_id();
     DEFAULT_STATE = {
       recentActivity: [],
       savedProviderSessions: [],
@@ -1433,8 +1396,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}`,
@@ -4046,12 +4009,21 @@ var init_control_effects = __esm({
 function normalizeHistoryComparable(text) {
   return String(text || "").replace(/\s+/g, " ").trim();
 }
-function cleanupHistoryContent(agentType, role, content) {
+function cleanupHistoryContent(agentType, role, content, historyBehavior) {
   let value = String(content || "").replace(/\r\n/g, "\n").trim();
   if (!value) return "";
-  if (agentType === "codex-cli" && role === "assistant") {
-    const filtered = value.split("\n").filter((line) => !CODEX_STARTER_PROMPT_RE.test(line.trim())).join("\n").replace(/\n{3,}/g, "\n\n").trim();
-    value = filtered;
+  if (role === "assistant" && historyBehavior?.filterAssistantPatterns?.length) {
+    const filters = historyBehavior.filterAssistantPatterns.map((p) => {
+      try {
+        return new RegExp(p, "i");
+      } catch {
+        return null;
+      }
+    }).filter(Boolean);
+    if (filters.length > 0) {
+      const filtered = value.split("\n").filter((line) => !filters.some((re) => re.test(line.trim()))).join("\n").replace(/\n{3,}/g, "\n\n").trim();
+      value = filtered;
+    }
   }
   return value;
 }
@@ -4068,8 +4040,8 @@ function isAdjacentHistoryDuplicate(agentType, previous, next) {
   if (!previous || !next) return false;
   return buildHistoryMessageSignature(agentType, previous) === buildHistoryMessageSignature(agentType, next);
 }
-function collapseReplayAssistantTurns(agentType, messages) {
-  if (agentType !== "codex-cli") return messages;
+function collapseReplayAssistantTurns(messages, historyBehavior) {
+  if (!historyBehavior?.collapseConsecutiveAssistantTurns) return messages;
   const collapsed = [];
   let sawAssistantSinceLastUser = false;
   for (const message of messages) {
@@ -4174,16 +4146,12 @@ function listHistoryFiles(dir, historySessionId) {
     return true;
   }).sort().reverse();
 }
-function normalizeSavedHistorySessionId(agentType, historySessionId) {
-  const normalizedId = String(historySessionId || "").trim();
-  if (!normalizedId) return "";
-  const strictProviderId = normalizeProviderSessionId(agentType, normalizedId);
-  if (strictProviderId) return strictProviderId;
-  return agentType === "hermes-cli" ? "" : normalizedId;
+function normalizeSavedHistorySessionId(historySessionId) {
+  return String(historySessionId || "").trim();
 }
-function extractSavedHistorySessionIdFromFile(agentType, file2) {
+function extractSavedHistorySessionIdFromFile(file2) {
   const match = file2.match(/^([A-Za-z0-9_-]+)_\d{4}-\d{2}-\d{2}\.jsonl$/);
-  return normalizeSavedHistorySessionId(agentType, match?.[1] || "");
+  return normalizeSavedHistorySessionId(match?.[1] || "");
 }
 function buildSavedHistoryFileSignatureMap(dir, files) {
   return new Map(files.map((file2) => {
@@ -4362,7 +4330,7 @@ function persistSavedHistoryFileSummaryEntry(agentType, dir, file2, updater) {
   }
 }
 function updateSavedHistoryIndexForSessionStart(agentType, dir, file2, historySessionId, workspace) {
-  const normalizedSessionId = normalizeSavedHistorySessionId(agentType, historySessionId);
+  const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
   const normalizedWorkspace = String(workspace || "").trim();
   if (!normalizedSessionId || !normalizedWorkspace) return;
   persistSavedHistoryFileSummaryEntry(agentType, dir, file2, (currentSummary) => ({
@@ -4377,7 +4345,7 @@ function updateSavedHistoryIndexForSessionStart(agentType, dir, file2, historySe
   }));
 }
 function updateSavedHistoryIndexForAppendedMessages(agentType, dir, file2, historySessionId, messages) {
-  const normalizedSessionId = normalizeSavedHistorySessionId(agentType, historySessionId || "");
+  const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId || "");
   if (!normalizedSessionId || messages.length === 0) return;
   persistSavedHistoryFileSummaryEntry(agentType, dir, file2, (currentSummary) => {
     const nextSummary = {
@@ -4414,8 +4382,8 @@ function updateSavedHistoryIndexForAppendedMessages(agentType, dir, file2, histo
     return nextSummary;
   });
 }
-function computeSavedHistoryFileSummary(agentType, dir, file2) {
-  const historySessionId = extractSavedHistorySessionIdFromFile(agentType, file2);
+function computeSavedHistoryFileSummary(dir, file2) {
+  const historySessionId = extractSavedHistorySessionIdFromFile(file2);
   if (!historySessionId) return null;
   const filePath = path7.join(dir, file2);
   const content = fs3.readFileSync(filePath, "utf-8");
@@ -4509,7 +4477,7 @@ function computeSavedHistorySessionSummaries(agentType, dir, files, fileSignatur
     const cached2 = savedHistoryFileSummaryCache.get(filePath);
     const persisted = persistedEntries.get(file2);
     const reusableEntry = cached2?.signature === signature ? cached2 : persisted?.signature === signature ? persisted : null;
-    const fileSummary = reusableEntry?.summary || computeSavedHistoryFileSummary(agentType, dir, file2);
+    const fileSummary = reusableEntry?.summary || computeSavedHistoryFileSummary(dir, file2);
     const nextEntry = reusableEntry || {
       signature,
       summary: fileSummary
@@ -4555,7 +4523,7 @@ function computeSavedHistorySessionSummaries(agentType, dir, files, fileSignatur
     persistedEntries: nextPersistedEntries
   };
 }
-function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, excludeRecentCount = 0) {
+function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, excludeRecentCount = 0, historyBehavior) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
     const dir = path7.join(HISTORY_DIR, sanitized);
@@ -4590,7 +4558,7 @@ function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, ex
       chronological.push(message);
       if (message.role !== "system") lastTurn = message;
     }
-    const collapsed = collapseReplayAssistantTurns(agentType, chronological);
+    const collapsed = collapseReplayAssistantTurns(chronological, historyBehavior);
     const boundedLimit = Math.max(1, limit);
     const boundedOffset = Math.max(0, offset);
     const boundedExclude = Math.max(0, Math.min(excludeRecentCount, collapsed.length));
@@ -4603,7 +4571,7 @@ function readChatHistory(agentType, offset = 0, limit = 30, historySessionId, ex
     return { messages: [], hasMore: false };
   }
 }
-function listSavedHistorySessions(agentType, options = {}) {
+function listSavedHistorySessions(agentType, options = {}, historyBehavior) {
   try {
     const sanitized = agentType.replace(/[^a-zA-Z0-9_-]/g, "_");
     const dir = path7.join(HISTORY_DIR, sanitized);
@@ -4734,7 +4702,7 @@ function rewriteCanonicalSavedHistory(agentType, historySessionId, records) {
   }
 }
 function rebuildHermesSavedHistoryFromCanonicalSession(historySessionId) {
-  const normalizedSessionId = normalizeSavedHistorySessionId("hermes-cli", historySessionId);
+  const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
   if (!normalizedSessionId) return false;
   try {
     const sessionFilePath = path7.join(os6.homedir(), ".hermes", "sessions", `session_${normalizedSessionId}.json`);
@@ -4883,7 +4851,7 @@ function extractClaudeUserContentParts(content) {
   return parts;
 }
 function rebuildClaudeSavedHistoryFromNativeProject(historySessionId, workspace) {
-  const normalizedSessionId = normalizeSavedHistorySessionId("claude-cli", historySessionId);
+  const normalizedSessionId = normalizeSavedHistorySessionId(historySessionId);
   if (!normalizedSessionId) return false;
   try {
     const transcriptPath = resolveClaudeProjectTranscriptPath(normalizedSessionId, workspace);
@@ -4960,7 +4928,7 @@ function rebuildClaudeSavedHistoryFromNativeProject(historySessionId, workspace)
     return false;
   }
 }
-var fs3, path7, os6, HISTORY_DIR, RETAIN_DAYS, SAVED_HISTORY_INDEX_VERSION, SAVED_HISTORY_INDEX_FILE, SAVED_HISTORY_INDEX_LOCK_SUFFIX, SAVED_HISTORY_INDEX_LOCK_WAIT_MS, SAVED_HISTORY_INDEX_LOCK_STALE_MS, SAVED_HISTORY_INDEX_LOCK_POLL_MS, SAVED_HISTORY_ROLLUP_THRESHOLD_BYTES, savedHistorySessionCache, savedHistoryFileSummaryCache, savedHistoryBackgroundRefresh, savedHistoryRollupInFlight, CODEX_STARTER_PROMPT_RE, ChatHistoryWriter;
+var fs3, path7, os6, HISTORY_DIR, RETAIN_DAYS, SAVED_HISTORY_INDEX_VERSION, SAVED_HISTORY_INDEX_FILE, SAVED_HISTORY_INDEX_LOCK_SUFFIX, SAVED_HISTORY_INDEX_LOCK_WAIT_MS, SAVED_HISTORY_INDEX_LOCK_STALE_MS, SAVED_HISTORY_INDEX_LOCK_POLL_MS, SAVED_HISTORY_ROLLUP_THRESHOLD_BYTES, savedHistorySessionCache, savedHistoryFileSummaryCache, savedHistoryBackgroundRefresh, savedHistoryRollupInFlight, ChatHistoryWriter;
 var init_chat_history = __esm({
   "../../oss/packages/daemon-core/src/config/chat-history.ts"() {
     "use strict";
@@ -4968,7 +4936,6 @@ var init_chat_history = __esm({
     path7 = __toESM(require("path"));
     os6 = __toESM(require("os"));
     init_chat_message_normalization();
-    init_provider_session_id();
     HISTORY_DIR = path7.join(os6.homedir(), ".adhdev", "history");
     RETAIN_DAYS = 30;
     SAVED_HISTORY_INDEX_VERSION = 1;
@@ -4982,7 +4949,6 @@ var init_chat_history = __esm({
     savedHistoryFileSummaryCache = /* @__PURE__ */ new Map();
     savedHistoryBackgroundRefresh = /* @__PURE__ */ new Set();
     savedHistoryRollupInFlight = /* @__PURE__ */ new Set();
-    CODEX_STARTER_PROMPT_RE = /^(?:[›❯]\s*)?(?:Find and fix a bug in @filename|Improve documentation in @filename|Write tests for @filename|Explain this codebase|Summarize recent commits|Implement \{feature\}|Use \/skills(?: to list available skills)?|Run \/review on my current changes)$/i;
     ChatHistoryWriter = class {
       /** Last seen message count per agent (deduplication) */
       lastSeenCounts = /* @__PURE__ */ new Map();
@@ -5235,7 +5201,7 @@ var init_chat_history = __esm({
         } catch {
         }
       }
-      compactHistorySession(agentType, historySessionId) {
+      compactHistorySession(agentType, historySessionId, historyBehavior) {
         const sessionId = String(historySessionId || "").trim();
         if (!sessionId) return;
         try {
@@ -5273,7 +5239,7 @@ var init_chat_history = __esm({
               dedupedAdjacent.push(entry);
               if (entry.role !== "system") lastTurn = entry;
             }
-            const collapsed = collapseReplayAssistantTurns(agentType, dedupedAdjacent);
+            const collapsed = collapseReplayAssistantTurns(dedupedAdjacent, historyBehavior);
             if (collapsed.length === 0) {
               fs3.unlinkSync(filePath);
               continue;
@@ -9718,7 +9684,8 @@ async function executeProviderScript(h, args, scriptName) {
       }
       const managed = runtimeSessionId ? h.agentStream?.getManagedSession(runtimeSessionId) : null;
       const targetSessionId = managed?.cdpSessionId || null;
-      const IDE_LEVEL_SCRIPTS = provider.type === "claude-code-vscode" ? ["listModes", "setMode", "listModels", "setModel", "setModelGui"] : ["listModes", "setMode", "listModels", "setModel"];
+      const DEFAULT_IDE_LEVEL_SCRIPTS = ["listModes", "setMode", "listModels", "setModel"];
+      const IDE_LEVEL_SCRIPTS = provider.ideLevelScripts ?? DEFAULT_IDE_LEVEL_SCRIPTS;
       if (IDE_LEVEL_SCRIPTS.includes(scriptName)) {
         if (targetSessionId) {
           try {
@@ -14066,10 +14033,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;
@@ -14603,6 +14566,28 @@ ${data.message || ""}`.trim();
   }
 });
 
+// ../../oss/packages/daemon-core/src/providers/provider-session-id.ts
+function normalizeProviderSessionId(provider, providerSessionId) {
+  const normalizedId = typeof providerSessionId === "string" ? providerSessionId.trim() : "";
+  if (!normalizedId) return "";
+  const lowered = normalizedId.toLowerCase();
+  if (lowered === "undefined" || lowered === "null") return "";
+  const sessionIdPattern = provider?.sessionIdPattern;
+  if (sessionIdPattern) {
+    try {
+      const re = new RegExp(sessionIdPattern, "i");
+      if (!re.test(normalizedId)) return "";
+    } catch {
+    }
+  }
+  return normalizedId;
+}
+var init_provider_session_id = __esm({
+  "../../oss/packages/daemon-core/src/providers/provider-session-id.ts"() {
+    "use strict";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/cli-provider-instance.ts
 function normalizePersistableCliHistoryContent(content) {
   return flattenContent(content).replace(/\s+/g, " ").trim();
@@ -14780,32 +14765,10 @@ var init_cli_provider_instance = __esm({
       }
       async onTick() {
         if (this.providerSessionId) return;
-        if (this.type === "hermes-cli" && this.launchMode === "new") return;
-        let probedSessionId = null;
+        if (this.provider.resume?.skipProbeOnNewSession && this.launchMode === "new") return;
         const probeConfig = this.provider.sessionProbe;
-        if (probeConfig) {
-          probedSessionId = this.probeSessionIdFromConfig(probeConfig);
-        } else {
-          if (this.type === "opencode-cli") {
-            probedSessionId = this.probeSessionIdFromConfig({
-              dbPath: "~/.local/share/opencode/opencode.db",
-              query: "select id from session where directory in ({dirs}) and time_created >= ? and time_archived is null order by time_updated desc limit 1",
-              timestampFormat: "unix_ms"
-            });
-          } else if (this.type === "codex-cli") {
-            probedSessionId = this.probeSessionIdFromConfig({
-              dbPath: "~/.codex/state_5.sqlite",
-              query: "select id from threads where cwd in ({dirs}) and updated_at >= ? and archived = 0 order by updated_at desc limit 1",
-              timestampFormat: "unix_s"
-            });
-          } else if (this.type === "goose-cli") {
-            probedSessionId = this.probeSessionIdFromConfig({
-              dbPath: "~/.local/share/goose/sessions/sessions.db",
-              query: "select id from sessions where working_dir in ({dirs}) and created_at >= ? order by updated_at desc limit 1",
-              timestampFormat: "iso"
-            });
-          }
-        }
+        if (!probeConfig) return;
+        const probedSessionId = this.probeSessionIdFromConfig(probeConfig);
         if (probedSessionId) {
           this.promoteProviderSessionId(probedSessionId);
         }
@@ -14857,7 +14820,7 @@ var init_cli_provider_instance = __esm({
         const autoApproveActive = adapterStatus.status === "waiting_approval" && this.shouldAutoApprove();
         const visibleStatus = parseErrorMessage ? "error" : autoApproveActive ? "generating" : adapterStatus.status;
         const parsedProviderSessionId = normalizeProviderSessionId(
-          this.type,
+          this.provider,
           typeof parsedStatus?.providerSessionId === "string" ? parsedStatus.providerSessionId : ""
         );
         if (parsedProviderSessionId) {
@@ -15147,7 +15110,7 @@ var init_cli_provider_instance = __esm({
       applyProviderResponse(data, options) {
         if (!data || typeof data !== "object") return;
         const patchedProviderSessionId = normalizeProviderSessionId(
-          this.type,
+          this.provider,
           typeof data.providerSessionId === "string" ? data.providerSessionId : ""
         );
         if (patchedProviderSessionId) {
@@ -15385,52 +15348,39 @@ ${effect.notification.body || ""}`.trim();
       }
       syncCanonicalSavedHistoryIfNeeded() {
         if (!this.providerSessionId) return false;
-        if (this.type === "hermes-cli") {
-          try {
-            const canonicalPath = path12.join(os14.homedir(), ".hermes", "sessions", `session_${this.providerSessionId}.json`);
-            if (!fs5.existsSync(canonicalPath)) return false;
-            const stat4 = fs5.statSync(canonicalPath);
+        const canonicalHistory = this.provider.canonicalHistory;
+        if (!canonicalHistory) return false;
+        try {
+          let rebuilt = false;
+          if (canonicalHistory.format === "hermes-json") {
+            const watchPath = canonicalHistory.watchPath.replace(/^~/, os14.homedir()).replace("{{sessionId}}", this.providerSessionId);
+            if (!fs5.existsSync(watchPath)) return false;
+            const stat4 = fs5.statSync(watchPath);
             if (stat4.mtimeMs <= this.lastCanonicalHermesSyncMtimeMs) return true;
-            const rebuilt = rebuildHermesSavedHistoryFromCanonicalSession(this.providerSessionId);
-            if (!rebuilt) return false;
-            this.lastCanonicalHermesSyncMtimeMs = stat4.mtimeMs;
-            const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId);
-            this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
-              role: message.role,
-              content: message.content,
-              kind: message.kind,
-              senderName: message.senderName,
-              receivedAt: message.receivedAt
-            }));
-            return true;
-          } catch {
-            return false;
-          }
-        }
-        if (this.type === "claude-cli") {
-          try {
-            const rebuilt = rebuildClaudeSavedHistoryFromNativeProject(this.providerSessionId, this.workingDir);
-            if (!rebuilt) return false;
-            const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId);
-            this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
-              role: message.role,
-              content: message.content,
-              kind: message.kind,
-              senderName: message.senderName,
-              receivedAt: message.receivedAt
-            }));
-            return true;
-          } catch {
-            return false;
-          }
+            rebuilt = rebuildHermesSavedHistoryFromCanonicalSession(this.providerSessionId);
+            if (rebuilt) this.lastCanonicalHermesSyncMtimeMs = stat4.mtimeMs;
+          } else if (canonicalHistory.format === "claude-jsonl") {
+            rebuilt = rebuildClaudeSavedHistoryFromNativeProject(this.providerSessionId, this.workingDir);
+          }
+          if (!rebuilt) return false;
+          const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId, 0, this.provider.historyBehavior);
+          this.lastPersistedHistoryMessages = restoredHistory.messages.map((message) => ({
+            role: message.role,
+            content: message.content,
+            kind: message.kind,
+            senderName: message.senderName,
+            receivedAt: message.receivedAt
+          }));
+          return true;
+        } catch {
+          return false;
         }
-        return false;
       }
       restorePersistedHistoryFromCurrentSession() {
         if (!this.providerSessionId) return;
         this.syncCanonicalSavedHistoryIfNeeded();
-        this.historyWriter.compactHistorySession(this.type, this.providerSessionId);
-        const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId);
+        this.historyWriter.compactHistorySession(this.type, this.providerSessionId, this.provider.historyBehavior);
+        const restoredHistory = readChatHistory(this.type, 0, Number.MAX_SAFE_INTEGER, this.providerSessionId, 0, this.provider.historyBehavior);
         this.historyWriter.seedSessionHistory(
           this.type,
           restoredHistory.messages,
@@ -32982,14 +32932,15 @@ function expandResumeArgs(template, sessionId) {
   if (!Array.isArray(template) || template.length === 0) return void 0;
   return template.map((part) => part === "{{id}}" ? sessionId : part);
 }
-function readCodexResumeSessionId(args) {
-  const resumeIndex = args.findIndex((arg) => arg === "resume" || arg === "fork");
+function readSubcommandSessionId(args, subcommands) {
+  const resumeIndex = args.findIndex((arg) => subcommands.includes(arg));
   if (resumeIndex < 0) return void 0;
   const candidate = args[resumeIndex + 1];
   if (!candidate || candidate.startsWith("-")) return void 0;
   return candidate;
 }
-function detectExplicitProviderSessionId(normalizedType, args) {
+function detectExplicitProviderSessionId(provider, args) {
+  const resume = provider?.resume;
   const explicitResumeId = readArgValue(args, ["--resume", "-r"]);
   if (explicitResumeId) {
     return { providerSessionId: explicitResumeId, launchMode: "resume" };
@@ -33003,19 +32954,20 @@ function detectExplicitProviderSessionId(normalizedType, args) {
   }
   const explicitSessionId = readArgValue(args, ["--session-id"]);
   if (explicitSessionId) {
-    if (normalizedType === "goose-cli" && !hasArg(args, ["--resume", "-r"])) {
+    if (resume?.sessionIdIsNewByDefault && !hasArg(args, ["--resume", "-r"])) {
       return { launchMode: "manual" };
     }
-    const isResume = normalizedType === "goose-cli" ? hasArg(args, ["--resume", "-r"]) : hasArg(args, ["--continue"]) || hasArg(args, ["--resume", "-r"]);
+    const isResume = resume?.sessionIdIsNewByDefault ? hasArg(args, ["--resume", "-r"]) : hasArg(args, ["--continue"]) || hasArg(args, ["--resume", "-r"]);
     return {
       providerSessionId: explicitSessionId,
       launchMode: isResume ? "resume" : "new"
     };
   }
-  if (normalizedType === "codex-cli") {
-    const codexSessionId = readCodexResumeSessionId(args);
-    if (codexSessionId) {
-      return { providerSessionId: codexSessionId, launchMode: "resume" };
+  const subcommands = resume?.sessionIdFromSubcommand;
+  if (Array.isArray(subcommands) && subcommands.length > 0) {
+    const subcommandSessionId = readSubcommandSessionId(args, subcommands);
+    if (subcommandSessionId) {
+      return { providerSessionId: subcommandSessionId, launchMode: "resume" };
     }
   }
   return { launchMode: "manual" };
@@ -33032,7 +32984,7 @@ function resolveCliSessionBinding(provider, normalizedType, cliArgs, requestedRe
   if (!resume?.supported) {
     return { cliArgs: baseArgs, launchMode: "manual" };
   }
-  const explicit = detectExplicitProviderSessionId(normalizedType, baseArgs || []);
+  const explicit = detectExplicitProviderSessionId(provider, baseArgs || []);
   if (explicit.providerSessionId) {
     return {
       cliArgs: baseArgs,
@@ -33040,6 +32992,12 @@ function resolveCliSessionBinding(provider, normalizedType, cliArgs, requestedRe
       launchMode: explicit.launchMode
     };
   }
+  if (explicit.launchMode === "manual" && hasArg(baseArgs || [], ["--session-id"])) {
+    return {
+      cliArgs: baseArgs,
+      launchMode: "manual"
+    };
+  }
   if (requestedResumeSessionId) {
     if (resume.sessionIdFormat === "uuid" && !isUuid(requestedResumeSessionId)) {
       throw new Error(`Invalid ${provider?.displayName || provider?.name || normalizedType} session ID: ${requestedResumeSessionId}`);
@@ -33907,10 +33865,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 +34399,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 +34411,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 +34433,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 +34462,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) {
@@ -35642,6 +35600,11 @@ var init_provider_schema = __esm({
       "resume",
       "sessionProbe",
       "approvalPositiveHints",
+      "sessionIdPattern",
+      "historyBehavior",
+      "canonicalHistory",
+      "autoFixProfile",
+      "ideLevelScripts",
       "scripts",
       "vscodeCommands",
       "inputMethod",
@@ -37821,9 +37784,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 +37922,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 +37952,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 +37972,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 +38005,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) {
@@ -42911,20 +42956,13 @@ function tryKillAutoImplProcess(processRef, signal) {
   } catch {
   }
 }
+function shouldScheduleAutoStopOnQuiet(options) {
+  return !!options.verification && options.autoImpl?.autoStopOnQuiet === true;
+}
 function getDefaultAutoImplReference(ctx, category, type) {
-  if (category === "cli") {
-    return type === "codex-cli" ? "claude-cli" : "codex-cli";
-  }
-  if (category === "extension") {
-    const preferred = ["claude-code-vscode", "codex", "cline", "roo-code"];
-    for (const ref of preferred) {
-      if (ref === type) continue;
-      if (ctx.providerLoader.resolve(ref) || ctx.providerLoader.getMeta(ref)) return ref;
-    }
-    const all = ctx.providerLoader.getAll();
-    const fb = all.find((p) => p.category === "extension" && p.type !== type);
-    if (fb?.type) return fb.type;
-  }
+  const all = ctx.providerLoader.getAll();
+  const sameCategoryOther = all.find((p) => p.category === category && p.type !== type);
+  if (sameCategoryOther?.type) return sameCategoryOther.type;
   return "antigravity";
 }
 function resolveAutoImplReference(ctx, category, requestedReference, targetType) {
@@ -43242,37 +43280,33 @@ async function handleAutoImplement(ctx, type, req, res) {
       return;
     }
     const command = spawn6.command;
+    const autoImpl = spawn6.autoImpl;
     const interactiveFlags = ["--yolo", "--interactive", "-i"];
     const baseArgs = [...spawn6.args || []].filter((a) => !interactiveFlags.includes(a));
     let shellCmd;
     const isWin = os23.platform() === "win32";
     const escapeArg = (a) => isWin ? `"${a.replace(/"/g, '""')}"` : `'${a.replace(/'/g, "'\\''")}'`;
-    if (command === "claude") {
-      const args = [...baseArgs, "--dangerously-skip-permissions"];
+    const promptMode = autoImpl?.promptMode ?? "stdin";
+    const extraArgs = autoImpl?.extraArgs ?? [];
+    const rawMetaPrompt = autoImpl?.metaPrompt ? autoImpl.metaPrompt.replace("{{promptFile}}", promptFile) : `Read the file at ${promptFile} and follow ALL the instructions in it exactly. Do not ask questions, just execute.`;
+    if (promptMode === "flag") {
+      const flag = autoImpl?.promptFlag ?? "-p";
+      const args = [...baseArgs, ...extraArgs];
       if (model) args.push("--model", model);
       const escapedArgs = args.map(escapeArg).join(" ");
-      const metaPrompt = `Read the file at ${promptFile} and follow ALL the instructions. Implement the specific function requested, then test it via CDP curl targeting 127.0.0.1:19280, wait for confirmation of success, and then close. DO NOT start working on other features not listed in the prompt constraint.`;
-      shellCmd = `${command} ${escapedArgs} -p ${escapeArg(metaPrompt)}`;
-    } else if (command === "gemini") {
-      const args = [...baseArgs, "-y", "-s", "false"];
-      if (model) args.push("-m", model);
-      const escapedArgs = args.map(escapeArg).join(" ");
-      const metaPrompt = `Read the file at ${promptFile} and follow ALL the instructions in it exactly. Do not ask questions, just execute.`;
-      shellCmd = `${command} ${escapedArgs} -p ${escapeArg(metaPrompt)}`;
-    } else if (command === "codex") {
-      const args = ["exec", ...baseArgs];
-      if (!args.includes("--dangerously-bypass-approvals-and-sandbox")) {
-        args.push("--dangerously-bypass-approvals-and-sandbox");
-      }
-      if (!args.includes("--skip-git-repo-check")) {
-        args.push("--skip-git-repo-check");
+      shellCmd = `${command} ${escapedArgs} ${flag} ${escapeArg(rawMetaPrompt)}`;
+    } else if (promptMode === "subcommand") {
+      const subcommand = autoImpl?.subcommand ?? "";
+      const args = subcommand ? [subcommand, ...baseArgs] : [...baseArgs];
+      for (const extra of extraArgs) {
+        if (!args.includes(extra)) args.push(extra);
       }
       if (model) args.push("--model", model);
       const escapedArgs = args.map(escapeArg).join(" ");
-      const metaPrompt = `Read the file at ${promptFile} and follow ALL instructions strictly. DO NOT spend time exploring the filesystem or other providers. You have full authority to implement ALL required script files and independently test them against 127.0.0.1:19280 via CDP CURL. Upon complete validation of ALL assigned files, print exactly "_PIPELINE_COMPLETE_SIGNAL_" to gracefully close the pipeline. DO NOT WAIT FOR APPROVAL, execute completely autonomously.`;
-      shellCmd = `${command} ${escapedArgs} ${escapeArg(metaPrompt)}`;
+      shellCmd = `${command} ${escapedArgs} ${escapeArg(rawMetaPrompt)}`;
     } else {
-      const escapedArgs = baseArgs.map(escapeArg).join(" ");
+      const args = [...baseArgs, ...extraArgs];
+      const escapedArgs = args.map(escapeArg).join(" ");
       if (isWin) {
         shellCmd = `type "${promptFile}" | ${command} ${escapedArgs}`;
       } else {
@@ -43307,8 +43341,7 @@ async function handleAutoImplement(ctx, type, req, res) {
         stdio: ["pipe", "pipe", "pipe"],
         env: {
           ...process.env,
-          ...spawn6.env || {},
-          ...command === "gemini" ? { SANDBOX: "1", GEMINI_CLI_NO_RELAUNCH: "1" } : {}
+          ...spawn6.env || {}
         }
       });
       child.on("error", (err2) => {
@@ -43370,7 +43403,7 @@ async function handleAutoImplement(ctx, type, req, res) {
       }
     };
     const scheduleAutoStopForVerification = () => {
-      if (!verification || command !== "codex" || completionSignalSeen || autoStopIssued) return;
+      if (!shouldScheduleAutoStopOnQuiet({ verification, autoImpl }) || completionSignalSeen || autoStopIssued) return;
       const elapsed = Date.now() - spawnedAt;
       if (elapsed < 3e4) return;
       clearAutoStopTimer();
@@ -46848,6 +46881,7 @@ __export(src_exports, {
   buildChatMessageSignature: () => buildChatMessageSignature,
   buildChatTailDeliverySignature: () => buildChatTailDeliverySignature,
   buildMachineInfo: () => buildMachineInfo,
+  buildPinnedGlobalInstallCommand: () => buildPinnedGlobalInstallCommand,
   buildRuntimeSystemChatMessage: () => buildRuntimeSystemChatMessage,
   buildSessionEntries: () => buildSessionEntries,
   buildSessionModalDeliverySignature: () => buildSessionModalDeliverySignature,
@@ -46930,6 +46964,7 @@ __export(src_exports, {
   resetDebugRuntimeConfig: () => resetDebugRuntimeConfig,
   resetState: () => resetState,
   resolveChatMessageKind: () => resolveChatMessageKind,
+  resolveCurrentGlobalInstallSurface: () => resolveCurrentGlobalInstallSurface,
   resolveDebugRuntimeConfig: () => resolveDebugRuntimeConfig,
   resolveSessionHostAppName: () => resolveSessionHostAppName,
   resolveSessionHostAppNameResolution: () => resolveSessionHostAppNameResolution,
@@ -78239,6 +78274,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 +86989,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 +87130,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.2" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.5" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -88153,6 +88188,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 +88233,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 +88251,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 +88490,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 +88502,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 +88537,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 +88567,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 +88926,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 +89458,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 +91548,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 +91624,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 +91659,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 +92121,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 +92140,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 +92162,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 +92173,7 @@ function probeConfigAccess() {
     });
   } catch (error48) {
     try {
-      fs25.rmSync(probePath, { force: true });
+      fs26.rmSync(probePath, { force: true });
     } catch {
     }
     checks.push({
@@ -91803,9 +92229,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 +92245,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 +92269,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 +92317,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 +92350,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 +92420,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 +92466,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 = [
@@ -92048,105 +92494,24 @@ function getAutoFixFunctions(category) {
   return IDE_AUTO_FIX_FUNCTIONS;
 }
 function getDefaultAutoFixReference(category, type, providers) {
-  if (category === "cli") {
-    const preferred = ["codex-cli", "claude-cli", "gemini-cli"];
-    const picked = preferred.find(
-      (ref) => ref !== type && providers.some((p) => p.type === ref && p.category === "cli")
-    );
-    if (picked) return picked;
-    const fallback2 = providers.find((p) => p.category === "cli" && p.type !== type);
-    return fallback2?.type || "codex-cli";
-  }
-  if (category === "extension") {
-    const preferred = ["claude-code-vscode", "codex", "cline", "roo-code"];
-    const picked = preferred.find(
-      (ref) => ref !== type && providers.some((p) => p.type === ref && p.category === "extension")
-    );
-    if (picked) return picked;
-    const fallback2 = providers.find((p) => p.category === "extension" && p.type !== type);
-    if (fallback2?.type) return fallback2.type;
-  }
+  const sameCategoryOther = providers.find((p) => p.category === category && p.type !== type);
+  if (sameCategoryOther?.type) return sameCategoryOther.type;
+  if (category === "extension") return "antigravity";
   return "antigravity";
 }
 function escapeRegex2(value) {
   return String(value || "").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 var CLI_PROVIDER_FIX_PROMPT = 'Create a file at tmp/adhdev_provider_fix_test.py that prints the current working directory and the squares of 1 through 5, then run python3 tmp/adhdev_provider_fix_test.py and tell me the exact output. Start the final answer with "Exact output:" and include the working directory plus the command stdout verbatim.';
-var CLI_AUTO_FIX_VERIFICATION_PROFILES = {
-  "codex-cli": {
-    fixtureName: "codex-cli-provider-fix",
-    inspectFields: [
-      "debug.messages",
-      "trace.entries[].payload.parsedLastAssistant",
-      "trace.entries[].payload.detectStatus",
-      "trace.entries[].payload.parsedStatus"
-    ],
-    focusAreas: [
-      "Startup or trust screens must be classified as approval/current chrome, not assistant transcript content.",
-      "Prefer fixing provider.json submit/approval behavior before piling on parser heuristics.",
-      "The final assistant transcript must preserve the exact stdout block and current working directory."
-    ],
-    lastAssistantMustContainAny: [
-      "Exact output:",
-      "1",
-      "4",
-      "9",
-      "16",
-      "25"
-    ],
-    lastAssistantMustNotContainAny: [
-      "Do you trust the contents of this directory?",
-      "OpenAI Codex",
-      "Tip: New",
-      "Summarize recent commits"
-    ],
-    description: "Codex CLI must classify startup/trust screens correctly, transition idle -> generating -> idle, and preserve the exact stdout block in the final assistant transcript.",
-    timeoutMs: 9e4
-  },
-  "claude-cli": {
-    fixtureName: "claude-cli-provider-fix",
-    inspectFields: [
-      "statusesSeen",
-      "approvalsResolved",
-      "debug.messages",
-      "trace.entries[].payload.detectStatus",
-      "trace.entries[].payload.parsedStatus",
-      "trace.entries[].payload.parsedLastAssistant",
-      "trace.entries[].payload.approval"
-    ],
-    focusAreas: [
-      "Some environments show a startup trust or safety confirmation before the first prompt; treat that screen as waiting_approval, not assistant content.",
-      "Single-action startup confirmations should resolve with Enter/confirm handling instead of assuming numbered approval options.",
-      "Do not leak footer chrome like shortcuts help, version banners, /effort text, or startup trust wording into the parsed transcript."
-    ],
-    lastAssistantMustContainAny: [
-      "Exact output:",
-      "1",
-      "4",
-      "9",
-      "16",
-      "25"
-    ],
-    lastAssistantMustNotContainAny: [
-      "Quick safety check",
-      "Is this a project you trust",
-      "Enter to confirm",
-      "Claude Code",
-      "Type your message"
-    ],
-    description: "Claude CLI must survive startup trust/safety prompts, resolve them cleanly, transition back to generating/idle, and keep startup chrome out of the final assistant transcript.",
-    timeoutMs: 12e4
-  }
-};
-function getCliAutoFixVerification(type, providerDir) {
-  const profile = CLI_AUTO_FIX_VERIFICATION_PROFILES[type];
+function getCliAutoFixVerification(provider, providerDir) {
+  const profile = provider?.autoFixProfile;
   if (!profile) return null;
   const normalizedDir = providerDir.replace(/\\/g, "/");
   const escapedDir = escapeRegex2(normalizedDir);
   return {
     fixtureName: profile.fixtureName,
     request: {
-      type,
+      type: provider?.type,
       workingDir: providerDir,
       freshSession: true,
       autoLaunch: true,
@@ -92184,7 +92549,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;
@@ -92516,21 +92881,26 @@ function registerProviderCommands(program2) {
         console.log(source_default.green(`
 \u2713 Writable local copy ready at [${targetDir2}]`));
       }
-      let agentName = options.agent || "codex-cli";
+      let agentName = options.agent;
       const modelName = options.model;
       const reference = options.reference || getDefaultAutoFixReference(providerToFix.category, type, allProviders);
-      if (!typeArg && agentName === "codex-cli") {
+      if (!agentName) {
         const inquirer3 = (await Promise.resolve().then(() => (init_lib(), lib_exports))).default;
         const { SUPPORTED_CLI_AGENTS: SUPPORTED_CLI_AGENTS2 } = await Promise.resolve().then(() => (init_supported(), supported_exports));
+        const availableAgentChoices = SUPPORTED_CLI_AGENTS2.filter(
+          (agent) => allProviders.some((provider2) => provider2.category === "cli" && provider2.type === agent.id)
+        );
+        const choices = (availableAgentChoices.length > 0 ? availableAgentChoices : SUPPORTED_CLI_AGENTS2).map((agent) => ({
+          name: `${agent.icon} ${source_default.green(agent.name)}`,
+          value: agent.id
+        }));
+        const defaultAgent = choices[0]?.value || "codex-cli";
         const agentAnswer = await inquirer3.prompt([{
           type: "list",
           name: "selected",
           message: "Select the AI agent to use for auto-fix:",
-          choices: SUPPORTED_CLI_AGENTS2.map((agent) => ({
-            name: `${agent.icon} ${source_default.green(agent.name)}`,
-            value: agent.id
-          })),
-          default: "codex-cli"
+          choices,
+          default: defaultAgent
         }]);
         agentName = agentAnswer.selected;
       }
@@ -92580,7 +92950,7 @@ function registerProviderCommands(program2) {
         console.log(source_default.gray(`   \u{1F4AC} Comment: ${userComment}`));
       }
       try {
-        const verification = providerToFix.category === "cli" ? getCliAutoFixVerification(type, targetDir) : null;
+        const verification = providerToFix.category === "cli" ? getCliAutoFixVerification(providerToFix, targetDir) : null;
         const postData = JSON.stringify({
           functions: functionsToFix,
           agent: agentName,
@@ -93153,372 +93523,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();