oh-my-copilot 4.13.2 → 4.13.21

package/dist/team/conflict-mailbox.js

@@ -0,0 +1,98 @@
+// src/team/conflict-mailbox.ts
+//
+// Formats and delivers merge/rebase conflict notifications for omc-teams CLI workers.
+//
+// NOTE: Markdown inbox is canonical for omc-teams CLI; JSONL is for native /team MCP workers
+// (out of scope here). Worker inbox: .omcp/state/team/{team}/workers/{worker}/inbox.md.
+// Leader inbox: .omcp/state/team/{team}/leader/inbox.md (see leader-inbox.ts).
+//
+// This module is 100% pure (formatMergeConflictForLeader, formatRebaseConflictForWorker).
+// Delivery functions delegate to appendToLeaderInbox / appendToInbox respectively.
+import { appendToInbox } from './worker-bootstrap.js';
+import { appendToLeaderInbox } from './leader-inbox.js';
+// ---------------------------------------------------------------------------
+// Pure formatters
+// ---------------------------------------------------------------------------
+/**
+ * Sanitize a single conflicting-file path before interpolation into a markdown
+ * mailbox message. Paths come from `git status --porcelain` output and could
+ * contain backticks, newlines, or carriage returns that would break the
+ * markdown structure or be interpreted as additional instructions by the
+ * leader's LLM. Replace each unsafe character with `?` so the message remains
+ * informative without enabling prompt injection.
+ */
+function sanitizeConflictPath(path) {
+    return path.replace(/[`\r\n]/g, '?');
+}
+/**
+ * Format a merge conflict notification destined for the leader inbox.
+ * Pure: same input → same output.
+ */
+export function formatMergeConflictForLeader(args) {
+    const { workerName, workerBranch, leaderBranch, conflictingFiles, mergeBaseSha, observedAt } = args;
+    const ts = new Date(observedAt).toISOString();
+    const safeFiles = conflictingFiles.map(sanitizeConflictPath);
+    const fileList = safeFiles.map((f) => `- \`${f}\``).join('\n');
+    return `### Merge conflict: ${workerName} → ${leaderBranch}
+
+**Worker branch:** \`${workerBranch}\`
+**Leader branch:** \`${leaderBranch}\`
+**Merge base:** \`${mergeBaseSha}\`
+**Observed at:** ${ts}
+
+**Conflicting files:**
+${fileList}
+
+**Leader: choose strategy.** To resolve, run:
+
+\`\`\`sh
+git checkout ${leaderBranch} && git merge --no-ff ${workerBranch}
+# resolve conflicts in the files listed above
+git add ${safeFiles.join(' ')}
+git commit
+\`\`\`
+
+Or abort with \`git merge --abort\` to defer resolution.`;
+}
+/**
+ * Format a rebase conflict notification destined for a worker inbox.
+ * Pure: same input → same output.
+ */
+export function formatRebaseConflictForWorker(args) {
+    const { workerName, workerBranch, leaderBranch, conflictingFiles, baseSha, worktreePath, observedAt } = args;
+    const ts = new Date(observedAt).toISOString();
+    const safeFiles = conflictingFiles.map(sanitizeConflictPath);
+    const fileList = safeFiles.map((f) => `- \`${f}\``).join('\n');
+    return `### Rebase conflict: ${workerName} onto ${leaderBranch}
+
+**Worker branch:** \`${workerBranch}\`
+**Base branch:** \`${leaderBranch}\`
+**Base SHA:** \`${baseSha}\`
+**Worktree:** \`${worktreePath}\`
+**Observed at:** ${ts}
+
+**Conflicting files:**
+${fileList}
+
+Resolve conflicts in your own pane, then \`git add <files>\` and \`git rebase --continue\`.
+Cadence stays paused until \`.git/rebase-merge\` is gone.
+
+Or run \`git rebase --abort\` to bail and return to the pre-rebase state.`;
+}
+/**
+ * Deliver a merge conflict message to the leader inbox.
+ * Delegates to leader-inbox.appendToLeaderInbox.
+ */
+export async function deliverMergeConflictToLeader(args) {
+    const { teamName, cwd, message } = args;
+    await appendToLeaderInbox(teamName, message, cwd);
+}
+/**
+ * Deliver a rebase conflict message to a worker inbox.
+ * Delegates to worker-bootstrap.appendToInbox.
+ */
+export async function deliverRebaseConflictToWorker(args) {
+    const { teamName, workerName, cwd, message } = args;
+    await appendToInbox(teamName, workerName, message, cwd);
+}
+//# sourceMappingURL=conflict-mailbox.js.map

package/dist/team/conflict-mailbox.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflict-mailbox.js","sourceRoot":"","sources":["../../src/team/conflict-mailbox.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,EAAE;AACF,sFAAsF;AACtF,EAAE;AACF,6FAA6F;AAC7F,wFAAwF;AACxF,+EAA+E;AAC/E,EAAE;AACF,0FAA0F;AAC1F,mFAAmF;AAEnF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,8EAA8E;AAC9E,kBAAkB;AAClB,8EAA8E;AAE9E;;;;;;;GAOG;AACH,SAAS,oBAAoB,CAAC,IAAY;IACxC,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;AACvC,CAAC;AAqBD;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAAC,IAAuB;IAClE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IACpG,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;IAC9C,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,OAAO,uBAAuB,UAAU,MAAM,YAAY;;uBAErC,YAAY;uBACZ,YAAY;oBACf,YAAY;mBACb,EAAE;;;EAGnB,QAAQ;;;;;eAKK,YAAY,yBAAyB,YAAY;;UAEtD,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;;;;yDAI4B,CAAC;AAC1D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,6BAA6B,CAAC,IAAwB;IACpE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,EAAE,gBAAgB,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAC7G,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;IAC9C,MAAM,SAAS,GAAG,gBAAgB,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAC7D,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,OAAO,wBAAwB,UAAU,SAAS,YAAY;;uBAEzC,YAAY;qBACd,YAAY;kBACf,OAAO;kBACP,YAAY;mBACX,EAAE;;;EAGnB,QAAQ;;;;;0EAKgE,CAAC;AAC3E,CAAC;AAmBD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,4BAA4B,CAAC,IAA8B;IAC/E,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACxC,MAAM,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;AACpD,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,IAA+B;IACjF,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACpD,MAAM,aAAa,CAAC,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;AAC1D,CAAC"}

package/dist/team/leader-inbox.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Returns the absolute path to the leader inbox file. Pure function.
+ * Uses sanitizeName to normalise teamName (prevents traversal characters).
+ */
+export declare function leaderInboxPath(teamName: string, cwd: string): string;
+/**
+ * Ensures the leader inbox directory and seed file exist.
+ * Creates .omcp/state/team/{team}/leader/ and seeds inbox.md with a header banner.
+ * Returns the absolute path to inbox.md.
+ * Idempotent: safe to call multiple times.
+ * Validates path is within cwd to prevent traversal.
+ */
+export declare function ensureLeaderInbox(teamName: string, cwd: string): Promise<string>;
+/**
+ * Append a message to the leader inbox.
+ * Mirrors appendToInbox for workers: appends `\n\n---\n${message}` to the inbox file.
+ * Validates path is within cwd to prevent traversal.
+ */
+export declare function appendToLeaderInbox(teamName: string, message: string, cwd: string): Promise<void>;
+/**
+ * Returns a one-line directive to append to the leader pane's spawn prompt,
+ * telling the leader where to find runtime notifications.
+ * Pure function. Returns a workspace-relative path (no `cwd` parameter — the
+ * directive is consumed by the leader process which interprets the path
+ * relative to its own working directory).
+ */
+export declare function extendLeaderBootstrapPrompt(teamName: string): string;
+//# sourceMappingURL=leader-inbox.d.ts.map

package/dist/team/leader-inbox.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"leader-inbox.d.ts","sourceRoot":"","sources":["../../src/team/leader-inbox.ts"],"names":[],"mappings":"AAuBA;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAGrE;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQtF;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKvG;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAIpE"}

package/dist/team/leader-inbox.js

@@ -0,0 +1,68 @@
+// src/team/leader-inbox.ts
+//
+// Bootstraps and writes to the leader's markdown inbox, mirroring the worker
+// appendToInbox pattern from worker-bootstrap.ts:268.
+//
+// Leader inbox path: .omcp/state/team/{sanitizedTeam}/leader/inbox.md
+// This resolves C1: leader notifications arrive via file, not tmux send-keys.
+// DO NOT register the leader as a member of the team registry (Option C, rejected).
+import { appendFile, mkdir, writeFile } from 'fs/promises';
+import { existsSync } from 'fs';
+import { dirname, join } from 'path';
+import { sanitizeName } from './tmux-session.js';
+import { validateResolvedPath } from './fs-utils.js';
+const LEADER_INBOX_HEADER = `# Leader Inbox
+
+Runtime notifications (merge conflicts, rebase events, etc.) appear here.
+Check this file periodically and after long-running operations.
+
+---
+`;
+/**
+ * Returns the absolute path to the leader inbox file. Pure function.
+ * Uses sanitizeName to normalise teamName (prevents traversal characters).
+ */
+export function leaderInboxPath(teamName, cwd) {
+    const safe = sanitizeName(teamName);
+    return join(cwd, `.omcp/state/team/${safe}/leader/inbox.md`);
+}
+/**
+ * Ensures the leader inbox directory and seed file exist.
+ * Creates .omcp/state/team/{team}/leader/ and seeds inbox.md with a header banner.
+ * Returns the absolute path to inbox.md.
+ * Idempotent: safe to call multiple times.
+ * Validates path is within cwd to prevent traversal.
+ */
+export async function ensureLeaderInbox(teamName, cwd) {
+    const inboxPath = leaderInboxPath(teamName, cwd);
+    validateResolvedPath(inboxPath, cwd);
+    await mkdir(dirname(inboxPath), { recursive: true });
+    if (!existsSync(inboxPath)) {
+        await writeFile(inboxPath, LEADER_INBOX_HEADER, 'utf-8');
+    }
+    return inboxPath;
+}
+/**
+ * Append a message to the leader inbox.
+ * Mirrors appendToInbox for workers: appends `\n\n---\n${message}` to the inbox file.
+ * Validates path is within cwd to prevent traversal.
+ */
+export async function appendToLeaderInbox(teamName, message, cwd) {
+    const inboxPath = leaderInboxPath(teamName, cwd);
+    validateResolvedPath(inboxPath, cwd);
+    await mkdir(dirname(inboxPath), { recursive: true });
+    await appendFile(inboxPath, `\n\n---\n${message}`, 'utf-8');
+}
+/**
+ * Returns a one-line directive to append to the leader pane's spawn prompt,
+ * telling the leader where to find runtime notifications.
+ * Pure function. Returns a workspace-relative path (no `cwd` parameter — the
+ * directive is consumed by the leader process which interprets the path
+ * relative to its own working directory).
+ */
+export function extendLeaderBootstrapPrompt(teamName) {
+    const safe = sanitizeName(teamName);
+    const path = `.omcp/state/team/${safe}/leader/inbox.md`;
+    return `Runtime notifications appear at ${path} — check this file periodically and after long-running operations.`;
+}
+//# sourceMappingURL=leader-inbox.js.map

package/dist/team/leader-inbox.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"leader-inbox.js","sourceRoot":"","sources":["../../src/team/leader-inbox.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAC3B,EAAE;AACF,6EAA6E;AAC7E,sDAAsD;AACtD,EAAE;AACF,sEAAsE;AACtE,8EAA8E;AAC9E,oFAAoF;AAEpF,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,MAAM,mBAAmB,GAAG;;;;;;CAM3B,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,GAAW;IAC3D,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACpC,OAAO,IAAI,CAAC,GAAG,EAAE,oBAAoB,IAAI,kBAAkB,CAAC,CAAC;AAC/D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,QAAgB,EAAE,GAAW;IACnE,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACjD,oBAAoB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACrC,MAAM,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,MAAM,SAAS,CAAC,SAAS,EAAE,mBAAmB,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,QAAgB,EAAE,OAAe,EAAE,GAAW;IACtF,MAAM,SAAS,GAAG,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACjD,oBAAoB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IACrC,MAAM,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,MAAM,UAAU,CAAC,SAAS,EAAE,YAAY,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;AAC9D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,2BAA2B,CAAC,QAAgB;IAC1D,MAAM,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,oBAAoB,IAAI,kBAAkB,CAAC;IACxD,OAAO,mCAAmC,IAAI,oEAAoE,CAAC;AACrH,CAAC"}

package/dist/team/merge-coordinator.d.ts

@@ -1,3 +1,9 @@
+/**
+ * Validate branch name to prevent flag injection in git commands.
+ * Exported so other modules (e.g. merge-orchestrator) can guard branch names
+ * before passing them to `git fetch/reset/rebase/rev-parse`.
+ */
+export declare function validateBranchName(branch: string): void;
 export interface MergeResult {
     workerName: string;
     branch: string;

package/dist/team/merge-coordinator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-coordinator.d.ts","sourceRoot":"","sources":["../../src/team/merge-coordinator.ts"],"names":[],"mappings":"AAsBA,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,EAAE,CAoDV;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,WAAW,CAuDb;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,WAAW,EAAE,CAsBf"}
+{"version":3,"file":"merge-coordinator.d.ts","sourceRoot":"","sources":["../../src/team/merge-coordinator.ts"],"names":[],"mappings":"AAeA;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAIvD;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,EAAE,CAoDV;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,WAAW,CAuDb;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,MAAM,GAClB,WAAW,EAAE,CAsBf"}

package/dist/team/merge-coordinator.js

@@ -9,8 +9,12 @@
 import { execFileSync } from 'node:child_process';
 import { listTeamWorktrees } from './git-worktree.js';
 const BRANCH_NAME_RE = /^[a-zA-Z0-9][a-zA-Z0-9/_.-]*$/;
-/** Validate branch name to prevent flag injection in git commands */
-function validateBranchName(branch) {
+/**
+ * Validate branch name to prevent flag injection in git commands.
+ * Exported so other modules (e.g. merge-orchestrator) can guard branch names
+ * before passing them to `git fetch/reset/rebase/rev-parse`.
+ */
+export function validateBranchName(branch) {
     if (!BRANCH_NAME_RE.test(branch)) {
         throw new Error(`Invalid branch name: "${branch}" — must match ${BRANCH_NAME_RE}`);
     }

package/dist/team/merge-coordinator.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-coordinator.js","sourceRoot":"","sources":["../../src/team/merge-coordinator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"merge-coordinator.js","sourceRoot":"","sources":["../../src/team/merge-coordinator.ts"],"names":[],"mappings":"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"}

package/dist/team/merge-orchestrator.d.ts

@@ -0,0 +1,41 @@
+export interface OrchestratorConfig {
+    teamName: string;
+    repoRoot: string;
+    leaderBranch: string;
+    cwd: string;
+    /** Polling interval for both the commit watcher and rebase resolver. Defaults to 1000ms. */
+    pollIntervalMs?: number;
+    /** Bound on `drainAndStop`. Defaults to 10000ms. */
+    drainTimeoutMs?: number;
+}
+export interface OrchestratorHandle {
+    /** Seed lastSha from the current branch HEAD (no fan-out on first observation). */
+    registerWorker(workerName: string): Promise<void>;
+    /** Stop tracking a worker. Idempotent. */
+    unregisterWorker(workerName: string): Promise<void>;
+    /**
+     * Run a final merge sweep for every worker whose lastSha is newer than what
+     * has been merged, then stop polling. Bounded by drainTimeoutMs.
+     */
+    drainAndStop(): Promise<{
+        unmerged: Array<{
+            workerName: string;
+            reason: string;
+        }>;
+    }>;
+    /** Run one poll cycle immediately (testing / debugging). */
+    pollOnce(): Promise<void>;
+    /** Inspect in-memory state (testing / debugging). */
+    getState(): {
+        workers: string[];
+        lastShas: Record<string, string>;
+        mergerWorktreePath: string;
+    };
+}
+export type OrchestratorEventType = 'commit_observed' | 'merge_attempted' | 'merge_succeeded' | 'merge_conflict' | 'rebase_triggered' | 'rebase_skipped_in_progress' | 'rebase_succeeded' | 'rebase_conflict' | 'rebase_resolved' | 'restart_recovery';
+export declare function startMergeOrchestrator(config: OrchestratorConfig): Promise<OrchestratorHandle>;
+export declare function recoverFromRestart(config: OrchestratorConfig): Promise<{
+    orphanedRebases: string[];
+    persistedShasLoaded: number;
+}>;
+//# sourceMappingURL=merge-orchestrator.d.ts.map

package/dist/team/merge-orchestrator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-orchestrator.d.ts","sourceRoot":"","sources":["../../src/team/merge-orchestrator.ts"],"names":[],"mappings":"AAiFA,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,4FAA4F;IAC5F,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oDAAoD;IACpD,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,mFAAmF;IACnF,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,0CAA0C;IAC1C,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD;;;OAGG;IACH,YAAY,IAAI,OAAO,CAAC;QAAE,QAAQ,EAAE,KAAK,CAAC;YAAE,UAAU,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE,CAAC,CAAC;IACrF,4DAA4D;IAC5D,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,qDAAqD;IACrD,QAAQ,IAAI;QACV,OAAO,EAAE,MAAM,EAAE,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjC,kBAAkB,EAAE,MAAM,CAAC;KAC5B,CAAC;CACH;AAuFD,MAAM,MAAM,qBAAqB,GAC7B,iBAAiB,GACjB,iBAAiB,GACjB,iBAAiB,GACjB,gBAAgB,GAChB,kBAAkB,GAClB,4BAA4B,GAC5B,kBAAkB,GAClB,iBAAiB,GACjB,iBAAiB,GACjB,kBAAkB,CAAC;AAwIvB,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,kBAAkB,CAAC,CA2e7B;AAMD,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC;IAAE,eAAe,EAAE,MAAM,EAAE,CAAC;IAAC,mBAAmB,EAAE,MAAM,CAAA;CAAE,CAAC,CAyDrE"}