@codebyplan/cli 3.3.0 → 3.4.0

package/dist/cli.js

@@ -37,7 +37,7 @@ var VERSION, PACKAGE_NAME;
 var init_version = __esm({
   "src/lib/version.ts"() {
     "use strict";
-    VERSION = "3.3.0";
+    VERSION = "3.4.0";
     PACKAGE_NAME = "@codebyplan/cli";
   }
 });
@@ -1751,8 +1751,12 @@ var sync_exports = {};
 __export(sync_exports, {
   runSync: () => runSync
 });
+import { createHash } from "node:crypto";
 import { readFile as readFile7, writeFile as writeFile3, mkdir as mkdir2, chmod as chmod2, unlink as unlink2 } from "node:fs/promises";
 import { join as join7, dirname as dirname2 } from "node:path";
+function contentHash(content) {
+  return createHash("sha256").update(content).digest("hex");
+}
 async function runSync() {
   const flags = parseFlags(3);
   const dryRun = hasFlag("dry-run", 3);
@@ -1817,17 +1821,27 @@ async function runSyncInner(repoId, projectPath, dryRun, force) {
     localFiles = await scanLocalFiles(claudeDir, projectPath);
   } catch {
   }
-  const [defaultsRes, repoSyncRes, repoRes, syncStateRes] = await Promise.all([
+  const [defaultsRes, repoSyncRes, repoRes, syncStateRes, fileReposRes] = await Promise.all([
     apiGet("/sync/defaults"),
     apiGet("/sync/files", { repo_id: repoId }),
     apiGet(`/repos/${repoId}`),
-    apiGet("/sync/state", { repo_id: repoId })
+    apiGet("/sync/state", { repo_id: repoId }),
+    apiGet("/sync/file-repos", { repo_id: repoId })
   ]);
   const syncStartTime = Date.now();
   const repoData = repoRes.data;
   const remoteDefaults = flattenSyncData(defaultsRes.data);
   const remoteRepoFiles = flattenSyncData(repoSyncRes.data);
   const syncState = syncStateRes.data;
+  const fileRepoHashes = /* @__PURE__ */ new Map();
+  const fileRepoByClaudeFileId = /* @__PURE__ */ new Map();
+  for (const entry of fileReposRes.data ?? []) {
+    if (entry.claude_files) {
+      const key = compositeKey(entry.claude_files.type, entry.claude_files.name, entry.claude_files.category);
+      fileRepoHashes.set(key, entry.last_synced_content_hash);
+    }
+    fileRepoByClaudeFileId.set(entry.claude_file_id, entry.last_synced_content_hash);
+  }
   const remoteFiles = new Map([...remoteDefaults, ...remoteRepoFiles]);
   console.log(`  Local: ${localFiles.size} files, Remote: ${remoteFiles.size} files
 `);
@@ -1854,9 +1868,8 @@ async function runSyncInner(repoId, projectPath, dryRun, force) {
       });
     } else if (!local && remote) {
       const resolvedContent = substituteVariables(remote.content, repoData);
-      const isDefaultOnly = remoteDefaults.has(key) && !remoteRepoFiles.has(key);
-      const hasSyncedBefore = syncState?.last_synced_at != null;
-      const recommended = !isDefaultOnly && hasSyncedBefore ? "delete" : "pull";
+      const hadSyncedThisFile = remote.id ? fileRepoByClaudeFileId.has(remote.id) : fileRepoHashes.has(key);
+      const recommended = hadSyncedThisFile ? "delete" : "pull";
       plan.push({
         key,
         displayPath: `${remote.type}/${remote.category ? remote.category + "/" : ""}${remote.name}`,
@@ -1877,16 +1890,24 @@ async function runSyncInner(repoId, projectPath, dryRun, force) {
       if (local.content === resolvedRemote) {
         continue;
       }
-      const lastSyncedAt = syncState?.last_synced_at;
-      const remoteUpdatedAt = remote.updated_at;
-      const remoteChanged = remoteUpdatedAt && lastSyncedAt ? new Date(remoteUpdatedAt) > new Date(lastSyncedAt) : true;
+      const localHash = contentHash(local.content);
+      const lastSyncedHash = fileRepoHashes.get(key) ?? null;
+      const localChanged = lastSyncedHash ? localHash !== lastSyncedHash : true;
       let action;
-      if (remoteChanged && force) {
+      if (force) {
         action = "pull";
-      } else if (!remoteChanged) {
-        action = "push";
-      } else {
+      } else if (!localChanged) {
+        action = "pull";
+      } else if (lastSyncedHash === null) {
         action = "conflict";
+      } else {
+        const remoteDbHash = remote.content_hash ?? null;
+        const remoteChanged = remoteDbHash ? remoteDbHash !== lastSyncedHash : true;
+        if (remoteChanged) {
+          action = "conflict";
+        } else {
+          action = "push";
+        }
       }
       plan.push({
         key,
@@ -2062,11 +2083,22 @@ async function runSyncInner(repoId, projectPath, dryRun, force) {
       });
       const syncTimestamp = (/* @__PURE__ */ new Date()).toISOString();
       const fileRepoUpdates = [];
-      for (const p of [...toPull, ...toPush]) {
-        if (p.claudeFileId) {
+      for (const p of toPull) {
+        if (p.claudeFileId && p.remoteContent !== null) {
+          fileRepoUpdates.push({
+            claude_file_id: p.claudeFileId,
+            last_synced_at: syncTimestamp,
+            last_synced_content_hash: contentHash(p.remoteContent),
+            sync_status: "synced"
+          });
+        }
+      }
+      for (const p of toPush) {
+        if (p.claudeFileId && p.localContent !== null) {
           fileRepoUpdates.push({
             claude_file_id: p.claudeFileId,
             last_synced_at: syncTimestamp,
+            last_synced_content_hash: contentHash(p.localContent),
             sync_status: "synced"
           });
         }
@@ -2263,7 +2295,7 @@ function getLocalFilePath(claudeDir, projectPath, remote) {
 }
 function getSyncVersion() {
   try {
-    return "3.3.0";
+    return "3.4.0";
   } catch {
     return "unknown";
   }
@@ -2289,7 +2321,8 @@ function flattenSyncData(data) {
         name: file.name,
         content: file.content,
         category: file.category,
-        updated_at: file.updated_at
+        updated_at: file.updated_at,
+        content_hash: file.content_hash
       });
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codebyplan/cli",
-  "version": "3.3.0",
+  "version": "3.4.0",
   "description": "MCP server for CodeByPlan — AI-powered development planning and tracking",
   "type": "module",
   "bin": {