botrun-mcli 0.2.0 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "botrun-mcli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Git-backed memory CLI for AI agents",
   "type": "module",
   "bin": {

package/src/commands/memory/init.mjs

@@ -13,12 +13,27 @@ async function exists(path) {
   }
 }
 
+async function hasWorkingTree(dir) {
+  try {
+    const result = await gitExec(['-C', dir, 'rev-parse', '--is-inside-work-tree']);
+    return result === 'true';
+  } catch {
+    return false;
+  }
+}
+
 async function cloneOrPull(repo, cloneDir, token, localMode, branch) {
-  if (await exists(cloneDir)) {
+  if (await exists(cloneDir) && await hasWorkingTree(cloneDir)) {
     await gitExec(['-C', cloneDir, 'pull', '--rebase']);
     return;
   }
 
+  // If directory exists but broken (no working tree), remove and re-clone
+  if (await exists(cloneDir)) {
+    const { rm } = await import('node:fs/promises');
+    await rm(cloneDir, { recursive: true });
+  }
+
   let cloneUrl;
   if (localMode) {
     cloneUrl = repo;

package/src/commands/memory/sync.mjs

@@ -6,23 +6,48 @@ export async function syncMemory(options = {}) {
   const config = await loadConfig(options.configPath);
   const dataDir = options.dataDir || join(getBasePath(), 'data');
 
-  const result = { synced: [], skipped: [] };
+  const result = { synced: [], pulled: [], skipped: [] };
 
   for (const [name, scope] of Object.entries(config.scopes)) {
     const cloneDir = join(dataDir, name);
+    let didPull = false;
+    let didPush = false;
 
+    // 1. Always pull remote changes first
+    try {
+      const before = await gitExec(['-C', cloneDir, 'rev-parse', 'HEAD']);
+      await gitExec(['-C', cloneDir, 'pull', '--rebase']);
+      const after = await gitExec(['-C', cloneDir, 'rev-parse', 'HEAD']);
+      if (before !== after) didPull = true;
+    } catch {
+      // pull may fail if no upstream set; try setting it
+      try {
+        const branch = await gitExec(['-C', cloneDir, 'rev-parse', '--abbrev-ref', 'HEAD']);
+        await gitExec(['-C', cloneDir, 'branch', '--set-upstream-to', `origin/${branch}`, branch]);
+        const before = await gitExec(['-C', cloneDir, 'rev-parse', 'HEAD']);
+        await gitExec(['-C', cloneDir, 'pull', '--rebase']);
+        const after = await gitExec(['-C', cloneDir, 'rev-parse', 'HEAD']);
+        if (before !== after) didPull = true;
+      } catch {
+        // still failed, continue
+      }
+    }
+
+    // 2. Check for local uncommitted changes and push
     const status = await gitExec(['-C', cloneDir, 'status', '--porcelain']);
+    if (status) {
+      await gitExec(['-C', cloneDir, 'add', '-A']);
+      await gitExec(['-C', cloneDir, 'commit', '-m', `bm: update ${name} memories`]);
+      await gitExec(['-C', cloneDir, 'push']);
+      didPush = true;
+    }
 
-    if (!status) {
+    if (didPull || didPush) {
+      result.synced.push(name);
+      if (didPull) result.pulled.push(name);
+    } else {
       result.skipped.push(name);
-      continue;
     }
-
-    await gitExec(['-C', cloneDir, 'add', '-A']);
-    await gitExec(['-C', cloneDir, 'commit', '-m', `bm: update ${name} memories`]);
-    await gitExec(['-C', cloneDir, 'pull', '--rebase']);
-    await gitExec(['-C', cloneDir, 'push']);
-    result.synced.push(name);
   }
 
   return result;