@use-aistack/cli 0.12.2 → 0.12.4

package/dist/index.js

@@ -348,7 +348,7 @@ function apiEquivalentCost(modelKey, t, atMs) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "0.12.2" : "0.0.0-dev";
+var CLI_VERSION = true ? "0.12.4" : "0.0.0-dev";
 
 // src/api.ts
 var BASE_URL = process.env.AISTACK_URL || "https://aistack.to";
@@ -976,11 +976,11 @@ function readText(path7) {
     return null;
   }
 }
-function readParsed(path7, parse) {
+function readParsed(path7, parse2) {
   const raw = readText(path7);
   if (raw === null) return null;
   try {
-    return parse(raw);
+    return parse2(raw);
   } catch {
     return null;
   }
@@ -6476,6 +6476,7 @@ import { createHash } from "node:crypto";
 import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync9, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir11 } 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(homedir11(), ".codex");
 }
@@ -6558,15 +6559,59 @@ function codexAutoSyncHookInstalled(file = codexHooksFile()) {
   if (!Array.isArray(sessionStart)) return false;
   return sessionStart.some((m) => (m.hooks ?? []).some((h) => isOurs(h)));
 }
-function codexHookTrusted(configFile = codexConfigFile()) {
-  let text;
+function codexHookTrusted(configFile = codexConfigFile(), hooksFile = codexHooksFile()) {
   try {
-    text = readFileSync9(configFile, "utf-8");
+    const config = parse(readFileSync9(configFile, "utf-8"));
+    const read = readHooksJson(hooksFile);
+    if ("error" in read) return null;
+    const sessionStart = read.settings.hooks?.SessionStart;
+    if (!Array.isArray(sessionStart)) return false;
+    const matches = [];
+    for (const [groupIndex, group] of sessionStart.entries()) {
+      for (const [handlerIndex, handler] of (group.hooks ?? []).entries()) {
+        if (!isOurs(handler) || typeof handler.command !== "string") continue;
+        const normalizedHandler = {
+          type: "command",
+          command: handler.command,
+          timeout: typeof handler.timeout === "number" ? Math.max(1, handler.timeout) : 600,
+          async: handler.async === true
+        };
+        if (typeof handler.statusMessage === "string") {
+          normalizedHandler.statusMessage = handler.statusMessage;
+        }
+        if (typeof handler.additionalContextLimit === "number" && handler.additionalContextLimit !== 2500) {
+          normalizedHandler.additionalContextLimit = handler.additionalContextLimit;
+        }
+        const identity = {
+          event_name: "session_start",
+          hooks: [normalizedHandler]
+        };
+        if (typeof group.matcher === "string") identity.matcher = group.matcher;
+        const currentHash = `sha256:${createHash("sha256").update(JSON.stringify(canonicalJson2(identity))).digest("hex")}`;
+        const key2 = `${hooksFile}:session_start:${groupIndex}:${handlerIndex}`;
+        matches.push(config.hooks?.state?.[key2]?.trusted_hash === currentHash);
+      }
+    }
+    return matches.length > 0 && matches.every(Boolean);
   } catch {
     return null;
   }
-  const hash = createHash("sha256").update(CODEX_HOOK_COMMAND).digest("hex");
-  return text.includes(hash);
+}
+function canonicalJson2(value) {
+  if (Array.isArray(value)) return value.map(canonicalJson2);
+  if (value && typeof value === "object") {
+    const sorted = {};
+    for (const [key2, child] of Object.entries(value).sort(
+      ([a], [b]) => a.localeCompare(b)
+    )) {
+      sorted[key2] = canonicalJson2(child);
+    }
+    return sorted;
+  }
+  if (value === null || typeof value === "boolean" || typeof value === "number" || typeof value === "string") {
+    return value;
+  }
+  throw new TypeError("hook identity is not JSON-serializable");
 }
 
 // src/autosync/optin.ts
@@ -6679,7 +6724,9 @@ async function enableAutoSync(frequencyHours = DEFAULT_FREQUENCY_HOURS, deps = {
   if (names.has(CODEX_HARNESS_NAME)) {
     const codexResult = (deps.installCodexHook ?? installCodexAutoSyncHook)();
     if (!codexResult.ok) return codexResult;
-    trustLine = codexResult.message;
+    if ((deps.codexHookTrustedImpl ?? codexHookTrusted)() !== true) {
+      trustLine = codexResult.message;
+    }
   }
   saveSettings(
     {
@@ -7430,6 +7477,15 @@ function totalUSD(payload) {
   }
   return any ? sum : null;
 }
+function tokenBreakdown(payload) {
+  let fresh = 0;
+  let cached = 0;
+  for (const model of payload.models) {
+    fresh += model.tokens.input + model.tokens.output + model.tokens.cacheWrite;
+    cached += model.tokens.cacheRead;
+  }
+  return fresh + cached === payload.activity.totalTokens ? { fresh, cached } : null;
+}
 function withheldCount(payload) {
   const w = payload.inventory.withheld;
   return w.builtinTools + w.mcpServers + w.skills + w.subagents + w.slashCommands;
@@ -7539,10 +7595,15 @@ function payloadBlock(payload, width, ownWindow, stats) {
   const label = `${harnessLabel2(payload.harness.name)}${payload.harness.version ? ` ${payload.harness.version}` : ""}`;
   const days = payload.activity.activeDayDates.length;
   const usd = totalUSD(payload);
+  const breakdown = tokenBreakdown(payload);
   const totals = [
     `${payload.activity.sessions} session${payload.activity.sessions === 1 ? "" : "s"}`,
     `${days} active day${days === 1 ? "" : "s"}`,
-    `${fmtTokens(payload.activity.totalTokens)} tokens`
+    `${fmtTokens(payload.activity.totalTokens)} tokens processed`,
+    ...breakdown ? [
+      `${fmtTokens(breakdown.fresh)} fresh`,
+      `${fmtTokens(breakdown.cached)} cached`
+    ] : []
   ];
   out.push(`${label.toUpperCase()} ${payload.activity.sessions}`);
   if (payload.activity.totalTokens === 0) {