madeby 0.3.10 → 0.3.12

package/README.md

@@ -156,7 +156,7 @@ Two modes, nothing more:
 - optional `"recordModel": true` — written by `madeby init --record-model`: the repo asks AI
   disclosures to name the model version as well as the tool. It adds one line to the AGENTS.md rule,
   and `me --with-ai` / `ai` then read the model from the **tool's own record of the session** — Cursor's
-  `CURSOR_MODEL`, the Copilot CLI and Claude Code session logs (locally; only the model id is read) —
+  `CURSOR_MODEL` or its chat store, the Copilot CLI and Claude Code session logs (locally; only the model id is read) —
   which wins over an agent's `--model`, since an agent routed by "Auto" may not know which model served
   it. Elsewhere `--model <version>` is used, never guessed. So `coverage` can list each **agent · model** pairing
   (`Cursor · gpt-5.3-codex` vs `Claude Code · claude-sonnet-5`). A request, not a gate — an AI

package/dist/madeby.mjs

@@ -127,11 +127,12 @@ function classifyCommit(commit) {
     const botText = `${commit.authorName ?? ""} ${commit.authorEmail ?? ""}`.trim();
     const agentAi = botText ? matchAi(botText) : null;
     if (agentAi) {
+      const named = [...commit.message.matchAll(AI_AUTHOR_TRAILER), ...commit.message.matchAll(TRAILER_RE)].map((m) => matchAiTrailer(m[1].trim())).filter((c) => c !== null);
       return {
         class: "ai",
         confidence: CONF_AI,
-        signals: [`author:${agentAi.provider}`],
-        aiContributors: [{ ...agentAi, raw: botText }]
+        signals: [`author:${agentAi.provider}`, ...named.map((c) => `trailer:${c.provider}`)],
+        aiContributors: [{ ...agentAi, raw: botText }, ...named]
       };
     }
     return { class: "bot", confidence: CONF_BOT, signals: ["author:bot"], aiContributors };
@@ -1833,12 +1834,13 @@ To disclose: add a Co-Authored-By / Generated-by trailer, affirm your own author
 
 // src/commands/me.ts
 import { execFileSync as execFileSync5 } from "node:child_process";
-import { existsSync as existsSync5, readFileSync as readFileSync6 } from "node:fs";
+import { existsSync as existsSync5, readFileSync as readFileSync7 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
 import { join as join6 } from "node:path";
 
 // src/model-source.ts
-import { closeSync, existsSync as existsSync4, openSync, readdirSync as readdirSync3, readSync, statSync as statSync2 } from "node:fs";
+import { createHash } from "node:crypto";
+import { closeSync, existsSync as existsSync4, openSync, readdirSync as readdirSync3, readFileSync as readFileSync6, readSync, statSync as statSync2 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { join as join5 } from "node:path";
 var SESSION_ID = /^[0-9a-f-]{8,64}$/i;
@@ -1859,11 +1861,32 @@ function lastModelIn(path) {
     if (fd !== void 0) closeSync(fd);
   }
 }
+var RECENT_MS = 30 * 60 * 1e3;
+function cursorChatModel(home, cwd) {
+  const dir = join5(home, ".cursor", "chats", createHash("md5").update(cwd).digest("hex"));
+  try {
+    const chats = readdirSync3(dir).map((c) => ({ c, t: statSync2(join5(dir, c)).mtimeMs })).sort((a, b) => b.t - a.t);
+    const newest = chats[0];
+    if (!newest || Date.now() - newest.t > RECENT_MS) return null;
+    const db = join5(dir, newest.c, "store.db");
+    if (!existsSync4(db) || statSync2(db).size > 64 * 1024 * 1024) return null;
+    const names = new Set([...readFileSync6(db).toString("latin1").matchAll(/"modelName"\s*:\s*"([^"]{1,80})"/g)].map((m) => m[1]));
+    return names.size === 1 ? [...names][0] : null;
+  } catch {
+    return null;
+  }
+}
 var MODEL_SOURCES = [
   {
     tool: "Cursor",
     matches: /\bcursor/i,
-    detect: (env) => env.CURSOR_AGENT === "1" && env.CURSOR_MODEL?.trim() ? { model: env.CURSOR_MODEL.trim(), source: "Cursor's CURSOR_MODEL" } : null
+    // Cursor's agent shell sets CURSOR_MODEL — but not always (none of four Auto trials saw it), so its
+    // chat store is the second witness. Either is the tool's record, not the agent's guess.
+    detect: (env, home, cwd) => {
+      if (env.CURSOR_AGENT === "1" && env.CURSOR_MODEL?.trim()) return { model: env.CURSOR_MODEL.trim(), source: "Cursor's CURSOR_MODEL" };
+      const model = cursorChatModel(home, cwd);
+      return model ? { model, source: "Cursor's chat store" } : null;
+    }
   },
   {
     tool: "GitHub Copilot CLI",
@@ -1897,11 +1920,11 @@ var MODEL_SOURCES = [
     }
   }
 ];
-function detectAgentModel(tool, env = process.env, home = homedir2()) {
+function detectAgentModel(tool, env = process.env, home = homedir2(), cwd = process.cwd()) {
   const generic = /^(?:AI|an? AI)$/i.test(tool.trim());
   for (const s of MODEL_SOURCES) {
     if (!generic && !s.matches.test(tool)) continue;
-    const hit = s.detect(env, home);
+    const hit = s.detect(env, home, cwd);
     if (hit) return { tool: generic ? s.tool : tool, ...hit };
   }
   return null;
@@ -1938,14 +1961,14 @@ function recordsModel(root) {
   const p = join6(root, ".madeby", "policy.json");
   if (!existsSync5(p)) return false;
   try {
-    return parseDisclosurePolicy(JSON.parse(readFileSync6(p, "utf8"))).recordModel === true;
+    return parseDisclosurePolicy(JSON.parse(readFileSync7(p, "utf8"))).recordModel === true;
   } catch {
     return false;
   }
 }
 function resolveAi(root, o) {
   const tool = o.tool && o.tool.trim() || "AI";
-  const detected = recordsModel(root) ? detectAgentModel(tool, o.env ?? process.env, o.home ?? homedir3()) : null;
+  const detected = recordsModel(root) ? detectAgentModel(tool, o.env ?? process.env, o.home ?? homedir3(), o.cwd ?? process.cwd()) : null;
   if (detected) return { value: aiValue(detected.tool, detected.model), tool: detected.tool, model: detected.model, modelSource: detected.source };
   const model = o.model?.trim() || void 0;
   return { value: aiValue(tool, model), tool, ...model ? { model, modelSource: "as given (--model)" } : {} };
@@ -2213,13 +2236,13 @@ function whoCommand(args) {
 }
 
 // src/commands/coverage.ts
-import { existsSync as existsSync6, readFileSync as readFileSync7 } from "node:fs";
+import { existsSync as existsSync6, readFileSync as readFileSync8 } from "node:fs";
 import { join as join7 } from "node:path";
 function policyIsRequired(root) {
   const p = join7(root, ".madeby", "policy.json");
   if (!existsSync6(p)) return false;
   try {
-    return parseDisclosurePolicy(JSON.parse(readFileSync7(p, "utf8"))).mode === "required";
+    return parseDisclosurePolicy(JSON.parse(readFileSync8(p, "utf8"))).mode === "required";
   } catch {
     return false;
   }
@@ -2281,7 +2304,7 @@ function coverageCommand(args) {
 }
 
 // src/init-repo.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync8, writeFileSync as writeFileSync2 } from "node:fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync9, writeFileSync as writeFileSync2 } from "node:fs";
 import { dirname as dirname2, join as join8 } from "node:path";
 var ACO_VERSION = 2;
 var ACO_OPEN = `<!-- madeby:aco v${ACO_VERSION} -->`;
@@ -2357,7 +2380,7 @@ function ensurePolicy(abs, rel, want, res) {
   }
   let raw;
   try {
-    raw = JSON.parse(readFileSync8(abs, "utf8"));
+    raw = JSON.parse(readFileSync9(abs, "utf8"));
   } catch {
     res.skipped.push(rel);
     return { mode: "advisory", recordModel: false, malformed: true };
@@ -2387,7 +2410,7 @@ ${block}`);
     res.created.push(rel);
     return;
   }
-  const content = readFileSync8(abs, "utf8");
+  const content = readFileSync9(abs, "utf8");
   const status = acoStatus(content);
   const loc = findAcoBlock(content);
   if (status === "absent") {
@@ -2506,7 +2529,7 @@ madeby init \u2014 policy: ${r.policyMode}${r.recordModel ? " + records model" :
 import { execFileSync as execFileSync6 } from "node:child_process";
 import { createInterface } from "node:readline";
 var DEFAULT_PROTOCOL = "2024-11-05";
-var SERVER_INFO = { name: "madeby", version: "0.3.10" };
+var SERVER_INFO = { name: "madeby", version: "0.3.12" };
 function rootFor(path) {
   const cwd = path && path.length ? path : process.cwd();
   return execFileSync6("git", ["-C", cwd, "-c", "core.quotePath=false", "rev-parse", "--show-toplevel"], { encoding: "utf8" }).trim();
@@ -2617,14 +2640,19 @@ var ALIGN_GUIDE = `# Aligning a repository with MadeBy
 MadeBy is **disclosure, not detection** \u2014 it records what a commit *states* about its origin, never
 guesses whether code is AI. To align a repo:
 
-1. **Assess** \u2014 call \`check\` (or \`who\` with no path for a repo-wide map) to see current coverage.
-2. **Set up** \u2014 call \`init\`: it writes \`.madeby/policy.json\` (advisory) and the CI disclosure check.
-   Idempotent; it never clobbers an existing policy or workflow (\`mode: "required"\` only ever raises an
-   advisory policy to required). Then commit the created files.
-3. **Disclose going forward** \u2014 contributors disclose origin with a Co-Authored-By / Generated-by
-   trailer (AI), an \`Authored-by-human\` trailer (work they wrote themselves \u2014 the symmetric human
-   claim; \`madeby me\` adds it), a DCO Signed-off-by, a signed commit, or \`ai\` (record your own AI
-   session's witnessed spans, structurally verified and local). Human and AI disclosure ride the same ladder.
+1. **Assess** \u2014 call \`coverage\` for the scoreboard (known vs unknown, the human / with_ai / ai mix, and
+   the agents and model versions named), \`check\` for the gate's verdict, or \`who\` with no path for a
+   repo-wide map.
+2. **Set up** \u2014 call \`init\`: it writes \`.madeby/policy.json\` (advisory), the AGENTS.md disclosure rule,
+   and the CI disclosure check (\`host: "azure-devops"\` for Azure Pipelines). Idempotent; it never
+   clobbers an existing policy or workflow (\`mode: "required"\` only ever raises an advisory policy to
+   required). Add \`record_model: true\` if the repo should also record which model version did the work
+   (opt-in; a project's choice). Then commit the created files.
+3. **Disclose going forward** \u2014 contributors disclose origin with an \`Authored-by-ai\` trailer (an AI
+   wrote it; \`madeby ai\` adds it), \`Authored-by-human\` plus \`Assisted-by\` (a human wrote it with AI;
+   \`madeby me --with-ai\`), \`Authored-by-human\` alone (\`madeby me\`), a Co-Authored-By / Generated-by AI
+   trailer, a DCO Signed-off-by, a signed commit, or witnessed spans from an AI session log
+   (\`madeby ai --witness\`). Human and AI disclosure ride the same ladder.
 4. **Account for existing history honestly** \u2014 do NOT fabricate disclosure for past commits. Read the
    \`madeby://guide/backfill\` resource: recognize what's already disclosed, attach recoverable
    evidence, and set an adoption boundary \u2014 pre-boundary history is labeled *unknown*, never invented.
@@ -2704,7 +2732,8 @@ var POLICY_SCHEMA = {
   properties: {
     version: { const: 0 },
     mode: { enum: ["advisory", "required"], description: "advisory: report only (the default, and the safe degrade); required: fail on any undisclosed commit" },
-    accept: { type: "array", items: { type: "string" }, description: "restrict what satisfies the policy (e.g. dco-signoff, ai-trailer, commit-signature); omit \u21D2 any recognized disclosure counts" }
+    accept: { type: "array", items: { type: "string" }, description: "restrict what satisfies the policy (e.g. dco-signoff, ai-trailer, commit-signature); omit \u21D2 any recognized disclosure counts" },
+    recordModel: { type: "boolean", description: "ask AI disclosures to name the model version too (tool:model, e.g. Assisted-by: Cursor:gpt-5.3-codex); madeby reads it from the tool's own session record where it can. Set by init --record-model. A request, not a gate" }
   }
 };
 var ACO_GUIDE = `# ACO \u2014 the Authorship Certificate of Origin
@@ -2720,12 +2749,22 @@ https://github.com/MadeByFYI/MadeBy/blob/main/ACO.md
 - **ai** \u2014 an AI agent authored it (a human remains accountable).
 
 ## How an agent discloses its OWN work (asserted tier, no keys)
-- Collaborative / human-directed work you just did -> call **disclose** (with_ai: true, tool: "<your name>").
-  It affirms human authorship + discloses AI assistance on HEAD, classifying the commit with_ai.
+- After you commit, call **disclose** with the honest \`category\` and your \`tool\` name (e.g. "Claude Code"):
+  - \`ai\`: you wrote it; the committer stays accountable. Adds \`Authored-by-ai: <tool>\`.
+  - \`with_ai\`: a human wrote it with your help. Adds \`Authored-by-human\` + \`Assisted-by: <tool>\`.
+  - \`human\`: a human wrote it alone. Adds \`Authored-by-human\`.
+  If you wrote the code and a human is only committing it, that is \`ai\`, not \`with_ai\`.
+- **The model version.** If the repo's \`.madeby/policy.json\` has \`"recordModel": true\`, madeby reads your
+  model from the tool's own record of the session (Cursor, Copilot CLI, Claude Code) and writes
+  \`<tool>:<model>\`. Elsewhere pass \`model\` only if you know your exact model version. Never guess.
+- **If your platform makes or rebuilds the commit** (a cloud coding agent that pushes through its own
+  tool), a trailer amended in afterwards can be lost. Call disclose with \`print: true\` to get the trailer
+  lines instead, and put them in the commit message's last paragraph.
 - Fully AI-authored spans recoverable from your session log -> call **ai** (records structurally-verified
   spans, local-only).
-- Read what's already disclosed -> **who**. Align a whole repo -> **init** (also scaffolds an AGENTS.md
-  ACO convention so any agent working there discloses).
+- Read what's already disclosed -> **who**; measure a repo -> **coverage** (also lists the agents and
+  models named). Align a whole repo -> **init** (also scaffolds an AGENTS.md ACO convention so any agent
+  working there discloses).
 
 Disclose per commit, honestly. Undisclosed content stays *unknown*, never guessed.
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "madeby",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "mcpName": "io.github.MadeByFYI/madeby",
   "description": "Disclose AI authorship of code. `npx madeby ai` adds an Authored-by-ai git trailer; AI coding agents disclose per the ACO standard (human/with_ai/ai) from an AGENTS.md convention. Disclosure, not detection. Gate PRs with `madeby check`.",
   "license": "MIT",