@jentrix/cli 0.5.21 → 0.5.22

package/dist/main.js

@@ -20966,7 +20966,7 @@ function refreshAccessToken(input) {
 
 // src/client.ts
 var CLI_NAME = "stacks-cli";
-var CLI_VERSION = "0.5.21";
+var CLI_VERSION = "0.5.22";
 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) {
@@ -21388,6 +21388,9 @@ function buildAlignDisclosures(catalog) {
   disclosures.push(
     catalog.captureMode === "on" ? "TRACE capture: ON \u2014 the full transcript will be recorded" : "TRACE capture: OFF (MVP default) \u2014 typed artifacts only, no transcript"
   );
+  disclosures.push(
+    catalog.skeletonMode === "on" ? "activity skeleton: ON (default) \u2014 content-free counts/timing (turns, tool names, files-touched), independent of capture; --no-skeleton opts out" : "activity skeleton: OFF \u2014 no counts, no timing, no files-touched; the session's Session activity section will read as not observed"
+  );
   disclosures.push("write the local alignment marker for this checkout");
   const mcp = catalog.mcpConfig;
   if (mcp && mcp.action !== "unchanged") {
@@ -22450,20 +22453,39 @@ function readLiveHostMarker(deps2, sessionId) {
     return null;
   }
 }
-async function waitForHostExit(deps2, sessionId, pid, timeoutMs) {
+async function waitForHostEnd(deps2, sessionId, pid, timeoutMs) {
   const sleep = deps2.sleep ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
-  const path = join2(deps2.spoolRoot, sessionId, "host.json");
+  const dir = join2(deps2.spoolRoot, sessionId);
+  const path = join2(dir, "host.json");
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
     await sleep(500);
+    const refusal = readEndRefusal(deps2, sessionId);
+    if (refusal) return { kind: "refused", message: refusal };
     try {
       const marker = JSON.parse(readFileSync2(path, "utf8"));
-      if (marker.exitedAt) return true;
+      if (marker.exitedAt) return { kind: "exited" };
     } catch {
     }
-    if (!(deps2.isPidAlive ?? defaultIsPidAlive)(pid)) return false;
+    if (!(deps2.isPidAlive ?? defaultIsPidAlive)(pid)) return { kind: "gone" };
+  }
+  return { kind: "gone" };
+}
+function readEndRefusal(deps2, sessionId) {
+  try {
+    const marker = JSON.parse(
+      readFileSync2(join2(deps2.spoolRoot, sessionId, "end-refusal.json"), "utf8")
+    );
+    return typeof marker.message === "string" && marker.message.trim() ? marker.message : null;
+  } catch {
+    return null;
+  }
+}
+function clearEndRefusal(deps2, sessionId) {
+  try {
+    unlinkSync(join2(deps2.spoolRoot, sessionId, "end-refusal.json"));
+  } catch {
   }
-  return false;
 }
 function localCaptureLines(deps2, sessionId, serverStatus) {
   const dir = join2(deps2.spoolRoot, sessionId);
@@ -23163,14 +23185,12 @@ async function buildAttestedDiffBody(git, root, startHead, endHead, dirty) {
     }
     body = notice + kept;
   }
+  let uncommitted = null;
   if (dirty) {
     const delta = await git(["diff", "--stat", "HEAD"], root);
-    body += `
-
-Uncommitted delta at end (stat only \u2014 not part of the attested range):
-${delta.code === 0 && delta.stdout.trim() ? delta.stdout : "(unreadable or empty)"}`;
+    uncommitted = delta.code === 0 && delta.stdout.trim() ? delta.stdout.trim() : null;
   }
-  return { body: header + body, commitCount };
+  return { body: header + body, commitCount, uncommitted };
 }
 async function postAttestedArtifact(deps2, sessionId, input) {
   const credentials = deps2.resolveTarget();
@@ -23298,6 +23318,12 @@ async function runSessionEnd(sessionIdFlag, flags, deps2) {
               deps2.writeOut(
                 `Attested diff pushed \u2192 artifact ${pushed.artifactId ?? "(unknown)"} (${built.commitCount} commit(s), source: cli)`
               );
+              if (built.uncommitted) {
+                deps2.writeOut(
+                  `note: uncommitted delta at end (stat only \u2014 not part of the attested range):
+${built.uncommitted}`
+                );
+              }
             } else {
               deps2.writeErr(
                 `note: attested diff push failed (${pushed.detail}) \u2014 the E1 delivery check will refuse the close; retry \`jentrix session end\`, or acknowledge with --acknowledge-evidence-gaps.`
@@ -23320,21 +23346,32 @@ async function runSessionEnd(sessionIdFlag, flags, deps2) {
       };
       const live = readLiveHostMarker(deps2, sessionId);
       if (live) {
+        clearEndRefusal(deps2, sessionId);
         writeFileSync2(
           join2(deps2.spoolRoot, sessionId, "end-request.json"),
-          JSON.stringify({ requestedAt: (/* @__PURE__ */ new Date()).toISOString() }),
+          JSON.stringify({
+            requestedAt: (/* @__PURE__ */ new Date()).toISOString(),
+            // JEN-167: the host closes the session, so the operator's
+            // acknowledgement has to travel with the request — otherwise the
+            // floor refuses a close they explicitly asked to force. The
+            // CLI-counted commits ride along for the same reason: only the
+            // CLI can count them, and the host's close is the one that lands.
+            ...flags.acknowledgeEvidenceGaps ? { acknowledgeEvidenceGaps: true } : {},
+            ...commitCount !== null ? { commitCount } : {}
+          }),
           { mode: 384 }
         );
         deps2.writeOut(
           `Local capture host (pid ${live.pid}) is finalizing capture\u2026`
         );
-        const finished = await waitForHostExit(
-          deps2,
-          sessionId,
-          live.pid,
-          9e4
-        );
-        if (finished) {
+        const outcome = await waitForHostEnd(deps2, sessionId, live.pid, 9e4);
+        if (outcome.kind === "refused") {
+          deps2.writeErr(
+            `local capture host (pid ${live.pid}) is still running \u2014 the skeleton, heartbeats and telemetry keep accumulating through the comply work; re-run \`jentrix session end ${sessionId}\` once the evidence is pushed`
+          );
+          throw new Error(outcome.message);
+        }
+        if (outcome.kind === "exited") {
           const final = await call(caller, "get_agent_session", { sessionId });
           const stillOpen = final.status === "STARTING" || final.status === "ACTIVE";
           if (!stillOpen) {
@@ -24185,6 +24222,9 @@ async function buildCatalog(caller, flags, detection) {
     // checkout root); defaults here are the no-live-host reading.
     liveHostPid: null,
     captureMode: decideCaptureMode(flags.capture, false),
+    // JEN-169: only `--no-skeleton` acts (the same rule submit applies at
+    // line ~1273), so the disclosure needs no server round trip.
+    skeletonMode: flags.skeleton === false ? "off" : "on",
     producer: producerFromFlags(flags),
     tokenBudget: budgetFromFlags(flags),
     preconditionNotices: [],
@@ -26574,6 +26614,10 @@ function parseArgsJson(raw, source) {
   }
   return { ok: true, value: parsed };
 }
+function workspaceIdShapeError(value) {
+  if (/^[a-z0-9]{20,}$/.test(value)) return null;
+  return `workspaceId "${value}" is not a workspace id (ids look like "cmt2cuhyo000004l38ddsim1y"). Find yours with \`jentrix workspace list\`, set it once as \`defaults.workspace\` in the config file, or use \`jentrix align --workspace <id-or-slug>\` \u2014 align is the command that accepts a slug.`;
+}
 async function runToolCommand(name, flags, deps2) {
   const maxWaitSeconds = Number(flags.maxWait);
   if (!Number.isFinite(maxWaitSeconds) || maxWaitSeconds < 0) {
@@ -26610,6 +26654,14 @@ async function runToolCommand(name, flags, deps2) {
     deps2.writeErr(`error: ${parsed.error}`);
     return EXIT_CODES.INVALID_INPUT;
   }
+  const workspaceId = parsed.value.workspaceId;
+  if (typeof workspaceId === "string") {
+    const shapeError = workspaceIdShapeError(workspaceId);
+    if (shapeError) {
+      deps2.writeErr(`error: ${shapeError}`);
+      return EXIT_CODES.INVALID_INPUT;
+    }
+  }
   let config2;
   try {
     config2 = resolveConfig({

package/package.json

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