@rigxyz/tapd 0.6.7 → 0.6.9

package/dist/bin.js

@@ -17,6 +17,7 @@ import {
   importStateDbPath,
   init,
   isSyncPaused,
+  isVersionPrunedError,
   join,
   list,
   loadIgnore,
@@ -25,12 +26,13 @@ import {
   openStateDb,
   quarantineFiles,
   readBindingConfig,
+  readMerges,
   readNotSynced,
   removeImport,
   revoke,
   safeResolveRigPath,
   start
-} from "./chunk-32K6ANXS.js";
+} from "./chunk-57Z2Y3S2.js";
 
 // src/bin.ts
 import { join as pathJoin, resolve } from "path";
@@ -214,6 +216,18 @@ var PathCurrentlyDeletedError = class extends Error {
   path;
   lastCursor;
 };
+var VersionPrunedError = class extends Error {
+  constructor(path, cursor) {
+    super(
+      "That version is no longer kept. Rig keeps every version from the last week, one an hour for 90 days, then one a day."
+    );
+    this.path = path;
+    this.cursor = cursor;
+    this.name = "VersionPrunedError";
+  }
+  path;
+  cursor;
+};
 var HashMismatchError = class extends Error {
   constructor(path, expected, actual) {
     super(`Hash mismatch restoring "${path}": expected ${expected}, got ${actual}`);
@@ -258,7 +272,13 @@ async function restore(opts) {
     throw new PathNeverExistedError(opts.path);
   }
   const client = clientFor3(opts.rootDir, opts.fetch);
-  const dl = await client.downloadUrl(writeEvent.hash);
+  let dl;
+  try {
+    dl = await client.downloadUrl(writeEvent.hash);
+  } catch (err) {
+    if (isVersionPrunedError(err)) throw new VersionPrunedError(opts.path, writeEvent.id);
+    throw err;
+  }
   const bytes = await client.getObjectBytes(dl.downloadUrl);
   const actualHash = `sha256:${sha256Hex(bytes)}`;
   if (actualHash !== writeEvent.hash) {
@@ -284,7 +304,7 @@ import { existsSync as existsSync4 } from "fs";
 import { join as join4 } from "path";
 
 // src/version.ts
-var TAPD_VERSION = "0.6.7";
+var TAPD_VERSION = "0.6.9";
 
 // src/status.ts
 var STATE_KEY_LAST_APPLY_ERROR = "last_apply_error";
@@ -307,6 +327,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
@@ -363,6 +384,7 @@ async function status(opts) {
       notSynced: [],
       conflicts: [],
       conflictCount: 0,
+      merged: [],
       lastApplyError: null,
       daemon,
       offline: false,
@@ -424,6 +446,7 @@ async function status(opts) {
       notSynced: readNotSynced(db),
       conflicts,
       conflictCount,
+      merged: readMerges(db),
       lastApplyError,
       daemon,
       offline,
@@ -1138,6 +1161,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(
@@ -1389,6 +1418,11 @@ async function runRestore(flags2) {
       else console.error(kleur.red("error:"), err.message);
       process.exit(1);
     }
+    if (err instanceof VersionPrunedError) {
+      if (json) printJsonError("version_pruned", err.message);
+      else console.error(kleur.red("error:"), err.message);
+      process.exit(1);
+    }
     if (err instanceof HashMismatchError) {
       if (json) printJsonError("hash_mismatch", err.message);
       else console.error(kleur.red("error:"), err.message);