@ordewell/cli 0.10.0 → 0.10.1

package/dist/main.js

@@ -2385,11 +2385,26 @@ function approvalKeysLine(block, cols) {
 }
 function checkpointCardLines(order, question, cols, approvalFirst) {
   const room = Math.max(1, cols - 2);
-  const keys = approvalFirst ? "answer the tool request above first (ctrl-y / ctrl-g), then ctrl-y approves \xB7 ctrl-g rejects (composer text is the reason)" : "ctrl-y approve \xB7 ctrl-g reject (composer text is the reason)";
+  const first = approvalFirst ? wrap("answer the tool request above first (ctrl-y / ctrl-g), then:", room) : [];
   return [
     truncate(`${style.accent("\u25C6")} ${style.bold(`Task ${order} asks`)}`, cols),
     ...wrap(sanitize(question).trim(), room).map((line) => `  ${line}`),
-    ...wrap(keys, room).map((line) => style.grey(`  ${line}`))
+    ...first.map((line) => style.grey(`  ${line}`)),
+    ...CHECKPOINT_CHOICES.flatMap(([key, text]) => choiceLines(key, text, room))
+  ];
+}
+var CHECKPOINT_CHOICES = [
+  ["enter", "reply: the task goes on with what you typed"],
+  ["ctrl-y", "approve as is"],
+  ["ctrl-g", "reject (with nothing typed, a plain no)"]
+];
+var CHOICE_KEY_WIDTH = 6;
+function choiceLines(key, text, room) {
+  const hang = CHOICE_KEY_WIDTH + 2;
+  const [head = "", ...rest] = wrap(text, Math.max(1, room - hang));
+  return [
+    `  ${style.accent(style.bold(pad(key, CHOICE_KEY_WIDTH)))}  ${style.grey(head)}`,
+    ...rest.map((line) => `  ${" ".repeat(hang)}${style.grey(line)}`)
   ];
 }
 var COMMAND_PAINT = {
@@ -4485,6 +4500,7 @@ var SLASH_COMMANDS = [
   { name: "cancel", usage: "/cancel <id>", description: "Kill a running task", category: "tasks" },
   { name: "force-start", usage: "/force-start <id>", description: "Start a task now, ignoring dependencies", category: "tasks" },
   { name: "continue", usage: "/continue <id> <message>", description: "Continue a finished task in its saved runner session, with your message", category: "tasks" },
+  { name: "open", usage: "/open <id>", description: "Open a task's view: its log, and the keys that answer its checkpoint or tool request", category: "tasks" },
   { name: "checkpoint", usage: "/checkpoint <id> approve|reject [reason]", description: "Answer the checkpoint a task waits at: approve lets it go on, reject tells it why not", category: "tasks" },
   { name: "task-runner", usage: "/task-runner <id> [runner]", description: "Choose or set a task's executor (re-picks its model and mode)", category: "tasks" },
   { name: "task-model", usage: "/task-model <id> [model]", description: "Choose or set a task's executor model", category: "tasks" },
@@ -4830,7 +4846,12 @@ var PLAN_KEYS = {
   move: { keys: "up / down", meaning: "move between tasks", group: "Navigation" },
   scroll: { keys: "pgup / pgdn", meaning: "scroll the plan", group: "Navigation" },
   expand: { keys: "\u2192", meaning: "reveal a task's subtasks, then edit its prompt", group: "Navigation", hint: "\u2192 expand" },
-  log: { keys: "enter", meaning: "open the task's log and message its runner", group: "Navigation", hint: "enter log" },
+  log: {
+    keys: "enter",
+    meaning: "open the task's log and message its runner \u2014 or, at a checkpoint, answer it",
+    group: "Navigation",
+    hint: (task) => task?.status === "awaiting_user" && task.awaitingReason === "checkpoint" ? "enter answer" : "enter log"
+  },
   back: { keys: "esc", meaning: "collapse the task, or leave a task's log for the plan", group: "Navigation" },
   runner: { keys: "R", meaning: "pick the task's runner", group: "Assign" },
   model: { keys: "o", meaning: "pick the task's model", group: "Assign", hint: "o model" },
@@ -4931,6 +4952,7 @@ function footerHints(state) {
   const taskSends = !!tv && tv.view.working && !!state.editor.text.trim() && !continuesTask(findTask(state.tasks, tv.taskId));
   const sendNowHint = planning || taskSends ? "ctrl-s send now" : null;
   const stopRunnerHint = runnerStoppable(state) ? "ctrl-x stop runner" : null;
+  const checkpointHints = tv && waitingCheckpoint(findTask(state.tasks, tv.taskId)) && !waitingApproval(tv) ? ["enter reply", "ctrl-y approve", "ctrl-g reject"] : [];
   if (state.focus === "plan") {
     if (state.taskEditor) {
       return ["type to edit prompt", "pgup/pgdn scroll", "alt-enter newline", "enter save", "esc cancel"];
@@ -4940,6 +4962,7 @@ function footerHints(state) {
   const detailHint = (0, import_core30.hasHiddenDetail)(state.taskView ? state.taskView.view.blocks : state.conversation.blocks) ? [state.detailAll ? "ctrl-o collapse all" : "ctrl-o expand all"] : [];
   return [
     "/help",
+    ...checkpointHints,
     ...stopRunnerHint ? [stopRunnerHint] : [],
     "tab plan",
     ...detailHint,
@@ -5013,7 +5036,7 @@ function taskHeaderLines(state, tv, cols) {
     taskActivity(task, tv.view.working)
   ].filter(Boolean);
   const approval = waitingApproval(tv);
-  const hint = approval ? ["ctrl-y allow", ...approval.allowForTask ? ["ctrl-t allow for task"] : [], "ctrl-g deny (composer text is the note)"] : waitingCheckpoint(task) ? ["ctrl-y approve", "ctrl-g reject (composer text is the reason)", "ctrl-x stop runner"] : task && (0, import_core30.resumeLabel)(task) ? ["ctrl-x don't resume"] : [...runnerStoppable(state) ? ["ctrl-x stop runner"] : [], "ctrl-r remove queued", "ctrl-s send now"];
+  const hint = approval ? ["ctrl-y allow", ...approval.allowForTask ? ["ctrl-t allow for task"] : [], "ctrl-g deny (composer text is the note)"] : waitingCheckpoint(task) ? ["enter reply", "ctrl-y approve", "ctrl-g reject", "ctrl-x stop runner"] : task && (0, import_core30.resumeLabel)(task) ? ["ctrl-x don't resume"] : [...runnerStoppable(state) ? ["ctrl-x stop runner"] : [], "ctrl-r remove queued", "ctrl-s send now"];
   if (approval && waitingCheckpoint(task)) hint.push("then the checkpoint");
   const index = tv.attempts.indexOf(tv.attempt);
   if (tv.attempts.length > 1) hint.push(`alt\u2190/\u2192 attempt ${index >= 0 ? index + 1 : 1}/${tv.attempts.length}`);
@@ -5515,7 +5538,7 @@ function commandSheetBody(cols) {
     style.grey("  ctrl-n/ctrl-p pick a pending message (the newest until you do) \xB7 ctrl-r removes a queued one"),
     style.grey("  ctrl-x stops the runner's running turn, and it then waits for your next message \u2014 on a task paused on a usage limit, it keeps it from resuming"),
     style.grey("  ctrl-y allows a tool request (its keys sit under it) \xB7 ctrl-t allows it for the task \xB7 ctrl-g denies it, with the composer text as the note"),
-    style.grey("  at a checkpoint, ctrl-y approves and ctrl-g rejects, with the composer text as the reason \xB7 /checkpoint <id> approve|reject [reason] from anywhere"),
+    style.grey("  at a checkpoint, enter replies with what you typed, ctrl-y approves, ctrl-g rejects (the text is its reason) \xB7 /checkpoint <id> approve|reject [reason] from anywhere"),
     style.grey("  alt\u2190/\u2192 changes attempt \xB7 esc returns")
   );
   return body;
@@ -6398,13 +6421,14 @@ function taskLogArrived(state, action) {
 function announceApprovals(state, action) {
   if (state.taskView?.taskId === action.taskId) return state;
   const task = findTask(state.tasks, action.taskId);
-  const spoken = action.events.reduce((s, event) => event.type === "approval_requested" && !event.decided ? say(s, "system", `Task ${task?.order ?? "?"} waits for approval: ${(0, import_core35.runnerToolSubject)(event.tool, event.args)} \u2014 enter on it, then ctrl-y to allow or ctrl-g to deny`) : s, state);
+  const way = task ? `tab to the plan, select task ${task.order} and press enter (or /open ${task.order})` : "tab to the plan, select it and press enter";
+  const spoken = action.events.reduce((s, event) => event.type === "approval_requested" && !event.decided ? say(s, "system", `Task ${task?.order ?? "?"} waits for approval: ${(0, import_core35.runnerToolSubject)(event.tool, event.args)} \u2014 ${way}, then ctrl-y allows or ctrl-g denies`) : s, state);
   return spoken !== state ? { ...spoken, scroll: state.scroll } : spoken;
 }
 function announceCheckpoint(state, action) {
   const task = findTask(state.tasks, action.taskId) ?? state.tasks.find((t) => t.title === action.title);
   const label = task ? `Task ${task.order}` : action.title;
-  const where = "enter on it to answer";
+  const where = task ? `tab to the plan, select task ${task.order} and press enter (or /open ${task.order}) to answer` : "tab to the plan, select it and press enter to answer";
   const spoken = say(state, "system", `${label} asks: ${(0, import_core35.truncateCheckpointSummary)(action.summary)} \u2014 ${where}`);
   return { ...spoken, scroll: state.scroll };
 }
@@ -7385,6 +7409,8 @@ function runCommand(state, { name, args }) {
         if (!text) return fail3(state, "Usage: /continue <id> <message>");
         return continueTaskStep(state, sessionId, taskId, text);
       });
+    case "open":
+      return taskCommand(state, args[0], (sessionId, taskId) => openTaskView(state, sessionId, taskId));
     case "checkpoint":
       return taskCommand(state, args[0], (sessionId, taskId) => {
         const answer = args[1]?.toLowerCase();
@@ -8257,6 +8283,12 @@ function submit(state) {
       return step({ ...cleared, taskView: { ...state.taskView, notice } });
     }
     if (state.taskView.notice) cleared.taskView = { ...state.taskView, notice: void 0 };
+    if (!command && waitingCheckpoint(task)) {
+      if (waitingApproval(state.taskView)) {
+        return step(say(state, "system", "A tool request is waiting ahead of the checkpoint \u2014 answer it first (ctrl-y to allow, ctrl-g to deny), then enter replies to the checkpoint."));
+      }
+      return answerCheckpoint(cleared, state.sessionId, taskId, "reject", text);
+    }
     if (continuesTask(task)) return continueTaskStep(cleared, state.sessionId, taskId, text);
     if (command && offered2.length > 0) return step(cleared, [{ type: "invokeTaskCommand", sessionId: state.sessionId, taskId, ...command }]);
     return step(cleared, [{ type: "sendTaskMessage", sessionId: state.sessionId, taskId, text }]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ordewell/cli",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Ordewell CLI and TUI — plan, run and verify coding-agent tasks from the terminal.",
   "license": "Apache-2.0",
   "author": "Alessandro Costanzo Ciano",
@@ -49,8 +49,8 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ordewell/core": "^0.10.0",
-    "@ordewell/web": "^0.10.0",
+    "@ordewell/core": "^0.10.1",
+    "@ordewell/web": "^0.10.1",
     "string-width": "^7.2.0",
     "ws": "^8.18.0"
   },