pushwork 1.0.4 → 1.0.5

package/README.md

@@ -29,7 +29,14 @@ pnpm run build
 pnpm link --global
 ```
 
-Note: you can also run this from NPX, I think.
+Make sure that pnpm is in your PATH. E.g. in your .zshrc or .bashrc, add:
+
+```bash
+export PNPM_HOME="/Users/username/Library/pnpm" # wherever you have pnpm installed
+export PATH="$PATH:$PNPM_HOME"
+```
+
+Note: you can also run this from NPX.
 
 ### Basic Usage
 

package/bench/filesystem.bench.ts

@@ -0,0 +1,78 @@
+/**
+ * Benchmarks for file system operations
+ * These are critical for sync performance
+ */
+
+import { Bench } from "tinybench";
+import { tmpdir } from "os";
+import { join } from "path";
+import { mkdirSync, writeFileSync, rmSync, existsSync } from "fs";
+import {
+  readFileContent,
+  pathExists,
+  listDirectory,
+  isTextFile,
+} from "../src/utils/fs";
+
+const bench = new Bench({ time: 1000 });
+
+// Setup test directory
+const testDir = join(tmpdir(), "pushwork-bench-fs-" + Date.now());
+mkdirSync(testDir, { recursive: true });
+
+// Create test files of realistic sizes
+const smallFile = join(testDir, "small.txt");
+const mediumFile = join(testDir, "medium.ts");
+const largeFile = join(testDir, "large.json");
+const binaryFile = join(testDir, "image.bin");
+
+writeFileSync(smallFile, "Hello, World!"); // 13 bytes
+writeFileSync(
+  mediumFile,
+  "export const data = " + JSON.stringify({ data: "a".repeat(5000) })
+); // ~5KB
+writeFileSync(largeFile, JSON.stringify({ data: "a".repeat(50000) })); // ~50KB
+writeFileSync(binaryFile, Buffer.alloc(10240)); // 10KB binary
+
+// Create nested directory structure
+const nestedDir = join(testDir, "nested");
+mkdirSync(join(nestedDir, "a", "b", "c"), { recursive: true });
+for (let i = 0; i < 20; i++) {
+  writeFileSync(join(nestedDir, `file${i}.txt`), `content ${i}`.repeat(100));
+  writeFileSync(
+    join(nestedDir, "a", `file${i}.txt`),
+    `content ${i}`.repeat(100)
+  );
+}
+
+// Realistic filesystem operations
+bench
+  .add("read small file (13 bytes)", async () => {
+    await readFileContent(smallFile);
+  })
+  .add("read medium file (5KB)", async () => {
+    await readFileContent(mediumFile);
+  })
+  .add("read large file (50KB)", async () => {
+    await readFileContent(largeFile);
+  })
+  .add("detect text vs binary (text)", async () => {
+    await isTextFile(smallFile);
+  })
+  .add("detect text vs binary (binary)", async () => {
+    await isTextFile(binaryFile);
+  })
+  .add("list directory recursive (40 files)", async () => {
+    await listDirectory(nestedDir, true);
+  });
+
+export default (async () => {
+  await bench.warmup();
+  await bench.run();
+  console.table(bench.table());
+
+  // Cleanup
+  if (existsSync(testDir)) {
+    rmSync(testDir, { recursive: true, force: true });
+  }
+})();

package/bench/hashing.bench.ts

@@ -0,0 +1,60 @@
+/**
+ * Benchmarks for content hashing
+ * Used in change detection and move detection
+ */
+
+import { Bench } from "tinybench";
+import { calculateContentHash } from "../src/utils/fs";
+
+const bench = new Bench({ time: 1000 });
+
+// Generate test data of various sizes
+const tiny = "Hello, World!";
+const small = "a".repeat(1024); // 1KB
+const medium = "a".repeat(10240); // 10KB
+const large = "a".repeat(102400); // 100KB
+const huge = "a".repeat(1024000); // 1MB
+
+// String content
+bench
+  .add("hash tiny string (13 bytes)", async () => {
+    await calculateContentHash(tiny);
+  })
+  .add("hash small string (1KB)", async () => {
+    await calculateContentHash(small);
+  })
+  .add("hash medium string (10KB)", async () => {
+    await calculateContentHash(medium);
+  })
+  .add("hash large string (100KB)", async () => {
+    await calculateContentHash(large);
+  })
+  .add("hash huge string (1MB)", async () => {
+    await calculateContentHash(huge);
+  });
+
+// Binary content
+const tinyBinary = new Uint8Array(13);
+const smallBinary = new Uint8Array(1024);
+const mediumBinary = new Uint8Array(10240);
+const largeBinary = new Uint8Array(102400);
+
+bench
+  .add("hash tiny binary (13 bytes)", async () => {
+    await calculateContentHash(tinyBinary);
+  })
+  .add("hash small binary (1KB)", async () => {
+    await calculateContentHash(smallBinary);
+  })
+  .add("hash medium binary (10KB)", async () => {
+    await calculateContentHash(mediumBinary);
+  })
+  .add("hash large binary (100KB)", async () => {
+    await calculateContentHash(largeBinary);
+  });
+
+export default (async () => {
+  await bench.warmup();
+  await bench.run();
+  console.table(bench.table());
+})();

package/bench/move-detection.bench.ts

@@ -0,0 +1,130 @@
+/**
+ * Benchmarks for move detection algorithm
+ * This is expensive because it combines similarity checking with pattern matching
+ */
+
+import { Bench } from "tinybench";
+import { MoveDetector } from "../src/core/move-detection";
+import { DetectedChange, ChangeType } from "../src/core/change-detection";
+import { FileType } from "../src/types";
+
+const bench = new Bench({ time: 1000 });
+
+const detector = new MoveDetector();
+
+// Create mock snapshot
+const mockSnapshot: any = {
+  timestamp: Date.now(),
+  rootPath: "/test",
+  files: new Map([
+    ["old1.txt", { url: "url1" as any, head: [], path: "/test/old1.txt" }],
+    ["old2.txt", { url: "url2" as any, head: [], path: "/test/old2.txt" }],
+  ]),
+  directories: new Map(),
+};
+
+// Realistic file content sizes
+const smallContent = "const x = 1;".repeat(10); // ~120 bytes
+const mediumContent = "export const data = { value: true };".repeat(30); // ~1KB
+const largeContent = "// Comment\nfunction foo() { return 42; }\n".repeat(250); // ~10KB
+
+// Scenario 1: Small file move (config files)
+const smallFileMove: DetectedChange[] = [
+  {
+    path: "old1.txt",
+    changeType: ChangeType.LOCAL_ONLY,
+    fileType: FileType.TEXT,
+    localContent: null,
+    remoteContent: smallContent,
+  },
+  {
+    path: "new1.txt",
+    changeType: ChangeType.LOCAL_ONLY,
+    fileType: FileType.TEXT,
+    localContent: smallContent + " // modified",
+    remoteContent: null,
+  },
+];
+
+// Scenario 2: Medium file move (source files)
+const mediumFileMove: DetectedChange[] = [
+  {
+    path: "old2.txt",
+    changeType: ChangeType.LOCAL_ONLY,
+    fileType: FileType.TEXT,
+    localContent: null,
+    remoteContent: mediumContent,
+  },
+  {
+    path: "new2.txt",
+    changeType: ChangeType.LOCAL_ONLY,
+    fileType: FileType.TEXT,
+    localContent: mediumContent.slice(0, -50) + "modified".repeat(10),
+    remoteContent: null,
+  },
+];
+
+// Scenario 3: Multiple candidates (ambiguous moves)
+const multipleCandidates: DetectedChange[] = [
+  // 3 deleted files
+  {
+    path: "deleted1.txt",
+    changeType: ChangeType.LOCAL_ONLY,
+    fileType: FileType.TEXT,
+    localContent: null,
+    remoteContent: smallContent,
+  },
+  {
+    path: "deleted2.txt",
+    changeType: ChangeType.LOCAL_ONLY,
+    fileType: FileType.TEXT,
+    localContent: null,
+    remoteContent: mediumContent,
+  },
+  {
+    path: "deleted3.txt",
+    changeType: ChangeType.LOCAL_ONLY,
+    fileType: FileType.TEXT,
+    localContent: null,
+    remoteContent: largeContent,
+  },
+  // 3 created files (need to find best matches)
+  {
+    path: "created1.txt",
+    changeType: ChangeType.LOCAL_ONLY,
+    fileType: FileType.TEXT,
+    localContent: smallContent + "!",
+    remoteContent: null,
+  },
+  {
+    path: "created2.txt",
+    changeType: ChangeType.LOCAL_ONLY,
+    fileType: FileType.TEXT,
+    localContent: mediumContent + "?",
+    remoteContent: null,
+  },
+  {
+    path: "created3.txt",
+    changeType: ChangeType.LOCAL_ONLY,
+    fileType: FileType.TEXT,
+    localContent: largeContent.slice(0, -100),
+    remoteContent: null,
+  },
+];
+
+bench
+  .add("detect move: 2 small files (~120 bytes)", async () => {
+    await detector.detectMoves(smallFileMove, mockSnapshot, "/test");
+  })
+  .add("detect move: 2 medium files (~1KB)", async () => {
+    await detector.detectMoves(mediumFileMove, mockSnapshot, "/test");
+  })
+  .add("detect move: 6 files, 3 candidates each", async () => {
+    await detector.detectMoves(multipleCandidates, mockSnapshot, "/test");
+  });
+
+export default (async () => {
+  await bench.warmup();
+  await bench.run();
+  console.table(bench.table());
+})();

package/bench/runner.ts

@@ -0,0 +1,49 @@
+#!/usr/bin/env tsx
+/**
+ * Benchmark runner for Pushwork performance tests
+ * 
+ * Run with: pnpm bench
+ */
+
+import { readdirSync } from 'fs';
+import { join } from 'path';
+
+async function main() {
+  console.log('🏃 Running Pushwork Performance Benchmarks\n');
+  console.log('=' .repeat(80));
+  console.log();
+
+  const benchDir = __dirname;
+  const benchFiles = readdirSync(benchDir)
+    .filter(f => f.endsWith('.bench.ts'))
+    .sort();
+
+  if (benchFiles.length === 0) {
+    console.log('No benchmark files found');
+    return;
+  }
+
+  for (const file of benchFiles) {
+    const benchPath = join(benchDir, file);
+    console.log(`📊 ${file.replace('.bench.ts', '')}`);
+    console.log('-'.repeat(80));
+    
+    try {
+      const module = await import(benchPath);
+      // Wait for the default export promise to complete
+      if (module.default) {
+        await module.default;
+      }
+      console.log();
+    } catch (error) {
+      console.error(`❌ Failed to run ${file}:`, error);
+      console.log();
+    }
+  }
+
+  console.log('=' .repeat(80));
+  console.log('✅ All benchmarks completed\n');
+}
+
+main().catch(console.error);
+

package/dist/cli/commands.d.ts

@@ -1,5 +1,5 @@
 import { Repo } from "@automerge/automerge-repo";
-import { CloneOptions, SyncOptions, DiffOptions, LogOptions, CheckoutOptions, DirectoryConfig } from "../types";
+import { CloneOptions, SyncOptions, DiffOptions, LogOptions, CheckoutOptions, InitOptions, CommitOptions, StatusOptions, UrlOptions, ListOptions, ConfigOptions, DebugOptions, DirectoryConfig } from "../types";
 import { SyncEngine } from "../core";
 /**
  * Shared context that commands can use
@@ -19,30 +19,14 @@ export declare function setupCommandContext(workingDir?: string, customSyncServe
  * Safely shutdown a repository with proper error handling
  */
 export declare function safeRepoShutdown(repo: Repo, context?: string): Promise<void>;
-/**
- * Common progress message helpers
- */
-export declare const ProgressMessages: {
-    directoryFound: () => void;
-    configLoaded: () => void;
-    repoConnected: () => void;
-    syncServer: (server: string) => void;
-    storageId: (id: string) => void;
-    rootUrl: (url: string) => void;
-    changesWritten: () => void;
-    syncCompleted: (duration: number) => void;
-    directoryStructureCreated: () => void;
-    configSaved: () => void;
-    repoCreated: () => void;
-};
 /**
  * Initialize sync in a directory
  */
-export declare function init(targetPath: string, syncServer?: string, syncServerStorageId?: string): Promise<void>;
+export declare function init(targetPath: string, options?: InitOptions): Promise<void>;
 /**
  * Run bidirectional sync
  */
-export declare function sync(options: SyncOptions): Promise<void>;
+export declare function sync(targetPath: string | undefined, options: SyncOptions): Promise<void>;
 /**
  * Show differences between local and remote
  */
@@ -50,7 +34,7 @@ export declare function diff(targetPath: string | undefined, options: DiffOption
 /**
  * Show sync status
  */
-export declare function status(): Promise<void>;
+export declare function status(targetPath?: string, options?: StatusOptions): Promise<void>;
 /**
  * Show sync history
  */
@@ -66,12 +50,18 @@ export declare function clone(rootUrl: string, targetPath: string, options: Clon
 /**
  * Get the root URL for the current pushwork repository
  */
-export declare function url(targetPath?: string): Promise<void>;
-export declare function commit(targetPath: string, dryRun?: boolean): Promise<void>;
+export declare function url(targetPath?: string, options?: UrlOptions): Promise<void>;
+export declare function commit(targetPath: string, options?: CommitOptions): Promise<void>;
 /**
  * Debug command to inspect internal document state
  */
-export declare function debug(targetPath?: string, options?: {
-    verbose?: boolean;
-}): Promise<void>;
+export declare function debug(targetPath?: string, options?: DebugOptions): Promise<void>;
+/**
+ * List tracked files
+ */
+export declare function ls(targetPath?: string, options?: ListOptions): Promise<void>;
+/**
+ * View or edit configuration
+ */
+export declare function config(targetPath?: string, options?: ConfigOptions): Promise<void>;
 //# sourceMappingURL=commands.d.ts.map

package/dist/cli/commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAA2B,MAAM,2BAA2B,CAAC;AAI1E,OAAO,EAEL,YAAY,EACZ,WAAW,EACX,WAAW,EACX,UAAU,EACV,eAAe,EACf,eAAe,EAEhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAMrC;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,IAAI,CAAC;IACX,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,GAAE,MAAsB,EAClC,gBAAgB,CAAC,EAAE,MAAM,EACzB,eAAe,CAAC,EAAE,MAAM,EACxB,aAAa,GAAE,OAAc,GAC5B,OAAO,CAAC,cAAc,CAAC,CAqCzB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;yBAON,MAAM;oBAEX,MAAM;mBACP,MAAM;;8BAKK,MAAM;;;;CAOjC,CAAC;AA+DF;;GAEG;AACH,wBAAsB,IAAI,CACxB,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC,CA6Hf;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAgM9D;AAED;;GAEG;AACH,wBAAsB,IAAI,CACxB,UAAU,oBAAM,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CA6Df;AAED;;GAEG;AACH,wBAAsB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CA0J5C;AAED;;GAEG;AACH,wBAAsB,GAAG,CACvB,UAAU,oBAAM,EAChB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC,CA2Cf;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,UAAU,oBAAM,EAChB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED;;GAEG;AACH,wBAAsB,KAAK,CACzB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CA6Hf;AAED;;GAEG;AACH,wBAAsB,GAAG,CAAC,UAAU,SAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuCzD;AAED,wBAAsB,MAAM,CAC1B,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAgEf;AAED;;GAEG;AACH,wBAAsB,KAAK,CACzB,UAAU,SAAM,EAChB,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,GAClC,OAAO,CAAC,IAAI,CAAC,CA8Gf"}
+{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAgB,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EACL,YAAY,EACZ,WAAW,EACX,WAAW,EACX,UAAU,EACV,eAAe,EACf,WAAW,EACX,aAAa,EACb,aAAa,EACb,UAAU,EACV,WAAW,EACX,aAAa,EACb,YAAY,EACZ,eAAe,EAEhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAqCrC;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,IAAI,CAAC;IACX,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAyBD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,GAAE,MAAsB,EAClC,gBAAgB,CAAC,EAAE,MAAM,EACzB,eAAe,CAAC,EAAE,MAAM,EACxB,aAAa,GAAE,OAAc,GAC5B,OAAO,CAAC,cAAc,CAAC,CAqCzB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAED;;GAEG;AACH,wBAAsB,IAAI,CACxB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,WAAgB,GACxB,OAAO,CAAC,IAAI,CAAC,CA2Gf;AAED;;GAEG;AACH,wBAAsB,IAAI,CACxB,UAAU,oBAAM,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAiIf;AAED;;GAEG;AACH,wBAAsB,IAAI,CACxB,UAAU,oBAAM,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAgHf;AAED;;GAEG;AACH,wBAAsB,MAAM,CAC1B,UAAU,GAAE,MAAY,EACxB,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CA0Cf;AAED;;GAEG;AACH,wBAAsB,GAAG,CACvB,UAAU,oBAAM,EAChB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,UAAU,oBAAM,EAChB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,IAAI,CAAC,CAcf;AAED;;GAEG;AACH,wBAAsB,KAAK,CACzB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CA+Ff;AAED;;GAEG;AACH,wBAAsB,GAAG,CACvB,UAAU,GAAE,MAAY,EACxB,OAAO,GAAE,UAAe,GACvB,OAAO,CAAC,IAAI,CAAC,CAgCf;AAED,wBAAsB,MAAM,CAC1B,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAwCf;AAED;;GAEG;AACH,wBAAsB,KAAK,CACzB,UAAU,GAAE,MAAY,EACxB,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,IAAI,CAAC,CAkEf;AAED;;GAEG;AACH,wBAAsB,EAAE,CACtB,UAAU,GAAE,MAAY,EACxB,OAAO,GAAE,WAAgB,GACxB,OAAO,CAAC,IAAI,CAAC,CA+Cf;AAED;;GAEG;AACH,wBAAsB,MAAM,CAC1B,UAAU,GAAE,MAAY,EACxB,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAkDf"}