@oxagen/cli 2.1.5-76 → 2.1.5-88

package/oxagen.mjs

@@ -6276,7 +6276,11 @@ var init_wire = __esm({
        * first model call, by digesting its remote and looking for the digest
        * in `bound_remote_digests`: every repository the organization bound,
        * in any workspace, each as its canonical digest and its folded digest
-       * (`canonicalRemote` and `foldedRemote` in `remote.ts`).
+       * (`canonicalRemote` and `foldedRemote` in `remote.ts`). An organisation
+       * with more than fit under the cap gets a list cut to it, the host
+       * workspace's repositories first, and a repository the cut left out is
+       * asked about like an unbound one (#4439). The list is never dropped,
+       * because an absent clause asks nothing.
        *
        * `link` carries what the link path would apply, for the question the
        * host shows. `timeout_ms` is how long the host waits before it answers
@@ -12118,6 +12122,48 @@ var init_frame_body = __esm({
   }
 });
 
+// ../../packages/tacho/src/claude-code/prompt-issue-refs.ts
+function issueNumber(text5) {
+  const n2 = Number(text5);
+  return Number.isSafeInteger(n2) && n2 > 0 ? n2 : void 0;
+}
+function promptIssueRefs(prompt) {
+  const found = [];
+  const rest = prompt.replace(ISSUE_URL2, (whole, owner, repo, num, at2) => {
+    const n2 = issueNumber(num);
+    if (n2 !== void 0) found.push({ at: at2, ref: `${owner}/${repo}#${n2}` });
+    return " ".repeat(whole.length);
+  });
+  for (const match of rest.matchAll(REPO_REF)) {
+    const n2 = issueNumber(match[3]);
+    if (n2 !== void 0)
+      found.push({ at: match.index, ref: `${match[1]}/${match[2]}#${n2}` });
+  }
+  for (const match of rest.matchAll(BARE_REF)) {
+    const n2 = issueNumber(match[1]);
+    if (n2 !== void 0) found.push({ at: match.index, ref: `#${n2}` });
+  }
+  found.sort((a, b3) => a.at - b3.at);
+  const refs = [];
+  for (const { ref: ref2 } of found) {
+    if (refs.length === PROMPT_ISSUE_REFS_MAX) break;
+    if (!refs.some((seen) => seen.toLowerCase() === ref2.toLowerCase()))
+      refs.push(ref2);
+  }
+  return refs;
+}
+var PROMPT_ISSUE_REFS_ATTR, PROMPT_ISSUE_REFS_MAX, ISSUE_URL2, REPO_REF, BARE_REF;
+var init_prompt_issue_refs = __esm({
+  "../../packages/tacho/src/claude-code/prompt-issue-refs.ts"() {
+    "use strict";
+    PROMPT_ISSUE_REFS_ATTR = "prompt.issue_refs";
+    PROMPT_ISSUE_REFS_MAX = 10;
+    ISSUE_URL2 = /https?:\/\/(?:www\.)?github\.com\/([A-Za-z0-9_.-]+)\/([A-Za-z0-9_.-]+)\/issues\/(\d+)(?![\w-])/gi;
+    REPO_REF = /(?<![\w./-])([A-Za-z0-9][A-Za-z0-9-]*)\/([A-Za-z0-9_.-]+)#(\d+)(?![\w-])/g;
+    BARE_REF = /(?<![\w/&#-])#(\d+)(?![\w-])/g;
+  }
+});
+
 // ../../packages/tacho/src/claude-code/hooks.ts
 function kindOf(value) {
   if (value === null) return "null";
@@ -12320,14 +12366,17 @@ function normalizeHook(raw, env, options) {
         } : {}
       };
       const kind = input.hook_event_name === "UserPromptSubmit" ? "turn_start" : "oxagen:message";
+      const issueRefs = kind === "turn_start" && prompt !== void 0 && workOrderIdOf(env[WORK_ORDER_ENV]) === void 0 ? promptIssueRefs(prompt) : [];
       return [
-        draft(
-          kind,
-          body2,
-          prompt !== void 0 ? {
-            content: textContent(prompt)
+        draft(kind, body2, {
+          ...prompt !== void 0 ? { content: textContent(prompt) } : {},
+          ...issueRefs.length > 0 ? {
+            attrs: {
+              ...base2.attrs,
+              [PROMPT_ISSUE_REFS_ATTR]: issueRefs.join(" ")
+            }
           } : {}
-        )
+        })
       ];
     }
     case "PreToolUse": {
@@ -12711,6 +12760,7 @@ var init_hooks = __esm({
     init_ids();
     init_frame_body();
     init_wire();
+    init_prompt_issue_refs();
     init_context();
     init_payload_members();
     init_github_text();
@@ -26672,7 +26722,7 @@ import { readFileSync as readFileSync10 } from "node:fs";
 import { dirname as dirname9, resolve as resolve3 } from "node:path";
 import { fileURLToPath } from "node:url";
 function readVersion() {
-  if (true) return "2.1.5-76";
+  if (true) return "2.1.5-88";
   try {
     const here = dirname9(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(
@@ -46233,7 +46283,7 @@ function createGitLane(deps) {
         reconciledHeads.delete(sessionUuid2);
     }
   }
-  function putBack(read2) {
+  function putBack2(read2) {
     const sessionUuid2 = read2.session.recorder.sessionUuid;
     if (read2.priorReconcileAt === void 0)
       lastReconcileAt.delete(sessionUuid2);
@@ -46269,7 +46319,7 @@ function createGitLane(deps) {
             force: true,
             reconcile: item.due
           });
-        for (const rest of found.slice(index + 1)) putBack(rest);
+        for (const rest of found.slice(index + 1)) putBack2(rest);
         throw error;
       }
     }
@@ -46310,7 +46360,7 @@ function createGitLane(deps) {
         priorReconcileAt: last
       });
     } catch (error) {
-      putBack({ session, due, priorReconcileAt: last });
+      putBack2({ session, due, priorReconcileAt: last });
       throw error;
     }
   }
@@ -46745,7 +46795,7 @@ var init_reflection_ask = __esm({
 });
 
 // ../../packages/tacho/src/interjection.ts
-var digest3, timestamp, count5, configVersion, workspaceSlug, interjectionKeySchema, INTERJECTION_RECEIPT_ID_PATTERN, INTERJECTION_QUESTION_MAX, INTERJECTION_PATHS, INTERJECTION_ANSWER_SOURCES, SKILLS_RESOLVED_REASONS, repoUnknownBodySchema, interjectLinkPathSchema, interjectCreatePathSchema, interjectBodySchema, answerBodySchema, repoBoundBodySchema, workspaceCreatedBodySchema, skillsResolvedBodySchema, interjectionAnswerPayloadSchema;
+var digest3, timestamp, count5, configVersion, workspaceSlug, interjectionKeySchema, INTERJECTION_RECEIPT_ID_PATTERN, INTERJECTION_QUESTION_MAX, INTERJECTION_PATHS, INTERJECTION_ANSWER_SOURCES, SKILLS_RESOLVED_REASONS, repoUnknownBodySchema, interjectLinkPathSchema, interjectCreatePathSchema, INTERJECT_PROVIDERS, interjectBodySchema, answerBodySchema, repoBoundBodySchema, workspaceCreatedBodySchema, skillsResolvedBodySchema, interjectionAnswerPayloadSchema;
 var init_interjection = __esm({
   "../../packages/tacho/src/interjection.ts"() {
     "use strict";
@@ -46796,6 +46846,7 @@ var init_interjection = __esm({
       proposed_slug: workspaceSlug.nullable(),
       skills_enabled: external_exports.literal(false)
     }).strict();
+    INTERJECT_PROVIDERS = ["github", "gitlab"];
     interjectBodySchema = external_exports.object({
       interjection_key: interjectionKeySchema,
       reason: external_exports.literal("repo_unknown"),
@@ -46809,7 +46860,16 @@ var init_interjection = __esm({
       /** What the timeout answers. */
       on_timeout: external_exports.literal("deny"),
       /** The two paths a person can take, link first. Deny needs no path. */
-      paths: external_exports.tuple([interjectLinkPathSchema, interjectCreatePathSchema])
+      paths: external_exports.tuple([interjectLinkPathSchema, interjectCreatePathSchema]),
+      /**
+       * The forge the remote's host names (#4439): `github` for github.com and
+       * `gitlab` for gitlab.com. Absent for any other host, and from a host
+       * built before the field, which the control plane reads as GitHub. The
+       * host string itself stays on the machine. A GitLab project binds through
+       * its own project access token, so the control plane offers no link for
+       * a `gitlab` question.
+       */
+      provider: external_exports.enum(INTERJECT_PROVIDERS).optional()
     }).strict();
     answerBodySchema = external_exports.object({
       interjection_key: interjectionKeySchema,
@@ -46898,6 +46958,12 @@ function proposedSlug(name) {
   const slug = name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+/, "").slice(0, SLUG_MAX).replace(/-+$/, "");
   return slug.length >= SLUG_MIN && SLUG_PATTERN.test(slug) ? slug : null;
 }
+function providerOf(canonical3) {
+  const host = canonical3.slice(0, canonical3.indexOf("/")).toLowerCase();
+  if (host === "github.com") return "github";
+  if (host === "gitlab.com") return "gitlab";
+  return void 0;
+}
 function prepareInterjection(record, clause, remote, now) {
   const key = ulid(now);
   const question = interjectionQuestion(clause, record.harness);
@@ -46934,7 +47000,8 @@ function prepareInterjection(record, clause, remote, now) {
         proposed_slug: name === null ? null : proposedSlug(name),
         skills_enabled: false
       }
-    ]
+    ],
+    ...providerOf(remote.canonical) === void 0 ? {} : { provider: providerOf(remote.canonical) }
   });
   if (!unknown2.success || !interject.success) return void 0;
   return {
@@ -46964,6 +47031,8 @@ function sealInterjection(record, pending, fields) {
 function expireInterjection(record, now, fields) {
   const held = record.control.interjection;
   if (held === void 0 || Date.parse(held.expiresAt) > now) return void 0;
+  expiredByHook.set(record, held);
+  putBack.delete(held);
   return settle(
     record,
     held,
@@ -46972,6 +47041,18 @@ function expireInterjection(record, now, fields) {
     fields
   );
 }
+function restoreExpiredInterjection(record, held) {
+  if (held === void 0 || record.control.interjection !== void 0 || expiredByHook.get(record) !== held)
+    return false;
+  record.control.interjection = held;
+  expiredByHook.delete(record);
+  putBack.add(held);
+  return true;
+}
+function heldQuestionWasPutBack(record) {
+  const held = record.control.interjection;
+  return held !== void 0 && putBack.has(held);
+}
 function interjectionAnswerOf(payload) {
   const parsed2 = interjectionAnswerPayloadSchema.safeParse(
     payload["interjection"]
@@ -47045,7 +47126,7 @@ function settle(record, held, answer, payload, fields) {
   record.control.interjection = void 0;
   return events;
 }
-var SLUG_PATTERN, SLUG_MIN, SLUG_MAX, NAME_MAX2, INTERJECTION_OPEN, INTERJECTION_TIMED_OUT_TEXT;
+var SLUG_PATTERN, SLUG_MIN, SLUG_MAX, NAME_MAX2, INTERJECTION_OPEN, INTERJECTION_TIMED_OUT_TEXT, expiredByHook, putBack;
 var init_interjection2 = __esm({
   "../../packages/tacho/src/collector/interjection.ts"() {
     "use strict";
@@ -47058,6 +47139,8 @@ var init_interjection2 = __esm({
     NAME_MAX2 = 120;
     INTERJECTION_OPEN = "interjection_open";
     INTERJECTION_TIMED_OUT_TEXT = "Oxagen asked a person whether to bind this repository to a workspace, and nobody answered in time. This session goes on without skills.";
+    expiredByHook = /* @__PURE__ */ new WeakMap();
+    putBack = /* @__PURE__ */ new WeakSet();
   }
 });
 
@@ -47882,7 +47965,7 @@ async function routeHook(raw, env, deps, replay, harness, agent, hookId) {
         hook_event_name: "UserPromptSubmit",
         attrs: replayed
       };
-      const timedOut = replay === void 0 ? expireInterjection(record, deps.now(), questionFields) : void 0;
+      const timedOut = replay === void 0 || heldQuestionWasPutBack(record) ? expireInterjection(record, deps.now(), questionFields) : void 0;
       if (timedOut !== void 0) events.push(...timedOut);
       const asked = await repositoryQuestion(
         record,
@@ -47970,7 +48053,7 @@ async function routeHook(raw, env, deps, replay, harness, agent, hookId) {
       const toolInput = input.tool_input;
       noteToolCall(record, toolName3, toolInput);
       noteRecallHints(record, input.tool_name, toolInput);
-      const timedOut = replay === void 0 ? expireInterjection(record, deps.now(), {
+      const timedOut = replay === void 0 || heldQuestionWasPutBack(record) ? expireInterjection(record, deps.now(), {
         hook_event_name: "PreToolUse",
         attrs: replayed
       }) : void 0;
@@ -52513,21 +52596,26 @@ ${tools}---
 
 ${skill.body.replace(/^\n+/, "")}`;
 }
+function updateFramed(hash3, part2) {
+  const bytes = typeof part2 === "string" ? Buffer.from(part2, "utf8") : part2;
+  const length = Buffer.alloc(8);
+  length.writeBigUInt64BE(BigInt(bytes.byteLength));
+  hash3.update(length);
+  hash3.update(bytes);
+}
 function skillDigest(skill) {
   const hash3 = createHash11("sha256");
-  hash3.update(skillMarkdown(skill));
+  updateFramed(hash3, skillMarkdown(skill));
   for (const file of skill.files) {
-    hash3.update("\0");
-    hash3.update(file.path);
-    hash3.update("\0");
-    hash3.update(file.content);
+    updateFramed(hash3, file.path);
+    updateFramed(hash3, file.content);
   }
   return `sha256:${hash3.digest("hex")}`;
 }
 function isMarker(value) {
   if (typeof value !== "object" || value === null) return false;
-  const { digest: digest6, sessions } = value;
-  return typeof digest6 === "string" && typeof sessions === "object" && sessions !== null && Object.values(sessions).every((at2) => typeof at2 === "string");
+  const { digest: digest6, lineage, sessions } = value;
+  return typeof digest6 === "string" && (lineage === void 0 || typeof lineage === "string") && typeof sessions === "object" && sessions !== null && Object.values(sessions).every((at2) => typeof at2 === "string");
 }
 async function readMarker(folder) {
   let entries2;
@@ -52624,21 +52712,38 @@ async function placeSkills(root, sessionId, skills, now = /* @__PURE__ */ new Da
     if (found.state === "absent") {
       await writeSkill(root, skill, {
         digest: digest6,
+        lineage: skill.lineage,
         sessions: { [sessionId]: now.toISOString() }
       });
       result2.placed.push(skill.name);
       continue;
     }
     const live = liveSessions(found.marker, now);
+    const othersLive = Object.keys(live).some(
+      (session) => session !== sessionId
+    );
+    const held = found.marker.lineage;
+    if (held !== void 0 && held !== skill.lineage && othersLive) {
+      result2.skipped.push(skill.name);
+      result2.warnings.push(
+        `${folder} holds ${held} for another running session, so ${skill.lineage} was not placed.`
+      );
+      continue;
+    }
     const joined = { ...live, [sessionId]: now.toISOString() };
-    if (found.marker.digest === digest6) {
-      await writeMarker(folder, { digest: digest6, sessions: joined });
+    if (found.marker.digest === digest6 && (held === void 0 || held === skill.lineage)) {
+      await writeMarker(folder, {
+        digest: digest6,
+        lineage: skill.lineage,
+        sessions: joined
+      });
       result2.placed.push(skill.name);
       continue;
     }
-    if (Object.keys(live).some((session) => session !== sessionId)) {
+    if (othersLive) {
       await writeMarker(folder, {
         digest: found.marker.digest,
+        ...held === void 0 ? {} : { lineage: held },
         sessions: joined
       });
       result2.skipped.push(skill.name);
@@ -52649,6 +52754,7 @@ async function placeSkills(root, sessionId, skills, now = /* @__PURE__ */ new Da
     }
     await writeSkill(root, skill, {
       digest: digest6,
+      lineage: skill.lineage,
       sessions: { [sessionId]: now.toISOString() }
     });
     result2.placed.push(skill.name);
@@ -52682,7 +52788,7 @@ async function removeSkills(root, sessionId, now = /* @__PURE__ */ new Date()) {
       await rm2(folder, { recursive: true, force: true });
       result2.removed.push(name);
     } else if (held) {
-      await writeMarker(folder, { digest: found.marker.digest, sessions });
+      await writeMarker(folder, { ...found.marker, sessions });
       result2.kept.push(name);
     }
   }
@@ -55068,6 +55174,7 @@ function createModelProxy(deps) {
       attrs: attrs2
     };
     const metered = route.api !== "other";
+    await deps.daySpendSeeded?.();
     const { model: askedModel, ambiguous: modelAmbiguous } = modelOf(
       readable,
       json2
@@ -58292,6 +58399,7 @@ async function initializeDaemon(options, server, port, ready, clock2) {
       if (session.sealed && !sealed) session.sealed = false;
       session.control.repoChecked = repoChecked;
       if (interjection === void 0) session.control.interjection = void 0;
+      else restoreExpiredInterjection(session, interjection);
       const held = new Set(messages.map((message) => message.id));
       const arrived = session.control.messages.filter(
         (message) => !held.has(message.id)
@@ -59957,16 +60065,29 @@ async function initializeDaemon(options, server, port, ready, clock2) {
   }
   await refreshUpstreams();
   function walDaySpendMicros(day) {
+    let total2 = 0;
+    for (const session of wal.sessions())
+      total2 += sessionDaySpendMicros(session, day);
+    return total2;
+  }
+  function sessionDaySpendMicros(session, day) {
     const start = Date.parse(`${day}T00:00:00.000Z`);
     const end = Date.parse(nextUtcDayStart(day));
+    return observedSpendMicros(wal.eventsSince(session, start), (event) => {
+      const at2 = Date.parse(event.ts);
+      return at2 >= start && at2 < end;
+    });
+  }
+  async function walDaySpendMicrosYielding(day) {
+    const yieldToLoop = () => new Promise((resolve26) => setImmediate(resolve26));
+    await yieldToLoop();
     let total2 = 0;
     for (const session of wal.sessions()) {
-      total2 += observedSpendMicros(wal.eventsSince(session, start), (event) => {
-        const at2 = Date.parse(event.ts);
-        return at2 >= start && at2 < end;
-      });
+      if (stopped2) return void 0;
+      total2 += sessionDaySpendMicros(session, day);
+      await yieldToLoop();
     }
-    return total2;
+    return stopped2 ? void 0 : total2;
   }
   function observedSpendMicros(events, within4 = () => true) {
     let total2 = 0;
@@ -59993,6 +60114,7 @@ async function initializeDaemon(options, server, port, ready, clock2) {
     };
   }
   let startupDaySpend;
+  let daySpendSeed = Promise.resolve();
   const modelProxy = createModelProxy({
     registry: registry2,
     hostRecorder: () => hostRecorder,
@@ -60011,6 +60133,7 @@ async function initializeDaemon(options, server, port, ready, clock2) {
     // counter asks this once per process (`createDaySpend`), so the figure
     // read at startup is used once. A first call on a later day than
     // startup's reads the WAL for that day.
+    daySpendSeeded: () => daySpendSeed,
     priorDaySpendMicros: spendRead("the day's spend", (day) => {
       const seeded = startupDaySpend;
       startupDaySpend = void 0;
@@ -60463,17 +60586,26 @@ async function initializeDaemon(options, server, port, ready, clock2) {
     }
   }
   clock2.phase("restart gaps");
-  try {
+  ready(api);
+  clock2.ready();
+  {
     const day = utcDay(now());
-    startupDaySpend = { day, micros: walDaySpendMicros(day) };
-  } catch (error) {
-    log(
-      `day spend not read from the WAL at startup: ${error instanceof Error ? error.message : String(error)}`
+    const began = performance.now();
+    daySpendSeed = walDaySpendMicrosYielding(day).then(
+      (micros) => {
+        if (micros === void 0) return;
+        startupDaySpend = { day, micros };
+        log(
+          `day spend read took ${Math.round(performance.now() - began)}ms after ready`
+        );
+      },
+      (error) => {
+        log(
+          `day spend not read from the WAL at startup: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
     );
   }
-  clock2.phase("day spend");
-  ready(api);
-  clock2.ready();
   servingSince = now();
   if (options.listen ?? true) {
     const unixSocket = (options.platform ?? process.platform) !== "win32";
@@ -60924,6 +61056,7 @@ async function initializeDaemon(options, server, port, ready, clock2) {
     bodyPurgeIdle: async () => {
       while (bodyPurge !== void 0) await bodyPurge;
     },
+    daySpendSeeded: () => daySpendSeed,
     workOrdersIdle: () => workOrderAutostart.idle(),
     stop: async () => {
       if (stopped2) return;
@@ -61057,6 +61190,7 @@ var init_daemon = __esm({
     init_registry();
     init_server();
     init_spool();
+    init_interjection2();
     init_refused();
     init_session_heads();
     init_transcript_tailer();
@@ -63376,7 +63510,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@oxagen/cli",
-      version: "2.1.5-76",
+      version: "2.1.5-88",
       description: "Oxagen governance CLI \u2014 spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
       type: "module",
       main: "./dist/index.js",
@@ -79174,9 +79308,40 @@ var init_digest3 = __esm({
 });
 
 // ../../packages/run-evidence/src/limits.ts
+function countCapFor(collection) {
+  const shareBytes = Math.floor(
+    ENVELOPE_ITEM_BUDGET_JCS_BYTES * ENVELOPE_COLLECTION_SHARES[collection] / 100
+  );
+  return Math.floor(shareBytes / MAX_ENVELOPE_ITEM_JCS_BYTES);
+}
+var MAX_ENVELOPE_JCS_BYTES, ENVELOPE_RESERVED_JCS_BYTES, MAX_ENVELOPE_ITEM_JCS_BYTES, ENVELOPE_COLLECTION_SHARES, ENVELOPE_ITEM_BUDGET_JCS_BYTES, MAX_CONTEXT_FRAMES, MAX_MODEL_CALLS, MAX_CHANGES, MAX_TOOL_CALLS, MAX_APPROVALS, MAX_VERIFICATIONS, MAX_COMMITS, MAX_PULL_REQUESTS, MAX_ARTIFACTS;
 var init_limits = __esm({
   "../../packages/run-evidence/src/limits.ts"() {
     "use strict";
+    MAX_ENVELOPE_JCS_BYTES = 1048576;
+    ENVELOPE_RESERVED_JCS_BYTES = 65536;
+    MAX_ENVELOPE_ITEM_JCS_BYTES = 512;
+    ENVELOPE_COLLECTION_SHARES = {
+      contextFrames: 10,
+      modelCalls: 15,
+      changes: 20,
+      toolCalls: 30,
+      approvals: 3,
+      verifications: 5,
+      commits: 7,
+      pullRequests: 2,
+      artifacts: 8
+    };
+    ENVELOPE_ITEM_BUDGET_JCS_BYTES = MAX_ENVELOPE_JCS_BYTES - ENVELOPE_RESERVED_JCS_BYTES;
+    MAX_CONTEXT_FRAMES = countCapFor("contextFrames");
+    MAX_MODEL_CALLS = countCapFor("modelCalls");
+    MAX_CHANGES = countCapFor("changes");
+    MAX_TOOL_CALLS = countCapFor("toolCalls");
+    MAX_APPROVALS = countCapFor("approvals");
+    MAX_VERIFICATIONS = countCapFor("verifications");
+    MAX_COMMITS = countCapFor("commits");
+    MAX_PULL_REQUESTS = countCapFor("pullRequests");
+    MAX_ARTIFACTS = countCapFor("artifacts");
   }
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxagen/cli",
-  "version": "2.1.5-76",
+  "version": "2.1.5-88",
   "description": "Oxagen governance CLI — spend, lineage, grounding, credentials, and audit (agentic coding lives in the stella CLI)",
   "type": "module",
   "bin": {