harnessed 2.0.0 → 2.0.1

package/dist/cli.mjs

@@ -785,7 +785,7 @@ var init_resume = __esm({
 
 // package.json
 var package_default = {
-  version: "2.0.0"};
+  version: "2.0.1"};
 
 // src/manifest/errors.ts
 function instancePathToKeyPath(instancePath) {
@@ -1566,7 +1566,7 @@ function renderHumanTable(records) {
   }
 }
 function pipeToJq(filterExpr, lines) {
-  return new Promise((resolve11, reject) => {
+  return new Promise((resolve8, reject) => {
     const child = spawn("jq", [filterExpr], {
       stdio: ["pipe", "inherit", "inherit"],
       windowsHide: true
@@ -1575,12 +1575,12 @@ function pipeToJq(filterExpr, lines) {
       const e = err2;
       if (e.code === "ENOENT") {
         console.error("\u2717 jq not found in PATH \u2014 run: harnessed doctor");
-        resolve11(1);
+        resolve8(1);
       } else {
         reject(err2);
       }
     });
-    child.on("close", (code) => resolve11(code ?? 0));
+    child.on("close", (code) => resolve8(code ?? 0));
     child.stdin.write(lines.join("\n"));
     child.stdin.end();
   });
@@ -1638,19 +1638,132 @@ function registerAuditLog(program2) {
     }
   );
 }
+function getBackupRoot() {
+  return join(homedir(), ".harnessed", "backups");
+}
+var HOME_DIR = process.env.HOME ?? process.env.USERPROFILE ?? "";
+function mirrorPath(target, scope, backupDir) {
+  const root = scope === "HOME" ? HOME_DIR : ".";
+  const rel = root ? relative(root, target) : target;
+  if (!rel || rel.startsWith("..")) {
+    const flat = createHash("sha1").update(target).digest("hex").slice(0, 16);
+    return join(backupDir, scope, flat);
+  }
+  return join(backupDir, scope, rel);
+}
+function detectEol(buf) {
+  return buf.includes("\r\n") ? "crlf" : "lf";
+}
+async function backup(plan, ctx) {
+  const filename = ctx.manifest.metadata.name;
+  const backupId = (/* @__PURE__ */ new Date()).toISOString().replace(/:/g, "-");
+  const backupDir = join(getBackupRoot(), backupId);
+  try {
+    await mkdir(backupDir, { recursive: true });
+  } catch (err2) {
+    return {
+      ok: false,
+      error: {
+        file: filename,
+        path: "/",
+        message: `failed to create backup dir ${backupDir}: ${err2.message}`,
+        line: null,
+        column: null,
+        keyword: "backup-mkdir-failed"
+      }
+    };
+  }
+  const entries = [];
+  for (const file of plan.files) {
+    let buf;
+    try {
+      buf = await readFile(file.target);
+    } catch (err2) {
+      const code = err2.code;
+      if (code === "ENOENT" && file.oldText === "") {
+        entries.push({
+          target: file.target,
+          backup: "",
+          // sentinel: no backup written; rollback should unlink target
+          sha1: "",
+          eol: "lf"
+          // moot for non-existent file; default to lf
+        });
+        continue;
+      }
+      return {
+        ok: false,
+        error: {
+          file: filename,
+          path: file.target,
+          message: `failed to read original file for backup: ${err2.message}`,
+          line: null,
+          column: null,
+          keyword: "backup-read-failed"
+        }
+      };
+    }
+    const sha1 = createHash("sha1").update(buf).digest("hex");
+    const eol = detectEol(buf);
+    const dest = mirrorPath(file.target, file.scope, backupDir);
+    try {
+      await mkdir(dirname(dest), { recursive: true });
+      await writeFile(dest, buf);
+    } catch (err2) {
+      return {
+        ok: false,
+        error: {
+          file: filename,
+          path: dest,
+          message: `failed to write backup copy: ${err2.message}`,
+          line: null,
+          column: null,
+          keyword: "backup-write-failed"
+        }
+      };
+    }
+    entries.push({ target: file.target, backup: dest, sha1, eol });
+  }
+  const metadata = {
+    installer: filename,
+    manifest: filename,
+    timestamp: backupId,
+    files: entries
+  };
+  const metadataPath = join(backupDir, "metadata.json");
+  try {
+    await writeFile(metadataPath, `${JSON.stringify(metadata, null, 2)}
+`, "utf8");
+  } catch (err2) {
+    return {
+      ok: false,
+      error: {
+        file: filename,
+        path: metadataPath,
+        message: `failed to write metadata.json: ${err2.message}`,
+        line: null,
+        column: null,
+        keyword: "backup-metadata-failed"
+      }
+    };
+  }
+  return { ok: true, backupId, backupDir };
+}
+
+// src/cli/backup-list.ts
 function registerBackupList(program2) {
   const backup2 = program2.command("backup").description("Backup snapshot operations");
   backup2.command("list").description("List backup snapshots under .harnessed-backup/").action(async () => {
-    const root = resolve(process.cwd(), ".harnessed-backup");
+    const root = getBackupRoot();
     let dirs;
     try {
       dirs = (await readdir(root, { withFileTypes: true })).filter((e) => e.isDirectory()).map((e) => e.name).sort();
     } catch {
-      console.log("no backups found (.harnessed-backup/ absent)");
+      console.log(`no backups found (${root} absent)`);
       return;
     }
     if (dirs.length === 0) {
-      console.log("no backups found (.harnessed-backup/ empty)");
+      console.log(`no backups found (${root} empty)`);
       return;
     }
     for (const ts of dirs) {
@@ -2721,12 +2834,12 @@ function registerGc(program2) {
       return;
     }
     const keepLast = Number.parseInt(opts.keepLast ?? "0", 10);
-    const root = resolve(process.cwd(), ".harnessed-backup");
+    const root = getBackupRoot();
     let dirs;
     try {
       dirs = (await readdir(root, { withFileTypes: true })).filter((e) => e.isDirectory()).map((e) => e.name).sort();
     } catch {
-      console.log("no backups found (.harnessed-backup/ absent) \u2014 nothing to gc");
+      console.log(`no backups found (${root} absent) \u2014 nothing to gc`);
       return;
     }
     const cutoff = Date.now() - olderMs;
@@ -2763,114 +2876,6 @@ function registerGc(program2) {
     if (dryRun) console.log("\n(dry-run \u2014 re-run with --apply to actually delete)");
   });
 }
-var HOME_DIR = process.env.HOME ?? process.env.USERPROFILE ?? "";
-function mirrorPath(target, scope, backupDir) {
-  const root = scope === "HOME" ? HOME_DIR : ".";
-  const rel = root ? relative(root, target) : target;
-  if (!rel || rel.startsWith("..")) {
-    const flat = createHash("sha1").update(target).digest("hex").slice(0, 16);
-    return join(backupDir, scope, flat);
-  }
-  return join(backupDir, scope, rel);
-}
-function detectEol(buf) {
-  return buf.includes("\r\n") ? "crlf" : "lf";
-}
-async function backup(plan, ctx) {
-  const filename = ctx.manifest.metadata.name;
-  const backupId = (/* @__PURE__ */ new Date()).toISOString().replace(/:/g, "-");
-  const backupDir = join(ctx.cwd, ".harnessed-backup", backupId);
-  try {
-    await mkdir(backupDir, { recursive: true });
-  } catch (err2) {
-    return {
-      ok: false,
-      error: {
-        file: filename,
-        path: "/",
-        message: `failed to create backup dir ${backupDir}: ${err2.message}`,
-        line: null,
-        column: null,
-        keyword: "backup-mkdir-failed"
-      }
-    };
-  }
-  const entries = [];
-  for (const file of plan.files) {
-    let buf;
-    try {
-      buf = await readFile(file.target);
-    } catch (err2) {
-      const code = err2.code;
-      if (code === "ENOENT" && file.oldText === "") {
-        entries.push({
-          target: file.target,
-          backup: "",
-          // sentinel: no backup written; rollback should unlink target
-          sha1: "",
-          eol: "lf"
-          // moot for non-existent file; default to lf
-        });
-        continue;
-      }
-      return {
-        ok: false,
-        error: {
-          file: filename,
-          path: file.target,
-          message: `failed to read original file for backup: ${err2.message}`,
-          line: null,
-          column: null,
-          keyword: "backup-read-failed"
-        }
-      };
-    }
-    const sha1 = createHash("sha1").update(buf).digest("hex");
-    const eol = detectEol(buf);
-    const dest = mirrorPath(file.target, file.scope, backupDir);
-    try {
-      await mkdir(dirname(dest), { recursive: true });
-      await writeFile(dest, buf);
-    } catch (err2) {
-      return {
-        ok: false,
-        error: {
-          file: filename,
-          path: dest,
-          message: `failed to write backup copy: ${err2.message}`,
-          line: null,
-          column: null,
-          keyword: "backup-write-failed"
-        }
-      };
-    }
-    entries.push({ target: file.target, backup: dest, sha1, eol });
-  }
-  const metadata = {
-    installer: filename,
-    manifest: filename,
-    timestamp: backupId,
-    files: entries
-  };
-  const metadataPath = join(backupDir, "metadata.json");
-  try {
-    await writeFile(metadataPath, `${JSON.stringify(metadata, null, 2)}
-`, "utf8");
-  } catch (err2) {
-    return {
-      ok: false,
-      error: {
-        file: filename,
-        path: metadataPath,
-        message: `failed to write metadata.json: ${err2.message}`,
-        line: null,
-        column: null,
-        keyword: "backup-metadata-failed"
-      }
-    };
-  }
-  return { ok: true, backupId, backupDir };
-}
 async function confirmAt(level, ctx) {
   if (level === "L4" && !ctx.opts.system) {
     if (!ctx.opts.nonInteractive) {
@@ -3152,7 +3157,7 @@ var installCcHookAdd = async (ctx) => {
   return { ok: true, backupId: bk.backupId, appliedFiles: [settingsPath] };
 };
 function runArgs(claudeArgs, cwd, timeoutMs = 15e3) {
-  return new Promise((resolve11) => {
+  return new Promise((resolve8) => {
     const isWin = process.platform === "win32";
     const child = isWin ? spawn("cmd.exe", ["/c", "claude", ...claudeArgs], { cwd, windowsHide: true }) : spawn("claude", claudeArgs, { cwd, shell: false });
     let stderr = "";
@@ -3161,15 +3166,15 @@ function runArgs(claudeArgs, cwd, timeoutMs = 15e3) {
     });
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve11({ exitCode: -1, stderr: `${stderr}[timeout after ${timeoutMs}ms]` });
+      resolve8({ exitCode: -1, stderr: `${stderr}[timeout after ${timeoutMs}ms]` });
     }, timeoutMs);
     child.on("error", (e) => {
       clearTimeout(timer);
-      resolve11({ exitCode: -1, stderr: `${stderr}${e.message}` });
+      resolve8({ exitCode: -1, stderr: `${stderr}${e.message}` });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve11({ exitCode: code ?? -1, stderr });
+      resolve8({ exitCode: code ?? -1, stderr });
     });
   });
 }
@@ -3310,7 +3315,7 @@ ${newEntry}
       )
     };
   }
-  const vr = await new Promise((resolve11) => {
+  const vr = await new Promise((resolve8) => {
     const child = spawn(verifyShell, [verifyFlag, verifyLine], { cwd: ctx.cwd, windowsHide: true });
     let stderr = "";
     child.stderr?.setEncoding("utf8").on("data", (c) => {
@@ -3318,15 +3323,15 @@ ${newEntry}
     });
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve11({ exitCode: -1, stderr: `${stderr}[timeout]` });
+      resolve8({ exitCode: -1, stderr: `${stderr}[timeout]` });
     }, 15e3);
     child.on("error", (e) => {
       clearTimeout(timer);
-      resolve11({ exitCode: -1, stderr: e.message });
+      resolve8({ exitCode: -1, stderr: e.message });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve11({ exitCode: code ?? -1, stderr });
+      resolve8({ exitCode: code ?? -1, stderr });
     });
   });
   if (vr.exitCode !== 0) {
@@ -3382,10 +3387,10 @@ async function spawnCmd(ctx, cmd, args) {
   child.stderr?.setEncoding("utf8").on("data", (chunk) => {
     stderr += chunk;
   });
-  return await new Promise((resolve11) => {
+  return await new Promise((resolve8) => {
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve11({
+      resolve8({
         ok: false,
         phase: "spawn",
         error: {
@@ -3400,7 +3405,7 @@ async function spawnCmd(ctx, cmd, args) {
     }, timeoutMs);
     child.on("error", (err2) => {
       clearTimeout(timer);
-      resolve11({
+      resolve8({
         ok: false,
         phase: "spawn",
         error: {
@@ -3415,14 +3420,14 @@ async function spawnCmd(ctx, cmd, args) {
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve11({ ok: true, exitCode: code ?? -1, stdout: stdout2, stderr });
+      resolve8({ ok: true, exitCode: code ?? -1, stdout: stdout2, stderr });
     });
   });
 }
 
 // src/installers/gitCloneWithSetup.ts
 function gitRevParseHead(cwd, timeoutMs = 1e4) {
-  return new Promise((resolve11) => {
+  return new Promise((resolve8) => {
     const isWin = process.platform === "win32";
     const child = isWin ? spawn("cmd.exe", ["/c", "git", "rev-parse", "HEAD"], { cwd, windowsHide: true }) : spawn("git", ["rev-parse", "HEAD"], { cwd, shell: false });
     let stdout2 = "";
@@ -3431,15 +3436,15 @@ function gitRevParseHead(cwd, timeoutMs = 1e4) {
     });
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve11({ sha: "", exit: -1 });
+      resolve8({ sha: "", exit: -1 });
     }, timeoutMs);
     child.on("error", () => {
       clearTimeout(timer);
-      resolve11({ sha: "", exit: -1 });
+      resolve8({ sha: "", exit: -1 });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve11({ sha: stdout2.trim(), exit: code ?? -1 });
+      resolve8({ sha: stdout2.trim(), exit: code ?? -1 });
     });
   });
 }
@@ -3779,7 +3784,7 @@ ${newEntry}
       )
     };
   }
-  const vr = await new Promise((resolve11) => {
+  const vr = await new Promise((resolve8) => {
     const child = spawn(verifyShell, [verifyFlag, verifyLine], { cwd: ctx.cwd, windowsHide: true });
     let stderr = "";
     child.stderr?.setEncoding("utf8").on("data", (c) => {
@@ -3787,15 +3792,15 @@ ${newEntry}
     });
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve11({ exitCode: -1, stderr: `${stderr}[timeout]` });
+      resolve8({ exitCode: -1, stderr: `${stderr}[timeout]` });
     }, 15e3);
     child.on("error", (e) => {
       clearTimeout(timer);
-      resolve11({ exitCode: -1, stderr: e.message });
+      resolve8({ exitCode: -1, stderr: e.message });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve11({ exitCode: code ?? -1, stderr });
+      resolve8({ exitCode: code ?? -1, stderr });
     });
   });
   if (vr.exitCode !== 0) {
@@ -3927,7 +3932,7 @@ ${newEntry}
       )
     };
   }
-  const vr = await new Promise((resolve11) => {
+  const vr = await new Promise((resolve8) => {
     const child = spawn(verifyShell, [verifyFlag, verifyLine], { cwd: ctx.cwd, windowsHide: true });
     let stderr = "";
     child.stderr?.setEncoding("utf8").on("data", (c) => {
@@ -3935,15 +3940,15 @@ ${newEntry}
     });
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve11({ exitCode: -1, stderr: `${stderr}[timeout]` });
+      resolve8({ exitCode: -1, stderr: `${stderr}[timeout]` });
     }, 15e3);
     child.on("error", (e) => {
       clearTimeout(timer);
-      resolve11({ exitCode: -1, stderr: e.message });
+      resolve8({ exitCode: -1, stderr: e.message });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve11({ exitCode: code ?? -1, stderr });
+      resolve8({ exitCode: code ?? -1, stderr });
     });
   });
   if (vr.exitCode !== 0) {
@@ -4515,7 +4520,7 @@ function normalizeEol(buf, eol) {
 }
 function registerRollback(program2) {
   program2.command("rollback <timestamp>").description("Restore files from a backup snapshot (preserves original LF/CRLF)").action(async (timestamp) => {
-    const dir = resolve(process.cwd(), ".harnessed-backup", timestamp);
+    const dir = join(getBackupRoot(), timestamp);
     const metaPath = join(dir, "metadata.json");
     let meta;
     try {
@@ -4958,7 +4963,7 @@ var uninstallNpmCli = async (ctx) => {
   const m = install.cmd.match(/npm\s+(?:install|i)\s+(?:-g\s+)?(\S+)/);
   const pkg = m?.[1] ?? ctx.manifest.metadata.upstream.source;
   const isWin = process.platform === "win32";
-  const result = await new Promise((resolve11) => {
+  const result = await new Promise((resolve8) => {
     const child = isWin ? spawn("cmd.exe", ["/c", "npm", "uninstall", "-g", pkg], { windowsHide: true }) : spawn("npm", ["uninstall", "-g", pkg], { shell: false });
     let stderr = "";
     child.stderr?.setEncoding("utf8").on("data", (c) => {
@@ -4966,15 +4971,15 @@ var uninstallNpmCli = async (ctx) => {
     });
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve11({ exitCode: -1, stderr: `${stderr}[timeout]` });
+      resolve8({ exitCode: -1, stderr: `${stderr}[timeout]` });
     }, 3e4);
     child.on("error", (e) => {
       clearTimeout(timer);
-      resolve11({ exitCode: -1, stderr: e.message });
+      resolve8({ exitCode: -1, stderr: e.message });
     });
     child.on("close", (code) => {
       clearTimeout(timer);
-      resolve11({ exitCode: code ?? -1, stderr });
+      resolve8({ exitCode: code ?? -1, stderr });
     });
   });
   if (result.exitCode !== 0) {