@codebyplan/cli 3.0.1 → 3.0.2

package/dist/cli.js

@@ -37,7 +37,7 @@ var VERSION, PACKAGE_NAME;
 var init_version = __esm({
   "src/lib/version.ts"() {
     "use strict";
-    VERSION = "3.0.1";
+    VERSION = "3.0.2";
     PACKAGE_NAME = "@codebyplan/cli";
   }
 });
@@ -1042,79 +1042,11 @@ var init_fileMapper = __esm({
   }
 });
 
-// src/cli/conflict.ts
+// src/cli/confirm.ts
 import { createInterface as createInterface2 } from "node:readline/promises";
 import { stdin as stdin2, stdout as stdout2 } from "node:process";
-async function resolveConflicts(conflicts) {
-  const resolutions = /* @__PURE__ */ new Map();
-  if (conflicts.length === 0) return resolutions;
-  const rl = createInterface2({ input: stdin2, output: stdout2 });
-  try {
-    console.log(`
-  ${conflicts.length} conflict(s) found:
-`);
-    let applyToAll = null;
-    for (let i = 0; i < conflicts.length; i++) {
-      const conflict = conflicts[i];
-      if (applyToAll) {
-        resolutions.set(conflict.key, applyToAll);
-        continue;
-      }
-      console.log(`  Conflict ${i + 1}/${conflicts.length}: ${conflict.displayPath}`);
-      if (conflict.localModified) {
-        console.log(`    Local:  modified ${conflict.localModified}`);
-      }
-      if (conflict.remoteModified) {
-        console.log(`    Remote: modified ${conflict.remoteModified}`);
-      }
-      const remaining = conflicts.length - i;
-      const prompt = remaining > 1 ? "    [L] Push local  [R] Keep remote  [S] Skip  [LA/RA/SA] Apply to all: " : "    [L] Push local  [R] Keep remote  [S] Skip: ";
-      const answer = (await rl.question(prompt)).trim().toUpperCase();
-      switch (answer) {
-        case "L":
-          resolutions.set(conflict.key, "local");
-          break;
-        case "R":
-          resolutions.set(conflict.key, "remote");
-          break;
-        case "LA":
-          resolutions.set(conflict.key, "local");
-          applyToAll = "local";
-          break;
-        case "RA":
-          resolutions.set(conflict.key, "remote");
-          applyToAll = "remote";
-          break;
-        case "SA":
-          resolutions.set(conflict.key, "skip");
-          applyToAll = "skip";
-          break;
-        default:
-          resolutions.set(conflict.key, "skip");
-          break;
-      }
-    }
-    if (applyToAll) {
-      const appliedCount = conflicts.length - [...resolutions.values()].filter((_, idx) => idx === 0).length;
-      console.log(`
-  Applied "${applyToAll}" to remaining conflicts.`);
-    }
-  } finally {
-    rl.close();
-  }
-  return resolutions;
-}
-var init_conflict = __esm({
-  "src/cli/conflict.ts"() {
-    "use strict";
-  }
-});
-
-// src/cli/confirm.ts
-import { createInterface as createInterface3 } from "node:readline/promises";
-import { stdin as stdin3, stdout as stdout3 } from "node:process";
 async function confirmProceed(message) {
-  const rl = createInterface3({ input: stdin3, output: stdout3 });
+  const rl = createInterface2({ input: stdin2, output: stdout2 });
   try {
     const answer = await rl.question(message ?? "  Proceed? [Y/n] ");
     const a = answer.trim().toLowerCase();
@@ -1273,8 +1205,8 @@ var sync_exports = {};
 __export(sync_exports, {
   runSync: () => runSync
 });
-import { readFile as readFile7, writeFile as writeFile3 } from "node:fs/promises";
-import { join as join7 } from "node:path";
+import { readFile as readFile7, writeFile as writeFile3, mkdir as mkdir2, chmod as chmod2 } from "node:fs/promises";
+import { join as join7, dirname as dirname2 } from "node:path";
 async function runSync() {
   const flags = parseFlags(3);
   const dryRun = hasFlag("dry-run", 3);
@@ -1289,118 +1221,191 @@ async function runSync() {
   if (dryRun) console.log(`  Mode: dry-run`);
   if (force) console.log(`  Mode: force`);
   console.log();
-  console.log("  Phase 1: Pull (DB \u2192 local)...");
-  const pullResult = await executeSyncToLocal({ repoId, projectPath, dryRun });
-  const pullChanges = pullResult.totals.created + pullResult.totals.updated + pullResult.totals.deleted;
-  if (pullChanges > 0) {
-    for (const [typeKey, result] of Object.entries(pullResult.byType)) {
-      for (const name of result.created) console.log(`    + ${typeKey}/${name}`);
-      for (const name of result.updated) console.log(`    ~ ${typeKey}/${name}`);
-      for (const name of result.deleted) console.log(`    - ${typeKey}/${name}`);
-    }
-    console.log(`    ${pullResult.totals.created} created, ${pullResult.totals.updated} updated, ${pullResult.totals.deleted} deleted`);
-  } else {
-    console.log("    All files up to date.");
-  }
-  console.log("\n  Phase 2: Push (local \u2192 DB)...");
-  await executePush(repoId, projectPath, dryRun, force);
-  console.log("\n  Phase 3: Config sync...");
-  await syncConfig(repoId, projectPath, dryRun);
-  console.log("\n  Phase 4: Tech stack...");
-  await syncTechStack(repoId, projectPath, dryRun);
-  console.log("\n  Sync complete.\n");
-}
-async function executePush(repoId, projectPath, dryRun, force) {
+  console.log("  Reading local and remote state...");
   const claudeDir = join7(projectPath, ".claude");
-  let localFiles;
+  let localFiles = /* @__PURE__ */ new Map();
   try {
     localFiles = await scanLocalFiles(claudeDir, projectPath);
   } catch {
-    console.log("    No .claude/ directory found. Skipping push.");
-    return;
   }
-  const [syncRes, repoRes] = await Promise.all([
+  const [defaultsRes, repoSyncRes, repoRes] = await Promise.all([
+    apiGet("/sync/defaults"),
     apiGet("/sync/files", { repo_id: repoId }),
     apiGet(`/repos/${repoId}`)
   ]);
   const repoData = repoRes.data;
-  const remoteFiles = flattenSyncData(syncRes.data);
-  const toUpsert = [];
-  const toDelete = [];
-  const conflicts = [];
-  const conflictLocalRecords = /* @__PURE__ */ new Map();
-  for (const [key, local] of localFiles) {
+  const remoteDefaults = flattenSyncData(defaultsRes.data);
+  const remoteRepoFiles = flattenSyncData(repoSyncRes.data);
+  const remoteFiles = new Map([...remoteDefaults, ...remoteRepoFiles]);
+  console.log(`  Local: ${localFiles.size} files, Remote: ${remoteFiles.size} files
+`);
+  const plan = [];
+  const allKeys = /* @__PURE__ */ new Set([...localFiles.keys(), ...remoteFiles.keys()]);
+  for (const key of allKeys) {
+    const local = localFiles.get(key);
     const remote = remoteFiles.get(key);
-    if (!remote) {
-      toUpsert.push({ ...local, content: reverseSubstituteVariables(local.content, repoData) });
-    } else {
+    if (local && !remote) {
+      plan.push({
+        key,
+        displayPath: `${local.type}/${local.category ? local.category + "/" : ""}${local.name}`,
+        action: "push",
+        localContent: local.content,
+        remoteContent: null,
+        pushContent: reverseSubstituteVariables(local.content, repoData),
+        filePath: null,
+        type: local.type,
+        name: local.name,
+        category: local.category,
+        isHook: local.type === "hook"
+      });
+    } else if (!local && remote) {
+      const resolvedContent = substituteVariables(remote.content, repoData);
+      plan.push({
+        key,
+        displayPath: `${remote.type}/${remote.category ? remote.category + "/" : ""}${remote.name}`,
+        action: "pull",
+        localContent: null,
+        remoteContent: resolvedContent,
+        pushContent: null,
+        filePath: getLocalFilePath(claudeDir, projectPath, remote),
+        type: remote.type,
+        name: remote.name,
+        category: remote.category ?? null,
+        isHook: remote.type === "hook"
+      });
+    } else if (local && remote) {
       const resolvedRemote = substituteVariables(remote.content, repoData);
-      if (local.content !== resolvedRemote) {
-        const reversed = { ...local, content: reverseSubstituteVariables(local.content, repoData) };
-        if (force) {
-          toUpsert.push(reversed);
-        } else {
-          conflicts.push({
-            key,
-            displayPath: `${local.type}/${local.category ? local.category + "/" : ""}${local.name}`,
-            remoteModified: remote.updated_at
-          });
-          conflictLocalRecords.set(key, reversed);
-        }
+      if (local.content === resolvedRemote) {
+        continue;
       }
+      const repoSyncAt = repoRes.data.claude_sync_at;
+      const remoteUpdatedAt = remote.updated_at;
+      const remoteChanged = remoteUpdatedAt && repoSyncAt ? new Date(remoteUpdatedAt) > new Date(repoSyncAt) : true;
+      let action;
+      if (remoteChanged && force) {
+        action = "pull";
+      } else if (!remoteChanged) {
+        action = "push";
+      } else {
+        action = "pull";
+      }
+      plan.push({
+        key,
+        displayPath: `${local.type}/${local.category ? local.category + "/" : ""}${local.name}`,
+        action,
+        localContent: local.content,
+        remoteContent: resolvedRemote,
+        pushContent: action === "push" ? reverseSubstituteVariables(local.content, repoData) : null,
+        filePath: getLocalFilePath(claudeDir, projectPath, remote),
+        type: local.type,
+        name: local.name,
+        category: local.category,
+        isHook: local.type === "hook"
+      });
     }
   }
-  for (const [key, remote] of remoteFiles) {
-    if (!localFiles.has(key)) {
-      toDelete.push({ type: remote.type, name: remote.name, category: remote.category ?? null });
-    }
+  const pulls = plan.filter((p) => p.action === "pull");
+  const pushes = plan.filter((p) => p.action === "push");
+  if (pulls.length > 0) {
+    console.log(`  Pull (DB \u2192 local): ${pulls.length}`);
+    for (const p of pulls) console.log(`    \u2193 ${p.displayPath}`);
+  }
+  if (pushes.length > 0) {
+    console.log(`  Push (local \u2192 DB): ${pushes.length}`);
+    for (const p of pushes) console.log(`    \u2191 ${p.displayPath}`);
   }
-  if (conflicts.length > 0) {
-    const resolutions = await resolveConflicts(conflicts);
-    for (const [key, resolution] of resolutions) {
-      if (resolution === "local") {
-        const local = conflictLocalRecords.get(key);
-        if (local) toUpsert.push(local);
+  if (pulls.length === 0 && pushes.length === 0) {
+    console.log("  All .claude/ files in sync.");
+  }
+  if (plan.length > 0 && !dryRun) {
+    if (!force && pulls.length + pushes.length > 0) {
+      console.log();
+      const confirmed = await confirmProceed();
+      if (!confirmed) {
+        console.log("  Cancelled.\n");
+        return;
       }
     }
-  }
-  if (toUpsert.length > 0) {
-    for (const f of toUpsert) {
-      console.log(`    + ${f.type}/${f.category ? f.category + "/" : ""}${f.name}`);
+    for (const p of pulls) {
+      if (p.filePath && p.remoteContent !== null) {
+        await mkdir2(dirname2(p.filePath), { recursive: true });
+        await writeFile3(p.filePath, p.remoteContent, "utf-8");
+        if (p.isHook) await chmod2(p.filePath, 493);
+      }
     }
-  }
-  if (toDelete.length > 0) {
-    for (const d of toDelete) {
-      console.log(`    - ${d.type}/${d.category ? d.category + "/" : ""}${d.name}`);
+    const toUpsert = pushes.filter((p) => p.pushContent !== null).map((p) => ({
+      type: p.type,
+      name: p.name,
+      category: p.category,
+      content: p.pushContent
+    }));
+    if (toUpsert.length > 0) {
+      await apiPost("/sync/files", {
+        repo_id: repoId,
+        files: toUpsert
+      });
     }
+    await apiPut(`/repos/${repoId}`, { claude_sync_at: (/* @__PURE__ */ new Date()).toISOString() });
+    console.log(`
+  Applied: ${pulls.length} pulled, ${pushes.length} pushed`);
+  } else if (dryRun) {
+    console.log("\n  (dry-run \u2014 no changes)");
+  }
+  console.log("\n  Settings sync...");
+  await syncSettings(claudeDir, projectPath, defaultsRes.data, repoData, dryRun);
+  console.log("  Config sync...");
+  await syncConfig(repoId, projectPath, dryRun);
+  console.log("  Tech stack...");
+  await syncTechStack(repoId, projectPath, dryRun);
+  console.log("\n  Sync complete.\n");
+}
+async function syncSettings(claudeDir, projectPath, syncData, repoData, dryRun) {
+  const settingsPath = join7(claudeDir, "settings.json");
+  const globalSettingsFiles = syncData.global_settings ?? [];
+  let globalSettings = {};
+  for (const gf of globalSettingsFiles) {
+    const parsed = JSON.parse(substituteVariables(gf.content, repoData));
+    globalSettings = { ...globalSettings, ...parsed };
+  }
+  const repoSettingsFiles = syncData.settings ?? [];
+  let repoSettings = {};
+  for (const rf of repoSettingsFiles) {
+    repoSettings = JSON.parse(substituteVariables(rf.content, repoData));
+  }
+  const combinedTemplate = mergeGlobalAndRepoSettings(globalSettings, repoSettings);
+  const hooksDir = join7(projectPath, ".claude", "hooks");
+  const discovered = await discoverHooks(hooksDir);
+  let localSettings = {};
+  try {
+    const raw = await readFile7(settingsPath, "utf-8");
+    localSettings = JSON.parse(raw);
+  } catch {
+  }
+  let merged = Object.keys(localSettings).length > 0 ? mergeSettings(combinedTemplate, localSettings) : combinedTemplate;
+  merged = stripPermissionsAllow(merged);
+  if (discovered.size > 0) {
+    merged.hooks = mergeDiscoveredHooks(
+      merged.hooks ?? {},
+      discovered
+    );
+  }
+  const mergedContent = JSON.stringify(merged, null, 2) + "\n";
+  let currentContent = "";
+  try {
+    currentContent = await readFile7(settingsPath, "utf-8");
+  } catch {
   }
-  if (toUpsert.length === 0 && toDelete.length === 0) {
-    console.log("    Nothing to push.");
+  if (currentContent === mergedContent) {
+    console.log("    Settings up to date.");
     return;
   }
   if (dryRun) {
-    console.log("    (dry-run \u2014 no changes)");
+    console.log("    Settings would be updated (dry-run).");
     return;
   }
-  if (!force) {
-    const confirmed = await confirmProceed();
-    if (!confirmed) {
-      console.log("    Cancelled.");
-      return;
-    }
-  }
-  const result = await apiPost("/sync/files", {
-    repo_id: repoId,
-    files: toUpsert.map((f) => ({
-      type: f.type,
-      name: f.name,
-      category: f.category,
-      content: f.content
-    })),
-    delete_keys: toDelete
-  });
-  await apiPut(`/repos/${repoId}`, { claude_sync_at: (/* @__PURE__ */ new Date()).toISOString() });
-  console.log(`    ${result.data.upserted} upserted, ${result.data.deleted} deleted`);
+  await mkdir2(dirname2(settingsPath), { recursive: true });
+  await writeFile3(settingsPath, mergedContent, "utf-8");
+  console.log("    Updated settings.json");
 }
 async function syncConfig(repoId, projectPath, dryRun) {
   const configPath = join7(projectPath, ".codebyplan.json");
@@ -1462,6 +1467,27 @@ async function syncTechStack(repoId, projectPath, dryRun) {
     console.log("    Tech stack detection skipped.");
   }
 }
+function getLocalFilePath(claudeDir, projectPath, remote) {
+  const typeConfig2 = {
+    command: { dir: "commands", ext: ".md" },
+    agent: { dir: "agents", ext: ".md", subfolder: "AGENT" },
+    skill: { dir: "skills", ext: ".md", subfolder: "SKILL" },
+    rule: { dir: "rules", ext: ".md" },
+    hook: { dir: "hooks", ext: ".sh" },
+    template: { dir: "templates", ext: "" },
+    claude_md: { dir: "", ext: "" },
+    settings: { dir: "", ext: "" }
+  };
+  if (remote.type === "claude_md") return join7(projectPath, "CLAUDE.md");
+  if (remote.type === "settings") return join7(claudeDir, "settings.json");
+  const cfg = typeConfig2[remote.type];
+  if (!cfg) return join7(claudeDir, remote.name);
+  const typeDir = remote.type === "command" ? join7(claudeDir, cfg.dir, "cbp") : join7(claudeDir, cfg.dir);
+  if (cfg.subfolder) return join7(typeDir, remote.name, `${cfg.subfolder}${cfg.ext}`);
+  if (remote.type === "command" && remote.category) return join7(typeDir, remote.category, `${remote.name}${cfg.ext}`);
+  if (remote.type === "template") return join7(typeDir, remote.name);
+  return join7(typeDir, `${remote.name}${cfg.ext}`);
+}
 function flattenSyncData(data) {
   const result = /* @__PURE__ */ new Map();
   const typeMap = {
@@ -1493,12 +1519,12 @@ var init_sync = __esm({
     "use strict";
     init_config();
     init_fileMapper();
-    init_conflict();
     init_confirm();
     init_api();
-    init_sync_engine();
     init_variables();
     init_tech_detect();
+    init_settings_merge();
+    init_hook_registry();
   }
 });
 
@@ -23316,11 +23342,11 @@ async function createPR(options) {
       }
     } catch {
     }
-    const { stdout: stdout4 } = await exec(
+    const { stdout: stdout3 } = await exec(
       `gh pr create --head "${head}" --base "${base}" --title "${title.replace(/"/g, '\\"')}" --body "${body.replace(/"/g, '\\"')}"`,
       { cwd: repoPath }
     );
-    const prUrl = stdout4.trim();
+    const prUrl = stdout3.trim();
     const prNumber = parseInt(prUrl.split("/").pop() ?? "0", 10);
     return { pr_url: prUrl, pr_number: prNumber || null };
   } catch (err) {
@@ -23331,11 +23357,11 @@ async function createPR(options) {
 async function mergePR(options) {
   const { repoPath, prNumber, mergeMethod } = options;
   try {
-    const { stdout: stdout4 } = await exec(
+    const { stdout: stdout3 } = await exec(
       `gh pr merge ${prNumber} --${mergeMethod} --delete-branch`,
       { cwd: repoPath }
     );
-    return { merged: true, message: stdout4.trim() || `PR #${prNumber} merged via ${mergeMethod}` };
+    return { merged: true, message: stdout3.trim() || `PR #${prNumber} merged via ${mergeMethod}` };
   } catch (err) {
     const errorMessage = err instanceof Error ? err.message : String(err);
     return { merged: false, message: "Merge failed", error: errorMessage };
@@ -23343,11 +23369,11 @@ async function mergePR(options) {
 }
 async function getPRStatus(repoPath, prNumber) {
   try {
-    const { stdout: stdout4 } = await exec(
+    const { stdout: stdout3 } = await exec(
       `gh pr view ${prNumber} --json state,mergeable,title,url,number`,
       { cwd: repoPath }
     );
-    const pr = JSON.parse(stdout4.trim());
+    const pr = JSON.parse(stdout3.trim());
     return {
       state: pr.state,
       mergeable: pr.mergeable,
@@ -24192,7 +24218,7 @@ function registerFileGenTools(server) {
       }
       const addCmd = files && files.length > 0 ? `git add ${files.map((f) => `"${f}"`).join(" ")}` : "git add .";
       await exec2(addCmd, { cwd: repo.path });
-      const { stdout: stdout4, stderr } = await exec2(
+      const { stdout: stdout3, stderr } = await exec2(
         `git commit -m "${message.replace(/"/g, '\\"')}"`,
         { cwd: repo.path }
       );
@@ -24203,7 +24229,7 @@ function registerFileGenTools(server) {
           text: JSON.stringify({
             status: "committed",
             branch: branch.trim(),
-            output: stdout4.trim(),
+            output: stdout3.trim(),
             warnings: stderr.trim() || void 0
           }, null, 2)
         }]

package/package.json

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