hyperframes 0.8.145 → 0.8.146

package/dist/{history-GGO5AWJB.js → history-RKGBRNLD.js}

@@ -6,7 +6,7 @@ var __filename = __hf_fileURLToPath(import.meta.url);
 var __dirname = __hf_dirname(__filename);
 import {
   resolveProject
-} from "./chunk-XBX4QJP7.js";
+} from "./chunk-TH4OXAWY.js";
 import "./chunk-K2FLNJVB.js";
 import {
   DEFAULT_HISTORY_ROOT,
@@ -14,9 +14,10 @@ import {
   HistoryIdError,
   MAX_WINDOW_IDLE_MS,
   START,
-  openProjectHistory
-} from "./chunk-QZ3AZTXI.js";
-import "./chunk-G75ENCEZ.js";
+  openProjectHistory,
+  readProjectHistory
+} from "./chunk-FJWEYVEM.js";
+import "./chunk-AIJS74LG.js";
 import "./chunk-EOVYQ3IG.js";
 import {
   AmbiguousPreviewServerError,
@@ -25,10 +26,10 @@ import {
 } from "./chunk-DQBY7FRR.js";
 import {
   trackHistoryAction
-} from "./chunk-ICKDMTLA.js";
-import "./chunk-ZF7SXQJ7.js";
+} from "./chunk-QSSPIATO.js";
+import "./chunk-2NAUEDA6.js";
 import "./chunk-VWG7OQKU.js";
-import "./chunk-GQJZORQP.js";
+import "./chunk-XBSPQ52S.js";
 import "./chunk-AMKC3AXA.js";
 import {
   defineCommand
@@ -37,19 +38,19 @@ import "./chunk-54HJ63Q2.js";
 import {
   setCommandExitCode
 } from "./chunk-PBN6GBJE.js";
-import "./chunk-KC5XXX3X.js";
-import "./chunk-USDEMXXL.js";
+import "./chunk-EOOEC32M.js";
+import "./chunk-JYVGYKXG.js";
 import "./chunk-OFQWTKPW.js";
 import "./chunk-T76PLPD6.js";
 import "./chunk-FXMKHHPO.js";
 import {
   withMeta
-} from "./chunk-PLR7Z6TC.js";
+} from "./chunk-K7ES5RSK.js";
 import "./chunk-K4WIOZFP.js";
 import "./chunk-XUXGIA7H.js";
 import "./chunk-WERLJGIC.js";
 import "./chunk-ISN5GRYI.js";
-import "./chunk-BFACGEII.js";
+import "./chunk-TBOMPYG6.js";
 import "./chunk-KNU5COPB.js";
 import "./chunk-ZTZA4UWZ.js";
 import "./chunk-M2WBOQ2Q.js";
@@ -69,6 +70,7 @@ var historyDeps = {
   findServer: (projectDir) => findPreviewServerForProject(projectDir),
   /** A turn with no write for this long has ended, through a preview or not. */
   turnIdleMs: MAX_WINDOW_IDLE_MS,
+  ownerWaitMs: void 0,
   now: () => Date.now()
 };
 var Refusal = class extends Error {
@@ -150,6 +152,7 @@ async function directOwner(projectDir, turn) {
     historyRoot: historyDeps.historyRoot,
     now: () => historyDeps.now(),
     pruneGoneProjectsBudgetMs: 1e3,
+    ownerWaitMs: historyDeps.ownerWaitMs,
     // A turn begun through a preview that has since stopped is still the agent's, until its idle limit.
     ...turn && {
       closedWindow: {
@@ -209,6 +212,26 @@ async function withOwner(dir, task) {
     }
   }
 }
+async function withReader(dir, task) {
+  try {
+    return await withOwner(dir, (owner) => task(owner));
+  } catch (error) {
+    if (!(error instanceof HistoryBusyError)) throw error;
+  }
+  const view = readProjectHistory({
+    projectDir: resolveProject(dir).dir,
+    historyRoot: historyDeps.historyRoot
+  });
+  return task({
+    via: "direct",
+    list: async () => view.list(),
+    peek: async (point) => view.peek(point),
+    // The owner may have pruned a blob since its log was read.
+    blob: (hash) => view.readBlob(hash).catch((error) => {
+      throw error.code === "ENOENT" ? new Refusal("That point is no longer kept") : error;
+    })
+  });
+}
 
 // src/commands/history.ts
 var examples = [
@@ -227,6 +250,10 @@ var withOwner2 = (action, dir, task) => withOwner(dir, (owner, turn, projectDir)
   trackHistoryAction({ action, via: owner.via });
   return task(owner, turn, projectDir);
 });
+var withReader2 = (action, dir, task) => withReader(dir, (reader) => {
+  trackHistoryAction({ action, via: reader.via });
+  return task(reader);
+});
 var whoOf = (name) => name ? { kind: "agent", name } : YOU;
 var short = (id) => id.slice(0, 8);
 function lastIndex(items, match) {
@@ -290,13 +317,13 @@ var changeOf = (file) => file.before === null ? "added" : file.after === null ?
 function print(json, data, text) {
   console.log(json ? JSON.stringify(withMeta(data), null, 2) : text);
 }
-async function textDiff(owner, entry) {
+async function textDiff(reader, entry) {
   const work = mkdtempSync(join2(tmpdir(), "hf-history-diff-"));
   try {
     const out = [];
     for (const file of entry.files) {
       const sides = await Promise.all(
-        [file.before, file.after].map((hash) => hash ? owner.blob(hash) : Buffer.alloc(0))
+        [file.before, file.after].map((hash) => hash ? reader.blob(hash) : Buffer.alloc(0))
       );
       if (sides.some((bytes) => bytes.subarray(0, 8e3).includes(0))) {
         out.push(`Binary ${file.path} changed`);
@@ -387,7 +414,7 @@ function guarded(run) {
       const refused = error instanceof Refusal || error instanceof AmbiguousPreviewServerError || error instanceof HistoryBusyError || error instanceof HistoryIdError;
       if (!refused) throw error;
       setCommandExitCode(2);
-      const { message } = error;
+      const message = error instanceof HistoryBusyError ? `This project is open in another app (pid ${error.pid}), which keeps its history: undo, restore or pin there.` : error.message;
       if (args.json) print(true, { ok: false, error: message }, message);
       else console.error(message);
     }
@@ -404,8 +431,8 @@ var sub = (name, description, args, run) => defineCommand({
 });
 var listEntries = async (args) => {
   if (args._?.[0]) return;
-  await withOwner2("list", args.dir, async (owner) => {
-    const all = await owner.list();
+  await withReader2("list", args.dir, async (reader) => {
+    const all = await reader.list();
     const picked = args.since ? since(all, args.since, whoOf(args.who)) : all;
     const limit = Number(args.limit ?? 20);
     if (!Number.isInteger(limit) || limit < 1)
@@ -434,13 +461,13 @@ var history_default = defineCommand({
       "show",
       "One entry's files, before and after",
       { ref: { type: "positional", required: true }, diff: { type: "boolean", default: false } },
-      (args) => withOwner2("show", args.dir, async (owner) => {
-        const entry = entryOf(await owner.list(), args.ref);
+      (args) => withReader2("show", args.dir, async (reader) => {
+        const entry = entryOf(await reader.list(), args.ref);
         const changes = entry.files.map((file) => ({
           path: file.path,
           change: changeOf(file)
         }));
-        const diff = args.diff ? await textDiff(owner, entry) : void 0;
+        const diff = args.diff ? await textDiff(reader, entry) : void 0;
         const marks = changes.map((file) => `  ${file.change[0].toUpperCase()} ${file.path}`);
         print(
           args.json,
@@ -484,13 +511,13 @@ ${diff ?? marks.join("\n")}`
         ref: { type: "positional", required: true },
         path: { type: "positional", required: false }
       },
-      (args) => withOwner2("peek", args.dir, async (owner) => {
-        const files = await owner.peek(pointOf(await owner.list(), args.ref));
+      (args) => withReader2("peek", args.dir, async (reader) => {
+        const files = await reader.peek(pointOf(await reader.list(), args.ref));
         if (!files) throw new Refusal("That point is no longer kept");
         if (!args.path) return print(args.json, { files }, Object.keys(files).join("\n"));
         const hash = files[args.path];
         if (!hash) throw new Refusal(`${args.path} did not exist then`);
-        process.stdout.write(await owner.blob(hash));
+        process.stdout.write(await reader.blob(hash));
       })
     ),
     pin: () => sub(