@warren-dean/code-kit 0.12.1 → 0.13.0

package/hooks/mod/panes.mjs

@@ -1257,10 +1257,15 @@ export function codeTab(view, { Box, Text, Button, Svg }, on) {
   return [picker, drawing, legend, detail, keys];
 }
 
+/** CARD-9: how many decision cards the list shows at once, around the selected one. */
+const CARDS_SHOWN = 5;
+
 /**
- * DECIDE-3: the Decisions tab: each decision that needs the person, the selected one as a card with its
- * lineage (what they asked for, the story and requirements, what was happening, what's settled, why it
- * needs them) and its options, each saying what it does. `on`: onDecision(i), onNeed(id, line).
+ * DECIDE-3, CARD-9: the Decisions tab: how many decisions need the person, by kind; then each as a short
+ * card (its kind, a one-line headline, and who or what it's for), a few at a time around the selected
+ * one, with j and k to move; then the selected one in full, with its lineage (what they asked for, the
+ * story and requirements, what was happening, what's settled, why it needs them) and its options, each
+ * saying what it does. `on`: onDecision(i), onNeed(id, line).
  */
 export function decisionsTab(cards, ui, { Box, Text, Button }, on) {
   const text = (value, style = {}) => Text({ ...style, children: [value] });
@@ -1277,27 +1282,92 @@ export function decisionsTab(cards, ui, { Box, Text, Button }, on) {
         text(value, { wrap: 'wrap', ...style }),
       ],
     });
+  const kinds = new Map();
+  for (const c of cards) kinds.set(c.tag, (kinds.get(c.tag) ?? 0) + 1);
+  const from = Math.max(0, Math.min(at - Math.floor(CARDS_SHOWN / 2), cards.length - CARDS_SHOWN));
+  const shown = cards.slice(from, from + CARDS_SHOWN);
   const list = Box({
     key: 'decision-list',
     flexDirection: 'column',
-    children: cards.map((c, i) =>
+    children: [
+      ...(from > 0 ? [text(`  ↑ ${from} more`, { key: 'decision-above', dimColor: true })] : []),
+      ...shown.map((c, n) => {
+        const i = from + n;
+        return Box({
+          key: `decision-item-${i}`,
+          flexDirection: 'column',
+          borderStyle: 'round',
+          borderColor: i === at ? 'yellow' : 'gray',
+          paddingX: 1,
+          children: [
+            Box({
+              flexDirection: 'row',
+              columnGap: 1,
+              children: [
+                text(c.tag.toUpperCase(), { color: i === at ? 'yellow' : 'cyan', bold: true }),
+                Button({
+                  key: `decision-pick-${i}`,
+                  label: c.headline,
+                  plain: true,
+                  onPress: () => on.onDecision(i),
+                }),
+              ],
+            }),
+            ...(c.sub ? [text(c.sub, { dimColor: true, wrap: 'truncate-end' })] : []),
+          ],
+        });
+      }),
+      ...(from + CARDS_SHOWN < cards.length
+        ? [
+            text(`  ↓ ${cards.length - from - CARDS_SHOWN} more`, {
+              key: 'decision-below',
+              dimColor: true,
+            }),
+          ]
+        : []),
+    ],
+  });
+  const keys = Box({
+    key: 'decision-keys',
+    flexDirection: 'row',
+    columnGap: 2,
+    children: [
       Button({
-        key: `decision-pick-${i}`,
-        label: `${i === at ? '›' : ' '} ${c.title}`,
+        key: 'decision-next',
+        label: 'Next',
+        hotkey: 'j',
         plain: true,
-        onPress: () => on.onDecision(i),
+        onPress: () => on.onDecision(Math.min(at + 1, cards.length - 1)),
       }),
-    ),
+      Button({
+        key: 'decision-prev',
+        label: 'Previous',
+        hotkey: 'k',
+        plain: true,
+        onPress: () => on.onDecision(Math.max(at - 1, 0)),
+      }),
+      text(`${at + 1} of ${cards.length}`, { dimColor: true }),
+    ],
   });
   const detail = Box({
     key: 'decision-card',
     flexDirection: 'column',
-    borderStyle: 'round',
+    borderStyle: 'double',
     borderColor: 'yellow',
     paddingX: 1,
     rowGap: 0,
     children: [
-      text(card.title, { bold: true }),
+      text(
+        card.kind === 'brief'
+          ? 'An open question in your brief'
+          : card.kind === 'question'
+            ? 'A question from the lead'
+            : card.headline,
+        { bold: true, wrap: 'wrap' },
+      ),
+      ...(card.details ?? []).map((d) =>
+        row(d.label, d.value, d.label === 'Question' ? { bold: true } : {}),
+      ),
       ...(card.asked ? [row('You asked for', card.asked)] : []),
       ...(card.story
         ? [
@@ -1353,7 +1423,18 @@ export function decisionsTab(cards, ui, { Box, Text, Button }, on) {
       `${cards.length} decision${cards.length === 1 ? '' : 's'} need${cards.length === 1 ? 's' : ''} you. Everything else is the lead's.`,
       { bold: true },
     ),
-    ...(cards.length > 1 ? [list] : []),
+    Box({
+      key: 'decision-kinds',
+      children: [
+        text(
+          [...kinds]
+            .map(([tag, n]) => `${n} ${tag}${n === 1 || tag.endsWith('brief') ? '' : 's'}`)
+            .join(' · '),
+          { dimColor: true },
+        ),
+      ],
+    }),
+    ...(cards.length > 1 ? [list, keys] : []),
     detail,
   ];
 }

package/hooks/mod/register.mjs

@@ -21,6 +21,7 @@ import {
   answerPane,
   approvalAsidePrompt,
   approvePane,
+  questionAsidePrompt,
   commandItself,
   band,
   bandLines,
@@ -564,12 +565,24 @@ export function register(on) {
       answerWith: (line) => act.sendAnswer({ kind: 'question', ...line.question }, line.choice),
       // ASK-2, ASK-4: Answer… opens a box for the person's own words.
       answer: async (line) => {
-        answering = { kind: 'question', ...line.question, text: '', error: null };
+        answering = {
+          kind: 'question',
+          ...line.question,
+          text: '',
+          error: null,
+          aside: { thread: [], draft: '' },
+        };
         await $.ui.open({ id: ANSWER_ID, title: 'Answer', focus: true, closeOnEscape: true });
         $.ui.invalidate('ui.render');
       },
       answerBrief: async (line) => {
-        answering = { kind: 'brief', ...line.brief, text: '', error: null };
+        answering = {
+          kind: 'brief',
+          ...line.brief,
+          text: '',
+          error: null,
+          aside: { thread: [], draft: '' },
+        };
         await $.ui.open({ id: ANSWER_ID, title: 'Answer', focus: true, closeOnEscape: true });
         $.ui.invalidate('ui.render');
       },
@@ -613,17 +626,24 @@ export function register(on) {
           }
         }
         notice = null;
-        const said = /[.!?]$/.test(text) ? text : `${text}.`;
-        await $.prompt.submit({
-          text:
-            q.kind === 'question'
-              ? `The person answered ${q.id} (${q.question}): ${said}${q.blocks ? ` ${q.story} no longer waits on them.` : ''} Carry on with it.`
-              : `The person answered an open question in ${q.path}, "${q.question}": ${said} Record it in the brief's decision log, take it out of the open questions, and carry on with it.`,
-        });
+        // Answered, the decision goes at once; the lead hears it as a turn of its own once it's idle, which
+        // can be long after (so the prompt isn't waited on).
         if (q.kind === 'brief') {
           briefLater.add(q.question);
           model = { ...model, brief: (model.brief ?? []).filter((b) => b.question !== q.question) };
         }
+        if (q.kind === 'question')
+          model = { ...model, questions: (model.questions ?? []).filter((x) => x.id !== q.id) };
+        $.ui.invalidate('ui.render');
+        const said = /[.!?]$/.test(text) ? text : `${text}.`;
+        $.prompt
+          .submit({
+            text:
+              q.kind === 'question'
+                ? `The person answered ${q.id} (${q.question}): ${said}${q.blocks ? ` ${q.story} no longer waits on them.` : ''} Carry on with it.`
+                : `The person answered an open question in ${q.path}, "${q.question}": ${said} Record it in the brief's decision log, take it out of the open questions, and carry on with it.`,
+          })
+          .catch(() => {});
         await act.reload();
         return true;
       },
@@ -634,16 +654,20 @@ export function register(on) {
       deniedDone: async (line) => {
         denied.delete(line.denial.id);
         $.ui.invalidate('ui.render');
-        await $.prompt.submit({
-          text: `The person ran it themselves, or allowed it: ${line.denial.command ?? line.denial.what} (Claude Code had refused it for ${line.denial.who}). Check it worked, and carry on.`,
-        });
+        $.prompt
+          .submit({
+            text: `The person ran it themselves, or allowed it: ${line.denial.command ?? line.denial.what} (Claude Code had refused it for ${line.denial.who}). Check it worked, and carry on.`,
+          })
+          .catch(() => {});
       },
       deniedNo: async (line) => {
         denied.delete(line.denial.id);
         $.ui.invalidate('ui.render');
-        await $.prompt.submit({
-          text: `The person won't run ${line.denial.command ?? line.denial.what} now (Claude Code refused it for ${line.denial.who}). Don't try to get around it: carry on with other work, and if a story can't go on without it, ask with code-kit ask --blocks.`,
-        });
+        $.prompt
+          .submit({
+            text: `The person won't run ${line.denial.command ?? line.denial.what} now (Claude Code refused it for ${line.denial.who}). Don't try to get around it: carry on with other work, and if a story can't go on without it, ask with code-kit ask --blocks.`,
+          })
+          .catch(() => {});
       },
       // REPORT-3: the person sends a drafted report to code-kit's GitHub, or discards it.
       sendReport: async (line) => {
@@ -675,6 +699,40 @@ export function register(on) {
           heldId: line.held.id,
           outside: line.held.outside ?? null,
         }),
+      // ACT-5: a side call over the lead's own conversation (it shares the prompt cache, and nothing is
+      // added to the conversation); before the lead's first reply, from the prompt's facts alone.
+      sideCall: async (prompt) => {
+        const failed = (err) => ({ isAnswered: false, reason: String(err?.message ?? err) });
+        const reply = await $.model.fork({ prompt }).catch(failed);
+        if (reply.isAnswered || reply.reason !== 'nothing-to-fork') return reply;
+        return $.model.complete({ model: 'sonnet', prompt, maxTokens: 800 }).catch(failed);
+      },
+      // ASK-5: a question about a question, asked in the answer box before answering.
+      askAnswer: async (question) => {
+        const q = question.trim();
+        if (!answering || !q) return;
+        const asked = answering;
+        const turn = { question: q, pending: true };
+        const thread = asked.aside.thread;
+        answering = { ...asked, aside: { thread: [...thread, turn], draft: '' } };
+        $.ui.invalidate('ui.render');
+        const reply = await act.sideCall(questionAsidePrompt({ q: asked, thread, question: q }));
+        if (!answering || answering.question !== asked.question) return;
+        const done = reply.isAnswered
+          ? { question: q, answer: reply.text }
+          : {
+              question: q,
+              error: `No answer: ${reply.reason}${reply.status ? ` (${reply.status})` : ''}`,
+            };
+        answering = {
+          ...answering,
+          aside: {
+            ...answering.aside,
+            thread: answering.aside.thread.map((t) => (t === turn ? done : t)),
+          },
+        };
+        $.ui.invalidate('ui.render');
+      },
       // ACT-5: a question about the approval, answered in its pane by a side call over the lead's own
       // conversation (it shares the prompt cache, and nothing is added to the conversation); before the
       // lead's first reply, from code-kit's facts alone.
@@ -694,13 +752,7 @@ export function register(on) {
           thread,
           question: q,
         });
-        let reply = await $.model
-          .fork({ prompt })
-          .catch((err) => ({ isAnswered: false, reason: String(err?.message ?? err) }));
-        if (!reply.isAnswered && reply.reason === 'nothing-to-fork')
-          reply = await $.model
-            .complete({ model: 'sonnet', prompt, maxTokens: 800 })
-            .catch((err) => ({ isAnswered: false, reason: String(err?.message ?? err) }));
+        const reply = await act.sideCall(prompt);
         // Answered for this approval only: a pane closed or moved on meanwhile keeps what it has.
         if (!approving || approving.request !== asked.request) return;
         const done = reply.isAnswered
@@ -2004,6 +2056,11 @@ export function register(on) {
       },
       onSubmit: (value) => act.confirmAnswer(value),
       onCancel: () => act.cancelAnswer(),
+      onAskInput: (value) => {
+        answering = { ...answering, aside: { ...answering.aside, draft: value } };
+        $.ui.invalidate('ui.render');
+      },
+      onAsk: (value) => act.askAnswer(value),
     });
   });