@jentrix/cli 0.5.18 → 0.5.20

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

@@ -1,7 +1,7 @@
 {
   "name": "jentrix",
-  "version": "0.2.4",
-  "description": "Connect Codex tasks to Jentrix projects with trusted lifecycle hooks, alignment, checkpoints, and honest session capture.",
+  "version": "0.2.5",
+  "description": "Connect Codex tasks to Jentrix with trusted lifecycle hooks, exact-rollout telemetry recovery, typed artifacts, and operator-confirmed alignment.",
   "author": {
     "name": "Jentrix",
     "url": "https://github.com/jentrix-au"
@@ -14,7 +14,7 @@
   "interface": {
     "displayName": "Jentrix",
     "shortDescription": "Connect this Codex task to Jentrix.",
-    "longDescription": "Align a Codex task to a Jentrix project and task, preserve typed checkpoints, and capture supported lifecycle evidence through trusted hooks.",
+    "longDescription": "Align a Codex task to a Jentrix project and task, preserve typed artifacts and checkpoints, capture supported lifecycle evidence through trusted hooks, and recover provider-reported usage from the exact task rollout when hooks are unavailable.",
     "developerName": "Jentrix",
     "category": "Productivity",
     "capabilities": ["Interactive", "Write"],

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

@@ -1,12 +1,13 @@
 {
-  "description": "Trusted Codex lifecycle bridge. Hook payloads are appended locally; compact hooks also ask the Jentrix CLI to preserve the approved capture boundary.",
+  "description": "Trusted Codex lifecycle bridge. Structured hook stdin is appended locally; credentials and transcript content never enter argv. Hooks remain inactive until the operator reviews and trusts them. PreCompact/PostCompact additionally preserve the approved capture boundary; capture off records only the boundary, never transcript content.",
   "hooks": {
     "SessionStart": [
       {
         "hooks": [
           {
             "type": "command",
-            "command": "stacks-runner session-hook --provider codex --event SessionStart"
+            "command": "stacks-runner session-hook --provider codex --event SessionStart",
+            "timeout": 3
           }
         ]
       }
@@ -16,7 +17,8 @@
         "hooks": [
           {
             "type": "command",
-            "command": "stacks-runner session-hook --provider codex --event UserPromptSubmit"
+            "command": "stacks-runner session-hook --provider codex --event UserPromptSubmit",
+            "timeout": 3
           }
         ]
       }
@@ -26,7 +28,8 @@
         "hooks": [
           {
             "type": "command",
-            "command": "stacks-runner session-hook --provider codex --event PostToolUse"
+            "command": "stacks-runner session-hook --provider codex --event PostToolUse",
+            "timeout": 3
           }
         ]
       }
@@ -36,7 +39,8 @@
         "hooks": [
           {
             "type": "command",
-            "command": "stacks-runner session-hook --provider codex --event Stop"
+            "command": "stacks-runner session-hook --provider codex --event Stop",
+            "timeout": 3
           }
         ]
       }
@@ -47,12 +51,13 @@
           {
             "type": "command",
             "command": "stacks-runner session-hook --provider codex --event PreCompact",
-            "timeout": 10
+            "timeout": 3
           },
           {
             "type": "command",
             "command": "jentrix session snapshot --event PreCompact",
-            "timeout": 10
+            "timeout": 10,
+            "statusMessage": "Preserving the Jentrix capture boundary"
           }
         ]
       }
@@ -63,12 +68,13 @@
           {
             "type": "command",
             "command": "stacks-runner session-hook --provider codex --event PostCompact",
-            "timeout": 10
+            "timeout": 3
           },
           {
             "type": "command",
             "command": "jentrix session snapshot --event PostCompact",
-            "timeout": 10
+            "timeout": 10,
+            "statusMessage": "Recording the Jentrix compaction boundary"
           }
         ]
       }
@@ -78,7 +84,8 @@
         "hooks": [
           {
             "type": "command",
-            "command": "stacks-runner session-hook --provider codex --event SessionEnd"
+            "command": "stacks-runner session-hook --provider codex --event SessionEnd",
+            "timeout": 3
           }
         ]
       }

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

@@ -34,6 +34,13 @@ description: Align the current Codex task to a Jentrix workspace, project, work
 8. Echo the returned server alignment snapshot verbatim. If `.mcp.json` changed,
    explain that the current task must reconnect MCP or restart before using it.
 
+If detection names an exact Codex rollout fallback instead of a lifecycle-hook
+record, say what that means: provider token receipts and the opening prompt remain
+collectable, but prompt/tool/assistant lifecycle events are not. Direct the operator
+to review and trust the plugin hooks with `/hooks`, then start a new Codex task for
+full lifecycle coverage. Never claim `coverage: COMPLETE` for token receipts proves
+that hooks ran.
+
 TRACE capture is off by default. Pass `--capture` only when the operator explicitly
 approved full hook-derived trace capture. Same-project re-alignment converges;
 different-project re-alignment must be refused until `jentrix session end`.

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

@@ -18,5 +18,10 @@ trusted environment and lifecycle-hook context. Relay the command output or erro
 verbatim. The command starts the hook-watching host in the background and prints
 its pid; do not start a second host. Never put credentials on the command line.
 
-If trusted identity is unavailable, report the CLI's fallback exactly; do not guess
-from Codex session files.
+When lifecycle hooks are unavailable, the CLI may recover telemetry only from the
+exact `rollout-*-${CODEX_THREAD_ID}.jsonl` under the trusted Codex home. Accept that
+exact match; never choose the newest session file. Explain that the fallback keeps
+provider token receipts and opening-prompt provenance, but not prompt/tool/assistant
+lifecycle events. Direct the operator to review and trust the plugin hooks with
+`/hooks`, then start a new Codex task for full lifecycle coverage. If trusted task
+identity or the exact rollout is unavailable, relay the refusal and do not guess.

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

@@ -8,4 +8,8 @@ description: Show the connected Jentrix session, alignment, capture health, and
 
 Run `jentrix session status` and append the session id when the user supplied one.
 Relay stdout and stderr verbatim, including capture or telemetry warnings. Never turn
-null token values into zero or infer provider usage that the hooks did not report.
+null token values into zero or infer provider usage that Codex did not report.
+`coverage: COMPLETE` describes provider token-receipt coverage only; it does not prove
+the lifecycle hooks ran. If the session uses the exact-rollout fallback, report that
+prompt/tool/assistant lifecycle evidence is unavailable and point to `/hooks` plus a
+new Codex task for future full coverage.

package/dist/main.js

@@ -20966,7 +20966,7 @@ function refreshAccessToken(input) {
 
 // src/client.ts
 var CLI_NAME = "stacks-cli";
-var CLI_VERSION = "0.5.18";
+var CLI_VERSION = "0.5.20";
 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) {
@@ -22663,6 +22663,23 @@ function hooksDir(deps2, provider) {
 function codexHooksDir(deps2) {
   return hooksDir(deps2, "codex");
 }
+function readCodexRolloutPath(deps2, sessionId) {
+  const configuredHome = deps2.env.CODEX_HOME?.trim() || null;
+  const userHome = deps2.env.HOME ?? deps2.env.USERPROFILE;
+  const home = configuredHome ?? (userHome ? join2(userHome, ".codex") : null);
+  if (!home) return null;
+  const root = join2(home, "sessions");
+  const suffix = `-${sessionId}.jsonl`;
+  try {
+    const relative = readdirSync(root, {
+      encoding: "utf8",
+      recursive: true
+    }).find((path) => path.endsWith(suffix));
+    return relative ? join2(root, relative) : null;
+  } catch {
+    return null;
+  }
+}
 function readClaudeHookContext(deps2, readFile = (path) => readFileSync2(path, "utf8"), mtimeOf = transcriptMtime, now = Date.now) {
   const own = deps2.env[CLAUDE_SESSION_ENV]?.trim() || null;
   const home = deps2.env.HOME ?? deps2.env.USERPROFILE;
@@ -22744,11 +22761,12 @@ function readCodexHookContext(deps2, readFile = (path) => readFileSync2(path, "u
   const { starts, endedAt } = ledger;
   if (own) {
     const source = threadId ? CODEX_THREAD_ENV : CODEX_SESSION_ENV;
-    const transcriptPath = transcriptForSessionIn(ledger, own);
+    const hookTranscript = transcriptForSessionIn(ledger, own);
+    const transcriptPath = hookTranscript ?? readCodexRolloutPath(deps2, own);
     return {
       sessionId: own,
       transcriptPath,
-      basis: `${source}=${own} \u2014 this Codex task's own id${transcriptPath ? " (rollout from its hook record)" : ""}`,
+      basis: `${source}=${own} \u2014 this Codex task's own id${hookTranscript ? " (rollout from its hook record)" : transcriptPath ? " (rollout resolved from Codex sessions)" : ""}`,
       newerElsewhere: null
     };
   }
@@ -22771,7 +22789,7 @@ function readCodexHookContext(deps2, readFile = (path) => readFileSync2(path, "u
   const match = matches[0];
   return match ? {
     sessionId: match.sessionId,
-    transcriptPath: transcriptForSessionIn(ledger, match.sessionId),
+    transcriptPath: transcriptForSessionIn(ledger, match.sessionId) ?? readCodexRolloutPath(deps2, match.sessionId),
     basis: `unambiguous SessionStart${match.at ? ` at ${match.at}` : ""} in ${match.cwd}`,
     newerElsewhere: null
   } : null;
@@ -22861,6 +22879,8 @@ async function runSessionAttach(flags, deps2) {
       }
     } else if (flags.provider === "claude" && flags.providerSession && !flags.transcriptPath) {
       flags.transcriptPath = readClaudeHookTranscript(deps2, flags.providerSession) ?? void 0;
+    } else if (flags.provider === "codex" && flags.providerSession && !flags.transcriptPath) {
+      flags.transcriptPath = readCodexRolloutPath(deps2, flags.providerSession) ?? void 0;
     }
     if (flags.provider === "codex") hookDir = codexHooksDir(deps2);
     if (!flags.providerSession) {
@@ -23890,10 +23910,11 @@ function sessionBindingCheck(detected) {
 function detectProvider(flags, deps2) {
   if (flags.provider === "codex") {
     const hook2 = flags.providerSession ? null : readCodexHookContext(deps2);
+    const providerSessionId = flags.providerSession ?? hook2?.sessionId ?? null;
     return {
       provider: "codex",
-      providerSessionId: flags.providerSession ?? hook2?.sessionId ?? null,
-      transcriptPath: flags.transcriptPath ?? hook2?.transcriptPath ?? null,
+      providerSessionId,
+      transcriptPath: flags.transcriptPath ?? hook2?.transcriptPath ?? (providerSessionId ? readCodexRolloutPath(deps2, providerSessionId) : null),
       basis: flags.providerSession ? `codex thread ${flags.providerSession} (explicit)` : hook2?.basis ?? null,
       newerElsewhere: null,
       transcriptGap: null,
@@ -27503,7 +27524,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";
@@ -27543,6 +27564,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"));
 }
@@ -27589,7 +27618,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`
       );

package/package.json

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