toolroll 0.9.52 → 0.9.54

package/dist/setup-guide.d.ts

@@ -15,10 +15,10 @@ export declare function detectPreparation(repo: string): {
 } | null;
 /** Browser installation may write only this known file inside its project. */
 export declare function previewProjectInstructions(repo: string): {
-    content?: never;
     ok: false;
     message: string;
     plan?: never;
+    content?: never;
     fingerprint?: never;
     installed?: never;
 } | {
@@ -30,10 +30,10 @@ export declare function previewProjectInstructions(repo: string): {
     installed: boolean;
 };
 export declare function addProjectInstructions(repo: string, fingerprint: string): {
-    content?: never;
     ok: false;
     message: string;
     plan?: never;
+    content?: never;
     fingerprint?: never;
     installed?: never;
 } | import("./skills.js").InstallResult;

package/dist/slack-api.d.ts

@@ -1,5 +1,9 @@
 import { ChatDeliveryError } from "./chat-delivery-state.js";
-import { type SlackIdentity } from "./slack-state.js";
+import { type ChatIdentity } from "./chat-delivery-state.js";
+/** A Slack app installation: the chat identity, with the workspace (team) it belongs to. */
+export type SlackIdentity = ChatIdentity & {
+    team: string;
+};
 export type SlackCredentials = SlackIdentity & {
     appToken: string;
     botToken: string;

package/dist/slack-api.js

@@ -2,7 +2,7 @@ import { ChatDeliveryError } from "./chat-delivery-state.js";
 import { chmodSync, readFileSync, renameSync, rmSync, writeFileSync, } from "node:fs";
 import { join } from "node:path";
 import { randomBytes } from "node:crypto";
-import { slackHash } from "./slack-state.js";
+import { chatHash } from "./chat-delivery-state.js";
 export class SlackError extends ChatDeliveryError {
     constructor(code, retryMs = 5_000, uncertain = false) {
         super(code, retryMs, uncertain);
@@ -128,7 +128,7 @@ export async function checkSlackCredentials(appToken, botToken, fetcher = fetch)
         app: String(detail.app_id),
         bot: String(auth.user_id),
         workspace: typeof auth.team === "string" ? auth.team : "Slack",
-        installation: slackHash(`${auth.team_id}:${detail.app_id}:${auth.user_id}`),
+        installation: chatHash(`${auth.team_id}:${detail.app_id}:${auth.user_id}`),
     };
 }
 export function object(value) {

package/dist/slack-chat.d.ts

@@ -1,6 +1,5 @@
-import { type DoorOptions } from "./mate-doors.js";
-import { SlackState, type SlackIdentity, type SlackBinding, type SlackEvent } from "./slack-state.js";
-import { uploadSlackBytes, type SlackApi } from "./slack-api.js";
+import { ChatState, type ChatBinding, type ChatContent, type ChatEvent } from "./chat-delivery-state.js";
+import { uploadSlackBytes, type SlackApi, type SlackIdentity } from "./slack-api.js";
 import { type Store } from "./store.js";
 import type { SubscriptionMateRunner } from "./subscription-chat.js";
 export type SlackChatOptions = {
@@ -13,15 +12,19 @@ export type SlackChatOptions = {
     current: () => boolean;
     origin: () => string | null;
     subscriptionRunner?: SubscriptionMateRunner;
-    held?: DoorOptions["held"];
     canNotify?: () => boolean;
     clock?: () => Date;
     upload?: typeof uploadSlackBytes;
 };
 /** Synchronous receipt before ACK. Never stores response_url, raw tokens, or a pairing code. */
-export declare function receiveSlack(state: SlackState, identity: SlackIdentity, type: string, raw: unknown, now: Date): boolean;
+export declare function receiveSlack(state: ChatState, identity: SlackIdentity, type: string, raw: unknown, now: Date): boolean;
 export declare const processSlackEvent: (options: SlackChatOptions) => Promise<boolean>;
-export declare const applySlackAction: (options: SlackChatOptions, event: SlackEvent, binding: SlackBinding, repos: readonly string[]) => void;
+export declare const applySlackAction: (options: SlackChatOptions, event: ChatEvent, binding: ChatBinding, repos: readonly string[]) => {
+    merge: import("./chat-decide.js").ChatMerge;
+    part: number;
+    shown: string;
+    content: ChatContent;
+} | null;
 export declare const planSlackNotifications: (options: SlackChatOptions) => Promise<void>;
 export declare const planSlackRooms: (options: SlackChatOptions) => Promise<void>;
 export declare function slackBlocks(text: string, buttons?: Record<string, unknown>[]): Record<string, unknown>[];

package/dist/slack-chat.js

@@ -9,9 +9,7 @@ import { processChatEvent, applyChatAction, planChatNotifications, channelAccess
 import { proposalPreview, proposalLink, proposalOutcomeText, armedCardText, armedYesLabel, } from "./chat-channel.js";
 import { MATE_MESSAGE_MAX_CHARS } from "./mate.js";
 import { renderReply } from "./reply-shape.js";
-import {} from "./mate-doors.js";
-import { SlackState, slackHash, } from "./slack-state.js";
-import { ChatDeliveryError, partContent } from "./chat-delivery-state.js";
+import { ChatDeliveryError, ChatState, chatHash, partContent } from "./chat-delivery-state.js";
 import { readChatPart } from "./contracts/chat-content.js";
 import { readSlackBlockActions, readSlackButton, SLACK_LINK_ACTION } from "./contracts/slack-callback.js";
 import { object, slackId, slackTs, slackMember, SlackError, uploadSlackBytes, } from "./slack-api.js";
@@ -65,12 +63,12 @@ export function receiveSlack(state, identity, type, raw, now) {
         const match = /^pair ([a-f0-9]{32})$/.exec(event.text.trim());
         kind = match ? "pair" : "message";
         payload = match
-            ? { hash: slackHash(match[1]) }
+            ? { hash: chatHash(match[1]) }
             : {
                 text: event.text.slice(0, MATE_MESSAGE_MAX_CHARS + 1),
                 originalLength: event.text.length,
             };
-        id = slackHash(`${identity.installation}:event:${body.event_id}`);
+        id = chatHash(`${identity.installation}:event:${body.event_id}`);
     }
     else if (type === "interactive" && body.type === "block_actions") {
         const interaction = readSlackBlockActions(body);
@@ -89,7 +87,7 @@ export function receiveSlack(state, identity, type, raw, now) {
         const button = readSlackButton(interaction.value);
         payload = button.ok ? { token: button.value.value } : { problem: button.issues.map(issue => issue.line).join("; ") };
         const tapped = actions[0];
-        id = slackHash(`${identity.installation}:action:${member}:${ts}:${tapped?.value ?? ""}:${tapped?.action_ts ?? ""}`);
+        id = chatHash(`${identity.installation}:action:${member}:${ts}:${tapped?.value ?? ""}:${tapped?.action_ts ?? ""}`);
     }
     else
         return false;
@@ -132,7 +130,7 @@ export function receiveSlack(state, identity, type, raw, now) {
 }
 const delivery = (options) => ({
     ...options,
-    state: new SlackState(options.store),
+    state: new ChatState(options.store, "slack"),
     label: "Slack",
     member: (member, channel) => slackMember(options.api, options.identity, member, channel),
     // A 👍 on the owner's message where the app has reactions:write; Slack shows bots no typing indicator.
@@ -202,26 +200,20 @@ function linkButton(origin, link) {
     }
 }
 export async function deliverSlackPart(options) {
-    const state = new SlackState(options.store), { store, identity } = options, now = nowOf(options);
+    const state = new ChatState(options.store, "slack"), { store, identity } = options, now = nowOf(options);
     if (!state.owns(identity.installation, options.owner, now) ||
         !options.current())
         return false;
-    const row = state.db
-        .prepare("SELECT p.* FROM slack_part p JOIN slack_event e ON e.id=p.event WHERE e.installation=? AND p.state='pending' AND (e.kind!='notice' OR ?=1) AND (p.next_at IS NULL OR p.next_at<=?) ORDER BY p.id LIMIT 1")
-        .get(identity.installation, options.canNotify?.() === false ? 0 : 1, now.toISOString());
+    const row = state.nextPart(identity.installation, options.canNotify?.() !== false, now);
     if (!row)
         return false;
     const event = state.event(row.event), binding = event.binding === null ? null : state.bindingById(event.binding);
     if (!binding) {
-        state.db
-            .prepare("UPDATE slack_part SET state='dropped',problem='Chat access changed' WHERE id=?")
-            .run(row.id);
+        state.dropPart(row.id, "Chat access changed");
         return true;
     }
     if (new Date(row.created).getTime() + 86_400_000 < now.getTime()) {
-        state.db
-            .prepare("UPDATE slack_part SET state='dropped',problem='Delivery expired; open the saved chat to recover it' WHERE id=?")
-            .run(row.id);
+        state.dropPart(row.id, "Delivery expired; open the saved chat to recover it");
         return true;
     }
     try {
@@ -236,15 +228,15 @@ export async function deliverSlackPart(options) {
             !repos.includes(store.lookupRef(content.task)?.repo ?? ""))
             throw new SlackError("Connected projects changed");
         // A screenshot sent with a result goes in that result's thread once its message is placed, and waits until then.
-        const result = content.shot?.follows == null ? undefined : state.db.prepare("SELECT message,state,next_at FROM slack_part WHERE id=?").get(content.shot.follows);
-        if (result !== undefined && !slackTs(result["message"]) && result["state"] === "pending") {
-            state.db.prepare("UPDATE slack_part SET next_at=? WHERE id=?").run(shotWaitsUntil(result["next_at"], now), row.id);
+        const result = content.shot?.follows == null ? null : state.part(content.shot.follows);
+        if (result !== null && !slackTs(result.message) && result.state === "pending") {
+            state.holdPart(row.id, shotWaitsUntil(result.next_at, now));
             return true;
         }
-        const follows = result?.["message"];
+        const follows = result?.message;
         const thread = slackTs(follows) ? String(follows) : event.thread;
         if (content.image && content.shot && resultShotsPruned(options.evidenceRoot, content.image.run)) {
-            state.db.prepare("UPDATE slack_part SET state='dropped',problem='Removed by retention' WHERE id=?").run(row.id);
+            state.dropPart(row.id, "Removed by retention");
             return true;
         }
         if (content.image) {
@@ -263,17 +255,13 @@ export async function deliverSlackPart(options) {
                         typeof allocated.upload_url !== "string")
                         throw new SlackError("Slack did not identify the upload");
                     file = allocated.file_id;
-                    state.db
-                        .prepare("UPDATE slack_part SET file=? WHERE id=?")
-                        .run(file, row.id);
+                    state.setPartFile(row.id, file);
                     await access(options, binding, session?.ceilingDigest);
                     const fresh = verifyResultImage(store, options.evidenceRoot, repos, content.image);
                     if (!fresh.ok)
                         throw new SlackError("Screenshot evidence changed before upload");
                     await (options.upload ?? uploadSlackBytes)(allocated.upload_url, fresh.bytes);
-                    state.db
-                        .prepare("UPDATE slack_part SET uploaded=1 WHERE id=?")
-                        .run(row.id);
+                    state.setPartFile(row.id, null, true);
                 }
                 await access(options, binding, session?.ceilingDigest);
                 if (!verifyResultImage(store, options.evidenceRoot, repos, content.image)
@@ -289,9 +277,7 @@ export async function deliverSlackPart(options) {
                         .map(object)
                         .find((receipt) => (receipt.thread_ts ?? "") === thread && slackTs(receipt.ts));
                     if (found) {
-                        state.db
-                            .prepare("UPDATE slack_part SET state='sent',message=?,problem=NULL WHERE id=?")
-                            .run(String(found.ts), row.id);
+                        state.partSent(row.id, String(found.ts), nowOf(options), false);
                         return true;
                     }
                 }
@@ -309,9 +295,7 @@ export async function deliverSlackPart(options) {
                 if (!Array.isArray(completed.files) ||
                     !completed.files.some((value) => object(value).id === file))
                     throw new SlackError("Slack did not confirm the file identity", 15_000, true);
-                state.db
-                    .prepare("UPDATE slack_part SET state='sent',problem=NULL WHERE id=?")
-                    .run(row.id);
+                state.partSent(row.id, null, nowOf(options), false);
                 return true;
             }
         }
@@ -328,9 +312,7 @@ export async function deliverSlackPart(options) {
                         ? armedCardText(proposal, preview.text)
                         : preview.text.replace("\n\nConfirm or Dismiss below. Nothing changes until you confirm.", "");
                 if (preview.buttons && preview.text.length <= 10_000) {
-                    const tokens = state.db
-                        .prepare("SELECT token,phase FROM slack_action WHERE part=? AND consumed IS NULL AND expires>? ORDER BY rowid")
-                        .all(row.id, now.toISOString());
+                    const tokens = state.partTokens(row.id, now);
                     buttons = tokens.map((action) => ({
                         type: "button",
                         text: {
@@ -399,6 +381,10 @@ export async function deliverSlackPart(options) {
                         value: one.token,
                     }))
                     : []),
+                // A result's, plan's, failure's or pull request's own buttons (chat-decide.ts): its acts, then its links.
+                ...(content.decide?.rows.flat() ?? []).flatMap((one, index) => "token" in one
+                    ? [{ type: "button", text: { type: "plain_text", text: one.label }, action_id: `toolroll_decide_${index}`, value: one.token, ...(index === 0 ? { style: "primary" } : {}) }]
+                    : linkButton(options.origin(), one.link).map(button => ({ ...button, action_id: `toolroll_link_${index + 10}` }))),
                 ...linkButton(options.origin(), content.link),
                 // [Look first] beside [Merge] or [Accept and finish]: each button's own action id.
                 ...(content.also ?? []).flatMap((one, index) => linkButton(options.origin(), one).map(button => ({ ...button, action_id: `toolroll_link_${index + 2}` }))),
@@ -428,17 +414,13 @@ export async function deliverSlackPart(options) {
             });
         if (!slackTs(answer.ts) || (target && answer.ts !== target))
             throw new SlackError("Slack did not confirm the message identity", 15_000, true);
-        state.db
-            .prepare("UPDATE slack_part SET state='sent',message=?,attempts=attempts+1,problem=NULL,next_at=NULL WHERE id=?")
-            .run(answer.ts, row.id);
-        state.db
-            .prepare("UPDATE slack_runtime SET problem=NULL WHERE installation=? AND owner=?")
-            .run(identity.installation, options.owner);
+        state.partSent(row.id, String(answer.ts), nowOf(options));
+        state.setProblem(identity.installation, options.owner, null);
         return true;
     }
     catch (error) {
         if (error instanceof ChatDeliveryError && error.permanent) {
-            state.prepare("UPDATE chat_part SET state='dropped',next_at=NULL,problem=? WHERE id=?").run(error.message, row.id);
+            state.dropPart(row.id, error.message);
             return true;
         }
         // No permission to upload files here: one plain line instead of the result's screenshots.
@@ -450,18 +432,12 @@ export async function deliverSlackPart(options) {
         const problem = error instanceof SlackError
             ? error
             : new SlackError("Slack delivery is waiting to retry", 15_000, true);
-        state.db
-            .prepare("UPDATE slack_runtime SET problem=? WHERE installation=? AND owner=?")
-            .run(problem.message, identity.installation, options.owner);
+        state.setProblem(identity.installation, options.owner, problem.message);
         const until = new Date(nowOf(options).getTime() +
             Math.max(problem.retryMs, [5000, 15000, 60000, 300000][Math.min(row.attempts, 3)])).toISOString();
-        state.db
-            .prepare("UPDATE slack_part SET attempts=attempts+1,uncertain=uncertain+?,next_at=?,problem=? WHERE id=?")
-            .run(problem.uncertain ? 1 : 0, until, problem.message, row.id);
+        state.partFailed(row.id, { problem: problem.message, until, uncertain: problem.uncertain });
         if (problem.code === "ratelimited")
-            state.db
-                .prepare("UPDATE slack_runtime SET retry_at=? WHERE installation=?")
-                .run(until, identity.installation);
+            state.deferUntil(identity.installation, until);
         return true;
     }
 }

package/dist/slack-settings.js

@@ -1,6 +1,6 @@
 import { loadPrimary } from "./webhooks.js";
 import { loadSlackCredentials } from "./slack-api.js";
-import { SlackState } from "./slack-state.js";
+import { ChatState } from "./chat-delivery-state.js";
 const escape = (text) => text
     .replaceAll("&", "&")
     .replaceAll("<", "&lt;")
@@ -8,15 +8,11 @@ const escape = (text) => text
     .replaceAll('"', "&quot;")
     .replaceAll("'", "&#39;");
 export function slackSettingsHtml(store, dir, csrf, options = {}) {
-    const credentials = loadSlackCredentials(dir), state = new SlackState(store), bindings = credentials ? state.bindings(credentials.installation).filter(one => state.live(one)) : [], binding = options.who === undefined ? null : bindings.find(one => one.approver === options.who) ?? null, others = bindings.length - (binding === null ? 0 : 1);
-    const runtime = credentials
-        ? state.db
-            .prepare("SELECT connected,problem,lease_until FROM slack_runtime WHERE installation=?")
-            .get(credentials.installation)
-        : null;
+    const credentials = loadSlackCredentials(dir), state = new ChatState(store, "slack"), bindings = credentials ? state.bindings(credentials.installation).filter(one => state.live(one)) : [], binding = options.who === undefined ? null : bindings.find(one => one.approver === options.who) ?? null, others = bindings.length - (binding === null ? 0 : 1);
+    const runtime = credentials ? state.runtime(credentials.installation) : null;
     const now = options.now ?? new Date(), live = runtime &&
-        typeof runtime.lease_until === "string" &&
-        runtime.lease_until > now.toISOString() &&
+        runtime.leaseUntil !== null &&
+        runtime.leaseUntil > now.toISOString() &&
         runtime.connected;
     const hidden = `<input type="hidden" name="csrf" value="${escape(csrf)}">`;
     const password = '<label>Your Toolroll password<input style="min-height:44px" type="password" name="password" autocomplete="current-password" required></label>';
@@ -44,12 +40,7 @@ export function slackSettingsHtml(store, dir, csrf, options = {}) {
                     '<a class="button-link" style="min-height:44px;white-space:nowrap" href="/settings/slack">Check connection</a>';
         }
         else if (binding && state.live(binding)) {
-            const pending = Number(state.db
-                .prepare("SELECT count(*) n FROM slack_part p JOIN slack_event e ON e.id=p.event WHERE e.binding=? AND p.state='pending'")
-                .get(binding.id)?.n ?? 0);
-            const failed = Number(state.db
-                .prepare("SELECT count(*) n FROM slack_part p JOIN slack_event e ON e.id=p.event WHERE e.binding=? AND p.state='dropped'")
-                .get(binding.id)?.n ?? 0);
+            const { pending, dropped: failed } = state.partCounts(binding.id);
             content +=
                 `<p>Your Slack account is paired.${others ? ` ${others} teammate${others === 1 ? " is" : "s are"} paired too.` : ""}${pending ? ` ${pending} replies waiting to send.` : ""}${failed ? ` ${failed} replies could not be delivered. Open the saved chat to recover them.` : ""}</p>` +
                     "<p>Try “What needs my attention?” or “Show the evidence for the latest result.”</p>" +

package/dist/slack.js

@@ -3,7 +3,7 @@ import { randomBytes } from "node:crypto";
 import { setTimeout as sleep } from "node:timers/promises";
 import { SocketModeClient, LogLevel } from "@slack/socket-mode";
 import { loadSlackCredentials, slackApi } from "./slack-api.js";
-import { SlackState } from "./slack-state.js";
+import { ChatState } from "./chat-delivery-state.js";
 import { receiveSlack, processSlackEvent, deliverSlackPart, planSlackNotifications, planSlackRooms, } from "./slack-chat.js";
 /** The bot and socket tokens must belong to the same app, including after reconnect. */
 export class ToolrollSlackSocket extends SocketModeClient {
@@ -29,7 +29,7 @@ export class ToolrollSlackSocket extends SocketModeClient {
     }
 }
 export async function followSlack(options) {
-    const owner = randomBytes(16).toString("hex"), state = new SlackState(options.store);
+    const owner = randomBytes(16).toString("hex"), state = new ChatState(options.store, "slack");
     const pause = async (ms) => {
         try {
             await sleep(ms, undefined, { signal: options.signal });
@@ -55,9 +55,7 @@ export async function followSlack(options) {
                 current.appToken === credentials.appToken &&
                 state.owns(credentials.installation, owner));
         };
-        const problem = (text) => state.db
-            .prepare("UPDATE slack_runtime SET problem=? WHERE installation=? AND owner=?")
-            .run(text, credentials.installation, owner);
+        const problem = (text) => state.setProblem(credentials.installation, owner, text);
         // SDK log output can include envelopes/tokens. Only fixed status phrases are saved.
         const client = new ToolrollSlackSocket({
             appToken: credentials.appToken,
@@ -93,9 +91,7 @@ export async function followSlack(options) {
         }, 10_000);
         client.on("connected", () => {
             connected = true;
-            state.db
-                .prepare("UPDATE slack_runtime SET connected=?,problem=NULL WHERE installation=? AND owner=?")
-                .run(new Date().toISOString(), credentials.installation, owner);
+            state.setConnected(credentials.installation, owner, new Date());
         });
         client.on("disconnected", () => {
             connected = false;
@@ -131,11 +127,7 @@ export async function followSlack(options) {
         try {
             await client.start();
             while (same()) {
-                const retry = state.db
-                    .prepare("SELECT retry_at FROM slack_runtime WHERE installation=?")
-                    .get(credentials.installation)?.retry_at;
-                if (!connected ||
-                    (typeof retry === "string" && retry > new Date().toISOString())) {
+                if (!connected || state.retryAt(credentials.installation) > new Date().toISOString()) {
                     await pause(1000);
                     continue;
                 }
@@ -158,9 +150,7 @@ export async function followSlack(options) {
             alive = false;
             options.signal.removeEventListener("abort", stop);
             await client.disconnect().catch(() => { });
-            state.db
-                .prepare("UPDATE slack_runtime SET owner=NULL,lease_until=NULL,connected=NULL WHERE installation=? AND owner=?")
-                .run(credentials.installation, owner);
+            state.stop(credentials.installation, owner);
         }
         await pause(5000);
     }