modelstat 0.2.0 → 0.3.1

package/dist/cli.mjs

@@ -137,6 +137,62 @@ var init_git = __esm({
   }
 });
 
+// ../../packages/parsers/src/git-outcome.ts
+import { execFile as execFile2 } from "child_process";
+import { promisify as promisify2 } from "util";
+function parseGitLog(stdout) {
+  const out = [];
+  for (const record of stdout.split(RS)) {
+    const rec = record.trim();
+    if (!rec) continue;
+    const [sha = "", committedAt = "", subject = "", ...rest] = rec.split(FS);
+    out.push({ sha, committedAt, subject, body: rest.join(FS) });
+  }
+  return out;
+}
+function findMergeCommitForPr(commits, prNumber) {
+  const re = new RegExp(`(^|\\D)#${prNumber}(\\D|$)`);
+  return commits.find((c) => re.test(c.subject)) ?? null;
+}
+function isReverted(commits, mergeSha) {
+  if (!mergeSha) return false;
+  const short = mergeSha.slice(0, 7);
+  return commits.some(
+    (c) => c.body.includes(`This reverts commit ${mergeSha}`) || c.body.includes(`This reverts commit ${short}`)
+  );
+}
+function outcomeFromCommits(commits, prNumber) {
+  const merge = findMergeCommitForPr(commits, prNumber);
+  if (!merge) return { merged: false, merged_at: null, reverted: false };
+  return {
+    merged: true,
+    merged_at: merge.committedAt || null,
+    reverted: isReverted(commits, merge.sha)
+  };
+}
+async function checkPullRequestOutcome(cwd, prNumber) {
+  try {
+    const { stdout } = await pexec2("git", ["log", "-n", "1000", `--format=${GIT_LOG_FORMAT}`], {
+      cwd,
+      timeout: 4e3,
+      maxBuffer: 16 * 1024 * 1024
+    });
+    return outcomeFromCommits(parseGitLog(stdout), prNumber);
+  } catch {
+    return null;
+  }
+}
+var pexec2, FS, RS, GIT_LOG_FORMAT;
+var init_git_outcome = __esm({
+  "../../packages/parsers/src/git-outcome.ts"() {
+    "use strict";
+    pexec2 = promisify2(execFile2);
+    FS = "";
+    RS = "";
+    GIT_LOG_FORMAT = `%H${FS}%cI${FS}%s${FS}%b${RS}`;
+  }
+});
+
 // ../../packages/core/src/billing.ts
 var MILLION, FREE_INCLUDED_TOKENS, TEAM_INCLUDED_PER_SEAT;
 var init_billing = __esm({
@@ -4540,7 +4596,7 @@ var init_redact_floor = __esm({
         pattern: /(?:sk|pk|rk)_test_[A-Za-z0-9]{24,}/g,
         replacement: "<REDACTED:stripe_test_key>"
       },
-      // Discord bot token (was daemon-sdk-only — the canonical drift example).
+      // Discord bot token (was caught by only one redactor — the canonical drift example).
       {
         name: "discord_token",
         pattern: /[MN][A-Za-z\d]{23}\.[\w-]{6}\.[\w-]{27}/g,
@@ -4938,7 +4994,16 @@ var init_session_metadata = __esm({
       number: external_exports.number().int().positive(),
       url: external_exports.string().max(400).nullable().default(null),
       source: RefSource.default("content"),
-      confidence: external_exports.number().min(0).max(1).default(0.9)
+      confidence: external_exports.number().min(0).max(1).default(0.9),
+      // On-device verified-outcome signals — filled by the parsers' local git-check
+      // (`checkPullRequestOutcome`) when the PR's repo is on disk. `null` = unknown;
+      // the server's CPVO engine classifies verified/failed from these. Mirrors
+      // core's `PullRequestRef` field-for-field.
+      merged: external_exports.boolean().nullable().optional(),
+      merged_at: external_exports.string().max(40).nullable().optional(),
+      reverted: external_exports.boolean().nullable().optional(),
+      hotfixed: external_exports.boolean().nullable().optional(),
+      reopened: external_exports.boolean().nullable().optional()
     });
     CommitRef = external_exports.object({
       /** 7–40 char hex SHA. */
@@ -5135,7 +5200,7 @@ var init_schemas = __esm({
       scripts: external_exports.array(external_exports.object({ token: external_exports.string().max(200), summary: external_exports.string().max(200) })).max(8).default([]),
       /** Extractor confidence in [0, 1]. */
       confidence: external_exports.number().min(0).max(1).default(0),
-      /** Provenance of the extraction, e.g. `shell.v2`. */
+      /** Provenance of the extraction, e.g. `shell.v3`. */
       extractor: external_exports.string().max(40)
     }).strict();
     ToolCallWire = external_exports.object({
@@ -5325,6 +5390,214 @@ var init_src = __esm({
   }
 });
 
+// ../../packages/parsers/src/tool-action/executable.ts
+function splitStatements(command) {
+  const out = [];
+  let cur = "";
+  let single = false;
+  let double = false;
+  for (let i = 0; i < command.length; i++) {
+    const c = command[i];
+    if (single) {
+      cur += c;
+      if (c === "'") single = false;
+      continue;
+    }
+    if (double) {
+      if (c === "\\" && i + 1 < command.length) {
+        cur += c + command[i + 1];
+        i++;
+        continue;
+      }
+      cur += c;
+      if (c === '"') double = false;
+      continue;
+    }
+    if (c === "'") {
+      single = true;
+      cur += c;
+      continue;
+    }
+    if (c === '"') {
+      double = true;
+      cur += c;
+      continue;
+    }
+    if (c === "\\" && i + 1 < command.length) {
+      cur += c + command[i + 1];
+      i++;
+      continue;
+    }
+    if (c === "#" && (cur === "" || /\s$/.test(cur))) {
+      out.push(cur);
+      cur = "";
+      while (i + 1 < command.length && command[i + 1] !== "\n") i++;
+      continue;
+    }
+    if (c === "\n" || c === ";") {
+      out.push(cur);
+      cur = "";
+      continue;
+    }
+    if (c === "&" || c === "|") {
+      out.push(cur);
+      cur = "";
+      if (command[i + 1] === c) i++;
+      continue;
+    }
+    cur += c;
+  }
+  out.push(cur);
+  return out;
+}
+function basename(token) {
+  const parts = token.split("/");
+  return parts[parts.length - 1] ?? token;
+}
+function stripOpener(token) {
+  let t = token;
+  if (t.startsWith("$(")) t = t.slice(2);
+  else if (t.startsWith("(")) t = t.slice(1);
+  if (t.startsWith("`")) t = t.slice(1);
+  return t;
+}
+function substitutionProgram(token) {
+  const rhs = token.slice(token.indexOf("=") + 1);
+  if (rhs.startsWith("$((")) return null;
+  if (rhs.startsWith("$(") || rhs.startsWith("`")) {
+    const inner = stripOpener(rhs);
+    return inner || null;
+  }
+  return null;
+}
+function looksLikeProgram(cand) {
+  if (!PROGRAM.test(cand)) return false;
+  if (/^\d+$/.test(cand)) return false;
+  if ((cand.match(/\./g)?.length ?? 0) >= 2) return false;
+  const lower = cand.toLowerCase();
+  return !DATA_EXTENSIONS.some((ext) => lower.endsWith(ext));
+}
+function scanStatement(stmt) {
+  for (const tok of stmt.split(/\s+/).filter(Boolean)) {
+    let t = tok;
+    if (BRACKETS.has(t) || FUNCTION_DEF.test(t) || WRAPPERS.has(t)) continue;
+    if (ASSIGNMENT.test(t)) {
+      const sub = substitutionProgram(t);
+      if (sub) t = sub;
+      else continue;
+    }
+    const cand = basename(stripOpener(t).replace(/[)"'`;,]+$/, "")).toLowerCase();
+    if (!cand || cand.startsWith("-")) break;
+    if (NOISE_BUILTINS.has(cand)) return { builtin: cand };
+    if (looksLikeProgram(cand)) return { program: cand };
+    break;
+  }
+  return {};
+}
+function extractExecutable(command) {
+  let fallback = null;
+  for (const raw of splitStatements(command)) {
+    const stmt = raw.trim();
+    if (!stmt || stmt.startsWith("#")) continue;
+    const { program, builtin } = scanStatement(stmt);
+    if (program) {
+      return program.length > MAX_EXECUTABLE_CHARS ? OTHER_BUCKET : program;
+    }
+    if (builtin && !fallback) fallback = builtin;
+  }
+  return fallback ?? OTHER_BUCKET;
+}
+var OTHER_BUCKET, MAX_EXECUTABLE_CHARS, WRAPPERS, BRACKETS, NOISE_BUILTINS, DATA_EXTENSIONS, ASSIGNMENT, FUNCTION_DEF, PROGRAM;
+var init_executable = __esm({
+  "../../packages/parsers/src/tool-action/executable.ts"() {
+    "use strict";
+    OTHER_BUCKET = "(other)";
+    MAX_EXECUTABLE_CHARS = 80;
+    WRAPPERS = /* @__PURE__ */ new Set([
+      "sudo",
+      "doas",
+      "env",
+      "command",
+      "exec",
+      "builtin",
+      "nohup",
+      "setsid",
+      "time",
+      "nice",
+      "ionice",
+      "chrt",
+      "stdbuf",
+      "xargs",
+      // control-flow openers that immediately precede a command
+      "then",
+      "do",
+      "else"
+    ]);
+    BRACKETS = /* @__PURE__ */ new Set(["{", "}", "(", ")"]);
+    NOISE_BUILTINS = /* @__PURE__ */ new Set([
+      "cd",
+      "pushd",
+      "popd",
+      "echo",
+      "printf",
+      "export",
+      "unset",
+      "set",
+      "readonly",
+      "typeset",
+      "declare",
+      "local",
+      "alias",
+      "source",
+      ".",
+      "eval",
+      ":",
+      "true",
+      "false",
+      "read",
+      "wait",
+      "trap",
+      "umask",
+      "shift",
+      "return",
+      "getopts",
+      "hash",
+      "let",
+      "test",
+      "[",
+      "[[",
+      // loop / conditional keywords
+      "for",
+      "while",
+      "until",
+      "if",
+      "elif",
+      "fi",
+      "case",
+      "esac",
+      "select",
+      "function",
+      "done"
+    ]);
+    DATA_EXTENSIONS = [
+      ".output",
+      ".txt",
+      ".log",
+      ".json",
+      ".jsonl",
+      ".md",
+      ".csv",
+      ".tmp",
+      ".out",
+      ".git",
+      ".lock"
+    ];
+    ASSIGNMENT = /^[A-Za-z_][A-Za-z0-9_]*=/;
+    FUNCTION_DEF = /^[A-Za-z_][A-Za-z0-9_]*\(\)?$/;
+    PROGRAM = /^[A-Za-z0-9][A-Za-z0-9._+-]*$/;
+  }
+});
+
 // ../../packages/parsers/src/tool-action/scripts.ts
 function detectScriptRefs(command) {
   const refs = [];
@@ -5397,9 +5670,9 @@ function extractToolAction(call) {
   let param_shape = null;
   let command_redacted = null;
   if (command != null) {
-    const [head = "", ...rest] = command.trim().split(/\s+/);
-    executable = basename(head) || null;
-    param_shape = clampChars(paramShape(rest.join(" ")), MAX_FIELD_CHARS) || null;
+    executable = extractExecutable(command);
+    const args = command.trim().split(/\s+/).slice(1).join(" ");
+    param_shape = clampChars(paramShape(args), MAX_FIELD_CHARS) || null;
     command_redacted = clampChars(redact(command, call.cwd ?? void 0).text, MAX_FIELD_CHARS) || null;
   }
   return {
@@ -5414,7 +5687,9 @@ function extractToolAction(call) {
     command_redacted,
     scripts: [],
     confidence: 0,
-    extractor: `${surface}.v1`
+    // Per-surface provenance. shell bumped to v3 (normalized executable, see
+    // `extractExecutable`); builtin/mcp extraction is unchanged → still v1.
+    extractor: `${surface}.${surface === "shell" ? "v3" : "v1"}`
   };
 }
 function extractLocalToolContext(call) {
@@ -5435,14 +5710,13 @@ function shellCommandOf(input) {
   }
   return null;
 }
-function basename(token) {
-  return token.split("/").pop() ?? token;
-}
 var MAX_FIELD_CHARS;
 var init_tool_action = __esm({
   "../../packages/parsers/src/tool-action/index.ts"() {
     "use strict";
     init_src();
+    init_executable();
+    init_executable();
     init_scripts();
     MAX_FIELD_CHARS = 16384;
   }
@@ -8367,11 +8641,11 @@ var init_cursor = __esm({
 });
 
 // ../../packages/parsers/src/discovery/index.ts
-import { execFile as execFile2, execSync } from "child_process";
+import { execFile as execFile3, execSync } from "child_process";
 import { existsSync as existsSync3, statSync } from "fs";
 import { homedir, platform } from "os";
 import { join as join2, resolve as resolve2 } from "path";
-import { promisify as promisify2 } from "util";
+import { promisify as promisify3 } from "util";
 async function discover(options = {}) {
   const os2 = platform() === "darwin" ? "macos" : "linux";
   const skip = new Set(options.skip ?? []);
@@ -8496,7 +8770,7 @@ function classifyInstallMethod(binPath, os2) {
 }
 async function safeVersionProbe(binPath) {
   try {
-    const { stdout } = await pexec2(binPath, ["--version"], { timeout: 1500 });
+    const { stdout } = await pexec3(binPath, ["--version"], { timeout: 1500 });
     return stdout.trim().split(/\s+/).pop() ?? null;
   } catch {
     return null;
@@ -8701,11 +8975,11 @@ function dedupeIdentities(list) {
   }
   return Array.from(seen.values());
 }
-var pexec2, H, SOURCES;
+var pexec3, H, SOURCES;
 var init_discovery = __esm({
   "../../packages/parsers/src/discovery/index.ts"() {
     "use strict";
-    pexec2 = promisify2(execFile2);
+    pexec3 = promisify3(execFile3);
     H = (p) => p.startsWith("~") ? p.replace("~", homedir()) : p;
     SOURCES = [
       {
@@ -8797,6 +9071,7 @@ var init_src2 = __esm({
     "use strict";
     init_types();
     init_git();
+    init_git_outcome();
     init_tool_action();
     init_claude_code();
     init_codex();
@@ -21668,7 +21943,7 @@ var require_mock_interceptor = __commonJS({
 var require_mock_client = __commonJS({
   "../../node_modules/.pnpm/undici@7.25.0/node_modules/undici/lib/mock/mock-client.js"(exports, module) {
     "use strict";
-    var { promisify: promisify4 } = __require("util");
+    var { promisify: promisify5 } = __require("util");
     var Client = require_client();
     var { buildMockDispatch } = require_mock_utils();
     var {
@@ -21716,7 +21991,7 @@ var require_mock_client = __commonJS({
         this[kDispatches] = [];
       }
       async [kClose]() {
-        await promisify4(this[kOriginalClose])();
+        await promisify5(this[kOriginalClose])();
         this[kConnected] = 0;
         this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
       }
@@ -21929,7 +22204,7 @@ var require_mock_call_history = __commonJS({
 var require_mock_pool = __commonJS({
   "../../node_modules/.pnpm/undici@7.25.0/node_modules/undici/lib/mock/mock-pool.js"(exports, module) {
     "use strict";
-    var { promisify: promisify4 } = __require("util");
+    var { promisify: promisify5 } = __require("util");
     var Pool = require_pool();
     var { buildMockDispatch } = require_mock_utils();
     var {
@@ -21977,7 +22252,7 @@ var require_mock_pool = __commonJS({
         this[kDispatches] = [];
       }
       async [kClose]() {
-        await promisify4(this[kOriginalClose])();
+        await promisify5(this[kOriginalClose])();
         this[kConnected] = 0;
         this[kMockAgent][Symbols.kClients].delete(this[kOrigin]);
       }
@@ -34612,25 +34887,25 @@ var init_constants2 = __esm({
 
 // ../../node_modules/.pnpm/stubborn-fs@2.0.0/node_modules/stubborn-fs/dist/index.js
 import fs from "fs";
-import { promisify as promisify3 } from "util";
-var FS, dist_default;
+import { promisify as promisify4 } from "util";
+var FS2, dist_default;
 var init_dist2 = __esm({
   "../../node_modules/.pnpm/stubborn-fs@2.0.0/node_modules/stubborn-fs/dist/index.js"() {
     "use strict";
     init_dist();
     init_dist();
     init_constants2();
-    FS = {
+    FS2 = {
       attempt: {
         /* ASYNC */
-        chmod: attemptify_async_default(promisify3(fs.chmod), ATTEMPTIFY_CHANGE_ERROR_OPTIONS),
-        chown: attemptify_async_default(promisify3(fs.chown), ATTEMPTIFY_CHANGE_ERROR_OPTIONS),
-        close: attemptify_async_default(promisify3(fs.close), ATTEMPTIFY_NOOP_OPTIONS),
-        fsync: attemptify_async_default(promisify3(fs.fsync), ATTEMPTIFY_NOOP_OPTIONS),
-        mkdir: attemptify_async_default(promisify3(fs.mkdir), ATTEMPTIFY_NOOP_OPTIONS),
-        realpath: attemptify_async_default(promisify3(fs.realpath), ATTEMPTIFY_NOOP_OPTIONS),
-        stat: attemptify_async_default(promisify3(fs.stat), ATTEMPTIFY_NOOP_OPTIONS),
-        unlink: attemptify_async_default(promisify3(fs.unlink), ATTEMPTIFY_NOOP_OPTIONS),
+        chmod: attemptify_async_default(promisify4(fs.chmod), ATTEMPTIFY_CHANGE_ERROR_OPTIONS),
+        chown: attemptify_async_default(promisify4(fs.chown), ATTEMPTIFY_CHANGE_ERROR_OPTIONS),
+        close: attemptify_async_default(promisify4(fs.close), ATTEMPTIFY_NOOP_OPTIONS),
+        fsync: attemptify_async_default(promisify4(fs.fsync), ATTEMPTIFY_NOOP_OPTIONS),
+        mkdir: attemptify_async_default(promisify4(fs.mkdir), ATTEMPTIFY_NOOP_OPTIONS),
+        realpath: attemptify_async_default(promisify4(fs.realpath), ATTEMPTIFY_NOOP_OPTIONS),
+        stat: attemptify_async_default(promisify4(fs.stat), ATTEMPTIFY_NOOP_OPTIONS),
+        unlink: attemptify_async_default(promisify4(fs.unlink), ATTEMPTIFY_NOOP_OPTIONS),
         /* SYNC */
         chmodSync: attemptify_sync_default(fs.chmodSync, ATTEMPTIFY_CHANGE_ERROR_OPTIONS),
         chownSync: attemptify_sync_default(fs.chownSync, ATTEMPTIFY_CHANGE_ERROR_OPTIONS),
@@ -34644,14 +34919,14 @@ var init_dist2 = __esm({
       },
       retry: {
         /* ASYNC */
-        close: retryify_async_default(promisify3(fs.close), RETRYIFY_OPTIONS),
-        fsync: retryify_async_default(promisify3(fs.fsync), RETRYIFY_OPTIONS),
-        open: retryify_async_default(promisify3(fs.open), RETRYIFY_OPTIONS),
-        readFile: retryify_async_default(promisify3(fs.readFile), RETRYIFY_OPTIONS),
-        rename: retryify_async_default(promisify3(fs.rename), RETRYIFY_OPTIONS),
-        stat: retryify_async_default(promisify3(fs.stat), RETRYIFY_OPTIONS),
-        write: retryify_async_default(promisify3(fs.write), RETRYIFY_OPTIONS),
-        writeFile: retryify_async_default(promisify3(fs.writeFile), RETRYIFY_OPTIONS),
+        close: retryify_async_default(promisify4(fs.close), RETRYIFY_OPTIONS),
+        fsync: retryify_async_default(promisify4(fs.fsync), RETRYIFY_OPTIONS),
+        open: retryify_async_default(promisify4(fs.open), RETRYIFY_OPTIONS),
+        readFile: retryify_async_default(promisify4(fs.readFile), RETRYIFY_OPTIONS),
+        rename: retryify_async_default(promisify4(fs.rename), RETRYIFY_OPTIONS),
+        stat: retryify_async_default(promisify4(fs.stat), RETRYIFY_OPTIONS),
+        write: retryify_async_default(promisify4(fs.write), RETRYIFY_OPTIONS),
+        writeFile: retryify_async_default(promisify4(fs.writeFile), RETRYIFY_OPTIONS),
         /* SYNC */
         closeSync: retryify_sync_default(fs.closeSync, RETRYIFY_OPTIONS),
         fsyncSync: retryify_sync_default(fs.fsyncSync, RETRYIFY_OPTIONS),
@@ -34663,7 +34938,7 @@ var init_dist2 = __esm({
         writeFileSync: retryify_sync_default(fs.writeFileSync, RETRYIFY_OPTIONS)
       }
     };
-    dist_default = FS;
+    dist_default = FS2;
   }
 });
 
@@ -45914,6 +46189,7 @@ async function buildSessionMetadata(segments, events, opts = {}) {
       const evs = eventsBySession.get(sessionId) ?? [];
       const segs = segsBySession.get(sessionId) ?? [];
       const parts = [];
+      const slugToCwd = /* @__PURE__ */ new Map();
       const cwds = /* @__PURE__ */ new Set();
       for (const e of evs) {
         if (e.cwd) cwds.add(e.cwd);
@@ -45948,6 +46224,7 @@ async function buildSessionMetadata(segments, events, opts = {}) {
             g = null;
           }
           if (!g?.remote_slug) continue;
+          slugToCwd.set(g.remote_slug.toLowerCase(), cwd);
           const refs = emptyDetectedRefs();
           refs.repos.push({
             host: g.remote_host ?? null,
@@ -45977,6 +46254,21 @@ async function buildSessionMetadata(segments, events, opts = {}) {
         }
       }
       const meta = dedupeSessionMetadata(parts);
+      if (opts.checkPrOutcome && meta.pull_requests.length > 0) {
+        for (const pr of meta.pull_requests) {
+          const cwd = pr.slug ? slugToCwd.get(pr.slug.toLowerCase()) : void 0;
+          if (!cwd) continue;
+          try {
+            const o = await opts.checkPrOutcome(cwd, pr.number);
+            if (o) {
+              pr.merged = o.merged;
+              pr.merged_at = o.merged_at;
+              pr.reverted = o.reverted;
+            }
+          } catch {
+          }
+        }
+      }
       if (!isEmptySessionMetadata(meta)) out[sessionId] = meta;
     } catch {
     }
@@ -47245,7 +47537,8 @@ async function buildSessionMetadata2(segments, events) {
   const a = await getAdapters();
   return buildSessionMetadata(segments, events, {
     resolveGit: resolveGitContext,
-    extractLinks: a.extractLinks
+    extractLinks: a.extractLinks,
+    checkPrOutcome: checkPullRequestOutcome
   });
 }
 async function enrichScripts(drafts, contexts = []) {
@@ -47489,7 +47782,7 @@ var init_scan = __esm({
     init_api();
     init_config2();
     init_pipeline2();
-    DAEMON_VERSION = true ? "daemon-0.2.0" : "daemon-dev";
+    DAEMON_VERSION = true ? "daemon-0.3.1" : "daemon-dev";
     BATCH_MAX_EVENTS = INGEST_BATCH_MAX_EVENTS;
     BATCH_MAX_TOOL_CALLS = 2e4;
     BATCH_BUFFER_HARD_CAP = BATCH_MAX_EVENTS * 2;
@@ -49999,7 +50292,7 @@ var init_daemon = __esm({
     init_machine_key();
     init_scan();
     init_single_flight();
-    DAEMON_VERSION2 = true ? "daemon-0.2.0" : "daemon-dev";
+    DAEMON_VERSION2 = true ? "daemon-0.3.1" : "daemon-dev";
     HEARTBEAT_INTERVAL_MS = 1e4;
     SCAN_INTERVAL_MS = 5 * 60 * 1e3;
     DISCOVERY_INTERVAL_MS = 6e4;
@@ -50601,7 +50894,7 @@ function tryOpenBrowser(url) {
     return false;
   }
 }
-var DAEMON_VERSION3 = true ? "daemon-0.2.0" : "daemon-dev";
+var DAEMON_VERSION3 = true ? "daemon-0.3.1" : "daemon-dev";
 function osFamily() {
   const p = platform5();
   if (p === "darwin") return "macos";