@telora/daemon 0.21.12 → 0.21.81

package/dist/focus-stage-lifecycle.js.map

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

package/dist/focus-team-state.d.ts

@@ -1,94 +0,0 @@
-/**
- * Focus team state management.
- *
- * Tracks active focus teams in memory and provides
- * query/mutation helpers for the active teams map.
- */
-import type { ResourceGovernor, SlotToken } from '@telora/daemon-core';
-import type { FocusTeamState, FocusExecutionConfig, PipelineConfig } from './types.js';
-/**
- * Record that the team for `focusId` just produced an agent event. Advances the
- * per-team last-activity clock; called on every agent_event so an actively
- * working team's timestamp keeps moving forward (silence is measured as the gap
- * between now and this value, not from spawn).
- *
- * @param focusId Focus whose team produced the event.
- * @param now     Epoch ms of the event (default Date.now()).
- */
-export declare function recordTeamActivity(focusId: string, now?: number): void;
-/**
- * Epoch ms of the team's last recorded agent event, or null when nothing has
- * been recorded yet (e.g. a team still initializing before its first event). A
- * liveness watchdog treats null as "not yet stalled", never as "stalled since
- * epoch".
- */
-export declare function getTeamLastActivityAt(focusId: string): number | null;
-/**
- * Clear the recorded last-activity timestamp for a focus. Called on team reap
- * (next to clearShuttingDown) so a later team for the same focus starts with a
- * clean clock and the side-table does not accumulate dead entries.
- */
-export declare function clearTeamActivity(focusId: string): void;
-/**
- * Get all active focus teams.
- */
-export declare function getActiveTeams(): Map<string, FocusTeamState>;
-/**
- * Record that a team entered the `shutting_down` phase at the given time.
- * Idempotent on the FIRST transition: a repeat call does NOT overwrite the
- * original timestamp, so the watchdog measures from when shutdown actually
- * began (re-entering terminateTeam must not keep resetting the clock).
- *
- * @param focusId Focus whose team is shutting down.
- * @param now     Epoch ms the team entered shutting_down (default Date.now()).
- */
-export declare function markShuttingDown(focusId: string, now?: number): void;
-/**
- * Epoch ms when the team for `focusId` entered `shutting_down`, or null if it
- * has no recorded shutdown start.
- */
-export declare function getShuttingDownAt(focusId: string): number | null;
-/**
- * Clear the recorded shutting-down timestamp for a focus. Called when a team
- * is reaped or otherwise leaves activeTeams so a later team for the same
- * focus starts with a clean slate. Deliberately does NOT touch the slot
- * token: an unreleased slot must stay releasable (or be self-healed on the
- * next recordSlotToken), never silently dropped.
- */
-export declare function clearShuttingDown(focusId: string): void;
-/**
- * Record the governor slot token minted for a focus team's spawn. If a stale
- * token from a defunct team is still recorded (its release path never ran),
- * release it now -- only one team per focus can exist, so a lingering token
- * here is a wedged slot, not a live one.
- */
-export declare function recordSlotToken(focusId: string, token: SlotToken, governor: ResourceGovernor | null): void;
-/**
- * Release the governor slot for a focus, exactly once. Consumes the recorded
- * token; a call with no recorded token (already released, or the spawn never
- * acquired one) is a no-op. Returns true if a slot was actually released.
- */
-export declare function releaseFocusSlot(focusId: string, governor: ResourceGovernor | null): boolean;
-/**
- * Test-only: reset the shutting-down + slot-token side tables.
- */
-export declare function __resetShutdownTrackingForTesting(): void;
-/**
- * Check if a focus already has an active team.
- */
-export declare function hasActiveTeam(focusId: string): boolean;
-/**
- * Get count of active teams.
- */
-export declare function getActiveTeamCount(): number;
-/**
- * Test-only helper: toggle hasActiveTeam(focusId) without instantiating
- * a real FocusTeamState. Tests use this to gate behavior that depends on
- * whether a team is in flight.
- */
-export declare function __setActiveTeamForTesting(focusId: string, active: boolean): void;
-/**
- * Derive execution config from focus pipeline config.
- */
-export declare function deriveExecutionConfig(_pipelineConfig: PipelineConfig | null): FocusExecutionConfig;
-//# sourceMappingURL=focus-team-state.d.ts.map

package/dist/focus-team-state.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"focus-team-state.d.ts","sourceRoot":"","sources":["../src/focus-team-state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACpB,cAAc,EACf,MAAM,YAAY,CAAC;AAkCpB;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAmB,GAAG,IAAI,CAElF;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEpE;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAEvD;AAWD;;GAEG;AACH,wBAAgB,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAE5D;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAmB,GAAG,IAAI,CAIhF;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEhE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAEvD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,gBAAgB,GAAG,IAAI,GAChC,IAAI,CASN;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,gBAAgB,GAAG,IAAI,GAChC,OAAO,CAMT;AAED;;GAEG;AACH,wBAAgB,iCAAiC,IAAI,IAAI,CAIxD;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,IAAI,CAMhF;AAUD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,cAAc,GAAG,IAAI,GAAG,oBAAoB,CAKlG"}

package/dist/focus-team-state.js

@@ -1,182 +0,0 @@
-/**
- * Focus team state management.
- *
- * Tracks active focus teams in memory and provides
- * query/mutation helpers for the active teams map.
- */
-import { createLogger } from './log.js';
-const log = createLogger({ module: 'focus-executor' });
-// ── Active teams tracking ────────────────────────────────────────────
-/** Active focus teams: focusId -> FocusTeamState */
-const activeTeams = new Map();
-/**
- * Side-table of when each team entered the `shutting_down` phase
- * (focusId -> epoch ms). Kept here rather than on FocusTeamState so the
- * stuck-shutdown watchdog has a precise entry timestamp without threading a
- * new field through every team construction site. An entry is recorded by
- * `markShuttingDown` (called from terminateTeam) and cleared when the team
- * leaves activeTeams.
- */
-const shuttingDownAt = new Map();
-/**
- * Side-table of when each team last produced an agent event (focusId -> epoch
- * ms). Kept here rather than on FocusTeamState so the liveness watchdog has a
- * per-team last-activity clock without threading a new field through every team
- * construction site (same rationale as shuttingDownAt). Advanced by
- * recordTeamActivity on every agent_event (output-monitor.ts), read by
- * getTeamLastActivityAt, and cleared alongside shuttingDownAt when the team is
- * reaped. Distinct from the process-wide agent-state.lastActivityAt (which the
- * heartbeat consumes): this measures a SINGLE team's silence, so a watchdog can
- * tell a working team from a parked one.
- */
-const lastActivityAt = new Map();
-/**
- * Record that the team for `focusId` just produced an agent event. Advances the
- * per-team last-activity clock; called on every agent_event so an actively
- * working team's timestamp keeps moving forward (silence is measured as the gap
- * between now and this value, not from spawn).
- *
- * @param focusId Focus whose team produced the event.
- * @param now     Epoch ms of the event (default Date.now()).
- */
-export function recordTeamActivity(focusId, now = Date.now()) {
-    lastActivityAt.set(focusId, now);
-}
-/**
- * Epoch ms of the team's last recorded agent event, or null when nothing has
- * been recorded yet (e.g. a team still initializing before its first event). A
- * liveness watchdog treats null as "not yet stalled", never as "stalled since
- * epoch".
- */
-export function getTeamLastActivityAt(focusId) {
-    return lastActivityAt.get(focusId) ?? null;
-}
-/**
- * Clear the recorded last-activity timestamp for a focus. Called on team reap
- * (next to clearShuttingDown) so a later team for the same focus starts with a
- * clean clock and the side-table does not accumulate dead entries.
- */
-export function clearTeamActivity(focusId) {
-    lastActivityAt.delete(focusId);
-}
-/**
- * Side-table of live governor slot tokens (focusId -> SlotToken). The token
- * minted by acquireSlot at team spawn is recorded here; releaseFocusSlot
- * consumes it. Taking the token IS the release claim, so every release path
- * (natural close, error, sandbox refusal, resume retry, stuck-shutdown
- * watchdog) is exactly-once per team regardless of firing order.
- */
-const slotTokens = new Map();
-/**
- * Get all active focus teams.
- */
-export function getActiveTeams() {
-    return activeTeams;
-}
-/**
- * Record that a team entered the `shutting_down` phase at the given time.
- * Idempotent on the FIRST transition: a repeat call does NOT overwrite the
- * original timestamp, so the watchdog measures from when shutdown actually
- * began (re-entering terminateTeam must not keep resetting the clock).
- *
- * @param focusId Focus whose team is shutting down.
- * @param now     Epoch ms the team entered shutting_down (default Date.now()).
- */
-export function markShuttingDown(focusId, now = Date.now()) {
-    if (!shuttingDownAt.has(focusId)) {
-        shuttingDownAt.set(focusId, now);
-    }
-}
-/**
- * Epoch ms when the team for `focusId` entered `shutting_down`, or null if it
- * has no recorded shutdown start.
- */
-export function getShuttingDownAt(focusId) {
-    return shuttingDownAt.get(focusId) ?? null;
-}
-/**
- * Clear the recorded shutting-down timestamp for a focus. Called when a team
- * is reaped or otherwise leaves activeTeams so a later team for the same
- * focus starts with a clean slate. Deliberately does NOT touch the slot
- * token: an unreleased slot must stay releasable (or be self-healed on the
- * next recordSlotToken), never silently dropped.
- */
-export function clearShuttingDown(focusId) {
-    shuttingDownAt.delete(focusId);
-}
-/**
- * Record the governor slot token minted for a focus team's spawn. If a stale
- * token from a defunct team is still recorded (its release path never ran),
- * release it now -- only one team per focus can exist, so a lingering token
- * here is a wedged slot, not a live one.
- */
-export function recordSlotToken(focusId, token, governor) {
-    const stale = slotTokens.get(focusId);
-    if (stale) {
-        log.warn(`[focus-executor] Releasing stale governor slot for focus ${focusId} (previous team never released it)`);
-        governor?.releaseSlot(stale);
-    }
-    slotTokens.set(focusId, token);
-}
-/**
- * Release the governor slot for a focus, exactly once. Consumes the recorded
- * token; a call with no recorded token (already released, or the spawn never
- * acquired one) is a no-op. Returns true if a slot was actually released.
- */
-export function releaseFocusSlot(focusId, governor) {
-    const token = slotTokens.get(focusId);
-    if (!token)
-        return false;
-    slotTokens.delete(focusId);
-    governor?.releaseSlot(token);
-    return true;
-}
-/**
- * Test-only: reset the shutting-down + slot-token side tables.
- */
-export function __resetShutdownTrackingForTesting() {
-    shuttingDownAt.clear();
-    slotTokens.clear();
-    lastActivityAt.clear();
-}
-/**
- * Check if a focus already has an active team.
- */
-export function hasActiveTeam(focusId) {
-    return activeTeams.has(focusId);
-}
-/**
- * Get count of active teams.
- */
-export function getActiveTeamCount() {
-    return activeTeams.size;
-}
-/**
- * Test-only helper: toggle hasActiveTeam(focusId) without instantiating
- * a real FocusTeamState. Tests use this to gate behavior that depends on
- * whether a team is in flight.
- */
-export function __setActiveTeamForTesting(focusId, active) {
-    if (active) {
-        activeTeams.set(focusId, {});
-    }
-    else {
-        activeTeams.delete(focusId);
-    }
-}
-// ── Default execution config ─────────────────────────────────────────
-const DEFAULT_EXECUTION_CONFIG = {
-    maxWorkers: 3,
-    idlePollIntervalMs: 30000,
-    activePollIntervalMs: 60000,
-};
-/**
- * Derive execution config from focus pipeline config.
- */
-export function deriveExecutionConfig(_pipelineConfig) {
-    // For now, use defaults. The teams.enabled flag in pipelineConfig
-    // is deprecated — teams are always the execution model.
-    // Future: pipelineConfig could specify maxWorkers or parallelism level.
-    return { ...DEFAULT_EXECUTION_CONFIG };
-}
-//# sourceMappingURL=focus-team-state.js.map

package/dist/focus-team-state.js.map

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

package/dist/focus-worktree-state.d.ts

@@ -1,58 +0,0 @@
-/**
- * Focus worktree state management — write-through cache.
- *
- * Tracks persistent focus worktrees using a local Map as the
- * synchronous read cache, backed by the focus_worktrees DB table.
- *
- * Read path: all get/has/getAll calls are synchronous (Map lookup).
- * Write path: update Map immediately, then fire async DB write.
- * Startup: hydrateFromDb() loads all records from DB into the Map.
- *
- * The Map is authoritative during runtime. The DB is authoritative
- * across restarts. Async DB writes are fire-and-forget with logging.
- *
- * The Map spans ALL products a multi-product daemon manages. Product
- * identity is carried on each entry (FocusWorktreeInfo.productId /
- * .repoPath), never in module state: every write-through stamps the
- * owning product from the entry itself, so a hydrate/rebuild pass for
- * one product cannot misattribute another product's worktrees.
- */
-import type { FocusWorktreeInfo } from './types.js';
-/**
- * Hydrate the in-memory cache from the database for one product.
- *
- * Call once per configured product during daemon startup, BEFORE
- * rebuildFocusWorktreeState. Each hydrated entry is stamped with the
- * product identity it was hydrated under; rebuildFocusWorktreeState
- * later re-stamps entries whose stored product_id was wrong (rows
- * written under the historical last-write-wins bug) once it can prove
- * ownership against the product's active focuses.
- */
-export declare function hydrateFromDb(productId: string, repoPath: string): Promise<void>;
-/**
- * Get a single focus worktree by focus ID.
- */
-export declare function getFocusWorktree(focusId: string): FocusWorktreeInfo | undefined;
-/**
- * Add or update a focus worktree entry.
- *
- * Updates the Map synchronously, then fires an async DB upsert stamped
- * with the entry's own product identity.
- */
-export declare function setFocusWorktree(focusId: string, info: FocusWorktreeInfo): void;
-/**
- * Remove a focus worktree entry.
- * Returns whether the entry existed.
- *
- * Deletes from Map synchronously, then fires an async DB remove.
- */
-export declare function removeFocusWorktree(focusId: string): boolean;
-/**
- * Get all focus worktrees (spans all products; scope by entry.productId).
- */
-export declare function getAllFocusWorktrees(): Map<string, FocusWorktreeInfo>;
-/**
- * Check if a focus has a persistent worktree.
- */
-export declare function hasFocusWorktree(focusId: string): boolean;
-//# sourceMappingURL=focus-worktree-state.d.ts.map

package/dist/focus-worktree-state.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"focus-worktree-state.d.ts","sourceRoot":"","sources":["../src/focus-worktree-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAgBpD;;;;;;;;;GASG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BtF;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAE/E;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,GAAG,IAAI,CAgB/E;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAc5D;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAErE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEzD"}

package/dist/focus-worktree-state.js

@@ -1,115 +0,0 @@
-/**
- * Focus worktree state management — write-through cache.
- *
- * Tracks persistent focus worktrees using a local Map as the
- * synchronous read cache, backed by the focus_worktrees DB table.
- *
- * Read path: all get/has/getAll calls are synchronous (Map lookup).
- * Write path: update Map immediately, then fire async DB write.
- * Startup: hydrateFromDb() loads all records from DB into the Map.
- *
- * The Map is authoritative during runtime. The DB is authoritative
- * across restarts. Async DB writes are fire-and-forget with logging.
- *
- * The Map spans ALL products a multi-product daemon manages. Product
- * identity is carried on each entry (FocusWorktreeInfo.productId /
- * .repoPath), never in module state: every write-through stamps the
- * owning product from the entry itself, so a hydrate/rebuild pass for
- * one product cannot misattribute another product's worktrees.
- */
-import { upsertWorktreeRecord, removeWorktreeRecord, listWorktreeRecords, } from './queries/worktrees.js';
-import { createLogger } from './log.js';
-const log = createLogger({ module: 'worktree-state' });
-// ── Persistent worktree tracking ─────────────────────────────────────
-/** Persistent focus worktrees: focusId -> FocusWorktreeInfo */
-const focusWorktrees = new Map();
-/**
- * Hydrate the in-memory cache from the database for one product.
- *
- * Call once per configured product during daemon startup, BEFORE
- * rebuildFocusWorktreeState. Each hydrated entry is stamped with the
- * product identity it was hydrated under; rebuildFocusWorktreeState
- * later re-stamps entries whose stored product_id was wrong (rows
- * written under the historical last-write-wins bug) once it can prove
- * ownership against the product's active focuses.
- */
-export async function hydrateFromDb(productId, repoPath) {
-    let records;
-    try {
-        records = await listWorktreeRecords(productId);
-    }
-    catch (err) {
-        log.warn(`[worktree-state] Failed to hydrate from DB, starting with empty cache:`, err.message);
-        return;
-    }
-    let hydrated = 0;
-    for (const record of records) {
-        focusWorktrees.set(record.focusId, {
-            focusId: record.focusId,
-            focusName: '', // Not stored in DB — rebuilt by callers
-            worktreePath: record.worktreePath,
-            branchName: record.branchName,
-            createdAt: new Date(record.createdAt),
-            productId,
-            repoPath,
-        });
-        hydrated++;
-    }
-    if (hydrated > 0) {
-        log.info(`Hydrated ${hydrated} worktree(s) from DB for product ${productId}`);
-    }
-}
-/**
- * Get a single focus worktree by focus ID.
- */
-export function getFocusWorktree(focusId) {
-    return focusWorktrees.get(focusId);
-}
-/**
- * Add or update a focus worktree entry.
- *
- * Updates the Map synchronously, then fires an async DB upsert stamped
- * with the entry's own product identity.
- */
-export function setFocusWorktree(focusId, info) {
-    focusWorktrees.set(focusId, info);
-    // Write-through: async DB upsert (fire-and-forget)
-    upsertWorktreeRecord({
-        focusId,
-        productId: info.productId,
-        worktreePath: info.worktreePath,
-        branchName: info.branchName,
-        status: 'active',
-    }).catch((err) => {
-        log.warn(`[worktree-state] DB upsert failed for focus ${focusId}:`, err.message);
-    });
-}
-/**
- * Remove a focus worktree entry.
- * Returns whether the entry existed.
- *
- * Deletes from Map synchronously, then fires an async DB remove.
- */
-export function removeFocusWorktree(focusId) {
-    const existed = focusWorktrees.delete(focusId);
-    if (existed) {
-        // Write-through: async DB remove (fire-and-forget)
-        removeWorktreeRecord(focusId).catch((err) => {
-            log.warn(`[worktree-state] DB remove failed for focus ${focusId}:`, err.message);
-        });
-    }
-    return existed;
-}
-/**
- * Get all focus worktrees (spans all products; scope by entry.productId).
- */
-export function getAllFocusWorktrees() {
-    return focusWorktrees;
-}
-/**
- * Check if a focus has a persistent worktree.
- */
-export function hasFocusWorktree(focusId) {
-    return focusWorktrees.has(focusId);
-}
-//# sourceMappingURL=focus-worktree-state.js.map

package/dist/focus-worktree-state.js.map

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

package/dist/git/merge-helpers.d.ts

@@ -1,48 +0,0 @@
-/**
- * Git merge helper functions.
- *
- * Low-level helpers for merge operations: remote detection, conflict
- * extraction, rollback, untracked file handling, and push failure recovery.
- */
-import { type MergeResult } from './types.js';
-import { type CorruptionDetails } from './merge-lock.js';
-/**
- * Returns true if the repo at repoPath has an 'origin' remote configured.
- * Used to gate all network operations so the daemon works in remote-less repos.
- */
-export declare function hasOriginRemote(repoPath: string): boolean;
-/**
- * Extract the list of conflicted files from git status.
- * Returns an empty array if the command fails or there are no conflicts.
- */
-export declare function extractConflictedFiles(repoPath: string): string[];
-/**
- * Hard-reset the current branch to a given ref.
- * Returns whether the rollback succeeded.
- */
-export declare function rollbackToRef(repoPath: string, ref: string): boolean;
-interface PushFailureRollbackParams {
-    repoPath: string;
-    branch: string;
-    preMergeRef: string;
-    pushError: string;
-    sourceBranch: string;
-    targetBranch: string;
-    onRollbackFailure?: (details: CorruptionDetails) => void;
-}
-/**
- * Handle a push failure with rollback. If rollback also fails, marks the
- * branch as corrupt and returns a result indicating the failure.
- */
-export declare function handlePushFailureWithRollback(params: PushFailureRollbackParams): MergeResult;
-/**
- * Handle untracked files that block a merge.
- *
- * When agents create new files (e.g. migrations) that also exist as
- * untracked files in the main repo working directory, git refuses to
- * merge. This helper parses the error output, removes the blocking
- * files, and returns true if blocking files were cleaned.
- */
-export declare function handleUntrackedFilesBlockingMerge(repoPath: string, errorOutput: string): boolean;
-export {};
-//# sourceMappingURL=merge-helpers.d.ts.map

package/dist/git/merge-helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"merge-helpers.d.ts","sourceRoot":"","sources":["../../src/git/merge-helpers.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAA0B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMjF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAMjE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAGpE;AAED,UAAU,yBAAyB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC1D;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,yBAAyB,GAAG,WAAW,CA8C5F;AAED;;;;;;;GAOG;AACH,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CA6BT"}

package/dist/git/merge-helpers.js

@@ -1,107 +0,0 @@
-/**
- * Git merge helper functions.
- *
- * Low-level helpers for merge operations: remote detection, conflict
- * extraction, rollback, untracked file handling, and push failure recovery.
- */
-import { runGitSync } from './types.js';
-import { markIntegrationCorrupt } from './merge-lock.js';
-import { createLogger } from '../log.js';
-const log = createLogger({ module: 'merge-lock' });
-/**
- * Returns true if the repo at repoPath has an 'origin' remote configured.
- * Used to gate all network operations so the daemon works in remote-less repos.
- */
-export function hasOriginRemote(repoPath) {
-    return runGitSync(['remote', 'get-url', 'origin'], repoPath, { timeoutMs: 3_000 }).success;
-}
-/**
- * Extract the list of conflicted files from git status.
- * Returns an empty array if the command fails or there are no conflicts.
- */
-export function extractConflictedFiles(repoPath) {
-    const statusResult = runGitSync(['diff', '--name-only', '--diff-filter=U'], repoPath);
-    if (!statusResult.success) {
-        return [];
-    }
-    return statusResult.output.split('\n').filter(Boolean);
-}
-/**
- * Hard-reset the current branch to a given ref.
- * Returns whether the rollback succeeded.
- */
-export function rollbackToRef(repoPath, ref) {
-    const result = runGitSync(['reset', '--hard', ref], repoPath);
-    return result.success;
-}
-/**
- * Handle a push failure with rollback. If rollback also fails, marks the
- * branch as corrupt and returns a result indicating the failure.
- */
-export function handlePushFailureWithRollback(params) {
-    const { repoPath, branch, preMergeRef, pushError, sourceBranch, targetBranch, onRollbackFailure } = params;
-    log.error(`Push to origin failed for ${branch}: ${pushError}`);
-    const rollbackSuccess = rollbackToRef(repoPath, preMergeRef);
-    if (rollbackSuccess) {
-        log.info(`Rolled back local merge to ${preMergeRef.slice(0, 8)}`);
-        return {
-            success: false,
-            error: `Push failed (local merge rolled back): ${pushError}. Branch ${sourceBranch} preserved for retry.`,
-            sourceBranch,
-            targetBranch,
-        };
-    }
-    // Rollback also failed -- mark as corrupt
-    const currentHeadResult = runGitSync(['rev-parse', 'HEAD'], repoPath);
-    const currentHead = currentHeadResult.success ? currentHeadResult.output : 'unknown';
-    const details = {
-        branch,
-        attemptedRollbackRef: preMergeRef,
-        currentHead,
-    };
-    markIntegrationCorrupt(details);
-    log.error(`[merge-lock] CRITICAL: Push failed AND rollback failed for "${branch}". ` +
-        `Branch is in a corrupt state. Attempted rollback to ${preMergeRef}, ` +
-        `current HEAD: ${currentHead}. All further merge operations will be rejected ` +
-        `until manual recovery and daemon restart.`);
-    if (onRollbackFailure) {
-        onRollbackFailure(details);
-    }
-    return {
-        success: false,
-        error: `Push failed AND rollback failed. Branch "${branch}" is corrupt. ` +
-            `Manual recovery required: git reset --hard origin/${branch}`,
-        sourceBranch,
-        targetBranch,
-        rollbackFailed: true,
-    };
-}
-/**
- * Handle untracked files that block a merge.
- *
- * When agents create new files (e.g. migrations) that also exist as
- * untracked files in the main repo working directory, git refuses to
- * merge. This helper parses the error output, removes the blocking
- * files, and returns true if blocking files were cleaned.
- */
-export function handleUntrackedFilesBlockingMerge(repoPath, errorOutput) {
-    const isUntrackedBlock = errorOutput.includes('untracked working tree files would be overwritten') ||
-        errorOutput.includes('would be overwritten by merge');
-    if (!isUntrackedBlock) {
-        return false;
-    }
-    const lines = errorOutput.split('\n');
-    const blockingFiles = lines
-        .map((l) => l.trim())
-        .filter((l) => l &&
-        !l.startsWith('error:') &&
-        !l.startsWith('Please') &&
-        !l.startsWith('Aborting'));
-    if (blockingFiles.length === 0) {
-        return false;
-    }
-    log.info(`Removing ${blockingFiles.length} untracked file(s) blocking merge: ${blockingFiles.join(', ')}`);
-    runGitSync(['clean', '-f', '--', ...blockingFiles], repoPath);
-    return true;
-}
-//# sourceMappingURL=merge-helpers.js.map

package/dist/git/merge-helpers.js.map

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