adhdev 0.8.29 → 0.8.30

package/dist/cli/index.js

@@ -3440,6 +3440,59 @@ ${effect.notification.body || ""}`.trim();
   }
 });
 
+// ../../oss/packages/daemon-core/src/providers/approval-utils.ts
+function normalizeApprovalLabel(value) {
+  return String(value || "").toLowerCase().replace(/[^\p{L}\p{N}]+/gu, " ").trim();
+}
+function getApprovalPositiveHints(provider) {
+  const customHints = Array.isArray(provider?.approvalPositiveHints) ? provider.approvalPositiveHints.map((hint) => normalizeApprovalLabel(String(hint || ""))).filter(Boolean) : [];
+  return customHints.length > 0 ? customHints : DEFAULT_APPROVAL_POSITIVE_HINTS;
+}
+function pickApprovalButton(buttons, provider) {
+  const labels = (buttons || []).map((button) => String(button || "").trim()).filter(Boolean);
+  if (labels.length === 0) {
+    return { index: 0, label: "Approve" };
+  }
+  const normalizedButtons = labels.map((label) => normalizeApprovalLabel(label));
+  const hints = getApprovalPositiveHints(provider);
+  for (const hint of hints) {
+    const exactIndex = normalizedButtons.findIndex((label) => label === hint);
+    if (exactIndex >= 0) return { index: exactIndex, label: labels[exactIndex] };
+    const prefixIndex = normalizedButtons.findIndex((label) => label.startsWith(hint));
+    if (prefixIndex >= 0) return { index: prefixIndex, label: labels[prefixIndex] };
+    const includeIndex = normalizedButtons.findIndex((label) => label.includes(hint));
+    if (includeIndex >= 0) return { index: includeIndex, label: labels[includeIndex] };
+  }
+  return { index: 0, label: labels[0] };
+}
+function formatAutoApprovalMessage(modalMessage, buttonLabel) {
+  const lines = [`Auto-approved${buttonLabel ? `: ${buttonLabel}` : ""}`];
+  const cleanMessage = String(modalMessage || "").trim();
+  if (cleanMessage) lines.push(cleanMessage);
+  return lines.join("\n");
+}
+var DEFAULT_APPROVAL_POSITIVE_HINTS;
+var init_approval_utils = __esm({
+  "../../oss/packages/daemon-core/src/providers/approval-utils.ts"() {
+    "use strict";
+    DEFAULT_APPROVAL_POSITIVE_HINTS = [
+      "run",
+      "approve",
+      "accept",
+      "allow once",
+      "always allow",
+      "allow",
+      "yes",
+      "proceed",
+      "continue",
+      "confirm",
+      "save",
+      "ok",
+      "trust"
+    ];
+  }
+});
+
 // ../../oss/packages/daemon-core/src/providers/ide-provider-instance.ts
 var crypto2, IdeProviderInstance;
 var init_ide_provider_instance = __esm({
@@ -3451,6 +3504,7 @@ var init_ide_provider_instance = __esm({
     init_chat_history();
     init_logger();
     init_control_effects();
+    init_approval_utils();
     IdeProviderInstance = class {
       type;
       category = "ide";
@@ -3517,6 +3571,8 @@ var init_ide_provider_instance = __esm({
       }
       getState() {
         const cdp = this.context?.cdp;
+        const autoApproveActive = (this.currentStatus === "waiting_approval" || this.cachedChat?.status === "waiting_approval") && this.canAutoApprove();
+        const visibleStatus = autoApproveActive ? "generating" : this.currentStatus;
         const extensionStates = [];
         for (const ext of this.extensions.values()) {
           extensionStates.push(ext.getState());
@@ -3525,13 +3581,13 @@ var init_ide_provider_instance = __esm({
           type: this.type,
           name: this.provider.name,
           category: "ide",
-          status: this.currentStatus,
+          status: visibleStatus,
           activeChat: this.cachedChat ? {
             id: this.cachedChat.id || "active_session",
             title: this.cachedChat.title || this.type,
-            status: this.cachedChat.status || this.currentStatus,
+            status: autoApproveActive && this.cachedChat.status === "waiting_approval" ? "generating" : this.cachedChat.status || visibleStatus,
             messages: this.mergeConversationMessages(this.cachedChat.messages || []),
-            activeModal: this.cachedChat.activeModal || null,
+            activeModal: autoApproveActive ? null : this.cachedChat.activeModal || null,
             inputContent: this.cachedChat.inputContent || ""
           } : null,
           workspace: this.workspace || null,
@@ -3750,7 +3806,9 @@ var init_ide_provider_instance = __esm({
         const chatStatus = chatData?.status;
         if (!chatStatus) return;
         const agentKey = `${this.type}:native`;
-        const agentStatus = chatStatus === "streaming" || chatStatus === "generating" ? "generating" : chatStatus === "waiting_approval" ? "waiting_approval" : "idle";
+        const rawAgentStatus = chatStatus === "streaming" || chatStatus === "generating" ? "generating" : chatStatus === "waiting_approval" ? "waiting_approval" : "idle";
+        const autoApproveActive = rawAgentStatus === "waiting_approval" && this.canAutoApprove();
+        const agentStatus = autoApproveActive ? "generating" : rawAgentStatus;
         const lastMsg = Array.isArray(chatData?.messages) && chatData.messages.length > 0 ? chatData.messages[chatData.messages.length - 1] : null;
         const progressFingerprint = agentStatus === "generating" ? `${lastMsg?.role || ""}:${typeof lastMsg?.content === "string" ? lastMsg.content : JSON.stringify(lastMsg?.content || "")}`.slice(-2e3) : void 0;
         this.currentStatus = agentStatus;
@@ -3782,7 +3840,7 @@ var init_ide_provider_instance = __esm({
         this.applyProviderResponse(chatData, {
           phase: agentStatus === "idle" && (lastStatus === "generating" || lastStatus === "waiting_approval") ? "turn_completed" : "immediate"
         });
-        if (agentStatus === "waiting_approval" && this.settings.autoApprove && !this.autoApproveBusy) {
+        if (rawAgentStatus === "waiting_approval" && autoApproveActive && !this.autoApproveBusy) {
           this.autoApproveViaScript(chatData);
         }
         const monitorEvents = this.monitor.check(agentKey, agentStatus, now, progressFingerprint);
@@ -3933,6 +3991,9 @@ ${effect.notification.body || ""}`.trim();
       updateCdp(cdp) {
         if (this.context) this.context.cdp = cdp;
       }
+      canAutoApprove() {
+        return this.settings.autoApprove !== false && typeof this.provider.scripts?.resolveAction === "function" && !!this.context?.cdp?.isConnected;
+      }
       // ─── Auto-approve via CDP script ────────────────────
       async autoApproveViaScript(_chatData) {
         const cdp = this.context?.cdp;
@@ -3944,17 +4005,15 @@ ${effect.notification.body || ""}`.trim();
         }
         this.autoApproveBusy = true;
         try {
-          let targetButton = _chatData?.activeModal?.buttons?.[0] || "Run";
-          const buttons = _chatData?.activeModal?.buttons || [];
-          for (const b of buttons) {
-            const lower = String(b).toLowerCase().replace(/[^\w]/g, "");
-            if (/^(run|approve|accept|yes|allow|always|proceed|save)/.test(lower)) {
-              targetButton = b;
-              break;
-            }
-          }
+          const { label: targetButton } = pickApprovalButton(_chatData?.activeModal?.buttons, this.provider);
           const script = scriptFn({ action: "approve", button: targetButton, buttonText: targetButton });
           if (!script) return;
+          const now = Date.now();
+          this.appendRuntimeSystemMessage(
+            formatAutoApprovalMessage(_chatData?.activeModal?.message, targetButton),
+            `auto_approval:${now}:${targetButton}`,
+            now
+          );
           LOG.info("IdeInstance", `[IdeInstance:${this.type}] autoApprove: executing resolveAction for "${targetButton}"`);
           let rawResult = await cdp.evaluate(script, 1e4);
           if (typeof rawResult === "string") {
@@ -3976,12 +4035,6 @@ ${effect.notification.body || ""}`.trim();
               LOG.warn("IdeInstance", `[IdeInstance:${this.type}] autoApprove: cdp.send() not available for coordinate click`);
             }
           }
-          this.pushEvent({
-            event: "agent:auto_approved",
-            chatTitle: _chatData?.title || this.provider.name,
-            timestamp: Date.now(),
-            ideType: this.type
-          });
         } catch (e) {
           LOG.warn("IdeInstance", `[IdeInstance:${this.type}] autoApprove error: ${e?.message}`);
         } finally {
@@ -9993,6 +10046,7 @@ var init_cli_provider_instance = __esm({
     init_chat_history();
     init_logger();
     init_control_effects();
+    init_approval_utils();
     CachedDatabaseSync = null;
     CliProviderInstance = class {
       constructor(provider, workingDir, cliArgs = [], instanceId, transportFactory, options) {
@@ -10150,6 +10204,8 @@ var init_cli_provider_instance = __esm({
       getState() {
         const adapterStatus = this.adapter.getStatus();
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
+        const autoApproveActive = adapterStatus.status === "waiting_approval" && this.shouldAutoApprove();
+        const visibleStatus = autoApproveActive ? "generating" : adapterStatus.status;
         const parsedProviderSessionId = typeof parsedStatus?.providerSessionId === "string" ? parsedStatus.providerSessionId.trim() : "";
         if (parsedProviderSessionId) {
           this.promoteProviderSessionId(parsedProviderSessionId);
@@ -10189,14 +10245,14 @@ var init_cli_provider_instance = __esm({
           type: this.type,
           name: this.provider.name,
           category: "cli",
-          status: adapterStatus.status,
+          status: visibleStatus,
           mode: this.presentationMode,
           activeChat: {
             id: `${this.type}_${this.workingDir}`,
             title: parsedStatus?.title || dirName,
-            status: parsedStatus?.status || adapterStatus.status,
+            status: autoApproveActive && parsedStatus?.status === "waiting_approval" ? "generating" : parsedStatus?.status || visibleStatus,
             messages: mergedMessages,
-            activeModal: parsedStatus?.activeModal ?? adapterStatus.activeModal,
+            activeModal: autoApproveActive ? null : parsedStatus?.activeModal ?? adapterStatus.activeModal,
             inputContent: ""
           },
           workspace: this.workingDir,
@@ -10260,7 +10316,16 @@ var init_cli_provider_instance = __esm({
         const now = Date.now();
         const adapterStatus = this.adapter.getStatus();
         const parsedStatus = this.adapter.getScriptParsedStatus?.() || null;
-        const newStatus = adapterStatus.status;
+        const rawStatus = adapterStatus.status;
+        const autoApproveActive = rawStatus === "waiting_approval" && this.shouldAutoApprove();
+        if (autoApproveActive) {
+          const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(adapterStatus.activeModal?.buttons, this.provider);
+          this.recordAutoApproval(adapterStatus.activeModal?.message, buttonLabel, now);
+          setTimeout(() => {
+            this.adapter.resolveModal(buttonIndex);
+          }, 0);
+        }
+        const newStatus = autoApproveActive ? "generating" : rawStatus;
         const dirName = this.workingDir.split("/").filter(Boolean).pop() || "session";
         const chatTitle = `${this.provider.name} \xB7 ${dirName}`;
         const partial2 = this.adapter.getPartialResponse();
@@ -10470,6 +10535,16 @@ ${effect.notification.body || ""}`.trim();
       get cliName() {
         return this.provider.name;
       }
+      shouldAutoApprove() {
+        return this.settings.autoApprove !== false;
+      }
+      recordAutoApproval(modalMessage, buttonLabel, now = Date.now()) {
+        this.appendRuntimeSystemMessage(
+          formatAutoApprovalMessage(modalMessage, buttonLabel),
+          `auto_approval:${now}:${buttonLabel || "approve"}`,
+          now
+        );
+      }
       recordApprovalSelection(buttonText) {
         const cleanButton = String(buttonText || "").trim();
         if (!cleanButton) return;
@@ -27355,8 +27430,10 @@ var init_acp_provider_instance = __esm({
                 input: tc.rawInput ? typeof tc.rawInput === "string" ? tc.rawInput : JSON.stringify(tc.rawInput) : void 0
               });
             }
-            if (this.settings.autoApprove) {
-              this.log.info(`[${this.type}] Auto-approving: ${tc.title || tc.toolCallId}`);
+            if (this.settings.autoApprove !== false) {
+              const toolTitle = tc.title || tc.toolCallId || "tool call";
+              this.log.info(`[${this.type}] Auto-approving: ${toolTitle}`);
+              this.appendSystemMessage(`Auto-approved: ${toolTitle}`);
               const allowOption = params.options.find((o) => o.kind === "allow_once") || params.options.find((o) => o.kind === "allow_always");
               if (allowOption) {
                 return { outcome: { outcome: "selected", optionId: allowOption.optionId } };
@@ -27808,6 +27885,18 @@ var init_acp_provider_instance = __esm({
         this.events.push(event);
         if (this.events.length > 50) this.events = this.events.slice(-50);
       }
+      appendSystemMessage(content, timestamp = Date.now()) {
+        const normalizedContent = String(content || "").trim();
+        if (!normalizedContent) return;
+        this.messages.push({
+          role: "system",
+          content: normalizedContent,
+          timestamp
+        });
+        if (this.messages.length > 200) {
+          this.messages = this.messages.slice(-100);
+        }
+      }
       flushEvents() {
         const events = [...this.events];
         this.events = [];
@@ -31151,7 +31240,7 @@ var init_provider_loader = __esm({
       */
       getSettingValue(type, key) {
         const schemaDef = this.getSettingsSchema(type)[key];
-        const defaultVal = schemaDef ? schemaDef.default : void 0;
+        const defaultVal = schemaDef ? key === "autoApprove" && schemaDef.type === "boolean" ? true : schemaDef.default : void 0;
         try {
           const { loadConfig: loadConfig2 } = (init_config(), __toCommonJS(config_exports));
           const config2 = loadConfig2();
@@ -31210,13 +31299,32 @@ var init_provider_loader = __esm({
       getSettingsSchema(type) {
         const provider = this.providers.get(type);
         if (!provider) return {};
-        return {
+        const result = {
           ...this.getSyntheticSettings(type, provider),
           ...provider.settings || {}
         };
+        if (result.autoApprove?.type === "boolean") {
+          result.autoApprove = {
+            ...result.autoApprove,
+            default: true,
+            public: true,
+            label: result.autoApprove.label || "Auto Approve",
+            description: result.autoApprove.description || "Automatically approve actionable prompts without sending approval alerts."
+          };
+        }
+        return result;
       }
       getSyntheticSettings(type, provider) {
         const result = {};
+        if (!provider.settings?.autoApprove) {
+          result.autoApprove = {
+            type: "boolean",
+            default: true,
+            public: true,
+            label: "Auto Approve",
+            description: "Automatically approve actionable prompts without sending approval alerts."
+          };
+        }
         if ((provider.category === "cli" || provider.category === "acp") && provider.spawn?.command && !provider.settings?.executablePath) {
           result.executablePath = {
             type: "string",
@@ -33663,6 +33771,7 @@ var init_poller = __esm({
     init_setup();
     init_reconcile();
     init_logger();
+    init_approval_utils();
     AgentStreamPoller = class {
       deps;
       timer = null;
@@ -33793,7 +33902,43 @@ var init_poller = __esm({
           }
           try {
             await agentStreamManager.syncActiveSession(cdp, parentSessionId);
-            const stream = await agentStreamManager.collectActiveSession(cdp, parentSessionId);
+            let stream = await agentStreamManager.collectActiveSession(cdp, parentSessionId);
+            if (stream?.status === "waiting_approval") {
+              const autoApprove = providerLoader.getSettings(stream.agentType).autoApprove !== false;
+              if (autoApprove && resolvedActiveSessionId) {
+                const provider = providerLoader.getMeta(stream.agentType);
+                const { label: buttonLabel } = pickApprovalButton(stream.activeModal?.buttons, provider);
+                const approved = await agentStreamManager.resolveSessionAction(cdp, resolvedActiveSessionId, "approve", buttonLabel);
+                if (approved) {
+                  const effectId = [
+                    "auto_approval",
+                    resolvedActiveSessionId,
+                    String(stream.messages?.length || 0),
+                    buttonLabel,
+                    String(stream.activeModal?.message || "").trim()
+                  ].join(":");
+                  stream = {
+                    ...stream,
+                    status: "streaming",
+                    activeModal: void 0,
+                    effects: [
+                      ...stream.effects || [],
+                      {
+                        type: "message",
+                        id: effectId,
+                        persist: true,
+                        message: {
+                          role: "system",
+                          senderName: "System",
+                          kind: "system",
+                          content: formatAutoApprovalMessage(stream.activeModal?.message, buttonLabel)
+                        }
+                      }
+                    ]
+                  };
+                }
+              }
+            }
             this.deps.onStreamsUpdated?.(ideType, stream ? [stream] : []);
           } catch {
           }
@@ -48879,7 +49024,7 @@ var init_adhdev_daemon = __esm({
     import_ws3 = require("ws");
     import_chalk2 = __toESM(require("chalk"));
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.29" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.30" });
     DANGEROUS_PATTERNS = [
       /\brm\s+(-[a-z]*f|-[a-z]*r|--force|--recursive)/i,
       /\bsudo\b/i,