@ricsam/r5dctl 0.0.71 → 0.0.72

package/README.md

@@ -71,10 +71,12 @@ r5dctl -s <session-id> conversation --system           # include system prompt m
 r5dctl -s <session-id> conversation --raw --tools --system  # exact raw agent request transcript
 r5dctl -s <session-id> conversation -f                  # print current transcript, then follow new output (--watch also works)
 r5dctl conversation overview <session-id>               # dialogue/thinking with tool work omitted
+r5dctl conversation overview <session-id> --skeleton     # user messages, decisions, and per-turn work markers only
 r5dctl conversation inspect-node <session-id> <node-id>  # raw persisted node plus traversal metadata
 r5dctl conversation inspect-work <session-id> <work-id> # compact call list for one omitted turn
 r5dctl conversation inspect-work <session-id> <work-id> --summary
-r5dctl conversation inspect-work <session-id> <work-id> --full
+r5dctl conversation inspect-work <session-id> <work-id> --full --calls 12-20
+r5dctl conversation inspect-work <session-id> <work-id> --include-polls
 r5dctl conversation move-head <session-id> <node-id>     # rewind or replay the transcript; files stay put
 r5dctl conversation fork <session-id> <node-id>          # copy the branch up to a node into a new session
 r5dctl conversation fork <session-id> <node-id> --name "Retry with tests"
@@ -107,7 +109,7 @@ r5dctl k8s usage --window 7d
 r5dctl k8s usage --workload default/api --window 7d --json
 ```
 
-`session start` creates an ordinary agent-mode chat on an explicitly selected existing worktree, or creates a named worktree from an explicit `worktree:<branch>` source. It requires project, worker, model, and prompt and never infers them from the current shell. Starts and prompts return after durable enqueue while execution continues asynchronously. Task specialization belongs in the prompt; there are no predefined debug, explore, research, or test agents.
+`session start` creates an ordinary agent-mode chat on an explicitly selected existing worktree, or creates a named worktree from an explicit `worktree:<branch>` source. It requires project, worker, model, and prompt and never infers them from the current shell. Starts and prompts return after durable enqueue while execution continues asynchronously. Task specialization belongs in the prompt; there are no predefined debug, explore, research, or test agents. `session stop` returns as soon as the agent run is stopped; the stopped worktree's workspace publication finishes asynchronously behind the response, and `merge` republishes at its own boundary before reading the worktree.
 
 Add `-f`/`--follow`/`--watch` to `session start` to attach after enqueue, or to `conversation` to print the current transcript and follow new output. Assistant text is written to stdout and lifecycle/tool progress to stderr; `--tools` includes tool calls and results. With global `--json`, follow mode emits one JSON event per line. Ctrl-C only detaches and never stops the session. The CLI reconnects transiently interrupted event streams and resynchronizes committed conversation revisions without repeating assistant text.
 
@@ -132,7 +134,11 @@ Conversation output is human-readable by default and excludes both the system pr
 
 When available, conversation rendering uses the newest complete persisted model-request snapshot on the active conversation branch, so its mode, tier, model, thinking mode, tools, and messages reflect the request that actually ran. Legacy or empty sessions without snapshots fall back to reconstruction from the latest conversation context.
 
-`conversation overview` is a deterministic active-branch projection for recovering earlier work after a fresh-context boundary. It keeps user messages, injected context, assistant thinking/commentary/final responses, and user decisions, while replacing each turn's tool batches with a stable work ID and numbered call ranges. Adjacent tool batches with no visible content between them are coalesced into one range. Use `conversation inspect-work` with that session and work ID to inspect the omitted calls. Inspection is compact by default; `--summary` adds bounded targets/outcomes and `--full` renders persisted inputs and results with the normal tool renderers. The explicit `--compact`, `--summary`, and `--full` flags are mutually exclusive. Compact and summary output are designed to be narrowed with `grep`, `head`, `tail`, `sed`, or `cat -n`.
+`conversation overview` is a deterministic active-branch projection for recovering earlier work after a fresh-context boundary. It keeps user messages, injected context, assistant thinking/commentary/final responses, and user decisions, while replacing each turn's tool batches with a stable work ID and numbered call ranges. Adjacent tool batches with no visible content between them are coalesced into one range. `--skeleton` drops thinking and commentary too, keeping only dialogue, questions/answers, terminal responses, and one work marker per turn — the fastest first read of a long session. When the last turn is unfinished, both views end with a `[Turn in progress: ...]` footer naming the pending state and last node, so "still running" is distinguishable from "ended without a response".
+
+Use `conversation inspect-work` with that session and work ID to inspect the omitted calls. Inspection is compact by default; `--summary` adds bounded targets/outcomes and `--full` renders persisted inputs and results with the normal tool renderers. The explicit `--compact`, `--summary`, and `--full` flags are mutually exclusive. `--calls <n[-m]>` selects a server-side call range while keeping the original call numbers, so a `calls 83–90 omitted` marker in the overview can be inspected directly. Compact and summary output are designed to be narrowed with `grep`, `head`, `tail`, `sed`, or `cat -n`.
+
+Persisted shell results are dispatch-time snapshots, so a long-running command's stored status can go stale. Rendering joins each unresolved run against the durable process-run store: summary rows gain `final_status=`/`final_exitCode=` next to the stale snapshot fields, `--full` appends a `## Final process outcomes` section with byte counts and output tails, and `shell_poll` calls whose run already finished are folded into one `[calls N–M folded: ...]` annotation carrying the final status. `--include-polls` restores the raw poll rows; call numbering never changes either way.
 
 `conversation inspect-node` reads one exact persisted conversation node as formatted JSON. Its header includes the previous node, every direct next node, the next node on the active branch, whether the selected node is active, and the containing `work_...` ID when one is available. This allows callers that start with only a copied chat node ID to traverse nearby nodes or zoom out with `conversation inspect-work`.
 

package/dist/cjs/cli.cjs

@@ -47,8 +47,9 @@ __export(cli_exports, {
   parseAnswerFlags: () => parseAnswerFlags,
   parseAnswerQuestionsCommandArgs: () => parseAnswerQuestionsCommandArgs,
   parseConversationForkArgs: () => parseConversationForkArgs,
+  parseConversationInspectWorkArgs: () => parseConversationInspectWorkArgs,
+  parseConversationOverviewArgs: () => parseConversationOverviewArgs,
   parseConversationRenderArgs: () => parseConversationRenderArgs,
-  parseConversationWorkDetailArgs: () => parseConversationWorkDetailArgs,
   parseEnvFlags: () => parseEnvFlags,
   parseEnvRequestResponseArgs: () => parseEnvRequestResponseArgs,
   parseGetEnvsArgs: () => parseGetEnvsArgs,
@@ -251,8 +252,8 @@ const SHARED_HELP_ENTRIES = [
   },
   {
     section: "sessions",
-    usage: "conversation overview <session-id>",
-    description: "Read dialogue and thinking while replacing tool work with inspectable ranges."
+    usage: "conversation overview <session-id> [--skeleton]",
+    description: "Read dialogue and thinking while replacing tool work with inspectable ranges; --skeleton keeps only dialogue, decisions, and per-turn work markers."
   },
   {
     section: "sessions",
@@ -261,8 +262,8 @@ const SHARED_HELP_ENTRIES = [
   },
   {
     section: "sessions",
-    usage: "conversation inspect-work <session-id> <work-id> [--compact|--summary|--full]",
-    description: "Inspect one turn's omitted tool work at the selected detail."
+    usage: "conversation inspect-work <session-id> <work-id> [--compact|--summary|--full] [--calls <n[-m]>] [--include-polls]",
+    description: "Inspect one turn's omitted tool work at the selected detail; finished shell polls are folded unless --include-polls."
   },
   {
     section: "sessions",
@@ -2422,21 +2423,57 @@ async function followR5dctlSession(client, sessionId, options) {
   }
   return 0;
 }
-function parseConversationWorkDetailArgs(args) {
+function parseConversationInspectWorkArgs(args) {
   let detail = "compact";
   let selected = false;
-  for (const arg of args) {
+  let calls;
+  let includePolls = false;
+  for (let index = 0; index < args.length; index += 1) {
+    const arg = args[index];
     const candidate = arg === "--compact" ? "compact" : arg === "--summary" ? "summary" : arg === "--full" ? "full" : void 0;
-    if (!candidate) {
-      throw new Error(`Unknown inspect-work argument: ${arg}`);
+    if (candidate) {
+      if (selected) {
+        throw new Error("Use only one of --compact, --summary, or --full");
+      }
+      detail = candidate;
+      selected = true;
+      continue;
+    }
+    if (arg === "--calls") {
+      if (calls !== void 0) {
+        throw new Error("Use --calls only once");
+      }
+      index += 1;
+      const value = requireValue(args[index], "Missing value for --calls");
+      if (!/^[0-9]+(-[0-9]+)?$/.test(value)) {
+        throw new Error(`Invalid --calls range: ${value} (use N or N-M)`);
+      }
+      calls = value;
+      continue;
     }
-    if (selected) {
-      throw new Error("Use only one of --compact, --summary, or --full");
+    if (arg === "--include-polls") {
+      if (includePolls) {
+        throw new Error("Use --include-polls only once");
+      }
+      includePolls = true;
+      continue;
     }
-    detail = candidate;
-    selected = true;
+    throw new Error(`Unknown inspect-work argument: ${arg}`);
   }
-  return detail;
+  return { detail, ...calls !== void 0 ? { calls } : {}, includePolls };
+}
+function parseConversationOverviewArgs(args) {
+  let skeleton = false;
+  for (const arg of args) {
+    if (arg !== "--skeleton") {
+      throw new Error(`Unknown conversation overview argument: ${arg}`);
+    }
+    if (skeleton) {
+      throw new Error("Use --skeleton only once");
+    }
+    skeleton = true;
+  }
+  return { skeleton };
 }
 function parseConversationForkArgs(args) {
   let name;
@@ -2665,10 +2702,9 @@ Sessions: ${result.sessions.length}
     return;
   }
   if (first === "conversation" && second === "overview") {
-    if (args.length > 3) {
-      throw new Error(`Unexpected conversation overview argument: ${args[3]}`);
-    }
-    const read = await client.sessions.conversationOverview(requireValue(args[2], "Missing session id"));
+    const sessionId = requireValue(args[2], "Missing session id");
+    const { skeleton } = parseConversationOverviewArgs(args.slice(3));
+    const read = await client.sessions.conversationOverview(sessionId, skeleton ? { view: "skeleton" } : {});
     write(read, renderConversationOverviewResponse(read));
     return;
   }
@@ -2703,8 +2739,12 @@ Sessions: ${result.sessions.length}
   if (first === "conversation" && second === "inspect-work") {
     const sessionId = requireValue(args[2], "Missing session id");
     const workId = requireValue(args[3], "Missing work id");
-    const detail = parseConversationWorkDetailArgs(args.slice(4));
-    const read = await client.sessions.inspectConversationWork(sessionId, workId, { detail });
+    const options = parseConversationInspectWorkArgs(args.slice(4));
+    const read = await client.sessions.inspectConversationWork(sessionId, workId, {
+      detail: options.detail,
+      ...options.calls !== void 0 ? { calls: options.calls } : {},
+      ...options.includePolls ? { polls: "include" } : {}
+    });
     write(read, renderConversationWorkResponse(read));
     return;
   }
@@ -3220,6 +3260,14 @@ async function runCommand(argv) {
     return 0;
   }
   if (execution.kind === "session-run") {
+    if (!options.json) {
+      if (execution.command.kind === "start") {
+        process.stderr.write("Starting session (publishing the workspace and provisioning the worktree)...\n");
+      } else if (execution.command.kind === "stop") {
+        process.stderr.write(`Stopping session ${execution.command.sessionId}...
+`);
+      }
+    }
     const result = await dispatchSessionRunCommand(client, execution.command);
     if (execution.command.kind !== "start" || !execution.command.follow) {
       writeDataOutput(options.json, result.data, result.human);
@@ -3317,8 +3365,9 @@ async function main(argv = process.argv.slice(2)) {
   parseAnswerFlags,
   parseAnswerQuestionsCommandArgs,
   parseConversationForkArgs,
+  parseConversationInspectWorkArgs,
+  parseConversationOverviewArgs,
   parseConversationRenderArgs,
-  parseConversationWorkDetailArgs,
   parseEnvFlags,
   parseEnvRequestResponseArgs,
   parseGetEnvsArgs,

package/dist/cjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.71",
+  "version": "0.0.72",
   "type": "commonjs"
 }

package/dist/mjs/cli.mjs

@@ -167,8 +167,8 @@ const SHARED_HELP_ENTRIES = [
   },
   {
     section: "sessions",
-    usage: "conversation overview <session-id>",
-    description: "Read dialogue and thinking while replacing tool work with inspectable ranges."
+    usage: "conversation overview <session-id> [--skeleton]",
+    description: "Read dialogue and thinking while replacing tool work with inspectable ranges; --skeleton keeps only dialogue, decisions, and per-turn work markers."
   },
   {
     section: "sessions",
@@ -177,8 +177,8 @@ const SHARED_HELP_ENTRIES = [
   },
   {
     section: "sessions",
-    usage: "conversation inspect-work <session-id> <work-id> [--compact|--summary|--full]",
-    description: "Inspect one turn's omitted tool work at the selected detail."
+    usage: "conversation inspect-work <session-id> <work-id> [--compact|--summary|--full] [--calls <n[-m]>] [--include-polls]",
+    description: "Inspect one turn's omitted tool work at the selected detail; finished shell polls are folded unless --include-polls."
   },
   {
     section: "sessions",
@@ -2338,21 +2338,57 @@ async function followR5dctlSession(client, sessionId, options) {
   }
   return 0;
 }
-function parseConversationWorkDetailArgs(args) {
+function parseConversationInspectWorkArgs(args) {
   let detail = "compact";
   let selected = false;
-  for (const arg of args) {
+  let calls;
+  let includePolls = false;
+  for (let index = 0; index < args.length; index += 1) {
+    const arg = args[index];
     const candidate = arg === "--compact" ? "compact" : arg === "--summary" ? "summary" : arg === "--full" ? "full" : void 0;
-    if (!candidate) {
-      throw new Error(`Unknown inspect-work argument: ${arg}`);
+    if (candidate) {
+      if (selected) {
+        throw new Error("Use only one of --compact, --summary, or --full");
+      }
+      detail = candidate;
+      selected = true;
+      continue;
+    }
+    if (arg === "--calls") {
+      if (calls !== void 0) {
+        throw new Error("Use --calls only once");
+      }
+      index += 1;
+      const value = requireValue(args[index], "Missing value for --calls");
+      if (!/^[0-9]+(-[0-9]+)?$/.test(value)) {
+        throw new Error(`Invalid --calls range: ${value} (use N or N-M)`);
+      }
+      calls = value;
+      continue;
     }
-    if (selected) {
-      throw new Error("Use only one of --compact, --summary, or --full");
+    if (arg === "--include-polls") {
+      if (includePolls) {
+        throw new Error("Use --include-polls only once");
+      }
+      includePolls = true;
+      continue;
     }
-    detail = candidate;
-    selected = true;
+    throw new Error(`Unknown inspect-work argument: ${arg}`);
   }
-  return detail;
+  return { detail, ...calls !== void 0 ? { calls } : {}, includePolls };
+}
+function parseConversationOverviewArgs(args) {
+  let skeleton = false;
+  for (const arg of args) {
+    if (arg !== "--skeleton") {
+      throw new Error(`Unknown conversation overview argument: ${arg}`);
+    }
+    if (skeleton) {
+      throw new Error("Use --skeleton only once");
+    }
+    skeleton = true;
+  }
+  return { skeleton };
 }
 function parseConversationForkArgs(args) {
   let name;
@@ -2581,10 +2617,9 @@ Sessions: ${result.sessions.length}
     return;
   }
   if (first === "conversation" && second === "overview") {
-    if (args.length > 3) {
-      throw new Error(`Unexpected conversation overview argument: ${args[3]}`);
-    }
-    const read = await client.sessions.conversationOverview(requireValue(args[2], "Missing session id"));
+    const sessionId = requireValue(args[2], "Missing session id");
+    const { skeleton } = parseConversationOverviewArgs(args.slice(3));
+    const read = await client.sessions.conversationOverview(sessionId, skeleton ? { view: "skeleton" } : {});
     write(read, renderConversationOverviewResponse(read));
     return;
   }
@@ -2619,8 +2654,12 @@ Sessions: ${result.sessions.length}
   if (first === "conversation" && second === "inspect-work") {
     const sessionId = requireValue(args[2], "Missing session id");
     const workId = requireValue(args[3], "Missing work id");
-    const detail = parseConversationWorkDetailArgs(args.slice(4));
-    const read = await client.sessions.inspectConversationWork(sessionId, workId, { detail });
+    const options = parseConversationInspectWorkArgs(args.slice(4));
+    const read = await client.sessions.inspectConversationWork(sessionId, workId, {
+      detail: options.detail,
+      ...options.calls !== void 0 ? { calls: options.calls } : {},
+      ...options.includePolls ? { polls: "include" } : {}
+    });
     write(read, renderConversationWorkResponse(read));
     return;
   }
@@ -3136,6 +3175,14 @@ async function runCommand(argv) {
     return 0;
   }
   if (execution.kind === "session-run") {
+    if (!options.json) {
+      if (execution.command.kind === "start") {
+        process.stderr.write("Starting session (publishing the workspace and provisioning the worktree)...\n");
+      } else if (execution.command.kind === "stop") {
+        process.stderr.write(`Stopping session ${execution.command.sessionId}...
+`);
+      }
+    }
     const result = await dispatchSessionRunCommand(client, execution.command);
     if (execution.command.kind !== "start" || !execution.command.follow) {
       writeDataOutput(options.json, result.data, result.human);
@@ -3232,8 +3279,9 @@ export {
   parseAnswerFlags,
   parseAnswerQuestionsCommandArgs,
   parseConversationForkArgs,
+  parseConversationInspectWorkArgs,
+  parseConversationOverviewArgs,
   parseConversationRenderArgs,
-  parseConversationWorkDetailArgs,
   parseEnvFlags,
   parseEnvRequestResponseArgs,
   parseGetEnvsArgs,

package/dist/mjs/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.71",
+  "version": "0.0.72",
   "type": "module"
 }

package/dist/types/cli.d.ts

@@ -298,7 +298,15 @@ export type R5dctlFollowOptions = {
     maxReconnects?: number;
 };
 export declare function followR5dctlSession(client: R5dctlFollowClient, sessionId: string, options: R5dctlFollowOptions): Promise<number>;
-export declare function parseConversationWorkDetailArgs(args: string[]): R5dctlConversationWorkDetail;
+export type ConversationInspectWorkOptions = {
+    detail: R5dctlConversationWorkDetail;
+    calls?: string;
+    includePolls: boolean;
+};
+export declare function parseConversationInspectWorkArgs(args: string[]): ConversationInspectWorkOptions;
+export declare function parseConversationOverviewArgs(args: string[]): {
+    skeleton: boolean;
+};
 export declare function parseConversationForkArgs(args: string[]): string | undefined;
 export declare function renderConversationOverviewResponse(read: R5dctlConversationOverviewResponse): string;
 export declare function renderConversationNodeResponse(read: R5dctlConversationNodeResponse): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5dctl",
-  "version": "0.0.71",
+  "version": "0.0.72",
   "type": "module",
   "main": "./dist/cjs/cli.cjs",
   "module": "./dist/mjs/cli.mjs",
@@ -26,7 +26,7 @@
     "r5dctl": "dist/cjs/main.cjs"
   },
   "dependencies": {
-    "@ricsam/r5d-api": "^0.0.71",
+    "@ricsam/r5d-api": "^0.0.72",
     "dotenv": "^17",
     "qrcode": "^1.5.4",
     "ws": "^8.18.3"