@iowarp/clio-coder 0.4.7 → 0.4.9

package/dist/{chunk-D2T66PDV.js → chunk-3SUDBGEI.js}

@@ -6,32 +6,35 @@ import {
   probeWorkspace
 } from "./chunk-DNHVRBH4.js";
 import {
-  isSessionEntry,
-  isSessionHeader
-} from "./chunk-KAFMW7WM.js";
+  collectSessionEntries,
+  enrichForkMeta,
+  listSessionsForCwd
+} from "./chunk-2VBWFXYE.js";
 import {
   stripTokenizerSentinels
 } from "./chunk-MCJKEGHO.js";
+import {
+  BusChannels
+} from "./chunk-W5RM7YAH.js";
+import {
+  protectArtifact
+} from "./chunk-SQBT46OF.js";
+import {
+  isSessionEntry,
+  isSessionHeader
+} from "./chunk-NBPA5QM6.js";
 import {
   CURRENT_SESSION_FORMAT_VERSION,
   appendSessionFileEntry,
   atomicWrite,
   createSession,
-  cwdHash,
   openSession,
   readSessionFileEntries,
   readSessionMeta,
   resumeSession,
   sessionPaths
-} from "./chunk-FQOOGXBH.js";
-import {
-  BusChannels
-} from "./chunk-6CB2IL4N.js";
-import {
-  protectArtifact
-} from "./chunk-2O2LVQQK.js";
+} from "./chunk-3RDHGNU7.js";
 import {
-  clioStateDir,
   stateRootRemoved
 } from "./chunk-CTTI7G3T.js";
 import {
@@ -117,25 +120,10 @@ function attributedModelId(observation, requestedModelId, differingResponseModel
   }
 }
 
-// src/domains/session/compaction/session-entries.ts
-init_esm_shims();
-function collectSessionEntries(turns, filePath) {
-  const out = [];
-  for (const raw of turns) {
-    if (!isSessionEntry(raw)) {
-      throw new Error(
-        `session ledger contains an unreadable entry (missing kind discriminant): ${filePath}. Remove or compact the session to reset.`
-      );
-    }
-    out.push(raw);
-  }
-  return out;
-}
-
 // src/domains/session/archive-readers.ts
 init_esm_shims();
 import { readdir, readFile } from "node:fs/promises";
-import { join as join3 } from "node:path";
+import { join as join2 } from "node:path";
 
 // src/domains/session/index.ts
 init_esm_shims();
@@ -159,161 +147,6 @@ async function performCheckpoint(state, reason) {
   Object.assign(state.meta, enriched);
 }
 
-// src/domains/session/history.ts
-init_esm_shims();
-import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
-import { join } from "node:path";
-function listSessionsForCwd(cwd) {
-  const hash = cwdHash(cwd);
-  const dir = join(clioStateDir(), "sessions", hash);
-  if (!existsSync(dir)) return [];
-  const metas = [];
-  for (const entry of readdirSync(dir, { withFileTypes: true })) {
-    if (!entry.isDirectory()) continue;
-    const sessionDir = join(dir, entry.name);
-    const metaPath = join(sessionDir, "meta.json");
-    if (!existsSync(metaPath)) continue;
-    let meta;
-    try {
-      if (!statSync(metaPath).isFile()) continue;
-      const raw = readFileSync(metaPath, "utf8");
-      meta = JSON.parse(raw);
-    } catch {
-      continue;
-    }
-    enrichMetaForListing(meta, join(sessionDir, "current.jsonl"));
-    metas.push(meta);
-  }
-  metas.sort((a, b) => {
-    const aKey = a.lastActivityAt ?? a.createdAt ?? "";
-    const bKey = b.lastActivityAt ?? b.createdAt ?? "";
-    return aKey === bKey ? 0 : aKey > bKey ? -1 : 1;
-  });
-  return metas;
-}
-var PREVIEW_MAX_CHARS = 240;
-function collapseWhitespace(text) {
-  return text.replace(/\s+/g, " ").trim();
-}
-function rawMessageText(payload) {
-  if (typeof payload === "string") return payload.trim().length > 0 ? payload : null;
-  if (!payload || typeof payload !== "object") return null;
-  const obj = payload;
-  if (typeof obj.text === "string" && obj.text.trim().length > 0) return obj.text;
-  if (Array.isArray(obj.content)) {
-    const parts = [];
-    for (const part of obj.content) {
-      if (part && typeof part === "object" && part.type === "text" && typeof part.text === "string") {
-        parts.push(part.text);
-      }
-    }
-    const joined = parts.join("\n");
-    if (joined.trim().length > 0) return joined;
-  }
-  return null;
-}
-function extractMessageText(payload) {
-  const raw = rawMessageText(payload);
-  if (raw === null) return null;
-  const collapsed = collapseWhitespace(raw);
-  return collapsed.length > 0 ? collapsed : null;
-}
-function operatorTextOfUserPayload(payload) {
-  if (payload && typeof payload === "object" && typeof payload.operatorText === "string") {
-    const collapsed = collapseWhitespace(payload.operatorText);
-    return collapsed.length > 0 ? collapsed : null;
-  }
-  const text = rawMessageText(payload);
-  if (text === null) return null;
-  const stripped = collapseWhitespace(stripInjectedPreamble(text));
-  return stripped.length > 0 ? stripped : null;
-}
-var LEADING_SYSTEM_REMINDER = /^\s*<system-reminder>[\s\S]*?<\/system-reminder>\s*/u;
-var LEADING_SKILL_REQUEST = /^\s*\[Skill request\][\s\S]*?Only these pending skill names are allowed this turn\.[^\n]*\s*/u;
-function stripInjectedPreamble(text) {
-  let current = text;
-  for (; ; ) {
-    const next = current.replace(LEADING_SYSTEM_REMINDER, "").replace(LEADING_SKILL_REQUEST, "");
-    if (next === current) return current;
-    current = next;
-  }
-}
-function scanCurrentJsonl(currentPath) {
-  const result = {
-    firstUserMessage: null,
-    firstAssistantMessage: null,
-    messageCount: 0,
-    lastTimestamp: null,
-    name: null,
-    labels: /* @__PURE__ */ new Map()
-  };
-  if (!existsSync(currentPath)) return result;
-  const records = readSessionFileEntries(currentPath).filter((entry) => !isSessionHeader(entry));
-  for (const parsed of collectSessionEntries(records, currentPath)) {
-    if (result.lastTimestamp === null || parsed.timestamp > result.lastTimestamp) {
-      result.lastTimestamp = parsed.timestamp;
-    }
-    if (parsed.kind === "message" && parsed.role === "user") {
-      result.messageCount += 1;
-      if (result.firstUserMessage === null) {
-        const text = operatorTextOfUserPayload(parsed.payload);
-        if (text !== null) result.firstUserMessage = text;
-      }
-    }
-    if (parsed.kind === "message" && parsed.role === "assistant" && result.firstAssistantMessage === null) {
-      const text = extractMessageText(parsed.payload);
-      if (text !== null) result.firstAssistantMessage = text;
-    }
-    if (parsed.kind === "sessionInfo") {
-      const info = parsed;
-      if (info.name !== void 0) {
-        const trimmed = info.name.trim();
-        result.name = trimmed.length > 0 ? trimmed : null;
-      }
-      if (info.targetTurnId && info.label !== void 0) {
-        const existing = result.labels.get(info.targetTurnId);
-        if (!existing || existing.timestamp <= info.timestamp) {
-          result.labels.set(info.targetTurnId, { label: info.label, timestamp: info.timestamp });
-        }
-      }
-    }
-    if (parsed.kind === "label") {
-      const label = parsed;
-      const existing = result.labels.get(label.targetTurnId);
-      if (!existing || existing.timestamp <= label.timestamp) {
-        result.labels.set(label.targetTurnId, { label: label.label ?? "", timestamp: label.timestamp });
-      }
-    }
-  }
-  return result;
-}
-function enrichMetaForListing(meta, currentPath) {
-  const scan = scanCurrentJsonl(currentPath);
-  if (scan.name) meta.name = scan.name;
-  const labelValues = [...scan.labels.values()].map((entry) => entry.label.trim()).filter((label) => label.length > 0);
-  if (labelValues.length > 0) meta.labels = labelValues;
-  const preview = scan.firstUserMessage ?? scan.firstAssistantMessage;
-  if (preview) {
-    meta.firstMessagePreview = preview.length > PREVIEW_MAX_CHARS ? `${preview.slice(0, PREVIEW_MAX_CHARS - 1)}\u2026` : preview;
-  }
-  if (scan.messageCount > 0) meta.messageCount = scan.messageCount;
-  const fallbackMtime = readMtimeIso(currentPath);
-  const activity = scan.lastTimestamp ?? fallbackMtime ?? meta.endedAt ?? meta.createdAt ?? null;
-  if (activity) meta.lastActivityAt = activity;
-}
-function readMtimeIso(path) {
-  try {
-    return statSync(path).mtime.toISOString();
-  } catch {
-    return null;
-  }
-}
-function enrichForkMeta(meta, parentSessionId, parentTurnId) {
-  Object.assign(meta, { parentSessionId, parentTurnId });
-  const paths = sessionPaths(meta);
-  atomicWrite(paths.meta, JSON.stringify(meta, null, 2));
-}
-
 // src/domains/session/manager.ts
 init_esm_shims();
 
@@ -445,12 +278,13 @@ function resumeSessionState(sessionId) {
   const persistedMeta = readSessionMeta(sessionId);
   const paths = sessionPaths(persistedMeta);
   const migration = runMigrations(persistedMeta, paths.meta);
-  const { meta, writer, tree } = resumeSession(sessionId);
+  const candidate = openSession(sessionId);
+  collectSessionEntries(candidate.turns(), paths.current);
+  const { meta, writer, tree } = resumeSession(
+    sessionId,
+    migration.migrated ? { sessionFormatVersion: migration.to } : {}
+  );
   const state = { meta, writer };
-  if (migration.migrated) {
-    state.meta.sessionFormatVersion = migration.to;
-    persistSessionMeta(state);
-  }
   return { state, nodes: tree };
 }
 function appendTurn(state, input) {
@@ -573,8 +407,8 @@ function forkFromState(input) {
 
 // src/domains/session/tree/manager.ts
 init_esm_shims();
-import { existsSync as existsSync2, renameSync, rmSync } from "node:fs";
-import { dirname, join as join2 } from "node:path";
+import { existsSync, renameSync, rmSync } from "node:fs";
+import { dirname, join } from "node:path";
 function readTreeBundle(sessionId) {
   const reader = openSession(sessionId);
   const meta = reader.meta();
@@ -625,8 +459,8 @@ function removeSessionDirectory(sessionId) {
 function tombstoneSession(sessionId) {
   const meta = readSessionMeta(sessionId);
   const paths = sessionPaths(meta);
-  if (!existsSync2(paths.meta)) return;
-  const tombstone = join2(dirname(paths.meta), "meta.deleted.json");
+  if (!existsSync(paths.meta)) return;
+  const tombstone = join(dirname(paths.meta), "meta.deleted.json");
   renameSync(paths.meta, tombstone);
 }
 
@@ -1221,7 +1055,7 @@ function numberAt(source, key) {
   return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
 }
 function reasoningTokensOf(usage) {
-  const direct = numberAt(usage, "reasoningTokens");
+  const direct = numberAt(usage, "reasoning") || numberAt(usage, "reasoningTokens");
   if (direct > 0) return direct;
   const details = usage.outputTokensDetails ?? usage.completionTokensDetails;
   if (details && typeof details === "object") return numberAt(details, "reasoningTokens");
@@ -1251,6 +1085,7 @@ function ledgerUsageCalls(entries, defaults = {}) {
         output: usage2.output,
         cacheRead: usage2.cacheRead,
         cacheWrite: usage2.cacheWrite,
+        ...usage2.cacheWrite1h === void 0 ? {} : { cacheWrite1h: usage2.cacheWrite1h },
         reasoningTokens: usage2.reasoning,
         totalTokens: usage2.totalTokens,
         costUsd: usage2.cost.total,
@@ -1271,8 +1106,6 @@ function ledgerUsageCalls(entries, defaults = {}) {
     const payload = entry.payload;
     if (!payload || typeof payload !== "object" || Array.isArray(payload)) continue;
     const record = payload;
-    const stopReason = record.stopReason;
-    if (stopReason === "aborted" || stopReason === "error") continue;
     const rawUsage = record.usage;
     if (!rawUsage || typeof rawUsage !== "object" || Array.isArray(rawUsage)) continue;
     const usage = rawUsage;
@@ -1296,6 +1129,7 @@ function ledgerUsageCalls(entries, defaults = {}) {
       output,
       cacheRead,
       cacheWrite,
+      ...typeof usage.cacheWrite1h === "number" ? { cacheWrite1h: numberAt(usage, "cacheWrite1h") } : {},
       reasoningTokens: reasoningTokensOf(usage),
       totalTokens,
       costUsd
@@ -1318,7 +1152,7 @@ function normalizeReleasedCustomType(entry) {
   return { ...entry, customType: ROUTING_NOTICE_CUSTOM_TYPE };
 }
 async function readAuditRows(stateDir) {
-  const root = join3(stateDir, "audit");
+  const root = join2(stateDir, "audit");
   let files;
   try {
     files = await readdir(root);
@@ -1330,7 +1164,7 @@ async function readAuditRows(stateDir) {
   const rows = [];
   const errors = [];
   for (const file of files.filter((name) => name.endsWith(".jsonl")).sort(compareStrings2)) {
-    const path = join3(root, file);
+    const path = join2(root, file);
     let raw;
     try {
       raw = await readFile(path, "utf8");
@@ -1369,7 +1203,7 @@ async function readAuditRows(stateDir) {
   return { rows, errors };
 }
 async function readSessionEntriesForId(stateDir, sessionId) {
-  const root = join3(stateDir, "sessions");
+  const root = join2(stateDir, "sessions");
   let cwdHashes;
   try {
     cwdHashes = await readdir(root);
@@ -1378,8 +1212,8 @@ async function readSessionEntriesForId(stateDir, sessionId) {
     if (err.code === "ENOENT") return { entries: [], missing: true, errors: [] };
     return { entries: [], missing: false, errors: [`session root read error: ${err.message ?? String(err)}`] };
   }
-  for (const cwdHash2 of cwdHashes.sort(compareStrings2)) {
-    const currentPath = join3(root, cwdHash2, sessionId, "current.jsonl");
+  for (const cwdHash of cwdHashes.sort(compareStrings2)) {
+    const currentPath = join2(root, cwdHash, sessionId, "current.jsonl");
     let raw;
     let source = currentPath;
     try {
@@ -1402,7 +1236,7 @@ async function readSessionEntriesForId(stateDir, sessionId) {
     }
     const result = parseSessionEntries(raw, source);
     try {
-      const meta = JSON.parse(await readFile(join3(root, cwdHash2, sessionId, "meta.json"), "utf8"));
+      const meta = JSON.parse(await readFile(join2(root, cwdHash, sessionId, "meta.json"), "utf8"));
       if (isRecord(meta) && typeof meta.pinnedLeafTurnId === "string") result.leafTurnId = meta.pinnedLeafTurnId;
     } catch {
     }
@@ -1437,7 +1271,7 @@ function parseSessionEntries(raw, source) {
   return { entries, missing: false, errors };
 }
 async function listSessionLedgerRefs(stateDir, onlyCwdHash) {
-  const root = join3(stateDir, "sessions");
+  const root = join2(stateDir, "sessions");
   let cwdHashes;
   try {
     cwdHashes = await readdir(root);
@@ -1445,16 +1279,16 @@ async function listSessionLedgerRefs(stateDir, onlyCwdHash) {
     return [];
   }
   const refs = [];
-  for (const cwdHash2 of cwdHashes.sort(compareStrings2)) {
-    if (onlyCwdHash !== void 0 && cwdHash2 !== onlyCwdHash) continue;
+  for (const cwdHash of cwdHashes.sort(compareStrings2)) {
+    if (onlyCwdHash !== void 0 && cwdHash !== onlyCwdHash) continue;
     let sessionIds;
     try {
-      sessionIds = await readdir(join3(root, cwdHash2));
+      sessionIds = await readdir(join2(root, cwdHash));
     } catch {
       continue;
     }
     for (const sessionId of sessionIds.sort(compareStrings2)) {
-      refs.push({ cwdHash: cwdHash2, sessionId, path: join3(root, cwdHash2, sessionId, "current.jsonl") });
+      refs.push({ cwdHash, sessionId, path: join2(root, cwdHash, sessionId, "current.jsonl") });
     }
   }
   return refs;
@@ -1476,7 +1310,6 @@ export {
   responseModelIdObservationCountsLabel,
   responseModelIdObservationFromRecord,
   attributedModelId,
-  collectSessionEntries,
   readAuditRows,
   readSessionEntriesForId,
   parseSessionEntries,
@@ -1487,4 +1320,4 @@ export {
   ledgerUsageCalls,
   SessionDomainModule
 };
-//# sourceMappingURL=chunk-D2T66PDV.js.map
+//# sourceMappingURL=chunk-3SUDBGEI.js.map

package/dist/{chunk-5AJPUR72.js → chunk-3TQN67I2.js}

@@ -1,11 +1,11 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
+import {
+  printError
+} from "./chunk-KIVFXGBM.js";
 import {
   discoverDeclaredChecksAtRoot,
   discoverDeclaredProjectEntriesAtRoot
-} from "./chunk-TLTGZTXI.js";
-import {
-  printError
-} from "./chunk-3T4DXWP6.js";
+} from "./chunk-QI72X67S.js";
 import {
   DISPATCH_INTENT_TIMEOUT_MIN_MS,
   normalizeIntentExpectedOutputs,
@@ -13,13 +13,13 @@ import {
 } from "./chunk-L4N3DWNW.js";
 import {
   packageDeclaredCheck
-} from "./chunk-BO4XV5VX.js";
-import {
-  atomicWrite
-} from "./chunk-FQOOGXBH.js";
+} from "./chunk-H72DCH3E.js";
 import {
   CLIO_PROJECT_DIR
 } from "./chunk-NTTS3O53.js";
+import {
+  atomicWrite
+} from "./chunk-3RDHGNU7.js";
 import {
   init_esm_shims
 } from "./chunk-ECBHH7LU.js";
@@ -393,4 +393,4 @@ export {
   acceptanceFromTaskFlags,
   runTasksCommand
 };
-//# sourceMappingURL=chunk-5AJPUR72.js.map
+//# sourceMappingURL=chunk-3TQN67I2.js.map

package/dist/{chunk-LBFQMYS3.js → chunk-3U4BL2EV.js}

@@ -1,10 +1,10 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
 import {
   appendOutOfTurnUsageRow
-} from "./chunk-6LRLOJHQ.js";
+} from "./chunk-3AND2EFU.js";
 import {
   extractReasoningTokens
-} from "./chunk-77CZRFTE.js";
+} from "./chunk-SJMNU4ZS.js";
 import {
   init_esm_shims
 } from "./chunk-ECBHH7LU.js";
@@ -22,6 +22,7 @@ function observedUsage(call) {
     output: reading(raw.output),
     cacheRead: reading(raw.cacheRead),
     cacheWrite: reading(raw.cacheWrite),
+    ...raw.cacheWrite1h === void 0 ? {} : { cacheWrite1h: reading(raw.cacheWrite1h) },
     reasoning: reasoning !== null && reasoning > 0 ? reasoning : null,
     totalTokens: reading(raw.totalTokens),
     costUsd,
@@ -54,6 +55,7 @@ function recordFailedCompactionCalls(origin, calls, observability) {
         output: usage.output ?? 0,
         cacheRead: usage.cacheRead ?? 0,
         cacheWrite: usage.cacheWrite ?? 0,
+        ...typeof usage.cacheWrite1h === "number" ? { cacheWrite1h: usage.cacheWrite1h } : {},
         reasoningTokens: usage.reasoning ?? 0,
         totalTokens: usage.totalTokens ?? 0,
         apiCalls: 1
@@ -98,4 +100,4 @@ export {
   recordFailedCompactionCalls,
   summarizeFailedCompactionUsage
 };
-//# sourceMappingURL=chunk-LBFQMYS3.js.map
+//# sourceMappingURL=chunk-3U4BL2EV.js.map

package/dist/{chunk-UFYNOQK4.js → chunk-3UQADNG2.js}

@@ -3,17 +3,17 @@ import {
   describeYaziProfile,
   inspectCurrentYaziProfile,
   resetYaziProfile
-} from "./chunk-T334FW2H.js";
+} from "./chunk-JU6MAMRJ.js";
+import {
+  formatColumns,
+  printError,
+  printOk
+} from "./chunk-KIVFXGBM.js";
 import {
   installTool,
   installedToolVersions,
   removeTool
 } from "./chunk-5GZICIYO.js";
-import {
-  formatColumns,
-  printError,
-  printOk
-} from "./chunk-3T4DXWP6.js";
 import {
   describeFloorRejection,
   describeResolution,
@@ -299,4 +299,4 @@ function jsonShape(status) {
 export {
   runToolsCommand
 };
-//# sourceMappingURL=chunk-UFYNOQK4.js.map
+//# sourceMappingURL=chunk-3UQADNG2.js.map