adhdev 0.6.75 → 0.6.76

package/dist/index.js

@@ -560,6 +560,10 @@ var init_ide_detector = __esm({
 });
 
 // ../../oss/packages/daemon-core/src/detection/cli-detector.ts
+function parseVersion(raw) {
+  const match = raw.match(/v?(\d+\.\d+(?:\.\d+)?(?:-[a-zA-Z0-9.]+)?)/);
+  return match ? match[1] : raw.split("\n")[0].slice(0, 100);
+}
 function execAsync(cmd, timeoutMs = 5e3) {
   return new Promise((resolve10) => {
     const child = (0, import_child_process2.exec)(cmd, { encoding: "utf-8", timeout: timeoutMs }, (err, stdout) => {
@@ -584,10 +588,18 @@ async function detectCLIs(providerLoader) {
         const firstPath = pathResult.split("\n")[0];
         let version2;
         try {
-          const versionResult = await execAsync(`${cli.command} --version 2>/dev/null`, 3e3);
-          if (versionResult) {
-            const match = versionResult.match(/(\d+\.\d+[\.\d]*)/);
-            version2 = match ? match[1] : versionResult.split("\n")[0].slice(0, 30);
+          const versionCommands = [
+            cli.versionCommand,
+            `${cli.command} --version 2>/dev/null`,
+            `${cli.command} -V 2>/dev/null`,
+            `${cli.command} -v 2>/dev/null`
+          ].filter((v2) => !!v2);
+          for (const versionCommand of versionCommands) {
+            const versionResult = await execAsync(versionCommand, 3e3);
+            if (versionResult) {
+              version2 = parseVersion(versionResult);
+              break;
+            }
           }
         } catch {
         }
@@ -3210,7 +3222,7 @@ function buildManagedClis(cliStates) {
     cliType: s15.type,
     cliName: s15.name,
     status: s15.status,
-    mode: s15.mode,
+    mode: "terminal",
     workspace: s15.workspace || "",
     activeChat: s15.activeChat
   }));
@@ -4804,8 +4816,13 @@ var init_handler = __esm({
       getCliAdapter(type) {
         const target = type || this._currentIdeType;
         if (!target || !this._ctx.adapters) return null;
+        let normalizedTarget = target;
+        const colonIdx = normalizedTarget.lastIndexOf(":");
+        if (colonIdx >= 0) normalizedTarget = normalizedTarget.substring(colonIdx + 1);
+        const direct = this._ctx.adapters.get(normalizedTarget);
+        if (direct) return direct;
         for (const [key, adapter] of this._ctx.adapters.entries()) {
-          if (adapter.cliType === target || key.startsWith(target)) {
+          if (adapter.cliType === target || adapter.cliType === normalizedTarget || key === normalizedTarget || key.startsWith(target) || key.startsWith(normalizedTarget)) {
             return adapter;
           }
         }
@@ -5314,10 +5331,10 @@ var init_readdirp = __esm({
       }
       async _formatEntry(dirent, path15) {
         let entry;
-        const basename5 = this._isDirent ? dirent.name : dirent;
+        const basename6 = this._isDirent ? dirent.name : dirent;
         try {
-          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path15, basename5));
-          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename5 };
+          const fullPath = (0, import_node_path.resolve)((0, import_node_path.join)(path15, basename6));
+          entry = { path: (0, import_node_path.relative)(this._root, fullPath), fullPath, basename: basename6 };
           entry[this._statsProp] = this._isDirent ? dirent : await this._stat(fullPath);
         } catch (err) {
           this._onError(err);
@@ -5848,9 +5865,9 @@ var init_handler2 = __esm({
       _watchWithNodeFs(path15, listener) {
         const opts = this.fsw.options;
         const directory = sp.dirname(path15);
-        const basename5 = sp.basename(path15);
+        const basename6 = sp.basename(path15);
         const parent = this.fsw._getWatchedDir(directory);
-        parent.add(basename5);
+        parent.add(basename6);
         const absolutePath = sp.resolve(path15);
         const options = {
           persistent: opts.persistent
@@ -5860,7 +5877,7 @@ var init_handler2 = __esm({
         let closer;
         if (opts.usePolling) {
           const enableBin = opts.interval !== opts.binaryInterval;
-          options.interval = enableBin && isBinaryPath(basename5) ? opts.binaryInterval : opts.interval;
+          options.interval = enableBin && isBinaryPath(basename6) ? opts.binaryInterval : opts.interval;
           closer = setFsWatchFileListener(path15, absolutePath, options, {
             listener,
             rawEmitter: this.fsw._emitRaw
@@ -5883,10 +5900,10 @@ var init_handler2 = __esm({
           return;
         }
         const dirname8 = sp.dirname(file2);
-        const basename5 = sp.basename(file2);
+        const basename6 = sp.basename(file2);
         const parent = this.fsw._getWatchedDir(dirname8);
         let prevStats = stats;
-        if (parent.has(basename5))
+        if (parent.has(basename6))
           return;
         const listener = async (path15, newStats) => {
           if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file2, 5))
@@ -5911,9 +5928,9 @@ var init_handler2 = __esm({
                 prevStats = newStats2;
               }
             } catch (error48) {
-              this.fsw._remove(dirname8, basename5);
+              this.fsw._remove(dirname8, basename6);
             }
-          } else if (parent.has(basename5)) {
+          } else if (parent.has(basename6)) {
             const at2 = newStats.atimeMs;
             const mt2 = newStats.mtimeMs;
             if (!at2 || at2 <= mt2 || mt2 !== prevStats.mtimeMs) {
@@ -7068,12 +7085,15 @@ var init_provider_loader = __esm({
         const result = [];
         for (const p of this.providers.values()) {
           if ((p.category === "cli" || p.category === "acp") && p.spawn?.command) {
+            const verCmdConfig = p.versionCommand;
+            const versionCommand = typeof verCmdConfig === "object" && verCmdConfig !== null ? verCmdConfig[process.platform] : verCmdConfig;
             result.push({
               id: p.type,
               displayName: p.displayName || p.name,
               icon: p.icon || "\u{1F527}",
               command: p.spawn.command,
-              category: p.category
+              category: p.category,
+              ...typeof versionCommand === "string" && versionCommand.trim() ? { versionCommand: versionCommand.trim() } : {}
             });
           }
         }
@@ -18113,6 +18133,12 @@ __export(provider_cli_adapter_exports, {
 function stripAnsi(str) {
   return str.replace(/\x1B\[\d*[A-HJKSTfG]/g, " ").replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])/g, "").replace(/\x1B\][^\x07]*\x07/g, "").replace(/\x1B\][^\x1B]*\x1B\\/g, "").replace(/  +/g, " ");
 }
+function stripTerminalNoise(str) {
+  return String(str || "").replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F]/g, "").replace(/(^|[\s([])(?:\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\[\??\d{1,4}(?:;\d{1,4})*[A-Za-z])(?=$|[\s)\]])/g, "$1").replace(/(^|[\s([])(?:\d{1,4};\?)(?=$|[\s)\]])/g, "$1").replace(/\r+/g, "\n").replace(/[ \t]+\n/g, "\n").replace(/\n{3,}/g, "\n\n").replace(/ {2,}/g, " ");
+}
+function sanitizeTerminalText(str) {
+  return stripTerminalNoise(stripAnsi(str));
+}
 function findBinary(name) {
   const isWin = os12.platform() === "win32";
   try {
@@ -18345,6 +18371,9 @@ var init_provider_cli_adapter = __esm({
       // Approval state machine
       approvalTransitionBuffer = "";
       approvalExitTimeout = null;
+      pendingScriptStatus = null;
+      pendingScriptStatusSince = 0;
+      pendingScriptStatusTimer = null;
       // Output settle debounce — fires after PTY output goes quiet
       settleTimer = null;
       settledBuffer = "";
@@ -18410,6 +18439,7 @@ var init_provider_cli_adapter = __esm({
       sendDelayMs;
       sendKey;
       submitStrategy;
+      static SCRIPT_STATUS_DEBOUNCE_MS = 1e3;
       /** Inject CLI scripts after construction (e.g. when resolved by ProviderLoader) */
       setCliScripts(scripts) {
         this.cliScripts = scripts;
@@ -18536,7 +18566,7 @@ var init_provider_cli_adapter = __esm({
       handleOutput(rawData) {
         this.terminalScreen.write(rawData);
         this.terminalHistory = mergeTerminalHistory(this.terminalHistory, this.terminalScreen.getText());
-        const cleanData = stripAnsi(rawData);
+        const cleanData = sanitizeTerminalText(rawData);
         if (this.isWaitingForResponse && cleanData) {
           this.responseBuffer = (this.responseBuffer + cleanData).slice(-8e3);
         }
@@ -18633,24 +18663,39 @@ var init_provider_cli_adapter = __esm({
         const scriptStatus = rawScriptStatus;
         if (!scriptStatus) return;
         const prevStatus = this.currentStatus;
-        if (scriptStatus === "waiting_approval") {
-          const modalMessage = modal?.message || "";
-          const screenText = this.terminalScreen.getText() || this.accumulatedBuffer;
-          const autoAcceptPatterns = [
-            /be able to read, edit, and execute/i,
-            /Security guide/i,
-            /Enter to confirm/i,
-            /Quick safety check/i,
-            /Do you trust the files/i,
-            /Is this a project/i
-          ];
-          if (autoAcceptPatterns.some((p) => p.test(modalMessage) || p.test(screenText))) {
-            LOG.info("CLI", `[${this.cliType}] Auto-accepting startup dialog: ${modalMessage.slice(0, 80)}`);
-            setTimeout(() => this.ptyProcess?.write("\r"), 200);
-            this.lastApprovalResolvedAt = Date.now();
-            this.activeModal = null;
+        const clearPendingScriptStatus = () => {
+          this.pendingScriptStatus = null;
+          this.pendingScriptStatusSince = 0;
+          if (this.pendingScriptStatusTimer) {
+            clearTimeout(this.pendingScriptStatusTimer);
+            this.pendingScriptStatusTimer = null;
+          }
+        };
+        const armPendingScriptStatus = (delayMs) => {
+          if (this.pendingScriptStatusTimer) clearTimeout(this.pendingScriptStatusTimer);
+          this.pendingScriptStatusTimer = setTimeout(() => {
+            this.pendingScriptStatusTimer = null;
+            this.settledBuffer = this.recentOutputBuffer;
+            this.evaluateSettled();
+          }, delayMs);
+        };
+        const shouldDebouncePromotion = (status) => prevStatus === "idle" && !this.isWaitingForResponse && !this.currentTurnScope && (status === "generating" || status === "waiting_approval");
+        if (shouldDebouncePromotion(scriptStatus)) {
+          if (this.pendingScriptStatus !== scriptStatus) {
+            this.pendingScriptStatus = scriptStatus;
+            this.pendingScriptStatusSince = now;
+            armPendingScriptStatus(_ProviderCliAdapter.SCRIPT_STATUS_DEBOUNCE_MS);
+            return;
+          }
+          const elapsed = now - this.pendingScriptStatusSince;
+          if (elapsed < _ProviderCliAdapter.SCRIPT_STATUS_DEBOUNCE_MS) {
+            armPendingScriptStatus(_ProviderCliAdapter.SCRIPT_STATUS_DEBOUNCE_MS - elapsed);
             return;
           }
+        } else {
+          clearPendingScriptStatus();
+        }
+        if (scriptStatus === "waiting_approval") {
           const inCooldown = this.lastApprovalResolvedAt && Date.now() - this.lastApprovalResolvedAt < this.timeouts.approvalCooldown;
           if (!inCooldown) {
             this.isWaitingForResponse = true;
@@ -18663,6 +18708,12 @@ var init_provider_cli_adapter = __esm({
           }
         }
         if (scriptStatus === "generating") {
+          const screenText = this.terminalScreen.getText() || this.accumulatedBuffer;
+          const noActiveTurn = !this.currentTurnScope;
+          const looksIdleChrome = /(^|\n)\s*[❯›>]\s*(?:\n|$)/m.test(screenText) || /accept edits on/i.test(screenText) && (/Update available!/i.test(screenText) || /\/effort/i.test(screenText) || /^.*➜\s+\S+/m.test(screenText));
+          if (prevStatus === "idle" && !this.isWaitingForResponse && noActiveTurn && !modal && looksIdleChrome) {
+            return;
+          }
           if (prevStatus === "waiting_approval") {
             if (this.approvalExitTimeout) {
               clearTimeout(this.approvalExitTimeout);
@@ -19120,7 +19171,7 @@ ${data.message || ""}`.trim();
           committedMessages: this.committedMessages.slice(-20),
           structuredMessages: this.structuredMessages.slice(-20),
           messageCount: this.committedMessages.length,
-          screenText: this.terminalScreen.getText().slice(-4e3),
+          screenText: sanitizeTerminalText(this.terminalScreen.getText()).slice(-4e3),
           terminalHistory: this.terminalHistory.slice(-8e3),
           currentTurnScope: this.currentTurnScope,
           startupBuffer: this.startupBuffer.slice(-4e3),
@@ -19129,6 +19180,7 @@ ${data.message || ""}`.trim();
           accumulatedBufferLength: this.accumulatedBuffer.length,
           accumulatedRawBufferLength: this.accumulatedRawBuffer.length,
           rawBufferPreview: this.accumulatedRawBuffer.slice(-1e3),
+          sanitizedRawPreview: sanitizeTerminalText(this.accumulatedRawBuffer).slice(-1e3),
           responseBuffer: this.responseBuffer.slice(-1e3),
           isWaitingForResponse: this.isWaitingForResponse,
           activeModal: this.activeModal,
@@ -19212,19 +19264,6 @@ var init_cli_provider_instance = __esm({
       getState() {
         const adapterStatus = this.adapter.getStatus();
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
-        const recentMessages = adapterStatus.messages.slice(-50).map((m) => {
-          const content = typeof m.content === "string" && m.content.length > 8e3 ? m.content.slice(0, 8e3) + "\n... (truncated)" : m.content;
-          return { ...m, content };
-        });
-        if (recentMessages.length > 0) {
-          const dirName2 = this.workingDir.split("/").filter(Boolean).pop() || "session";
-          this.historyWriter.appendNewMessages(
-            this.type,
-            recentMessages,
-            `${this.provider.name} \xB7 ${dirName2}`,
-            this.instanceId
-          );
-        }
         if (adapterStatus.terminalHistory?.trim()) {
           this.historyWriter.appendTerminalHistory(
             this.type,
@@ -19238,12 +19277,12 @@ var init_cli_provider_instance = __esm({
           name: this.provider.name,
           category: "cli",
           status: adapterStatus.status,
-          mode: this.settings.mode || "terminal",
+          mode: "terminal",
           activeChat: {
             id: `${this.type}_${this.workingDir}`,
             title: `${this.provider.name} \xB7 ${dirName}`,
             status: adapterStatus.status,
-            messages: recentMessages,
+            messages: [],
             activeModal: adapterStatus.activeModal,
             terminalHistory: adapterStatus.terminalHistory,
             inputContent: ""
@@ -19257,11 +19296,15 @@ var init_cli_provider_instance = __esm({
       }
       onEvent(event, data) {
         if (event === "send_message" && data?.text) {
-          this.adapter.sendMessage(data.text);
+          void this.adapter.sendMessage(data.text).catch((e) => {
+            LOG.warn("CLI", `[${this.type}] send_message failed: ${e?.message || e}`);
+          });
         } else if (event === "server_connected" && data?.serverConn) {
           this.adapter.setServerConn(data.serverConn);
         } else if (event === "resolve_action" && data) {
-          this.adapter.resolveAction(data);
+          void this.adapter.resolveAction(data).catch((e) => {
+            LOG.warn("CLI", `[${this.type}] resolve_action failed: ${e?.message || e}`);
+          });
         }
       }
       dispose() {
@@ -37702,18 +37745,18 @@ function findBinary2(name) {
   const result = runCommand(cmd, 5e3);
   return result ? result.split("\n")[0] : null;
 }
-function parseVersion(raw) {
+function parseVersion2(raw) {
   const match = raw.match(/v?(\d+\.\d+(?:\.\d+)?(?:-[a-zA-Z0-9.]+)?)/);
   return match ? match[1] : raw.split("\n")[0].substring(0, 100);
 }
 function getVersion(binary, versionCommand) {
   if (versionCommand) {
     const raw = runCommand(versionCommand);
-    return raw ? parseVersion(raw) : null;
+    return raw ? parseVersion2(raw) : null;
   }
   for (const flag of ["--version", "-V", "-v"]) {
     const raw = runCommand(`"${binary}" ${flag}`);
-    if (raw && raw.length < 500) return parseVersion(raw);
+    if (raw && raw.length < 500) return parseVersion2(raw);
   }
   return null;
 }
@@ -40047,16 +40090,16 @@ var init_dev_server = __esm({
       resolveAutoImplWritableProviderDir(category, type, requestedDir) {
         const canonicalUserDir = path12.resolve(this.providerLoader.getUserProviderDir(category, type));
         const desiredDir = requestedDir ? path12.resolve(requestedDir) : canonicalUserDir;
-        if (desiredDir !== canonicalUserDir) {
-          return null;
+        const upstreamRoot = path12.resolve(this.providerLoader.getUpstreamDir());
+        if (desiredDir === upstreamRoot || desiredDir.startsWith(`${upstreamRoot}${path12.sep}`)) {
+          return { dir: null, reason: `Refusing to write into upstream provider directory: ${desiredDir}` };
         }
-        const userRoot = path12.resolve(this.providerLoader.getUserDir());
-        if (desiredDir !== userRoot && !desiredDir.startsWith(`${userRoot}${path12.sep}`)) {
-          return null;
+        if (path12.basename(desiredDir) !== type) {
+          return { dir: null, reason: `Requested writable provider directory must end with '${type}': ${desiredDir}` };
         }
         const sourceDir = this.findProviderDir(type);
         if (!sourceDir) {
-          return null;
+          return { dir: null, reason: `Provider source directory not found for '${type}'` };
         }
         if (!fs10.existsSync(desiredDir)) {
           fs10.mkdirSync(path12.dirname(desiredDir), { recursive: true });
@@ -40065,7 +40108,7 @@ var init_dev_server = __esm({
         }
         const providerJson = path12.join(desiredDir, "provider.json");
         if (!fs10.existsSync(providerJson)) {
-          return null;
+          return { dir: null, reason: `provider.json not found in writable provider directory: ${desiredDir}` };
         }
         try {
           const providerData = JSON.parse(fs10.readFileSync(providerJson, "utf-8"));
@@ -40073,10 +40116,13 @@ var init_dev_server = __esm({
             providerData.disableUpstream = true;
             fs10.writeFileSync(providerJson, JSON.stringify(providerData, null, 2));
           }
-        } catch {
-          return null;
+        } catch (error48) {
+          return {
+            dir: null,
+            reason: `Failed to update provider.json in writable provider directory: ${error48.message}`
+          };
         }
-        return desiredDir;
+        return { dir: desiredDir };
       }
       loadAutoImplReferenceScripts(referenceType) {
         if (!referenceType) return {};
@@ -40111,13 +40157,14 @@ var init_dev_server = __esm({
           this.json(res, 404, { error: `Provider not found: ${type}` });
           return;
         }
-        const providerDir = this.resolveAutoImplWritableProviderDir(provider.category, type, requestedProviderDir);
-        if (!providerDir) {
+        const writableProvider = this.resolveAutoImplWritableProviderDir(provider.category, type, requestedProviderDir);
+        if (!writableProvider.dir) {
           this.json(res, 409, {
-            error: `Auto-implement only writes to the canonical user provider directory for '${type}'.`
+            error: writableProvider.reason || `Auto-implement only writes to the canonical user provider directory for '${type}'.`
           });
           return;
         }
+        const providerDir = writableProvider.dir;
         try {
           const resolvedReference = this.resolveAutoImplReference(provider.category, reference, type);
           this.sendAutoImplSSE({
@@ -40810,6 +40857,9 @@ var init_dev_server = __esm({
         lines.push("8. Keep exports compatible with the existing `scripts.js` router (`module.exports = function ...`).");
         lines.push("9. Do not rewrite unrelated provider config. Only touch the scripts needed for this task unless a tiny supporting change is required.");
         lines.push("10. When the verification API returns `instanceId`, keep using that exact instance for follow-up `send`, `resolve`, `raw`, and `stop` calls. Do not assume type-only routing is safe if multiple sessions exist.");
+        lines.push("11. Do NOT repeatedly dump the same target files. Read the target scripts once, reproduce the bug, then move directly to patching.");
+        lines.push("12. If the user instructions include concrete screen text, raw PTY snippets, or a specific repro, treat that as the primary acceptance criteria.");
+        lines.push("13. After the first successful live repro, stop broad diagnosis. Edit the scripts, reload, and verify. Do not burn tokens on repeated re-inspection without code changes.");
         lines.push("");
         lines.push("## Task");
         lines.push(`Edit files in \`${providerDir}\` to implement: **${functions.join(", ")}**`);
@@ -40851,6 +40901,9 @@ var init_dev_server = __esm({
         lines.push("");
         lines.push("Use `resolve` when the parsed modal buttons are correct. Use `raw` when the CLI expects a literal keystroke like `1`, `y`, or Enter. Repeat until idle.");
         lines.push("");
+        lines.push("### Patch Discipline");
+        lines.push("Once the repro is confirmed, immediately edit the target files. Avoid loops where you keep re-reading long files or re-running the same debug commands without changing code.");
+        lines.push("");
         lines.push("### 5. Verify the side effects outside the CLI");
         lines.push("```bash");
         lines.push("test -f tmp/adhdev_provider_fix_test.py");
@@ -42754,7 +42807,7 @@ var init_adhdev_daemon = __esm({
     fs12 = __toESM(require("fs"));
     path14 = __toESM(require("path"));
     import_chalk2 = __toESM(require("chalk"));
-    pkgVersion = "0.6.75";
+    pkgVersion = "0.6.76";
     if (pkgVersion === "unknown") {
       try {
         const possiblePaths = [