adhdev 0.1.34 → 0.1.35

package/dist/index.js

@@ -364,8 +364,9 @@ async function detectCLIs() {
   return results;
 }
 async function detectCLI(cliId) {
+  const normalizedId = cliId === "claude-cli" ? "claude-code" : cliId;
   const all = await detectCLIs();
-  return all.find((c) => c.id === cliId && c.installed) || null;
+  return all.find((c) => c.id === normalizedId && c.installed) || null;
 }
 var import_child_process3, os, KNOWN_CLIS;
 var init_cli_detector = __esm({
@@ -933,6 +934,47 @@ var init_cli_bridge = __esm({
 function stripAnsi(str) {
   return str.replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][^\x1B]*\x1B\\/g, "");
 }
+function cleanGeminiResponse(raw, lastUserInput) {
+  const lines = raw.split("\n");
+  const cleaned = [];
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed) {
+      cleaned.push("");
+      continue;
+    }
+    if (/^[\u256d\u256e\u2570\u256f\u2502\u251c\u2524\u252c\u2534\u253c\u2500\u2501\u2550\u2554\u2557\u255a\u255d\u2551]+$/.test(trimmed)) continue;
+    if (/^[\u256d\u2570]\u2500\u2500/.test(trimmed) || /\u2500\u2500[\u256e\u256f]$/.test(trimmed)) continue;
+    if (/^\u2502.*\u2502$/.test(trimmed)) continue;
+    if (/[\u2500\u2501\u2550\u2580\u2584]{4,}/.test(trimmed)) continue;
+    if (/^YOLO\s+ctrl\+y/i.test(trimmed)) continue;
+    if (/^\? for shortcuts/.test(trimmed)) continue;
+    if (/^\/model\s/i.test(trimmed)) continue;
+    if (/^~\s.*no sandbox/i.test(trimmed)) continue;
+    if (/^Type your message/i.test(trimmed)) continue;
+    if (/ctrl\+[a-z]/i.test(trimmed) && trimmed.length < 50) continue;
+    if (/Shortcuts?\s*\(for more/i.test(trimmed)) continue;
+    if (/shell mode|cycle mode|paste images|select file or folder|reverse-search|clear prompt|rewind|raw markdown|open external editor/i.test(trimmed)) continue;
+    if (/Shift\+Tab|Option\+M|Ctrl\+X|Ctrl\+R|Ctrl\+Y/i.test(trimmed) && /mode|prompt|editor|search/i.test(trimmed)) continue;
+    if (/^[\u276f>]\s*$/.test(trimmed)) continue;
+    if (/^[*\u2022]\s*$/.test(trimmed)) continue;
+    if (lastUserInput && /^[*\u2022]\s/.test(trimmed)) {
+      const bulletContent = trimmed.replace(/^[*\u2022]\s*/, "").trim();
+      if (bulletContent === lastUserInput.trim() || lastUserInput.trim().startsWith(bulletContent.slice(0, 15))) {
+        continue;
+      }
+    }
+    if (/Gemini CLI update available/i.test(trimmed)) continue;
+    if (/brew upgrade gemini-cli/i.test(trimmed)) continue;
+    if (/Installed via .+ Please update/i.test(trimmed)) continue;
+    if (/Waiting for auth/i.test(trimmed)) continue;
+    if (/ℹ Gemini CLI/i.test(trimmed)) continue;
+    if (/^[\u280b\u2819\u2839\u2838\u283c\u2834\u2826\u2827\u2807\u280f\s]+$/.test(trimmed)) continue;
+    if (trimmed.length <= 2 && /^[!@#$%^&*()_+=\-<>?/\\|~`]+$/.test(trimmed)) continue;
+    cleaned.push(line);
+  }
+  return cleaned.join("\n").replace(/\n{3,}/g, "\n\n").trim();
+}
 function findGeminiBinary() {
   const isWin = os3.platform() === "win32";
   const cmd = isWin ? "where gemini" : "which gemini";
@@ -983,12 +1025,20 @@ var init_gemini_cli = __esm({
       ready = false;
       startupBuffer = "";
       startupDialogDismissed = false;
+      // Raw PTY I/O (터미널 뷰용)
+      onPtyData = null;
+      ptyOutputBuffer = "";
+      ptyOutputFlushTimer = null;
       constructor(workingDir) {
         this.workingDir = workingDir.startsWith("~") ? workingDir.replace(/^~/, os3.homedir()) : workingDir;
       }
       setOnStatusChange(callback) {
         this.onStatusChange = callback;
       }
+      /** PTY raw data 콜백 설정 (터미널 뷰 스트리밍용) */
+      setOnPtyData(callback) {
+        this.onPtyData = callback;
+      }
       /**
        * PTY로 gemini 프로세스 시작 (인터랙티브 모드)
        */
@@ -1000,7 +1050,7 @@ var init_gemini_cli = __esm({
         console.log(`[GeminiAdapter] Spawning interactive session in ${this.workingDir}`);
         console.log(`[GeminiAdapter] Binary: ${geminiBin}`);
         const shell = isWin ? "cmd.exe" : process.env.SHELL || "/bin/zsh";
-        const shellArgs = isWin ? ["/c", `${geminiBin} --yolo`] : ["-l", "-c", `"${geminiBin}" --yolo`];
+        const shellArgs = isWin ? ["/c", `${geminiBin} --yolo`] : ["-l", "-c", `${geminiBin} --yolo`];
         console.log(`[GeminiAdapter] Shell: ${shell} ${shellArgs.join(" ")}`);
         this.ptyProcess = pty.spawn(shell, shellArgs, {
           name: "xterm-256color",
@@ -1013,6 +1063,18 @@ var init_gemini_cli = __esm({
         });
         this.ptyProcess.onData((data) => {
           this.handleOutput(data);
+          if (this.onPtyData) {
+            this.ptyOutputBuffer += data;
+            if (!this.ptyOutputFlushTimer) {
+              this.ptyOutputFlushTimer = setTimeout(() => {
+                if (this.ptyOutputBuffer && this.onPtyData) {
+                  this.onPtyData(this.ptyOutputBuffer);
+                }
+                this.ptyOutputBuffer = "";
+                this.ptyOutputFlushTimer = null;
+              }, 50);
+            }
+          }
         });
         this.ptyProcess.onExit(({ exitCode }) => {
           console.log(`[GeminiAdapter] Process exited with code ${exitCode}`);
@@ -1091,6 +1153,8 @@ var init_gemini_cli = __esm({
           }
         }
         response = lines.join("\n").trim();
+        const lastUserText = this.messages.length > 0 && this.messages[this.messages.length - 1].role === "user" ? this.messages[this.messages.length - 1].content : void 0;
+        response = cleanGeminiResponse(response, lastUserText);
         if (response) {
           this.messages.push({
             role: "assistant",
@@ -1185,6 +1249,21 @@ var init_gemini_cli = __esm({
       isReady() {
         return this.ready;
       }
+      /** Raw 키 입력을 PTY에 직접 전달 (터미널 뷰용) */
+      writeRaw(data) {
+        if (this.ptyProcess) {
+          this.ptyProcess.write(data);
+        }
+      }
+      /** PTY 터미널 사이즈 변경 */
+      resize(cols, rows) {
+        if (this.ptyProcess) {
+          try {
+            this.ptyProcess.resize(cols, rows);
+          } catch {
+          }
+        }
+      }
       /** 작업 디렉토리 변경 (세션 재시작) */
       async changeWorkingDir(newDir) {
         this.cancel();
@@ -1239,6 +1318,7 @@ var init_claude_cli = __esm({
       startupBuffer = "";
       bridge = null;
       logBuffer = [];
+      onPtyDataCallback = null;
       // Patterns for Claude Code
       PROMPT_PATTERNS = [
         /❯\s*$/,
@@ -1282,6 +1362,7 @@ var init_claude_cli = __esm({
           env: { ...process.env }
         });
         this.ptyProcess.onData((data) => {
+          this.onPtyDataCallback?.(data);
           this.handleOutput(data);
         });
         this.ptyProcess.onExit(({ exitCode }) => {
@@ -1407,6 +1488,25 @@ var init_claude_cli = __esm({
         await new Promise((r) => setTimeout(r, 1e3));
         await this.spawn();
       }
+      /** PTY raw data 콜백 설정 (터미널 뷰 스트리밍용) */
+      setOnPtyData(callback) {
+        this.onPtyDataCallback = callback;
+      }
+      /** Raw 키 입력을 PTY에 직접 전달 (터미널 뷰용) */
+      writeRaw(data) {
+        if (this.ptyProcess) {
+          this.ptyProcess.write(data);
+        }
+      }
+      /** PTY 터미널 사이즈 변경 */
+      resize(cols, rows) {
+        if (this.ptyProcess) {
+          try {
+            this.ptyProcess.resize(cols, rows);
+          } catch {
+          }
+        }
+      }
     };
   }
 });
@@ -2729,7 +2829,13 @@ var init_daemon_p2p = __esm({
       fileRequestHandler = null;
       inputHandler = null;
       commandHandler = null;
+      ptyInputHandler = null;
+      ptyResizeHandler = null;
       _ssDebugDone = false;
+      // PTY scrollback buffer per cliType (재연결 시 최근 출력 전송)
+      ptyScrollback = /* @__PURE__ */ new Map();
+      PTY_SCROLLBACK_MAX = 64 * 1024;
+      // 64KB per CLI
       get screenshotActive() {
         for (const peer of this.peers.values()) {
           if (peer.screenshotActive && peer.state === "connected") return true;
@@ -2973,7 +3079,10 @@ var init_daemon_p2p = __esm({
           screenshotCh.onError((err) => log(`Screenshots error: ${err}`));
           const filesCh = pc.createDataChannel("files");
           entry.filesChannel = filesCh;
-          filesCh.onOpen(() => log(`Files channel OPEN for peer ${pid}`));
+          filesCh.onOpen(() => {
+            log(`Files channel OPEN for peer ${pid}`);
+            setTimeout(() => this.sendPtyScrollback(pid), 100);
+          });
           filesCh.onClosed(() => {
             const peer = this.peers.get(pid);
             if (peer?.filesChannel === filesCh) peer.filesChannel = null;
@@ -3021,6 +3130,18 @@ var init_daemon_p2p = __esm({
             this.handleP2PCommand(peerId, parsed);
             return;
           }
+          if (parsed.type === "pty_input") {
+            if (this.ptyInputHandler && parsed.data) {
+              this.ptyInputHandler(parsed.cliType || "gemini-cli", parsed.data);
+            }
+            return;
+          }
+          if (parsed.type === "pty_resize") {
+            if (this.ptyResizeHandler && parsed.cols && parsed.rows) {
+              this.ptyResizeHandler(parsed.cliType || "gemini-cli", parsed.cols, parsed.rows);
+            }
+            return;
+          }
           this.handleFileRequest(peerId, parsed);
         } catch (e) {
           log(`Parse error from peer ${peerId}: ${e?.message}`);
@@ -3044,6 +3165,44 @@ var init_daemon_p2p = __esm({
         }
         return sentAny;
       }
+      /** PTY 출력을 모든 connected peer에게 브로드캐스트 */
+      broadcastPtyOutput(cliType, data) {
+        const prev = this.ptyScrollback.get(cliType) || "";
+        const updated = prev + data;
+        this.ptyScrollback.set(
+          cliType,
+          updated.length > this.PTY_SCROLLBACK_MAX ? updated.slice(-this.PTY_SCROLLBACK_MAX) : updated
+        );
+        const msg = JSON.stringify({ type: "pty_output", cliType, data });
+        let sentAny = false;
+        for (const peer of this.peers.values()) {
+          if (peer.state !== "connected" || !peer.filesChannel) continue;
+          try {
+            peer.filesChannel.sendMessage(msg);
+            sentAny = true;
+          } catch {
+          }
+        }
+        return sentAny;
+      }
+      /** Peer 연결 시 scrollback 전송 */
+      sendPtyScrollback(peerId) {
+        const peer = this.peers.get(peerId);
+        if (!peer?.filesChannel) return;
+        for (const [cliType, buffer] of this.ptyScrollback) {
+          if (!buffer) continue;
+          try {
+            peer.filesChannel.sendMessage(JSON.stringify({
+              type: "pty_output",
+              cliType,
+              data: buffer,
+              scrollback: true
+            }));
+            log(`Sent PTY scrollback to peer ${peerId}: ${cliType} (${buffer.length} bytes)`);
+          } catch {
+          }
+        }
+      }
       sendScreenshot(base64Data) {
         let sentAny = false;
         const buffer = Buffer.from(base64Data, "base64");
@@ -3081,6 +3240,12 @@ var init_daemon_p2p = __esm({
       onCommand(handler) {
         this.commandHandler = handler;
       }
+      onPtyInput(handler) {
+        this.ptyInputHandler = handler;
+      }
+      onPtyResize(handler) {
+        this.ptyResizeHandler = handler;
+      }
       // ─── P2P 명령/입력/파일 처리 ────────────────
       async handleP2PCommand(peerId, msg) {
         const { id, commandType, data } = msg;
@@ -3479,6 +3644,11 @@ var init_daemon_commands = __esm({
             return this.handleAgentStreamSwitchSession(args);
           case "agent_stream_focus":
             return this.handleAgentStreamFocus(args);
+          // ─── PTY Raw I/O (터미널 뷰) ─────────
+          case "pty_input":
+            return this.handlePtyInput(args);
+          case "pty_resize":
+            return this.handlePtyResize(args);
           default:
             return { success: false, error: `Unknown command: ${cmd}` };
         }
@@ -3938,6 +4108,35 @@ var init_daemon_commands = __esm({
         const ok = await this.agentStream.focusAgentEditor(this.getCdp(), agentType);
         return { success: ok };
       }
+      // ─── PTY Raw I/O (터미널 뷰) ──────────────────────
+      handlePtyInput(args) {
+        const { cliType, data } = args || {};
+        if (!data) return { success: false, error: "data required" };
+        if (this.ctx.adapters) {
+          const targetCli = cliType || "gemini-cli";
+          for (const [, adapter] of this.ctx.adapters) {
+            if (adapter.cliType === targetCli && typeof adapter.writeRaw === "function") {
+              adapter.writeRaw(data);
+              return { success: true };
+            }
+          }
+        }
+        return { success: false, error: `CLI adapter not found: ${cliType}` };
+      }
+      handlePtyResize(args) {
+        const { cliType, cols, rows } = args || {};
+        if (!cols || !rows) return { success: false, error: "cols and rows required" };
+        if (this.ctx.adapters) {
+          const targetCli = cliType || "gemini-cli";
+          for (const [, adapter] of this.ctx.adapters) {
+            if (adapter.cliType === targetCli && typeof adapter.resize === "function") {
+              adapter.resize(cols, rows);
+              return { success: true };
+            }
+          }
+        }
+        return { success: false, error: `CLI adapter not found: ${cliType}` };
+      }
     };
   }
 });
@@ -4542,6 +4741,11 @@ var init_adhdev_daemon = __esm({
       scriptLoaders = /* @__PURE__ */ new Map();
       commandHandler = null;
       screenshotTimer = null;
+      lastStatusSentFull = false;
+      lastStatusSentAt = 0;
+      statusPendingThrottle = false;
+      lastP2PStatusHash = "";
+      statusReportCount = 0;
       agentStreamManager = null;
       agentStreamTimer = null;
       running = false;
@@ -4592,7 +4796,7 @@ var init_adhdev_daemon = __esm({
             setTimeout(() => this.sendUnifiedStatusReport(), 500);
           },
           onExtensionStatus: () => {
-            this.sendUnifiedStatusReport();
+            this.throttledStatusReport();
           },
           onExtensionEvent: (ext, event, data) => {
             if (event === "token_updated" && data.token) {
@@ -4705,6 +4909,22 @@ var init_adhdev_daemon = __esm({
               return { id: req.id, success: result.success, entries: result.files, error: result.error };
             }
           });
+          this.p2p.onPtyInput((cliType, data) => {
+            for (const [, adapter] of this.adapters) {
+              if (adapter.cliType === cliType && typeof adapter.writeRaw === "function") {
+                adapter.writeRaw(data);
+                return;
+              }
+            }
+          });
+          this.p2p.onPtyResize((cliType, cols, rows) => {
+            for (const [, adapter] of this.adapters) {
+              if (adapter.cliType === cliType && typeof adapter.resize === "function") {
+                adapter.resize(cols, rows);
+                return;
+              }
+            }
+          });
           let ssDebugCount = 0;
           this.screenshotTimer = setInterval(async () => {
             const active = this.p2p?.screenshotActive;
@@ -4842,7 +5062,10 @@ var init_adhdev_daemon = __esm({
           "agent_stream_new",
           "agent_stream_list_chats",
           "agent_stream_switch_session",
-          "agent_stream_focus"
+          "agent_stream_focus",
+          // PTY I/O commands (터미널 뷰)
+          "pty_input",
+          "pty_resize"
         ];
         for (const cmdType of directCdpCommands) {
           this.bridge.on(cmdType, async (msg) => {
@@ -4911,7 +5134,19 @@ var init_adhdev_daemon = __esm({
               const dir = args?.dir || process.cwd();
               if (!cliType) throw new Error("cliType required");
               const key = this.getCliKey(cliType, dir);
-              await this.stopCliSession(key);
+              if (this.adapters.has(key)) {
+                await this.stopCliSession(key);
+              } else {
+                let found = false;
+                for (const [k, adapter] of this.adapters) {
+                  if (adapter.cliType === cliType) {
+                    await this.stopCliSession(k);
+                    found = true;
+                    break;
+                  }
+                }
+                if (!found) console.log(import_chalk2.default.yellow(`  \u26A0 No adapter found for ${cliType} (key: ${key})`));
+              }
               this.sendResult(msg, true, { cliType, dir });
               return;
             }
@@ -5033,6 +5268,17 @@ var init_adhdev_daemon = __esm({
           adapter.setBridge(this.bridge);
         }
         adapter.setOnStatusChange(() => this.sendUnifiedStatusReport());
+        if (typeof adapter.setOnPtyData === "function") {
+          adapter.setOnPtyData((data) => {
+            const sentViaP2P = this.p2pSender?.broadcastPtyOutput(adapter.cliType, data);
+            if (!sentViaP2P && this.bridge) {
+              this.bridge.sendMessage("pty_output", {
+                cliType: adapter.cliType,
+                data
+              });
+            }
+          });
+        }
         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}`));
@@ -5052,18 +5298,33 @@ var init_adhdev_daemon = __esm({
       // ─── 통합 상태 보고 ─────────────────────────────
       startStatusReporting() {
         const scheduleNext = () => {
-          const isProcessing = Array.from(this.adapters.values()).some((a) => a.isProcessing());
-          const interval = isProcessing ? 2e3 : 15e3;
           this.statusTimer = setTimeout(() => {
             this.sendUnifiedStatusReport().catch(() => {
             });
             scheduleNext();
-          }, interval);
+          }, 15e3);
         };
         scheduleNext();
       }
+      /** Throttled status report: 최소 3초 간격 보장 */
+      throttledStatusReport() {
+        const now = Date.now();
+        const elapsed = now - this.lastStatusSentAt;
+        if (elapsed >= 3e3) {
+          this.sendUnifiedStatusReport().catch(() => {
+          });
+        } else if (!this.statusPendingThrottle) {
+          this.statusPendingThrottle = true;
+          setTimeout(() => {
+            this.statusPendingThrottle = false;
+            this.sendUnifiedStatusReport().catch(() => {
+            });
+          }, 3e3 - elapsed);
+        }
+      }
       async sendUnifiedStatusReport() {
         if (!this.bridge?.isConnected()) return;
+        this.lastStatusSentAt = Date.now();
         if (this.cdpManagers.size > 0 && this.scriptLoaders.size > 0 && !this._cdpChatBusy) {
           this._cdpChatBusy = true;
           for (const [ideType, cdp] of this.cdpManagers) {
@@ -5148,7 +5409,7 @@ var init_adhdev_daemon = __esm({
               this.generatingStartedAt.set(key, now);
               this.bridge?.sendMessage("status_event", {
                 event: "agent:generating_started",
-                chatTitle: `${adapter.cliName} Session`,
+                chatTitle: `${adapter.cliName} \xB7 ${adapter.workingDir.split("/").filter(Boolean).pop() || "session"}`,
                 timestamp: now
               });
             } else if (lastStatus === "generating" && cliStatus === "idle") {
@@ -5156,7 +5417,7 @@ var init_adhdev_daemon = __esm({
               const duration = startedAt ? Math.round((now - startedAt) / 1e3) : 0;
               this.bridge?.sendMessage("status_event", {
                 event: "agent:generating_completed",
-                chatTitle: `${adapter.cliName} Session`,
+                chatTitle: `${adapter.cliName} \xB7 ${adapter.workingDir.split("/").filter(Boolean).pop() || "session"}`,
                 duration,
                 timestamp: now
               });
@@ -5182,7 +5443,7 @@ var init_adhdev_daemon = __esm({
             activeChat: {
               id: key,
               status: cliStatus,
-              title: `${adapter.cliName} Session`,
+              title: `${adapter.cliName} \xB7 ${adapter.workingDir.split("/").filter(Boolean).pop() || "session"}`,
               messages: cliMessages,
               inputContent: "",
               activeModal: adapterStatus.activeModal
@@ -5257,8 +5518,38 @@ var init_adhdev_daemon = __esm({
             hostname: os8.hostname()
           }
         };
-        this.bridge.sendMessage("status_report", payload);
-        this.p2p?.sendStatus(payload);
+        const { timestamp: _ts, system: _sys, ...hashTarget } = payload;
+        if (hashTarget.machine) {
+          const { freeMem: _f, loadavg: _l, uptime: _u, ...stableMachine } = hashTarget.machine;
+          hashTarget.machine = stableMachine;
+        }
+        const statusHash = this.simpleHash(JSON.stringify(hashTarget));
+        if (statusHash !== this.lastP2PStatusHash) {
+          this.lastP2PStatusHash = statusHash;
+          this.p2p?.sendStatus(payload);
+        }
+        const p2pConnected = (this.p2p?.connectedPeerCount || 0) > 0;
+        this.statusReportCount = (this.statusReportCount || 0) + 1;
+        const forceFullSync = this.statusReportCount % 4 === 0;
+        if (p2pConnected && this.lastStatusSentFull && !forceFullSync) {
+          this.bridge.sendMessage("status_heartbeat", {
+            timestamp: now,
+            p2pConnected: true,
+            p2pPeers: this.p2p?.connectedPeerCount || 0
+          });
+        } else {
+          this.bridge.sendMessage("status_report", payload);
+          this.lastStatusSentFull = true;
+        }
+      }
+      /** Fast string hash (FNV-1a 32-bit) */
+      simpleHash(s) {
+        let h = 2166136261;
+        for (let i = 0; i < s.length; i++) {
+          h ^= s.charCodeAt(i);
+          h = h * 16777619 >>> 0;
+        }
+        return h.toString(36);
       }
       sendResult(msg, success, extra) {
         if (!msg.id) return;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "adhdev",
-    "version": "0.1.34",
+    "version": "0.1.35",
     "description": "ADHDev CLI — Detect, install and configure your IDE + AI agent extensions",
     "main": "dist/index.js",
     "bin": {
@@ -54,4 +54,4 @@
         "tsx": "^4.19.0",
         "typescript": "^5.5.0"
     }
-}
+}