tether-sync 0.2.0 → 0.6.0

package/bin/tether.js

@@ -13,7 +13,7 @@ import {
   npmInstall,
   prefixOf,
   tetherHome
-} from "./chunk-NDKBAHAG.js";
+} from "./chunk-KG4OTE34.js";
 
 // packages/client/src/cli.js
 import path2 from "node:path";
@@ -172,7 +172,7 @@ async function resolveFlow(p, from, opts) {
   }
   const { results } = await daemon("resolve", { path: target, from, items: plan.items, choices });
   for (const r of results) {
-    const extra = r.error ? `  ERROR: ${r.error}` : r.version ? `  -> v${r.version}` : r.keptAs ? `  (your copy: ${r.keptAs})` : r.released ? `  (left at ${r.released})` : "";
+    const extra = r.error ? `  ERROR: ${r.error}` : r.version ? `  -> v${r.version}${r.sent ? ` (${r.sent})` : ""}` : r.keptAs ? `  (your copy: ${r.keptAs})` : r.released ? `  (left at ${r.released})` : "";
     out(`${r.action.padEnd(9)} ${r.path}${extra}`);
   }
   if (results.some((r) => r.error)) process.exitCode = 1;
@@ -191,6 +191,7 @@ async function chooseGitMode(target, flag, canFollow) {
   out(`${target} is inside the git repository ${repo.root}.`);
   out("How should Tether treat it when git changes it?");
   out("  [1] keep managing it: git's changes (pull, checkout, switch, merge) may get reverted to Tether's version");
+  out("      (git is told to ignore Tether's copy, so git status stays clean and pulls are not blocked)");
   out("  [2] do not let Tether manage it");
   if (canFollow) out("  [3] manage it, and after a git pull, checkout, switch or merge accept git's version and publish it to Tether");
   else out("  (option 3, accepting git's changes, needs editor access)");
@@ -299,6 +300,7 @@ async function main(argv) {
     if (gitMode === "skip") return out("not pulled");
     const r = await daemon("pull", { shareId, dest, cwd: process.cwd(), gitMode });
     out(`pulled ${r.path} (${r.kind}${r.kind === "folder" ? `, ${r.files} files` : ""}, v${r.version}) as ${r.role}`);
+    if (r.note) out(`note: ${r.note}`);
   });
   program.command("status [path]").description("modes, pending changes, problems").option("-v, --verbose", "show every file and instance IDs").option("--json").action(async (p, o) => {
     const s = await daemon("status", { path: p ? path2.resolve(p) : void 0 });

package/bin/tetherd.js

@@ -4,7 +4,7 @@
 process.removeAllListeners("warning");
 var i = process.argv.indexOf("--home");
 if (i > 0 && process.argv[i + 1]) process.env.TETHER_HOME = process.argv[i + 1];
-var { runDaemon } = await import("./daemon-KQ4ZTBYG.js");
+var { runDaemon } = await import("./daemon-Z2NE3MNG.js");
 runDaemon().catch((e) => {
   if (e.code === "EADDRINUSE") {
     console.error("tetherd is already running");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tether-sync",
-  "version": "0.2.0",
+  "version": "0.6.0",
   "description": "Keep files identical to a central source of truth, wherever they live on your machine.",
   "type": "module",
   "bin": {
@@ -21,7 +21,8 @@
   "dependencies": {
     "koffi": "^3.3.3",
     "commander": "^14.0.1",
-    "diff": "^8.0.2"
+    "diff": "^8.0.2",
+    "firebase": "^12.19.0"
   },
   "keywords": [
     "sync",