amicus 2.1.0 → 3.0.0

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "amicus",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "description": "Multi-model LLM Council + parallel AI window for Claude Code. Run structured council reviews across Gemini, GPT, DeepSeek and more — or fork a conversation to any model and fold the results back.",
   "author": {
     "name": "Christian Wagner"

package/CHANGELOG.md

@@ -5,6 +5,89 @@ All notable changes to Amicus are documented here. Format follows
 
 ## [Unreleased]
 
+## [3.0.0] - 2026-07-15
+
+### ⚠️ Breaking
+
+- **Node >=22.12 is now required** (`engines.node`). Amicus 3.0 fails fast on older Node with a
+  clear message instead of a confusing error deep in provisioning. This is driven by
+  `@electron/get` 5.x (ESM-only, requires Node >=22.12), which the Electron self-heal depends on.
+  Node 18/20 users — **including headless / council-only users who never touch the GUI** — must
+  upgrade Node.
+- **Electron upgraded 28 -> 43.1.1**, which drops OS support for **Windows 8/8.1, Windows Server
+  2012/2012 R2, and macOS 11**. The interactive GUI will not run there; headless runs and the
+  council are unaffected.
+
+### Changed
+
+- **Electron 28.3.3 -> 43.1.1**, clearing the outstanding high-severity `npm audit` finding
+  (ASAR Integrity Bypass, GHSA-vmqv-hx8q-j7mg). Amicus runs Electron **unpackaged**, so the
+  ASAR-integrity attack class never applied to its deployment — the concrete effect is a clean
+  audit and staying on a supported Electron line.
+- **Content view migrated from the deprecated `BrowserView` to `WebContentsView`**
+  (`mainWindow.contentView.addChildView`). All four windows now set `sandbox` explicitly.
+- **`@electron/get` 2.x -> 5.x** (now a direct `dependency`, ESM-only). The self-heal defers a
+  lazy dynamic `import()` to the network path and bounds the download with an `AbortSignal`
+  timeout (5.x dropped the old `got`-style timeout).
+- CI matrices raised to Node 22/24.
+
+### Fixed
+
+- Runtime Node-version guard (`src/utils/node-version-guard.js`) fires early in `bin/amicus.js`,
+  before heavy imports, so an unsupported Node fails with an actionable message.
+
+### Known limitations
+
+- `@electron/get` 5.x uses native `fetch`, which does **not** honor `HTTPS_PROXY` / `NO_PROXY`.
+  Provisioning Electron behind a corporate proxy needs a manual cache copy or `ELECTRON_MIRROR`
+  (see `docs/troubleshooting.md`). Headless runs and the council never download Electron.
+
+## [2.2.0] - 2026-07-14
+
+### Added
+
+- **Optional council elements** (second-opinion skill): four new opt-in behaviors, presented
+  together with Claude-in-the-council as a single numbered Stage-0 menu — all default OFF, enabled
+  only when the user names them, and the launch confirmation must enumerate what's on:
+  - **Critic seat** — one bench member swaps to a four-pass adversarial brief (adversarial pass,
+    edge-case hunt, consistency check, executability test), launched as a concurrent solo beside
+    the fanout wave (`role: "critic"`). Its findings enter the same anonymized bundle and are
+    peer-adjudicated like any other seat's — the council disciplines the critic.
+  - **Expert lenses** — each seat reviews through a distinct expert perspective (panel domain
+    scoped with the user: business/technical/customer/financial/custom). Lens runs always tally
+    `--no-ledger` and the report discloses the weakened cross-review anonymity.
+  - **Debate mode** — a new Stage 2.5 rebuttal round: Contested/Disputed findings go back to their
+    raisers to DEFEND / AMEND / WITHDRAW, disputing judges re-vote, then the final ledger-recorded
+    tally. Exactly one round; withdrawn findings are auto-denied and listed in the report.
+  - **Chair verdict scale** — the chair closes with 3–5 hard questions and a final parseable
+    `VERDICT: Ship it | Fix these first | Fundamental rethink` line, surfaced at the top of the
+    report.
+- New `skills/second-opinion/SEAT-BRIEFS.md` — briefing boilerplate for the elements plus a
+  standard anti-sycophancy clause now required in **every** Stage-1 briefing. Critic and lens
+  methodologies adapted from the `/critic` and `/debate` agents in John Renaldi's product-kit
+  (MIT), with deliberate deviations documented (no findings quota; verdict moved to the chair).
+- Zero engine changes: free-form `runStats[].role` labels, tally-input re-assembly, and the
+  existing `--no-ledger` flag cover all four elements.
+
+### Changed
+
+- `COUNCIL-DESIGN.md` gains §12 documenting the elements, their caveats (critic
+  self-identification in cross-review; lens anonymity/ledger trade-offs), and parallel panels as
+  future work. The `/council` command accepts pre-requested elements in its arguments.
+- MODEL-NOTES seed: fold-back of the v2.2.0 verification council — claim-class dedup
+  adjudication limit, minimax debut (strong critic seat), qwen-coder debut.
+
+### Fixed
+
+- Resurrected both Windows e2e integration suites, silently dead since before the rebrand:
+  Node's `spawn()` cannot execute `node_modules/.bin` `.cmd` shims on Windows, so the Electron
+  toolbar suite (electron shim) and the OpenCode server test helper ENOENT'd without a visible
+  error. The helper now uses the shared `ensureNodeModulesBinInPath()` (which adds the platform
+  `opencode.exe` dirs to PATH) and the toolbar suite spawns the real binary via
+  `require('electron')`. Also refreshed two stale pins the dead suites never caught: the wave
+  document's `schemaVersion` (now pinned to the shared `SCHEMA_VERSION` constant instead of a
+  literal `1`) and the pre-rebrand `Sidecar` toolbar brand assertion (now `Amicus`).
+
 ## [2.1.0] - 2026-07-04
 
 ### Added

package/README.md

@@ -4,7 +4,7 @@
 
 **A multi-model LLM Council for Claude — with a parallel AI window underneath.**
 
-![Amicus: an LLM Council and a parallel AI window for Claude](./docs/hero.png)
+![The Amicus council mid-ritual: five models — Gemini 3 Pro, Llama 4, Grok 4, Claude Opus — reading the same material independently, chaired by GPT-5](./docs/council.png)
 
 Hand Claude a plan, a design, a diff, an architecture decision, a manuscript — anything — and say *council review this*: Amicus routes it through several models from different families, has them anonymously cross-review each other, and a non-Claude chair synthesizes a verdict you turn into accept/deny edits. Or skip the ceremony and **fork** a single conversation to Gemini, GPT, DeepSeek, or any other model — it works in parallel with full context, and you **fold** the result back when you're ready. Claude orchestrates throughout; you stay in your editor.
 
@@ -209,11 +209,19 @@ Everything you need before your first run, and what's optional.
   findings-by-tier, cost — no chair prose). This is the default artifact handed to the user.
 - For an **editable source**, the accepted edits land in `<stem>-reviewed.<ext>` next to the original.
 
-**Claude in the council** (default off): you can add Claude's own fresh review to the bundle so the bench ranks and adjudicates it — Claude is *judged* but never votes or chairs, so the verdict stays independent.
+**Optional council elements** (v2.2.0, all default off): five opt-in behaviors, offered once as a menu at launch — nothing turns on unless you name it, and the confirmation lists exactly what's on.
 
-**Cost is disclosed up front.** Before any model launches, you see the run shape — for example:
+- **Critic seat** — one reviewer swaps to a four-pass adversarial brief (adversarial pass, edge-case hunt, consistency check, executability test). Its findings enter the same anonymized bundle as everyone else's, so the bench disciplines the critic: manufactured negativity lands Disputed and dies in the tally.
+- **Expert lenses** — each reviewer takes a distinct expert perspective; you pick the panel domain (business, technical, customer, financial, or custom). Lens runs never feed the reliability ledger, and the report discloses the weakened cross-review anonymity.
+- **Debate mode** — after cross-review, every Contested or Disputed finding goes back to its raiser to **defend, amend, or withdraw**, and the disputing judges re-vote. Exactly one rebuttal round, then the final tally.
+- **Chair verdict scale** — the chair closes with 3–5 hard questions and one parseable line: `VERDICT: Ship it | Fix these first | Fundamental rethink`.
+- **Claude in the council** — Claude adds its own fresh review to the bundle so the bench ranks and adjudicates it. Claude is *judged* but never votes or chairs, so the verdict stays independent.
 
-> This run uses 3 council models across 2 fanout waves + 1 chair call (~7 model runs).
+The critic and lens methodologies are adapted from the `/critic` and `/debate` agents in [John Renaldi's product-kit](https://github.com/jrenaldi79/plugin-marketplace) (MIT); the briefing boilerplate lives in [`skills/second-opinion/SEAT-BRIEFS.md`](./skills/second-opinion/SEAT-BRIEFS.md).
+
+**Cost is disclosed up front.** Before any model launches, you see the run shape — including any enabled optional elements — for example:
+
+> This run uses 3 council models across 2 fanout waves + 1 chair call, with critic seat + debate mode ON (~7 base runs + up to 6 rebuttal calls).
 
 Then the council waits for your confirmation.
 
@@ -311,7 +319,7 @@ $ amicus status demo123 --json
   "taskId": "demo123",
   "status": "complete",
   "elapsed": "5m 0s",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "model": "google/gemini-2.5-flash",
   "phase": "terminal"
 }

package/bin/amicus.js

@@ -7,6 +7,11 @@
  * Routes commands to appropriate handlers.
  */
 
+// Node version guard: fail fast on unsupported Node versions
+const { checkNodeVersion } = require('../src/utils/node-version-guard');
+const _nv = checkNodeVersion(process.version);
+if (!_nv.ok) { process.stderr.write(_nv.message + '\n'); process.exit(1); }
+
 // Load API keys from all sources: process.env > amicus .env > auth.json
 const { loadCredentials } = require('../src/utils/env-loader');
 loadCredentials();

package/commands/council.md

@@ -1,6 +1,6 @@
 ---
 description: Run a structured multi-model LLM council review of the given material — wraps the second-opinion skill (independent reviews → anonymous cross-review → non-Claude chair verdict → accept/deny decisions).
-argument-hint: [material, path, or URL] [analysis request + criteria]
+argument-hint: [material, path, or URL] [analysis request + criteria] [optional elements — e.g. "with a critic seat", "debate mode", "expert lenses", "chair verdict scale"]
 disable-model-invocation: true
 ---
 
@@ -24,3 +24,9 @@ and explicit user confirmation; Stage 1 independent reviews, running
 cross-review, followed by `amicus council tally` once cross-review settles;
 Stage 3 council-chair synthesis; Stage 4 the accept/deny decision pass; and
 Stage 5, which runs `amicus council verdict` to write the final `verdict.json`.
+
+The user may also name **optional council elements** in the arguments (critic seat,
+expert lenses, debate mode, verdict scale, Claude in the council). All elements
+default OFF; the skill's Stage-0 menu is the single opt-in point. If the user named
+elements here, carry them into Stage 0 as pre-requested — confirm them back by name
+instead of re-asking — and never enable an element the user did not explicitly name.

package/electron/close-guard.js

@@ -54,9 +54,9 @@
  * @param {() => boolean} [deps.hasCompleted] - Whether the fold's
  *   `[SIDECAR_FOLD]` stdout write has actually succeeded. Falls back to
  *   `hasFolded()` when omitted.
- * @param {(mainWindow: object, contentView: object) => Promise<void>} deps.triggerFold
+ * @param {(mainWindow: object, opencodeView: object) => Promise<void>} deps.triggerFold
  *   - The SAME fold.js closure used by the shortcut/toolbar/IPC paths.
- * @returns {{ handleClose: (event: object, mainWindow: object, contentView: object) => void }}
+ * @returns {{ handleClose: (event: object, mainWindow: object, opencodeView: object) => void }}
  */
 function createCloseGuard({ hasFolded, isFolding, hasCompleted, triggerFold }) {
   const checkIsFolding = isFolding || hasFolded;
@@ -78,7 +78,7 @@ function createCloseGuard({ hasFolded, isFolding, hasCompleted, triggerFold }) {
     }
   }
 
-  function handleClose(event, mainWindow, contentView) {
+  function handleClose(event, mainWindow, opencodeView) {
     if (checkHasCompleted()) {
       // Fold already completed — proceed exactly like the pre-existing
       // behavior (no interception, no destroy call from the guard itself;
@@ -110,7 +110,7 @@ function createCloseGuard({ hasFolded, isFolding, hasCompleted, triggerFold }) {
     }
     closeFoldAttempted = true;
 
-    Promise.resolve(triggerFold(mainWindow, contentView)).then(() => {
+    Promise.resolve(triggerFold(mainWindow, opencodeView)).then(() => {
       // triggerFold can RESOLVE without ever calling mainWindow.close() —
       // its outer catch swallows failures (including a synchronous throw
       // from the post-write nudge-overlay executeJavaScript call, which can

package/electron/fold.js

@@ -41,13 +41,13 @@ function createFoldHandler(state) {
   let folded = false;
   let completed = false;
 
-  async function triggerFold(mainWindow, contentView) {
+  async function triggerFold(mainWindow, opencodeView) {
     if (folded) { return; }
     folded = true;
     completed = false;
 
     // Show fold progress in toolbar and content overlay
-    showFoldOverlay(mainWindow, contentView);
+    showFoldOverlay(mainWindow, opencodeView);
 
     try {
       // Ask the model to generate a structured summary
@@ -76,8 +76,8 @@ function createFoldHandler(state) {
       logger.info('Fold completed', { taskId: state.taskId });
 
       // Show nudge overlay before closing
-      if (contentView) {
-        await contentView.webContents.executeJavaScript(`
+      if (opencodeView) {
+        await opencodeView.webContents.executeJavaScript(`
           (function() {
             var overlay = document.getElementById('amicus-fold-overlay');
             if (overlay) {
@@ -147,7 +147,7 @@ function createFoldHandler(state) {
  * Note: The JS strings below contain only hardcoded markup (no user input),
  * so there is no XSS risk from DOM manipulation.
  */
-function showFoldOverlay(mainWindow, contentView) {
+function showFoldOverlay(mainWindow, opencodeView) {
   if (mainWindow) {
     mainWindow.webContents.executeJavaScript(`
       (function() {
@@ -174,7 +174,7 @@ function showFoldOverlay(mainWindow, contentView) {
       })();
     `).catch(() => {});
   }
-  if (contentView) {
+  if (opencodeView) {
     // Scope token vars to the overlay container so var(--x) resolves without
     // touching OpenCode's own :root (which would clobber its CSS variables).
     const rawCss = tokenCss({ absoluteFontUrls: true });
@@ -182,9 +182,9 @@ function showFoldOverlay(mainWindow, contentView) {
     // custom properties are defined on #amicus-fold-overlay and inherited by
     // its descendants. @font-face blocks are left at global scope (no selector).
     const scopedCss = rawCss.replace(/:root\s*\{/, '#amicus-fold-overlay {');
-    contentView.webContents.insertCSS(scopedCss).catch(() => {});
+    opencodeView.webContents.insertCSS(scopedCss).catch(() => {});
 
-    contentView.webContents.executeJavaScript(`
+    opencodeView.webContents.executeJavaScript(`
       (function() {
         if (!document.getElementById('fold-spin-style')) {
           var style = document.createElement('style');

package/electron/ipc-guard.js

@@ -5,8 +5,8 @@
  * unit-testable (main.js itself runs heavy Electron side effects at import).
  *
  *  - isPrivilegedSender: pin privileged IPC handlers to the toolbar window so a
- *    compromised/remote page in the OpenCode BrowserView cannot invoke them (M9).
- *  - isAllowedContentNavigation: pin the OpenCode BrowserView to its localhost
+ *    compromised/remote page in the OpenCode WebContentsView cannot invoke them (M9).
+ *  - isAllowedContentNavigation: pin the OpenCode WebContentsView to its localhost
  *    origin so it cannot be navigated off to an attacker-controlled page (M9).
  *  - handleFatalException: EPIPE stays a no-op; any other uncaught exception is
  *    logged and then quits the app rather than leaving a wedged invisible shell
@@ -26,7 +26,7 @@ function isPrivilegedSender(event, getToolbarWindow) {
 }
 
 /**
- * Whether a navigation target is allowed for the OpenCode content BrowserView.
+ * Whether a navigation target is allowed for the OpenCode content WebContentsView.
  * Only the OpenCode localhost origin (any path) is permitted; everything else
  * (external http(s), file:, etc.) is blocked. data: URLs are allowed so the
  * in-app load-error page can render.

package/electron/main.js

@@ -1,7 +1,7 @@
 /**
  * Amicus Electron Shell - v3
  *
- * Uses BrowserView to split the window into two physical areas:
+ * Uses WebContentsView to split the window into two physical areas:
  *   - Top: OpenCode Web UI (gets its own viewport, no CSS conflicts)
  *   - Bottom 40px: Amicus toolbar (branding, task ID, timer, fold button)
  *
@@ -12,7 +12,7 @@
  * Spec Reference: §4.4 Electron Wrapper
  */
 
-const { app, BrowserWindow, BrowserView, globalShortcut, ipcMain, screen } = require('electron');
+const { app, BrowserWindow, WebContentsView, globalShortcut, ipcMain, screen } = require('electron');
 const path = require('path');
 const { logger } = require('../src/utils/logger');
 const { buildToolbarHTML, TOOLBAR_H, getBrandName } = require('./toolbar');
@@ -84,7 +84,7 @@ const OPENCODE_URL = `http://localhost:${OPENCODE_PORT}`;
 // ============================================================================
 
 let mainWindow = null;
-let contentView = null;
+let opencodeView = null;
 let currentToolbarH = TOOLBAR_H;
 
 const foldHandler = createFoldHandler({
@@ -127,7 +127,7 @@ function createAmicusWindow() {
     icon: ICON_PATH,
     webPreferences: {
       preload: path.join(__dirname, 'preload.js'),
-      contextIsolation: true, nodeIntegration: false,
+      contextIsolation: true, nodeIntegration: false, sandbox: true,
     }
   });
 
@@ -157,27 +157,27 @@ function createAmicusWindow() {
   mainWindow.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(toolbarHtml)}`);
   mainWindow.webContents.on('page-title-updated', (e) => e.preventDefault());
 
-  // BrowserView for OpenCode content. It uses a MINIMAL preload that exposes no
+  // WebContentsView for OpenCode content. It uses a MINIMAL preload that exposes no
   // privileged bridge — the OpenCode page must not be able to reach the fold /
   // settings / update IPC (M9). The toolbar window keeps preload.js.
-  contentView = new BrowserView({
+  opencodeView = new WebContentsView({
     webPreferences: {
       preload: path.join(__dirname, 'preload-content.js'),
-      contextIsolation: true, nodeIntegration: false,
+      contextIsolation: true, nodeIntegration: false, sandbox: true,
     }
   });
 
   // Pin the content view to the OpenCode localhost origin: block any attempt to
   // navigate it off-origin or open new windows (defense-in-depth, M9). data:
   // URLs (the in-app load-error page) are still allowed by the guard.
-  contentView.webContents.on('will-navigate', (event, targetUrl) => {
+  opencodeView.webContents.on('will-navigate', (event, targetUrl) => {
     if (!isAllowedContentNavigation(targetUrl, OPENCODE_URL)) {
       logger.warn('Blocked content-view navigation', { targetUrl });
       event.preventDefault();
     }
   });
-  contentView.webContents.setWindowOpenHandler(() => ({ action: 'deny' }));
-  // Load OpenCode off-screen first; only attach BrowserView after rebranding
+  opencodeView.webContents.setWindowOpenHandler(() => ({ action: 'deny' }));
+  // Load OpenCode off-screen first; only attach WebContentsView after rebranding
   // to prevent the OpenCode logo/splash from flashing during load.
   mainWindow.on('resize', updateContentBounds);
 
@@ -190,9 +190,9 @@ function createAmicusWindow() {
   // is token-driven — it inlines tokenCss() and remaps OpenCode's own :root
   // custom properties — so it tracks the toolbar without brittle class
   // selectors. insertCSS is more reliable than preload DOM injection in a
-  // BrowserView. NOTE: the live visual match is a user-side CDP/manual check.
-  contentView.webContents.on('dom-ready', () => {
-    contentView.webContents.insertCSS(buildOpencodeThemeCSS()).catch(() => {});
+  // WebContentsView. NOTE: the live visual match is a user-side CDP/manual check.
+  opencodeView.webContents.on('dom-ready', () => {
+    opencodeView.webContents.insertCSS(buildOpencodeThemeCSS()).catch(() => {});
   });
 
   // Navigate directly to the session URL to bypass the project selection screen.
@@ -205,7 +205,7 @@ function createAmicusWindow() {
   // failsafe, a failed/stalled UI load leaves an invisible window and a
   // silently hung process (the historical "Starting up... | 0 messages" bug).
   const failsafe = attachLoadFailsafe({
-    webContents: contentView.webContents,
+    webContents: opencodeView.webContents,
     timeoutMs: parseInt(process.env.AMICUS_GUI_LOAD_TIMEOUT_MS || '', 10) || undefined,
     onFail: ({ reason, errorCode, errorDescription, validatedURL }) => {
       logger.error('OpenCode UI failed to load', {
@@ -215,12 +215,12 @@ function createAmicusWindow() {
         const html = buildLoadErrorHTML({
           url: validatedURL || contentUrl, errorCode, errorDescription
         });
-        contentView.webContents
+        opencodeView.webContents
           .loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(html)}`)
           .catch(() => {});
       }
       // On timeout, show whatever is in flight rather than aborting the load.
-      mainWindow.addBrowserView(contentView);
+      mainWindow.contentView.addChildView(opencodeView);
       updateContentBounds();
       if (!process.env.AMICUS_HEADLESS_TEST) {
         mainWindow.show();
@@ -228,16 +228,16 @@ function createAmicusWindow() {
     }
   });
 
-  contentView.webContents.loadURL(contentUrl);
+  opencodeView.webContents.loadURL(contentUrl);
 
-  contentView.webContents.on('did-finish-load', () => {
+  opencodeView.webContents.on('did-finish-load', () => {
     // Wait for React to render, then rebrand and show window
     setTimeout(() => {
       rebrandUI().then(() => {
         // Disarm only once the window is actually about to show, so a wedged
         // rebrand/executeJavaScript is still covered by the timeout.
         failsafe.cancel();
-        mainWindow.addBrowserView(contentView);
+        mainWindow.contentView.addChildView(opencodeView);
         updateContentBounds();
         if (!process.env.AMICUS_HEADLESS_TEST) {
           mainWindow.show();
@@ -247,7 +247,7 @@ function createAmicusWindow() {
   });
 
   globalShortcut.register(FOLD_SHORTCUT, () => {
-    foldHandler.triggerFold(mainWindow, contentView);
+    foldHandler.triggerFold(mainWindow, opencodeView);
   });
 
   // Poll toolbar for button clicks (IPC doesn't work with data: URLs).
@@ -258,7 +258,7 @@ function createAmicusWindow() {
       if (!action) { return; }
       mainWindow.webContents.executeJavaScript('window.__amicusToolbarAction = null');
       if (action === 'fold') {
-        foldHandler.triggerFold(mainWindow, contentView);
+        foldHandler.triggerFold(mainWindow, opencodeView);
       } else if (action === 'open-settings') {
         createSettingsChildWindow();
       }
@@ -300,11 +300,11 @@ function createAmicusWindow() {
   }
 
   mainWindow.on('close', (event) => {
-    closeGuard.handleClose(event, mainWindow, contentView);
+    closeGuard.handleClose(event, mainWindow, opencodeView);
   });
   mainWindow.on('closed', () => {
     mainWindow = null;
-    contentView = null;
+    opencodeView = null;
     globalShortcut.unregisterAll();
     app.quit();
   });
@@ -334,7 +334,7 @@ async function createSetupWindow() {
     resizable: false,
     webPreferences: {
       preload: path.join(__dirname, 'preload-setup.js'),
-      contextIsolation: true, nodeIntegration: false,
+      contextIsolation: true, nodeIntegration: false, sandbox: false, // preload-setup.js require()s shell (not sandbox-safe)
     }
   });
 
@@ -356,9 +356,9 @@ async function createSetupWindow() {
 // ============================================================================
 
 function updateContentBounds() {
-  if (!mainWindow || !contentView) { return; }
+  if (!mainWindow || !opencodeView) { return; }
   const [w, h] = mainWindow.getContentSize();
-  contentView.setBounds({ x: 0, y: 0, width: w, height: h - currentToolbarH });
+  opencodeView.setBounds({ x: 0, y: 0, width: w, height: h - currentToolbarH });
 }
 
 // Amicus wordmark SVG in the same pixel/block art style as the OpenCode logo.
@@ -387,12 +387,12 @@ const AMICUS_WORDMARK = [
 ].join('');
 
 function rebrandUI() {
-  if (!contentView) { return Promise.resolve(); }
+  if (!opencodeView) { return Promise.resolve(); }
   const brandName = getBrandName(CLIENT);
   // The OpenCode logo may be hidden (display:none/visibility:hidden) by preload.js
   // or insertCSS before this runs. Use a MutationObserver with a fallback timeout
   // to catch it whenever React renders it into the DOM.
-  return contentView.webContents.executeJavaScript(`
+  return opencodeView.webContents.executeJavaScript(`
     (function() {
       document.title = '${brandName}';
       var header = document.querySelector('#root > div > header');
@@ -436,7 +436,7 @@ function rebrandUI() {
 // ============================================================================
 
 // These handlers are privileged (fold/settings/update/resize). Only the toolbar
-// window may invoke them — the OpenCode content BrowserView must not (M9). The
+// window may invoke them — the OpenCode content WebContentsView must not (M9). The
 // content view no longer gets a bridge preload, but we still validate the
 // sender as belt-and-suspenders in case a future preload change reintroduces one.
 const fromToolbar = (event) => isPrivilegedSender(event, () => mainWindow);
@@ -444,7 +444,7 @@ const fromToolbar = (event) => isPrivilegedSender(event, () => mainWindow);
 // Amicus mode: fold
 ipcMain.handle('sidecar:fold', (event) => {
   if (!fromToolbar(event)) { return; }
-  return foldHandler.triggerFold(mainWindow, contentView);
+  return foldHandler.triggerFold(mainWindow, opencodeView);
 });
 
 // Amicus mode: open settings in a child window
@@ -498,7 +498,7 @@ function createSettingsChildWindow() {
     resizable: false,
     webPreferences: {
       preload: path.join(__dirname, 'preload-setup.js'),
-      contextIsolation: true, nodeIntegration: false,
+      contextIsolation: true, nodeIntegration: false, sandbox: false, // shares preload-setup.js (shell)
     }
   });
 

package/electron/opencode-theme.js

@@ -3,7 +3,7 @@
 /**
  * Issue #49 — token-driven theme for the embedded OpenCode web UI.
  *
- * main.js injects this via `contentView.webContents.insertCSS(...)` on
+ * main.js injects this via `opencodeView.webContents.insertCSS(...)` on
  * `dom-ready`. Before #49 that hook only HID OpenCode's header/wordmark; this
  * module extends it so the embedded chat surface inherits the clay/gold tokens
  * and matches the token-driven Amicus toolbar (toolbar.js).
@@ -13,7 +13,7 @@
  * PREFER overriding OpenCode's OWN :root CSS custom properties — a much more
  * stable surface than `.css-abc123` class selectors. We:
  *   1. inline the canonical token CSS (tokenCss) so OUR vars + @font-face are
- *      available inside the BrowserView (absolute font URLs, same as toolbar.js
+ *      available inside the WebContentsView (absolute font URLs, same as toolbar.js
  *      / setup-ui-styles.js / load-failsafe.js do),
  *   2. remap a generous superset of OpenCode's plausible theme custom-property
  *      names to our tokens (var(--...)), covering the prefixes OpenCode has
@@ -115,7 +115,7 @@ const ELEMENT_FALLBACKS = `
 `;
 
 /**
- * Build the full theme CSS string injected into the OpenCode BrowserView.
+ * Build the full theme CSS string injected into the OpenCode WebContentsView.
  * @returns {string} hide-chrome + inlined tokens + :root overrides + fallbacks.
  */
 function buildOpencodeThemeCSS() {

package/electron/preload-content.js

@@ -1,5 +1,5 @@
 /**
- * Content Preload - OpenCode BrowserView (minimal, no privileged bridge)
+ * Content Preload - OpenCode WebContentsView (minimal, no privileged bridge)
  *
  * The OpenCode Web UI is remote-ish content: it should NOT be able to reach the
  * privileged sidecar IPC (fold/open-settings/perform-update/...). This preload

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amicus",
-  "version": "2.1.0",
+  "version": "3.0.0",
   "mcpName": "io.github.BourbonDog/amicus",
   "description": "Multi-model LLM Council + parallel AI window for Claude Code. Run structured council reviews across Gemini, GPT, DeepSeek and more — or fork a conversation to any model and fold the results back.",
   "keywords": [
@@ -69,6 +69,7 @@
     "check:tarball": "node scripts/check-tarball-lifecycle.js"
   },
   "dependencies": {
+    "@electron/get": "^5.0.0",
     "@modelcontextprotocol/sdk": "^1.27.0",
     "@opencode-ai/sdk": "^1.1.36",
     "dotenv": "^17.2.3",
@@ -78,7 +79,7 @@
     "zod": "^3.0.0"
   },
   "optionalDependencies": {
-    "electron": "^28.0.0"
+    "electron": "^43.1.1"
   },
   "devDependencies": {
     "chrome-remote-interface": "^0.33.3",
@@ -90,7 +91,7 @@
     "ws": "^8.19.0"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=22.12.0"
   },
   "lint-staged": {
     "src/**/*.js": [

package/skills/second-opinion/COUNCIL-DESIGN.md

@@ -1,8 +1,8 @@
 # Second Opinion v3 — "LLM Council" Design
 
 _Status: implemented (v3). v2 (2026-06-03) added the council mechanics; v3 (2026-06-10) swapped the
-transport onto the Amicus fanout/JSON engine primitives. v2 history lives in git
-(`V2-COUNCIL-DESIGN.md`, deleted at v3)._
+transport onto the Amicus fanout/JSON engine primitives; v3.1 (2026-07-14) added the optional
+council elements (§12). v2 history lives in git (`V2-COUNCIL-DESIGN.md`, deleted at v3)._
 _Design for `SKILL.md` and `MODEL-NOTES.md` of the `second-opinion` skill._
 
 ## 1. Intent
@@ -224,6 +224,70 @@ The append-only `council-ledger.jsonl` (consumed via `amicus council stats`) is
   four qualitative tiers, if tiers prove too coarse in practice.
 
 ## 11. Implementation surface
-- `SKILL.md` — the Stage 0–6 council flow on the v3 transport (WS-3: findings contract, tally assembly recipe, `amicus council tally/stats`, `verdict.json`, ledger auto-append).
+- `SKILL.md` — the Stage 0–6 council flow on the v3 transport (WS-3: findings contract, tally assembly recipe, `amicus council tally/stats`, `verdict.json`, ledger auto-append). v3.1 adds the Stage-0 optional-elements menu, the Stage-1 critic/lens launch blocks, Stage 2.5, and the chair verdict-scale addendum.
+- `SEAT-BRIEFS.md` — v3.1 briefing boilerplate for the optional elements + the standard anti-sycophancy clause.
 - `MODEL-NOTES.md` — qualitative per-model quirks, structural-conformance notes, cost guardrail, Stage-2 briefing tips. Quantitative reliability data now generated by `amicus council stats` (ledger). Engine workarounds that F1/F2/F4 made obsolete were pruned at v3.
-- `src/council/` — the deterministic helpers (`findings.js`, `tally.js`, `verdict.js`, `ledger.js`). No other files.
+- `src/council/` — the deterministic helpers (`findings.js`, `tally.js`, `verdict.js`, `ledger.js`). No other files. **v3.1 required zero engine changes**: `runStats[].role` labels are free-form, the rebuttal round is a tally-input re-assembly, and `--no-ledger` already existed.
+
+## 12. Optional council elements (v3.1)
+
+The `/critic` and `/debate` behaviors from John Renaldi's product-kit plugin (MIT — the
+elite-advisor and expert-debate-facilitator agents), grafted onto the council. Both source
+agents are single-model theater: one model playing an adversarial reviewer or a panel of
+disagreeing experts, with no external check on manufactured negativity or fake disagreement.
+The council supplies exactly that check — independent models and deterministic peer-validated
+tiers — so the methodologies port over as *optional elements* whose output is disciplined by
+Stage-2 adjudication.
+
+**Opt-in contract.** All elements default OFF. They are presented once, as a single numbered
+menu at Stage 0 (after bench/chair selection, before launch confirmation); the user must name
+an element to enable it — silence means off, and the launch confirmation enumerates enabled
+elements by name. "Claude in the council" (§5.4, semantics unchanged) is presented as one item
+of the same menu so there is exactly one opt-in point per run. Elements compose freely except
+critic + lenses on one seat (the critic takes one seat; lenses take the rest).
+
+### 12.1 Critic seat
+One bench member swaps its standard brief for an adversarial four-pass brief (adversarial
+pass, edge-case hunt, consistency check, executability test — `SEAT-BRIEFS.md`). Launches as
+a concurrent solo run (the red-team variant pattern); same findings contract; `role: "critic"`.
+Judges are never told the seat exists. Two deliberate deviations from the source agent: the
+minimum-10-findings quota is dropped (quotas force invented findings, which waste the bench's
+adjudication capital — the anti-padding rule replaces it), and the hard questions +
+Ship/Fix/Rethink verdict moved to the chair (§12.4). Known cost: the critic model can
+self-identify its review in the Stage-2 bundle by shape, weakening self-bias wash-out for that
+one seat — disclosed in the report. A single-seat brief variant is judged acceptable to record
+to the ledger (precedent: the red-team variant records normally).
+
+### 12.2 Expert lenses
+Each seat gets a distinct expert-perspective brief (panel domain scoped with the user:
+business/technical/specialty/customer/financial/custom). All legs launch as concurrent solos
+(no shared-prompt wave); lens↔model assignment is random and private; `role: "lens:<slug>"`.
+Two standing caveats, both disclosed: (a) **anonymity leak** — every judge can spot its own
+lens-flavored review, so self-bias wash-out is weakened bench-wide; (b) **ledger pollution** —
+lens reviews are not comparable to standard reviews (street-cred and confirm-rate assume a
+shared task), so lens-run tallies always pass `--no-ledger`. The bench-wide task change is what
+separates lenses (no ledger) from the single-seat critic (ledger ok).
+
+### 12.3 Debate mode (Stage 2.5 rebuttal round)
+The debate agent's challenge/stress-test rounds, grounded in findings instead of persona
+prose: the Stage-2 tally runs `--no-ledger` (provisional); every Contested/Disputed finding
+goes back to its raiser (defense mini-wave — solo per raiser: DEFEND / AMEND / WITHDRAW), the
+disputing judges re-vote on defended/amended findings (one shared fanout), and the final tally
+runs with the ledger. Exactly one round — the source agent's open-ended rounds become a fixed
+convergence step, or cost is unbounded. Withdrawn findings stay in `findings[]` and are
+auto-recorded `denied` (never presented for user decision). Missing/unparseable rebuttal or
+re-vote lines mean the original claim/verdict stands. No new decision vocabulary and no engine
+changes: `buildVerdict` and the renderer see a normal tally record.
+
+### 12.4 Chair verdict scale
+A chair-packet addendum: the chair closes with 3–5 hard questions plus a final parseable
+`VERDICT: Ship it | Fix these first | Fundamental rethink` line, surfaced verbatim at the top
+of `report.md` and in chat. Gives the council the single overall call its tier counts never
+provided. Possible later engine touch: an `overallVerdict` field in `verdict.json` + a
+renderer line (not needed for the prose version).
+
+### 12.5 Future work — parallel panels
+The debate agent's parallel-panels + cross-panel synthesis maps to two full council runs over
+different benches or lens-sets plus a super-chair synthesis of where the panels agree,
+disagree, and what each missed. Deferred: cost doubles and the run-folder conventions need
+namespacing. Revisit if lens runs prove valuable.

package/skills/second-opinion/MODEL-NOTES.md

@@ -4,8 +4,8 @@ This file is the `second-opinion` skill's evolving memory of **how to actually d
 well**. Read it before Stage 0 (council selection and launch); update it, with the user's
 approval, at the end of each run (Stage 6). Keep it tight — merge and prune rather than append.
 
-_Last updated: 2026-07-02 (runs 4-7 folded back from the field ledger: PowerShell quoting, date
-injection, long-read failures, judge tool-wander; see changelog)._
+_Last updated: 2026-07-14 (v2.2.0 fold-back: v3.1 optional council elements verified live;
+claim-class dedup adjudication limit; minimax and qwen-coder debut notes; see changelog)._
 
 ## Global operating rules (all models)
 - **Council runs are headless by design** (autonomous batch work): `fanout` is headless by
@@ -54,6 +54,19 @@ injection, long-read failures, judge tool-wander; see changelog)._
   no-tools preamble is now mandatory in SKILL.md Stage 2/3 — keep it verbatim.
 - The tally input needs **all five keys** (`meta` incl. `meta.models`, `findings`, `adjudications`,
   `rankings`, `runStats`) — see the SKILL.md Stage-2 recipe step 0.
+- **Claim-class dedup glosses rationale errors.** When several reviews raise the same claim, judges
+  adjudicate the class ("same as A3 — agree") and skip verifying each finding's own rationale text:
+  a direction-inverted arithmetic detail inside an otherwise-correct finding drew unanimous agrees
+  despite an explicit "dispute material factual errors in the rationale" instruction. If
+  rationale-level precision matters, instruct judges to independently verify the numbers in each
+  finding; otherwise expect class-level adjudication and let the chair reconcile details (a chair
+  has caught and corrected such an error unprompted).
+- **Optional council elements (v2.2.0) verified live:** critic seat (solo-alongside-fanout;
+  `role: "critic"` passes through `council tally` untouched), debate mode's nothing-to-debate path
+  (provisional `--no-ledger` tally → skip rebuttals → final ledger-recorded tally), and the chair
+  verdict scale (parseable `VERDICT:` line + hard questions) all behaved per SEAT-BRIEFS. **Debate
+  mode's defense/re-vote waves remain unexercised** — an all-Confirmed consensus run has no
+  rebuttal surface; exercise them on a contentious artifact before trusting that path blind.
 
 ## Per-model notes
 
@@ -102,6 +115,21 @@ injection, long-read failures, judge tool-wander; see changelog)._
 ### Claude  (in-council, when toggle on)
 - Consistently the most *calibrated* reviewer (no severity inflation; findings overwhelmingly Confirmed; bench-best street-cred in recent runs) but sometimes the least *original* — it can miss the boldest single catch. Treat as a reliability floor, not a discovery engine.
 
+### minimax  (`--model minimax` → via OpenRouter)
+- Fast (~2 min review legs), cheap, `clean` findings-JSON conformance on debut.
+- Took the **critic seat** brief exceptionally well: unanimously ranked #1 by its bench, full
+  coverage on a ground-truth test, zero padded findings under the anti-padding rule. A strong
+  default critic-seat candidate.
+- **Quirks:** occasional CJK character intrusions mid-English prose (cosmetic; the findings JSON
+  is unaffected); can invert the direction of an arithmetic detail inside an otherwise-correct
+  rationale — see the claim-class-dedup tip in Stage-2 briefing tips.
+
+### qwen-coder  (`--model qwen-coder` → via OpenRouter; distinct from `qwen`)
+- Very fast (16–22 s legs, review and judging alike), `clean` conformance, competent
+  core-blocker coverage on prose/PRD artifacts.
+- Ranked last on its debut bench — misses the offline, interruption-handling, and
+  test-methodology gap classes stronger seats catch. Fine budget-bench filler; do not chair it.
+
 ### (others — add as used)
 - Opus / o-series etc. are reachable via amicus **if their API keys are configured**. Add notes
   here the first time each is used.
@@ -160,3 +188,8 @@ This section keeps only per-model **qualitative quirks** and **structural-confor
   GUI-hangs-on-this-machine rule (resolved 2026-06-10; headless stays the council default by
   design). Config path updated to `~/.config/amicus/.env`.
 - **2026-07-02** — Folded back field lessons from runs 4-7 (AV-receiver, pork-shoulder, resume, novel ×2 councils): PowerShell `--models` quoting; current-date injection; long-read model selection; judge no-tools preamble; severity-inflation-justifies-dispute; five-keys tally schema; new Grok/Kimi/Mistral/Claude-in-council sections. Quantitative history stays in the ledger (`amicus council stats`).
+- **2026-07-14 (v2.2.0)** — Optional council elements shipped and verified on a planted-flaw
+  ground-truth council (critic seat, debate mode nothing-to-debate path, chair verdict scale;
+  expert lenses defined but not yet field-run). New lessons: claim-class dedup glosses
+  rationale-level errors in Stage-2; minimax debut (strong critic seat, CJK-intrusion quirk);
+  qwen-coder debut (fast budget filler). Debate mode's defense/re-vote waves still unexercised.

package/skills/second-opinion/SEAT-BRIEFS.md

@@ -0,0 +1,190 @@
+# Seat Briefs — Optional Council Elements
+
+Briefing boilerplate for the **optional council elements** offered at Stage 0 of the
+`second-opinion` skill (SKILL.md → "Optional council elements"). When an element is toggled
+ON, Claude copies the relevant block below into the run's `_tmp-*` briefing files and fills
+the `<placeholders>`. Everything here is orchestration prose — the findings contract,
+`council validate`, tally, and verdict mechanics are unchanged unless a section says
+otherwise.
+
+_The critic and lens methodologies are adapted from the `/critic` (elite-advisor) and
+`/debate` (expert-debate-facilitator) agents in John Renaldi's product-kit plugin (MIT)._
+_Deliberate deviations from those sources: no minimum-findings quota (quotas force invented
+findings, which waste the bench's adjudication capital), and the hard questions +
+Ship/Fix/Rethink verdict belong to the chair (synthesis-level judgments stay with the
+non-Claude chair, per the council's core rule)._
+
+---
+
+## Standard anti-sycophancy clause (ALL Stage-1 briefings — not an optional element)
+
+Include this block **verbatim in every Stage-1 review briefing**, standard seats included.
+This is briefing hygiene, not a toggle:
+
+> Do not soften findings to be agreeable. Lead with your most severe finding. No praise
+> cushions before criticism, and never perform enthusiasm you don't hold — if the artifact
+> is mediocre, say so and show why. Do not pad: report every real finding and no invented
+> ones. An empty severity category is a valid result.
+
+---
+
+## Critic seat brief
+
+Body of `_tmp-briefing-critic.md`. Follow it with the standard structured-output contract
+(prose review + trailing findings JSON, identical to every other seat) and the material.
+One bench member gets this brief **instead of** the standard review brief; the rest of the
+bench runs the normal fanout wave.
+
+> You are this review bench's designated critic. Assume problems exist; your job is to find
+> them, not to confirm the artifact is fine. Work through four passes and fold everything
+> into one findings list:
+>
+> 1. **Adversarial pass** — for every claim: what evidence supports it, or is it an
+>    assumption presented as fact? For every goal: is it measurable — would the author know
+>    if they hit it or missed it? For every decision: what alternatives were considered, or
+>    was this just the first idea? For every scope boundary: real constraint, or avoidance
+>    of hard work?
+> 2. **Edge-case hunt** — walk every journey, requirement, and scenario. What happens on the
+>    unexpected input, the failed integration, the malformed data? At zero, at one, at
+>    scale? With the confused, frustrated, or adversarial user instead of the happy-path
+>    one? Report only unhandled cases — if the artifact addresses an edge case, move on
+>    silently.
+> 3. **Consistency check** — cross-reference sections against each other: do goals have
+>    metrics, and metrics targets? do requirements trace back to stated needs? do the
+>    milestones fit the declared scope? does anything contradict a stated non-goal or
+>    constraint?
+> 4. **Executability test** — could someone act on this artifact without coming back with
+>    clarifying questions? Wherever the answer is no, name the specific section and exactly
+>    what is missing.
+>
+> Be specific: name the section, the line, the exact gap — not "the requirements need work"
+> but which requirement, and what about it is untestable. Report every real finding and no
+> invented ones; do not pad to look thorough. An empty pass is a valid result.
+
+**Orchestration notes (not part of the brief):**
+- Launch as a separate concurrent solo run alongside the fanout wave — the exact red-team
+  variant pattern in SKILL.md Stage 1.
+- Same findings contract, same `council validate` + repair loop, same anonymization into the
+  Stage-2 bundle. Judges are never told a critic seat exists.
+- Record `role: "critic"` on the seat's `runStats` entry.
+- Disclose in `report.md`: the critic model can recognize its own review in the Stage-2
+  bundle by its adversarial shape, so self-bias wash-out is weakened for that one seat.
+
+---
+
+## Expert lens briefs
+
+**Panel scoping first (Stage 0, when the element is toggled ON).** Ask the user which
+domain the panel should come from, then propose one distinct lens per seat:
+
+- **Business / Venture** — VCs, operators, market strategists (viability, positioning, GTM)
+- **Technical** — architects, security specialists, infrastructure engineers (feasibility,
+  scalability, build-vs-buy)
+- **Specialty technical** — user names the field (ML, biotech, regulatory, hardware, …)
+- **Customer / Market** — user researchers, skeptical buyers, channel partners (demand,
+  willingness to pay, adoption barriers)
+- **Financial** — CFOs, pricing strategists, unit-economics experts
+- **Mixed / Custom** — the user defines the lens set
+
+Pick lenses that will produce productive tension (a growth-stage VC + a bootstrapped
+operator + a skeptical enterprise buyer beats three near-identical strategists). Confirm the
+lens set with the user before launch.
+
+**Per-seat brief opener** (`_tmp-briefing-lens-<slug>.md`, one per seat; follow with the
+standard structured-output contract and the material):
+
+> Review this artifact strictly through the lens of a <lens — e.g. "growth-stage VC",
+> "security architect", "skeptical enterprise buyer", "CFO focused on unit economics">.
+> Raise only findings that perspective is qualified to raise, at the depth a top
+> practitioner of it would reach. Stay in-domain: if something matters but is outside your
+> lens, leave it to the other reviewers.
+
+**Orchestration notes (not part of the brief):**
+- Every seat gets a distinct brief, so there is no shared-prompt wave — launch ALL legs as
+  concurrent solo runs.
+- The lens↔model assignment is random and lives only in the private label map. Never tell
+  any reviewer which lenses the other seats hold, and never mention lenses in the Stage-2
+  bundle or judging instructions — judges rank on accuracy and insight only.
+- Record `role: "lens:<slug>"` on each `runStats` entry.
+- The Stage-2 tally runs `--no-ledger` — lens reviews are not comparable to standard
+  reviews, so they must not feed cross-run reliability stats.
+- Disclose in `report.md`: anonymity is weakened (each judge can spot its own lens-flavored
+  review), street-cred is not comparable across lenses, and the run was not recorded to the
+  reliability ledger.
+
+---
+
+## Rebuttal-round templates (debate mode, Stage 2.5)
+
+### Defense brief
+
+`_tmp-rebuttal-<label>.md` — one concurrent solo run per raiser that has at least one
+Contested or Disputed finding. First line is the no-tools preamble, verbatim:
+
+> Do NOT use any tools or read any files; everything is in this message; begin immediately
+> with the first finding id.
+>
+> You reviewed an artifact and raised the findings below. Peer reviewers (anonymous)
+> disputed them for the stated reasons. For EACH finding, respond with exactly one line
+> starting with the finding id and one verb:
+>
+> `<id>: DEFEND — <your strongest evidence-based defense, one paragraph maximum>`
+> `<id>: AMEND — <the corrected claim, full replacement text>`
+> `<id>: WITHDRAW`
+>
+> Withdraw anything you cannot defend with evidence — an unsupported repeat of the original
+> claim is weaker than a withdrawal.
+>
+> [one block per finding: id · claim · severity · the peers' dispute reasons, anonymized]
+
+### Re-vote bundle
+
+`_tmp-revote-bundle.md` — ONE shared bundle, sent as a single fanout wave to every judge
+that disputed at least one defended or amended finding. First line is the no-tools preamble,
+verbatim:
+
+> Do NOT use any tools or read any files; everything is in this message; begin immediately
+> with the first finding id.
+>
+> You previously adjudicated the findings below and disputed them. The (anonymous) raiser
+> has now responded. Re-adjudicate ONLY these findings in light of the response. For each,
+> respond with exactly one line:
+>
+> `<id>: agree | dispute | neutral — <one-line reason>`
+>
+> Changing your verdict when the defense is convincing is good judging, not weakness; so is
+> holding your dispute when it isn't.
+>
+> [one block per finding: id · claim (amended claims marked AMENDED) · the raiser's
+> defense]
+
+**Orchestration notes (not part of the briefs):**
+- Exactly ONE rebuttal round, ever. Whatever remains unsettled after the re-vote keeps its
+  final tier.
+- A missing or unparseable defense line = the original claim stands undefended. A missing
+  re-vote line = that judge's original verdict stands.
+- WITHDRAWN findings stay in the tally input (they were raised) and are auto-recorded as
+  `denied` in Stage 4 — never presented for a user decision. List them in `report.md` under
+  "Withdrawn by raiser (debate mode)".
+
+---
+
+## Chair verdict-scale addendum
+
+Append to the chair packet (`_tmp-chair-packet.md`) when the element is toggled ON:
+
+> After your synthesis, add two closing sections:
+>
+> 1. **HARD QUESTIONS** — three to five questions the artifact's author has probably not
+>    asked themselves, chosen so that an unanswerable question reveals a structural gap in
+>    the artifact (not gotchas — questions whose answers should exist).
+> 2. A final line, alone on the last line, in exactly this format:
+>
+>    `VERDICT: Ship it` | `VERDICT: Fix these first` | `VERDICT: Fundamental rethink`
+>
+>    Pick one. "Ship it" = solid, nothing blocking. "Fix these first" = specific gaps must
+>    be resolved before the artifact is useful — name them. "Fundamental rethink" =
+>    structural problems that cannot be patched — say what is wrong at the foundation.
+
+**Orchestration note:** surface the chair's `VERDICT:` line verbatim at the top of
+`report.md` and in the inline chat presentation of the results.

package/skills/second-opinion/SKILL.md

@@ -50,7 +50,7 @@ Operating lessons from each run fold back into `MODEL-NOTES.md` (with approval),
 
 ## The council flow
 
-The flow runs as a **Stage 0 intake/prep step** followed by **three sequential review waves** (Stage 1 → Stage 2 → Stage 3), each wave dependent on the prior. Within each wave, models run in parallel. Track the stages as todos and do not advance until the prior wave's outputs are in hand.
+The flow runs as a **Stage 0 intake/prep step** followed by **three sequential review waves** (Stage 1 → Stage 2 → Stage 3), each wave dependent on the prior — plus an optional **Stage 2.5 rebuttal round** when debate mode is on. Within each wave, models run in parallel. Track the stages as todos and do not advance until the prior wave's outputs are in hand.
 
 ### Stage 0 — Intake & prep
 
@@ -73,7 +73,7 @@ in this run is written here. Use its absolute path in all `--prompt-file` argume
   know "today" and have raised false "future-dated" blockers; state the date explicitly, e.g.
   "Today's date is YYYY-MM-DD."
 
-**Pick the council.** Default: **3 models from different families (non-Claude)**. Recommend them ranked by fit, consulting both the reviewer-reliability data from `amicus council stats` (the authoritative quantitative source — runs, avg peers-only street-cred, confirm-rate, fact-error rate) and the qualitative quirks in `MODEL-NOTES.md`. State the estimated cost. The estimate is the budget gate's pre-flight figure (per-$/Mtok pricing from the cached catalog; direct-provider legs without catalog pricing are disclosed as "cost unknown"). State it as an estimate, not a guarantee. **Disclose the run shape up front** before asking for confirmation — e.g.:
+**Pick the council.** Default: **3 models from different families (non-Claude)**. Recommend them ranked by fit, consulting both the reviewer-reliability data from `amicus council stats` (the authoritative quantitative source — runs, avg peers-only street-cred, confirm-rate, fact-error rate) and the qualitative quirks in `MODEL-NOTES.md`. State the estimated cost. The estimate is the budget gate's pre-flight figure (per-$/Mtok pricing from the cached catalog; direct-provider legs without catalog pricing are disclosed as "cost unknown"). State it as an estimate, not a guarantee. **Disclose the run shape up front** before asking for confirmation — naming any enabled optional council elements and their cost impact (see the optional-elements menu below) — e.g.:
 
 **Free council (zero-cost).** If the user asks for a "free council" / "zero-cost council",
 read `councils.free` from `~/.config/amicus/config.json` and run
@@ -93,6 +93,10 @@ read `councils.free` from `~/.config/amicus/config.json` and run
 
 > This run uses 3 council models across 2 fanout waves + 1 chair call (~7 model runs), ~10 min.
 
+or, with elements enabled:
+
+> This run uses 3 council models across 2 fanout waves + 1 chair call, with **critic seat + debate mode ON** (~7 base runs + up to 6 rebuttal calls), ~15 min.
+
 Then **wait for confirmation**. Never launch without it. The budget gate enforces the cost guardrail in code: by default it refuses any leg whose price exceeds the per-$/Mtok threshold (the o3/o3-pro guard). To run an intentionally expensive model the user explicitly asked for by name, pass `--no-cost-gate`; to raise only the total ceiling, pass `--max-cost <$>`.
 
 **Scale-down is explicit — state which mode applies:**
@@ -102,11 +106,27 @@ Then **wait for confirmation**. Never launch without it. The budget gate enforce
 
 The scale-down levels count **non-Claude judges**; enabling "Claude in the council" adds a judged review but not a judge, so it does not change these levels. If the bench drops below 2 surviving reviews during the run, apply the Stage-1 wave-degrade rule (offer re-run or a disclosed single-pass downgrade).
 
-**Present the "Claude in the council" toggle (default: off).** At launch, offer:
+**Present the optional council elements (all default OFF — explicit opt-in only).** After the
+bench and chair are picked and before asking for launch confirmation, present this menu once
+(adjust the run-shape numbers to the actual bench):
+
+> Optional council elements — all OFF unless you name them. Reply with any you want (e.g. "1 and 3", "critic + debate mode", or "none"):
+>
+> 1. **Critic seat** — one reviewer swaps to an adversarial brief (adversarial pass, edge-case hunt, consistency check, executability test). Same review count; that seat runs as a solo call. Trade-off: that reviewer can recognize its own review during cross-review (disclosed in the report).
+> 2. **Expert lenses** — each reviewer gets a distinct expert perspective; you pick the panel domain (business, technical, customer, financial, custom). Same review count, launched as solo calls. Trade-offs: weakens cross-review anonymity (disclosed) and the run is not recorded to the reliability ledger.
+> 3. **Debate mode** — after cross-review, Contested and Disputed findings go back to their raisers to defend, amend, or withdraw, and the disputing judges re-vote before the final tally. Adds 1–2 short waves (up to ~2N extra calls, ~+5 min).
+> 4. **Chair verdict scale** — the chair ends its synthesis with `VERDICT: Ship it | Fix these first | Fundamental rethink` plus 3–5 hard questions. No extra calls.
+> 5. **Claude in the council** — I add my own fresh review to the bundle so the bench can rank and adjudicate it; I'm judged but do not vote (Stage 2) or chair (Stage 3), so the verdict stays independent. +1 review in the bundle, no extra council calls.
 
-> Claude-in-the-council (default off): I can add my own fresh review to the bundle so the bench can rank and adjudicate it. You'd see how my take compares to the other reviewers. This means Claude is judged but does not vote (Stage 2) or chair (Stage 3) — the verdict stays independent. Turn on?
+Rules for this menu:
 
-When off, Claude does not contribute a review and does not appear in the bundle. When on, see Stage 1.
+- **Never enable an element the user did not explicitly name.** Silence, "no", or "none" = all off. Do not infer opt-in from the nature of the material ("this doc could use a critic…") — offer, don't decide.
+- If elements were **pre-requested in the invoking command** (e.g. `/council … with a critic seat and debate mode`), confirm them back by name ("Critic seat and debate mode are ON per your request; the others are off") instead of re-asking.
+- **The launch confirmation must enumerate the enabled elements by name** — an element not named in the confirmation is off. Restate its cost/shape impact there (see the run-shape disclosure above).
+- Elements compose freely, with one exception: **critic seat + expert lenses together** means one bench member takes the critic brief and the *remaining* seats take lenses — never stack both briefs on one seat.
+- Briefing boilerplate for elements 1–4 lives in **`SEAT-BRIEFS.md`** next to this file — read it when any of them is toggled on.
+
+When Claude-in-the-council is off, Claude does not contribute a review and does not appear in the bundle. When on, see Stage 1 and §5.4.
 
 ---
 
@@ -140,6 +160,10 @@ amicus start --model <redteam-model> --no-ui --json \
 
 Its stdout is a single run document; the `summary` field is the review.
 
+**Critic seat (optional element, when ON):** one bench member — recommended by Claude at Stage 0, typically a strong reasoner that is not the chair — receives the critic brief from `SEAT-BRIEFS.md § Critic seat brief` **instead of** the standard review brief. Launch it exactly like the red-team variant: a separate concurrent solo run (`_tmp-briefing-critic.md`) alongside the fanout wave of the remaining members — same total review count. Everything downstream is unchanged: same structured-output contract, same `council validate` + repair loop, same anonymization into the Stage-2 bundle (judges are never told a critic seat exists). Record `role: "critic"` on that seat's `runStats` entry. One standing disclosure for `report.md`: the critic model can recognize its own review in the Stage-2 bundle by its adversarial shape, so self-bias wash-out is weakened for that one seat.
+
+**Expert lenses (optional element, when ON):** every seat gets a distinct per-seat brief, so there is no shared-prompt wave — launch **all** legs as concurrent solo runs (`_tmp-briefing-lens-<slug>.md`, one per seat), using the lens templates and panel-scoping rules in `SEAT-BRIEFS.md § Expert lens briefs`. The lens↔model assignment is random and lives only in the private label map — no reviewer learns the other seats' lenses. Same structured-output contract and validation. Record `role: "lens:<slug>"` on each `runStats` entry. Two standing consequences, both disclosed in `report.md`: Stage-2 anonymity is weakened (each judge can spot its own lens-flavored review), and the Stage-2 tally runs `--no-ledger` (lens reviews are not comparable to standard reviews and must not feed cross-run reliability stats). Wave-degrade rules apply to these solos exactly as to fanout legs.
+
 **Cowork / no-Bash environments:** use the MCP tools instead — `amicus_fanout` (briefing via
 file) returns `{waveId, taskIds[]}` immediately. Preferred: call `amicus_wait` with the waveId —
 one blocking call per wave; re-call it while it returns `timedOut: true`. Fallback: poll
@@ -166,6 +190,8 @@ self-contained (`--no-context`), so MCP transport is equivalent.
 
 Instruct models to emit the structured JSON verbatim after the prose, without preamble, so it parses cleanly.
 
+**Every Stage-1 briefing — standard seats included — must contain the standard anti-sycophancy clause from `SEAT-BRIEFS.md` verbatim** (do not soften, lead with the most severe finding, no praise cushions, no padding — an empty severity category is a valid result). This is briefing hygiene, not an optional element.
+
 Save each leg's full output (prose + findings block) to the run folder as `review-<model>.md`
 (one file per reviewer) before moving on.
 
@@ -232,6 +258,8 @@ FINAL RANKING:
 
 **Task B — Adjudicate findings.** For every finding in the bundle, state: `agree | dispute | neutral` plus one-line reason. Reference each finding as **review-label + finding-id** — for example, `A2` means Review A's 2nd finding, `B1` means Review B's 1st finding. An "I missed this — it's valid" counts as `agree`.
 
+**When critic seat or expert lenses are ON:** the bundle and judging instructions must not mention seats, lenses, or briefs — judges rank and adjudicate on accuracy and insight only. The element briefs are Stage-1 information; leaking them into Stage 2 tells every judge which review is which.
+
 As each judge's ranking + adjudication response returns, collect it (the raw per-judge responses are working intermediates, not separate run-folder artifacts). Once all are in, **assemble the de-anonymized tally input** and then call `amicus council tally`:
 
 **Stage-2 → tally assembly recipe (Claude's work before calling `tally`):**
@@ -251,12 +279,34 @@ Then call, saving the printed `record` to `<run-folder>/tally.json` (Stage 5's `
 amicus council tally <run-folder>/tally-input.json --json > <run-folder>/tally.json
 ```
 
+**Ledger flags for optional elements:** when **expert lenses** are ON, always pass `--no-ledger` — lens runs never feed cross-run reliability stats. When **debate mode** is ON, this Stage-2 tally is *provisional* — pass `--no-ledger` here; the final, ledger-recorded tally happens at the end of Stage 2.5 (the critic seat and Claude-in-the-council change nothing about ledger handling).
+
 **Windows PowerShell 5.1 caveat:** that `>` redirect writes UTF-16 under legacy Windows PowerShell 5.1 (fine on pwsh 7+ or bash), which corrupts `tally.json` for Stage 5's `amicus council verdict` and surfaces as a confusing `BAD_ARGS` there instead of here — on 5.1 pipe through `| Out-File -Encoding utf8` (or run under pwsh 7+) instead of a bare `>`.
 
 The output `record` carries the deterministic tiers (Disputed / Confirmed / Contested / Singleton), `confidence` (`solid` | `thin`), both street-cred numbers (`withSelf` and `peersOnly`), the validated `runStats`, and `tierCounts`. **Claude may override a `thin`-confidence tier at the margins** before Stage 4 — record the override in `tierOverride: {from, to, reason}`; the matrix and `verdict.json` surface it. De-anonymize and write the tally results to `crossreview-matrix.md` — the adjudication grid plus the street-cred table. This data feeds Stage 3 (chair briefing) and is never re-anonymized or forwarded to any council model.
 
 ---
 
+### Stage 2.5 — Rebuttal round ("debate mode", optional element — skip this entire stage when OFF)
+
+One structured challenge round on the findings the bench did not settle: every **Contested** and **Disputed** finding goes back to its raiser to defend, amend, or withdraw; the judges that disputed it re-vote; then the final tally. **Exactly ONE round, ever** — never iterate further; whatever remains unsettled after the re-vote keeps its final tier. Briefing templates are in `SEAT-BRIEFS.md § Rebuttal-round templates`; every rebuttal briefing opens with the no-tools preamble, same as Stage 2.
+
+The Stage-2 tally above ran `--no-ledger` (provisional). If it produced **zero Contested + Disputed findings**, skip the rebuttal waves entirely: re-run the tally on the unchanged input *without* `--no-ledger` to record it, note "debate mode: nothing to debate" for `report.md`, and proceed to Stage 3.
+
+**1. Defense mini-wave.** For each raiser with ≥ 1 Contested/Disputed finding, write `_tmp-rebuttal-<label>.md`: its findings (run-global ids and claims), each with the peers' dispute reasons — anonymized, no judge identities. Launch one concurrent solo run per raiser (same flags and budget-gate handling as the Stage-1 solos). Parse each response line: `<id>: DEFEND — …` | `<id>: AMEND — <replacement claim>` | `<id>: WITHDRAW`. A missing or unparseable line = the original claim stands undefended (original verdicts carry).
+
+**2. Re-vote mini-wave.** Build ONE shared `_tmp-revote-bundle.md` holding every defended or amended finding plus its (anonymous) defense. Send it as a single fanout wave to the judges that disputed at least one of those findings — judges that never disputed sit this round out. Parse verdict lines `<id>: agree | dispute | neutral — <reason>`; a judge's missing line = its original verdict stands.
+
+**3. Final tally.** Re-assemble the tally input: re-vote verdicts replace those judges' original adjudications on those findings; AMENDED claims replace the originals (`id`, `raiser`, and `severity` unchanged); WITHDRAWN findings **stay in `findings[]`** (they were raised) and take whatever tier the final cascade assigns. Run `amicus council tally` **without** `--no-ledger` (unless expert lenses are also ON — lens runs never ledger) and save this record as the run's `tally.json`. This final record — not the provisional one — is what Stages 3–5 consume; the chair packet and `crossreview-matrix.md` are built from it, with verdict changes from the re-vote called out before/after.
+
+**Withdrawals downstream:** WITHDRAWN findings are auto-recorded in `decisions.json` as `{"id": …, "decision": "denied"}` — never presented for a user decision in Stage 4 — and listed in `report.md` under "Withdrawn by raiser (debate mode)".
+
+**Degrade rules:** a dead defense leg → all of that raiser's contested findings stand undefended. A dead re-vote leg → that judge's original verdicts carry. Never re-run the round.
+
+**Cost/shape:** adds up to 2 short waves (≤ N defense solos + 1 re-vote fanout), disclosed at Stage 0. If the actual rebuttal surface turns out much larger than estimated (many contested findings), say so before launching the mini-waves.
+
+---
+
 ### Stage 3 — Council-chair synthesis
 
 A designated **non-Claude** chair synthesizes the verdict across all reviews, rankings, and adjudications. The chair produces an independent verdict that Claude then presents — Claude does not paraphrase, edit, or re-synthesize it.
@@ -291,6 +341,8 @@ Instruct the chair to write a **synthesized verdict** that:
 - Distinguishes findings the bench broadly endorsed from contested or singleton claims
 - Arrives at an overall assessment of the artifact
 
+**Chair verdict scale (optional element, when ON):** append the addendum from `SEAT-BRIEFS.md § Chair verdict-scale addendum` to the chair packet — the chair must close with 3–5 **hard questions** the artifact's author probably hasn't asked themselves, then a final parseable line: `VERDICT: Ship it | Fix these first | Fundamental rethink`. Surface that line verbatim at the top of `report.md` and in the inline chat presentation. When debate mode is also ON, the chair packet is built from the *final* (post-rebuttal) tally and includes the defense/re-vote outcomes.
+
 Save the chair's output to the run folder as `verdict.md`.
 
 ---
@@ -301,6 +353,8 @@ All findings from the bundle are sorted into tiers based on the **peer-confidenc
 
 **Scale-down:** In a 1-model run, Stage 2 was skipped — there is no peer-confidence data, so present every finding individually for decision (no tiers). In a 2-model run, the Confirmed tier rests on thin cross-review (one ranker per review, per Stage 0) — say so when presenting it.
 
+**Debate mode:** the tiers below come from the *final* (post-rebuttal) tally. Findings WITHDRAWN by their raiser in Stage 2.5 are already recorded as `denied` — do not present them for decision; note them as withdrawn when walking the tiers.
+
 **Consensus tier — Confirmed findings** (≥ 2 peer agreements, agrees dominate)
 
 - Present the full list in one block: id, claim, severity, and which models raised / endorsed it.
@@ -341,7 +395,12 @@ Do not advance to Stage 5 until every finding in both tiers has a recorded decis
 - `verdict.md` (already saved in Stage 3)
 - `verdict.json` — write by running `amicus council verdict <run-folder>/tally.json --decisions <run-folder>/decisions.json -o <run-folder>/verdict.json` (a thin CLI wrapper over `buildVerdict(record, decisions)` + `writeVerdictAtomic`, `src/council/verdict.js`). `<run-folder>/tally.json` is the `record` saved from the Stage-2 `amicus council tally` call. `<run-folder>/decisions.json` is a **JSON array**, one object per finding: `{id, decision, applied?, duplicateOf?, tierOverride?}` — `id` is the run-global label id (e.g. `A1`); `decision` is the Stage-4 outcome (accepted / denied / modified / deferred); `applied` (optional bool) marks whether the accepted change was actually applied to the artifact in Stage 5; `duplicateOf` (optional) links to another finding's id when Claude identified a duplicate; `tierOverride` (optional) carries any `{from, to, reason}` override recorded in Stage 2. Save this array to `<run-folder>/decisions.json` first, then run the command — it parses the tally record and the decisions file, calls `buildVerdict`, and writes the schema-stamped machine-readable record to the run folder via the same atomic tmp+rename convention the function always used.
 - `report.md` — the chair's synthesis + the full Stage-4 decision log + a summary of what was
-  applied (+ the "How Claude's review fared" readout when "Claude in the council" is on) + a
+  applied (+ the "How Claude's review fared" readout when "Claude in the council" is on) + an
+  **Optional elements** section whenever any element was ON: which elements ran; the chair's
+  `VERDICT:` line verbatim at the top of the report (chair verdict scale); the "Withdrawn by
+  raiser (debate mode)" list and re-vote verdict changes (debate mode); and the standing
+  disclosures — critic self-identification in cross-review (critic seat), weakened anonymity +
+  non-comparable street-cred + `--no-ledger` (expert lenses) + a
   **run-stats table**: one row per model call — **stage** (which stage you launched the call for)
   plus **model, status, durationMs, and cost** read from the wave/run JSON `usage`
   block. Cost is `usage.cost.amount` (USD); mark it with its `usage.cost.source`
@@ -377,7 +436,7 @@ The `MODEL-NOTES.md` **next to this file** is your machine-local run ledger: npm
 
 Draft new or updated entries for the per-model sections of `MODEL-NOTES.md` that capture what was learned.
 
-**Ledger auto-append (automatic — no approval required).** Running `amicus council tally` (the Stage-2 finalize call) appends one row per (run × model) to the append-only `council-ledger.jsonl` under `getConfigDir()` — no separate step is needed. Pass `--no-ledger` to compute a tally record *without* recording it (e.g. a re-tally that shouldn't double-count). The run summary shows the appended row. This is a deterministic, content-free model-level record (no finding text, no claim strings, no artifact body content). The quantitative reviewer-reliability data in `MODEL-NOTES.md` is now sourced entirely from `amicus council stats` (which aggregates the ledger) — **do not hand-edit reliability numbers in MODEL-NOTES**.
+**Ledger auto-append (automatic — no approval required).** Running `amicus council tally` (the finalize call — Stage 2, or the Stage-2.5 final tally when debate mode is on; skipped entirely on expert-lens runs, which always pass `--no-ledger`) appends one row per (run × model) to the append-only `council-ledger.jsonl` under `getConfigDir()` — no separate step is needed. Pass `--no-ledger` to compute a tally record *without* recording it (e.g. a re-tally that shouldn't double-count). The run summary shows the appended row. This is a deterministic, content-free model-level record (no finding text, no claim strings, no artifact body content). The quantitative reviewer-reliability data in `MODEL-NOTES.md` is now sourced entirely from `amicus council stats` (which aggregates the ledger) — **do not hand-edit reliability numbers in MODEL-NOTES**.
 
 **Compose the proposed MODEL-NOTES diff.** Combine the run-lessons updates and the reviewer-reliability table updates into a single proposed diff (old → new for every changed section). **Write the full diff to a file in the run folder** — `_tmp-proposed-model-notes-update.md` — so the user can open and review it before deciding. Presenting the diff as chat text alone is **not sufficient**: an approval dialog can hide the chat transcript, so the user may be asked to decide on a diff they never saw.
 
@@ -476,13 +535,15 @@ Always **rank recommendations by fit**, state the trade-off for each option, and
   - `report.md` — Claude-authored; full contract defined once in *Stage 5 → Run-folder artifacts* above (chair's synthesis + Stage-4 decision log + run-stats table).
   - `report.html` — a **separate, deterministic** artifact generated by the `amicus council report <verdict.json> --html` renderer directly from `verdict.json` (no chair prose, no decision-log narrative — see Stage 5's *Renderer* note); the default artifact to share.
 - Reviewed copy: `<stem>-reviewed.<ext>`, next to the source.
-- Temp working files (`_tmp-*.md`: extracts, stage briefings, red-team brief, bundle, chair packet, proposed
-  MODEL-NOTES diff) live in the run folder and are cleaned up at the end of the run — the proposed-diff file
-  only after the Stage-6 approval decision is resolved.
+- Temp working files (`_tmp-*.md`: extracts, stage briefings, red-team brief, critic/lens seat briefs
+  (`_tmp-briefing-critic.md`, `_tmp-briefing-lens-<slug>.md`), rebuttal briefs (`_tmp-rebuttal-<label>.md`,
+  `_tmp-revote-bundle.md`), bundle, chair packet, proposed MODEL-NOTES diff) live in the run folder and are
+  cleaned up at the end of the run — the proposed-diff file only after the Stage-6 approval decision is resolved.
 
 ---
 
 ## Files
 
 - `MODEL-NOTES.md` — operating rules, per-model qualitative quirks, cost guardrail, and structural-conformance notes. **Read it before Stage 0 (council selection and launch); update qualitative notes (with approval) in Stage 6.** Quantitative reliability data (runs, avg street-cred, confirm-rate, fact-error rate) comes from `amicus council stats`, not this file. This copy is machine-local (never overwritten on update); the shipped seed lives in the amicus repo and absorbs durable lessons at release time.
-- `COUNCIL-DESIGN.md` — the design spec this skill implements (v3 + WS-3). Consult it if a mechanics question arises that the skill prose does not resolve.
+- `SEAT-BRIEFS.md` — briefing boilerplate for the optional council elements (critic seat, expert lenses, rebuttal round, chair verdict scale) plus the standard anti-sycophancy clause every Stage-1 briefing carries. **Read it whenever any element is toggled on at Stage 0** (the anti-sycophancy clause applies to every run).
+- `COUNCIL-DESIGN.md` — the design spec this skill implements (v3 + WS-3; §12 covers the optional council elements). Consult it if a mechanics question arises that the skill prose does not resolve.

package/src/sidecar/electron-install.js

@@ -146,7 +146,7 @@ function cacheRootFor(env = process.env) {
  * @returns {Promise<void>}
  */
 async function controlledProvision({
-  electronDir, platform, arch, version, downloadArtifact, extract, fs, env = process.env,
+  electronDir, platform, arch, version, downloadArtifact, extract, fs, env = process.env, downloadMs = 480000,
 }) {
   const zip = await downloadArtifact({
     version,
@@ -155,11 +155,7 @@ async function controlledProvision({
     cacheRoot: cacheRootFor(env),
     platform,
     arch,
-    checksums: undefined,
-    // Bound the fetch so a stalled/blocked network aborts (got v11 timeouts:
-    // socket = inactivity, request = total) instead of hanging the repair —
-    // a hung-then-killed download is what orphaned the single-flight lock.
-    downloadOptions: { timeout: { socket: 60000, request: 480000 } },
+    downloadOptions: { signal: AbortSignal.timeout(downloadMs) }, // 5.x native fetch: bound stalled downloads, free the lock
   });
   await extractFromCache({ zip, electronDir, platform, extract, fs });
 }
@@ -214,7 +210,11 @@ async function repairElectron({
   const spawn = deps.spawn || ((cmd, args, o) => spawnSync(cmd, args, { ...o, timeout: timeoutMs || 480000 }));
   const findZip = deps.cachedZip || ((o) => cachedZip(o));
   const acquireLock = deps.acquireLock || ((o) => acquireRepairLock({ ...o, fs }));
-  const downloadArtifact = deps.downloadArtifact || require('@electron/get').downloadArtifact;
+  // Lazy: import the ESM-only @electron/get only on the network path, so cacheOnly
+  // repairs and injected mocks stay parseable under Jest (which can't import() ESM).
+  const resolveDownloadArtifact = deps.downloadArtifact
+    ? async () => deps.downloadArtifact
+    : async () => (await import('@electron/get')).downloadArtifact;
 
   if (!version) {
     try {
@@ -268,8 +268,9 @@ async function repairElectron({
     // download that produced no usable exe is a FAILURE (no false success; #53).
     let controlledExtracted = false;
     try {
+      const downloadArtifact = await resolveDownloadArtifact();
       await controlledProvision({
-        electronDir, platform, arch, version, downloadArtifact, extract, fs, env: process.env,
+        electronDir, platform, arch, version, downloadArtifact, extract, fs, env: process.env, downloadMs: timeoutMs,
       });
       controlledExtracted = true; // download + extract returned without throwing
     } catch {

package/src/utils/node-version-guard.js

@@ -0,0 +1,16 @@
+'use strict';
+const MIN_NODE = '22.12.0';
+
+/** @param {string} current @param {string} min @returns {{ok:boolean,message:string|null}} */
+function checkNodeVersion(current, min = MIN_NODE) {
+  const c = current.replace(/^v/, '').split('.').map(Number);
+  const m = min.split('.').map(Number);
+  for (let i = 0; i < 3; i++) {
+    if ((c[i] || 0) > (m[i] || 0)) { return { ok: true, message: null }; }
+    if ((c[i] || 0) < (m[i] || 0)) {
+      return { ok: false, message: `Amicus 3.0 requires Node >=${min}; you are on ${current.replace(/^v/, '')}. Upgrade Node and retry.` };
+    }
+  }
+  return { ok: true, message: null };
+}
+module.exports = { checkNodeVersion, MIN_NODE };