@jentrix/cli 0.5.17 → 0.5.19

package/codex-plugin/plugins/jentrix/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "jentrix",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Connect Codex tasks to Jentrix projects with trusted lifecycle hooks, alignment, checkpoints, and honest session capture.",
   "author": {
     "name": "Jentrix",

package/codex-plugin/plugins/jentrix/skills/jentrix-end/SKILL.md

@@ -22,8 +22,8 @@ description: End a connected Jentrix session after preserving approved outputs,
    Declining never blocks closure.
 5. Run `jentrix session end <session-id>` and relay all output, including the exact
    telemetry line and any capture gap.
-6. Explain that Codex lifecycle hooks do not report token receipts, so null token
-   fields are expected on hook-watched sessions. Do not report estimates.
+6. Report provider-reported Codex token receipts when the hook supplied a rollout
+   path. If none were observed, keep token fields null; never report estimates.
 7. A final-response artifact exists only when a prior `Stop` hook observed assistant
    text before closure. The assistant text produced by this closing turn occurs after
    the command and must not be claimed as captured.

package/dist/main.js

@@ -20966,7 +20966,7 @@ function refreshAccessToken(input) {
 
 // src/client.ts
 var CLI_NAME = "stacks-cli";
-var CLI_VERSION = "0.5.17";
+var CLI_VERSION = "0.5.19";
 var DEAD_TOKEN_MESSAGE = "authentication failed (HTTP 401): the token is dead or expired \u2014 mint a new PAT at /account/tokens on your Jentrix server and update STACKS_TOKEN (or --token / the config file).";
 var RELOGIN_MESSAGE = "OAuth session expired and could not be refreshed \u2014 run `jentrix login` to sign in again.";
 function originOf2(url2) {
@@ -22620,6 +22620,7 @@ function readTranscriptHead(path) {
 function parseHookLedger(body) {
   const starts = [];
   const endedAt = /* @__PURE__ */ new Map();
+  const transcriptBySession = /* @__PURE__ */ new Map();
   for (const line of body.split("\n").filter(Boolean)) {
     let parsed;
     try {
@@ -22629,6 +22630,10 @@ function parseHookLedger(body) {
     }
     const sessionId = parsed.payload?.session_id;
     if (typeof sessionId !== "string") continue;
+    const transcriptPath = parsed.payload?.transcript_path?.trim();
+    if (transcriptPath) {
+      transcriptBySession.set(sessionId, transcriptPath);
+    }
     const stamped = parsed.at ? Date.parse(parsed.at) : NaN;
     const ms = Number.isNaN(stamped) ? 0 : stamped;
     if (parsed.event === "SessionEnd") {
@@ -22643,16 +22648,10 @@ function parseHookLedger(body) {
       });
     }
   }
-  return { starts, endedAt };
+  return { starts, endedAt, transcriptBySession };
 }
 function transcriptForSessionIn(ledger, sessionId) {
-  for (let i = ledger.starts.length - 1; i >= 0; i--) {
-    const start = ledger.starts[i];
-    if (start.sessionId === sessionId && start.transcriptPath) {
-      return start.transcriptPath;
-    }
-  }
-  return null;
+  return ledger.transcriptBySession.get(sessionId) ?? null;
 }
 var CLAUDE_SESSION_ENV = "CLAUDE_CODE_SESSION_ID";
 var CODEX_THREAD_ENV = "CODEX_THREAD_ID";
@@ -22676,9 +22675,10 @@ function readClaudeHookContext(deps2, readFile = (path) => readFileSync2(path, "
     } catch {
     }
   }
-  const { starts, endedAt } = parseHookLedger(body);
+  const ledger = parseHookLedger(body);
+  const { starts, endedAt } = ledger;
   if (own) {
-    const transcriptPath = transcriptForSessionIn({ starts }, own);
+    const transcriptPath = transcriptForSessionIn(ledger, own);
     return {
       sessionId: own,
       transcriptPath,
@@ -22740,13 +22740,15 @@ function readCodexHookContext(deps2, readFile = (path) => readFileSync2(path, "u
     } catch {
     }
   }
-  const { starts, endedAt } = parseHookLedger(body);
+  const ledger = parseHookLedger(body);
+  const { starts, endedAt } = ledger;
   if (own) {
     const source = threadId ? CODEX_THREAD_ENV : CODEX_SESSION_ENV;
+    const transcriptPath = transcriptForSessionIn(ledger, own);
     return {
       sessionId: own,
-      transcriptPath: null,
-      basis: `${source}=${own} \u2014 this Codex task's own id`,
+      transcriptPath,
+      basis: `${source}=${own} \u2014 this Codex task's own id${transcriptPath ? " (rollout from its hook record)" : ""}`,
       newerElsewhere: null
     };
   }
@@ -22769,7 +22771,7 @@ function readCodexHookContext(deps2, readFile = (path) => readFileSync2(path, "u
   const match = matches[0];
   return match ? {
     sessionId: match.sessionId,
-    transcriptPath: null,
+    transcriptPath: transcriptForSessionIn(ledger, match.sessionId),
     basis: `unambiguous SessionStart${match.at ? ` at ${match.at}` : ""} in ${match.cwd}`,
     newerElsewhere: null
   } : null;
@@ -22851,7 +22853,12 @@ async function runSessionAttach(flags, deps2) {
       }
     } else if (!flags.providerSession && flags.provider === "codex") {
       const hookContext = readCodexHookContext(deps2);
-      if (hookContext) flags.providerSession = hookContext.sessionId;
+      if (hookContext) {
+        flags.providerSession = hookContext.sessionId;
+        if (!flags.transcriptPath && hookContext.transcriptPath) {
+          flags.transcriptPath = hookContext.transcriptPath;
+        }
+      }
     } else if (flags.provider === "claude" && flags.providerSession && !flags.transcriptPath) {
       flags.transcriptPath = readClaudeHookTranscript(deps2, flags.providerSession) ?? void 0;
     }
@@ -23076,7 +23083,7 @@ function telemetryVerdict(sessionId, usage, hostRan, provider = "claude") {
   if (provider === "codex" && hostRan) {
     return {
       state: "unavailable",
-      line: `Telemetry: token usage unavailable \u2014 Codex lifecycle hooks report no token receipts${wallPart} (coverage ${coverage})`,
+      line: `Telemetry: token usage unavailable \u2014 no Codex rollout receipt was observed${wallPart} (coverage ${coverage})`,
       warning: null
     };
   }
@@ -23858,7 +23865,7 @@ function sessionBindingCheck(detected) {
     return detected.hookDir ? {
       name: "session",
       status: "ok",
-      detail: `${detected.providerSessionId} \xB7 ${detected.basis ?? "resolved"} \xB7 host watches trusted Codex lifecycle hooks; token usage is unavailable by provider contract`
+      detail: `${detected.providerSessionId} \xB7 ${detected.basis ?? "resolved"} \xB7 host watches trusted Codex lifecycle hooks and provider-reported rollout usage`
     } : {
       name: "session",
       status: "warn",
@@ -23886,7 +23893,7 @@ function detectProvider(flags, deps2) {
     return {
       provider: "codex",
       providerSessionId: flags.providerSession ?? hook2?.sessionId ?? null,
-      transcriptPath: null,
+      transcriptPath: flags.transcriptPath ?? hook2?.transcriptPath ?? null,
       basis: flags.providerSession ? `codex thread ${flags.providerSession} (explicit)` : hook2?.basis ?? null,
       newerElsewhere: null,
       transcriptGap: null,
@@ -23898,7 +23905,7 @@ function detectProvider(flags, deps2) {
     return {
       provider: "codex",
       providerSessionId: current.sessionId,
-      transcriptPath: null,
+      transcriptPath: flags.transcriptPath ?? current.transcriptPath,
       basis: current.basis,
       newerElsewhere: null,
       transcriptGap: null,
@@ -24332,7 +24339,7 @@ ${JSON.stringify(session.alignment, null, 2)}`
     });
     if (pid !== null) {
       deps2.writeOut(
-        captureMode === "on" ? `Capture host running (pid ${pid}) \u2014 TRACE capture ON for this session.` : detected.provider === "codex" ? `Session host running (pid ${pid}) \u2014 heartbeats + Codex lifecycle hooks; token usage is unavailable and TRACE capture is OFF.` : `Session host running (pid ${pid}) \u2014 heartbeats + telemetry only; TRACE capture is OFF (MVP default; a NEW session aligned with --capture records one \u2014 it cannot start mid-session).`
+        captureMode === "on" ? `Capture host running (pid ${pid}) \u2014 TRACE capture ON for this session.` : detected.provider === "codex" ? `Session host running (pid ${pid}) \u2014 heartbeats + Codex rollout telemetry; TRACE capture is OFF.` : `Session host running (pid ${pid}) \u2014 heartbeats + telemetry only; TRACE capture is OFF (MVP default; a NEW session aligned with --capture records one \u2014 it cannot start mid-session).`
       );
     }
   } else if (!liveHost) {
@@ -27496,7 +27503,7 @@ function registerLogoutCommand(program3, deps2, onExit2) {
 
 // src/commands/plugin.ts
 import { existsSync as existsSync4 } from "node:fs";
-import { join as join4, resolve as resolve2 } from "node:path";
+import { join as join4, resolve as resolve2, win32 } from "node:path";
 var MARKETPLACE_NAME = "jentrix";
 var PLUGIN_REF = "jentrix@jentrix";
 var LEGACY_MARKETPLACE = "stacks";
@@ -27536,6 +27543,14 @@ function persistentPluginRoot(globalNodeModules, ownRoot, exists) {
 function isPluginMarketplaceDir(dir) {
   return existsSync4(join4(dir, ".claude-plugin", "marketplace.json"));
 }
+function samePluginPath(a, b, win = process.platform === "win32") {
+  const normalize = (raw) => {
+    const bare = raw.replace(/^\\\\\?\\UNC\\/i, "\\\\").replace(/^\\\\\?\\/, "");
+    const abs = win ? win32.resolve(bare) : resolve2(bare);
+    return win ? abs.toLowerCase() : abs;
+  };
+  return normalize(a) === normalize(b);
+}
 function isCodexPluginMarketplaceDir(dir) {
   return existsSync4(join4(dir, ".agents", "plugins", "marketplace.json"));
 }
@@ -27582,7 +27597,7 @@ async function installCodexPlugin(deps2, codex, pluginDir) {
   const existing = marketplaces.find((row) => row.name === MARKETPLACE_NAME);
   if (existing) {
     const source = existing.marketplaceSource;
-    if (source?.sourceType !== "local" || typeof source.source !== "string" || resolve2(source.source) !== resolve2(pluginDir)) {
+    if (source?.sourceType !== "local" || typeof source.source !== "string" || !samePluginPath(source.source, pluginDir)) {
       deps2.writeErr(
         `PLUGIN_MARKETPLACE_CONFLICT: Codex marketplace "${MARKETPLACE_NAME}" points somewhere else \u2014 inspect with \`codex plugin marketplace list\`; if intentional, run \`codex plugin marketplace remove ${MARKETPLACE_NAME}\` and retry`
       );
@@ -27627,7 +27642,7 @@ async function installCodexPlugin(deps2, codex, pluginDir) {
   }
   return finishInstall(
     deps2,
-    "Jentrix Codex plugin ready: $jentrix-connect, $jentrix-align, $jentrix-plan, $jentrix-checkpoint, $jentrix-status, and $jentrix-end are available in NEW Codex tasks. Open `/hooks` and trust the Jentrix hooks before use." + await removeLegacyPlugin(deps2, codex, "codex")
+    "Jentrix Codex plugin ready: $jentrix-connect, $jentrix-align, $jentrix-plan, $jentrix-checkpoint, $jentrix-status, $jentrix-review, and $jentrix-end are available in NEW Codex tasks. Open `/hooks` and trust the Jentrix hooks before use." + await removeLegacyPlugin(deps2, codex, "codex")
   );
 }
 async function runPluginInstall(deps2, provider = "claude") {
@@ -27718,7 +27733,7 @@ ${update.stderr}`.match(
   );
   return finishInstall(
     deps2,
-    `Jentrix plugin ready: /jentrix-connect, /jentrix-align, /jentrix-plan, /jentrix-checkpoint, /jentrix-status, /jentrix-end are available in NEW Claude Code sessions (running sessions pick it up on restart).${await removeLegacyPlugin(deps2, claude, "claude")}`
+    `Jentrix plugin ready: /jentrix-connect, /jentrix-align, /jentrix-plan, /jentrix-checkpoint, /jentrix-status, /jentrix-review, /jentrix-end are available in NEW Claude Code sessions (running sessions pick it up on restart).${await removeLegacyPlugin(deps2, claude, "claude")}`
   );
 }
 function registerPluginCommand(program3, deps2, onExit2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jentrix/cli",
-  "version": "0.5.17",
+  "version": "0.5.19",
   "description": "Command-line client for the Jentrix MCP surface (jentrix tool <name>, generated noun-verb commands).",
   "keywords": [
     "jentrix",