@earntori/cli 0.2.5 → 0.2.9

package/dist/index.js

@@ -55,7 +55,7 @@ function out(o, human) { console.log(json ? JSON.stringify(o, null, 2) : human);
 function die(msg) { console.error(json ? JSON.stringify({ error: msg }) : `\u2717 ${msg}`); process.exit(1); }
 const usd = (c) => `$${(c / 100).toFixed(2)}`;
 async function api(cfg, method, path, body) {
-    const r = await fetch(`${cfg.base}${path}`, { method, headers: { Authorization: `Bearer ${cfg.token}`, "Content-Type": "application/json", "User-Agent": "@earntori/cli/0.2.5" }, body: body ? JSON.stringify(body) : undefined });
+    const r = await fetch(`${cfg.base}${path}`, { method, headers: { Authorization: `Bearer ${cfg.token}`, "Content-Type": "application/json", "User-Agent": "@earntori/cli/0.2.9" }, body: body ? JSON.stringify(body) : undefined });
     const t = await r.text();
     let j = null;
     try {
@@ -157,6 +157,63 @@ catch {
     return null;
 } }
 function writeJson(p, o) { mkdirSync(dirname(resolve(p)), { recursive: true }); writeFileSync(p, JSON.stringify(o, null, 2) + "\n"); }
+const withHarness = (mcp, id) => ({ ...mcp, env: { TORI_HARNESS: id } });
+function mergeMcpJson(file, mcp) { const j = readJson(file) ?? {}; j.mcpServers = { ...(j.mcpServers ?? {}), tori: mcp }; writeJson(file, j); return file; }
+function hookPresent(h, c) { return typeof h?.command === "string" && (h.command.includes("@earntori/cli check") || (c.local && h.command.includes(c.cliBin))); }
+function ensureHook(hooks, event, entry, c) {
+    const arr = Array.isArray(hooks[event]) ? hooks[event] : [];
+    if (!arr.some((g) => Array.isArray(g?.hooks) && g.hooks.some((h) => hookPresent(h, c))))
+        arr.push(entry);
+    hooks[event] = arr;
+}
+const HARNESSES = [
+    {
+        id: "claude-code", label: "Claude Code", detect: () => true,
+        install: (c) => {
+            const wrote = [mergeMcpJson(".mcp.json", withHarness(c.mcp, "claude-code"))];
+            const sfile = join(".claude", "settings.json");
+            const s = readJson(sfile) ?? {};
+            s.hooks = s.hooks && typeof s.hooks === "object" ? s.hooks : {};
+            ensureHook(s.hooks, "Stop", { hooks: [{ type: "command", command: `${c.cli} check --hook` }] }, c);
+            ensureHook(s.hooks, "SessionStart", { hooks: [{ type: "command", command: `${c.cli} check --reminder` }] }, c);
+            writeJson(sfile, s);
+            wrote.push(sfile);
+            return wrote;
+        },
+        after: "Claude Code: restart the session (hooks and .mcp.json load at start).",
+    },
+    {
+        id: "cursor", label: "Cursor", detect: () => true,
+        install: (c) => [mergeMcpJson(join(".cursor", "mcp.json"), withHarness(c.mcp, "cursor"))],
+        after: "Cursor: reload the window.",
+    },
+    {
+        id: "codex", label: "Codex",
+        detect: () => !has("no-codex") && (has("codex") || existsSync(".codex") || existsSync(join(homedir(), ".codex"))),
+        install: (c) => {
+            const wrote = [];
+            // .codex/config.toml — append the [mcp_servers.tori] table if it is not already there.
+            const tfile = join(".codex", "config.toml");
+            const toml = existsSync(tfile) ? readFileSync(tfile, "utf8") : "";
+            if (!/\[mcp_servers\.tori\]/.test(toml)) {
+                const block = `\n[mcp_servers.tori]\ncommand = ${JSON.stringify(c.mcp.command)}\nargs = ${JSON.stringify(c.mcp.args)}\n\n[mcp_servers.tori.env]\nTORI_HARNESS = "codex"\n`;
+                mkdirSync(".codex", { recursive: true });
+                writeFileSync(tfile, (toml.trimEnd() + "\n" + block).replace(/^\n/, ""));
+            }
+            wrote.push(tfile);
+            // .codex/hooks.json — same two hooks; Stop uses exit 2 + stderr to continue the turn, SessionStart prints to stdout.
+            const hfile = join(".codex", "hooks.json");
+            const h = readJson(hfile) ?? {};
+            h.hooks = h.hooks && typeof h.hooks === "object" ? h.hooks : {};
+            ensureHook(h.hooks, "SessionStart", { matcher: "startup|resume", hooks: [{ type: "command", command: `${c.cli} check --reminder`, timeout: 30 }] }, c);
+            ensureHook(h.hooks, "Stop", { hooks: [{ type: "command", command: `${c.cli} check --hook`, timeout: 120 }] }, c);
+            writeJson(hfile, h);
+            wrote.push(hfile);
+            return wrote;
+        },
+        after: "Codex: trust the project, then /mcp to confirm tori and /hooks once to trust the two hooks.",
+    },
+];
 function init() {
     const pin = flag("base");
     if (pin)
@@ -169,30 +226,31 @@ function init() {
     const mcpBin = resolve(dirname(cliBin), "..", "..", "mcp", "dist", "index.js");
     if (local && !existsSync(mcpBin))
         die(`--local: MCP build not found at ${mcpBin} (run: pnpm --filter @earntori/mcp build)`);
-    const mcp = local ? { command: "node", args: [mcpBin] } : { command: "npx", args: ["-y", "@earntori/mcp"] };
-    const cli = local ? `node ${JSON.stringify(cliBin)}` : "npx -y @earntori/cli";
-    const mergeMcp = (file) => { const j = readJson(file) ?? {}; j.mcpServers = { ...(j.mcpServers ?? {}), tori: mcp }; writeJson(file, j); return file; };
-    const wrote = [mergeMcp(".mcp.json"), mergeMcp(join(".cursor", "mcp.json"))];
-    const sfile = join(".claude", "settings.json");
-    const s = readJson(sfile) ?? {};
-    s.hooks = s.hooks && typeof s.hooks === "object" ? s.hooks : {};
-    const ensure = (event, command) => {
-        const arr = Array.isArray(s.hooks[event]) ? s.hooks[event] : [];
-        const present = arr.some((g) => Array.isArray(g?.hooks) && g.hooks.some((h) => typeof h?.command === "string" && h.command.includes("@earntori/cli check") || (local && typeof h?.command === "string" && h.command.includes(cliBin))));
-        if (!present)
-            arr.push({ hooks: [{ type: "command", command }] });
-        s.hooks[event] = arr;
-    };
-    ensure("Stop", `${cli} check --hook`);
-    ensure("SessionStart", `${cli} check --reminder`);
-    writeJson(sfile, s);
-    wrote.push(sfile);
+    const ctx = { mcp: local ? { command: "node", args: [mcpBin] } : { command: "npx", args: ["-y", "@earntori/mcp"] }, cli: local ? `node ${JSON.stringify(cliBin)}` : "npx -y @earntori/cli", local, cliBin };
+    const set = HARNESSES.filter((h) => h.detect());
+    const wrote = [];
+    for (const h of set)
+        wrote.push(...h.install(ctx));
     if (pin)
         wrote.push(join(".tori", "project.json"));
-    out({ ok: true, wrote, local }, `\u2713 Tori installed in this project${local ? " (local builds)" : ""}${pin ? ` \u2014 pinned to ${pin}` : ""}\n` +
+    out({ ok: true, harnesses: set.map((h) => h.id), wrote, local }, `\u2713 Tori installed in this project for ${set.map((h) => h.label).join(", ")}${local ? " (local builds)" : ""}${pin ? ` \u2014 pinned to ${pin}` : ""}\n` +
         wrote.map((w) => `  ${w}`).join("\n") +
-        `\n\nClaude Code: restart the session (hooks and .mcp.json load at start). Cursor: reload the window.\nTori's checks now run when the agent finishes a turn; findings are shown to the agent before it stops.`);
+        `\n\n${set.map((h) => h.after).join(" ")}\nTori's checks now run when the agent finishes a turn; findings are shown to the agent before it stops.` +
+        (set.some((h) => h.id === "codex") ? "" : "\n(Codex not detected \u2014 run `tori init --codex` to set it up too.)"));
+}
+function repoIndex() { try {
+    const out = execSync("git ls-files", { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).split("\n").filter(Boolean);
+    return out.length ? out.slice(0, 5000) : undefined;
 }
+catch {
+    return undefined;
+} }
+function envExample() { try {
+    return existsSync(".env.example") ? readFileSync(".env.example", "utf8").slice(0, 20000) : undefined;
+}
+catch {
+    return undefined;
+} }
 const CODE_EXT = /\.(ts|tsx|js|jsx|mjs|cjs|py|go|rb|php|java|kt|cs)$/i;
 function projectId() {
     try {
@@ -206,7 +264,8 @@ function projectId() {
 function gitChanged() {
     try {
         const o = execSync("git status --porcelain --untracked-files=all", { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
-        return o.split("\n").map((l) => l.slice(3).trim()).filter(Boolean).map((p) => (p.includes(" -> ") ? p.split(" -> ")[1] : p));
+        const SKIP = /(^|\/)(node_modules|dist|build|out|\.next|\.git|coverage|vendor|\.venv|venv|__pycache__|\.turbo|\.cache)(\/|$)/;
+        return o.split("\n").map((l) => l.slice(3).trim()).filter(Boolean).map((p) => (p.includes(" -> ") ? p.split(" -> ")[1] : p)).filter((p) => !SKIP.test(p)).slice(0, 200);
     }
     catch {
         return [];
@@ -242,9 +301,27 @@ function formatRun(r, n) {
         L.push(`Receipt: ${r.receipt.short}`);
     return L.join("\n");
 }
+const dbg = (m) => { if (process.env.TORI_DEBUG)
+    console.error(`[tori ${new Date().toISOString().slice(11, 23)}] ${m}`); };
 async function check() {
+    dbg("check: start");
     if (has("reminder")) {
-        console.log("Tori is installed in this project. Before finishing any work that touches webhooks, payments, banking, identity or third-party APIs, call the checks_run tool on the files you changed; after fixing a finding, call checks_resolve with the finding_id and path. Tori also runs automatically when you stop. Call ledger_query first to see open and waived findings for this project — everything here is journaled.");
+        let extra = "";
+        try {
+            const cfg0 = loadCfg();
+            if (cfg0) {
+                const project = projectId();
+                const [st, ru] = await Promise.all([
+                    api(cfg0, "GET", `/api/v1/standards?project=${encodeURIComponent(project)}`),
+                    api(cfg0, "GET", `/api/v1/rules?project=${encodeURIComponent(project)}`),
+                ]);
+                const domains = st.standards.filter((s) => s.tier === "domain" && s.enabled).map((s) => s.id);
+                const enforced = ru.rules.filter((r) => r.enforced).length, recorded = ru.rules.length - enforced;
+                extra = ` This project is held to Tori's coding standards${domains.length ? ` plus ${domains.join(", ")}` : ""}${ru.rules.length ? `, and ${ru.rules.length} rule${ru.rules.length === 1 ? "" : "s"} of its own (${enforced} enforced, ${recorded} recorded)` : ""}.${recorded ? " Recorded rules are not checked automatically; read them with `tori rules` and follow them." : ""}`;
+            }
+        }
+        catch { }
+        console.log("Tori is installed in this project. Before finishing any work that touches webhooks, payments, banking, identity or third-party APIs, call the checks_run tool on the files you changed; after fixing a finding, call checks_resolve with the finding_id and path. Tori also runs automatically when you stop. Call ledger_query first to see open and waived findings for this project — everything here is journaled." + extra);
         return;
     }
     const hook = has("hook");
@@ -255,6 +332,7 @@ async function check() {
             stopActive = !!JSON.parse(raw || "{}").stop_hook_active;
         }
         catch { }
+        dbg(`stdin read (stop_hook_active=${stopActive})`);
     }
     const cfg = loadCfg();
     if (!cfg) {
@@ -263,7 +341,10 @@ async function check() {
         die("Not signed in \u2014 run: tori login");
     }
     const explicit = args.slice(1).filter((a) => !a.startsWith("--"));
-    const files = readCode(explicit.length ? explicit : gitChanged());
+    const changed = explicit.length ? explicit : gitChanged();
+    dbg(`changed files: ${changed.length}`);
+    const files = readCode(changed);
+    dbg(`code files: ${files.length} (${files.reduce((n, f) => n + f.content.length, 0)} chars)`);
     if (files.length === 0) {
         if (!hook)
             out({ clean: true, files: 0 }, "Nothing to check \u2014 no changed code files.");
@@ -271,7 +352,10 @@ async function check() {
     }
     let r;
     try {
-        const res = await fetch(`${cfg.base}/api/v1/checks/run`, { method: "POST", headers: { Authorization: `Bearer ${cfg.token}`, "Content-Type": "application/json", "User-Agent": "@earntori/cli/check" }, body: JSON.stringify({ files, project: projectId() }) });
+        const body0 = { files, project: projectId(), repo_index: repoIndex(), env_example: envExample() };
+        dbg(`request: ${JSON.stringify(body0).length} bytes, index ${body0.repo_index?.length ?? 0} paths -> ${cfg.base}`);
+        const res = await fetch(`${cfg.base}/api/v1/checks/run`, { method: "POST", headers: { Authorization: `Bearer ${cfg.token}`, "Content-Type": "application/json", "User-Agent": "@earntori/cli/check" }, body: JSON.stringify(body0) });
+        dbg(`response: ${res.status}`);
         const t = await res.text();
         if (!res.ok)
             throw new Error(`Tori API ${res.status}${t ? ": " + t.slice(0, 200) : ""}`);
@@ -283,6 +367,7 @@ async function check() {
         die(e.message);
     }
     const text = formatRun(r, files.length);
+    const highs = r.findings.filter((f) => f.severity === "high").length, meds = r.findings.filter((f) => f.severity === "medium").length, lows = r.findings.length - highs - meds;
     if (hook) {
         if (r.clean)
             return;
@@ -290,7 +375,9 @@ async function check() {
             console.log(`Tori: ${r.findings.length} finding(s) still open \u2014 run \`tori check\` to see them.`);
             return;
         }
-        console.error(text);
+        if (highs === 0)
+            return; // only high blocks; medium/low are recorded and shown in status and at session start
+        console.error(text + `\n\n${highs} high (blocking)${meds ? `, ${meds} medium` : ""}${lows ? `, ${lows} low` : ""} — medium and low are recorded and do not block.`);
         process.exit(2); // exit 2 = block the stop; stderr goes to the agent
     }
     out(r, text);
@@ -391,9 +478,53 @@ async function connector() {
     const r = await api(cfg, "GET", "/api/v1/connectors");
     out(r, r.connectors.length ? r.connectors.map((c) => `${c.revoked_at ? "revoked " : "active  "} ${c.id}  ${c.label} (${c.harness})  created ${String(c.created_at).slice(0, 10)}${c.last_used_at ? "  last used " + String(c.last_used_at).slice(0, 16) : ""}`).join("\n") : "No connectors. Create one: tori connector new --label cowork");
 }
+async function standards() {
+    const cfg = loadCfg();
+    if (!cfg)
+        die("Not signed in \u2014 run: tori login");
+    const project = projectId();
+    const sub = args[1];
+    if (sub === "enable" || sub === "disable") {
+        const ids = args.slice(2).filter((a) => !a.startsWith("--"));
+        if (!ids.length)
+            die(`Usage: tori standards ${sub} <standard…>`);
+        const r = await api(cfg, "POST", "/api/v1/standards", { project, enable: sub === "enable" ? ids : [], disable: sub === "disable" ? ids : [] });
+        out(r, `\u2713 ${sub === "enable" ? "Enabled" : "Disabled"} ${ids.join(", ")} for this project.\nOn for this project: coding standards (always) + ${r.enabled.length ? r.enabled.join(", ") : "no domain standards"}${r.receipts.length ? "\nReceipt: " + r.receipts.map((x) => x.short).join(", ") : ""}`);
+        return;
+    }
+    const r = await api(cfg, "GET", `/api/v1/standards?project=${encodeURIComponent(project)}`);
+    const line = (s) => `  ${s.enabled ? "on " : "off"}  ${s.id.padEnd(20)} ${s.name}${s.rules ? ` (${s.rules} checks)` : " (no checks yet)"}`;
+    out(r, `Coding standards \u2014 always on:\n${r.standards.filter((s) => s.tier === "coding").map(line).join("\n")}\n\nDomain standards \u2014 choose per project:\n${r.standards.filter((s) => s.tier === "domain").map(line).join("\n")}\n\nEnable: tori standards enable <id…>   Disable: tori standards disable <id…>`);
+}
+async function rules() {
+    const cfg = loadCfg();
+    if (!cfg)
+        die("Not signed in \u2014 run: tori login");
+    const project = projectId();
+    const sub = args[1];
+    if (sub === "add") {
+        const text = args.slice(2).filter((a) => !a.startsWith("--")).join(" ").trim();
+        if (!text)
+            die('Usage: tori rules add "<rule in plain English>"');
+        const r = await api(cfg, "POST", "/api/v1/rules", { project, text });
+        out(r, r.enforced ? `\u2713 Rule added and enforced: "${text}"\n  id ${r.id} \u00b7 Tori will check it on every run. Receipt: ${r.receipt.short}`
+            : `\u2713 Rule recorded (not enforced): "${text}"\n  id ${r.id} \u00b7 Tori can't turn this wording into a check yet. The agent still sees it as a rule it is held to. Enforceable shapes: "no X [in|outside <where>]", "<where> must contain X", "every <where> ships with X". Receipt: ${r.receipt.short}`);
+        return;
+    }
+    if (sub === "remove") {
+        const id = args[2];
+        if (!id || id.startsWith("--"))
+            die("Usage: tori rules remove <id>");
+        const r = await api(cfg, "DELETE", "/api/v1/rules", { project, id });
+        out(r, `\u2713 Rule ${r.id} removed. Receipt: ${r.receipt.short}`);
+        return;
+    }
+    const r = await api(cfg, "GET", `/api/v1/rules?project=${encodeURIComponent(project)}`);
+    out(r, r.rules.length ? r.rules.map((x) => `  ${x.enforced ? "enforced" : "recorded"}  ${x.id}  ${x.text}`).join("\n") : 'No rules for this project. Add one: tori rules add "no console.log outside dev paths"');
+}
 function logout() { if (existsSync(CONFIG))
     unlinkSync(CONFIG); out({ ok: true }, "\u2713 Signed out"); }
-function help() { console.log(`tori \u2014 Tori CLI\n\n  tori login [--base URL]              sign in with GitHub (device flow)\n  tori status [--json]                 balance + your AI keys\n  tori key --limit 5 [--write env] [--file .env] [--json]\n  tori stats [--json]                  your integration + developer program numbers\n  tori init [--local]                  wire Tori into this project (MCP + Claude Code hooks)\n  tori check [paths...] [--json]       run Tori's checks on changed files\n  tori ledger [--project X|all] [--type a,b] [--since ISO] [--limit N] [--json]\n  tori receipt <event_id|seq>          fetch a receipt and verify it locally\n  tori connector new [--label X] | list | revoke <id>   Tori as a remote MCP connector (Claude Cowork etc.)\n  tori init --base https://sandbox.earntori.com   pin this repo to a Tori environment (.tori/project.json)\n  tori logout\n`); }
+function help() { console.log(`tori \u2014 Tori CLI\n\n  tori login [--base URL]              sign in with GitHub (device flow)\n  tori status [--json]                 balance + your AI keys\n  tori key --limit 5 [--write env] [--file .env] [--json]\n  tori stats [--json]                  your integration + developer program numbers\n  tori init [--local] [--codex|--no-codex]   wire Tori into this project (Claude Code, Cursor, Codex)\n  tori check [paths...] [--json]       run Tori's checks on changed files\n  tori ledger [--project X|all] [--type a,b] [--since ISO] [--limit N] [--json]\n  tori receipt <event_id|seq>          fetch a receipt and verify it locally\n  tori connector new [--label X] | list | revoke <id>   Tori as a remote MCP connector (Claude Cowork etc.)\n  tori standards [enable|disable <id…>]   standards that apply to this project (coding standards are always on)\n  tori rules [add "<rule>"|list|remove <id>]   your own rules for this project, in plain English\n  tori init --base https://sandbox.earntori.com   pin this repo to a Tori environment (.tori/project.json)\n  tori logout\n`); }
 (async () => {
     switch (cmd) {
         case "login": return login();
@@ -403,6 +534,8 @@ function help() { console.log(`tori \u2014 Tori CLI\n\n  tori login [--base URL]
         case "ledger": return ledger();
         case "receipt": return receipt();
         case "connector": return connector();
+        case "standards": return standards();
+        case "rules": return rules();
         case "key": return key();
         case "stats": return stats();
         case "logout": return logout();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@earntori/cli",
-  "version": "0.2.5",
+  "version": "0.2.9",
   "description": "Tori CLI \u2014 sign in with GitHub, check your credits, mint a capped AI key into your tools.",
   "license": "MIT",
   "type": "module",