adhdev 0.9.2 → 0.9.5

package/dist/index.js

@@ -729,35 +729,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);
@@ -769,31 +740,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,
@@ -831,7 +795,6 @@ var init_state_store = __esm({
     import_fs2 = require("fs");
     import_path2 = require("path");
     init_config();
-    init_provider_session_id();
     DEFAULT_STATE = {
       recentActivity: [],
       savedProviderSessions: [],
@@ -913,8 +876,8 @@ async function detectIDEs(providerLoader) {
       if ((0, import_fs3.existsSync)(bundledCli)) resolvedCli = bundledCli;
     }
     if (!resolvedCli && appPath && os29 === "win32") {
-      const { dirname: dirname9 } = await import("path");
-      const appDir = dirname9(appPath);
+      const { dirname: dirname10 } = await import("path");
+      const appDir = dirname10(appPath);
       const candidates = [
         `${appDir}\\\\bin\\\\${def.cli}.cmd`,
         `${appDir}\\\\bin\\\\${def.cli}`,
@@ -3526,12 +3489,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;
 }
@@ -3548,8 +3520,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) {
@@ -3654,16 +3626,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) => {
@@ -3842,7 +3810,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) => ({
@@ -3857,7 +3825,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 = {
@@ -3894,8 +3862,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");
@@ -3989,7 +3957,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
@@ -4035,7 +4003,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);
@@ -4070,7 +4038,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));
@@ -4083,7 +4051,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);
@@ -4214,7 +4182,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(os5.homedir(), ".hermes", "sessions", `session_${normalizedSessionId}.json`);
@@ -4363,7 +4331,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);
@@ -4440,7 +4408,7 @@ function rebuildClaudeSavedHistoryFromNativeProject(historySessionId, workspace)
     return false;
   }
 }
-var fs3, path7, os5, 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, os5, 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";
@@ -4448,7 +4416,6 @@ var init_chat_history = __esm({
     path7 = __toESM(require("path"));
     os5 = __toESM(require("os"));
     init_chat_message_normalization();
-    init_provider_session_id();
     HISTORY_DIR = path7.join(os5.homedir(), ".adhdev", "history");
     RETAIN_DAYS = 30;
     SAVED_HISTORY_INDEX_VERSION = 1;
@@ -4462,7 +4429,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();
@@ -4715,7 +4681,7 @@ var init_chat_history = __esm({
         } catch {
         }
       }
-      compactHistorySession(agentType, historySessionId) {
+      compactHistorySession(agentType, historySessionId, historyBehavior) {
         const sessionId = String(historySessionId || "").trim();
         if (!sessionId) return;
         try {
@@ -4753,7 +4719,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;
@@ -9198,7 +9164,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 {
@@ -13110,10 +13077,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;
@@ -13647,6 +13610,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();
@@ -13824,32 +13809,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);
         }
@@ -13901,7 +13864,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) {
@@ -14191,7 +14154,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) {
@@ -14429,52 +14392,39 @@ ${effect.notification.body || ""}`.trim();
       }
       syncCanonicalSavedHistoryIfNeeded() {
         if (!this.providerSessionId) return false;
-        if (this.type === "hermes-cli") {
-          try {
-            const canonicalPath = path11.join(os13.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(/^~/, os13.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,
@@ -32026,14 +31976,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" };
@@ -32047,19 +31998,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" };
@@ -32076,7 +32028,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,
@@ -32084,6 +32036,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}`);
@@ -32951,10 +32909,10 @@ var init_readdirp = __esm({
       }
       async _formatEntry(dirent, path29) {
         let entry;
-        const basename8 = this._isDirent ? dirent.name : dirent;
+        const basename9 = this._isDirent ? dirent.name : dirent;
         try {
-          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path29, basename8));
-          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename8 };
+          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path29, basename9));
+          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename9 };
           entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
         } catch (err) {
           this._onError(err);
@@ -33485,9 +33443,9 @@ var init_handler2 = __esm({
       _watchWithNodeFs(path29, listener) {
         const opts = this.fsw.options;
         const directory = sp.dirname(path29);
-        const basename8 = sp.basename(path29);
+        const basename9 = sp.basename(path29);
         const parent = this.fsw._getWatchedDir(directory);
-        parent.add(basename8);
+        parent.add(basename9);
         const absolutePath = sp.resolve(path29);
         const options = {
           persistent: opts.persistent
@@ -33497,7 +33455,7 @@ var init_handler2 = __esm({
         let closer;
         if (opts.usePolling) {
           const enableBin = opts.interval !== opts.binaryInterval;
-          options.interval = enableBin && isBinaryPath(basename8) ? opts.binaryInterval : opts.interval;
+          options.interval = enableBin && isBinaryPath(basename9) ? opts.binaryInterval : opts.interval;
           closer = setFsWatchFileListener(path29, absolutePath, options, {
             listener,
             rawEmitter: this.fsw._emitRaw
@@ -33519,11 +33477,11 @@ var init_handler2 = __esm({
         if (this.fsw.closed) {
           return;
         }
-        const dirname9 = sp.dirname(file2);
-        const basename8 = sp.basename(file2);
-        const parent = this.fsw._getWatchedDir(dirname9);
+        const dirname10 = sp.dirname(file2);
+        const basename9 = sp.basename(file2);
+        const parent = this.fsw._getWatchedDir(dirname10);
         let prevStats = stats;
-        if (parent.has(basename8))
+        if (parent.has(basename9))
           return;
         const listener = async (path29, newStats) => {
           if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
@@ -33548,9 +33506,9 @@ var init_handler2 = __esm({
                 prevStats = newStats2;
               }
             } catch (error48) {
-              this.fsw._remove(dirname9, basename8);
+              this.fsw._remove(dirname10, basename9);
             }
-          } else if (parent.has(basename8)) {
+          } else if (parent.has(basename9)) {
             const at = newStats.atimeMs;
             const mt = newStats.mtimeMs;
             if (!at || at <= mt || mt !== prevStats.mtimeMs) {
@@ -34686,6 +34644,11 @@ var init_provider_schema = __esm({
       "resume",
       "sessionProbe",
       "approvalPositiveHints",
+      "sessionIdPattern",
+      "historyBehavior",
+      "canonicalHistory",
+      "autoFixProfile",
+      "ideLevelScripts",
       "scripts",
       "vscodeCommands",
       "inputMethod",
@@ -36865,9 +36828,82 @@ function appendUpgradeLog(message) {
   } catch {
   }
 }
-function getNpmExecutable() {
+function resolveSiblingNpmExecutable(nodeExecutable) {
+  const binDir = path16.dirname(nodeExecutable);
+  const candidates = process.platform === "win32" ? ["npm.cmd", "npm.exe", "npm"] : ["npm"];
+  for (const candidate of candidates) {
+    const candidatePath = path16.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 = path16.dirname(resolvedPath);
+    }
+  } catch {
+    currentDir = path16.dirname(resolvedPath);
+  }
+  while (true) {
+    const packageJsonPath = path16.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 = path16.dirname(currentDir);
+    if (parentDir === currentDir) {
+      return null;
+    }
+    currentDir = parentDir;
+  }
+}
+function resolveInstallPrefixFromPackageRoot(packageRoot, packageName) {
+  const nodeModulesDir = packageName.startsWith("@") ? path16.dirname(path16.dirname(packageRoot)) : path16.dirname(packageRoot);
+  if (path16.basename(nodeModulesDir) !== "node_modules") {
+    return null;
+  }
+  const maybeLibDir = path16.dirname(nodeModulesDir);
+  if (path16.basename(maybeLibDir) === "lib") {
+    return path16.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" };
 }
@@ -36930,11 +36966,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 : path16.join(npmPrefix, "bin");
   const packageBaseName = pkgName.startsWith("@") ? pkgName.split("/")[1] : pkgName;
   const binNames = /* @__PURE__ */ new Set([packageBaseName]);
@@ -36959,7 +36996,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(path16.join(binDir, entry), { recursive: true, force: true });
       appendUpgradeLog(`Removed stale bin staging entry: ${path16.join(binDir, entry)}`);
     }
@@ -36979,19 +37016,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",
@@ -37004,7 +37049,7 @@ async function runDaemonUpgradeHelper(payload) {
   }
   if (process.platform === "win32") {
     await new Promise((resolve16) => setTimeout(resolve16, 500));
-    cleanupStaleGlobalInstallDirs(payload.packageName);
+    cleanupStaleGlobalInstallDirs(payload.packageName, installCommand.surface);
     appendUpgradeLog("Post-install staging cleanup complete");
   }
   if (restartArgv.length > 0) {
@@ -41955,20 +42000,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) {
@@ -42286,37 +42324,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 = os21.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 {
@@ -42351,8 +42385,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) => {
@@ -42414,7 +42447,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();
@@ -45892,6 +45925,7 @@ __export(src_exports, {
   buildChatMessageSignature: () => buildChatMessageSignature,
   buildChatTailDeliverySignature: () => buildChatTailDeliverySignature,
   buildMachineInfo: () => buildMachineInfo,
+  buildPinnedGlobalInstallCommand: () => buildPinnedGlobalInstallCommand,
   buildRuntimeSystemChatMessage: () => buildRuntimeSystemChatMessage,
   buildSessionEntries: () => buildSessionEntries,
   buildSessionModalDeliverySignature: () => buildSessionModalDeliverySignature,
@@ -45974,6 +46008,7 @@ __export(src_exports, {
   resetDebugRuntimeConfig: () => resetDebugRuntimeConfig,
   resetState: () => resetState,
   resolveChatMessageKind: () => resolveChatMessageKind,
+  resolveCurrentGlobalInstallSurface: () => resolveCurrentGlobalInstallSurface,
   resolveDebugRuntimeConfig: () => resolveDebugRuntimeConfig,
   resolveSessionHostAppName: () => resolveSessionHostAppName,
   resolveSessionHostAppNameResolution: () => resolveSessionHostAppNameResolution,
@@ -55375,7 +55410,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;
@@ -87473,6 +87508,7 @@ var open_default = open2;
 
 // src/wizard.ts
 init_src();
+init_version();
 var SERVER_URL = process.env.ADHDEV_SERVER_URL || "https://api.adhf.dev";
 var LOGO = `
 ${source_default2.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")}
@@ -87485,6 +87521,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) {
@@ -87500,27 +87566,10 @@ async function runWizard(options = {}) {
 }
 async function checkForUpdate() {
   try {
-    const { execSync: execSync7 } = await import("child_process");
-    let currentVersion = null;
-    try {
-      currentVersion = execSync7("adhdev --version", {
-        encoding: "utf-8",
-        timeout: 3e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-    } catch {
-      return;
-    }
-    let latestVersion = null;
-    try {
-      latestVersion = execSync7("npm show adhdev version", {
-        encoding: "utf-8",
-        timeout: 5e3,
-        stdio: ["pipe", "pipe", "pipe"]
-      }).trim();
-    } catch {
-      return;
-    }
+    const { execFileSync: execFileSync4 } = await import("child_process");
+    const currentVersion = resolvePackageVersion();
+    const latestVersion = readLatestPublishedCliVersion(execFileSync4);
+    if (!latestVersion) return;
     if (!currentVersion || !latestVersion || currentVersion === latestVersion) return;
     console.log(source_default2.yellow(`  Update available: ${currentVersion} \u2192 ${latestVersion}`));
     const { doUpdate } = await (await Promise.resolve().then(() => (init_lib(), lib_exports))).default.prompt([{
@@ -87535,7 +87584,8 @@ async function checkForUpdate() {
     }
     const spinner = (await Promise.resolve().then(() => (init_ora(), ora_exports))).default("Updating adhdev CLI...").start();
     try {
-      execSync7("npm install -g adhdev@latest", {
+      const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: "latest" });
+      execFileSync4(installCommand.command, installCommand.args, {
         encoding: "utf-8",
         timeout: 6e4,
         stdio: ["pipe", "pipe", "pipe"]
@@ -87773,18 +87823,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_default2.bold("\n\u{1F527} ADHDev CLI\n"));
   console.log(source_default2.gray("  The `adhdev` command lets you:"));
@@ -87795,15 +87835,7 @@ async function installCliOnly() {
   console.log();
   if (currentVersion) {
     console.log(source_default2.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_default2.gray("  (Already up to date)"));
       return;
@@ -87838,20 +87870,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_default2.gray("  Try: adhdev daemon"));
     console.log();