pushwork 1.0.3 → 1.0.5

package/dist/cli/commands.js

@@ -32,11 +32,7 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProgressMessages = void 0;
 exports.setupCommandContext = setupCommandContext;
 exports.safeRepoShutdown = safeRepoShutdown;
 exports.init = init;
@@ -49,15 +45,51 @@ exports.clone = clone;
 exports.url = url;
 exports.commit = commit;
 exports.debug = debug;
+exports.ls = ls;
+exports.config = config;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs/promises"));
-const chalk_1 = __importDefault(require("chalk"));
-const ora_1 = __importDefault(require("ora"));
 const diffLib = __importStar(require("diff"));
 const core_1 = require("../core");
 const utils_1 = require("../utils");
 const config_1 = require("../config");
 const repo_factory_1 = require("../utils/repo-factory");
+const output_1 = require("./output");
+/**
+ * Simple key transformation for debug output: snake_case -> Title Case
+ */
+function prettifyKey(key) {
+    return (key
+        .split("_")
+        .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+        .join(" ") + ":");
+}
+/**
+ * Format timing value with percentage and optional metadata
+ */
+function formatTimingValue(value, key, total, timings) {
+    // Skip non-timing values
+    if (key === "documents_to_sync")
+        return "";
+    if (key === "total")
+        return `${(value / 1000).toFixed(3)}s`;
+    const timeStr = `${(value / 1000).toFixed(3)}s`;
+    const pctStr = `(${((value / total) * 100).toFixed(1)}%)`;
+    return `${timeStr} ${pctStr}`;
+}
+/**
+ * Validate that sync server options are used together
+ */
+function validateSyncServerOptions(syncServer, syncServerStorageId) {
+    const hasSyncServer = !!syncServer;
+    const hasSyncServerStorageId = !!syncServerStorageId;
+    if (hasSyncServer && !hasSyncServerStorageId) {
+        throw new Error("--sync-server requires --sync-server-storage-id\nBoth arguments must be provided together.");
+    }
+    if (hasSyncServerStorageId && !hasSyncServer) {
+        throw new Error("--sync-server-storage-id requires --sync-server\nBoth arguments must be provided together.");
+    }
+}
 /**
  * Shared pre-action that ensures repository and sync engine are properly initialized
  * This function always works, with or without network connectivity
@@ -111,102 +143,30 @@ async function safeRepoShutdown(repo, context) {
         console.warn(`Warning: Repository shutdown failed${context ? ` (${context})` : ""}: ${shutdownError}`);
     }
 }
-/**
- * Common progress message helpers
- */
-exports.ProgressMessages = {
-    // Setup messages
-    directoryFound: () => console.log(chalk_1.default.gray("  ✓ Sync directory found")),
-    configLoaded: () => console.log(chalk_1.default.gray("  ✓ Configuration loaded")),
-    repoConnected: () => console.log(chalk_1.default.gray("  ✓ Connected to repository")),
-    // Configuration display
-    syncServer: (server) => console.log(chalk_1.default.gray(`  ✓ Sync server: ${server}`)),
-    storageId: (id) => console.log(chalk_1.default.gray(`  ✓ Storage ID: ${id}`)),
-    rootUrl: (url) => console.log(chalk_1.default.gray(`  ✓ Root URL: ${url}`)),
-    // Operation completion
-    changesWritten: () => console.log(chalk_1.default.gray("  ✓ All changes written to disk")),
-    syncCompleted: (duration) => console.log(chalk_1.default.gray(`  ✓ Initial sync completed in ${duration}ms`)),
-    directoryStructureCreated: () => console.log(chalk_1.default.gray("  ✓ Created sync directory structure")),
-    configSaved: () => console.log(chalk_1.default.gray("  ✓ Saved configuration")),
-    repoCreated: () => console.log(chalk_1.default.gray("  ✓ Created Automerge repository")),
-};
-/**
- * Show actual content diff for a changed file
- */
-async function showContentDiff(change) {
-    try {
-        // Get old content (from snapshot/remote)
-        const oldContent = change.remoteContent || "";
-        // Get new content (current local)
-        const newContent = change.localContent || "";
-        // Convert binary content to string representation if needed
-        const oldText = typeof oldContent === "string"
-            ? oldContent
-            : `<binary content: ${oldContent.length} bytes>`;
-        const newText = typeof newContent === "string"
-            ? newContent
-            : `<binary content: ${newContent.length} bytes>`;
-        // Generate unified diff
-        const diffResult = diffLib.createPatch(change.path, oldText, newText, "previous", "current");
-        // Skip the header lines and process the diff
-        const lines = diffResult.split("\n").slice(4); // Skip index, ===, ---, +++ lines
-        if (lines.length === 0 || (lines.length === 1 && lines[0] === "")) {
-            console.log(chalk_1.default.gray("  (content identical)"));
-            return;
-        }
-        for (const line of lines) {
-            if (line.startsWith("@@")) {
-                // Hunk header
-                console.log(chalk_1.default.cyan(line));
-            }
-            else if (line.startsWith("+")) {
-                // Added line
-                console.log(chalk_1.default.green(line));
-            }
-            else if (line.startsWith("-")) {
-                // Removed line
-                console.log(chalk_1.default.red(line));
-            }
-            else if (line.startsWith(" ")) {
-                // Context line
-                console.log(chalk_1.default.gray(line));
-            }
-            else if (line === "") {
-                // Empty line
-                console.log("");
-            }
-        }
-    }
-    catch (error) {
-        console.log(chalk_1.default.gray(`  (diff error: ${error})`));
-    }
-}
 /**
  * Initialize sync in a directory
  */
-async function init(targetPath, syncServer, syncServerStorageId) {
-    const spinner = (0, ora_1.default)("Starting initialization...").start();
+async function init(targetPath, options = {}) {
+    // Validate sync server options
+    validateSyncServerOptions(options.syncServer, options.syncServerStorageId);
+    const out = new output_1.Output();
     try {
         const resolvedPath = path.resolve(targetPath);
-        // Step 1: Directory setup
-        spinner.text = "Setting up directory structure...";
+        out.task(`Initializing ${resolvedPath}`);
         await (0, utils_1.ensureDirectoryExists)(resolvedPath);
         // Check if already initialized
         const syncToolDir = path.join(resolvedPath, ".pushwork");
         if (await (0, utils_1.pathExists)(syncToolDir)) {
-            spinner.fail("Directory already initialized for sync");
-            return;
+            out.error("Directory already initialized for sync");
+            out.exit(1);
         }
-        // Step 2: Create sync directories
-        spinner.text = "Creating .pushwork directory...";
+        out.update("Creating sync directory");
         await (0, utils_1.ensureDirectoryExists)(syncToolDir);
         await (0, utils_1.ensureDirectoryExists)(path.join(syncToolDir, "automerge"));
-        exports.ProgressMessages.directoryStructureCreated();
-        // Step 3: Configuration setup
-        spinner.text = "Setting up configuration...";
+        out.update("Setting up configuration");
         const configManager = new config_1.ConfigManager(resolvedPath);
-        const defaultSyncServer = syncServer || "wss://sync3.automerge.org";
-        const defaultStorageId = syncServerStorageId || "3760df37-a4c6-4f66-9ecd-732039a9385d";
+        const defaultSyncServer = options.syncServer || "wss://sync3.automerge.org";
+        const defaultStorageId = options.syncServerStorageId || "3760df37-a4c6-4f66-9ecd-732039a9385d";
         const config = {
             sync_server: defaultSyncServer,
             sync_server_storage_id: defaultStorageId,
@@ -226,432 +186,339 @@ async function init(targetPath, syncServer, syncServerStorageId) {
             },
         };
         await configManager.save(config);
-        exports.ProgressMessages.configSaved();
-        exports.ProgressMessages.syncServer(defaultSyncServer);
-        exports.ProgressMessages.storageId(defaultStorageId);
-        // Step 4: Initialize Automerge repo and create root directory document
-        spinner.text = "Creating root directory document...";
+        out.update("Creating root directory");
         const repo = await (0, repo_factory_1.createRepo)(resolvedPath, {
             enableNetwork: true,
-            syncServer: syncServer,
-            syncServerStorageId: syncServerStorageId,
+            syncServer: options.syncServer,
+            syncServerStorageId: options.syncServerStorageId,
         });
-        // Create the root directory document
         const rootDoc = {
             "@patchwork": { type: "folder" },
             docs: [],
         };
         const rootHandle = repo.create(rootDoc);
-        exports.ProgressMessages.repoCreated();
-        exports.ProgressMessages.rootUrl(rootHandle.url);
-        // Step 5: Scan existing files
-        spinner.text = "Scanning existing files...";
-        const syncEngine = new core_1.SyncEngine(repo, resolvedPath, config.defaults.exclude_patterns, true, // Network sync enabled for init
-        config.sync_server_storage_id);
-        // Get file count for progress
-        const dirEntries = await fs.readdir(resolvedPath, { withFileTypes: true });
-        const fileCount = dirEntries.filter((dirent) => dirent.isFile()).length;
-        if (fileCount > 0) {
-            console.log(chalk_1.default.gray(`  ✓ Found ${fileCount} existing files`));
-            spinner.text = `Creating initial snapshot with ${fileCount} files...`;
-        }
-        else {
-            spinner.text = "Creating initial empty snapshot...";
-        }
-        // Step 6: Set the root directory URL before creating initial snapshot
+        out.update("Scanning existing files");
+        const syncEngine = new core_1.SyncEngine(repo, resolvedPath, config.defaults.exclude_patterns, true, config.sync_server_storage_id);
         await syncEngine.setRootDirectoryUrl(rootHandle.url);
-        // Step 7: Create initial snapshot
-        spinner.text = "Creating initial snapshot...";
-        const startTime = Date.now();
-        await syncEngine.sync(false);
-        const duration = Date.now() - startTime;
-        exports.ProgressMessages.syncCompleted(duration);
-        // Step 8: Ensure all Automerge operations are flushed to disk
-        spinner.text = "Flushing changes to disk...";
+        const result = await syncEngine.sync(false);
+        out.update("Writing to disk");
         await safeRepoShutdown(repo, "init");
-        exports.ProgressMessages.changesWritten();
-        spinner.succeed(`Initialized sync in ${chalk_1.default.green(resolvedPath)}`);
-        console.log(`\n${chalk_1.default.bold("🎉 Sync Directory Created!")}`);
-        console.log(`  📁 Directory: ${chalk_1.default.blue(resolvedPath)}`);
-        console.log(`  🔗 Sync server: ${chalk_1.default.blue(defaultSyncServer)}`);
-        console.log(`\n${chalk_1.default.green("Initialization complete!")} Run ${chalk_1.default.cyan("pushwork sync")} to start syncing.`);
+        out.done();
+        out.pair("Sync", defaultSyncServer);
+        if (result.filesChanged > 0) {
+            out.pair("Files", `${result.filesChanged} added`);
+        }
+        out.success("INITIALIZED", rootHandle.url);
+        // Show timing breakdown if debug mode is enabled
+        if (options.debug &&
+            result.timings &&
+            Object.keys(result.timings).length > 0) {
+            const total = result.timings.total || 0;
+            out.log("");
+            out.special("TIMING", "");
+            out.obj(result.timings, prettifyKey, (value, key) => formatTimingValue(value, key, total, result.timings));
+        }
+        out.log("");
+        out.log(`Run 'pushwork sync' to start synchronizing`);
     }
     catch (error) {
-        spinner.fail(`Failed to initialize: ${error}`);
-        throw error;
+        out.error("FAILED", "Initialization failed");
+        out.log(`  ${error}`);
+        out.exit(1);
     }
+    process.exit();
 }
 /**
  * Run bidirectional sync
  */
-async function sync(options) {
-    const spinner = (0, ora_1.default)("Starting sync operation...").start();
+async function sync(targetPath = ".", options) {
+    const out = new output_1.Output();
     try {
-        // Step 1: Setup shared context
-        spinner.text = "Setting up sync context...";
-        const { repo, syncEngine, config, workingDir } = await setupCommandContext();
-        exports.ProgressMessages.directoryFound();
-        exports.ProgressMessages.configLoaded();
-        exports.ProgressMessages.syncServer(config?.sync_server || "wss://sync3.automerge.org");
-        exports.ProgressMessages.repoConnected();
-        // Show root directory URL for context
-        const syncStatus = await syncEngine.getStatus();
-        if (syncStatus.snapshot?.rootDirectoryUrl) {
-            exports.ProgressMessages.rootUrl(syncStatus.snapshot.rootDirectoryUrl);
-        }
+        out.task("Syncing");
+        const { repo, syncEngine, workingDir } = await setupCommandContext(targetPath);
         if (options.dryRun) {
-            // Dry run mode - detailed preview
-            spinner.text = "Analyzing changes (dry run)...";
-            const startTime = Date.now();
+            out.update("Analyzing changes");
             const preview = await syncEngine.previewChanges();
-            const analysisTime = Date.now() - startTime;
-            spinner.succeed("Change analysis completed");
-            console.log(`\n${chalk_1.default.bold("📊 Change Analysis")} (${analysisTime}ms):`);
-            console.log(chalk_1.default.gray(`  Directory: ${workingDir}`));
-            console.log(chalk_1.default.gray(`  Analysis time: ${analysisTime}ms`));
+            out.done();
             if (preview.changes.length === 0 && preview.moves.length === 0) {
-                console.log(`\n${chalk_1.default.green("✨ No changes detected")} - everything is in sync!`);
+                out.info("No changes detected");
+                out.log("Everything is already in sync");
                 return;
             }
-            console.log(`\n${chalk_1.default.bold("📋 Summary:")}`);
-            console.log(`  ${preview.summary}`);
-            if (preview.changes.length > 0) {
-                const localChanges = preview.changes.filter((c) => c.changeType === "local_only" || c.changeType === "both_changed").length;
-                const remoteChanges = preview.changes.filter((c) => c.changeType === "remote_only" || c.changeType === "both_changed").length;
-                const conflicts = preview.changes.filter((c) => c.changeType === "both_changed").length;
-                console.log(`\n${chalk_1.default.bold("📁 File Changes:")} (${preview.changes.length} total)`);
-                if (localChanges > 0) {
-                    console.log(`  ${chalk_1.default.green("📤")} Local changes: ${localChanges}`);
-                }
-                if (remoteChanges > 0) {
-                    console.log(`  ${chalk_1.default.blue("📥")} Remote changes: ${remoteChanges}`);
-                }
-                if (conflicts > 0) {
-                    console.log(`  ${chalk_1.default.yellow("⚠️")} Conflicts: ${conflicts}`);
-                }
-                console.log(`\n${chalk_1.default.bold("📄 Changed Files:")}`);
-                for (const change of preview.changes.slice(0, 10)) {
-                    // Show first 10
-                    const typeIcon = change.changeType === "local_only"
-                        ? chalk_1.default.green("📤")
-                        : change.changeType === "remote_only"
-                            ? chalk_1.default.blue("📥")
-                            : change.changeType === "both_changed"
-                                ? chalk_1.default.yellow("⚠️")
-                                : chalk_1.default.gray("➖");
-                    console.log(`  ${typeIcon} ${change.path}`);
-                }
-                if (preview.changes.length > 10) {
-                    console.log(`  ${chalk_1.default.gray(`... and ${preview.changes.length - 10} more files`)}`);
-                }
+            out.info("CHANGES", "Pending");
+            out.pair("Directory", workingDir);
+            out.pair("Changes", preview.changes.length.toString());
+            if (preview.moves.length > 0) {
+                out.pair("Moves", preview.moves.length.toString());
+            }
+            out.log("");
+            out.log("Files:");
+            for (const change of preview.changes.slice(0, 10)) {
+                const prefix = change.changeType === "local_only"
+                    ? "[local]  "
+                    : change.changeType === "remote_only"
+                        ? "[remote] "
+                        : "[conflict]";
+                out.log(`  ${prefix} ${change.path}`);
+            }
+            if (preview.changes.length > 10) {
+                out.log(`  ... and ${preview.changes.length - 10} more`);
             }
             if (preview.moves.length > 0) {
-                console.log(`\n${chalk_1.default.bold("🔄 Potential Moves:")} (${preview.moves.length})`);
+                out.log("");
+                out.log("Moves:");
                 for (const move of preview.moves.slice(0, 5)) {
-                    // Show first 5
-                    const confidence = move.confidence === "auto"
-                        ? chalk_1.default.green("Auto")
-                        : move.confidence === "prompt"
-                            ? chalk_1.default.yellow("Prompt")
-                            : chalk_1.default.red("Low");
-                    console.log(`  🔄 ${move.fromPath} → ${move.toPath} (${confidence})`);
+                    out.log(`  ${move.fromPath} → ${move.toPath}`);
                 }
                 if (preview.moves.length > 5) {
-                    console.log(`  ${chalk_1.default.gray(`... and ${preview.moves.length - 5} more moves`)}`);
+                    out.log(`  ... and ${preview.moves.length - 5} more`);
                 }
             }
-            console.log(`\n${chalk_1.default.cyan("ℹ️  Run without --dry-run to apply these changes")}`);
+            out.log("");
+            out.log("Run without --dry-run to apply these changes");
         }
         else {
-            // Actual sync operation
-            spinner.text = "Detecting changes...";
-            const startTime = Date.now();
+            out.update("Synchronizing");
             const result = await syncEngine.sync(false);
-            const totalTime = Date.now() - startTime;
+            out.update("Writing to disk");
+            await safeRepoShutdown(repo, "sync");
             if (result.success) {
-                spinner.succeed(`Sync completed in ${totalTime}ms`);
-                console.log(`\n${chalk_1.default.bold("✅ Sync Results:")}`);
-                console.log(`  📄 Files changed: ${chalk_1.default.yellow(result.filesChanged)}`);
-                console.log(`  📁 Directories changed: ${chalk_1.default.yellow(result.directoriesChanged)}`);
-                console.log(`  ⏱️  Total time: ${chalk_1.default.gray(totalTime + "ms")}`);
+                if (result.filesChanged === 0 && result.directoriesChanged === 0) {
+                    out.done();
+                    out.success("Already in sync");
+                }
+                else {
+                    out.done();
+                    out.success("SYNCED", `${result.filesChanged} file${result.filesChanged !== 1 ? "s" : ""} updated`);
+                    out.pair("Files", result.filesChanged.toString());
+                }
                 if (result.warnings.length > 0) {
-                    console.log(`\n${chalk_1.default.yellow("⚠️  Warnings:")} (${result.warnings.length})`);
+                    out.log("");
+                    out.warn("WARNINGS", `${result.warnings.length} warnings`);
                     for (const warning of result.warnings.slice(0, 5)) {
-                        console.log(`  ${chalk_1.default.yellow("⚠️")} ${warning}`);
+                        out.log(`  ${warning}`);
                     }
                     if (result.warnings.length > 5) {
-                        console.log(`  ${chalk_1.default.gray(`... and ${result.warnings.length - 5} more warnings`)}`);
+                        out.log(`  ... and ${result.warnings.length - 5} more`);
                     }
                 }
-                if (result.filesChanged === 0 && result.directoriesChanged === 0) {
-                    console.log(`\n${chalk_1.default.green("✨ Everything already in sync!")}`);
+                // Show timing breakdown if debug mode is enabled
+                if (options.debug &&
+                    result.timings &&
+                    Object.keys(result.timings).length > 0) {
+                    const total = result.timings.total || 0;
+                    out.log("");
+                    out.special("TIMING", "");
+                    out.obj(result.timings, prettifyKey, (value, key) => formatTimingValue(value, key, total, result.timings));
                 }
-                // Ensure all changes are flushed to disk
-                spinner.text = "Flushing changes to disk...";
-                await safeRepoShutdown(repo, "sync");
-                exports.ProgressMessages.changesWritten();
             }
             else {
-                spinner.fail("Sync completed with errors");
-                console.log(`\n${chalk_1.default.red("❌ Sync Errors:")} (${result.errors.length})`);
+                out.done("partial", false);
+                out.warn("PARTIAL", `${result.filesChanged} updated, ${result.errors.length} errors`);
+                out.pair("Files", result.filesChanged.toString());
+                out.pair("Errors", result.errors.length.toString());
+                out.log("");
                 for (const error of result.errors.slice(0, 5)) {
-                    console.log(`  ${chalk_1.default.red("❌")} ${error.path}: ${error.error.message}`);
+                    out.error("ERROR", error.path);
+                    out.log(`  ${error.error.message}`);
+                    out.log("");
                 }
                 if (result.errors.length > 5) {
-                    console.log(`  ${chalk_1.default.gray(`... and ${result.errors.length - 5} more errors`)}`);
+                    out.log(`... and ${result.errors.length - 5} more errors`);
                 }
-                if (result.filesChanged > 0 || result.directoriesChanged > 0) {
-                    console.log(`\n${chalk_1.default.yellow("⚠️  Partial sync completed:")}`);
-                    console.log(`  📄 Files changed: ${result.filesChanged}`);
-                    console.log(`  📁 Directories changed: ${result.directoriesChanged}`);
-                }
-                // Still try to flush any partial changes
-                await safeRepoShutdown(repo, "sync-error");
             }
         }
     }
     catch (error) {
-        spinner.fail(`Sync failed: ${error}`);
-        throw error;
+        out.error("FAILED", "Sync failed");
+        out.log(`  ${error}`);
+        out.exit(1);
     }
+    process.exit();
 }
 /**
  * Show differences between local and remote
  */
 async function diff(targetPath = ".", options) {
+    const out = new output_1.Output();
     try {
-        // Setup shared context with network disabled for diff check
+        out.task("Analyzing changes");
         const { repo, syncEngine } = await setupCommandContext(targetPath, undefined, undefined, false);
         const preview = await syncEngine.previewChanges();
+        out.done();
         if (options.nameOnly) {
-            // Show only file names
             for (const change of preview.changes) {
                 console.log(change.path);
             }
             return;
         }
-        // Show root directory URL for context
-        const diffStatus = await syncEngine.getStatus();
-        if (diffStatus.snapshot?.rootDirectoryUrl) {
-            console.log(chalk_1.default.gray(`Root URL: ${diffStatus.snapshot.rootDirectoryUrl}`));
-            console.log("");
-        }
         if (preview.changes.length === 0) {
-            console.log(chalk_1.default.green("No changes detected"));
+            out.success("No changes detected");
+            await safeRepoShutdown(repo, "diff");
+            out.exit();
             return;
         }
-        console.log(chalk_1.default.bold("Differences:"));
+        out.warn(`${preview.changes.length} changes detected`);
         for (const change of preview.changes) {
-            const typeLabel = change.changeType === "local_only"
-                ? chalk_1.default.green("[LOCAL]")
+            const prefix = change.changeType === "local_only"
+                ? "[local]  "
                 : change.changeType === "remote_only"
-                    ? chalk_1.default.blue("[REMOTE]")
-                    : change.changeType === "both_changed"
-                        ? chalk_1.default.yellow("[CONFLICT]")
-                        : chalk_1.default.gray("[NO CHANGE]");
-            console.log(`\n${typeLabel} ${change.path}`);
-            if (options.tool) {
-                console.log(`  Use "${options.tool}" to view detailed diff`);
+                    ? "[remote] "
+                    : "[conflict]";
+            if (!options.tool) {
+                try {
+                    // Get old content (from snapshot/remote)
+                    const oldContent = change.remoteContent || "";
+                    // Get new content (current local)
+                    const newContent = change.localContent || "";
+                    // Convert binary content to string representation if needed
+                    const oldText = typeof oldContent === "string"
+                        ? oldContent
+                        : `<binary content: ${oldContent.length} bytes>`;
+                    const newText = typeof newContent === "string"
+                        ? newContent
+                        : `<binary content: ${newContent.length} bytes>`;
+                    // Generate unified diff
+                    const diffResult = diffLib.createPatch(change.path, oldText, newText, "previous", "current");
+                    // Skip the header lines and process the diff
+                    const lines = diffResult.split("\n").slice(4); // Skip index, ===, ---, +++ lines
+                    if (lines.length === 0 || (lines.length === 1 && lines[0] === "")) {
+                        out.log(`${prefix}${change.path} (content identical)`, "cyan");
+                        continue;
+                    }
+                    // Extract first hunk header and show inline with path
+                    let firstHunk = "";
+                    let diffLines = lines;
+                    if (lines[0]?.startsWith("@@")) {
+                        firstHunk = ` ${lines[0]}`;
+                        diffLines = lines.slice(1);
+                    }
+                    out.log(`${prefix}${change.path}${firstHunk}`, "cyan");
+                    for (const line of diffLines) {
+                        if (line.startsWith("@@")) {
+                            // Additional hunk headers
+                            out.log(line, "dim");
+                        }
+                        else if (line.startsWith("+")) {
+                            // Added line
+                            out.log(line, "green");
+                        }
+                        else if (line.startsWith("-")) {
+                            // Removed line
+                            out.log(line, "red");
+                        }
+                        else if (line.startsWith(" ") || line === "") {
+                            // Context line or empty
+                            out.log(line, "dim");
+                        }
+                    }
+                }
+                catch (error) {
+                    out.log(`${prefix}${change.path} (diff error: ${error})`, "cyan");
+                }
             }
             else {
-                // Show actual diff content
-                await showContentDiff(change);
+                out.log(`${prefix} ${change.path}`);
             }
         }
-        // Cleanup repo resources
         await safeRepoShutdown(repo, "diff");
     }
     catch (error) {
-        console.error(chalk_1.default.red(`Diff failed: ${error}`));
-        throw error;
+        out.error(`Diff failed: ${error}`);
+        out.exit(1);
     }
 }
 /**
  * Show sync status
  */
-async function status() {
+async function status(targetPath = ".", options = {}) {
+    const out = new output_1.Output();
     try {
-        const spinner = (0, ora_1.default)("Loading sync status...").start();
-        // Setup shared context with network disabled for status check
-        const { repo, syncEngine, workingDir } = await setupCommandContext(process.cwd(), undefined, undefined, false);
+        out.task("Loading status");
+        const { repo, syncEngine, workingDir, config } = await setupCommandContext(targetPath, undefined, undefined, false);
         const syncStatus = await syncEngine.getStatus();
-        spinner.stop();
-        console.log(chalk_1.default.bold("📊 Sync Status Report"));
-        console.log(`${"=".repeat(50)}`);
-        // Directory information
-        console.log(`\n${chalk_1.default.bold("📁 Directory Information:")}`);
-        console.log(`  📂 Path: ${chalk_1.default.blue(workingDir)}`);
-        console.log(`  🔧 Config: ${path.join(workingDir, ".pushwork")}`);
-        // Show root directory URL if available
+        out.done();
+        out.info("STATUS", workingDir);
         if (syncStatus.snapshot?.rootDirectoryUrl) {
-            console.log(`  🔗 Root URL: ${chalk_1.default.cyan(syncStatus.snapshot.rootDirectoryUrl)}`);
-            // Try to show lastSyncAt from root directory document
-            try {
-                const rootHandle = await repo.find(syncStatus.snapshot.rootDirectoryUrl);
-                const rootDoc = await rootHandle.doc();
-                if (rootDoc?.lastSyncAt) {
-                    const lastSyncDate = new Date(rootDoc.lastSyncAt);
-                    const timeSince = Date.now() - rootDoc.lastSyncAt;
-                    const timeAgo = timeSince < 60000
-                        ? `${Math.floor(timeSince / 1000)}s ago`
-                        : timeSince < 3600000
-                            ? `${Math.floor(timeSince / 60000)}m ago`
-                            : `${Math.floor(timeSince / 3600000)}h ago`;
-                    console.log(`  🕒 Root last touched: ${chalk_1.default.green(lastSyncDate.toLocaleString())} (${chalk_1.default.gray(timeAgo)})`);
-                }
-                else {
-                    console.log(`  🕒 Root last touched: ${chalk_1.default.yellow("Never")}`);
-                }
-            }
-            catch (error) {
-                console.log(`  🕒 Root last touched: ${chalk_1.default.gray("Unable to determine")}`);
-            }
-        }
-        else {
-            console.log(`  🔗 Root URL: ${chalk_1.default.yellow("Not set")}`);
-        }
-        // Sync timing
-        if (syncStatus.lastSync) {
-            const timeSince = Date.now() - syncStatus.lastSync.getTime();
-            const timeAgo = timeSince < 60000
-                ? `${Math.floor(timeSince / 1000)}s ago`
-                : timeSince < 3600000
-                    ? `${Math.floor(timeSince / 60000)}m ago`
-                    : `${Math.floor(timeSince / 3600000)}h ago`;
-            console.log(`\n${chalk_1.default.bold("⏱️  Sync Timing:")}`);
-            console.log(`  🕐 Last sync: ${chalk_1.default.green(syncStatus.lastSync.toLocaleString())}`);
-            console.log(`  ⏳ Time since: ${chalk_1.default.gray(timeAgo)}`);
-        }
-        else {
-            console.log(`\n${chalk_1.default.bold("⏱️  Sync Timing:")}`);
-            console.log(`  🕐 Last sync: ${chalk_1.default.yellow("Never synced")}`);
-            console.log(`  💡 Run ${chalk_1.default.cyan("pushwork sync")} to perform initial sync`);
-        }
-        // Change status
-        console.log(`\n${chalk_1.default.bold("📝 Change Status:")}`);
-        if (syncStatus.hasChanges) {
-            console.log(`  📄 Pending changes: ${chalk_1.default.yellow(syncStatus.changeCount)}`);
-            console.log(`  🔄 Status: ${chalk_1.default.yellow("Sync needed")}`);
-            console.log(`  💡 Run ${chalk_1.default.cyan("pushwork diff")} to see details`);
-        }
-        else {
-            console.log(`  📄 Pending changes: ${chalk_1.default.green("None")}`);
-            console.log(`  ✅ Status: ${chalk_1.default.green("Up to date")}`);
+            out.pair("URL", syncStatus.snapshot.rootDirectoryUrl);
         }
-        // Configuration
-        console.log(`\n${chalk_1.default.bold("⚙️  Configuration:")}`);
-        const statusConfigManager2 = new config_1.ConfigManager(workingDir);
-        const statusConfig2 = await statusConfigManager2.load();
-        if (statusConfig2?.sync_server) {
-            console.log(`  🔗 Sync server: ${chalk_1.default.blue(statusConfig2.sync_server)}`);
-        }
-        else {
-            console.log(`  🔗 Sync server: ${chalk_1.default.blue("wss://sync3.automerge.org")} (default)`);
-        }
-        console.log(`  ⚡ Auto sync: ${statusConfig2?.sync?.auto_sync
-            ? chalk_1.default.green("Enabled")
-            : chalk_1.default.gray("Disabled")}`);
-        // Snapshot information
         if (syncStatus.snapshot) {
             const fileCount = syncStatus.snapshot.files.size;
-            const dirCount = syncStatus.snapshot.directories.size;
-            console.log(`\n${chalk_1.default.bold("📊 Repository Statistics:")}`);
-            console.log(`  📄 Tracked files: ${chalk_1.default.yellow(fileCount)}`);
-            console.log(`  📁 Tracked directories: ${chalk_1.default.yellow(dirCount)}`);
-            console.log(`  🏷️  Snapshot timestamp: ${chalk_1.default.gray(new Date(syncStatus.snapshot.timestamp).toLocaleString())}`);
-        }
-        // Quick actions
-        console.log(`\n${chalk_1.default.bold("🚀 Quick Actions:")}`);
+            out.pair("Files", `${fileCount} tracked`);
+        }
+        out.pair("Sync", config?.sync_server || "wss://sync3.automerge.org");
         if (syncStatus.hasChanges) {
-            console.log(`  ${chalk_1.default.cyan("pushwork diff")}     - View pending changes`);
-            console.log(`  ${chalk_1.default.cyan("pushwork sync")}     - Apply changes`);
+            out.pair("Changes", `${syncStatus.changeCount} pending`);
+            out.log("");
+            out.log("Run 'pushwork diff' to see changes");
         }
         else {
-            console.log(`  ${chalk_1.default.cyan("pushwork sync")}     - Check for remote changes`);
+            out.pair("Status", "up to date");
         }
-        console.log(`  ${chalk_1.default.cyan("pushwork log")}      - View sync history`);
-        // Cleanup repo resources
         await safeRepoShutdown(repo, "status");
     }
     catch (error) {
-        console.error(chalk_1.default.red(`❌ Status check failed: ${error}`));
-        throw error;
+        out.error(`Status check failed: ${error}`);
+        out.exit(1);
     }
 }
 /**
  * Show sync history
  */
 async function log(targetPath = ".", options) {
+    const out = new output_1.Output();
     try {
-        // Setup shared context with network disabled for log check
-        const { repo: logRepo, syncEngine: logSyncEngine, workingDir, } = await setupCommandContext(targetPath, undefined, undefined, false);
-        const logStatus = await logSyncEngine.getStatus();
-        if (logStatus.snapshot?.rootDirectoryUrl) {
-            console.log(chalk_1.default.gray(`Root URL: ${logStatus.snapshot.rootDirectoryUrl}`));
-            console.log("");
-        }
-        // TODO: Implement history tracking and display
-        // For now, show basic information
-        console.log(chalk_1.default.bold("Sync History:"));
-        // Check for snapshot files
+        const { repo: logRepo, workingDir } = await setupCommandContext(targetPath, undefined, undefined, false);
+        // TODO: Implement history tracking
         const snapshotPath = path.join(workingDir, ".pushwork", "snapshot.json");
         if (await (0, utils_1.pathExists)(snapshotPath)) {
             const stats = await fs.stat(snapshotPath);
-            if (options.oneline) {
-                console.log(`${stats.mtime.toISOString()} - Last sync`);
-            }
-            else {
-                console.log(`Last sync: ${chalk_1.default.green(stats.mtime.toISOString())}`);
-                console.log(`Snapshot size: ${stats.size} bytes`);
-            }
+            out.info("HISTORY", "Sync history (stub)");
+            out.pair("Last sync", stats.mtime.toISOString());
         }
         else {
-            console.log(chalk_1.default.yellow("No sync history found"));
+            out.info("No sync history found");
         }
-        // Cleanup repo resources
         await safeRepoShutdown(logRepo, "log");
     }
     catch (error) {
-        console.error(chalk_1.default.red(`Log failed: ${error}`));
-        throw error;
+        out.error(`Log failed: ${error}`);
+        out.exit(1);
     }
 }
 /**
  * Checkout/restore from previous sync
  */
 async function checkout(syncId, targetPath = ".", options) {
+    const out = new output_1.Output();
     try {
-        // Setup shared context
         const { workingDir } = await setupCommandContext(targetPath);
         // TODO: Implement checkout functionality
-        // This would involve:
-        // 1. Finding the sync with the given ID
-        // 2. Restoring file states from that sync
-        // 3. Updating the snapshot
-        console.log(chalk_1.default.yellow(`Checkout functionality not yet implemented`));
-        console.log(`Would restore to sync: ${syncId}`);
-        console.log(`Target path: ${workingDir}`);
+        out.warn("NOT IMPLEMENTED", "Checkout not yet implemented");
+        out.pair("Sync ID", syncId);
+        out.pair("Path", workingDir);
     }
     catch (error) {
-        console.error(chalk_1.default.red(`Checkout failed: ${error}`));
-        throw error;
+        out.error(`Checkout failed: ${error}`);
+        out.exit(1);
     }
 }
 /**
  * Clone an existing synced directory from an AutomergeUrl
  */
 async function clone(rootUrl, targetPath, options) {
-    const spinner = (0, ora_1.default)("Starting clone operation...").start();
+    // Validate sync server options
+    validateSyncServerOptions(options.syncServer, options.syncServerStorageId);
+    const out = new output_1.Output();
     try {
         const resolvedPath = path.resolve(targetPath);
-        // Step 1: Directory setup
-        spinner.text = "Setting up target directory...";
+        out.task(`Cloning ${rootUrl}`);
         // Check if directory exists and handle --force
         if (await (0, utils_1.pathExists)(resolvedPath)) {
             const files = await fs.readdir(resolvedPath);
             if (files.length > 0 && !options.force) {
-                spinner.fail("Target directory is not empty. Use --force to overwrite.");
-                return;
+                out.error("Target directory is not empty. Use --force to overwrite");
+                out.exit(1);
             }
         }
         else {
@@ -661,20 +528,15 @@ async function clone(rootUrl, targetPath, options) {
         const syncToolDir = path.join(resolvedPath, ".pushwork");
         if (await (0, utils_1.pathExists)(syncToolDir)) {
             if (!options.force) {
-                spinner.fail("Directory already initialized for sync. Use --force to overwrite.");
-                return;
+                out.error("Directory already initialized. Use --force to overwrite");
+                out.exit(1);
             }
-            // Clean up existing sync directory
             await fs.rm(syncToolDir, { recursive: true, force: true });
         }
-        console.log(chalk_1.default.gray("  ✓ Target directory prepared"));
-        // Step 2: Create sync directories
-        spinner.text = "Creating .pushwork directory...";
+        out.update("Creating sync directory");
         await (0, utils_1.ensureDirectoryExists)(syncToolDir);
         await (0, utils_1.ensureDirectoryExists)(path.join(syncToolDir, "automerge"));
-        exports.ProgressMessages.directoryStructureCreated();
-        // Step 3: Configuration setup
-        spinner.text = "Setting up configuration...";
+        out.update("Setting up configuration");
         const configManager = new config_1.ConfigManager(resolvedPath);
         const defaultSyncServer = options.syncServer || "wss://sync3.automerge.org";
         const defaultStorageId = options.syncServerStorageId || "3760df37-a4c6-4f66-9ecd-732039a9385d";
@@ -697,64 +559,47 @@ async function clone(rootUrl, targetPath, options) {
             },
         };
         await configManager.save(config);
-        exports.ProgressMessages.configSaved();
-        exports.ProgressMessages.syncServer(defaultSyncServer);
-        exports.ProgressMessages.storageId(defaultStorageId);
-        // Step 4: Initialize Automerge repo and connect to root directory
-        spinner.text = "Connecting to root directory document...";
+        out.update("Connecting to sync server");
         const repo = await (0, repo_factory_1.createRepo)(resolvedPath, {
             enableNetwork: true,
             syncServer: options.syncServer,
             syncServerStorageId: options.syncServerStorageId,
         });
-        exports.ProgressMessages.repoCreated();
-        exports.ProgressMessages.rootUrl(rootUrl);
-        // Step 5: Initialize sync engine and pull existing structure
-        spinner.text = "Downloading directory structure...";
-        const syncEngine = new core_1.SyncEngine(repo, resolvedPath, config.defaults.exclude_patterns, true, // Network sync enabled for clone
-        defaultStorageId);
-        // Set the root directory URL to connect to the cloned repository
+        out.update("Downloading files");
+        const syncEngine = new core_1.SyncEngine(repo, resolvedPath, config.defaults.exclude_patterns, true, defaultStorageId);
         await syncEngine.setRootDirectoryUrl(rootUrl);
-        // Sync to pull the existing directory structure and files
-        const startTime = Date.now();
-        await syncEngine.sync(false);
-        const duration = Date.now() - startTime;
-        console.log(chalk_1.default.gray(`  ✓ Directory sync completed in ${duration}ms`));
-        // Ensure all changes are flushed to disk
-        spinner.text = "Flushing changes to disk...";
+        const result = await syncEngine.sync(false);
+        out.update("Writing to disk");
         await safeRepoShutdown(repo, "clone");
-        exports.ProgressMessages.changesWritten();
-        spinner.succeed(`Cloned sync directory to ${chalk_1.default.green(resolvedPath)}`);
-        console.log(`\n${chalk_1.default.bold("📂 Directory Cloned!")}`);
-        console.log(`  📁 Directory: ${chalk_1.default.blue(resolvedPath)}`);
-        console.log(`  🔗 Root URL: ${chalk_1.default.cyan(rootUrl)}`);
-        console.log(`  🔗 Sync server: ${chalk_1.default.blue(defaultSyncServer)}`);
-        console.log(`\n${chalk_1.default.green("Clone complete!")} Run ${chalk_1.default.cyan("pushwork sync")} to stay in sync.`);
+        out.done();
+        out.pair("Path", resolvedPath);
+        out.pair("Files", `${result.filesChanged} downloaded`);
+        out.pair("Sync", defaultSyncServer);
+        out.success("CLONED", rootUrl);
     }
     catch (error) {
-        spinner.fail(`Failed to clone: ${error}`);
-        throw error;
+        out.error("FAILED", "Clone failed");
+        out.log(`  ${error}`);
+        out.exit(1);
     }
+    process.exit();
 }
 /**
  * Get the root URL for the current pushwork repository
  */
-async function url(targetPath = ".") {
+async function url(targetPath = ".", options = {}) {
+    const out = new output_1.Output();
     try {
         const resolvedPath = path.resolve(targetPath);
-        // Check if initialized
         const syncToolDir = path.join(resolvedPath, ".pushwork");
         if (!(await (0, utils_1.pathExists)(syncToolDir))) {
-            console.error(chalk_1.default.red("Directory not initialized for sync"));
-            console.error(`Run ${chalk_1.default.cyan("pushwork init .")} to get started`);
-            process.exit(1);
+            out.error("Directory not initialized for sync");
+            out.exit(1);
         }
-        // Load the snapshot directly to get the URL without all the verbose output
         const snapshotPath = path.join(syncToolDir, "snapshot.json");
         if (!(await (0, utils_1.pathExists)(snapshotPath))) {
-            console.error(chalk_1.default.red("No snapshot found"));
-            console.error(chalk_1.default.gray("The repository may not be properly initialized"));
-            process.exit(1);
+            out.error("No snapshot found");
+            out.exit(1);
         }
         const snapshotData = await fs.readFile(snapshotPath, "utf-8");
         const snapshot = JSON.parse(snapshotData);
@@ -763,141 +608,186 @@ async function url(targetPath = ".") {
             console.log(snapshot.rootDirectoryUrl);
         }
         else {
-            console.error(chalk_1.default.red("No root URL found in snapshot"));
-            console.error(chalk_1.default.gray("The repository may not be properly initialized"));
-            process.exit(1);
+            out.error("No root URL found in snapshot");
+            out.exit(1);
         }
     }
     catch (error) {
-        console.error(chalk_1.default.red(`Failed to get URL: ${error}`));
-        process.exit(1);
+        out.error(`Failed to get URL: ${error}`);
+        out.exit(1);
     }
 }
-async function commit(targetPath, dryRun = false) {
-    const spinner = (0, ora_1.default)("Starting commit operation...").start();
-    let repo;
+async function commit(targetPath, options = {}) {
+    const out = new output_1.Output();
     try {
-        // Setup shared context with network disabled for local-only commit
-        spinner.text = "Setting up commit context...";
-        const context = await setupCommandContext(targetPath, undefined, undefined, false);
-        repo = context.repo;
-        const syncEngine = context.syncEngine;
-        spinner.succeed("Connected to repository");
-        // Run local commit only
-        spinner.text = "Committing local changes...";
-        const startTime = Date.now();
-        const result = await syncEngine.commitLocal(dryRun);
-        const duration = Date.now() - startTime;
-        if (repo) {
-            await safeRepoShutdown(repo, "commit");
-        }
-        spinner.succeed(`Commit completed in ${duration}ms`);
-        // Display results
-        console.log(chalk_1.default.green("\n✅ Commit Results:"));
-        console.log(`  📄 Files committed: ${result.filesChanged}`);
-        console.log(`  📁 Directories committed: ${result.directoriesChanged}`);
-        console.log(`  ⏱️  Total time: ${duration}ms`);
-        if (result.warnings.length > 0) {
-            console.log(chalk_1.default.yellow("\n⚠️  Warnings:"));
-            result.warnings.forEach((warning) => console.log(chalk_1.default.yellow(`  • ${warning}`)));
-        }
+        out.task("Committing local changes");
+        const { repo, syncEngine } = await setupCommandContext(targetPath, undefined, undefined, false);
+        const result = await syncEngine.commitLocal(options.dryRun || false);
+        await safeRepoShutdown(repo, "commit");
+        out.done();
         if (result.errors.length > 0) {
-            console.log(chalk_1.default.red("\n❌ Errors:"));
-            result.errors.forEach((error) => console.log(chalk_1.default.red(`  • ${error.operation} at ${error.path}: ${error.error.message}`)));
-            process.exit(1);
+            out.error("ERRORS", `${result.errors.length} errors`);
+            result.errors.forEach((error) => {
+                out.log(`  ${error.path}: ${error.error.message}`);
+            });
+            out.exit(1);
+        }
+        out.success("COMMITTED", `${result.filesChanged} files committed`);
+        out.pair("Files", result.filesChanged.toString());
+        out.pair("Directories", result.directoriesChanged.toString());
+        if (result.warnings.length > 0) {
+            out.log("");
+            out.warn("WARNINGS", `${result.warnings.length} warnings`);
+            result.warnings.forEach((warning) => out.log(`  ${warning}`));
         }
-        console.log(chalk_1.default.gray("\n💡 Run 'pushwork push' to upload to sync server"));
     }
     catch (error) {
-        if (repo) {
-            await safeRepoShutdown(repo, "commit-error");
-        }
-        spinner.fail(`Commit failed: ${error}`);
-        console.error(chalk_1.default.red(`Error: ${error}`));
-        process.exit(1);
+        out.error(`Commit failed: ${error}`);
+        out.exit(1);
     }
+    process.exit();
 }
 /**
  * Debug command to inspect internal document state
  */
 async function debug(targetPath = ".", options = {}) {
+    const out = new output_1.Output();
     try {
-        const spinner = (0, ora_1.default)("Loading debug information...").start();
-        // Setup shared context with network disabled for debug check
+        out.task("Loading debug info");
         const { repo, syncEngine, workingDir } = await setupCommandContext(targetPath, undefined, undefined, false);
         const debugStatus = await syncEngine.getStatus();
-        spinner.stop();
-        console.log(chalk_1.default.bold("🔍 Debug Information"));
-        console.log(`${"=".repeat(50)}`);
-        // Directory information
-        console.log(`\n${chalk_1.default.bold("📁 Directory Information:")}`);
-        console.log(`  📂 Path: ${chalk_1.default.blue(workingDir)}`);
-        console.log(`  🔧 Config: ${path.join(workingDir, ".pushwork")}`);
+        out.done("done");
+        out.info("DEBUG", workingDir);
         if (debugStatus.snapshot?.rootDirectoryUrl) {
-            console.log(`\n${chalk_1.default.bold("🗂️  Root Directory Document:")}`);
-            console.log(`  🔗 URL: ${chalk_1.default.cyan(debugStatus.snapshot.rootDirectoryUrl)}`);
+            out.pair("URL", debugStatus.snapshot.rootDirectoryUrl);
             try {
                 const rootHandle = await repo.find(debugStatus.snapshot.rootDirectoryUrl);
                 const rootDoc = await rootHandle.doc();
                 if (rootDoc) {
-                    console.log(`  📊 Document Structure:`);
-                    console.log(`    📄 Entries: ${rootDoc.docs.length}`);
-                    console.log(`    🏷️  Type: ${rootDoc["@patchwork"].type}`);
+                    out.pair("Entries", rootDoc.docs.length.toString());
                     if (rootDoc.lastSyncAt) {
                         const lastSyncDate = new Date(rootDoc.lastSyncAt);
-                        console.log(`    🕒 Last Sync At: ${chalk_1.default.green(lastSyncDate.toISOString())}`);
-                        console.log(`    🕒 Last Sync Timestamp: ${chalk_1.default.gray(rootDoc.lastSyncAt)}`);
-                    }
-                    else {
-                        console.log(`    🕒 Last Sync At: ${chalk_1.default.yellow("Never set")}`);
+                        out.pair("Last sync", lastSyncDate.toISOString());
                     }
                     if (options.verbose) {
-                        console.log(`\n  📋 Full Document Content:`);
-                        console.log(JSON.stringify(rootDoc, null, 2));
-                        console.log(`\n  🏷️  Document Heads:`);
-                        console.log(JSON.stringify(rootHandle.heads(), null, 2));
+                        out.log("");
+                        out.log("Document:");
+                        out.log(JSON.stringify(rootDoc, null, 2));
+                        out.log("");
+                        out.log("Heads:");
+                        out.log(JSON.stringify(rootHandle.heads(), null, 2));
                     }
-                    console.log(`\n  📁 Directory Entries:`);
-                    rootDoc.docs.forEach((entry, index) => {
-                        console.log(`    ${index + 1}. ${entry.name} (${entry.type}) -> ${entry.url}`);
-                    });
-                }
-                else {
-                    console.log(`  ❌ Unable to load root document`);
                 }
             }
             catch (error) {
-                console.log(`  ❌ Error loading root document: ${error}`);
+                out.warn(`Error loading root document: ${error}`);
             }
         }
-        else {
-            console.log(`\n${chalk_1.default.bold("🗂️  Root Directory Document:")}`);
-            console.log(`  ❌ No root directory URL set`);
-        }
-        // Snapshot information
         if (debugStatus.snapshot) {
-            console.log(`\n${chalk_1.default.bold("📸 Snapshot Information:")}`);
-            console.log(`  📄 Tracked files: ${debugStatus.snapshot.files.size}`);
-            console.log(`  📁 Tracked directories: ${debugStatus.snapshot.directories.size}`);
-            console.log(`  🏷️  Timestamp: ${new Date(debugStatus.snapshot.timestamp).toISOString()}`);
-            console.log(`  📂 Root path: ${debugStatus.snapshot.rootPath}`);
+            out.pair("Files", debugStatus.snapshot.files.size.toString());
+            out.pair("Directories", debugStatus.snapshot.directories.size.toString());
             if (options.verbose) {
-                console.log(`\n  📋 All Tracked Files:`);
-                debugStatus.snapshot.files.forEach((entry, path) => {
-                    console.log(`    ${path} -> ${entry.url}`);
-                });
-                console.log(`\n  📋 All Tracked Directories:`);
-                debugStatus.snapshot.directories.forEach((entry, path) => {
-                    console.log(`    ${path} -> ${entry.url}`);
+                out.log("");
+                out.log("All tracked files:");
+                debugStatus.snapshot.files.forEach((entry, filePath) => {
+                    out.log(`  ${filePath} -> ${entry.url}`);
                 });
             }
         }
-        // Cleanup repo resources
         await safeRepoShutdown(repo, "debug");
     }
     catch (error) {
-        console.error(chalk_1.default.red(`Debug failed: ${error}`));
-        throw error;
+        out.error(`Debug failed: ${error}`);
+        out.exit(1);
+    }
+}
+/**
+ * List tracked files
+ */
+async function ls(targetPath = ".", options = {}) {
+    const out = new output_1.Output();
+    try {
+        const { repo, syncEngine } = await setupCommandContext(targetPath, undefined, undefined, false);
+        const syncStatus = await syncEngine.getStatus();
+        if (!syncStatus.snapshot) {
+            out.error("No snapshot found");
+            await safeRepoShutdown(repo, "ls");
+            out.exit(1);
+            return;
+        }
+        const files = Array.from(syncStatus.snapshot.files.entries()).sort(([pathA], [pathB]) => pathA.localeCompare(pathB));
+        if (files.length === 0) {
+            out.info("No tracked files");
+            await safeRepoShutdown(repo, "ls");
+            return;
+        }
+        if (options.long) {
+            // Long format with URLs
+            for (const [filePath, entry] of files) {
+                const url = entry?.url || "unknown";
+                console.log(`${filePath} -> ${url}`);
+            }
+        }
+        else {
+            // Simple list
+            for (const [filePath] of files) {
+                console.log(filePath);
+            }
+        }
+        await safeRepoShutdown(repo, "ls");
+    }
+    catch (error) {
+        out.error(`List failed: ${error}`);
+        out.exit(1);
+    }
+}
+/**
+ * View or edit configuration
+ */
+async function config(targetPath = ".", options = {}) {
+    const out = new output_1.Output();
+    try {
+        const resolvedPath = path.resolve(targetPath);
+        const syncToolDir = path.join(resolvedPath, ".pushwork");
+        if (!(await (0, utils_1.pathExists)(syncToolDir))) {
+            out.error("Directory not initialized for sync");
+            out.exit(1);
+        }
+        const configManager = new config_1.ConfigManager(resolvedPath);
+        const config = await configManager.getMerged();
+        if (options.list) {
+            // List all configuration
+            out.info("CONFIGURATION", "Full configuration");
+            out.log(JSON.stringify(config, null, 2));
+        }
+        else if (options.get) {
+            // Get specific config value
+            const keys = options.get.split(".");
+            let value = config;
+            for (const key of keys) {
+                value = value?.[key];
+            }
+            if (value !== undefined) {
+                console.log(typeof value === "object" ? JSON.stringify(value, null, 2) : value);
+            }
+            else {
+                out.error(`Config key not found: ${options.get}`);
+                out.exit(1);
+            }
+        }
+        else {
+            // Show basic config info
+            out.info("CONFIGURATION", resolvedPath);
+            out.pair("Sync server", config.sync_server || "default");
+            out.pair("Sync enabled", config.sync_enabled ? "yes" : "no");
+            out.pair("Exclusions", config.defaults.exclude_patterns.length.toString());
+            out.log("");
+            out.log("Use --list to see full configuration");
+        }
+    }
+    catch (error) {
+        out.error(`Config failed: ${error}`);
+        out.exit(1);
     }
 }
 // TODO: Add push and pull commands later