dahrk-node 0.1.1 → 0.1.2

package/dist/main.js

@@ -1269,6 +1269,25 @@ function createGitService(opts = {}) {
       log2.warn(`could not set worktree scratch exclude at ${worktreePath}: ${e.message}`);
     }
   };
+  const commitPending = (worktreePath, message) => {
+    const SCRATCH = ".skakel/scratch";
+    excludeScratchLocally(worktreePath);
+    git(worktreePath, ["rm", "-r", "--cached", "--ignore-unmatch", "--quiet", SCRATCH]);
+    git(worktreePath, ["add", "-A", "--", "."]);
+    const dirty = !gitOk(worktreePath, ["diff", "--cached", "--quiet"]);
+    if (dirty) {
+      git(worktreePath, [
+        "-c",
+        `user.name=${authorName}`,
+        "-c",
+        `user.email=${authorEmail}`,
+        "commit",
+        "-m",
+        message
+      ]);
+    }
+    return { headSha: git(worktreePath, ["rev-parse", "HEAD"]).trim(), dirty };
+  };
   const setupAuth = (token) => {
     const dir = mkdtempSync(join2(tmpdir(), "dahrk-cred-"));
     const script = join2(dir, "askpass.sh");
@@ -1334,6 +1353,9 @@ function createGitService(opts = {}) {
       } finally {
         auth?.cleanup();
       }
+      if (!gitOk(worktreePath, ["rev-parse", "--verify", "-q", "HEAD"])) {
+        throw new Error(`base '${baseBranch}' did not materialise into ${worktreePath} (unborn HEAD)`);
+      }
       mkdirSync(join2(worktreePath, ".skakel", "scratch"), { recursive: true });
       return refFor(spec, worktreePath);
     },
@@ -1343,24 +1365,8 @@ function createGitService(opts = {}) {
         throw new Error(`worktree missing for push: ${worktreePath}`);
       }
       const branch = sanitizeBranchName(opts2.branch);
-      const SCRATCH = ".skakel/scratch";
-      excludeScratchLocally(worktreePath);
-      git(worktreePath, ["rm", "-r", "--cached", "--ignore-unmatch", "--quiet", SCRATCH]);
-      git(worktreePath, ["add", "-A", "--", "."]);
-      const hasStaged = !gitOk(worktreePath, ["diff", "--cached", "--quiet"]);
-      if (hasStaged) {
-        git(worktreePath, [
-          "-c",
-          `user.name=${authorName}`,
-          "-c",
-          `user.email=${authorEmail}`,
-          "commit",
-          "-m",
-          opts2.message
-        ]);
-      }
-      const dirty = hasStaged;
-      let headSha = git(worktreePath, ["rev-parse", "HEAD"]).trim();
+      const { headSha: committedSha, dirty } = commitPending(worktreePath, opts2.message);
+      let headSha = committedSha;
       let commitsAhead = 0;
       for (const baseRef of [opts2.base, `origin/${opts2.base}`, `refs/heads/${opts2.base}`]) {
         if (!baseRef) continue;
@@ -1385,6 +1391,9 @@ function createGitService(opts = {}) {
           }
         }
         if (fetched) {
+          if (!gitOk(worktreePath, ["merge-base", "HEAD", "FETCH_HEAD"])) {
+            return { headSha, pushed: false, nothingToCommit: !dirty, commitsAhead, integration: "diverged" };
+          }
           try {
             git(worktreePath, [
               "-c",
@@ -1397,10 +1406,18 @@ function createGitService(opts = {}) {
             ], auth?.env);
             integration = "clean";
             headSha = git(worktreePath, ["rev-parse", "HEAD"]).trim();
-          } catch {
-            const conflictFiles = git(worktreePath, ["diff", "--name-only", "--diff-filter=U"]).split("\n").map((l) => l.trim()).filter(Boolean);
-            git(worktreePath, ["merge", "--abort"]);
-            return { headSha, pushed: false, nothingToCommit: !dirty, commitsAhead, integration: "conflict", conflictFiles };
+          } catch (mergeErr) {
+            const inMerge = gitOk(worktreePath, ["rev-parse", "--verify", "-q", "MERGE_HEAD"]);
+            if (inMerge) {
+              const conflictFiles = git(worktreePath, ["diff", "--name-only", "--diff-filter=U"]).split("\n").map((l) => l.trim()).filter(Boolean);
+              git(worktreePath, ["merge", "--abort"]);
+              return { headSha, pushed: false, nothingToCommit: !dirty, commitsAhead, integration: "conflict", conflictFiles };
+            }
+            const msg = mergeErr.message;
+            if (/unrelated histories|refusing to merge/i.test(msg)) {
+              return { headSha, pushed: false, nothingToCommit: !dirty, commitsAhead, integration: "diverged" };
+            }
+            throw mergeErr;
           }
         }
         git(worktreePath, ["push", remote, `HEAD:refs/heads/${branch}`], netEnv(auth?.env));
@@ -1410,6 +1427,22 @@ function createGitService(opts = {}) {
       }
       return { headSha, pushed, nothingToCommit: !dirty, commitsAhead, ...integration ? { integration } : {} };
     },
+    async backupPush(ref, opts2) {
+      const { worktreePath } = ref;
+      if (!existsSync(worktreePath) || !gitOk(worktreePath, ["rev-parse", "--git-dir"])) {
+        throw new Error(`worktree missing for backup push: ${worktreePath}`);
+      }
+      const wipRef = sanitizeBranchName(opts2.branch);
+      const { headSha, dirty } = commitPending(worktreePath, opts2.message);
+      const auth = opts2.credentialToken ? setupAuth(opts2.credentialToken) : void 0;
+      const remote = opts2.credentialToken ? withTokenUser(ref.gitUrl) : ref.gitUrl;
+      try {
+        git(worktreePath, ["push", "--force", remote, `HEAD:refs/heads/${wipRef}`], netEnv(auth?.env));
+      } finally {
+        auth?.cleanup();
+      }
+      return { headSha, pushed: true, nothingToCommit: !dirty, wipRef };
+    },
     async openPrAmbient(ref, opts2) {
       const ownerRepo = parseOwnerRepo(ref.gitUrl);
       if (!ownerRepo) return { prError: `cannot derive owner/repo from ${ref.gitUrl}` };
@@ -2277,62 +2310,111 @@ function createStageRunner(deps) {
         return { jobId, status: "fail", summary: `edge does not serve repo "${job.workspaceRef.repoId}"` };
       }
       lastUsed.set(runId, Date.now());
-      let ref = worktrees.get(runId);
-      if (!ref) {
-        ref = await deps.gitService.createWorktree({
-          repoId: job.workspaceRef.repoId,
-          gitUrl: job.workspaceRef.gitUrl,
-          baseBranch: job.workspaceRef.baseBranch,
-          runId,
-          repo: job.workspaceRef.repo,
-          branch: job.branch,
-          ...job.workspaceRef.credentialToken ? { credentialToken: job.workspaceRef.credentialToken } : {}
-        });
-        worktrees.set(runId, ref);
-      }
+      inFlight.set(runId, (inFlight.get(runId) ?? 0) + 1);
       try {
-        const r = await deps.gitService.commitAndPush(ref, {
-          message: job.message,
-          branch: job.branch,
-          base: job.base,
-          ...job.workspaceRef.credentialToken ? { credentialToken: job.workspaceRef.credentialToken } : {}
-        });
-        if (r.integration === "conflict") {
+        const mode = job.mode ?? "deliver";
+        if (mode === "backup") {
+          const ref2 = worktrees.get(runId);
+          if (!ref2) {
+            return {
+              jobId,
+              status: "fail",
+              branch: job.branch,
+              summary: `backup push: run ${runId} has no live worktree; committed HEAD cannot be preserved`
+            };
+          }
+          try {
+            const r = await deps.gitService.backupPush(ref2, {
+              message: job.message,
+              branch: job.branch,
+              ...job.workspaceRef.credentialToken ? { credentialToken: job.workspaceRef.credentialToken } : {}
+            });
+            const result = {
+              jobId,
+              status: "ok",
+              branch: job.branch,
+              headSha: r.headSha,
+              pushed: r.pushed,
+              nothingToCommit: r.nothingToCommit,
+              wipRef: r.wipRef,
+              summary: `backup: preserved ${r.headSha.slice(0, 7)} on ${r.wipRef} (no base merge, no PR)`
+            };
+            return result;
+          } catch (e) {
+            return { jobId, status: "fail", branch: job.branch, summary: `backup push failed: ${e.message}` };
+          }
+        }
+        let ref = worktrees.get(runId);
+        if (!ref) {
+          ref = await deps.gitService.createWorktree({
+            repoId: job.workspaceRef.repoId,
+            gitUrl: job.workspaceRef.gitUrl,
+            baseBranch: job.workspaceRef.baseBranch,
+            runId,
+            repo: job.workspaceRef.repo,
+            branch: job.branch,
+            ...job.workspaceRef.credentialToken ? { credentialToken: job.workspaceRef.credentialToken } : {}
+          });
+          worktrees.set(runId, ref);
+        }
+        try {
+          const r = await deps.gitService.commitAndPush(ref, {
+            message: job.message,
+            branch: job.branch,
+            base: job.base,
+            ...job.workspaceRef.credentialToken ? { credentialToken: job.workspaceRef.credentialToken } : {}
+          });
+          if (r.integration === "conflict") {
+            return {
+              jobId,
+              status: "ok",
+              branch: job.branch,
+              headSha: r.headSha,
+              pushed: false,
+              nothingToCommit: r.nothingToCommit,
+              commitsAhead: r.commitsAhead,
+              integration: "conflict",
+              ...r.conflictFiles ? { conflictFiles: r.conflictFiles } : {},
+              summary: `base advanced; merge conflict on ${job.branch} (manual merge needed)`
+            };
+          }
+          if (r.integration === "diverged") {
+            return {
+              jobId,
+              status: "fail",
+              branch: job.branch,
+              headSha: r.headSha,
+              pushed: false,
+              nothingToCommit: r.nothingToCommit,
+              commitsAhead: r.commitsAhead,
+              summary: `branch history diverged from ${job.base}; cannot auto-integrate on ${job.branch} (the branch likely needs rebuilding from ${job.base})`
+            };
+          }
+          const pr = job.openPr && r.pushed ? await deps.gitService.openPrAmbient(ref, {
+            branch: job.branch,
+            base: job.base,
+            title: job.openPr.title,
+            body: job.openPr.body
+          }) : void 0;
           return {
             jobId,
             status: "ok",
             branch: job.branch,
             headSha: r.headSha,
-            pushed: false,
+            pushed: r.pushed,
             nothingToCommit: r.nothingToCommit,
             commitsAhead: r.commitsAhead,
-            integration: "conflict",
-            ...r.conflictFiles ? { conflictFiles: r.conflictFiles } : {},
-            summary: `base advanced; merge conflict on ${job.branch} (manual merge needed)`
+            ...r.integration ? { integration: r.integration } : {},
+            ...pr?.prUrl ? { prUrl: pr.prUrl } : {},
+            ...pr?.prNumber !== void 0 ? { prNumber: pr.prNumber } : {},
+            ...pr?.prError ? { prError: pr.prError } : {},
+            summary: r.nothingToCommit ? `no changes to commit; ${r.pushed ? "branch pushed" : "nothing pushed"}` : `committed ${r.headSha.slice(0, 7)} and pushed ${job.branch}`
           };
+        } catch (e) {
+          return { jobId, status: "fail", summary: `push failed: ${e.message}` };
         }
-        const pr = job.openPr && r.pushed ? await deps.gitService.openPrAmbient(ref, {
-          branch: job.branch,
-          base: job.base,
-          title: job.openPr.title,
-          body: job.openPr.body
-        }) : void 0;
-        return {
-          jobId,
-          status: "ok",
-          branch: job.branch,
-          headSha: r.headSha,
-          pushed: r.pushed,
-          nothingToCommit: r.nothingToCommit,
-          commitsAhead: r.commitsAhead,
-          ...r.integration ? { integration: r.integration } : {},
-          ...pr?.prUrl ? { prUrl: pr.prUrl } : {},
-          ...pr?.prNumber !== void 0 ? { prNumber: pr.prNumber } : {},
-          ...pr?.prError ? { prError: pr.prError } : {},
-          summary: r.nothingToCommit ? `no changes to commit; ${r.pushed ? "branch pushed" : "nothing pushed"}` : `committed ${r.headSha.slice(0, 7)} and pushed ${job.branch}`
-        };
-      } catch (e) {
-        return { jobId, status: "fail", summary: `push failed: ${e.message}` };
+      } finally {
+        inFlight.set(runId, Math.max(0, (inFlight.get(runId) ?? 1) - 1));
       }
     },
     cancel(jobId) {
@@ -2882,7 +2964,7 @@ async function runDoctor(inputs, deps = {}) {
 }
 
 // src/main.ts
-var CLIENT_VERSION = "0.1.1";
+var CLIENT_VERSION = "0.1.2";
 var DEFAULT_HUB_URL = "wss://api.dahrk.ai";
 var list = (v) => (v ?? "").split(",").map((s) => s.trim()).filter(Boolean);
 var RUNTIMES = ["claude-code", "codex", "pi"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dahrk-node",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": false,
   "license": "Apache-2.0",
   "type": "module",