adhdev 0.8.20 → 0.8.22

package/dist/cli/index.js

@@ -4184,6 +4184,24 @@ function isRecentDuplicateSend(key) {
   recentSendByTarget.set(key, now);
   return false;
 }
+function parseMaybeJson(value) {
+  if (typeof value !== "string") return value;
+  try {
+    return JSON.parse(value);
+  } catch {
+    return value;
+  }
+}
+function didProviderConfirmSend(result) {
+  const parsed = parseMaybeJson(result);
+  if (parsed === true) return true;
+  if (typeof parsed === "string") {
+    const normalized = parsed.trim().toLowerCase();
+    return normalized === "ok" || normalized === "sent" || normalized === "success" || normalized === "true";
+  }
+  if (!parsed || typeof parsed !== "object") return false;
+  return parsed.sent === true || parsed.success === true || parsed.ok === true || parsed.submitted === true || parsed.dispatched === true;
+}
 async function handleChatHistory(h, args) {
   const { agentType, offset, limit } = args;
   const historySessionId = getHistorySessionId(h, args);
@@ -4366,14 +4384,8 @@ async function handleSendChat(h, args) {
     try {
       const evalResult = await h.evaluateProviderScript("sendMessage", { MESSAGE: text }, 3e4);
       if (evalResult?.result) {
-        let parsed = evalResult.result;
-        if (typeof parsed === "string") {
-          try {
-            parsed = JSON.parse(parsed);
-          } catch {
-          }
-        }
-        if (parsed?.sent) {
+        const parsed = parseMaybeJson(evalResult.result);
+        if (didProviderConfirmSend(parsed)) {
           _log(`Extension script sent OK`);
           return _logSendSuccess("extension-script");
         }
@@ -4405,14 +4417,8 @@ async function handleSendChat(h, args) {
   if (sendScript) {
     try {
       const result = await targetCdp.evaluate(sendScript, 3e4);
-      let parsed = result;
-      if (typeof result === "string") {
-        try {
-          parsed = JSON.parse(result);
-        } catch {
-        }
-      }
-      if (parsed?.sent) {
+      const parsed = parseMaybeJson(result);
+      if (didProviderConfirmSend(parsed)) {
         _log(`sendMessage script OK`);
         return _logSendSuccess("script");
       }
@@ -4457,14 +4463,8 @@ async function handleSendChat(h, args) {
             const matchText = provider.webviewMatchText;
             const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
             const wvResult = await targetCdp.evaluateInWebviewFrame(webviewScript, matchFn);
-            let wvParsed = wvResult;
-            if (typeof wvResult === "string") {
-              try {
-                wvParsed = JSON.parse(wvResult);
-              } catch {
-              }
-            }
-            if (wvParsed?.sent) {
+            const wvParsed = parseMaybeJson(wvResult);
+            if (didProviderConfirmSend(wvParsed)) {
               _log(`webviewSendMessage OK`);
               return _logSendSuccess("webview-script");
             }
@@ -4486,14 +4486,8 @@ async function handleSendChat(h, args) {
         const matchText = provider.webviewMatchText;
         const matchFn = matchText ? (body) => body.includes(matchText) : void 0;
         const wvResult = await targetCdp.evaluateInWebviewFrame(webviewScript, matchFn);
-        let wvParsed = wvResult;
-        if (typeof wvResult === "string") {
-          try {
-            wvParsed = JSON.parse(wvResult);
-          } catch {
-          }
-        }
-        if (wvParsed?.sent) {
+        const wvParsed = parseMaybeJson(wvResult);
+        if (didProviderConfirmSend(wvParsed)) {
           _log(`webviewSendMessage OK`);
           return _logSendSuccess("webview-script");
         }
@@ -7185,7 +7179,7 @@ var init_provider_cli_adapter = __esm({
         let shellArgs;
         const useShellUnix = !isWin && (!!spawnConfig.shell || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath) || !looksLikeMachOOrElf(binaryPath));
         const isCmdShim = isWin && /\.(cmd|bat)$/i.test(binaryPath);
-        const useShellWin = isCmdShim || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath);
+        const useShellWin = !!spawnConfig.shell || isCmdShim || !path7.isAbsolute(binaryPath) || isScriptBinary(binaryPath);
         const useShell = isWin ? useShellWin : useShellUnix;
         if (useShell) {
           if (!spawnConfig.shell && !isWin) {
@@ -7396,6 +7390,40 @@ var init_provider_cli_adapter = __esm({
         if (!text.trim()) return false;
         return /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(text) || /⏎\s+send/i.test(text) || /\?\s*for\s*shortcuts/i.test(text) || /Type your message(?:\s+or\s+@path\/to\/file)?/i.test(text) || /workspace\s*\(\/directory\)/i.test(text) || /for\s*shortcuts/i.test(text);
       }
+      findLastMatchingLineIndex(lines, predicate) {
+        for (let index = lines.length - 1; index >= 0; index -= 1) {
+          if (predicate(lines[index])) return index;
+        }
+        return -1;
+      }
+      looksLikeClaudeGeneratingLine(line) {
+        const trimmed = String(line || "").trim();
+        if (!trimmed) return false;
+        if (/esc to (cancel|interrupt|stop)/i.test(trimmed)) return true;
+        if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+\s+\S+.*\b(?:thinking|thought for \d+s?)\b/i.test(trimmed)) return true;
+        if (/^[✻✶✳✢✽⠂⠐⠒⠓⠦⠴⠶⠷⠿]+\s+[A-Z][A-Za-z-]{3,}ing\b.*(?:…|\.{3})/u.test(trimmed)) return true;
+        if (/^[⏺•]\s+(?:Reading|Writing|Editing|Searching|Inspecting|Planning|Analyzing|Synthesizing|Drafting|Running|Listing|Scanning|Matching)\b.*(?:…|\.{3})/i.test(trimmed)) {
+          return /ctrl\+o to expand/i.test(trimmed) || /\b\d+\s+(?:file|files|pattern|patterns|director(?:y|ies)|match|matches|result|results)\b/i.test(trimmed);
+        }
+        return false;
+      }
+      detectClaudeGeneratingOverride(screenText, tail) {
+        if (this.cliType !== "claude-cli") return false;
+        const source = sanitizeTerminalText(screenText || tail || "");
+        if (!source.trim()) return false;
+        const allLines = source.split(/\r\n|\n|\r/g).map((line) => line.trim()).filter(Boolean);
+        if (allLines.length === 0) return false;
+        const recentLines = allLines.slice(-12);
+        const promptIndex = this.findLastMatchingLineIndex(recentLines, (line) => /^[❯›>]\s*$/.test(line));
+        const activeRegion = promptIndex >= 0 ? recentLines.slice(promptIndex + 1) : recentLines;
+        if (activeRegion.length === 0) return false;
+        return activeRegion.some((line) => this.looksLikeClaudeGeneratingLine(line));
+      }
+      refineDetectedStatus(status, tail, screenText) {
+        if (status === "waiting_approval") return status;
+        if (this.detectClaudeGeneratingOverride(screenText || "", tail)) return "generating";
+        return status;
+      }
       looksLikeVisibleAssistantCandidate(screenText) {
         const lines = sanitizeTerminalText(String(screenText || "")).split(/\r\n|\n|\r/g);
         for (const line of lines) {
@@ -7793,11 +7821,13 @@ var init_provider_cli_adapter = __esm({
       runDetectStatus(text) {
         if (!this.cliScripts?.detectStatus) return null;
         try {
-          return this.cliScripts.detectStatus({
+          const screenText = this.terminalScreen.getText();
+          const status = this.cliScripts.detectStatus({
             tail: text.slice(-500),
-            screenText: this.terminalScreen.getText(),
+            screenText,
             rawBuffer: this.accumulatedRawBuffer
           });
+          return this.refineDetectedStatus(status, text, screenText || "");
         } catch (e) {
           LOG.warn("CLI", `[${this.cliType}] detectStatus error: ${e.message}`);
           return null;
@@ -7867,6 +7897,10 @@ var init_provider_cli_adapter = __esm({
         try {
           const input = this.buildParseInput(baseMessages, partialResponse, scope);
           const parsed = this.cliScripts.parseOutput(input);
+          const refinedStatus = this.refineDetectedStatus(typeof parsed?.status === "string" ? parsed.status : null, input.recentBuffer, input.screenText);
+          if (parsed && refinedStatus && parsed.status !== refinedStatus) {
+            parsed.status = refinedStatus;
+          }
           const promptForTrim = scope?.prompt || getLastUserPromptText(baseMessages);
           if (parsed && Array.isArray(parsed.messages) && promptForTrim) {
             const lastAssistant = [...parsed.messages].reverse().find((message) => message?.role === "assistant" && typeof message.content === "string");
@@ -46591,7 +46625,7 @@ var init_adhdev_daemon = __esm({
     import_ws3 = require("ws");
     import_chalk2 = __toESM(require("chalk"));
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.20" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.22" });
     DANGEROUS_PATTERNS = [
       /\brm\s+(-[a-z]*f|-[a-z]*r|--force|--recursive)/i,
       /\bsudo\b/i,