katt 0.0.6 → 0.0.8

package/dist/index.js

@@ -1,195 +1,231 @@
-import { r as $, c as x, p as E, a as d, l, b as p, g as w, d as N, e as P, f as h, s as A, h as S, i as j, j as _, k as O, m as L, n as I, o as U, q as R } from "./runCli-B3oIBxOl.js";
-import { t as xt } from "./runCli-B3oIBxOl.js";
-import { CopilotClient as z } from "@github/copilot-sdk";
-import { readFile as F } from "node:fs/promises";
-import { resolve as k, dirname as g, isAbsolute as B, basename as W, join as K } from "node:path";
-import { readFileSync as H, writeFileSync as C, mkdirSync as Y } from "node:fs";
-function wt(t, e) {
-  $(() => {
-    N(), E(t);
-    const n = w(), o = Date.now(), r = () => w() === n, s = () => Date.now() - o;
+import { r as N, c as I, a as j, p as z, b as C, l as h, d as T, g as D, e as B, f as $, h as H, s as A, i as W, j as L, k as G, m as X, n as Y, o as q, q as K, t as J } from "./runCli-425rgVp8.js";
+import { u as jt } from "./runCli-425rgVp8.js";
+import { CopilotClient as Q } from "@github/copilot-sdk";
+import { mkdtemp as V, rm as Z, readFile as R } from "node:fs/promises";
+import { join as S, dirname as v, isAbsolute as tt, resolve as et, basename as nt } from "node:path";
+import { spawn as ot } from "node:child_process";
+import { tmpdir as rt } from "node:os";
+import { readFileSync as st, writeFileSync as M, mkdirSync as it } from "node:fs";
+function Pt(t, e) {
+  N(() => {
+    j(), z(t);
+    const n = D(), o = Date.now(), i = () => D() === n, s = () => Date.now() - o;
     try {
-      const i = e();
-      if (i && typeof i.then == "function") {
-        d(
-          i.then(() => {
-            l(!0, s());
+      const r = e();
+      if (r && typeof r.then == "function") {
+        C(
+          r.then(() => {
+            h(!0, s());
           }).catch((a) => {
-            throw l(!1, s()), a;
+            throw h(!1, s()), a;
           }).finally(() => {
-            p();
+            T();
           })
         );
         return;
       }
-    } catch (i) {
-      throw l(!1, s()), p(), i;
+    } catch (r) {
+      throw h(!1, s()), T(), r;
     }
-    l(r(), s()), p();
-  }, x());
+    h(i(), s()), T();
+  }, I());
 }
-function Ct(t, e) {
-  $(() => {
-    P(t);
+function Nt(t, e) {
+  N(() => {
+    B(t);
     try {
       const n = e();
       if (n && typeof n.then == "function") {
-        d(
+        C(
           n.finally(() => {
-            h();
+            $();
           })
         );
         return;
       }
     } catch (n) {
-      throw h(), n;
+      throw $(), n;
     }
-    h();
-  }, x());
+    $();
+  }, I());
 }
-function q(t, e) {
+const at = "katt-codex-", ct = "last-message.txt";
+function ut(t, e) {
   return typeof t == "object" && t !== null && "code" in t && t.code === e;
 }
-function J(t) {
-  try {
-    const e = JSON.parse(t);
-    return typeof e == "object" && e !== null ? e : void 0;
-  } catch (e) {
-    console.warn(`Failed to parse katt.json: ${String(e)}`);
-    return;
-  }
+function m(t) {
+  return typeof t == "string" && t.length > 0;
 }
-async function G() {
-  const t = k(process.cwd(), "katt.json");
-  try {
-    const e = await F(t, "utf8");
-    return J(e);
-  } catch (e) {
-    if (q(e, "ENOENT"))
-      return;
-    console.warn(`Failed to read katt.json: ${String(e)}`);
-    return;
-  }
+function dt(t) {
+  return m(t) ? [t] : Array.isArray(t) ? t.filter(m) : [];
 }
-function Q(t) {
-  const e = t?.copilot;
-  if (typeof e != "object" || e === null || Array.isArray(e))
-    return;
-  const n = {
-    ...e
-  }, o = n.model;
-  return (typeof o != "string" || o.length === 0) && delete n.model, Object.keys(n).length > 0 ? n : void 0;
+function lt(t, e) {
+  const n = e ?? {}, o = [
+    "exec",
+    "--color",
+    "never",
+    "--output-last-message",
+    t
+  ];
+  m(n.model) && o.push("--model", n.model), m(n.profile) && o.push("--profile", n.profile), m(n.sandbox) && o.push("--sandbox", n.sandbox), n.fullAuto === !0 && o.push("--full-auto"), n.skipGitRepoCheck === !0 && o.push("--skip-git-repo-check"), n.dangerouslyBypassApprovalsAndSandbox === !0 && o.push("--dangerously-bypass-approvals-and-sandbox");
+  for (const i of dt(n.config))
+    o.push("--config", i);
+  return o.push("-"), o;
 }
-function V(t) {
-  if (!(typeof t != "number" || !Number.isFinite(t)) && !(t <= 0))
-    return Math.floor(t);
+function ft(t, e, n, o) {
+  return new Promise((i, s) => {
+    const r = ot("codex", e, {
+      cwd: o,
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    let a = "", c = "", p = !1;
+    r.stdout.setEncoding("utf8"), r.stderr.setEncoding("utf8"), r.stdout.on("data", (u) => {
+      a += u;
+    }), r.stderr.on("data", (u) => {
+      c += u;
+    }), r.stdin.on("error", () => {
+    });
+    const g = setTimeout(() => {
+      p = !0, r.kill("SIGTERM");
+    }, n);
+    r.once("error", (u) => {
+      clearTimeout(g), s(
+        new Error(
+          `Failed to start Codex CLI. Ensure codex is installed and available on PATH. ${String(
+            u
+          )}`
+        )
+      );
+    }), r.once("close", (u, x) => {
+      clearTimeout(g), i({
+        exitCode: u,
+        signal: x,
+        stdout: a.trim(),
+        stderr: c.trim(),
+        timedOut: p
+      });
+    }), r.stdin.end(t);
+  });
+}
+async function pt(t, e) {
+  try {
+    return await R(t, "utf8");
+  } catch (n) {
+    if (!ut(n, "ENOENT"))
+      throw n;
+    return e;
+  }
 }
-function X(t) {
-  const e = t?.prompt;
-  if (!(typeof e != "object" || e === null || Array.isArray(e)))
-    return V(e.timeoutMs);
+function ht(t) {
+  if (t.timedOut)
+    return "Codex timed out before returning a response.";
+  if (t.exitCode === null)
+    return `Codex exited due to signal ${t.signal ?? "unknown"}.`;
+  const e = t.stderr.length > 0 ? ` ${t.stderr}` : "";
+  return `Codex exited with code ${t.exitCode}.${e}`;
 }
-async function Z() {
-  const t = await G();
-  return {
-    copilot: Q(t),
-    promptTimeoutMs: X(t)
-  };
+async function mt(t, e, n) {
+  const o = n ?? {}, i = m(o.workingDirectory) ? o.workingDirectory : process.cwd(), s = await V(S(rt(), at)), r = S(s, ct);
+  try {
+    const a = lt(r, n), c = await ft(
+      t,
+      a,
+      e,
+      i
+    );
+    if (c.timedOut)
+      throw new Error(`Codex timed out after ${e}ms.`);
+    if (c.exitCode !== 0)
+      throw new Error(ht(c));
+    const p = await pt(r, c.stdout);
+    if (p.length === 0)
+      throw new Error("Codex did not return a response.");
+    return p;
+  } finally {
+    await Z(s, { recursive: !0, force: !0 });
+  }
 }
-const tt = 6e5;
-function M(t) {
+const gt = 6e5;
+function U(t) {
   return typeof t == "string" && t.length > 0 ? t : void 0;
 }
-function m(t) {
+function E(t) {
   if (!t)
     return;
   const e = { ...t };
   if (e.model !== void 0) {
-    const n = M(e.model);
+    const n = U(
+      typeof e.model == "string" ? e.model : void 0
+    );
     n ? e.model = n : delete e.model;
   }
   return Object.keys(e).length > 0 ? e : void 0;
 }
-function b(t) {
+function O(t) {
   if (!(typeof t != "number" || !Number.isFinite(t)) && !(t <= 0))
     return Math.floor(t);
 }
-function f(t) {
+function y(t) {
   return !Number.isFinite(t) || (t ?? 0) <= 0 ? 0 : Math.floor(t ?? 0);
 }
-function et(t) {
-  return f(t.inputTokens) + f(t.outputTokens) + f(t.cacheReadTokens) + f(t.cacheWriteTokens);
+function xt(t) {
+  return y(t.inputTokens) + y(t.outputTokens) + y(t.cacheReadTokens) + y(t.cacheWriteTokens);
 }
-function nt(t, e) {
-  const { timeoutMs: n, ...o } = t, r = m(e.copilot), s = m(
+async function F(t, e = {}) {
+  const { timeoutMs: n, ...o } = e, i = await H(), s = E(i.agentOptions), r = E(
     o
-  ), i = m({
-    ...r ?? {},
-    ...s ?? {}
-  }), a = b(e.promptTimeoutMs), D = b(n) ?? a ?? tt;
-  return {
-    sessionOptions: i,
-    model: M(i?.model),
-    timeoutMs: D
-  };
-}
-async function ot(t, e) {
-  const n = [];
-  if (e.unsubscribeUsage?.(), e.usedTokens > 0 && j(e.usedTokens), e.session)
-    try {
-      await e.session.destroy();
-    } catch (o) {
-      n.push(o);
-    }
-  try {
-    const o = await t.stop();
-    n.push(...o);
-  } catch (o) {
-    n.push(o);
-  }
-  n.length > 0 && console.error(
-    `Copilot cleanup encountered ${n.length} error(s).`
+  ), a = E({
+    ...s ?? {},
+    ...r ?? {}
+  }), c = O(i.promptTimeoutMs), g = O(n) ?? c ?? gt, u = U(
+    typeof a?.model == "string" ? a.model : void 0
   );
-}
-async function y(t, e = {}) {
-  const n = await Z(), o = nt(e, n), r = new z({ useLoggedInUser: !0 }), s = {
-    session: void 0,
-    unsubscribeUsage: void 0,
-    usedTokens: 0
-  };
+  if (i.agent === "codex") {
+    const d = await mt(t, g, a);
+    return u && A(u), d;
+  }
+  const x = new Q({ useLoggedInUser: !0 });
+  let w, k, b = 0;
   try {
-    await r.start(), s.session = await r.createSession(
-      o.sessionOptions
-    ), s.unsubscribeUsage = s.session.on(
-      "assistant.usage",
-      (a) => {
-        s.usedTokens += et(a.data);
-      }
-    );
-    const i = await s.session.sendAndWait(
-      { prompt: t },
-      o.timeoutMs
-    );
-    if (!i?.data?.content)
+    await x.start(), w = await x.createSession(a), k = w.on("assistant.usage", (f) => {
+      b += xt(f.data);
+    });
+    const d = await w.sendAndWait({ prompt: t }, g);
+    if (!d?.data?.content)
       throw new Error("Copilot did not return a response.");
-    return o.model && A(o.model), i.data.content;
+    return u && A(u), d.data.content;
   } finally {
-    await ot(r, s);
+    const d = [];
+    if (k?.(), b > 0 && W(b), w)
+      try {
+        await w.destroy();
+      } catch (f) {
+        d.push(f);
+      }
+    try {
+      const f = await x.stop();
+      d.push(...f);
+    } catch (f) {
+      d.push(f);
+    }
+    d.length > 0 && console.error(
+      `Copilot cleanup encountered ${d.length} error(s).`
+    );
   }
 }
-async function bt(t, e = {}) {
-  const n = S.getStore(), o = n?.evalFile ? g(n.evalFile) : process.cwd(), r = B(t) ? t : k(o, t), s = await F(r, "utf8");
-  return y(s, e);
+async function It(t, e = {}) {
+  const n = L.getStore(), o = n?.evalFile ? v(n.evalFile) : process.cwd(), i = tt(t) ? t : et(o, t), s = await R(i, "utf8");
+  return F(s, e);
 }
-function c(t) {
-  _({
-    describePath: L(),
-    itPath: O(),
+function l(t) {
+  G({
+    describePath: Y(),
+    itPath: X(),
     message: t
   });
 }
-async function st(t, e) {
-  const n = Date.now(), o = `expected '${t}' to satisfy '${e}'`, r = y(`Evaluate if the expectation is fulfiled in by the input.
+async function wt(t, e) {
+  const n = Date.now(), o = `expected '${t}' to satisfy '${e}'`, i = F(`Evaluate if the expectation is fulfiled in by the input.
         Expectation: "${e}".
         Input:
         ---
@@ -197,17 +233,17 @@ async function st(t, e) {
         ---
         Important: Answer with "Yes" or "No" only, without any additional text.
         `).then((s) => {
-    s.includes("Yes") ? l(!0, Date.now() - n, "promptCheck") : s.includes("No") ? c(o) : c(`failed to evaluate expectation '${e}'`);
+    s.includes("Yes") ? h(!0, Date.now() - n, "promptCheck") : s.includes("No") ? l(o) : l(`failed to evaluate expectation '${e}'`);
   });
-  return d(r), r;
+  return C(i), i;
 }
-const rt = 3;
-function it(t) {
+const yt = 3;
+function Ct(t) {
   const e = t.match(/\b([1-5])\b/);
   return !e || !e[1] ? null : Number(e[1]);
 }
-async function at(t, e, n) {
-  const o = Date.now(), r = n?.threshold ?? rt, s = y(
+async function bt(t, e, n) {
+  const o = Date.now(), i = n?.threshold ?? yt, s = F(
     `Classify the input by how "${e}" it is on a scale of 1 to 5.
 1 means "not ${e}" and 5 means "very ${e}".
 Return only a single number: 1, 2, 3, 4, or 5.
@@ -217,141 +253,141 @@ Input:
 ${t}
 ---`,
     n?.model ? { model: n.model } : void 0
-  ).then((i) => {
-    const a = it(i);
+  ).then((r) => {
+    const a = Ct(r);
     if (a === null) {
-      c(
-        `failed to classify as '${e}'. Evaluator returned '${i}'`
+      l(
+        `failed to classify as '${e}'. Evaluator returned '${r}'`
       );
       return;
     }
-    const u = `expected response to be classified as '${e}' with score >= ${r}, got ${a}`;
-    if (a < r) {
-      c(u);
+    const c = `expected response to be classified as '${e}' with score >= ${i}, got ${a}`;
+    if (a < i) {
+      l(c);
       return;
     }
-    l(
+    h(
       !0,
       Date.now() - o,
       "toBeClassifiedAs"
     );
   });
-  return d(s), s;
+  return C(s), s;
 }
-function ct(t, e) {
+function Tt(t, e) {
   const n = `expected '${t}' to include '${e}'`;
-  t.includes(e) || c(n);
+  t.includes(e) || l(n);
 }
-function v(t) {
+function _(t) {
   const e = t.trim().replace(/[<>:"/\\|?*\x00-\x1f]/g, "_").replace(/\s+/g, "_");
   return e.length > 0 ? e : "unnamed";
 }
-function ut() {
-  const t = U().map(
-    (o) => v(o.description)
-  ), e = R().map(
-    (o) => v(o.description)
+function $t() {
+  const t = K().map(
+    (o) => _(o.description)
+  ), e = J().map(
+    (o) => _(o.description)
   ), n = [...t, ...e];
   return n.length === 0 ? "root" : n.join("__");
 }
-function lt(t) {
-  const n = W(t).replace(/\.eval\.[^./\\]+$/, ""), o = ut();
-  return K(
-    g(t),
+function Et(t) {
+  const n = nt(t).replace(/\.eval\.[^./\\]+$/, ""), o = $t();
+  return S(
+    v(t),
     "__snapshots__",
     `${n}__${o}.snap.md`
   );
 }
-function T(t) {
+function P(t) {
   return t.split(/\r?\n/);
 }
-function ft(t, e) {
+function St(t, e) {
   if (t === e)
     return "  (no diff)";
-  const n = T(t), o = T(e), r = Math.max(n.length, o.length), s = [];
-  for (let i = 0; i < r; i += 1) {
-    const a = n[i], u = o[i];
-    if (a !== u) {
-      if (a === void 0 && u !== void 0) {
-        s.push(`+ ${u}`);
+  const n = P(t), o = P(e), i = Math.max(n.length, o.length), s = [];
+  for (let r = 0; r < i; r += 1) {
+    const a = n[r], c = o[r];
+    if (a !== c) {
+      if (a === void 0 && c !== void 0) {
+        s.push(`+ ${c}`);
         continue;
       }
-      if (a !== void 0 && u === void 0) {
+      if (a !== void 0 && c === void 0) {
         s.push(`- ${a}`);
         continue;
       }
-      s.push(`- ${a ?? ""}`), s.push(`+ ${u ?? ""}`);
+      s.push(`- ${a ?? ""}`), s.push(`+ ${c ?? ""}`);
     }
   }
   return s.join(`
 `);
 }
-function dt(t) {
-  const e = S.getStore()?.evalFile;
+function vt(t) {
+  const e = L.getStore()?.evalFile;
   if (!e) {
-    c(
+    l(
       "toMatchSnapshot can only be used while running an eval file."
     );
     return;
   }
-  const n = lt(e);
+  const n = Et(e);
   try {
-    const o = H(n, "utf8");
+    const o = st(n, "utf8");
     if (o === t)
       return;
-    if (I()) {
-      C(n, t, "utf8");
+    if (q()) {
+      M(n, t, "utf8");
       return;
     }
-    const r = ft(o, t);
-    c(
+    const i = St(o, t);
+    l(
       [
         `Snapshot mismatch at ${n}`,
         "",
         "Diff:",
-        r,
+        i,
         "",
-        "Run katt with --update-snapshots (or -u) to accept this change."
+        "Run 'npx katt --update-snapshots' (or -u) to accept this change."
       ].join(`
 `)
     );
   } catch (o) {
     if (o.code !== "ENOENT") {
-      c(
+      l(
         `Failed to read snapshot at ${n}: ${String(o)}`
       );
       return;
     }
     try {
-      Y(g(n), { recursive: !0 }), C(n, t, "utf8");
+      it(v(n), { recursive: !0 }), M(n, t, "utf8");
     } catch (s) {
-      c(
+      l(
         `Failed to write snapshot at ${n}: ${String(s)}`
       );
     }
   }
 }
-function vt(t) {
+function Lt(t) {
   return {
     toContain: (e) => {
-      ct(t, e);
+      Tt(t, e);
     },
     toMatchSnapshot: () => {
-      dt(t);
+      vt(t);
     },
     promptCheck: async (e) => {
-      await st(t, e);
+      await wt(t, e);
     },
     toBeClassifiedAs: async (e, n) => {
-      await at(t, e, n);
+      await bt(t, e, n);
     }
   };
 }
 export {
-  Ct as describe,
-  vt as expect,
-  wt as it,
-  y as prompt,
-  bt as promptFile,
-  xt as runCli
+  Nt as describe,
+  Lt as expect,
+  Pt as it,
+  F as prompt,
+  It as promptFile,
+  jt as runCli
 };

package/dist/katt.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { t as r } from "./runCli-B3oIBxOl.js";
+import { u as r } from "./runCli-425rgVp8.js";
 r().then((e) => {
   process.exit(e);
 }).catch((e) => {