adhdev 0.1.37 → 0.1.39

package/dist/index.js

@@ -696,6 +696,16 @@ var init_chunk_BFUPGBW2 = __esm({
   }
 });
 
+// ../core/dist/chunk-SVQNBQ2O.js
+var DEFAULT_DAEMON_PORT, DAEMON_WS_PATH;
+var init_chunk_SVQNBQ2O = __esm({
+  "../core/dist/chunk-SVQNBQ2O.js"() {
+    "use strict";
+    DEFAULT_DAEMON_PORT = 19222;
+    DAEMON_WS_PATH = "/ipc";
+  }
+});
+
 // ../core/dist/index.js
 var dist_exports = {};
 __export(dist_exports, {
@@ -711,15 +721,13 @@ __export(dist_exports, {
   getInstalledIDEs: () => getInstalledIDEs,
   isIdeInstalled: () => isIdeInstalled
 });
-var DEFAULT_DAEMON_PORT, DAEMON_WS_PATH;
 var init_dist = __esm({
   "../core/dist/index.js"() {
     "use strict";
     init_chunk_PP6RFM75();
     init_chunk_ZZGGFYGY();
     init_chunk_BFUPGBW2();
-    DEFAULT_DAEMON_PORT = 19222;
-    DAEMON_WS_PATH = "/ipc";
+    init_chunk_SVQNBQ2O();
   }
 });
 
@@ -786,6 +794,22 @@ function isSetupComplete() {
 function resetConfig() {
   saveConfig({ ...DEFAULT_CONFIG });
 }
+function addCliHistory(entry) {
+  const config = loadConfig();
+  const history = config.cliHistory || [];
+  const argsKey = (entry.cliArgs || []).join(" ");
+  const filtered = history.filter((h) => {
+    const hArgsKey = (h.cliArgs || []).join(" ");
+    return !(h.cliType === entry.cliType && h.dir === entry.dir && hArgsKey === argsKey);
+  });
+  filtered.unshift({
+    ...entry,
+    timestamp: Date.now(),
+    label: entry.label || `${entry.cliType} \xB7 ${entry.dir.split("/").filter(Boolean).pop() || "root"}${argsKey ? ` (${argsKey})` : ""}`
+  });
+  config.cliHistory = filtered.slice(0, 20);
+  saveConfig(config);
+}
 var import_os2, import_path, import_fs2, DEFAULT_CONFIG;
 var init_config = __esm({
   "src/config.ts"() {
@@ -808,7 +832,9 @@ var init_config = __esm({
       setupDate: null,
       configuredCLIs: [],
       enabledIdes: [],
-      recentCliWorkspaces: []
+      recentCliWorkspaces: [],
+      machineNickname: null,
+      cliHistory: []
     };
   }
 });
@@ -1466,7 +1492,7 @@ function findGeminiBinary() {
     return isWin ? "gemini.cmd" : "gemini";
   }
 }
-var os3, import_child_process5, pty, PROMPT_PATTERNS, STARTUP_DIALOG_PATTERNS, GeminiCliAdapter;
+var os3, import_child_process5, pty, PROMPT_PATTERNS, STARTUP_DIALOG_PATTERNS, GENERATING_PATTERNS, APPROVAL_PATTERNS, GeminiCliAdapter;
 var init_gemini_cli = __esm({
   "src/cli-adapters/gemini-cli.ts"() {
     "use strict";
@@ -1490,6 +1516,24 @@ var init_gemini_cli = __esm({
       /● 1\. Yes/,
       /2\. No/
     ];
+    GENERATING_PATTERNS = [
+      /esc\s+to\s+interrupt/i,
+      /⎋\s*to\s+interrupt/i,
+      /press\s+esc\s+to\s+interrupt/i,
+      /accept\s+edits\s+on/i,
+      // ⏵⏵ accept edits on (shift+tab to cycle) · esc to interrupt
+      /shift\+tab\s+to\s+cycle/i,
+      /ctrl\+c\s+to\s+(cancel|interrupt|stop)/i
+    ];
+    APPROVAL_PATTERNS = [
+      /allow\s+once/i,
+      /always\s+allow/i,
+      /\(y\)es\s*\/\s*\(n\)o/i,
+      /\[y\/n\/a\]/i,
+      /do\s+you\s+want\s+to\s+(run|proceed|allow|execute)/i,
+      /do\s+you\s+want\s+to\s+proceed/i,
+      /proceed\?/i
+    ];
     GeminiCliAdapter = class {
       cliType = "gemini-cli";
       cliName = "Gemini CLI";
@@ -1500,7 +1544,10 @@ var init_gemini_cli = __esm({
       onStatusChange = null;
       // 응답 버퍼링
       responseBuffer = "";
+      recentOutputBuffer = "";
+      // 최근 ~1000자 rolling buffer (청크 경계 패턴 감지용)
       isWaitingForResponse = false;
+      activeModal = null;
       responseTimeout = null;
       idleTimeout = null;
       ready = false;
@@ -1569,6 +1616,7 @@ var init_gemini_cli = __esm({
       }
       handleOutput(rawData) {
         const cleanData = stripAnsi(rawData);
+        this.recentOutputBuffer = (this.recentOutputBuffer + cleanData).slice(-1e3);
         if (!this.ready) {
           this.startupBuffer += cleanData;
           const preview = cleanData.trim().slice(0, 100);
@@ -1593,9 +1641,45 @@ var init_gemini_cli = __esm({
           }
           return;
         }
+        const hasApprovalSignal = APPROVAL_PATTERNS.some((p) => p.test(this.recentOutputBuffer));
+        if (hasApprovalSignal && this.currentStatus !== "waiting_approval") {
+          console.log("[GeminiAdapter] \u23F3 Approval required");
+          this.isWaitingForResponse = true;
+          this.currentStatus = "waiting_approval";
+          const ctxLines = cleanData.split("\n").map((l) => l.trim()).filter((l) => l && !/^[─═╭╮╰╯│]+$/.test(l));
+          const ctxMsg = ctxLines.slice(-5).join(" ").slice(0, 200);
+          this.activeModal = { message: ctxMsg || "Approval required", buttons: ["Yes", "No"] };
+          if (this.idleTimeout) clearTimeout(this.idleTimeout);
+          this.onStatusChange?.();
+          return;
+        }
+        if (this.currentStatus === "waiting_approval") {
+          const hasGeneratingResume = GENERATING_PATTERNS.some((p) => p.test(cleanData));
+          const hasPromptResume = PROMPT_PATTERNS.some((p) => p.test(cleanData));
+          if (hasGeneratingResume) {
+            console.log("[GeminiAdapter] \u2705 Approval granted, generating resumed");
+            this.currentStatus = "generating";
+            this.activeModal = null;
+            this.onStatusChange?.();
+          } else if (hasPromptResume) {
+            console.log("[GeminiAdapter] \u{1F6AB} Approval denied or skipped");
+            this.activeModal = null;
+            this.finishResponse();
+          }
+          return;
+        }
         if (this.isWaitingForResponse) {
           this.responseBuffer += cleanData;
           if (this.idleTimeout) clearTimeout(this.idleTimeout);
+          const stillGenerating = GENERATING_PATTERNS.some((p) => p.test(cleanData));
+          if (stillGenerating) {
+            this.currentStatus = "generating";
+            this.idleTimeout = setTimeout(() => {
+              if (this.isWaitingForResponse) this.finishResponse();
+            }, 4e3);
+            this.onStatusChange?.();
+            return;
+          }
           const hasPrompt = PROMPT_PATTERNS.some((p) => p.test(this.responseBuffer));
           if (hasPrompt) {
             this.finishResponse();
@@ -1649,6 +1733,7 @@ var init_gemini_cli = __esm({
         }
         this.responseBuffer = "";
         this.isWaitingForResponse = false;
+        this.activeModal = null;
         this.currentStatus = "idle";
         this.onStatusChange?.();
       }
@@ -1657,7 +1742,7 @@ var init_gemini_cli = __esm({
           status: this.currentStatus,
           messages: [...this.messages],
           workingDir: this.workingDir,
-          activeModal: null
+          activeModal: this.activeModal
         };
       }
       /**
@@ -1793,13 +1878,17 @@ var init_claude_cli = __esm({
       workingDir;
       onStatusChange = null;
       responseBuffer = "";
+      recentOutputBuffer = "";
+      // 최근 ~1000자 rolling buffer (청크 경계 패턴 감지용)
       isWaitingForResponse = false;
+      activeModal = null;
       idleTimeout = null;
       ready = false;
       startupBuffer = "";
       bridge = null;
       logBuffer = [];
       onPtyDataCallback = null;
+      extraArgs = [];
       // Patterns for Claude Code
       PROMPT_PATTERNS = [
         /❯\s*$/,
@@ -1808,14 +1897,40 @@ var init_claude_cli = __esm({
         /➜\s+.*\s*$/,
         /\s+✗\s*$/
       ];
+      // "Esc to interrupt" 표시 → Claude Code가 자율적으로 생성 중임을 감지
+      GENERATING_PATTERNS = [
+        /esc\s+to\s+interrupt/i,
+        /⎋\s*to\s+interrupt/i,
+        /press\s+esc\s+to\s+interrupt/i,
+        /accept\s+edits\s+on/i,
+        // ⏵⏵ accept edits on (shift+tab to cycle) · esc to interrupt
+        /shift\+tab\s+to\s+cycle/i
+      ];
+      // Approval 요청 패턴 — Claude Code가 툴 실행 전 사용자 허가를 요청할 때
+      APPROVAL_PATTERNS = [
+        /allow\s+once/i,
+        /always\s+allow/i,
+        /\(y\)es\s*\/\s*\(n\)o/i,
+        /\[y\/n\/a\]/i,
+        /do\s+you\s+want\s+to\s+(run|proceed|allow|execute|make|create|delete|write|edit)/i,
+        /do\s+you\s+want\s+to\s+proceed/i,
+        /proceed\?/i,
+        /esc\s+to\s+cancel/i,
+        // Claude Code 파일 편집 승인 UI
+        /tab\s+to\s+amend/i,
+        // Claude Code 파일 편집 승인 UI
+        /yes,\s+allow\s+all\s+edits/i
+        // "Yes, allow all edits during this session"
+      ];
       DIALOG_PATTERNS = [
         /Do you trust the files in this folder/i,
         /Please log in to Anthropic/i,
         /Your one-time login code is/i,
         /Wait for login to complete/i
       ];
-      constructor(workingDir) {
+      constructor(workingDir, cliArgs = []) {
         this.workingDir = workingDir;
+        this.extraArgs = cliArgs;
       }
       setBridge(bridge) {
         this.bridge = bridge;
@@ -1834,8 +1949,8 @@ var init_claude_cli = __esm({
         if (this.ptyProcess) return;
         if (!pty2) throw new Error("node-pty is not installed");
         const claudeBin = findClaudeBinary();
-        console.log(`[ClaudeAdapter] Spawning Claude Code in ${this.workingDir}`);
-        this.ptyProcess = pty2.spawn(claudeBin, [], {
+        console.log(`[ClaudeAdapter] Spawning Claude Code in ${this.workingDir}${this.extraArgs.length ? ` with args: ${this.extraArgs.join(" ")}` : ""}`);
+        this.ptyProcess = pty2.spawn(claudeBin, this.extraArgs, {
           name: "xterm-256color",
           cols: 120,
           rows: 40,
@@ -1868,6 +1983,7 @@ var init_claude_cli = __esm({
             this.logBuffer.push({ message: cleanData.trim(), level: "info" });
           }
         }
+        this.recentOutputBuffer = (this.recentOutputBuffer + cleanData).slice(-1e3);
         if (!this.ready) {
           this.startupBuffer += cleanData;
           const hasDialog = this.DIALOG_PATTERNS.some((p) => p.test(this.startupBuffer));
@@ -1889,9 +2005,55 @@ var init_claude_cli = __esm({
           }
           return;
         }
+        const hasApprovalSignal = this.APPROVAL_PATTERNS.some((p) => p.test(this.recentOutputBuffer));
+        if (hasApprovalSignal && this.currentStatus !== "waiting_approval") {
+          console.log('[ClaudeAdapter] \u23F3 Approval required ("Allow once" / y/n detected)');
+          this.isWaitingForResponse = true;
+          this.currentStatus = "waiting_approval";
+          const ctxLines = cleanData.split("\n").map((l) => l.trim()).filter((l) => l && !/^[─═╭╮╰╯│]+$/.test(l));
+          const ctxMsg = ctxLines.slice(-5).join(" ").slice(0, 200);
+          this.activeModal = { message: ctxMsg || "Approval required", buttons: ["Allow once", "Always allow", "Deny"] };
+          if (this.idleTimeout) clearTimeout(this.idleTimeout);
+          this.onStatusChange?.();
+          return;
+        }
+        if (this.currentStatus === "waiting_approval") {
+          const hasGeneratingResume = this.GENERATING_PATTERNS.some((p) => p.test(cleanData));
+          const hasPromptResume = this.PROMPT_PATTERNS.some((p) => p.test(cleanData));
+          if (hasGeneratingResume) {
+            console.log("[ClaudeAdapter] \u2705 Approval granted, generating resumed");
+            this.currentStatus = "generating";
+            this.activeModal = null;
+            this.onStatusChange?.();
+          } else if (hasPromptResume) {
+            console.log("[ClaudeAdapter] \u{1F6AB} Approval denied or skipped, returning to idle");
+            this.activeModal = null;
+            this.finishResponse();
+          }
+          return;
+        }
+        if (!this.isWaitingForResponse) {
+          const hasGeneratingSignal = this.GENERATING_PATTERNS.some((p) => p.test(cleanData));
+          if (hasGeneratingSignal) {
+            console.log('[ClaudeAdapter] \u26A1 Autonomous generating detected ("Esc to interrupt")');
+            this.isWaitingForResponse = true;
+            this.responseBuffer = "";
+            this.currentStatus = "generating";
+            this.onStatusChange?.();
+          }
+        }
         if (this.isWaitingForResponse) {
           this.responseBuffer += cleanData;
           if (this.idleTimeout) clearTimeout(this.idleTimeout);
+          const stillGenerating = this.GENERATING_PATTERNS.some((p) => p.test(cleanData));
+          if (stillGenerating) {
+            this.currentStatus = "generating";
+            this.idleTimeout = setTimeout(() => {
+              if (this.isWaitingForResponse) this.finishResponse();
+            }, 4e3);
+            this.onStatusChange?.();
+            return;
+          }
           const hasPrompt = this.PROMPT_PATTERNS.some((p) => p.test(this.responseBuffer));
           if (hasPrompt) {
             this.finishResponse();
@@ -1917,6 +2079,7 @@ var init_claude_cli = __esm({
         }
         this.responseBuffer = "";
         this.isWaitingForResponse = false;
+        this.activeModal = null;
         this.currentStatus = "idle";
         this.onStatusChange?.();
       }
@@ -1925,7 +2088,7 @@ var init_claude_cli = __esm({
           status: this.currentStatus,
           messages: [...this.messages],
           workingDir: this.workingDir,
-          activeModal: null
+          activeModal: this.activeModal
         };
       }
       async sendMessage(text) {
@@ -4461,9 +4624,71 @@ var init_daemon_commands = __esm({
         const script = loader.getCapabilityWithParams("switch_session", { SESSION_ID: JSON.stringify(sessionId) });
         if (!script) return { success: false, error: "switch_session script not available" };
         try {
-          const result = await cdp2.evaluate(script, 15e3);
-          console.log(`[switch_chat] result:`, result);
-          return { success: true, result };
+          const raw = await cdp2.evaluate(script, 15e3);
+          console.log(`[switch_chat] result:`, raw);
+          let parsed = null;
+          try {
+            parsed = typeof raw === "string" ? JSON.parse(raw) : raw;
+          } catch {
+          }
+          if (parsed?.action === "click" && parsed.clickX && parsed.clickY) {
+            const x = Math.round(parsed.clickX);
+            const y = Math.round(parsed.clickY);
+            console.log(`[switch_chat] CDP click at (${x}, ${y}) for "${parsed.title}"`);
+            await cdp2.send("Input.dispatchMouseEvent", {
+              type: "mousePressed",
+              x,
+              y,
+              button: "left",
+              clickCount: 1
+            });
+            await cdp2.send("Input.dispatchMouseEvent", {
+              type: "mouseReleased",
+              x,
+              y,
+              button: "left",
+              clickCount: 1
+            });
+            await new Promise((r) => setTimeout(r, 2e3));
+            const wsResult = await cdp2.evaluate(`
+                    (() => {
+                        const inp = Array.from(document.querySelectorAll('input[type="text"]'))
+                            .find(i => i.offsetWidth > 0 && (i.placeholder || '').includes('Select where'));
+                        if (!inp) return null;
+                        const rows = inp.closest('[class*="quickInput"]')?.querySelectorAll('[class*="cursor-pointer"]');
+                        if (rows && rows.length > 0) {
+                            const r = rows[0].getBoundingClientRect();
+                            return JSON.stringify({ x: Math.round(r.left + r.width/2), y: Math.round(r.top + r.height/2) });
+                        }
+                        return null;
+                    })()
+                `, 5e3);
+            if (wsResult) {
+              try {
+                const ws = JSON.parse(wsResult);
+                await cdp2.send("Input.dispatchMouseEvent", {
+                  type: "mousePressed",
+                  x: ws.x,
+                  y: ws.y,
+                  button: "left",
+                  clickCount: 1
+                });
+                await cdp2.send("Input.dispatchMouseEvent", {
+                  type: "mouseReleased",
+                  x: ws.x,
+                  y: ws.y,
+                  button: "left",
+                  clickCount: 1
+                });
+              } catch {
+              }
+            }
+            return { success: true, result: "switched" };
+          }
+          if (parsed?.error) {
+            return { success: false, error: parsed.error };
+          }
+          return { success: true, result: raw };
         } catch (e) {
           console.error(`[switch_chat] error:`, e.message);
           return { success: false, error: e.message };
@@ -5990,9 +6215,12 @@ var init_adhdev_daemon = __esm({
         this.commandHandler.setAgentStreamManager(this.agentStreamManager);
         this.startAgentStreamPolling();
         if (options.cliType) {
-          await this.startCliSession(options.cliType, workingDir).catch((e) => {
-            console.log(import_chalk2.default.yellow(`  \u26A0 Failed to start CLI ${options.cliType}: ${e.message}`));
-          });
+          const cliTypes = Array.isArray(options.cliType) ? options.cliType : options.cliType.split(",").map((s) => s.trim()).filter(Boolean);
+          for (const ct of cliTypes) {
+            await this.startCliSession(ct, workingDir, options.cliArgs).catch((e) => {
+              console.log(import_chalk2.default.yellow(`  \u26A0 Failed to start CLI ${ct}: ${e.message}`));
+            });
+          }
         }
         const machineId = os9.hostname().replace(/[^a-zA-Z0-9]/g, "_");
         const machineHash = crypto2.createHash("md5").update(os9.hostname() + os9.homedir()).digest("hex").slice(0, 8);
@@ -6029,17 +6257,27 @@ var init_adhdev_daemon = __esm({
               return { id: req.id, success: result.success, entries: result.files, error: result.error };
             }
           });
-          this.p2p.onPtyInput((cliType, data) => {
+          this.p2p.onPtyInput((cliId, data) => {
+            const directAdapter = this.adapters.get(cliId);
+            if (directAdapter && typeof directAdapter.writeRaw === "function") {
+              directAdapter.writeRaw(data);
+              return;
+            }
             for (const [, adapter] of this.adapters) {
-              if (adapter.cliType === cliType && typeof adapter.writeRaw === "function") {
+              if (adapter.cliType === cliId && typeof adapter.writeRaw === "function") {
                 adapter.writeRaw(data);
                 return;
               }
             }
           });
-          this.p2p.onPtyResize((cliType, cols, rows) => {
+          this.p2p.onPtyResize((cliId, cols, rows) => {
+            const directAdapter = this.adapters.get(cliId);
+            if (directAdapter && typeof directAdapter.resize === "function") {
+              directAdapter.resize(cols, rows);
+              return;
+            }
             for (const [, adapter] of this.adapters) {
-              if (adapter.cliType === cliType && typeof adapter.resize === "function") {
+              if (adapter.cliType === cliId && typeof adapter.resize === "function") {
                 adapter.resize(cols, rows);
                 return;
               }
@@ -6206,7 +6444,7 @@ var init_adhdev_daemon = __esm({
               if (!cliType) throw new Error("cliType required");
               const key = this.getCliKey(cliType, dir);
               if (!this.adapters.has(key)) {
-                await this.startCliSession(cliType, dir);
+                await this.startCliSession(cliType, dir, args?.cliArgs);
                 try {
                   const config = loadConfig();
                   console.log(import_chalk2.default.cyan(`  \u{1F4C2} Saving recent workspace: ${dir}`));
@@ -6416,14 +6654,17 @@ var init_adhdev_daemon = __esm({
             case "stop_cli": {
               const cliType = data.cliType || "gemini-cli";
               const dir = data.dir || "";
-              const key = `${cliType}:${dir}`;
+              const key = this.getCliKey(cliType, dir);
               const adapter = this.adapters.get(key);
               if (adapter) {
-                try {
-                  adapter.destroy?.();
-                } catch {
+                await this.stopCliSession(key);
+              } else {
+                for (const [k, a] of this.adapters) {
+                  if (a.cliType === cliType) {
+                    await this.stopCliSession(k);
+                    break;
+                  }
                 }
-                this.adapters.delete(key);
               }
               return { success: true, stopped: true };
             }
@@ -6442,6 +6683,34 @@ var init_adhdev_daemon = __esm({
               await this.startCliSession(cliType, dir);
               return { success: true, restarted: true };
             }
+            // ─── P2P/Local only: 민감 데이터 (서버 경유 X) ─────
+            case "get_cli_history": {
+              const config = loadConfig();
+              return { success: true, history: config.cliHistory || [] };
+            }
+            case "set_machine_nickname": {
+              const nickname = data.nickname?.trim() || null;
+              const config = loadConfig();
+              config.machineNickname = nickname;
+              saveConfig(config);
+              return { success: true, nickname };
+            }
+            case "get_daemon_logs": {
+              const lines = parseInt(data.lines) || 100;
+              try {
+                const logPath = require("path").join(require("os").tmpdir(), "adhdev-daemon.log");
+                const fs6 = require("fs");
+                if (fs6.existsSync(logPath)) {
+                  const content = fs6.readFileSync(logPath, "utf-8");
+                  const allLines = content.split("\n");
+                  const recent = allLines.slice(-lines).join("\n");
+                  return { success: true, logs: recent, totalLines: allLines.length };
+                }
+                return { success: true, logs: "", totalLines: 0 };
+              } catch (e) {
+                return { success: false, error: e.message };
+              }
+            }
           }
           if (this.commandHandler) {
             return this.commandHandler.handle(cmdType, data);
@@ -6452,17 +6721,18 @@ var init_adhdev_daemon = __esm({
         }
       }
       // ─── CLI 세션 관리 ──────────────────────────────
-      createAdapter(cliType, workingDir) {
+      createAdapter(cliType, workingDir, cliArgs) {
         if (cliType === "claude-cli" || cliType === "claude-code") {
-          return new ClaudeCliAdapter(workingDir);
+          return new ClaudeCliAdapter(workingDir, cliArgs);
         } else if (cliType === "codex-cli" || cliType === "codex") {
           return new CodexCliAdapter(workingDir);
         } else {
           return new GeminiCliAdapter(workingDir);
         }
       }
-      async startCliSession(cliType, workingDir) {
-        const resolvedDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os9.homedir()) : workingDir;
+      async startCliSession(cliType, workingDir, cliArgs) {
+        const trimmed = (workingDir || process.cwd()).trim();
+        const resolvedDir = trimmed.startsWith("~") ? trimmed.replace(/^~/, os9.homedir()) : require("path").resolve(trimmed);
         const cliInfo = await detectCLI(cliType);
         if (!cliInfo) throw new Error(`${cliType} not found`);
         const key = this.getCliKey(cliType, resolvedDir);
@@ -6471,7 +6741,7 @@ var init_adhdev_daemon = __esm({
           return;
         }
         console.log(import_chalk2.default.yellow(`  \u26A1 Starting CLI ${cliType} in ${resolvedDir}...`));
-        const adapter = this.createAdapter(cliType, resolvedDir);
+        const adapter = this.createAdapter(cliType, resolvedDir, cliArgs);
         await adapter.spawn();
         if (this.bridge && typeof adapter.setBridge === "function") {
           adapter.setBridge(this.bridge);
@@ -6479,10 +6749,11 @@ var init_adhdev_daemon = __esm({
         adapter.setOnStatusChange(() => this.sendUnifiedStatusReport());
         if (typeof adapter.setOnPtyData === "function") {
           adapter.setOnPtyData((data) => {
-            const sentViaP2P = this.p2p?.broadcastPtyOutput(adapter.cliType, data);
+            const sentViaP2P = this.p2p?.broadcastPtyOutput(key, data);
             if (!sentViaP2P && this.bridge) {
               this.bridge.sendMessage("pty_output", {
-                cliType: adapter.cliType,
+                cliType: key,
+                // adapter key (cliType_hash)
                 data
               });
             }
@@ -6491,6 +6762,10 @@ var init_adhdev_daemon = __esm({
         this.adapters.set(key, adapter);
         this.lastAgentStatus.set(key, "idle");
         console.log(import_chalk2.default.green(`  \u2713 CLI started: ${cliInfo.displayName} v${cliInfo.version || "unknown"} in ${resolvedDir}`));
+        try {
+          addCliHistory({ cliType, dir: resolvedDir, cliArgs });
+        } catch {
+        }
         this.sendUnifiedStatusReport();
       }
       async stopCliSession(key) {
@@ -6594,9 +6869,12 @@ var init_adhdev_daemon = __esm({
                     console.log(`[StatusReport] ${ideType} inline fallback: ${inlineResult?.messages?.length || 0} msgs`);
                     if (inlineResult?.messages?.length > 0) {
                       this._cachedActiveChatMap.set(ideType, { ...inlineResult, activeModal });
+                    } else {
+                      this._cachedActiveChatMap.set(ideType, { ...raw, messages: [], activeModal });
                     }
                   } catch (e2) {
                     console.log(`[StatusReport] ${ideType} inline error: ${e2.message}`);
+                    this._cachedActiveChatMap.set(ideType, { ...raw, messages: [], activeModal });
                   }
                 }
               } else {
@@ -6683,19 +6961,28 @@ var init_adhdev_daemon = __esm({
           const cliStatus = adapterStatus.status;
           let lastStatus = this.lastAgentStatus.get(key) || "idle";
           if (cliStatus !== lastStatus) {
+            const chatTitle = `${adapter.cliName} \xB7 ${adapter.workingDir.split("/").filter(Boolean).pop() || "session"}`;
             if (lastStatus === "idle" && cliStatus === "generating") {
               this.generatingStartedAt.set(key, now);
               this.bridge?.sendMessage("status_event", {
                 event: "agent:generating_started",
-                chatTitle: `${adapter.cliName} \xB7 ${adapter.workingDir.split("/").filter(Boolean).pop() || "session"}`,
+                chatTitle,
+                timestamp: now
+              });
+            } else if (cliStatus === "waiting_approval") {
+              if (!this.generatingStartedAt.has(key)) this.generatingStartedAt.set(key, now);
+              this.bridge?.sendMessage("status_event", {
+                event: "agent:approval_requested",
+                chatTitle,
                 timestamp: now
               });
-            } else if (lastStatus === "generating" && cliStatus === "idle") {
+            } else if (lastStatus === "waiting_approval" && cliStatus === "generating") {
+            } else if (cliStatus === "idle" && (lastStatus === "generating" || lastStatus === "waiting_approval")) {
               const startedAt = this.generatingStartedAt.get(key);
               const duration = startedAt ? Math.round((now - startedAt) / 1e3) : 0;
               this.bridge?.sendMessage("status_event", {
                 event: "agent:generating_completed",
-                chatTitle: `${adapter.cliName} \xB7 ${adapter.workingDir.split("/").filter(Boolean).pop() || "session"}`,
+                chatTitle,
                 duration,
                 timestamp: now
               });
@@ -6734,6 +7021,7 @@ var init_adhdev_daemon = __esm({
         const payload = {
           // Machine 정보
           daemonMode: true,
+          machineNickname: loadConfig().machineNickname || null,
           machine: {
             hostname: os9.hostname(),
             platform: os9.platform(),
@@ -8550,13 +8838,11 @@ program.command("reset").description("Reset ADHDev configuration").action(async
     console.log(import_chalk4.default.gray("  Run `adhdev setup` to reconfigure.\n"));
   }
 });
-program.command("daemon").description("Start ADHDev Daemon \u2014 unified local hub for Extensions, CLIs, and IDEs").option("-p, --port <port>", "Local WS server port", "19222").option("--cli <type>", "Also start a CLI agent (gemini-cli, claude-code, codex-cli)").option("-d, --dir <path>", "Working directory for CLI sessions", process.cwd()).option("--server <url>", "Override server URL for testing").action(async (options) => {
+program.command("daemon").description("Start ADHDev Daemon \u2014 unified local hub for Extensions, CLIs, and IDEs").option("-p, --port <port>", "Local WS server port", "19222").option("--server <url>", "Override server URL for testing").action(async (options) => {
   const { AdhdevDaemon: AdhdevDaemon2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
   const daemon = new AdhdevDaemon2();
   await daemon.start({
     localPort: parseInt(options.port) || 19222,
-    cliType: options.cli,
-    workingDir: options.dir,
     serverUrl: options.server,
     foreground: true
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adhdev",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "ADHDev CLI — Detect, install and configure your IDE + AI agent extensions",
   "main": "dist/index.js",
   "bin": {