@rigxyz/tapd 0.3.0 → 0.4.1

package/dist/bin.js

@@ -2,23 +2,29 @@
 import {
   AlreadyInitializedError,
   AlreadyJoinedError,
+  ImportTokenScopeError,
+  ImportValidationFailed,
   InvalidInviteUrlError,
   NotInitializedError,
   RelayClient,
   STATE_KEY_CONFLICT_COUNT,
+  addImport,
   bindingConfigFile,
   computeLocalDiff,
   findConflictSidecars,
+  importStateDbPath,
   init,
   join,
   list,
   loadIgnore,
+  loadImportMounts,
   mint,
   openStateDb,
   readBindingConfig,
+  removeImport,
   revoke,
   start
-} from "./chunk-N3KRCOBG.js";
+} from "./chunk-JBX2ZRMD.js";
 
 // src/bin.ts
 import { join as pathJoin, resolve as resolve2 } from "path";
@@ -272,7 +278,7 @@ import { existsSync as existsSync4 } from "fs";
 import { join as join4 } from "path";
 
 // src/version.ts
-var TAPD_VERSION = "0.3.0";
+var TAPD_VERSION = "0.4.1";
 
 // src/status.ts
 var STATE_KEY_LAST_APPLY_ERROR = "last_apply_error";
@@ -284,9 +290,9 @@ function statusToJson(report) {
   return {
     protocolVersion: STATUS_PROTOCOL_VERSION,
     version: TAPD_VERSION,
-    bindingId: report.config.bindingId,
-    relayUrl: report.config.relayUrl,
-    deviceId: report.config.deviceId,
+    bindingId: report.config?.bindingId ?? null,
+    relayUrl: report.config?.relayUrl ?? null,
+    deviceId: report.config?.deviceId ?? null,
     daemon: report.daemon,
     cursor: report.cursor,
     remoteCursor: report.remoteCursor,
@@ -295,13 +301,65 @@ function statusToJson(report) {
     pendingUploads: report.pendingUploads,
     conflicts: report.conflicts,
     lastApplyError: report.lastApplyError,
-    offline: report.offline
+    offline: report.offline,
+    mounts: report.mounts
   };
 }
+function readMounts(rootDir) {
+  const loaded = loadImportMounts(rootDir);
+  const mounts = [];
+  const readyPaths = [];
+  for (const spec of loaded.ready) {
+    let cursor;
+    const dbPath = importStateDbPath(rootDir, spec.name);
+    if (existsSync4(dbPath)) {
+      const db = openStateDb(dbPath);
+      try {
+        cursor = db.getCursor();
+      } finally {
+        db.close();
+      }
+    }
+    mounts.push({
+      name: spec.name,
+      path: spec.path,
+      state: "ok",
+      bindingId: spec.bindingId,
+      ...cursor ? { cursor } : {}
+    });
+    readyPaths.push(spec.path);
+  }
+  for (const b of loaded.broken) {
+    mounts.push({ name: b.name, path: b.path, state: "misconfigured", reason: b.reason });
+  }
+  mounts.sort((a, b) => a.name.localeCompare(b.name));
+  return { mounts, readyPaths };
+}
 async function status(opts) {
   const config = readBindingConfig(opts.rootDir);
+  const { mounts, readyPaths } = readMounts(opts.rootDir);
+  const pidfilePath = join4(opts.rootDir, DAEMON_PIDFILE_REL);
+  const livePid = readLivePid(pidfilePath);
+  const daemon = livePid !== null ? { running: true, pid: livePid } : { running: false };
   if (!config) {
-    throw new NotInitializedError(opts.rootDir);
+    if (mounts.length === 0) {
+      throw new NotInitializedError(opts.rootDir);
+    }
+    return {
+      config: null,
+      cursor: "chg_0",
+      remoteCursor: "chg_0",
+      trackedPaths: 0,
+      pendingPeek: [],
+      pendingApplies: 0,
+      pendingUploads: 0,
+      conflicts: [],
+      conflictCount: 0,
+      lastApplyError: null,
+      daemon,
+      offline: false,
+      mounts
+    };
   }
   const db = openStateDb(join4(opts.rootDir, ".rig", "tap", "state.local.db"));
   try {
@@ -314,9 +372,6 @@ async function status(opts) {
     const lastErrJson = db.getMeta(STATE_KEY_LAST_APPLY_ERROR);
     const lastErrAt = db.getMeta(STATE_KEY_LAST_APPLY_ERROR_AT);
     const lastApplyError = lastErrJson ? safeParseLastError(lastErrJson, lastErrAt) : null;
-    const pidfilePath = join4(opts.rootDir, DAEMON_PIDFILE_REL);
-    const livePid = readLivePid(pidfilePath);
-    const daemon = livePid !== null ? { running: true, pid: livePid } : { running: false };
     const client = new RelayClient({
       baseUrl: config.relayUrl,
       bindingId: config.bindingId,
@@ -341,7 +396,12 @@ async function status(opts) {
     let pendingUploads = 0;
     if (existsSync4(opts.rootDir)) {
       const ignore = loadIgnore(opts.rootDir);
-      const diff = await computeLocalDiff({ rootDir: opts.rootDir, stateDb: db, ignore });
+      const diff = await computeLocalDiff({
+        rootDir: opts.rootDir,
+        stateDb: db,
+        ignore,
+        excludePaths: readyPaths
+      });
       pendingUploads = diff.writes.length + diff.deletes.length + diff.mkdirs.length + diff.rmdirs.length;
     }
     const conflicts = findConflictSidecars(opts.rootDir);
@@ -357,7 +417,8 @@ async function status(opts) {
       conflictCount,
       lastApplyError,
       daemon,
-      offline
+      offline,
+      mounts
     };
   } finally {
     db.close();
@@ -506,6 +567,7 @@ ${C.bold().cyan("COMMANDS")}
   ${C.green("tapd invite")}  mint / list / revoke invite URLs (owner only)
   ${C.green("tapd members")} list / remove / set-role for binding members (owner only for write ops)
   ${C.green("tapd join")}    accept an invite URL into the current directory
+  ${C.green("tapd import")}  mount another binding read-only into a subdir (meta-rig)
   ${C.green("tapd start")}   run the watch + apply daemon (foreground)
   ${C.green("tapd status")}  show binding + cursor + pending remote events
   ${C.green("tapd history")} list ChangeEvents for a single path (recovery)
@@ -892,6 +954,129 @@ async function runJoin(positional2, flags2) {
   console.log("");
   console.log(C.dim("  Next: `tapd start` (initial apply pulls the remote manifest)."));
 }
+async function runImport(positional2, flags2) {
+  const json = flags2.get("json") === true;
+  const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
+  const sub = positional2[0];
+  if (sub === "remove") {
+    const name = positional2[1];
+    if (!name) {
+      if (json) printJsonError("missing_argument", "usage: tapd import remove <name>");
+      else console.error(kleur.red("error:"), "usage: tapd import remove <name>");
+      process.exit(2);
+    }
+    let accessToken2 = null;
+    try {
+      accessToken2 = readHubToken();
+    } catch {
+      accessToken2 = null;
+    }
+    const result2 = await removeImport({
+      rootDir,
+      name,
+      purge: flags2.get("purge") === true,
+      accessToken: accessToken2
+    });
+    if (json) {
+      printJson({ protocolVersion: PROTOCOL_VERSION, ...result2, name });
+      return;
+    }
+    const C2 = kleur;
+    if (!result2.removed) {
+      console.log(C2.dim(`no import named "${name}"`));
+      return;
+    }
+    console.log(`${C2.green("\u2713")} removed import ${C2.bold(name)}${result2.purged ? C2.dim(" (purged files)") : ""}`);
+    switch (result2.revoke) {
+      case "revoked":
+        console.log(C2.dim("  grant relinquished on the relay."));
+        break;
+      case "not-creator":
+        console.log(
+          C2.yellow("  note:") + " the grant belongs to another user and remains active \u2014 only its owner can revoke it."
+        );
+        break;
+      case "no-token":
+        console.log(C2.yellow("  note:") + " not signed in \u2014 the grant was not revoked. Run `rig login`, then re-remove, to relinquish it.");
+        break;
+      case "offline":
+        console.log(C2.yellow("  note:") + " relay unreachable \u2014 local mount removed, grant not yet revoked.");
+        break;
+    }
+    console.log(C2.dim("  restart the daemon to apply: `tapd start`"));
+    return;
+  }
+  const inviteUrl = sub;
+  const mountPath = flags2.get("path");
+  if (!inviteUrl || !mountPath) {
+    const msg = "usage: tapd import <invite-url> --path <subdir> [--name <name>]";
+    if (json) printJsonError("missing_argument", msg);
+    else console.error(kleur.red("error:"), msg);
+    process.exit(2);
+  }
+  const anonymous = flags2.get("anonymous") === true;
+  let accessToken = null;
+  if (!anonymous) {
+    try {
+      accessToken = readHubToken();
+    } catch (err) {
+      if (err instanceof HubTokenMissingError) {
+        if (json) printJsonError("not_logged_in", err.message);
+        else {
+          console.error(kleur.red("error:"), err.message);
+          console.error(kleur.dim("  pass --anonymous for a pure-capability invite, or run `rig login`."));
+        }
+        process.exit(1);
+      }
+      throw err;
+    }
+  }
+  let result;
+  try {
+    result = await addImport({
+      rootDir,
+      inviteUrl,
+      path: mountPath,
+      name: flags2.get("name"),
+      accessToken,
+      deviceLabel: flags2.get("device-label")
+    });
+  } catch (err) {
+    if (err instanceof ImportValidationFailed) {
+      if (json) printJsonError("import_invalid", err.message);
+      else console.error(kleur.red("error:"), err.message);
+      process.exit(2);
+    }
+    if (err instanceof ImportTokenScopeError) {
+      if (json) printJsonError("insufficient_ops", err.message);
+      else console.error(kleur.red("error:"), err.message);
+      process.exit(1);
+    }
+    if (err instanceof InvalidInviteUrlError) {
+      if (json) printJsonError("invalid_invite_url", err.message);
+      else console.error(kleur.red("error:"), err.message);
+      process.exit(2);
+    }
+    throw err;
+  }
+  if (json) {
+    printJson({ protocolVersion: PROTOCOL_VERSION, ...result });
+    return;
+  }
+  const C = kleur;
+  console.log(C.bold().cyan("tapd import"));
+  console.log(`  name:     ${C.bold(result.name)}`);
+  console.log(`  mount:    ${result.path}  ${C.dim("(read-only mirror)")}`);
+  console.log(`  binding:  ${result.bindingId}`);
+  console.log(`  ops:      ${result.ops.join(", ")}`);
+  console.log(C.dim(`    Token stored in ${rootDir}/.rig/tap/imports/${result.name}.local.json (mode 0600).`));
+  if (result.importerBindingVerified === false) {
+    console.log(
+      C.yellow("  note:") + " recorded as a personal import (you \u2192 source); the rig-level edge needs membership in this meta-rig."
+    );
+  }
+  console.log(C.dim("  Next: (re)start the daemon to begin mirroring \u2014 `tapd start`."));
+}
 async function runStatus(flags2) {
   const json = flags2.get("json") === true;
   const rootDir = resolve2(flags2.get("dir") ?? process.cwd());
@@ -914,31 +1099,45 @@ async function runStatus(flags2) {
   }
   const C = kleur;
   console.log(C.bold().cyan("tapd status"));
-  console.log(`  binding:  ${C.bold(report.config.bindingId)}`);
-  console.log(`  relay:    ${report.config.relayUrl}`);
-  console.log(`  device:   ${C.bold(report.config.deviceId)}`);
-  console.log(`  cursor:   ${report.cursor}`);
-  console.log(`  tracked:  ${report.trackedPaths} paths`);
-  if (report.pendingPeek.length === 0) {
-    console.log(`  pending:  ${C.green("up to date")}`);
-  } else {
-    console.log(`  pending:  ${C.yellow(`${report.pendingPeek.length}+ events behind`)}`);
-    for (const ev of report.pendingPeek) {
-      console.log(C.dim(`    ${ev.op.padEnd(6)} ${ev.path}  (${ev.id})`));
+  if (report.config) {
+    console.log(`  binding:  ${C.bold(report.config.bindingId)}`);
+    console.log(`  relay:    ${report.config.relayUrl}`);
+    console.log(`  device:   ${C.bold(report.config.deviceId)}`);
+    console.log(`  cursor:   ${report.cursor}`);
+    console.log(`  tracked:  ${report.trackedPaths} paths`);
+    if (report.pendingPeek.length === 0) {
+      console.log(`  pending:  ${C.green("up to date")}`);
+    } else {
+      console.log(`  pending:  ${C.yellow(`${report.pendingPeek.length}+ events behind`)}`);
+      for (const ev of report.pendingPeek) {
+        console.log(C.dim(`    ${ev.op.padEnd(6)} ${ev.path}  (${ev.id})`));
+      }
+    }
+    if (report.conflictCount > 0) {
+      console.log(
+        `  conflicts: ${C.yellow(String(report.conflictCount))} ${C.dim("(sidecars at *.conflict-from.*)")}`
+      );
+    } else {
+      console.log(`  conflicts: ${C.dim("none")}`);
+    }
+    if (report.lastApplyError) {
+      const e = report.lastApplyError;
+      console.log(
+        `  last err: ${C.red(e.reason)} ${C.dim(`(${e.op} ${e.path} @ ${e.eventId}${e.at ? `, ${e.at}` : ""})`)}`
+      );
     }
-  }
-  if (report.conflictCount > 0) {
-    console.log(
-      `  conflicts: ${C.yellow(String(report.conflictCount))} ${C.dim("(sidecars at *.conflict-from.*)")}`
-    );
   } else {
-    console.log(`  conflicts: ${C.dim("none")}`);
+    console.log(C.dim("  (import-only meta-rig \u2014 no primary binding)"));
   }
-  if (report.lastApplyError) {
-    const e = report.lastApplyError;
-    console.log(
-      `  last err: ${C.red(e.reason)} ${C.dim(`(${e.op} ${e.path} @ ${e.eventId}${e.at ? `, ${e.at}` : ""})`)}`
-    );
+  if (report.mounts.length > 0) {
+    console.log(`  imports:`);
+    for (const m of report.mounts) {
+      if (m.state === "ok") {
+        console.log(`    ${C.green("\u25CF")} ${C.bold(m.name)} \u2192 ${m.path}${m.cursor ? C.dim(`  (${m.cursor})`) : ""}`);
+      } else {
+        console.log(`    ${C.yellow("\u25CB")} ${C.bold(m.name)} ${C.yellow("misconfigured")} ${C.dim(`(${m.reason ?? "unknown"})`)}`);
+      }
+    }
   }
 }
 async function runUninit(flags2) {
@@ -1269,6 +1468,9 @@ if (flags.get("version") === true || command === "-v") {
     case "join":
       await runJoin(positional, flags);
       return;
+    case "import":
+      await runImport(positional, flags);
+      return;
     case "start":
       await runStart(flags);
       return;