fullcourtdefense-cli 1.35.0 → 1.35.2

package/dist/devConfirm.d.ts

@@ -13,7 +13,7 @@ export declare const MIN_HUMAN_ANSWER_MS = 1000;
 export declare function looksLikeClientAutoAnswer(answer: 'accept' | 'decline' | 'timeout', latencyMs: number): boolean;
 /**
  * OS-owned confirmation dialog — the IDE-independent fallback for "Ask the developer".
- * PowerShell `WScript.Shell.Popup` on Windows, `osascript` on macOS, `zenity` elsewhere.
+ * Branded WinForms card on Windows, WKWebView card on macOS, `zenity` elsewhere.
  * The agent cannot answer it: it is not connected to hook stdin, the MCP stream or the
  * agent's terminal. Resolves `true` only for an explicit "Allow once"; decline, close,
  * timeout, a missing dialog binary or no human present all resolve `false`.
@@ -42,6 +42,8 @@ export interface NativeDialogOptions {
     alwaysScopeLabel?: string;
     /** How long / how many times it would hold, e.g. "30 days" or "7 days or 20 uses". */
     alwaysLimitsLabel?: string;
+    /** Icon and copy. Buttons stay Deny / Allow once / Always allow for `ask`. */
+    tone?: 'ask' | 'approval' | 'block';
 }
 export declare function confirmNativeActionDetailed(reason: string, timeoutMs?: number, options?: NativeDialogOptions): Promise<{
     outcome: NativeDialogOutcome;

package/dist/devConfirm.js

@@ -107,7 +107,7 @@ function looksLikeClientAutoAnswer(answer, latencyMs) {
 }
 /**
  * OS-owned confirmation dialog — the IDE-independent fallback for "Ask the developer".
- * PowerShell `WScript.Shell.Popup` on Windows, `osascript` on macOS, `zenity` elsewhere.
+ * Branded WinForms card on Windows, WKWebView card on macOS, `zenity` elsewhere.
  * The agent cannot answer it: it is not connected to hook stdin, the MCP stream or the
  * agent's terminal. Resolves `true` only for an explicit "Allow once"; decline, close,
  * timeout, a missing dialog binary or no human present all resolve `false`.
@@ -129,43 +129,158 @@ function nativeDialogAvailable() {
         return true;
     return Boolean(process.env.DISPLAY || process.env.WAYLAND_DISPLAY);
 }
+function b64(value) {
+    return Buffer.from(value, 'utf8').toString('base64');
+}
+function htmlEsc(value) {
+    return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+}
+function toneTheme(tone) {
+    if (tone === 'block')
+        return { icon: '#DC2626', badgeBg: '#FEF2F2', badgeFg: '#B91C1C', glyph: '✕' };
+    if (tone === 'approval')
+        return { icon: '#D97706', badgeBg: '#FFEDD5', badgeFg: '#C2410C', glyph: '!' };
+    return { icon: '#2563EB', badgeBg: '#DBEAFE', badgeFg: '#1D4ED8', glyph: '?' };
+}
+function argb(hex) {
+    const n = hex.replace('#', '');
+    return `${parseInt(n.slice(0, 2), 16)},${parseInt(n.slice(2, 4), 16)},${parseInt(n.slice(4, 6), 16)}`;
+}
+/** Card HTML for macOS WKWebView. Button labels stay the existing Deny / Allow once / Always allow. */
+function dialogCardHtml(view, options) {
+    const theme = toneTheme(view.tone);
+    const bullets = (items, color) => items.map(item => `<li><span class="dot" style="background:${color}"></span>${htmlEsc(item)}</li>`).join('');
+    const always = options.allowAlways
+        ? `<button class="ghost" onclick="location.hash='fcd-always'">${htmlEsc(exports.DIALOG_BUTTON_ALWAYS)}</button>`
+        : '';
+    return `<!doctype html><html><head><meta charset="utf-8"><style>
+*{box-sizing:border-box}body{margin:0;font:13px/1.45 -apple-system,Segoe UI,sans-serif;background:#f4f7fb;color:#0f172a}
+.card{margin:12px;background:#fff;border:1px solid #e2e8f0;border-radius:16px;padding:20px 22px 16px;box-shadow:0 10px 30px rgba(15,23,42,.08)}
+.brand{display:flex;justify-content:space-between;align-items:center;color:#64748b;font-weight:600;font-size:12px;margin-bottom:14px}
+.hero{display:flex;gap:14px;align-items:flex-start}
+.icon{width:44px;height:44px;border-radius:50%;background:${theme.badgeBg};color:${theme.icon};border:1px solid ${theme.icon}33;display:flex;align-items:center;justify-content:center;font:700 20px/1 sans-serif;flex:none}
+.badge{display:inline-block;background:${theme.badgeBg};color:${theme.badgeFg};font-size:11px;font-weight:700;padding:3px 8px;border-radius:999px;margin-bottom:6px}
+h1{margin:0 0 4px;font-size:22px}.sub{color:#64748b;margin:0 0 14px}
+.box{border:1px solid #e2e8f0;border-radius:12px;padding:12px 14px;margin:0 0 10px;background:#f8fafc}
+h2{margin:0 0 6px;font-size:13px}.k{color:#64748b;font-size:11px;font-weight:700}
+.action{font-family:ui-monospace,Menlo,Consolas,monospace;font-size:12px;white-space:pre-wrap;word-break:break-word;background:#fff;border:1px solid #e2e8f0;border-radius:8px;padding:8px 10px}
+ul{list-style:none;margin:0;padding:0}li{display:flex;gap:8px;margin:6px 0}
+.dot{width:8px;height:8px;border-radius:50%;margin-top:6px;flex:none}
+.row{display:flex;justify-content:flex-end;gap:8px;align-items:center;margin-top:14px;flex-wrap:wrap}
+button{font:600 13px/1 -apple-system,Segoe UI,sans-serif;border-radius:8px;padding:9px 14px;cursor:pointer}
+.primary{background:#1d4ed8;color:#fff;border:0}.ghost{background:#fff;border:1px solid #cbd5e1}
+.danger{background:#fff;color:#dc2626;border:1px solid #fecaca}
+.foot{color:#94a3b8;font-size:11px;margin-top:10px}
+</style></head><body><div class="card">
+<div class="brand"><span>FullCourtDefense</span><span>Keep developers moving, safely.</span></div>
+<div class="hero"><div class="icon">${theme.glyph}</div><div>
+<span class="badge">${htmlEsc(view.badge)}</span>
+<h1>${htmlEsc(view.headline)}</h1>
+<p class="sub">${htmlEsc(view.subtitle)}</p>
+</div></div>
+<div class="box"><h2>Action</h2>
+${view.kind ? `<div class="k">${htmlEsc(view.kind)}</div>` : ''}
+${view.action ? `<div class="action">${htmlEsc(view.action)}</div>` : '<p class="sub">The action is described in the IDE message.</p>'}
+</div>
+${view.policy ? `<div class="box"><h2>Matched policy</h2><div><span class="k">Policy</span> ${htmlEsc(view.policy)}</div>${view.scope ? `<div><span class="k">Scope</span> ${htmlEsc(view.scope)}</div>` : ''}</div>` : ''}
+<h2>Why it triggered</h2><ul>${bullets(view.why, theme.icon)}</ul>
+<h2>What happens next</h2><ul>${bullets(view.next, '#2563EB')}</ul>
+<div class="row">${always}
+<button class="primary" onclick="location.hash='fcd-once'">${htmlEsc(exports.DIALOG_BUTTON_ONCE)}</button>
+<button class="danger" onclick="location.hash='fcd-deny'">${htmlEsc(exports.DIALOG_BUTTON_DENY)}</button>
+</div>
+<p class="foot">${htmlEsc(view.footer)}</p>
+</div></body></html>`;
+}
 /**
- * Windows: a small owned window (System.Windows.Forms) — `WScript.Shell.Popup`
- * cannot label its buttons, and "Yes / No / Cancel" is not an approval UI.
- * TopMost keeps it above the IDE that triggered it; Enter/Escape both mean Deny.
+ * Windows branded card. Compact prompt text stays the first payload so tests still
+ * read the dialog copy; layout facts travel as JSON.
  * Exit codes: 0 = Allow once, 3 = Always allow, 2 = timed out, anything else = Deny.
  */
-function windowsDialogScript(message, timeoutSeconds, options, title = 'FullCourtDefense') {
-    const encoded = Buffer.from(message, 'utf8').toString('base64');
-    const encodedTitle = Buffer.from(title, 'utf8').toString('base64');
+function windowsDialogScript(message, timeoutSeconds, options, title, view) {
+    const encoded = b64(message);
+    const encodedTitle = b64(title);
+    const encodedView = b64(JSON.stringify(view));
+    const theme = toneTheme(view.tone);
     return [
         `# ${exports.DIALOG_SCRIPT_MARKER}`,
         'Add-Type -AssemblyName System.Windows.Forms; Add-Type -AssemblyName System.Drawing',
         '[System.Windows.Forms.Application]::EnableVisualStyles()',
         `$msg=[Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${encoded}'))`,
         `$title=[Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${encodedTitle}'))`,
-        "$f=New-Object Windows.Forms.Form; $f.Text=$title; $f.TopMost=$true; $f.StartPosition='CenterScreen'; $f.FormBorderStyle='FixedDialog'; $f.MaximizeBox=$false; $f.MinimizeBox=$false; $f.ShowInTaskbar=$true; $f.AutoSize=$true; $f.AutoSizeMode='GrowAndShrink'; $f.Padding=New-Object Windows.Forms.Padding(18,16,18,16); $f.Font=New-Object Drawing.Font('Segoe UI',9.75)",
-        "$t=New-Object Windows.Forms.TableLayoutPanel; $t.AutoSize=$true; $t.AutoSizeMode='GrowAndShrink'; $t.ColumnCount=1; $t.RowCount=3; $t.Dock='Fill'",
-        // First line is the question; it is the headline. The rest is the body.
-        "$parts=$msg -split \"`n\",2; $h=New-Object Windows.Forms.Label; $h.Text=$parts[0]; $h.AutoSize=$true; $h.MaximumSize=New-Object Drawing.Size(600,0); $h.Font=New-Object Drawing.Font('Segoe UI',12,[Drawing.FontStyle]::Bold); $h.Margin=New-Object Windows.Forms.Padding(0,0,0,8); $t.Controls.Add($h,0,0)",
-        "$l=New-Object Windows.Forms.Label; $l.Text=$(if($parts.Count -gt 1){$parts[1].TrimStart(\"`n\")}else{''}); $l.AutoSize=$true; $l.MaximumSize=New-Object Drawing.Size(600,0); $l.Margin=New-Object Windows.Forms.Padding(0,0,0,14); $t.Controls.Add($l,0,1)",
-        "$b=New-Object Windows.Forms.FlowLayoutPanel; $b.FlowDirection='RightToLeft'; $b.AutoSize=$true; $b.AutoSizeMode='GrowAndShrink'; $b.Dock='Fill'; $b.WrapContents=$false",
-        `$deny=New-Object Windows.Forms.Button; $deny.Text='${exports.DIALOG_BUTTON_DENY}'; $deny.AutoSize=$true; $deny.MinimumSize=New-Object Drawing.Size(96,30); $deny.DialogResult='Cancel'; $deny.TabIndex=0; $b.Controls.Add($deny)`,
-        `$once=New-Object Windows.Forms.Button; $once.Text='${exports.DIALOG_BUTTON_ONCE}'; $once.AutoSize=$true; $once.MinimumSize=New-Object Drawing.Size(96,30); $once.DialogResult='OK'; $once.TabIndex=1; $b.Controls.Add($once)`,
+        `$v=[Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${encodedView}')) | ConvertFrom-Json`,
+        "$bg=[Drawing.Color]::White; $muted=[Drawing.Color]::FromArgb(100,116,139); $ink=[Drawing.Color]::FromArgb(15,23,42)",
+        `$accent=[Drawing.Color]::FromArgb(${argb(theme.icon)}); $badgeBg=[Drawing.Color]::FromArgb(${argb(theme.badgeBg)}); $badgeFg=[Drawing.Color]::FromArgb(${argb(theme.badgeFg)})`,
+        "$f=New-Object Windows.Forms.Form; $f.Text=$title; $f.TopMost=$true; $f.StartPosition='CenterScreen'; $f.FormBorderStyle='FixedDialog'; $f.MaximizeBox=$false; $f.MinimizeBox=$false; $f.ShowInTaskbar=$true; $f.BackColor=$bg; $f.Font=New-Object Drawing.Font('Segoe UI',9.75); $f.ClientSize=New-Object Drawing.Size(700,640)",
+        // Panel.Padding does not move absolutely positioned children: every control takes $x0 explicitly.
+        "$root=New-Object Windows.Forms.Panel; $root.Dock='Fill'; $root.AutoScroll=$true; $root.BackColor=$bg; $f.Controls.Add($root)",
+        "function AddLabel($parent,$text,$font,$color,$y,$w,$x){ $l=New-Object Windows.Forms.Label; $l.Text=$text; $l.Font=$font; $l.ForeColor=$color; $l.AutoSize=$true; $l.MaximumSize=New-Object Drawing.Size($w,0); $l.Location=New-Object Drawing.Point($(if($x){$x}else{$x0}),$y); $parent.Controls.Add($l); return $l }",
+        "$x0=24; $y=18; $w=652",
+        "AddLabel $root 'FullCourtDefense' (New-Object Drawing.Font('Segoe UI',9.75,[Drawing.FontStyle]::Bold)) $muted $y $w | Out-Null; $y+=30",
+        `$icon=New-Object Windows.Forms.Label; $icon.Text='${theme.glyph}'; $icon.Font=New-Object Drawing.Font('Segoe UI',18,[Drawing.FontStyle]::Bold); $icon.TextAlign='MiddleCenter'; $icon.Size=New-Object Drawing.Size(44,44); $icon.Location=New-Object Drawing.Point($x0,$y); $icon.ForeColor=$accent; $icon.BackColor=$badgeBg; $root.Controls.Add($icon)`,
+        "$hx=$x0+58; $hw=$w-58",
+        "$badge=AddLabel $root ([string]$v.badge) (New-Object Drawing.Font('Segoe UI',8.25,[Drawing.FontStyle]::Bold)) $badgeFg $y $hw $hx; $badge.BackColor=$badgeBg; $badge.Padding=New-Object Windows.Forms.Padding(6,2,6,2)",
+        "$h=AddLabel $root ([string]$v.headline) (New-Object Drawing.Font('Segoe UI',16,[Drawing.FontStyle]::Bold)) $ink ($badge.Bottom+4) $hw $hx",
+        "$s=AddLabel $root ([string]$v.subtitle) (New-Object Drawing.Font('Segoe UI',9.75)) $muted ($h.Bottom+4) $hw $hx; $y=[Math]::Max($icon.Bottom,$s.Bottom)+18",
+        "AddLabel $root 'Action' (New-Object Drawing.Font('Segoe UI',9.75,[Drawing.FontStyle]::Bold)) $ink $y $w | Out-Null; $y+=22",
+        "if($v.kind){ AddLabel $root ([string]$v.kind) (New-Object Drawing.Font('Segoe UI',8.25,[Drawing.FontStyle]::Bold)) $muted $y $w | Out-Null; $y+=18 }",
+        "if($v.action){ $a=AddLabel $root ([string]$v.action) (New-Object Drawing.Font('Consolas',9.75)) $ink $y $w; $y=$a.Bottom+12 } else { $y+=8 }",
+        "if($v.policy){ AddLabel $root 'Matched policy' (New-Object Drawing.Font('Segoe UI',9.75,[Drawing.FontStyle]::Bold)) $ink $y $w | Out-Null; $y+=22; $pn=AddLabel $root ([string]$v.policy) (New-Object Drawing.Font('Segoe UI',9.75)) $ink $y $w; $y=$pn.Bottom+2; if($v.scope){ $ps=AddLabel $root ([string]$v.scope) (New-Object Drawing.Font('Segoe UI',9)) $muted $y $w; $y=$ps.Bottom+12 } }",
+        "AddLabel $root 'Why it triggered' (New-Object Drawing.Font('Segoe UI',9.75,[Drawing.FontStyle]::Bold)) $ink $y $w | Out-Null; $y+=22",
+        "foreach($item in @($v.why)){ $row=AddLabel $root ('•  '+$item) (New-Object Drawing.Font('Segoe UI',9.75)) $ink $y $w; $y=$row.Bottom+2 }",
+        "$y+=10; AddLabel $root 'What happens next' (New-Object Drawing.Font('Segoe UI',9.75,[Drawing.FontStyle]::Bold)) $ink $y $w | Out-Null; $y+=22",
+        "foreach($item in @($v.next)){ $row=AddLabel $root ('•  '+$item) (New-Object Drawing.Font('Segoe UI',9.75)) $ink $y $w; $y=$row.Bottom+2 }",
+        // Fixed-size row spanning the content width: RightToLeft flow puts Deny at the right edge,
+        // and a known height lets the footer and the form size be computed before the window exists.
+        "$y+=18; $b=New-Object Windows.Forms.FlowLayoutPanel; $b.FlowDirection='RightToLeft'; $b.AutoSize=$false; $b.WrapContents=$false; $b.Size=New-Object Drawing.Size($w,40); $b.Location=New-Object Drawing.Point($x0,$y)",
+        `$deny=New-Object Windows.Forms.Button; $deny.Text='${exports.DIALOG_BUTTON_DENY}'; $deny.AutoSize=$true; $deny.MinimumSize=New-Object Drawing.Size(96,34); $deny.FlatStyle='Flat'; $deny.ForeColor=[Drawing.Color]::FromArgb(220,38,38); $deny.BackColor=$bg; $deny.FlatAppearance.BorderColor=[Drawing.Color]::FromArgb(254,202,202); $deny.DialogResult='Cancel'; $deny.TabIndex=0; $b.Controls.Add($deny)`,
+        `$once=New-Object Windows.Forms.Button; $once.Text='${exports.DIALOG_BUTTON_ONCE}'; $once.AutoSize=$true; $once.MinimumSize=New-Object Drawing.Size(110,34); $once.FlatStyle='Flat'; $once.ForeColor=[Drawing.Color]::White; $once.BackColor=[Drawing.Color]::FromArgb(29,78,216); $once.FlatAppearance.BorderSize=0; $once.DialogResult='OK'; $once.TabIndex=1; $b.Controls.Add($once)`,
         options.allowAlways
-            ? `$always=New-Object Windows.Forms.Button; $always.Text='${exports.DIALOG_BUTTON_ALWAYS}'; $always.AutoSize=$true; $always.MinimumSize=New-Object Drawing.Size(110,30); $always.DialogResult='Yes'; $always.TabIndex=2; $b.Controls.Add($always)`
+            ? `$always=New-Object Windows.Forms.Button; $always.Text='${exports.DIALOG_BUTTON_ALWAYS}'; $always.AutoSize=$true; $always.MinimumSize=New-Object Drawing.Size(110,34); $always.FlatStyle='Flat'; $always.BackColor=$bg; $always.DialogResult='Yes'; $always.TabIndex=2; $b.Controls.Add($always)`
             : '',
-        "$t.Controls.Add($b,0,2); $f.Controls.Add($t); $f.CancelButton=$deny; $f.AcceptButton=$deny; $f.ActiveControl=$deny",
+        "$root.Controls.Add($b); $foot=AddLabel $root ([string]$v.footer) (New-Object Drawing.Font('Segoe UI',8.25)) $muted ($b.Bottom+14) $w",
+        // Fit the window to its content; only a very long action / reason list scrolls.
+        "$wa=[Windows.Forms.Screen]::PrimaryScreen.WorkingArea; $f.ClientSize=New-Object Drawing.Size(($w+2*$x0),[Math]::Min($foot.Bottom+18,[Math]::Max(360,$wa.Height-120)))",
+        "$f.CancelButton=$deny; $f.AcceptButton=$deny; $f.ActiveControl=$deny",
         `$timer=New-Object Windows.Forms.Timer; $timer.Interval=${timeoutSeconds * 1000}; $timer.Add_Tick({ $f.DialogResult='Abort'; $f.Close() })`,
-        // The hook spawns PowerShell with a hidden startup show-state (no console flash);
-        // WinForms applies that state to the FIRST window, so the form would run
-        // invisibly. Bouncing WindowState issues a real ShowWindow(SW_RESTORE).
         "$f.Add_Load({ $f.WindowState='Minimized'; $f.WindowState='Normal' })",
         "$f.Add_Shown({ $f.Activate(); $deny.Select(); $deny.Focus(); $timer.Start() })",
         "$r=$f.ShowDialog(); $timer.Stop()",
         "if($r -eq 'OK'){exit 0} elseif($r -eq 'Yes'){exit 3} elseif($r -eq 'Abort'){exit 2} else {exit 1}",
     ].filter(Boolean).join('\n');
 }
+function macosDialogScript(html, timeoutSeconds, allowAlways) {
+    const encoded = b64(html);
+    return `// ${exports.DIALOG_SCRIPT_MARKER}
+${allowAlways ? `// ${exports.DIALOG_BUTTON_ALWAYS}` : '// two-button'}
+ObjC.import('Cocoa');
+ObjC.import('WebKit');
+var html = $.NSString.alloc.initWithDataEncoding($.NSData.alloc.initWithBase64Encoding('${encoded}'), $.NSUTF8StringEncoding);
+var app = $.NSApplication.sharedApplication;
+app.setActivationPolicy($.NSApplicationActivationPolicyRegular);
+var win = $.NSWindow.alloc.initWithContentRectStyleMaskBackingDefer($.NSMakeRect(0,0,720,640), (1<<0)|(1<<1)|(1<<3), 2, false);
+win.setTitle('FullCourtDefense');
+win.setBackgroundColor($.NSColor.whiteColor);
+var web = $.WKWebView.alloc.initWithFrame($.NSMakeRect(0,0,720,640));
+win.contentView.addSubview(web);
+web.loadHTMLStringbaseURL(html, $.NSURL.URLWithString('about:blank'));
+win.center();
+win.makeKeyAndOrderFront(win);
+app.activateIgnoringOtherApps(true);
+var deadline = Date.now() + ${timeoutSeconds * 1000};
+var result = 'timeout';
+while (Date.now() < deadline) {
+  $.NSRunLoop.currentRunLoop.runUntilDate($.NSDate.dateWithTimeIntervalSinceNow(0.12));
+  var url = String(web.URL.absoluteString);
+  if (url.indexOf('fcd-once') >= 0) { result = '${exports.DIALOG_BUTTON_ONCE}'; break; }
+  if (url.indexOf('fcd-always') >= 0) { result = '${exports.DIALOG_BUTTON_ALWAYS}'; break; }
+  if (url.indexOf('fcd-deny') >= 0) { result = '${exports.DIALOG_BUTTON_DENY}'; break; }
+  if (!win.isVisible) { result = '${exports.DIALOG_BUTTON_DENY}'; break; }
+}
+win.close();
+result;
+`;
+}
 async function confirmNativeActionDetailed(reason, timeoutMs = 60_000, options = {}) {
     if (!nativeDialogAvailable())
         return { outcome: 'unavailable', latencyMs: 0 };
@@ -173,21 +288,17 @@ async function confirmNativeActionDetailed(reason, timeoutMs = 60_000, options =
     let executable;
     let args;
     const message = (0, approvalPrompt_1.nativeApprovalMessage)(reason, { allowAlways: options.allowAlways, alwaysScopeLabel: options.alwaysScopeLabel, alwaysLimitsLabel: options.alwaysLimitsLabel });
+    const view = (0, approvalPrompt_1.nativeDialogView)(reason, { allowAlways: options.allowAlways, alwaysScopeLabel: options.alwaysScopeLabel, alwaysLimitsLabel: options.alwaysLimitsLabel, tone: options.tone || 'ask' });
     // The title names the kind of action and the policy, so the window itself says what is asking.
     const title = (0, approvalPrompt_1.nativeApprovalTitle)(reason);
     const timeoutSeconds = Math.max(1, Math.ceil(timeoutMs / 1000));
     if (process.platform === 'win32') {
         executable = 'powershell.exe';
-        args = ['-NoProfile', '-NonInteractive', '-EncodedCommand', Buffer.from(windowsDialogScript(message, timeoutSeconds, options, title), 'utf16le').toString('base64')];
+        args = ['-NoProfile', '-NonInteractive', '-EncodedCommand', Buffer.from(windowsDialogScript(message, timeoutSeconds, options, title, view), 'utf16le').toString('base64')];
     }
     else if (process.platform === 'darwin') {
         executable = '/usr/bin/osascript';
-        const buttons = options.allowAlways
-            ? `{"${exports.DIALOG_BUTTON_DENY}", "${exports.DIALOG_BUTTON_ONCE}", "${exports.DIALOG_BUTTON_ALWAYS}"}`
-            : `{"${exports.DIALOG_BUTTON_DENY}", "${exports.DIALOG_BUTTON_ONCE}"}`;
-        // The pressed label is printed on stdout; Deny is the cancel button (exit 1).
-        // Message and title travel as argv items: never interpolated into the script.
-        args = ['-e', 'on run argv', '-e', `set r to display dialog (item 1 of argv) with title (item 2 of argv) buttons ${buttons} default button "${exports.DIALOG_BUTTON_DENY}" cancel button "${exports.DIALOG_BUTTON_DENY}" giving up after ${timeoutSeconds}`, '-e', 'if gave up of r then return "timeout"', '-e', 'return button returned of r', '-e', 'end run', message, title];
+        args = ['-l', 'JavaScript', '-e', macosDialogScript(dialogCardHtml(view, options), timeoutSeconds, Boolean(options.allowAlways))];
     }
     else {
         executable = 'zenity';
@@ -660,6 +771,10 @@ function sweepExpiredConfirmations(now = new Date(), ttlMs = exports.CONFIRM_PEN
 // ---------------------------------------------------------------------------
 /** Shell words that run the program that follows them, not a program of their own. */
 const SHELL_LEAD_WRAPPERS = new Set(['sudo', 'doas', 'env', 'nice', 'nohup', 'time', 'command', 'builtin', 'exec', 'xargs', 'timeout', 'stdbuf', 'chronic', 'busybox', 'call', 'start', '&']);
+/** Control-flow words (sh / bash / PowerShell): structure, never a program of their own. */
+const SHELL_CONTROL_WORDS = /^(if|then|else|elif|elseif|fi|do|done|for|while|until|case|esac|try|catch|finally|foreach|function|return|switch|break|continue)$/i;
+/** Words a body follows directly (`then rm x`, `do echo`, PowerShell `else { … }`). */
+const SHELL_BODY_LEADS = /^(then|do|else)$/i;
 /** Cheap quote-aware split on `; && || | \n` — the grant needs program NAMES, not semantics. */
 function splitShellSegments(command) {
     const segments = [];
@@ -703,11 +818,20 @@ function splitShellSegments(command) {
 function shellPrograms(command) {
     const out = new Set();
     for (const raw of splitShellSegments(command)) {
-        const words = raw.trim().replace(/^[\s({]+/, '').split(/\s+/).filter(Boolean);
+        const words = raw.trim().split(/\s+/).filter(Boolean);
         let i = 0;
-        // `$r = Invoke-WebRequest …` / `$r=Invoke-WebRequest …` / `FOO=bar cmd …`
+        // `$r = Invoke-WebRequest …` / `$r=Invoke-WebRequest …` / `FOO=bar cmd …` / `$t = (gcloud …)`
         while (i < words.length) {
             const w = words[i];
+            // Grouping before the program: `( gcloud`, `{ gcloud`, `(gcloud` — the program is inside.
+            if (/^[({]+$/.test(w)) {
+                i++;
+                continue;
+            }
+            if (/^[({]/.test(w)) {
+                words[i] = w.replace(/^[({]+/, '');
+                continue;
+            }
             if (/^\$[\w:.]+$/.test(w) && words[i + 1] && /^[+-]?=$/.test(words[i + 1])) {
                 i += 2;
                 continue;
@@ -720,10 +844,32 @@ function shellPrograms(command) {
                 i++;
                 continue;
             }
+            if (SHELL_BODY_LEADS.test(w)) {
+                i++;
+                continue;
+            }
+            if (SHELL_CONTROL_WORDS.test(w)) {
+                // `if (cond) { body }` / `foreach ($x in $y) { body }` / `else { body }`: the program
+                // runs in the body, so skip to the first `{` and read on from there.
+                const open = words.findIndex((word, index) => index > i && word.includes('{'));
+                if (open < 0) {
+                    i = words.length;
+                    break;
+                }
+                const rest = words[open].slice(words[open].indexOf('{') + 1);
+                if (rest) {
+                    words[open] = rest;
+                    i = open;
+                }
+                else {
+                    i = open + 1;
+                }
+                continue;
+            }
             break;
         }
         const lead = words[i];
-        if (!lead || /^[$@(){}\]\[|&;<>#'"`-]/.test(lead) || /^(if|then|else|elif|fi|do|done|for|while|until|case|esac|try|catch|finally|foreach|function|return|switch|break|continue)$/i.test(lead))
+        if (!lead || /^[$@(){}\]\[|&;<>#'"`-]/.test(lead) || SHELL_CONTROL_WORDS.test(lead))
             continue;
         const name = lead.replace(/^["']|["']$/g, '').split(/[\\/]/).pop().replace(/\.(exe|cmd|bat|ps1|sh)$/i, '').toLowerCase();
         if (name)

package/dist/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.35.0"
+  "version": "1.35.2"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fullcourtdefense-cli",
-  "version": "1.35.0",
+  "version": "1.35.2",
   "description": "Full Court Defense CLI — security scanning for AI agents from your terminal",
   "main": "dist/index.js",
   "bin": {