@prnv/tuck 1.2.0 → 1.2.1

package/dist/index.js

@@ -365,12 +365,22 @@ var init_ui = __esm({
 
 // src/constants.ts
 import { homedir } from "os";
-import { join } from "path";
-var VERSION, DESCRIPTION, HOME_DIR, DEFAULT_TUCK_DIR, MANIFEST_FILE, CONFIG_FILE, BACKUP_DIR, FILES_DIR, CATEGORIES, COMMON_DOTFILES;
+import { join, dirname } from "path";
+import { readFileSync } from "fs";
+import { fileURLToPath } from "url";
+var __dirname, packageJsonPath, VERSION_VALUE, VERSION, DESCRIPTION, HOME_DIR, DEFAULT_TUCK_DIR, MANIFEST_FILE, CONFIG_FILE, BACKUP_DIR, FILES_DIR, CATEGORIES;
 var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
-    VERSION = "0.1.0";
+    __dirname = dirname(fileURLToPath(import.meta.url));
+    packageJsonPath = join(__dirname, "..", "package.json");
+    VERSION_VALUE = "1.0.0";
+    try {
+      const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+      VERSION_VALUE = pkg.version;
+    } catch {
+    }
+    VERSION = VERSION_VALUE;
     DESCRIPTION = "Modern dotfiles manager with a beautiful CLI";
     HOME_DIR = homedir();
     DEFAULT_TUCK_DIR = join(HOME_DIR, ".tuck");
@@ -430,23 +440,12 @@ var init_constants = __esm({
         icon: "-"
       }
     };
-    COMMON_DOTFILES = [
-      { path: "~/.zshrc", category: "shell" },
-      { path: "~/.bashrc", category: "shell" },
-      { path: "~/.bash_profile", category: "shell" },
-      { path: "~/.gitconfig", category: "git" },
-      { path: "~/.config/nvim", category: "editors" },
-      { path: "~/.vimrc", category: "editors" },
-      { path: "~/.tmux.conf", category: "terminal" },
-      { path: "~/.ssh/config", category: "ssh" },
-      { path: "~/.config/starship.toml", category: "terminal" }
-    ];
   }
 });
 
 // src/lib/paths.ts
 import { homedir as homedir2 } from "os";
-import { join as join2, basename, dirname, relative, isAbsolute, resolve } from "path";
+import { join as join2, basename, dirname as dirname2, relative, isAbsolute, resolve } from "path";
 import { stat, access } from "fs/promises";
 import { constants } from "fs";
 var expandPath, collapsePath, getTuckDir, getManifestPath, getConfigPath, getFilesDir, getCategoryDir, getDestinationPath, getRelativeDestination, sanitizeFilename, detectCategory, pathExists, isDirectory, isPathWithinHome, validateSafeSourcePath, generateFileId;
@@ -1160,9 +1159,9 @@ var init_git = __esm({
         const remote = options?.remote || "origin";
         const branch = options?.branch;
         if (branch) {
-          await git.push([remote, branch, ...args]);
+          await git.push([...args, remote, branch]);
         } else {
-          await git.push([remote, ...args]);
+          await git.push([...args, remote]);
         }
       } catch (error) {
         throw new GitError("Failed to push", String(error));
@@ -1234,9 +1233,15 @@ var init_git = __esm({
       try {
         const git = createGit(dir);
         const branch = await git.revparse(["--abbrev-ref", "HEAD"]);
-        return branch;
-      } catch (error) {
-        throw new GitError("Failed to get current branch", String(error));
+        return branch.trim();
+      } catch {
+        try {
+          const git = createGit(dir);
+          const ref = await git.raw(["symbolic-ref", "--short", "HEAD"]);
+          return ref.trim();
+        } catch {
+          return "main";
+        }
       }
     };
     hasRemote = async (dir, name = "origin") => {
@@ -1480,7 +1485,7 @@ var init_github = __esm({
 import { createHash } from "crypto";
 import { readFile as readFile5, stat as stat4, readdir as readdir3, copyFile, symlink, unlink, rm as rm3 } from "fs/promises";
 import { copy as copy3, ensureDir as ensureDir3 } from "fs-extra";
-import { join as join7, dirname as dirname3 } from "path";
+import { join as join7, dirname as dirname4 } from "path";
 var getFileChecksum, getFileInfo, getDirectoryFiles, getDirectoryFileCount, copyFileOrDir, createSymlink, deleteFileOrDir;
 var init_files = __esm({
   "src/lib/files.ts"() {
@@ -1546,7 +1551,7 @@ var init_files = __esm({
       if (!await pathExists(expandedSource)) {
         throw new FileNotFoundError(source);
       }
-      await ensureDir3(dirname3(expandedDest));
+      await ensureDir3(dirname4(expandedDest));
       const sourceIsDir = await isDirectory(expandedSource);
       try {
         if (sourceIsDir) {
@@ -1574,7 +1579,7 @@ var init_files = __esm({
       if (!await pathExists(expandedTarget)) {
         throw new FileNotFoundError(target);
       }
-      await ensureDir3(dirname3(expandedLink));
+      await ensureDir3(dirname4(expandedLink));
       if (options?.overwrite && await pathExists(expandedLink)) {
         await unlink(expandedLink);
       }
@@ -2239,7 +2244,7 @@ var detectDotfiles = async () => {
 // src/lib/timemachine.ts
 init_paths();
 init_errors();
-import { join as join5, dirname as dirname2 } from "path";
+import { join as join5, dirname as dirname3 } from "path";
 import { readdir as readdir2, readFile as readFile3, writeFile as writeFile3, rm, stat as stat3 } from "fs/promises";
 import { copy, ensureDir, pathExists as pathExists2 } from "fs-extra";
 import { homedir as homedir3 } from "os";
@@ -2273,7 +2278,7 @@ var createSnapshot = async (filePaths, reason, profile) => {
     const backupPath = join5(snapshotPath, "files", backupRelativePath);
     const existed = await pathExists(expandedPath);
     if (existed) {
-      await ensureDir(dirname2(backupPath));
+      await ensureDir(dirname3(backupPath));
       await copy(expandedPath, backupPath, { overwrite: true, preserveTimestamps: true });
     }
     files.push({
@@ -2382,7 +2387,7 @@ var restoreSnapshot = async (snapshotId) => {
       continue;
     }
     if (await pathExists2(file.backupPath)) {
-      await ensureDir(dirname2(file.originalPath));
+      await ensureDir(dirname3(file.originalPath));
       await copy(file.backupPath, file.originalPath, { overwrite: true, preserveTimestamps: true });
       restoredFiles.push(file.originalPath);
     }
@@ -2410,7 +2415,7 @@ var restoreFileFromSnapshot = async (snapshotId, filePath) => {
   if (!await pathExists2(file.backupPath)) {
     throw new BackupError(`Backup file is missing: ${file.backupPath}`);
   }
-  await ensureDir(dirname2(file.originalPath));
+  await ensureDir(dirname3(file.originalPath));
   await copy(file.backupPath, file.originalPath, { overwrite: true, preserveTimestamps: true });
   return true;
 };
@@ -3070,30 +3075,52 @@ var runInteractiveInit = async () => {
       prompts.log.info("Run `tuck restore --all` to restore all dotfiles");
     }
   } else {
-    const existingDotfiles = [];
-    for (const df of COMMON_DOTFILES) {
-      const fullPath = expandPath(df.path);
-      if (await pathExists(fullPath)) {
-        existingDotfiles.push({
-          path: df.path,
-          label: `${df.path} (${df.category})`
-        });
-      }
-    }
     await initFromScratch(tuckDir, {});
-    if (existingDotfiles.length > 0) {
-      const selectedFiles = await prompts.multiselect(
-        "Would you like to track some common dotfiles?",
-        existingDotfiles.map((f) => ({
+    const scanSpinner = prompts.spinner();
+    scanSpinner.start("Scanning for dotfiles...");
+    const detectedFiles = await detectDotfiles();
+    const nonSensitiveFiles = detectedFiles.filter((f) => !f.sensitive);
+    scanSpinner.stop(`Found ${nonSensitiveFiles.length} dotfiles on your system`);
+    if (nonSensitiveFiles.length > 0) {
+      const grouped = {};
+      for (const file of nonSensitiveFiles) {
+        if (!grouped[file.category]) grouped[file.category] = [];
+        grouped[file.category].push(file);
+      }
+      console.log();
+      const categoryOrder = ["shell", "git", "editors", "terminal", "ssh", "misc"];
+      const sortedCategories = Object.keys(grouped).sort((a, b) => {
+        const aIdx = categoryOrder.indexOf(a);
+        const bIdx = categoryOrder.indexOf(b);
+        if (aIdx === -1 && bIdx === -1) return a.localeCompare(b);
+        if (aIdx === -1) return 1;
+        if (bIdx === -1) return -1;
+        return aIdx - bIdx;
+      });
+      for (const category of sortedCategories) {
+        const files = grouped[category];
+        const config = DETECTION_CATEGORIES[category] || { icon: "-", name: category };
+        console.log(`  ${config.icon} ${config.name}: ${files.length} files`);
+      }
+      console.log();
+      const trackNow = await prompts.confirm("Would you like to track some of these now?", true);
+      if (trackNow) {
+        const options = nonSensitiveFiles.slice(0, 25).map((f) => ({
           value: f.path,
-          label: f.label
-        }))
-      );
-      if (selectedFiles.length > 0) {
-        prompts.log.step(
-          `Run the following to track these files:
-  tuck add ${selectedFiles.join(" ")}`
+          label: `${collapsePath(f.path)} (${f.category})`
+        }));
+        const selectedFiles = await prompts.multiselect(
+          "Select files to track:",
+          options
         );
+        if (selectedFiles.length > 0) {
+          prompts.log.step(
+            `Run the following to track these files:
+  tuck add ${selectedFiles.join(" ")}`
+          );
+        }
+      } else {
+        prompts.log.info("Run 'tuck scan' later to interactively add files");
       }
     }
     const wantsRemote = await prompts.confirm("Would you like to set up a remote repository?");
@@ -3618,13 +3645,32 @@ var runInteractivePush = async (tuckDir) => {
     return;
   }
   const needsUpstream = !status.tracking;
-  await withSpinner("Pushing...", async () => {
-    await push(tuckDir, {
-      setUpstream: needsUpstream,
-      branch: needsUpstream ? branch : void 0
+  try {
+    await withSpinner("Pushing...", async () => {
+      await push(tuckDir, {
+        setUpstream: needsUpstream,
+        branch: needsUpstream ? branch : void 0
+      });
     });
-  });
-  prompts.log.success("Pushed successfully!");
+    prompts.log.success("Pushed successfully!");
+  } catch (error) {
+    const errorMsg = error instanceof Error ? error.message : String(error);
+    if (errorMsg.includes("Permission denied") || errorMsg.includes("publickey")) {
+      prompts.log.error("Authentication failed");
+      prompts.log.info("Check your SSH keys with: ssh -T git@github.com");
+      prompts.log.info("Or try switching to HTTPS: git remote set-url origin https://...");
+    } else if (errorMsg.includes("Could not resolve host") || errorMsg.includes("Network")) {
+      prompts.log.error("Network error - could not reach remote");
+      prompts.log.info("Check your internet connection and try again");
+    } else if (errorMsg.includes("rejected") || errorMsg.includes("non-fast-forward")) {
+      prompts.log.error("Push rejected - remote has changes");
+      prompts.log.info("Run 'tuck pull' first, then push again");
+      prompts.log.info("Or use 'tuck push --force' to overwrite (use with caution)");
+    } else {
+      prompts.log.error(`Push failed: ${errorMsg}`);
+    }
+    return;
+  }
   if (remoteUrl) {
     let viewUrl = remoteUrl;
     if (remoteUrl.startsWith("git@github.com:")) {
@@ -3651,14 +3697,27 @@ var runPush = async (options) => {
     throw new GitError("No remote configured", "Run 'tuck init -r <url>' or add a remote manually");
   }
   const branch = await getCurrentBranch(tuckDir);
-  await withSpinner("Pushing...", async () => {
-    await push(tuckDir, {
-      force: options.force,
-      setUpstream: Boolean(options.setUpstream),
-      branch: options.setUpstream || branch
+  try {
+    await withSpinner("Pushing...", async () => {
+      await push(tuckDir, {
+        force: options.force,
+        setUpstream: Boolean(options.setUpstream),
+        branch: options.setUpstream || branch
+      });
     });
-  });
-  logger.success("Pushed successfully!");
+    logger.success("Pushed successfully!");
+  } catch (error) {
+    const errorMsg = error instanceof Error ? error.message : String(error);
+    if (errorMsg.includes("Permission denied") || errorMsg.includes("publickey")) {
+      throw new GitError("Authentication failed", "Check your SSH keys: ssh -T git@github.com");
+    } else if (errorMsg.includes("Could not resolve host") || errorMsg.includes("Network")) {
+      throw new GitError("Network error", "Check your internet connection");
+    } else if (errorMsg.includes("rejected") || errorMsg.includes("non-fast-forward")) {
+      throw new GitError("Push rejected", "Run 'tuck pull' first, or use --force");
+    } else {
+      throw new GitError("Push failed", errorMsg);
+    }
+  }
 };
 var pushCommand = new Command5("push").description("Push changes to remote repository").option("-f, --force", "Force push").option("--set-upstream <name>", "Set upstream branch").action(async (options) => {
   await runPush(options);
@@ -3999,8 +4058,10 @@ init_manifest();
 init_git();
 init_files();
 init_errors();
+init_constants();
 import { Command as Command8 } from "commander";
 import chalk13 from "chalk";
+import boxen2 from "boxen";
 var detectFileChanges = async (tuckDir) => {
   const files = await getAllTrackedFiles(tuckDir);
   const changes = [];
@@ -4055,6 +4116,10 @@ var getFullStatus = async (tuckDir) => {
     }
   }
   const fileChanges = await detectFileChanges(tuckDir);
+  const categoryCounts = {};
+  for (const file of Object.values(manifest.files)) {
+    categoryCounts[file.category] = (categoryCounts[file.category] || 0) + 1;
+  }
   return {
     tuckDir,
     branch,
@@ -4063,6 +4128,7 @@ var getFullStatus = async (tuckDir) => {
     ahead: gitStatus.ahead,
     behind: gitStatus.behind,
     trackedCount: Object.keys(manifest.files).length,
+    categoryCounts,
     changes: fileChanges,
     gitChanges: {
       staged: gitStatus.staged,
@@ -4072,33 +4138,58 @@ var getFullStatus = async (tuckDir) => {
   };
 };
 var printStatus = (status) => {
-  prompts.intro("tuck status");
-  console.log();
-  console.log(chalk13.dim("Repository:"), collapsePath(status.tuckDir));
-  console.log(chalk13.dim("Branch:"), chalk13.cyan(status.branch));
+  const headerLines = [
+    `${chalk13.bold.cyan("tuck")} ${chalk13.dim(`v${VERSION}`)}`,
+    "",
+    `${chalk13.dim("Repository:")} ${collapsePath(status.tuckDir)}`,
+    `${chalk13.dim("Branch:")}     ${chalk13.cyan(status.branch)}`
+  ];
+  if (status.remote) {
+    const shortRemote = status.remote.length > 40 ? status.remote.replace(/^https?:\/\//, "").replace(/\.git$/, "") : status.remote;
+    headerLines.push(`${chalk13.dim("Remote:")}     ${shortRemote}`);
+  } else {
+    headerLines.push(`${chalk13.dim("Remote:")}     ${chalk13.yellow("not configured")}`);
+  }
+  console.log(boxen2(headerLines.join("\n"), {
+    padding: { top: 0, bottom: 0, left: 1, right: 1 },
+    borderColor: "cyan",
+    borderStyle: "round"
+  }));
   if (status.remote) {
-    console.log(chalk13.dim("Remote:"), status.remote);
     let remoteInfo = "";
     switch (status.remoteStatus) {
       case "up-to-date":
-        remoteInfo = chalk13.green("up to date");
+        remoteInfo = chalk13.green("\u2713 Up to date with remote");
         break;
       case "ahead":
-        remoteInfo = chalk13.yellow(`${status.ahead} commit${status.ahead > 1 ? "s" : ""} ahead`);
+        remoteInfo = chalk13.yellow(`\u2191 ${status.ahead} commit${status.ahead > 1 ? "s" : ""} ahead of remote`);
         break;
       case "behind":
-        remoteInfo = chalk13.yellow(`${status.behind} commit${status.behind > 1 ? "s" : ""} behind`);
+        remoteInfo = chalk13.yellow(`\u2193 ${status.behind} commit${status.behind > 1 ? "s" : ""} behind remote`);
         break;
       case "diverged":
-        remoteInfo = chalk13.red(`diverged (${status.ahead} ahead, ${status.behind} behind)`);
+        remoteInfo = chalk13.red(`\u26A0 Diverged (${status.ahead} ahead, ${status.behind} behind)`);
         break;
     }
-    console.log(chalk13.dim("Status:"), remoteInfo);
-  } else {
-    console.log(chalk13.dim("Remote:"), chalk13.yellow("not configured"));
+    console.log("\n" + remoteInfo);
   }
   console.log();
-  console.log(chalk13.dim("Tracked files:"), status.trackedCount);
+  console.log(chalk13.bold(`Tracked Files: ${status.trackedCount}`));
+  const categoryOrder = ["shell", "git", "editors", "terminal", "ssh", "misc"];
+  const sortedCategories = Object.keys(status.categoryCounts).sort((a, b) => {
+    const aIdx = categoryOrder.indexOf(a);
+    const bIdx = categoryOrder.indexOf(b);
+    if (aIdx === -1 && bIdx === -1) return a.localeCompare(b);
+    if (aIdx === -1) return 1;
+    if (bIdx === -1) return -1;
+    return aIdx - bIdx;
+  });
+  if (sortedCategories.length > 0) {
+    for (const category of sortedCategories) {
+      const count = status.categoryCounts[category];
+      console.log(chalk13.dim(`  ${category}: ${count} file${count > 1 ? "s" : ""}`));
+    }
+  }
   if (status.changes.length > 0) {
     console.log();
     console.log(chalk13.bold("Changes detected:"));
@@ -4938,8 +5029,8 @@ var applyWithMerge = async (files, dryRun) => {
       } else {
         const { writeFile: writeFile5 } = await import("fs/promises");
         const { ensureDir: ensureDir6 } = await import("fs-extra");
-        const { dirname: dirname4 } = await import("path");
-        await ensureDir6(dirname4(file.destination));
+        const { dirname: dirname5 } = await import("path");
+        await ensureDir6(dirname5(file.destination));
         await writeFile5(file.destination, mergeResult.content, "utf-8");
         logger.file("merge", collapsePath(file.destination));
       }