@kynver-app/runtime 0.1.10 → 0.1.11

package/dist/cli.js

@@ -593,6 +593,92 @@ function ensureGitRepo(repo) {
 function gitStatusShort(worktreePath) {
   return git(worktreePath, ["status", "--short"], { allowFailure: true }).split("\n").map((line) => line.trim()).filter(Boolean);
 }
+function gitCapture(cwd, args) {
+  try {
+    const res = spawnSync("git", args, { cwd, encoding: "utf8" });
+    return {
+      status: res.status,
+      stdout: res.stdout || "",
+      stderr: res.stderr || "",
+      error: res.error ? res.error.message : null
+    };
+  } catch (error) {
+    return {
+      status: null,
+      stdout: "",
+      stderr: "",
+      error: error.message
+    };
+  }
+}
+function gitIsAncestor(cwd, ancestor, descendant) {
+  const res = gitCapture(cwd, ["merge-base", "--is-ancestor", ancestor, descendant]);
+  if (res.status === 0) return { isAncestor: true, error: null };
+  if (res.status === 1) return { isAncestor: false, error: null };
+  return { isAncestor: null, error: res.error || res.stderr || res.stdout || `git exited ${res.status}` };
+}
+function computeGitAncestry(worktreePath, base = "origin/main") {
+  if (!worktreePath) {
+    return unknownAncestry(base, "missing worktree path");
+  }
+  const head = gitCapture(worktreePath, ["rev-parse", "HEAD"]);
+  if (head.status !== 0) return unknownAncestry(base, head.error || head.stderr || head.stdout || "failed to resolve HEAD");
+  const baseHead = gitCapture(worktreePath, ["rev-parse", base]);
+  if (baseHead.status !== 0) {
+    return unknownAncestry(base, baseHead.error || baseHead.stderr || baseHead.stdout || `failed to resolve ${base}`, head.stdout.trim());
+  }
+  const headSha = head.stdout.trim();
+  const baseSha = baseHead.stdout.trim();
+  if (headSha === baseSha) {
+    return {
+      checked: true,
+      base,
+      head: headSha,
+      baseHead: baseSha,
+      baseIsAncestorOfHead: true,
+      headIsAncestorOfBase: true,
+      relation: "synced"
+    };
+  }
+  const baseIsAncestorOfHead = gitIsAncestor(worktreePath, baseSha, headSha);
+  const headIsAncestorOfBase = gitIsAncestor(worktreePath, headSha, baseSha);
+  const error = baseIsAncestorOfHead.error || headIsAncestorOfBase.error || void 0;
+  if (baseIsAncestorOfHead.isAncestor == null || headIsAncestorOfBase.isAncestor == null) {
+    return {
+      checked: false,
+      base,
+      head: headSha,
+      baseHead: baseSha,
+      baseIsAncestorOfHead: baseIsAncestorOfHead.isAncestor,
+      headIsAncestorOfBase: headIsAncestorOfBase.isAncestor,
+      relation: "unknown",
+      ...error ? { error } : {}
+    };
+  }
+  const relation = baseIsAncestorOfHead.isAncestor ? "ahead" : headIsAncestorOfBase.isAncestor ? "merged" : "diverged";
+  return {
+    checked: true,
+    base,
+    head: headSha,
+    baseHead: baseSha,
+    baseIsAncestorOfHead: baseIsAncestorOfHead.isAncestor,
+    headIsAncestorOfBase: headIsAncestorOfBase.isAncestor,
+    relation,
+    ...error ? { error } : {}
+  };
+}
+function unknownAncestry(base, error, head = null) {
+  return {
+    checked: false,
+    base,
+    head,
+    baseHead: null,
+    baseIsAncestorOfHead: null,
+    headIsAncestorOfBase: null,
+    relation: "unknown",
+    error
+  };
+}
 function scrubClaudeEnv(env) {
   const next = { ...env };
   delete next.ANTHROPIC_API_KEY;
@@ -619,7 +705,7 @@ function computeAttention(input) {
   }
   return { state: "ok", reason: "recent activity" };
 }
-function computeWorkerStatus(worker) {
+function computeWorkerStatus(worker, options = {}) {
   const parsed = parseClaudeStream(worker.stdoutPath);
   const heartbeat = parseHeartbeat(worker.heartbeatPath);
   const alive = isPidAlive(worker.pid);
@@ -627,6 +713,7 @@ function computeWorkerStatus(worker) {
   const stderrBytes = fileSize(worker.stderrPath);
   const heartbeatBytes = fileSize(worker.heartbeatPath);
   const changedFiles = gitStatusShort(worker.worktreePath);
+  const gitAncestry = computeGitAncestry(worker.worktreePath, options.base);
   const lastActivityAt = latestIso([
     parsed.lastEventAt,
     heartbeat.lastHeartbeatAt,
@@ -668,7 +755,8 @@ function computeWorkerStatus(worker) {
     heartbeatBlocker: heartbeat.heartbeatBlocker,
     finalResult: parsed.finalResult,
     error: parsed.error || (!alive && !parsed.finalResult ? tailFile(worker.stderrPath, 10).trim() || void 0 : void 0),
-    changedFiles
+    changedFiles,
+    gitAncestry
   };
 }
 function isFinishedWorkerStatus(status) {
@@ -1430,7 +1518,7 @@ function runStatus(args) {
     if (!worker) {
       return { worker: name, status: "missing", attention: "needs_attention", attentionReason: "worker.json not found" };
     }
-    const status = computeWorkerStatus(worker);
+    const status = computeWorkerStatus(worker, { base: run.base });
     return {
       worker: status.worker,
       status: status.status,
@@ -1444,7 +1532,9 @@ function runStatus(args) {
       lastHeartbeatSummary: status.lastHeartbeatSummary,
       heartbeatBlocker: status.heartbeatBlocker,
       changedFileCount: status.changedFiles.length,
-      branch: status.branch
+      branch: status.branch,
+      ancestry: status.gitAncestry.relation,
+      ancestryChecked: status.gitAncestry.checked
     };
   });
   const board = {