adhdev 0.5.7 → 0.5.11

package/dist/index.js

@@ -18655,8 +18655,7 @@ var require_dist = __commonJS({
       // IDE meta
       ideVersion = "";
       instanceId;
-      workspaceFolders = [];
-      activeFile = null;
+      workspace = "";
       // ─── Child Extension Instances ────────────────────
       extensions = /* @__PURE__ */ new Map();
       constructor(provider, instanceKey) {
@@ -18717,8 +18716,7 @@ var require_dist = __commonJS({
             activeModal: this.cachedChat.activeModal || null,
             inputContent: this.cachedChat.inputContent || ""
           } : null,
-          workspaceFolders: this.workspaceFolders,
-          activeFile: this.activeFile,
+          workspace: this.workspace || null,
           extensions: extensionStates,
           cdpConnected: cdp?.isConnected || false,
           currentModel: this.cachedChat?.model || void 0,
@@ -18735,11 +18733,6 @@ var require_dist = __commonJS({
         } else if (event === "cdp_disconnected") {
           this.cachedChat = null;
           this.currentStatus = "idle";
-        } else if (event === "extension_data") {
-          if (data?.workspaceFolders) this.workspaceFolders = data.workspaceFolders;
-          if (data?.activeFile) this.activeFile = data.activeFile;
-          if (data?.ideVersion) this.ideVersion = data.ideVersion;
-          if (data?.instanceId) this.instanceId = data.instanceId;
         } else if (event === "stream_update") {
           const extType = data?.extensionType;
           if (extType && this.extensions.has(extType)) {
@@ -18795,6 +18788,10 @@ var require_dist = __commonJS({
       getExtensionInstances() {
         return [...this.extensions.values()];
       }
+      /** Set workspace from daemon launch context */
+      setWorkspace(workspace) {
+        this.workspace = workspace;
+      }
       // ─── CDP readChat ───────────────────────────────
       async readChat() {
         const { cdp } = this.context;
@@ -22516,7 +22513,7 @@ var require_dist = __commonJS({
         const acpStates = allStates.filter((s) => s.category === "acp");
         const ideSummary = ideStates.map((s) => {
           const msgs = s.activeChat?.messages?.length || 0;
-          const exts = (s.extensions || []).length;
+          const exts = s.extensions.length;
           return `${s.type}(${s.status},${msgs}msg,${exts}ext${s.currentModel ? ",model=" + s.currentModel : ""})`;
         }).join(", ");
         const cliSummary = cliStates.map((s) => `${s.type}(${s.status})`).join(", ");
@@ -22536,13 +22533,12 @@ var require_dist = __commonJS({
           ideType: s.type,
           ideVersion: "",
           instanceId: s.instanceId,
-          workspaceFolders: s.workspaceFolders || [],
-          activeFile: s.activeFile || null,
+          workspace: s.workspace || null,
           terminals: 0,
           aiAgents: [],
           activeChat: s.activeChat,
           chats: [],
-          agentStreams: (s.extensions || []).map((ext) => ({
+          agentStreams: s.extensions.map((ext) => ({
             agentType: ext.type,
             agentName: ext.name,
             extensionId: ext.type,
@@ -22551,7 +22547,7 @@ var require_dist = __commonJS({
             inputContent: ext.activeChat?.inputContent || "",
             activeModal: ext.activeChat?.activeModal || null
           })),
-          cdpConnected: s.cdpConnected || false,
+          cdpConnected: s.cdpConnected,
           currentModel: s.currentModel,
           currentPlan: s.currentPlan,
           currentAutoApprove: s.currentAutoApprove
@@ -22562,8 +22558,8 @@ var require_dist = __commonJS({
           cliType: s.type,
           cliName: s.name,
           status: s.status,
-          mode: s.mode || "terminal",
-          workingDir: s.workingDir || "",
+          mode: s.mode,
+          workspace: s.workspace || "",
           activeChat: s.activeChat
         }));
         const managedAcps = acpStates.map((s) => ({
@@ -22571,19 +22567,22 @@ var require_dist = __commonJS({
           acpType: s.type,
           acpName: s.name,
           status: s.status,
-          mode: "chat",
-          workingDir: s.workingDir || "",
+          mode: s.mode,
+          workspace: s.workspace || "",
           activeChat: s.activeChat,
           currentModel: s.currentModel,
           currentPlan: s.currentPlan,
           acpConfigOptions: s.acpConfigOptions,
-          acpModes: s.acpModes
+          acpModes: s.acpModes,
+          errorMessage: s.errorMessage,
+          errorReason: s.errorReason
         }));
         const cfg = loadConfig3();
         const wsState = getWorkspaceState(cfg);
         const memSnap = getHostMemorySnapshot();
         const payload = {
           daemonMode: true,
+          version: this.deps.daemonVersion || "unknown",
           machineNickname: cfg.machineNickname || null,
           workspaces: wsState.workspaces,
           defaultWorkspaceId: wsState.defaultWorkspaceId,
@@ -22786,12 +22785,14 @@ var require_dist = __commonJS({
       /Type your message/i,
       /^>\s*$/m,
       // '>' alone on its own line
-      /[›➤]\s*$/,
-      /for shortcuts/i,
-      /\?\s*for help/i,
+      /[›❯]\s*[\r\n]/,
+      // prompt char followed by line ending (ANSI-stripped may not have $ at end)
+      /[›❯]\s*$/m,
+      // prompt char at end of line (multiline)
+      /for\s*shortcuts/i,
+      // Claude Code prompt (ANSI strip may remove spaces → 'forshortcuts')
+      /\?\s*for\s*help/i,
       /Press enter/i
-      // NOTE: removed /^[\s\u2500-\u257f]*>\s*$/m — the box-drawing char range is too wide and
-      // can match dialog-clearing ANSI output, causing false prompt detection in approval state.
     ];
     var FALLBACK_GENERATING = [
       /[\u2800-\u28ff]/,
@@ -22803,13 +22804,18 @@ var require_dist = __commonJS({
       // Specific Claude Code status
     ];
     var FALLBACK_APPROVAL = [
-      /Allow\s+once/i,
-      /Always\s+allow/i,
+      /Allow\s*once/i,
+      // ANSI strip may remove spaces
+      /Always\s*allow/i,
       /\(y\/n\)/i,
       /\[Y\/n\]/i,
-      /Run\s+this\s+command/i
-      // NOTE: removed /Do you want to (?:run|execute|allow)/i — too broad, matches AI explanation
-      // text like "Do you want to allow this feature?" causing false approval notifications.
+      /Run\s*this\s*command/i,
+      /Allow\s*tool/i,
+      // Claude Code v2 approval
+      /Yes,?\s*don'?t\s*ask/i,
+      // "Yes, don't ask again" (Claude Code)
+      /Deny/i
+      // Deny button presence = approval dialog
     ];
     function defaultCleanOutput(raw, _lastUserInput) {
       return stripAnsi(raw).trim();
@@ -22844,6 +22850,8 @@ var require_dist = __commonJS({
           maxResponse: t.maxResponse ?? 3e5,
           shutdownGrace: t.shutdownGrace ?? 1e3
         };
+        const rawKeys = provider.approvalKeys;
+        this.approvalKeys = rawKeys && typeof rawKeys === "object" ? rawKeys : {};
       }
       cliType;
       cliName;
@@ -22875,8 +22883,20 @@ var require_dist = __commonJS({
       approvalExitTimeout = null;
       // Resize redraw suppression
       resizeSuppressUntil = 0;
+      // Debug: status transition history
+      statusHistory = [];
+      setStatus(status, trigger) {
+        const prev = this.currentStatus;
+        if (prev === status) return;
+        this.currentStatus = status;
+        this.statusHistory.push({ status, at: Date.now(), trigger });
+        if (this.statusHistory.length > 50) this.statusHistory.shift();
+        LOG5.info("CLI", `[${this.cliType}] status: ${prev} \u2192 ${status}${trigger ? ` (${trigger})` : ""}`);
+      }
       // Resolved timeouts (provider defaults + overrides)
       timeouts;
+      // Provider approval key mapping (e.g. { 0: '1', 1: '2', 2: '3' }) — loaded from provider.json
+      approvalKeys;
       // ─── Lifecycle ─────────────────────────────────
       setServerConn(serverConn) {
         this.serverConn = serverConn;
@@ -22956,11 +22976,11 @@ var require_dist = __commonJS({
         this.ptyProcess.onExit(({ exitCode }) => {
           LOG5.info("CLI", `[${this.cliType}] Exit code ${exitCode}`);
           this.ptyProcess = null;
-          this.currentStatus = "stopped";
+          this.setStatus("stopped", "pty_exit");
           this.ready = false;
           this.onStatusChange?.();
         });
-        this.currentStatus = "starting";
+        this.setStatus("starting", "spawn");
         this.onStatusChange?.();
       }
       // ─── Output state machine ────────────────────────────
@@ -22978,9 +22998,13 @@ var require_dist = __commonJS({
         this.recentOutputBuffer = (this.recentOutputBuffer + cleanData).slice(-1e3);
         if (!this.ready) {
           this.startupBuffer += cleanData;
+          LOG5.info("CLI", `[${this.cliType}] startup chunk (${cleanData.length} chars): ${cleanData.slice(0, 200).replace(/\n/g, "\\n")}`);
           const dialogPatterns = [
             /Do you want to connect/i,
-            /Do you trust the files/i
+            /Do you trust the files/i,
+            /Quick safety check/i,
+            /Is this a project/i,
+            /Enter to confirm/i
           ];
           if (dialogPatterns.some((p) => p.test(this.startupBuffer))) {
             setTimeout(() => this.ptyProcess?.write("\r"), this.timeouts.dialogAccept);
@@ -22989,7 +23013,7 @@ var require_dist = __commonJS({
           }
           if (patterns.prompt.some((p) => p.test(this.startupBuffer))) {
             this.ready = true;
-            this.currentStatus = "idle";
+            this.setStatus("idle", "prompt_matched");
             LOG5.info("CLI", `[${this.cliType}] \u2713 Ready`);
             this.onStatusChange?.();
           }
@@ -23000,12 +23024,12 @@ var require_dist = __commonJS({
           if (this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown) return;
           const ctxLines = this.recentOutputBuffer.split("\n").map((l) => l.trim()).filter((l) => l && !/^[─═╭╮╰╯│]+$/.test(l));
           this.isWaitingForResponse = true;
-          this.currentStatus = "waiting_approval";
+          this.setStatus("waiting_approval", "approval_pattern");
           this.recentOutputBuffer = "";
           this.approvalTransitionBuffer = "";
           this.activeModal = {
             message: ctxLines.slice(-5).join(" ").slice(0, 200) || "Approval required",
-            buttons: ["Allow once", "Always allow", "Deny"]
+            buttons: this.cliType === "claude-cli" ? ["Yes (y)", "Always allow (a)", "Deny (Esc)"] : ["Allow once", "Always allow", "Deny"]
           };
           if (this.idleTimeout) clearTimeout(this.idleTimeout);
           if (this.approvalExitTimeout) clearTimeout(this.approvalExitTimeout);
@@ -23017,7 +23041,7 @@ var require_dist = __commonJS({
               this.recentOutputBuffer = "";
               this.approvalTransitionBuffer = "";
               this.approvalExitTimeout = null;
-              this.currentStatus = this.isWaitingForResponse ? "generating" : "idle";
+              this.setStatus(this.isWaitingForResponse ? "generating" : "idle", "approval_cleared");
               this.onStatusChange?.();
             }
           }, 6e4);
@@ -23033,7 +23057,7 @@ var require_dist = __commonJS({
               clearTimeout(this.approvalExitTimeout);
               this.approvalExitTimeout = null;
             }
-            this.currentStatus = "generating";
+            this.setStatus("generating", "approval_gen_resume");
             this.activeModal = null;
             this.recentOutputBuffer = "";
             this.approvalTransitionBuffer = "";
@@ -23056,7 +23080,7 @@ var require_dist = __commonJS({
           if (patterns.generating.some((p) => p.test(cleanData))) {
             this.isWaitingForResponse = true;
             this.responseBuffer = "";
-            this.currentStatus = "generating";
+            this.setStatus("generating", "autonomous_gen");
             this.onStatusChange?.();
           }
         }
@@ -23065,7 +23089,7 @@ var require_dist = __commonJS({
           if (this.idleTimeout) clearTimeout(this.idleTimeout);
           const stillGenerating = patterns.generating.some((p) => p.test(cleanData));
           if (stillGenerating) {
-            this.currentStatus = "generating";
+            this.setStatus("generating", "still_generating");
             this.idleTimeout = setTimeout(() => {
               if (this.isWaitingForResponse) this.finishResponse();
             }, this.timeouts.generatingIdle);
@@ -23112,7 +23136,7 @@ var require_dist = __commonJS({
         this.responseBuffer = "";
         this.isWaitingForResponse = false;
         this.activeModal = null;
-        this.currentStatus = "idle";
+        this.setStatus("idle", "response_finished");
         this.onStatusChange?.();
       }
       // ─── Public API (CliAdapter interface) ──────────
@@ -23131,7 +23155,7 @@ var require_dist = __commonJS({
         this.messages.push({ role: "user", content: text, timestamp: Date.now() });
         this.isWaitingForResponse = true;
         this.responseBuffer = "";
-        this.currentStatus = "generating";
+        this.setStatus("generating", "sendMessage");
         this.onStatusChange?.();
         this.ptyProcess.write(text + "\r");
         this.responseTimeout = setTimeout(() => {
@@ -23159,7 +23183,7 @@ var require_dist = __commonJS({
             } catch {
             }
             this.ptyProcess = null;
-            this.currentStatus = "stopped";
+            this.setStatus("stopped", "stop_cmd");
             this.ready = false;
             this.onStatusChange?.();
           }, this.timeouts.shutdownGrace);
@@ -23185,9 +23209,13 @@ var require_dist = __commonJS({
       */
       resolveModal(buttonIndex) {
         if (!this.ptyProcess || this.currentStatus !== "waiting_approval") return;
-        const DOWN = "\x1B[B";
-        const keys = DOWN.repeat(Math.max(0, buttonIndex)) + "\r";
-        this.ptyProcess.write(keys);
+        if (buttonIndex in this.approvalKeys) {
+          this.ptyProcess.write(this.approvalKeys[buttonIndex]);
+        } else {
+          const DOWN = "\x1B[B";
+          const keys = DOWN.repeat(Math.max(0, buttonIndex)) + "\r";
+          this.ptyProcess.write(keys);
+        }
       }
       resize(cols, rows) {
         if (this.ptyProcess) {
@@ -23198,6 +23226,44 @@ var require_dist = __commonJS({
           }
         }
       }
+      /**
+      * Full debug state — exposes all internal buffers, status, and patterns for debugging.
+      * Used by DevServer /api/cli/debug endpoint.
+      */
+      getDebugState() {
+        return {
+          type: this.cliType,
+          name: this.cliName,
+          status: this.currentStatus,
+          ready: this.ready,
+          workingDir: this.workingDir,
+          messages: this.messages.slice(-20),
+          messageCount: this.messages.length,
+          // Buffers
+          startupBuffer: this.startupBuffer.slice(-500),
+          recentOutputBuffer: this.recentOutputBuffer.slice(-500),
+          responseBuffer: this.responseBuffer.slice(-500),
+          approvalTransitionBuffer: this.approvalTransitionBuffer.slice(-500),
+          // State
+          isWaitingForResponse: this.isWaitingForResponse,
+          activeModal: this.activeModal,
+          lastApprovalResolvedAt: this.lastApprovalResolvedAt,
+          resizeSuppressUntil: this.resizeSuppressUntil,
+          // Provider patterns (serialized)
+          patterns: {
+            prompt: this.provider.patterns.prompt.map((p) => p.toString()),
+            generating: this.provider.patterns.generating.map((p) => p.toString()),
+            approval: this.provider.patterns.approval.map((p) => p.toString()),
+            ready: this.provider.patterns.ready.map((p) => p.toString())
+          },
+          // Status history
+          statusHistory: this.statusHistory.slice(-30),
+          // Timeouts config
+          timeouts: this.timeouts,
+          // PTY alive
+          ptyAlive: !!this.ptyProcess
+        };
+      }
     };
     init_config();
     init_workspaces();
@@ -23222,6 +23288,8 @@ var require_dist = __commonJS({
       generatingStartedAt = 0;
       settings = {};
       monitor;
+      generatingDebounceTimer = null;
+      generatingDebouncePending = null;
       historyWriter;
       instanceId;
       // ─── Lifecycle ─────────────────────────────────
@@ -23288,7 +23356,7 @@ var require_dist = __commonJS({
             activeModal: adapterStatus.activeModal,
             inputContent: ""
           },
-          workingDir: this.workingDir,
+          workspace: this.workingDir,
           instanceId: this.instanceId,
           lastUpdated: Date.now(),
           settings: this.settings,
@@ -23317,8 +23385,24 @@ var require_dist = __commonJS({
           LOG5.info("CLI", `[${this.type}] status: ${this.lastStatus} \u2192 ${newStatus}`);
           if (this.lastStatus === "idle" && newStatus === "generating") {
             this.generatingStartedAt = now;
-            this.pushEvent({ event: "agent:generating_started", chatTitle, timestamp: now });
+            if (this.generatingDebounceTimer) clearTimeout(this.generatingDebounceTimer);
+            this.generatingDebouncePending = { chatTitle, timestamp: now };
+            this.generatingDebounceTimer = setTimeout(() => {
+              if (this.generatingDebouncePending) {
+                this.pushEvent({ event: "agent:generating_started", ...this.generatingDebouncePending });
+                this.generatingDebouncePending = null;
+              }
+              this.generatingDebounceTimer = null;
+            }, 1e3);
           } else if (newStatus === "waiting_approval") {
+            if (this.generatingDebouncePending) {
+              if (this.generatingDebounceTimer) {
+                clearTimeout(this.generatingDebounceTimer);
+                this.generatingDebounceTimer = null;
+              }
+              this.pushEvent({ event: "agent:generating_started", ...this.generatingDebouncePending });
+              this.generatingDebouncePending = null;
+            }
             if (!this.generatingStartedAt) this.generatingStartedAt = now;
             const modal = adapterStatus.activeModal;
             LOG5.info("CLI", `[${this.type}] approval modal: "${modal?.message?.slice(0, 80) ?? "none"}"`);
@@ -23331,10 +23415,24 @@ var require_dist = __commonJS({
             });
           } else if (newStatus === "idle" && (this.lastStatus === "generating" || this.lastStatus === "waiting_approval")) {
             const duration3 = this.generatingStartedAt ? Math.round((now - this.generatingStartedAt) / 1e3) : 0;
-            LOG5.info("CLI", `[${this.type}] completed in ${duration3}s`);
-            this.pushEvent({ event: "agent:generating_completed", chatTitle, duration: duration3, timestamp: now });
+            if (this.generatingDebouncePending) {
+              LOG5.info("CLI", `[${this.type}] suppressed short generating (${now - this.generatingStartedAt}ms)`);
+              if (this.generatingDebounceTimer) {
+                clearTimeout(this.generatingDebounceTimer);
+                this.generatingDebounceTimer = null;
+              }
+              this.generatingDebouncePending = null;
+            } else {
+              LOG5.info("CLI", `[${this.type}] completed in ${duration3}s`);
+              this.pushEvent({ event: "agent:generating_completed", chatTitle, duration: duration3, timestamp: now });
+            }
             this.generatingStartedAt = 0;
           } else if (newStatus === "stopped") {
+            if (this.generatingDebounceTimer) {
+              clearTimeout(this.generatingDebounceTimer);
+              this.generatingDebounceTimer = null;
+            }
+            this.generatingDebouncePending = null;
             this.pushEvent({ event: "agent:stopped", chatTitle, timestamp: now });
           }
           this.lastStatus = newStatus;
@@ -23479,7 +23577,7 @@ var require_dist = __commonJS({
             } : null,
             inputContent: ""
           },
-          workingDir: this.workingDir,
+          workspace: this.workingDir,
           currentModel: this.currentModel,
           currentPlan: this.currentMode,
           instanceId: this.instanceId,
@@ -23490,8 +23588,8 @@ var require_dist = __commonJS({
           acpConfigOptions: this.configOptions,
           acpModes: this.availableModes,
           // Error details for dashboard display
-          errorMessage: this.errorMessage,
-          errorReason: this.errorReason
+          errorMessage: this.errorMessage || void 0,
+          errorReason: this.errorReason || void 0
         };
       }
       onEvent(event, data) {
@@ -23974,29 +24072,27 @@ var require_dist = __commonJS({
       handleSessionUpdate(params) {
         if (!params) return;
         const update = params.update;
-        this.log.debug(`[${this.type}] sessionUpdate: ${update.sessionUpdate} | keys=${Object.keys(update).join(",")}`);
+        this.log.debug(`[${this.type}] sessionUpdate: ${update.sessionUpdate}`);
         switch (update.sessionUpdate) {
           case "agent_message_chunk": {
             const content = update.content;
-            if (content?.type === "text" && content.text) {
+            if (content.type === "text") {
               this.partialContent += content.text;
-            } else if (content?.type === "image") {
+            } else if (content.type === "image") {
               this.partialBlocks.push({
                 type: "image",
-                data: content.data || "",
-                mimeType: content.mimeType || "image/png",
-                uri: content.uri
+                data: content.data,
+                mimeType: content.mimeType
               });
-            } else if (content?.type === "resource_link") {
+            } else if (content.type === "resource_link") {
               this.partialBlocks.push({
                 type: "resource_link",
-                uri: content.uri || "",
+                uri: content.uri,
                 name: content.name || "resource",
-                title: content.title,
-                mimeType: content.mimeType,
-                size: content.size
+                title: content.title ?? void 0,
+                mimeType: content.mimeType ?? void 0
               });
-            } else if (content?.type === "resource") {
+            } else if (content.type === "resource") {
               this.partialBlocks.push({
                 type: "resource",
                 resource: content.resource
@@ -25709,6 +25805,8 @@ async (params) => {
       server = null;
       providerLoader;
       cdpManagers;
+      instanceManager;
+      cliManager;
       logFn;
       sseClients = [];
       watchScriptPath = null;
@@ -25718,9 +25816,13 @@ async (params) => {
       autoImplProcess = null;
       autoImplSSEClients = [];
       autoImplStatus = { running: false, type: null, progress: [] };
+      // CLI debug SSE
+      cliSSEClients = [];
       constructor(options) {
         this.providerLoader = options.providerLoader;
         this.cdpManagers = options.cdpManagers;
+        this.instanceManager = options.instanceManager || null;
+        this.cliManager = options.cliManager || null;
         this.logFn = options.logFn || LOG5.forComponent("DevServer").asLogFn();
       }
       log(msg) {
@@ -25747,6 +25849,15 @@ async (params) => {
         { method: "POST", pattern: "/api/watch/stop", handler: (q, s) => this.handleWatchStop(q, s) },
         { method: "GET", pattern: "/api/watch/events", handler: (q, s) => this.handleSSE(q, s) },
         { method: "POST", pattern: "/api/scaffold", handler: (q, s) => this.handleScaffold(q, s) },
+        // CLI Debug routes
+        { method: "GET", pattern: "/api/cli/status", handler: (q, s) => this.handleCliStatus(q, s) },
+        { method: "POST", pattern: "/api/cli/launch", handler: (q, s) => this.handleCliLaunch(q, s) },
+        { method: "POST", pattern: "/api/cli/send", handler: (q, s) => this.handleCliSend(q, s) },
+        { method: "POST", pattern: "/api/cli/resolve", handler: (q, s) => this.handleCliResolve(q, s) },
+        { method: "POST", pattern: "/api/cli/raw", handler: (q, s) => this.handleCliRaw(q, s) },
+        { method: "POST", pattern: "/api/cli/stop", handler: (q, s) => this.handleCliStop(q, s) },
+        { method: "GET", pattern: "/api/cli/events", handler: (q, s) => this.handleCliSSE(q, s) },
+        { method: "GET", pattern: /^\/api\/cli\/debug\/([^/]+)$/, handler: (q, s, p) => this.handleCliDebug(p[0], q, s) },
         // Dynamic routes (provider :type param)
         { method: "POST", pattern: /^\/api\/providers\/([^/]+)\/script$/, handler: (q, s, p) => this.handleRunScript(p[0], q, s) },
         { method: "GET", pattern: /^\/api\/providers\/([^/]+)\/files$/, handler: (q, s, p) => this.handleListFiles(p[0], q, s) },
@@ -28013,6 +28124,251 @@ data: ${JSON.stringify(msg.data)}
           });
         });
       }
+      // ─── CLI Debug Handlers ──────────────────────────────
+      /** GET /api/cli/status — list all running CLI/ACP instances with state */
+      async handleCliStatus(_req, res) {
+        if (!this.instanceManager) {
+          this.json(res, 503, { error: "InstanceManager not available (daemon not fully initialized)" });
+          return;
+        }
+        const allStates = this.instanceManager.collectAllStates();
+        const cliStates = allStates.filter((s) => s.category === "cli" || s.category === "acp");
+        const result = cliStates.map((s) => ({
+          instanceId: s.instanceId,
+          type: s.type,
+          name: s.name,
+          category: s.category,
+          status: s.status,
+          mode: s.mode,
+          workspace: s.workspace,
+          messageCount: s.activeChat?.messages?.length || 0,
+          lastMessage: s.activeChat?.messages?.slice(-1)[0] || null,
+          activeModal: s.activeChat?.activeModal || null,
+          pendingEvents: s.pendingEvents || [],
+          currentModel: s.currentModel,
+          settings: s.settings
+        }));
+        this.json(res, 200, { instances: result, count: result.length });
+      }
+      /** POST /api/cli/launch — launch a CLI agent { type, workingDir?, args? } */
+      async handleCliLaunch(req, res) {
+        if (!this.cliManager) {
+          this.json(res, 503, { error: "CliManager not available" });
+          return;
+        }
+        const body = await this.readBody(req);
+        const { type, workingDir, args } = body;
+        if (!type) {
+          this.json(res, 400, { error: "type required (e.g. claude-cli, gemini-cli)" });
+          return;
+        }
+        try {
+          await this.cliManager.startSession(type, workingDir || process.cwd(), args || []);
+          this.json(res, 200, { launched: true, type, workspace: workingDir || process.cwd() });
+        } catch (e) {
+          this.json(res, 500, { error: `Launch failed: ${e.message}` });
+        }
+      }
+      /** POST /api/cli/send — send message to a running CLI { type, text } */
+      async handleCliSend(req, res) {
+        if (!this.instanceManager) {
+          this.json(res, 503, { error: "InstanceManager not available" });
+          return;
+        }
+        const body = await this.readBody(req);
+        const { type, text, instanceId } = body;
+        if (!text) {
+          this.json(res, 400, { error: "text required" });
+          return;
+        }
+        const allStates = this.instanceManager.collectAllStates();
+        const target = allStates.find(
+          (s) => (s.category === "cli" || s.category === "acp") && (instanceId ? s.instanceId === instanceId : s.type === type)
+        );
+        if (!target) {
+          this.json(res, 404, { error: `No running instance found for: ${type || instanceId}` });
+          return;
+        }
+        try {
+          this.instanceManager.sendEvent(target.instanceId, "send_message", { text });
+          this.json(res, 200, { sent: true, type: target.type, instanceId: target.instanceId });
+        } catch (e) {
+          this.json(res, 500, { error: `Send failed: ${e.message}` });
+        }
+      }
+      /** POST /api/cli/stop — stop a running CLI { type } */
+      async handleCliStop(req, res) {
+        if (!this.instanceManager) {
+          this.json(res, 503, { error: "InstanceManager not available" });
+          return;
+        }
+        const body = await this.readBody(req);
+        const { type, instanceId } = body;
+        const allStates = this.instanceManager.collectAllStates();
+        const target = allStates.find(
+          (s) => (s.category === "cli" || s.category === "acp") && (instanceId ? s.instanceId === instanceId : s.type === type)
+        );
+        if (!target) {
+          this.json(res, 404, { error: `No running instance found for: ${type || instanceId}` });
+          return;
+        }
+        try {
+          this.instanceManager.removeInstance(target.instanceId);
+          this.json(res, 200, { stopped: true, type: target.type, instanceId: target.instanceId });
+        } catch (e) {
+          this.json(res, 500, { error: `Stop failed: ${e.message}` });
+        }
+      }
+      /** GET /api/cli/events — SSE stream of CLI status events */
+      handleCliSSE(_req, res) {
+        res.writeHead(200, {
+          "Content-Type": "text/event-stream",
+          "Cache-Control": "no-cache",
+          "Connection": "keep-alive",
+          "Access-Control-Allow-Origin": "*"
+        });
+        res.write('data: {"type":"connected"}\n\n');
+        this.cliSSEClients.push(res);
+        if (this.cliSSEClients.length === 1 && this.instanceManager) {
+          this.instanceManager.onEvent((event) => {
+            this.sendCliSSE(event);
+          });
+        }
+        if (this.instanceManager) {
+          const allStates = this.instanceManager.collectAllStates();
+          const cliStates = allStates.filter((s) => s.category === "cli" || s.category === "acp");
+          for (const s of cliStates) {
+            this.sendCliSSE({ event: "snapshot", providerType: s.type, status: s.status, instanceId: s.instanceId });
+          }
+        }
+        _req.on("close", () => {
+          this.cliSSEClients = this.cliSSEClients.filter((c) => c !== res);
+        });
+      }
+      sendCliSSE(data) {
+        const msg = `data: ${JSON.stringify({ ...data, timestamp: Date.now() })}
+
+`;
+        for (const client of this.cliSSEClients) {
+          try {
+            client.write(msg);
+          } catch {
+          }
+        }
+      }
+      /** GET /api/cli/debug/:type — full internal debug state of a CLI adapter */
+      async handleCliDebug(type, _req, res) {
+        if (!this.instanceManager) {
+          this.json(res, 503, { error: "InstanceManager not available" });
+          return;
+        }
+        const allStates = this.instanceManager.collectAllStates();
+        const target = allStates.find(
+          (s) => (s.category === "cli" || s.category === "acp") && s.type === type
+        );
+        if (!target) {
+          this.json(res, 404, { error: `No running instance for: ${type}`, available: allStates.filter((s) => s.category === "cli" || s.category === "acp").map((s) => s.type) });
+          return;
+        }
+        const instance = this.instanceManager.getInstance(target.instanceId);
+        if (!instance) {
+          this.json(res, 404, { error: `Instance not found: ${target.instanceId}` });
+          return;
+        }
+        try {
+          const adapter = instance.getAdapter?.() || instance.adapter;
+          if (adapter && typeof adapter.getDebugState === "function") {
+            const debugState = adapter.getDebugState();
+            this.json(res, 200, {
+              instanceId: target.instanceId,
+              providerState: {
+                type: target.type,
+                name: target.name,
+                status: target.status,
+                mode: "mode" in target ? target.mode : void 0
+              },
+              debug: debugState
+            });
+          } else {
+            this.json(res, 200, {
+              instanceId: target.instanceId,
+              providerState: target,
+              debug: null,
+              message: "No debug state available (adapter.getDebugState not found)"
+            });
+          }
+        } catch (e) {
+          this.json(res, 500, { error: `Debug state failed: ${e.message}` });
+        }
+      }
+      /** POST /api/cli/resolve — resolve an approval modal { type, buttonIndex } */
+      async handleCliResolve(req, res) {
+        const body = await this.readBody(req);
+        const { type, buttonIndex, instanceId } = body;
+        if (buttonIndex === void 0 || buttonIndex === null) {
+          this.json(res, 400, { error: "buttonIndex required (0=Yes, 1=Always, 2=Deny)" });
+          return;
+        }
+        if (!this.cliManager) {
+          this.json(res, 503, { error: "CliManager not available" });
+          return;
+        }
+        let adapter = null;
+        for (const [, a] of this.cliManager.adapters) {
+          if (type && a.cliType === type) {
+            adapter = a;
+            break;
+          }
+        }
+        if (!adapter) {
+          this.json(res, 404, { error: `No running adapter for: ${type || instanceId}` });
+          return;
+        }
+        try {
+          if (typeof adapter.resolveModal === "function") {
+            adapter.resolveModal(buttonIndex);
+            this.json(res, 200, { resolved: true, type, buttonIndex });
+          } else {
+            this.json(res, 400, { error: "resolveModal not available on this adapter" });
+          }
+        } catch (e) {
+          this.json(res, 500, { error: `Resolve failed: ${e.message}` });
+        }
+      }
+      /** POST /api/cli/raw — send raw keystrokes to PTY { type, keys } */
+      async handleCliRaw(req, res) {
+        const body = await this.readBody(req);
+        const { type, keys, instanceId } = body;
+        if (!keys) {
+          this.json(res, 400, { error: "keys required (raw string to send to PTY)" });
+          return;
+        }
+        if (!this.cliManager) {
+          this.json(res, 503, { error: "CliManager not available" });
+          return;
+        }
+        let adapter = null;
+        for (const [, a] of this.cliManager.adapters) {
+          if (type && a.cliType === type) {
+            adapter = a;
+            break;
+          }
+        }
+        if (!adapter) {
+          this.json(res, 404, { error: `No running adapter for: ${type || instanceId}` });
+          return;
+        }
+        try {
+          if (typeof adapter.writeRaw === "function") {
+            adapter.writeRaw(keys);
+            this.json(res, 200, { sent: true, type, keysLength: keys.length });
+          } else {
+            this.json(res, 400, { error: "writeRaw not available on this adapter" });
+          }
+        } catch (e) {
+          this.json(res, 500, { error: `Raw send failed: ${e.message}` });
+        }
+      }
     };
     var import_child_process8 = require("child_process");
     var EXTENSION_CATALOG = [
@@ -28357,7 +28713,8 @@ var init_server_connection = __esm({
           this.ws = new import_ws.default(fullUrl, {
             headers: {
               "X-ADHDev-Token": this.options.token,
-              "X-ADHDev-IDE": JSON.stringify(this.options.cliInfo)
+              "X-ADHDev-IDE": JSON.stringify(this.options.cliInfo),
+              "X-ADHDev-Version": this.options.daemonVersion || "unknown"
             }
           });
           this.ws.on("open", () => this.onOpen());
@@ -28455,6 +28812,19 @@ var init_server_connection = __esm({
             import_daemon_core.LOG.error("Server", `Auth failed: ${message.payload.reason}`);
             this.setState("error");
             return;
+          } else if (message.type === "version_mismatch") {
+            const p = message.payload;
+            import_daemon_core.LOG.info("Server", `
+  \u{1F504} Update available: v${p.current} \u2192 v${p.latest}`);
+            import_daemon_core.LOG.info("Server", `     Run: adhdev daemon:upgrade
+`);
+          } else if (message.type === "force_update_required") {
+            const p = message.payload;
+            import_daemon_core.LOG.error("Server", `
+  \u26D4 Daemon v${this.options.daemonVersion} is no longer compatible.`);
+            import_daemon_core.LOG.error("Server", `     Minimum required: v${p.minVersion}`);
+            import_daemon_core.LOG.error("Server", `     Run: adhdev daemon:upgrade
+`);
           }
           const handlers = this.messageHandlers.get(message.type);
           if (handlers) {
@@ -29631,6 +30001,7 @@ var init_adhdev_daemon = __esm({
         this.serverConn = new ServerConnection({
           serverUrl: options.serverUrl || config2.serverUrl,
           token: config2.connectionToken,
+          daemonVersion: pkgVersion,
           cliInfo: {
             type: "adhdev-daemon",
             version: pkgVersion,
@@ -29716,6 +30087,7 @@ var init_adhdev_daemon = __esm({
           adapters: this.components.cliManager.adapters,
           detectedIdes: this.components.detectedIdes.value,
           ideType: this.ideType,
+          daemonVersion: pkgVersion,
           instanceManager: this.components.instanceManager
         });
         this.statusReporter.startReporting();
@@ -29726,7 +30098,12 @@ var init_adhdev_daemon = __esm({
         process.on("SIGINT", () => this.stop());
         process.on("SIGTERM", () => this.stop());
         if (options.dev) {
-          const devServer = new import_daemon_core4.DevServer({ providerLoader: this.components.providerLoader, cdpManagers: this.components.cdpManagers });
+          const devServer = new import_daemon_core4.DevServer({
+            providerLoader: this.components.providerLoader,
+            cdpManagers: this.components.cdpManagers,
+            instanceManager: this.components.instanceManager,
+            cliManager: this.components.cliManager
+          });
           await devServer.start();
         }
         this.printBanner(options, config2.serverUrl);
@@ -30081,54 +30458,56 @@ async function quickSetup() {
   console.log(import_chalk2.default.bold("\n\u{1F680} Quick Setup\n"));
   const spinner = (0, import_ora.default)("Detecting installed IDEs...").start();
   const ides = await (0, import_daemon_core5.detectIDEs)();
-  const installedIDEs = ides.filter((i) => i.installed && i.cliCommand);
+  const installedIDEs = ides.filter((i) => i.installed);
   spinner.stop();
+  let selectedIDEs = [];
   if (installedIDEs.length === 0) {
-    console.log(import_chalk2.default.red("\u2717 No supported IDE with CLI found."));
+    console.log(import_chalk2.default.yellow("\u26A0 No supported IDEs auto-detected."));
+    console.log(import_chalk2.default.gray("  This is fine \u2014 the daemon will detect IDEs at runtime via CDP."));
     console.log(import_chalk2.default.gray("  Supported: VS Code, Cursor, Antigravity, Windsurf, VSCodium"));
-    return;
-  }
-  console.log(import_chalk2.default.green(`Found ${installedIDEs.length} IDE(s):
+    console.log();
+  } else {
+    console.log(import_chalk2.default.green(`Found ${installedIDEs.length} IDE(s):
 `));
-  installedIDEs.forEach((ide) => {
-    const version2 = ide.version ? import_chalk2.default.gray(` v${ide.version}`) : "";
-    console.log(`  ${import_chalk2.default.green("\u2713")} ${ide.icon} ${import_chalk2.default.bold(ide.displayName)}${version2}`);
-  });
-  console.log();
-  let selectedIDEs;
-  if (installedIDEs.length === 1) {
-    selectedIDEs = installedIDEs;
-    console.log(import_chalk2.default.gray(`  Auto-selected: ${installedIDEs[0].displayName}
+    installedIDEs.forEach((ide) => {
+      const version2 = ide.version ? import_chalk2.default.gray(` v${ide.version}`) : "";
+      console.log(`  ${import_chalk2.default.green("\u2713")} ${ide.icon} ${import_chalk2.default.bold(ide.displayName)}${version2}`);
+    });
+    console.log();
+    if (installedIDEs.length === 1) {
+      selectedIDEs = installedIDEs;
+      console.log(import_chalk2.default.gray(`  Auto-selected: ${installedIDEs[0].displayName}
 `));
-  } else {
-    const { selectedIdeIds } = await import_inquirer.default.prompt([
-      {
-        type: "checkbox",
-        name: "selectedIdeIds",
-        message: "Select IDEs to set up (Space to toggle, Enter to confirm):",
-        choices: installedIDEs.map((ide) => ({
-          name: `${ide.icon} ${ide.displayName}${ide.version ? import_chalk2.default.gray(` v${ide.version}`) : ""}`,
-          value: ide.id,
-          checked: true
-          // All selected by default
-        })),
-        validate: (input) => input.length > 0 ? true : "Select at least one IDE"
-      }
-    ]);
-    selectedIDEs = installedIDEs.filter((i) => selectedIdeIds.includes(i.id));
+    } else {
+      const { selectedIdeIds } = await import_inquirer.default.prompt([
+        {
+          type: "checkbox",
+          name: "selectedIdeIds",
+          message: "Select IDEs to set up (Space to toggle, Enter to confirm):",
+          choices: installedIDEs.map((ide) => ({
+            name: `${ide.icon} ${ide.displayName}${ide.version ? import_chalk2.default.gray(` v${ide.version}`) : ""}`,
+            value: ide.id,
+            checked: true
+            // All selected by default
+          })),
+          validate: (input) => input.length > 0 ? true : "Select at least one IDE"
+        }
+      ]);
+      selectedIDEs = installedIDEs.filter((i) => selectedIdeIds.includes(i.id));
+    }
   }
   console.log(DIVIDER);
   const loginResult = await loginFlow();
   if (!loginResult) {
     console.log(import_chalk2.default.yellow("\u26A0 Setup completed without login. You can login later with `adhdev setup`."));
   }
-  if (loginResult?.connectionToken) {
+  if (loginResult?.connectionToken && selectedIDEs.length > 0) {
     for (const ide of selectedIDEs) {
       await injectTokenToIDE(ide, loginResult.connectionToken);
     }
   }
   const ideIds = selectedIDEs.map((i) => i.id);
-  (0, import_daemon_core5.markSetupComplete)(ideIds, ["adhdev"]);
+  (0, import_daemon_core5.markSetupComplete)(ideIds.length > 0 ? ideIds : ["daemon-only"], ["adhdev"]);
   if (loginResult) {
     (0, import_daemon_core5.updateConfig)({
       connectionToken: loginResult.connectionToken,
@@ -30138,10 +30517,14 @@ async function quickSetup() {
   }
   console.log(DIVIDER);
   console.log(import_chalk2.default.bold("\n\u{1F389} Setup Complete!\n"));
-  if (selectedIDEs.length === 1) {
-    console.log(`  ${import_chalk2.default.bold("IDE:")}     ${selectedIDEs[0].icon} ${selectedIDEs[0].displayName}`);
+  if (selectedIDEs.length > 0) {
+    if (selectedIDEs.length === 1) {
+      console.log(`  ${import_chalk2.default.bold("IDE:")}     ${selectedIDEs[0].icon} ${selectedIDEs[0].displayName}`);
+    } else {
+      console.log(`  ${import_chalk2.default.bold("IDEs:")}    ${selectedIDEs.map((i) => `${i.icon} ${i.displayName}`).join(", ")}`);
+    }
   } else {
-    console.log(`  ${import_chalk2.default.bold("IDEs:")}    ${selectedIDEs.map((i) => `${i.icon} ${i.displayName}`).join(", ")}`);
+    console.log(`  ${import_chalk2.default.bold("IDEs:")}    ${import_chalk2.default.gray("None detected (daemon will auto-detect at runtime)")}`);
   }
   console.log(`  ${import_chalk2.default.bold("User:")}    ${loginResult?.email || "not logged in"}`);
   console.log(`  ${import_chalk2.default.bold("Status:")}  ${import_chalk2.default.green("Ready to connect")}`);
@@ -30164,7 +30547,26 @@ async function customSetup() {
   const installedIDEs = ides.filter((i) => i.installed);
   spinner.stop();
   if (installedIDEs.length === 0) {
-    console.log(import_chalk2.default.yellow("\u26A0 No supported IDEs found."));
+    console.log(import_chalk2.default.yellow("\u26A0 No supported IDEs auto-detected."));
+    console.log(import_chalk2.default.gray("  The daemon will detect IDEs at runtime via CDP."));
+    console.log();
+    console.log(DIVIDER);
+    const loginResult2 = await loginFlow();
+    (0, import_daemon_core5.markSetupComplete)(["daemon-only"], ["adhdev"]);
+    if (loginResult2) {
+      (0, import_daemon_core5.updateConfig)({
+        connectionToken: loginResult2.connectionToken,
+        userEmail: loginResult2.email,
+        userName: loginResult2.name
+      });
+    }
+    console.log(DIVIDER);
+    console.log(import_chalk2.default.bold("\n\u{1F389} Setup Complete!\n"));
+    console.log(`  ${import_chalk2.default.bold("IDEs:")}    ${import_chalk2.default.gray("None detected (daemon will auto-detect at runtime)")}`);
+    console.log(`  ${import_chalk2.default.bold("User:")}    ${loginResult2?.email || "not logged in"}`);
+    console.log(`  ${import_chalk2.default.bold("Status:")}  ${import_chalk2.default.green("Ready to connect")}`);
+    console.log();
+    await startDaemonFlow();
     return;
   }
   console.log(import_chalk2.default.green(`Found ${installedIDEs.length} IDE(s):