@generacy-ai/orchestrator 0.5.1 → 0.7.0

package/dist/worker/merge-conflict-handler.d.ts

@@ -0,0 +1,141 @@
+import type { QueueItem } from '../types/index.js';
+import type { Logger } from './types.js';
+import type { WorkerConfig } from './config.js';
+import type { SSEEventEmitter } from './output-capture.js';
+import type { AgentLauncher } from '../launcher/agent-launcher.js';
+import type { HandlerOutcome } from './handler-outcome.js';
+/**
+ * Evidence emitted when the agent-CLI attempt fails to produce a conflict-
+ * free committed merge (FR-009).
+ */
+export interface BlockedStuckMergeConflictsEvidence {
+    /** Paths that still had conflict markers after the agent-CLI attempt. */
+    unresolvedPaths: string[];
+    /**
+     * Paths the agent successfully resolved (staged, no markers).
+     * Empty if the agent produced no diff at all.
+     */
+    partiallyResolvedPaths: string[];
+    /** Base ref that was being merged. */
+    baseRef: string;
+    /** Short SHA of the branch tip at attempt time. */
+    branchTipSha: string;
+    /** ISO timestamp of the attempt. */
+    attemptedAt: string;
+    /** Optional short human-readable reason (e.g., "no linked PR"). */
+    reason?: string;
+}
+/**
+ * Handles the `resolve-merge-conflicts` command per #898.
+ *
+ * Processing flow (see `handler-contract.md` §"Flow"):
+ *   1-3. Parse item, create GitHub client, resolve PR via PrLinker.
+ *   4.   switchBranch with 3× retry.
+ *   5.   resolveBaseBranch (reuses #864 helper).
+ *   6-7. fetch + merge origin/<base> with 3× retry. No-op merge → immediate success.
+ *   8.   Enumerate conflicted paths.
+ *   9-10.Enumerate open PRs targeting same base, cache file lists.
+ *   11.  Build MergeConflictIntent prompt via buildMergeConflictPrompt.
+ *   12.  agentLauncher.launch EXACTLY ONCE.
+ *   13.  Success predicate: no MERGE_HEAD, no unresolved paths, no conflict markers.
+ *   14.  git push origin <branch> with 3× retry (network only; NFF is a hard fail).
+ *   15.  On success: apply completed:merge-conflicts + remove waiting-for + agent:paused.
+ *   17.  On block: apply blocked:stuck-merge-conflicts, leave waiting-for in place,
+ *        emit evidence block, return normally.
+ */
+export declare class MergeConflictHandler {
+    private readonly config;
+    private readonly logger;
+    private readonly agentLauncher;
+    private readonly sseEmitter?;
+    private readonly repoCheckout;
+    private readonly prLinker;
+    constructor(config: WorkerConfig, logger: Logger, agentLauncher: AgentLauncher, sseEmitter?: SSEEventEmitter | undefined);
+    /**
+     * Process a merge-conflict resolution task (#902 FR-005 return type).
+     *
+     * Returns a `HandlerOutcome` — the dispatcher (via `ClaudeCliWorker.handle`)
+     * routes on the discriminant to decide re-arm vs failed-terminal.
+     *
+     * Success/no-op/push-succeeded → `re-armed` with `startPhase` from
+     * `metadata.phase`. Blocked branches → `failed` with evidence. Missing
+     * `metadata.phase` at a would-be `re-armed` return → fail-loud path
+     * (FR-004): applies `blocked:stuck-merge-conflicts`, returns `failed` with
+     * evidence citing the missing pause-context.
+     */
+    handle(item: QueueItem, checkoutPath: string): Promise<HandlerOutcome>;
+    /**
+     * Enumerate open PRs targeting `baseName` (excluding the target issue's own PR)
+     * and build a Map<path, prNumber[]> of files each sibling PR touches.
+     *
+     * Uses `gh pr view <number> --json files` per sibling (call site is bounded
+     * to the poll cycle, per handler-contract §Observability). Missing files
+     * data is treated as an empty set.
+     */
+    private enumerateSiblingFileMap;
+    /**
+     * `gh pr view <number> --json files` on the local checkout. Called
+     * per-sibling; failures are non-fatal (the scope guard degrades to
+     * "no siblings" for that PR, which is safer than throwing).
+     */
+    private fetchPrFiles;
+    /**
+     * Success predicate (handler-contract §"Success predicate"):
+     *   - `.git/MERGE_HEAD` does NOT exist (merge is complete)
+     *   - `git diff --name-only --diff-filter=U` is empty (no unresolved paths)
+     *   - No file in the tree contains `<<<<<<< ` at line-start (belt & suspenders)
+     */
+    private verifyMergeResolved;
+    private listUnresolvedPaths;
+    /**
+     * Best-effort scan for the `<<<<<<< ` conflict marker at line start across
+     * tracked files. Uses `git ls-files` to enumerate, then reads each file
+     * synchronously (bounded — small worker workloads).
+     */
+    private scanForConflictMarkers;
+    /**
+     * `git push origin <branch>` with 3× retry on transient network errors.
+     * Non-fast-forward rejection does NOT retry — it escalates to blocked.
+     * On success, applies the combined label cleanup and returns re-armed.
+     */
+    private pushAndSucceed;
+    /**
+     * Success-terminal branch (#902 FR-001, FR-004, FR-007).
+     *
+     * - FR-001: consume `completed:merge-conflicts` and clear `agent:in-progress` /
+     *   `agent:paused` residue so the next natural conflict pause is not
+     *   insta-resumed by the generic pair path.
+     * - FR-004: fail-loud if `metadata.phase` is missing — never re-derive from
+     *   labels. Applies `blocked:stuck-merge-conflicts`, returns `failed` with
+     *   evidence citing the missing pause-context.
+     * - FR-007: one combined `gh issue edit --remove-label …` invocation (via
+     *   `github.removeLabels` which already batches removes into a single call).
+     */
+    private finishSuccess;
+    /**
+     * #902 FR-007: single combined `gh issue edit --remove-label …` for all four
+     * ownership-transition removes. No adds — re-arm is direct enqueue, not a
+     * resume-pair, so no `waiting-for:<gate>` / `completed:<gate>` labels are
+     * needed. The next `continue` item's normal in-progress labels are applied
+     * by `LabelManager.onResumeStart` when the phase loop enters.
+     *
+     * `github.removeLabels` batches all four `--remove-label` flags into one
+     * `gh issue edit` invocation — one HTTP round-trip, atomic at the label-set
+     * level (per contracts/handler-outcome.md §"Label edit shape").
+     */
+    private applySuccessDisposition;
+    private applyBlockedDisposition;
+    /**
+     * Spawn the agent CLI with a MergeConflictIntent. Runs at most once
+     * (Q4 → D). Returns true if the CLI exited 0, false otherwise.
+     */
+    private spawnAgentForConflict;
+    private retry;
+    private isTransientGitError;
+    private isTransientNetworkError;
+    private isNonFastForward;
+    private baseIsAncestor;
+    private getBranchTipSha;
+    private sleep;
+}
+//# sourceMappingURL=merge-conflict-handler.d.ts.map

package/dist/worker/merge-conflict-handler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-conflict-handler.d.ts","sourceRoot":"","sources":["../../src/worker/merge-conflict-handler.ts"],"names":[],"mappings":"AAgCA,OAAO,KAAK,EAAE,SAAS,EAAiC,MAAM,mBAAmB,CAAC;AAClF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AA8B3D;;;GAGG;AACH,MAAM,WAAW,kCAAkC;IACjD,yEAAyE;IACzE,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B;;;OAGG;IACH,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,sCAAsC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,mDAAmD;IACnD,YAAY,EAAE,MAAM,CAAC;IACrB,oCAAoC;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,oBAAoB;IAK7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAP9B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;gBAGjB,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,aAAa,EAC5B,UAAU,CAAC,EAAE,eAAe,YAAA;IAM/C;;;;;;;;;;;OAWG;IACG,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAiQ5E;;;;;;;OAOG;YACW,uBAAuB;IA8CrC;;;;OAIG;YACW,YAAY;IAoB1B;;;;;OAKG;YACW,mBAAmB;YAgCnB,mBAAmB;IAgBjC;;;;OAIG;YACW,sBAAsB;IAwBpC;;;;OAIG;YACW,cAAc;IA0D5B;;;;;;;;;;;OAWG;YACW,aAAa;IA+B3B;;;;;;;;;;OAUG;YACW,uBAAuB;YAyBvB,uBAAuB;IA8BrC;;;OAGG;YACW,qBAAqB;YAkFrB,KAAK;IAqBnB,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,uBAAuB;IAW/B,OAAO,CAAC,gBAAgB;YAMV,cAAc;YAad,eAAe;IAW7B,OAAO,CAAC,KAAK;CAGd"}