fullcourtdefense-cli 1.21.4 → 1.21.6

package/dist/commands/desktopChatGuard.js

@@ -279,19 +279,36 @@ 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;
-        return Date.now() - last > A11Y_RELAUNCH_THROTTLE_MS;
+        const marker = JSON.parse(fs.readFileSync(A11Y_RELAUNCH_MARKER, 'utf8'));
+        const last = marker.lastAttemptAt || 0;
+        const sinceLast = Date.now() - last;
+        // Hard floor: never two relaunches within 15 minutes regardless of
+        // instance tracking — bounds the worst case if a relaunched Claude drops
+        // our flag (e.g. MSIX self-restart) so we can't kill it in a loop.
+        if (sinceLast < 15 * 60_000)
+            return false;
+        // Claude was restarted (update, crash, user quit/reopen) since our last
+        // relaunch attempt — the old throttle must not leave the composer blind.
+        // Legacy markers without claudeCreated also take this path once, then
+        // start tracking the instance.
+        if (currentClaudeCreated && marker.claudeCreated !== currentClaudeCreated) {
+            return true;
+        }
+        return sinceLast > 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 +336,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.`);
+            }
+        });
     });
 }
 /**

package/dist/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.21.4"
+  "version": "1.21.6"
 }

package/package.json

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