@codebyplan/cli 2.3.0 → 3.0.0

package/dist/cli.js

@@ -37,179 +37,11 @@ var VERSION, PACKAGE_NAME;
 var init_version = __esm({
   "src/lib/version.ts"() {
     "use strict";
-    VERSION = "2.3.0";
+    VERSION = "3.0.0";
     PACKAGE_NAME = "@codebyplan/cli";
   }
 });
 
-// src/cli/setup.ts
-var setup_exports = {};
-__export(setup_exports, {
-  runSetup: () => runSetup
-});
-import { createInterface } from "node:readline/promises";
-import { stdin, stdout } from "node:process";
-import { readFile, writeFile } from "node:fs/promises";
-import { homedir } from "node:os";
-import { join } from "node:path";
-function getConfigPath(scope) {
-  return scope === "user" ? join(homedir(), ".claude.json") : join(process.cwd(), ".mcp.json");
-}
-async function readConfig(path) {
-  try {
-    const raw = await readFile(path, "utf-8");
-    const parsed = JSON.parse(raw);
-    if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
-      return parsed;
-    }
-    return {};
-  } catch {
-    return {};
-  }
-}
-function buildMcpEntry(apiKey) {
-  return {
-    command: "npx",
-    args: ["-y", PACKAGE_NAME],
-    env: { CODEBYPLAN_API_KEY: apiKey }
-  };
-}
-async function writeMcpConfig(scope, apiKey) {
-  const configPath = getConfigPath(scope);
-  const config2 = await readConfig(configPath);
-  if (typeof config2.mcpServers !== "object" || config2.mcpServers === null || Array.isArray(config2.mcpServers)) {
-    config2.mcpServers = {};
-  }
-  config2.mcpServers.codebyplan = buildMcpEntry(apiKey);
-  await writeFile(configPath, JSON.stringify(config2, null, 2) + "\n", "utf-8");
-  return configPath;
-}
-async function verifyMcpConfig(scope, apiKey) {
-  try {
-    const config2 = await readConfig(getConfigPath(scope));
-    const servers = config2.mcpServers;
-    if (!servers) return false;
-    const entry = servers.codebyplan;
-    return entry?.env?.CODEBYPLAN_API_KEY === apiKey;
-  } catch {
-    return false;
-  }
-}
-async function runSetup() {
-  const rl = createInterface({ input: stdin, output: stdout });
-  console.log("\n  CodeByPlan MCP Server Setup\n");
-  console.log("  This will configure Claude Code to use CodeByPlan.\n");
-  console.log("  1. Sign up at https://codebyplan.com");
-  console.log("  2. Create an API key at https://codebyplan.com/settings/api-keys/\n");
-  try {
-    const apiKey = (await rl.question("  Enter your API key: ")).trim();
-    if (!apiKey) {
-      console.log("\n  No API key provided. Aborting setup.\n");
-      return;
-    }
-    console.log("\n  Validating API key...");
-    const baseUrl = process.env.CODEBYPLAN_API_URL ?? "https://codebyplan.com";
-    const res = await fetch(`${baseUrl}/api/repos`, {
-      headers: { "x-api-key": apiKey },
-      signal: AbortSignal.timeout(1e4)
-    });
-    if (res.status === 401) {
-      console.log("  Invalid API key. Please check and try again.\n");
-      return;
-    }
-    if (!res.ok) {
-      console.log(`  Warning: API returned status ${res.status}, but continuing.
-`);
-    } else {
-      try {
-        const body = await res.json();
-        if (Array.isArray(body.data) && body.data.length === 0) {
-          console.log("  API key is valid but no repositories found.");
-          console.log("  Create one at https://codebyplan.com after setup.\n");
-        } else {
-          console.log("  API key is valid!\n");
-        }
-      } catch {
-        console.log("  API key is valid!\n");
-      }
-    }
-    console.log("  Where should the MCP server be configured?\n");
-    console.log("    1. Global \u2014 available in all projects (~/.claude.json)");
-    console.log("    2. Project \u2014 only this project (.mcp.json)\n");
-    const scopeInput = (await rl.question("  Select (1/2, default: 1): ")).trim();
-    const scope = scopeInput === "2" ? "project" : "user";
-    console.log("\n  Configuring MCP server...");
-    const configPath = await writeMcpConfig(scope, apiKey);
-    const verified = await verifyMcpConfig(scope, apiKey);
-    if (verified) {
-      console.log(`  Done! Config written to ${configPath}
-`);
-      if (scope === "project") {
-        console.log("  Note: .mcp.json contains your API key \u2014 add it to .gitignore.\n");
-      }
-      console.log("  Start a new Claude Code session to begin using it.\n");
-    } else {
-      console.log("  Warning: Could not verify the saved configuration.\n");
-      console.log("  You can configure manually by adding to your Claude config:\n");
-      console.log(`  claude mcp add codebyplan -e CODEBYPLAN_API_KEY=${apiKey} -- npx -y ${PACKAGE_NAME}
-`);
-    }
-  } finally {
-    rl.close();
-  }
-}
-var init_setup = __esm({
-  "src/cli/setup.ts"() {
-    "use strict";
-    init_version();
-  }
-});
-
-// src/cli/config.ts
-import { readFile as readFile2 } from "node:fs/promises";
-import { join as join2 } from "node:path";
-function parseFlags(startIndex) {
-  const flags = {};
-  const args = process.argv.slice(startIndex);
-  for (let i = 0; i < args.length; i++) {
-    const arg2 = args[i];
-    if (arg2.startsWith("--") && i + 1 < args.length) {
-      const key = arg2.slice(2);
-      flags[key] = args[++i];
-    }
-  }
-  return flags;
-}
-function hasFlag(name, startIndex) {
-  return process.argv.slice(startIndex).includes(`--${name}`);
-}
-async function resolveConfig(flags) {
-  const projectPath = flags["path"] ?? process.cwd();
-  let repoId = flags["repo-id"] ?? process.env.CODEBYPLAN_REPO_ID;
-  let worktreeId = flags["worktree-id"] ?? process.env.CODEBYPLAN_WORKTREE_ID;
-  if (!repoId || !worktreeId) {
-    try {
-      const configPath = join2(projectPath, ".codebyplan.json");
-      const raw = await readFile2(configPath, "utf-8");
-      const config2 = JSON.parse(raw);
-      if (!repoId) repoId = config2.repo_id;
-      if (!worktreeId) worktreeId = config2.worktree_id;
-    } catch {
-    }
-  }
-  if (!repoId) {
-    throw new Error(
-      'Could not determine repo_id.\n\nProvide it via one of:\n  --repo-id <uuid>              CLI flag\n  CODEBYPLAN_REPO_ID=<uuid>     environment variable\n  .codebyplan.json              { "repo_id": "<uuid>" } in project root'
-    );
-  }
-  return { repoId, worktreeId, projectPath };
-}
-var init_config = __esm({
-  "src/cli/config.ts"() {
-    "use strict";
-  }
-});
-
 // src/lib/api.ts
 function validateApiKey() {
   if (!API_KEY) {
@@ -432,8 +264,8 @@ var init_settings_merge = __esm({
 });
 
 // src/lib/hook-registry.ts
-import { readdir, readFile as readFile3 } from "node:fs/promises";
-import { join as join3 } from "node:path";
+import { readdir, readFile } from "node:fs/promises";
+import { join } from "node:path";
 function parseHookMeta(content) {
   const match = content.match(/^#\s*@hook:\s*(\S+)(?:\s+(.+))?$/m);
   if (!match) return null;
@@ -452,7 +284,7 @@ async function discoverHooks(hooksDir) {
     return discovered;
   }
   for (const filename of filenames) {
-    const content = await readFile3(join3(hooksDir, filename), "utf-8");
+    const content = await readFile(join(hooksDir, filename), "utf-8");
     const meta = parseHookMeta(content);
     if (meta) {
       discovered.set(filename.replace(/\.sh$/, ""), meta);
@@ -557,38 +389,42 @@ var init_variables = __esm({
 });
 
 // src/lib/sync-engine.ts
-import { readdir as readdir2, readFile as readFile4, writeFile as writeFile2, unlink, mkdir, rmdir, chmod, stat } from "node:fs/promises";
-import { join as join4, dirname } from "node:path";
+var sync_engine_exports = {};
+__export(sync_engine_exports, {
+  executeSyncToLocal: () => executeSyncToLocal
+});
+import { readdir as readdir2, readFile as readFile2, writeFile, unlink, mkdir, rmdir, chmod, stat } from "node:fs/promises";
+import { join as join2, dirname } from "node:path";
 function getTypeDir(claudeDir, dir) {
-  if (dir === "commands") return join4(claudeDir, dir, "cbp");
-  return join4(claudeDir, dir);
+  if (dir === "commands") return join2(claudeDir, dir, "cbp");
+  return join2(claudeDir, dir);
 }
 function getFilePath(claudeDir, typeName, file) {
   const cfg = typeConfig[typeName];
   const typeDir = getTypeDir(claudeDir, cfg.dir);
   if (cfg.subfolder) {
-    return join4(typeDir, file.name, `${cfg.subfolder}${cfg.ext}`);
+    return join2(typeDir, file.name, `${cfg.subfolder}${cfg.ext}`);
   }
   if (typeName === "command" && file.category) {
-    return join4(typeDir, file.category, `${file.name}${cfg.ext}`);
+    return join2(typeDir, file.category, `${file.name}${cfg.ext}`);
   }
   if (typeName === "template") {
-    return join4(typeDir, file.name);
+    return join2(typeDir, file.name);
   }
-  return join4(typeDir, `${file.name}${cfg.ext}`);
+  return join2(typeDir, `${file.name}${cfg.ext}`);
 }
 async function readDirRecursive(dir, base = dir) {
   const result = /* @__PURE__ */ new Map();
   try {
     const entries = await readdir2(dir, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join4(dir, entry.name);
+      const fullPath = join2(dir, entry.name);
       if (entry.isDirectory()) {
         const sub = await readDirRecursive(fullPath, base);
         for (const [k, v] of sub) result.set(k, v);
       } else {
         const relPath = fullPath.slice(base.length + 1);
-        const fileContent = await readFile4(fullPath, "utf-8");
+        const fileContent = await readFile2(fullPath, "utf-8");
         result.set(relPath, fileContent);
       }
     }
@@ -598,7 +434,7 @@ async function readDirRecursive(dir, base = dir) {
 }
 async function isGitWorktree(projectPath) {
   try {
-    const gitPath = join4(projectPath, ".git");
+    const gitPath = join2(projectPath, ".git");
     const info = await stat(gitPath);
     return info.isFile();
   } catch {
@@ -625,7 +461,7 @@ async function executeSyncToLocal(options) {
   const syncData = syncRes.data;
   const repoData = repoRes.data;
   syncData.claude_md = [];
-  const claudeDir = join4(projectPath, ".claude");
+  const claudeDir = join2(projectPath, ".claude");
   const worktree = await isGitWorktree(projectPath);
   const byType = {};
   const totals = { created: 0, updated: 0, deleted: 0, unchanged: 0 };
@@ -650,19 +486,19 @@ async function executeSyncToLocal(options) {
       remotePathMap.set(relPath, { content: substituted, name: remote.name });
     }
     for (const [relPath, { content, name }] of remotePathMap) {
-      const fullPath = join4(targetDir, relPath);
+      const fullPath = join2(targetDir, relPath);
       const localContent = localFiles.get(relPath);
       if (localContent === void 0) {
         if (!dryRun) {
           await mkdir(dirname(fullPath), { recursive: true });
-          await writeFile2(fullPath, content, "utf-8");
+          await writeFile(fullPath, content, "utf-8");
           if (typeName === "hook") await chmod(fullPath, 493);
         }
         result.created.push(name);
         totals.created++;
       } else if (localContent !== content) {
         if (!dryRun) {
-          await writeFile2(fullPath, content, "utf-8");
+          await writeFile(fullPath, content, "utf-8");
           if (typeName === "hook") await chmod(fullPath, 493);
         }
         result.updated.push(name);
@@ -674,7 +510,7 @@ async function executeSyncToLocal(options) {
     }
     for (const [relPath] of localFiles) {
       if (!remotePathMap.has(relPath)) {
-        const fullPath = join4(targetDir, relPath);
+        const fullPath = join2(targetDir, relPath);
         if (!dryRun) {
           await unlink(fullPath);
           await removeEmptyParents(fullPath, targetDir);
@@ -689,7 +525,7 @@ async function executeSyncToLocal(options) {
   {
     const typeName = "docs_stack";
     const syncKey = "docs_stack";
-    const targetDir = join4(projectPath, "docs", "stack");
+    const targetDir = join2(projectPath, "docs", "stack");
     const remoteFiles = syncData[syncKey] ?? [];
     const result = { created: [], updated: [], deleted: [], unchanged: [] };
     if (remoteFiles.length > 0 && !dryRun) {
@@ -698,23 +534,23 @@ async function executeSyncToLocal(options) {
     const localFiles = await readDirRecursive(targetDir);
     const remotePathMap = /* @__PURE__ */ new Map();
     for (const remote of remoteFiles) {
-      const relPath = remote.category ? join4(remote.category, remote.name) : remote.name;
+      const relPath = remote.category ? join2(remote.category, remote.name) : remote.name;
       const substituted = substituteVariables(remote.content, repoData);
       remotePathMap.set(relPath, { content: substituted, name: `${remote.category ?? ""}/${remote.name}` });
     }
     for (const [relPath, { content, name }] of remotePathMap) {
-      const fullPath = join4(targetDir, relPath);
+      const fullPath = join2(targetDir, relPath);
       const localContent = localFiles.get(relPath);
       if (localContent === void 0) {
         if (!dryRun) {
           await mkdir(dirname(fullPath), { recursive: true });
-          await writeFile2(fullPath, content, "utf-8");
+          await writeFile(fullPath, content, "utf-8");
         }
         result.created.push(name);
         totals.created++;
       } else if (localContent !== content) {
         if (!dryRun) {
-          await writeFile2(fullPath, content, "utf-8");
+          await writeFile(fullPath, content, "utf-8");
         }
         result.updated.push(name);
         totals.updated++;
@@ -725,7 +561,7 @@ async function executeSyncToLocal(options) {
     }
     for (const [relPath] of localFiles) {
       if (!remotePathMap.has(relPath)) {
-        const fullPath = join4(targetDir, relPath);
+        const fullPath = join2(targetDir, relPath);
         if (!dryRun) {
           await unlink(fullPath);
           await removeEmptyParents(fullPath, targetDir);
@@ -743,8 +579,8 @@ async function executeSyncToLocal(options) {
     globalSettings = { ...globalSettings, ...parsed };
   }
   const specialTypes = {
-    claude_md: () => join4(projectPath, "CLAUDE.md"),
-    settings: () => join4(projectPath, ".claude", "settings.json")
+    claude_md: () => join2(projectPath, "CLAUDE.md"),
+    settings: () => join2(projectPath, ".claude", "settings.json")
   };
   for (const [typeName, getPath] of Object.entries(specialTypes)) {
     const remoteFiles = syncData[typeName] ?? [];
@@ -754,13 +590,13 @@ async function executeSyncToLocal(options) {
       const remoteContent = substituteVariables(remote.content, repoData);
       let localContent;
       try {
-        localContent = await readFile4(targetPath, "utf-8");
+        localContent = await readFile2(targetPath, "utf-8");
       } catch {
       }
       if (typeName === "settings") {
         const repoSettings = JSON.parse(remoteContent);
         const combinedTemplate = mergeGlobalAndRepoSettings(globalSettings, repoSettings);
-        const hooksDir = join4(projectPath, ".claude", "hooks");
+        const hooksDir = join2(projectPath, ".claude", "hooks");
         const discovered = await discoverHooks(hooksDir);
         if (localContent === void 0) {
           let finalSettings = stripPermissionsAllow(combinedTemplate);
@@ -772,7 +608,7 @@ async function executeSyncToLocal(options) {
           }
           if (!dryRun) {
             await mkdir(dirname(targetPath), { recursive: true });
-            await writeFile2(targetPath, JSON.stringify(finalSettings, null, 2) + "\n", "utf-8");
+            await writeFile(targetPath, JSON.stringify(finalSettings, null, 2) + "\n", "utf-8");
           }
           result.created.push(remote.name);
           totals.created++;
@@ -789,7 +625,7 @@ async function executeSyncToLocal(options) {
           const mergedContent = JSON.stringify(merged, null, 2) + "\n";
           if (localContent !== mergedContent) {
             if (!dryRun) {
-              await writeFile2(targetPath, mergedContent, "utf-8");
+              await writeFile(targetPath, mergedContent, "utf-8");
             }
             result.updated.push(remote.name);
             totals.updated++;
@@ -802,13 +638,13 @@ async function executeSyncToLocal(options) {
         if (localContent === void 0) {
           if (!dryRun) {
             await mkdir(dirname(targetPath), { recursive: true });
-            await writeFile2(targetPath, remoteContent, "utf-8");
+            await writeFile(targetPath, remoteContent, "utf-8");
           }
           result.created.push(remote.name);
           totals.created++;
         } else if (localContent !== remoteContent) {
           if (!dryRun) {
-            await writeFile2(targetPath, remoteContent, "utf-8");
+            await writeFile(targetPath, remoteContent, "utf-8");
           }
           result.updated.push(remote.name);
           totals.updated++;
@@ -852,327 +688,244 @@ var init_sync_engine = __esm({
   }
 });
 
-// src/cli/confirm.ts
-import { createInterface as createInterface2 } from "node:readline/promises";
-import { stdin as stdin2, stdout as stdout2 } from "node:process";
-async function confirmProceed(message) {
-  const rl = createInterface2({ input: stdin2, output: stdout2 });
+// src/cli/setup.ts
+var setup_exports = {};
+__export(setup_exports, {
+  runSetup: () => runSetup
+});
+import { createInterface } from "node:readline/promises";
+import { stdin, stdout } from "node:process";
+import { readFile as readFile3, writeFile as writeFile2 } from "node:fs/promises";
+import { homedir } from "node:os";
+import { join as join3 } from "node:path";
+function getConfigPath(scope) {
+  return scope === "user" ? join3(homedir(), ".claude.json") : join3(process.cwd(), ".mcp.json");
+}
+async function readConfig(path) {
   try {
-    const answer = await rl.question(message ?? "  Proceed? [Y/n] ");
-    const a = answer.trim().toLowerCase();
-    return a !== "n" && a !== "no";
-  } finally {
-    rl.close();
+    const raw = await readFile3(path, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+      return parsed;
+    }
+    return {};
+  } catch {
+    return {};
   }
 }
-var init_confirm = __esm({
-  "src/cli/confirm.ts"() {
-    "use strict";
+function buildMcpEntry(apiKey) {
+  return {
+    command: "npx",
+    args: ["-y", PACKAGE_NAME],
+    env: { CODEBYPLAN_API_KEY: apiKey }
+  };
+}
+async function writeMcpConfig(scope, apiKey) {
+  const configPath = getConfigPath(scope);
+  const config2 = await readConfig(configPath);
+  if (typeof config2.mcpServers !== "object" || config2.mcpServers === null || Array.isArray(config2.mcpServers)) {
+    config2.mcpServers = {};
   }
-});
-
-// src/lib/tech-detect.ts
-import { readFile as readFile5, access } from "node:fs/promises";
-import { join as join5 } from "node:path";
-async function fileExists(filePath) {
+  config2.mcpServers.codebyplan = buildMcpEntry(apiKey);
+  await writeFile2(configPath, JSON.stringify(config2, null, 2) + "\n", "utf-8");
+  return configPath;
+}
+async function verifyMcpConfig(scope, apiKey) {
   try {
-    await access(filePath);
-    return true;
+    const config2 = await readConfig(getConfigPath(scope));
+    const servers = config2.mcpServers;
+    if (!servers) return false;
+    const entry = servers.codebyplan;
+    return entry?.env?.CODEBYPLAN_API_KEY === apiKey;
   } catch {
     return false;
   }
 }
-async function detectTechStack(projectPath) {
-  const seen = /* @__PURE__ */ new Map();
+async function runSetup() {
+  const rl = createInterface({ input: stdin, output: stdout });
+  console.log("\n  CodeByPlan Setup\n");
+  console.log("  This will configure Claude Code to use CodeByPlan.\n");
+  console.log("  1. Sign up at https://codebyplan.com");
+  console.log("  2. Create an API key at https://codebyplan.com/settings/api-keys/\n");
   try {
-    const raw = await readFile5(join5(projectPath, "package.json"), "utf-8");
-    const pkg = JSON.parse(raw);
-    const allDeps = {
-      ...pkg.dependencies,
-      ...pkg.devDependencies
-    };
-    for (const depName of Object.keys(allDeps)) {
-      const rule = PACKAGE_MAP[depName];
-      if (rule) {
-        const key = rule.name.toLowerCase();
-        if (!seen.has(key)) {
-          seen.set(key, { name: rule.name, category: rule.category });
+    const apiKey = (await rl.question("  Enter your API key: ")).trim();
+    if (!apiKey) {
+      console.log("\n  No API key provided. Aborting setup.\n");
+      return;
+    }
+    console.log("\n  Validating API key...");
+    const baseUrl = process.env.CODEBYPLAN_API_URL ?? "https://codebyplan.com";
+    const res = await fetch(`${baseUrl}/api/repos`, {
+      headers: { "x-api-key": apiKey },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (res.status === 401) {
+      console.log("  Invalid API key. Please check and try again.\n");
+      return;
+    }
+    let repos = [];
+    if (res.ok) {
+      try {
+        const body = await res.json();
+        repos = body.data ?? [];
+        if (repos.length === 0) {
+          console.log("  API key is valid but no repositories found.");
+          console.log("  Create one at https://codebyplan.com after setup.\n");
+        } else {
+          console.log("  API key is valid!\n");
         }
+      } catch {
+        console.log("  API key is valid!\n");
       }
+    } else {
+      console.log(`  Warning: API returned status ${res.status}, but continuing.
+`);
     }
-  } catch {
-  }
-  for (const { file, rule } of CONFIG_FILE_MAP) {
-    const key = rule.name.toLowerCase();
-    if (!seen.has(key) && await fileExists(join5(projectPath, file))) {
-      seen.set(key, { name: rule.name, category: rule.category });
+    console.log("  Where should the MCP server be configured?\n");
+    console.log("    1. Global \u2014 available in all projects (~/.claude.json)");
+    console.log("    2. Project \u2014 only this project (.mcp.json)\n");
+    const scopeInput = (await rl.question("  Select (1/2, default: 1): ")).trim();
+    const scope = scopeInput === "2" ? "project" : "user";
+    console.log("\n  Configuring MCP server...");
+    const configPath = await writeMcpConfig(scope, apiKey);
+    const verified = await verifyMcpConfig(scope, apiKey);
+    if (verified) {
+      console.log(`  Done! Config written to ${configPath}
+`);
+      if (scope === "project") {
+        console.log("  Note: .mcp.json contains your API key \u2014 add it to .gitignore.\n");
+      }
+    } else {
+      console.log("  Warning: Could not verify the saved configuration.\n");
+      console.log(`  claude mcp add codebyplan -e CODEBYPLAN_API_KEY=${apiKey} -- npx -y ${PACKAGE_NAME}
+`);
     }
-  }
-  return Array.from(seen.values()).sort((a, b) => {
-    const catCmp = a.category.localeCompare(b.category);
-    if (catCmp !== 0) return catCmp;
-    return a.name.localeCompare(b.name);
-  });
-}
-function mergeTechStack(remote, detected) {
-  const seen = /* @__PURE__ */ new Map();
-  for (const entry of remote) {
-    seen.set(entry.name.toLowerCase(), entry);
-  }
-  const added = [];
-  for (const entry of detected) {
-    const key = entry.name.toLowerCase();
-    if (!seen.has(key)) {
-      seen.set(key, entry);
-      added.push(entry);
+    if (repos.length > 0) {
+      console.log("  Initialize this project?\n");
+      const initAnswer = (await rl.question("  Link to a repository? (Y/n): ")).trim().toLowerCase();
+      if (initAnswer === "" || initAnswer === "y" || initAnswer === "yes") {
+        process.env.CODEBYPLAN_API_KEY = apiKey;
+        console.log("\n  Your repositories:\n");
+        for (let i = 0; i < repos.length; i++) {
+          console.log(`    ${i + 1}. ${repos[i].name}`);
+        }
+        console.log();
+        const choice = (await rl.question("  Select a repository (number): ")).trim();
+        const index = parseInt(choice, 10) - 1;
+        if (isNaN(index) || index < 0 || index >= repos.length) {
+          console.log("  Invalid selection. Skipping project init.\n");
+        } else {
+          const selectedRepo = repos[index];
+          console.log(`
+  Selected: ${selectedRepo.name}
+`);
+          let worktreeId;
+          const projectPath = process.cwd();
+          try {
+            const worktreesRes = await apiGet(`/worktrees?repo_id=${selectedRepo.id}`);
+            const match = worktreesRes.data.find((wt) => projectPath === wt.path || projectPath.startsWith(wt.path + "/"));
+            if (match) worktreeId = match.id;
+          } catch {
+          }
+          const codebyplanPath = join3(projectPath, ".codebyplan.json");
+          const codebyplanConfig = { repo_id: selectedRepo.id };
+          if (worktreeId) codebyplanConfig.worktree_id = worktreeId;
+          await writeFile2(codebyplanPath, JSON.stringify(codebyplanConfig, null, 2) + "\n", "utf-8");
+          console.log(`  Created ${codebyplanPath}`);
+          console.log("\n  Running initial sync...\n");
+          try {
+            const { executeSyncToLocal: executeSyncToLocal2 } = await Promise.resolve().then(() => (init_sync_engine(), sync_engine_exports));
+            const syncResult = await executeSyncToLocal2({
+              repoId: selectedRepo.id,
+              projectPath
+            });
+            const totalChanges = syncResult.totals.created + syncResult.totals.updated + syncResult.totals.deleted;
+            if (totalChanges > 0) {
+              console.log(`  Synced: ${syncResult.totals.created} created, ${syncResult.totals.updated} updated, ${syncResult.totals.deleted} deleted
+`);
+            } else {
+              console.log("  All files already up to date.\n");
+            }
+          } catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            console.log(`  Sync failed: ${msg}`);
+            console.log("  Run 'codebyplan sync' later to sync files.\n");
+          }
+        }
+      }
     }
+    console.log("  Setup complete! Start a new Claude Code session to begin.\n");
+  } finally {
+    rl.close();
   }
-  const merged = Array.from(seen.values()).sort((a, b) => {
-    const catCmp = a.category.localeCompare(b.category);
-    if (catCmp !== 0) return catCmp;
-    return a.name.localeCompare(b.name);
-  });
-  return { merged, added };
-}
-function parseTechStack(raw) {
-  if (!Array.isArray(raw)) return [];
-  return raw.filter(
-    (item) => typeof item === "object" && item !== null && typeof item.name === "string" && typeof item.category === "string"
-  );
 }
-var PACKAGE_MAP, CONFIG_FILE_MAP;
-var init_tech_detect = __esm({
-  "src/lib/tech-detect.ts"() {
+var init_setup = __esm({
+  "src/cli/setup.ts"() {
     "use strict";
-    PACKAGE_MAP = {
-      // Frameworks
-      next: { name: "Next.js", category: "framework" },
-      nuxt: { name: "Nuxt", category: "framework" },
-      gatsby: { name: "Gatsby", category: "framework" },
-      express: { name: "Express", category: "framework" },
-      fastify: { name: "Fastify", category: "framework" },
-      hono: { name: "Hono", category: "framework" },
-      "@remix-run/node": { name: "Remix", category: "framework" },
-      svelte: { name: "Svelte", category: "framework" },
-      astro: { name: "Astro", category: "framework" },
-      "@angular/core": { name: "Angular", category: "framework" },
-      // Libraries (UI)
-      react: { name: "React", category: "framework" },
-      vue: { name: "Vue", category: "framework" },
-      "solid-js": { name: "Solid", category: "framework" },
-      preact: { name: "Preact", category: "framework" },
-      // Languages (detected via devDeps)
-      typescript: { name: "TypeScript", category: "language" },
-      // Styling
-      tailwindcss: { name: "Tailwind CSS", category: "styling" },
-      sass: { name: "SCSS", category: "styling" },
-      "styled-components": { name: "styled-components", category: "styling" },
-      "@emotion/react": { name: "Emotion", category: "styling" },
-      // Database
-      prisma: { name: "Prisma", category: "database" },
-      "@prisma/client": { name: "Prisma", category: "database" },
-      "drizzle-orm": { name: "Drizzle", category: "database" },
-      "@supabase/supabase-js": { name: "Supabase", category: "database" },
-      mongoose: { name: "MongoDB", category: "database" },
-      typeorm: { name: "TypeORM", category: "database" },
-      knex: { name: "Knex", category: "database" },
-      // Testing
-      jest: { name: "Jest", category: "testing" },
-      vitest: { name: "Vitest", category: "testing" },
-      mocha: { name: "Mocha", category: "testing" },
-      playwright: { name: "Playwright", category: "testing" },
-      "@playwright/test": { name: "Playwright", category: "testing" },
-      cypress: { name: "Cypress", category: "testing" },
-      // Build tools
-      turbo: { name: "Turborepo", category: "build" },
-      vite: { name: "Vite", category: "build" },
-      webpack: { name: "Webpack", category: "build" },
-      esbuild: { name: "esbuild", category: "build" },
-      rollup: { name: "Rollup", category: "build" },
-      // Tools
-      eslint: { name: "ESLint", category: "tool" },
-      prettier: { name: "Prettier", category: "tool" },
-      "@biomejs/biome": { name: "Biome", category: "tool" }
-    };
-    CONFIG_FILE_MAP = [
-      { file: "tsconfig.json", rule: { name: "TypeScript", category: "language" } },
-      { file: "next.config.js", rule: { name: "Next.js", category: "framework" } },
-      { file: "next.config.mjs", rule: { name: "Next.js", category: "framework" } },
-      { file: "next.config.ts", rule: { name: "Next.js", category: "framework" } },
-      { file: "tailwind.config.js", rule: { name: "Tailwind CSS", category: "styling" } },
-      { file: "tailwind.config.ts", rule: { name: "Tailwind CSS", category: "styling" } },
-      { file: "turbo.json", rule: { name: "Turborepo", category: "build" } },
-      { file: "docker-compose.yml", rule: { name: "Docker", category: "deployment" } },
-      { file: "docker-compose.yaml", rule: { name: "Docker", category: "deployment" } },
-      { file: "Dockerfile", rule: { name: "Docker", category: "deployment" } },
-      { file: "vercel.json", rule: { name: "Vercel", category: "deployment" } }
-    ];
+    init_version();
+    init_api();
   }
 });
 
-// src/cli/pull.ts
-var pull_exports = {};
-__export(pull_exports, {
-  executePull: () => executePull,
-  runPull: () => runPull
-});
-async function executePull(options) {
-  const { repoId, projectPath, dryRun, quiet, force } = options;
-  const log = quiet ? () => {
-  } : (msg) => console.log(msg);
-  const needsConfirm = !force && !quiet && !dryRun;
-  const previewResult = await executeSyncToLocal({
-    repoId,
-    projectPath,
-    dryRun: needsConfirm ? true : dryRun
-  });
-  for (const [typeKey, result] of Object.entries(previewResult.byType)) {
-    const displayType = displayTypeMap[typeKey] ?? typeKey;
-    for (const name of result.created) {
-      log(`  + ${displayType}/${name}`);
-    }
-    for (const name of result.updated) {
-      log(`  ~ ${displayType}/${name}`);
-    }
-    for (const name of result.deleted) {
-      log(`  - ${displayType}/${name}`);
-    }
-  }
-  const totalChanges = previewResult.totals.created + previewResult.totals.updated + previewResult.totals.deleted;
-  if (needsConfirm && totalChanges > 0) {
-    log("");
-    log(`  ${previewResult.totals.created} to create, ${previewResult.totals.updated} to update, ${previewResult.totals.deleted} to delete`);
-    const confirmed = await confirmProceed();
-    if (!confirmed) {
-      log("  Cancelled.");
-      return { created: 0, updated: 0, deleted: 0, unchanged: previewResult.totals.unchanged };
+// src/cli/config.ts
+import { readFile as readFile4 } from "node:fs/promises";
+import { join as join4 } from "node:path";
+function parseFlags(startIndex) {
+  const flags = {};
+  const args = process.argv.slice(startIndex);
+  for (let i = 0; i < args.length; i++) {
+    const arg2 = args[i];
+    if (arg2.startsWith("--") && i + 1 < args.length) {
+      const key = arg2.slice(2);
+      flags[key] = args[++i];
     }
-    const realResult = await executeSyncToLocal({ repoId, projectPath, dryRun: false });
-    return {
-      created: realResult.totals.created,
-      updated: realResult.totals.updated,
-      deleted: realResult.totals.deleted,
-      unchanged: realResult.totals.unchanged
-    };
   }
-  return {
-    created: previewResult.totals.created,
-    updated: previewResult.totals.updated,
-    deleted: previewResult.totals.deleted,
-    unchanged: previewResult.totals.unchanged
-  };
+  return flags;
 }
-async function runPull() {
-  const flags = parseFlags(3);
-  const dryRun = hasFlag("dry-run", 3);
-  const force = hasFlag("force", 3);
-  const statusOnly = hasFlag("status", 3);
-  validateApiKey();
-  const config2 = await resolveConfig(flags);
-  const { repoId, projectPath } = config2;
-  if (statusOnly) {
-    console.log(`
-  CodeByPlan Sync Status
-`);
-    await printSyncStatus(repoId);
-    return;
-  }
-  console.log(`
-  CodeByPlan Pull`);
-  console.log(`  Repo: ${repoId}`);
-  console.log(`  Path: ${projectPath}`);
-  if (dryRun) console.log(`  Mode: dry-run (no changes will be made)`);
-  if (force) console.log(`  Mode: force (no confirmation prompt)`);
-  console.log();
-  const repoRes = await apiGet(`/repos/${repoId}`);
-  const result = await executePull({ repoId, projectPath, dryRun, force });
-  console.log();
-  if (result.created + result.updated + result.deleted === 0) {
-    console.log("  All files up to date.");
-  } else {
-    console.log(`  ${result.created} created, ${result.updated} updated, ${result.deleted} deleted, ${result.unchanged} unchanged`);
-  }
-  if (dryRun) {
-    console.log("  (dry-run \u2014 no changes were made)");
-  }
-  printTechStack(repoRes.data.tech_stack);
-  await printSyncStatus(repoId);
+function hasFlag(name, startIndex) {
+  return process.argv.slice(startIndex).includes(`--${name}`);
 }
-function printTechStack(techStackRaw) {
-  try {
-    const entries = parseTechStack(techStackRaw);
-    if (entries.length === 0) return;
-    const grouped = /* @__PURE__ */ new Map();
-    for (const entry of entries) {
-      const list = grouped.get(entry.category) ?? [];
-      list.push(entry);
-      grouped.set(entry.category, list);
-    }
-    console.log();
-    console.log("  Tech stack:");
-    for (const [category, items] of grouped) {
-      const label = category.charAt(0).toUpperCase() + category.slice(1);
-      const names = items.map((e) => e.name).join(", ");
-      console.log(`    ${label}: ${names}`);
+async function resolveConfig(flags) {
+  const projectPath = flags["path"] ?? process.cwd();
+  let repoId = flags["repo-id"] ?? process.env.CODEBYPLAN_REPO_ID;
+  let worktreeId = flags["worktree-id"] ?? process.env.CODEBYPLAN_WORKTREE_ID;
+  if (!repoId || !worktreeId) {
+    try {
+      const configPath = join4(projectPath, ".codebyplan.json");
+      const raw = await readFile4(configPath, "utf-8");
+      const config2 = JSON.parse(raw);
+      if (!repoId) repoId = config2.repo_id;
+      if (!worktreeId) worktreeId = config2.worktree_id;
+    } catch {
     }
-  } catch {
   }
-}
-async function printSyncStatus(currentRepoId) {
-  try {
-    const statusRes = await apiGet("/sync/status");
-    const { repos } = statusRes.data;
-    const otherRepos = repos.filter((r) => r.id !== currentRepoId);
-    const stale = otherRepos.filter((r) => r.needs_sync);
-    if (stale.length > 0) {
-      console.log();
-      console.log(`  Other repos needing sync (${stale.length}):`);
-      for (const repo of stale) {
-        const syncedAt = repo.claude_sync_at ? new Date(repo.claude_sync_at).toLocaleDateString() : "never";
-        console.log(`    - ${repo.name} (last synced: ${syncedAt})`);
-      }
-    } else if (otherRepos.length > 0) {
-      console.log();
-      console.log("  All repos are in sync.");
-    }
-  } catch {
+  if (!repoId) {
+    throw new Error(
+      'Could not determine repo_id.\n\nProvide it via one of:\n  --repo-id <uuid>              CLI flag\n  CODEBYPLAN_REPO_ID=<uuid>     environment variable\n  .codebyplan.json              { "repo_id": "<uuid>" } in project root'
+    );
   }
-  console.log();
+  return { repoId, worktreeId, projectPath };
 }
-var displayTypeMap;
-var init_pull = __esm({
-  "src/cli/pull.ts"() {
+var init_config = __esm({
+  "src/cli/config.ts"() {
     "use strict";
-    init_config();
-    init_api();
-    init_sync_engine();
-    init_confirm();
-    init_tech_detect();
-    displayTypeMap = {
-      commands: "command",
-      agents: "agent",
-      skills: "skill",
-      rules: "rule",
-      hooks: "hook",
-      templates: "template"
-    };
   }
 });
 
 // src/cli/fileMapper.ts
-import { readdir as readdir3, readFile as readFile6 } from "node:fs/promises";
-import { join as join6, extname } from "node:path";
+import { readdir as readdir3, readFile as readFile5 } from "node:fs/promises";
+import { join as join5, extname } from "node:path";
 function compositeKey(type, name, category) {
   return category ? `${type}:${category}/${name}` : `${type}:${name}`;
 }
 async function scanLocalFiles(claudeDir, projectPath) {
   const result = /* @__PURE__ */ new Map();
-  await scanCommands(join6(claudeDir, "commands", "cbp"), result);
-  await scanSubfolderType(join6(claudeDir, "agents"), "agent", "AGENT.md", result);
-  await scanSubfolderType(join6(claudeDir, "skills"), "skill", "SKILL.md", result);
-  await scanFlatType(join6(claudeDir, "rules"), "rule", ".md", result);
-  await scanFlatType(join6(claudeDir, "hooks"), "hook", ".sh", result);
-  await scanTemplates(join6(claudeDir, "templates"), result);
+  await scanCommands(join5(claudeDir, "commands", "cbp"), result);
+  await scanSubfolderType(join5(claudeDir, "agents"), "agent", "AGENT.md", result);
+  await scanSubfolderType(join5(claudeDir, "skills"), "skill", "SKILL.md", result);
+  await scanFlatType(join5(claudeDir, "rules"), "rule", ".md", result);
+  await scanFlatType(join5(claudeDir, "hooks"), "hook", ".sh", result);
+  await scanTemplates(join5(claudeDir, "templates"), result);
   await scanSettings(claudeDir, projectPath, result);
   return result;
 }
@@ -1188,10 +941,10 @@ async function scanCommandsRecursive(baseDir, currentDir, result) {
   }
   for (const entry of entries) {
     if (entry.isDirectory()) {
-      await scanCommandsRecursive(baseDir, join6(currentDir, entry.name), result);
+      await scanCommandsRecursive(baseDir, join5(currentDir, entry.name), result);
     } else if (entry.isFile() && entry.name.endsWith(".md")) {
       const name = entry.name.slice(0, -3);
-      const content = await readFile6(join6(currentDir, entry.name), "utf-8");
+      const content = await readFile5(join5(currentDir, entry.name), "utf-8");
       const relDir = currentDir.slice(baseDir.length + 1);
       const category = relDir || null;
       const key = compositeKey("command", name, category);
@@ -1208,9 +961,9 @@ async function scanSubfolderType(dir, type, fileName, result) {
   }
   for (const entry of entries) {
     if (entry.isDirectory()) {
-      const filePath = join6(dir, entry.name, fileName);
+      const filePath = join5(dir, entry.name, fileName);
       try {
-        const content = await readFile6(filePath, "utf-8");
+        const content = await readFile5(filePath, "utf-8");
         const key = compositeKey(type, entry.name, null);
         result.set(key, { type, name: entry.name, category: null, content });
       } catch {
@@ -1228,7 +981,7 @@ async function scanFlatType(dir, type, ext, result) {
   for (const entry of entries) {
     if (entry.isFile() && entry.name.endsWith(ext)) {
       const name = entry.name.slice(0, -ext.length);
-      const content = await readFile6(join6(dir, entry.name), "utf-8");
+      const content = await readFile5(join5(dir, entry.name), "utf-8");
       const key = compositeKey(type, name, null);
       result.set(key, { type, name, category: null, content });
     }
@@ -1243,17 +996,17 @@ async function scanTemplates(dir, result) {
   }
   for (const entry of entries) {
     if (entry.isFile() && extname(entry.name)) {
-      const content = await readFile6(join6(dir, entry.name), "utf-8");
+      const content = await readFile5(join5(dir, entry.name), "utf-8");
       const key = compositeKey("template", entry.name, null);
       result.set(key, { type: "template", name: entry.name, category: null, content });
     }
   }
 }
 async function scanSettings(claudeDir, projectPath, result) {
-  const settingsPath = join6(claudeDir, "settings.json");
+  const settingsPath = join5(claudeDir, "settings.json");
   let raw;
   try {
-    raw = await readFile6(settingsPath, "utf-8");
+    raw = await readFile5(settingsPath, "utf-8");
   } catch {
     return;
   }
@@ -1265,7 +1018,7 @@ async function scanSettings(claudeDir, projectPath, result) {
   }
   parsed = stripPermissionsAllow(parsed);
   if (parsed.hooks && typeof parsed.hooks === "object") {
-    const hooksDir = projectPath ? join6(projectPath, ".claude", "hooks") : join6(claudeDir, "hooks");
+    const hooksDir = projectPath ? join5(projectPath, ".claude", "hooks") : join5(claudeDir, "hooks");
     const discovered = await discoverHooks(hooksDir);
     if (discovered.size > 0) {
       parsed.hooks = stripDiscoveredHooks(
@@ -1290,12 +1043,12 @@ var init_fileMapper = __esm({
 });
 
 // src/cli/conflict.ts
-import { createInterface as createInterface3 } from "node:readline/promises";
-import { stdin as stdin3, stdout as stdout3 } from "node:process";
+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 = createInterface3({ input: stdin3, output: stdout3 });
+  const rl = createInterface2({ input: stdin2, output: stdout2 });
   try {
     console.log(`
   ${conflicts.length} conflict(s) found:
@@ -1357,47 +1110,221 @@ var init_conflict = __esm({
   }
 });
 
-// src/cli/push.ts
-var push_exports = {};
-__export(push_exports, {
-  runPush: () => runPush
+// 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 });
+  try {
+    const answer = await rl.question(message ?? "  Proceed? [Y/n] ");
+    const a = answer.trim().toLowerCase();
+    return a !== "n" && a !== "no";
+  } finally {
+    rl.close();
+  }
+}
+var init_confirm = __esm({
+  "src/cli/confirm.ts"() {
+    "use strict";
+  }
+});
+
+// src/lib/tech-detect.ts
+import { readFile as readFile6, access } from "node:fs/promises";
+import { join as join6 } from "node:path";
+async function fileExists(filePath) {
+  try {
+    await access(filePath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function detectTechStack(projectPath) {
+  const seen = /* @__PURE__ */ new Map();
+  try {
+    const raw = await readFile6(join6(projectPath, "package.json"), "utf-8");
+    const pkg = JSON.parse(raw);
+    const allDeps = {
+      ...pkg.dependencies,
+      ...pkg.devDependencies
+    };
+    for (const depName of Object.keys(allDeps)) {
+      const rule = PACKAGE_MAP[depName];
+      if (rule) {
+        const key = rule.name.toLowerCase();
+        if (!seen.has(key)) {
+          seen.set(key, { name: rule.name, category: rule.category });
+        }
+      }
+    }
+  } catch {
+  }
+  for (const { file, rule } of CONFIG_FILE_MAP) {
+    const key = rule.name.toLowerCase();
+    if (!seen.has(key) && await fileExists(join6(projectPath, file))) {
+      seen.set(key, { name: rule.name, category: rule.category });
+    }
+  }
+  return Array.from(seen.values()).sort((a, b) => {
+    const catCmp = a.category.localeCompare(b.category);
+    if (catCmp !== 0) return catCmp;
+    return a.name.localeCompare(b.name);
+  });
+}
+function mergeTechStack(remote, detected) {
+  const seen = /* @__PURE__ */ new Map();
+  for (const entry of remote) {
+    seen.set(entry.name.toLowerCase(), entry);
+  }
+  const added = [];
+  for (const entry of detected) {
+    const key = entry.name.toLowerCase();
+    if (!seen.has(key)) {
+      seen.set(key, entry);
+      added.push(entry);
+    }
+  }
+  const merged = Array.from(seen.values()).sort((a, b) => {
+    const catCmp = a.category.localeCompare(b.category);
+    if (catCmp !== 0) return catCmp;
+    return a.name.localeCompare(b.name);
+  });
+  return { merged, added };
+}
+function parseTechStack(raw) {
+  if (!Array.isArray(raw)) return [];
+  return raw.filter(
+    (item) => typeof item === "object" && item !== null && typeof item.name === "string" && typeof item.category === "string"
+  );
+}
+var PACKAGE_MAP, CONFIG_FILE_MAP;
+var init_tech_detect = __esm({
+  "src/lib/tech-detect.ts"() {
+    "use strict";
+    PACKAGE_MAP = {
+      // Frameworks
+      next: { name: "Next.js", category: "framework" },
+      nuxt: { name: "Nuxt", category: "framework" },
+      gatsby: { name: "Gatsby", category: "framework" },
+      express: { name: "Express", category: "framework" },
+      fastify: { name: "Fastify", category: "framework" },
+      hono: { name: "Hono", category: "framework" },
+      "@remix-run/node": { name: "Remix", category: "framework" },
+      svelte: { name: "Svelte", category: "framework" },
+      astro: { name: "Astro", category: "framework" },
+      "@angular/core": { name: "Angular", category: "framework" },
+      // Libraries (UI)
+      react: { name: "React", category: "framework" },
+      vue: { name: "Vue", category: "framework" },
+      "solid-js": { name: "Solid", category: "framework" },
+      preact: { name: "Preact", category: "framework" },
+      // Languages (detected via devDeps)
+      typescript: { name: "TypeScript", category: "language" },
+      // Styling
+      tailwindcss: { name: "Tailwind CSS", category: "styling" },
+      sass: { name: "SCSS", category: "styling" },
+      "styled-components": { name: "styled-components", category: "styling" },
+      "@emotion/react": { name: "Emotion", category: "styling" },
+      // Database
+      prisma: { name: "Prisma", category: "database" },
+      "@prisma/client": { name: "Prisma", category: "database" },
+      "drizzle-orm": { name: "Drizzle", category: "database" },
+      "@supabase/supabase-js": { name: "Supabase", category: "database" },
+      mongoose: { name: "MongoDB", category: "database" },
+      typeorm: { name: "TypeORM", category: "database" },
+      knex: { name: "Knex", category: "database" },
+      // Testing
+      jest: { name: "Jest", category: "testing" },
+      vitest: { name: "Vitest", category: "testing" },
+      mocha: { name: "Mocha", category: "testing" },
+      playwright: { name: "Playwright", category: "testing" },
+      "@playwright/test": { name: "Playwright", category: "testing" },
+      cypress: { name: "Cypress", category: "testing" },
+      // Build tools
+      turbo: { name: "Turborepo", category: "build" },
+      vite: { name: "Vite", category: "build" },
+      webpack: { name: "Webpack", category: "build" },
+      esbuild: { name: "esbuild", category: "build" },
+      rollup: { name: "Rollup", category: "build" },
+      // Tools
+      eslint: { name: "ESLint", category: "tool" },
+      prettier: { name: "Prettier", category: "tool" },
+      "@biomejs/biome": { name: "Biome", category: "tool" }
+    };
+    CONFIG_FILE_MAP = [
+      { file: "tsconfig.json", rule: { name: "TypeScript", category: "language" } },
+      { file: "next.config.js", rule: { name: "Next.js", category: "framework" } },
+      { file: "next.config.mjs", rule: { name: "Next.js", category: "framework" } },
+      { file: "next.config.ts", rule: { name: "Next.js", category: "framework" } },
+      { file: "tailwind.config.js", rule: { name: "Tailwind CSS", category: "styling" } },
+      { file: "tailwind.config.ts", rule: { name: "Tailwind CSS", category: "styling" } },
+      { file: "turbo.json", rule: { name: "Turborepo", category: "build" } },
+      { file: "docker-compose.yml", rule: { name: "Docker", category: "deployment" } },
+      { file: "docker-compose.yaml", rule: { name: "Docker", category: "deployment" } },
+      { file: "Dockerfile", rule: { name: "Docker", category: "deployment" } },
+      { file: "vercel.json", rule: { name: "Vercel", category: "deployment" } }
+    ];
+  }
+});
+
+// src/cli/sync.ts
+var sync_exports = {};
+__export(sync_exports, {
+  runSync: () => runSync
 });
-import { stat as stat2 } from "node:fs/promises";
+import { readFile as readFile7, writeFile as writeFile3 } from "node:fs/promises";
 import { join as join7 } from "node:path";
-async function runPush() {
+async function runSync() {
   const flags = parseFlags(3);
   const dryRun = hasFlag("dry-run", 3);
   const force = hasFlag("force", 3);
-  const isGlobal = hasFlag("global", 3);
   validateApiKey();
   const config2 = await resolveConfig(flags);
   const { repoId, projectPath } = config2;
   console.log(`
-  CodeByPlan Push`);
+  CodeByPlan Sync`);
   console.log(`  Repo: ${repoId}`);
   console.log(`  Path: ${projectPath}`);
-  if (dryRun) console.log(`  Mode: dry-run (no changes will be made)`);
-  if (force) console.log(`  Mode: force (no conflict prompts)`);
+  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) {
   const claudeDir = join7(projectPath, ".claude");
+  let localFiles;
   try {
-    await stat2(claudeDir);
+    localFiles = await scanLocalFiles(claudeDir, projectPath);
   } catch {
-    console.log("  No .claude/ directory found. Nothing to push.\n");
+    console.log("    No .claude/ directory found. Skipping push.");
     return;
   }
-  console.log("  Scanning local files...");
-  const localFiles = await scanLocalFiles(claudeDir, projectPath);
-  console.log(`  Found ${localFiles.size} local files.`);
-  console.log("  Fetching remote state...");
   const [syncRes, repoRes] = await Promise.all([
     apiGet("/sync/files", { repo_id: repoId }),
     apiGet(`/repos/${repoId}`)
   ]);
   const repoData = repoRes.data;
   const remoteFiles = flattenSyncData(syncRes.data);
-  console.log(`  Found ${remoteFiles.size} remote files.
-`);
   const toUpsert = [];
   const toDelete = [];
   const conflicts = [];
@@ -1415,7 +1342,7 @@ async function runPush() {
         } else {
           conflicts.push({
             key,
-            displayPath: formatDisplayPath(local),
+            displayPath: `${local.type}/${local.category ? local.category + "/" : ""}${local.name}`,
             remoteModified: remote.updated_at
           });
           conflictLocalRecords.set(key, reversed);
@@ -1438,69 +1365,101 @@ async function runPush() {
     }
   }
   if (toUpsert.length > 0) {
-    console.log(`  Files to push: ${toUpsert.length}`);
     for (const f of toUpsert) {
-      console.log(`    + ${formatDisplayPath(f)}`);
+      console.log(`    + ${f.type}/${f.category ? f.category + "/" : ""}${f.name}`);
     }
   }
   if (toDelete.length > 0) {
-    console.log(`  Files to delete from remote: ${toDelete.length}`);
     for (const d of toDelete) {
       console.log(`    - ${d.type}/${d.category ? d.category + "/" : ""}${d.name}`);
     }
   }
   if (toUpsert.length === 0 && toDelete.length === 0) {
-    if (!dryRun) {
-      const repoUpdate2 = { claude_sync_at: (/* @__PURE__ */ new Date()).toISOString() };
-      await pushTechStack(projectPath, repoRes.data.tech_stack, repoUpdate2);
-      await apiPut(`/repos/${repoId}`, repoUpdate2);
-    }
-    console.log("  Everything is in sync. Nothing to push.\n");
+    console.log("    Nothing to push.");
     return;
   }
   if (dryRun) {
-    console.log("\n  (dry-run \u2014 no changes were made)\n");
+    console.log("    (dry-run \u2014 no changes)");
     return;
   }
   if (!force) {
     const confirmed = await confirmProceed();
     if (!confirmed) {
-      console.log("  Cancelled.\n");
+      console.log("    Cancelled.");
       return;
     }
   }
-  console.log("\n  Pushing changes...");
   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,
-      ...f.type === "settings" ? { scope: isGlobal ? "global" : "repo" } : {}
+      content: f.content
     })),
     delete_keys: toDelete
   });
-  const repoUpdate = { claude_sync_at: (/* @__PURE__ */ new Date()).toISOString() };
-  await pushTechStack(projectPath, repoRes.data.tech_stack, repoUpdate);
-  await apiPut(`/repos/${repoId}`, repoUpdate);
-  console.log(`  Done: ${result.data.upserted} upserted, ${result.data.deleted} deleted
-`);
+  await apiPut(`/repos/${repoId}`, { claude_sync_at: (/* @__PURE__ */ new Date()).toISOString() });
+  console.log(`    ${result.data.upserted} upserted, ${result.data.deleted} deleted`);
+}
+async function syncConfig(repoId, projectPath, dryRun) {
+  const configPath = join7(projectPath, ".codebyplan.json");
+  let currentConfig = {};
+  try {
+    const raw = await readFile7(configPath, "utf-8");
+    currentConfig = JSON.parse(raw);
+  } catch {
+    currentConfig = { repo_id: repoId };
+  }
+  const repoRes = await apiGet(`/repos/${repoId}`);
+  const repo = repoRes.data;
+  let portAllocations = [];
+  try {
+    const portsRes = await apiGet(`/port-allocations`, { repo_id: repoId });
+    portAllocations = portsRes.data ?? [];
+  } catch {
+  }
+  const newConfig = {
+    repo_id: repoId,
+    ...currentConfig.worktree_id ? { worktree_id: currentConfig.worktree_id } : {},
+    server_port: repo.server_port,
+    server_type: repo.server_type,
+    git_branch: repo.git_branch ?? "development",
+    auto_push_enabled: repo.auto_push_enabled,
+    ...portAllocations.length > 0 ? { port_allocations: portAllocations } : {}
+  };
+  const currentJson = JSON.stringify(currentConfig, null, 2);
+  const newJson = JSON.stringify(newConfig, null, 2);
+  if (currentJson === newJson) {
+    console.log("    Config up to date.");
+    return;
+  }
+  if (dryRun) {
+    console.log("    Config would be updated (dry-run).");
+    return;
+  }
+  await writeFile3(configPath, newJson + "\n", "utf-8");
+  console.log("    Updated .codebyplan.json");
 }
-async function pushTechStack(projectPath, remoteTechStack, repoUpdate) {
+async function syncTechStack(repoId, projectPath, dryRun) {
   try {
     const detected = await detectTechStack(projectPath);
-    if (detected.length === 0) return;
-    const remote = parseTechStack(remoteTechStack);
+    if (detected.length === 0) {
+      console.log("    No tech stack detected.");
+      return;
+    }
+    const repoRes = await apiGet(`/repos/${repoId}`);
+    const remote = parseTechStack(repoRes.data.tech_stack);
     const { merged, added } = mergeTechStack(remote, detected);
-    console.log(`  Tech stack: ${detected.length} detected${added.length > 0 ? ` (${added.length} new)` : ""}`);
+    console.log(`    ${detected.length} detected${added.length > 0 ? ` (${added.length} new)` : ""}`);
     for (const entry of added) {
-      console.log(`    + ${entry.name} (${entry.category})`);
+      console.log(`      + ${entry.name} (${entry.category})`);
     }
-    if (added.length > 0) {
-      repoUpdate.tech_stack = merged;
+    if (added.length > 0 && !dryRun) {
+      await apiPut(`/repos/${repoId}`, { tech_stack: merged });
     }
   } catch {
+    console.log("    Tech stack detection skipped.");
   }
 }
 function flattenSyncData(data) {
@@ -1529,206 +1488,20 @@ function flattenSyncData(data) {
   }
   return result;
 }
-function formatDisplayPath(f) {
-  if (f.category) return `${f.type}/${f.category}/${f.name}`;
-  return `${f.type}/${f.name}`;
-}
-var init_push = __esm({
-  "src/cli/push.ts"() {
+var init_sync = __esm({
+  "src/cli/sync.ts"() {
     "use strict";
     init_config();
     init_fileMapper();
     init_conflict();
     init_confirm();
     init_api();
+    init_sync_engine();
     init_variables();
     init_tech_detect();
   }
 });
 
-// src/cli/init.ts
-var init_exports = {};
-__export(init_exports, {
-  runInit: () => runInit
-});
-import { createInterface as createInterface4 } from "node:readline/promises";
-import { stdin as stdin4, stdout as stdout4 } from "node:process";
-import { writeFile as writeFile3, mkdir as mkdir2, chmod as chmod2 } from "node:fs/promises";
-import { join as join8, dirname as dirname2 } from "node:path";
-async function runInit() {
-  const flags = parseFlags(3);
-  const projectPath = flags["path"] ?? process.cwd();
-  console.log("\n  CodeByPlan Init\n");
-  validateApiKey();
-  const rl = createInterface4({ input: stdin4, output: stdout4 });
-  try {
-    let repoId = flags["repo-id"] ?? process.env.CODEBYPLAN_REPO_ID;
-    if (!repoId) {
-      console.log("  Fetching your repositories...\n");
-      const res = await apiGet("/repos");
-      const repos = res.data;
-      if (repos.length === 0) {
-        console.log("  No repositories found. Create one at https://codebyplan.com first.\n");
-        return;
-      }
-      for (let i = 0; i < repos.length; i++) {
-        console.log(`  ${i + 1}. ${repos[i].name}`);
-      }
-      console.log();
-      const choice = (await rl.question("  Select a repository (number): ")).trim();
-      const index = parseInt(choice, 10) - 1;
-      if (isNaN(index) || index < 0 || index >= repos.length) {
-        console.log("  Invalid selection. Aborting.\n");
-        return;
-      }
-      repoId = repos[index].id;
-      console.log(`
-  Selected: ${repos[index].name}
-`);
-    }
-    let worktreeId;
-    try {
-      const worktreesRes = await apiGet(`/worktrees?repo_id=${repoId}`);
-      const match = worktreesRes.data.find((wt) => projectPath === wt.path || projectPath.startsWith(wt.path + "/"));
-      if (match) worktreeId = match.id;
-    } catch {
-    }
-    const configPath = join8(projectPath, ".codebyplan.json");
-    const configData = { repo_id: repoId };
-    if (worktreeId) configData.worktree_id = worktreeId;
-    const configContent = JSON.stringify(configData, null, 2) + "\n";
-    await writeFile3(configPath, configContent, "utf-8");
-    console.log(`  Created ${configPath}`);
-    const seedAnswer = (await rl.question("\n  Seed with CodeByPlan defaults? (Y/n): ")).trim().toLowerCase();
-    if (seedAnswer === "" || seedAnswer === "y" || seedAnswer === "yes") {
-      let getFilePath3 = function(typeName, file) {
-        const cfg = typeConfig2[typeName];
-        const typeDir = typeName === "command" ? join8(claudeDir, cfg.dir, "cbp") : join8(claudeDir, cfg.dir);
-        if (cfg.subfolder) {
-          return join8(typeDir, file.name, `${cfg.subfolder}${cfg.ext}`);
-        }
-        if (typeName === "command" && file.category) {
-          return join8(typeDir, file.category, `${file.name}${cfg.ext}`);
-        }
-        if (typeName === "template") {
-          return join8(typeDir, file.name);
-        }
-        return join8(typeDir, `${file.name}${cfg.ext}`);
-      };
-      var getFilePath2 = getFilePath3;
-      console.log("\n  Fetching default files...");
-      let defaultsData;
-      try {
-        const defaultsRes = await apiGet("/sync/defaults");
-        defaultsData = defaultsRes.data;
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        console.log(`  Could not fetch defaults: ${msg}`);
-        console.log("  You can run 'codebyplan pull' later to sync files.\n");
-        printNextSteps(projectPath);
-        return;
-      }
-      const claudeDir = join8(projectPath, ".claude");
-      let written = 0;
-      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: "" }
-      };
-      const syncKeyToType2 = {
-        commands: "command",
-        agents: "agent",
-        skills: "skill",
-        rules: "rule",
-        hooks: "hook",
-        templates: "template"
-      };
-      for (const [syncKey, typeName] of Object.entries(syncKeyToType2)) {
-        const files = defaultsData[syncKey] ?? [];
-        for (const file of files) {
-          const filePath = getFilePath3(typeName, file);
-          await mkdir2(dirname2(filePath), { recursive: true });
-          await writeFile3(filePath, file.content, "utf-8");
-          if (typeName === "hook") await chmod2(filePath, 493);
-          written++;
-        }
-      }
-      const specialFiles = [
-        ...defaultsData.claude_md ?? []
-      ];
-      for (const file of specialFiles) {
-        const targetPath = join8(projectPath, "CLAUDE.md");
-        await mkdir2(dirname2(targetPath), { recursive: true });
-        await writeFile3(targetPath, file.content, "utf-8");
-        written++;
-      }
-      const settingsFiles = defaultsData.settings ?? [];
-      for (const file of settingsFiles) {
-        const targetPath = join8(claudeDir, "settings.json");
-        await mkdir2(dirname2(targetPath), { recursive: true });
-        await writeFile3(targetPath, file.content, "utf-8");
-        written++;
-      }
-      console.log(`  Wrote ${written} files to .claude/
-`);
-      console.log("  Syncing defaults to your repository...");
-      try {
-        const allFiles = [];
-        for (const [syncKey, typeName] of Object.entries(syncKeyToType2)) {
-          const files = defaultsData[syncKey] ?? [];
-          for (const file of files) {
-            allFiles.push({
-              type: typeName,
-              name: file.name,
-              category: file.category ?? null,
-              content: file.content
-            });
-          }
-        }
-        for (const file of specialFiles) {
-          allFiles.push({ type: "claude_md", name: file.name, content: file.content });
-        }
-        for (const file of settingsFiles) {
-          allFiles.push({ type: "settings", name: file.name, content: file.content, scope: file.scope ?? "repo" });
-        }
-        if (allFiles.length > 0) {
-          await apiPost("/sync/files", {
-            repo_id: repoId,
-            files: allFiles
-          });
-          console.log(`  Synced ${allFiles.length} files to database.
-`);
-        }
-      } catch (err) {
-        const msg = err instanceof Error ? err.message : String(err);
-        console.log(`  Warning: Could not sync to database: ${msg}`);
-        console.log("  Local files were written successfully. Run 'codebyplan push' to sync later.\n");
-      }
-    } else {
-      console.log();
-    }
-    printNextSteps(projectPath);
-  } finally {
-    rl.close();
-  }
-}
-function printNextSteps(_projectPath) {
-  console.log("  Next steps:");
-  console.log("  1. Start a Claude Code session in this project");
-  console.log("  2. Use 'codebyplan pull' to sync latest files from database");
-  console.log("  3. Use 'codebyplan push' to push local changes back\n");
-}
-var init_init = __esm({
-  "src/cli/init.ts"() {
-    "use strict";
-    init_config();
-    init_api();
-  }
-});
-
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/helpers/util.js
 var util, objectUtil, ZodParsedType, getParsedType;
 var init_util = __esm({
@@ -23543,11 +23316,11 @@ async function createPR(options) {
       }
     } catch {
     }
-    const { stdout: stdout5 } = await exec(
+    const { stdout: stdout4 } = await exec(
       `gh pr create --head "${head}" --base "${base}" --title "${title.replace(/"/g, '\\"')}" --body "${body.replace(/"/g, '\\"')}"`,
       { cwd: repoPath }
     );
-    const prUrl = stdout5.trim();
+    const prUrl = stdout4.trim();
     const prNumber = parseInt(prUrl.split("/").pop() ?? "0", 10);
     return { pr_url: prUrl, pr_number: prNumber || null };
   } catch (err) {
@@ -23558,11 +23331,11 @@ async function createPR(options) {
 async function mergePR(options) {
   const { repoPath, prNumber, mergeMethod } = options;
   try {
-    const { stdout: stdout5 } = await exec(
+    const { stdout: stdout4 } = await exec(
       `gh pr merge ${prNumber} --${mergeMethod} --delete-branch`,
       { cwd: repoPath }
     );
-    return { merged: true, message: stdout5.trim() || `PR #${prNumber} merged via ${mergeMethod}` };
+    return { merged: true, message: stdout4.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 };
@@ -23570,11 +23343,11 @@ async function mergePR(options) {
 }
 async function getPRStatus(repoPath, prNumber) {
   try {
-    const { stdout: stdout5 } = await exec(
+    const { stdout: stdout4 } = await exec(
       `gh pr view ${prNumber} --json state,mergeable,title,url,number`,
       { cwd: repoPath }
     );
-    const pr = JSON.parse(stdout5.trim());
+    const pr = JSON.parse(stdout4.trim());
     return {
       state: pr.state,
       mergeable: pr.mergeable,
@@ -24419,7 +24192,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: stdout5, stderr } = await exec2(
+      const { stdout: stdout4, stderr } = await exec2(
         `git commit -m "${message.replace(/"/g, '\\"')}"`,
         { cwd: repo.path }
       );
@@ -24430,7 +24203,7 @@ function registerFileGenTools(server) {
           text: JSON.stringify({
             status: "committed",
             branch: branch.trim(),
-            output: stdout5.trim(),
+            output: stdout4.trim(),
             warnings: stderr.trim() || void 0
           }, null, 2)
         }]
@@ -24555,19 +24328,30 @@ if (arg === "setup") {
   await runSetup2();
   process.exit(0);
 }
-if (arg === "pull") {
-  const { runPull: runPull2 } = await Promise.resolve().then(() => (init_pull(), pull_exports));
-  await runPull2();
-  process.exit(0);
-}
-if (arg === "push") {
-  const { runPush: runPush2 } = await Promise.resolve().then(() => (init_push(), push_exports));
-  await runPush2();
+if (arg === "sync") {
+  const { runSync: runSync2 } = await Promise.resolve().then(() => (init_sync(), sync_exports));
+  await runSync2();
   process.exit(0);
 }
-if (arg === "init") {
-  const { runInit: runInit2 } = await Promise.resolve().then(() => (init_init(), init_exports));
-  await runInit2();
+if (arg === "help" || arg === "--help" || arg === "-h") {
+  console.log(`
+  CodeByPlan CLI v${VERSION}
+
+  Usage:
+    codebyplan              Start MCP server (for Claude Code)
+    codebyplan setup        Interactive setup (API key + project init + first sync)
+    codebyplan sync         Bidirectional sync (pull + push + config)
+    codebyplan help         Show this help message
+    codebyplan --version    Print version
+
+  Sync options:
+    --path <dir>            Project root directory (default: cwd)
+    --repo-id <uuid>        Repository ID (or set via .codebyplan.json)
+    --dry-run               Preview changes without writing
+    --force                 Skip confirmation and conflict prompts
+
+  Learn more: https://codebyplan.com
+`);
   process.exit(0);
 }
 if (arg === void 0) {
@@ -24578,18 +24362,6 @@ if (arg === void 0) {
   });
 } else {
   console.error(`Unknown command: ${arg}`);
-  console.error("\nUsage:");
-  console.error("  codebyplan              Start MCP server");
-  console.error("  codebyplan setup        Interactive setup");
-  console.error("  codebyplan init         Initialize project with defaults");
-  console.error("  codebyplan pull         Pull .claude/ files from database");
-  console.error("  codebyplan push         Push .claude/ files to database");
-  console.error("  codebyplan --version    Print version");
-  console.error("\nOptions (pull/push):");
-  console.error("  --path <dir>       Project root directory (default: cwd)");
-  console.error("  --repo-id <uuid>   Repository ID (or set CODEBYPLAN_REPO_ID or .codebyplan.json)");
-  console.error("  --dry-run          Preview changes without writing");
-  console.error("  --force            Skip confirmation and conflict prompts");
-  console.error("  --status           Show cross-repo sync status (pull only)");
+  console.error("Run 'codebyplan help' for usage.");
   process.exit(1);
 }