adhdev 0.9.4 → 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: [],
@@ -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 {
@@ -14599,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();
@@ -14776,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);
         }
@@ -14853,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) {
@@ -15143,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) {
@@ -15381,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,
@@ -32978,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" };
@@ -32999,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" };
@@ -33028,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,
@@ -33036,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}`);
@@ -35638,6 +35600,11 @@ var init_provider_schema = __esm({
       "resume",
       "sessionProbe",
       "approvalPositiveHints",
+      "sessionIdPattern",
+      "historyBehavior",
+      "canonicalHistory",
+      "autoFixProfile",
+      "ideLevelScripts",
       "scripts",
       "vscodeCommands",
       "inputMethod",
@@ -42989,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) {
@@ -43320,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 {
@@ -43385,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) => {
@@ -43448,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();
@@ -87175,7 +87130,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.4" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.5" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -92539,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,
@@ -93007,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;
       }
@@ -93071,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,