@telora/daemon-core 0.2.5

package/dist/worktree.js

@@ -0,0 +1,221 @@
+/**
+ * Shared worktree operations for daemon and factory.
+ *
+ * Provides the common building blocks that both engines use for worktree
+ * lifecycle management: pruning, WIP commits, removal, existence checks,
+ * and creation. Engine-specific extensions (daemon's safety guards,
+ * merge-before-remove, orphan cleanup; factory's branch naming) live in
+ * their respective packages.
+ */
+import { existsSync, mkdirSync, rmSync } from 'node:fs';
+import { join } from 'node:path';
+import { runGit, branchExists } from './git.js';
+// ---------------------------------------------------------------------------
+// Prune
+// ---------------------------------------------------------------------------
+/**
+ * Prune stale worktree bookkeeping entries.
+ *
+ * Calls `git worktree prune` to clean up internal git state for worktrees
+ * whose directories no longer exist on disk. Both daemon and factory call
+ * this identically during startup and before worktree creation.
+ */
+export function pruneWorktrees(repoPath) {
+    const result = runGit(['worktree', 'prune'], repoPath);
+    if (result.success) {
+        console.log('[worktree] Pruned stale worktree entries');
+    }
+}
+// ---------------------------------------------------------------------------
+// WIP commit
+// ---------------------------------------------------------------------------
+/**
+ * Commit all uncommitted changes in a worktree as a WIP safety commit.
+ *
+ * Stages everything (`git add -A`), commits with a WIP-prefixed message,
+ * and returns the resulting commit SHA. Returns `null` if the worktree
+ * does not exist, has no uncommitted changes, or if any git operation fails.
+ *
+ * @param worktreePath  Absolute path to the worktree.
+ * @param label         Human-readable context for the commit message
+ *                      (e.g. delivery name, blueprint name, instance ID).
+ * @returns             Commit SHA if a WIP commit was created, `null` otherwise.
+ */
+export function commitWip(worktreePath, label) {
+    if (!existsSync(worktreePath)) {
+        console.warn(`[worktree] commitWip: worktree does not exist: ${worktreePath}`);
+        return null;
+    }
+    // Check for uncommitted changes (staged + unstaged + untracked)
+    const statusResult = runGit(['status', '--porcelain'], worktreePath);
+    if (!statusResult.success) {
+        console.warn(`[worktree] commitWip: git status failed: ${statusResult.error}`);
+        return null;
+    }
+    if (statusResult.output.length === 0) {
+        // Clean tree -- nothing to commit
+        return null;
+    }
+    // Stage everything
+    const addResult = runGit(['add', '-A'], worktreePath);
+    if (!addResult.success) {
+        console.warn(`[worktree] commitWip: failed to stage changes: ${addResult.error}`);
+        return null;
+    }
+    // Commit with WIP prefix
+    const commitResult = runGit(['commit', '-m', `WIP: ${label}`], worktreePath);
+    if (!commitResult.success) {
+        // May legitimately fail if staging resolved to no diff (e.g. only ignored files)
+        console.warn(`[worktree] commitWip: commit failed (may be empty): ${commitResult.error}`);
+        return null;
+    }
+    // Return the new HEAD sha
+    const hashResult = runGit(['rev-parse', 'HEAD'], worktreePath);
+    const sha = hashResult.success ? hashResult.output : null;
+    if (sha) {
+        console.log(`[worktree] WIP commit created: ${sha.slice(0, 8)} for "${label}"`);
+    }
+    return sha;
+}
+// ---------------------------------------------------------------------------
+// Remove (base)
+// ---------------------------------------------------------------------------
+/**
+ * Remove a worktree directory and clean up git bookkeeping.
+ *
+ * This is the base removal operation shared by both engines. It handles:
+ * - Already-removed worktrees (just prune git state)
+ * - `git worktree remove --force` as the primary removal path
+ * - Fallback to `rmSync` if git removal fails
+ * - Final `git worktree prune` to clean up bookkeeping
+ *
+ * Engine-specific safety guards (daemon's unmerged-commit checks,
+ * merge-before-remove) are layered on top of this function.
+ *
+ * @param repoPath      Absolute path to the main git repository.
+ * @param worktreePath  Absolute path to the worktree to remove.
+ * @returns             `true` if the worktree was removed (or already gone),
+ *                      `false` if removal failed.
+ */
+export function removeWorktreeBase(repoPath, worktreePath) {
+    try {
+        if (!existsSync(worktreePath)) {
+            console.log(`[worktree] Worktree already removed: ${worktreePath}`);
+            runGit(['worktree', 'prune'], repoPath);
+            return true;
+        }
+        // Attempt git-managed removal
+        const result = runGit(['worktree', 'remove', '--force', worktreePath], repoPath);
+        if (result.success) {
+            console.log(`[worktree] Removed worktree: ${worktreePath}`);
+            return true;
+        }
+        // Fallback: manual directory deletion
+        console.warn(`[worktree] git worktree remove failed: ${result.error}. ` +
+            `Falling back to manual cleanup.`);
+        if (existsSync(worktreePath)) {
+            rmSync(worktreePath, { recursive: true, force: true });
+            console.log(`[worktree] Manually removed worktree directory: ${worktreePath}`);
+        }
+        // Prune so git stops tracking the now-deleted directory
+        runGit(['worktree', 'prune'], repoPath);
+        return true;
+    }
+    catch (err) {
+        console.error(`[worktree] Error removing worktree ${worktreePath}: `, err instanceof Error ? err.message : String(err));
+        return false;
+    }
+}
+// ---------------------------------------------------------------------------
+// Existence check
+// ---------------------------------------------------------------------------
+/**
+ * Check if a worktree is currently checked out for a given branch.
+ *
+ * Parses `git worktree list --porcelain` output and checks for a matching
+ * `branch refs/heads/{branchName}` entry.
+ *
+ * @param branchName  Branch name to search for (e.g. `agent/dev/my-feature`).
+ * @param repoPath    Absolute path to the main git repository.
+ * @returns           `true` if a worktree is attached to the branch.
+ */
+export function worktreeExistsForBranch(branchName, repoPath) {
+    const result = runGit(['worktree', 'list', '--porcelain'], repoPath);
+    if (!result.success) {
+        return false;
+    }
+    return result.output.includes(`branch refs/heads/${branchName}`);
+}
+// ---------------------------------------------------------------------------
+// Create (base)
+// ---------------------------------------------------------------------------
+/**
+ * Create a worktree with an isolated branch.
+ *
+ * This is the shared worktree creation logic used by both engines:
+ * 1. Ensure the parent `worktreeDir` exists
+ * 2. Remove any existing directory at the target path (clean start)
+ * 3. Prune stale worktree entries
+ * 4. Remove any lingering worktree registration for the branch
+ * 5. Create the worktree using the existing branch or a new branch
+ *
+ * The `baseBranch` parameter controls what the new branch forks from:
+ * - Daemon passes the integration branch
+ * - Factory omits it (forks from HEAD of the default branch)
+ *
+ * @param repoPath     Absolute path to the main git repository.
+ * @param worktreeDir  Parent directory for worktrees
+ *                     (e.g. `.telora/worktrees/` or `.telora/factory-worktrees/`).
+ * @param branchName   Full branch name (e.g. `agent/dev/feat-abc12345`
+ *                     or `factory/my-blueprint-a1b2c3d4`).
+ * @param baseBranch   Branch to fork from when creating a new branch.
+ *                     If omitted, `git worktree add -b` forks from HEAD.
+ * @returns            The worktree path and whether a new branch was created.
+ * @throws             If the worktree cannot be created.
+ */
+export function createWorktreeBase(repoPath, worktreeDir, branchName, baseBranch) {
+    // Ensure the parent worktree directory exists
+    if (!existsSync(worktreeDir)) {
+        mkdirSync(worktreeDir, { recursive: true });
+        console.log(`[worktree] Created worktree directory: ${worktreeDir}`);
+    }
+    // Derive a filesystem-safe subdirectory name from the branch
+    const safeName = branchName.replace(/\//g, '-');
+    const worktreePath = join(worktreeDir, safeName);
+    // If the target directory already exists, remove it to start clean
+    if (existsSync(worktreePath)) {
+        console.log(`[worktree] Removing existing worktree directory: ${worktreePath}`);
+        rmSync(worktreePath, { recursive: true, force: true });
+    }
+    // Prune stale worktree entries
+    runGit(['worktree', 'prune'], repoPath);
+    // If git still tracks a worktree for this branch after pruning, remove it
+    if (worktreeExistsForBranch(branchName, repoPath)) {
+        console.log(`[worktree] Removing stale worktree entry for branch: ${branchName}`);
+        runGit(['worktree', 'remove', '--force', branchName], repoPath);
+    }
+    // Determine if the branch already exists
+    const branchAlreadyExists = branchExists(branchName, repoPath);
+    if (branchAlreadyExists) {
+        // Use existing branch
+        console.log(`[worktree] Creating worktree from existing branch: ${branchName}`);
+        const result = runGit(['worktree', 'add', worktreePath, branchName], repoPath);
+        if (!result.success) {
+            throw new Error(`Failed to create worktree from existing branch: ${result.error}`);
+        }
+        return { worktreePath, created: false };
+    }
+    // Create new branch (optionally forked from baseBranch)
+    const args = ['worktree', 'add', '-b', branchName, worktreePath];
+    if (baseBranch) {
+        args.push(baseBranch);
+    }
+    console.log(`[worktree] Creating worktree with new branch: ${branchName}` +
+        (baseBranch ? ` from ${baseBranch}` : ''));
+    const result = runGit(args, repoPath);
+    if (!result.success) {
+        throw new Error(`Failed to create worktree with new branch: ${result.error}`);
+    }
+    return { worktreePath, created: true };
+}
+//# sourceMappingURL=worktree.js.map

package/dist/worktree.js.map

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

package/package.json

@@ -0,0 +1,57 @@
+{
+  "name": "@telora/daemon-core",
+  "version": "0.2.5",
+  "description": "Shared core infrastructure for Telora daemon and factory - resilience, API client, config, git operations",
+  "type": "module",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/index.js",
+      "types": "./dist/index.d.ts"
+    }
+  },
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "dev": "tsc --watch",
+    "build": "tsc",
+    "clean": "rm -rf dist",
+    "lint": "eslint .",
+    "test": "npx tsx --test src/__tests__/*.test.ts",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "zod": "^4.3.6"
+  },
+  "devDependencies": {
+    "@types/node": "^22.12.0",
+    "eslint-import-resolver-typescript": "^4.4.4",
+    "eslint-plugin-import-x": "^4.16.1",
+    "tsx": "^4.19.2",
+    "typescript": "^5.7.3"
+  },
+  "engines": {
+    "node": ">=20"
+  },
+  "keywords": [
+    "telora",
+    "daemon-core",
+    "resilience",
+    "api-client",
+    "infrastructure"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/syntelyos/telora.git",
+    "directory": "packages/daemon-core"
+  },
+  "license": "MIT",
+  "author": "Syntelyos",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  }
+}