@earntori/cli 0.2.4 → 0.2.6

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.4" }, 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.6" }, body: body ? JSON.stringify(body) : undefined });
     const t = await r.text();
     let j = null;
     try {
@@ -119,8 +119,9 @@ async function key() {
     let note = "";
     if (write === "env") {
         const file = flag("file") ?? ".env";
-        appendFileSync(file, `\n# Tori AI key (${r.label}, cap ${usd(r.limitCents)})\nOPENAI_API_KEY=${r.key}\nOPENAI_BASE_URL=https://openrouter.ai/api/v1\n`);
-        note = `\n\u2713 Wrote OPENAI_API_KEY and OPENAI_BASE_URL to ${file}`;
+        const pinnedBase = projectBase() ?? (cfg.base !== "https://www.earntori.com" ? cfg.base : null);
+        appendFileSync(file, `\n# Tori AI key (${r.label}, cap ${usd(r.limitCents)})\nOPENAI_API_KEY=${r.key}\nOPENAI_BASE_URL=https://openrouter.ai/api/v1\n${pinnedBase ? `TORI_BASE_URL=${pinnedBase}\n` : ""}`);
+        note = `\n\u2713 Wrote OPENAI_API_KEY and OPENAI_BASE_URL${pinnedBase ? " and TORI_BASE_URL" : ""} to ${file}`;
     }
     else if (write)
         die(`--write ${write} is not supported yet; use --write env`);
@@ -156,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)
@@ -168,29 +226,17 @@ 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.)"));
 }
 const CODE_EXT = /\.(ts|tsx|js|jsx|mjs|cjs|py|go|rb|php|java|kt|cs)$/i;
 function projectId() {
@@ -243,7 +289,7 @@ function formatRun(r, n) {
 }
 async function check() {
     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. Everything you do here is journaled — the ledger_query tool reads it back.");
+        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.");
         return;
     }
     const hook = has("hook");
@@ -318,6 +364,8 @@ async function ledger() {
     const line = (e) => {
         const p = e.payload ?? {};
         const bits = [];
+        if (p.summary)
+            bits.push(String(p.summary).slice(0, 120));
         if (p.rule_id)
             bits.push(p.rule_id);
         if (p.path)
@@ -366,9 +414,31 @@ async function receipt() {
     if (verdict !== "VERIFIED")
         process.exitCode = 1;
 }
+async function connector() {
+    const cfg = loadCfg();
+    if (!cfg)
+        die("Not signed in \u2014 run: tori login");
+    const sub = args[1];
+    if (sub === "new") {
+        const label = flag("label") ?? "cowork";
+        const r = await api(cfg, "POST", "/api/v1/connectors", { label });
+        out(r, `\u2713 Connector "${r.label}" created (id ${r.id})\n\nAdd this URL as a custom connector (Claude Cowork / claude.ai \u2192 Settings \u2192 Connectors \u2192 Add custom connector):\n\n  ${r.url}\n\nThe URL is the secret \u2014 it is shown once. Revoke with: tori connector revoke ${r.id}\nReceipt: ${r.receipt.short}`);
+        return;
+    }
+    if (sub === "revoke") {
+        const id = args[2];
+        if (!id || id.startsWith("--"))
+            die("Usage: tori connector revoke <id>");
+        const r = await api(cfg, "POST", `/api/v1/connectors/${encodeURIComponent(id)}/revoke`, {});
+        out(r, `\u2713 Connector ${r.id} revoked. Receipt: ${r.receipt.short}`);
+        return;
+    }
+    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");
+}
 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 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 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();
@@ -377,6 +447,7 @@ function help() { console.log(`tori \u2014 Tori CLI\n\n  tori login [--base URL]
         case "check": return check();
         case "ledger": return ledger();
         case "receipt": return receipt();
+        case "connector": return connector();
         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.4",
+  "version": "0.2.6",
   "description": "Tori CLI \u2014 sign in with GitHub, check your credits, mint a capped AI key into your tools.",
   "license": "MIT",
   "type": "module",