@iowarp/clio-coder 0.4.3 → 0.4.5

package/dist/{chunk-ZA4VCIGV.js → chunk-UUQ5G6EZ.js}

@@ -14,21 +14,21 @@ import {
   toolResultPayload,
   toolResultText,
   withoutThinkingBlocks
-} from "./chunk-GTUD2WMY.js";
+} from "./chunk-DBREN25X.js";
 import {
   filterEntriesToActivePath
-} from "./chunk-W6GROXXM.js";
+} from "./chunk-O5F25NIE.js";
 import {
   formatSize
-} from "./chunk-OZNBF4L3.js";
+} from "./chunk-KECNXMDE.js";
 import {
   ceilChars,
   contentChars,
   estimateAgentMessageTokens
-} from "./chunk-NZMNUPZZ.js";
+} from "./chunk-77CZRFTE.js";
 import {
   init_esm_shims
-} from "./chunk-3R73A4XB.js";
+} from "./chunk-ECBHH7LU.js";
 
 // src/domains/session/compaction/tokens.ts
 init_esm_shims();
@@ -50,7 +50,15 @@ function estimateCustom(entry) {
   return ceilChars(contentChars(entry.data));
 }
 function estimateSummary(entry) {
-  return ceilChars(entry.summary.length);
+  let tokens = ceilChars(entry.summary.length);
+  if (entry.kind !== "compactionSummary") return tokens;
+  if (entry.userContext) tokens += ceilChars(entry.userContext.text.length + 40) + 4;
+  for (const skill of entry.skillContext?.skills ?? []) {
+    tokens += ceilChars(skill.requestText.length + 40) + 4;
+    tokens += ceilChars(JSON.stringify(skill.activation).length + 32) + 4;
+    for (const block of skill.content) tokens += ceilChars(block.text.length) + 4;
+  }
+  return tokens;
 }
 function estimateTokens(entry) {
   switch (entry.kind) {
@@ -201,7 +209,7 @@ function firstLine(text) {
   return line.trim().slice(0, PREVIEW_LIMIT).replace(/"/g, '\\"');
 }
 function renderMarker(input) {
-  const ref = input.ref.entry;
+  const ref = input.alias ?? input.ref.entry;
   const fields = [`ref=${ref}`, `reason=${input.reason}`];
   if (input.by !== void 0) fields.push(`by=${input.by}`);
   fields.push(`tool=${input.toolName}`);
@@ -268,9 +276,11 @@ function eventIndex(entries, lastEvictionTurnId) {
   const index = entries.findIndex((entry) => entry.turnId === lastEvictionTurnId);
   return index < 0 ? entries.length : index;
 }
-function projectWorkingSet(entries, view) {
-  if (view.evicted.size === 0 && view.evictionEvents === 0) return [...entries];
-  const cutoff = view.evictionEvents > 0 ? eventIndex(entries, view.lastEvictionTurnId) : -1;
+function projectWorkingSet(entries, view, activeLeafTurnId) {
+  const checkpoint = filterEntriesToActivePath(entries, activeLeafTurnId).reverse().find((entry) => entry.kind === "compactionSummary");
+  const compactionIndex = checkpoint ? entries.indexOf(checkpoint) : -1;
+  if (view.evicted.size === 0 && view.evictionEvents === 0 && compactionIndex < 0) return [...entries];
+  const cutoff = Math.max(compactionIndex, view.evictionEvents > 0 ? eventIndex(entries, view.lastEvictionTurnId) : -1);
   const out = [];
   for (let index = 0; index < entries.length; index += 1) {
     const entry = entries[index];
@@ -292,7 +302,7 @@ function projectWorkingSet(entries, view) {
 // src/domains/context/working-set/engine.ts
 var NO_CALL_PATHS = /* @__PURE__ */ new Map();
 var PENDING_EVENT_TURN_ID = "";
-function markerFor(entry, candidate, callPaths) {
+function markerFor(entry, candidate, callPaths, alias) {
   if (entry.kind !== "message") return null;
   if (entry.role === "assistant") return hasThinking(entry.payload) ? "" : null;
   if (entry.role !== "tool_result") return null;
@@ -300,6 +310,7 @@ function markerFor(entry, candidate, callPaths) {
   const toolCallId = typeof payload.obj.toolCallId === "string" ? payload.obj.toolCallId : void 0;
   return renderMarker({
     ref: candidate.ref,
+    ...alias === void 0 ? {} : { alias },
     reason: candidate.reason,
     by: candidate.by,
     toolName: payload.toolName,
@@ -349,8 +360,8 @@ function sumTokens(entries, estimate) {
   for (const entry of entries) total += estimate(entry);
   return total;
 }
-function tokensFreedByEviction(estimateTokens2, entry, candidate, callPaths = NO_CALL_PATHS) {
-  const marker = markerFor(entry, candidate, callPaths);
+function tokensFreedByEviction(estimateTokens2, entry, candidate, callPaths = NO_CALL_PATHS, alias) {
+  const marker = markerFor(entry, candidate, callPaths, alias);
   if (marker === null) return 0;
   const key = refKey(candidate.ref);
   const projected = projectWorkingSet([entry], soloView(key, pendingState(candidate, marker, "")))[0] ?? entry;
@@ -364,17 +375,21 @@ function planEviction(policy, input) {
   const callPaths = callPathsByToolCallId(input.entries);
   const items = [];
   const claimed = /* @__PURE__ */ new Set();
+  let aliasSequence = input.view.recallAliasSequence ?? [...input.view.evicted.values()].reduce((max, state) => Math.max(max, Number(state.alias?.slice(1)) || 0), 0);
   for (const candidate of candidates) {
     const key = refKey(candidate.ref);
     if (input.view.evicted.has(key) || claimed.has(key)) continue;
     const entry = byTurnId.get(key);
     if (entry === void 0) continue;
-    const marker = markerFor(entry, candidate, callPaths);
+    const alias = entry.kind === "message" && entry.role === "tool_result" ? `r${aliasSequence + 1}` : void 0;
+    const marker = markerFor(entry, candidate, callPaths, alias);
     if (marker === null) continue;
-    const tokensFreed = tokensFreedByEviction(input.estimateTokens, entry, candidate, callPaths);
+    const tokensFreed = tokensFreedByEviction(input.estimateTokens, entry, candidate, callPaths, alias);
     if (tokensFreed <= 0) continue;
     claimed.add(key);
+    if (alias !== void 0) aliasSequence += 1;
     items.push({
+      ...alias === void 0 ? {} : { alias },
       ref: candidate.ref,
       reason: candidate.reason,
       tokensFreed,
@@ -563,7 +578,7 @@ function findTurnStartIndex(entries, entryIndex, startIndex = 0) {
 function isValidCutPoint(entry) {
   switch (entry.kind) {
     case "message":
-      return entry.role !== "tool_result";
+      return entry.role !== "tool_result" && entry.role !== "tool_call";
     case "bashExecution":
     case "custom":
     case "skillActivation":
@@ -593,6 +608,29 @@ function findValidCutPoints(entries, startIndex, endIndex) {
   }
   return cuts;
 }
+function findToolBatchStart(entries, resultIndex, startIndex, endIndex) {
+  for (let index = resultIndex - 1; index >= startIndex; index--) {
+    const entry = entries[index];
+    if (entry?.kind !== "message") continue;
+    if (entry.role === "user") break;
+    if (entry.role !== "assistant") continue;
+    const payload = entry.payload;
+    if (!Array.isArray(payload?.content)) break;
+    const callIds = /* @__PURE__ */ new Set();
+    for (const block of payload.content) {
+      if (block?.type === "toolCall" && typeof block.id === "string") callIds.add(block.id);
+    }
+    if (callIds.size === 0) break;
+    for (let tail = index + 1; tail < endIndex; tail++) {
+      const result = entries[tail];
+      if (result?.kind !== "message" || result.role !== "tool_result") continue;
+      const id = result.payload?.toolCallId;
+      if (typeof id !== "string" || !callIds.has(id)) return -1;
+    }
+    return index;
+  }
+  return -1;
+}
 function findCutPoint(entries, keepRecentTokens, opts = {}) {
   const startIndex = opts.startIndex ?? 0;
   const endIndex = opts.endIndex ?? entries.length;
@@ -613,6 +651,9 @@ function findCutPoint(entries, keepRecentTokens, opts = {}) {
           break;
         }
       }
+      if (cutIndex === -1 && entry.kind === "message" && (entry.role === "tool_result" || entry.role === "tool_call")) {
+        cutIndex = findToolBatchStart(entries, i, startIndex, endIndex);
+      }
       break;
     }
   }
@@ -639,40 +680,18 @@ function findCutPoint(entries, keepRecentTokens, opts = {}) {
   };
 }
 
-// src/domains/context/working-set/visible.ts
-init_esm_shims();
-function compactionCut(entries) {
-  let compactionIndex = -1;
-  for (let i = entries.length - 1; i >= 0; i -= 1) {
-    if (entries[i]?.kind === "compactionSummary") {
-      compactionIndex = i;
-      break;
-    }
-  }
-  const compaction = entries[compactionIndex];
-  if (compaction?.kind !== "compactionSummary") return { compactionIndex: -1, visible: [...entries] };
-  const firstKeptIndex = compaction.firstKeptTurnId.length > 0 ? entries.findIndex((entry) => entry.turnId === compaction.firstKeptTurnId) : -1;
-  const kept = firstKeptIndex >= 0 && firstKeptIndex < compactionIndex ? entries.slice(firstKeptIndex, compactionIndex) : [];
-  return { compactionIndex, visible: [...kept, ...entries.slice(compactionIndex + 1)] };
-}
-function selectVisibleEntries(entries, activeLeafTurnId) {
-  return compactionCut(filterEntriesToActivePath(entries, activeLeafTurnId)).visible;
-}
-
 export {
+  projectWorkingSet,
   estimateTokens,
   getLastAssistantUsage,
   calculateContextTokens,
   findCutPoint,
   DEFAULT_RESERVE_TOKENS,
   DEFAULT_KEEP_RECENT_TOKENS,
-  projectWorkingSet,
   tokensFreedByEviction,
   planEviction,
   buildEvictionFields,
   isProtected,
-  resolveWorkingSetPolicy,
-  compactionCut,
-  selectVisibleEntries
+  resolveWorkingSetPolicy
 };
-//# sourceMappingURL=chunk-ZA4VCIGV.js.map
+//# sourceMappingURL=chunk-UUQ5G6EZ.js.map

package/dist/{chunk-F5JHEYZM.js → chunk-UXAC2FX4.js}

@@ -4,34 +4,37 @@ import {
   listChecks,
   runProjectCheck,
   runScriptCheck
-} from "./chunk-V2ANDPVT.js";
+} from "./chunk-HGSLRG33.js";
 import {
   BROWSER_MODES,
-  maxOutputArg,
   prepareVerifyArguments,
-  timeoutArg,
   verifyToolSurface
-} from "./chunk-ZDN3Y73Y.js";
+} from "./chunk-GXCCHKN6.js";
 import {
-  escapeRegExp
-} from "./chunk-VG7TBQIY.js";
+  prepareBoundedImage
+} from "./chunk-YGDMBK7O.js";
 import {
+  escapeRegExp,
   resolveReadPath
-} from "./chunk-OQE5J4C6.js";
+} from "./chunk-V552WL53.js";
+import {
+  maxOutputArg,
+  timeoutArg
+} from "./chunk-WJIMKGD6.js";
 import {
   VERIFICATION_SCRIPT_FAMILY_HINT,
   isVerificationScriptName
-} from "./chunk-UL3WSD3F.js";
+} from "./chunk-M4KFUXS7.js";
 import {
   truncateUtf8
-} from "./chunk-6XLNIQDB.js";
+} from "./chunk-MYI32N4R.js";
 import {
   combineSafeOutput,
   runCommandVector
-} from "./chunk-JSC3U7TI.js";
+} from "./chunk-GJ24ODAX.js";
 import {
   init_esm_shims
-} from "./chunk-3R73A4XB.js";
+} from "./chunk-ECBHH7LU.js";
 
 // src/tools/verify/index.ts
 init_esm_shims();
@@ -103,7 +106,10 @@ async function runFrontendCheck(args, options) {
   const browserMode = browserModeArg(args.browser);
   const validateOptions = {
     timeoutMs: timeoutArg(args),
-    maxOutputBytes: maxOutputArg(args)
+    maxOutputBytes: maxOutputArg(args),
+    supportsImages: options?.supportsImages === true,
+    imageMaxBytes: Math.min(maxOutputArg(args), options?.toolResultMaxBytes ?? 5e4) - 4096,
+    images: []
   };
   if (options?.signal !== void 0) validateOptions.signal = options.signal;
   const checks = [];
@@ -128,7 +134,7 @@ ${output}`,
       details
     };
   }
-  return { kind: "ok", output, details };
+  return { kind: "ok", output, details, ...validateOptions.images?.length ? { images: validateOptions.images } : {} };
 }
 async function validateArtifact(artifactPath, checks, browserMode, options) {
   const ext = path.extname(artifactPath).toLowerCase();
@@ -486,38 +492,63 @@ async function validateBrowserLoad(artifactPath, browserMode, checks, options) {
     });
     return;
   }
-  const result = await runCommandVector(
-    browser,
-    [
-      "--headless=new",
-      "--disable-gpu",
-      "--no-sandbox",
-      "--disable-dev-shm-usage",
-      "--dump-dom",
-      pathToFileURL(artifactPath).href
-    ],
-    {
-      timeoutMs: options.timeoutMs,
-      maxOutputBytes: options.maxOutputBytes,
-      ...options.signal !== void 0 ? { signal: options.signal } : {}
+  const dir = mkdtempSync(path.join(tmpdir(), "clio-coder-browser-check-"));
+  const screenshot = path.join(dir, "loaded.png");
+  try {
+    const result = await runCommandVector(
+      browser,
+      [
+        "--headless=new",
+        "--disable-gpu",
+        "--no-sandbox",
+        "--disable-dev-shm-usage",
+        `--user-data-dir=${path.join(dir, "profile")}`,
+        `--screenshot=${screenshot}`,
+        pathToFileURL(artifactPath).href
+      ],
+      {
+        timeoutMs: options.timeoutMs,
+        maxOutputBytes: options.maxOutputBytes,
+        ...options.signal !== void 0 ? { signal: options.signal } : {}
+      }
+    );
+    let failure;
+    if (result.aborted) failure = "headless browser aborted";
+    else if (result.timedOut) failure = `headless browser timed out after ${options.timeoutMs}ms`;
+    else if (result.outputCapped) failure = `headless browser output exceeded ${options.maxOutputBytes} bytes`;
+    else if (result.exitCode !== 0) {
+      failure = `headless browser exited with ${result.exitCode ?? result.signal ?? "unknown"}`;
+    } else if (!existsSync(screenshot) || !statSync(screenshot).isFile() || statSync(screenshot).size === 0) {
+      failure = "headless browser exited without a rendered screenshot";
+    } else {
+      if (options.supportsImages) {
+        const image = await prepareBoundedImage(readFileSync(screenshot), options.imageMaxBytes ?? 0);
+        if (image) options.images?.push(image);
+        else
+          checks.push({
+            name: "browser image",
+            status: "warn",
+            message: "Screenshot omitted: could not encode within the tool result byte cap."
+          });
+      }
+      checks.push({
+        name: "browser load",
+        status: "pass",
+        message: `loaded and rendered with ${path.basename(browser)}`,
+        path: artifactPath
+      });
+      return;
     }
-  );
-  if (result.exitCode === 0 && !result.timedOut && !result.aborted && !result.outputCapped) {
+    const output = truncateUtf8(combineSafeOutput(result).trim(), 800, " [truncated]");
     checks.push({
       name: "browser load",
-      status: "pass",
-      message: `loaded with ${path.basename(browser)}`,
+      status: "fail",
+      message: `${failure}${output ? `: ${output}` : ""}`,
       path: artifactPath
     });
-    return;
+  } finally {
+    rmSync(dir, { recursive: true, force: true });
   }
-  const output = truncateUtf8(combineSafeOutput(result).trim(), 800, " [truncated]");
-  checks.push({
-    name: "browser load",
-    status: "fail",
-    message: `headless browser exited with ${result.exitCode ?? result.signal ?? "unknown"}${output ? `: ${output}` : ""}`,
-    path: artifactPath
-  });
 }
 function parseAttributes(source) {
   const attrs = {};
@@ -626,11 +657,12 @@ var verifyTool = {
         message: `verify: '${check}' is not a verification check (${VERIFICATION_SCRIPT_FAMILY_HINT} or "frontend"); run it through bash.`
       };
     }
-    return runScriptCheck(check, args, options);
+    const result = await runScriptCheck(check, args, options);
+    return declared ? { ...result, details: { ...result.details, check, source: { ...declared.source } } } : result;
   }
 };
 
 export {
   verifyTool
 };
-//# sourceMappingURL=chunk-F5JHEYZM.js.map
+//# sourceMappingURL=chunk-UXAC2FX4.js.map

package/dist/{chunk-VG7TBQIY.js → chunk-V552WL53.js}

@@ -1,15 +1,75 @@
 import { createRequire as __clioCreateRequire } from "node:module"; const require = __clioCreateRequire(import.meta.url);
 import {
-  toPosixPath
-} from "./chunk-OQE5J4C6.js";
+  canonicalizeExistingPath
+} from "./chunk-KQ6IDQIB.js";
 import {
   init_esm_shims
-} from "./chunk-3R73A4XB.js";
+} from "./chunk-ECBHH7LU.js";
 
 // src/tools/ignore-policy.ts
 init_esm_shims();
 import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
+
+// src/tools/path-utils.ts
+init_esm_shims();
+import { accessSync, constants } from "node:fs";
+import { homedir } from "node:os";
+import { isAbsolute, resolve as resolvePath, sep } from "node:path";
+function toPosixPath(value) {
+  return value.split(sep).join("/");
+}
+var UNICODE_SPACES = /[\u00A0\u2000-\u200A\u202F\u205F\u3000]/g;
+var NARROW_NO_BREAK_SPACE = "\u202F";
+function normalizeUnicodeSpaces(value) {
+  return value.replace(UNICODE_SPACES, " ");
+}
+function fileExists(filePath) {
+  try {
+    accessSync(filePath, constants.F_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function normalizeAtPrefix(filePath) {
+  return filePath.startsWith("@") ? filePath.slice(1) : filePath;
+}
+function tryMacOSScreenshotPath(filePath) {
+  return filePath.replace(/ (AM|PM)\./gi, `${NARROW_NO_BREAK_SPACE}$1.`);
+}
+function tryNfdVariant(filePath) {
+  return filePath.normalize("NFD");
+}
+function tryCurlyQuoteVariant(filePath) {
+  return filePath.replace(/'/g, "\u2019");
+}
+function expandPath(filePath) {
+  const normalized = normalizeUnicodeSpaces(normalizeAtPrefix(filePath));
+  if (normalized === "~") return homedir();
+  if (normalized.startsWith("~/")) return homedir() + normalized.slice(1);
+  return normalized;
+}
+function resolveToCwd(filePath, cwd = process.cwd()) {
+  const expanded = expandPath(filePath);
+  const resolved = isAbsolute(expanded) ? resolvePath(expanded) : resolvePath(cwd, expanded);
+  return canonicalizeExistingPath(resolved);
+}
+function resolveReadPath(filePath, cwd = process.cwd()) {
+  const resolved = resolveToCwd(filePath, cwd);
+  if (fileExists(resolved)) return resolved;
+  const amPmVariant = tryMacOSScreenshotPath(resolved);
+  if (amPmVariant !== resolved && fileExists(amPmVariant)) return amPmVariant;
+  const nfdVariant = tryNfdVariant(resolved);
+  if (nfdVariant !== resolved && fileExists(nfdVariant)) return nfdVariant;
+  const curlyVariant = tryCurlyQuoteVariant(resolved);
+  if (curlyVariant !== resolved && fileExists(curlyVariant)) return curlyVariant;
+  const nfdCurlyVariant = tryCurlyQuoteVariant(nfdVariant);
+  if (nfdCurlyVariant !== resolved && fileExists(nfdCurlyVariant)) return nfdCurlyVariant;
+  return resolved;
+}
+
+// src/tools/ignore-policy.ts
 var ALWAYS_EXCLUDED_DIRS = [".clio-coder", ".fallow", ".git"];
 var GENERATED_DIRS = [
   ".cache",
@@ -118,6 +178,10 @@ function compileGlobRegex(pattern) {
 }
 
 export {
+  toPosixPath,
+  expandPath,
+  resolveToCwd,
+  resolveReadPath,
   rgIgnoreArgs,
   fdIgnoreArgs,
   fallbackIgnoredDirs,
@@ -125,4 +189,4 @@ export {
   normalizeGlobInput,
   compileGlobRegex
 };
-//# sourceMappingURL=chunk-VG7TBQIY.js.map
+//# sourceMappingURL=chunk-V552WL53.js.map