amicus 1.0.0 → 1.2.0

package/electron/setup-ui-model.js

@@ -2,24 +2,22 @@
  * Setup UI - Step 2: Default Model Selection
  *
  * Builds the HTML for the model selection step of the wizard.
- * Renders radio card choices with provider routing and pre-selection support.
- * Models are disabled when no configured API key matches their routes.
+ * Renders radio card choices with provider routing, write-preview,
+ * and offline-badge support.
+ *
+ * Choices are RESOLVED rows passed in at call time (see src/utils/quick-picks.js):
+ *   { alias, label, blurb, source: 'live'|'fallback', routes: Object<string,string> }
+ * No curated-models import — this module is pure builder/renderer.
  */
 
-const { getCuratedModels } = require('../src/utils/curated-models');
-/**
- * Wizard quick-pick cards \u2014 derived from curated-models (F5).
- * @type {Array<{alias: string, label: string, routes: Object<string,string>}>}
- */
-const MODEL_CHOICES = getCuratedModels().map(c => ({
-  alias: c.alias, label: `${c.label} \u2014 ${c.blurb}`, routes: c.routes
-}));
+'use strict';
 
 const PROVIDER_NAMES = {
   openrouter: 'OpenRouter',
   google: 'Google AI',
   openai: 'OpenAI',
-  anthropic: 'Anthropic'
+  anthropic: 'Anthropic',
+  deepseek: 'DeepSeek'
 };
 
 /**
@@ -37,7 +35,7 @@ function isModelAvailable(providers, configuredKeys) {
 }
 
 /**
- * Find the best available provider for a model's static route text.
+ * Find the best available provider for a model's route display.
  * Prefers the first provider with a configured key; falls back to first provider.
  * @param {string[]} providers - Route provider IDs
  * @param {Object<string,boolean>} configuredKeys - Which providers have keys
@@ -49,12 +47,13 @@ function bestAvailableProvider(providers, configuredKeys) {
 }
 
 /**
- * Search-over-catalog section (F5). Hidden until the wizard script confirms
- * a non-empty catalog; rows are rendered client-side from the get-catalog IPC.
+ * Search-over-catalog section. Always visible — no display:none gating.
+ * Rows are rendered client-side from the get-catalog IPC response.
  * @returns {string} HTML fragment
  */
 function buildModelSearchHTML() {
-  return `<div id="model-search-section" style="display:none">
+  return `<div id="model-search-section">
+      <div class="search-label">&hellip;or pick any model from the catalog</div>
       <div class="search-head">
         <input type="text" id="model-search-input" placeholder="Search all models (id or name)..." autocomplete="off">
         <button class="icon-btn" id="model-search-refresh" title="Refresh catalog">&#x21bb;</button>
@@ -65,10 +64,11 @@ function buildModelSearchHTML() {
 }
 
 /**
- * Build the HTML fragment for Step 2 (Model Selection)
- * @param {Array<{alias: string, label: string, routes: Object<string,string>}>} choices
- * @param {string} [selectedAlias] - Pre-selected alias, defaults to first available choice
- * @param {Object<string,boolean>} [configuredKeys] - Provider IDs the user has keys for
+ * Build the HTML fragment for Step 2 (Model Selection).
+ * @param {Array<{alias:string, label:string, blurb:string, source:string, routes:Object<string,string>}>} choices
+ *   Resolved rows from resolveQuickPicks(). Each row has separate label + blurb fields.
+ * @param {string} [selectedAlias] - Pre-selected alias; defaults to first available choice.
+ * @param {Object<string,boolean>} [configuredKeys] - Provider IDs the user has keys for.
  * @returns {string} HTML fragment
  */
 function buildModelStepHTML(choices, selectedAlias, configuredKeys = {}) {
@@ -100,12 +100,19 @@ function buildModelStepHTML(choices, selectedAlias, configuredKeys = {}) {
     const showToggle = available.length >= 2;
     const bestProvider = bestAvailableProvider(providers, configuredKeys);
 
+    // Resolved id for the write-preview (prefer bestProvider route)
+    const previewId = c.routes[bestProvider] || Object.values(c.routes)[0] || '';
+
+    // Offline badge for fallback rows
+    const badge = c.source === 'fallback'
+      ? '<span class="pick-badge">offline list</span>' : '';
+
     let routeHtml = '';
     if (!modelAvailable) {
       routeHtml = '<span class="no-key-hint">No API key configured</span>';
     } else if (hasMultipleRoutes) {
       const pills = providers.map(p => {
-        const isActive = (showToggle && p === bestProvider) || (!showToggle && p === bestProvider);
+        const isActive = p === bestProvider;
         const cls = isActive ? 'route-pill active' : 'route-pill';
         return `<button class="${cls}" data-alias="${c.alias}" data-provider="${p}">${PROVIDER_NAMES[p]}</button>`;
       }).join('');
@@ -116,17 +123,20 @@ function buildModelStepHTML(choices, selectedAlias, configuredKeys = {}) {
     } else {
       routeHtml = `<span class="route-static">via ${PROVIDER_NAMES[bestProvider]}</span>`;
     }
+
     return `<label class="${cardClass}">
         <input type="radio" name="default-model" value="${c.alias}" ${checked}${disabled}>
         <span class="model-alias">${c.alias}</span>
-        <span class="model-label">${c.label}</span>
+        <span class="model-label">${c.label} — ${c.blurb}</span>${badge}
+        <span class="model-resolved">${previewId}</span>
         ${routeHtml}
+        <span class="write-preview" data-alias="${c.alias}">will set <code>${c.alias}</code> → <code class="write-preview-id">${previewId}</code></span>
       </label>`;
   }).join('\n      ');
 
   return `<div class="step-content">
     <h1>Choose Default Model</h1>
-    <p class="subtitle">Pick the model to use when no --model flag is given.</p>
+    <p class="subtitle">Current models resolved from the live catalog. Pick the default used when no --model flag is given.</p>
 
     <div class="model-list" id="model-list">
       ${cards}
@@ -135,4 +145,4 @@ function buildModelStepHTML(choices, selectedAlias, configuredKeys = {}) {
   </div>`;
 }
 
-module.exports = { buildModelSearchHTML, buildModelStepHTML, MODEL_CHOICES, PROVIDER_NAMES };
+module.exports = { buildModelSearchHTML, buildModelStepHTML, PROVIDER_NAMES };

package/electron/setup-ui-styles.js

@@ -321,7 +321,12 @@ function buildWizardCSS() {
   .search-row-sub { color: #A09B96; font-size: 11px; margin-top: 2px; }
   .icon-btn { background: none; border: 1px solid #3D3A38; border-radius: 6px; color: #A09B96; cursor: pointer; font-size: 14px; padding: 6px 10px; }
   .icon-btn:hover { border-color: #D97757; color: #D97757; }
-  .icon-btn:disabled { opacity: 0.5; cursor: default; }`;
+  .icon-btn:disabled { opacity: 0.5; cursor: default; }
+  .search-label { margin: 14px 0 6px; font-size: 12px; opacity: 0.75; }
+  .pick-badge { font-size: 10px; padding: 1px 5px; border-radius: 3px; background: #5a4a35; margin-left: 6px; }
+  .model-resolved { display: block; font-size: 11px; opacity: 0.6; font-family: monospace; }
+  .write-preview { display: none; font-size: 11px; margin-top: 4px; }
+  .write-preview-active { display: block; }`;
 }
 
 module.exports = { buildWizardCSS };

package/electron/setup-ui.js

@@ -1,26 +1,32 @@
 /** Setup UI - Wizard Orchestrator: API Keys → Models → Aliases → Review */
 const { buildKeysStepHTML, PROVIDERS } = require('./setup-ui-keys');
-const { buildModelStepHTML, MODEL_CHOICES, PROVIDER_NAMES } = require('./setup-ui-model');
+const { buildModelStepHTML, PROVIDER_NAMES } = require('./setup-ui-model');
 const { buildAliasEditorHTML } = require('./setup-ui-aliases');
 const { buildWizardCSS } = require('./setup-ui-styles');
 const { buildKeysScript } = require('./setup-ui-keys-script');
 const { buildAliasScript } = require('./setup-ui-alias-script');
 const { getDefaultAliases } = require('../src/utils/config');
 const { getBrandName } = require('./toolbar');
+const { resolveQuickPicks } = require('../src/utils/quick-picks');
 
 /**
  * @param {object} [options={}]
  * @param {string} [options.client='code-local'] - Client type for branding
+ * @param {Array} [options.quickPicks] - Resolved quick-pick rows from resolveQuickPicks(catalog).
+ *   Defaults to pinned fallbacks when not provided.
  */
 function buildSetupHTML(options = {}) {
-  const { client = 'code-local' } = options;
+  const {
+    client = 'code-local',
+    quickPicks = resolveQuickPicks([]),          // pinned fallbacks when not provided
+  } = options;
   const brandName = getBrandName(client);
   const keysHtml = buildKeysStepHTML(PROVIDERS);
-  const modelHtml = buildModelStepHTML(MODEL_CHOICES);
+  const modelHtml = buildModelStepHTML(quickPicks);
   const aliasHtml = buildAliasEditorHTML(getDefaultAliases());
   const css = buildWizardCSS();
   const providersJson = JSON.stringify(PROVIDERS);
-  const modelChoicesJson = JSON.stringify(MODEL_CHOICES);
+  const modelChoicesJson = JSON.stringify(quickPicks);
   const providerNamesJson = JSON.stringify(PROVIDER_NAMES);
   const defaultAliasesJson = JSON.stringify(getDefaultAliases());
   return `<!DOCTYPE html>
@@ -63,6 +69,7 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
   var defaultAliases = ${defaultAliasesJson};
   var routingChoices = {};
   var aliasEdits = {};
+  var aliasDisplay = {};
   window.availableModels = null;
   var keyValid = false, validatedKey = '';
   var $ = function(id) { return document.getElementById(id); };
@@ -128,7 +135,7 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
           }
         });
         Object.keys(cfg.aliases).forEach(function(k) {
-          if (cfg.aliases[k] !== defaultAliases[k]) { aliasEdits[k] = cfg.aliases[k]; }
+          if (cfg.aliases[k] !== defaultAliases[k]) { aliasDisplay[k] = cfg.aliases[k]; }
         });
         applyAliasEditsToUI();
       }
@@ -136,6 +143,12 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
   })();
 
   function applyAliasEditsToUI() {
+    Object.keys(aliasDisplay).forEach(function(k) {
+      var row = document.querySelector('.alias-row[data-alias="' + k + '"]');
+      if (!row) { return; }
+      var modelSpan = row.querySelector('.alias-model');
+      if (modelSpan) { modelSpan.textContent = aliasDisplay[k]; }
+    });
     Object.keys(aliasEdits).forEach(function(k) {
       var row = document.querySelector('.alias-row[data-alias="' + k + '"]');
       if (!row) { return; }
@@ -172,6 +185,23 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     } else { nextBtn.disabled = false; }
   }
 
+  // Single source of the route choice for a quick-pick row: explicit pill
+  // choice if its key still exists, else first provider with a key, else
+  // the row's first route. Returns the full model id or null.
+  function pickRouteFor(mc) {
+    if (!mc) { return null; }
+    var provs = Object.keys(mc.routes);
+    var prov = routingChoices[mc.alias];
+    if (!prov || !mc.routes[prov]) {
+      prov = null;
+      for (var i = 0; i < provs.length; i++) {
+        if (configuredKeys[provs[i]]) { prov = provs[i]; break; }
+      }
+      if (!prov) { prov = provs[0]; }
+    }
+    return mc.routes[prov] || null;
+  }
+
   function updateRoutingPills() {
     var hasAnyKey = Object.values(configuredKeys).some(function(v) { return v; });
     var firstAvailableAlias = null;
@@ -240,6 +270,7 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
       var fallback = document.querySelector('input[name="default-model"][value="' + firstAvailableAlias + '"]');
       if (fallback) { fallback.checked = true; }
     }
+    updateWritePreviews();
   }
 
   function updateAliasRoutes() {
@@ -275,15 +306,8 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
       if (row.querySelector('.alias-model-select')) { return; }
       var modelSpan = row.querySelector('.alias-model');
       if (!modelSpan) { return; }
-      // For MODEL_CHOICES aliases: update text to match available routing
-      if (routedModels[alias]) {
-        modelSpan.textContent = routedModels[alias];
-        aliasEdits[alias] = routedModels[alias];
-        row.classList.remove('alias-no-key');
-        return;
-      }
       // Check if the model's provider has a configured key
-      var model = aliasEdits[alias] || modelSpan.textContent;
+      var model = aliasEdits[alias] || aliasDisplay[alias] || modelSpan.textContent;
       var prefix = model.split('/')[0];
       var noKey = false;
       if (prefix === 'openrouter') {
@@ -301,17 +325,20 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
       kn.length > 0 ? kn.map(function(k) { return k + ' \\u2713'; }).join(', ') : 'None';
     var r = document.querySelector('input[name="default-model"]:checked');
     document.getElementById('review-model').textContent = window.customDefaultModel || (r ? r.value : 'Not selected');
-    var routeLines = [];
-    modelChoicesData.forEach(function(mc) {
-      var prov = routingChoices[mc.alias];
-      if (!prov) {
-        var provs = Object.keys(mc.routes);
-        prov = provs.find(function(p) { return configuredKeys[p]; }) || provs[0];
+    var writes = [];
+    var r2 = document.querySelector('input[name="default-model"]:checked');
+    if (!window.customDefaultModel && r2) {
+      var mc2 = null;
+      for (var i2 = 0; i2 < modelChoicesData.length; i2++) {
+        if (modelChoicesData[i2].alias === r2.value) { mc2 = modelChoicesData[i2]; break; }
       }
-      var provName = providerNamesData[prov] || prov;
-      routeLines.push(mc.alias + ' \\u2192 ' + provName);
-    });
-    document.getElementById('review-routing').textContent = routeLines.join(', ');
+      if (mc2) {
+        var routeId2 = pickRouteFor(mc2);
+        if (routeId2) { writes.push(mc2.alias + ' \\u2192 ' + routeId2); }
+      }
+    }
+    document.getElementById('review-routing').textContent =
+      writes.length > 0 ? writes.join(', ') : 'No alias changes';
     var editCount = Object.keys(aliasEdits).length;
     var reviewAliases = document.getElementById('review-aliases');
     if (reviewAliases) {
@@ -332,26 +359,31 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     routingChoices[alias] = provider;
     var toggle = pill.parentElement;
     toggle.querySelectorAll('.route-pill').forEach(function(p) { p.classList.toggle('active', p === pill); });
+    updateWritePreviews();
   });
 
   finishBtn.addEventListener('click', async function() {
     finishBtn.disabled = true; finishBtn.textContent = 'Saving...';
     try {
       var r = document.querySelector('input[name="default-model"]:checked');
-      var dm = window.customDefaultModel || (r ? r.value : 'gemini');
-      var routingOverrides = {};
-      modelChoicesData.forEach(function(mc) {
-        var prov = routingChoices[mc.alias];
-        if (!prov) {
-          var provs = Object.keys(mc.routes);
-          prov = provs.find(function(p) { return configuredKeys[p]; }) || provs[0];
-        }
-        routingOverrides[mc.alias] = mc.routes[prov];
-      });
+      var dm = window.customDefaultModel || (r ? r.value : null);
+      var aliasWrites = {};
       Object.keys(aliasEdits).forEach(function(k) {
-        routingOverrides[k] = aliasEdits[k];
+        aliasWrites[k] = aliasEdits[k];
       });
-      await window.sidecarSetup.invoke('sidecar:save-config', dm, routingOverrides);
+      if (!window.customDefaultModel && r) {
+        // Selecting a quick pick = explicit touch: upgrade that ONE alias
+        // to the resolved id via the chosen route (user-locked decision #2).
+        var mc = null;
+        for (var i = 0; i < modelChoicesData.length; i++) {
+          if (modelChoicesData[i].alias === r.value) { mc = modelChoicesData[i]; break; }
+        }
+        if (mc) {
+          var routeId = pickRouteFor(mc);
+          if (routeId) { aliasWrites[mc.alias] = routeId; }
+        }
+      }
+      await window.sidecarSetup.invoke('sidecar:save-config', dm, aliasWrites);
       var kc = Object.values(configuredKeys).filter(function(v) { return v; }).length;
       await window.sidecarSetup.invoke('sidecar:setup-done', dm, kc);
     } catch (_e) { finishBtn.disabled = false; finishBtn.textContent = 'Finish'; }
@@ -379,11 +411,12 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
   function applyCatalog(info) {
     catalogRows = (info && info.models) || [];
     catalogFetchedAt = info && info.fetchedAt;
-    var section = $('model-search-section');
-    if (!section) { return; }
-    section.style.display = catalogRows.length > 0 ? '' : 'none';
     renderSearchMeta();
     renderSearchResults();
+    if (catalogRows.length === 0) {
+      var meta = $('model-search-meta');
+      if (meta) { meta.textContent = 'Catalog unavailable (offline?) \\u2014 use \\u21bb to retry.'; }
+    }
   }
 
   function renderSearchMeta() {
@@ -434,6 +467,25 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     var keep = box ? box.scrollTop : 0;
     renderSearchResults();
     if (box) { box.scrollTop = keep; }
+    updateWritePreviews();
+  }
+
+  function updateWritePreviews() {
+    var r = document.querySelector('input[name="default-model"]:checked');
+    var sel = (!window.customDefaultModel && r) ? r.value : null;
+    document.querySelectorAll('.write-preview').forEach(function(el) {
+      var alias = el.getAttribute('data-alias');
+      el.classList.toggle('write-preview-active', alias === sel);
+      if (alias !== sel) { return; }
+      var mc = null;
+      for (var i = 0; i < modelChoicesData.length; i++) {
+        if (modelChoicesData[i].alias === alias) { mc = modelChoicesData[i]; break; }
+      }
+      if (!mc) { return; }
+      var routeId = pickRouteFor(mc);
+      var idEl = el.querySelector('.write-preview-id');
+      if (idEl && routeId) { idEl.textContent = routeId; }
+    });
   }
 
   document.addEventListener('input', function(e) {
@@ -443,6 +495,7 @@ function buildWizardScript(providersJson, modelChoicesJson, providerNamesJson, d
     if (e.target && e.target.name === 'default-model' && e.target.checked) {
       window.customDefaultModel = null;
       renderSearchResults();
+      updateWritePreviews();
     }
   });
   document.addEventListener('click', async function(e) {

package/electron/toolbar.js

@@ -8,12 +8,11 @@
 const TOOLBAR_H = 40;
 
 /**
- * Get the brand name based on client type
- * @param {string} [client='code-local'] - Client type (code-local, code-web, cowork)
- * @returns {string} Brand name to display
+ * Get the brand name to display
+ * @returns {string} Always 'Amicus' — all clients share one brand
  */
-function getBrandName(client) {
-  return client === 'cowork' ? 'Openwork Amicus' : 'Amicus';
+function getBrandName() {
+  return 'Amicus';
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amicus",
-  "version": "1.0.0",
+  "version": "1.2.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.",
   "keywords": [
     "claude",
@@ -17,14 +17,14 @@
     "second-opinion",
     "fanout"
   ],
-  "author": "BourbonDog",
+  "author": "Christian Wagner",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/BourbonDog/amicus.git"
   },
   "bugs": "https://github.com/BourbonDog/amicus/issues",
-  "homepage": "https://github.com/BourbonDog/amicus#readme",
+  "homepage": "https://bourbondog.github.io/amicus/",
   "bin": {
     "amicus": "./bin/amicus.js",
     "am": "./bin/amicus.js",
@@ -39,8 +39,8 @@
     "bin/",
     "src/",
     "electron/",
-    "skill/",
     "skills/",
+    ".claude-plugin/",
     "CHANGELOG.md",
     "scripts/postinstall.js",
     "scripts/setup-hooks.js"
@@ -63,7 +63,9 @@
     "generate-docs": "node scripts/generate-docs.js",
     "generate-docs:check": "node scripts/generate-docs.js --check",
     "validate-docs": "node scripts/validate-docs.js --full",
-    "prepare": "node scripts/setup-hooks.js"
+    "prepare": "node scripts/setup-hooks.js",
+    "check:secrets": "node scripts/check-secrets.js --all",
+    "check:sizes": "node scripts/check-file-sizes.js --all"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.27.0",

package/scripts/postinstall.js

@@ -13,7 +13,7 @@ const path = require('path');
 const os = require('os');
 const { execFileSync } = require('child_process');
 
-const SKILL_SOURCE = path.join(__dirname, '..', 'skill', 'SKILL.md');
+const SKILL_SOURCE = path.join(__dirname, '..', 'skills', 'sidecar', 'SKILL.md');
 const COUNCIL_SOURCE_DIR = path.join(__dirname, '..', 'skills', 'second-opinion');
 
 /** Council files + per-file install semantics: SKILL/COUNCIL-DESIGN are product code
@@ -172,12 +172,21 @@ function registerClaudeDesktop() {
   addMcpToConfigFile(configPath, 'sidecar', MCP_CONFIG);
 }
 
-function main() {
+function main(deps = {}) {
+  if (process.env.AMICUS_SKIP_POSTINSTALL === '1') {
+    console.log('[amicus] AMICUS_SKIP_POSTINSTALL set — skipping global setup (plugin channel handles registration).');
+    return;
+  }
+  const _installSkill = deps.installSkill || installSkill;
+  const _installCouncilSkill = deps.installCouncilSkill || installCouncilSkill;
+  const _registerClaudeCode = deps.registerClaudeCode || registerClaudeCode;
+  const _registerClaudeDesktop = deps.registerClaudeDesktop || registerClaudeDesktop;
+
   console.log('[amicus] Installing...');
-  installSkill();
-  installCouncilSkill();
-  registerClaudeCode();
-  registerClaudeDesktop();
+  _installSkill();
+  _installCouncilSkill();
+  _registerClaudeCode();
+  _registerClaudeDesktop();
 
   console.log('');
   console.log('[amicus] Setup:');
@@ -190,4 +199,4 @@ if (require.main === module) {
   main();
 }
 
-module.exports = { addMcpToConfigFile, installSkill, installCouncilSkill, COUNCIL_FILES };
+module.exports = { main, addMcpToConfigFile, installSkill, installCouncilSkill, COUNCIL_FILES };

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

@@ -35,7 +35,7 @@ non-Claude chairman + per-model inspectable artifacts.
   chair) is prose workflow Claude performs while driving the `amicus` CLI. v3 note: the *transport*
   is now engine-native — each review wave is ONE `amicus fanout --json` call returning structured
   run documents — but scoring, tallying, anonymization, and synthesis remain Claude's manual work.
-  No backend, no parsing code beyond reading JSON fields.
+  No backend, no parsing code beyond reading JSON fields. Deterministic arithmetic/formatting/schema helpers under `amicus council` (findings validation, tier tally, street-cred, ledger) are sanctioned; judgment, synthesis, anonymization, and de-anonymization remain Claude's inline work.
 
 ## 3. What changes vs. v1
 
@@ -44,7 +44,7 @@ non-Claude chairman + per-model inspectable artifacts.
 | Independent reviews | ✅ Phase 2 parallel sidecars | ✅ Stage 1 — now emits a **structured findings list** |
 | Cross-review | ❌ none | ⭐ **Stage 2** — anonymized peer ranking **+** per-finding adjudication |
 | Synthesis | Claude synthesizes | ⭐ **Council-model chair** synthesizes; Claude only presents |
-| Decision tiers | Claude's consensus/divergence read | ⭐ **Peer-validated** tiers (Confirmed / Contested / Singleton) |
+| Decision tiers | Claude's consensus/divergence read | ⭐ **Peer-validated** tiers (Disputed / Confirmed / Contested / Singleton) |
 | Scoring | none | ⭐ Reviewer **street-cred** + per-finding **peer-confidence** |
 | Artifacts | reviewed copy + report | + per-model raw reviews, cross-review matrix, chair verdict (run folder) |
 | MODEL-NOTES | per-model quirks | + **reviewer-reliability** rolling table feeding recommendations |
@@ -106,11 +106,9 @@ Run as ordered phases; track as todos. **Three sequential waves of model calls**
 - Chair selection & fallback: §5.3.
 
 ### Stage 4 — Tiered decisions (peer-validated)
-- **Consensus tier** = **Confirmed** findings (peers agree) → offer one **bulk accept/deny**
-  (user may name exceptions).
-- **Judgment tier** = **Contested** (peers dispute/split) or **Singleton** (only the raiser)
-  findings → present **each individually**, showing the dissent and which model raised/disputed it.
-- Record every decision (accepted / denied / modified).
+- **Consensus tier** = **Confirmed** findings (≥ 2 peer agreements, agrees dominate) → offer one **bulk accept/deny** (user may name exceptions).
+- **Judgment tier** = **Disputed** (strong peer pushback), **Contested** (live dispute), or **Singleton** (only the raiser) → present **each individually**, showing the adjudication data and which model raised/disputed it.
+- Record every decision (accepted / denied / modified / deferred).
 
 ### Stage 5 — Outputs
 - **Editable source** → write `<stem>-reviewed.<ext>` next to the original (accepted changes
@@ -119,8 +117,10 @@ Run as ordered phases; track as todos. **Three sequential waves of model calls**
 
 ### Stage 6 — Capture lessons (compounding)
 - Reflect on failures/mitigations and briefing wording, as today.
-- **Additionally** update the per-model **reviewer-reliability** table (§7).
-- **Show the proposed MODEL-NOTES diff and get approval before writing.** Keep it tight.
+- **Ledger auto-appends** — `ledger.appendRun(record)` writes one row per (run × model) to `council-ledger.jsonl` automatically at finalize (shown in the run summary). No manual reliability-table update needed.
+- **Qualitative MODEL-NOTES update (approval-gated):** draft per-model quirk/conformance notes; write the proposed diff to `_tmp-proposed-model-notes-update.md`; present its path in the approval prompt; do not write until approved.
+  The approval prompt carries the diff file's path; chat text alone is not sufficient (an approval
+  dialog can hide the chat transcript). Keep it tight.
 
 ## 5. Key mechanics
 
@@ -134,14 +134,23 @@ Run as ordered phases; track as todos. **Three sequential waves of model calls**
   and judged blind by the council models. Claude never ranks/adjudicates (it holds the map) —
   the asymmetry detailed in §5.4.
 
-### 5.2 Scoring (Claude tallies by hand — no code required)
-- **Street cred** = each model's **average rank position** across all judges' `FINAL RANKING:`
-  blocks (lower = better), exactly as LLM Council's aggregate. Surface as a small table.
-- **Per-finding peer-confidence** = qualitative tier from the adjudications:
-  - **Confirmed** — agrees clearly outweigh disputes (and ≥2 judges engaged).
-  - **Contested** — meaningful split or explicit disputes.
-  - **Singleton** — only the original raiser; others neutral/silent.
-  These tiers drive Stage 4. Claude exercises judgment at the margins; no rigid formula.
+### 5.2 Scoring (`amicus council tally` computes; Claude may override at the margins)
+
+**Street cred** — computed two ways by `amicus council tally`:
+- **withSelf** = each model's mean rank position across **all** judges' `FINAL RANKING:` blocks (lower = better).
+- **peersOnly** = mean rank across judges **other than** that model (self-vote excluded).
+The cross-review matrix shows both; the ledger and Stage-0 bench recommendations consume **peersOnly** only.
+
+**Per-finding peer-confidence tier** — determined by a **peers-only** cascade: for a finding raised by model R, peers are all judges except R (the raiser's own adjudication is excluded — consistent with the peers-only street-cred rule). Let `a` = peer agrees, `d` = peer disputes. The cascade is exhaustive and mutually exclusive:
+
+| Priority | Tier | Rule | Meaning |
+|---|---|---|---|
+| 1 | **Disputed** | `d ≥ 2` and `d > a` | Strong peer pushback — the finding itself is likely wrong |
+| 2 | **Confirmed** | `a ≥ 2` and `a > d` | ≥ 2 independent corroborations, agrees dominate |
+| 3 | **Contested** | `d ≥ 1` (whatever remains) | At least one live dispute — in question |
+| 4 | **Singleton** | else (`d = 0` and `a < 2`) | At most one endorsement, no pushback — thin |
+
+`confidence` is `thin` when total engaged peers `a + d ≤ 1` — cells `(0,0)`, `(1,0)`, and `(0,1)`. **Claude may override the tier at `thin` margins** (recorded as `tierOverride: {from, to, reason}` and surfaced in the matrix and `verdict.json`). These four tiers drive Stage 4. `amicus council tally` assigns them deterministically; judgment at the margins remains Claude's.
 
 ### 5.3 Chair selection & fallback
 - Default: Claude **recommends a non-Claude chair** from the council each run (often the
@@ -159,7 +168,7 @@ Lets you see how the bench judges Claude's *own* take.
 - **Which review: always fresh** — Claude does a new structured Stage-1 review on the artifact
   every time it's enabled (not a formalization of upstream feedback).
 - **Readout — "How Claude's review fared":** Claude's street-cred rank among peers and the
-  Confirmed/Contested/Singleton split of its findings, reported in the matrix and report.
+  Disputed/Confirmed/Contested/Singleton split of its findings, reported in the matrix and report.
 - **Integrity:** when Claude presents results, it reports the bench's verdict on its own review
   at face value — no defending or re-litigating.
 
@@ -169,22 +178,16 @@ One tidy run folder: `output/<stem>-council/` (or `./second-opinion/<stem>-counc
 - `review-<model>.md` ×N — raw Stage 1 reviews (plus `review-claude.md` when "Claude in the
   council" is on)
 - `crossreview-matrix.md` — adjudication grid + street-cred table (de-anonymized)
-- `verdict.md` — the chair's synthesis
+- `verdict.md` — the chair's synthesis (prose)
+- `verdict.json` — schema-stamped machine-readable record: tally output + Stage-4 decisions, written via `buildVerdict(record, decisions)` at Stage 5
 - `report.md` — synthesis + decision log + what was applied (+ the "How Claude's review fared"
   readout when "Claude in the council" is on)
 - `<stem>-reviewed.<ext>` — written **next to the original**, as today (editable sources only)
 - Temp extracts get a clearly-temporary name and are cleaned up at the end.
 
 ## 7. MODEL-NOTES reviewer-reliability
-Add a compact rolling table consulted in Stage 0 and updated (with approval) in Stage 6:
-
-| model | runs | avg street-cred | confirm-rate | notes |
-|---|---|---|---|---|
 
-- **avg street-cred** — running average rank when peer-ranked.
-- **confirm-rate** — share of this model's findings that ended up **Confirmed** by peers.
-- Used to justify recommendations ("DeepSeek findings peer-confirm ~80% → strong default
-  reviewer"). Kept tight per the existing no-bloat rule; merge/prune rather than append.
+The append-only `council-ledger.jsonl` (consumed via `amicus council stats`) is the **authoritative source of quantitative reviewer-reliability data** — runs, avg peers-only street-cred, confirm-rate, fact-error rate, conformance distribution. `MODEL-NOTES.md` keeps only *qualitative* per-model quirks and structural-conformance notes (`clean` / `repaired` / `unstructured`); it may embed a snapshot generated from `amicus council stats --json` but is no longer hand-edited for numbers. Stage-6 reliability updates are written by the ledger auto-append; the MODEL-NOTES prose update remains approval-gated.
 
 ## 8. Gating, cost, degradation & failure handling
 
@@ -205,23 +208,22 @@ Add a compact rolling table consulted in Stage 0 and updated (with approval) in
   - **Stage 3:** chair failure uses the same fallback chain (re-run → promote next-best non-Claude
     → Claude chairs with explicit disclosure).
 - **Run stats (v3):** `report.md` includes a per-leg table (model, status, durationMs) read from
-  the wave/run documents. The schema carries no cost data — never invent cost figures.
+  the wave/run documents. `durationMs` and `usage` are copied verbatim from the per-leg run docs; any leg with no run doc gets `durationMs: null` (and `usage: null`) — never invent a value. The schema carries no cost data — never invent cost figures.
 - **Transient failures:** provider 502s etc. → re-run the affected leg (solo `start --json`) or
   the wave; never present a half-finished run as an answer.
 
 ## 9. Non-goals (YAGNI)
 - No web UI, API server, or persistent conversation store (LLM Council's app shell).
-- No code/backend for scoring or parsing — Claude does it inline.
+- No code/backend for scoring or parsing — Claude does it inline. Deterministic arithmetic/formatting/schema helpers under `amicus council` (findings validation, tier tally, street-cred, ledger) are sanctioned; judgment, synthesis, anonymization, and de-anonymization remain Claude's inline work.
 - No automatic MODEL-NOTES writes — always approval-gated.
 - Claude is **not** a council member by default; it joins only via the opt-in toggle (§5.4),
   and even then it is judged-but-non-voting/non-chairing.
 
 ## 10. Open questions
 - None blocking. Possible later refinement: a numeric peer-confidence score instead of the
-  three qualitative tiers, if tiers prove too coarse in practice.
+  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.
-- `MODEL-NOTES.md` — reviewer-reliability table, per-model quirks, cost guardrail, Stage-2
-  briefing tips. Engine workarounds that F1/F2/F4 made obsolete were pruned at v3.
-- No other files.
+- `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).
+- `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.