@ascenda-one/history-import 0.1.12 → 0.1.13

package/dist/cli.js

@@ -242,10 +242,29 @@ var require_afterHours = __commonJS({
   "../packages/tool-kit/out/afterHours.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.isAfterHours = isAfterHours4;
+    exports.BUSINESS_DAY = void 0;
+    exports.isOutsideBusinessHours = isOutsideBusinessHours2;
+    exports.isAfterHours = isAfterHours3;
     exports.utcOffsetMinutesAt = utcOffsetMinutesAt2;
     exports.localHourAt = localHourAt;
-    function isAfterHours4(now = /* @__PURE__ */ new Date(), start = "19:00", end = "07:00") {
+    exports.BUSINESS_DAY = {
+      /** 0 = Sunday … 6 = Saturday. */
+      days: [1, 2, 3, 4, 5],
+      start: "09:00",
+      end: "17:00"
+    };
+    function isOutsideBusinessHours2(at = /* @__PURE__ */ new Date(), opts = {}) {
+      const days = opts.days ?? exports.BUSINESS_DAY.days;
+      if (!days.includes(at.getDay()))
+        return true;
+      const minutes = at.getHours() * 60 + at.getMinutes();
+      const start = parseTimeToMinutes(opts.start ?? exports.BUSINESS_DAY.start, 9 * 60);
+      const end = parseTimeToMinutes(opts.end ?? exports.BUSINESS_DAY.end, 17 * 60);
+      if (start >= end)
+        return false;
+      return minutes < start || minutes >= end;
+    }
+    function isAfterHours3(now = /* @__PURE__ */ new Date(), start = "19:00", end = "07:00") {
       const currentMinutes = now.getHours() * 60 + now.getMinutes();
       const startMinutes = parseTimeToMinutes(start, 19 * 60);
       const endMinutes = parseTimeToMinutes(end, 7 * 60);
@@ -304,9 +323,9 @@ var require_payload = __commonJS({
       }
       return void 0;
     }
-    function getNested(input, path9) {
+    function getNested(input, path10) {
       let current = input;
-      for (const segment of path9) {
+      for (const segment of path10) {
         if (!current || typeof current !== "object")
           return void 0;
         current = current[segment];
@@ -314,16 +333,16 @@ var require_payload = __commonJS({
       return current;
     }
     function getNestedString(input, paths) {
-      for (const path9 of paths) {
-        const value = getNested(input, path9);
+      for (const path10 of paths) {
+        const value = getNested(input, path10);
         if (typeof value === "string" && value.trim())
           return value;
       }
       return void 0;
     }
     function getNestedNumber(input, paths) {
-      for (const path9 of paths) {
-        const value = getNested(input, path9);
+      for (const path10 of paths) {
+        const value = getNested(input, path10);
         if (typeof value === "number" && Number.isFinite(value))
           return value;
       }
@@ -471,9 +490,9 @@ var require_eventLog = __commonJS({
     exports.expandUserPath = expandUserPath;
     exports.resolveEventLogPath = resolveEventLogPath;
     exports.appendEventLog = appendEventLog;
-    var fs9 = __importStar(__require("fs"));
+    var fs10 = __importStar(__require("fs"));
     var os3 = __importStar(__require("os"));
-    var path9 = __importStar(__require("path"));
+    var path10 = __importStar(__require("path"));
     exports.EVENT_LOG_ENV_VAR = "ASCENDA_EVENT_LOG_FILE";
     var MAX_BYTES = 5 * 1024 * 1024;
     function expandUserPath(configured) {
@@ -483,8 +502,8 @@ var require_eventLog = __commonJS({
       if (value === "~")
         return os3.homedir();
       if (value.startsWith("~/"))
-        return path9.join(os3.homedir(), value.slice(2));
-      return path9.resolve(value);
+        return path10.join(os3.homedir(), value.slice(2));
+      return path10.resolve(value);
     }
     function resolveEventLogPath() {
       return expandUserPath(process.env[exports.EVENT_LOG_ENV_VAR]);
@@ -492,20 +511,20 @@ var require_eventLog = __commonJS({
     function appendEventLog(logFilePath, entry) {
       try {
         rotateIfLarge(logFilePath);
-        const dir = path9.dirname(logFilePath);
-        fs9.mkdirSync(dir, { recursive: true, mode: 448 });
-        fs9.appendFileSync(logFilePath, `${JSON.stringify(entry)}
+        const dir = path10.dirname(logFilePath);
+        fs10.mkdirSync(dir, { recursive: true, mode: 448 });
+        fs10.appendFileSync(logFilePath, `${JSON.stringify(entry)}
 `, { encoding: "utf8", mode: 384 });
         if (process.platform !== "win32")
-          fs9.chmodSync(logFilePath, 384);
+          fs10.chmodSync(logFilePath, 384);
       } catch {
       }
     }
     function rotateIfLarge(logFilePath) {
       try {
-        if (fs9.statSync(logFilePath).size < MAX_BYTES)
+        if (fs10.statSync(logFilePath).size < MAX_BYTES)
           return;
-        fs9.renameSync(logFilePath, `${logFilePath}.1`);
+        fs10.renameSync(logFilePath, `${logFilePath}.1`);
       } catch {
       }
     }
@@ -660,26 +679,26 @@ var require_tokenStore = __commonJS({
     exports.persistEventWriteToken = persistEventWriteToken;
     exports.readTokenFile = readTokenFile2;
     exports.sanitizeFilePart = sanitizeFilePart;
-    var fs9 = __importStar(__require("fs"));
+    var fs10 = __importStar(__require("fs"));
     var os3 = __importStar(__require("os"));
-    var path9 = __importStar(__require("path"));
+    var path10 = __importStar(__require("path"));
     function defaultTokenFilePath2(toolInstallationId) {
-      return path9.join(os3.homedir(), ".ascenda", "tokens", sanitizeFilePart(toolInstallationId));
+      return path10.join(os3.homedir(), ".ascenda", "tokens", sanitizeFilePart(toolInstallationId));
     }
     function persistEventWriteToken(tokenFilePath, token) {
-      const dir = path9.dirname(tokenFilePath);
-      fs9.mkdirSync(dir, { recursive: true, mode: 448 });
-      fs9.writeFileSync(tokenFilePath, token, { encoding: "utf8", mode: 384 });
+      const dir = path10.dirname(tokenFilePath);
+      fs10.mkdirSync(dir, { recursive: true, mode: 448 });
+      fs10.writeFileSync(tokenFilePath, token, { encoding: "utf8", mode: 384 });
       if (process.platform !== "win32") {
-        fs9.chmodSync(dir, 448);
-        fs9.chmodSync(tokenFilePath, 384);
+        fs10.chmodSync(dir, 448);
+        fs10.chmodSync(tokenFilePath, 384);
       }
     }
     function readTokenFile2(tokenFilePath) {
       try {
-        if (!fs9.existsSync(tokenFilePath))
+        if (!fs10.existsSync(tokenFilePath))
           return void 0;
-        const value = fs9.readFileSync(tokenFilePath, "utf8").trim();
+        const value = fs10.readFileSync(tokenFilePath, "utf8").trim();
         return value || void 0;
       } catch {
         return void 0;
@@ -738,20 +757,20 @@ var require_stateStore = __commonJS({
     exports.recordSendOutcome = recordSendOutcome;
     exports.shouldAnnounceFailure = shouldAnnounceFailure;
     exports.markFailureNotified = markFailureNotified;
-    var fs9 = __importStar(__require("fs"));
+    var fs10 = __importStar(__require("fs"));
     var os3 = __importStar(__require("os"));
-    var path9 = __importStar(__require("path"));
+    var path10 = __importStar(__require("path"));
     var tokenStore_1 = require_tokenStore();
     function defaultStateFilePath(toolInstallationId) {
       const dir = process.env.ASCENDA_STATE_DIR?.trim();
-      const base = dir ? dir : path9.join(os3.homedir(), ".ascenda", "state");
-      return path9.join(base, `${(0, tokenStore_1.sanitizeFilePart)(toolInstallationId)}.json`);
+      const base = dir ? dir : path10.join(os3.homedir(), ".ascenda", "state");
+      return path10.join(base, `${(0, tokenStore_1.sanitizeFilePart)(toolInstallationId)}.json`);
     }
     function readCollectorState(stateFilePath) {
       try {
-        if (!fs9.existsSync(stateFilePath))
+        if (!fs10.existsSync(stateFilePath))
           return void 0;
-        const raw = fs9.readFileSync(stateFilePath, "utf8").trim();
+        const raw = fs10.readFileSync(stateFilePath, "utf8").trim();
         if (!raw)
           return void 0;
         const parsed = JSON.parse(raw);
@@ -797,17 +816,17 @@ var require_stateStore = __commonJS({
     function writeStateFile(stateFilePath, state) {
       const temporaryPath = `${stateFilePath}.${process.pid}.tmp`;
       try {
-        const dir = path9.dirname(stateFilePath);
-        fs9.mkdirSync(dir, { recursive: true, mode: 448 });
-        fs9.writeFileSync(temporaryPath, `${JSON.stringify(state, null, 2)}
+        const dir = path10.dirname(stateFilePath);
+        fs10.mkdirSync(dir, { recursive: true, mode: 448 });
+        fs10.writeFileSync(temporaryPath, `${JSON.stringify(state, null, 2)}
 `, { encoding: "utf8", mode: 384 });
-        fs9.renameSync(temporaryPath, stateFilePath);
+        fs10.renameSync(temporaryPath, stateFilePath);
         if (process.platform !== "win32")
-          fs9.chmodSync(stateFilePath, 384);
+          fs10.chmodSync(stateFilePath, 384);
       } catch {
         try {
-          if (fs9.existsSync(temporaryPath))
-            fs9.unlinkSync(temporaryPath);
+          if (fs10.existsSync(temporaryPath))
+            fs10.unlinkSync(temporaryPath);
         } catch {
         }
       }
@@ -847,6 +866,7 @@ var require_eventSender = __commonJS({
         utcOffsetMinutes: (0, afterHours_1.utcOffsetMinutesAt)(/* @__PURE__ */ new Date()),
         sessionId: identity.sessionId ?? void 0,
         workspaceHash: identity.workspaceHash ?? void 0,
+        projectHash: identity.projectHash ?? void 0,
         consentScope: tool_contract_1.ASCENDA_CONSENT_SCOPE,
         provenance: tool_contract_1.ASCENDA_PROVENANCE,
         privacyMode: "metadata_only",
@@ -902,6 +922,7 @@ var require_eventSender = __commonJS({
           severity: "low",
           sessionId: this.config.sessionId ?? void 0,
           workspaceHash: this.config.workspaceHash ?? void 0,
+          projectHash: this.config.projectHash ?? void 0,
           consentScope: tool_contract_1.ASCENDA_SEMANTIC_CONSENT_SCOPE,
           provenance: tool_contract_1.ASCENDA_SEMANTIC_PROVENANCE,
           privacyMode: "metadata_only",
@@ -931,6 +952,7 @@ var require_eventSender = __commonJS({
           severity: "low",
           sessionId: this.config.sessionId ?? void 0,
           workspaceHash: this.config.workspaceHash ?? void 0,
+          projectHash: this.config.projectHash ?? void 0,
           consentScope: tool_contract_1.ASCENDA_COLLABORATION_CONSENT_SCOPE,
           provenance: tool_contract_1.ASCENDA_PROVENANCE,
           privacyMode: "metadata_only",
@@ -970,7 +992,7 @@ var require_eventSender = __commonJS({
           return (0, http_1.postToolEvent)(this.config.apiBaseUrl, this.eventWriteToken, payload, this.signal());
         }
         if (outcome.result === "transport_error" && (outcome.httpStatus === void 0 || (0, http_1.isRetryableStatus)(outcome.httpStatus))) {
-          await new Promise((resolve) => setTimeout(resolve, RETRY_DELAY_MS));
+          await new Promise((resolve2) => setTimeout(resolve2, RETRY_DELAY_MS));
           return (0, http_1.postToolEvent)(this.config.apiBaseUrl, this.eventWriteToken, payload, this.signal());
         }
         return outcome;
@@ -1021,19 +1043,387 @@ var require_eventSender = __commonJS({
   }
 });
 
+// ../packages/tool-kit/out/contextRegistry.js
+var require_contextRegistry = __commonJS({
+  "../packages/tool-kit/out/contextRegistry.js"(exports) {
+    "use strict";
+    var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    } : function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__importStar || /* @__PURE__ */ function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    }();
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.workContextRegistryFilePath = workContextRegistryFilePath;
+    exports.readWorkContextRegistry = readWorkContextRegistry;
+    exports.recordWorkContext = recordWorkContext2;
+    exports.recordWorkContextAlias = recordWorkContextAlias2;
+    var fs10 = __importStar(__require("fs"));
+    var os3 = __importStar(__require("os"));
+    var path10 = __importStar(__require("path"));
+    var MAX_PATHS_PER_ENTRY = 8;
+    function workContextRegistryFilePath() {
+      return path10.join(os3.homedir(), ".ascenda", "work-contexts.json");
+    }
+    function readWorkContextRegistry(registryFilePath = workContextRegistryFilePath()) {
+      try {
+        const parsed = JSON.parse(fs10.readFileSync(registryFilePath, "utf8"));
+        if (parsed && parsed.version === 1 && parsed.contexts && typeof parsed.contexts === "object") {
+          return parsed;
+        }
+      } catch {
+      }
+      return { version: 1, contexts: {} };
+    }
+    function recordWorkContext2(context, options) {
+      if (!context)
+        return false;
+      const updates = [];
+      if (context.projectHash && context.projectLabel) {
+        updates.push({ hash: context.projectHash, kind: "project", label: context.projectLabel, observedPath: context.projectPath ?? context.workspacePath });
+      }
+      if (context.workspaceHash && context.workspaceLabel && context.workspaceHash !== context.projectHash) {
+        updates.push({ hash: context.workspaceHash, kind: "workspace", label: context.workspaceLabel, observedPath: context.workspacePath });
+      }
+      return upsert(updates, options);
+    }
+    function recordWorkContextAlias2(hash, label, observedPath, options) {
+      if (!hash || !label)
+        return false;
+      return upsert([{ hash, kind: "alias", label, observedPath: observedPath ?? null }], options);
+    }
+    function upsert(updates, options) {
+      if (updates.length === 0)
+        return false;
+      try {
+        const registryFilePath = options?.registryFilePath ?? workContextRegistryFilePath();
+        const nowIso = (options?.now ?? /* @__PURE__ */ new Date()).toISOString();
+        const registry = readWorkContextRegistry(registryFilePath);
+        let dirty = false;
+        for (const update of updates) {
+          const existing = registry.contexts[update.hash];
+          if (!existing) {
+            registry.contexts[update.hash] = {
+              kind: update.kind,
+              label: update.label,
+              paths: update.observedPath ? [update.observedPath] : [],
+              firstSeenAt: nowIso,
+              lastSeenAt: nowIso
+            };
+            dirty = true;
+            continue;
+          }
+          if (existing.kind === "alias" && update.kind !== "alias") {
+            existing.kind = update.kind;
+            dirty = true;
+          }
+          if (existing.label !== update.label && update.kind !== "alias") {
+            existing.label = update.label;
+            dirty = true;
+          }
+          if (update.observedPath && !existing.paths.includes(update.observedPath)) {
+            if (existing.paths.length < MAX_PATHS_PER_ENTRY)
+              existing.paths.push(update.observedPath);
+            dirty = true;
+          }
+          if (dayOf(existing.lastSeenAt) !== dayOf(nowIso)) {
+            existing.lastSeenAt = nowIso;
+            dirty = true;
+          }
+        }
+        if (!dirty)
+          return false;
+        writeRegistry(registryFilePath, registry);
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    function dayOf(iso) {
+      return iso.slice(0, 10);
+    }
+    function writeRegistry(registryFilePath, registry) {
+      const dir = path10.dirname(registryFilePath);
+      fs10.mkdirSync(dir, { recursive: true, mode: 448 });
+      const tmp = `${registryFilePath}.${process.pid}.tmp`;
+      fs10.writeFileSync(tmp, `${JSON.stringify(registry, null, 2)}
+`, { encoding: "utf8", mode: 384 });
+      fs10.renameSync(tmp, registryFilePath);
+      if (process.platform !== "win32") {
+        fs10.chmodSync(registryFilePath, 384);
+      }
+    }
+  }
+});
+
+// ../packages/tool-kit/out/salt.js
+var require_salt = __commonJS({
+  "../packages/tool-kit/out/salt.js"(exports) {
+    "use strict";
+    var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    } : function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__importStar || /* @__PURE__ */ function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    }();
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.machineSaltFilePath = machineSaltFilePath;
+    exports.readOrCreateMachineSalt = readOrCreateMachineSalt;
+    exports.hashWithMachineSalt = hashWithMachineSalt2;
+    var crypto = __importStar(__require("crypto"));
+    var fs10 = __importStar(__require("fs"));
+    var os3 = __importStar(__require("os"));
+    var path10 = __importStar(__require("path"));
+    function machineSaltFilePath() {
+      return path10.join(os3.homedir(), ".ascenda", "salt");
+    }
+    var cache = /* @__PURE__ */ new Map();
+    function readOrCreateMachineSalt(saltFilePath = machineSaltFilePath()) {
+      const hit = cache.get(saltFilePath);
+      if (hit)
+        return hit;
+      const dir = path10.dirname(saltFilePath);
+      fs10.mkdirSync(dir, { recursive: true, mode: 448 });
+      let salt;
+      try {
+        salt = crypto.randomBytes(32).toString("hex");
+        fs10.writeFileSync(saltFilePath, salt, { encoding: "utf8", mode: 384, flag: "wx" });
+      } catch (error) {
+        if (error.code !== "EEXIST")
+          throw error;
+        salt = fs10.readFileSync(saltFilePath, "utf8").trim();
+      }
+      if (process.platform !== "win32") {
+        fs10.chmodSync(dir, 448);
+        fs10.chmodSync(saltFilePath, 384);
+      }
+      cache.set(saltFilePath, salt);
+      return salt;
+    }
+    function hashWithMachineSalt2(value, saltFilePath) {
+      if (!value)
+        return null;
+      return crypto.createHash("sha256").update(readOrCreateMachineSalt(saltFilePath)).update("\0").update(value).digest("hex").slice(0, 16);
+    }
+  }
+});
+
+// ../packages/tool-kit/out/workContext.js
+var require_workContext = __commonJS({
+  "../packages/tool-kit/out/workContext.js"(exports) {
+    "use strict";
+    var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
+    } : function(o, m, k, k2) {
+      if (k2 === void 0) k2 = k;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports && exports.__importStar || /* @__PURE__ */ function() {
+      var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function(o2) {
+          var ar = [];
+          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
+          return ar;
+        };
+        return ownKeys(o);
+      };
+      return function(mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) {
+          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        }
+        __setModuleDefault(result, mod);
+        return result;
+      };
+    }();
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.deriveWorkContext = deriveWorkContext2;
+    var fs10 = __importStar(__require("fs"));
+    var path10 = __importStar(__require("path"));
+    var salt_1 = require_salt();
+    var MAX_WALK_DEPTH = 64;
+    function deriveWorkContext2(cwd, saltFilePath) {
+      if (!cwd || !cwd.trim())
+        return null;
+      const startPath = stripTrailingSeparators(cwd.trim());
+      let roots = null;
+      try {
+        roots = resolveRepositoryRoots(startPath);
+      } catch {
+        roots = null;
+      }
+      const workspacePath = roots?.checkoutRoot ?? startPath;
+      const workspaceLabel = basenameOf(workspacePath);
+      if (!workspaceLabel)
+        return null;
+      const projectPath = roots?.canonicalRoot ?? null;
+      const projectLabel = (projectPath ? basenameOf(projectPath) : null) ?? workspaceLabel;
+      return {
+        workspaceLabel,
+        projectLabel,
+        workspaceHash: (0, salt_1.hashWithMachineSalt)(workspaceLabel, saltFilePath),
+        projectHash: (0, salt_1.hashWithMachineSalt)(projectLabel, saltFilePath),
+        workspacePath,
+        projectPath
+      };
+    }
+    function resolveRepositoryRoots(startDir) {
+      if (!fs10.existsSync(startDir))
+        return null;
+      let dir = startDir;
+      for (let depth = 0; depth < MAX_WALK_DEPTH; depth++) {
+        const dotGit = path10.join(dir, ".git");
+        let stat6 = null;
+        try {
+          stat6 = fs10.statSync(dotGit);
+        } catch {
+          stat6 = null;
+        }
+        if (stat6?.isDirectory())
+          return { checkoutRoot: dir, canonicalRoot: dir };
+        if (stat6?.isFile())
+          return { checkoutRoot: dir, canonicalRoot: worktreeParentRoot(dotGit, dir) ?? dir };
+        const parent = path10.dirname(dir);
+        if (parent === dir)
+          return null;
+        dir = parent;
+      }
+      return null;
+    }
+    function worktreeParentRoot(dotGitFile, containingDir) {
+      let gitdir;
+      try {
+        const match = /^gitdir:\s*(.+)\s*$/m.exec(fs10.readFileSync(dotGitFile, "utf8"));
+        if (!match)
+          return null;
+        gitdir = match[1].trim();
+      } catch {
+        return null;
+      }
+      const resolved = path10.resolve(containingDir, gitdir);
+      const marker = `${path10.sep}.git${path10.sep}worktrees${path10.sep}`;
+      const idx = resolved.indexOf(marker);
+      if (idx === -1)
+        return null;
+      return resolved.slice(0, idx);
+    }
+    function stripTrailingSeparators(value) {
+      let end = value.length;
+      while (end > 1 && (value[end - 1] === "/" || value[end - 1] === "\\"))
+        end--;
+      return value.slice(0, end);
+    }
+    function basenameOf(value) {
+      const segment = value.split(/[\\/]/).filter(Boolean).pop() ?? null;
+      return segment && segment.length > 0 ? segment : null;
+    }
+  }
+});
+
 // ../packages/tool-kit/out/hookAdapter.js
 var require_hookAdapter = __commonJS({
   "../packages/tool-kit/out/hookAdapter.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.DEFAULT_API_BASE_URL = void 0;
+    exports.resolveContextHashes = resolveContextHashes;
     exports.loadCliAgentConfig = loadCliAgentConfig;
     exports.deliverHookEvents = deliverHookEvents;
+    var contextRegistry_1 = require_contextRegistry();
     var eventLog_1 = require_eventLog();
     var eventSender_1 = require_eventSender();
     var tokenStore_1 = require_tokenStore();
+    var workContext_1 = require_workContext();
     exports.DEFAULT_API_BASE_URL = "https://api.ascenda.one";
-    function loadCliAgentConfig(toolType, sessionIdFromHook) {
+    function resolveContextHashes(cwd) {
+      const workspaceOverride = process.env.ASCENDA_WORKSPACE_HASH?.trim() || null;
+      const projectOverride = process.env.ASCENDA_PROJECT_HASH?.trim() || null;
+      if (workspaceOverride && projectOverride)
+        return { workspaceHash: workspaceOverride, projectHash: projectOverride };
+      const context = (0, workContext_1.deriveWorkContext)(cwd ?? process.cwd());
+      if (context)
+        (0, contextRegistry_1.recordWorkContext)(context);
+      return {
+        workspaceHash: workspaceOverride ?? context?.workspaceHash ?? null,
+        projectHash: projectOverride ?? context?.projectHash ?? null
+      };
+    }
+    function loadCliAgentConfig(toolType, sessionIdFromHook, cwd) {
       const apiBaseUrl = (process.env.ASCENDA_API_BASE_URL ?? exports.DEFAULT_API_BASE_URL).replace(/\/$/, "");
       const toolInstallationIdRaw = process.env.ASCENDA_TOOL_INSTALLATION_ID;
       if (!toolInstallationIdRaw)
@@ -1046,13 +1436,15 @@ var require_hookAdapter = __commonJS({
         throw new Error("Missing ASCENDA_EVENT_WRITE_TOKEN (or token file)");
       if (!fileToken)
         (0, tokenStore_1.persistEventWriteToken)(tokenFilePath, eventWriteToken);
+      const contextHashes = resolveContextHashes(cwd);
       return {
         apiBaseUrl,
         toolInstallationId,
         eventWriteToken,
         tokenFilePath,
         sessionId: process.env.ASCENDA_SESSION_ID ?? sessionIdFromHook ?? null,
-        workspaceHash: process.env.ASCENDA_WORKSPACE_HASH ?? null,
+        workspaceHash: contextHashes.workspaceHash,
+        projectHash: contextHashes.projectHash,
         // Agents await command hooks; fail fast rather than stall the user's turn.
         timeoutMs: parsePositiveInt(process.env.ASCENDA_HTTP_TIMEOUT_MS) ?? 3e3
       };
@@ -1063,11 +1455,12 @@ var require_hookAdapter = __commonJS({
       const notice = options.onNotice ?? ((message) => console.error(message));
       let config;
       try {
-        config = loadCliAgentConfig(options.toolType, options.sessionId);
+        config = loadCliAgentConfig(options.toolType, options.sessionId, options.cwd);
       } catch (error) {
         const logFile = (0, eventLog_1.resolveEventLogPath)();
         if (!logFile)
           throw error;
+        const contextHashes = resolveContextHashes(options.cwd);
         for (const event of events) {
           (0, eventLog_1.appendEventLog)(logFile, {
             loggedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -1076,7 +1469,8 @@ var require_hookAdapter = __commonJS({
               toolInstallationId: `${options.toolType}:unpaired`,
               source: options.source,
               sessionId: options.sessionId ?? null,
-              workspaceHash: process.env.ASCENDA_WORKSPACE_HASH ?? null
+              workspaceHash: contextHashes.workspaceHash,
+              projectHash: contextHashes.projectHash
             }, event)
           });
         }
@@ -1090,6 +1484,7 @@ var require_hookAdapter = __commonJS({
         tokenFilePath: config.tokenFilePath,
         sessionId: config.sessionId,
         workspaceHash: config.workspaceHash,
+        projectHash: config.projectHash,
         timeoutMs: config.timeoutMs
       });
       for (const event of events) {
@@ -1159,12 +1554,12 @@ var require_turnState = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.recordTurnStart = recordTurnStart;
     exports.consumeTurnDurationMs = consumeTurnDurationMs;
-    var fs9 = __importStar(__require("fs"));
+    var fs10 = __importStar(__require("fs"));
     var os3 = __importStar(__require("os"));
-    var path9 = __importStar(__require("path"));
-    var stateDir = () => process.env.ASCENDA_STATE_DIR ?? path9.join(os3.homedir(), ".ascenda", "state");
+    var path10 = __importStar(__require("path"));
+    var stateDir = () => process.env.ASCENDA_STATE_DIR ?? path10.join(os3.homedir(), ".ascenda", "state");
     function turnFile(agent, sessionId) {
-      return path9.join(stateDir(), `${sanitize(agent)}-turn-${sanitize(sessionId)}`);
+      return path10.join(stateDir(), `${sanitize(agent)}-turn-${sanitize(sessionId)}`);
     }
     function sanitize(value) {
       return value.replace(/[^a-zA-Z0-9._-]/g, "_");
@@ -1173,8 +1568,8 @@ var require_turnState = __commonJS({
       if (!sessionId)
         return;
       try {
-        fs9.mkdirSync(stateDir(), { recursive: true });
-        fs9.writeFileSync(turnFile(agent, sessionId), String(now), { encoding: "utf8", mode: 384 });
+        fs10.mkdirSync(stateDir(), { recursive: true });
+        fs10.writeFileSync(turnFile(agent, sessionId), String(now), { encoding: "utf8", mode: 384 });
       } catch {
       }
     }
@@ -1183,8 +1578,8 @@ var require_turnState = __commonJS({
         return void 0;
       const file = turnFile(agent, sessionId);
       try {
-        const started = Number(fs9.readFileSync(file, "utf8").trim());
-        fs9.rmSync(file, { force: true });
+        const started = Number(fs10.readFileSync(file, "utf8").trim());
+        fs10.rmSync(file, { force: true });
         if (!Number.isFinite(started) || started <= 0 || started > now)
           return void 0;
         return now - started;
@@ -1195,9 +1590,9 @@ var require_turnState = __commonJS({
   }
 });
 
-// ../packages/tool-kit/out/salt.js
-var require_salt = __commonJS({
-  "../packages/tool-kit/out/salt.js"(exports) {
+// ../packages/tool-kit/out/liveBus.js
+var require_liveBus = __commonJS({
+  "../packages/tool-kit/out/liveBus.js"(exports) {
     "use strict";
     var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0) k2 = k;
@@ -1237,114 +1632,31 @@ var require_salt = __commonJS({
       };
     }();
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.machineSaltFilePath = machineSaltFilePath;
-    exports.readOrCreateMachineSalt = readOrCreateMachineSalt;
-    exports.hashWithMachineSalt = hashWithMachineSalt2;
-    var crypto = __importStar(__require("crypto"));
-    var fs9 = __importStar(__require("fs"));
+    exports.liveBusSocketCandidates = liveBusSocketCandidates;
+    exports.liveBusSocketPath = liveBusSocketPath;
+    exports.bucketPromptSize = bucketPromptSize;
+    exports.emitLiveSignal = emitLiveSignal;
+    var fs10 = __importStar(__require("fs"));
+    var net = __importStar(__require("net"));
     var os3 = __importStar(__require("os"));
-    var path9 = __importStar(__require("path"));
-    function machineSaltFilePath() {
-      return path9.join(os3.homedir(), ".ascenda", "salt");
-    }
-    var cache = /* @__PURE__ */ new Map();
-    function readOrCreateMachineSalt(saltFilePath = machineSaltFilePath()) {
-      const hit = cache.get(saltFilePath);
-      if (hit)
-        return hit;
-      const dir = path9.dirname(saltFilePath);
-      fs9.mkdirSync(dir, { recursive: true, mode: 448 });
-      let salt;
-      try {
-        salt = crypto.randomBytes(32).toString("hex");
-        fs9.writeFileSync(saltFilePath, salt, { encoding: "utf8", mode: 384, flag: "wx" });
-      } catch (error) {
-        if (error.code !== "EEXIST")
-          throw error;
-        salt = fs9.readFileSync(saltFilePath, "utf8").trim();
-      }
-      if (process.platform !== "win32") {
-        fs9.chmodSync(dir, 448);
-        fs9.chmodSync(saltFilePath, 384);
-      }
-      cache.set(saltFilePath, salt);
-      return salt;
-    }
-    function hashWithMachineSalt2(value, saltFilePath) {
-      if (!value)
-        return null;
-      return crypto.createHash("sha256").update(readOrCreateMachineSalt(saltFilePath)).update("\0").update(value).digest("hex").slice(0, 16);
-    }
-  }
-});
-
-// ../packages/tool-kit/out/liveBus.js
-var require_liveBus = __commonJS({
-  "../packages/tool-kit/out/liveBus.js"(exports) {
-    "use strict";
-    var __createBinding = exports && exports.__createBinding || (Object.create ? function(o, m, k, k2) {
-      if (k2 === void 0) k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
-    } : function(o, m, k, k2) {
-      if (k2 === void 0) k2 = k;
-      o[k2] = m[k];
-    });
-    var __setModuleDefault = exports && exports.__setModuleDefault || (Object.create ? function(o, v) {
-      Object.defineProperty(o, "default", { enumerable: true, value: v });
-    } : function(o, v) {
-      o["default"] = v;
-    });
-    var __importStar = exports && exports.__importStar || /* @__PURE__ */ function() {
-      var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function(o2) {
-          var ar = [];
-          for (var k in o2) if (Object.prototype.hasOwnProperty.call(o2, k)) ar[ar.length] = k;
-          return ar;
-        };
-        return ownKeys(o);
-      };
-      return function(mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) {
-          for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        }
-        __setModuleDefault(result, mod);
-        return result;
-      };
-    }();
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.liveBusSocketCandidates = liveBusSocketCandidates;
-    exports.liveBusSocketPath = liveBusSocketPath;
-    exports.bucketPromptSize = bucketPromptSize;
-    exports.emitLiveSignal = emitLiveSignal;
-    var fs9 = __importStar(__require("fs"));
-    var net = __importStar(__require("net"));
-    var os3 = __importStar(__require("os"));
-    var path9 = __importStar(__require("path"));
-    var WRITE_TIMEOUT_MS = 50;
-    var APP_BUNDLE_ID2 = "one.ascenda.ascendaMissionControl";
-    function liveBusSocketCandidates() {
-      const override = process.env.ASCENDA_LIVE_BUS_SOCKET;
-      if (override)
-        return [override];
-      const home = os3.homedir();
-      return [
-        path9.join(home, ".ascenda", "live.sock"),
-        path9.join(home, "Library", "Containers", APP_BUNDLE_ID2, "Data", ".ascenda", "live.sock")
-      ];
+    var path10 = __importStar(__require("path"));
+    var WRITE_TIMEOUT_MS = 50;
+    var APP_BUNDLE_ID2 = "one.ascenda.ascendaMissionControl";
+    function liveBusSocketCandidates() {
+      const override = process.env.ASCENDA_LIVE_BUS_SOCKET;
+      if (override)
+        return [override];
+      const home = os3.homedir();
+      return [
+        path10.join(home, ".ascenda", "live.sock"),
+        path10.join(home, "Library", "Containers", APP_BUNDLE_ID2, "Data", ".ascenda", "live.sock")
+      ];
     }
     function liveBusSocketPath() {
       const candidates = liveBusSocketCandidates();
       for (const candidate of candidates) {
         try {
-          if (fs9.statSync(candidate).isSocket())
+          if (fs10.statSync(candidate).isSocket())
             return candidate;
         } catch {
         }
@@ -1362,7 +1674,7 @@ var require_liveBus = __commonJS({
       return "xl";
     }
     function emitLiveSignal(signal) {
-      return new Promise((resolve) => {
+      return new Promise((resolve2) => {
         let settled = false;
         const done = () => {
           if (settled)
@@ -1372,13 +1684,13 @@ var require_liveBus = __commonJS({
             socket.destroy();
           } catch {
           }
-          resolve();
+          resolve2();
         };
         let socket;
         try {
           socket = net.createConnection(liveBusSocketPath());
         } catch {
-          resolve();
+          resolve2();
           return;
         }
         const timer = setTimeout(done, WRITE_TIMEOUT_MS);
@@ -1409,8 +1721,8 @@ var require_out2 = __commonJS({
   "../packages/tool-kit/out/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.renewToolToken = exports.getPairingStatus = exports.createPairingSession = exports.AscendaApiError = exports.liveBusSocketCandidates = exports.liveBusSocketPath = exports.bucketPromptSize = exports.emitLiveSignal = exports.hashWithMachineSalt = exports.readOrCreateMachineSalt = exports.machineSaltFilePath = exports.markFailureNotified = exports.shouldAnnounceFailure = exports.recordSendOutcome = exports.readCollectorState = exports.defaultStateFilePath = exports.readTokenFile = exports.persistEventWriteToken = exports.defaultTokenFilePath = exports.recordTurnStart = exports.consumeTurnDurationMs = exports.loadCliAgentConfig = exports.deliverHookEvents = exports.DEFAULT_API_BASE_URL = exports.resolveEventLogPath = exports.expandUserPath = exports.appendEventLog = exports.EVENT_LOG_ENV_VAR = exports.buildEventPayload = exports.AscendaSemanticEventError = exports.AscendaEventSender = exports.looksLikeCorrection = exports.outcomeForHook = exports.inferOutcome = exports.getNestedNumber = exports.getNestedString = exports.getNested = exports.getNumber = exports.getString = exports.localHourAt = exports.utcOffsetMinutesAt = exports.isAfterHours = exports.bucketDurationMs = exports.bucketLinesChanged = exports.invitesDebrief = exports.classifyWorkMilestone = exports.isReworkGitAction = exports.classifyGitAction = exports.isVerificationCommand = exports.classifyCommand = void 0;
-    exports.isRetryableStatus = exports.parseIngestResponse = exports.postToolEventsBatch = exports.postToolEvent = void 0;
+    exports.workContextRegistryFilePath = exports.readWorkContextRegistry = exports.recordWorkContextAlias = exports.recordWorkContext = exports.deriveWorkContext = exports.hashWithMachineSalt = exports.readOrCreateMachineSalt = exports.machineSaltFilePath = exports.markFailureNotified = exports.shouldAnnounceFailure = exports.recordSendOutcome = exports.readCollectorState = exports.defaultStateFilePath = exports.readTokenFile = exports.persistEventWriteToken = exports.defaultTokenFilePath = exports.recordTurnStart = exports.consumeTurnDurationMs = exports.resolveContextHashes = exports.loadCliAgentConfig = exports.deliverHookEvents = exports.DEFAULT_API_BASE_URL = exports.resolveEventLogPath = exports.expandUserPath = exports.appendEventLog = exports.EVENT_LOG_ENV_VAR = exports.buildEventPayload = exports.AscendaSemanticEventError = exports.AscendaEventSender = exports.looksLikeCorrection = exports.outcomeForHook = exports.inferOutcome = exports.getNestedNumber = exports.getNestedString = exports.getNested = exports.getNumber = exports.getString = exports.localHourAt = exports.utcOffsetMinutesAt = exports.BUSINESS_DAY = exports.isOutsideBusinessHours = exports.isAfterHours = exports.bucketDurationMs = exports.bucketLinesChanged = exports.invitesDebrief = exports.classifyWorkMilestone = exports.isReworkGitAction = exports.classifyGitAction = exports.isVerificationCommand = exports.classifyCommand = void 0;
+    exports.isRetryableStatus = exports.parseIngestResponse = exports.postToolEventsBatch = exports.postToolEvent = exports.renewToolToken = exports.getPairingStatus = exports.createPairingSession = exports.AscendaApiError = exports.liveBusSocketCandidates = exports.liveBusSocketPath = exports.bucketPromptSize = exports.emitLiveSignal = void 0;
     var commandClassifier_1 = require_commandClassifier();
     Object.defineProperty(exports, "classifyCommand", { enumerable: true, get: function() {
       return commandClassifier_1.classifyCommand;
@@ -1443,6 +1755,12 @@ var require_out2 = __commonJS({
     Object.defineProperty(exports, "isAfterHours", { enumerable: true, get: function() {
       return afterHours_1.isAfterHours;
     } });
+    Object.defineProperty(exports, "isOutsideBusinessHours", { enumerable: true, get: function() {
+      return afterHours_1.isOutsideBusinessHours;
+    } });
+    Object.defineProperty(exports, "BUSINESS_DAY", { enumerable: true, get: function() {
+      return afterHours_1.BUSINESS_DAY;
+    } });
     Object.defineProperty(exports, "utcOffsetMinutesAt", { enumerable: true, get: function() {
       return afterHours_1.utcOffsetMinutesAt;
     } });
@@ -1507,6 +1825,9 @@ var require_out2 = __commonJS({
     Object.defineProperty(exports, "loadCliAgentConfig", { enumerable: true, get: function() {
       return hookAdapter_1.loadCliAgentConfig;
     } });
+    Object.defineProperty(exports, "resolveContextHashes", { enumerable: true, get: function() {
+      return hookAdapter_1.resolveContextHashes;
+    } });
     var turnState_1 = require_turnState();
     Object.defineProperty(exports, "consumeTurnDurationMs", { enumerable: true, get: function() {
       return turnState_1.consumeTurnDurationMs;
@@ -1550,6 +1871,23 @@ var require_out2 = __commonJS({
     Object.defineProperty(exports, "hashWithMachineSalt", { enumerable: true, get: function() {
       return salt_1.hashWithMachineSalt;
     } });
+    var workContext_1 = require_workContext();
+    Object.defineProperty(exports, "deriveWorkContext", { enumerable: true, get: function() {
+      return workContext_1.deriveWorkContext;
+    } });
+    var contextRegistry_1 = require_contextRegistry();
+    Object.defineProperty(exports, "recordWorkContext", { enumerable: true, get: function() {
+      return contextRegistry_1.recordWorkContext;
+    } });
+    Object.defineProperty(exports, "recordWorkContextAlias", { enumerable: true, get: function() {
+      return contextRegistry_1.recordWorkContextAlias;
+    } });
+    Object.defineProperty(exports, "readWorkContextRegistry", { enumerable: true, get: function() {
+      return contextRegistry_1.readWorkContextRegistry;
+    } });
+    Object.defineProperty(exports, "workContextRegistryFilePath", { enumerable: true, get: function() {
+      return contextRegistry_1.workContextRegistryFilePath;
+    } });
     var liveBus_1 = require_liveBus();
     Object.defineProperty(exports, "emitLiveSignal", { enumerable: true, get: function() {
       return liveBus_1.emitLiveSignal;
@@ -1592,8 +1930,8 @@ var require_out2 = __commonJS({
 });
 
 // src/cli.ts
-import * as fs8 from "node:fs/promises";
-import * as path8 from "node:path";
+import * as fs9 from "node:fs/promises";
+import * as path9 from "node:path";
 
 // src/stores.ts
 import * as os from "node:os";
@@ -1905,6 +2243,107 @@ async function snapshotVsCodeWorkspaceStorage(area, sourceRoot, label) {
   }
   return dest;
 }
+var STAGING_KEEP = ["events.jsonl"];
+async function entrySizeBytes(target) {
+  let st;
+  try {
+    st = await fs3.lstat(target);
+  } catch {
+    return 0;
+  }
+  if (st.isSymbolicLink()) return 0;
+  if (!st.isDirectory()) return st.size;
+  let total = 0;
+  let entries = [];
+  try {
+    entries = await fs3.readdir(target);
+  } catch {
+    return total;
+  }
+  for (const entry of entries) {
+    total += await entrySizeBytes(path3.join(target, entry));
+  }
+  return total;
+}
+async function disposeStagingArea(area, keep = STAGING_KEEP) {
+  const result = { freedBytes: 0, kept: [] };
+  let entries = [];
+  try {
+    entries = await fs3.readdir(area.root);
+  } catch {
+    return result;
+  }
+  for (const entry of entries) {
+    if (keep.includes(entry)) {
+      result.kept.push(entry);
+      continue;
+    }
+    const target = path3.join(area.root, entry);
+    const size = await entrySizeBytes(target);
+    try {
+      await fs3.rm(target, { recursive: true, force: true });
+      result.freedBytes += size;
+    } catch {
+    }
+  }
+  return result;
+}
+async function sweepStagingRoot(stagingRoot, exceptRun, keep = STAGING_KEEP) {
+  const result = { runsSwept: 0, freedBytes: 0 };
+  let runs = [];
+  try {
+    runs = (await fs3.readdir(stagingRoot, { withFileTypes: true })).filter((e) => e.isDirectory()).map((e) => e.name);
+  } catch {
+    return result;
+  }
+  for (const run of runs) {
+    if (run === exceptRun) continue;
+    const disposed = await disposeStagingArea({ extractionId: run, root: path3.join(stagingRoot, run) }, keep);
+    if (disposed.freedBytes > 0) {
+      result.runsSwept += 1;
+      result.freedBytes += disposed.freedBytes;
+    }
+  }
+  return result;
+}
+async function freeSpaceBytes(dir) {
+  let probe = path3.resolve(dir);
+  for (; ; ) {
+    try {
+      const st = await fs3.statfs(probe);
+      return Number(st.bsize) * Number(st.bavail);
+    } catch {
+      const parent = path3.dirname(probe);
+      if (parent === probe) return null;
+      probe = parent;
+    }
+  }
+}
+async function estimateSnapshotBytes(sources) {
+  let total = 0;
+  for (const source of sources) total += await entrySizeBytes(source);
+  return total;
+}
+var SPACE_HEADROOM_BYTES = 2 * 1024 * 1024 * 1024;
+async function checkSpaceForSnapshot(stagingRoot, sources) {
+  const requiredBytes = await estimateSnapshotBytes(sources) + SPACE_HEADROOM_BYTES;
+  const freeBytes = await freeSpaceBytes(stagingRoot);
+  return {
+    requiredBytes,
+    freeBytes,
+    sufficient: freeBytes === null || freeBytes >= requiredBytes
+  };
+}
+function formatBytes(bytes) {
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  let value = bytes;
+  let unit = 0;
+  while (value >= 1024 && unit < units.length - 1) {
+    value /= 1024;
+    unit += 1;
+  }
+  return `${value >= 10 || unit === 0 ? Math.round(value) : value.toFixed(1)} ${units[unit]}`;
+}
 
 // src/extractors/claudeCode.ts
 var import_tool_kit = __toESM(require_out2(), 1);
@@ -2122,7 +2561,7 @@ var ASSUMED_CONTEXT_WINDOW_TOKENS = 2e5;
 function contextWindowPeakPctOf(fold) {
   if (fold.contextWindowPeakTokens <= 0) return 0;
   const pct = fold.contextWindowPeakTokens / ASSUMED_CONTEXT_WINDOW_TOKENS;
-  return Math.round(Math.min(1, pct) * 1e3) / 1e3;
+  return Math.round(pct * 1e3) / 1e3;
 }
 async function foldLinesInto(fold, filePath, opts) {
   const handle = await fs4.open(filePath);
@@ -2169,7 +2608,7 @@ async function foldLinesInto(fold, filePath, opts) {
             fold.subagentPrompts += 1;
           } else {
             fold.humanPrompts += 1;
-            if (sniffed.occurredAt && (0, import_tool_kit.isAfterHours)(new Date(sniffed.occurredAt))) {
+            if (sniffed.occurredAt && (0, import_tool_kit.isOutsideBusinessHours)(new Date(sniffed.occurredAt))) {
               fold.afterHoursPrompts += 1;
             }
             fold.humanPromptTimestamps.push(sniffed.occurredAt);
@@ -2915,6 +3354,10 @@ import { fileURLToPath } from "node:url";
 var KNOWN_HISTORY_VERSION = 1;
 var KNOWN_CHAT_SESSION_VERSION = 3;
 var CHAT_EDIT_PREFIX = "Chat Edit:";
+function isAbsence(error) {
+  const code = error?.code;
+  return code === "ENOENT" || code === "ENOTDIR";
+}
 function uriToPath(uri) {
   if (typeof uri !== "string" || !uri.startsWith("file://")) return null;
   try {
@@ -2976,6 +3419,7 @@ async function foldEditDays(historyDir, index) {
   const result = {
     days: /* @__PURE__ */ new Map(),
     unparsedFiles: 0,
+    unreadableFiles: 0,
     malformedEntries: 0,
     oldest: null,
     newest: null
@@ -2990,7 +3434,8 @@ async function foldEditDays(historyDir, index) {
     let raw;
     try {
       raw = await fs6.readFile(path6.join(historyDir, hash, "entries.json"), "utf8");
-    } catch {
+    } catch (error) {
+      if (!isAbsence(error)) result.unreadableFiles += 1;
       continue;
     }
     const sniffed = sniffHistoryFile(raw);
@@ -3032,9 +3477,9 @@ async function foldEditDays(historyDir, index) {
 var JSONL_KIND_HEADER = 0;
 var JSONL_KIND_SET = 1;
 var JSONL_KIND_SPLICE = 2;
-function resolvePath(root, path9) {
+function resolvePath(root, path10) {
   let cur = root;
-  for (const seg of path9) {
+  for (const seg of path10) {
     if (typeof seg === "number") {
       if (!Array.isArray(cur) || seg >= cur.length) return null;
       cur = cur[seg];
@@ -3045,10 +3490,10 @@ function resolvePath(root, path9) {
   }
   return cur ?? null;
 }
-function applySet(root, path9, value) {
-  if (path9.length === 0) return;
-  const parent = resolvePath(root, path9.slice(0, -1));
-  const last = path9[path9.length - 1];
+function applySet(root, path10, value) {
+  if (path10.length === 0) return;
+  const parent = resolvePath(root, path10.slice(0, -1));
+  const last = path10[path10.length - 1];
   if (typeof last === "number") {
     if (!Array.isArray(parent)) return;
     while (parent.length <= last) parent.push(null);
@@ -3058,8 +3503,8 @@ function applySet(root, path9, value) {
     parent[last] = value;
   }
 }
-function applySplice(root, path9, values, index) {
-  const target = resolvePath(root, path9);
+function applySplice(root, path10, values, index) {
+  const target = resolvePath(root, path10);
   if (!Array.isArray(target)) return;
   if (index !== null && index >= 0 && index <= target.length) target.splice(index, 0, ...values);
   else target.push(...values);
@@ -3116,6 +3561,7 @@ async function foldChatSessions(workspaceStorageDir) {
   const result = {
     sessions: [],
     unparsedFiles: 0,
+    unreadableFiles: 0,
     unrecognisedFiles: 0,
     emptyDrafts: 0,
     malformedLines: 0
@@ -3148,6 +3594,7 @@ async function foldChatSessions(workspaceStorageDir) {
       try {
         raw = await fs6.readFile(path6.join(wsDir, "chatSessions", file), "utf8");
       } catch {
+        result.unreadableFiles += 1;
         continue;
       }
       let record = null;
@@ -3213,9 +3660,9 @@ async function foldChatSessions(workspaceStorageDir) {
   }
   return result;
 }
-async function* extractVsCode(snapshotDir, extractionId) {
-  const historyDir = path6.join(snapshotDir, "history");
-  const workspaceStorageDir = path6.join(snapshotDir, "workspaceStorage");
+async function* extractVsCode(source, extractionId) {
+  const historyDir = typeof source === "string" ? path6.join(source, "history") : source.historyDir;
+  const workspaceStorageDir = typeof source === "string" ? path6.join(source, "workspaceStorage") : source.workspaceStorageDir;
   const index = await buildWorkspaceFolderIndex(workspaceStorageDir);
   const editDays = await foldEditDays(historyDir, index);
   const chatSessions = await foldChatSessions(workspaceStorageDir);
@@ -3315,7 +3762,7 @@ async function* extractVsCode(snapshotDir, extractionId) {
       };
     }
   }
-  const readFailures = editDays.unparsedFiles + editDays.malformedEntries + chatSessions.unparsedFiles + chatSessions.unrecognisedFiles + chatSessions.malformedLines;
+  const readFailures = editDays.unparsedFiles + editDays.unreadableFiles + editDays.malformedEntries + chatSessions.unparsedFiles + chatSessions.unreadableFiles + chatSessions.unrecognisedFiles + chatSessions.malformedLines;
   if (windowOldest && windowNewest || readFailures > 0) {
     const window = windowOldest && windowNewest ? { windowOldest, windowNewest } : {};
     yield {
@@ -3332,8 +3779,10 @@ async function* extractVsCode(snapshotDir, extractionId) {
         editDayCount: editDays.days.size,
         sessionCount,
         unparsedHistoryFiles: editDays.unparsedFiles,
+        unreadableHistoryFiles: editDays.unreadableFiles,
         malformedHistoryEntries: editDays.malformedEntries,
         unparsedChatSessionFiles: chatSessions.unparsedFiles,
+        unreadableChatSessionFiles: chatSessions.unreadableFiles,
         unrecognisedChatSessionFiles: chatSessions.unrecognisedFiles,
         emptyChatSessions: chatSessions.emptyDrafts,
         malformedChatSessionLines: chatSessions.malformedLines
@@ -3344,9 +3793,314 @@ async function* extractVsCode(snapshotDir, extractionId) {
   }
 }
 
+// src/archive.ts
+import { createHash } from "node:crypto";
+import { createReadStream } from "node:fs";
+import * as fs7 from "node:fs/promises";
+import * as path7 from "node:path";
+import { pipeline } from "node:stream/promises";
+var ARCHIVE_SCHEMA = 1;
+function defaultArchiveRoot(home) {
+  return path7.join(home, ".ascenda", "history-import", "archive");
+}
+function defaultArchiveSources(paths, includeVsCodeSessions = false) {
+  const sources = [
+    { store: "claude_code", root: paths.claudeProjects, label: "projects" },
+    { store: "cursor", root: paths.cursorStateDb, siblings: ["-wal", "-shm"], label: "state" },
+    { store: "vscode", root: paths.vscodeHistory, label: "history" }
+  ];
+  if (includeVsCodeSessions) {
+    sources.push({ store: "vscode", root: paths.vscodeWorkspaceStorage, label: "workspaceStorage" });
+  }
+  return sources;
+}
+function blobPath(archiveRoot, sha256) {
+  return path7.join(archiveRoot, "objects", sha256.slice(0, 2), sha256);
+}
+function manifestDir(archiveRoot) {
+  return path7.join(archiveRoot, "manifests");
+}
+async function hashFile(file) {
+  const hash = createHash("sha256");
+  await pipeline(createReadStream(file), hash);
+  return hash.digest("hex");
+}
+async function walkFiles(root) {
+  let st;
+  try {
+    st = await fs7.stat(root);
+  } catch {
+    return [];
+  }
+  if (!st.isDirectory()) return [{ absolute: root, relative: path7.basename(root) }];
+  const found = [];
+  async function walk(dir, prefix) {
+    let entries;
+    try {
+      entries = await fs7.readdir(dir, { withFileTypes: true });
+    } catch {
+      return;
+    }
+    for (const entry of entries) {
+      const absolute = path7.join(dir, entry.name);
+      const relative = prefix ? `${prefix}/${entry.name}` : entry.name;
+      if (entry.isDirectory()) await walk(absolute, relative);
+      else if (entry.isFile()) found.push({ absolute, relative });
+    }
+  }
+  await walk(root, "");
+  return found;
+}
+async function listManifests(archiveRoot) {
+  try {
+    return (await fs7.readdir(manifestDir(archiveRoot))).filter((f) => f.endsWith(".json")).map((f) => f.slice(0, -".json".length)).sort();
+  } catch {
+    return [];
+  }
+}
+async function readManifest(archiveRoot, generation) {
+  try {
+    const raw = await fs7.readFile(path7.join(manifestDir(archiveRoot), `${generation}.json`), "utf8");
+    const parsed = JSON.parse(raw);
+    if (parsed.schema !== ARCHIVE_SCHEMA) return null;
+    return parsed;
+  } catch {
+    return null;
+  }
+}
+async function readLatestManifest(archiveRoot) {
+  const generations = await listManifests(archiveRoot);
+  const latest = generations[generations.length - 1];
+  return latest ? readManifest(archiveRoot, latest) : null;
+}
+async function archiveStores(options) {
+  const { archiveRoot, sources, generation, now } = options;
+  const result = {
+    generation,
+    manifestPath: path7.join(manifestDir(archiveRoot), `${generation}.json`),
+    filesArchived: 0,
+    filesDeduplicated: 0,
+    newBytes: 0,
+    totalBytes: 0,
+    perStore: {},
+    unreadable: 0
+  };
+  await fs7.mkdir(path7.join(archiveRoot, "objects"), { recursive: true });
+  await fs7.mkdir(manifestDir(archiveRoot), { recursive: true });
+  const previous = await readLatestManifest(archiveRoot);
+  const previousByKey = /* @__PURE__ */ new Map();
+  for (const file of previous?.files ?? []) {
+    previousByKey.set(`${file.store}/${file.relativePath}`, file);
+  }
+  const files = [];
+  const roots = {};
+  for (const source of sources) {
+    roots[`${source.store}/${source.label}`] = source.root;
+    const targets = await walkFiles(source.root);
+    for (const suffix of source.siblings ?? []) {
+      const absolute = source.root + suffix;
+      try {
+        await fs7.stat(absolute);
+        targets.push({ absolute, relative: path7.basename(absolute) });
+      } catch {
+      }
+    }
+    const storeStats = result.perStore[source.store] ??= {
+      files: 0,
+      newBytes: 0
+    };
+    for (const target of targets) {
+      const relativePath = `${source.label}/${target.relative}`;
+      let st;
+      try {
+        st = await fs7.stat(target.absolute);
+      } catch {
+        result.unreadable += 1;
+        continue;
+      }
+      const prior = previousByKey.get(`${source.store}/${relativePath}`);
+      let sha256 = null;
+      if (prior && prior.size === st.size && prior.mtimeMs === st.mtimeMs) {
+        try {
+          await fs7.stat(blobPath(archiveRoot, prior.sha256));
+          sha256 = prior.sha256;
+        } catch {
+          sha256 = null;
+        }
+      }
+      if (sha256 === null) {
+        try {
+          sha256 = await hashFile(target.absolute);
+        } catch {
+          result.unreadable += 1;
+          continue;
+        }
+      }
+      const destination = blobPath(archiveRoot, sha256);
+      let alreadyHeld = true;
+      try {
+        await fs7.stat(destination);
+      } catch {
+        alreadyHeld = false;
+      }
+      if (alreadyHeld) {
+        result.filesDeduplicated += 1;
+      } else {
+        await fs7.mkdir(path7.dirname(destination), { recursive: true });
+        const temporary2 = `${destination}.tmp-${generation}`;
+        try {
+          await fs7.copyFile(target.absolute, temporary2);
+          await fs7.rename(temporary2, destination);
+          result.newBytes += st.size;
+          storeStats.newBytes += st.size;
+        } catch {
+          await fs7.rm(temporary2, { force: true });
+          result.unreadable += 1;
+          continue;
+        }
+      }
+      files.push({
+        store: source.store,
+        relativePath,
+        sha256,
+        size: st.size,
+        mtimeMs: st.mtimeMs
+      });
+      result.filesArchived += 1;
+      result.totalBytes += st.size;
+      storeStats.files += 1;
+    }
+  }
+  const manifest = {
+    schema: ARCHIVE_SCHEMA,
+    generation,
+    createdAt: now,
+    roots,
+    files
+  };
+  const temporary = `${result.manifestPath}.tmp`;
+  await fs7.writeFile(temporary, JSON.stringify(manifest, null, 2) + "\n", "utf8");
+  await fs7.rename(temporary, result.manifestPath);
+  return result;
+}
+async function verifyArchive(archiveRoot, manifest, deep = true) {
+  const result = { generation: manifest.generation, checked: 0, missing: [], corrupted: [] };
+  const hashed = /* @__PURE__ */ new Set();
+  for (const file of manifest.files) {
+    const blob = blobPath(archiveRoot, file.sha256);
+    result.checked += 1;
+    try {
+      await fs7.stat(blob);
+    } catch {
+      result.missing.push(file.relativePath);
+      continue;
+    }
+    if (!deep || hashed.has(file.sha256)) continue;
+    hashed.add(file.sha256);
+    let actual;
+    try {
+      actual = await hashFile(blob);
+    } catch {
+      result.corrupted.push(file.relativePath);
+      continue;
+    }
+    if (actual !== file.sha256) result.corrupted.push(file.relativePath);
+  }
+  return result;
+}
+async function restoreArchive(archiveRoot, manifest, destination) {
+  const result = { restored: 0, skipped: 0, destination };
+  for (const file of manifest.files) {
+    const blob = blobPath(archiveRoot, file.sha256);
+    const target = path7.join(destination, file.store, file.relativePath);
+    try {
+      await fs7.mkdir(path7.dirname(target), { recursive: true });
+      await fs7.copyFile(blob, target);
+      result.restored += 1;
+    } catch {
+      result.skipped += 1;
+    }
+  }
+  return result;
+}
+async function pruneArchive(archiveRoot, keep) {
+  const result = { generationsRemoved: [], blobsRemoved: 0, freedBytes: 0 };
+  const generations = await listManifests(archiveRoot);
+  const doomed = keep >= generations.length ? [] : generations.slice(0, generations.length - keep);
+  for (const generation of doomed) {
+    try {
+      await fs7.rm(path7.join(manifestDir(archiveRoot), `${generation}.json`), { force: true });
+      result.generationsRemoved.push(generation);
+    } catch {
+    }
+  }
+  const live = /* @__PURE__ */ new Set();
+  for (const generation of await listManifests(archiveRoot)) {
+    const manifest = await readManifest(archiveRoot, generation);
+    for (const file of manifest?.files ?? []) live.add(file.sha256);
+  }
+  const objectsRoot = path7.join(archiveRoot, "objects");
+  let shards = [];
+  try {
+    shards = (await fs7.readdir(objectsRoot, { withFileTypes: true })).filter((e) => e.isDirectory()).map((e) => e.name);
+  } catch {
+    return result;
+  }
+  for (const shard of shards) {
+    let blobs = [];
+    try {
+      blobs = await fs7.readdir(path7.join(objectsRoot, shard));
+    } catch {
+      continue;
+    }
+    for (const blob of blobs) {
+      if (live.has(blob)) continue;
+      const target = path7.join(objectsRoot, shard, blob);
+      let size = 0;
+      try {
+        size = (await fs7.stat(target)).size;
+      } catch {
+        continue;
+      }
+      try {
+        await fs7.rm(target, { force: true });
+        result.blobsRemoved += 1;
+        result.freedBytes += size;
+      } catch {
+      }
+    }
+  }
+  return result;
+}
+async function archiveSizeBytes(archiveRoot) {
+  const objectsRoot = path7.join(archiveRoot, "objects");
+  let total = 0;
+  let shards = [];
+  try {
+    shards = (await fs7.readdir(objectsRoot, { withFileTypes: true })).filter((e) => e.isDirectory()).map((e) => e.name);
+  } catch {
+    return 0;
+  }
+  for (const shard of shards) {
+    let blobs = [];
+    try {
+      blobs = await fs7.readdir(path7.join(objectsRoot, shard));
+    } catch {
+      continue;
+    }
+    for (const blob of blobs) {
+      try {
+        total += (await fs7.stat(path7.join(objectsRoot, shard, blob))).size;
+      } catch {
+      }
+    }
+  }
+  return total;
+}
+
 // src/ship.ts
 var import_tool_kit4 = __toESM(require_out2(), 1);
-import { createHash } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 var DEFAULT_API_BASE_URL = "https://api.ascenda.one";
 function loadShipConfig() {
   const apiBaseUrl = (process.env.ASCENDA_API_BASE_URL ?? DEFAULT_API_BASE_URL).replace(/\/$/, "");
@@ -3376,12 +4130,28 @@ function importOrdinals(events) {
   });
 }
 function importKeyOf(event, ordinal) {
-  return createHash("sha256").update(
+  return createHash2("sha256").update(
     [event.store, event.sessionRef ?? "", event.eventKind, event.occurredAt, String(ordinal)].join(
       "|"
     )
   ).digest("hex").slice(0, 16);
 }
+var workContextMemo = /* @__PURE__ */ new Map();
+function workContextOf(repoRef) {
+  if (!repoRef) return null;
+  const hit = workContextMemo.get(repoRef);
+  if (hit !== void 0) return hit;
+  const context = (0, import_tool_kit4.deriveWorkContext)(repoRef);
+  if (context) {
+    (0, import_tool_kit4.recordWorkContext)(context);
+    const legacyHash = (0, import_tool_kit4.hashWithMachineSalt)(repoRef);
+    if (legacyHash && legacyHash !== context.workspaceHash && legacyHash !== context.projectHash) {
+      (0, import_tool_kit4.recordWorkContextAlias)(legacyHash, context.workspaceLabel ?? repoRef, context.workspacePath);
+    }
+  }
+  workContextMemo.set(repoRef, context);
+  return context;
+}
 function toWirePayload(event, ordinal, toolInstallationId) {
   const metadata = {
     importKey: importKeyOf(event, ordinal),
@@ -3396,7 +4166,7 @@ function toWirePayload(event, ordinal, toolInstallationId) {
     metadata.gitBranchHash = (0, import_tool_kit4.hashWithMachineSalt)(metadata.gitBranch) ?? "";
     delete metadata.gitBranch;
   }
-  const workspaceHash = event.repoRef ? (0, import_tool_kit4.hashWithMachineSalt)(event.repoRef) : null;
+  const context = workContextOf(event.repoRef);
   return {
     toolInstallationId,
     source: STORE_SOURCE[event.store],
@@ -3412,8 +4182,8 @@ function toWirePayload(event, ordinal, toolInstallationId) {
     utcOffsetMinutes: (0, import_tool_kit4.utcOffsetMinutesAt)(new Date(event.occurredAt)),
     severity: "low",
     sessionId: event.sessionRef,
-    workspaceHash,
-    projectHash: workspaceHash,
+    workspaceHash: context?.workspaceHash ?? null,
+    projectHash: context?.projectHash ?? null,
     // A real contract ToolConsentScope now, and a real gate: the backend
     // requires an active historical-import consent lease for anything carrying
     // one of the provenance classes below, and decides that on the provenance
@@ -3425,6 +4195,9 @@ function toWirePayload(event, ordinal, toolInstallationId) {
     metadata
   };
 }
+function storeCounts(result, store) {
+  return result.perStore[store] ??= { sent: 0, accepted: 0, duplicate: 0, rejected: 0 };
+}
 var BATCH_SIZE = 200;
 function shippableEvents(events) {
   return events.filter(
@@ -3438,7 +4211,9 @@ async function shipEvents(events, config, onProgress) {
     duplicate: 0,
     rejected: 0,
     rejectionReasons: {},
-    httpFailures: 0
+    httpFailures: 0,
+    perStore: {},
+    attributionComplete: true
   };
   const wireEvents = shippableEvents(events);
   const ordinals = importOrdinals(wireEvents);
@@ -3459,11 +4234,14 @@ async function shipEvents(events, config, onProgress) {
       });
     } catch {
       result.httpFailures += 1;
+      result.attributionComplete = false;
       continue;
     }
     result.sent += chunk.length;
+    for (const event of chunk) storeCounts(result, event.store).sent += 1;
     if (!response.ok) {
       result.httpFailures += 1;
+      result.attributionComplete = false;
       if (response.status === 401 || response.status === 403) {
         throw new Error(
           `Ingest refused (${response.status}) \u2014 token invalid/revoked or consent missing; aborting rather than burning ${wireEvents.length - offset} more events`
@@ -3476,14 +4254,38 @@ async function shipEvents(events, config, onProgress) {
       result.accepted += body.accepted ?? 0;
       result.duplicate += body.duplicate ?? 0;
       result.rejected += body.rejected ?? 0;
-      for (const item of body.results ?? []) {
+      const items = body.results ?? [];
+      const attributable = items.length === chunk.length;
+      if (!attributable && (body.accepted ?? body.duplicate ?? body.rejected) !== void 0) {
+        result.attributionComplete = false;
+      }
+      for (let i = 0; i < items.length; i += 1) {
+        const item = items[i];
+        if (attributable) {
+          const counts = storeCounts(result, chunk[i].store);
+          if (item.status === "accepted") counts.accepted += 1;
+          else if (item.status === "duplicate") counts.duplicate += 1;
+          else counts.rejected += 1;
+        }
         if (item.status !== "accepted" && item.status !== "duplicate") {
           const reason = item.reason ?? "unknown";
           result.rejectionReasons[reason] = (result.rejectionReasons[reason] ?? 0) + 1;
         }
       }
+      if (items.length === chunk.length && items.length > 0) {
+        const blocked = items.every(
+          (item) => item.status !== "accepted" && item.status !== "duplicate" && (item.reason === "consent_missing_or_expired" || item.reason === "unknown_consent_scope")
+        );
+        if (blocked) {
+          result.consentBlocked = true;
+          result.attributionComplete = false;
+          onProgress?.(Math.min(offset + BATCH_SIZE, wireEvents.length), wireEvents.length);
+          return result;
+        }
+      }
     } catch {
       result.httpFailures += 1;
+      result.attributionComplete = false;
     }
     onProgress?.(Math.min(offset + BATCH_SIZE, wireEvents.length), wireEvents.length);
   }
@@ -3491,16 +4293,16 @@ async function shipEvents(events, config, onProgress) {
 }
 
 // src/localHandoff.ts
-import * as fs7 from "node:fs/promises";
+import * as fs8 from "node:fs/promises";
 import * as os2 from "node:os";
-import * as path7 from "node:path";
+import * as path8 from "node:path";
 var APP_BUNDLE_ID = "one.ascenda.ascendaMissionControl";
 var HANDOFF_SCHEMA = 2;
 function handoffDir(home = os2.homedir()) {
-  return path7.join(home, "Library", "Containers", APP_BUNDLE_ID, "Data", ".ascenda", "history-import");
+  return path8.join(home, "Library", "Containers", APP_BUNDLE_ID, "Data", ".ascenda", "history-import");
 }
 function handoffFilePath(home = os2.homedir(), store = "claude_code") {
-  return path7.join(handoffDir(home), `${store}.json`);
+  return path8.join(handoffDir(home), `${store}.json`);
 }
 function projectLabelOf(repoRef) {
   if (!repoRef) return null;
@@ -3534,7 +4336,15 @@ function buildHandoff(events, extractionId, generatedAt) {
       compactionCount: Number(event.metrics.compactionCount ?? 0),
       toolFailureCount: Number(event.metrics.toolFailureCount ?? 0),
       contextWindowPeakPct: Number(event.metrics.contextWindowPeakPct ?? 0),
-      userModifiedEditCount: Number(event.metrics.userModifiedEditCount ?? 0),
+      contextWindowPeakTokens: Number(event.metrics.contextWindowPeakTokens ?? 0),
+      // Null, never 0. `toolUseResult.userModified` occurs 20,133 times
+      // across a real 363-session store and is `false` on every single one
+      // — Claude Code does not appear to set it true. Shipping 0 says "no
+      // AI edit was ever corrected by hand", which is a finding; the truth
+      // is that this store cannot answer the question. The extractor keeps
+      // counting it in case upstream starts populating it, and the handoff
+      // reports the count only when it is non-zero.
+      userModifiedEditCount: Number(event.metrics.userModifiedEditCount ?? 0) > 0 ? Number(event.metrics.userModifiedEditCount) : null,
       subagentTranscripts: Number(event.metrics.subagentTranscripts ?? 0),
       days: event.dayBreakdown ?? [],
       provenance: event.provenance
@@ -3651,18 +4461,18 @@ function buildVsCodeHandoff(events, extractionId, generatedAt) {
   };
 }
 async function writeHandoff(handoff, home = os2.homedir()) {
-  const containerRoot = path7.join(home, "Library", "Containers", APP_BUNDLE_ID, "Data");
+  const containerRoot = path8.join(home, "Library", "Containers", APP_BUNDLE_ID, "Data");
   try {
-    await fs7.stat(containerRoot);
+    await fs8.stat(containerRoot);
   } catch {
     return null;
   }
   const dir = handoffDir(home);
-  await fs7.mkdir(dir, { recursive: true });
+  await fs8.mkdir(dir, { recursive: true });
   const target = handoffFilePath(home, handoff.store);
   const temp = `${target}.tmp`;
-  await fs7.writeFile(temp, JSON.stringify(handoff, null, 2) + "\n", "utf8");
-  await fs7.rename(temp, target);
+  await fs8.writeFile(temp, JSON.stringify(handoff, null, 2) + "\n", "utf8");
+  await fs8.rename(temp, target);
   return target;
 }
 
@@ -3682,6 +4492,185 @@ function formatInventory(inv) {
   }
   return lines.join("\n");
 }
+async function safeScan(store, rootPath, scan) {
+  try {
+    return { inventory: await scan(), scanError: null };
+  } catch (error) {
+    return {
+      inventory: { store, rootPath, present: false, counts: {}, notes: [] },
+      scanError: error instanceof Error ? error.message : String(error)
+    };
+  }
+}
+var READ_FAILURE_METRICS = [
+  "unparsedFiles",
+  "unreadableFiles",
+  "unparsedHistoryFiles",
+  "unreadableHistoryFiles",
+  "malformedHistoryEntries",
+  "unparsedChatSessionFiles",
+  "unreadableChatSessionFiles",
+  "unrecognisedChatSessionFiles",
+  "malformedChatSessionLines",
+  "unparsedLines",
+  "unparsedTranscripts"
+];
+function readFailuresOf(events) {
+  let total = 0;
+  for (const event of events) {
+    if (event.eventKind !== "extraction_epoch") continue;
+    for (const metric of READ_FAILURE_METRICS) {
+      const value = event.metrics[metric];
+      if (typeof value === "number") total += value;
+    }
+  }
+  return total;
+}
+async function runSource(outcomes, store, inventory, allEvents, extract, buildStoreHandoff, scanError = null) {
+  if (scanError !== null) {
+    process.stdout.write(`${inventory.store} FAILED to scan: ${scanError}
+
+`);
+    outcomes.push({ store, status: "failed", events: 0, error: scanError, readFailures: 0 });
+    return;
+  }
+  process.stdout.write(formatInventory(inventory) + "\n\n");
+  if (!inventory.present) {
+    outcomes.push({ store, status: "absent", events: 0, readFailures: 0 });
+    return;
+  }
+  const events = [];
+  const kindCounts = {};
+  try {
+    await extract((event) => {
+      events.push(event);
+      kindCounts[event.eventKind] = (kindCounts[event.eventKind] ?? 0) + 1;
+    });
+  } catch (error) {
+    allEvents.push(...events);
+    outcomes.push({
+      store,
+      status: "failed",
+      events: events.length,
+      error: error instanceof Error ? error.message : String(error),
+      readFailures: readFailuresOf(events)
+    });
+    process.stdout.write(`${store} FAILED after ${events.length.toLocaleString("en-US")} events
+
+`);
+    return;
+  }
+  allEvents.push(...events);
+  process.stdout.write(`${store} extracted: ${events.length.toLocaleString("en-US")} events
+`);
+  for (const [kind, n] of Object.entries(kindCounts)) {
+    process.stdout.write(`  ${kind}: ${n.toLocaleString("en-US")}
+`);
+  }
+  const epoch = events.find((e) => e.eventKind === "extraction_epoch");
+  if (epoch) {
+    process.stdout.write(`  window: ${epoch.metrics.windowOldest} \u2192 ${epoch.metrics.windowNewest}
+`);
+  }
+  const handoffPath = await writeHandoff(buildStoreHandoff(events));
+  process.stdout.write(
+    handoffPath ? `  handoff: \u2192 ${handoffPath}
+
+` : "  handoff: desktop app container not found \u2014 skipped\n\n"
+  );
+  outcomes.push({
+    store,
+    status: "extracted",
+    events: events.length,
+    readFailures: readFailuresOf(events)
+  });
+}
+function writeSummary(input) {
+  const { outcomes, shipResult, ship } = input;
+  const out = process.stdout;
+  out.write("\n" + "\u2500".repeat(60) + "\nsummary\n");
+  for (const outcome of outcomes) {
+    const name = outcome.store.padEnd(12);
+    if (outcome.status === "absent") {
+      out.write(`  ${name} not present on this machine
+`);
+      continue;
+    }
+    if (outcome.status === "failed") {
+      out.write(`  ${name} FAILED \u2014 ${outcome.error}
+`);
+      out.write(`  ${" ".repeat(12)} ${outcome.events.toLocaleString("en-US")} events salvaged before the failure
+`);
+      continue;
+    }
+    const counts = shipResult?.perStore[outcome.store];
+    let line = `  ${name} ${outcome.events.toLocaleString("en-US")} extracted`;
+    if (counts) {
+      line += `, ${counts.sent.toLocaleString("en-US")} sent`;
+      line += ` (accepted ${counts.accepted.toLocaleString("en-US")}`;
+      line += `, duplicate ${counts.duplicate.toLocaleString("en-US")}`;
+      line += `, rejected ${counts.rejected.toLocaleString("en-US")})`;
+    }
+    out.write(line + "\n");
+    if (outcome.readFailures > 0) {
+      out.write(
+        `  ${" ".repeat(12)} \u26A0 ${outcome.readFailures.toLocaleString("en-US")} file(s)/record(s) this store could not read \u2014 the window is short by an unknown amount
+`
+      );
+    }
+  }
+  out.write(`  ${"total".padEnd(12)} ${input.totalExtracted.toLocaleString("en-US")} extracted`);
+  out.write(ship ? `, ${input.shippable.toLocaleString("en-US")} eligible for the wire
+` : "\n");
+  out.write(`  events file: ${input.eventsFile}
+`);
+  if (!ship) {
+    out.write("\ndry run \u2014 pass --ship to send these over the batch wire.\n");
+    return;
+  }
+  if (input.shipError) {
+    out.write(`
+ship FAILED: ${input.shipError}
+`);
+    return;
+  }
+  if (!shipResult) {
+    out.write("\nship did not run.\n");
+    return;
+  }
+  out.write(
+    `
+shipped: sent=${shipResult.sent} accepted=${shipResult.accepted} duplicate=${shipResult.duplicate} rejected=${shipResult.rejected} httpFailures=${shipResult.httpFailures}
+`
+  );
+  if (shipResult.duplicate > 0) {
+    out.write(
+      `  ${shipResult.duplicate.toLocaleString("en-US")} already imported \u2014 the backend kept its existing copy and stored nothing new.
+`
+    );
+  }
+  if (shipResult.consentBlocked) {
+    out.write(
+      "\n  stopped early: this account has no consent for a retrospective import, so the\n  backend refused the whole batch and every remaining event would be refused too.\n  Nothing was stored. Grant it in Flow \u2014 Connections > Bring in daily tools \u2014 and\n  run this again; the import is idempotent, so nothing here is wasted.\n"
+    );
+  }
+  for (const [reason, n] of Object.entries(shipResult.rejectionReasons)) {
+    out.write(`  rejected ${reason}: ${n}
+`);
+  }
+  if (!shipResult.attributionComplete) {
+    out.write(
+      "  note: at least one batch could not be attributed per source \u2014 the per-source accept/reject splits above are incomplete.\n"
+    );
+  }
+}
+function exitCodeFor(outcomes, ship, shipResult, shipError) {
+  if (outcomes.some((o) => o.status === "failed")) return 1;
+  if (!ship) return 0;
+  if (shipError || !shipResult) return 1;
+  if (shipResult.rejected > 0 || shipResult.httpFailures > 0) return 1;
+  return shipResult.accepted + shipResult.duplicate > 0 ? 0 : 1;
+}
 async function main() {
   const [command, ...rest] = process.argv.slice(2);
   const paths = resolveStorePaths();
@@ -3697,158 +4686,258 @@ async function main() {
     }
     case "import": {
       const ship = rest.includes("--ship");
-      const claudeInventory = await scanClaudeCode(paths);
-      const cursorInventory = await scanCursor(paths);
-      const vsCodeInventory = await scanVsCode(paths);
-      if (!claudeInventory.present && !cursorInventory.present && !vsCodeInventory.present) {
+      const keepStaging = rest.includes("--keep-staging");
+      const snapshotSessions = rest.includes("--snapshot-sessions");
+      const claudeScan = await safeScan("claude_code", paths.claudeProjects, () => scanClaudeCode(paths));
+      const cursorScan = await safeScan("cursor", paths.cursorStateDb, () => scanCursor(paths));
+      const vsCodeScan = await safeScan("vscode", paths.vscodeHistory, () => scanVsCode(paths));
+      const claudeInventory = claudeScan.inventory;
+      const cursorInventory = cursorScan.inventory;
+      const vsCodeInventory = vsCodeScan.inventory;
+      const anyScanFailed = [claudeScan, cursorScan, vsCodeScan].some((r) => r.scanError !== null);
+      if (!claudeInventory.present && !cursorInventory.present && !vsCodeInventory.present && !anyScanFailed) {
         process.stderr.write(
           `no Claude Code store at ${claudeInventory.rootPath}, no Cursor store at ${cursorInventory.rootPath}, and no VS Code store at ${vsCodeInventory.rootPath} \u2014 nothing to import
 `
         );
         return 2;
       }
-      const area = await createStagingArea(defaultStagingRoot(paths.home));
+      const stagingRoot = defaultStagingRoot(paths.home);
+      const swept = await sweepStagingRoot(stagingRoot);
+      if (swept.runsSwept > 0) {
+        process.stdout.write(
+          `swept ${swept.runsSwept} stale staging run(s), freed ${formatBytes(swept.freedBytes)}
+`
+        );
+      }
+      const willCopy = [paths.claudeProjects, paths.cursorStateDb, paths.vscodeHistory].filter(
+        (_, i) => [claudeInventory.present, cursorInventory.present, vsCodeInventory.present][i]
+      );
+      if (snapshotSessions && vsCodeInventory.present) willCopy.push(paths.vscodeWorkspaceStorage);
+      const space = await checkSpaceForSnapshot(stagingRoot, willCopy);
+      if (!space.sufficient) {
+        process.stderr.write(
+          `not enough space to stage this import: need ~${formatBytes(space.requiredBytes)}, ${formatBytes(space.freeBytes ?? 0)} free on the volume holding ${stagingRoot}
+refusing to start rather than failing halfway through the copy
+`
+        );
+        return 2;
+      }
+      const area = await createStagingArea(stagingRoot);
       process.stdout.write(`staging: ${area.root}
 
 `);
       const allEvents = [];
-      if (claudeInventory.present) {
-        process.stdout.write(formatInventory(claudeInventory) + "\n\n");
-        const snapshotRoot = path8.join(area.root, "claude_code");
-        await snapshotPath(area, paths.claudeProjects, path8.join("claude_code", "projects"));
-        const claudeEvents = [];
-        const kindCounts = {};
-        for await (const event of extractClaudeCode(snapshotRoot, area.extractionId)) {
-          claudeEvents.push(event);
-          kindCounts[event.eventKind] = (kindCounts[event.eventKind] ?? 0) + 1;
-        }
-        allEvents.push(...claudeEvents);
-        const epoch = claudeEvents.find((e) => e.eventKind === "extraction_epoch");
-        process.stdout.write(`claude_code extracted: ${claudeEvents.length.toLocaleString("en-US")} events
-`);
-        for (const [kind, n] of Object.entries(kindCounts)) {
-          process.stdout.write(`  ${kind}: ${n.toLocaleString("en-US")}
-`);
-        }
-        if (epoch) {
-          process.stdout.write(`  window: ${epoch.metrics.windowOldest} \u2192 ${epoch.metrics.windowNewest}
+      const outcomes = [];
+      try {
+        await runSource(outcomes, "claude_code", claudeInventory, allEvents, async (collect) => {
+          const snapshotRoot = path9.join(area.root, "claude_code");
+          await snapshotPath(area, paths.claudeProjects, path9.join("claude_code", "projects"));
+          for await (const event of extractClaudeCode(snapshotRoot, area.extractionId)) collect(event);
+        }, (events) => buildHandoff(events, area.extractionId, (/* @__PURE__ */ new Date()).toISOString()), claudeScan.scanError);
+        await runSource(outcomes, "cursor", cursorInventory, allEvents, async (collect) => {
+          const cursorSnapshotRoot = path9.join(area.root, "cursor");
+          await snapshotPath(area, paths.cursorStateDb, path9.join("cursor", "state.vscdb"));
+          for await (const event of extractCursor(cursorSnapshotRoot, area.extractionId)) collect(event);
+        }, (events) => buildCursorHandoff(events, area.extractionId, (/* @__PURE__ */ new Date()).toISOString()), cursorScan.scanError);
+        await runSource(outcomes, "vscode", vsCodeInventory, allEvents, async (collect) => {
+          await snapshotPath(area, paths.vscodeHistory, path9.join("vscode", "history"));
+          let workspaceStorageDir = paths.vscodeWorkspaceStorage;
+          if (snapshotSessions) {
+            workspaceStorageDir = await snapshotVsCodeWorkspaceStorage(
+              area,
+              paths.vscodeWorkspaceStorage,
+              path9.join("vscode", "workspaceStorage")
+            );
+          }
+          const source = {
+            historyDir: path9.join(area.root, "vscode", "history"),
+            workspaceStorageDir
+          };
+          for await (const event of extractVsCode(source, area.extractionId)) collect(event);
+        }, (events) => buildVsCodeHandoff(events, area.extractionId, (/* @__PURE__ */ new Date()).toISOString()), vsCodeScan.scanError);
+        const eventsFile = path9.join(area.root, "events.jsonl");
+        await fs9.writeFile(eventsFile, allEvents.map((e) => JSON.stringify(e)).join("\n") + "\n", "utf8");
+        let shipResult = null;
+        let shipError = null;
+        if (ship) {
+          const config = loadShipConfig();
+          process.stdout.write(`
+shipping to ${config.apiBaseUrl} as ${config.toolInstallationId}\u2026
 `);
+          try {
+            shipResult = await shipEvents(allEvents, config, (done, total) => {
+              process.stdout.write(`  ${done.toLocaleString("en-US")}/${total.toLocaleString("en-US")}\r`);
+            });
+            process.stdout.write("\n");
+          } catch (error) {
+            process.stdout.write("\n");
+            shipError = error instanceof Error ? error.message : String(error);
+          }
         }
-        const handoff = buildHandoff(claudeEvents, area.extractionId, (/* @__PURE__ */ new Date()).toISOString());
-        const handoffPath = await writeHandoff(handoff);
-        if (handoffPath) {
-          process.stdout.write(`  handoff: ${handoff.sessions.length} sessions \u2192 ${handoffPath}
-
+        writeSummary({
+          outcomes,
+          eventsFile,
+          totalExtracted: allEvents.length,
+          shippable: shippableEvents(allEvents).length,
+          ship,
+          shipResult,
+          shipError
+        });
+        return exitCodeFor(outcomes, ship, shipResult, shipError);
+      } finally {
+        if (keepStaging) {
+          process.stdout.write(`
+staging kept at ${area.root} (--keep-staging)
 `);
         } else {
-          process.stdout.write("  handoff: desktop app container not found \u2014 skipped\n\n");
-        }
-      } else {
-        process.stdout.write(formatInventory(claudeInventory) + "\n\n");
-      }
-      if (cursorInventory.present) {
-        process.stdout.write(formatInventory(cursorInventory) + "\n\n");
-        const cursorSnapshotRoot = path8.join(area.root, "cursor");
-        await snapshotPath(area, paths.cursorStateDb, path8.join("cursor", "state.vscdb"));
-        const cursorEvents = [];
-        const kindCounts = {};
-        for await (const event of extractCursor(cursorSnapshotRoot, area.extractionId)) {
-          cursorEvents.push(event);
-          kindCounts[event.eventKind] = (kindCounts[event.eventKind] ?? 0) + 1;
+          const disposed = await disposeStagingArea(area);
+          if (disposed.freedBytes > 0) {
+            process.stdout.write(
+              `
+staging cleaned: freed ${formatBytes(disposed.freedBytes)}, kept ${disposed.kept.join(", ") || "nothing"}
+`
+            );
+          }
         }
-        allEvents.push(...cursorEvents);
-        const epoch = cursorEvents.find((e) => e.eventKind === "extraction_epoch");
-        process.stdout.write(`cursor extracted: ${cursorEvents.length.toLocaleString("en-US")} events
-`);
-        for (const [kind, n] of Object.entries(kindCounts)) {
-          process.stdout.write(`  ${kind}: ${n.toLocaleString("en-US")}
+      }
+    }
+    case "archive": {
+      const archiveRoot = defaultArchiveRoot(paths.home);
+      const flagValue = (name) => {
+        const at = rest.indexOf(name);
+        return at >= 0 && rest[at + 1] ? rest[at + 1] : null;
+      };
+      const generationFlag = flagValue("--generation");
+      if (rest.includes("--list")) {
+        const generations = await listManifests(archiveRoot);
+        if (generations.length === 0) {
+          process.stdout.write(`no archive at ${archiveRoot} \u2014 run \`archive\` to create one
 `);
+          return 0;
         }
-        if (epoch) {
-          process.stdout.write(`  window: ${epoch.metrics.windowOldest} \u2192 ${epoch.metrics.windowNewest}
+        for (const generation2 of generations) {
+          const manifest = await readManifest(archiveRoot, generation2);
+          if (!manifest) {
+            process.stdout.write(`  ${generation2}  UNREADABLE
 `);
+            continue;
+          }
+          const bytes = manifest.files.reduce((sum, f) => sum + f.size, 0);
+          process.stdout.write(
+            `  ${generation2}  ${manifest.files.length.toLocaleString("en-US")} files  ${formatBytes(bytes)} logical
+`
+          );
         }
-        const handoff = buildCursorHandoff(cursorEvents, area.extractionId, (/* @__PURE__ */ new Date()).toISOString());
-        const handoffPath = await writeHandoff(handoff);
-        if (handoffPath) {
-          process.stdout.write(`  handoff: ${handoff.sessions.length} sessions \u2192 ${handoffPath}
-
+        process.stdout.write(`
+archive on disk: ${formatBytes(await archiveSizeBytes(archiveRoot))}
 `);
-        } else {
-          process.stdout.write("  handoff: desktop app container not found \u2014 skipped\n\n");
-        }
-      } else {
-        process.stdout.write(formatInventory(cursorInventory) + "\n\n");
-      }
-      if (vsCodeInventory.present) {
-        process.stdout.write(formatInventory(vsCodeInventory) + "\n\n");
-        const vsCodeSnapshotRoot = path8.join(area.root, "vscode");
-        await snapshotPath(area, paths.vscodeHistory, path8.join("vscode", "history"));
-        await snapshotVsCodeWorkspaceStorage(area, paths.vscodeWorkspaceStorage, path8.join("vscode", "workspaceStorage"));
-        const vsCodeEvents = [];
-        const kindCounts = {};
-        for await (const event of extractVsCode(vsCodeSnapshotRoot, area.extractionId)) {
-          vsCodeEvents.push(event);
-          kindCounts[event.eventKind] = (kindCounts[event.eventKind] ?? 0) + 1;
+        return 0;
+      }
+      if (rest.includes("--verify")) {
+        const manifest = generationFlag ? await readManifest(archiveRoot, generationFlag) : await readLatestManifest(archiveRoot);
+        if (!manifest) {
+          process.stderr.write(`no readable generation to verify in ${archiveRoot}
+`);
+          return 2;
         }
-        allEvents.push(...vsCodeEvents);
-        const epoch = vsCodeEvents.find((e) => e.eventKind === "extraction_epoch");
-        process.stdout.write(`vscode extracted: ${vsCodeEvents.length.toLocaleString("en-US")} events
+        const verified = await verifyArchive(archiveRoot, manifest);
+        process.stdout.write(
+          `generation ${verified.generation}: ${verified.checked.toLocaleString("en-US")} files checked, ${verified.missing.length} missing, ${verified.corrupted.length} corrupted
+`
+        );
+        for (const file of verified.missing.slice(0, 10)) process.stdout.write(`  missing: ${file}
 `);
-        for (const [kind, n] of Object.entries(kindCounts)) {
-          process.stdout.write(`  ${kind}: ${n.toLocaleString("en-US")}
+        for (const file of verified.corrupted.slice(0, 10)) process.stdout.write(`  corrupted: ${file}
 `);
+        return verified.missing.length + verified.corrupted.length > 0 ? 1 : 0;
+      }
+      const restoreTo = flagValue("--restore");
+      if (rest.includes("--restore")) {
+        if (!restoreTo) {
+          process.stderr.write("--restore needs a destination directory\n");
+          return 2;
         }
-        if (epoch) {
-          process.stdout.write(`  window: ${epoch.metrics.windowOldest} \u2192 ${epoch.metrics.windowNewest}
+        const manifest = generationFlag ? await readManifest(archiveRoot, generationFlag) : await readLatestManifest(archiveRoot);
+        if (!manifest) {
+          process.stderr.write(`no readable generation to restore in ${archiveRoot}
 `);
+          return 2;
         }
-        const handoff = buildVsCodeHandoff(vsCodeEvents, area.extractionId, (/* @__PURE__ */ new Date()).toISOString());
-        const handoffPath = await writeHandoff(handoff);
-        if (handoffPath) {
-          process.stdout.write(
-            `  handoff: ${handoff.editDays.length} edit-days, ${handoff.chatSessions.length} chat sessions \u2192 ${handoffPath}
-
+        const restored = await restoreArchive(archiveRoot, manifest, restoreTo);
+        process.stdout.write(
+          `restored ${restored.restored.toLocaleString("en-US")} files from ${manifest.generation} \u2192 ${restored.destination}
 `
-          );
-        } else {
-          process.stdout.write("  handoff: desktop app container not found \u2014 skipped\n\n");
+        );
+        if (restored.skipped > 0) {
+          process.stdout.write(`  ${restored.skipped} could not be written
+`);
         }
-      } else {
-        process.stdout.write(formatInventory(vsCodeInventory) + "\n\n");
+        process.stdout.write(
+          "\nnothing was written to the live stores \u2014 copy back by hand once you have looked at this.\n"
+        );
+        return restored.skipped > 0 ? 1 : 0;
       }
-      const eventsFile = path8.join(area.root, "events.jsonl");
-      await fs8.writeFile(eventsFile, allEvents.map((e) => JSON.stringify(e)).join("\n") + "\n", "utf8");
-      process.stdout.write(`total extracted: ${allEvents.length.toLocaleString("en-US")} events
-`);
-      process.stdout.write(`events file: ${eventsFile}
+      if (rest.includes("--prune")) {
+        const keep = Number(flagValue("--keep") ?? 10);
+        if (!Number.isInteger(keep) || keep < 1) {
+          process.stderr.write("--keep needs a positive integer\n");
+          return 2;
+        }
+        const pruned = await pruneArchive(archiveRoot, keep);
+        process.stdout.write(
+          `pruned ${pruned.generationsRemoved.length} generation(s) and ${pruned.blobsRemoved} unreferenced blob(s), freed ${formatBytes(pruned.freedBytes)}
+`
+        );
+        process.stdout.write(`archive on disk: ${formatBytes(await archiveSizeBytes(archiveRoot))}
 `);
-      if (!ship) {
-        process.stdout.write("dry run \u2014 pass --ship to send these over the batch wire.\n");
         return 0;
       }
-      const config = loadShipConfig();
-      process.stdout.write(`shipping to ${config.apiBaseUrl} as ${config.toolInstallationId}\u2026
+      const includeSessions = rest.includes("--include-vscode-sessions");
+      const sources = defaultArchiveSources(paths, includeSessions);
+      const generation = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+      process.stdout.write(`archiving to ${archiveRoot}
 `);
-      const result = await shipEvents(allEvents, config, (done, total) => {
-        process.stdout.write(`  ${done.toLocaleString("en-US")}/${total.toLocaleString("en-US")}\r`);
-      });
+      for (const source of sources) process.stdout.write(`  ${source.store}/${source.label}: ${source.root}
+`);
+      if (!includeSessions) {
+        process.stdout.write(
+          "  vscode/workspaceStorage: skipped \u2014 15 GB that VS Code is not deleting (--include-vscode-sessions to add)\n"
+        );
+      }
       process.stdout.write("\n");
+      const result = await archiveStores({
+        archiveRoot,
+        sources,
+        generation,
+        now: (/* @__PURE__ */ new Date()).toISOString()
+      });
+      process.stdout.write("\u2500".repeat(60) + `
+generation ${result.generation}
+`);
+      for (const [store, counts] of Object.entries(result.perStore)) {
+        process.stdout.write(
+          `  ${store.padEnd(12)} ${counts.files.toLocaleString("en-US")} files, ${formatBytes(counts.newBytes)} new
+`
+        );
+      }
       process.stdout.write(
-        `shipped: sent=${result.sent} accepted=${result.accepted} duplicate=${result.duplicate} rejected=${result.rejected} httpFailures=${result.httpFailures}
+        `  ${"total".padEnd(12)} ${result.filesArchived.toLocaleString("en-US")} files (${result.filesDeduplicated.toLocaleString("en-US")} already held), ${formatBytes(result.newBytes)} new
 `
       );
-      if (result.duplicate > 0) {
+      if (result.unreadable > 0) {
         process.stdout.write(
-          `  ${result.duplicate.toLocaleString("en-US")} already imported \u2014 the backend kept its existing copy and stored nothing new.
+          `  \u26A0 ${result.unreadable} file(s) could not be read \u2014 this generation is short by an unknown amount
 `
         );
       }
-      for (const [reason, n] of Object.entries(result.rejectionReasons)) {
-        process.stdout.write(`  rejected ${reason}: ${n}
+      const onDisk = await archiveSizeBytes(archiveRoot);
+      process.stdout.write(`  archive on disk: ${formatBytes(onDisk)} across ${(await listManifests(archiveRoot)).length} generation(s)
 `);
-      }
-      return result.accepted + result.duplicate > 0 && result.rejected === 0 && result.httpFailures === 0 ? 0 : 1;
+      process.stdout.write(`  manifest: ${result.manifestPath}
+`);
+      process.stdout.write("\nverify it: ascenda-history-import archive --verify\n");
+      return result.unreadable > 0 ? 1 : 0;
     }
     case "fix-retention": {
       const plan = await planClaudeRetentionFix(paths);
@@ -3873,7 +4962,7 @@ async function main() {
     }
     default: {
       process.stderr.write(
-        "usage: ascenda-history-import <scan [--json] | import [--ship] | fix-retention [--apply]>\n"
+        "usage: ascenda-history-import <scan [--json] | import [--ship] | fix-retention [--apply] | archive [--verify|--list|--restore <dir>|--prune]>\n"
       );
       return command === void 0 || command === "--help" ? 0 : 2;
     }