promptgraph-mcp 2.0.8 → 2.0.9

package/github-import.js

@@ -57,13 +57,17 @@ export async function importFromGitHub(repoUrl) {
 
   if (fs.existsSync(dest)) {
     console.log(`Updating ${repoName}...`);
-    const pullResult = spawnSync('git', ['-C', dest, 'pull', '--depth=1'], { stdio: 'inherit' });
-    if (pullResult.status !== 0) {
-      // Force-push or unrelated histories — re-clone from scratch
-      console.log(`Pull failed (force-push?), re-cloning ${repoName}...`);
-      fs.rmSync(dest, { recursive: true, force: true });
-      const cloneResult = spawnSync('git', ['clone', '--depth=1', url, dest], { stdio: 'inherit' });
-      if (cloneResult.status !== 0) throw new Error(`git clone failed for ${url}`);
+    // fetch + reset handles force-pushes and unrelated histories without re-cloning
+    const fetch = spawnSync('git', ['-C', dest, 'fetch', '--depth=1', 'origin'], { stdio: 'inherit' });
+    if (fetch.status !== 0) throw new Error(`git fetch failed for ${repoName}`);
+    const reset = spawnSync('git', ['-C', dest, 'reset', '--hard', 'origin/HEAD'], { stdio: 'pipe' });
+    if (reset.status !== 0) {
+      // fallback: try origin/main then origin/master
+      const main = spawnSync('git', ['-C', dest, 'reset', '--hard', 'origin/main'], { stdio: 'pipe' });
+      if (main.status !== 0) {
+        const master = spawnSync('git', ['-C', dest, 'reset', '--hard', 'origin/master'], { stdio: 'inherit' });
+        if (master.status !== 0) throw new Error(`git reset failed for ${repoName}`);
+      }
     }
   } else {
     console.log(`Cloning ${url}...`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "promptgraph-mcp",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "main": "index.js",
   "type": "module",
   "bin": {