@telora/daemon 0.15.1 → 0.15.3

package/dist/focus-team-lifecycle.js

@@ -0,0 +1,256 @@
+/**
+ * Focus team lifecycle management - terminate, wait, detect deactivated.
+ *
+ * Extracted from focus-executor.ts. These functions manage the lifecycle
+ * of running focus teams (shutdown, deactivation detection, merge checks).
+ */
+import { getReadyFocuses, } from './supabase.js';
+import { sendMessage } from '@telora/daemon-core';
+import { clearNarration } from './heartbeat.js';
+import { getActiveTeams } from './focus-team-state.js';
+import { mergeFocusBranch, escalateMergeConflict } from './focus-merge.js';
+import { mergeIntegrationToMain } from './git-merge.js';
+import { reportGitState } from './supabase.js';
+import { isStatusAgentActionable, isStatusBlocking, isStatusExcludedFromCascade } from './stage-classifier.js';
+import { getFocusDeliveries } from './queries/focuses.js';
+import { configForProduct, findProduct } from './config.js';
+// ── Team lifecycle ──────────────────────────────────────────────────────
+/**
+ * Terminate a focus team.
+ *
+ * Sends a deactivation message via stdin (if open) before SIGTERM
+ * to allow the team lead to process the shutdown gracefully.
+ */
+export function terminateTeam(focusId) {
+    const activeTeams = getActiveTeams();
+    const team = activeTeams.get(focusId);
+    if (!team || !team.leadPid)
+        return false;
+    // Warn if terminating while conflict resolution is in progress
+    if (team.resolvingMergeConflict) {
+        console.warn(`[focus-executor] Terminating team "${team.focusName}" while merge conflict resolution is in progress`);
+    }
+    console.log(`[focus-executor] Terminating team for focus "${team.focusName}" (phase: ${team.phase})`);
+    team.phase = 'shutting_down';
+    clearNarration(focusId);
+    try {
+        // Send a deactivation message first to let the team lead process it
+        if (team.leadStdin) {
+            sendMessage(team.leadStdin, 'Pipeline deactivated. Exit now.');
+            // Close stdin after a short delay to let the message be processed
+            setTimeout(() => {
+                try {
+                    team.leadStdin?.end();
+                }
+                catch (e) {
+                    console.debug('[focus-executor] stdin.end() failed (may already be closed):', e.message);
+                }
+            }, 5000);
+        }
+        // SIGTERM to the lead process -- it should clean up workers
+        process.kill(team.leadPid, 'SIGTERM');
+        // Escalate to SIGKILL after timeout
+        setTimeout(() => {
+            if (activeTeams.has(focusId) && team.leadPid) {
+                try {
+                    process.kill(team.leadPid, 'SIGKILL');
+                }
+                catch (e) {
+                    console.debug('[focus-executor] SIGKILL failed (process may have exited):', e.message);
+                }
+            }
+        }, 30000);
+        return true;
+    }
+    catch (e) {
+        console.debug(`[focus-executor] terminateTeam: process may have already exited:`, e.message);
+        return false;
+    }
+}
+/**
+ * Wait for a team's process to exit (leave activeTeams).
+ *
+ * Polls activeTeams until the focus is no longer present,
+ * which happens when handleTeamCompletion runs on the 'close' event.
+ * If the timeout expires, sends SIGKILL and waits briefly.
+ *
+ * @param focusId - Focus to wait for
+ * @param timeoutMs - Max wait time in ms (default 30s)
+ * @returns true if team exited within timeout, false if forced
+ */
+export async function waitForTeamExit(focusId, timeoutMs = 30000) {
+    const activeTeams = getActiveTeams();
+    const team = activeTeams.get(focusId);
+    if (!team)
+        return true; // Already gone
+    const deadline = Date.now() + timeoutMs;
+    const pollMs = 500;
+    while (Date.now() < deadline) {
+        if (!activeTeams.has(focusId))
+            return true;
+        await new Promise(resolve => setTimeout(resolve, pollMs));
+    }
+    // Timeout expired — escalate to SIGKILL
+    if (team.leadPid) {
+        console.warn(`[focus-executor] Team "${team.focusName}" did not exit within ${timeoutMs}ms, sending SIGKILL`);
+        try {
+            process.kill(team.leadPid, 'SIGKILL');
+        }
+        catch { /* process may already be gone */ }
+        // Brief wait for SIGKILL to take effect
+        await new Promise(resolve => setTimeout(resolve, 2000));
+    }
+    return !activeTeams.has(focusId);
+}
+/**
+ * Terminate all active teams.
+ */
+export function terminateAllTeams() {
+    const activeTeams = getActiveTeams();
+    for (const focusId of activeTeams.keys()) {
+        terminateTeam(focusId);
+    }
+}
+/**
+ * Detect focuses that have been deactivated (agent role removed)
+ * and shut down their active teams.
+ */
+export async function detectDeactivatedFocuses(config) {
+    const activeTeams = getActiveTeams();
+    if (activeTeams.size === 0)
+        return;
+    try {
+        // Aggregate ready focuses across all configured products
+        const allReadyFocuses = [];
+        for (const product of config.products) {
+            const focuses = await getReadyFocuses(config.organizationId, product.id);
+            allReadyFocuses.push(...focuses);
+        }
+        const activeFocusIds = new Set(allReadyFocuses.map(s => s.focus_id));
+        for (const [focusId, team] of activeTeams) {
+            if (!activeFocusIds.has(focusId) && team.phase !== 'shutting_down' && team.phase !== 'terminated') {
+                console.log(`[focus-executor] Focus "${team.focusName}" deactivated -- shutting down team`);
+                // Mark the shutdown reason so handleTeamCompletion can skip the merge
+                // attempt cleanly when a planning team is cancelled mid-flight.
+                team.shutdownReason = 'deactivated';
+                terminateTeam(focusId);
+            }
+        }
+    }
+    catch (err) {
+        console.warn(`[focus-executor] Failed to check for deactivated focuses:`, err.message);
+    }
+}
+/**
+ * Check active teams for newly completed deliveries and merge
+ * the focus branch to integration incrementally.
+ *
+ * Called from the poll loop. For each active team, queries delivery
+ * statuses and triggers a merge when any delivery reaches verify/done
+ * that hasn't already been merged mid-flight.
+ *
+ * After processing merges, checks if ALL active deliveries are terminal
+ * and merged. If so, terminates the team proactively since no more work
+ * remains. The focus stays active in the DB -- if new deliveries
+ * arrive later, the next poll cycle spawns a fresh team.
+ */
+export async function checkAndMergeCompletedDeliveries(config) {
+    const activeTeams = getActiveTeams();
+    if (activeTeams.size === 0)
+        return;
+    for (const [focusId, team] of activeTeams) {
+        // Only check teams that are actively executing
+        if (team.phase !== 'executing')
+            continue;
+        // Skip merge attempts while team lead is resolving a merge conflict
+        if (team.resolvingMergeConflict) {
+            console.log(`[focus-executor] Skipping merge check for "${team.focusName}" -- conflict resolution in progress`);
+            continue;
+        }
+        // Use product-scoped config for this team's merge operations
+        const teamProduct = findProduct(config, team.productId);
+        const teamConfig = teamProduct ? configForProduct(config, teamProduct) : config;
+        try {
+            const deliveries = await getFocusDeliveries(focusId);
+            // Find deliveries in verify/done that we haven't merged for yet
+            const newlyCompleted = deliveries.filter(d => !isStatusAgentActionable(d.executionStatus ?? '') && !isStatusBlocking(d.executionStatus ?? '')
+                && !team.mergedDeliveryIds.has(d.id));
+            if (newlyCompleted.length > 0) {
+                const completedNames = newlyCompleted.map(d => d.name).join(', ');
+                console.log(`[focus-executor] ${newlyCompleted.length} delivery(ies) completed mid-flight for "${team.focusName}": ${completedNames} -- merging to integration`);
+                // One merge covers all completed deliveries (same branch).
+                // Pass the newly-completed IDs so git state is recorded only for
+                // these — never for queued/planning deliveries on the same branch.
+                const mergeResult = await mergeFocusBranch(teamConfig, team, team.leadSessionId ?? '', team.branchName, newlyCompleted.map(d => d.id));
+                if (mergeResult.mergeSucceeded) {
+                    // Track merged deliveries (git state already reported by mergeFocusBranch)
+                    for (const d of newlyCompleted) {
+                        team.mergedDeliveryIds.add(d.id);
+                    }
+                    // ── Eager CI: merge integration → main when all deliveries are merged ──
+                    // Don't wait for team exit — run CI as soon as all work reaches integration.
+                    if (team.pipelineConfig?.ci?.enabled) {
+                        const activeDeliveries = deliveries.filter(d => !isStatusExcludedFromCascade(d.executionStatus ?? ''));
+                        const allMerged = activeDeliveries.length > 0 && activeDeliveries.every(d => team.mergedDeliveryIds.has(d.id));
+                        if (allMerged) {
+                            const pushToRemote = team.pipelineConfig?.cd?.enabled ?? false;
+                            const ciLabel = pushToRemote ? 'CI+CD' : 'CI';
+                            console.log(`[${ciLabel}] All deliveries merged for "${team.focusName}" -- merging integration to main${pushToRemote ? ' (will push to remote)' : ''}`);
+                            try {
+                                const ciResult = await mergeIntegrationToMain({
+                                    config: teamConfig,
+                                    focusName: team.focusName,
+                                    pushToRemote,
+                                });
+                                if (ciResult.success) {
+                                    console.log(`[${ciLabel}] Successfully merged integration to main for "${team.focusName}"`);
+                                    for (const d of activeDeliveries) {
+                                        const newState = pushToRemote ? 'pushed_to_remote' : 'merged_to_main';
+                                        reportGitState(d.id, newState).catch(err => console.warn(`[${ciLabel}] reportGitState ${newState} failed for ${d.id}:`, err.message));
+                                    }
+                                }
+                                else {
+                                    console.error(`[${ciLabel}] Failed to merge integration to main for "${team.focusName}": ${ciResult.error}`);
+                                }
+                            }
+                            catch (err) {
+                                console.error(`[${ciLabel}] Error merging integration to main for "${team.focusName}":`, err.message);
+                            }
+                        }
+                    }
+                }
+                else {
+                    console.warn(`[focus-executor] Mid-flight merge failed for "${team.focusName}": ${mergeResult.exitReason}`);
+                    // Escalate merge conflict for each unmerged delivery
+                    for (const d of newlyCompleted) {
+                        escalateMergeConflict({
+                            organizationId: team.organizationId,
+                            sessionId: team.leadSessionId ?? '',
+                            deliveryId: d.id,
+                            deliveryName: d.name,
+                            branchName: team.branchName,
+                            integrationBranch: config.integrationBranch,
+                            mergeError: mergeResult.exitReason,
+                        }).catch(err => console.warn(`[focus-executor] escalateMergeConflict failed for ${d.id}:`, err.message));
+                    }
+                    // Don't mark as merged -- will retry next poll. Team continues working.
+                }
+            }
+            // ── All-done detection ──────────────────────────────────────
+            // If any delivery is queued or running, the team still has work.
+            // Otherwise the team is idle, waiting for the daemon to push new work.
+            const teamWork = deliveries.filter(d => isStatusAgentActionable(d.executionStatus ?? ''));
+            if (teamWork.length > 0) {
+                console.log(`[focus-executor] ${teamWork.length} delivery(ies) still queued/running for "${team.focusName}" -- team continues`);
+                continue;
+            }
+            // No queued/running deliveries -- team is idle, completion detector
+            // handles the actual idle transition. Log for observability.
+            console.log(`[focus-executor] All deliveries complete for "${team.focusName}" -- team is idle`);
+        }
+        catch (err) {
+            console.warn(`[focus-executor] Failed to check completed deliveries for "${team.focusName}":`, err.message);
+        }
+    }
+}
+//# sourceMappingURL=focus-team-lifecycle.js.map

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

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

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

@@ -0,0 +1,24 @@
+/**
+ * Focus team state management.
+ *
+ * Tracks active focus teams in memory and provides
+ * query/mutation helpers for the active teams map.
+ */
+import type { FocusTeamState, FocusExecutionConfig, PipelineConfig } from './types.js';
+/**
+ * Get all active focus teams.
+ */
+export declare function getActiveTeams(): Map<string, FocusTeamState>;
+/**
+ * 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;
+/**
+ * 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

@@ -0,0 +1 @@
+{"version":3,"file":"focus-team-state.d.ts","sourceRoot":"","sources":["../src/focus-team-state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EACpB,cAAc,EACf,MAAM,YAAY,CAAC;AAOpB;;GAEG;AACH,wBAAgB,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAE5D;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAUD;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,eAAe,EAAE,cAAc,GAAG,IAAI,GAAG,oBAAoB,CAKlG"}

package/dist/focus-team-state.js

@@ -0,0 +1,43 @@
+/**
+ * Focus team state management.
+ *
+ * Tracks active focus teams in memory and provides
+ * query/mutation helpers for the active teams map.
+ */
+// ── Active teams tracking ────────────────────────────────────────────
+/** Active focus teams: focusId -> FocusTeamState */
+const activeTeams = new Map();
+/**
+ * Get all active focus teams.
+ */
+export function getActiveTeams() {
+    return activeTeams;
+}
+/**
+ * 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;
+}
+// ── 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

@@ -0,0 +1 @@
+{"version":3,"file":"focus-team-state.js","sourceRoot":"","sources":["../src/focus-team-state.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,wEAAwE;AAExE,oDAAoD;AACpD,MAAM,WAAW,GAAG,IAAI,GAAG,EAA0B,CAAC;AAEtD;;GAEG;AACH,MAAM,UAAU,cAAc;IAC5B,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,OAAO,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO,WAAW,CAAC,IAAI,CAAC;AAC1B,CAAC;AAED,wEAAwE;AAExE,MAAM,wBAAwB,GAAyB;IACrD,UAAU,EAAE,CAAC;IACb,kBAAkB,EAAE,KAAK;IACzB,oBAAoB,EAAE,KAAK;CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,eAAsC;IAC1E,kEAAkE;IAClE,wDAAwD;IACxD,wEAAwE;IACxE,OAAO,EAAE,GAAG,wBAAwB,EAAE,CAAC;AACzC,CAAC"}

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

@@ -0,0 +1,47 @@
+/**
+ * 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.
+ */
+import type { FocusWorktreeInfo } from './types.js';
+/**
+ * Hydrate the in-memory cache from the database.
+ *
+ * Call once during daemon startup, BEFORE rebuildFocusWorktreeState.
+ * Stores the productId for subsequent write-through operations.
+ */
+export declare function hydrateFromDb(productId: 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.
+ */
+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.
+ */
+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

@@ -0,0 +1 @@
+{"version":3,"file":"focus-worktree-state.d.ts","sourceRoot":"","sources":["../src/focus-worktree-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAgBpD;;;;;GAKG;AACH,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BpE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAE/E;AAED;;;;GAIG;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

@@ -0,0 +1,104 @@
+/**
+ * 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.
+ */
+import { upsertWorktreeRecord, removeWorktreeRecord, listWorktreeRecords, } from './queries/worktrees.js';
+// ── Module-level config ──────────────────────────────────────────────
+let configuredProductId = null;
+// ── Persistent worktree tracking ─────────────────────────────────────
+/** Persistent focus worktrees: focusId -> FocusWorktreeInfo */
+const focusWorktrees = new Map();
+/**
+ * Hydrate the in-memory cache from the database.
+ *
+ * Call once during daemon startup, BEFORE rebuildFocusWorktreeState.
+ * Stores the productId for subsequent write-through operations.
+ */
+export async function hydrateFromDb(productId) {
+    configuredProductId = productId;
+    let records;
+    try {
+        records = await listWorktreeRecords(productId);
+    }
+    catch (err) {
+        console.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),
+            hasQaDevServer: false, // Runtime-only state
+        });
+        hydrated++;
+    }
+    if (hydrated > 0) {
+        console.log(`[worktree-state] Hydrated ${hydrated} worktree(s) from DB`);
+    }
+}
+/**
+ * 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.
+ */
+export function setFocusWorktree(focusId, info) {
+    focusWorktrees.set(focusId, info);
+    // Write-through: async DB upsert (fire-and-forget)
+    upsertWorktreeRecord({
+        focusId,
+        productId: configuredProductId,
+        worktreePath: info.worktreePath,
+        branchName: info.branchName,
+        status: 'active',
+    }).catch((err) => {
+        console.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) => {
+            console.warn(`[worktree-state] DB remove failed for focus ${focusId}:`, err.message);
+        });
+    }
+    return existed;
+}
+/**
+ * Get all focus worktrees.
+ */
+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

@@ -0,0 +1 @@
+{"version":3,"file":"focus-worktree-state.js","sourceRoot":"","sources":["../src/focus-worktree-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAEhC,wEAAwE;AAExE,IAAI,mBAAmB,GAAkB,IAAI,CAAC;AAE9C,wEAAwE;AAExE,+DAA+D;AAC/D,MAAM,cAAc,GAAG,IAAI,GAAG,EAA6B,CAAC;AAE5D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,SAAiB;IACnD,mBAAmB,GAAG,SAAS,CAAC;IAEhC,IAAI,OAAO,CAAC;IACZ,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,mBAAmB,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,CACV,wEAAwE,EACvE,GAAa,CAAC,OAAO,CACvB,CAAC;QACF,OAAO;IACT,CAAC;IAED,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE;YACjC,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,SAAS,EAAE,EAAE,EAAE,wCAAwC;YACvD,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,SAAS,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YACrC,cAAc,EAAE,KAAK,EAAE,qBAAqB;SAC7C,CAAC,CAAC;QACH,QAAQ,EAAE,CAAC;IACb,CAAC;IAED,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,6BAA6B,QAAQ,sBAAsB,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,OAAO,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAe,EAAE,IAAuB;IACvE,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAElC,mDAAmD;IACnD,oBAAoB,CAAC;QACnB,OAAO;QACP,SAAS,EAAE,mBAAmB;QAC9B,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,MAAM,EAAE,QAAQ;KACjB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACf,OAAO,CAAC,IAAI,CACV,+CAA+C,OAAO,GAAG,EACxD,GAAa,CAAC,OAAO,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,MAAM,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAE/C,IAAI,OAAO,EAAE,CAAC;QACZ,mDAAmD;QACnD,oBAAoB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YAC1C,OAAO,CAAC,IAAI,CACV,+CAA+C,OAAO,GAAG,EACxD,GAAa,CAAC,OAAO,CACvB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB;IAClC,OAAO,cAAc,CAAC;AACxB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,OAAO,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC"}

package/dist/git-merge.d.ts

@@ -60,15 +60,15 @@ export interface MergeToIntegrationParams {
 export declare function mergeToIntegration(params: MergeToIntegrationParams): Promise<MergeResult>;
 export interface MergeIntegrationToMainParams {
     config: DaemonConfig;
-    /** Strategy name for logging/commit messages. */
-    strategyName: string;
+    /** Focus name for logging/commit messages. */
+    focusName: string;
     /** Whether to also push main to remote (CD). */
     pushToRemote: boolean;
 }
 /**
  * Merge the integration branch into the default (main) branch.
  *
- * Called when a strategy completes with CI enabled. Optionally pushes
+ * Called when a focus completes with CI enabled. Optionally pushes
  * to remote when CD is also enabled.
  *
  * Uses the merge worktree and merge lock (same as mergeToIntegration)
@@ -76,7 +76,7 @@ export interface MergeIntegrationToMainParams {
  */
 export declare function mergeIntegrationToMain(params: MergeIntegrationToMainParams): Promise<MergeResult>;
 export interface MergeBackFromIntegrationParams {
-    /** Path to the strategy/delivery worktree. */
+    /** Path to the focus/delivery worktree. */
     worktreePath: string;
     /** Name of the integration branch (e.g., 'integration'). */
     integrationBranch: string;
@@ -85,7 +85,7 @@ export interface MergeBackFromIntegrationParams {
  * Merge the latest integration HEAD into the current branch of a worktree.
  *
  * This is the "prevent conflicts" layer: by syncing integration changes into
- * the strategy branch before merging to integration, we guarantee the final
+ * the focus branch before merging to integration, we guarantee the final
  * merge will be conflict-free (or surface conflicts early for agent resolution).
  *
  * On conflict: does NOT abort -- leaves conflict markers in the worktree

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

@@ -1 +1 @@
-{"version":3,"file":"git-merge.d.ts","sourceRoot":"","sources":["../src/git-merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EAAc,KAAK,WAAW,EAAE,KAAK,aAAa,EAAwB,MAAM,gBAAgB,CAAC;AACxG,OAAO,EAAyC,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmCpG,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,CAoD5F;AA0HD;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,WAAW,CA8Cb;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,aAAa,GACtB,WAAW,CAmBb;AAID,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9G;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,WAAW,CAAC,CA4GtB;AAID,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,YAAY,CAAC;IACrB,iDAAiD;IACjD,YAAY,EAAE,MAAM,CAAC;IACrB,gDAAgD;IAChD,YAAY,EAAE,OAAO,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,WAAW,CAAC,CAwFtB;AAID,MAAM,WAAW,8BAA8B;IAC7C,8CAA8C;IAC9C,YAAY,EAAE,MAAM,CAAC;IACrB,4DAA4D;IAC5D,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,eAAe,CAAC,CAgE1B"}
+{"version":3,"file":"git-merge.d.ts","sourceRoot":"","sources":["../src/git-merge.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EAAc,KAAK,WAAW,EAAE,KAAK,aAAa,EAAwB,MAAM,gBAAgB,CAAC;AACxG,OAAO,EAAyC,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAmCpG,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,CAoD5F;AA0HD;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,WAAW,CA8Cb;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,aAAa,GACtB,WAAW,CAmBb;AAID,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CAC9G;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,WAAW,CAAC,CA4GtB;AAID,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,YAAY,CAAC;IACrB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,gDAAgD;IAChD,YAAY,EAAE,OAAO,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,WAAW,CAAC,CAwFtB;AAID,MAAM,WAAW,8BAA8B;IAC7C,2CAA2C;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,4DAA4D;IAC5D,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,eAAe,CAAC,CAgE1B"}

package/dist/git-merge.js

@@ -330,14 +330,14 @@ export function mergeToIntegration(params) {
 /**
  * Merge the integration branch into the default (main) branch.
  *
- * Called when a strategy completes with CI enabled. Optionally pushes
+ * Called when a focus completes with CI enabled. Optionally pushes
  * to remote when CD is also enabled.
  *
  * Uses the merge worktree and merge lock (same as mergeToIntegration)
  * to avoid concurrent merge conflicts.
  */
 export function mergeIntegrationToMain(params) {
-    const { config, strategyName, pushToRemote } = params;
+    const { config, focusName, pushToRemote } = params;
     return withMergeLock(async () => {
         const mwt = getMergeWorktreePath(config);
         const mainBranch = getDefaultBranch(config.repoPath);
@@ -362,7 +362,7 @@ export function mergeIntegrationToMain(params) {
         }
         // Save pre-merge state for rollback
         const preMergeRef = runGitSync(['rev-parse', 'HEAD'], mwt);
-        const commitMessage = `Merge integration: ${strategyName} [CI]`;
+        const commitMessage = `Merge integration: ${focusName} [CI]`;
         // Try fast-forward first, fall back to merge commit
         let result = tryFastForwardMerge(mwt, config.integrationBranch);
         if (!result.success) {
@@ -411,13 +411,13 @@ export function mergeIntegrationToMain(params) {
             commitSha: result.commitSha,
             preMergeRef: preMergeRef.success ? preMergeRef.output : undefined,
         };
-    }, `mergeIntegrationToMain:${strategyName}`);
+    }, `mergeIntegrationToMain:${focusName}`);
 }
 /**
  * Merge the latest integration HEAD into the current branch of a worktree.
  *
  * This is the "prevent conflicts" layer: by syncing integration changes into
- * the strategy branch before merging to integration, we guarantee the final
+ * the focus branch before merging to integration, we guarantee the final
  * merge will be conflict-free (or surface conflicts early for agent resolution).
  *
  * On conflict: does NOT abort -- leaves conflict markers in the worktree