@inerrata-corporation/errata 2.0.2-dev.866 → 2.0.2-dev.873

package/errata.mjs

@@ -15485,9 +15485,17 @@ function substituteSymbolSummaries(text, summaryByToken) {
   let out2 = text;
   let substituted = 0;
   for (const key of present) {
-    const re = new RegExp(`(?<![A-Za-z0-9_$.])${escapeRe2(key)}(?![A-Za-z0-9_$])`, "g");
+    const phrase = summaryByToken.get(key);
+    const leadsWithArticle = RE_LEADING_ARTICLE.test(phrase);
+    const re = new RegExp(
+      `(?<![A-Za-z0-9_$.])${leadsWithArticle ? String.raw`(?:(An|an|A|a|The|the)\s+)?` : ""}${escapeRe2(key)}(?![A-Za-z0-9_$])`,
+      "g"
+    );
     const before = out2;
-    out2 = out2.replace(re, summaryByToken.get(key));
+    out2 = leadsWithArticle ? out2.replace(
+      re,
+      (_m, article) => article !== void 0 && /^[A-Z]/.test(article) ? phrase.charAt(0).toUpperCase() + phrase.slice(1) : phrase
+    ) : out2.replace(re, phrase);
     if (out2 !== before) substituted++;
   }
   return { text: out2, substituted, offered: summaryByToken.size };
@@ -15504,7 +15512,7 @@ function vetSidecarSummaries(sidecar) {
   }
   return clean.size > 0 ? clean : null;
 }
-var SYMBOL_SUMMARY_KINDS, MAX_SYMBOL_SUMMARY_CHARS, MAX_SIDECAR_SYMBOLS, TOKEN_RE2, RE_RESERVED, escapeRe2, PATH_SHAPE_RE, CONTRACTION_RE, QUOTED_LITERAL_RE;
+var SYMBOL_SUMMARY_KINDS, MAX_SYMBOL_SUMMARY_CHARS, MAX_SIDECAR_SYMBOLS, TOKEN_RE2, RE_RESERVED, escapeRe2, RE_LEADING_ARTICLE, PATH_SHAPE_RE, CONTRACTION_RE, QUOTED_LITERAL_RE;
 var init_symbol_intent = __esm({
   "../../packages/shared/src/symbol-intent.ts"() {
     "use strict";
@@ -15520,6 +15528,7 @@ var init_symbol_intent = __esm({
     TOKEN_RE2 = /[A-Za-z_$][A-Za-z0-9_$]*(?:\.[A-Za-z_$][A-Za-z0-9_$]*)*/g;
     RE_RESERVED = /[.*+?^${}()|[\]\\]/g;
     escapeRe2 = (s) => s.replace(RE_RESERVED, "\\$&");
+    RE_LEADING_ARTICLE = /^(?:an?|the)\s/i;
     PATH_SHAPE_RE = /[\w.~-]+[/\\][\w.$~-]+/;
     CONTRACTION_RE = /([A-Za-z])'([A-Za-z])/g;
     QUOTED_LITERAL_RE = /"[^"]+"|'[^']+'|`[^`]+`/;
@@ -16006,6 +16015,7 @@ __export(src_exports, {
   PROJECT_ONLY_NODE_LABELS: () => PROJECT_ONLY_NODE_LABELS,
   QUARANTINE_EXTRACTION_SOURCE_PREFIX: () => QUARANTINE_EXTRACTION_SOURCE_PREFIX,
   RESOLUTION_EDGES: () => RESOLUTION_EDGES,
+  RE_LEADING_ARTICLE: () => RE_LEADING_ARTICLE,
   RouteContextCountWireSchema: () => RouteContextCountWireSchema,
   SEMANTIC_NODE_LABELS: () => SEMANTIC_NODE_LABELS,
   SOLUTION_STRUCTURE_EDGES: () => SOLUTION_STRUCTURE_EDGES,
@@ -21172,7 +21182,7 @@ function triageOf(l2, q, mathOpts) {
   if (!triage) return { triage: "", presenting: presentingId, routes: [] };
   const seen = triage.attrs["perContextSeen"] ?? {};
   const buckets = q.context ? triageContextBuckets(canonicalizeContext(q.context)) : [];
-  const active = new Set(q.activeProblemIds ?? []);
+  const active2 = new Set(q.activeProblemIds ?? []);
   const routes = [];
   for (const e of l2.outEdges(triageId, [...ROUTE_EDGE_TYPES])) {
     const perContext = e.attrs["perContext"] ?? {};
@@ -21193,13 +21203,13 @@ function triageOf(l2, q, mathOpts) {
     }
     const post = triagePosterior(counts, buckets, mathOpts);
     let probability = post.probability;
-    if (active.size > 0) {
+    if (active2.size > 0) {
       const neighbors = /* @__PURE__ */ new Set([
         ...l2.outEdges(e.to).map((x) => x.to),
         ...l2.inEdges(e.to).map((x) => x.from)
       ]);
       let hits = 0;
-      for (const id of active) if (neighbors.has(id)) hits++;
+      for (const id of active2) if (neighbors.has(id)) hits++;
       if (hits > 0) probability = Math.min(1, probability * (1 + COOCCUR_BONUS * Math.tanh(hits)));
     }
     const cause = l2.getNode(e.to);
@@ -28402,7 +28412,7 @@ function buildSymbolLexicon(store) {
   return lex;
 }
 function replaceWithPhrase(text, before, escapedKey, after, phrase) {
-  if (!RE_LEADING_ARTICLE.test(phrase)) {
+  if (!RE_LEADING_ARTICLE2.test(phrase)) {
     return text.replace(new RegExp(`${before}${escapedKey}${after}`, "g"), phrase);
   }
   const re = new RegExp(`${before}${String.raw`(?:(An|an|A|a|The|the)\s+)?`}${escapedKey}${after}`, "g");
@@ -28560,7 +28570,7 @@ function generalizeSymbols(text, lexicon, level = 1, fileLexicon) {
   }
   return generalize(out2, { level }).text;
 }
-var SYMBOL_LABELS2, KIND_PHRASE, BUILTIN_TYPE_NAMES, DOC_COMMENT_KINDS, MAX_DOC_CHARS, RE_RESERVED2, escapeRe4, RE_LEADING_ARTICLE, CONVENTION_FILENAMES, CONVENTION_BASENAME_MIN_FILES, CONVENTION_STEMS, FILE_TOKEN_RE, STEM_TOKEN_RE, SOURCE_EXTENSIONS, TOKEN_RE3;
+var SYMBOL_LABELS2, KIND_PHRASE, BUILTIN_TYPE_NAMES, DOC_COMMENT_KINDS, MAX_DOC_CHARS, RE_RESERVED2, escapeRe4, RE_LEADING_ARTICLE2, CONVENTION_FILENAMES, CONVENTION_BASENAME_MIN_FILES, CONVENTION_STEMS, FILE_TOKEN_RE, STEM_TOKEN_RE, SOURCE_EXTENSIONS, TOKEN_RE3;
 var init_generalize_graph = __esm({
   "src/generalize-graph.ts"() {
     "use strict";
@@ -28612,7 +28622,7 @@ var init_generalize_graph = __esm({
     MAX_DOC_CHARS = 600;
     RE_RESERVED2 = /[.*+?^${}()|[\]\\]/g;
     escapeRe4 = (s) => s.replace(RE_RESERVED2, "\\$&");
-    RE_LEADING_ARTICLE = /^(?:an?|the)\s/i;
+    RE_LEADING_ARTICLE2 = /^(?:an?|the)\s/i;
     CONVENTION_FILENAMES = /* @__PURE__ */ new Set([
       "package.json",
       "package-lock.json",
@@ -56074,30 +56084,34 @@ function createLivenessWatch(deps) {
 // src/loop-lag.ts
 var HEARTBEAT_MS = 500;
 var RECENT_PASS_LIMIT = 12;
-var currentPass = "idle";
-var currentPassStartedAt = null;
+var active = /* @__PURE__ */ new Map();
+var nextPassId = 1;
 var started = false;
 var recent = [];
 function markPass(name2) {
-  const prev = currentPass;
-  const prevStart = currentPassStartedAt;
+  const id = nextPassId++;
   const startedAt = Date.now();
-  currentPass = name2;
-  currentPassStartedAt = startedAt;
-  let restored = false;
+  active.set(id, { name: name2, startedAt });
+  let ended = false;
   return () => {
-    if (restored) return;
-    restored = true;
+    if (ended) return;
+    ended = true;
+    active.delete(id);
     recent.unshift({ name: name2, ms: Date.now() - startedAt, endedAt: Date.now() });
     if (recent.length > RECENT_PASS_LIMIT) recent.pop();
-    currentPass = prev;
-    currentPassStartedAt = prevStart;
   };
 }
+function oldestActive() {
+  for (const p of active.values()) return p;
+  return null;
+}
 function passState() {
+  const now = Date.now();
+  const oldest = oldestActive();
   return {
-    current: currentPass,
-    runningMs: currentPassStartedAt === null ? null : Date.now() - currentPassStartedAt,
+    current: oldest?.name ?? "idle",
+    runningMs: oldest === null ? null : now - oldest.startedAt,
+    active: [...active.values()].map((p) => ({ name: p.name, runningMs: now - p.startedAt })),
     recent: [...recent]
   };
 }
@@ -56109,8 +56123,10 @@ function startLoopLagMonitor(thresholdMs = 1e3) {
     const now = Date.now();
     const lag = now - last - HEARTBEAT_MS;
     if (lag > thresholdMs) {
+      const holders = [...active.values()];
+      const who = holders.length === 0 ? "idle" : holders.map((p) => `${p.name} +${((now - p.startedAt) / 1e3).toFixed(1)}s`).join(" | ");
       console.warn(
-        `[loop-lag] ${(/* @__PURE__ */ new Date()).toISOString()} event loop held ~${(lag / 1e3).toFixed(1)}s during "${currentPass}"`
+        `[loop-lag] ${(/* @__PURE__ */ new Date()).toISOString()} event loop held ~${(lag / 1e3).toFixed(1)}s during "${who}"`
       );
     }
     last = now;
@@ -56139,7 +56155,7 @@ function watchCensusLine(c = watchCensus()) {
 }
 
 // src/engine.ts
-var DAEMON_VERSION = true ? "2.0.2-dev.866" : "2.0.0-alpha.0";
+var DAEMON_VERSION = true ? "2.0.2-dev.873" : "2.0.0-alpha.0";
 var IGNORED_PATH = /[\\/](?:\.git|node_modules|\.errata|\.claude|\.codex|\.cursor|\.turbo|\.next|dist|coverage|test-results|playwright-report|__pycache__)(?:[\\/]|$)/;
 var IGNORED_NOISE = /castalia\.db|eventlog\.sqlite|turn-cursors/;
 var GIT_OP_MUTE_MS = 4e3;
@@ -60665,18 +60681,18 @@ async function runUse(action, ctx) {
   }
 }
 function runClear(ctx) {
-  const active = ctx.getActiveAgent();
+  const active2 = ctx.getActiveAgent();
   ctx.clearActiveAgent();
-  if (active) {
-    ctx.log(`no longer acting as ${active.handle} \u2014 the daemon acts as your default identity`);
+  if (active2) {
+    ctx.log(`no longer acting as ${active2.handle} \u2014 the daemon acts as your default identity`);
   } else {
     ctx.log(`already on the default identity \u2014 nothing to clear`);
   }
   return 0;
 }
 async function runShow(ctx) {
-  const active = ctx.getActiveAgent();
-  ctx.log(active ? `active agent: ${active.handle} (id ${active.id})` : `active agent: (default identity)`);
+  const active2 = ctx.getActiveAgent();
+  ctx.log(active2 ? `active agent: ${active2.handle} (id ${active2.id})` : `active agent: (default identity)`);
   if (!ctx.loggedIn) {
     ctx.log(`  log in to list the agents you can act as:  errata login`);
     return 0;
@@ -60688,7 +60704,7 @@ async function runShow(ctx) {
     ctx.log(`  couldn't list actable agents: ${errText(err2)}`);
     return 1;
   }
-  printActable(resp, active, ctx);
+  printActable(resp, active2, ctx);
   return 0;
 }
 async function runSet(handle2, ctx) {
@@ -60717,7 +60733,7 @@ async function runSet(handle2, ctx) {
   ctx.log(`now acting as ${match2.handle} (id ${match2.id}) \u2014 saved; persists across daemon restarts`);
   return 0;
 }
-function printActable(resp, active, ctx) {
+function printActable(resp, active2, ctx) {
   if (resp.agents.length === 0) {
     ctx.log(`  (no agents you can act as)`);
     return;
@@ -60725,7 +60741,7 @@ function printActable(resp, active, ctx) {
   ctx.log(`  agents you can act as:`);
   for (const a of resp.agents) {
     const marks = [];
-    if (active && a.id === active.id) marks.push("active");
+    if (active2 && a.id === active2.id) marks.push("active");
     if (a.id === resp.defaultAgentId) marks.push("default");
     const suffix = marks.length ? `  (${marks.join(", ")})` : "";
     const scope = a.scope ? ` \xB7 ${a.scope}` : "";
@@ -61866,8 +61882,10 @@ async function cmdStatus() {
         const h = await res.json();
         if (h.pass) {
           const held = h.pass.runningMs !== null && h.pass.current !== "idle" ? ` (${(h.pass.runningMs / 1e3).toFixed(1)}s)` : "";
+          const alsoCount = Math.max(0, (h.pass.active?.length ?? 0) - 1);
+          const also = alsoCount > 0 ? ` +${alsoCount} concurrent` : "";
           const last = (h.pass.recent ?? []).slice(0, 3).map((p) => `${p.name} ${(p.ms / 1e3).toFixed(1)}s`).join(", ");
-          console.log(`  pass:      ${h.pass.current}${held}${last ? ` \xB7 recent: ${last}` : ""}`);
+          console.log(`  pass:      ${h.pass.current}${held}${also}${last ? ` \xB7 recent: ${last}` : ""}`);
         }
         if (h.watch) {
           const line = watchCensusLine(h.watch);
@@ -61896,9 +61914,9 @@ async function cmdStatus() {
   } else {
     console.log(`    logged in: yes (${cfg.email}) \u2014 key capability enforced by Console installation/scopes`);
   }
-  const active = getActiveAgent(cfg);
+  const active2 = getActiveAgent(cfg);
   console.log(
-    `    active agent: ${active ? `${active.handle} (acting-as; \`errata use --none\` to clear)` : "default identity"}`
+    `    active agent: ${active2 ? `${active2.handle} (acting-as; \`errata use --none\` to clear)` : "default identity"}`
   );
   const inspection = await inspectCloudEndpoint(cfg.cloudUrl);
   const decision = evaluateCloudEndpoint(cfg.cloudUrl, inspection);
@@ -62018,8 +62036,8 @@ async function cmdWhoami(args2) {
     return;
   }
   try {
-    const active = getActiveAgent(cfg);
-    const response = await resolveWhoami(authedCloudClient(cfg), active?.handle ?? null);
+    const active2 = getActiveAgent(cfg);
+    const response = await resolveWhoami(authedCloudClient(cfg), active2?.handle ?? null);
     if (args2.includes("--json")) {
       console.log(JSON.stringify(response, null, 2));
       return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inerrata-corporation/errata",
-  "version": "2.0.2-dev.866",
+  "version": "2.0.2-dev.873",
   "description": "errata - local-first observation engine for AI coding agents",
   "type": "module",
   "bin": {