@use-aistack/cli 0.15.0 → 0.16.1

package/dist/index.js

@@ -377,12 +377,13 @@ function apiEquivalentCost(modelKey, t, atMs) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "0.15.0" : "0.0.0-dev";
+var CLI_VERSION = true ? "0.16.1" : "0.0.0-dev";
 
 // src/api.ts
 var BASE_URL = process.env.AISTACK_URL || "https://aistack.to";
-async function request(path13, options = {}) {
-  return fetch(`${BASE_URL}${path13}`, {
+var STARTUP_READ_TIMEOUT_MS = 5e3;
+async function request(path14, options = {}) {
+  return fetch(`${BASE_URL}${path14}`, {
     ...options,
     headers: {
       "Content-Type": "application/json",
@@ -501,6 +502,7 @@ async function syncPublish(token, bodyJson) {
 }
 async function fetchDayManifest(baseUrl, token) {
   const res = await fetch(`${baseUrl}/api/cli/sync-manifest`, {
+    signal: AbortSignal.timeout(STARTUP_READ_TIMEOUT_MS),
     headers: { "Content-Type": "application/json", ...authHeaders(token) }
   });
   if (res.status === 404) return null;
@@ -524,6 +526,7 @@ async function fetchDayManifest(baseUrl, token) {
 }
 async function fetchPriceTable(baseUrl) {
   const res = await fetch(`${baseUrl}/api/prices`, {
+    signal: AbortSignal.timeout(STARTUP_READ_TIMEOUT_MS),
     headers: { Accept: "application/json" }
   });
   if (res.status === 404) return null;
@@ -800,9 +803,9 @@ function canonicalizeRepoUrl(input) {
 function repoNameFromCanonical(canonical) {
   return parseRepo(canonical)?.repo ?? "";
 }
-function normalizeUpstreamPath(path13) {
-  if (!path13) return "";
-  return path13.split("/").filter(Boolean).join("/");
+function normalizeUpstreamPath(path14) {
+  if (!path14) return "";
+  return path14.split("/").filter(Boolean).join("/");
 }
 
 // src/git.ts
@@ -848,16 +851,16 @@ function buildRepoLinkResource(canonical) {
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { join as join2 } from "node:path";
-function readJson(path13) {
+function readJson(path14) {
   try {
-    if (!existsSync2(path13)) return null;
-    return JSON.parse(readFileSync2(path13, "utf-8"));
+    if (!existsSync2(path14)) return null;
+    return JSON.parse(readFileSync2(path14, "utf-8"));
   } catch {
     return null;
   }
 }
-function hooksFrom(path13, source, out, seen) {
-  const hooks = readJson(path13)?.hooks;
+function hooksFrom(path14, source, out, seen) {
+  const hooks = readJson(path14)?.hooks;
   if (!hooks || typeof hooks !== "object") return;
   for (const [event, config] of Object.entries(hooks)) {
     const stableKey = `hooks:${source}:${event}`;
@@ -1006,16 +1009,16 @@ function buildMcpResource(name, group, pkg) {
     pkg
   };
 }
-function readText(path13) {
+function readText(path14) {
   try {
-    if (!existsSync3(path13)) return null;
-    return readFileSync3(path13, "utf-8");
+    if (!existsSync3(path14)) return null;
+    return readFileSync3(path14, "utf-8");
   } catch {
     return null;
   }
 }
-function readParsed(path13, parse2) {
-  const raw = readText(path13);
+function readParsed(path14, parse2) {
+  const raw = readText(path14);
   if (raw === null) return null;
   try {
     return parse2(raw);
@@ -1023,14 +1026,14 @@ function readParsed(path13, parse2) {
     return null;
   }
 }
-function readJson2(path13) {
-  return readParsed(path13, JSON.parse);
+function readJson2(path14) {
+  return readParsed(path14, JSON.parse);
 }
-function readYaml(path13) {
-  return readParsed(path13, parseYaml);
+function readYaml(path14) {
+  return readParsed(path14, parseYaml);
 }
-function readToml(path13) {
-  return readParsed(path13, parseToml);
+function readToml(path14) {
+  return readParsed(path14, parseToml);
 }
 function continueListToMap(file) {
   if (!file?.mcpServers?.length) return void 0;
@@ -1169,8 +1172,8 @@ function resolveSource(entry, mpRepoUrl) {
   const src = entry.source;
   if (typeof src === "string") {
     if (!mpRepoUrl) return null;
-    const path13 = src.replace(/^\.\//, "").replace(/\/+$/, "");
-    return { url: mpRepoUrl, path: path13 || void 0 };
+    const path14 = src.replace(/^\.\//, "").replace(/\/+$/, "");
+    return { url: mpRepoUrl, path: path14 || void 0 };
   }
   if (src && typeof src === "object" && src.url) {
     return { url: src.url, path: src.path, sha: src.sha };
@@ -1207,10 +1210,10 @@ function resolvePluginLinks(installed, marketplaces, manifests) {
   }
   return out;
 }
-function readJson3(path13) {
+function readJson3(path14) {
   try {
-    if (!existsSync4(path13)) return null;
-    return JSON.parse(readFileSync4(path13, "utf-8"));
+    if (!existsSync4(path14)) return null;
+    return JSON.parse(readFileSync4(path14, "utf-8"));
   } catch {
     return null;
   }
@@ -1844,7 +1847,7 @@ function diffResources(current, existing) {
 // src/commands/connect.ts
 import { spawnSync } from "node:child_process";
 import { cpSync, existsSync as existsSync6 } from "node:fs";
-import { homedir as homedir13 } from "node:os";
+import { homedir as homedir14 } from "node:os";
 import { dirname as dirname3, join as join6 } from "node:path";
 import { fileURLToPath } from "node:url";
 import * as p3 from "@clack/prompts";
@@ -3634,13 +3637,13 @@ function canonicalJson(value) {
 function fnv1a64(text) {
   const prime = 0x100000001b3n;
   const mask = 0xffffffffffffffffn;
-  let hash = 0xcbf29ce484222325n;
+  let hash2 = 0xcbf29ce484222325n;
   const bytes = new TextEncoder().encode(text);
   for (const byte of bytes) {
-    hash ^= BigInt(byte);
-    hash = hash * prime & mask;
+    hash2 ^= BigInt(byte);
+    hash2 = hash2 * prime & mask;
   }
-  return hash.toString(16).padStart(16, "0");
+  return hash2.toString(16).padStart(16, "0");
 }
 function dayFingerprint(day) {
   return fnv1a64(
@@ -5441,11 +5444,11 @@ function ingestWithRetry(agg, file, opts) {
   }
 }
 function ingestFile2(agg, file, opts) {
-  const readFile3 = opts.readFileImpl ?? readFileSync6;
+  const readFile4 = opts.readFileImpl ?? readFileSync6;
   let text;
   if (file.endsWith(".zst")) {
     if (zstdDecompress === null) throw readError("zstd-unsupported");
-    const raw = readFile3(file);
+    const raw = readFile4(file);
     try {
       text = zstdDecompress(
         Buffer.isBuffer(raw) ? raw : Buffer.from(raw)
@@ -5454,7 +5457,7 @@ function ingestFile2(agg, file, opts) {
       throw readError("zstd-corrupt");
     }
   } else {
-    text = readFile3(file).toString("utf8");
+    text = readFile4(file).toString("utf8");
   }
   const records = [];
   let nonEmptyLines = 0;
@@ -6610,15 +6613,129 @@ function ingestContribution(agg, row) {
 
 // src/harness/grok/scan.ts
 import { createReadStream as createReadStream2 } from "node:fs";
-import { readdir as readdir4, readFile as readFile2, stat as stat5 } from "node:fs/promises";
-import { homedir as homedir10 } from "node:os";
-import path8 from "node:path";
+import { readdir as readdir5, readFile as readFile3, stat as stat5 } from "node:fs/promises";
+import { homedir as homedir11 } from "node:os";
+import path9 from "node:path";
 import readline2 from "node:readline";
 import { parse as parseToml3 } from "smol-toml";
+
+// src/harness/grok/context.ts
+import { createHash as createHash2 } from "node:crypto";
+import { appendFile, mkdir as mkdir2, readdir as readdir4, readFile as readFile2, unlink } from "node:fs/promises";
+import { homedir as homedir10 } from "node:os";
+import path8 from "node:path";
+var DAY_MS = 864e5;
+var hash = (value) => createHash2("sha256").update(value).digest("hex");
+function contextCall(value) {
+  const row = asObj(value);
+  if (row?.src !== "shell" || row.msg !== "shell.turn.inference_done")
+    return null;
+  const session = asStr(row.sid);
+  const ts = asStr(row.ts);
+  const ctx = asObj(row.ctx);
+  const tokens = ctx?.prompt_tokens;
+  const loop = ctx?.loop_index;
+  const tsMs = ts ? Date.parse(ts) : NaN;
+  if (!session || !Number.isFinite(tsMs) || typeof tokens !== "number" || !Number.isSafeInteger(tokens) || tokens < 0 || typeof loop !== "number" || !Number.isSafeInteger(loop) || loop < 0)
+    return null;
+  return {
+    id: hash(JSON.stringify([session, tsMs, row.pid ?? null, loop, tokens])),
+    session,
+    tsMs,
+    tokens
+  };
+}
+function contextCacheDirectory(root) {
+  return path8.join(
+    homedir10(),
+    ".config",
+    "aistack",
+    "grok-context",
+    hash(path8.resolve(root))
+  );
+}
+async function optionalRead(file) {
+  try {
+    return await readFile2(file, "utf8");
+  } catch (error) {
+    if (error.code === "ENOENT") return "";
+    throw error;
+  }
+}
+async function retainedContextCalls(root, sessions, cacheDir = contextCacheDirectory(root), now = Date.now()) {
+  const cutoff = now - 400 * DAY_MS;
+  const calls = /* @__PURE__ */ new Map();
+  let files = [];
+  try {
+    files = await readdir4(cacheDir);
+  } catch (error) {
+    if (error.code !== "ENOENT") throw error;
+  }
+  for (const file of files) {
+    if (!/^\d{4}-\d{2}-\d{2}\.jsonl$/.test(file)) continue;
+    if (Date.parse(file.slice(0, 10)) + DAY_MS < cutoff) {
+      await unlink(path8.join(cacheDir, file)).catch(
+        (error) => {
+          if (error.code !== "ENOENT") throw error;
+        }
+      );
+      continue;
+    }
+    const raw2 = await optionalRead(path8.join(cacheDir, file));
+    if (raw2 && !raw2.endsWith("\n"))
+      throw new Error("Incomplete Grok context cache");
+    for (const line of raw2.split("\n").filter(Boolean)) {
+      const call = asObj(JSON.parse(line));
+      if (!call || typeof call.id !== "string" || !/^[a-f0-9]{64}$/.test(call.id) || typeof call.session !== "string" || typeof call.tsMs !== "number" || !Number.isFinite(call.tsMs) || typeof call.tokens !== "number" || !Number.isSafeInteger(call.tokens) || call.tokens < 0)
+        throw new Error("Invalid Grok context cache");
+      if (call.tsMs >= cutoff && call.tsMs <= now)
+        calls.set(call.id, {
+          id: call.id,
+          session: call.session,
+          tsMs: call.tsMs,
+          tokens: call.tokens
+        });
+    }
+  }
+  const raw = await optionalRead(
+    path8.join(root, "..", "logs", "unified.jsonl")
+  );
+  const additions = /* @__PURE__ */ new Map();
+  for (const line of raw.slice(0, raw.lastIndexOf("\n") + 1).split("\n")) {
+    let value;
+    try {
+      value = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    const call = contextCall(value);
+    if (!call || !sessions.has(call.session) || call.tsMs < cutoff || call.tsMs > now || calls.has(call.id))
+      continue;
+    calls.set(call.id, call);
+    const date = new Date(call.tsMs).toISOString().slice(0, 10);
+    const lines2 = additions.get(date) ?? [];
+    lines2.push(JSON.stringify(call));
+    additions.set(date, lines2);
+  }
+  if (additions.size) {
+    await mkdir2(cacheDir, { recursive: true, mode: 448 });
+    for (const [date, lines2] of additions) {
+      await appendFile(
+        path8.join(cacheDir, `${date}.jsonl`),
+        `${lines2.join("\n")}
+`,
+        { mode: 384 }
+      );
+    }
+  }
+  return [...calls.values()].filter((call) => sessions.has(call.session)).sort((a, b) => a.tsMs - b.tsMs || a.id.localeCompare(b.id));
+}
+
+// src/harness/grok/scan.ts
 function sessionRoots() {
   return [
-    path8.join(
-      process.env.GROK_HOME || path8.join(homedir10(), ".grok"),
+    path9.join(
+      process.env.GROK_HOME || path9.join(homedir11(), ".grok"),
       "sessions"
     )
   ];
@@ -6650,7 +6767,7 @@ async function stableRead(file, jsonl) {
         if (before.size === after.size && before.mtimeMs === after.mtimeMs)
           return { lines: lines2, complete: true };
       } else {
-        const raw = await readFile2(file, "utf8");
+        const raw = await readFile3(file, "utf8");
         const after = await stat5(file);
         if (before.size === after.size && before.mtimeMs === after.mtimeMs)
           return { json: JSON.parse(raw), complete: true };
@@ -6662,16 +6779,16 @@ async function stableRead(file, jsonl) {
 }
 async function directories(root) {
   try {
-    const workspaces = await readdir4(root, { withFileTypes: true });
+    const workspaces = await readdir5(root, { withFileTypes: true });
     const out = [];
     for (const workspace of workspaces) {
       if (!workspace.isDirectory() || workspace.isSymbolicLink()) continue;
-      const workspacePath = path8.join(root, workspace.name);
-      for (const session of await readdir4(workspacePath, {
+      const workspacePath = path9.join(root, workspace.name);
+      for (const session of await readdir5(workspacePath, {
         withFileTypes: true
       })) {
         if (session.isDirectory() && !session.isSymbolicLink())
-          out.push(path8.join(workspacePath, session.name));
+          out.push(path9.join(workspacePath, session.name));
       }
     }
     return out.sort();
@@ -6683,7 +6800,7 @@ async function modelAliasesForRoot(root) {
   if (process.env.GROK_MODELS_BASE_URL) return /* @__PURE__ */ new Map();
   try {
     const parsed = asObj(
-      parseToml3(await readFile2(path8.join(root, "..", "config.toml"), "utf8"))
+      parseToml3(await readFile3(path9.join(root, "..", "config.toml"), "utf8"))
     );
     if (!parsed || asObj(parsed.endpoints)?.models_base_url) return /* @__PURE__ */ new Map();
     const models = asObj(parsed.model);
@@ -6706,6 +6823,7 @@ async function scan4(agg, opts = {}) {
   let complete = true;
   for (const root of opts.roots ?? sessionRoots()) {
     const aliases = await modelAliasesForRoot(root);
+    const contextSessions = /* @__PURE__ */ new Map();
     const dirs = await directories(root);
     if (dirs === null) {
       complete = false;
@@ -6714,7 +6832,7 @@ async function scan4(agg, opts = {}) {
     for (const dir of dirs) {
       let entries;
       try {
-        entries = await readdir4(dir, { withFileTypes: true });
+        entries = await readdir5(dir, { withFileTypes: true });
       } catch {
         complete = false;
         continue;
@@ -6722,10 +6840,10 @@ async function scan4(agg, opts = {}) {
       const files = new Map(
         entries.filter(
           (e) => e.isFile() && (isGrokEvidenceFile(e.name) || e.name === "summary.json")
-        ).map((e) => [e.name, path8.join(dir, e.name)])
+        ).map((e) => [e.name, path9.join(dir, e.name)])
       );
       let projectDir = dir;
-      let sessionFallback = path8.basename(dir);
+      let sessionFallback = path9.basename(dir);
       let child = false;
       let parentSession;
       const summary = files.get("summary.json");
@@ -6743,6 +6861,7 @@ async function scan4(agg, opts = {}) {
         parentSession = asStr(value?.parentSessionId) ?? asStr(value?.parent_session_id) ?? asStr(info?.parentSessionId) ?? asStr(info?.parent_session_id) ?? void 0;
         child = parentSession !== void 0;
       }
+      contextSessions.set(sessionFallback, { projectDir, parentSession });
       let rows = [];
       let precedence = 0;
       const usage = files.get("usage.json");
@@ -6756,7 +6875,11 @@ async function scan4(agg, opts = {}) {
         }
         stats.filesRead++;
         rows = sidecarContributions(read3.json, projectDir);
-        if (rows.length > 0) precedence = 2;
+        if (rows.length > 0) {
+          precedence = 2;
+          for (const row of rows)
+            contextSessions.set(row.sessionId, { projectDir, parentSession });
+        }
       }
       if (child) {
         rows = [];
@@ -6829,6 +6952,32 @@ async function scan4(agg, opts = {}) {
       }
       opts.onProgress?.(stats.filesFound);
     }
+    try {
+      const calls = await retainedContextCalls(
+        root,
+        new Set(contextSessions.keys()),
+        opts.contextCacheDir
+      );
+      for (const call of calls) {
+        if (opts.sinceMs !== void 0 && call.tsMs < opts.sinceMs) continue;
+        const source = contextSessions.get(call.session);
+        agg.workflow.ingest({
+          type: "response",
+          session: call.session,
+          projectWorkspace: source?.projectDir,
+          parentSession: source?.parentSession,
+          tsMs: call.tsMs,
+          responseId: `context:${call.id}`,
+          contextTokens: call.tokens
+        });
+        const dates = sessionDates.get(call.session) ?? /* @__PURE__ */ new Set();
+        dates.add(new Date(call.tsMs).toISOString().slice(0, 10));
+        sessionDates.set(call.session, dates);
+      }
+    } catch {
+      complete = false;
+      stats.filesUnreadable++;
+    }
   }
   for (const { rows } of candidates.values()) {
     for (const row of rows) {
@@ -7056,14 +7205,14 @@ function noteConfiguredMcpServers2(agg, state, serverNames) {
 
 // src/harness/opencode/scan.ts
 import { readFileSync as readFileSync7 } from "node:fs";
-import { readdir as readdir5, stat as stat6 } from "node:fs/promises";
-import { homedir as homedir11 } from "node:os";
-import path9 from "node:path";
+import { readdir as readdir6, stat as stat6 } from "node:fs/promises";
+import { homedir as homedir12 } from "node:os";
+import path10 from "node:path";
 var OPENCODE_MIGRATION_CEILING = 20260622202450;
 function opencodeDataDirs() {
   const xdg = process.env.XDG_DATA_HOME;
-  const base = xdg || path9.join(homedir11(), ".local", "share");
-  return [path9.join(base, "opencode")];
+  const base = xdg || path10.join(homedir12(), ".local", "share");
+  return [path10.join(base, "opencode")];
 }
 function isStoreFile(basename2) {
   return basename2 === "opencode.db" || /^opencode-[^/]+\.db$/.test(basename2);
@@ -7072,8 +7221,8 @@ async function dbFilesIn(root) {
   const override = process.env.OPENCODE_DB;
   if (override) return [override];
   try {
-    const entries = await readdir5(root, { withFileTypes: true });
-    return entries.filter((e) => e.isFile() && isStoreFile(e.name)).map((e) => path9.join(root, e.name)).sort();
+    const entries = await readdir6(root, { withFileTypes: true });
+    return entries.filter((e) => e.isFile() && isStoreFile(e.name)).map((e) => path10.join(root, e.name)).sort();
   } catch {
     return [];
   }
@@ -7110,7 +7259,7 @@ async function scan5(agg, opts = {}) {
       } catch (e) {
         stats.filesUnreadable++;
         stats.unreadableFiles.push({
-          path: path9.basename(file),
+          path: path10.basename(file),
           reason: errorClass2(e)
         });
       }
@@ -7277,8 +7426,8 @@ function pickTs(jsonTs, columnTs) {
 }
 function opencodeConfigFile() {
   const xdg = process.env.XDG_CONFIG_HOME;
-  const base = xdg || path9.join(homedir11(), ".config");
-  return path9.join(base, "opencode", "opencode.json");
+  const base = xdg || path10.join(homedir12(), ".config");
+  return path10.join(base, "opencode", "opencode.json");
 }
 function readConfiguredMcpServers2(agg, state, configFile) {
   const file = configFile ?? opencodeConfigFile();
@@ -7580,17 +7729,17 @@ function readCounts2(usageRaw) {
 
 // src/harness/pi/scan.ts
 import { createReadStream as createReadStream3 } from "node:fs";
-import { readdir as readdir6, realpath as realpath3, stat as stat7 } from "node:fs/promises";
-import { homedir as homedir12 } from "node:os";
-import path10 from "node:path";
+import { readdir as readdir7, realpath as realpath3, stat as stat7 } from "node:fs/promises";
+import { homedir as homedir13 } from "node:os";
+import path11 from "node:path";
 import readline3 from "node:readline";
 var MAX_SESSION_VERSION = 3;
 function piAgentDir() {
-  return process.env.PI_CODING_AGENT_DIR || path10.join(homedir12(), ".pi", "agent");
+  return process.env.PI_CODING_AGENT_DIR || path11.join(homedir13(), ".pi", "agent");
 }
 function sessionRoots2() {
   const override = process.env.PI_CODING_AGENT_SESSION_DIR;
-  return [override || path10.join(piAgentDir(), "sessions")];
+  return [override || path11.join(piAgentDir(), "sessions")];
 }
 var SESSION_FILE_RE = /^\d{4}-\d{2}-\d{2}T\d{2}-\d{2}-\d{2}-\d{3}Z_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\.jsonl$/;
 function isSessionFile(basename2) {
@@ -7599,12 +7748,12 @@ function isSessionFile(basename2) {
 async function* walkSessions(dir) {
   let entries;
   try {
-    entries = await readdir6(dir, { withFileTypes: true });
+    entries = await readdir7(dir, { withFileTypes: true });
   } catch {
     return;
   }
   for (const e of entries) {
-    const full = path10.join(dir, e.name);
+    const full = path11.join(dir, e.name);
     if (e.isDirectory()) yield* walkSessions(full);
     else if (e.isFile() && isSessionFile(e.name)) yield full;
   }
@@ -7652,7 +7801,7 @@ async function scan6(agg, opts = {}) {
           stats.filesUnreadable++;
           stats.filesRead--;
           stats.unreadableFiles.push({
-            path: path10.relative(root, file),
+            path: path11.relative(root, file),
             reason: "version-too-new"
           });
         }
@@ -7660,7 +7809,7 @@ async function scan6(agg, opts = {}) {
         stats.filesUnreadable++;
         stats.filesRead--;
         stats.unreadableFiles.push({
-          path: path10.relative(root, file),
+          path: path11.relative(root, file),
           reason: "read-error"
         });
       }
@@ -7798,7 +7947,7 @@ var MCP_ADD_ARGS = [
   "mcp"
 ];
 var MCP_REMOVE_ARGS = ["mcp", "remove", "--scope", "user", "aistack"];
-var SKILL_DEST = join6(homedir13(), ".claude", "skills", "aistack-sync");
+var SKILL_DEST = join6(homedir14(), ".claude", "skills", "aistack-sync");
 function runClaude(args) {
   const r = spawnSync("claude", args, { encoding: "utf-8" });
   const notFound = r.error !== void 0 && r.error.code === "ENOENT";
@@ -8120,13 +8269,13 @@ async function loginCommand(options = {}) {
 import * as p7 from "@clack/prompts";
 
 // src/autosync/codexHook.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync9, writeFileSync as writeFileSync3 } from "node:fs";
-import { homedir as homedir14 } from "node:os";
+import { homedir as homedir15 } from "node:os";
 import { dirname as dirname5, join as join8 } from "node:path";
 import { parse } from "smol-toml";
 function codexHome2() {
-  return process.env.CODEX_HOME || join8(homedir14(), ".codex");
+  return process.env.CODEX_HOME || join8(homedir15(), ".codex");
 }
 function codexHooksFile() {
   return join8(codexHome2(), "hooks.json");
@@ -8235,7 +8384,7 @@ function codexHookTrusted(configFile = codexConfigFile(), hooksFile = codexHooks
           hooks: [normalizedHandler]
         };
         if (typeof group.matcher === "string") identity.matcher = group.matcher;
-        const currentHash = `sha256:${createHash2("sha256").update(JSON.stringify(canonicalJson2(identity))).digest("hex")}`;
+        const currentHash = `sha256:${createHash3("sha256").update(JSON.stringify(canonicalJson2(identity))).digest("hex")}`;
         const key2 = `${hooksFile}:session_start:${groupIndex}:${handlerIndex}`;
         matches.push(config.hooks?.state?.[key2]?.trusted_hash === currentHash);
       }
@@ -8267,14 +8416,14 @@ import * as p6 from "@clack/prompts";
 
 // src/autosync/cursorHook.ts
 import { existsSync as existsSync10, mkdirSync as mkdirSync5, readFileSync as readFileSync11, writeFileSync as writeFileSync5 } from "node:fs";
-import { homedir as homedir16, platform as platform2 } from "node:os";
+import { homedir as homedir17, platform as platform2 } from "node:os";
 import { dirname as dirname7, join as join10 } from "node:path";
 
 // src/autosync/hook.ts
 import { existsSync as existsSync9, mkdirSync as mkdirSync4, readFileSync as readFileSync10, writeFileSync as writeFileSync4 } from "node:fs";
-import { homedir as homedir15 } from "node:os";
+import { homedir as homedir16 } from "node:os";
 import { dirname as dirname6, join as join9 } from "node:path";
-var CLAUDE_SETTINGS_FILE = join9(homedir15(), ".claude", "settings.json");
+var CLAUDE_SETTINGS_FILE = join9(homedir16(), ".claude", "settings.json");
 var AUTO_SYNC_HOOK_COMMAND = "npx -y @use-aistack/cli@latest sync --auto || npx -y --prefer-offline @use-aistack/cli sync --auto";
 function isOurs2(entry) {
   return typeof entry.command === "string" && entry.command.includes("@use-aistack/cli") && entry.command.includes("sync --auto");
@@ -8347,7 +8496,7 @@ function autoSyncHookInstalled(file = CLAUDE_SETTINGS_FILE) {
 }
 
 // src/autosync/cursorHook.ts
-var CURSOR_HOOK_FILE = join10(homedir16(), ".cursor", "hooks.json");
+var CURSOR_HOOK_FILE = join10(homedir17(), ".cursor", "hooks.json");
 function cursorHookCommand(os = platform2()) {
   if (os === "win32") {
     const script = `Start-Process -WindowStyle Hidden -FilePath 'cmd.exe' -ArgumentList '/d /s /c "set AISTACK_HOOK_SOURCE=cursor&& (${AUTO_SYNC_HOOK_COMMAND}) <NUL >NUL 2>&1"'`;
@@ -8427,10 +8576,10 @@ import {
   unlinkSync,
   writeFileSync as writeFileSync6
 } from "node:fs";
-import { homedir as homedir17, platform as platform3 } from "node:os";
+import { homedir as homedir18, platform as platform3 } from "node:os";
 import { dirname as dirname8, join as join11 } from "node:path";
 var GROK_HOOK_FILE = join11(
-  process.env.GROK_HOME || join11(homedir17(), ".grok"),
+  process.env.GROK_HOME || join11(homedir18(), ".grok"),
   "hooks",
   "aistack.json"
 );
@@ -8788,11 +8937,11 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync8
 } from "node:fs";
-import { homedir as homedir19 } from "node:os";
+import { homedir as homedir20 } from "node:os";
 import { dirname as dirname9, join as join12 } from "node:path";
 
 // src/sync/stage.ts
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 
 // src/usage/days.ts
 var round6 = (n) => Math.round(n * 1e6) / 1e6;
@@ -8907,11 +9056,11 @@ function buildMeasuredDays(input) {
 
 // src/usage/diff.ts
 var MAX_DAY_WINDOW = 400;
-var DAY_MS = 864e5;
+var DAY_MS2 = 864e5;
 function retentionFloor(todayUtc, days) {
   const span = Math.max(1, Math.min(days, MAX_DAY_WINDOW));
   const todayMs = Date.parse(`${todayUtc}T00:00:00.000Z`);
-  return new Date(todayMs - (span - 1) * DAY_MS).toISOString().slice(0, 10);
+  return new Date(todayMs - (span - 1) * DAY_MS2).toISOString().slice(0, 10);
 }
 function selectDaysToPublish(input) {
   const { local, manifest, todayUtc } = input;
@@ -8948,7 +9097,7 @@ function selectDaysToPublish(input) {
 
 // src/workflow/git.ts
 import { execFile, execFileSync as execFileSync2 } from "node:child_process";
-import path11 from "node:path";
+import path12 from "node:path";
 var TEST_FILE_RULE_VERSION = "test-files/v2";
 var FILE_TYPE_RULE_VERSION = "file-types/v2";
 var COMMIT_SET_RULE_VERSION = "commit-set/v1";
@@ -9212,10 +9361,10 @@ function reduceGitHistories(histories, options) {
       const field = fields[fieldIndex] ?? "";
       if (field.replace(/^\n+/, "") === COMMIT_MARKER) {
         finishCommit();
-        const hash = fields[++fieldIndex] ?? "";
+        const hash2 = fields[++fieldIndex] ?? "";
         const authoredAt = fields[++fieldIndex] ?? "";
         const authoredMs = Date.parse(authoredAt);
-        const included = Number.isFinite(authoredMs) && authoredMs >= options.fromMs && authoredMs <= options.toMs && !seenCommits.has(hash);
+        const included = Number.isFinite(authoredMs) && authoredMs >= options.fromMs && authoredMs <= options.toMs && !seenCommits.has(hash2);
         current = {
           included,
           date: included ? new Date(authoredMs).toISOString().slice(0, 10) : "",
@@ -9228,7 +9377,7 @@ function reduceGitHistories(histories, options) {
           withheldLines: 0,
           extensionLines: /* @__PURE__ */ new Map()
         };
-        if (included) seenCommits.add(hash);
+        if (included) seenCommits.add(hash2);
         continue;
       }
       const stat8 = parseNumstat(field);
@@ -9247,7 +9396,7 @@ function reduceGitHistories(histories, options) {
       current.changedLines += fileChangedLines;
       if (isTestFile(file)) current.touchesTest = true;
       if (fileChangedLines <= 0) continue;
-      const extension = path11.extname(file).toLowerCase();
+      const extension = path12.extname(file).toLowerCase();
       if (APPROVED_EXTENSIONS.has(extension)) {
         current.extensionLines.set(
           extension,
@@ -9351,18 +9500,18 @@ function buildWorkflowExtraction(harnessWorkflows, git, utcOffsetMinutes = machi
 }
 
 // src/sync/grokDateCache.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 import { existsSync as existsSync12, mkdirSync as mkdirSync7, readFileSync as readFileSync13, writeFileSync as writeFileSync7 } from "node:fs";
-import { homedir as homedir18 } from "node:os";
-import path12 from "node:path";
-var defaultFile = path12.join(
-  homedir18(),
+import { homedir as homedir19 } from "node:os";
+import path13 from "node:path";
+var defaultFile = path13.join(
+  homedir19(),
   ".config",
   "aistack",
   "grok-session-dates.json"
 );
 function grokCacheScope(baseUrl, stack, token) {
-  return createHash3("sha256").update(`${baseUrl}\0${stack}\0${token}`).digest("hex");
+  return createHash4("sha256").update(`${baseUrl}\0${stack}\0${token}`).digest("hex");
 }
 function read2(file) {
   if (!existsSync12(file)) return {};
@@ -9379,7 +9528,7 @@ function loadGrokDateHints(scope, file = defaultFile) {
 function saveGrokDateHints(scope, hints, file = defaultFile) {
   const cache = read2(file);
   cache[scope] = hints;
-  mkdirSync7(path12.dirname(file), { recursive: true });
+  mkdirSync7(path13.dirname(file), { recursive: true });
   writeFileSync7(file, JSON.stringify(cache, null, 2));
 }
 function mapToHints(value, floor) {
@@ -9791,7 +9940,7 @@ function buildGateSummary(ctx) {
 // src/sync/stage.ts
 var utcDate2 = (ms) => new Date(ms).toISOString().slice(0, 10);
 function stageId(bodyJson) {
-  return createHash4("sha256").update(bodyJson).digest("hex").slice(0, 12);
+  return createHash5("sha256").update(bodyJson).digest("hex").slice(0, 12);
 }
 async function stageSync(deps) {
   const now = (deps.now ?? Date.now)();
@@ -9808,7 +9957,7 @@ async function stageSync(deps) {
     id: BUNDLED_PRICE_TABLE_ID,
     origin: "bundled"
   };
-  progress("Checking prices and stack settings");
+  progress("Checking prices");
   try {
     const table = await fetchPrices(deps.baseUrl);
     if (table) {
@@ -9820,12 +9969,14 @@ async function stageSync(deps) {
   } catch {
     setActivePricer(null);
   }
+  progress("Checking stack settings");
   const { config, source } = await loadConfig({
     baseUrl: deps.baseUrl,
     ...token ? { token } : {}
   });
   let manifest = null;
   if (token) {
+    progress("Checking previously synced days");
     try {
       manifest = await fetchManifest(deps.baseUrl, token);
     } catch {
@@ -9842,6 +9993,7 @@ async function stageSync(deps) {
   const usageScans = [];
   const sinceMs = windowStartMs(now, windowDays);
   const daysSinceMs = windowStartMs(now, retentionDays);
+  progress("Detecting local harnesses");
   const active2 = await adapters(sinceMs);
   const historical = await adapters(daysSinceMs);
   let dayScansComplete = true;
@@ -9996,7 +10148,7 @@ async function stageSync(deps) {
 }
 
 // src/autosync/run.ts
-var SYNC_LOG_FILE = join12(homedir19(), ".config", "aistack", "sync.log");
+var SYNC_LOG_FILE = join12(homedir20(), ".config", "aistack", "sync.log");
 var SYNC_LOG_MAX_LINES = 200;
 var FIX_COMMAND = "npx @use-aistack/cli sync";
 var REVOKED_RESULT = "off - auto-sync is switched off for this stack";
@@ -10049,7 +10201,7 @@ async function runAutoSync(deps) {
   const state = settings.autoSyncState ?? {};
   const lastRunAt = state.lastRunAt ?? 0;
   if (now - lastRunAt < windowMs) return;
-  const reservationFile = deps.reservationFile ?? `${settingsFile ?? join12(homedir19(), ".config", "aistack", "settings.json")}.auto-sync-attempt`;
+  const reservationFile = deps.reservationFile ?? `${settingsFile ?? join12(homedir20(), ".config", "aistack", "settings.json")}.auto-sync-attempt`;
   if (!reserveAttempt(reservationFile, now, windowMs)) return;
   saveSettings({ autoSyncState: { ...state, lastRunAt: now } }, settingsFile);
   const stage = deps.stageImpl ?? stageSync;