@telora/daemon 0.21.26 → 0.21.82

package/dist/worktree/focus.js

@@ -1,105 +1,28 @@
 /**
- * Focus worktree lifecycle: canonical removal and orphan cleanup.
+ * Focus worktree orphan-classification pure cores.
  *
- * safeRemoveFocusWorktree is the single code path for all focus
- * worktree removals -- it merges before removing and conditionally
- * clears in-memory state.
+ * identifyOrphanWorktrees decides which `agent-*` worktree dirs are orphans
+ * (no matching active focus) -- the irreversible delete decision, so it is
+ * extracted and tested directly. parseWorktreeBranches parses
+ * `git worktree list --porcelain` into a path -> branch map.
  *
- * cleanupOrphanFocusWorktrees scans the worktree directory on startup
- * and removes worktrees that no longer match any active focus.
+ * The stateful lifecycle (safeRemoveFocusWorktree / cleanupOrphanFocusWorktrees)
+ * lives in the top-level worktree.ts, which is the live path
+ * (git.ts -> focus-lifecycle.ts). This module holds only the pure,
+ * directly-tested cores those functions build on.
  */
-import { existsSync, readdirSync, statSync } from 'node:fs';
-import { join, resolve } from 'node:path';
-import { runGitSync } from '../git/index.js';
-import { mergeToIntegration } from '../git/index.js';
-import { getActiveFocuses } from '../queries/deliveries.js';
-import { removeFocusWorktree as removeFocusWorktreeState } from '../focus-worktree-state.js';
+import { resolve } from 'node:path';
 import { sanitizeGitSegment } from '../git/index.js';
-import { branchHasUnmergedCommits, removeWorktree } from './safety.js';
-import { createLogger } from '../log.js';
-const log = createLogger({ module: 'worktree' });
-// ── Canonical worktree removal ────────────────────────────────────
-/**
- * Canonical focus worktree removal: merge-before-remove + conditional cleanup.
- *
- * Every code path that removes a focus worktree should route through this
- * function. It encapsulates the full lifecycle:
- *   1. Check for unmerged commits on the branch
- *   2. Attempt merge to integration if needed
- *   3. Call removeWorktree with safety guards (handles uncommitted changes)
- *   4. Conditionally clear in-memory state based on whether removal succeeded
- *
- * Returns structured result so callers can count cleaned/preserved and log.
- */
-export async function safeRemoveFocusWorktree(params) {
-    const { config, worktreePath, branchName, deliveryName, deliveryId, focusId } = params;
-    const { repoPath, integrationBranch } = config;
-    // 1. Attempt merge if there are unmerged commits
-    let mergeSucceeded = false;
-    let merged = false;
-    let mergeError;
-    try {
-        if (branchHasUnmergedCommits(branchName, integrationBranch, repoPath)) {
-            log.info(`Attempting merge for ${branchName} before removal`);
-            const mergeResult = await mergeToIntegration({
-                config,
-                branchName,
-                deliveryName,
-                deliveryId: deliveryId ?? deliveryName,
-            });
-            mergeSucceeded = mergeResult.success;
-            merged = true;
-            if (mergeResult.success) {
-                log.info(`Merge succeeded for ${branchName}`);
-            }
-            else {
-                mergeError = mergeResult.error ?? 'unknown';
-                log.warn(`[worktree] Merge failed for ${branchName}: ${mergeError}. ` +
-                    `Safety guards will preserve the branch.`);
-            }
-        }
-        else {
-            mergeSucceeded = true; // Nothing to merge
-        }
-    }
-    catch (err) {
-        mergeError = err.message;
-        log.warn(`Merge attempt failed for ${branchName}: ${mergeError}`);
-    }
-    // 2. Remove worktree (safety guards handle uncommitted changes and unmerged commits)
-    let removed = false;
-    try {
-        removed = removeWorktree(repoPath, worktreePath, {
-            branchName,
-            integrationBranch,
-            deliveryName,
-            mergeSucceeded,
-        });
-    }
-    catch (err) {
-        log.warn(`Failed to remove worktree ${worktreePath}: ${err.message}`);
-    }
-    // 3. Conditionally clear in-memory state
-    if (focusId) {
-        if (removed) {
-            removeFocusWorktreeState(focusId);
-        }
-        else {
-            log.info(`[worktree] Worktree preserved for focus ${focusId} -- keeping in-memory state`);
-        }
-    }
-    return { removed, merged, mergeError };
-}
 /**
  * Identify orphan focus worktree dirs: `agent-*` directories that do NOT
  * correspond to any active focus.
  *
- * Extracted from cleanupOrphanFocusWorktrees because misclassifying a LIVE
- * focus's worktree as an orphan deletes in-flight work -- this is the
- * irreversible decision and must be tested directly. The matching mirrors the
- * spawn-time dir naming (`agent-<role>-<name>-<shortId>`) with a fallback that
- * treats any entry ending in the focus's 8-char short id as belonging to that
- * focus, so a sanitization mismatch can never orphan a live worktree.
+ * Misclassifying a LIVE focus's worktree as an orphan deletes in-flight work --
+ * this is the irreversible decision and must be tested directly. The matching
+ * mirrors the spawn-time dir naming (`agent-<role>-<name>-<shortId>`) with a
+ * fallback that treats any entry ending in the focus's 8-char short id as
+ * belonging to that focus, so a sanitization mismatch can never orphan a live
+ * worktree.
  *
  * Only `agent-*` dirs are ever considered orphans; anything else is left alone.
  */
@@ -151,91 +74,4 @@ export function parseWorktreeBranches(porcelainOutput) {
     }
     return pathToBranch;
 }
-// ── Orphan focus worktree cleanup ──────────────────────────────
-/**
- * Clean up orphan focus worktrees on daemon startup.
- *
- * Scans the worktree directory and cross-references against active
- * focuses (those with assigned agent roles and queued deliveries).
- * Worktrees that don't match any active focus are orphans from a
- * previous daemon run and are cleaned up.
- *
- * Conservative approach:
- * - Safety-commits any uncommitted changes before removal
- * - Checks for unmerged commits before deleting
- * - Logs all actions for auditability
- *
- * @returns Count of orphans cleaned up and preserved
- */
-export async function cleanupOrphanFocusWorktrees(config) {
-    const { worktreeDir, repoPath, organizationId, productId } = config;
-    let cleaned = 0;
-    let preserved = 0;
-    if (!existsSync(worktreeDir)) {
-        return { cleaned, preserved };
-    }
-    // 1. List all subdirectories in the worktree directory
-    let entries;
-    try {
-        entries = readdirSync(worktreeDir).filter((entry) => {
-            try {
-                return statSync(join(worktreeDir, entry)).isDirectory();
-            }
-            catch (e) {
-                log.debug(`Failed to stat ${entry} (may have been deleted):`, e.message);
-                return false;
-            }
-        });
-    }
-    catch (err) {
-        log.warn(`[worktree] Failed to scan worktree directory: ${err instanceof Error ? err.message : String(err)}`);
-        return { cleaned, preserved };
-    }
-    if (entries.length === 0) {
-        return { cleaned, preserved };
-    }
-    // 2. Query active focuses, then 3. identify orphans via the pure classifier.
-    let orphanDirs;
-    try {
-        const activeFocusesList = await getActiveFocuses(organizationId, productId);
-        orphanDirs = identifyOrphanWorktrees(entries, activeFocusesList);
-    }
-    catch (err) {
-        log.warn(`[worktree] Failed to query active focuses for orphan detection: ` +
-            `${err instanceof Error ? err.message : String(err)}. Skipping orphan cleanup.`);
-        return { cleaned, preserved };
-    }
-    if (orphanDirs.length === 0) {
-        log.info('No orphan focus worktrees found');
-        return { cleaned, preserved };
-    }
-    log.info(`Found ${orphanDirs.length} orphan focus worktree(s)`);
-    // 4. Parse git worktree list to get branch names for each path
-    const worktreeListResult = runGitSync(['worktree', 'list', '--porcelain'], repoPath);
-    const pathToBranch = worktreeListResult.success
-        ? parseWorktreeBranches(worktreeListResult.output)
-        : new Map();
-    // 5. Clean up each orphan via canonical removal path
-    for (const dir of orphanDirs) {
-        const worktreePath = resolve(join(worktreeDir, dir));
-        const branchName = pathToBranch.get(worktreePath) ?? dir.replace(/-/g, '/');
-        const deliveryName = branchName.split('/').slice(2).join('/') || dir;
-        log.info(`Cleaning up orphan focus worktree: ${worktreePath} [${branchName}]`);
-        const result = await safeRemoveFocusWorktree({
-            config,
-            worktreePath,
-            branchName,
-            deliveryName,
-            deliveryId: dir, // No real delivery ID -- use dir name for traceability
-        });
-        if (result.removed) {
-            cleaned++;
-        }
-        else {
-            preserved++;
-        }
-    }
-    log.info(`[worktree] Orphan focus worktree cleanup: ${cleaned} cleaned, ${preserved} preserved`);
-    return { cleaned, preserved };
-}
 //# sourceMappingURL=focus.js.map

package/dist/worktree/focus.js.map

@@ -1 +1 @@
-{"version":3,"file":"focus.js","sourceRoot":"","sources":["../../src/worktree/focus.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"focus.js","sourceRoot":"","sources":["../../src/worktree/focus.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAWrD;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,uBAAuB,CACrC,OAAiB,EACjB,aAAyC;IAEzC,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAU,CAAC;IAChD,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;QAC9B,MAAM,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvC,MAAM,aAAa,GAAG,kBAAkB,CAAC,CAAC,CAAC,eAAe,IAAI,UAAU,CAAC,CAAC;QAC1E,MAAM,aAAa,GAAG,kBAAkB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,SAAS,aAAa,IAAI,aAAa,IAAI,OAAO,EAAE,CAAC;QACzE,IAAI,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAClC,qBAAqB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACzC,CAAC;aAAM,CAAC;YACN,mEAAmE;YACnE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC5B,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QAC9B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,OAAO,KAAK,CAAC;QAC9C,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,eAAuB;IAC3D,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC/C,IAAI,WAAW,GAAkB,IAAI,CAAC;IACtC,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/C,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YACjC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,IAAI,WAAW,EAAE,CAAC;YAChE,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC;YAChF,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC;aAAM,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YACvB,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC"}

package/dist/worktree/identity.js

@@ -21,7 +21,7 @@
 import { realpathSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { runGitSync } from '../git/index.js';
-import { createLogger } from '../log.js';
+import { createLogger } from '../shell/log.js';
 const log = createLogger({ module: 'worktree' });
 /**
  * Canonicalize a path for comparison: resolve symlinks via realpath so a

package/dist/worktree/identity.js.map

@@ -1 +1 @@
-{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/worktree/identity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;AAEjD;;;;;GAKG;AACH,SAAS,YAAY,CAAC,CAAS;IAC7B,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAgBD;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CAAC,YAAoB;IACzD,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,WAAW,EAAE,iBAAiB,CAAC,EAAE,YAAY,CAAC,CAAC;IACvE,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,OAAO;YACL,EAAE,EAAE,KAAK;YACT,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,yCAAyC,YAAY,EAAE;SAChE,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAE5C,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IACpC,CAAC;IAED,OAAO;QACL,EAAE,EAAE,KAAK;QACT,YAAY;QACZ,MAAM,EACJ,iBAAiB,YAAY,wCAAwC;YACrE,IAAI,YAAY,wDAAwD;YACxE,wDAAwD;KAC3D,CAAC;AACJ,CAAC;AAoBD,4FAA4F;AAC5F,MAAM,CAAC,MAAM,wCAAwC,GAAsC,CAAC,CAAC,EAAE,EAAE;IAC/F,GAAG,CAAC,KAAK,CACP,uBAAuB,CAAC,CAAC,SAAS,OAAO,CAAC,CAAC,YAAY,sBAAsB;QAC7E,gCAAgC,CAAC,CAAC,YAAY,IAAI,eAAe,gBAAgB;QACjF,yEAAyE;QACzE,wDAAwD,CACzD,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/worktree/identity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;AAEjD;;;;;GAKG;AACH,SAAS,YAAY,CAAC,CAAS;IAC7B,IAAI,CAAC;QACH,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;AACH,CAAC;AAgBD;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CAAC,YAAoB;IACzD,MAAM,GAAG,GAAG,UAAU,CAAC,CAAC,WAAW,EAAE,iBAAiB,CAAC,EAAE,YAAY,CAAC,CAAC;IACvE,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,OAAO;YACL,EAAE,EAAE,KAAK;YACT,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,yCAAyC,YAAY,EAAE;SAChE,CAAC;IACJ,CAAC;IAED,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAE5C,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;IACpC,CAAC;IAED,OAAO;QACL,EAAE,EAAE,KAAK;QACT,YAAY;QACZ,MAAM,EACJ,iBAAiB,YAAY,wCAAwC;YACrE,IAAI,YAAY,wDAAwD;YACxE,wDAAwD;KAC3D,CAAC;AACJ,CAAC;AAoBD,4FAA4F;AAC5F,MAAM,CAAC,MAAM,wCAAwC,GAAsC,CAAC,CAAC,EAAE,EAAE;IAC/F,GAAG,CAAC,KAAK,CACP,uBAAuB,CAAC,CAAC,SAAS,OAAO,CAAC,CAAC,YAAY,sBAAsB;QAC7E,gCAAgC,CAAC,CAAC,YAAY,IAAI,eAAe,gBAAgB;QACjF,yEAAyE;QACzE,wDAAwD,CACzD,CAAC;AACJ,CAAC,CAAC"}

package/dist/worktree/index.d.ts

@@ -7,7 +7,7 @@
  *
  * Modules:
  * - safety.ts -- worktree dirty/unmerged safety checks + safe removal / WIP commit
- * - focus.ts  -- focus-worktree safe removal + orphan cleanup
+ * - focus.ts  -- orphan-classification pure cores (identifyOrphanWorktrees / parseWorktreeBranches)
  * - state.ts  -- worktree write-in-progress signal detection
  */
 export * from './safety.js';

package/dist/worktree/index.js

@@ -7,7 +7,7 @@
  *
  * Modules:
  * - safety.ts -- worktree dirty/unmerged safety checks + safe removal / WIP commit
- * - focus.ts  -- focus-worktree safe removal + orphan cleanup
+ * - focus.ts  -- orphan-classification pure cores (identifyOrphanWorktrees / parseWorktreeBranches)
  * - state.ts  -- worktree write-in-progress signal detection
  */
 export * from './safety.js';

package/dist/worktree/provision.d.ts

@@ -0,0 +1,147 @@
+/**
+ * Git worktree management for the daemon.
+ *
+ * Handles worktree creation, cleanup, pruning, and safety checks
+ * for agent session isolation.
+ *
+ * Base operations (prune, existence check, WIP commit, removal, creation)
+ * are imported from @telora/daemon-core. Daemon-specific extensions
+ * (safety guards, merge-before-remove, orphan cleanup) are implemented here.
+ */
+import type { DaemonConfig } from '../types/index.js';
+import { worktreeHasUncommittedChanges, branchHasUnmergedCommits, safetyCommitWorktree, removeWorktree, commitWipChanges } from './safety.js';
+export { getMergeWorktreePath } from '../git/index.js';
+/**
+ * Create or validate the persistent merge worktree.
+ *
+ * Uses a detached HEAD worktree at `.telora/merge-worktree/` so merge
+ * functions can checkout any branch without "already checked out" conflicts.
+ * The main repo working tree is never touched during merge operations.
+ *
+ * Called once from initGit() after ensureIntegrationBranch().
+ */
+export declare function ensureMergeWorktree(config: DaemonConfig): string;
+/**
+ * Parameters for the canonical worktree removal function.
+ */
+export interface SafeRemoveFocusWorktreeParams {
+    config: DaemonConfig;
+    worktreePath: string;
+    branchName: string;
+    /** Human-readable name for logging and merge commit messages. */
+    deliveryName: string;
+    /** Delivery/focus ID for merge traceability. Falls back to deliveryName. */
+    deliveryId?: string;
+    /** If provided, clears in-memory worktree state on successful removal. */
+    focusId?: string;
+}
+/**
+ * Result of a canonical worktree removal attempt.
+ */
+export interface SafeRemoveResult {
+    /** Whether the worktree was actually removed from disk. */
+    removed: boolean;
+    /** Whether a merge to integration was attempted and succeeded. */
+    merged: boolean;
+    /** Error message if merge failed. */
+    mergeError?: string;
+}
+/**
+ * Ensure the worktree directory exists.
+ */
+export declare function ensureWorktreeDir(config: DaemonConfig): void;
+/**
+ * Clean up stale worktree entries on startup.
+ *
+ * Delegates to daemon-core's pruneWorktrees.
+ */
+export declare function pruneWorktrees(repoPath: string): void;
+/**
+ * Check if a worktree exists for a branch.
+ *
+ * Delegates to daemon-core's worktreeExistsForBranch.
+ */
+export declare function worktreeExistsForBranch(branchName: string, repoPath: string): boolean;
+/**
+ * Generate .mcp.json in a worktree with absolute path to the MCP server.
+ *
+ * Uses the daemon's own @telora/mcp-products dependency to resolve the
+ * MCP server entry point. The generated config uses an absolute path,
+ * so it works in any worktree without symlinks. It carries the MCP profile
+ * ONLY -- workstation identity resolves from the single source
+ * ~/.telora/daemon.json via the MCP server's loadCredentials(), so no
+ * DaemonConfig is needed here.
+ */
+export declare function generateMcpConfigInWorktree(worktreePath: string): void;
+/**
+ * Ensure daemon-generated Codex project config stays local to this git worktree.
+ *
+ * Focus worktrees often have a `.git` pointer file, so write to the path Git
+ * reports for `info/exclude` instead of assuming `<worktree>/.git/info/exclude`.
+ * The file is worktree-local and disappears when the worktree is pruned.
+ */
+export declare function ensureCodexConfigIgnoredInWorktree(worktreePath: string): void;
+/**
+ * Render the Codex project config Telora places in focus worktrees.
+ *
+ * Keep provider/auth keys out of project config. Codex intentionally ignores
+ * those from project-local `.codex/config.toml`; local-model routing remains in
+ * CODEX_HOME and child-process env.
+ */
+export declare function renderCodexWorktreeConfigToml(): string;
+/**
+ * Write Codex project config into a focus worktree.
+ *
+ * The config lives under `.codex/`, which `ensureCodexConfigIgnoredInWorktree`
+ * excludes from this worktree's git status. Codex loads it as a project config
+ * layer when the project is trusted, without replacing user auth state.
+ */
+export declare function generateCodexConfigInWorktree(worktreePath: string): void;
+/**
+ * Create a worktree for an agent session.
+ * The worktree is created from the integration branch.
+ *
+ * @returns The path to the created worktree
+ */
+export declare function createWorktree(config: DaemonConfig, branchName: string): Promise<string>;
+/**
+ * Canonical worktree safety primitives live in a SINGLE definition site,
+ * `./worktree/safety.ts`. Re-export them here so this module's historical
+ * import surface (consumed by `git.ts`'s re-export block, and used by the
+ * focus-worktree helpers below) is preserved without a second copy that
+ * could drift or leave a caller on stale behavior.
+ */
+export { worktreeHasUncommittedChanges, branchHasUnmergedCommits, safetyCommitWorktree, removeWorktree, commitWipChanges, };
+/**
+ * Canonical focus worktree removal: merge-before-remove + conditional cleanup.
+ *
+ * Every code path that removes a focus worktree should route through this
+ * function. It encapsulates the full lifecycle:
+ *   1. Check for unmerged commits on the branch
+ *   2. Attempt merge to integration if needed
+ *   3. Call removeWorktree with safety guards (handles uncommitted changes)
+ *   4. Conditionally clear in-memory state based on whether removal succeeded
+ *
+ * Returns structured result so callers can count cleaned/preserved and log.
+ */
+export declare function safeRemoveFocusWorktree(params: SafeRemoveFocusWorktreeParams): Promise<SafeRemoveResult>;
+/**
+ * Clean up orphan focus worktrees on daemon startup.
+ *
+ * Scans the worktree directory and cross-references against active
+ * focuses (those with assigned agent roles and queued deliveries).
+ * Worktrees that don't match any active focus are orphans from a
+ * previous daemon run and are cleaned up.
+ *
+ * Conservative approach:
+ * - Safety-commits any uncommitted changes before removal
+ * - Checks for unmerged commits before deleting
+ * - Logs all actions for auditability
+ *
+ * @returns Count of orphans cleaned up and preserved
+ */
+export declare function cleanupOrphanFocusWorktrees(config: DaemonConfig): Promise<{
+    cleaned: number;
+    preserved: number;
+}>;
+//# sourceMappingURL=provision.d.ts.map

package/dist/worktree/provision.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../src/worktree/provision.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAOtD,OAAO,EACL,6BAA6B,EAC7B,wBAAwB,EACxB,oBAAoB,EACpB,cAAc,EACd,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAgBrB,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAqChE;AAID;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,MAAM,EAAE,YAAY,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,YAAY,EAAE,MAAM,CAAC;IACrB,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0EAA0E;IAC1E,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,2DAA2D;IAC3D,OAAO,EAAE,OAAO,CAAC;IACjB,kEAAkE;IAClE,MAAM,EAAE,OAAO,CAAC;IAChB,qCAAqC;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAK5D;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAErD;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAET;AAED;;;;;;;;;GASG;AACH,wBAAgB,2BAA2B,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAWtE;AAID;;;;;;GAMG;AACH,wBAAgB,kCAAkC,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAyB7E;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,CAqBtD;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAWxE;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAgEjB;AAED;;;;;;GAMG;AACH,OAAO,EACL,6BAA6B,EAC7B,wBAAwB,EACxB,oBAAoB,EACpB,cAAc,EACd,gBAAgB,GACjB,CAAC;AAIF;;;;;;;;;;;GAWG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,6BAA6B,GACpC,OAAO,CAAC,gBAAgB,CAAC,CA8D3B;AAID;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAsIjD"}