@kage-core/kage-graph-mcp 2.2.0 → 2.2.1

package/dist/kernel.js

@@ -16152,13 +16152,13 @@ function resolvePacketSyncConflict(memoryDir, file) {
 function rebaseOntoUpstream(memoryDir, upstream) {
     const conflictBackups = [];
     let resolved = 0;
-    let step = runSyncGit(memoryDir, ["-c", "core.editor=true", "rebase", upstream]);
+    let step = runSyncGit(memoryDir, [...syncIdentityArgs(memoryDir), "-c", "core.editor=true", "rebase", upstream]);
     while (!step.ok) {
         const conflicted = runSyncGit(memoryDir, ["diff", "--name-only", "--diff-filter=U"])
             .stdout.split("\n").map((line) => line.trim()).filter(Boolean);
         if (!conflicted.length) {
             // The resolved commit became empty (we kept the upstream side wholesale).
-            const skip = runSyncGit(memoryDir, ["-c", "core.editor=true", "rebase", "--skip"]);
+            const skip = runSyncGit(memoryDir, [...syncIdentityArgs(memoryDir), "-c", "core.editor=true", "rebase", "--skip"]);
             if (skip.ok) {
                 step = skip;
                 continue;
@@ -16182,7 +16182,7 @@ function rebaseOntoUpstream(memoryDir, upstream) {
             const toAdd = [file, ...(resolution.backupPath ? [(0, node_path_1.relative)(memoryDir, resolution.backupPath)] : [])];
             runSyncGit(memoryDir, ["add", "--", ...toAdd]);
         }
-        step = runSyncGit(memoryDir, ["-c", "core.editor=true", "rebase", "--continue"]);
+        step = runSyncGit(memoryDir, [...syncIdentityArgs(memoryDir), "-c", "core.editor=true", "rebase", "--continue"]);
     }
     return { ok: true, resolved, conflictBackups };
 }
@@ -16267,9 +16267,25 @@ function syncSetup(remoteUrl) {
         }
     }
     result.branch = runSyncGit(memoryDir, ["rev-parse", "--abbrev-ref", "HEAD"]).stdout || null;
-    const push = runSyncGit(memoryDir, ["push", "-u", "origin", "HEAD"]);
+    let push = runSyncGit(memoryDir, ["push", "-u", "origin", "HEAD"]);
+    if (!push.ok && /non-fast-forward|behind|fetch first/i.test(push.stderr)) {
+        // Some git versions leave the local branch behind the remote after the
+        // convergence rebase (observed on CI's git, not on macOS). A second
+        // fetch + rebase fast-forwards a behind branch, after which push succeeds.
+        runSyncGit(memoryDir, ["fetch", "origin"]);
+        const retryBranch = syncRemoteDefaultBranch(memoryDir) ?? result.branch;
+        if (retryBranch && runSyncGit(memoryDir, ["rev-parse", "--verify", "--quiet", `origin/${retryBranch}`]).ok) {
+            runSyncGit(memoryDir, ["branch", "-M", retryBranch]);
+            const retryRebase = rebaseOntoUpstream(memoryDir, `origin/${retryBranch}`);
+            if (retryRebase.ok)
+                push = runSyncGit(memoryDir, ["push", "-u", "origin", "HEAD"]);
+        }
+    }
     if (!push.ok) {
-        result.errors.push(`git push failed: ${push.stderr}`);
+        const state = runSyncGit(memoryDir, ["log", "--oneline", "--all", "--decorate", "-n", "8"]).stdout;
+        result.errors.push(`git push failed: ${push.stderr}${state ? `
+repo state:
+${state}` : ""}`);
         return result;
     }
     result.pushed = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kage-core/kage-graph-mcp",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Local-first repo memory, code graph, and recall MCP server for coding agents",
   "main": "dist/index.js",
   "files": [