@rigxyz/tapd 0.6.5 → 0.6.8

package/dist/bin.js

@@ -23,13 +23,15 @@ import {
   loadImportMounts,
   mint,
   openStateDb,
+  quarantineFiles,
   readBindingConfig,
+  readMerges,
   readNotSynced,
   removeImport,
   revoke,
   safeResolveRigPath,
   start
-} from "./chunk-7RKYNS5V.js";
+} from "./chunk-S5AVBVLP.js";
 
 // src/bin.ts
 import { join as pathJoin, resolve } from "path";
@@ -266,9 +268,9 @@ async function restore(opts) {
   const overwrote = existsSync3(targetAbs);
   mkdirSync2(dirname2(targetAbs), { recursive: true });
   const tmp = `${targetAbs}.tap-restore-tmp.${Date.now().toString(36)}`;
-  const mode = writeEvent.executable ? 493 : 420;
-  writeFileSync2(tmp, bytes, { mode });
+  writeFileSync2(tmp, bytes, { mode: 420 });
   renameSync(tmp, targetAbs);
+  await quarantineFiles([targetAbs]);
   return {
     path: opts.path,
     restoredFromCursor: writeEvent.id,
@@ -283,7 +285,7 @@ import { existsSync as existsSync4 } from "fs";
 import { join as join4 } from "path";
 
 // src/version.ts
-var TAPD_VERSION = "0.6.5";
+var TAPD_VERSION = "0.6.8";
 
 // src/status.ts
 var STATE_KEY_LAST_APPLY_ERROR = "last_apply_error";
@@ -306,6 +308,7 @@ function statusToJson(report) {
     pendingUploads: report.pendingUploads,
     notSynced: report.notSynced,
     conflicts: report.conflicts,
+    merged: report.merged,
     lastApplyError: report.lastApplyError,
     offline: report.offline,
     mounts: report.mounts
@@ -362,6 +365,7 @@ async function status(opts) {
       notSynced: [],
       conflicts: [],
       conflictCount: 0,
+      merged: [],
       lastApplyError: null,
       daemon,
       offline: false,
@@ -423,6 +427,7 @@ async function status(opts) {
       notSynced: readNotSynced(db),
       conflicts,
       conflictCount,
+      merged: readMerges(db),
       lastApplyError,
       daemon,
       offline,
@@ -596,6 +601,8 @@ ${C.bold().cyan("tapd init OPTIONS")}
   ${C.dim("--relay <url>")}           override (defaults to the logged-in relay)
   ${C.dim("--device-label <l>")}      default 'owner'
   ${C.dim("--org <slug>")}            create this binding under an org you belong to
+  ${C.dim("--kind <rig|space>")}      create it as a space (default: rig)
+  ${C.dim("--defer-upload")}          create the binding only; \`tapd start\` uploads the files
   ${C.dim("--dir <path>")}            default cwd
 
 ${C.bold().cyan("tapd join OPTIONS")}
@@ -1135,6 +1142,12 @@ async function runStatus(flags2) {
     } else {
       console.log(`  conflicts: ${C.dim("none")}`);
     }
+    if (report.merged.length > 0) {
+      console.log(`  merged:   ${report.merged.length} ${C.dim("(local + remote edits merged automatically, recent)")}`);
+      for (const m of report.merged.slice(-5)) {
+        console.log(C.dim(`    ${m.path}  with ${m.theirsChangeId}${m.changeId ? ` \u2192 ${m.changeId}` : " (upload pending)"}  ${m.at}`));
+      }
+    }
     if (report.lastApplyError) {
       const e = report.lastApplyError;
       console.log(
@@ -1158,6 +1171,20 @@ async function runStatus(flags2) {
       );
       for (const f of tooLarge) console.log(C.dim(`    ${f.path}`));
     }
+    const ownerOnly = report.notSynced.filter((f) => f.reason === "owner_only");
+    if (ownerOnly.length > 0) {
+      console.log(
+        `  ${C.yellow(`${plural(ownerOnly.length)} not synced`)}: agent instructions only the space's owner can change`
+      );
+      for (const f of ownerOnly) console.log(C.dim(`    ${f.path}`));
+    }
+    const protectedPaths = report.notSynced.filter((f) => f.reason === "protected");
+    if (protectedPaths.length > 0) {
+      console.log(
+        `  ${C.yellow(`${plural(protectedPaths.length)} not synced`)}: protected paths never sync between members`
+      );
+      for (const f of protectedPaths) console.log(C.dim(`    ${f.path}`));
+    }
   } else {
     console.log(C.dim("  (import-only meta-rig \u2014 no primary binding)"));
   }
@@ -1426,9 +1453,18 @@ async function runInit(flags2) {
     process.exit(2);
   }
   const org = orgRaw;
+  const kindRaw = flags2.get("kind");
+  if (kindRaw !== void 0 && kindRaw !== "rig" && kindRaw !== "space") {
+    const msg = "--kind must be rig or space";
+    if (json) printJsonError("invalid_flag", msg);
+    else console.error(kleur.red("error:"), msg);
+    process.exit(2);
+  }
+  const kind = kindRaw;
+  const deferUpload = flags2.get("defer-upload") === true;
   let result;
   try {
-    result = await init({ rootDir, relayUrl, accessToken, bindingName: name, deviceLabel, org });
+    result = await init({ rootDir, relayUrl, accessToken, bindingName: name, deviceLabel, org, kind, deferUpload });
   } catch (err) {
     if (err instanceof AlreadyInitializedError) {
       if (json) printJsonError("already_initialized", err.message);
@@ -1450,6 +1486,8 @@ async function runInit(flags2) {
       protocolVersion: PROTOCOL_VERSION,
       bindingId: result.binding.id,
       bindingName: result.binding.name,
+      // What the relay made (an older relay ignores `kind` and says nothing).
+      kind: result.binding.kind ?? null,
       deviceId: result.device.id,
       deviceLabel: result.device.label,
       relayUrl,
@@ -1458,6 +1496,7 @@ async function runInit(flags2) {
       reusedHashes: result.reusedHashes,
       submittedEvents: result.submittedEvents,
       cursor: result.cursor,
+      deferredUpload: result.deferredUpload,
       warnings: result.warnings
     });
     return;