@wrongstack/core 0.298.3 → 0.300.0

package/dist/execution/index.js

@@ -3979,7 +3979,11 @@ async function completeBrainLlm(target, input) {
   return (await completeBrainLlmDetailed(target, input)).text;
 }
 async function completeBrainLlmDetailed(target, input) {
-  const signal = AbortSignal.timeout(input.timeoutMs);
+  if (input.signal?.aborted) {
+    throw new DOMException("Brain call aborted before it started.", "AbortError");
+  }
+  const timeoutSignal = AbortSignal.timeout(input.timeoutMs);
+  const signal = input.signal ? AbortSignal.any([input.signal, timeoutSignal]) : timeoutSignal;
   const response = await target.provider.complete(
     {
       model: target.model,
@@ -4193,7 +4197,7 @@ function truncate(s, max) {
 var QUOTA_EXHAUSTED_RE = /(?:insufficient|exhausted|depleted|exceeded|no|not enough)[-_\s]*(?:quota|credit|balance)|(?:quota|credit|balance)(?:\s+(?:has|have))?(?:\s+been)?[-_\s]*(?:exhausted|depleted|exceeded|insufficient)|billing[_\s-]*(?:hard[_\s-]*)?limit|payment required|spending limit|plan limit|usage[-_\s]*limit[-_\s]*(?:reached|exceeded)/i;
 
 // src/types/provider.ts
-var CONTEXT_OVERFLOW_RE = /context.length|context.window|maximum context|max.*tokens?.*exceeded|prompt is too long|too long|exceeds the context|\btokens\b.*exceed|too many tokens|reduce the length|resulted in \d+ tokens|input.{0,12}too (?:large|long)|context_length_exceeded/i;
+var CONTEXT_OVERFLOW_RE = /context.length|context.window|maximum context|max.*tokens?.*exceeded|(?:prompt|request|input|messages?).{0,12}too (?:large|long)|exceeds the context|\btokens\b.*exceed|too many tokens|reduce the length|resulted in \d+ tokens|context_length_exceeded/i;
 var CONTENT_FILTER_RE = /content.(filter|policy|moderation)|safety (system|filter)/i;
 var RATE_LIMIT_EXCEEDED_RE = /rate[-_\s]*limit[-_\s]*exceeded/i;
 function classifyProviderError(status, body, message) {
@@ -4203,7 +4207,7 @@ function classifyProviderError(status, body, message) {
   if (status === 408) return "timeout";
   if (status === 599) return "stream_hang";
   if (status === 402 || QUOTA_EXHAUSTED_RE.test(text)) return "quota_exhausted";
-  if (status === 429 && body?.message && RATE_LIMIT_EXCEEDED_RE.test(body.message)) {
+  if (status === 429 && body?.message && body.type !== "rate_limit_exceeded" && RATE_LIMIT_EXCEEDED_RE.test(body.message)) {
     return "quota_exhausted";
   }
   if (type === "rate_limit_error" || status === 429) return "rate_limit";
@@ -4280,7 +4284,7 @@ var ProviderError = class extends WrongStackError {
     const e = err;
     const name = e.name;
     if (typeof name !== "string" || !name.endsWith("Error")) return false;
-    return typeof e.status === "number" && typeof e.retryable === "boolean" && typeof e.kind === "string";
+    return typeof e.status === "number" && typeof e.retryable === "boolean" && typeof e.kind === "string" && typeof e.describe === "function";
   }
   constructor(message, status, retryable, providerId, opts = {}) {
     const kind = opts.kind ?? classifyProviderError(status, opts.body, message);
@@ -4785,6 +4789,9 @@ var BUILTIN_COUNCIL_PERSONAS = Object.freeze([
     tags: ["users", "usability", "accessibility"]
   })
 ]);
+var BUILTIN_COUNCIL_PERSONA_IDS = Object.freeze(
+  BUILTIN_COUNCIL_PERSONAS.map((persona) => persona.id)
+);
 var CouncilPersonaRegistry = class _CouncilPersonaRegistry {
   byId;
   constructor(personas = []) {
@@ -5171,22 +5178,29 @@ function buildCouncilJudgeUserPrompt(question, votes, opts = {}) {
     "</council-ballots>"
   ].filter(Boolean).join("\n\n");
 }
-function normalizeOptions(options) {
-  if (!options) return [];
+function validateCouncilOptions(options) {
+  const errors = [];
   const seen = /* @__PURE__ */ new Set();
-  return options.map((option) => {
+  for (const option of options ?? []) {
     const id = option.id.trim();
-    const label = option.label.trim();
-    if (!id) throw new Error("buildCouncilQuestionPrompt: option id must not be empty.");
-    if (!label) throw new Error(`buildCouncilQuestionPrompt: option "${id}" needs a label.`);
-    if (seen.has(id)) throw new Error(`buildCouncilQuestionPrompt: duplicate option id "${id}".`);
+    if (!id) errors.push("Every option must have a non-empty `id`.");
+    if (!option.label.trim()) errors.push(`Option "${id || "<empty>"}" must have a label.`);
+    if (seen.has(id)) errors.push(`Duplicate option id "${id}".`);
     seen.add(id);
-    return {
-      id,
-      label,
-      ...option.consequence?.trim() ? { consequence: option.consequence.trim() } : {}
-    };
-  });
+  }
+  return errors;
+}
+function normalizeOptions(options) {
+  if (!options) return [];
+  const errors = validateCouncilOptions(options);
+  if (errors.length > 0) {
+    throw new Error(`buildCouncilQuestionPrompt: ${errors.join("; ")}`);
+  }
+  return options.map((option) => ({
+    id: option.id.trim(),
+    label: option.label.trim(),
+    ...option.consequence?.trim() ? { consequence: option.consequence.trim() } : {}
+  }));
 }
 function requiredInstruction(path17) {
   const text = readBundledInstructionText(path17);
@@ -5294,6 +5308,8 @@ function requireFraction(value, label) {
 var COUNCIL_REFUSAL_OPTION_ID = "council_refuse";
 var DEFAULT_COUNCIL_MAX_CONCURRENCY = 3;
 var MAX_COUNCIL_CONCURRENCY = 8;
+var OVERALL_TIMEOUT_REASON = "Council overall timeout exceeded.";
+var CALL_CANCELLED_REASON = "Cancelled.";
 var CouncilOrchestrator = class {
   caller;
   personas;
@@ -5304,6 +5320,17 @@ var CouncilOrchestrator = class {
   fallbackProfileManager;
   seatCaller;
   judgeCaller;
+  /**
+   * Normalized ad-hoc profiles keyed by the caller's config object identity.
+   * The Brain adapter reuses ONE profile object for every decision, so this
+   * avoids re-validating + re-freezing it on every ask() without caching
+   * string-keyed registry lookups (those are already O(1)).
+   *
+   * Hosts must treat ad-hoc profile configs as IMMUTABLE once passed to
+   * ask(): the cache is keyed by object identity and never invalidated, so
+   * mutating a cached profile would silently serve the first snapshot.
+   */
+  profileCache = /* @__PURE__ */ new WeakMap();
   constructor(opts) {
     if (!opts.caller && !opts.seatCaller && !opts.judgeCaller) {
       throw new Error(
@@ -5322,13 +5349,33 @@ var CouncilOrchestrator = class {
     this.seatCaller = opts.seatCaller;
     this.judgeCaller = opts.judgeCaller;
   }
-  async ask(question) {
-    const startedAt = Date.now();
-    const profile = resolveCouncilProfile(question.profile, {
+  /**
+   * Resolve the effective profile for a question. String ids and the default
+   * go through the registry (already O(1)); ad-hoc config objects are
+   * normalized once per stable object identity and cached, because hosts such
+   * as the Brain adapter pass the same profile object on every ask().
+   */
+  resolveProfile(profile) {
+    if (typeof profile === "string" || profile === void 0) {
+      return resolveCouncilProfile(profile, {
+        registry: this.profiles,
+        personas: this.personas,
+        defaultProfile: this.defaultProfile
+      });
+    }
+    const cached = this.profileCache.get(profile);
+    if (cached) return cached;
+    const resolved = resolveCouncilProfile(profile, {
       registry: this.profiles,
       personas: this.personas,
       defaultProfile: this.defaultProfile
     });
+    this.profileCache.set(profile, resolved);
+    return resolved;
+  }
+  async ask(question) {
+    const startedAt = Date.now();
+    const profile = this.resolveProfile(question.profile);
     validateRefusalCollision(question, this.refusalOptionId);
     const timeoutSignal = AbortSignal.timeout(profile.overallTimeoutMs);
     const signal = question.signal ? AbortSignal.any([question.signal, timeoutSignal]) : timeoutSignal;
@@ -5345,11 +5392,16 @@ var CouncilOrchestrator = class {
         try {
           return await this.callSeat(question, profile, seat, i, signal, usage);
         } catch (error) {
+          const timedOut = signal.aborted && !question.signal?.aborted;
           return {
             seatId: seat.id,
             persona: seat.persona,
-            status: signal.aborted ? "cancelled" : "failed",
-            error: errorMessage(error)
+            // Only the caller's own cancel is a "cancelled" vote; the overall
+            // budget expiring is a failure (timeout), matching the envelope.
+            status: question.signal?.aborted ? "cancelled" : "failed",
+            // Canonical text for aborted-by-budget or cancelled seats, so one
+            // event does not surface a different string per code path.
+            error: question.signal?.aborted ? CALL_CANCELLED_REASON : timedOut ? OVERALL_TIMEOUT_REASON : errorMessage(error)
           };
         }
       }
@@ -5359,7 +5411,7 @@ var CouncilOrchestrator = class {
     if (question.signal?.aborted) {
       return resultEnvelope({
         status: "cancelled",
-        reason: "Council call cancelled.",
+        reason: CALL_CANCELLED_REASON,
         resolution: "none",
         votes,
         profile,
@@ -5372,14 +5424,17 @@ var CouncilOrchestrator = class {
     if (timeoutSignal.aborted) {
       return resultEnvelope({
         status: "failed",
-        reason: "Council overall timeout exceeded.",
+        reason: OVERALL_TIMEOUT_REASON,
         resolution: "none",
         votes,
         profile,
         usage,
         startedAt,
         warnings,
-        errors: [...errors, "Council overall timeout exceeded."]
+        // Seat-prefixed errors normally carry the canonical timeout text, but
+        // a signal-blind caller can resolve valid votes even after the budget
+        // expired — append the standalone entry only when nothing carries it.
+        errors: errors.some((entry) => entry.includes(OVERALL_TIMEOUT_REASON)) ? errors : [...errors, OVERALL_TIMEOUT_REASON]
       });
     }
     if (!question.options || question.options.length === 0) {
@@ -5406,7 +5461,17 @@ var CouncilOrchestrator = class {
     );
   }
   async callSeat(question, profile, seat, seatIndex, signal, usage) {
-    if (signal.aborted) return cancelledVote(seat);
+    if (signal.aborted) {
+      return question.signal?.aborted ? cancelledVote(seat) : {
+        seatId: seat.id,
+        persona: seat.persona,
+        status: "failed",
+        ...seat.target?.providerId ? { provider: seat.target.providerId } : {},
+        ...seat.target?.model ? { model: seat.target.model } : {},
+        durationMs: 0,
+        error: OVERALL_TIMEOUT_REASON
+      };
+    }
     let persona;
     try {
       persona = this.personas.require(seat.persona);
@@ -5432,12 +5497,15 @@ var CouncilOrchestrator = class {
     });
     const metadata = callMetadata(result);
     if (result.error) {
+      const timedOut = signal.aborted && !question.signal?.aborted;
       return {
         seatId: seat.id,
         persona: seat.persona,
-        status: signal.aborted ? "cancelled" : "failed",
+        status: question.signal?.aborted ? "cancelled" : "failed",
         ...metadata,
-        error: result.error
+        // Canonical text for cancelled or aborted-by-budget seats, so one
+        // cancel/timeout event does not surface a raw provider string.
+        error: question.signal?.aborted ? CALL_CANCELLED_REASON : timedOut ? OVERALL_TIMEOUT_REASON : result.error
       };
     }
     const parsed = parseVote(result.text, question, this.refusalOptionId);
@@ -5536,9 +5604,27 @@ var CouncilOrchestrator = class {
       signal,
       usage
     );
+    if (signal.aborted) {
+      const cancelled = question.signal?.aborted === true;
+      const reason = cancelled ? CALL_CANCELLED_REASON : OVERALL_TIMEOUT_REASON;
+      return resultEnvelope({
+        status: cancelled ? "cancelled" : "failed",
+        reason,
+        resolution: "none",
+        votes,
+        profile,
+        usage,
+        startedAt,
+        warnings,
+        errors: errors.some((entry) => entry.includes(reason)) ? errors : [...errors, reason],
+        judgeUsed: true
+      });
+    }
     if (!judged.ok) {
       return resultEnvelope({
-        status: signal.aborted ? "cancelled" : "abstained",
+        // User cancel -> cancelled; overall budget expired mid-judge -> failed;
+        // otherwise the judge simply failed -> abstained (can't decide).
+        status: question.signal?.aborted ? "cancelled" : signal.aborted ? "failed" : "abstained",
         reason: judged.error,
         resolution: "none",
         votes,
@@ -5598,6 +5684,19 @@ var CouncilOrchestrator = class {
       });
     }
     if (!profile.judge) {
+      if (divergentStances(valid)) {
+        return resultEnvelope({
+          status: "abstained",
+          reason: "Council produced multiple distinct stances and has no judge to reconcile them.",
+          resolution: "none",
+          votes,
+          profile,
+          usage,
+          startedAt,
+          warnings,
+          errors
+        });
+      }
       const first = valid[0];
       if (!first) {
         return resultEnvelope({
@@ -5634,9 +5733,30 @@ var CouncilOrchestrator = class {
       signal,
       usage
     );
+    if (signal.aborted) {
+      const cancelled = question.signal?.aborted === true;
+      const reason = cancelled ? CALL_CANCELLED_REASON : OVERALL_TIMEOUT_REASON;
+      return resultEnvelope({
+        status: cancelled ? "cancelled" : "failed",
+        reason,
+        resolution: "none",
+        votes,
+        profile,
+        usage,
+        startedAt,
+        warnings,
+        errors: errors.some((entry) => entry.includes(reason)) ? errors : [...errors, reason],
+        judgeUsed: true
+      });
+    }
     if (!judged.ok) {
       return resultEnvelope({
-        status: signal.aborted ? "cancelled" : "failed",
+        // User cancel -> cancelled; overall budget expired mid-judge -> failed;
+        // otherwise the judge simply failed -> failed (open questions cannot
+        // abstain for a judge failure — 'abstained' is reserved for quorum
+        // failure and stance divergence; the option path maps this same
+        // plain-judge-failure case to 'abstained' instead).
+        status: question.signal?.aborted ? "cancelled" : "failed",
         reason: judged.error,
         resolution: "none",
         votes,
@@ -5675,18 +5795,28 @@ var CouncilOrchestrator = class {
       signal,
       usage
     });
-    if (result.error) return { ok: false, error: result.error };
+    if (result.error) {
+      if (signal.aborted && !question.signal?.aborted) {
+        return { ok: false, error: OVERALL_TIMEOUT_REASON };
+      }
+      if (question.signal?.aborted) {
+        return { ok: false, error: CALL_CANCELLED_REASON };
+      }
+      return { ok: false, error: result.error };
+    }
     return parseJudge(result.text, question, this.refusalOptionId);
   }
   /**
-   * Resolve the effective LLM caller for a call. Voter seats use
-   * `seatCaller(seatIndex)` when wired. Judge seats (seatIndex undefined)
-   * use `judgeCaller` if set, otherwise `seatCaller(0)` if set, otherwise
-   * the shared `caller`.
+   * Resolve the effective LLM caller for a call. Voter seats (defined
+   * seatIndex) use `seatCaller(seatIndex)` when wired, otherwise the shared
+   * `caller` — a seat never falls through to the judge caller. Judge seats
+   * (seatIndex undefined) use `judgeCaller` if set, otherwise `seatCaller(0)`
+   * if set, otherwise the shared `caller`.
    */
   resolveCaller(seatIndex) {
-    if (seatIndex !== void 0 && this.seatCaller) {
-      return this.seatCaller(seatIndex);
+    if (seatIndex !== void 0) {
+      if (this.seatCaller) return this.seatCaller(seatIndex);
+      return this.caller ?? this.judgeCaller;
     }
     if (this.judgeCaller) return this.judgeCaller;
     if (this.seatCaller) return this.seatCaller(0);
@@ -5695,6 +5825,7 @@ var CouncilOrchestrator = class {
   async safeCall(input) {
     const effectiveCaller = this.resolveCaller(input.seatIndex);
     const resolvedTarget = this.resolveCouncilTarget(input.target);
+    const startedAt = Date.now();
     try {
       const result = await effectiveCaller.call({
         system: input.system,
@@ -5711,8 +5842,17 @@ var CouncilOrchestrator = class {
       addUsage(input.usage, result);
       return result;
     } catch (error) {
-      input.usage.calls += 1;
-      return emptyCallResult(errorMessage(error));
+      const failed = {
+        text: "",
+        model: resolvedTarget?.model ?? "",
+        provider: resolvedTarget?.providerId ?? "",
+        tokens: { input: 0, output: 0, total: 0 },
+        durationMs: Math.max(0, Date.now() - startedAt),
+        fromFallback: false,
+        error: errorMessage(error)
+      };
+      addUsage(input.usage, failed);
+      return failed;
     }
   }
   /**
@@ -5744,47 +5884,77 @@ var CouncilOrchestrator = class {
     };
   }
 };
-function parseVote(text, question, refusalOptionId) {
+function parseCouncilResponse(text, question, refusalOptionId, opts) {
+  const roleLabel = opts.role === "judge" ? "Judge" : "Voter";
   const parsed = parseObject(text);
   if (!parsed.ok && (!question.options || question.options.length === 0)) {
     const fallback = text.trim();
-    if (fallback) return { ok: true, vote: { stance: fallback } };
-    return { ok: false, error: "Voter returned an empty response." };
+    if (fallback) return { ok: true, value: { [opts.freeTextField]: fallback } };
+    return { ok: false, error: `${roleLabel} returned an empty response.` };
   }
   if (!parsed.ok) return parsed;
   const rationale = optionalString(parsed.value["rationale"]);
   if (question.options && question.options.length > 0) {
     const optionId = optionalString(parsed.value["optionId"]);
-    const allowed = /* @__PURE__ */ new Set([...question.options.map((option) => option.id.trim()), refusalOptionId]);
+    const allowed = /* @__PURE__ */ new Set([
+      ...question.options.map((option) => option.id.trim()),
+      refusalOptionId
+    ]);
     if (!optionId || !allowed.has(optionId)) {
-      return { ok: false, error: "Voter returned an unknown or missing optionId." };
+      return { ok: false, error: `${roleLabel} returned an unknown or missing optionId.` };
     }
-    return { ok: true, vote: { optionId, ...rationale ? { rationale } : {} } };
+    return { ok: true, value: { optionId, ...rationale ? { rationale } : {} } };
   }
-  const stance = optionalString(parsed.value["stance"]);
-  if (!stance) return { ok: false, error: "Voter returned an empty or missing stance." };
-  return { ok: true, vote: { stance, ...rationale ? { rationale } : {} } };
+  const freeText = optionalString(parsed.value[opts.freeTextField]);
+  if (!freeText) {
+    return {
+      ok: false,
+      error: `${roleLabel} returned an empty or missing ${opts.freeTextField}.`
+    };
+  }
+  return { ok: true, value: { [opts.freeTextField]: freeText, ...rationale ? { rationale } : {} } };
 }
-function parseJudge(text, question, refusalOptionId) {
-  const parsed = parseObject(text);
-  if (!parsed.ok && (!question.options || question.options.length === 0)) {
-    const fallback = text.trim();
-    if (fallback) return { ok: true, value: { answer: fallback } };
-    return { ok: false, error: "Judge returned an empty response." };
+function divergentStances(valid) {
+  const seen = /* @__PURE__ */ new Set();
+  for (const vote of valid) {
+    const normalized = vote.stance.trim().replace(/^["'`]+|["'`]+$/g, "").toLowerCase().replace(/[.!?;:,]+$/g, "").replace(/\s+/g, " ").trim();
+    if (!normalized) return true;
+    seen.add(normalized);
+    if (seen.size > 1) return true;
   }
+  return false;
+}
+function parseVote(text, question, refusalOptionId) {
+  const parsed = parseCouncilResponse(text, question, refusalOptionId, {
+    role: "voter",
+    freeTextField: "stance"
+  });
   if (!parsed.ok) return parsed;
-  const rationale = optionalString(parsed.value["rationale"]);
-  if (question.options && question.options.length > 0) {
-    const optionId = optionalString(parsed.value["optionId"]);
-    const allowed = /* @__PURE__ */ new Set([...question.options.map((option) => option.id.trim()), refusalOptionId]);
-    if (!optionId || !allowed.has(optionId)) {
-      return { ok: false, error: "Judge returned an unknown or missing optionId." };
+  const { optionId, stance, rationale } = parsed.value;
+  return {
+    ok: true,
+    vote: {
+      ...optionId ? { optionId } : {},
+      ...stance ? { stance } : {},
+      ...rationale ? { rationale } : {}
     }
-    return { ok: true, value: { optionId, ...rationale ? { rationale } : {} } };
-  }
-  const answer = optionalString(parsed.value["answer"]);
-  if (!answer) return { ok: false, error: "Judge returned an empty or missing answer." };
-  return { ok: true, value: { answer, ...rationale ? { rationale } : {} } };
+  };
+}
+function parseJudge(text, question, refusalOptionId) {
+  const parsed = parseCouncilResponse(text, question, refusalOptionId, {
+    role: "judge",
+    freeTextField: "answer"
+  });
+  if (!parsed.ok) return parsed;
+  const { optionId, answer, rationale } = parsed.value;
+  return {
+    ok: true,
+    value: {
+      ...optionId ? { optionId } : {},
+      ...answer ? { answer } : {},
+      ...rationale ? { rationale } : {}
+    }
+  };
 }
 function parseObject(text) {
   const trimmed = text.trim();
@@ -5828,7 +5998,7 @@ function callMetadata(result) {
   };
 }
 function addUsage(usage, result) {
-  usage.calls += 1;
+  usage.calls += Math.max(1, result.attempts ?? 1);
   usage.inputTokens += result.tokens.input;
   usage.outputTokens += result.tokens.output;
   usage.totalTokens += result.tokens.total;
@@ -5837,21 +6007,40 @@ function usageResult(usage, startedAt) {
   return Object.freeze({ ...usage, durationMs: Math.max(0, Date.now() - startedAt) });
 }
 function cancelledVote(seat) {
-  return { seatId: seat.id, persona: seat.persona, status: "cancelled", error: "Cancelled." };
+  return {
+    seatId: seat.id,
+    persona: seat.persona,
+    status: "cancelled",
+    ...seat.target?.providerId ? { provider: seat.target.providerId } : {},
+    ...seat.target?.model ? { model: seat.target.model } : {},
+    durationMs: 0,
+    error: CALL_CANCELLED_REASON
+  };
 }
 function distinctTargetCount(votes, profile) {
-  const keys = votes.filter((vote) => vote.status === "valid").map(
-    (vote) => profile.distinctness === "provider" ? vote.provider : `${vote.provider ?? ""}/${vote.model ?? ""}`
-  ).filter(Boolean);
-  return new Set(keys).size;
+  return new Set(distinctTargetKeys(votes, profile)).size;
+}
+function distinctTargetKeys(votes, profile) {
+  const keys = [];
+  for (const vote of votes) {
+    if (vote.status !== "valid") continue;
+    const provider = vote.provider?.trim() ?? "";
+    const model = vote.model?.trim() ?? "";
+    if (profile.distinctness === "provider") {
+      if (provider) keys.push(provider);
+    } else if (provider || model) {
+      keys.push(`${provider}/${model}`);
+    }
+  }
+  return keys;
 }
 function distinctnessWarnings(votes, profile) {
   if (profile.distinctness === "none") return [];
-  const valid = votes.filter((vote) => vote.status === "valid");
-  const distinct = distinctTargetCount(valid, profile);
-  if (valid.length > 1 && distinct < valid.length) {
+  const keys = distinctTargetKeys(votes, profile);
+  const distinct = new Set(keys).size;
+  if (keys.length > 1 && distinct < keys.length) {
     return [
-      `Council distinctness policy "${profile.distinctness}" was not met: ${distinct} distinct target(s) served ${valid.length} valid vote(s).`
+      `Council distinctness policy "${profile.distinctness}" was not met: ${distinct} distinct target(s) served ${keys.length} valid vote(s).`
     ];
   }
   return [];
@@ -5887,17 +6076,6 @@ async function mapConcurrent(items, concurrency, worker) {
   await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, () => run()));
   return results;
 }
-function emptyCallResult(error) {
-  return {
-    text: "",
-    model: "",
-    provider: "",
-    tokens: { input: 0, output: 0, total: 0 },
-    durationMs: 0,
-    fromFallback: false,
-    error
-  };
-}
 function optionalString(value) {
   return typeof value === "string" && value.trim() ? value.trim() : void 0;
 }
@@ -5906,52 +6084,96 @@ function errorMessage(error) {
 }
 
 // src/execution/council-brain.ts
+var MAX_CUSTOM_PERSONA_ID_CHARS = 48;
+function customPersonaId(raw, index) {
+  const slug = raw.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, MAX_CUSTOM_PERSONA_ID_CHARS).replace(/-+$/g, "");
+  return slug ? `custom-${slug}` : `custom-${index + 1}`;
+}
+function resolvePersonaRegistry(voters) {
+  let registry = DEFAULT_COUNCIL_PERSONA_REGISTRY;
+  const personaIds = [];
+  const byRawText = /* @__PURE__ */ new Map();
+  voters.forEach((voter, index) => {
+    const raw = voter.persona?.trim();
+    if (!raw) {
+      personaIds.push("executor");
+      return;
+    }
+    if (registry.has(raw)) {
+      personaIds.push(raw);
+      return;
+    }
+    const existing = byRawText.get(raw);
+    if (existing) {
+      personaIds.push(existing);
+      return;
+    }
+    let id = customPersonaId(raw, index);
+    let suffix = 2;
+    while (registry.has(id)) id = `${customPersonaId(raw, index)}-${suffix++}`;
+    registry = registry.with({
+      id,
+      name: raw.length <= 40 ? raw : `${raw.slice(0, 39)}\u2026`,
+      description: "Custom decision lens supplied by the host configuration.",
+      instruction: raw
+    });
+    byRawText.set(raw, id);
+    personaIds.push(id);
+  });
+  return { registry, personaIds };
+}
+function makeSeatCallerForVoter(target) {
+  return {
+    async call(input) {
+      const startedAt = Date.now();
+      try {
+        const result = await completeBrainLlmDetailed(
+          { provider: target.provider, model: input.model ?? target.model },
+          {
+            system: typeof input.system === "string" ? input.system : Array.isArray(input.system) ? input.system.map((b) => b.text).join("\n") : "",
+            user: input.userPrompt ?? "",
+            timeoutMs: input.timeoutMs ?? 15e3,
+            maxTokens: input.maxTokens,
+            // Forward the orchestrator's signal (overall budget + caller
+            // cancellation) so an in-flight seat call is interrupted when
+            // the council times out or is cancelled instead of running to
+            // its per-call timeout. Previously this was dropped and a
+            // cancelled council waited for every seat to finish.
+            signal: input.signal
+          }
+        );
+        const inputTokens = result.usage?.input ?? 0;
+        const outputTokens = result.usage?.output ?? 0;
+        return {
+          text: result.text,
+          model: target.model,
+          provider: target.provider.id,
+          tokens: {
+            input: inputTokens,
+            output: outputTokens,
+            total: inputTokens + outputTokens
+          },
+          durationMs: Date.now() - startedAt,
+          fromFallback: false
+        };
+      } catch (error) {
+        return {
+          text: "",
+          model: target.model,
+          provider: target.provider.id,
+          tokens: { input: 0, output: 0, total: 0 },
+          durationMs: 0,
+          fromFallback: false,
+          error: error instanceof Error ? error.message : String(error)
+        };
+      }
+    }
+  };
+}
 function createCouncilBrainArbiter(opts) {
   if (opts.voters.length === 0) {
     throw new Error("createCouncilBrainArbiter: at least one voter is required.");
   }
-  function makeSeatCallerForVoter(target) {
-    return {
-      async call(input) {
-        const startedAt = Date.now();
-        try {
-          const result = await completeBrainLlmDetailed(
-            { provider: target.provider, model: input.model ?? target.model },
-            {
-              system: typeof input.system === "string" ? input.system : Array.isArray(input.system) ? input.system.map((b) => b.text).join("\n") : "",
-              user: input.userPrompt ?? "",
-              timeoutMs: input.timeoutMs ?? 15e3,
-              maxTokens: input.maxTokens
-            }
-          );
-          const inputTokens = result.usage?.input ?? 0;
-          const outputTokens = result.usage?.output ?? 0;
-          return {
-            text: result.text,
-            model: target.model,
-            provider: target.provider.id,
-            tokens: {
-              input: inputTokens,
-              output: outputTokens,
-              total: inputTokens + outputTokens
-            },
-            durationMs: Date.now() - startedAt,
-            fromFallback: false
-          };
-        } catch (error) {
-          return {
-            text: "",
-            model: target.model,
-            provider: target.provider.id,
-            tokens: { input: 0, output: 0, total: 0 },
-            durationMs: 0,
-            fromFallback: false,
-            error: error instanceof Error ? error.message : String(error)
-          };
-        }
-      }
-    };
-  }
   const seatCaller = (seatIndex) => {
     const voter = opts.voters[seatIndex];
     if (!voter) {
@@ -5971,14 +6193,15 @@ function createCouncilBrainArbiter(opts) {
     }
     return makeSeatCallerForVoter(voter);
   };
+  const { registry: personas, personaIds } = resolvePersonaRegistry(opts.voters);
   const seats = opts.voters.map((voter, i) => ({
     id: `voter-${i}`,
     label: voter.label ?? voter.model,
-    persona: voter.persona ?? "executor",
+    persona: personaIds[i] ?? "executor",
     target: {
       providerId: voter.provider.id,
       model: voter.model,
-      role: voter.persona ?? "executor"
+      role: personaIds[i] ?? "executor"
     },
     weight: voter.weight,
     veto: voter.veto
@@ -5988,18 +6211,31 @@ function createCouncilBrainArbiter(opts) {
     model: opts.judge.model,
     role: "judge"
   } : false;
+  const perCallTimeoutMs = opts.decisionTimeoutMs ?? 15e3;
+  const effectiveConcurrency = Math.max(
+    1,
+    Math.min(opts.maxConcurrency ?? DEFAULT_COUNCIL_MAX_CONCURRENCY, seats.length)
+  );
+  const overallTimeoutMs = Math.max(
+    DEFAULT_COUNCIL_OVERALL_TIMEOUT_MS,
+    perCallTimeoutMs * (Math.ceil(seats.length / effectiveConcurrency) + 1)
+  );
   const profile = {
     id: "brain-council-adapter",
     seats,
     judge: judgeTarget,
     quorumFraction: opts.quorumFraction ?? 0.5,
     approvalFraction: opts.approvalFraction ?? 0.5,
-    perCallTimeoutMs: opts.decisionTimeoutMs ?? 15e3,
+    perCallTimeoutMs,
+    overallTimeoutMs,
     ...opts.judgeMaxTokens !== void 0 ? { judgeMaxTokens: opts.judgeMaxTokens } : {},
     distinctness: opts.distinctness ?? "none"
   };
   const orchestrator = new CouncilOrchestrator({
     defaultProfile: "brain-council-adapter",
+    // Carries the ad-hoc lenses registered above; without it the orchestrator
+    // falls back to the built-in registry and rejects every custom persona.
+    personas,
     // Previously never passed, so the panel was pinned at the orchestrator's
     // default of 3 concurrent seats no matter how many voters were configured.
     ...opts.maxConcurrency !== void 0 ? { maxConcurrency: opts.maxConcurrency } : {},
@@ -7820,7 +8056,9 @@ function safeProfileName(name) {
 function activeProfileName(globalRoot) {
   try {
     const parsed = JSON.parse(fs.readFileSync(path4.join(globalRoot, "config.json"), "utf8"));
-    return safeProfileName(typeof parsed.activeProfile === "string" ? parsed.activeProfile : void 0);
+    return safeProfileName(
+      typeof parsed.activeProfile === "string" ? parsed.activeProfile : void 0
+    );
   } catch {
     return "default";
   }
@@ -7900,6 +8138,7 @@ function resolveWstackPaths(opts) {
     projectPlan: path4.join(projectDir, "plan.json"),
     projectAutophase: path4.join(projectDir, "autophase"),
     projectSddBoards: path4.join(projectDir, "sdd-boards"),
+    projectRequirementIntakes: path4.join(projectDir, "requirement-intakes"),
     syncConfig: path4.join(profileDir, "sync.json"),
     configHistoryDir: path4.join(globalRoot, "config-history"),
     projectStatus: (projectHash2) => path4.join(globalRoot, "projects", projectHash2, "status.json")
@@ -15917,8 +16156,17 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
       durationMs: 0
     };
     this.completedResults.push(synthetic);
+    this.trimCompletedResults();
     this.emit("task.completed", { task, result: synthetic });
   }
+  trimCompletedResults() {
+    if (this.completedResults.length > _DefaultMultiAgentCoordinator.MAX_COMPLETED_RESULTS) {
+      this.completedResults.splice(
+        0,
+        this.completedResults.length - _DefaultMultiAgentCoordinator.MAX_COMPLETED_RESULTS
+      );
+    }
+  }
   async runDispatched(subagentId, task) {
     const subagent = this.subagents.get(subagentId);
     if (!subagent) return;
@@ -16052,12 +16300,7 @@ var DefaultMultiAgentCoordinator = class _DefaultMultiAgentCoordinator extends E
   }
   recordCompletion(result) {
     this.completedResults.push(result);
-    if (this.completedResults.length > _DefaultMultiAgentCoordinator.MAX_COMPLETED_RESULTS) {
-      this.completedResults.splice(
-        0,
-        this.completedResults.length - _DefaultMultiAgentCoordinator.MAX_COMPLETED_RESULTS
-      );
-    }
+    this.trimCompletedResults();
     this.totalIterations += result.iterations;
     if (this.inFlight > 0) {
       this.inFlight--;
@@ -20363,6 +20606,7 @@ var OneShotOrchestrator = class {
         tokens: { input: 0, output: 0, total: 0 },
         durationMs: Math.round(performance.now() - startedAt),
         fromFallback: false,
+        attempts: 0,
         error: "No provider or model could be resolved. Check your config."
       };
     }
@@ -20377,6 +20621,7 @@ var OneShotOrchestrator = class {
         tokens: { input: 0, output: 0, total: 0 },
         durationMs: Math.round(performance.now() - startedAt),
         fromFallback: false,
+        attempts: 0,
         error: `Cannot build provider "${target.providerId}": ${err instanceof Error ? err.message : String(err)}`
       };
     }
@@ -20389,11 +20634,13 @@ var OneShotOrchestrator = class {
     let fromFallback = false;
     let lastError;
     let fallbackEligible = false;
+    let attempts = 0;
     if (tracker && !tracker.isAvailable(target.providerId, target.model) || !evaluateModelCalendar(config.modelAvailabilitySchedule, target.providerId, target.model).allowed) {
       this.opts.logger?.debug(
         `one-shot: primary "${target.providerId}/${target.model}" is blocked \u2014 trying fallback`
       );
     } else {
+      attempts += 1;
       const primaryAttempt = await this.tryCall(
         provider,
         request,
@@ -20408,10 +20655,17 @@ var OneShotOrchestrator = class {
         tracker?.recordSuccess(target.providerId, target.model);
         servingProviderId = provider.id;
         servingModel = target.model;
-        return this.buildResult(result, servingProviderId, servingModel, false, startedAt);
+        return this.buildResult(result, servingProviderId, servingModel, false, startedAt, attempts);
       }
       if (!fallbackEligible || chain.length === 0) {
-        return this.buildErrorResult(lastError, target.providerId, target.model, false, startedAt);
+        return this.buildErrorResult(
+          lastError,
+          target.providerId,
+          target.model,
+          false,
+          startedAt,
+          attempts
+        );
       }
     }
     const estimatedTokens = estimateRequestTokens(request.messages, request.system, []).total;
@@ -20439,6 +20693,7 @@ var OneShotOrchestrator = class {
       }
       servingProviderId = fbProvider.id;
       servingModel = entry.model;
+      attempts += 1;
       const attempt = await this.tryCall(
         fbProvider,
         this.buildRequest(input, entry.model),
@@ -20449,7 +20704,14 @@ var OneShotOrchestrator = class {
       if (attempt.response) {
         tracker?.recordSuccess(entry.providerId, entry.model);
         fromFallback = true;
-        return this.buildResult(attempt.response, servingProviderId, servingModel, true, startedAt);
+        return this.buildResult(
+          attempt.response,
+          servingProviderId,
+          servingModel,
+          true,
+          startedAt,
+          attempts
+        );
       }
       lastError = attempt.error;
     }
@@ -20458,7 +20720,8 @@ var OneShotOrchestrator = class {
       servingProviderId,
       servingModel,
       fromFallback,
-      startedAt
+      startedAt,
+      attempts
     );
   }
   // ── Private helpers ─────────────────────────────────────────────
@@ -20469,7 +20732,8 @@ var OneShotOrchestrator = class {
   resolveTarget(input, config) {
     if (input.role && this.opts.modelRouter) {
       const pick = this.opts.modelRouter.pickForTask(input.role, "");
-      if (pick) {
+      const hasExplicitTarget = Boolean(input.providerId || input.model);
+      if (pick && (pick.fromMatrix === true || !hasExplicitTarget)) {
         return { providerId: pick.provider, model: pick.model };
       }
     }
@@ -20581,7 +20845,7 @@ var OneShotOrchestrator = class {
     }
   }
   /** Build a success result from a provider Response. */
-  buildResult(response, servingProviderId, servingModel, fromFallback, startedAt) {
+  buildResult(response, servingProviderId, servingModel, fromFallback, startedAt, attempts) {
     const textBlocks = response.content.filter(isTextBlock);
     const text = textBlocks.map((b) => b.text).join("\n").trim();
     return {
@@ -20595,11 +20859,12 @@ var OneShotOrchestrator = class {
       },
       durationMs: Math.round(performance.now() - startedAt),
       fromFallback,
+      attempts,
       stopReason: response.stopReason
     };
   }
   /** Build a total-failure error result. */
-  buildErrorResult(error, servingProviderId, servingModel, fromFallback, startedAt) {
+  buildErrorResult(error, servingProviderId, servingModel, fromFallback, startedAt, attempts) {
     return {
       text: "",
       model: servingModel,
@@ -20607,6 +20872,7 @@ var OneShotOrchestrator = class {
       tokens: { input: 0, output: 0, total: 0 },
       durationMs: Math.round(performance.now() - startedAt),
       fromFallback,
+      attempts,
       error: error instanceof Error ? error.message : String(error ?? "Unknown error")
     };
   }
@@ -21142,6 +21408,7 @@ export {
   AutonomousRunner,
   BRAIN_EVALUATION_CASE_VERSION,
   BUILTIN_COUNCIL_PERSONAS,
+  BUILTIN_COUNCIL_PERSONA_IDS,
   BUILTIN_COUNCIL_PROFILES,
   COUNCIL_JUDGE_PROMPT_PATH,
   COUNCIL_REFUSAL_OPTION_ID,