fullcourtdefense-cli 1.21.3 → 1.21.5

package/dist/commands/desktopChatGuard.js

@@ -279,19 +279,28 @@ function ensureWatcherScript() {
     fs.writeFileSync(WATCHER_PS1_PATH, desktopChatWatcherScript(), { encoding: 'utf8' });
     return WATCHER_PS1_PATH;
 }
-function relaunchThrottleOk() {
+function relaunchThrottleOk(currentClaudeCreated) {
     try {
-        const last = JSON.parse(fs.readFileSync(A11Y_RELAUNCH_MARKER, 'utf8')).lastAttemptAt || 0;
+        const marker = JSON.parse(fs.readFileSync(A11Y_RELAUNCH_MARKER, 'utf8'));
+        const last = marker.lastAttemptAt || 0;
+        // Claude was restarted (update, crash, user quit/reopen) since our last
+        // relaunch attempt — the old throttle must not leave the composer blind.
+        if (currentClaudeCreated && marker.claudeCreated && currentClaudeCreated !== marker.claudeCreated) {
+            return true;
+        }
         return Date.now() - last > A11Y_RELAUNCH_THROTTLE_MS;
     }
     catch {
         return true;
     }
 }
-function stampRelaunch() {
+function stampRelaunch(claudeCreated) {
     try {
         fs.mkdirSync(path.dirname(A11Y_RELAUNCH_MARKER), { recursive: true });
-        fs.writeFileSync(A11Y_RELAUNCH_MARKER, JSON.stringify({ lastAttemptAt: Date.now() }), { encoding: 'utf8', mode: 0o600 });
+        fs.writeFileSync(A11Y_RELAUNCH_MARKER, JSON.stringify({
+            lastAttemptAt: Date.now(),
+            ...(claudeCreated ? { claudeCreated } : {}),
+        }), { encoding: 'utf8', mode: 0o600 });
     }
     catch { /* best-effort */ }
 }
@@ -319,50 +328,78 @@ function ensureAccessibilityScript(allowRelaunch) {
         // The browser (main) process is the claude.exe with no --type= child switch.
         "$main = $procs | Where-Object { $_.CommandLine -and ($_.CommandLine -notmatch '--type=') } | Select-Object -First 1",
         "if (-not $main) { Write-Output 'STATE:not-running'; exit 0 }",
-        "if ($main.CommandLine -match '--force-renderer-accessibility') { Write-Output 'STATE:has-flag'; exit 0 }",
-        allowRelaunch ? '' : "Write-Output 'STATE:needs-flag'; exit 0",
+        "$created = $main.CreationDate",
+        "if ($main.CommandLine -match '--force-renderer-accessibility') { Write-Output ('STATE:has-flag:' + $created); exit 0 }",
+        allowRelaunch ? '' : "Write-Output ('STATE:needs-flag:' + $created); exit 0",
         "$exe = $main.ExecutablePath",
         "if (-not $exe -or -not (Test-Path $exe)) { Write-Output 'STATE:error:no-exe'; exit 0 }",
         'try {',
         "  $procs | ForEach-Object { Stop-Process -Id $_.ProcessId -Force -ErrorAction SilentlyContinue }",
         '  Start-Sleep -Milliseconds 1500',
         "  Start-Process -FilePath $exe -ArgumentList '--force-renderer-accessibility'",
-        "  Write-Output 'STATE:relaunched'",
+        "  Write-Output ('STATE:relaunched:' + $created)",
         "} catch { Write-Output ('STATE:error:' + $_.Exception.Message) }",
     ].filter(Boolean).join('\n');
 }
+function parseAccessibilityState(out) {
+    const match = out.match(/STATE:([^:\r\n]+)(?::(.+))?/);
+    if (!match)
+        return { state: '' };
+    return { state: match[1].trim(), claudeCreated: match[2]?.trim() };
+}
 /**
  * Ensure Claude Desktop is running with renderer accessibility so the composer
  * is readable. Non-blocking best-effort; throttled to at most one relaunch per
- * A11Y_RELAUNCH_THROTTLE_MS. Safe no-op off-Windows or when Claude is closed.
+ * A11Y_RELAUNCH_THROTTLE_MS for the SAME Claude process instance. A fresh
+ * Claude restart (update, MSI, user reopen) bypasses the throttle.
  */
 function ensureClaudeForceAccessibility(log) {
     if (process.platform !== 'win32')
         return;
-    const allow = relaunchThrottleOk();
-    const child = (0, child_process_1.spawn)('powershell', [
+    // Probe first without committing to relaunch so we can compare process age
+    // against the throttle marker before deciding.
+    const probe = (0, child_process_1.spawn)('powershell', [
         '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-WindowStyle', 'Hidden',
-        '-Command', ensureAccessibilityScript(allow),
+        '-Command', ensureAccessibilityScript(false),
     ], { windowsHide: true, stdio: ['ignore', 'pipe', 'ignore'] });
-    let out = '';
-    child.stdout?.on('data', (d) => { out += d.toString(); });
-    child.on('error', () => { });
-    child.on('exit', () => {
-        const state = (out.match(/STATE:(.*)/) || [])[1]?.trim();
-        if (state === 'relaunched') {
-            stampRelaunch();
-            log('Claude Desktop guard: relaunched Claude with --force-renderer-accessibility so the chat composer is readable.');
+    let probeOut = '';
+    probe.stdout?.on('data', (d) => { probeOut += d.toString(); });
+    probe.on('error', () => { });
+    probe.on('exit', () => {
+        const { state, claudeCreated } = parseAccessibilityState(probeOut);
+        if (!state || state === 'not-running' || state.startsWith('has-flag'))
+            return;
+        if (!state.startsWith('needs-flag')) {
+            if (state.startsWith('error'))
+                log(`Claude Desktop guard: accessibility probe failed (${state}).`);
+            return;
         }
-        else if (state === 'needs-flag') {
+        const allow = relaunchThrottleOk(claudeCreated);
+        if (!allow) {
             log('Claude Desktop guard: Claude is running without accessibility; relaunch throttled — composer stays unreadable until the next allowed relaunch.');
+            return;
         }
-        else if (state && state.startsWith('error')) {
-            // An error can surface AFTER we already force-stopped Claude (Start-Process
-            // threw). Stamp the throttle regardless so a half-failed restart can never
-            // loop the kill every 5 minutes — wait the full window before retrying.
-            stampRelaunch();
-            log(`Claude Desktop guard: could not enable accessibility (${state}); backing off before retry.`);
-        }
+        const child = (0, child_process_1.spawn)('powershell', [
+            '-NoProfile', '-NonInteractive', '-ExecutionPolicy', 'Bypass', '-WindowStyle', 'Hidden',
+            '-Command', ensureAccessibilityScript(true),
+        ], { windowsHide: true, stdio: ['ignore', 'pipe', 'ignore'] });
+        let out = '';
+        child.stdout?.on('data', (d) => { out += d.toString(); });
+        child.on('error', () => { });
+        child.on('exit', () => {
+            const result = parseAccessibilityState(out);
+            if (result.state === 'relaunched') {
+                stampRelaunch(result.claudeCreated || claudeCreated);
+                log('Claude Desktop guard: relaunched Claude with --force-renderer-accessibility so the chat composer is readable.');
+            }
+            else if (result.state.startsWith('error')) {
+                // An error can surface AFTER we already force-stopped Claude (Start-Process
+                // threw). Stamp the throttle regardless so a half-failed restart can never
+                // loop the kill every 5 minutes — wait the full window before retrying.
+                stampRelaunch(result.claudeCreated || claudeCreated);
+                log(`Claude Desktop guard: could not enable accessibility (${result.state}); backing off before retry.`);
+            }
+        });
     });
 }
 /**
@@ -437,6 +474,10 @@ function startDesktopChatGuard(runtime) {
             (0, notify_1.notifyOs)({
                 title: 'FullCourtDefense: secret in Claude Desktop',
                 message: `${finding.reason}. Remove it before sending — this text has not been protected.`,
+                // Security warning: use a top-most window, not a toast. Toasts are
+                // silently swallowed by Focus Assist / Do-Not-Disturb and per-app
+                // banner settings — verified in the field — which would hide the alert.
+                forceWindow: true,
             });
         }
         runtime.log(`Claude Desktop chat finding: ${finding.itemId} (${finding.reason}).`);

package/dist/notify.d.ts

@@ -14,6 +14,13 @@ export interface OsNotification {
     message: string;
     /** Optional URL. Platforms that support click-through open it; others append it to the body. */
     url?: string;
+    /**
+     * Windows only: render a top-most alert WINDOW instead of a toast. Toasts are
+     * silently suppressed by Focus Assist / Do-Not-Disturb, per-app banner
+     * settings, and rapid-fire dedup — unacceptable for a security warning the
+     * user MUST see. A plain window is not a notification, so none of that applies.
+     */
+    forceWindow?: boolean;
 }
 /** Show a native OS notification. Best-effort, non-blocking, never throws. */
 export declare function notifyOs(n: OsNotification): void;

package/dist/notify.js

@@ -4,9 +4,17 @@ exports.notifyOs = notifyOs;
 exports.consoleUrl = consoleUrl;
 exports.approvalsConsoleUrl = approvalsConsoleUrl;
 const child_process_1 = require("child_process");
-function spawnDetached(command, args) {
+function spawnDetached(command, args, opts) {
     try {
-        const child = (0, child_process_1.spawn)(command, args, { detached: true, stdio: 'ignore', windowsHide: true });
+        const child = (0, child_process_1.spawn)(command, args, {
+            detached: true,
+            stdio: 'ignore',
+            // windowsHide sets the process show-state to SW_HIDE, which a GUI child's
+            // FIRST top-level window inherits — that silently hid the alert form.
+            // showWindow:true (used for the forced alert) must NOT hide it.
+            windowsHide: opts?.showWindow ? false : true,
+            env: opts?.env ? { ...process.env, ...opts.env } : process.env,
+        });
         child.unref();
     }
     catch { /* best-effort */ }
@@ -19,7 +27,59 @@ function psQuote(value) {
 function asQuote(value) {
     return value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
 }
+/**
+ * Top-most WinForms alert window. Unlike a toast, this is an ordinary window,
+ * so Focus Assist / Do-Not-Disturb and per-app notification settings cannot
+ * hide it. Auto-dismisses after ~12s so it never blocks the machine, and reads
+ * its text from env vars (no string interpolation into the script → no quoting
+ * or injection issues with arbitrary secret-adjacent message text).
+ */
+function notifyWindowsWindow(n) {
+    const body = n.url ? `${n.message}\n${n.url}` : n.message;
+    // Node composes the full label text (with real newlines) and hands it to
+    // PowerShell via an env var. The script does ZERO string concatenation or
+    // escaping — arbitrary secret-adjacent message text can never break parsing
+    // or inject code.
+    const script = [
+        "$ErrorActionPreference='SilentlyContinue';",
+        'Add-Type -AssemblyName System.Windows.Forms;',
+        'Add-Type -AssemblyName System.Drawing;',
+        '$f=New-Object System.Windows.Forms.Form;',
+        '$f.Text=$env:FCD_NOTIFY_TITLE;',
+        '$f.StartPosition="Manual";',
+        '$wa=[System.Windows.Forms.Screen]::PrimaryScreen.WorkingArea;',
+        '$f.Size=New-Object System.Drawing.Size(460,160);',
+        '$f.Location=New-Object System.Drawing.Point(($wa.Right-475),($wa.Bottom-180));',
+        '$f.TopMost=$true;',
+        '$f.FormBorderStyle="FixedDialog";',
+        '$f.MaximizeBox=$false; $f.MinimizeBox=$false; $f.ShowInTaskbar=$true;',
+        '$f.BackColor=[System.Drawing.Color]::FromArgb(180,30,40);',
+        '$l=New-Object System.Windows.Forms.Label;',
+        '$l.Text=$env:FCD_NOTIFY_TEXT;',
+        '$l.ForeColor=[System.Drawing.Color]::White;',
+        '$l.Font=New-Object System.Drawing.Font("Segoe UI",10,[System.Drawing.FontStyle]::Bold);',
+        '$l.Dock="Fill"; $l.Padding=New-Object System.Windows.Forms.Padding(14);',
+        '$f.Controls.Add($l);',
+        '$tm=New-Object System.Windows.Forms.Timer;',
+        '$tm.Interval=12000;',
+        '$tm.Add_Tick({$tm.Stop();$f.Close()});',
+        '$tm.Start();',
+        '$f.Add_Shown({$f.Activate();$f.BringToFront()});',
+        '[System.Windows.Forms.Application]::Run($f);',
+    ].join(' ');
+    spawnDetached('powershell', ['-NoProfile', '-NonInteractive', '-STA', '-Command', script], {
+        env: {
+            FCD_NOTIFY_TITLE: n.title,
+            FCD_NOTIFY_TEXT: `${n.title}\r\n\r\n${body}`,
+        },
+        showWindow: true,
+    });
+}
 function notifyWindows(n) {
+    if (n.forceWindow) {
+        notifyWindowsWindow(n);
+        return;
+    }
     const body = n.url ? `${n.message}\n${n.url}` : n.message;
     // WinRT toast via PowerShell — works from a plain console process for the
     // current user, no admin/UAC and no extra dependencies. Uses the stock

package/dist/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.21.3"
+  "version": "1.21.5"
 }

package/package.json

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