opencode-swarm 7.133.0 → 7.134.0

package/dist/memory/schema.d.ts

@@ -3,8 +3,8 @@ import type { CuratorMemoryDecision, MemoryKind, MemoryPatch, MemoryProposal, Me
 export declare const MemoryScopeTypeSchema: z.ZodEnum<{
     agent: "agent";
     project: "project";
-    global_user: "global_user";
     workspace: "workspace";
+    global_user: "global_user";
     repository: "repository";
     run: "run";
     cohort: "cohort";
@@ -13,8 +13,8 @@ export declare const MemoryScopeRefSchema: z.ZodObject<{
     type: z.ZodEnum<{
         agent: "agent";
         project: "project";
-        global_user: "global_user";
         workspace: "workspace";
+        global_user: "global_user";
         repository: "repository";
         run: "run";
         cohort: "cohort";
@@ -66,8 +66,8 @@ export declare const MemoryRecordSchema: z.ZodObject<{
         type: z.ZodEnum<{
             agent: "agent";
             project: "project";
-            global_user: "global_user";
             workspace: "workspace";
+            global_user: "global_user";
             repository: "repository";
             run: "run";
             cohort: "cohort";
@@ -154,8 +154,8 @@ export declare const MemoryProposalSchema: z.ZodObject<{
             type: z.ZodEnum<{
                 agent: "agent";
                 project: "project";
-                global_user: "global_user";
                 workspace: "workspace";
+                global_user: "global_user";
                 repository: "repository";
                 run: "run";
                 cohort: "cohort";

package/dist/session/snapshot-writer.d.ts

@@ -43,6 +43,8 @@ export interface SerializedAgentSession {
     qaSkipTaskIds: string[];
     pendingAdvisoryMessages: string[];
     taskWorkflowStates?: Record<string, string>;
+    /** Task-keyed coder file attribution. Optional for backward compatibility. */
+    modifiedFilesByTask?: Record<string, string[]>;
     /** Flag for one-shot scope violation warning injection (omitted when undefined for additive-only schema) */
     scopeViolationDetected?: boolean;
     /** Current index into the fallback_models array (v6.33) */

package/dist/state.d.ts

@@ -64,6 +64,14 @@ export interface PrSubscriptionState {
  * Transitions must be forward-only: idle → coder_delegated → pre_check_passed → reviewer_run → tests_run → complete
  */
 export type TaskWorkflowState = 'idle' | 'coder_delegated' | 'pre_check_passed' | 'reviewer_run' | 'tests_run' | 'complete';
+/**
+ * Upper bound for per-session task file-attribution entries.
+ *
+ * Runtime concurrency is capped well below this value. When the map is full,
+ * only workflow-complete entries may be reclaimed; live task attribution is
+ * never evicted to make room.
+ */
+export declare const MAX_TRACKED_TASK_FILE_ATTRIBUTIONS = 128;
 /** Exact lifecycle state for one coder generation and its paired reviewer. */
 export interface ReviewerScopeGeneration {
     taskId: string;
@@ -218,7 +226,12 @@ export interface AgentSessionState {
     lastScopeViolation: string | null;
     /** Flag for one-shot scope violation warning injection in messagesTransform */
     scopeViolationDetected?: boolean;
-    /** Files modified by the current coder task (populated by guardrails toolBefore/toolAfter, reset on new coder delegation) */
+    /** Task-keyed files modified by coder work. Bounded by MAX_TRACKED_TASK_FILE_ATTRIBUTIONS. */
+    modifiedFilesByTask: Map<string, string[]>;
+    /**
+     * Compatibility projection for callers that still inspect the active task.
+     * Helpers in this module keep it synchronized only with `currentTaskId`.
+     */
     modifiedFilesThisCoderTask: string[];
     /** Bounded coder generations awaiting exact reviewer claims. */
     reviewerScopeGenerations?: Map<string, ReviewerScopeGeneration>;
@@ -737,6 +750,35 @@ export declare function pruneOldWindows(sessionId: string, maxAgeMs?: number, ma
  * @param agentName - Agent name to record (will be normalized)
  */
 export declare function recordPhaseAgentDispatch(sessionId: string, agentName: string): void;
+/**
+ * Atomically replace one task's attributed file list.
+ *
+ * Returns false without mutation when the task id is invalid or the bounded
+ * map has no reclaimable workflow-complete slot.
+ */
+export declare function recordModifiedFilesForTask(session: AgentSessionState, taskId: string, files: readonly string[]): boolean;
+/**
+ * Add one file to a task's attribution without disturbing its existing files.
+ */
+export declare function recordModifiedFileForTask(session: AgentSessionState, taskId: string, file: string): boolean;
+/**
+ * Return a defensive copy of the files attributed to one task.
+ */
+export declare function getModifiedFilesForTask(session: AgentSessionState, taskId: string): string[];
+/**
+ * Reset one task's attribution. `remove` is used at terminal cleanup; the
+ * default keeps an empty live-task slot ready for subsequent writes.
+ */
+export declare function resetModifiedFilesForTask(session: AgentSessionState, taskId: string, options?: {
+    remove?: boolean;
+}): boolean;
+/**
+ * Apply task-completion retention rules.
+ *
+ * Non-Epic sessions release attribution at the workflow-complete boundary.
+ * Epic sessions retain it until `epic_record_divergence` consumes the entry.
+ */
+export declare function completeModifiedFilesForTask(session: AgentSessionState, taskId: string): void;
 /**
  * Advance a task's workflow state. Validates forward-only transitions.
  * Throws 'INVALID_TASK_STATE_TRANSITION: [taskId] [current] → [requested]' on illegal transition.

package/dist/tools/dispatch-lanes.d.ts

@@ -67,7 +67,7 @@ declare function validatePrReviewMicroDispatch(args: DispatchLanesAsyncArgs, dep
 export type DispatchLanesArgs = z.infer<typeof DispatchLanesArgsSchema>;
 export type DispatchLanesAsyncArgs = z.infer<typeof DispatchLanesAsyncArgsSchema>;
 export type CollectLaneResultsArgs = z.infer<typeof CollectLaneResultsArgsSchema>;
-export type DispatchLaneStatus = 'pending' | 'completed' | 'failed' | 'rejected' | 'cancelled' | 'stale' | 'consumed';
+export type DispatchLaneStatus = 'pending' | 'completed' | 'failed' | 'rejected' | 'cancelled' | 'stale' | 'ingesting' | 'consumed';
 export interface DispatchLaneResult {
     id: string;
     agent: string;

package/dist/tools/epic-record-divergence.d.ts

@@ -6,10 +6,8 @@
  *
  *   1. Reads the task's DECLARED scope from `.swarm/scopes/scope-{taskId}.json`
  *      (the same on-disk record `readScopeFromDisk` consults).
- *   2. Reads the ACTUAL files the coder modified from the session's
- *      `modifiedFilesThisCoderTask` — populated by the guardrails write hook
- *      and reset by Lean Turbo at task-boundaries, so it captures THIS
- *      task's writes only.
+ *   2. Reads the ACTUAL files attributed to this exact task by the guardrails
+ *      write hook and background-completion ingestion.
  *   3. Appends one record to `.swarm/epic/divergence.jsonl` via
  *      `recordTaskDivergence`. The calibration engine reads that file on the
  *      next `epic_decide_phase` invocation (the architect-facing decide
@@ -28,7 +26,7 @@
 import type { ToolDefinition } from '@opencode-ai/plugin/tool';
 import { loadPlanJsonOnly as loadPlanJsonOnly_import } from '../plan/manager.js';
 import { readScopeFromDisk as readScopeFromDisk_import } from '../scope/scope-persistence.js';
-import { getAgentSession as getAgentSession_import, hasActiveEpicMode as hasActiveEpicMode_import } from '../state.js';
+import { getAgentSession as getAgentSession_import, getModifiedFilesForTask as getModifiedFilesForTask_import, hasActiveEpicMode as hasActiveEpicMode_import, resetModifiedFilesForTask as resetModifiedFilesForTask_import } from '../state.js';
 import { recordTaskDivergence as recordTaskDivergence_import } from '../turbo/epic/divergence-recorder.js';
 export interface EpicRecordDivergenceArgs {
     directory: string;
@@ -65,6 +63,8 @@ export interface EpicRecordDivergenceResult {
 export declare const _internals: {
     hasActiveEpicMode: typeof hasActiveEpicMode_import;
     getAgentSession: typeof getAgentSession_import;
+    getModifiedFilesForTask: typeof getModifiedFilesForTask_import;
+    resetModifiedFilesForTask: typeof resetModifiedFilesForTask_import;
     readScopeFromDisk: typeof readScopeFromDisk_import;
     loadPlanJsonOnly: typeof loadPlanJsonOnly_import;
     recordTaskDivergence: typeof recordTaskDivergence_import;

package/dist/worktree/merge.d.ts

@@ -65,6 +65,10 @@ export interface DirtyMergeSuccess {
     strategy: string;
     autoCommitted: boolean;
     cleaned: boolean;
+    /** True when a resumed operation was already present on the target. */
+    reconciled?: boolean;
+    /** Durable identity for the Git operation, when settlement tracking is enabled. */
+    provenance?: MergeOperationProvenance;
 }
 export interface DirtyMergePartial {
     partial: true;
@@ -73,11 +77,45 @@ export interface DirtyMergePartial {
     cleaned: boolean;
     message: string;
     conflictFiles?: string[];
+    provenance?: MergeOperationProvenance;
 }
 export interface DirtyMergeFailure {
     failed: true;
     stage: string;
     message: string;
+    provenance?: MergeOperationProvenance;
+}
+/**
+ * Durable identity for a standard-worktree merge-back operation.
+ *
+ * `sourceHead` is captured after the lane's dirty state is auto-committed and
+ * `targetHeadBefore` immediately before the merge starts. The stable
+ * `operationId` is supplied by the durable background-delegation record.
+ */
+export interface MergeOperationProvenance {
+    operationId: string;
+    sourceHead: string;
+    targetHeadBefore: string;
+    branchName: string;
+    strategy: MergeStrategy;
+}
+export type MergeReconciliationResult = {
+    landed: true;
+    method: 'ancestry' | 'cherry-pick-trailer';
+} | {
+    landed: false;
+    error?: string;
+};
+export interface DirtyMergeOptions {
+    /** Stable identifier allocated before the merge-back begins. */
+    operationId?: string;
+    /** Previously persisted provenance when resuming a `settling` operation. */
+    resume?: MergeOperationProvenance;
+    /**
+     * Awaited after auto-commit and HEAD capture, but before the Git merge.
+     * A rejection fails closed without invoking the merge.
+     */
+    onBeforeMerge?: (provenance: MergeOperationProvenance) => Promise<void>;
 }
 export interface OrphanCleanupResult {
     removed: string[];
@@ -123,6 +161,14 @@ export declare function getMergeStrategy(config: {
  * @returns Discriminated union: success, conflict, or failure.
  */
 export declare function mergeLaneBranch(primaryDir: string, branchName: string, strategy: MergeStrategy): Promise<MergeSuccess | MergeConflict | MergeFailure>;
+/**
+ * Detect whether a previously-started merge-back already landed on the target.
+ *
+ * Merge and rebase settlement uses ancestry. Cherry-pick settlement uses the
+ * exact provenance trailer emitted by Git's `cherry-pick -x`; patch identity or
+ * subject matching is intentionally insufficient.
+ */
+export declare function reconcileLandedMerge(primaryDir: string, provenance: MergeOperationProvenance): Promise<MergeReconciliationResult>;
 /**
  * Cleans up a lane branch after a successful merge.
  *
@@ -168,7 +214,7 @@ export declare function handleMergeConflict(primaryDir: string, _branchName: str
  * @param strategy     - Merge strategy to use.
  * @returns Discriminated union: success, partial, or failure.
  */
-export declare function attemptMergeBackFromDirty(worktreePath: string, branchName: string, primaryDir: string, strategy: MergeStrategy): Promise<DirtyMergeSuccess | DirtyMergePartial | DirtyMergeFailure>;
+export declare function attemptMergeBackFromDirty(worktreePath: string, branchName: string, primaryDir: string, strategy: MergeStrategy, options?: DirtyMergeOptions): Promise<DirtyMergeSuccess | DirtyMergePartial | DirtyMergeFailure>;
 /**
  * Extracts the session ID from a swarm-lane branch name.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "opencode-swarm",
-	"version": "7.133.0",
+	"version": "7.134.0",
 	"description": "Architect-centric agentic swarm plugin for OpenCode - hub-and-spoke orchestration with SME consultation, code generation, and QA review",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/dist/cli/guardrail-explain-zgja2b9m.js

@@ -1,54 +0,0 @@
-// @bun
-import {
-  handleGuardrailExplain
-} from "./index-sw82jvf2.js";
-import"./index-mwqfyjja.js";
-import"./index-mmvaf4t6.js";
-import"./index-tj2mkfb3.js";
-import"./index-r260ybay.js";
-import"./index-4905hd2m.js";
-import"./index-134d35c1.js";
-import"./index-9f71ye47.js";
-import"./index-0vd91yb8.js";
-import"./index-cpest8sa.js";
-import"./index-66zght9d.js";
-import"./index-vxv732ex.js";
-import"./index-c8s9a3zh.js";
-import"./index-9ss2m4rs.js";
-import"./index-g4mnf3p5.js";
-import"./index-s80bsjkj.js";
-import"./index-7ftthvqt.js";
-import"./index-wz36r0fk.js";
-import"./index-rtry5xyf.js";
-import"./index-j5pnah1w.js";
-import"./index-bz08438z.js";
-import"./index-ae75rja9.js";
-import"./index-q27bajqb.js";
-import"./index-kc1m6vpr.js";
-import"./index-k5jrywpr.js";
-import"./index-n832052r.js";
-import"./index-wzb4dv5s.js";
-import"./index-bk5tah7q.js";
-import"./index-8fwhhayc.js";
-import"./index-q1exe2b3.js";
-import"./index-74tptrss.js";
-import"./index-2tn5h2zp.js";
-import"./index-1kz6da87.js";
-import"./index-17zjp67y.js";
-import"./index-z6xqpmqg.js";
-import"./index-4rhhvd1a.js";
-import"./index-zjygnfay.js";
-import"./index-zgwm4ryv.js";
-import"./index-h3k62043.js";
-import"./index-3x761jqv.js";
-import"./index-7mkpsw6g.js";
-import"./index-fsrp8wp3.js";
-import"./index-76kvm9z5.js";
-import"./index-q2rrv0cy.js";
-import"./index-bpmtbmy9.js";
-import"./index-7g4c7s5r.js";
-import"./index-qe3v54nb.js";
-import"./index-a76rekgs.js";
-export {
-  handleGuardrailExplain
-};

package/dist/cli/pending-delegations-kxy8mdqg.js

@@ -1,75 +0,0 @@
-// @bun
-import {
-  BACKGROUND_DELEGATIONS_FILE,
-  BACKGROUND_INGESTION_LEASE_MS,
-  appendDelegationTransition,
-  buildPromptSnapshot,
-  claimDelegationIngestion,
-  findByBatchId,
-  findByCorrelationId,
-  findOpenAsyncLaneBatches,
-  readDelegations,
-  recordPendingDelegation,
-  settleDelegationIngestion,
-  sweepStaleDelegations
-} from "./index-mwqfyjja.js";
-import"./index-mmvaf4t6.js";
-import"./index-tj2mkfb3.js";
-import"./index-r260ybay.js";
-import"./index-4905hd2m.js";
-import"./index-134d35c1.js";
-import"./index-9f71ye47.js";
-import"./index-0vd91yb8.js";
-import"./index-cpest8sa.js";
-import"./index-66zght9d.js";
-import"./index-vxv732ex.js";
-import"./index-c8s9a3zh.js";
-import"./index-9ss2m4rs.js";
-import"./index-g4mnf3p5.js";
-import"./index-s80bsjkj.js";
-import"./index-7ftthvqt.js";
-import"./index-wz36r0fk.js";
-import"./index-rtry5xyf.js";
-import"./index-j5pnah1w.js";
-import"./index-bz08438z.js";
-import"./index-ae75rja9.js";
-import"./index-q27bajqb.js";
-import"./index-kc1m6vpr.js";
-import"./index-k5jrywpr.js";
-import"./index-n832052r.js";
-import"./index-wzb4dv5s.js";
-import"./index-bk5tah7q.js";
-import"./index-8fwhhayc.js";
-import"./index-q1exe2b3.js";
-import"./index-74tptrss.js";
-import"./index-2tn5h2zp.js";
-import"./index-1kz6da87.js";
-import"./index-17zjp67y.js";
-import"./index-z6xqpmqg.js";
-import"./index-4rhhvd1a.js";
-import"./index-zjygnfay.js";
-import"./index-zgwm4ryv.js";
-import"./index-h3k62043.js";
-import"./index-3x761jqv.js";
-import"./index-7mkpsw6g.js";
-import"./index-fsrp8wp3.js";
-import"./index-76kvm9z5.js";
-import"./index-q2rrv0cy.js";
-import"./index-bpmtbmy9.js";
-import"./index-7g4c7s5r.js";
-import"./index-qe3v54nb.js";
-import"./index-a76rekgs.js";
-export {
-  sweepStaleDelegations,
-  settleDelegationIngestion,
-  recordPendingDelegation,
-  readDelegations,
-  findOpenAsyncLaneBatches,
-  findByCorrelationId,
-  findByBatchId,
-  claimDelegationIngestion,
-  buildPromptSnapshot,
-  appendDelegationTransition,
-  BACKGROUND_INGESTION_LEASE_MS,
-  BACKGROUND_DELEGATIONS_FILE
-};

package/dist/cli/{index-9f71ye47.js → index-13xxjfhn.js}

@@ -2,12 +2,12 @@
 import {
   simpleGlobToRegex
 } from "./index-z6xqpmqg.js";
-import {
-  warn
-} from "./index-zgwm4ryv.js";
 import {
   bunSpawnSync
 } from "./index-qe3v54nb.js";
+import {
+  warn
+} from "./index-zgwm4ryv.js";
 import {
   __export
 } from "./index-a76rekgs.js";

package/dist/cli/{index-s80bsjkj.js → index-2ghkk9ve.js}

@@ -1,16 +1,16 @@
 // @bun
-import {
-  SwarmError
-} from "./index-z6xqpmqg.js";
-import {
-  warn
-} from "./index-zgwm4ryv.js";
 import {
   readCachedTextFile
 } from "./index-fsrp8wp3.js";
+import {
+  SwarmError
+} from "./index-z6xqpmqg.js";
 import {
   bunFile
 } from "./index-qe3v54nb.js";
+import {
+  warn
+} from "./index-zgwm4ryv.js";
 
 // src/hooks/utils.ts
 import * as fs from "fs";

package/dist/cli/{index-76kvm9z5.js → index-5nybajn9.js}

@@ -1,10 +1,10 @@
 // @bun
-import {
-  emit
-} from "./index-q2rrv0cy.js";
 import {
   require_proper_lockfile
 } from "./index-7g4c7s5r.js";
+import {
+  emit
+} from "./index-q2rrv0cy.js";
 import {
   __toESM
 } from "./index-a76rekgs.js";