@indigoai-us/hq-cli 5.345.135 → 5.345.137

package/dist/commands/storage.js

@@ -41,6 +41,7 @@ import { execFile } from "node:child_process";
 import { dropExpiredBackups, reclaimFields, reclaimWindowHours, runCoreScript, } from "./storage-core.js";
 import { S3Client, ListObjectVersionsCommand, DeleteObjectsCommand, } from "@aws-sdk/client-s3";
 import { PERSONAL_VAULT_EXCLUDED_TOP_LEVEL, VaultClient } from "@indigoai-us/hq-cloud";
+import * as hqCloud from "@indigoai-us/hq-cloud";
 import { buildVaultConfig, DEFAULT_COGNITO } from "../utils/cognito-session.js";
 import { resolveVaultCredential } from "../utils/resolve-vault-credential.js";
 import { vaultApiFetch } from "../utils/vault-api.js";
@@ -775,7 +776,10 @@ export function formatOffloadStatus(o) {
 export function formatOffload(r) {
     const lines = [];
     const h = r.history;
-    if (h.refused) {
+    if (h.skipped) {
+        // History was not part of this run.
+    }
+    else if (h.refused) {
         // Core's and the CLI's refusal messages may already say nothing changed;
         // add that sentence only when the message lacks it.
         const msg = (h.message ?? "").trim();
@@ -797,7 +801,7 @@ export function formatOffload(r) {
     else {
         lines.push(`History: uploaded ${h.uploaded} old version(s), ${formatBytes(h.bytes)}; freed ${formatBytes(h.freed_bytes)}`);
     }
-    if (h.available !== false) {
+    if (!h.skipped && h.available !== false) {
         const pending = reclaimLine(h);
         if (pending)
             lines.push(`  ${pending}`);
@@ -806,16 +810,44 @@ export function formatOffload(r) {
             lines.push(`  ${h.held_by_worktrees.count} more old version(s) (${formatBytes(h.held_by_worktrees.bytes)}) stay: ${names} still uses this history.`);
         }
     }
-    if (r.current.available === false) {
-        lines.push(`Current files: not available - ${r.current.reason ?? "unknown"}`);
+    const c = r.current;
+    if (c.skipped) {
+        // Current files were not part of this run.
+    }
+    else if (c.available === false) {
+        lines.push(`Current files: not available - ${c.reason ?? "unknown"}`);
     }
     else {
-        lines.push(`Current files: moved ${r.current.offloaded.length}, freed ${formatBytes(r.current.freed_bytes)}`);
+        const files = c.files ?? [];
+        if (r.dry_run) {
+            const todo = files.filter((f) => f.action !== "skip");
+            lines.push(`Current files: would offload ${todo.length} of ${files.length}, ${formatBytes(todo.reduce((n, f) => n + f.bytes, 0))}`);
+        }
+        else {
+            lines.push(`Current files: moved ${c.offloaded.length}, freed ${formatBytes(c.freed_bytes)}`);
+        }
+        for (const f of files)
+            lines.push(`  ${formatCurrentFile(f)}`);
+        if (c.message)
+            lines.push(`  ${c.message}`);
     }
     for (const e of r.errors)
         lines.push(chalk.red(`  ${e}`));
     return lines.join("\n");
 }
+const CURRENT_ACTION_LABEL = {
+    "point-at-vault": "point at vault",
+    upload: "upload",
+    skip: "skip",
+};
+/** One `--current` plan line: path, size, owning vault, sync state, action. */
+function formatCurrentFile(f) {
+    const vault = f.vault === "company" ? `company ${f.company ?? "?"}` : "personal vault";
+    const parts = [f.path, formatBytes(f.bytes), vault, f.synced ? "synced" : "not synced", CURRENT_ACTION_LABEL[f.action]];
+    if (f.action === "skip" && f.reason)
+        parts.push(`(${f.reason})`);
+    return parts.join("  ");
+}
 /** One line on when backed-up space comes back, or nothing. */
 export function reclaimLine(r) {
     const pending = num(r.pending_reclaim_bytes);
@@ -993,6 +1025,7 @@ async function buildOffloadDeps() {
         }
         return companiesFromMemberships(await res.json());
     };
+    const journals = new Map();
     return {
         hqRoot,
         now: () => new Date(),
@@ -1008,6 +1041,25 @@ async function buildOffloadDeps() {
             return personalS3Store({ bucket, region: DEFAULT_COGNITO.region, credentials });
         },
         activeCompanySlugs: async () => (await activeCompanies()).map((c) => c.slug),
+        // Current-file offload replaces a file with a placeholder only when the
+        // installed sync engine holds every `.hqcloud` sibling (no delete, no
+        // download over it). Older engines lack the flag, so this stays false.
+        syncHoldsPlaceholders: () => hqCloud.CLOUD_PLACEHOLDER_HOLDS_ANY_SIBLING === true,
+        // What HQ sync last stored for a file, read from its local journal.
+        // Company journal keys are relative to the company folder; personal keys
+        // are relative to the HQ root. Read-only: offload never writes a journal.
+        syncRecord: async (target) => {
+            const slug = target.vault === "company" ? target.slug : hqCloud.PERSONAL_VAULT_JOURNAL_SLUG;
+            let journal = journals.get(slug);
+            if (!journal) {
+                journal = hqCloud.readJournal(slug);
+                journals.set(slug, journal);
+            }
+            const entry = hqCloud.getEntry(journal, target.key);
+            if (!entry || hqCloud.isTombstone(entry))
+                return null;
+            return { hash: entry.hash, size: entry.size, remoteEtag: entry.remoteEtag };
+        },
         // Read-only, for placeholders that HQ sync rewrote. Company credentials
         // come from the existing membership-scoped /sts/vend path.
         openVaultObjects: async (target) => {
@@ -1169,11 +1221,11 @@ export function registerStorageCommand(program) {
     });
     storage
         .command("offload")
-        .description("Move big files to your personal HQ cloud storage and leave links behind (old versions in history; idle current files)")
+        .description("Move big files to HQ cloud storage and leave links behind (old versions in history; with --current, idle working files to the vault that owns them)")
         .option("--min-size <size>", "Only files at least this big, e.g. 50MB (env HQ_OFFLOAD_MIN_BYTES)")
         .option("--idle-days <days>", "Current files must be untouched this many days", String(DEFAULT_IDLE_DAYS))
         .option("--history", "Only old versions in local autosave history")
-        .option("--current", "Only idle files in the working tree")
+        .option("--current [paths...]", "Idle working files instead of history; optional HQ paths limit it to those files or folders")
         .option("--dry-run", "Show what would move without uploading or changing anything")
         .option("--yes", "Skip the confirmation prompt")
         .option("--json", "Print JSON")
@@ -1188,6 +1240,7 @@ export function registerStorageCommand(program) {
                 idleDays,
                 history: Boolean(opts.history),
                 current: Boolean(opts.current),
+                paths: Array.isArray(opts.current) ? opts.current : undefined,
                 dryRun: Boolean(opts.dryRun),
                 yes: Boolean(opts.yes),
             }, await buildOffloadDeps());