toolroll 0.9.19 → 0.9.21

package/dist/telegram.js

@@ -27,14 +27,15 @@ import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
 import { chmodSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { validateNote } from "./decision.js";
-import { resultShotsFor } from "./result-shots.js";
+import { isShotsKind, resultShotsFor } from "./result-shots.js";
 import { isLifecycleNotification, isTelegramProgressNotification, RESULT_SHOTS_KIND, TELEGRAM_HOLD_REASONS } from "./store.js";
 import { telegramProgressCard } from "./telegram-progress.js";
 import { enqueueEveningDigests, finishedView, isTaskFact, joinsBatch, needsPerson, quietCardView } from "./chat-quiet.js";
 import { BATCH_MS, chatText, chatTitle, factLinkLabel, mentions, nameTelegramBot } from "./chat-voice.js";
 import { LEAD_SAY_KIND, enqueueLeadLapses, leadSayEarlier, leadSayText, leadSubjectOf } from "./lead-voice.js";
 import { applyTeamInbound, deliverTeamChats, teamCommand } from "./telegram-team.js";
-import { applyFlowReply, applyFlowTap, FLOW_DECIDE_KEY, flowButtons, flowDecisionAt } from "./telegram-flow.js";
+import { applyFlowChoiceTap, applyFlowReply, applyFlowTap, FLOW_DECIDE_KEY, flowButtons, flowChoiceButtons, flowDecisionAt, flowSendKeyboardRow, flowSentContent } from "./telegram-flow.js";
+import { flowChoiceAt, FLOW_CHOOSE_KEY, FLOW_SEND_KEY } from "./flow-send.js";
 import { connectChannel, FLOW_WORDS, takeChannelMessage, watchedChannel } from "./chat-inbox.js";
 import { focusContextFor, taskInCeiling } from "./chat-channel.js";
 import { answersPrompt, applyDecideFeedback, applyDecideTap, decideFallbackLink, dropDecideTokens, hasLiveDecideTokens, linksFor, placeDecidePrompt, decideOffer, decideTargetOf, isDecideToken, mergedText, mintDecideButtons, offerFingerprint, openPromptFor, placeDecideTokens, recordChatMerge, retireDecideTokens } from "./chat-decide.js";
@@ -658,7 +659,7 @@ async function deliverOutbox(store, botId, transport, owner, clock, report, read
         // Routine progress facts are not a problem to fix: a first pairing
         // starts from now and settles them as history. Anything else pending
         // is named, once per pass, as before.
-        if (store.listNotifications("pending").some(row => !isLifecycleNotification(row) && row.kind !== RESULT_SHOTS_KIND))
+        if (store.listNotifications("pending").some(row => !isLifecycleNotification(row) && !isShotsKind(row.kind)))
             report.problems.push("outbox rows are pending but no chat is paired — `toolroll bridge telegram pair`");
         return;
     }
@@ -1058,7 +1059,7 @@ async function deliverOutboxTo(store, botId, binding, transport, owner, clock, r
             return sent.ok ? { ok: true, receipt: receiptFor(botId, binding.chatId, sent.messageId) } : sent;
         };
         let outcome;
-        if (rows.length === 1 && row.kind === RESULT_SHOTS_KIND)
+        if (rows.length === 1 && isShotsKind(row.kind))
             outcome = await shotsSender(row);
         else if (rows.length === 1 && row.kind === LEAD_SAY_KIND)
             outcome = await leadSayOutcome(row);
@@ -1107,7 +1108,7 @@ function isUrgent(notification) {
 /** A routine fact the digest may carry. Screenshots are never urgent (they follow their result message, which the
  * task's order fence holds them behind) and never a digest line: they go as their own photos once it has gone. */
 function joinsDigest(notification) {
-    return !isUrgent(notification) && notification.kind !== RESULT_SHOTS_KIND;
+    return !isUrgent(notification) && !isShotsKind(notification.kind);
 }
 /** The digest text: a header with the count and the window, then one
  * fact per entry — its subject, then its body's first line, indented.
@@ -1193,7 +1194,7 @@ async function deliverOne(store, botId, binding, sender, notification, clock, ph
         const decided = offer === null ? null : mintDecideButtons(store, decideSeat(binding), target, offer, clock());
         const parts = split(offer?.text ?? `${notificationIdentity(notification, title !== undefined && mentions(words, title) ? undefined : title)}${words}`);
         const fallback = offer === null ? decideFallbackLink(target) : null;
-        const button = fallback !== null ? (() => { try {
+        let button = fallback !== null ? (() => { try {
             return phoneLinkButton(phoneOrigin?.() ?? null, fallback);
         }
         catch {
@@ -1204,10 +1205,23 @@ async function deliverOne(store, botId, binding, sender, notification, clock, ph
         const visit = FLOW_DECIDE_KEY.exec(notification.dedupeKey);
         const waiting = visit === null ? null : flowDecisionAt(store, Number(visit[1]), Number(visit[2]));
         const flowKeys = waiting === null ? null : flowButtons(store, binding, waiting, clock());
+        // A flow's "Send to me" or "Person chooses" (flow-send.ts): its links as buttons, and a choice's options above them.
+        const sentVisit = FLOW_SEND_KEY.exec(notification.dedupeKey) ?? FLOW_CHOOSE_KEY.exec(notification.dedupeKey);
+        const sent = sentVisit === null ? null : flowSentContent(store, Number(sentVisit[1]), Number(sentVisit[2]));
+        const choosing = sent === null || !FLOW_CHOOSE_KEY.test(notification.dedupeKey) || notification.recipient !== binding.approver ? null : flowChoiceAt(store, Number(sentVisit[1]), Number(sentVisit[2]));
+        const choiceKeys = choosing === null || sent === null ? null : flowChoiceButtons(store, binding, choosing, sent, clock());
+        const sentRow = sent === null ? null : (() => { try {
+            return flowSendKeyboardRow(phoneOrigin?.() ?? null, sent);
+        }
+        catch {
+            return [];
+        } })();
+        if (sentRow !== null)
+            button = sentRow.length === 0 ? null : sentRow;
         // A teammate's question (v93): its options and "Answer in words", for the person it asks.
-        const asked = flowKeys === null ? openQuestionOf(store, notification.dedupeKey) : null;
+        const asked = flowKeys === null && choiceKeys === null ? openQuestionOf(store, notification.dedupeKey) : null;
         const questionKeys = asked === null ? null : telegramQuestionButtons(store, binding, asked, clock());
-        const keys = flowKeys ?? questionKeys;
+        const keys = flowKeys ?? choiceKeys ?? questionKeys;
         let last = null;
         for (const [index, part] of parts.entries()) {
             const final = index === parts.length - 1;
@@ -1223,6 +1237,12 @@ async function deliverOne(store, botId, binding, sender, notification, clock, ph
         }
         if (flowKeys !== null && last !== null)
             store.placeTelegramFlowActions(flowKeys.tokens, last);
+        if (choiceKeys !== null && last !== null) {
+            store.placeTelegramFlowChoices(choiceKeys.tokens, last);
+            // A reply to this message, instead of a tap, is the person's note (applyFlowReply).
+            if (sent?.reply === true)
+                store.recordTelegramFlowPrompt({ chatId: binding.chatId, messageId: last, binding: binding.id, card: choosing.card.id, entry: choosing.card.entry, mode: "send-back" }, clock(), 7 * 24);
+        }
         if (questionKeys !== null && last !== null)
             store.placeTelegramQuestionActions(questionKeys.tokens, last);
         if (decided !== null && last !== null)
@@ -1472,7 +1492,7 @@ async function enrolledForMessage(context, update) {
 async function projectsForTap(context, update) {
     const callback = update.callback_query;
     // Flow decision buttons (v86) work with or without the lead's conversation on this phone.
-    const flowTap = callback !== undefined && context.store.getTelegramFlowAction(callback.data ?? "") !== null;
+    const flowTap = callback !== undefined && (context.store.getTelegramFlowAction(callback.data ?? "") !== null || context.store.getTelegramFlowChoice(callback.data ?? "") !== null);
     // So do a result's, plan's or pull request's own buttons (chat-decide.ts).
     const decideTap = callback !== undefined && isDecideToken(context.store, callback.data ?? "");
     if (callback === undefined || context.readProjects === undefined || (context.conversation === undefined && !flowTap && !decideTap))
@@ -1481,7 +1501,7 @@ async function projectsForTap(context, update) {
     if (binding === null || callback.from === undefined ||
         callback.message?.chat === undefined ||
         // Proposal cards and task picks read the chat's project ceiling.
-        (context.store.getTelegramProposalAction(callback.data ?? "") === null && context.store.getTelegramFlowAction(callback.data ?? "") === null && !decideTap && !(callback.data ?? "").startsWith("pick:")))
+        (context.store.getTelegramProposalAction(callback.data ?? "") === null && !flowTap && !decideTap && !(callback.data ?? "").startsWith("pick:")))
         return null;
     const chat = callback.message.chat;
     const chatId = String(chat.id);
@@ -2138,6 +2158,22 @@ function applyCallback(context, update, effects) {
         }
         return;
     }
+    // A "Person chooses" option (flow-send.ts): the card goes where it leads, or is ignored.
+    const choiceAction = store.getTelegramFlowChoice(token);
+    if (choiceAction !== null) {
+        if (choiceAction.binding !== binding.id || choiceAction.chatId !== tapChat || (choiceAction.messageId !== null && choiceAction.messageId !== String(message.message_id))) {
+            report.ignored++;
+            return;
+        }
+        const repos = context.projects === null ? null : telegramConversationRepos(store, binding.approver, context.projects);
+        for (const effect of applyFlowChoiceTap(store, binding, choiceAction, { text: message.text ?? "" }, repos, clock())) {
+            if (effect.kind === "ack")
+                ack(effect.text);
+            else if (effect.kind === "edit")
+                editText(effect.text);
+        }
+        return;
+    }
     // The lead's question to its owner: an option is sent as their next message; "Something else" asks them to type it.
     const askTap = /^ask:([1-9][0-9]{0,14}):([0-3]|x)$/.exec(token);
     if (askTap !== null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolroll",
-  "version": "0.9.19",
+  "version": "0.9.21",
   "description": "A control plane for unattended coding agents — queue tasks, walk away, come back to pull requests. Agents build in leased worktrees, never touch your default branch, and interrupt you only for decisions that need a human.",
   "directories": {
     "doc": "docs"