@jentrix/cli 0.5.13 → 0.5.15

package/claude-plugin/commands/jentrix-align.md

@@ -2,6 +2,7 @@
 description: Align this session to a Jentrix work layer (workspace → project → task → owner) with a server-confirmed alignment snapshot
 allowed-tools: Bash(jentrix align:*), Bash(jentrix session:*)
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 Run the Jentrix MVP alignment wizard for THIS session. The question set is
 fixed — workspace, project, project name, work item, task title, owner,
@@ -28,12 +29,19 @@ and do NOT answer any question yourself.
    choice is the explicit free-text escape: when picked, let the operator
    type the id/slug. A question whose `status` is `"skipped"` was resolved
    by detection — tell the operator what was resolved (e.g. the workspace),
-   don't re-ask it.
-5. After the project answer, re-run
-   `jentrix align --questions --json --project <chosen>` to load the
-   work-item and owner choices, then continue asking. If the operator picked
-   "Create a new project from this repo", the NEXT question is
-   `project_name` (already in the payload, `kind: "freetext"`): relay its
+   don't re-ask it. When a question carries more choices than the native
+   picker can show (the work-item question can carry up to 15 tasks plus its
+   escapes), put the overflow choices — label AND id — in the prompt text and
+   say they are reachable through "Other…". Never silently drop a choice.
+5. Re-run `--questions --json` after every answer that unlocks the next
+   question, carrying the answers so far as flags. After the WORKSPACE
+   answer: `jentrix align --questions --json --workspace <chosen>` — it
+   narrows the project list to that workspace, and without it the project
+   question stays `pending` and the flow stalls. After the PROJECT answer:
+   `jentrix align --questions --json [--workspace <chosen>] --project <chosen>`
+   loads the work-item and owner choices, then continue asking. If the
+   operator picked "Create a new project from this repo", the NEXT question
+   is `project_name` (already in the payload, `kind: "freetext"`): relay its
    `prompt` verbatim and collect the name as free text FROM THE OPERATOR —
    never propose name options, never fill it in yourself. Then re-run
    `jentrix align --questions --json --new-project "<name>"` — the work-item

package/claude-plugin/commands/jentrix-checkpoint.md

@@ -2,6 +2,7 @@
 description: Write a distilled state-of-play for this session and push it as a typed Jentrix artifact
 allowed-tools: Bash(jentrix push:*), Bash(jentrix session:*), Bash(jentrix task:*)
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 Write down what this session currently knows, and push it.
 

package/claude-plugin/commands/jentrix-connect.md

@@ -2,6 +2,7 @@
 description: Connect this Claude Code session to a Jentrix project (session anchor + capture)
 allowed-tools: Bash(jentrix session:*)
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 Run this exact command with the Bash tool and relay its output to the user:
 

package/claude-plugin/commands/jentrix-end.md

@@ -2,6 +2,7 @@
 description: End the connected Jentrix session (pushes the final artifacts, verifies capture, stores the RUN_SUMMARY)
 allowed-tools: Bash(jentrix session:*), Bash(jentrix push:*), Bash(jentrix artifact:*), Bash(jentrix column:*), Bash(jentrix task:*), Bash(jentrix tool:*)
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 End the connected Jentrix session honestly. For an ALIGNED session (the MVP
 pipeline), the typed artifacts ARE the record — push them before closing:

package/claude-plugin/commands/jentrix-plan.md

@@ -2,6 +2,7 @@
 description: Turn the opening prompt into a goal and a small set of Jentrix tasks, confirmed by the operator before anything is created
 allowed-tools: Bash(jentrix task:*), Bash(jentrix column:*), Bash(jentrix board:*), Bash(jentrix session:*), Bash(jentrix push:*)
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 Decompose the work the operator just asked for into a goal and a short task
 list, **confirm both before creating anything**, then create them.

package/claude-plugin/commands/jentrix-review.md

@@ -2,6 +2,7 @@
 description: Review a Jentrix session's typed artifacts by category (input → plan → decision → output → issue → gap → learning → record), check the readiness contract, and post the verdict as a task comment
 allowed-tools: Bash(jentrix tool:*), Bash(jentrix artifact:*), Bash(jentrix session:*), Bash(jentrix comment:*)
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 Run the category walk over one session's record (docs: Reviewing a session).
 Read-only until the final comment; never modify the tree, the board, or the

package/claude-plugin/commands/jentrix-status.md

@@ -2,6 +2,7 @@
 description: Show the connected Jentrix session for this work (capture health included)
 allowed-tools: Bash(jentrix session:*)
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 Run `jentrix session status` with the Bash tool (append the session id if the
 user gave one) and relay the output verbatim, including any capture-pending

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

@@ -2,6 +2,7 @@
 name: stacks-align
 description: Align the current Codex task to a Jentrix workspace, project, work item, and owner with an operator-confirmed server snapshot.
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 # Align this Codex task
 
@@ -12,8 +13,13 @@ description: Align the current Codex task to a Jentrix workspace, project, work
 4. Present each `status:"ask"` question and its choices verbatim using Codex's
    structured input UI when available, otherwise ask in chat. Never answer for the
    operator. Preserve notices and the `Other…` free-text escape.
-5. Re-run `--questions --json` after project selection. Collect `project_name` and
-   `task_title` as free text from the operator; never propose permanent names.
+5. Re-run `--questions --json` after every answer that unlocks the next question,
+   carrying the answers so far: `--workspace <chosen>` after the workspace (it
+   narrows the project list — without it the project question stays `pending`),
+   then `--project <chosen>`. Collect `project_name` and `task_title` as free text
+   from the operator; never propose permanent names. When the choices outnumber
+   the front end's picker, name the overflow (label + id) in the prompt rather
+   than dropping it.
 6. Present the confirmation prompt and every disclosure verbatim.
 7. On confirmation, submit exactly once with `jentrix align --provider codex --json
    --yes` plus the confirmed project, task/session-level, owner, agent label, and

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

@@ -2,6 +2,7 @@
 name: stacks-checkpoint
 description: Distill verified session state into a typed Jentrix checkpoint that survives compaction or handoff.
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 # Write a checkpoint
 

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

@@ -2,6 +2,7 @@
 name: stacks-connect
 description: Connect the current Codex task to a Jentrix project using trusted lifecycle identity and start the session capture host.
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 # Connect this Codex task
 

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

@@ -2,6 +2,7 @@
 name: stacks-end
 description: End a connected Jentrix session after preserving approved outputs, parking completed work in review, and reporting capture honestly.
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 # End the connected session
 

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

@@ -2,6 +2,7 @@
 name: stacks-plan
 description: Turn the opening request into an operator-approved goal and small Jentrix task set, then store the prompt and goal as typed artifacts.
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 # Plan confirmed work
 

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

@@ -2,6 +2,7 @@
 name: stacks-review
 description: Review a Jentrix session's typed artifacts by category, verify the readiness contract, and post the verdict as a comment on the aligned task.
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 # Review a session's record
 

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

@@ -2,6 +2,7 @@
 name: stacks-status
 description: Show the connected Jentrix session, alignment, capture health, and honest telemetry availability for this Codex task.
 ---
+<!-- Source of truth. The cli/{claude,codex}-plugin copy is GENERATED by cli/scripts/build.mjs (rm + cp) on every build — edits made there are deleted. Edit this file. -->
 
 # Show session status
 

package/dist/main.js

@@ -10336,7 +10336,7 @@ import {
   readFileSync as readFileSync7,
   statSync as statSync3
 } from "node:fs";
-import { homedir } from "node:os";
+import { homedir as homedir2 } from "node:os";
 import { basename as basename2, delimiter as delimiter2, dirname as dirname4, join as join6, resolve as resolve4 } from "node:path";
 import { fileURLToPath } from "node:url";
 
@@ -20593,8 +20593,8 @@ var ConfigError = class extends Error {
     this.exitCode = exitCode;
   }
 };
-function configPathFor(homedir2) {
-  return join(homedir2, ".config", "stacks", "config.json");
+function configPathFor(homedir3) {
+  return join(homedir3, ".config", "stacks", "config.json");
 }
 var PROJECT_CONFIG_DIR = ".stacks";
 function projectConfigPathFor(dir) {
@@ -20610,8 +20610,8 @@ function findProjectConfigPath(startDir, exists = existsSync) {
     dir = parent;
   }
 }
-function resolveConfigPath(cwd, homedir2, exists = existsSync) {
-  return findProjectConfigPath(cwd, exists) ?? configPathFor(homedir2);
+function resolveConfigPath(cwd, homedir3, exists = existsSync) {
+  return findProjectConfigPath(cwd, exists) ?? configPathFor(homedir3);
 }
 function scaffoldProjectConfigDir(dir) {
   const stacksDir = join(dir, PROJECT_CONFIG_DIR);
@@ -20882,7 +20882,10 @@ var ACCESS_TOKEN_PREFIX = "tmo_";
 var REFRESH_TOKEN_PREFIX = "tmr_";
 function parseTokenResponse(body) {
   if (typeof body !== "object" || body === null) {
-    throw new OAuthTokenError("invalid_response", "token response is not an object");
+    throw new OAuthTokenError(
+      "invalid_response",
+      "token response is not an object"
+    );
   }
   const json = body;
   if (typeof json.error === "string") {
@@ -20962,7 +20965,7 @@ function refreshAccessToken(input) {
 
 // src/client.ts
 var CLI_NAME = "stacks-cli";
-var CLI_VERSION = "0.5.13";
+var CLI_VERSION = "0.5.15";
 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) {
@@ -23840,7 +23843,7 @@ function producerFromFlags(flags) {
   if (!label) return null;
   return { label, emoji: flags.agentEmoji?.trim() || null };
 }
-async function buildCatalog(caller, deps2, flags, detection) {
+async function buildCatalog(caller, flags, detection) {
   const context = await callStructured(caller, "get_token_context", {});
   let pinnedWorkspace = null;
   if (context.workspacePinned === true && typeof context.workspaceId === "string") {
@@ -23851,10 +23854,13 @@ async function buildCatalog(caller, deps2, flags, detection) {
       name: match?.name ?? "pinned"
     };
   }
-  const { candidates, pinned: discoveryPinned } = await resolveCandidates(
+  const flagWorkspaceId = flags.workspace?.trim() ? await resolveWorkspaceFlag(
     caller,
-    detection.repoOwnerName
-  );
+    flags.workspace.trim(),
+    pinnedWorkspace
+  ) : null;
+  const { candidates: matched, pinned: discoveryPinned } = await resolveCandidates(caller, detection.repoOwnerName);
+  const candidates = flagWorkspaceId ? matched.filter((candidate) => candidate.workspace.id === flagWorkspaceId) : matched;
   let otherProjects = [];
   let discoveryNotice = null;
   if (discoveryPinned && pinnedWorkspace) {
@@ -23879,7 +23885,7 @@ async function buildCatalog(caller, deps2, flags, detection) {
       (project) => project.id === flags.project || project.slug === flags.project
     );
     chosenProjectId = match?.id ?? flags.project;
-  } else if (candidates.length === 1) {
+  } else if (candidates.length === 1 && matched.length === 1) {
     chosenProjectId = candidates[0].id;
   }
   let openTasks = null;
@@ -23926,7 +23932,7 @@ async function buildCatalog(caller, deps2, flags, detection) {
     } catch {
     }
   }
-  const chosenWorkspaceId = candidates.find((candidate) => candidate.id === chosenProjectId)?.workspace.id ?? pinnedWorkspace?.id ?? null;
+  const chosenWorkspaceId = candidates.find((candidate) => candidate.id === chosenProjectId)?.workspace.id ?? flagWorkspaceId ?? pinnedWorkspace?.id ?? null;
   return {
     detection,
     pinnedWorkspace,
@@ -24305,7 +24311,7 @@ async function runAlign(flags, deps2) {
       provider: detected.provider
     };
     return await withCaller(deps2, async (caller, target) => {
-      const catalog = await buildCatalog(caller, deps2, flags, detection);
+      const catalog = await buildCatalog(caller, flags, detection);
       const marker = readAlignmentMarker(
         deps2.configPath,
         inspection.root,
@@ -24427,14 +24433,7 @@ async function runAlign(flags, deps2) {
       let pendingCreateProject = null;
       if (flags.newTask) workItem = `__new__:${flags.newTask}`;
       if (flags.newProject && flags.newProject.trim()) {
-        let workspaceId = catalog.chosenWorkspaceId ?? catalog.pinnedWorkspace?.id ?? null;
-        if (flags.workspace?.trim()) {
-          workspaceId = await resolveWorkspaceFlag(
-            caller,
-            flags.workspace.trim(),
-            catalog.pinnedWorkspace ?? null
-          );
-        }
+        const workspaceId = catalog.chosenWorkspaceId ?? catalog.pinnedWorkspace?.id ?? null;
         if (!workspaceId) {
           throw new UsageError(
             "--new-project needs a resolved workspace (a workspace-pinned token, a repo-matched candidate, or --workspace <id-or-slug>) \u2014 none resolved here"
@@ -24766,7 +24765,7 @@ function registerAlignCommand(program3, deps2, onExit2) {
     "create a project in the resolved workspace (seeds a board + repo/board links), then align to it"
   ).option(
     "--workspace <id-or-slug>",
-    "workspace for --new-project when neither a pinned token nor a repo match resolves one (fresh checkout, non-interactive)"
+    "the workspace question's flag twin: narrows the wizard's project list, and names where --new-project creates when neither a pinned token nor a repo match resolves one"
   ).option("--task <taskId>", "existing work item to align to").option(
     "--new-task <title>",
     "create a task (existing ops core) and align to it"
@@ -25104,7 +25103,11 @@ async function offerCardMint(kind, payload, flags, deps2, sessionId = null) {
       board,
       artifactId: payload.artifactId,
       anchorTaskId: payload.taskId,
-      noun: mintNoun(ARTIFACT_TYPE_BY_PUSH_KIND[kind] ?? "FINDINGS"),
+      noun: mintNoun(
+        ARTIFACT_TYPE_BY_PUSH_KIND[kind] ?? "FINDINGS"
+      ),
+      // STA-128: the operator's own claim title, when one was given.
+      artifactTitle: flags.title?.trim() || null,
       blocks: Boolean(flags.blocks),
       sessionId
     });
@@ -25128,7 +25131,12 @@ async function findMintBoard(deps2, taskId) {
     const boards = (await callStructured(caller, "list_boards", { workspaceId })).boards.filter((b) => b.kind === "BUGS" && !b.archivedAt);
     const candidates = [
       ...boards,
-      ...task.boardId ? [{ id: String(task.boardId), name: String(task.boardName ?? "board") }] : []
+      ...task.boardId ? [
+        {
+          id: String(task.boardId),
+          name: String(task.boardName ?? "board")
+        }
+      ] : []
     ];
     for (const board of candidates) {
       const columns = (await callStructured(caller, "list_columns", { boardId: board.id })).columns;
@@ -25147,9 +25155,11 @@ async function mintCard(deps2, input) {
       const anchor = await callStructured(caller, "get_task", {
         taskId: input.anchorTaskId
       });
+      const claim = input.artifactTitle?.trim();
       const created = await callStructured(caller, "create_task", {
         columnId: input.board.columnId,
-        title: `${input.noun} from ${String(anchor.key ?? input.anchorTaskId)}`,
+        // The task-title cap is 200 chars; the claim form truncates into it.
+        title: (claim ? `${input.noun}: ${claim}` : `${input.noun} from ${String(anchor.key ?? input.anchorTaskId)}`).slice(0, 200),
         description: `Minted from a ${input.noun.toLowerCase()} artifact pushed on ${String(anchor.key ?? input.anchorTaskId)}. Origin session artifact: ${input.artifactId}.`,
         idempotencyKey: `mint-${input.artifactId}`
       });
@@ -25225,6 +25235,8 @@ async function runMintIssue(flags, deps2) {
       artifactId: flags.artifact,
       anchorTaskId: flags.fromTask,
       noun: mintNoun(type),
+      // STA-128: the stored artifact's claim title rides onto the card.
+      artifactTitle: typeof record3.title === "string" ? record3.title : null,
       blocks: Boolean(flags.blocks),
       sessionId
     });
@@ -25254,7 +25266,10 @@ async function runMintIssue(flags, deps2) {
 function registerMintIssueCommand(artifact, deps2, onExit2) {
   artifact.command("mint-issue").description(
     "Mint a card from a findings/gap/issue artifact: opens a card on the workspace's BUGS board (else the task's own board), links the artifact to it, and relates it back to the source task."
-  ).requiredOption("--artifact <id>", "the findings/gap/issue artifact to link").requiredOption(
+  ).requiredOption(
+    "--artifact <id>",
+    "the findings/gap/issue artifact to link"
+  ).requiredOption(
     "--from-task <id>",
     "the task the artifact was pushed on (the card RELATES_TO it)"
   ).option(
@@ -25332,7 +25347,9 @@ function statusToExit(status) {
 }
 async function runArtifactAttach(filePath, flags, deps2) {
   if (!flags.workspace && !flags.task) {
-    deps2.writeErr("--workspace <id> is required (or --task <id> to resolve it)");
+    deps2.writeErr(
+      "--workspace <id> is required (or --task <id> to resolve it)"
+    );
     return EXIT_CODES.INVALID_INPUT;
   }
   if (flags.kind && !PUSH_KINDS.includes(flags.kind)) {
@@ -25452,7 +25469,12 @@ async function runArtifactAttach(filePath, flags, deps2) {
       });
       const artifact = result.artifact ?? {};
       deps2.writeOut(
-        flags.json ? JSON.stringify({ artifactId: artifact.id ?? null, ...result }) : `Attached artifact ${String(artifact.id ?? "?")} \xB7 ${String(artifact.title ?? filename)} (${type}, ${body.byteLength} bytes)`
+        flags.json ? (
+          // The id at the top level: every other artifact-producing command
+          // answers `artifactId`, and a caller should not have to know which
+          // envelope this one came in.
+          JSON.stringify({ artifactId: artifact.id ?? null, ...result })
+        ) : `Attached artifact ${String(artifact.id ?? "?")} \xB7 ${String(artifact.title ?? filename)} (${type}, ${body.byteLength} bytes)`
       );
       return 0;
     } finally {
@@ -25477,7 +25499,10 @@ function registerArtifactCommand(program3, deps2, onExit2) {
   ).option("--project <id>", "link to a project").option("--task <id>", "link to a task").option("--run <id>", "link to a run").option("--work-order <id>", "link to a Work Order").option("--decision <id>", "link to a decision").option(
     "--kind <kind>",
     `push kind (${PUSH_KINDS.join("|")}) \u2014 files under the same ArtifactType, hence the same work layer, as \`jentrix push\``
-  ).option("--session <id>", "attribute the artifact to a connected session").option("--type <type>", "ArtifactType (default inferred from --kind, else the extension, else DOC)").option("--title <title>", "artifact title (default: the file name)").option("--json", "stable JSON output").action(
+  ).option("--session <id>", "attribute the artifact to a connected session").option(
+    "--type <type>",
+    "ArtifactType (default inferred from --kind, else the extension, else DOC)"
+  ).option("--title <title>", "artifact title (default: the file name)").option("--json", "stable JSON output").action(
     async (file, flags) => onExit2(await runArtifactAttach(file, flags, deps2))
   );
   return artifact;
@@ -26779,7 +26804,8 @@ function mountCommandTree(program3, plan, runtime) {
 var WHOAMI_SCOPE_NOTE = "scope/workspace restrictions are enforced server-side and not introspectable; a FORBIDDEN (exit 3) on a write means the token lacks write/admin scope.";
 function redactToken(token) {
   const hint = token.length > 8 ? `\u2026${token.slice(-4)}` : "\u2026";
-  if (token.startsWith("tmo_")) return { type: "oauth", display: `tmo_${hint}` };
+  if (token.startsWith("tmo_"))
+    return { type: "oauth", display: `tmo_${hint}` };
   if (token.startsWith("tm_")) return { type: "pat", display: `tm_${hint}` };
   return { type: "unknown", display: hint };
 }
@@ -26868,7 +26894,8 @@ async function runWhoamiCommand(flags, deps2) {
   const scrub = (text) => {
     let out = text;
     for (const secret of secrets) {
-      if (out.includes(secret)) out = out.split(secret).join("<redacted token>");
+      if (out.includes(secret))
+        out = out.split(secret).join("<redacted token>");
     }
     return out;
   };
@@ -26963,7 +26990,9 @@ async function runWhoamiCommand(flags, deps2) {
       note: WHOAMI_SCOPE_NOTE
     };
     deps2.writeOut(
-      redact(flags.json === true ? stableStringify(report) : renderHuman(report))
+      redact(
+        flags.json === true ? stableStringify(report) : renderHuman(report)
+      )
     );
     return EXIT_CODES.OK;
   } finally {
@@ -27622,6 +27651,7 @@ function registerPluginCommand(program3, deps2, onExit2) {
 // src/commands/runner.ts
 import { execFile as execFile2, spawn as spawn2 } from "node:child_process";
 import { constants, promises as fs } from "node:fs";
+import { homedir } from "node:os";
 import { delimiter, isAbsolute, resolve as resolve3 } from "node:path";
 var CLI_RUNNER_PROTOCOL_VERSION = 1;
 var RUNNER_TIMEOUT_MS = 35e3;
@@ -27690,6 +27720,16 @@ async function resolveRunnerExecutable(env = process.env) {
   }
   return null;
 }
+async function resolveClaudeExecutable(env = process.env, home = homedir()) {
+  const names = platformExecutableNames("claude");
+  const onPath = await resolveExecutableOnPath(names, env);
+  if (onPath) return onPath;
+  for (const name of names) {
+    const found = await executable(resolve3(home, ".local", "bin", name));
+    if (found) return found;
+  }
+  return null;
+}
 function invokeRunnerProcess(file, args, stdin, timeoutMs = RUNNER_TIMEOUT_MS) {
   if (!isAbsolute(file)) {
     return Promise.reject(new Error("runner executable path must be absolute"));
@@ -28213,8 +28253,9 @@ var RUNTIMES = [
     provider: "claude",
     resolve: (deps2) => deps2.resolveClaude(),
     absent: [
-      "note: the `claude` CLI is not installed \u2014 skipped its plugin.",
-      "      Install Claude Code (https://claude.com/claude-code), then run: jentrix plugin install"
+      "note: the `claude` CLI was not found \u2014 skipped its plugin.",
+      "      Installed already? This terminal's PATH may predate the install \u2014 reopen it and re-run, or run: jentrix plugin install claude",
+      "      Otherwise install Claude Code (https://claude.com/claude-code) first."
     ]
   },
   {
@@ -28732,7 +28773,8 @@ function loadSurface(json) {
   const seen = /* @__PURE__ */ new Set();
   const validated = tools.map((tool, index) => {
     const where = (field) => isRecord9(tool) && typeof tool.name === "string" ? `tool "${tool.name}": ${field}` : `tools[${index}]: ${field}`;
-    if (!isRecord9(tool)) throw new SurfaceError(`tools[${index}] is not an object`);
+    if (!isRecord9(tool))
+      throw new SurfaceError(`tools[${index}] is not an object`);
     if (typeof tool.name !== "string" || tool.name.length === 0) {
       throw new SurfaceError(where("missing or empty `name`"));
     }
@@ -28813,8 +28855,8 @@ function readStdin() {
     process.stdin.on("error", reject);
   });
 }
-var CONFIG_PATH = resolveConfigPath(process.cwd(), homedir());
-var HOME_CONFIG_PATH = configPathFor(homedir());
+var CONFIG_PATH = resolveConfigPath(process.cwd(), homedir2());
+var HOME_CONFIG_PATH = configPathFor(homedir2());
 function configFile() {
   return readConfigFile(CONFIG_PATH);
 }
@@ -29033,7 +29075,7 @@ var sessionDeps = {
       closeSync3(fd);
     }
   },
-  spoolRoot: join6(homedir(), ".config", "stacks", "session-spool")
+  spoolRoot: join6(homedir2(), ".config", "stacks", "session-spool")
 };
 var sessionCommand = registerSessionCommand(program2, sessionDeps, onExit);
 registerSnapshotCommand(sessionCommand, sessionDeps, onExit);
@@ -29047,7 +29089,9 @@ var CODEX_PLUGIN_DIR = fileURLToPath(
 var pluginDeps = {
   resolvePluginDir: () => existsSync6(PLUGIN_DIR) && isPluginMarketplaceDir(PLUGIN_DIR) ? PLUGIN_DIR : null,
   resolveCodexPluginDir: () => existsSync6(CODEX_PLUGIN_DIR) && isCodexPluginMarketplaceDir(CODEX_PLUGIN_DIR) ? CODEX_PLUGIN_DIR : null,
-  resolveClaude: () => resolveExecutableOnPath(platformExecutableNames("claude"), process.env),
+  // STA-133: PATH plus the native installer's ~/.local/bin, so a terminal
+  // whose PATH predates the Claude Code install still finds the binary.
+  resolveClaude: () => resolveClaudeExecutable(process.env),
   resolveCodex: () => resolveExecutableOnPath(platformExecutableNames("codex"), process.env),
   resolveRunner: () => resolveRunnerExecutable(process.env),
   resolveNpm: () => resolveExecutableOnPath(platformExecutableNames("npm"), process.env),
@@ -29158,7 +29202,7 @@ registerSetupCommand(
       }
     },
     login: (flags) => runLoginCommand(flags, loginDeps),
-    codexConfigPath: () => join6(process.env.CODEX_HOME ?? join6(homedir(), ".codex"), "config.toml"),
+    codexConfigPath: () => join6(process.env.CODEX_HOME ?? join6(homedir2(), ".codex"), "config.toml"),
     readTextFile: (path) => existsSync6(path) ? readFileSync7(path, "utf8") : null,
     appendTextFile: (path, text) => {
       mkdirSync4(dirname4(path), { recursive: true });
@@ -29167,7 +29211,7 @@ registerSetupCommand(
     copyFile: (from, to) => copyFileSync(from, to),
     now: () => /* @__PURE__ */ new Date(),
     cwd: () => process.cwd(),
-    homeDir: () => homedir(),
+    homeDir: () => homedir2(),
     git: defaultGitRunner,
     readLine
   },

package/package.json

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