@rightkit/release 0.2.164 → 0.2.165

package/disk-command.mjs

@@ -6,7 +6,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { spawnSync } from "./background-process.mjs";
 import { compareVersions } from "./rightkit-sync.mjs";
 import {
-  DISK_EXIT_WARNING, applySweep, checkDisk, ensureScratchRoots, formatBytes, listOpenPaths, logEvent, planSweep, platformKey, purgeHoldings, readDiskPolicy,
+  DISK_EXIT_WARNING, applySweep, checkDisk, ensureScratchRoots, formatBytes, listOpenPaths, logEvent, planSweep, platformKey, purgeHoldings, readDiskPolicy, setWorkspaceSweepAllowed,
 } from "./disk-policy.mjs";
 import { evaluateBinding, installStableRoot, readScheduleBinding, selfCheck } from "./disk-stable-root.mjs";
 
@@ -27,7 +27,7 @@ export function renderCheck(result) {
   return lines.join("\n");
 }
 
-export function renderSweep(plan, applied) {
+export function renderSweep(plan, applied, { all = false } = {}) {
   const lines = [`${applied ? "Swept" : "Dry run: would move"} ${plan.candidates.length} item(s), ${formatBytes(plan.totalBytes)} (stale > ${plan.staleDays} days)`];
   const rows = applied ? applied.results : plan.candidates;
   const byWriter = new Map();
@@ -35,24 +35,27 @@ export function renderSweep(plan, applied) {
   for (const [writer, items] of byWriter) {
     const total = items.reduce((s, r) => s + r.bytes, 0);
     lines.push(`  ${writer.padEnd(26)} ${String(items.length).padStart(4)} item(s) ${formatBytes(total).padStart(9)}`);
-    for (const r of [...items].sort((a, b) => b.bytes - a.bytes).slice(0, 5)) lines.push(`      ${formatBytes(r.bytes).padStart(9)}  ${r.path}${r.destination ? ` -> ${r.destination}` : ""}${r.ok === false ? `  FAILED: ${r.error}` : ""}`);
-    if (items.length > 5) lines.push(`      ... ${items.length - 5} more`);
+    for (const r of [...items].sort((a, b) => b.bytes - a.bytes).slice(0, all ? Infinity : 5)) lines.push(`      ${formatBytes(r.bytes).padStart(9)}  ${r.path}${r.destination ? ` -> ${r.destination}` : ""}${r.ok === false ? `  FAILED: ${r.error}` : ""}`);
+    if (!all && items.length > 5) lines.push(`      ... ${items.length - 5} more`);
   }
   const counts = {};
   for (const s of plan.skipped) counts[s.reason] = (counts[s.reason] ?? 0) + 1;
+  const reportOnly = plan.skipped.filter((s) => s.reason === "report-only");
+  if (reportOnly.length) lines.push(`  workspace-unknown is report-only on this host: ${reportOnly.length} unknown entr${reportOnly.length === 1 ? "y" : "ies"} will not be moved (opt in with: right-release disk allow-workspace-sweep)`);
   if (plan.skipped.length) lines.push(`  skipped: ${Object.entries(counts).map(([k, v]) => `${v} ${k}`).join(", ")}`);
   return lines.join("\n");
 }
 
 function parse(rest) {
-  const known = new Set(["--json", "--dry-run", "--delete", "--days", "--policy"]);
-  const opts = { json: false, dryRun: false, deleteMode: false, days: undefined, policy: undefined };
+  const known = new Set(["--json", "--dry-run", "--delete", "--all", "--days", "--policy"]);
+  const opts = { json: false, dryRun: false, deleteMode: false, all: false, days: undefined, policy: undefined };
   for (let i = 0; i < rest.length; i += 1) {
     const a = rest[i];
     if (!known.has(a)) throw new Error(`disk: unknown option ${a}`);
     if (a === "--json") opts.json = true;
     else if (a === "--dry-run") opts.dryRun = true;
     else if (a === "--delete") opts.deleteMode = true;
+    else if (a === "--all") opts.all = true;
     else { const v = rest[++i]; if (!v) throw new Error(`disk: ${a} needs a value`); if (a === "--days") opts.days = Number(v); else opts.policy = v; }
   }
   if (opts.days !== undefined && !(opts.days >= 0)) throw new Error("disk: --days must be a non-negative number");
@@ -246,6 +249,12 @@ export async function runDiskCommand(args = process.argv.slice(2), { env = proce
     const exitCode = schedule(rest[0], { stdout, cli: at === -1 ? undefined : rest[at + 1], platform, env });
     return { exitCode };
   }
+  if (command === "allow-workspace-sweep") {
+    const off = rest.includes("--off");
+    const file = setWorkspaceSweepAllowed(!off, { platform, env, ...(deps.flagHome ? { home: deps.flagHome } : {}) });
+    stdout(off ? `workspace-unknown sweep revoked on this host (${file}.revoked)` : `workspace-unknown sweep allowed on this host (${file}); review \`disk sweep --dry-run --all\` first, revoke with --off`);
+    return { exitCode: 0 };
+  }
   const opts = parse(rest);
   const policy = readDiskPolicy(opts.policy);
   const key = platformKey(platform);
@@ -262,9 +271,9 @@ export async function runDiskCommand(args = process.argv.slice(2), { env = proce
   if (command === "sweep") {
     if (!opts.dryRun) ensureScratchRoots({ policy, platform, env });
     const p = plan();
-    if (opts.dryRun) { out(p, renderSweep(p)); return { exitCode: 0, plan: p }; }
+    if (opts.dryRun) { out(p, renderSweep(p, undefined, { all: opts.all })); return { exitCode: 0, plan: p }; }
     const applied = applySweep({ plan: p, policy, platform, deleteMode: opts.deleteMode, ...deps.apply });
-    out({ ...p, applied }, renderSweep(p, applied));
+    out({ ...p, applied }, renderSweep(p, applied, { all: opts.all }));
     return { exitCode: applied.results.some((r) => !r.ok) ? 1 : 0, plan: p, applied };
   }
   if (command === "purge") {
@@ -294,7 +303,7 @@ export async function runDiskCommand(args = process.argv.slice(2), { env = proce
     if (warn) stdout(`WARNING: ${after.warnings.join("; ")}`);
     return { exitCode: !self.ok ? 2 : warn ? DISK_EXIT_WARNING : 0, before, after, applied, purged, selfCheck: self };
   }
-  throw new Error("disk usage: check|sweep [--dry-run|--delete] [--days N]|purge [--dry-run] [--days N]|run|schedule install|uninstall|status  [--json]");
+  throw new Error("disk usage: check|sweep [--dry-run|--delete] [--all]|allow-workspace-sweep [--off] [--days N]|purge [--dry-run] [--days N]|run|schedule install|uninstall|status  [--json]");
 }
 
 if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {

package/disk-policy.mjs

@@ -160,9 +160,33 @@ export function ensureScratchRoots({ policy, platform = process.platform, env =
 
 /** Top-level entries of each workspace root that are neither tracked by the workspace repo, nested git checkouts,
  * nor on the allowlist. Symlinks are listed (`symlink: true`) but sweep never touches them. */
+// Names that are always known at a workspace root, whatever the policy file says: agent instructions and agent state.
+export const WORKSPACE_ALWAYS_ALLOWED = ["CLAUDE.md", "AGENTS.md", "CLAUDE.local.md", ".claude", ".codex", ".agent", ".agents", ".membrane", "cockpit", "contributions"];
+const PROJECT_MARKERS = [".git", "package.json", "Cargo.toml"];
+
+/** Host-local opt-in for moving workspace-unknown entries. Without it the target is report-only on every host. */
+export function workspaceSweepFlagPath({ platform = process.platform, env = process.env, home = os.homedir() } = {}) {
+  if (platform === "win32" || platform === "win") {
+    if (!env.LOCALAPPDATA) return null;
+    return path.win32.join(env.LOCALAPPDATA, "Orthic Labs", "rightkit-release", "workspace-sweep-allowed");
+  }
+  return path.posix.join(home, "Library", "Application Support", "Orthic Labs", "rightkit-release", "workspace-sweep-allowed");
+}
+export function workspaceSweepAllowed(options = {}) {
+  const file = workspaceSweepFlagPath(options);
+  return Boolean(file) && existsSync(file);
+}
+export function setWorkspaceSweepAllowed(on, options = {}) {
+  const file = workspaceSweepFlagPath(options);
+  if (!file) throw new Error("disk: cannot place the host-local flag (LOCALAPPDATA is not set)");
+  if (on) { mkdirSync(path.dirname(file), { recursive: true }); writeFileSync(file, `workspace-unknown sweep allowed on this host ${new Date().toISOString()}\n`); }
+  else renameSync(file, `${file}.revoked`);
+  return file;
+}
+
 export function scanWorkspaceRoots({ policy, platform = process.platform, env = process.env, home = os.homedir(), tracked = (r) => workspaceTracked(r, { platform }) } = {}) {
   const key = platformKey(platform);
-  const allow = new Set((policy.workspaceAllowlist ?? []).map((n) => fold(n, key)));
+  const allow = new Set([...WORKSPACE_ALWAYS_ALLOWED, ...(policy.workspaceAllowlist ?? [])].map((n) => fold(n, key)));
   const unknown = [];
   const skipped = [];
   for (const entry of policy.workspaceRoots?.[key] ?? []) {
@@ -177,10 +201,12 @@ export function scanWorkspaceRoots({ policy, platform = process.platform, env =
     for (const name of names) {
       const folded = fold(name, key);
       if (allow.has(folded) || extra.has(folded) || trackedNames.has(folded)) continue;
+      if (/\.md$/i.test(name)) continue; // any markdown file at the root is documentation
       const full = path.join(root, name);
       let st;
       try { st = lstatSync(full); } catch { continue; }
-      if (!st.isSymbolicLink() && existsSync(path.join(full, ".git"))) continue; // nested git checkout
+      // a nested git checkout or any project directory (own package.json / Cargo.toml) is known
+      if (!st.isSymbolicLink() && st.isDirectory() && PROJECT_MARKERS.some((m) => existsSync(path.join(full, m)))) continue;
       unknown.push({ root, name, path: full, symlink: st.isSymbolicLink(), mtimeMs: st.mtimeMs });
     }
   }
@@ -206,7 +232,7 @@ export function checkDisk({ policy, platform = process.platform, env = process.e
   for (const w of writers) if (w.over) warnings.push(`${w.id} holds ${formatBytes(w.bytes)} over its ${formatBytes(w.capBytes)} cap`);
   const scanned = scan({ policy, platform, env, home });
   const unknown = scanned.unknown.map((u) => ({ root: u.root, name: u.name, path: u.path, symlink: u.symlink, bytes: u.symlink ? 0 : size(u.path), ageDays: Math.max(0, Math.floor((now - u.mtimeMs) / 86400_000)) }));
-  for (const u of unknown) warnings.push(`unknown top-level entry ${u.path} (${u.symlink ? "symlink" : formatBytes(u.bytes)}, ${u.ageDays}d old): track it, add it to workspaceAllowlist, or let sweep move it`);
+  for (const u of unknown) warnings.push(`unknown top-level entry ${u.path} (${u.symlink ? "symlink" : formatBytes(u.bytes)}, ${u.ageDays}d old): track it or add it to workspaceAllowlist (sweep only moves it on a host that ran \`disk allow-workspace-sweep\`)`);
   for (const s of scanned.skipped) warnings.push(`workspace root ${s.path}: tracked paths cannot be read from git, so unknown entries are not evaluated or swept`);
   return { schema: 1, platform: key, floor, writers, unknown, warnings, warn: warnings.length > 0 };
 }
@@ -272,7 +298,7 @@ export function gitTracksPath(target) {
   return String(listed.stdout).length > 0;
 }
 
-export function planSweep({ policy, platform = process.platform, env = process.env, home = os.homedir(), now = Date.now(), staleDays, openPaths, inUse, tracked = gitTracksPath, size = (p) => pathSize(p, { platform }), scan = scanWorkspaceRoots } = {}) {
+export function planSweep({ policy, platform = process.platform, env = process.env, home = os.homedir(), now = Date.now(), staleDays, openPaths, inUse, tracked = gitTracksPath, size = (p) => pathSize(p, { platform }), scan = scanWorkspaceRoots, workspaceSweep = workspaceSweepAllowed({ platform, env, home }) } = {}) {
   const key = platformKey(platform);
   const effectiveDays = staleDays ?? policy.staleDays;
   const candidates = [];
@@ -326,7 +352,11 @@ export function planSweep({ policy, platform = process.platform, env = process.e
     if (lockCheck(unit)) { skipped.push({ ...base, reason: "in-use" }); return; }
     candidates.push({ ...base, root, bytes: size(unit), mtime: new Date(st.mtimeMs).toISOString() });
   };
-  for (const u of scanned.unknown) consider("workspace-unknown", u.path, u.root, unknownCutoff);
+  // Report-only unless this host opted in (`disk allow-workspace-sweep`): unknown entries are warned about, never moved.
+  for (const u of scanned.unknown) {
+    if (!workspaceSweep) { skipped.push({ writer: "workspace-unknown", path: u.path, reason: "report-only" }); continue; }
+    consider("workspace-unknown", u.path, u.root, unknownCutoff);
+  }
   // Scratch roots: every child older than 3 days and idle (the same window).
   for (const root of scratchRoots(policy, { platform, env, home })) {
     let rst;
@@ -429,7 +459,7 @@ export function applySweep({ plan, policy, platform = process.platform, deleteMo
     try {
       // Re-verify at apply time: still the planned unit, not a symlink, still inside its root.
       if (!c.root || lstatSync(c.path).isSymbolicLink() || !isInsideRoot(c.path, c.root)) throw new Error("refused: path is not a sweepable unit inside its target root");
-      if (c.writer === "workspace-unknown" && existsSync(path.join(c.path, ".git"))) throw new Error("refused: a nested git checkout is never swept");
+      if (c.writer === "workspace-unknown" && PROJECT_MARKERS.some((m) => existsSync(path.join(c.path, m)))) throw new Error("refused: a nested git checkout or project directory is never swept");
       if (deleteMode) { remove(c.path); results.push({ ...c, action: "delete", ok: true }); logEvent(logFile, { event: "disk.sweep.delete", ...c }); continue; }
       // An item stays on its own volume: moving it elsewhere frees nothing on the volume that is short of space.
       const holding = pick(c.path, { policy, platform, env, home, date });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rightkit/release",
-  "version": "0.2.164",
+  "version": "0.2.165",
   "description": "Portable release CLI/SDK with fail-closed public GitHub Releases and private R2 + RightApps distribution.",
   "license": "MIT OR Apache-2.0",
   "type": "module",

package/release.mjs

@@ -51,7 +51,8 @@ const SIGN_MACOS = path.resolve(TOOL_ROOT, "sign-macos.mjs");
 const NOTARIZE_MACOS = path.resolve(TOOL_ROOT, "notarize-macos.mjs");
 const SIGN_UPDATER = path.resolve(TOOL_ROOT, "sign-updater.mjs");
 const RIGHTKIT_VERSIONS = JSON.parse(readFileSync(path.resolve(TOOL_ROOT, "rightkit-versions.json"), "utf8"));
-const VERSION = RIGHTKIT_VERSIONS.stagedNpm?.["@rightkit/release"] ?? RIGHTKIT_VERSIONS.npm["@rightkit/release"];
+// The running package's own version: the bundled feed lags by one release (it is written after the publish).
+const VERSION = JSON.parse(readFileSync(path.resolve(TOOL_ROOT, "package.json"), "utf8")).version;
 const TIERS = new Set(["patch", "update"]);
 const RIGHTKIT_ALLOWED = buildAllowedVersions(
   RIGHTKIT_VERSIONS.npm,

package/rightkit-versions.json

@@ -31,7 +31,7 @@
     "@rightkit/qa": "0.4.8",
     "@rightkit/qa-chrome": "0.1.6",
     "@rightkit/react-shell": "0.6.4",
-    "@rightkit/release": "0.2.163",
+    "@rightkit/release": "0.2.164",
     "@rightkit/settings-ui": "0.4.4",
     "@rightkit/tauri": "0.2.1",
     "@rightkit/tauri-shell": "0.1.1",
@@ -204,7 +204,8 @@
       "0.2.159",
       "0.2.160",
       "0.2.161",
-      "0.2.162"
+      "0.2.162",
+      "0.2.163"
     ],
     "@rightkit/qa": [
       "0.1.0",
@@ -516,7 +517,7 @@
       "@rightkit/qa": "0.4.8",
       "@rightkit/qa-chrome": "0.1.6",
       "@rightkit/react-shell": "0.6.4",
-      "@rightkit/release": "0.2.163",
+      "@rightkit/release": "0.2.164",
       "@rightkit/settings-ui": "0.4.4",
       "@rightkit/shell": "0.1.1",
       "@rightkit/tauri": "0.2.1",