@wrongstack/core 0.31.1 → 0.41.0

package/dist/execution/index.d.ts

@@ -1,15 +1,15 @@
-export { C as CompactorOptions, a as DefaultErrorHandler, b as DefaultRetryPolicy, H as HybridCompactor, T as ToolExecutor } from '../tool-executor-BAi4WI2d.js';
+export { C as CompactorOptions, a as DefaultErrorHandler, b as DefaultRetryPolicy, H as HybridCompactor, T as ToolExecutor } from '../tool-executor-BpK-SWtJ.js';
 import { m as Provider, d as Context } from '../context-7u93AcGD.js';
 import { a as Compactor, C as CompactReport } from '../compactor-D1RHFRmF.js';
 import { M as MessageSelector } from '../selector-DmXxpFyM.js';
 import { E as EventBus } from '../events-BrQiweXN.js';
 import { b as MiddlewareHandler } from '../system-prompt-CM6zOhd2.js';
 import { a as SessionEventBridge, J as JournalEntry } from '../goal-store-BeRsj7YX.js';
-import { e as ContextWindowAggressiveOn, i as ContextWindowPolicy } from '../config-BUEGM4JP.js';
-import { c as Agent, R as RunResult, w as SystemPromptContributor } from '../index-ysfO_DlX.js';
+import { e as ContextWindowAggressiveOn, i as ContextWindowPolicy } from '../config-ZRCf7sTu.js';
+import { c as Agent, R as RunResult, w as SystemPromptContributor } from '../index-6_csX32J.js';
 import { D as DoneCondition } from '../multi-agent-C8Z1i__e.js';
-import { A as AgentFactory } from '../agent-subagent-runner-DpZTLdBe.js';
-import { f as DispatchClassifier, d as DefaultMultiAgentCoordinator } from '../multi-agent-coordinator-DOXSgtom.js';
+import { A as AgentFactory } from '../agent-subagent-runner-C66vi4Gq.js';
+import { f as DispatchClassifier, d as DefaultMultiAgentCoordinator } from '../multi-agent-coordinator-BUsjiRWl.js';
 import { a as SkillLoader, b as SkillManifest, S as SkillEntry } from '../skill-CxuWrsKK.js';
 import { a as WstackPaths } from '../wstack-paths-eMXnY1_X.js';
 import '../retry-policy-KF18W4dg.js';

package/dist/extension/index.d.ts

@@ -1,4 +1,4 @@
-export { A as AfterIterationHook, a as AfterRunHook, b as AfterToolExecutionHook, d as AgentExtension, B as BeforeIterationHook, h as BeforeRunHook, i as BeforeToolExecutionHook, E as ExtensionRegistry, O as OnErrorHook, s as ProviderRunnerFn, t as ProviderRunnerWrapper } from '../index-ysfO_DlX.js';
+export { A as AfterIterationHook, a as AfterRunHook, b as AfterToolExecutionHook, d as AgentExtension, B as BeforeIterationHook, h as BeforeRunHook, i as BeforeToolExecutionHook, E as ExtensionRegistry, O as OnErrorHook, s as ProviderRunnerFn, t as ProviderRunnerWrapper } from '../index-6_csX32J.js';
 import '../context-7u93AcGD.js';
 import '../logger-DDd5C--Z.js';
 import '../system-prompt-CM6zOhd2.js';
@@ -6,5 +6,5 @@ import '../observability-BhnVLBLS.js';
 import '../events-BrQiweXN.js';
 import '../secret-scrubber-3MHDDAtm.js';
 import '../permission-B6sldrSp.js';
-import '../config-BUEGM4JP.js';
+import '../config-ZRCf7sTu.js';
 import '../models-registry-BcYJDKLm.js';

package/dist/{index-ysfO_DlX.d.ts → index-6_csX32J.d.ts}

@@ -5,7 +5,7 @@ import { T as Tracer } from './observability-BhnVLBLS.js';
 import { E as EventBus, c as EventName, L as Listener } from './events-BrQiweXN.js';
 import { S as SecretScrubber } from './secret-scrubber-3MHDDAtm.js';
 import { a as PermissionPolicy } from './permission-B6sldrSp.js';
-import { l as ProviderConfig, a as Config } from './config-BUEGM4JP.js';
+import { m as ProviderConfig, a as Config } from './config-ZRCf7sTu.js';
 import { W as WireFamily } from './models-registry-BcYJDKLm.js';
 
 /**

package/dist/{index-pXJdVLe0.d.ts → index-DkVgH3wC.d.ts}

@@ -1,7 +1,7 @@
 import { T as Token, e as Renderer, S as SystemPromptBuilder } from './system-prompt-CM6zOhd2.js';
 import { E as EventBus } from './events-BrQiweXN.js';
 import { a as Compactor } from './compactor-D1RHFRmF.js';
-import { b as ConfigLoader, c as ConfigStore } from './config-BUEGM4JP.js';
+import { b as ConfigLoader, c as ConfigStore } from './config-ZRCf7sTu.js';
 import { E as ErrorHandler, a as RetryPolicy } from './retry-policy-KF18W4dg.js';
 import { I as InputReader } from './input-reader-E-ffP2ee.js';
 import { a as Logger } from './logger-DDd5C--Z.js';
@@ -58,12 +58,27 @@ interface AllocateOpts {
 interface MergeOpts {
     squash?: boolean;
     message?: string;
+    /**
+     * Optional conflict resolver. Invoked when the squash-merge conflicts, with
+     * the conflicted paths and the base working tree (`cwd`). It must resolve the
+     * conflict markers in place and return `true` when done. If it returns `true`
+     * and no conflict markers remain, the merge is committed and `merge()` returns
+     * `{ ok: true, resolved: true }`. Otherwise the merge is aborted (hard reset)
+     * and the handle is parked `needs-review` — exactly as if no resolver were
+     * provided, so the base tree is never left dirty.
+     */
+    resolve?: (info: {
+        conflictFiles: string[];
+        cwd: string;
+    }) => Promise<boolean>;
 }
 interface MergeResult {
     ok: boolean;
     conflict?: boolean;
     conflictFiles?: string[];
     stderr?: string;
+    /** True when an initial conflict was successfully resolved by `opts.resolve`. */
+    resolved?: boolean;
 }
 interface RunResult {
     code: number;
@@ -103,6 +118,21 @@ declare class WorktreeManager {
     }>;
     /** Merge the worktree branch back into the base branch (squash by default). */
     merge(handle: WorktreeHandle, opts?: MergeOpts): Promise<MergeResult>;
+    /**
+     * Run the caller-supplied resolver against a conflicted squash-merge, then
+     * commit if it cleared every marker. Returns a successful `MergeResult` on a
+     * clean resolution, or `null` to signal the caller should fall back to the
+     * abort path. Never leaves the base tree committed-but-dirty: a partial or
+     * failed resolution returns `null` and the caller hard-resets.
+     */
+    private tryResolveConflict;
+    /**
+     * True when staged content still carries conflict markers. `git diff --cached
+     * --check` exits nonzero and prints a "leftover conflict marker" line for each
+     * survivor; whitespace-only errors (also flagged by --check) are ignored so a
+     * clean resolution with unrelated whitespace is not rejected.
+     */
+    private hasConflictMarkers;
     /**
      * Remove the worktree + branch. Conflicted/failed handles (or `keep:true`)
      * are left on disk for inspection.

package/dist/index.d.ts

@@ -2,13 +2,13 @@ import { S as SystemPromptBuilder, c as ModelCapabilities, a as BuildContext, C
 export { B as BindOptions, D as Decorator, F as Factory, M as Middleware, b as MiddlewareHandler, N as NextFn, P as Pipeline, d as PipelineOptions, e as Renderer, T as Token } from './system-prompt-CM6zOhd2.js';
 import { E as EventBus, c as EventName, L as Listener } from './events-BrQiweXN.js';
 export { a as EventLogger, b as EventMap, S as ScopedEventBus } from './events-BrQiweXN.js';
-import { d as WorktreeManager } from './index-pXJdVLe0.js';
-export { A as AllocateOpts, M as MergeOpts, a as MergeResult, R as RunController, b as RunControllerOptions, T as TOKENS, W as WorktreeHandle, e as WorktreeManagerOptions, c as WorktreeRunResult, f as WorktreeStatus, g as assertSafePath } from './index-pXJdVLe0.js';
+import { d as WorktreeManager } from './index-DkVgH3wC.js';
+export { A as AllocateOpts, M as MergeOpts, a as MergeResult, R as RunController, b as RunControllerOptions, T as TOKENS, W as WorktreeHandle, e as WorktreeManagerOptions, c as WorktreeRunResult, f as WorktreeStatus, g as assertSafePath } from './index-DkVgH3wC.js';
 import { d as Context, m as Provider, Q as Tool, p as Request, q as Response, c as ContentBlock, T as TextBlock } from './context-7u93AcGD.js';
 export { A as AgentError, a as Capabilities, b as ConfigError, e as ContextInit, f as ConversationState, E as ERROR_CODES, g as ErrorCode, h as ErrorSeverity, i as ErrorSubsystem, F as FileSnapshot, j as FsError, I as ImageBlock, J as JSONSchema, M as Message, k as MessageRole, P as Permission, l as PluginError, n as ProviderError, o as ProviderErrorBody, R as ReadonlyConversationState, r as ResumedSession, s as RiskTier, t as RunEnv, u as RunOptions, S as SessionData, v as SessionError, w as SessionEvent, x as SessionMetadata, y as SessionStore, z as SessionSummary, B as SessionWriter, D as StateChange, G as StateChangeHandler, H as StopReason, K as StreamEvent, L as ThinkingBlock, N as TodoItem, O as TokenCounter, U as ToolCallContext, V as ToolError, W as ToolFinalEvent, X as ToolProgressEvent, Y as ToolResultBlock, Z as ToolStreamEvent, _ as ToolUseBlock, $ as Usage, a0 as WrongStackError, a1 as asBlocks, a2 as asText, a3 as extractRunEnv, a4 as isAgentError, a5 as isConfigError, a6 as isFsError, a7 as isImageBlock, a8 as isPluginError, a9 as isSessionError, aa as isTextBlock, ab as isThinkingBlock, ac as isToolError, ad as isToolResultBlock, ae as isToolUseBlock, af as isWrongStackError, ag as toWrongStackError, ah as wrapAsState } from './context-7u93AcGD.js';
 import { P as ProviderRunner, R as RunProviderOptions$1 } from './provider-runner-Dlv8Fvw9.js';
-import { M as MCPServerConfig, a as Config, c as ConfigStore } from './config-BUEGM4JP.js';
-export { A as AutonomyConfig, C as CONTEXT_WINDOW_MODES, b as ConfigLoader, d as ContextConfig, e as ContextWindowAggressiveOn, f as ContextWindowConfigLike, g as ContextWindowMode, h as ContextWindowModeId, i as ContextWindowPolicy, j as ContextWindowThresholds, D as DEFAULT_CONTEXT_WINDOW_MODE_ID, F as FeaturesConfig, L as LogConfig, P as PluginConfig, k as ProviderApiKey, l as ProviderConfig, S as SessionLoggingConfig, m as SyncCategory, n as SyncConfig, T as ToolsConfig, o as formatContextWindowModeList, p as getContextWindowMode, q as isContextWindowModeId, r as listContextWindowModes, s as resolveContextWindowPolicy } from './config-BUEGM4JP.js';
+import { M as MCPServerConfig, a as Config, k as ModelMatrixEntry, c as ConfigStore } from './config-ZRCf7sTu.js';
+export { A as AutonomyConfig, C as CONTEXT_WINDOW_MODES, b as ConfigLoader, d as ContextConfig, e as ContextWindowAggressiveOn, f as ContextWindowConfigLike, g as ContextWindowMode, h as ContextWindowModeId, i as ContextWindowPolicy, j as ContextWindowThresholds, D as DEFAULT_CONTEXT_WINDOW_MODE_ID, F as FeaturesConfig, L as LogConfig, P as PluginConfig, l as ProviderApiKey, m as ProviderConfig, S as SessionLoggingConfig, n as SyncCategory, o as SyncConfig, T as ToolsConfig, p as formatContextWindowModeList, q as getContextWindowMode, r as isContextWindowModeId, s as listContextWindowModes, t as resolveContextWindowPolicy } from './config-ZRCf7sTu.js';
 export { C as CompactReport, a as Compactor } from './compactor-D1RHFRmF.js';
 export { P as PermissionDecision, a as PermissionPolicy, T as TrustPolicy } from './permission-B6sldrSp.js';
 export { C as CheckpointInfo, R as RewindResult, a as RewindResultExtended, S as SessionRewinder } from './session-rewinder-C9HnMkhP.js';
@@ -20,12 +20,12 @@ export { D as DefaultLogger, a as DefaultLoggerOptions } from './logger-bOzkF5LL
 export { D as DefaultPathResolver, a as DefaultTokenCounter } from './path-resolver-DumKAi0n.js';
 import { b as MemoryStore } from './memory-CEXuo7sz.js';
 export { M as MemoryEntry, a as MemoryScope } from './memory-CEXuo7sz.js';
-export { C as CompactorOptions, D as DEFAULT_RECOVERY_STRATEGIES, a as DefaultErrorHandler, b as DefaultRetryPolicy, H as HybridCompactor, R as RecoveryStrategy, T as ToolExecutor, c as buildRecoveryStrategies } from './tool-executor-BAi4WI2d.js';
+export { C as CompactorOptions, D as DEFAULT_RECOVERY_STRATEGIES, a as DefaultErrorHandler, b as DefaultRetryPolicy, H as HybridCompactor, R as RecoveryStrategy, T as ToolExecutor, c as buildRecoveryStrategies } from './tool-executor-BpK-SWtJ.js';
 import { a as SkillLoader } from './skill-CxuWrsKK.js';
 export { S as SkillEntry, b as SkillManifest } from './skill-CxuWrsKK.js';
 export { I as InputReader, P as PromptOption } from './input-reader-E-ffP2ee.js';
-import { u as SlashCommand, w as SystemPromptContributor, k as PluginAPI, n as PluginPipelines, F as ToolRegistryView, r as ProviderRegistryView, M as MCPRegistryView, v as SlashCommandRegistryView, E as ExtensionRegistry, S as SessionWriterView, j as MetricsSinkView, C as ToolRegistry, q as ProviderRegistry, P as Plugin, x as ToolCallPipelinePayload } from './index-ysfO_DlX.js';
-export { A as AfterIterationHook, a as AfterRunHook, b as AfterToolExecutionHook, c as Agent, d as AgentExtension, e as AgentInit, f as AgentInput, g as AgentPipelines, B as BeforeIterationHook, h as BeforeRunHook, i as BeforeToolExecutionHook, D as DEFAULT_MAX_ITERATIONS, O as OnErrorHook, l as PluginCapabilities, m as PluginDependency, p as ProviderFactory, t as ProviderRunnerWrapper, R as RunResult, G as ToolWrapper, U as UserInputPayload, H as createDefaultPipelines } from './index-ysfO_DlX.js';
+import { u as SlashCommand, w as SystemPromptContributor, k as PluginAPI, n as PluginPipelines, F as ToolRegistryView, r as ProviderRegistryView, M as MCPRegistryView, v as SlashCommandRegistryView, E as ExtensionRegistry, S as SessionWriterView, j as MetricsSinkView, C as ToolRegistry, q as ProviderRegistry, P as Plugin, x as ToolCallPipelinePayload } from './index-6_csX32J.js';
+export { A as AfterIterationHook, a as AfterRunHook, b as AfterToolExecutionHook, c as Agent, d as AgentExtension, e as AgentInit, f as AgentInput, g as AgentPipelines, B as BeforeIterationHook, h as BeforeRunHook, i as BeforeToolExecutionHook, D as DEFAULT_MAX_ITERATIONS, O as OnErrorHook, l as PluginCapabilities, m as PluginDependency, p as ProviderFactory, t as ProviderRunnerWrapper, R as RunResult, G as ToolWrapper, U as UserInputPayload, H as createDefaultPipelines } from './index-6_csX32J.js';
 export { D as DefaultModelsRegistry, a as DefaultModelsRegistryOptions, c as classifyFamily } from './models-registry-gwMAo6E3.js';
 import { c as ModeStore } from './mode-CV077NjV.js';
 export { D as DEFAULT_MODES, M as Mode, a as ModeConfig, b as ModeManifest } from './mode-CV077NjV.js';
@@ -35,23 +35,23 @@ import { l as TaskGraph, r as TaskType, n as TaskPriority, m as TaskNode } from
 export { C as CriticalPathResult, D as DEFAULT_SPEC_TEMPLATE, S as SpecAnalysis, a as SpecApiEndpoint, b as SpecRequirement, c as SpecSection, d as SpecSectionType, e as SpecStatus, f as SpecTemplate, g as SpecValidationResult, h as Specification, T as TaskAssignment, i as TaskDependency, j as TaskEdge, k as TaskFilter, o as TaskProgress, p as TaskSort, q as TaskStatus, s as computeTaskProgress, t as findCriticalPath, u as topologicalSort } from './task-graph-D1YQbpxF.js';
 import { T as Tracer, e as MetricsSink, b as HealthRegistry } from './observability-BhnVLBLS.js';
 export { A as AggregateHealth, H as HealthCheck, a as HealthCheckResult, c as HealthStatus, M as MetricLabels, d as MetricSeries, f as MetricsSnapshot, S as Span } from './observability-BhnVLBLS.js';
-export { AtomicWriteOptions, BuildChildEnvOptions, CompileFail, CompileResult, MessageRepairReport, MessageRepairResult, NewlineStyle, RequestTokenBreakdown, SafeParseResult, ToolOutputSerializerOptions, UnifiedDiffOptions, ValidationError, ValidationResult, atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, completePartialObject, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, expandGlob, formatTodosList, getCalibrationState, matchAny, matchGlob, mergeModelsPayload, normalizeToLf, recordActualUsage, repairToolUseAdjacency, resetCalibration, safeParse, safeStringify, sanitizeJsonString, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema } from './utils/index.js';
+export { AtomicWriteOptions, BuildChildEnvOptions, CompileFail, CompileResult, MessageRepairReport, MessageRepairResult, NewlineStyle, RequestTokenBreakdown, SafeParseResult, ToolOutputSerializerOptions, UnifiedDiffOptions, ValidationError, ValidationResult, atomicWrite, buildChildEnv, color, compileGlob, compileUserRegex, completePartialObject, createToolOutputSerializer, detectNewlineStyle, ensureDir, estimateRequestTokens, estimateRequestTokensCalibrated, estimateTextTokens, estimateToolDefTokens, estimateToolInputTokens, estimateToolResultTokens, expandGlob, formatTodosList, getCalibrationState, getTermSize, isInteractive, isStdinTTY, isStdoutTTY, matchAny, matchGlob, mergeModelsPayload, normalizeToLf, onResize, recordActualUsage, repairToolUseAdjacency, resetCalibration, safeParse, safeStringify, sanitizeJsonString, setRawMode, stripAnsi, toStyle, unifiedDiff, validateAgainstSchema, writeErr, writeOut } from './utils/index.js';
 import { a as WstackPaths } from './wstack-paths-eMXnY1_X.js';
 export { W as WstackPathOptions, p as projectHash, r as resolveWstackPaths } from './wstack-paths-eMXnY1_X.js';
-export { A as AbandonedSession, a as AttachmentStoreOptions, C as ConfigLoaderOptions, b as ConfigMigration, c as ConfigMigrationError, d as ConfigSource, D as DEFAULT_CONFIG_MIGRATIONS, e as DefaultAttachmentStore, f as DefaultConfigLoader, g as DefaultConfigStore, h as DefaultMemoryStore, i as DefaultSessionStore, M as MemoryStoreOptions, j as MigrationContext, k as MigrationResult, P as PersistedQueueItem, l as PlanFile, m as PlanItem, n as PlanTemplate, Q as QueueStore, R as RecoveryLock, o as RecoveryLockOptions, S as SessionAnalyzer, p as SessionStoreOptions, T as TodosCheckpointFile, q as addPlanItem, r as attachPlanCheckpoint, s as attachTodosCheckpoint, t as clearPlan, u as deriveTodosFromPlanItem, v as emptyPlan, w as formatPlan, x as formatPlanTemplates, y as getPlanTemplate, z as listPlanTemplates, B as loadPlan, E as loadTodosCheckpoint, F as removePlanItem, G as runConfigMigrations, H as savePlan, I as saveTodosCheckpoint, J as setPlanItemStatus } from './plan-templates-BZMi-VpU.js';
+export { A as AbandonedSession, a as AttachmentStoreOptions, C as ConfigLoaderOptions, b as ConfigMigration, c as ConfigMigrationError, d as ConfigSource, D as DEFAULT_CONFIG_MIGRATIONS, e as DefaultAttachmentStore, f as DefaultConfigLoader, g as DefaultConfigStore, h as DefaultMemoryStore, i as DefaultSessionStore, M as MemoryStoreOptions, j as MigrationContext, k as MigrationResult, P as PersistedQueueItem, l as PlanFile, m as PlanItem, n as PlanTemplate, Q as QueueStore, R as RecoveryLock, o as RecoveryLockOptions, S as SessionAnalyzer, p as SessionStoreOptions, T as TodosCheckpointFile, q as addPlanItem, r as attachPlanCheckpoint, s as attachTodosCheckpoint, t as clearPlan, u as deriveTodosFromPlanItem, v as emptyPlan, w as formatPlan, x as formatPlanTemplates, y as getPlanTemplate, z as listPlanTemplates, B as loadPlan, E as loadTodosCheckpoint, F as removePlanItem, G as runConfigMigrations, H as savePlan, I as saveTodosCheckpoint, J as setPlanItemStatus } from './plan-templates-DYCeRCDN.js';
 export { A as AuditLevel, C as CORE_RECONSTRUCT_EVENTS, G as GoalFile, J as JournalEntry, M as MAX_JOURNAL_ENTRIES, S as STANDARD_AUDIT_EVENTS, a as SessionEventBridge, b as SessionEventBridgeOptions, c as SessionSamplingOptions, T as ToolProgressSamplingOptions, d as appendJournal, e as createSessionEventBridge, f as emptyGoal, g as formatGoal, h as goalFilePath, l as loadGoal, r as resolveAuditLevel, i as resolveSessionLoggingConfig, s as saveGoal, j as summarizeUsage } from './goal-store-BeRsj7YX.js';
 export { D as DirectorStateCheckpoint, a as DirectorStateSnapshot, b as DirectorSubagentState, c as DirectorTaskState, l as loadDirectorState } from './director-state-BmYi3DGA.js';
 export { A as AutoApprovePermissionPolicy, D as DefaultPermissionPolicy, P as PermissionPolicyOptions } from './permission-policy-CtNscWOA.js';
 export { AutoCompactionMiddleware, AutonomousRunner, AutonomousRunnerOptions, AutonomyPromptContributorOptions, DefaultSkillLoader, DoneCheckResult, DoneConditionChecker, EternalAutonomyEngine, EternalAutonomyOptions, EternalEngineState, IntelligentCompactor, IntelligentCompactorOptions, ParallelEngineState, ParallelEternalEngine, ParallelEternalOptions, SelectiveCompactor, SelectiveCompactorOptions, SkillLoaderOptions, buildGoalPreamble, makeAutonomyPromptContributor } from './execution/index.js';
 export { DefaultProviderRunner } from './defaults/index.js';
-export { A as ACP_AGENTS, a as AGENTS_BY_PHASE, b as AGENT_CATALOG, c as ALL_AGENT_DEFINITIONS, d as ALL_FLEET_AGENTS, e as AUDIT_LOG_AGENT, f as AutoExtendCeiling, g as AutoExtendPolicy, B as BUG_HUNTER_AGENT, n as CreateDelegateToolOptions, D as DEFAULT_DIRECTOR_PREAMBLE, q as DEFAULT_SUBAGENT_BASELINE, r as DelegateHost, s as Director, w as DirectorPromptParts, x as DirectorSessionFactory, y as DirectorSessionFactoryOptions, F as FLEET_ROSTER, z as FLEET_ROSTER_BUDGETS, E as FLEET_ROSTER_WITHACP, G as FleetCostCapError, H as FleetManager, I as FleetManagerOptions, J as FleetRosterBudget, K as FleetSpawnBudgetError, L as ICoordinator, M as IFleetManager, O as NULL_FLEET_BUS, R as REFACTOR_PLANNER_AGENT, S as SECURITY_SCANNER_AGENT, V as SubagentPromptParts, W as applyRosterBudget, X as attachAutoExtend, Y as composeDirectorPrompt, Z as composeSubagentPrompt, _ as createDelegateTool, $ as getAgentDefinition, a1 as makeAskTool, a2 as makeAssignTool, a3 as makeAwaitTasksTool, a4 as makeCollabDebugTool, a5 as makeDirectorSessionFactory, a6 as makeFleetEmitTool, a7 as makeFleetHealthTool, a8 as makeFleetSessionTool, a9 as makeFleetStatusTool, aa as makeFleetUsageTool, ab as makeRollUpTool, ac as makeSpawnTool, ad as makeTerminateTool, af as rosterSummaryFromConfigs } from './null-fleet-bus-CAQDGsKc.js';
-export { A as AgentBudgetTier, a as AgentCapability, b as AgentDefinition, c as AgentPhase, D as DEFAULT_DISPATCH_ROLE, d as DefaultMultiAgentCoordinator, e as DispatchCandidate, f as DispatchClassifier, g as DispatchMethod, h as DispatchOptions, i as DispatchResult, j as MultiAgentCoordinatorOptions, k as dispatchAgent, m as makeLLMClassifier, s as scoreAgents } from './multi-agent-coordinator-DOXSgtom.js';
-export { A as AgentFactory, a as AgentFactoryResult, b as AgentRunnerOptions, F as FleetBus, c as FleetEvent, d as FleetHandler, e as FleetUsage, f as FleetUsageAggregator, S as SubagentUsageSnapshot, m as makeAgentSubagentRunner } from './agent-subagent-runner-DpZTLdBe.js';
+export { A as ACP_AGENTS, a as AGENTS_BY_PHASE, b as AGENT_CATALOG, c as ALL_AGENT_DEFINITIONS, d as ALL_FLEET_AGENTS, e as AUDIT_LOG_AGENT, f as AutoExtendCeiling, g as AutoExtendPolicy, B as BUG_HUNTER_AGENT, n as CreateDelegateToolOptions, D as DEFAULT_DIRECTOR_PREAMBLE, q as DEFAULT_SUBAGENT_BASELINE, r as DelegateHost, s as Director, w as DirectorPromptParts, x as DirectorSessionFactory, y as DirectorSessionFactoryOptions, F as FLEET_ROSTER, z as FLEET_ROSTER_BUDGETS, E as FLEET_ROSTER_WITHACP, G as FleetCostCapError, H as FleetManager, I as FleetManagerOptions, J as FleetRosterBudget, K as FleetSpawnBudgetError, L as ICoordinator, M as IFleetManager, O as NULL_FLEET_BUS, R as REFACTOR_PLANNER_AGENT, S as SECURITY_SCANNER_AGENT, V as SubagentPromptParts, W as applyRosterBudget, X as attachAutoExtend, Y as composeDirectorPrompt, Z as composeSubagentPrompt, _ as createDelegateTool, $ as getAgentDefinition, a1 as makeAskTool, a2 as makeAssignTool, a3 as makeAwaitTasksTool, a4 as makeCollabDebugTool, a5 as makeDirectorSessionFactory, a6 as makeFleetEmitTool, a7 as makeFleetHealthTool, a8 as makeFleetSessionTool, a9 as makeFleetStatusTool, aa as makeFleetUsageTool, ab as makeRollUpTool, ac as makeSpawnTool, ad as makeTerminateTool, af as rosterSummaryFromConfigs } from './null-fleet-bus-FvgHnZah.js';
+export { A as AgentBudgetTier, a as AgentCapability, b as AgentDefinition, c as AgentPhase, D as DEFAULT_DISPATCH_ROLE, d as DefaultMultiAgentCoordinator, e as DispatchCandidate, f as DispatchClassifier, g as DispatchMethod, h as DispatchOptions, i as DispatchResult, j as MultiAgentCoordinatorOptions, k as dispatchAgent, m as makeLLMClassifier, s as scoreAgents } from './multi-agent-coordinator-BUsjiRWl.js';
+export { A as AgentFactory, a as AgentFactoryResult, b as AgentRunnerOptions, F as FleetBus, c as FleetEvent, d as FleetHandler, e as FleetUsage, f as FleetUsageAggregator, S as SubagentUsageSnapshot, m as makeAgentSubagentRunner } from './agent-subagent-runner-C66vi4Gq.js';
 export { DefaultModeStore, LLMSelector, LLMSelectorOptions, ModeLoaderOptions, loadProjectModes, loadUserModes } from './models/index.js';
 import { TaskStore } from './sdd/index.js';
 export { AISpecBuilder, AISpecBuilderOptions, AISpecPhase, AISpecSession, AutoExecutor, AutoExecutorOptions, BottleneckTask, CollectedAnswer, CriticalPathAnalysis, DefaultTaskStore, ExecutionSummary, GeneratedTask, SPEC_TEMPLATES, SddParallelRun, SddParallelRunOptions, SddProgress, SddTaskDecomposer, SddTaskDecomposerOptions, SpecDiff, SpecDrivenDev, SpecDrivenDevOptions, SpecIndexEntry, SpecParser, SpecStore, SpecStoreOptions, SpecVersion, SpecVersioning, TaskBatch, TaskExecutionContext, TaskExecutionResult, TaskFlow, TaskFlowEventMap, TaskFlowEventName, TaskFlowExecutionContext, TaskFlowOptions, TaskFlowPhase, TaskGenerator, TaskGeneratorOptions, TaskGraphIndexEntry, TaskGraphStore, TaskGraphStoreOptions, TaskTracker, TaskTrackerOptions, TaskTransition, WaveResult, analyzeCriticalPath, createAutoExecutor, getTemplate, listTemplates, renderProgress, renderSpecAnalysis, renderTaskGraph, renderTaskList, templateToMarkdown } from './sdd/index.js';
 export { DefaultHealthRegistry, InMemoryMetricsSink, MetricsServerHandle, MetricsServerOptions, NoopMetricsSink, NoopTracer, OTelTracer, OtlpMetricsExporterHandle, OtlpMetricsExporterOptions, OtlpTraceExporterHandle, OtlpTraceExporterOptions, PROMETHEUS_CONTENT_TYPE, buildOtlpMetricsRequest, buildOtlpTracesRequest, renderPrometheus, startMetricsServer, startOtlpMetricsExporter, startOtlpTraceExporter, wireMetricsToEvents } from './observability/index.js';
-export { C as ContextManagerAction, a as ContextManagerInput, b as ContextManagerResult, c as ContextManagerToolOptions, d as allServers, e as awsServer, f as blockServer, g as braveSearchServer, h as context7Server, i as contextManagerTool, j as createContextManagerTool, k as everArtServer, l as filesystemServer, m as githubServer, n as googleMapsServer, o as miniMaxVisionServer, s as sentinelServer, p as slackServer, z as zaiVisionServer } from './mcp-servers-BzB3r7_c.js';
+export { C as ContextManagerAction, a as ContextManagerInput, b as ContextManagerResult, c as ContextManagerToolOptions, d as allServers, e as awsServer, f as blockServer, g as braveSearchServer, h as context7Server, i as contextManagerTool, j as createContextManagerTool, k as everArtServer, l as filesystemServer, m as githubServer, n as googleMapsServer, o as miniMaxVisionServer, s as sentinelServer, p as slackServer, z as zaiVisionServer } from './mcp-servers-DONdo-XM.js';
 export { DownloadResult, InstallResult, InstalledSkillEntry, ManifestData, ParsedRef, SkillInstaller, SkillInstallerOptions, SkillManifestStore, UpdateResult, downloadGitHubTarball, parseSkillRef } from './skills/index.js';
 import { ReplayLogStore, DefaultPromptStore } from './storage/index.js';
 export { ALL_SYNC_CATEGORIES, Annotation, AnnotationsStore, AnnotationsStoreOptions, AuditEntry, CloudSync, DefaultSessionRewinder, PromptEntry, PromptStore, RecoveryPlan, ReplayEntry, ReplayLogStoreOptions, SessionRecovery, SessionRewinderOptions, StaleSession, SyncResult, ToolAuditLog, ToolAuditLogOptions, VerifyResult } from './storage/index.js';
@@ -991,6 +991,31 @@ interface PhaseEventMap {
         completed: number;
         failed: number;
     };
+    'phase.verifying': {
+        phaseId: string;
+        name: string;
+        attempt: number;
+    };
+    'phase.verifyFailed': {
+        phaseId: string;
+        name: string;
+        attempt: number;
+        error?: string;
+    };
+    'phase.repairing': {
+        phaseId: string;
+        name: string;
+        attempt: number;
+    };
+    'phase.conflictResolving': {
+        phaseId: string;
+        name: string;
+        files: string[];
+    };
+    'phase.conflictResolved': {
+        phaseId: string;
+        name: string;
+    };
     'graph.completed': {
         graphId: string;
         durationMs: number;
@@ -1023,6 +1048,44 @@ interface PhaseExecutionContext {
         cwd?: string;
         branch?: string;
     }) => Promise<unknown>;
+    /**
+     * Opsiyonel doğrulama kapısı. Bir fazın tüm görevleri bittikten *sonra*,
+     * faz "completed" işaretlenmeden ve worktree'si ana branch'e merge edilmeden
+     * *önce* çağrılır. `env`, fazın worktree'sine (varsa) işaret eder; doğrulama
+     * o izole dizinde koşmalıdır (örn. typecheck/test). `ok:false` dönerse merge
+     * bloklanır ve (varsa) `repairPhase` ile onarım denenir.
+     *
+     * Tanımlanmazsa kapı atlanır (geriye dönük uyumlu — eski davranış).
+     */
+    verifyPhase?: (phase: PhaseNode, env?: {
+        cwd?: string;
+        branch?: string;
+    }) => Promise<{
+        ok: boolean;
+        output?: string;
+    }>;
+    /**
+     * Opsiyonel onarım geçişi. `verifyPhase` başarısız olduğunda, yakalanan hata
+     * çıktısı ile çağrılır. Worktree'deki kodu düzeltmeye çalışmalıdır (örn. bir
+     * onarım subagent'ı). Dönüş beklenmez; orchestrator ardından `verifyPhase`'i
+     * yeniden koşar. `verifyPhase` tanımlı değilse hiç çağrılmaz.
+     */
+    repairPhase?: (phase: PhaseNode, failure: string, attempt: number, env?: {
+        cwd?: string;
+        branch?: string;
+    }) => Promise<void>;
+    /**
+     * Opsiyonel birleştirme-çakışması çözücü. Bir fazın worktree'si ana branch'e
+     * squash-merge edilirken çakışma çıkarsa çağrılır. `info.cwd` ana çalışma
+     * ağacına (çakışma işaretçilerinin bulunduğu yer) işaret eder; çözücü oradaki
+     * işaretçileri temizlemeli ve `true` döndürmelidir. Başarılı olursa merge
+     * commit'lenir; aksi halde merge iptal edilir ve worktree `needs-review`'da
+     * saklanır. Tanımlanmazsa çakışma eski davranışla parked-for-review olur.
+     */
+    resolveConflict?: (phase: PhaseNode, info: {
+        conflictFiles: string[];
+        cwd: string;
+    }) => Promise<boolean>;
     /** Bir faz tamamlandığında çağrılır */
     onPhaseComplete?: (phase: PhaseNode) => void;
     /** Bir faz başarısız olduğunda çağrılır */
@@ -1040,6 +1103,12 @@ interface AutoPhaseOptions {
     maxConcurrentTasks?: number;
     /** Başarısız görev retry sayısı */
     maxRetries?: number;
+    /**
+     * Doğrulama kapısı başarısız olduğunda yapılacak maksimum onarım denemesi.
+     * Toplam doğrulama koşusu = maxVerifyAttempts + 1 (ilk koşu + her onarım
+     * sonrası yeniden koşu). Varsayılan 2. `verifyPhase` verilmezse etkisizdir.
+     */
+    maxVerifyAttempts?: number;
     /** Otonom mod: faz tamamlandıkça otomatik sonrakine geç */
     autonomous?: boolean;
     /** Fazlar arası bekleme süresi (ms) */
@@ -1195,6 +1264,19 @@ declare class PhaseOrchestrator {
     stop(): void;
     private tick;
     private startPhase;
+    /**
+     * Run the verification gate for a phase whose tasks all succeeded. Verifies in
+     * the phase's worktree; on failure, runs the repair pass and re-verifies, up to
+     * `maxVerifyAttempts` repairs. Returns the final verdict. When no `verifyPhase`
+     * callback is wired the gate is a no-op and always passes.
+     */
+    private runVerifyGate;
+    /** Worktree env (cwd/branch) for a phase, or undefined if it runs on the shared tree. */
+    private worktreeEnv;
+    /** Shared failure bookkeeping for a phase whose tasks ran but the phase failed. */
+    private failPhaseAfterTasks;
+    /** Trim long verifier output so it fits cleanly in an event/error message. */
+    private truncate;
     /**
      * Commit the phase's worktree changes, then enqueue the merge back into the
      * base branch. Merges run dependency-ordered (a phase merges only after its
@@ -1202,7 +1284,11 @@ declare class PhaseOrchestrator {
      * concurrent writes to the base tree.
      */
     private commitAndEnqueueMerge;
-    /** Squash-merge one phase. Conflicts mark the worktree needs-review (run continues). */
+    /**
+     * Squash-merge one phase. When a `resolveConflict` callback is wired, a merge
+     * conflict is handed to it (a resolver subagent) before giving up; only if
+     * that fails does the worktree fall to needs-review and the run continues.
+     */
     private mergeOne;
     /** A failed phase keeps its worktree on disk for inspection (no merge). */
     private keepWorktreeForReview;
@@ -1399,6 +1485,40 @@ declare class CheckpointManager {
     private pruneCheckpoints;
 }
 
+/**
+ * Per-task model matrix resolution.
+ *
+ * The matrix (Config.modelMatrix) maps a catalog **role**, a **phase** name, or
+ * the `*` default to a {@link ModelMatrixEntry} (model + optional provider).
+ * At subagent spawn time we resolve the most specific match so different task
+ * types can run on different models — e.g. `security-scanner` on one model,
+ * `documentation` on another — while the leader keeps its own model.
+ *
+ * Resolution precedence (most → least specific):
+ *   1. exact role          (matrix["security-scanner"])
+ *   2. the role's phase     (matrix["review"])
+ *   3. the `*` default      (matrix["*"])
+ *   4. undefined            (caller falls back to the leader model)
+ *
+ * Set via the `/setmodel` slash command; this module is the single source of
+ * truth both that command and the spawn path use to validate + resolve keys.
+ */
+
+/** All valid phase keys, in catalog order. */
+declare const MATRIX_PHASE_KEYS: readonly string[];
+/** The phase a catalog role belongs to, or undefined for unknown roles. */
+declare function phaseForRole(role: string | undefined): string | undefined;
+/**
+ * Resolve the matrix entry for a subagent role. Returns the most specific
+ * match (role → phase → `*`), or undefined when nothing matches.
+ */
+declare function resolveModelMatrix(matrix: Record<string, ModelMatrixEntry> | undefined, role: string | undefined): ModelMatrixEntry | undefined;
+type MatrixKeyKind = 'role' | 'phase' | 'default' | 'unknown';
+/** Classify a matrix key so `/setmodel` can reject typos before persisting. */
+declare function matrixKeyKind(key: string): MatrixKeyKind;
+/** True when `key` is a usable matrix key (role, phase, or `*`). */
+declare function isValidMatrixKey(key: string): boolean;
+
 /**
  * CollaborationBus — kernel-level pause/resume signal for the
  * collaboration `controller` role (Phase 3 of idea #13 from IDEAS.md).
@@ -1745,4 +1865,4 @@ interface PlanPluginOptions {
  */
 declare function createPlanPlugin(opts?: PlanPluginOptions): Plugin;
 
-export { AddAttachmentInput, AttachmentRef, AttachmentStore, type AutoPhaseOptions, type AutoPhasePlanResult, AutoPhasePlanner, type AutoPhasePlannerOptions, AutoPhaseRunner, type AutoPhaseRunnerOptions, BuildContext, type Checkpoint, CheckpointManager, type CheckpointManagerOptions, type CollabBusState, type InjectedToolResult as CollabInjectedToolResult, type CollabPauseMiddlewareOptions, CollaborationBus, Config, ConfigStore, Container, ContentBlock, Context, type ContinueDirective, DefaultPluginAPI, DefaultPromptStore, DefaultSystemPromptBuilder, type DefaultSystemPromptBuilderOptions, type DetectedDependency, type DetectionResult, EventBus, EventName, ExtensionRegistry, type Finding, type FullScanResult, type GeneratedSecuritySkill, type GeneratedSkill, type GeneratedSkillContent, GitignoreUpdater, HealthRegistry, InputBuilder, type InputBuilderEvent, type InputBuilderOptions, KERNEL_API_VERSION, LAYER_1_IDENTITY, Listener, type LoadPluginsOptions, Logger, type MCPRegistryHandle, MCPRegistryView, MCPServerConfig, MemoryStore, MetricsSink, MetricsSinkView, ModeStore, ModelCapabilities, type PackageManager, type PhaseEventMap, type PhaseEventName, type PhaseExecutionContext, type PhaseFilter, type PhaseGraph, PhaseGraphBuilder, type PhaseGraphBuilderOptions, type PhaseNode, PhaseOrchestrator, type PhaseOrchestratorOptions, type PhaseProgress, type PhaseSort, type PhaseStatus, PhaseStore, type PhaseStoreOptions, type PhaseTemplate, Plugin, PluginAPI, type PluginAPIInit, PluginPipelines, Provider, ProviderRegistry, ProviderRegistryView, ProviderRunner, ReplayLogStore, type ReplayMode, ReplayProviderRunner, type ReplayProviderRunnerOptions, ReportGenerator, type ReportOptions, Request, Response, RunProviderOptions$1 as RunProviderOptions, type ScanOptions, type ScanResult, type ScanScope, type SecurityPattern, SecurityScanner, type SecurityScannerContext, type SecurityScannerOptions, SecurityScannerOrchestrator, SessionWriterView, type SeverityLevel, type SkillGenerationContext, SkillGenerator, type SkillGeneratorOptions, SkillLoader, SlashCommand, SlashCommandRegistry, SlashCommandRegistryView, SystemPromptBuilder, SystemPromptContributor, TaskGraph, TaskNode, TaskPriority, TaskStore, TaskType, type TechStack, TechStackDetector, type TechStackInfo, TextBlock, Tool, ToolRegistry, ToolRegistryView, Tracer, WorktreeManager, WstackPaths, buildBtwBlock, collabInjectMiddleware, collabPauseMiddleware, consumeBtwNotes, createAutoPhaseFromTaskGraph, createGitPlugin, createMcpControlTool, createObservabilityPlugin, createPlanPlugin, createPromptsPlugin, createSecurityPlugin, createSecuritySlashCommand, createSkillsPlugin, createSyncPlugin, defaultGitignoreUpdater, defaultOrchestrator, defaultReportGenerator, defaultSecurityScanner, defaultSkillGenerator, defaultTechStackDetector, hashRequest, loadPlugins, makeContinueToNextIterationTool, parseContinueDirective, pendingBtwCount, runProviderWithRetry, securitySlashCommand, setBtwNote, stableStringify, unloadPlugins };
+export { AddAttachmentInput, AttachmentRef, AttachmentStore, type AutoPhaseOptions, type AutoPhasePlanResult, AutoPhasePlanner, type AutoPhasePlannerOptions, AutoPhaseRunner, type AutoPhaseRunnerOptions, BuildContext, type Checkpoint, CheckpointManager, type CheckpointManagerOptions, type CollabBusState, type InjectedToolResult as CollabInjectedToolResult, type CollabPauseMiddlewareOptions, CollaborationBus, Config, ConfigStore, Container, ContentBlock, Context, type ContinueDirective, DefaultPluginAPI, DefaultPromptStore, DefaultSystemPromptBuilder, type DefaultSystemPromptBuilderOptions, type DetectedDependency, type DetectionResult, EventBus, EventName, ExtensionRegistry, type Finding, type FullScanResult, type GeneratedSecuritySkill, type GeneratedSkill, type GeneratedSkillContent, GitignoreUpdater, HealthRegistry, InputBuilder, type InputBuilderEvent, type InputBuilderOptions, KERNEL_API_VERSION, LAYER_1_IDENTITY, Listener, type LoadPluginsOptions, Logger, MATRIX_PHASE_KEYS, type MCPRegistryHandle, MCPRegistryView, MCPServerConfig, type MatrixKeyKind, MemoryStore, MetricsSink, MetricsSinkView, ModeStore, ModelCapabilities, ModelMatrixEntry, type PackageManager, type PhaseEventMap, type PhaseEventName, type PhaseExecutionContext, type PhaseFilter, type PhaseGraph, PhaseGraphBuilder, type PhaseGraphBuilderOptions, type PhaseNode, PhaseOrchestrator, type PhaseOrchestratorOptions, type PhaseProgress, type PhaseSort, type PhaseStatus, PhaseStore, type PhaseStoreOptions, type PhaseTemplate, Plugin, PluginAPI, type PluginAPIInit, PluginPipelines, Provider, ProviderRegistry, ProviderRegistryView, ProviderRunner, ReplayLogStore, type ReplayMode, ReplayProviderRunner, type ReplayProviderRunnerOptions, ReportGenerator, type ReportOptions, Request, Response, RunProviderOptions$1 as RunProviderOptions, type ScanOptions, type ScanResult, type ScanScope, type SecurityPattern, SecurityScanner, type SecurityScannerContext, type SecurityScannerOptions, SecurityScannerOrchestrator, SessionWriterView, type SeverityLevel, type SkillGenerationContext, SkillGenerator, type SkillGeneratorOptions, SkillLoader, SlashCommand, SlashCommandRegistry, SlashCommandRegistryView, SystemPromptBuilder, SystemPromptContributor, TaskGraph, TaskNode, TaskPriority, TaskStore, TaskType, type TechStack, TechStackDetector, type TechStackInfo, TextBlock, Tool, ToolRegistry, ToolRegistryView, Tracer, WorktreeManager, WstackPaths, buildBtwBlock, collabInjectMiddleware, collabPauseMiddleware, consumeBtwNotes, createAutoPhaseFromTaskGraph, createGitPlugin, createMcpControlTool, createObservabilityPlugin, createPlanPlugin, createPromptsPlugin, createSecurityPlugin, createSecuritySlashCommand, createSkillsPlugin, createSyncPlugin, defaultGitignoreUpdater, defaultOrchestrator, defaultReportGenerator, defaultSecurityScanner, defaultSkillGenerator, defaultTechStackDetector, hashRequest, isValidMatrixKey, loadPlugins, makeContinueToNextIterationTool, matrixKeyKind, parseContinueDirective, pendingBtwCount, phaseForRole, resolveModelMatrix, runProviderWithRetry, securitySlashCommand, setBtwNote, stableStringify, unloadPlugins };