@telora/daemon 0.13.8 → 0.13.10

package/dist/worktree-merge.js

@@ -0,0 +1,57 @@
+/**
+ * Merge worktree management.
+ *
+ * The persistent merge worktree is a detached-HEAD worktree at
+ * `.telora/merge-worktree/` used by merge operations so the main
+ * repo working tree is never touched during merges.
+ */
+import { existsSync, mkdirSync, rmSync } from 'node:fs';
+import { join } from 'node:path';
+import { runGitSync } from './git-types.js';
+/**
+ * Derive the merge worktree path from config. Deterministic -- no state.
+ */
+export function getMergeWorktreePath(config) {
+    return join(config.repoPath, '.telora', 'merge-worktree');
+}
+/**
+ * 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 function ensureMergeWorktree(config) {
+    const teloraDir = join(config.repoPath, '.telora');
+    const wtPath = getMergeWorktreePath(config);
+    // Ensure .telora directory exists
+    if (!existsSync(teloraDir)) {
+        mkdirSync(teloraDir, { recursive: true });
+    }
+    if (existsSync(wtPath)) {
+        // Validate it's a functioning worktree (has a .git file or directory)
+        const gitMarker = join(wtPath, '.git');
+        if (existsSync(gitMarker)) {
+            console.log(`[merge-worktree] Using existing merge worktree: ${wtPath}`);
+            return wtPath;
+        }
+        // Directory exists but isn't a valid worktree -- prune and recreate
+        console.log(`[merge-worktree] Stale merge worktree detected, recreating...`);
+        rmSync(wtPath, { recursive: true, force: true });
+        runGitSync(['worktree', 'prune'], config.repoPath);
+    }
+    else {
+        // Prune in case git still has a stale entry for this path
+        runGitSync(['worktree', 'prune'], config.repoPath);
+    }
+    // Create detached HEAD worktree (avoids branch conflicts)
+    const result = runGitSync(['worktree', 'add', '--detach', wtPath], config.repoPath);
+    if (!result.success) {
+        throw new Error(`Failed to create merge worktree: ${result.error}`);
+    }
+    console.log(`[merge-worktree] Created merge worktree: ${wtPath}`);
+    return wtPath;
+}
+//# sourceMappingURL=worktree-merge.js.map

package/dist/worktree-merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktree-merge.js","sourceRoot":"","sources":["../src/worktree-merge.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAAoB;IACvD,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;AAC5D,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAoB;IACtD,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAE5C,kCAAkC;IAClC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,sEAAsE;QACtE,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACvC,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,mDAAmD,MAAM,EAAE,CAAC,CAAC;YACzE,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,oEAAoE;QACpE,OAAO,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;QAC7E,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,UAAU,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;SAAM,CAAC;QACN,0DAA0D;QAC1D,UAAU,CAAC,CAAC,UAAU,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;IAED,0DAA0D;IAC1D,MAAM,MAAM,GAAG,UAAU,CACvB,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,EACvC,MAAM,CAAC,QAAQ,CAChB,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,oCAAoC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACtE,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,4CAA4C,MAAM,EAAE,CAAC,CAAC;IAClE,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telora/daemon",
-  "version": "0.13.8",
+  "version": "0.13.10",
   "description": "Agent orchestration daemon for Telora - spawns and manages Claude Code instances",
   "type": "module",
   "bin": {
@@ -36,7 +36,7 @@
   "//testRunner": "Uses Node.js built-in test runner (node:test) via tsx for TypeScript support. The root package uses Vitest; this is a deliberate choice for the daemon package to avoid framework dependencies. See src/__tests__/ for test files.",
   "dependencies": {
     "@telora/daemon-core": "^0.2.6",
-    "@telora/factory": "^0.4.5",
+    "@telora/factory": "^0.4.6",
     "@telora/mcp-products": "^0.21.4",
     "commander": "^14.0.3",
     "zod": "^4.3.6"
@@ -72,6 +72,6 @@
   "author": "Syntelyos",
   "publishConfig": {
     "access": "public",
-    "registry": "https://registry.npmjs.org/"
+    "registry": "https://10.1.1.250:3100/api/packages/syntelyos/npm/"
   }
 }