pushwork 1.1.8 → 1.2.2

package/package.json

@@ -1,97 +1,99 @@
 {
-  "name": "pushwork",
-  "version": "1.1.8",
-  "description": "Bidirectional directory synchronization using Automerge CRDTs",
-  "main": "dist/index.js",
-  "exports": {
-    ".": "./dist/index.js"
-  },
-  "bin": {
-    "pushwork": "./dist/cli.js"
-  },
-  "engines": {
-    "node": ">=24.0.0",
-    "pnpm": ">=8.0.0"
-  },
-  "keywords": [
-    "automerge",
-    "sync",
-    "crdt",
-    "collaboration",
-    "filesystem"
-  ],
-  "author": "Peter van Hardenberg",
-  "license": "MIT",
-  "dependencies": {
-    "@automerge/automerge": "^3.2.4",
-    "@automerge/automerge-repo": "^2.5.3",
-    "@automerge/automerge-repo-network-websocket": "^2.5.3",
-    "@automerge/automerge-repo-storage-indexeddb": "^2.5.3",
-    "@automerge/automerge-repo-storage-nodefs": "^2.5.3",
-    "@commander-js/extra-typings": "^14.0.0",
-    "chalk": "^5.3.0",
-    "commander": "^14.0.2",
-    "diff": "^8.0.2",
-    "glob": "^10.3.0",
-    "ignore": "^5.3.0",
-    "mime-types": "^2.1.35",
-    "ora": "^7.0.1"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.28.6",
-    "@babel/preset-env": "^7.28.6",
-    "@types/diff": "^5.0.3",
-    "@types/jest": "^29.5.0",
-    "@types/mime-types": "^2.1.1",
-    "@types/node": "^20.0.0",
-    "@types/tmp": "^0.2.4",
-    "babel-jest": "^30.2.0",
-    "fast-check": "^4.3.0",
-    "jest": "^29.7.0",
-    "tmp": "^0.2.1",
-    "ts-jest": "^29.1.0",
-    "tsx": "^4.19.2",
-    "typescript": "^5.2.0"
-  },
-  "jest": {
-    "preset": "ts-jest",
-    "testEnvironment": "node",
-    "roots": [
-      "<rootDir>/src",
-      "<rootDir>/test"
-    ],
-    "testMatch": [
-      "**/__tests__/**/*.ts",
-      "**/*.(test|spec).ts"
-    ],
-    "collectCoverageFrom": [
-      "src/**/*.ts",
-      "!src/**/*.d.ts"
-    ],
-    "setupFilesAfterEnv": [
-      "<rootDir>/test/jest.setup.ts"
-    ],
-    "maxWorkers": "75%",
-    "maxConcurrency": 10,
-    "transformIgnorePatterns": [
-      "node_modules/(?!.*@automerge)"
-    ],
-    "transform": {
-      "^.+\\.tsx?$": "ts-jest",
-      "^.+\\.jsx?$": "babel-jest"
-    }
-  },
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsc --watch",
-    "test": "jest",
-    "test:bail": "jest --bail",
-    "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage",
-    "lint": "eslint src --ext .ts",
-    "lint:fix": "eslint src --ext .ts --fix",
-    "clean": "rm -rf dist",
-    "start": "node dist/cli.js",
-    "typecheck": "tsc --noEmit"
-  }
-}
+	"name": "pushwork",
+	"version": "1.2.2",
+	"description": "Bidirectional directory synchronization using Automerge CRDTs",
+	"main": "dist/index.js",
+	"exports": {
+		".": "./dist/index.js"
+	},
+	"bin": {
+		"pushwork": "./dist/cli.js"
+	},
+	"scripts": {
+		"build": "tsc",
+		"dev": "tsc --watch",
+		"test": "jest",
+		"test:bail": "jest --bail",
+		"test:watch": "jest --watch",
+		"test:coverage": "jest --coverage",
+		"lint": "eslint src --ext .ts",
+		"lint:fix": "eslint src --ext .ts --fix",
+		"clean": "rm -rf dist",
+		"prepack": "pnpm run build",
+		"start": "node dist/cli.js",
+		"typecheck": "tsc --noEmit"
+	},
+	"packageManager": "pnpm@10.32.1+sha512.a706938f0e89ac1456b6563eab4edf1d1faf3368d1191fc5c59790e96dc918e4456ab2e67d613de1043d2e8c81f87303e6b40d4ffeca9df15ef1ad567348f2be",
+	"engines": {
+		"node": ">=24.0.0",
+		"pnpm": ">=8.0.0"
+	},
+	"keywords": [
+		"automerge",
+		"sync",
+		"crdt",
+		"collaboration",
+		"filesystem"
+	],
+	"author": "Peter van Hardenberg",
+	"license": "MIT",
+	"dependencies": {
+		"@automerge/automerge": "^3.2.5",
+		"@automerge/automerge-repo": "2.6.0-subduction.14",
+		"@automerge/automerge-repo-network-websocket": "2.6.0-subduction.14",
+		"@automerge/automerge-repo-storage-nodefs": "2.6.0-subduction.14",
+		"@automerge/automerge-subduction": "0.7.0",
+		"@commander-js/extra-typings": "^14.0.0",
+		"chalk": "^5.3.0",
+		"commander": "^14.0.2",
+		"diff": "^8.0.2",
+		"glob": "^10.3.0",
+		"ignore": "^5.3.0",
+		"mime-types": "^2.1.35",
+		"ora": "^7.0.1"
+	},
+	"devDependencies": {
+		"@babel/core": "^7.28.6",
+		"@babel/preset-env": "^7.28.6",
+		"@types/diff": "^5.0.3",
+		"@types/jest": "^29.5.0",
+		"@types/mime-types": "^2.1.1",
+		"@types/node": "^20.0.0",
+		"@types/tmp": "^0.2.4",
+		"babel-jest": "^30.2.0",
+		"fast-check": "^4.3.0",
+		"jest": "^29.7.0",
+		"tmp": "^0.2.1",
+		"ts-jest": "^29.1.0",
+		"tsx": "^4.19.2",
+		"typescript": "^5.2.0"
+	},
+	"jest": {
+		"preset": "ts-jest",
+		"testEnvironment": "node",
+		"roots": [
+			"<rootDir>/src",
+			"<rootDir>/test"
+		],
+		"testMatch": [
+			"**/__tests__/**/*.ts",
+			"**/*.(test|spec).ts"
+		],
+		"collectCoverageFrom": [
+			"src/**/*.ts",
+			"!src/**/*.d.ts"
+		],
+		"setupFilesAfterEnv": [
+			"<rootDir>/test/jest.setup.ts"
+		],
+		"maxWorkers": "75%",
+		"maxConcurrency": 10,
+		"transformIgnorePatterns": [
+			"node_modules/(?!.*@automerge)"
+		],
+		"transform": {
+			"^.+\\.tsx?$": "ts-jest",
+			"^.+\\.jsx?$": "babel-jest"
+		}
+	}
+}

package/scripts/roundtrip-test.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# Roundtrip-test pushwork by init-ing a directory, cloning it elsewhere,
+# and diffing the two trees (ignoring files that aren't synced).
+#
+# Usage: roundtrip-test.sh <source-dir>
+
+set -euo pipefail
+
+if [ $# -lt 1 ]; then
+  echo "usage: $0 <source-dir>" >&2
+  exit 1
+fi
+
+SRC=$(cd "$1" && pwd)
+CLONE_DIR=$(mktemp -d -t pushwork-roundtrip-XXXXXX)/clone
+
+echo ">> init  $SRC"
+pushwork init --sub "$SRC"
+
+URL=$(pushwork url "$SRC")
+echo ">> url   $URL"
+
+echo ">> clone $CLONE_DIR"
+pushwork clone "$URL" "$CLONE_DIR" --sub
+
+echo ">> diff  $SRC  <->  $CLONE_DIR"
+if diff -r \
+    --exclude=.pushwork \
+    --exclude=node_modules \
+    "$SRC" "$CLONE_DIR"; then
+  echo ">> OK: directories match"
+else
+  echo ">> FAIL: directories differ" >&2
+  exit 1
+fi

package/src/cli.ts

@@ -20,11 +20,49 @@ import {
   watch,
 } from "./commands";
 
-const version = require("../package.json").version;
+const pkg = require("../package.json");
+const version = pkg.version;
+
+// Resolve dependency versions from installed package.json files. These
+// are the actual runtime versions, which is what users care about when
+// reporting bugs (they may differ from package.json ranges after a
+// `pnpm install` that satisfied a range with a newer patch).
+//
+// Some packages (like @automerge/automerge-repo) have an `exports` field
+// that blocks `require("pkg/package.json")`, so we resolve the package
+// entry point with `require.resolve` and walk up to find package.json.
+function depVersion(pkgName: string): string {
+  try {
+    const fs = require("fs");
+    const path = require("path");
+    let dir = path.dirname(require.resolve(pkgName));
+    while (dir !== path.dirname(dir)) {
+      const candidate = path.join(dir, "package.json");
+      if (fs.existsSync(candidate)) {
+        const data = JSON.parse(fs.readFileSync(candidate, "utf8"));
+        if (data.name === pkgName) {
+          return data.version;
+        }
+      }
+      dir = path.dirname(dir);
+    }
+    return "unknown";
+  } catch {
+    return "unknown";
+  }
+}
+
+const versionString = [
+  `pushwork ${version}`,
+  `  @automerge/automerge               ${depVersion("@automerge/automerge")}`,
+  `  @automerge/automerge-repo          ${depVersion("@automerge/automerge-repo")}`,
+  `  @automerge/automerge-subduction    ${depVersion("@automerge/automerge-subduction")}`,
+].join("\n");
+
 const program = new Command()
   .name("pushwork")
   .description("Bidirectional directory synchronization using Automerge CRDTs")
-  .version(version, "-V, --version", "output the version number");
+  .version(versionString, "-V, --version", "output the version number");
 
 // Init command
 program
@@ -39,16 +77,21 @@ program
     "--sync-server <url> <storage-id...>",
     "Custom sync server URL and storage ID"
   )
+  .option("--sub", "Use Subduction sync backend", false)
   .action(async (path, opts) => {
     const [syncServer, syncServerStorageId] = validateSyncServer(
       opts.syncServer
     );
-    await init(path, { syncServer, syncServerStorageId });
+    await init(path, { syncServer, syncServerStorageId, sub: opts.sub });
   });
 
 // Track command (set root directory URL without full initialization)
-const trackAction = async (url: string, path: string, opts: { force: boolean }) => {
-  await root(url, path, { force: opts.force });
+const trackAction = async (
+  url: string,
+  path: string,
+  opts: { force: boolean; sub: boolean }
+) => {
+  await root(url, path, { force: opts.force, sub: opts.sub });
 };
 
 program
@@ -64,6 +107,7 @@ program
     "."
   )
   .option("-f, --force", "Overwrite existing pushwork setup", false)
+  .option("--sub", "Use Subduction sync backend", false)
   .action(async (url, path, opts) => {
     await trackAction(url, path, opts);
   });
@@ -74,7 +118,8 @@ program
   .argument("<url>")
   .argument("[path]", "", ".")
   .option("-f, --force", "", false)
-  .action(async (url: string, path: string, opts: { force: boolean }) => {
+  .option("--sub", "", false)
+  .action(async (url: string, path: string, opts: { force: boolean; sub: boolean }) => {
     await trackAction(url, path, opts);
   });
 
@@ -92,6 +137,7 @@ program
     "--sync-server <url> <storage-id...>",
     "Custom sync server URL and storage ID"
   )
+  .option("--sub", "Use Subduction sync backend", false)
   .option("-v, --verbose", "Verbose output", false)
   .action(async (url, path, opts) => {
     const [syncServer, syncServerStorageId] = validateSyncServer(
@@ -102,6 +148,7 @@ program
       verbose: opts.verbose,
       syncServer,
       syncServerStorageId,
+      sub: opts.sub,
     });
   });