@earntori/cli 0.2.9 → 0.2.11

package/dist/index.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { readdirSync } from "node:fs";
 // @earntori/cli — tori login | status | key --limit N [--write env] | stats | logout
 import { readFileSync, writeFileSync, mkdirSync, existsSync, appendFileSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
@@ -55,7 +56,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.9" }, 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.10" }, body: body ? JSON.stringify(body) : undefined });
     const t = await r.text();
     let j = null;
     try {
@@ -157,18 +158,37 @@ catch {
     return null;
 } }
 function writeJson(p, o) { mkdirSync(dirname(resolve(p)), { recursive: true }); writeFileSync(p, JSON.stringify(o, null, 2) + "\n"); }
+// Harness registry: one entry per coding harness. `detect` decides whether `tori init` sets it up
+// (Claude Code and Cursor: always; Codex: when it is installed or present in the repo, or --codex);
+// `install` writes that harness's files and returns their paths. Add a harness = add a row.
+// Pinned package versions written into agent config (B1b). CLI version = this package's own;
+// MCP version is a constant: bump it in the same commit as a @earntori/mcp release.
+const TORI_MCP_VERSION = "0.1.7";
+function cliVersion(cliBin) {
+    try {
+        return JSON.parse(readFileSync(resolve(dirname(cliBin), "..", "package.json"), "utf8")).version ?? "latest";
+    }
+    catch {
+        return "latest";
+    }
+}
 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 hookPresent(h, c) { return typeof h?.command === "string" && (/@earntori\/cli(@[^\s]+)? check/.test(h.command) || (c.local && h.command.includes(c.cliBin))); }
+// Re-running init replaces an existing Tori hook group (so a new pinned version lands) and never adds a second one.
 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))))
+    const i = arr.findIndex((g) => Array.isArray(g?.hooks) && g.hooks.some((h) => hookPresent(h, c)));
+    if (i >= 0)
+        arr[i] = entry;
+    else
         arr.push(entry);
     hooks[event] = arr;
 }
 const HARNESSES = [
     {
-        id: "claude-code", label: "Claude Code", detect: () => true,
+        id: "claude-code", label: "Claude Code",
+        detect: () => !has("no-claude") && (has("claude") || existsSync(".claude") || existsSync(".mcp.json") || existsSync(join(homedir(), ".claude")) || existsSync(join(homedir(), ".claude.json"))),
         install: (c) => {
             const wrote = [mergeMcpJson(".mcp.json", withHarness(c.mcp, "claude-code"))];
             const sfile = join(".claude", "settings.json");
@@ -183,7 +203,8 @@ const HARNESSES = [
         after: "Claude Code: restart the session (hooks and .mcp.json load at start).",
     },
     {
-        id: "cursor", label: "Cursor", detect: () => true,
+        id: "cursor", label: "Cursor",
+        detect: () => !has("no-cursor") && (has("cursor") || existsSync(".cursor") || existsSync(join(homedir(), ".cursor"))),
         install: (c) => [mergeMcpJson(join(".cursor", "mcp.json"), withHarness(c.mcp, "cursor"))],
         after: "Cursor: reload the window.",
     },
@@ -200,6 +221,12 @@ const HARNESSES = [
                 mkdirSync(".codex", { recursive: true });
                 writeFileSync(tfile, (toml.trimEnd() + "\n" + block).replace(/^\n/, ""));
             }
+            else {
+                // Existing block: rewrite its command/args so the pinned version is current.
+                const updated = toml.replace(/(\[mcp_servers\.tori\][^\[]*?)command = [^\n]*\nargs = [^\n]*/, `$1command = ${JSON.stringify(c.mcp.command)}\nargs = ${JSON.stringify(c.mcp.args)}`);
+                if (updated !== toml)
+                    writeFileSync(tfile, updated);
+            }
             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");
@@ -226,8 +253,11 @@ 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 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 ver = cliVersion(cliBin);
+    const ctx = { mcp: local ? { command: "node", args: [mcpBin] } : { command: "npx", args: ["-y", `@earntori/mcp@${TORI_MCP_VERSION}`] }, cli: local ? `node ${JSON.stringify(cliBin)}` : `npx -y @earntori/cli@${ver}`, local, cliBin };
     const set = HARNESSES.filter((h) => h.detect());
+    if (!set.length)
+        die("No coding agent detected here. Run `tori init --claude`, `--cursor` or `--codex` to set one up anyway.");
     const wrote = [];
     for (const h of set)
         wrote.push(...h.install(ctx));
@@ -236,7 +266,8 @@ function init() {
     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\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.)"));
+        (local ? "" : `\nPinned to @earntori/cli@${ver} and @earntori/mcp@${TORI_MCP_VERSION}; re-run tori init after upgrading.`) +
+        (set.length === HARNESSES.length ? "" : "\n(Not detected: " + HARNESSES.filter((h) => !set.includes(h)).map((h) => `${h.label} \u2014 tori init --${h.id === "claude-code" ? "claude" : h.id}`).join("; ") + ".)"));
 }
 function repoIndex() { try {
     const out = execSync("git ls-files", { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).split("\n").filter(Boolean);
@@ -464,7 +495,7 @@ async function connector() {
     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}`);
+        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}\n\nThis connector's project is connector:${r.label}. Choose its standards and add rules with:\n  tori standards enable <id\u2026> --connector ${r.label}\n  tori rules add "<rule>" --connector ${r.label}\nReceipt: ${r.receipt.short}`);
         return;
     }
     if (sub === "revoke") {
@@ -476,13 +507,15 @@ async function connector() {
         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");
+    out(r, r.connectors.length ? r.connectors.map((c) => `${c.revoked_at ? "revoked " : "active  "} ${c.id}  ${c.label} (${c.harness})  project connector:${c.label}  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");
 }
+/** The project a standards/rules command targets: `--connector <label>` for a desktop connector's project, else this directory's. */
+function targetProject() { const c = flag("connector"); return c ? `connector:${c}` : projectId(); }
 async function standards() {
     const cfg = loadCfg();
     if (!cfg)
         die("Not signed in \u2014 run: tori login");
-    const project = projectId();
+    const project = targetProject();
     const sub = args[1];
     if (sub === "enable" || sub === "disable") {
         const ids = args.slice(2).filter((a) => !a.startsWith("--"));
@@ -494,21 +527,35 @@ async function standards() {
     }
     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…>`);
+    out(r, `${project.startsWith("connector:") ? `Project: ${project}\n\n` : ""}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 project = targetProject();
     const sub = args[1];
     if (sub === "add") {
-        const text = args.slice(2).filter((a) => !a.startsWith("--")).join(" ").trim();
+        const words = [];
+        for (let i = 2; i < args.length; i++) {
+            const a = args[i];
+            if (a.startsWith("--")) {
+                if (!a.includes("=") && i + 1 < args.length && !args[i + 1].startsWith("--"))
+                    i++;
+                continue;
+            }
+            words.push(a);
+        }
+        const text = words.join(" ").trim();
         if (!text)
-            die('Usage: tori rules add "<rule in plain English>"');
+            die('Usage: tori rules add "<rule in plain English>" [--connector <label>]');
         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}`);
+        if (r.existing) {
+            out(r, `Already there: "${text}" (id ${r.id}, ${r.enforced ? "enforced" : "recorded"}). Nothing added.`);
+            return;
+        }
+        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>]", "no X without Y", "<where> must contain X", "every <where> ships with X". Receipt: ${r.receipt?.short}`);
         return;
     }
     if (sub === "remove") {
@@ -522,9 +569,17 @@ async function rules() {
     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] [--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`); }
+function logout() {
+    if (existsSync(CONFIG))
+        unlinkSync(CONFIG);
+    // Pinned projects keep a per-base session; signing out must remove those too (B6).
+    if (existsSync(SESSIONS_DIR))
+        for (const f of readdirSync(SESSIONS_DIR))
+            if (f.endsWith(".json"))
+                unlinkSync(join(SESSIONS_DIR, f));
+    out({ ok: true }, "\u2713 Signed out (all sessions removed)");
+}
+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] [--claude|--no-claude] [--cursor|--no-cursor] [--codex|--no-codex]   wire Tori into this project (agents detected unless forced)\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…>] [--connector <label>]   standards that apply to this project, or to a connector's\n  tori rules [add "<rule>"|list|remove <id>] [--connector <label>]   your own rules, 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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@earntori/cli",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Tori CLI \u2014 sign in with GitHub, check your credits, mint a capped AI key into your tools.",
   "license": "MIT",
   "type": "module",
@@ -29,7 +29,7 @@
   "homepage": "https://www.earntori.com/docs/mcp",
   "repository": {
     "type": "git",
-    "url": "https://github.com/GAishZOEish/Tori-MCP.git"
+    "url": "git+https://github.com/usetori/tori.git"
   },
   "bugs": {
     "url": "https://github.com/GAishZOEish/Tori-MCP/issues"