@adhdev/daemon-core 0.9.82-rc.168 → 0.9.82-rc.169

package/dist/providers/approval-utils.d.ts

@@ -4,6 +4,10 @@ export declare function pickApprovalButton(buttons: string[] | null | undefined,
     index: number;
     label: string;
 };
+export declare function pickAutoApprovalButton(buttons: string[] | null | undefined): {
+    index: number;
+    label: string;
+};
 export declare function formatAutoApprovalMessage(modalMessage?: string, buttonLabel?: string): string;
 /**
  * Returns true when the given text (e.g. last assistant message content, or

package/dist/providers/spec/schema.gen.d.ts

@@ -245,6 +245,10 @@ export declare const SCHEMA: {
                             readonly minimum: 1;
                             readonly default: 2;
                         };
+                        readonly continuation_lines: {
+                            readonly type: "boolean";
+                            readonly default: false;
+                        };
                     };
                 };
             };

package/dist/providers/spec/types.d.ts

@@ -23,6 +23,7 @@ export interface ModalButtonsRule {
     flags?: string;
     key_for_index: string;
     min_count?: number;
+    continuation_lines?: boolean;
 }
 export interface SpecState {
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.82-rc.168",
+  "version": "0.9.82-rc.169",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/agent-stream/poller.ts

@@ -19,7 +19,7 @@ import type { SessionRegistry } from '../sessions/registry.js';
 import { reconcileIdeRuntimeSessions } from '../sessions/reconcile.js';
 import { LOG } from '../logging/logger.js';
 import type { AgentStreamState } from './types.js';
-import { formatAutoApprovalMessage, pickApprovalButton } from '../providers/approval-utils.js';
+import { formatAutoApprovalMessage, pickAutoApprovalButton } from '../providers/approval-utils.js';
 import type { ProviderModule } from '../providers/contracts.js';
 import { buildRuntimeSystemChatMessage } from '../providers/chat-message-normalization.js';
 
@@ -210,8 +210,7 @@ export class AgentStreamPoller {
                 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 { label: buttonLabel } = pickAutoApprovalButton(stream.activeModal?.buttons);
                         const approved = await agentStreamManager.resolveSessionAction(cdp, resolvedActiveSessionId, 'approve', buttonLabel);
                         if (approved) {
                             const effectId = [

package/src/providers/approval-utils.d.ts

@@ -4,4 +4,8 @@ export declare function pickApprovalButton(buttons: string[] | null | undefined,
     index: number;
     label: string;
 };
+export declare function pickAutoApprovalButton(buttons: string[] | null | undefined): {
+    index: number;
+    label: string;
+};
 export declare function formatAutoApprovalMessage(modalMessage?: string, buttonLabel?: string): string;

package/src/providers/approval-utils.ts

@@ -66,6 +66,14 @@ export function pickApprovalButton(
     return { index: -1, label: '' };
 }
 
+export function pickAutoApprovalButton(
+    buttons: string[] | null | undefined,
+): { index: number; label: string } {
+    const labels = (buttons || []).map((button) => String(button || '').trim());
+    const index = labels.findIndex(Boolean);
+    return index >= 0 ? { index, label: labels[index] } : { index: -1, label: '' };
+}
+
 export function formatAutoApprovalMessage(modalMessage?: string, buttonLabel?: string): string {
     const lines = [`Auto-approved${buttonLabel ? `: ${buttonLabel}` : ''}`];
     const cleanMessage = String(modalMessage || '').trim();

package/src/providers/cli-provider-instance.ts

@@ -22,7 +22,7 @@ import { ChatHistoryWriter, isNativeSourceCanonicalHistory, materializeProviderN
 import { LOG } from '../logging/logger.js';
 import type { ChatMessage } from '../types.js';
 import { buildPersistedProviderEffectMessage, normalizeProviderEffects } from './control-effects.js';
-import { formatAutoApprovalMessage, pickApprovalButton, looksLikeActiveApprovalPromptText } from './approval-utils.js';
+import { formatAutoApprovalMessage, pickApprovalButton, pickAutoApprovalButton, looksLikeActiveApprovalPromptText } from './approval-utils.js';
 import { getCliScriptCommand, parseCliScriptResult } from './cli-script-results.js';
 import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
 import { normalizeProviderSessionId } from './provider-session-id.js';
@@ -1092,9 +1092,9 @@ export class CliProviderInstance implements ProviderInstance {
         if (!modal || buttons.length === 0) {
             return autoApproveActive;
         }
-        const { index: buttonIndex, label: buttonLabel } = pickApprovalButton(buttons, this.provider);
+        const { index: buttonIndex, label: buttonLabel } = pickAutoApprovalButton(buttons);
         if (buttonIndex < 0) {
-            // No positive button matched — don't pick a random index, just
+            // No concrete button matched — don't pick a random index, just
             // surface the modal so the user can decide.
             return autoApproveActive;
         }

package/src/providers/ide-provider-instance.ts

@@ -20,7 +20,7 @@ import { LOG } from '../logging/logger.js';
 import { buildPersistedProviderEffectMessage, normalizeProviderEffects } from './control-effects.js';
 import { validateReadChatResultPayload } from './read-chat-contract.js';
 import type { ChatMessage } from '../types.js';
-import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.js';
+import { formatAutoApprovalMessage, pickAutoApprovalButton } from './approval-utils.js';
 import { mergeProviderPatchState, resolveProviderStateSurface } from './provider-patch-state.js';
 import { buildChatMessage, buildRuntimeSystemChatMessage, normalizeChatMessages, extractFinalSummaryFromMessages } from './chat-message-normalization.js';
 import { getProviderSessionCapabilities, IDE_PROVIDER_SESSION_CAPABILITIES_BASE } from './open-panel-support.js';
@@ -708,7 +708,7 @@ export class IdeProviderInstance implements ProviderInstance {
 
         this.autoApproveBusy = true;
         try {
-            const { label: targetButton } = pickApprovalButton(_chatData?.activeModal?.buttons, this.provider);
+            const { label: targetButton } = pickAutoApprovalButton(_chatData?.activeModal?.buttons);
 
             const script = scriptFn({ action: 'approve', button: targetButton, buttonText: targetButton });
             if (!script) return;

package/src/providers/spec/evaluator.ts

@@ -125,6 +125,11 @@ function compilePattern(ref: { pattern: string; flags?: string }): RegExp {
     return new RegExp(ref.pattern, flags.includes('g') ? flags : flags + 'g');
 }
 
+function compileLinePattern(ref: { pattern: string; flags?: string }): RegExp {
+    const flags = (ref.flags ?? 'm').replace(/g/g, '');
+    return new RegExp(ref.pattern, flags);
+}
+
 // ────────────────────────────────────────────────────────────────────────────
 // State matching
 // ────────────────────────────────────────────────────────────────────────────
@@ -162,16 +167,41 @@ function extractModal(
 ): ModalSnapshot | null {
     if (!state.modal_buttons) return null;
     const hay = sectionText(sections, state.modal_buttons.section, fullScreen);
-    const re = compilePattern(state.modal_buttons);
     const buttons: { index: number; label: string; key: string }[] = [];
-    let m: RegExpExecArray | null;
-    while ((m = re.exec(hay)) !== null) {
-        const idx = Number(m[1]);
-        const label = String(m[2] ?? '').trim();
-        if (!Number.isFinite(idx) || idx <= 0 || !label) continue;
-        if (buttons.some(b => b.index === idx)) continue;
-        const key = state.modal_buttons.key_for_index.replace(/\{index\}/g, String(idx));
-        buttons.push({ index: idx, label, key });
+    if (state.modal_buttons.continuation_lines) {
+        const re = compileLinePattern(state.modal_buttons);
+        const lines = hay.split('\n');
+        for (let i = 0; i < lines.length; i += 1) {
+            const m = re.exec(lines[i]);
+            if (!m) continue;
+            const idx = Number(m[1]);
+            let label = String(m[2] ?? '').trim();
+            if (!Number.isFinite(idx) || idx <= 0 || !label) continue;
+            let j = i + 1;
+            while (j < lines.length) {
+                const next = lines[j];
+                if (!next.trim()) break;
+                if (re.test(next)) break;
+                if (!/^\s+/.test(next)) break;
+                label += ' ' + next.trim();
+                j += 1;
+            }
+            if (buttons.some(b => b.index === idx)) continue;
+            const key = state.modal_buttons.key_for_index.replace(/\{index\}/g, String(idx));
+            buttons.push({ index: idx, label, key });
+            i = j - 1;
+        }
+    } else {
+        const re = compilePattern(state.modal_buttons);
+        let m: RegExpExecArray | null;
+        while ((m = re.exec(hay)) !== null) {
+            const idx = Number(m[1]);
+            const label = String(m[2] ?? '').trim();
+            if (!Number.isFinite(idx) || idx <= 0 || !label) continue;
+            if (buttons.some(b => b.index === idx)) continue;
+            const key = state.modal_buttons.key_for_index.replace(/\{index\}/g, String(idx));
+            buttons.push({ index: idx, label, key });
+        }
     }
     buttons.sort((a, b) => a.index - b.index);
     const minCount = state.modal_buttons.min_count ?? 2;

package/src/providers/spec/schema.gen.ts

@@ -269,6 +269,10 @@ export const SCHEMA = {
                             "type": "integer",
                             "minimum": 1,
                             "default": 2
+                        },
+                        "continuation_lines": {
+                            "type": "boolean",
+                            "default": false
                         }
                     }
                 }

package/src/providers/spec/schema.json

@@ -122,7 +122,8 @@
                         "pattern": { "type": "string", "minLength": 1 },
                         "flags": { "type": "string" },
                         "key_for_index": { "type": "string", "minLength": 1 },
-                        "min_count": { "type": "integer", "minimum": 1, "default": 2 }
+                        "min_count": { "type": "integer", "minimum": 1, "default": 2 },
+                        "continuation_lines": { "type": "boolean", "default": false }
                     }
                 }
             }

package/src/providers/spec/types.ts

@@ -33,6 +33,7 @@ export interface ModalButtonsRule {
     flags?: string;
     key_for_index: string;
     min_count?: number;
+    continuation_lines?: boolean;
 }
 
 export interface SpecState {