amicus 4.4.0 → 4.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amicus",
-  "version": "4.4.0",
+  "version": "4.5.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": [
@@ -43,6 +43,7 @@
     "commands/",
     ".claude-plugin/",
     "CHANGELOG.md",
+    "docs/*.md",
     "scripts/postinstall.js",
     "scripts/setup-hooks.js"
   ],
@@ -50,11 +51,11 @@
     "start": "node --experimental-top-level-await --experimental-vm-modules bin/amicus.js",
     "test": "jest",
     "test:integration": "node scripts/run-integration-keyless.js",
-    "test:integration:live": "jest --testPathIgnorePatterns='worktrees' --testMatch='**/tests/**/*.integration.test.js'",
+    "test:integration:live": "jest --runInBand --testPathIgnorePatterns='worktrees' --testMatch='**/tests/**/*.integration.test.js'",
     "test:all": "jest --testPathIgnorePatterns='/node_modules/' --testPathIgnorePatterns='worktrees' && node scripts/mark-test-passed.js",
     "test:e2e:mcp": "jest tests/mcp-repomix-e2e.integration.test.js --testTimeout=180000 --forceExit",
     "posttest": "node scripts/mark-test-passed.js",
-    "lint": "eslint src/",
+    "lint": "eslint src/ electron/",
     "postinstall": "node scripts/postinstall.js",
     "test:thinking": "node scripts/benchmark-thinking.js",
     "test:thinking:quick": "MODELS=gemini node scripts/benchmark-thinking.js",
@@ -88,6 +89,7 @@
     "ajv": "^8.20.0",
     "chrome-remote-interface": "^0.33.3",
     "eslint": "^8.0.0",
+    "espree": "^9.6.1",
     "jest": "^29.0.0",
     "lint-staged": "^16.3.2",
     "puppeteer": "^24.36.0",
@@ -100,6 +102,9 @@
   "lint-staged": {
     "src/**/*.js": [
       "eslint --fix"
+    ],
+    "electron/**/*.js": [
+      "eslint --fix"
     ]
   }
 }

package/schemas/council-run-live.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://github.com/BourbonDog/amicus/schemas/council-run-live.schema.json",
+  "$id": "https://raw.githubusercontent.com/BourbonDog/amicus/main/schemas/council-run-live.schema.json",
   "title": "Amicus composed live council-run doc (amicus_status/buildCouncilStatusPayload, view:'live')",
   "type": "object",
   "required": ["taskId", "type", "runId", "runDir", "status", "currentStage", "stages", "legsTotal", "legsComplete", "elapsed", "exitCode", "version"],

package/schemas/council-run.schema.json

@@ -30,8 +30,22 @@
     "chair": { "type": "string" },
     "critic": { "type": ["string", "null"] },
     "lenses": { "type": ["array", "null"], "items": { "type": "string" } },
+    "droppedMembers": {
+      "description": "Council preset members dropped during resolution before this run started (v4.5 Wave 2): an alias that no longer resolves, or a resolved id absent from a non-empty cached model catalog (a catalog-unknown/offline member is never dropped this way). Present only when at least one member was actually dropped; absent — never an empty array — otherwise. `bench` above already reflects the survivors only; this is purely an additional observability signal so a scripted/MCP caller can detect a shrunken bench without diffing `bench` against the preset's nominal member list.",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": ["member", "reason"],
+        "properties": {
+          "member": { "type": "string" },
+          "reason": { "type": "string" }
+        }
+      }
+    },
     "labelMap": { "type": ["object", "null"], "additionalProperties": { "type": "string" } },
     "options": { "type": "object" },
+    "pack": { "type": "object" },
+    "template": { "type": "object" },
     "usage": { "type": "object" },
     "exitCode": { "type": ["number", "null"] },
     "budgetRefusals": {
@@ -48,6 +62,26 @@
         }
       }
     },
+    "sharedServer": {
+      "description": "The run acquired its single shared OpenCode server and threaded it through every wave (v4.4.1 Task 0.5). Present only on a successful acquisition; mutually exclusive with sharedServerUnavailable. `goPid` is the shared server's process id — no wave writes a goPid into its own metadata.json while riding an injected server, so this field is the POSITIVE, direct evidence that one server served the run, replacing the goPid-absence inference.",
+      "type": "object",
+      "required": ["acquired"],
+      "properties": {
+        "acquired": { "const": true },
+        "at": { "type": "string" },
+        "goPid": { "type": ["number", "null"] },
+        "models": { "type": "number" }
+      }
+    },
+    "sharedServerUnavailable": {
+      "description": "The run could not start its single shared OpenCode server and fell back to one server per wave (v4.4.1 Task 0.5). Present only when the acquisition failed. The run CONTINUES — this is never fatal — but the per-wave configuration is the one that races on OpenCode's SQLite, so results may be degraded.",
+      "type": "object",
+      "required": ["error"],
+      "properties": {
+        "error": { "type": "string" },
+        "at": { "type": "string" }
+      }
+    },
     "debate": {
       "type": "object",
       "properties": {

package/schemas/error.schema.json

@@ -13,7 +13,7 @@
       "type": "object",
       "required": ["code", "message"],
       "properties": {
-        "code": { "enum": ["BAD_ARGS", "MISSING_PROMPT", "BAD_MODEL", "MISSING_KEY", "BAD_SESSION", "BUDGET_EXCEEDED", "INTERNAL", "COUNCIL_QUORUM", "COST_EXCEEDED", "COUNCIL_CLAUDE_REVIEW_INVALID"] },
+        "code": { "enum": ["BAD_ARGS", "MISSING_PROMPT", "BAD_MODEL", "MISSING_KEY", "BAD_SESSION", "BUDGET_EXCEEDED", "INTERNAL", "COUNCIL_QUORUM", "COST_EXCEEDED", "COUNCIL_CLAUDE_REVIEW_INVALID", "TEMPLATE_NOT_FOUND", "TEMPLATE_RENDER", "PACK_NOT_FOUND", "PACK_INVALID", "PACK_KIND_MISMATCH"] },
         "message": { "type": "string" },
         "hint": { "type": ["string", "null"] },
         "command": { "type": ["string", "null"] }

package/schemas/event.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://github.com/BourbonDog/amicus/schemas/event.schema.json",
+  "$id": "https://raw.githubusercontent.com/BourbonDog/amicus/main/schemas/event.schema.json",
   "title": "Amicus observability event (events.jsonl line)",
   "type": "object",
   "required": ["schemaVersion", "type", "event", "ts", "id"],

package/schemas/pack.schema.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://raw.githubusercontent.com/BourbonDog/amicus/main/schemas/pack.schema.json",
+  "title": "Amicus policy pack",
+  "type": "object",
+  "required": ["schemaVersion", "type", "name", "version", "kind"],
+  "properties": {
+    "schemaVersion": { "const": 1 },
+    "type": { "const": "pack" },
+    "name": { "type": "string", "pattern": "^[a-zA-Z0-9][a-zA-Z0-9._-]{0,63}$" },
+    "version": { "type": "string" },
+    "kind": { "enum": ["council", "fanout", "solo"] },
+    "description": { "type": "string" },
+    "bench": {
+      "oneOf": [
+        { "type": "string" },
+        { "type": "array", "items": { "type": "string" }, "minItems": 2 }
+      ]
+    },
+    "model": { "type": "string" },
+    "chair": { "type": ["string", "null"] },
+    "critic": { "type": ["string", "null"] },
+    "lenses": { "type": ["array", "null"], "items": { "type": "string" } },
+    "options": { "type": "object" },
+    "briefing": {
+      "type": "object",
+      "properties": { "template": { "type": ["string", "null"] } }
+    }
+  }
+}

package/schemas/progress.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://github.com/BourbonDog/amicus/schemas/progress.schema.json",
+  "$id": "https://raw.githubusercontent.com/BourbonDog/amicus/main/schemas/progress.schema.json",
   "title": "Amicus leg/solo progress snapshot (progress.json)",
   "type": "object",
   "required": ["schemaVersion", "type", "stage", "updatedAt"],
@@ -12,6 +12,18 @@
     "updatedAt": { "type": "string", "format": "date-time" },
     "messagesReceived": { "type": "number" },
     "latestTool": { "type": "string" },
+    "toolSettleTimedOut": {
+      "description": "v4.4 B4. The leg was completed while at least one tool call was still non-terminal, after AMICUS_TOOL_SETTLE_GRACE_MS elapsed. Its partial output was kept and it was NOT failed, but its reported cost is a floor. Present only when true.",
+      "const": true
+    },
+    "unsettledToolCalls": {
+      "description": "How many tool calls were still live when the settle grace was exceeded. A count here (progress.json is a compact snapshot); the full list rides the runHeadless result. Present only alongside toolSettleTimedOut.",
+      "type": "number"
+    },
+    "toolSettleAborted": {
+      "description": "v4.4.1 LC-2. Whether the leg's OpenCode session was successfully aborted at the settle ceiling so it would stop billing. `false` means the abort was attempted and failed — the session may still be billing. Present only alongside toolSettleTimedOut.",
+      "type": "boolean"
+    },
     "usage": {
       "type": "object",
       "properties": {

package/schemas/run-live.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://github.com/BourbonDog/amicus/schemas/run-live.schema.json",
+  "$id": "https://raw.githubusercontent.com/BourbonDog/amicus/main/schemas/run-live.schema.json",
   "title": "Amicus composed live single-session doc (amicus_status, view:'live')",
   "description": "amicus_status's single-session response always stamps type:'run' (stampEnvelope); documented here as a const rather than the brief's 'may be absent' guess to match real output.",
   "type": "object",

package/schemas/run.schema.json

@@ -21,6 +21,7 @@
     "durationMs": { "type": ["number", "null"] },
     "sessionDir": { "type": ["string", "null"] },
     "opencodeSessionId": { "type": ["string", "null"] },
-    "usage": { "type": ["object", "null"] }
+    "usage": { "type": ["object", "null"] },
+    "pack": { "type": "object" }
   }
 }

package/schemas/spend.schema.json

@@ -9,8 +9,28 @@
     "schemaVersion": { "const": 2 },
     "type": { "const": "spend" },
     "windowDays": { "type": ["number", "null"] },
-    "total": { "type": "object" },
-    "byModel": { "type": "array", "items": { "type": "object" } },
+    "total": {
+      "type": "object",
+      "properties": {
+        "amount": { "type": "number" },
+        "runs": { "type": "number" },
+        "unpricedRows": { "$ref": "#/$defs/unpricedRows" },
+        "unattributedSubtreeRows": { "$ref": "#/$defs/unattributedSubtreeRows" }
+      }
+    },
+    "byModel": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "model": { "type": "string" },
+          "amount": { "type": "number" },
+          "runs": { "type": "number" },
+          "unpricedRows": { "$ref": "#/$defs/unpricedRows" },
+          "unattributedSubtreeRows": { "$ref": "#/$defs/unattributedSubtreeRows" }
+        }
+      }
+    },
     "credit": { "type": ["object", "null"] },
     "filters": { "type": "object" },
     "groupBy": { "enum": ["model", "wave", "council", "project", "op", "day"] },
@@ -22,7 +42,9 @@
         "properties": {
           "key": { "type": "string" },
           "amount": { "type": "number" },
-          "runs": { "type": "number" }
+          "runs": { "type": "number" },
+          "unpricedRows": { "$ref": "#/$defs/unpricedRows" },
+          "unattributedSubtreeRows": { "$ref": "#/$defs/unattributedSubtreeRows" }
         }
       }
     },
@@ -32,10 +54,36 @@
       "properties": {
         "amount": { "type": "number" },
         "runs": { "type": "number" },
+        "unpricedRows": { "$ref": "#/$defs/unpricedRows" },
+        "unattributedSubtreeRows": { "$ref": "#/$defs/unattributedSubtreeRows" },
         "byStatus": { "type": "object" }
       }
     },
-    "rows": { "type": "array" },
+    "rows": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "description": "A raw spend-ledger.jsonl row (internal v1 shape, echoed verbatim when --rows is passed). Always an object: readSpendRows drops any ledger line that does not parse as one, scalars and arrays included. Only the fields this document makes claims about are pinned beyond that.",
+        "properties": {
+          "subtreeUnknown": {
+            "type": "boolean",
+            "description": "v4.4.1. Present (and always true) only when this leg's own cost resolved but it spawned a child session whose spend could not be determined — the row is PRICED yet its cost is a floor. OMITTED entirely otherwise, so an ordinary row is byte-identical to a pre-4.4.1 one."
+          }
+        }
+      }
+    },
     "rowsTruncated": { "type": "boolean" }
+  },
+  "$defs": {
+    "unpricedRows": {
+      "type": "integer",
+      "minimum": 0,
+      "description": "Rows that contributed NOTHING to `amount` (no numeric cost). The bucket's figure omits them entirely: real spend is at least this much."
+    },
+    "unattributedSubtreeRows": {
+      "type": "integer",
+      "minimum": 0,
+      "description": "v4.4.1 CA-2. Rows that ARE priced and DO contribute to `amount`, but whose leg spawned a subagent whose child-session spend could not be determined — the second, independent reason the figure is a floor. A row can be counted in both this and `unpricedRows`; the two are never substitutes."
+    }
   }
 }

package/schemas/wave-live.schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://github.com/BourbonDog/amicus/schemas/wave-live.schema.json",
+  "$id": "https://raw.githubusercontent.com/BourbonDog/amicus/main/schemas/wave-live.schema.json",
   "title": "Amicus composed live wave doc (amicus_status, view:'live')",
   "type": "object",
   "required": ["taskId", "type", "status", "legs"],

package/schemas/wave.schema.json

@@ -28,6 +28,7 @@
     "completedAt": { "type": ["string", "null"] },
     "durationMs": { "type": ["number", "null"] },
     "usage": { "type": "object" },
-    "notices": { "type": "array", "items": { "type": "string" } }
+    "notices": { "type": "array", "items": { "type": "string" } },
+    "pack": { "type": "object" }
   }
 }

package/skills/second-opinion/SKILL.md

@@ -211,6 +211,11 @@ mangled alias (instant arg-parse failure). For a free council, swap `--models "<
 `--council free`. Run it in the background (`run_in_background: true`); you are notified on
 completion — do not poll.
 
+**Saved run configs (v4.5).** Every flag above this line can also come from a saved
+[policy pack](../../docs/usage.md#policy-packs) — `--pack <name>` loads its bench/chair/critic/
+lenses/options/template as defaults (an explicit flag still overrides it), the same on the
+`amicus_council_run`/`amicus_fanout`/`amicus_start` MCP tools' `pack` param.
+
 **Budget gate — one flag for the whole run.** By default the gate refuses any leg whose price
 exceeds the per-$/Mtok threshold (the o3/o3-pro guard). To run an intentionally expensive model the
 user asked for by name, pass `--no-cost-gate`; to raise only the total ceiling, pass

package/src/cli-handlers-council-run.js

@@ -71,9 +71,11 @@ function resolveBench(args, useJson) {
     if (expanded.dropped && expanded.dropped.length && !useJson) {
       process.stderr.write(`Notice: dropped unavailable council member(s): ${expanded.dropped.join(', ')}\n`);
     }
-    return { bench: expanded.models, presetName };
+    // v4.5 Wave 2: threaded into runCouncil's options — the ONLY prior signal
+    // was the stderr-only Notice above, which --json mode never even prints.
+    return { bench: expanded.models, presetName, droppedMembers: expanded.droppedMembers || [] };
   }
-  return { bench: parseList(args.models), presetName: null };
+  return { bench: parseList(args.models), presetName: null, droppedMembers: [] };
 }
 
 function renderRunHuman(run) {
@@ -115,6 +117,27 @@ function renderRunHuman(run) {
 async function handleCouncilRun(args) {
   const useJson = !!args.json;
 
+  // v4.5 Task 12 (B7/F5): resolve --pack FIRST, above the Task-5 template
+  // block, so a pack-filled args.template renders through that single
+  // existing application point exactly like a typed --template.
+  let packRecord = null;
+  const explicitKeys = args.__explicit || new Set();
+  if (args.pack !== undefined) {
+    const { applyPackToArgs } = require('./pack/pack-resolve');
+    const pr = applyPackToArgs({
+      packRef: args.pack, expectedKind: 'council', args,
+      explicit: explicitKeys, useJson,
+    });
+    if (pr.error) { return failJson(useJson, pr.error); }
+    for (const n of pr.notices) { process.stderr.write(n + '\n'); }
+    packRecord = pr.packRecord;
+  }
+  // 2026-07-28 ruling (Task-11 review): attribute a pre-flight failure to the
+  // pack that supplied the failing value — ONLY when the pack filled it (an
+  // explicit flag always wins and is never "blamed" on the pack).
+  const packSuffix = (key) => (packRecord && args[key] !== undefined && !explicitKeys.has(key))
+    ? ` (set by pack '${packRecord.name}')` : '';
+
   // --prompt-file required; inline --prompt rejected (councils always have
   // real briefings — same rationale as MCP fanout's briefing-via-file).
   if (args.prompt !== undefined) {
@@ -123,9 +146,26 @@ async function handleCouncilRun(args) {
       hint: 'write the briefing to a file and pass --prompt-file <path>' });
   }
   const { resolvePromptSource } = require('./utils/prompt-source');
-  const promptRes = resolvePromptSource(args);
-  if (promptRes.error) {
-    return failJson(useJson, { code: ERROR_CODES.MISSING_PROMPT, message: promptRes.error });
+  // F9 (v4.5): with --template and no {{prompt}} slot, --prompt-file may be
+  // absent (mirrors handleFanout's guard); byte-identical without --template.
+  let promptRes;
+  if (args.prompt !== undefined || args['prompt-file'] !== undefined || args.template === undefined) {
+    promptRes = resolvePromptSource(args);
+    if (promptRes.error) { return failJson(useJson, { code: ERROR_CODES.MISSING_PROMPT, message: promptRes.error }); }
+  } else {
+    promptRes = { prompt: undefined, promptMeta: null };
+  }
+  let templateMeta = null;
+  if (args.template !== undefined) {
+    const { applyTemplate } = require('./template/apply');
+    const t = applyTemplate({ templateRef: args.template, prompt: promptRes.prompt,
+      artifactFile: args.artifact, varList: args.var, project: args.cwd || process.cwd() });
+    if (t.error) { return failJson(useJson, t.error); }
+    for (const n of t.notices) { process.stderr.write(n + '\n'); }
+    promptRes = { prompt: t.prompt, promptMeta: t.promptMeta };
+    templateMeta = t.promptMeta.template;
+  } else if (args.artifact !== undefined || args.var !== undefined) {
+    return failJson(useJson, { code: ERROR_CODES.BAD_ARGS, message: 'Error: --artifact/--var require --template (expansion happens only in template files)' });
   }
 
   const benchRes = resolveBench(args, useJson);
@@ -153,19 +193,19 @@ async function handleCouncilRun(args) {
     ? args.chair.trim() : CHAIR_DEFAULT;
   if (bench.includes(chair)) {
     return failJson(useJson, { code: ERROR_CODES.BAD_ARGS,
-      message: `Error: chair '${chair}' is a bench seat — the chair must not review`,
+      message: `Error: chair '${chair}' is a bench seat — the chair must not review${packSuffix('chair')}`,
       hint: `pick a chair outside --models (default: ${CHAIR_DEFAULT}), or remove '${chair}' from the bench` });
   }
   const critic = (typeof args.critic === 'string' && args.critic.trim()) ? args.critic.trim() : null;
   if (critic && !bench.includes(critic)) {
     return failJson(useJson, { code: ERROR_CODES.BAD_ARGS,
-      message: `Error: critic '${critic}' must be one of the bench seats`,
+      message: `Error: critic '${critic}' must be one of the bench seats${packSuffix('critic')}`,
       hint: `--critic swaps one seat's brief; pass one of: ${bench.join(', ')}` });
   }
   const lenses = (typeof args.lenses === 'string' && args.lenses.trim()) ? parseList(args.lenses) : null;
   if (critic && lenses) {
     return failJson(useJson, { code: ERROR_CODES.BAD_ARGS,
-      message: 'Error: --critic and --lenses are mutually exclusive in v4.0' });
+      message: `Error: --critic and --lenses are mutually exclusive in v4.0${packSuffix('critic') || packSuffix('lenses')}` });
   }
   if (lenses && lenses.length !== bench.length) {
     return failJson(useJson, { code: ERROR_CODES.BAD_ARGS,
@@ -211,6 +251,9 @@ async function handleCouncilRun(args) {
     noValidateModel: !!args['no-validate-model'],
     date: new Date().toISOString().slice(0, 10),
     councilName,
+    template: templateMeta, // F9 (v4.5): null when no --template; additive on the run.json seed (run-state.js).
+    pack: packRecord, // v4.5 Task 12 (B7/F5): null when no --pack; additive on the run.json seed (run-state.js).
+    droppedMembers: benchRes.droppedMembers, // v4.5 Wave 2: [] when nothing dropped; additive on the run.json seed (run-state.js).
     // v4.1 §4.5b/§4.5d. `--claude-review` is resolved here but VALIDATED by the
     // engine's preflightClaudeReview (run-assemble.js): the reserved-seat and
     // 'claude may not chair' guards live there on purpose so MCP, the GitHub