@wrongstack/core 0.298.3 → 0.300.0

package/dist/types/config/skills-fleet-brain.d.ts

@@ -170,8 +170,10 @@ export interface BrainModelEntry {
 export interface BrainCouncilVoterConfig extends BrainModelEntry {
     /**
      * Decision lens for this seat. Built-ins: 'executor' (progress-biased),
-     * 'skeptic' (risk-hunting), 'auditor' (cost/waste-focused). Any other
-     * string is injected verbatim as the persona description.
+     * 'skeptic' (risk-hunting), 'auditor' (cost/waste-focused), 'security'
+     * (trust boundaries, abuse cases), 'maintainer' (complexity, compatibility)
+     * and 'user-advocate' (usability, recovery). Any other string is registered
+     * as an ad-hoc lens whose instruction is the string itself.
      */
     persona?: string | undefined;
     /** Vote weight in the tally. Default 1. */

package/dist/types/config/tools.d.ts

@@ -50,6 +50,21 @@ export interface ToolsConfig {
      * it is honored from any source.
      */
     exec?: ExecToolConfig | undefined;
+    /**
+     * Agent-callable `council` tool: which panel profile it runs by default and
+     * which extra lenses/profiles are available to it.
+     *
+     * Distinct from `brain.council`, which is the Brain's own decision tier —
+     * that one is convened by the Brain on high-risk questions, this one is
+     * invoked by the agent.
+     *
+     * SECURITY: in the in-project DENY list. A persona's `instruction` is
+     * rendered into the voter SYSTEM prompt, and a profile seat may pin a
+     * `providerId`/`model` — so a repo-committed config could otherwise inject
+     * system-level instructions into every seat and reroute the calls to an
+     * attacker-chosen provider. Only honoured from the active-profile config.
+     */
+    council?: CouncilToolConfig | undefined;
     /**
      * Agent-loop repetition detector tuning. The detector watches two signals:
      * consecutive effectively-identical iterations (same tool-name set + inputs
@@ -86,6 +101,90 @@ export interface LoopDetectionConfig {
      */
     callRepeatThreshold?: number | undefined;
 }
+/**
+ * Configuration for the agent-callable `council` tool.
+ *
+ * The Council orchestrator has always accepted custom persona and profile
+ * registries, but no host ever built one — the tool was pinned to the three
+ * built-in profiles with no way to add a lens, change the default panel, or
+ * tune concurrency. This is that surface.
+ */
+export interface CouncilToolConfig {
+    /**
+     * Profile the tool runs when a call names none. Must be a built-in id
+     * (`balanced`, `fast`, `risk-review`) or one defined in `profiles`.
+     * Default `balanced`.
+     */
+    defaultProfile?: string | undefined;
+    /** Seats polled concurrently, 1..8. Default 3. */
+    maxConcurrency?: number | undefined;
+    /**
+     * Extra decision lenses, registered alongside the six built-ins. Each needs
+     * a kebab-case `id`, a `name`, a `description` and the `instruction` that
+     * becomes the seat's system prompt.
+     */
+    personas?: CouncilPersonaDefinition[] | undefined;
+    /**
+     * Extra panel profiles, registered alongside the built-ins. A profile whose
+     * id matches a built-in replaces it.
+     */
+    profiles?: CouncilToolProfileDefinition[] | undefined;
+}
+/** A custom Council decision lens declared in configuration. */
+export interface CouncilPersonaDefinition {
+    /** Kebab-case identifier, e.g. "latency-hawk". */
+    id: string;
+    name: string;
+    description: string;
+    /** Trusted system-level instruction for this lens. */
+    instruction: string;
+    defaultWeight?: number | undefined;
+    defaultVeto?: boolean | undefined;
+    tags?: string[] | undefined;
+}
+/**
+ * A custom Council panel declared in configuration.
+ *
+ * Structurally the config-facing half of `CouncilProfileConfig`; kept as its
+ * own type so the config surface stays JSON-shaped (no readonly arrays) and
+ * documents itself where users read it.
+ */
+export interface CouncilToolProfileDefinition {
+    id: string;
+    name?: string | undefined;
+    description?: string | undefined;
+    seats: Array<{
+        id?: string | undefined;
+        label?: string | undefined;
+        /** Persona id — a built-in or one declared in `personas`. */
+        persona: string;
+        target?: {
+            providerId?: string | undefined;
+            model?: string | undefined;
+            /** Model-matrix role, resolved before the explicit target. */
+            role?: string | undefined;
+            fallbackProfile?: string | undefined;
+            fallbackModels?: string[] | undefined;
+        } | undefined;
+        weight?: number | undefined;
+        veto?: boolean | undefined;
+    }>;
+    /** `false` disables judging; omitted also means no judge. */
+    judge?: false | {
+        providerId?: string | undefined;
+        model?: string | undefined;
+        role?: string | undefined;
+        fallbackProfile?: string | undefined;
+        fallbackModels?: string[] | undefined;
+    } | undefined;
+    quorumFraction?: number | undefined;
+    approvalFraction?: number | undefined;
+    distinctness?: 'none' | 'model' | 'provider' | undefined;
+    voterMaxTokens?: number | undefined;
+    judgeMaxTokens?: number | undefined;
+    perCallTimeoutMs?: number | undefined;
+    overallTimeoutMs?: number | undefined;
+}
 /** Allow/deny extension of the `exec` tool's built-in command allowlist. */
 export interface ExecToolConfig {
     /**

package/dist/types/council.d.ts

@@ -28,6 +28,10 @@ export interface CouncilSeatConfig {
     label?: string | undefined;
     persona: string;
     target?: CouncilModelTarget | undefined;
+    /**
+     * Vote weight in the tally. Ignored for optionless questions — open
+     * stances are not tallied, so every valid stance counts once.
+     */
     weight?: number | undefined;
     veto?: boolean | undefined;
 }
@@ -37,6 +41,7 @@ export interface ResolvedCouncilSeat {
     label: string;
     persona: string;
     target?: CouncilModelTarget | undefined;
+    /** Vote weight in the tally. No-op for optionless questions (see above). */
     weight: number;
     veto: boolean;
 }
@@ -56,6 +61,11 @@ export interface CouncilProfileConfig {
     /** False disables judging. Omitted profiles also default to no judge. */
     judge?: CouncilModelTarget | false | undefined;
     quorumFraction?: number | undefined;
+    /**
+     * Winning option must exceed this fraction of cast vote weight. No-op for
+     * optionless questions — open stances are not tallied; divergence is
+     * escalated instead (see `resolveOpenQuestion`).
+     */
     approvalFraction?: number | undefined;
     distinctness?: CouncilDistinctness | undefined;
     voterMaxTokens?: number | undefined;
@@ -71,6 +81,7 @@ export interface ResolvedCouncilProfile {
     seats: readonly ResolvedCouncilSeat[];
     judge: CouncilModelTarget | false;
     quorumFraction: number;
+    /** No-op for optionless questions (see the config-level doc above). */
     approvalFraction: number;
     distinctness: CouncilDistinctness;
     voterMaxTokens: number;

package/dist/types/index.d.ts

@@ -14,7 +14,7 @@ export type { CacheTtl, Capabilities, JsonSchemaSpec, Provider, ProviderErrorBod
 export { StreamHangError } from './provider.js';
 export type { ProviderRunner, RunProviderOptions } from './provider-runner.js';
 export { DEFAULT_TUI_THINKING_WORD, FLEET_CHAT_VERBOSITY_VALUES, MAX_TUI_THINKING_WORD_LENGTH, normalizeTokenSavingTier, normalizeTuiThinkingWord, resolveFleetChatVerbosity, resolveTokenSavingTier } from './config.js';
-export type { AdaptiveConcurrencyConfig, AutonomyConfig, BrainConfig, BrainCouncilConfig, BrainCouncilVoterConfig, BrainModelEntry, CircuitBreakerRuntimeConfig, ConcreteTokenSavingTier, Config, ConfigLoader, ConfigStore, ContextConfig, CustomModelDefinition, ExecDangerConfig, ExecToolConfig, FeaturesConfig, FleetChatVerbosity, FleetConfig, FleetSupervisorConfig, GitBehaviorConfig, HqClientConfig, IndexingConfig, InputHistoryConfig, LaunchConfig, LaunchMenuChoice, LogConfig, LoopDetectionConfig, MCPHealthConfig, MCPHealthThresholds, MCPServerConfig, ModelMatrixEntry, ModelRuntimeCacheConfig, ModelRuntimeConfig, ModelRuntimeParametersConfig, ModelRuntimeReasoningConfig, PluginConfig, PluginManagerConfig, ProviderApiKey, ProviderConfig, SageConfig, SessionLoggingConfig, SkillsConfig, SyncCategory, SyncConfig, TokenSavingTier, ToolDescriptionMode, ToolDescriptionModeConfig, ToolResultRenderMode, ToolResultRenderModeConfig, ToolsConfig } from './config.js';
+export type { AdaptiveConcurrencyConfig, AutonomyConfig, BrainConfig, BrainCouncilConfig, BrainCouncilVoterConfig, BrainModelEntry, CircuitBreakerRuntimeConfig, ConcreteTokenSavingTier, Config, ConfigLoader, ConfigStore, ContextConfig, CouncilPersonaDefinition, CouncilToolConfig, CouncilToolProfileDefinition, CustomModelDefinition, ExecDangerConfig, ExecToolConfig, FeaturesConfig, FleetChatVerbosity, FleetConfig, FleetSupervisorConfig, GitBehaviorConfig, HqClientConfig, IndexingConfig, InputHistoryConfig, LaunchConfig, LaunchMenuChoice, LogConfig, LoopDetectionConfig, MCPHealthConfig, MCPHealthThresholds, MCPServerConfig, ModelMatrixEntry, ModelRuntimeCacheConfig, ModelRuntimeConfig, ModelRuntimeParametersConfig, ModelRuntimeReasoningConfig, PluginConfig, PluginManagerConfig, ProviderApiKey, ProviderConfig, SageConfig, SessionLoggingConfig, SkillsConfig, SyncCategory, SyncConfig, TokenSavingTier, ToolDescriptionMode, ToolDescriptionModeConfig, ToolResultRenderMode, ToolResultRenderModeConfig, ToolsConfig } from './config.js';
 export type { AnyHookOutcome, ConfiguredHook, HookEntry, HookEvent, HookFailurePolicy, HookInput, HookInvocationContext, HookMatcher, HookOutcome, HookRegistrationOptions, HttpHook, InProcessHook, PreToolUseOutcome, PreToolUseStage, ShellHook } from './hooks.js';
 export type { Compactor, CompactReport } from './compactor.js';
 export type { DirectoryPolicy, DirectoryRule, PermissionDecision, PermissionPolicy, PermissionTrace, PermissionTraceStep, TrustPolicy } from './permission.js';
@@ -40,7 +40,7 @@ export { flattenSystemPromptRegions } from './system-prompt.js';
 export type { BuildContext, ModelCapabilities, SystemPromptBuilder, SystemPromptRegions } from './system-prompt.js';
 export type { Renderer } from './renderer.js';
 export type { InputReader, PromptOption } from './input-reader.js';
-export type { MCPRegistryView, MetricsSinkView, Notifier, Plugin, PluginAPI, PluginCapabilities, PluginConfigFieldLifecycle, PluginConfigFieldMetadata, PluginConfigFields, PluginDependency, PluginLLM, PluginLLMOptions, PluginLLMResult, PluginPipelines, PluginRuntime, ProviderFactory, ProviderRegistryView, SessionWriterView, SlashCommandRegistryView, ToolRegistryView } from './plugin.js';
+export type { MCPRegistryView, MetricsSinkView, Notifier, Plugin, PluginAPI, PluginCapabilities, PluginConfigFieldLifecycle, PluginConfigFieldMetadata, PluginConfigFields, PluginCouncilOptions, PluginDependency, PluginLLM, PluginLLMOptions, PluginLLMResult, PluginPipelines, PluginRuntime, ProviderFactory, ProviderRegistryView, SessionWriterView, SlashCommandRegistryView, ToolRegistryView } from './plugin.js';
 export { AgentError, ConfigError, ERROR_CODES, FetchError, FsError, ParseError, PluginError, SddError, SessionError, ToolError, ToolValidationError, WrongStackError, isAgentError, isConfigError, isFetchError, isFsError, isParseError, isPluginError, isSddError, isSessionError, isToolError, isToolValidationError, isWrongStackError, toWrongStackError } from './errors.js';
 export type { ErrorCode, ErrorSeverity, ErrorSubsystem } from './errors.js';
 export type { ModelsDevModel, ModelsDevPayload, ModelsDevProvider, ModelsDevReasoningOption, ModelsRegistry, ResolvedModel, ResolvedProvider, WireFamily } from './models-registry.js';
@@ -50,6 +50,7 @@ export { CONTEXT_WINDOW_MODES, DEFAULT_CONTEXT_WINDOW_MODE_ID, DEPRECATED_CONTEX
 export type { ContextSnapshot, ContextWindowAggressiveOn, ContextWindowConfigLike, ContextWindowMode, ContextWindowModeId, ContextWindowModeSelectionId, ContextWindowPolicy, ContextWindowThresholds, DeprecatedContextWindowModeId } from './context-window.js';
 export type { CompletedWorkEvidence, CompletedWorkSource, ContextEvidenceState, ContextFileEvidence, ContextIntentEvidence, ContextRepeatedReadEvidence, ToolEvidenceStatus, ToolOutputMetadata } from './context-evidence.js';
 export type { CouncilDistinctness, CouncilLLMCaller, CouncilModelTarget, CouncilOption, CouncilPersona, CouncilProfileConfig, CouncilQuestion, CouncilResolutionMethod, CouncilResult, CouncilSeatConfig, CouncilUsage, CouncilVoteResult, CouncilVoteStatus, ResolvedCouncilProfile, ResolvedCouncilSeat } from './council.js';
+export type { OneShotLLMInput, OneShotLLMResult, OneShotModelPick, OneShotModelRouter, OneShotOrchestratorOptions } from './one-shot-llm.js';
 export type { AwaitAnyResult, CoordinatorEvents, CoordinatorStatus, DoneCondition, MultiAgentConfig, MultiAgentCoordinator, SpawnResult, SubagentConfig, SubagentContext, SubagentError, SubagentErrorKind, SubagentPartialResult, SubagentRunContext, SubagentRunOutcome, SubagentRunner, SubagentSpawnLineage, SubagentStructuredReport, TaskDelegation, TaskResult, TaskSpec } from './multi-agent.js';
 export { DEFAULT_SPEC_TEMPLATE } from './spec.js';
 export type { SpecAnalysis, SpecApiEndpoint, SpecRequirement, SpecSection, SpecSectionType, SpecStatus, SpecTemplate, SpecValidationResult, Specification } from './spec.js';

package/dist/types/index.js

@@ -324,7 +324,7 @@ var QUOTA_EXHAUSTED_RE = /(?:insufficient|exhausted|depleted|exceeded|no|not eno
 function effectiveInputTokens(usage) {
   return usage.input + (usage.cacheRead ?? 0) + (usage.cacheWrite ?? 0);
 }
-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) {
@@ -334,7 +334,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";
@@ -411,7 +411,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);

package/dist/types/multi-agent.d.ts

@@ -65,6 +65,16 @@ export interface SubagentConfig {
     allowedCapabilities?: readonly string[] | undefined;
     model?: string | undefined;
     priority?: number | undefined;
+    /**
+     * Exempt this spawn from the director's lifetime `maxSpawns` budget.
+     * Ephemeral infrastructure agents (Chimera reviewers, cascade agents) set
+     * this so background review traffic cannot exhaust the leader's
+     * deliberate-delegation budget: the `max_spawns` admission check is skipped
+     * and the lifetime spawn counter is NOT incremented. All other caps
+     * (spawn depth, fleet cost/tokens, leader context load) still apply.
+     * Deliberate leader spawns must leave this unset.
+     */
+    spawnBudgetExempt?: boolean | undefined;
     /**
      * Director-authored recursion/budget inheritance. Director.spawn overwrites
      * caller input so a model cannot forge a shallower depth or larger budget.

package/dist/types/one-shot-llm.d.ts

@@ -92,6 +92,15 @@ export interface OneShotLLMResult {
     durationMs: number;
     /** Whether the response came from a fallback model. */
     fromFallback: boolean;
+    /**
+     * Number of provider invocations behind this result (primary attempt +
+     * every fallback entry actually tried). Absent for callers without
+     * fallback machinery (Brain seats, test doubles) — consumers treat
+     * absence as one call. Producers report explicit 0 only for pre-call
+     * failures where no provider was invoked (e.g. unresolved target), so
+     * consumers should clamp to at least 1 when a seat ran at all.
+     */
+    attempts?: number | undefined;
     /** Provider-level stop reason, if available. */
     stopReason?: string | undefined;
     /**
@@ -100,6 +109,21 @@ export interface OneShotLLMResult {
      */
     error?: string | undefined;
 }
+/** One role→model resolution. Mirrors `ModelPick` from the ModelRouter. */
+export interface OneShotModelPick {
+    provider: string;
+    model: string;
+    /**
+     * True when the pick came from the user's `/setmodel` matrix (explicit
+     * intent) rather than from capability heuristics. Only a matrix pick may
+     * override a caller's explicit `providerId`/`model`.
+     */
+    fromMatrix?: boolean | undefined;
+}
+/** Minimal router contract consumed by role-based routing. */
+export interface OneShotModelRouter {
+    pickForTask(role: string, description: string): OneShotModelPick | undefined;
+}
 /**
  * Dependencies for OneShotOrchestrator.
  */
@@ -119,10 +143,14 @@ export interface OneShotOrchestratorOptions {
      */
     fallbackProfileManager: import('../core/fallback-profile-manager.js').FallbackProfileManager;
     /**
-     * Optional ModelRouter for role-based model selection.
-     * When absent, role-based routing is skipped.
+     * Optional role→model router. When absent, role-based routing is skipped
+     * and `role` on an input is inert.
+     *
+     * Structurally typed rather than pinned to the concrete `ModelRouter` class
+     * so a host can supply a router rebuilt from the LIVE config on every call
+     * (the `/setmodel` matrix changes mid-session). `ModelRouter` satisfies it.
      */
-    modelRouter?: import('../models/model-router.js').ModelRouter | undefined;
+    modelRouter?: OneShotModelRouter | undefined;
     /**
      * Optional logger for fallback warnings.
      */

package/dist/types/plugin.d.ts

@@ -103,6 +103,12 @@ export interface PluginLLMOptions {
     responseFormat?: 'text' | 'json' | undefined;
     /** Abort signal — plugins should pass one for cancellable work. */
     signal?: AbortSignal | undefined;
+    /** Model-matrix role hint used by the host One Shot router. */
+    role?: string | undefined;
+    /** Explicit fallback model references for this call. */
+    fallbackModels?: string[] | undefined;
+    /** Hard timeout in milliseconds. Defaults to the host One Shot timeout. */
+    timeoutMs?: number | undefined;
 }
 export interface PluginLLMResult {
     /** Concatenated text blocks of the response. */
@@ -116,6 +122,23 @@ export interface PluginLLMResult {
         output: number;
     };
     stopReason: string;
+    /** True when the host served the completion through a fallback target. */
+    fromFallback?: boolean | undefined;
+    /** Provider invocations made by the One Shot fallback ladder. */
+    attempts?: number | undefined;
+    /** End-to-end completion duration when reported by the host. */
+    durationMs?: number | undefined;
+}
+/** Options for a bounded, read-only plugin Council request. */
+export interface PluginCouncilOptions {
+    /** Evidence and constraints supplied separately from the question. */
+    context?: string | undefined;
+    /** Registered Council profile or an ad-hoc profile. */
+    profile?: string | import('./council.js').CouncilProfileConfig | undefined;
+    /** Optional closed set of choices. Omit for an open synthesis. */
+    options?: readonly import('./council.js').CouncilOption[] | undefined;
+    /** Abort signal propagated to every Council seat and judge. */
+    signal?: AbortSignal | undefined;
 }
 /**
  * LLM access for plugins, routed through the host's provider layer —
@@ -138,6 +161,11 @@ export interface PluginLLM {
     };
     /** One-shot completion. Throws on provider errors. */
     complete(prompt: string, opts?: PluginLLMOptions): Promise<PluginLLMResult>;
+    /**
+     * Multi-model Council deliberation. Present only when the host wires the
+     * Council runtime; plugins must retain a One Shot or deterministic fallback.
+     */
+    council?(question: string, opts?: PluginCouncilOptions): Promise<import('./council.js').CouncilResult>;
 }
 export interface PluginPipelines {
     request: ReadonlyPipeline<Request>;

package/dist/types/session.d.ts

@@ -1,6 +1,6 @@
 import type { ContentBlock } from './blocks.js';
 import type { Message } from './messages.js';
-import type { Usage } from './provider.js';
+import type { ProviderErrorBody, Usage } from './provider.js';
 export interface SessionMetadata {
     id: string;
     title?: string | undefined;
@@ -295,6 +295,8 @@ export type SessionEvent = {
     delayMs: number;
     status?: number | undefined;
     description: string;
+    /** Scrubbed raw provider error envelope/body for post-run diagnosis. */
+    errorBody?: ProviderErrorBody | undefined;
 } | {
     type: 'provider_error';
     ts: string;
@@ -302,6 +304,8 @@ export type SessionEvent = {
     status?: number | undefined;
     description: string;
     retryable: boolean;
+    /** Scrubbed raw provider error envelope/body for post-run diagnosis. */
+    errorBody?: ProviderErrorBody | undefined;
 } | {
     type: 'checkpoint';
     ts: string;

package/dist/utils/index.js

@@ -2478,7 +2478,9 @@ function safeProfileName(name) {
 function activeProfileName(globalRoot) {
   try {
     const parsed = JSON.parse(fs3.readFileSync(path3.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";
   }
@@ -2558,6 +2560,7 @@ function resolveWstackPaths(opts) {
     projectPlan: path3.join(projectDir, "plan.json"),
     projectAutophase: path3.join(projectDir, "autophase"),
     projectSddBoards: path3.join(projectDir, "sdd-boards"),
+    projectRequirementIntakes: path3.join(projectDir, "requirement-intakes"),
     syncConfig: path3.join(profileDir, "sync.json"),
     configHistoryDir: path3.join(globalRoot, "config-history"),
     projectStatus: (projectHash2) => path3.join(globalRoot, "projects", projectHash2, "status.json")

package/dist/utils/wstack-paths.d.ts

@@ -124,6 +124,8 @@ export interface WstackPaths {
     projectAutophase: string;
     /** ~/.wrongstack/projects/<hash>/sdd-boards — live SDD board snapshots + JSONL event logs */
     projectSddBoards: string;
+    /** ~/.wrongstack/projects/<hash>/requirement-intakes — requirement intake records */
+    projectRequirementIntakes: string;
     /** ~/.wrongstack/profiles/<activeProfile>/sync.json — CloudSync configuration */
     syncConfig: string;
     /** ~/.wrongstack/config-history — timestamped backups on every config write */

package/dist/worktree/index.js

@@ -1,5 +1,5 @@
 // src/worktree/worktree-manager.ts
-import { mkdir } from "node:fs/promises";
+import { mkdir, readFile } from "node:fs/promises";
 import { join, resolve as resolve3, sep as sep3 } from "node:path";
 
 // src/utils/error.ts
@@ -466,11 +466,11 @@ var WorktreeManager = class {
     }
     const mergeArgs = squash ? ["merge", "--squash", handle.branch] : ["merge", "--no-ff", handle.branch];
     const merged = await this.runGit(mergeArgs, this.projectRoot);
-    if (merged.code !== 0) {
-      const fromOutput = parseConflictPaths(`${merged.stdout}
+    const fromOutput = parseConflictPaths(`${merged.stdout}
 ${merged.stderr}`);
-      const fromIndex = await this.unmergedFiles();
-      const conflictFiles = [.../* @__PURE__ */ new Set([...fromOutput, ...fromIndex])];
+    const fromIndex = await this.unmergedFiles();
+    const conflictFiles = [.../* @__PURE__ */ new Set([...fromOutput, ...fromIndex])];
+    if (merged.code !== 0 || conflictFiles.length > 0) {
       if (opts.resolve) {
         const finalized = await this.tryResolveConflict(handle, conflictFiles, opts);
         if (finalized) return finalized;
@@ -523,6 +523,10 @@ ${merged.stderr}`);
    * Safe because SDD merges are serialized — no other commit lands in between.
    */
   async revertBaseTo(handle, sha) {
+    const status = await this.runGit(["status", "--porcelain"], this.projectRoot);
+    if (status.code !== 0) return false;
+    const hasTrackedDirt = status.stdout.split("\n").some((line) => line.trim().length > 0 && !line.startsWith("??"));
+    if (hasTrackedDirt) return false;
     const co = await this.runGit(["checkout", handle.baseBranch], this.projectRoot);
     if (co.code !== 0) return false;
     const reset = await this.runGit(["reset", "--hard", sha], this.projectRoot);
@@ -737,29 +741,47 @@ ${merged.stderr}`);
   /**
    * True when staged content still carries conflict markers.
    *
-   * Primary probe: `git grep --cached` scans the STAGED blobs directly for a
-   * full marker line (`<<<<<<< `, `=======`, `>>>>>>> `, `||||||| `) — exit 0
-   * means found. This is byte-level and independent of git version, locale,
-   * and human-output phrasing. When the caller knows which files conflicted,
-   * the scan is restricted to them so an unrelated `=======` underline in
-   * some document can't false-positive.
+   * Reads the working-tree files directly and matches a full marker line
+   * (`<<<<<<< `, `=======`, `>>>>>>> `, `||||||| `) with a lenient regex
+   * (`{7,}`) that stays platform- and config-independent — unlike the old
+   * `git diff --check` (only fires when `core.whitespace` opts in) and
+   * `git grep` (assumes the default 7-char markers).
+   *
+   * Scan set: when the caller supplies the conflicted paths (the normal
+   * path from {@link tryResolveConflict}), ONLY those files are scanned so
+   * an unrelated `=======` setext-heading underline in a staged document
+   * can't false-positive and discard valid resolution work. The staged-file
+   * listing (`git diff --cached --name-only`) is used only as a fallback
+   * when no paths are given.
    *
-   * Fallback probe: `git diff --cached --check` prints a "leftover conflict
-   * marker" line per survivor. Kept as belt-and-braces — it was the original
-   * sole probe, but CI runners were observed to miss markers through it
-   * (output parsing), which let a half-resolved merge commit.
+   * CRLF caveat: conflicted files checked out with CRLF (`core.autocrlf=true`,
+   * `.gitattributes eol=crlf`) carry bare markers as `=======\r\n`. Because
+   * `$` in multiline mode matches only before `\n`, carriage returns are
+   * stripped before matching so `\r` never defeats the end-of-line anchor.
    */
   async hasConflictMarkers(files) {
-    const pathspec = files && files.length > 0 ? ["--", ...files] : [];
-    const grep = await this.runGit(
-      ["grep", "--cached", "-q", "-E", "^(<{7} |={7}$|>{7} |\\|{7} )", ...pathspec],
-      this.projectRoot
-    );
-    if (grep.code === 0) return true;
-    const check = await this.runGit(["diff", "--cached", "--check"], this.projectRoot);
-    if (check.code === 0) return false;
-    return /conflict marker/i.test(`${check.stdout}
-${check.stderr}`);
+    const listed = files ?? [];
+    const paths = listed.length > 0 ? listed : (await this.runGit(["diff", "--cached", "--name-only", "-z"], this.projectRoot)).stdout.split("\0").filter(Boolean);
+    const marker = /^(?:<{7,}(?: |$)|={7,}$|>{7,}(?: |$)|\|{7,}(?: |$))/m;
+    const startMarker = /^(?:<{7,}(?: |$)|\|{7,}(?: |$))/m;
+    for (const rel of paths) {
+      try {
+        const content = (await readFile(join(this.projectRoot, rel), "utf8")).replace(/\r/g, "");
+        const lines = content.split("\n");
+        let seenStart = false;
+        for (const line of lines) {
+          if (!marker.test(line)) continue;
+          if (line.startsWith("=====")) {
+            if (!seenStart) continue;
+          } else if (startMarker.test(line)) {
+            seenStart = true;
+          }
+          return true;
+        }
+      } catch {
+      }
+    }
+    return false;
   }
   /**
    * Remove the worktree + branch. Conflicted/failed handles (or `keep:true`)

package/dist/worktree/worktree-manager.d.ts

@@ -153,17 +153,23 @@ export declare class WorktreeManager {
     /**
      * True when staged content still carries conflict markers.
      *
-     * Primary probe: `git grep --cached` scans the STAGED blobs directly for a
-     * full marker line (`<<<<<<< `, `=======`, `>>>>>>> `, `||||||| `) — exit 0
-     * means found. This is byte-level and independent of git version, locale,
-     * and human-output phrasing. When the caller knows which files conflicted,
-     * the scan is restricted to them so an unrelated `=======` underline in
-     * some document can't false-positive.
+     * Reads the working-tree files directly and matches a full marker line
+     * (`<<<<<<< `, `=======`, `>>>>>>> `, `||||||| `) with a lenient regex
+     * (`{7,}`) that stays platform- and config-independent — unlike the old
+     * `git diff --check` (only fires when `core.whitespace` opts in) and
+     * `git grep` (assumes the default 7-char markers).
      *
-     * Fallback probe: `git diff --cached --check` prints a "leftover conflict
-     * marker" line per survivor. Kept as belt-and-braces — it was the original
-     * sole probe, but CI runners were observed to miss markers through it
-     * (output parsing), which let a half-resolved merge commit.
+     * Scan set: when the caller supplies the conflicted paths (the normal
+     * path from {@link tryResolveConflict}), ONLY those files are scanned so
+     * an unrelated `=======` setext-heading underline in a staged document
+     * can't false-positive and discard valid resolution work. The staged-file
+     * listing (`git diff --cached --name-only`) is used only as a fallback
+     * when no paths are given.
+     *
+     * CRLF caveat: conflicted files checked out with CRLF (`core.autocrlf=true`,
+     * `.gitattributes eol=crlf`) carry bare markers as `=======\r\n`. Because
+     * `$` in multiline mode matches only before `\n`, carriage returns are
+     * stripped before matching so `\r` never defeats the end-of-line anchor.
      */
     private hasConflictMarkers;
     /**

package/instructions/coordination/subagent-baseline.md

@@ -40,6 +40,14 @@ deletion, history rewriting, force-push, or database destruction unless the
 task explicitly requires the action and identifies the exact target. Recheck
 the target before any destructive step.
 
+## Codebase discovery
+
+When the index is available, use it before broad `grep`/`glob` exploration:
+- `codebase-search` to locate symbols, definitions, and candidate modules.
+- `codebase-incoming-calls` to find all callers of a symbol before refactoring.
+- `codebase-outgoing-calls` to understand a symbol's dependencies.
+Read source files returned by search before relying on them.
+
 ## No further delegation
 
 You MUST NOT call `delegate`, `spawn_subagent`, `assign_task`, or any equivalent.