@claude-sync/cli 0.1.16 → 0.1.18

package/dist/src/index.js

@@ -54,12 +54,12 @@ var require_path_encoding = __commonJS({
     init_esm_shims();
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.ROOT_PATTERN = void 0;
-    exports.encodePath = encodePath3;
+    exports.encodePath = encodePath5;
     exports.decodeSuffix = decodeSuffix;
     exports.decodeRoot = decodeRoot;
     exports.extractCanonicalPath = extractCanonicalPath;
     exports.ROOT_PATTERN = /^-(home-[^-]+|Users-[^-]+)/;
-    function encodePath3(p) {
+    function encodePath5(p) {
       return p.replace(/\//g, "-").replace(/\./g, "-");
     }
     function decodeSuffix(suffix, projectPath) {
@@ -79,7 +79,7 @@ var require_path_encoding = __commonJS({
     }
     function extractCanonicalPath(fullPath, homeDir) {
       const relative = fullPath.startsWith(homeDir) ? fullPath.slice(homeDir.length) : fullPath;
-      return encodePath3(relative.startsWith("/") ? relative : "/" + relative);
+      return encodePath5(relative.startsWith("/") ? relative : "/" + relative);
     }
   }
 });
@@ -4345,7 +4345,7 @@ var require_validation = __commonJS({
     "use strict";
     init_esm_shims();
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.createFeatureRequestCommentSchema = exports.updateFeatureRequestStatusSchema = exports.updateFeatureRequestSchema = exports.createFeatureRequestSchema = exports.featureRequestStatusSchema = exports.featureRequestTypeSchema = exports.updateProfileSchema = exports.resetPasswordSchema = exports.forgotPasswordSchema = exports.oauthExchangeSchema = exports.refreshTokenSchema = exports.syncCompleteSchema = exports.downloadUrlSchema = exports.uploadUrlSchema = exports.pullRequestSchema = exports.pushManifestSchema = exports.updateDeviceSchema = exports.createDeviceSchema = exports.registerSchema = exports.loginSchema = void 0;
+    exports.updateCollaboratorRoleSchema = exports.inviteCollaboratorSchema = exports.editableRoleSchema = exports.projectRoleSchema = exports.createFeatureRequestCommentSchema = exports.updateFeatureRequestStatusSchema = exports.updateFeatureRequestSchema = exports.createFeatureRequestSchema = exports.featureRequestStatusSchema = exports.featureRequestTypeSchema = exports.updateProfileSchema = exports.resetPasswordSchema = exports.forgotPasswordSchema = exports.oauthExchangeSchema = exports.refreshTokenSchema = exports.pushBundleCompleteSchema = exports.pushBundlePrepareSchema = exports.manifestEntrySchema = exports.syncCompleteSchema = exports.downloadUrlSchema = exports.uploadUrlSchema = exports.pullRequestSchema = exports.pushManifestSchema = exports.updateDeviceSchema = exports.createDeviceSchema = exports.registerSchema = exports.loginSchema = void 0;
     var zod_1 = require_zod();
     exports.loginSchema = zod_1.z.object({
       email: zod_1.z.string().email(),
@@ -4404,6 +4404,27 @@ var require_validation = __commonJS({
         isCompressed: zod_1.z.boolean()
       }))
     });
+    exports.manifestEntrySchema = zod_1.z.object({
+      path: zod_1.z.string(),
+      hash: zod_1.z.string(),
+      size: zod_1.z.number(),
+      modifiedAt: zod_1.z.string(),
+      isCompressed: zod_1.z.boolean()
+    });
+    exports.pushBundlePrepareSchema = zod_1.z.object({
+      deviceId: zod_1.z.string().uuid(),
+      projectPath: zod_1.z.string().min(1),
+      projectId: zod_1.z.string().uuid().optional(),
+      manifest: zod_1.z.array(exports.manifestEntrySchema),
+      bundleSize: zod_1.z.number().positive(),
+      localVersion: zod_1.z.number().int().min(0),
+      message: zod_1.z.string().max(500).optional()
+    });
+    exports.pushBundleCompleteSchema = zod_1.z.object({
+      syncEventId: zod_1.z.string().uuid(),
+      manifest: zod_1.z.array(exports.manifestEntrySchema),
+      message: zod_1.z.string().min(1).max(500)
+    });
     exports.refreshTokenSchema = zod_1.z.object({
       refreshToken: zod_1.z.string()
     });
@@ -4439,6 +4460,15 @@ var require_validation = __commonJS({
     exports.createFeatureRequestCommentSchema = zod_1.z.object({
       body: zod_1.z.string().min(1).max(2e3)
     });
+    exports.projectRoleSchema = zod_1.z.enum(["owner", "editor", "viewer"]);
+    exports.editableRoleSchema = zod_1.z.enum(["editor", "viewer"]);
+    exports.inviteCollaboratorSchema = zod_1.z.object({
+      email: zod_1.z.string().email(),
+      role: exports.editableRoleSchema
+    });
+    exports.updateCollaboratorRoleSchema = zod_1.z.object({
+      role: exports.editableRoleSchema
+    });
   }
 });
 
@@ -4693,8 +4723,8 @@ var init_auth = __esm({
 // src/lib/progress.ts
 import ora from "ora";
 import chalk from "chalk";
-function createSpinner(text4) {
-  return ora({ text: brandColor(text4), spinner: "dots", color: "magenta" });
+function createSpinner(text5) {
+  return ora({ text: brandColor(text5), spinner: "dots", color: "magenta" });
 }
 function formatBytes(bytes) {
   if (bytes === 0) return "0 B";
@@ -4772,6 +4802,9 @@ function printSuccess(message) {
 function printError(message) {
   console.log(`  ${error("\u2716")} ${message}`);
 }
+function printWarn(message) {
+  console.log(`  ${warn("\u25B2")} ${message}`);
+}
 function printInfo(message) {
   console.log(`  ${brand("\u25CF")} ${message}`);
 }
@@ -5270,19 +5303,23 @@ var init_bundle = __esm({
   }
 });
 
-// src/commands/sync.ts
-var sync_exports = {};
-__export(sync_exports, {
-  runSync: () => runSync,
-  syncCommand: () => syncCommand
+// src/commands/push.ts
+var push_exports = {};
+__export(push_exports, {
+  pushCommand: () => pushCommand
 });
 import { Command as Command4 } from "commander";
-import { select as select2, isCancel as isCancel3 } from "@clack/prompts";
-import { mkdir as mkdir3, lstat as lstat2, symlink, unlink, rename, rm } from "fs/promises";
+import { text as text3, isCancel as isCancel3 } from "@clack/prompts";
 import { join as join4 } from "path";
 import { homedir as homedir4, tmpdir } from "os";
-async function runSync(options) {
-  printIntro("Sync");
+import { rm } from "fs/promises";
+function pushCommand() {
+  return new Command4("push").description("Push local changes to cloud").option("-m, --message <message>", "Commit message").option("--dry-run", "Show what would be pushed without pushing").option("--verbose", "Show detailed output").action(async (options) => {
+    await runPush(options);
+  });
+}
+async function runPush(options) {
+  printIntro("Push");
   const config = await loadConfig();
   if (!isAuthenticated(config)) {
     printError("Not logged in. Run `claude-sync login` first.");
@@ -5302,275 +5339,927 @@ async function runSync(options) {
     projectDir = join4(projectsDir, ctx.symlinkTarget);
   }
   printInfo(`Project: ${brand(cwd)}`);
-  if (ctx.state === "symlink") {
-    printInfo(`Linked to: ${dim(ctx.symlinkTarget || "unknown")}`);
-  }
   const manifest = await buildProjectManifest(cwd);
-  if (!projectLink) {
-    const result = await handleFirstRun(client, config, cwd, ctx, manifest, projectDir, projectsDir, options);
-    if (result === "cancelled") {
-      printOutro("Cancelled.");
-      return;
-    }
-    if (result === "pulled") {
-      const finalManifest2 = await buildProjectManifest(cwd);
-      await saveProjectManifest(cwd, finalManifest2);
-      printOutro("Done");
-      return;
-    }
-    if (result === "pushed") {
-      const finalManifest2 = await buildProjectManifest(cwd);
-      await saveProjectManifest(cwd, finalManifest2);
-      printOutro("Done");
-      return;
-    }
+  if (manifest.length === 0) {
+    printInfo("No files to push.");
     printOutro("Done");
     return;
   }
-  let pushResult = { fileCount: 0, projectId: projectLink.projectId, failed: false };
-  let pullResult = { fileCount: 0, failed: false };
-  if (manifest.length > 0) {
-    pushResult = await bundlePushPhase(client, config.deviceId, cwd, manifest, projectDir, projectLink.projectId, options);
-  }
-  if (!pushResult.failed) {
-    pullResult = await bundlePullPhase(client, config.deviceId, cwd, projectDir, projectLink.projectId, options);
-  }
-  if (pushResult.failed && pullResult.failed) {
-    printOutro("Sync failed.");
-    return;
-  }
-  const finalManifest = await buildProjectManifest(cwd);
-  await saveProjectManifest(cwd, finalManifest);
-  if (pushResult.fileCount > 0 || pullResult.fileCount > 0) {
-    const parts = [];
-    if (pushResult.fileCount > 0) parts.push(`${success(`${pushResult.fileCount}`)} pushed`);
-    if (pullResult.fileCount > 0) parts.push(`${success(`${pullResult.fileCount}`)} pulled`);
-    printSuccess(`Synced: ${parts.join(", ")} files`);
-  } else if (!pushResult.failed && !pullResult.failed) {
-    printSuccess("Everything is up to date.");
-  }
-  printOutro("Done");
-}
-async function handleFirstRun(client, config, cwd, ctx, manifest, projectDir, projectsDir, options) {
-  printInfo(brand("First time syncing this project"));
-  const hasLocalFiles = ctx.state !== "none" && manifest.length > 0;
-  const devicesSpinner = createSpinner("Checking for other devices...").start();
-  let devices;
-  try {
-    devices = await client.get("/api/devices");
-  } catch (err) {
-    if (err instanceof AuthExpiredError) throw err;
-    devices = [];
-  }
-  devicesSpinner.stop();
-  const otherDevices = devices.filter((d) => d.id !== config.deviceId);
-  const menuOptions = [];
-  if (hasLocalFiles) {
-    menuOptions.push({
-      value: "push",
-      label: "Push to cloud",
-      hint: dim(`Upload ${manifest.length} local files`)
-    });
-  }
-  if (otherDevices.length > 0) {
-    menuOptions.push({
-      value: "continue",
-      label: "Continue from another machine",
-      hint: dim("Pull sessions from a device")
-    });
-  }
-  if (menuOptions.length === 0) {
-    printInfo("No local sessions and no other devices found.");
-    printInfo("Use Claude Code in this directory first, then run sync.");
-    return "cancelled";
-  }
-  if (menuOptions.length === 1 && menuOptions[0].value === "push") {
-    printInfo("No other devices found.");
-  }
-  const choice = await select2({
-    message: brand("What would you like to do?"),
-    options: menuOptions
-  });
-  if (isCancel3(choice)) return "cancelled";
-  if (choice === "push") {
-    const result2 = await bundlePushPhase(client, config.deviceId, cwd, manifest, projectDir, void 0, options);
-    if (result2.failed) {
-      return "cancelled";
-    }
-    await saveProjectLink(cwd, {
-      projectId: result2.projectId,
-      foreignEncodedDir: ctx.encodedPath,
-      linkedAt: (/* @__PURE__ */ new Date()).toISOString()
-    });
-    return "pushed";
-  }
-  const deviceChoice = await select2({
-    message: brand("Select device"),
-    options: otherDevices.map((d) => ({
-      value: d.id,
-      label: d.name,
-      hint: dim(`${d.hostname} \xB7 ${d.platform}`)
-    }))
-  });
-  if (isCancel3(deviceChoice)) return "cancelled";
-  const spinner = createSpinner("Loading projects...").start();
-  let projects;
-  try {
-    projects = await client.get(`/api/devices/${deviceChoice}/projects`);
-  } catch (err) {
-    spinner.stop();
-    if (err instanceof AuthExpiredError) throw err;
-    printError("Failed to load projects from device.");
-    return "cancelled";
-  }
-  spinner.stop();
-  if (projects.length === 0) {
-    printInfo("No projects found on that device.");
-    return "cancelled";
-  }
-  const projectChoice = await select2({
-    message: brand("Select project"),
-    options: projects.map((p) => ({
-      value: p.id,
-      label: p.displayName || p.originalPath,
-      hint: dim(p.localPath)
-    }))
-  });
-  if (isCancel3(projectChoice)) return "cancelled";
-  const selectedProject = projects.find((p) => p.id === projectChoice);
-  const existingCheck = await handleExistingSessionDir(projectsDir, ctx.encodedPath);
-  if (existingCheck === "cancelled") {
-    return "cancelled";
-  }
-  const result = await crossMachineBundlePull(
-    client,
-    config.deviceId,
-    cwd,
-    deviceChoice,
-    selectedProject.id,
-    selectedProject.encodedDir,
-    projectsDir,
-    options
-  );
-  if (result.fileCount === 0 && !options.dryRun) {
-    printInfo("No files to download.");
-    return "cancelled";
-  }
-  if (!options.dryRun) {
-    await createProjectSymlink(projectsDir, ctx.encodedPath, selectedProject.encodedDir);
-    await saveProjectLink(cwd, {
-      projectId: selectedProject.id,
-      foreignEncodedDir: selectedProject.encodedDir,
-      linkedAt: (/* @__PURE__ */ new Date()).toISOString()
-    });
-    printInfo(`Symlink: ${dim(ctx.encodedPath)} \u2192 ${dim(selectedProject.encodedDir)}`);
-  }
-  return "pulled";
-}
-async function handleExistingSessionDir(projectsDir, localEncoded) {
-  const symlinkPath = join4(projectsDir, localEncoded);
-  try {
-    const stats = await lstat2(symlinkPath);
-    if (stats.isSymbolicLink()) {
-      return "continue";
-    }
-    if (stats.isDirectory()) {
-      printInfo(brand("Local session directory already exists"));
-      printInfo(dim(symlinkPath));
-      const choice = await select2({
-        message: brand("What would you like to do?"),
-        options: [
-          {
-            value: "backup",
-            label: "Backup and continue",
-            hint: dim("Move existing to .bak and sync from remote")
-          },
-          {
-            value: "cancel",
-            label: "Stop sync",
-            hint: dim("Keep existing local sessions")
-          }
-        ]
-      });
-      if (isCancel3(choice) || choice === "cancel") {
-        return "cancelled";
-      }
-      const backupPath = `${symlinkPath}.bak.${Date.now()}`;
-      await rename(symlinkPath, backupPath);
-      printSuccess(`Backed up to: ${dim(backupPath)}`);
-      return "continue";
-    }
-  } catch {
-  }
-  return "continue";
-}
-async function createProjectSymlink(projectsDir, localEncoded, foreignEncoded) {
-  const symlinkPath = join4(projectsDir, localEncoded);
-  await mkdir3(projectsDir, { recursive: true });
-  try {
-    const stats = await lstat2(symlinkPath);
-    if (stats.isSymbolicLink()) {
-      await unlink(symlinkPath);
-    }
-  } catch {
-  }
-  await symlink(foreignEncoded, symlinkPath);
-}
-async function bundlePushPhase(client, deviceId, projectPath, manifest, projectDir, projectId, options) {
-  if (manifest.length === 0) {
-    return { fileCount: 0, projectId: projectId || "", failed: false };
-  }
   const totalBytes = manifest.reduce((sum, f) => sum + f.size, 0);
-  printInfo(`${brand(String(manifest.length))} files ${dim(`(${formatBytes(totalBytes)})`)} to push`);
+  printInfo(`Files: ${brand(String(manifest.length))} ${dim(`(${formatBytes(totalBytes)})`)}`);
   if (options.dryRun) {
+    console.log();
+    printInfo("Changes to push:");
     if (options.verbose) {
       for (const entry of manifest) {
         console.log(`    ${success("+")} ${entry.path} ${dim(`(${formatBytes(entry.size)})`)}`);
       }
+    } else {
+      console.log(`    ${brand(String(manifest.length))} files would be uploaded`);
+    }
+    printOutro("Dry run complete");
+    return;
+  }
+  if (projectLink?.projectId) {
+    const permission = await checkPushPermission(client, projectLink.projectId);
+    if (!permission.allowed) {
+      printError(`Cannot push: You have ${brand(permission.role)} access to this project.`);
+      printInfo("Only project editors and owners can push changes.");
+      return;
     }
-    return { fileCount: manifest.length, projectId: projectId || "", failed: false };
+  }
+  const localVersion = projectLink?.localVersion ?? 0;
+  let commitMessage = options.message;
+  if (!commitMessage) {
+    const result = await text3({
+      message: brand("Commit message:"),
+      placeholder: "Describe your changes...",
+      validate: (value) => {
+        if (!value || value.trim().length === 0) {
+          return "Please enter a commit message";
+        }
+        if (value.length > 500) {
+          return "Message too long (max 500 characters)";
+        }
+      }
+    });
+    if (isCancel3(result)) {
+      printInfo("Push cancelled.");
+      return;
+    }
+    commitMessage = result;
   }
   const tempBundle = join4(tmpdir(), `claude-sync-bundle-${Date.now()}.tar.gz`);
   try {
-    const spinner = createSpinner("Syncing...").start();
+    const spinner = createSpinner("Preparing...").start();
     const bundleResult = await createBundle(projectDir, manifest, tempBundle, (bytes, total, phase) => {
       if (phase === "compressing") {
         const percent = Math.round(bytes / total * 100);
         spinner.text = `Compressing files... ${dim(`${percent}%`)}`;
       }
     });
-    const progress = createTransferProgress("Uploading", bundleResult.size, spinner);
+    spinner.text = "Checking remote...";
     let prepareResponse;
     try {
       prepareResponse = await client.post("/api/sync/push/bundle/prepare", {
-        deviceId,
-        projectPath,
-        projectId,
+        deviceId: config.deviceId,
+        projectPath: cwd,
+        projectId: projectLink?.projectId,
         manifest,
-        bundleSize: bundleResult.size
+        bundleSize: bundleResult.size,
+        localVersion,
+        message: commitMessage
       });
     } catch (err) {
       spinner.stop();
       if (err instanceof AuthExpiredError) throw err;
       printError(`Push failed: ${err instanceof Error ? err.message : "Unknown error"}`);
-      return { fileCount: 0, projectId: projectId || "", failed: true };
+      return;
     }
-    await streamUpload(prepareResponse.uploadUrl, tempBundle, (bytes, total) => {
-      progress.update(bytes);
-    });
-    try {
-      await client.post("/api/sync/push/bundle/complete", {
-        syncEventId: prepareResponse.syncEventId,
-        manifest
-      });
-    } catch {
+    if (!prepareResponse.canProceed) {
+      spinner.stop();
+      console.log();
+      printError(`Cannot push: You are ${brand(String(prepareResponse.behindBy))} version(s) behind.`);
+      console.log();
+      if (prepareResponse.recentCommits && prepareResponse.recentCommits.length > 0) {
+        printInfo("Recent commits on remote:");
+        for (const commit of prepareResponse.recentCommits) {
+          const deviceName = commit.device?.name || "Unknown";
+          const timeAgo = formatTimeAgo(commit.createdAt);
+          console.log(`    v${commit.version}  "${commit.message}"  ${dim(`(${deviceName}, ${timeAgo})`)}`);
+        }
+        console.log();
+      }
+      printInfo(`Run ${brand("claude-sync pull")} first to get these changes.`);
+      return;
+    }
+    const progress = createTransferProgress("Uploading", bundleResult.size, spinner);
+    await streamUpload(prepareResponse.uploadUrl, tempBundle, (bytes) => {
+      progress.update(bytes);
+    });
+    let completeResponse;
+    try {
+      completeResponse = await client.post("/api/sync/push/bundle/complete", {
+        syncEventId: prepareResponse.syncEventId,
+        manifest,
+        message: commitMessage
+      });
+    } catch (err) {
+      spinner.stop();
+      if (err instanceof AuthExpiredError) throw err;
+      printError(`Push failed: ${err instanceof Error ? err.message : "Unknown error"}`);
+      return;
+    }
+    const newVersion = completeResponse.commit.version;
+    const compressionRatio = Math.round((1 - bundleResult.size / bundleResult.originalSize) * 100);
+    progress.finish(`Pushed ${manifest.length} files ${dim(`(${formatBytes(bundleResult.size)}, ${compressionRatio}% smaller)`)}`);
+    await saveProjectLink(cwd, {
+      projectId: prepareResponse.projectId,
+      foreignEncodedDir: (0, import_utils3.encodePath)(cwd),
+      linkedAt: projectLink?.linkedAt || (/* @__PURE__ */ new Date()).toISOString(),
+      localVersion: newVersion
+    });
+    console.log();
+    printSuccess(`Commit: "${commitMessage}"`);
+    printInfo(`Version: ${localVersion} \u2192 ${newVersion}`);
+    printOutro("Done");
+  } finally {
+    try {
+      await rm(tempBundle, { force: true });
+    } catch {
+    }
+  }
+}
+async function checkPushPermission(client, projectId) {
+  try {
+    const roleInfo = await client.get(`/api/projects/${projectId}/my-role`);
+    return { allowed: roleInfo.canPush, role: roleInfo.role };
+  } catch {
+    return { allowed: true, role: "owner" };
+  }
+}
+function formatTimeAgo(dateStr) {
+  const date = new Date(dateStr);
+  const now = /* @__PURE__ */ new Date();
+  const diffMs = now.getTime() - date.getTime();
+  const diffMins = Math.floor(diffMs / 6e4);
+  const diffHours = Math.floor(diffMs / 36e5);
+  const diffDays = Math.floor(diffMs / 864e5);
+  if (diffMins < 1) return "just now";
+  if (diffMins < 60) return `${diffMins}m ago`;
+  if (diffHours < 24) return `${diffHours}h ago`;
+  if (diffDays < 7) return `${diffDays}d ago`;
+  return date.toLocaleDateString();
+}
+var import_utils3;
+var init_push = __esm({
+  "src/commands/push.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_config();
+    init_api_client();
+    init_sync_engine();
+    init_progress();
+    init_bundle();
+    import_utils3 = __toESM(require_dist(), 1);
+    init_theme();
+  }
+});
+
+// src/commands/pull.ts
+var pull_exports = {};
+__export(pull_exports, {
+  pullCommand: () => pullCommand
+});
+import { Command as Command5 } from "commander";
+import { confirm, isCancel as isCancel4 } from "@clack/prompts";
+import { join as join5 } from "path";
+import { homedir as homedir5, tmpdir as tmpdir2 } from "os";
+import { rm as rm2, mkdir as mkdir3 } from "fs/promises";
+function pullCommand() {
+  return new Command5("pull").description("Pull latest changes from cloud").option("--dry-run", "Show what would be pulled without pulling").option("--verbose", "Show detailed output").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
+    await runPull(options);
+  });
+}
+async function runPull(options) {
+  printIntro("Pull");
+  const config = await loadConfig();
+  if (!isAuthenticated(config)) {
+    printError("Not logged in. Run `claude-sync login` first.");
+    return;
+  }
+  if (!config.deviceId) {
+    printError("No device registered. Run `claude-sync device add` first.");
+    return;
+  }
+  const cwd = process.cwd();
+  const ctx = await resolveProjectState(cwd);
+  const client = new ApiClient(config.apiUrl);
+  const projectsDir = join5(homedir5(), import_utils4.CLAUDE_DIR, import_utils4.PROJECTS_DIR);
+  const projectLink = await loadProjectLink(cwd);
+  let projectDir = ctx.projectDir;
+  if (ctx.state === "symlink" && ctx.symlinkTarget) {
+    projectDir = join5(projectsDir, ctx.symlinkTarget);
+  }
+  printInfo(`Project: ${brand(cwd)}`);
+  if (!projectLink?.projectId) {
+    printInfo("No project linked yet. Run `claude-sync push` first to create one.");
+    printOutro("Done");
+    return;
+  }
+  const localVersion = projectLink.localVersion ?? 0;
+  const spinner = createSpinner("Checking for updates...").start();
+  let syncState;
+  try {
+    syncState = await client.get(`/api/projects/${projectLink.projectId}/sync-state?localVersion=${localVersion}`);
+  } catch (err) {
+    spinner.stop();
+    if (err instanceof AuthExpiredError) throw err;
+    printError(`Failed to check sync state: ${err instanceof Error ? err.message : "Unknown error"}`);
+    return;
+  }
+  if (!syncState.isBehind) {
+    spinner.stop();
+    console.log();
+    printSuccess("Already up to date.");
+    printInfo(`Version: ${localVersion} (latest)`);
+    printOutro("Done");
+    return;
+  }
+  spinner.stop();
+  console.log();
+  printInfo(`You are ${brand(String(syncState.behindBy))} version(s) behind.`);
+  printInfo(`Local: v${localVersion}  Remote: v${syncState.currentVersion}`);
+  console.log();
+  if (syncState.recentCommits.length > 0) {
+    printInfo("Commits to pull:");
+    for (const commit of syncState.recentCommits) {
+      const deviceName = commit.device?.name || "Unknown";
+      const timeAgo = formatTimeAgo2(commit.createdAt);
+      console.log(`    v${commit.version}  "${commit.message}"  ${dim(`(${deviceName}, ${timeAgo})`)}`);
+    }
+    console.log();
+  }
+  if (options.dryRun) {
+    printOutro("Dry run complete");
+    return;
+  }
+  if (!options.yes) {
+    const proceed = await confirm({
+      message: brand(`Pull ${syncState.behindBy} version(s)?`),
+      initialValue: true
+    });
+    if (isCancel4(proceed) || !proceed) {
+      printInfo("Pull cancelled.");
+      return;
+    }
+  }
+  const pullSpinner = createSpinner("Downloading...").start();
+  let prepareResponse;
+  try {
+    prepareResponse = await client.post("/api/sync/pull/bundle/prepare", {
+      deviceId: config.deviceId,
+      projectPath: cwd,
+      projectId: projectLink.projectId
+    });
+  } catch (err) {
+    pullSpinner.stop();
+    if (err instanceof AuthExpiredError) throw err;
+    printError(`Pull failed: ${err instanceof Error ? err.message : "Unknown error"}`);
+    return;
+  }
+  if (!prepareResponse.downloadUrl || !prepareResponse.bundleSize) {
+    pullSpinner.stop();
+    printInfo("No files to download.");
+    printOutro("Done");
+    return;
+  }
+  const tempBundle = join5(tmpdir2(), `claude-sync-pull-${Date.now()}.tar.gz`);
+  try {
+    const progress = createTransferProgress("Downloading", prepareResponse.bundleSize, pullSpinner);
+    await streamDownload(prepareResponse.downloadUrl, tempBundle, (bytes) => {
+      progress.update(bytes);
+    });
+    progress.finish("Downloaded");
+    const extractSpinner = createSpinner("Extracting...").start();
+    await mkdir3(projectDir, { recursive: true });
+    const extractedCount = await extractBundle(tempBundle, projectDir);
+    extractSpinner.succeed(`Extracted ${extractedCount} files`);
+    try {
+      await client.post("/api/sync/pull/bundle/complete", {
+        syncEventId: prepareResponse.syncEventId,
+        manifest: prepareResponse.manifest
+      });
+    } catch {
+    }
+    await saveProjectLink(cwd, {
+      ...projectLink,
+      localVersion: syncState.currentVersion
+    });
+    console.log();
+    printSuccess(`Pulled ${prepareResponse.manifest.length} files`);
+    printInfo(`Version: ${localVersion} \u2192 ${syncState.currentVersion}`);
+    printOutro("Done");
+  } finally {
+    try {
+      await rm2(tempBundle, { force: true });
+    } catch {
+    }
+  }
+}
+function formatTimeAgo2(dateStr) {
+  const date = new Date(dateStr);
+  const now = /* @__PURE__ */ new Date();
+  const diffMs = now.getTime() - date.getTime();
+  const diffMins = Math.floor(diffMs / 6e4);
+  const diffHours = Math.floor(diffMs / 36e5);
+  const diffDays = Math.floor(diffMs / 864e5);
+  if (diffMins < 1) return "just now";
+  if (diffMins < 60) return `${diffMins}m ago`;
+  if (diffHours < 24) return `${diffHours}h ago`;
+  if (diffDays < 7) return `${diffDays}d ago`;
+  return date.toLocaleDateString();
+}
+var import_utils4;
+var init_pull = __esm({
+  "src/commands/pull.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_config();
+    init_api_client();
+    init_sync_engine();
+    init_progress();
+    init_bundle();
+    import_utils4 = __toESM(require_dist(), 1);
+    init_theme();
+  }
+});
+
+// src/commands/log.ts
+var log_exports = {};
+__export(log_exports, {
+  logCommand: () => logCommand
+});
+import { Command as Command6 } from "commander";
+function logCommand() {
+  return new Command6("log").description("Show commit history for current project").option("-n, --limit <number>", "Number of commits to show", "10").action(async (options) => {
+    await runLog(options);
+  });
+}
+async function runLog(options) {
+  printIntro("Log");
+  const config = await loadConfig();
+  if (!isAuthenticated(config)) {
+    printError("Not logged in. Run `claude-sync login` first.");
+    return;
+  }
+  const cwd = process.cwd();
+  const projectLink = await loadProjectLink(cwd);
+  printInfo(`Project: ${brand(cwd)}`);
+  if (!projectLink?.projectId) {
+    printInfo("No project linked yet. Run `claude-sync push` first.");
+    printOutro("Done");
+    return;
+  }
+  const client = new ApiClient(config.apiUrl);
+  const limit = parseInt(options.limit, 10) || 10;
+  let commits;
+  try {
+    commits = await client.get(`/api/projects/${projectLink.projectId}/commits?limit=${limit}`);
+  } catch (err) {
+    if (err instanceof AuthExpiredError) throw err;
+    printError(`Failed to fetch commits: ${err instanceof Error ? err.message : "Unknown error"}`);
+    return;
+  }
+  if (commits.length === 0) {
+    printInfo("No commits yet.");
+    printOutro("Done");
+    return;
+  }
+  const localVersion = projectLink.localVersion ?? 0;
+  console.log();
+  for (const commit of commits) {
+    const deviceName = commit.device?.name || "Unknown device";
+    const timeAgo = formatTimeAgo3(commit.createdAt);
+    const isHead = commit.version === localVersion;
+    const versionStr = isHead ? `${brand(`v${commit.version}`)} ${dim("(HEAD)")}` : `v${commit.version}`;
+    console.log(`  ${versionStr}  "${commit.message}"`);
+    console.log(`      ${dim(`${deviceName} \u2022 ${timeAgo}`)}`);
+    console.log();
+  }
+  printOutro("");
+}
+function formatTimeAgo3(dateStr) {
+  const date = new Date(dateStr);
+  const now = /* @__PURE__ */ new Date();
+  const diffMs = now.getTime() - date.getTime();
+  const diffMins = Math.floor(diffMs / 6e4);
+  const diffHours = Math.floor(diffMs / 36e5);
+  const diffDays = Math.floor(diffMs / 864e5);
+  if (diffMins < 1) return "just now";
+  if (diffMins < 60) return `${diffMins}m ago`;
+  if (diffHours < 24) return `${diffHours}h ago`;
+  if (diffDays < 7) return `${diffDays}d ago`;
+  return date.toLocaleDateString();
+}
+var init_log = __esm({
+  "src/commands/log.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_config();
+    init_api_client();
+    init_theme();
+  }
+});
+
+// src/commands/status.ts
+var status_exports = {};
+__export(status_exports, {
+  statusCommand: () => statusCommand
+});
+import { Command as Command8 } from "commander";
+function statusCommand() {
+  return new Command8("status").description("Show sync status for current project").action(async () => {
+    printIntro("Status");
+    const config = await loadConfig();
+    const cwd = process.cwd();
+    printLabel("API", config.apiUrl);
+    printLabel("Authenticated", isAuthenticated(config) ? success("yes") : error("no"));
+    printLabel("Device", config.deviceName || dim("none"));
+    printLabel("Project", brand(cwd));
+    const ctx = await resolveProjectState(cwd);
+    printLabel("State", ctx.state === "none" ? dim("no session data") : ctx.state === "symlink" ? `symlink \u2192 ${dim(ctx.symlinkTarget || "unknown")}` : "local");
+    if (!isAuthenticated(config) || ctx.state === "none") return;
+    const spinner = createSpinner("Scanning files...").start();
+    const savedManifest = await loadProjectManifest(cwd);
+    const currentManifest = await buildProjectManifest(cwd);
+    const diff = computeDiff(currentManifest, savedManifest);
+    spinner.stop();
+    const totalSize = currentManifest.reduce((sum, e) => sum + e.size, 0);
+    printDivider();
+    printLabel("Local files", `${brand(String(currentManifest.length))} ${dim(`(${formatBytes(totalSize)})`)}`);
+    console.log();
+    printInfo("Changes since last sync:");
+    console.log(`    ${success(`+${diff.added.length}`)} added  ${warn(`~${diff.modified.length}`)} modified  ${error(`-${diff.deleted.length}`)} deleted`);
+    console.log();
+    const projectLink = await loadProjectLink(cwd);
+    if (projectLink?.projectId) {
+      const client = new ApiClient(config.apiUrl);
+      const localVersion = projectLink.localVersion ?? 0;
+      try {
+        const syncState = await client.get(`/api/projects/${projectLink.projectId}/sync-state?localVersion=${localVersion}`);
+        if (syncState.isBehind) {
+          printWarn(`You are ${brand(String(syncState.behindBy))} version(s) behind.`);
+          printInfo(`Local: v${localVersion}  Remote: v${syncState.currentVersion}`);
+          console.log();
+          if (syncState.recentCommits.length > 0) {
+            printInfo("Recent commits on remote:");
+            for (const commit of syncState.recentCommits) {
+              const deviceName = commit.device?.name || "Unknown";
+              console.log(`    v${commit.version}  "${commit.message}"  ${dim(`(${deviceName})`)}`);
+            }
+            console.log();
+          }
+          printInfo(`Run ${brand("claude-sync pull")} to get latest changes.`);
+        } else {
+          printSuccess("Up to date");
+          printInfo(`Version: ${localVersion}`);
+        }
+      } catch {
+        printInfo(`Local version: ${localVersion}`);
+      }
+    }
+  });
+}
+var init_status = __esm({
+  "src/commands/status.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_config();
+    init_sync_engine();
+    init_api_client();
+    init_progress();
+    init_theme();
+  }
+});
+
+// src/commands/whoami.ts
+var whoami_exports = {};
+__export(whoami_exports, {
+  whoamiCommand: () => whoamiCommand
+});
+import { Command as Command9 } from "commander";
+function whoamiCommand() {
+  return new Command9("whoami").description("Show current user and device info").action(async () => {
+    printIntro("Who Am I");
+    const config = await loadConfig();
+    if (!isAuthenticated(config)) {
+      printError("Not logged in. Run `claude-sync login` first.");
+      return;
+    }
+    const client = new ApiClient(config.apiUrl);
+    const spinner = createSpinner("Fetching user info...").start();
+    try {
+      const user = await client.get("/api/auth/me");
+      spinner.stop();
+      printLabel("User", `${user.name} ${dim(`(${user.email})`)}`);
+      printLabel("Plan", brand(user.plan));
+      printDivider();
+      printLabel("Device", config.deviceName || dim("none"));
+      printLabel("Device ID", config.deviceId || dim("not registered"));
+    } catch (err) {
+      spinner.stop();
+      if (err instanceof AuthExpiredError) throw err;
+      printLabel("Email", config.email || dim("unknown"));
+      printLabel("Device", config.deviceName || dim("none"));
+    }
+    console.log();
+  });
+}
+var init_whoami = __esm({
+  "src/commands/whoami.ts"() {
+    "use strict";
+    init_esm_shims();
+    init_config();
+    init_api_client();
+    init_progress();
+    init_theme();
+  }
+});
+
+// src/index.ts
+init_esm_shims();
+init_login();
+init_logout();
+init_device();
+init_push();
+init_pull();
+init_log();
+import { Command as Command10 } from "commander";
+
+// src/commands/sync.ts
+init_esm_shims();
+init_config();
+init_api_client();
+init_sync_engine();
+init_progress();
+init_bundle();
+var import_utils5 = __toESM(require_dist(), 1);
+init_theme();
+import { Command as Command7 } from "commander";
+import { select as select2, isCancel as isCancel5 } from "@clack/prompts";
+import { mkdir as mkdir4, lstat as lstat2, symlink, unlink, rename, rm as rm3 } from "fs/promises";
+import { join as join6 } from "path";
+import { homedir as homedir6, tmpdir as tmpdir3 } from "os";
+async function runSync(options) {
+  printIntro("Sync");
+  const config = await loadConfig();
+  if (!isAuthenticated(config)) {
+    printError("Not logged in. Run `claude-sync login` first.");
+    return;
+  }
+  if (!config.deviceId) {
+    printError("No device registered. Run `claude-sync device add` first.");
+    return;
+  }
+  const cwd = process.cwd();
+  const ctx = await resolveProjectState(cwd);
+  const client = new ApiClient(config.apiUrl);
+  const projectsDir = join6(homedir6(), import_utils5.CLAUDE_DIR, import_utils5.PROJECTS_DIR);
+  const projectLink = await loadProjectLink(cwd);
+  let projectDir = ctx.projectDir;
+  if (ctx.state === "symlink" && ctx.symlinkTarget) {
+    projectDir = join6(projectsDir, ctx.symlinkTarget);
+  }
+  printInfo(`Project: ${brand(cwd)}`);
+  if (ctx.state === "symlink") {
+    printInfo(`Linked to: ${dim(ctx.symlinkTarget || "unknown")}`);
+  }
+  const manifest = await buildProjectManifest(cwd);
+  if (!projectLink) {
+    const result = await handleFirstRun(client, config, cwd, ctx, manifest, projectDir, projectsDir, options);
+    if (result === "cancelled") {
+      printOutro("Cancelled.");
+      return;
+    }
+    if (result === "pulled") {
+      const finalManifest2 = await buildProjectManifest(cwd);
+      await saveProjectManifest(cwd, finalManifest2);
+      printOutro("Done");
+      return;
+    }
+    if (result === "pushed") {
+      const finalManifest2 = await buildProjectManifest(cwd);
+      await saveProjectManifest(cwd, finalManifest2);
+      printOutro("Done");
+      return;
+    }
+    printOutro("Done");
+    return;
+  }
+  let pushResult = { fileCount: 0, projectId: projectLink.projectId, failed: false };
+  let pullResult = { fileCount: 0, failed: false };
+  if (manifest.length > 0) {
+    pushResult = await bundlePushPhase(client, config.deviceId, cwd, manifest, projectDir, projectLink.projectId, options);
+  }
+  if (!pushResult.failed) {
+    pullResult = await bundlePullPhase(client, config.deviceId, cwd, projectDir, projectLink.projectId, options);
+  }
+  if (pushResult.failed && pullResult.failed) {
+    printOutro("Sync failed.");
+    return;
+  }
+  const finalManifest = await buildProjectManifest(cwd);
+  await saveProjectManifest(cwd, finalManifest);
+  if (pushResult.fileCount > 0 || pullResult.fileCount > 0) {
+    const parts = [];
+    if (pushResult.fileCount > 0) parts.push(`${success(`${pushResult.fileCount}`)} pushed`);
+    if (pullResult.fileCount > 0) parts.push(`${success(`${pullResult.fileCount}`)} pulled`);
+    printSuccess(`Synced: ${parts.join(", ")} files`);
+  } else if (!pushResult.failed && !pullResult.failed) {
+    printSuccess("Everything is up to date.");
+  }
+  printOutro("Done");
+}
+async function handleFirstRun(client, config, cwd, ctx, manifest, projectDir, projectsDir, options) {
+  printInfo(brand("First time syncing this project"));
+  const hasLocalFiles = ctx.state !== "none" && manifest.length > 0;
+  const devicesSpinner = createSpinner("Checking for other devices...").start();
+  let devices;
+  try {
+    devices = await client.get("/api/devices");
+  } catch (err) {
+    if (err instanceof AuthExpiredError) throw err;
+    devices = [];
+  }
+  devicesSpinner.stop();
+  const otherDevices = devices.filter((d) => d.id !== config.deviceId);
+  let sharedProjects = [];
+  try {
+    sharedProjects = await client.get("/api/projects/shared");
+  } catch {
+  }
+  const menuOptions = [];
+  if (hasLocalFiles) {
+    menuOptions.push({
+      value: "push",
+      label: "Push to cloud",
+      hint: dim(`Upload ${manifest.length} local files`)
+    });
+  }
+  if (otherDevices.length > 0) {
+    menuOptions.push({
+      value: "continue",
+      label: "Continue from another machine",
+      hint: dim("Pull sessions from a device")
+    });
+  }
+  if (sharedProjects.length > 0) {
+    menuOptions.push({
+      value: "collaborator",
+      label: "Sync from collaborator",
+      hint: dim(`${sharedProjects.length} shared project(s) available`)
+    });
+  }
+  if (menuOptions.length === 0) {
+    printInfo("No local sessions and no other devices found.");
+    printInfo("Use Claude Code in this directory first, then run sync.");
+    return "cancelled";
+  }
+  if (menuOptions.length === 1 && menuOptions[0].value === "push") {
+    printInfo("No other devices found.");
+  }
+  const choice = await select2({
+    message: brand("What would you like to do?"),
+    options: menuOptions
+  });
+  if (isCancel5(choice)) return "cancelled";
+  if (choice === "push") {
+    const result2 = await bundlePushPhase(client, config.deviceId, cwd, manifest, projectDir, void 0, options);
+    if (result2.failed) {
+      return "cancelled";
+    }
+    await saveProjectLink(cwd, {
+      projectId: result2.projectId,
+      foreignEncodedDir: ctx.encodedPath,
+      linkedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    return "pushed";
+  }
+  if (choice === "collaborator") {
+    const sharedChoice = await select2({
+      message: brand("Select shared project"),
+      options: sharedProjects.map((p) => ({
+        value: p.id,
+        label: p.displayName || p.originalPath,
+        hint: dim(`${p.owner.name} \xB7 ${p.role}`)
+      }))
+    });
+    if (isCancel5(sharedChoice)) return "cancelled";
+    const selectedShared = sharedProjects.find((p) => p.id === sharedChoice);
+    const syncStatusSpinner = createSpinner("Checking sync status...").start();
+    let syncStatus = null;
+    try {
+      syncStatus = await client.get(`/api/projects/${selectedShared.id}/sync-status`);
+    } catch {
+    }
+    syncStatusSpinner.stop();
+    if (syncStatus?.hasRecentSync && syncStatus.lastSyncedBy) {
+      printInfo(brand("Recent sync detected"));
+      printInfo(dim(`${syncStatus.lastSyncedBy.name} synced from ${syncStatus.lastSyncedBy.deviceName} recently`));
+      const confirmChoice = await select2({
+        message: brand("Continue anyway?"),
+        options: [
+          { value: "yes", label: "Yes, continue", hint: dim("Pull the latest version") },
+          { value: "no", label: "Cancel", hint: dim("Wait for them to finish") }
+        ]
+      });
+      if (isCancel5(confirmChoice) || confirmChoice === "no") return "cancelled";
+    }
+    const existingCheck2 = await handleExistingSessionDir(projectsDir, ctx.encodedPath);
+    if (existingCheck2 === "cancelled") {
+      return "cancelled";
+    }
+    const result2 = await collaboratorBundlePull(
+      client,
+      config.deviceId,
+      cwd,
+      selectedShared.id,
+      selectedShared.canonicalPath,
+      projectsDir,
+      options
+    );
+    if (result2.fileCount === 0 && !options.dryRun) {
+      printInfo("No files to download.");
+      return "cancelled";
+    }
+    if (!options.dryRun) {
+      const foreignEncoded = selectedShared.canonicalPath.replace(/\//g, "%2F");
+      await createProjectSymlink(projectsDir, ctx.encodedPath, foreignEncoded);
+      await saveProjectLink(cwd, {
+        projectId: selectedShared.id,
+        foreignEncodedDir: foreignEncoded,
+        linkedAt: (/* @__PURE__ */ new Date()).toISOString()
+      });
+      printInfo(`Synced from: ${dim(`${selectedShared.owner.name}'s ${selectedShared.displayName}`)}`);
+    }
+    return "pulled";
+  }
+  const deviceChoice = await select2({
+    message: brand("Select device"),
+    options: otherDevices.map((d) => ({
+      value: d.id,
+      label: d.name,
+      hint: dim(`${d.hostname} \xB7 ${d.platform}`)
+    }))
+  });
+  if (isCancel5(deviceChoice)) return "cancelled";
+  const spinner = createSpinner("Loading projects...").start();
+  let projects;
+  try {
+    projects = await client.get(`/api/devices/${deviceChoice}/projects`);
+  } catch (err) {
+    spinner.stop();
+    if (err instanceof AuthExpiredError) throw err;
+    printError("Failed to load projects from device.");
+    return "cancelled";
+  }
+  spinner.stop();
+  if (projects.length === 0) {
+    printInfo("No projects found on that device.");
+    return "cancelled";
+  }
+  const projectChoice = await select2({
+    message: brand("Select project"),
+    options: projects.map((p) => ({
+      value: p.id,
+      label: p.displayName || p.originalPath,
+      hint: dim(p.localPath)
+    }))
+  });
+  if (isCancel5(projectChoice)) return "cancelled";
+  const selectedProject = projects.find((p) => p.id === projectChoice);
+  const existingCheck = await handleExistingSessionDir(projectsDir, ctx.encodedPath);
+  if (existingCheck === "cancelled") {
+    return "cancelled";
+  }
+  const result = await crossMachineBundlePull(
+    client,
+    config.deviceId,
+    cwd,
+    deviceChoice,
+    selectedProject.id,
+    selectedProject.encodedDir,
+    projectsDir,
+    options
+  );
+  if (result.fileCount === 0 && !options.dryRun) {
+    printInfo("No files to download.");
+    return "cancelled";
+  }
+  if (!options.dryRun) {
+    await createProjectSymlink(projectsDir, ctx.encodedPath, selectedProject.encodedDir);
+    await saveProjectLink(cwd, {
+      projectId: selectedProject.id,
+      foreignEncodedDir: selectedProject.encodedDir,
+      linkedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    printInfo(`Symlink: ${dim(ctx.encodedPath)} \u2192 ${dim(selectedProject.encodedDir)}`);
+  }
+  return "pulled";
+}
+async function handleExistingSessionDir(projectsDir, localEncoded) {
+  const symlinkPath = join6(projectsDir, localEncoded);
+  try {
+    const stats = await lstat2(symlinkPath);
+    if (stats.isSymbolicLink()) {
+      return "continue";
+    }
+    if (stats.isDirectory()) {
+      printInfo(brand("Local session directory already exists"));
+      printInfo(dim(symlinkPath));
+      const choice = await select2({
+        message: brand("What would you like to do?"),
+        options: [
+          {
+            value: "backup",
+            label: "Backup and continue",
+            hint: dim("Move existing to .bak and sync from remote")
+          },
+          {
+            value: "cancel",
+            label: "Stop sync",
+            hint: dim("Keep existing local sessions")
+          }
+        ]
+      });
+      if (isCancel5(choice) || choice === "cancel") {
+        return "cancelled";
+      }
+      const backupPath = `${symlinkPath}.bak.${Date.now()}`;
+      await rename(symlinkPath, backupPath);
+      printSuccess(`Backed up to: ${dim(backupPath)}`);
+      return "continue";
+    }
+  } catch {
+  }
+  return "continue";
+}
+async function createProjectSymlink(projectsDir, localEncoded, foreignEncoded) {
+  const symlinkPath = join6(projectsDir, localEncoded);
+  await mkdir4(projectsDir, { recursive: true });
+  try {
+    const stats = await lstat2(symlinkPath);
+    if (stats.isSymbolicLink()) {
+      await unlink(symlinkPath);
+    }
+  } catch {
+  }
+  await symlink(foreignEncoded, symlinkPath);
+}
+async function bundlePushPhase(client, deviceId, projectPath, manifest, projectDir, projectId, options) {
+  if (manifest.length === 0) {
+    return { fileCount: 0, projectId: projectId || "", failed: false };
+  }
+  if (projectId) {
+    const permission = await checkPushPermission2(client, projectId);
+    if (!permission.allowed) {
+      printError(`Cannot push: You have ${brand(permission.role)} access to this project.`);
+      printInfo("Only project editors and owners can push changes.");
+      return { fileCount: 0, projectId, failed: true };
+    }
+  }
+  const totalBytes = manifest.reduce((sum, f) => sum + f.size, 0);
+  printInfo(`${brand(String(manifest.length))} files ${dim(`(${formatBytes(totalBytes)})`)} to push`);
+  if (options.dryRun) {
+    if (options.verbose) {
+      for (const entry of manifest) {
+        console.log(`    ${success("+")} ${entry.path} ${dim(`(${formatBytes(entry.size)})`)}`);
+      }
+    }
+    return { fileCount: manifest.length, projectId: projectId || "", failed: false };
+  }
+  const tempBundle = join6(tmpdir3(), `claude-sync-bundle-${Date.now()}.tar.gz`);
+  try {
+    const spinner = createSpinner("Syncing...").start();
+    const bundleResult = await createBundle(projectDir, manifest, tempBundle, (bytes, total, phase) => {
+      if (phase === "compressing") {
+        const percent = Math.round(bytes / total * 100);
+        spinner.text = `Compressing files... ${dim(`${percent}%`)}`;
+      }
+    });
+    const progress = createTransferProgress("Uploading", bundleResult.size, spinner);
+    let prepareResponse;
+    try {
+      prepareResponse = await client.post("/api/sync/push/bundle/prepare", {
+        deviceId,
+        projectPath,
+        projectId,
+        manifest,
+        bundleSize: bundleResult.size
+      });
+    } catch (err) {
+      spinner.stop();
+      if (err instanceof AuthExpiredError) throw err;
+      printError(`Push failed: ${err instanceof Error ? err.message : "Unknown error"}`);
+      return { fileCount: 0, projectId: projectId || "", failed: true };
+    }
+    await streamUpload(prepareResponse.uploadUrl, tempBundle, (bytes, total) => {
+      progress.update(bytes);
+    });
+    try {
+      await client.post("/api/sync/push/bundle/complete", {
+        syncEventId: prepareResponse.syncEventId,
+        manifest
+      });
+    } catch {
     }
     const compressionRatio = Math.round((1 - bundleResult.size / bundleResult.originalSize) * 100);
     progress.finish(`Pushed ${manifest.length} files ${dim(`(${formatBytes(bundleResult.size)}, ${compressionRatio}% smaller)`)}`);
     return { fileCount: manifest.length, projectId: prepareResponse.projectId, failed: false };
   } finally {
     try {
-      await rm(tempBundle, { force: true });
+      await rm3(tempBundle, { force: true });
     } catch {
     }
   }
@@ -5605,7 +6294,7 @@ async function bundlePullPhase(client, deviceId, projectPath, projectDir, projec
     }
     return { fileCount, failed: false };
   }
-  const tempBundle = join4(tmpdir(), `claude-sync-bundle-${Date.now()}.tar.gz`);
+  const tempBundle = join6(tmpdir3(), `claude-sync-bundle-${Date.now()}.tar.gz`);
   try {
     const progress = createTransferProgress("Downloading", prepareResponse.bundleSize, spinner);
     await streamDownload(prepareResponse.downloadUrl, tempBundle, prepareResponse.bundleSize, (bytes) => {
@@ -5625,7 +6314,7 @@ async function bundlePullPhase(client, deviceId, projectPath, projectDir, projec
     return { fileCount: extractedCount, failed: false };
   } finally {
     try {
-      await rm(tempBundle, { force: true });
+      await rm3(tempBundle, { force: true });
     } catch {
     }
   }
@@ -5661,15 +6350,15 @@ async function crossMachineBundlePull(client, deviceId, projectPath, fromDeviceI
     }
     return { fileCount, failed: false };
   }
-  const targetDir = join4(projectsDir, foreignEncodedDir);
-  const tempBundle = join4(tmpdir(), `claude-sync-bundle-${Date.now()}.tar.gz`);
+  const targetDir = join6(projectsDir, foreignEncodedDir);
+  const tempBundle = join6(tmpdir3(), `claude-sync-bundle-${Date.now()}.tar.gz`);
   try {
     const progress = createTransferProgress("Downloading", prepareResponse.bundleSize, spinner);
     await streamDownload(prepareResponse.downloadUrl, tempBundle, prepareResponse.bundleSize, (bytes) => {
       progress.update(bytes);
     });
     spinner.text = "Extracting files...";
-    await mkdir3(targetDir, { recursive: true });
+    await mkdir4(targetDir, { recursive: true });
     const extractedCount = await extractBundle(tempBundle, targetDir);
     try {
       const completeManifest = await walkDirectory(targetDir);
@@ -5683,134 +6372,93 @@ async function crossMachineBundlePull(client, deviceId, projectPath, fromDeviceI
     return { fileCount: extractedCount, failed: false };
   } finally {
     try {
-      await rm(tempBundle, { force: true });
+      await rm3(tempBundle, { force: true });
     } catch {
     }
   }
 }
-function syncCommand() {
-  return new Command4("sync").description("Sync current project sessions with cloud").option("--dry-run", "Show what would be synced without syncing").option("--verbose", "Show detailed output").action(async (options) => {
-    await runSync(options);
-  });
-}
-var import_utils3;
-var init_sync = __esm({
-  "src/commands/sync.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_config();
-    init_api_client();
-    init_sync_engine();
-    init_progress();
-    init_bundle();
-    import_utils3 = __toESM(require_dist(), 1);
-    init_theme();
+async function collaboratorBundlePull(client, deviceId, projectPath, projectId, canonicalPath, projectsDir, options) {
+  const spinner = createSpinner("Preparing download...").start();
+  let prepareResponse;
+  try {
+    prepareResponse = await client.post("/api/sync/pull/bundle/prepare", {
+      deviceId,
+      projectPath,
+      projectId
+    });
+  } catch (err) {
+    spinner.stop();
+    if (err instanceof AuthExpiredError) throw err;
+    printError(`Pull failed: ${err instanceof Error ? err.message : "Unknown error"}`);
+    return { fileCount: 0, failed: true };
   }
-});
-
-// src/commands/status.ts
-var status_exports = {};
-__export(status_exports, {
-  statusCommand: () => statusCommand
-});
-import { Command as Command5 } from "commander";
-function statusCommand() {
-  return new Command5("status").description("Show sync status for current project").action(async () => {
-    printIntro("Status");
-    const config = await loadConfig();
-    const cwd = process.cwd();
-    printLabel("API", config.apiUrl);
-    printLabel("Authenticated", isAuthenticated(config) ? success("yes") : error("no"));
-    printLabel("Device", config.deviceName || dim("none"));
-    printLabel("Project", brand(cwd));
-    const ctx = await resolveProjectState(cwd);
-    printLabel("State", ctx.state === "none" ? dim("no session data") : ctx.state === "symlink" ? `symlink \u2192 ${dim(ctx.symlinkTarget || "unknown")}` : "local");
-    if (!isAuthenticated(config) || ctx.state === "none") return;
-    const spinner = createSpinner("Scanning files...").start();
-    const savedManifest = await loadProjectManifest(cwd);
-    const currentManifest = await buildProjectManifest(cwd);
-    const diff = computeDiff(currentManifest, savedManifest);
+  if (!prepareResponse.downloadUrl || !prepareResponse.bundleSize) {
     spinner.stop();
-    const totalSize = currentManifest.reduce((sum, e) => sum + e.size, 0);
-    printDivider();
-    printLabel("Local files", `${brand(String(currentManifest.length))} ${dim(`(${formatBytes(totalSize)})`)}`);
-    console.log();
-    printInfo("Changes since last sync:");
-    console.log(`    ${success(`+${diff.added.length}`)} added  ${warn(`~${diff.modified.length}`)} modified  ${error(`-${diff.deleted.length}`)} deleted`);
-    console.log();
-  });
-}
-var init_status = __esm({
-  "src/commands/status.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_config();
-    init_sync_engine();
-    init_progress();
-    init_theme();
+    return { fileCount: 0, failed: false };
   }
-});
-
-// src/commands/whoami.ts
-var whoami_exports = {};
-__export(whoami_exports, {
-  whoamiCommand: () => whoamiCommand
-});
-import { Command as Command6 } from "commander";
-function whoamiCommand() {
-  return new Command6("whoami").description("Show current user and device info").action(async () => {
-    printIntro("Who Am I");
-    const config = await loadConfig();
-    if (!isAuthenticated(config)) {
-      printError("Not logged in. Run `claude-sync login` first.");
-      return;
+  const fileCount = prepareResponse.manifest.length;
+  if (options.dryRun) {
+    spinner.stop();
+    printInfo(`${brand(String(fileCount))} files to pull`);
+    if (options.verbose) {
+      for (const entry of prepareResponse.manifest) {
+        console.log(`    ${brand("\u25CB")} ${entry.path} ${dim(`(${formatBytes(entry.size)})`)}`);
+      }
     }
-    const client = new ApiClient(config.apiUrl);
-    const spinner = createSpinner("Fetching user info...").start();
+    return { fileCount, failed: false };
+  }
+  const foreignEncoded = canonicalPath.replace(/\//g, "%2F");
+  const targetDir = join6(projectsDir, foreignEncoded);
+  const tempBundle = join6(tmpdir3(), `claude-sync-bundle-${Date.now()}.tar.gz`);
+  try {
+    const progress = createTransferProgress("Downloading", prepareResponse.bundleSize, spinner);
+    await streamDownload(prepareResponse.downloadUrl, tempBundle, prepareResponse.bundleSize, (bytes) => {
+      progress.update(bytes);
+    });
+    spinner.text = "Extracting files...";
+    await mkdir4(targetDir, { recursive: true });
+    const extractedCount = await extractBundle(tempBundle, targetDir);
     try {
-      const user = await client.get("/api/auth/me");
-      spinner.stop();
-      printLabel("User", `${user.name} ${dim(`(${user.email})`)}`);
-      printLabel("Plan", brand(user.plan));
-      printDivider();
-      printLabel("Device", config.deviceName || dim("none"));
-      printLabel("Device ID", config.deviceId || dim("not registered"));
-    } catch (err) {
-      spinner.stop();
-      if (err instanceof AuthExpiredError) throw err;
-      printLabel("Email", config.email || dim("unknown"));
-      printLabel("Device", config.deviceName || dim("none"));
+      const completeManifest = await walkDirectory(targetDir);
+      await client.post("/api/sync/pull/bundle/complete", {
+        syncEventId: prepareResponse.syncEventId,
+        manifest: completeManifest
+      });
+    } catch {
     }
-    console.log();
-  });
+    progress.finish(`Pulled ${extractedCount} files ${dim(`(${formatBytes(prepareResponse.bundleSize)})`)}`);
+    return { fileCount: extractedCount, failed: false };
+  } finally {
+    try {
+      await rm3(tempBundle, { force: true });
+    } catch {
+    }
+  }
 }
-var init_whoami = __esm({
-  "src/commands/whoami.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_config();
-    init_api_client();
-    init_progress();
-    init_theme();
+async function checkPushPermission2(client, projectId) {
+  try {
+    const myRole = await client.get(`/api/projects/${projectId}/my-role`);
+    return { allowed: myRole.canPush, role: myRole.role };
+  } catch {
+    return { allowed: true, role: "owner" };
   }
-});
+}
+function syncCommand() {
+  return new Command7("sync").description("Sync current project sessions with cloud").option("--dry-run", "Show what would be synced without syncing").option("--verbose", "Show detailed output").action(async (options) => {
+    await runSync(options);
+  });
+}
 
 // src/index.ts
-init_esm_shims();
-init_login();
-init_logout();
-init_device();
-init_sync();
 init_status();
 init_whoami();
-import { Command as Command7 } from "commander";
 
 // src/commands/tui.ts
 init_esm_shims();
 init_theme();
 init_config();
 init_api_client();
-import { select as select3, text as text3, isCancel as isCancel4 } from "@clack/prompts";
+import { select as select3, text as text4, isCancel as isCancel6 } from "@clack/prompts";
 import chalk3 from "chalk";
 function buildMenu(loggedIn) {
   if (!loggedIn) {
@@ -5819,7 +6467,10 @@ function buildMenu(loggedIn) {
     ];
   }
   return [
-    { value: "sync", label: "Sync", hint: "Sync current project" },
+    { value: "quick-push", label: "Quick Push", hint: "Push without message" },
+    { value: "push-message", label: "Push with Message", hint: "Add a commit message" },
+    { value: "pull", label: "Pull", hint: "Get latest changes" },
+    { value: "log", label: "View History", hint: "Show commit log" },
     { value: "status", label: "Status", hint: "Show sync state" },
     { value: "device:add", label: "Add Device", hint: "Register this machine" },
     { value: "device:list", label: "List Devices", hint: "Show registered devices" },
@@ -5861,7 +6512,7 @@ async function runTui() {
       message: brand("What would you like to do?"),
       options
     });
-    if (isCancel4(choice) || choice === "quit") {
+    if (isCancel6(choice) || choice === "quit") {
       printOutro("Goodbye!");
       return;
     }
@@ -5905,21 +6556,33 @@ async function promptDeviceSelection(config) {
       hint: d.id === config.deviceId ? dim("current") : void 0
     }))
   });
-  if (isCancel4(choice)) return null;
+  if (isCancel6(choice)) return null;
   return choice;
 }
 async function executeCommand(command) {
   const { loginCommand: loginCommand2 } = await Promise.resolve().then(() => (init_login(), login_exports));
   const { logoutCommand: logoutCommand2 } = await Promise.resolve().then(() => (init_logout(), logout_exports));
   const { deviceCommand: deviceCommand2 } = await Promise.resolve().then(() => (init_device(), device_exports));
-  const { syncCommand: syncCommand2 } = await Promise.resolve().then(() => (init_sync(), sync_exports));
+  const { pushCommand: pushCommand2 } = await Promise.resolve().then(() => (init_push(), push_exports));
+  const { pullCommand: pullCommand2 } = await Promise.resolve().then(() => (init_pull(), pull_exports));
+  const { logCommand: logCommand2 } = await Promise.resolve().then(() => (init_log(), log_exports));
   const { statusCommand: statusCommand2 } = await Promise.resolve().then(() => (init_status(), status_exports));
   const { whoamiCommand: whoamiCommand2 } = await Promise.resolve().then(() => (init_whoami(), whoami_exports));
   const config = await loadConfig();
   const handlers = {
     login: () => loginCommand2().parseAsync(["", ""]),
     logout: () => logoutCommand2().parseAsync(["", ""]),
-    sync: () => syncCommand2().parseAsync(["", ""]),
+    "quick-push": () => pushCommand2().parseAsync(["", "", "-m", "Quick sync"]),
+    "push-message": async () => {
+      const message = await text4({
+        message: brand("Commit message:"),
+        placeholder: "Describe your changes..."
+      });
+      if (isCancel6(message)) return;
+      await pushCommand2().parseAsync(["", "", "-m", message]);
+    },
+    pull: () => pullCommand2().parseAsync(["", "", "-y"]),
+    log: () => logCommand2().parseAsync(["", ""]),
     status: () => statusCommand2().parseAsync(["", ""]),
     whoami: () => whoamiCommand2().parseAsync(["", ""]),
     "device:add": () => deviceCommand2().parseAsync(["", "", "add"]),
@@ -5930,8 +6593,8 @@ async function executeCommand(command) {
       await deviceCommand2().parseAsync(["", "", "remove", deviceId]);
     },
     "device:rename": async () => {
-      const name = await text3({ message: `${brand("New device name")}:` });
-      if (isCancel4(name)) return;
+      const name = await text4({ message: `${brand("New device name")}:` });
+      if (isCancel6(name)) return;
       await deviceCommand2().parseAsync(["", "", "rename", name]);
     }
   };
@@ -5944,7 +6607,7 @@ async function executeCommand(command) {
 // src/index.ts
 init_config();
 function run() {
-  const program = new Command7();
+  const program = new Command10();
   program.name("claude-sync").description("Sync Claude Code sessions across machines \u2014 claude-sync.com").version("0.1.0").option("--menu", "Open interactive menu").action(async (options) => {
     if (options.menu) {
       await runTui();
@@ -5960,6 +6623,9 @@ function run() {
   program.addCommand(loginCommand());
   program.addCommand(logoutCommand());
   program.addCommand(deviceCommand());
+  program.addCommand(pushCommand());
+  program.addCommand(pullCommand());
+  program.addCommand(logCommand());
   program.addCommand(syncCommand());
   program.addCommand(statusCommand());
   program.addCommand(whoamiCommand());