talon-agent 3.34.1 → 3.36.0

package/src/storage/sql/statements.generated.ts

@@ -25,7 +25,12 @@ CREATE TABLE IF NOT EXISTS history_messages (
   timestamp       INTEGER NOT NULL,
   media_type      TEXT,
   sticker_file_id TEXT,
-  file_path       TEXT
+  file_path       TEXT,
+  -- Files attached to this message, as a JSON array of
+  -- {path,name,size,mimeType,image}. A message can carry several (the
+  -- companion's composer stages any number), so file_path above holds
+  -- only the first for the pre-multi-file row shape. Null when none.
+  attachments     TEXT
 );
 CREATE INDEX IF NOT EXISTS idx_history_chat ON history_messages(chat_id, id);
 CREATE UNIQUE INDEX IF NOT EXISTS idx_history_chat_msg ON history_messages(chat_id, msg_id);
@@ -255,7 +260,28 @@ CREATE TABLE IF NOT EXISTS journal (
   type    TEXT    NOT NULL,
   payload TEXT    NOT NULL
 );
-CREATE INDEX IF NOT EXISTS idx_journal_type ON journal(type, seq);`;
+CREATE INDEX IF NOT EXISTS idx_journal_type ON journal(type, seq);
+
+-- WhatsApp message keys: Talon's numeric message id ↔ WhatsApp's
+-- (id, remoteJid, fromMe, participant) key, plus the full proto as JSON
+-- so react/reply/forward/download keep working on messages from before
+-- a restart and media past the CDN TTL can be re-requested.
+CREATE TABLE IF NOT EXISTS whatsapp_messages (
+  chat_id TEXT NOT NULL,
+  msg_id INTEGER NOT NULL,
+  wa_id TEXT NOT NULL,
+  remote_jid TEXT NOT NULL,
+  from_me INTEGER NOT NULL DEFAULT 0,
+  participant TEXT,
+  sender_name TEXT NOT NULL DEFAULT '',
+  text TEXT NOT NULL DEFAULT '',
+  timestamp INTEGER NOT NULL,
+  message_json TEXT,
+  PRIMARY KEY (chat_id, msg_id)
+);
+CREATE INDEX IF NOT EXISTS idx_whatsapp_messages_msg ON whatsapp_messages(msg_id);
+CREATE INDEX IF NOT EXISTS idx_whatsapp_messages_wa_id ON whatsapp_messages(wa_id);
+CREATE INDEX IF NOT EXISTS idx_whatsapp_messages_time ON whatsapp_messages(timestamp);`;
 
 export const chatSettingsSql = {
   upsert: `INSERT OR REPLACE INTO chat_settings (chat_id, settings) VALUES (?, ?)`,
@@ -303,6 +329,10 @@ ALTER TABLE history_messages ADD COLUMN sender_handle TEXT`,
   addSessionsMetricsColumn: `-- Column reconciliation for databases that shipped before per-session
 -- metrics existed. Fresh databases get the column via schema.sql.
 ALTER TABLE sessions ADD COLUMN metrics TEXT NOT NULL DEFAULT '{"lifetime":{"counters":{"queries":0,"toolCalls":0,"turnsWithTools":0,"apiCalls":0,"inputTokens":0,"outputTokens":0,"cacheReadTokens":0,"cacheWriteTokens":0,"failedTurns":0,"flowViolationRetries":0,"flowViolationCapExhausted":0,"trailingTextDropped":0},"latency":{"count":0,"sumMs":0,"minMs":null,"maxMs":0},"toolCallsByName":{},"backend":{},"cacheHitPercent":{"count":0,"sumMs":0,"minMs":null,"maxMs":0},"toolCallsPerTurn":{"count":0,"sumMs":0,"minMs":null,"maxMs":0},"apiCallsPerTurn":{"count":0,"sumMs":0,"minMs":null,"maxMs":0}},"buckets":{}}'`,
+  addHistoryAttachmentsColumn: `-- Column reconciliation for databases that shipped before a message could
+-- carry more than one attachment. Fresh databases get the column via
+-- schema.sql.
+ALTER TABLE history_messages ADD COLUMN attachments TEXT`,
 } as const;
 
 export const goalsSql = {
@@ -334,22 +364,23 @@ WHERE chat_id = ? AND status IN (/* statuses */)`,
 export const historySql = {
   insert: `INSERT OR IGNORE INTO history_messages
   (chat_id, msg_id, sender_id, sender_name, sender_handle, text,
-   reply_to_msg_id, timestamp, media_type, sticker_file_id, file_path)
-VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+   reply_to_msg_id, timestamp, media_type, sticker_file_id, file_path,
+   attachments)
+VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
   recent: `SELECT msg_id, sender_id, sender_name, sender_handle, text, reply_to_msg_id,
-       timestamp, media_type, sticker_file_id, file_path
+       timestamp, media_type, sticker_file_id, file_path, attachments
 FROM history_messages
 WHERE chat_id = ? ORDER BY id DESC LIMIT ?`,
   recentBefore: `-- Scroll-back pagination: the window of messages strictly older than a
 -- given msg_id, newest-first (the repository reverses to chronological).
 SELECT msg_id, sender_id, sender_name, sender_handle, text, reply_to_msg_id,
-       timestamp, media_type, sticker_file_id, file_path
+       timestamp, media_type, sticker_file_id, file_path, attachments
 FROM history_messages
 WHERE chat_id = ? AND msg_id < ? ORDER BY id DESC LIMIT ?`,
   recentBeforeTime: `-- Time-cursor variant of recentBefore for the read_history \`before\` date
 -- parameter: the newest \`limit\` messages strictly older than a timestamp.
 SELECT msg_id, sender_id, sender_name, sender_handle, text, reply_to_msg_id,
-       timestamp, media_type, sticker_file_id, file_path
+       timestamp, media_type, sticker_file_id, file_path, attachments
 FROM history_messages
 WHERE chat_id = ? AND timestamp < ? ORDER BY id DESC LIMIT ?`,
   setFilePath: `UPDATE history_messages SET file_path = ? WHERE chat_id = ? AND msg_id = ?`,
@@ -357,23 +388,33 @@ WHERE chat_id = ? AND timestamp < ? ORDER BY id DESC LIMIT ?`,
   searchFts: `-- The match param must already be a valid FTS5 expression
 -- (see history.ts ftsQuery).
 SELECT msg_id, sender_id, sender_name, sender_handle, text, reply_to_msg_id,
-       timestamp, media_type, sticker_file_id, file_path
+       timestamp, media_type, sticker_file_id, file_path, attachments
+FROM history_messages
+WHERE chat_id = ?
+  AND id IN (SELECT rowid FROM history_fts WHERE history_fts MATCH ?)
+ORDER BY id DESC LIMIT ?`,
+  searchFtsBetween: `-- searchFts restricted to a timestamp window [after, before) — the
+-- search_history \`after\` / \`before\` date parameters. Either bound may be
+-- the open end of the range (0 / a far-future value).
+SELECT msg_id, sender_id, sender_name, sender_handle, text, reply_to_msg_id,
+       timestamp, media_type, sticker_file_id, file_path, attachments
 FROM history_messages
 WHERE chat_id = ?
   AND id IN (SELECT rowid FROM history_fts WHERE history_fts MATCH ?)
+  AND timestamp >= ? AND timestamp < ?
 ORDER BY id DESC LIMIT ?`,
   bySenderName: `-- The fragment param is LIKE-escaped by the repository (backslash escape).
 SELECT msg_id, sender_id, sender_name, sender_handle, text, reply_to_msg_id,
-       timestamp, media_type, sticker_file_id, file_path
+       timestamp, media_type, sticker_file_id, file_path, attachments
 FROM history_messages
 WHERE chat_id = ? AND lower(sender_name) LIKE ? ESCAPE '\\'
 ORDER BY id DESC LIMIT ?`,
   byMsgId: `SELECT msg_id, sender_id, sender_name, sender_handle, text, reply_to_msg_id,
-       timestamp, media_type, sticker_file_id, file_path
+       timestamp, media_type, sticker_file_id, file_path, attachments
 FROM history_messages
 WHERE chat_id = ? AND msg_id = ? ORDER BY id DESC LIMIT 1`,
   bySenderId: `SELECT msg_id, sender_id, sender_name, sender_handle, text, reply_to_msg_id,
-       timestamp, media_type, sticker_file_id, file_path
+       timestamp, media_type, sticker_file_id, file_path, attachments
 FROM history_messages
 WHERE chat_id = ? AND sender_id = ? ORDER BY id DESC LIMIT ?`,
   latestMsgId: `SELECT msg_id FROM history_messages WHERE chat_id = ? ORDER BY id DESC LIMIT 1`,
@@ -548,3 +589,21 @@ WHERE chat_id = ?1
     LIMIT ?2
   )`,
 } as const;
+
+export const whatsappMessagesSql = {
+  insert: `INSERT OR IGNORE INTO whatsapp_messages
+  (chat_id, msg_id, wa_id, remote_jid, from_me, participant, sender_name,
+   text, timestamp, message_json)
+VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+  byMsgId: `SELECT chat_id, msg_id, wa_id, remote_jid, from_me, participant, sender_name,
+       text, timestamp, message_json
+FROM whatsapp_messages WHERE msg_id = ? LIMIT 1`,
+  byWaId: `-- Newest first: a WhatsApp id re-delivered on reconnect maps to the row
+-- that already exists for it.
+SELECT chat_id, msg_id, wa_id, remote_jid, from_me, participant, sender_name,
+       text, timestamp, message_json
+FROM whatsapp_messages WHERE wa_id = ? ORDER BY msg_id DESC LIMIT 1`,
+  maxMsgId: `SELECT MAX(msg_id) AS max_id FROM whatsapp_messages`,
+  deleteOlderThan: `DELETE FROM whatsapp_messages WHERE timestamp < ?`,
+  deleteAll: `DELETE FROM whatsapp_messages`,
+} as const;

package/src/storage/sql/whatsapp-messages.sql

@@ -0,0 +1,29 @@
+-- Statements for the whatsapp_messages table (see
+-- repositories/whatsapp-messages-repo.ts for parameter order and mapping).
+
+-- name: insert
+INSERT OR IGNORE INTO whatsapp_messages
+  (chat_id, msg_id, wa_id, remote_jid, from_me, participant, sender_name,
+   text, timestamp, message_json)
+VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+
+-- name: byMsgId
+SELECT chat_id, msg_id, wa_id, remote_jid, from_me, participant, sender_name,
+       text, timestamp, message_json
+FROM whatsapp_messages WHERE msg_id = ? LIMIT 1
+
+-- name: byWaId
+-- Newest first: a WhatsApp id re-delivered on reconnect maps to the row
+-- that already exists for it.
+SELECT chat_id, msg_id, wa_id, remote_jid, from_me, participant, sender_name,
+       text, timestamp, message_json
+FROM whatsapp_messages WHERE wa_id = ? ORDER BY msg_id DESC LIMIT 1
+
+-- name: maxMsgId
+SELECT MAX(msg_id) AS max_id FROM whatsapp_messages
+
+-- name: deleteOlderThan
+DELETE FROM whatsapp_messages WHERE timestamp < ?
+
+-- name: deleteAll
+DELETE FROM whatsapp_messages

package/src/storage/whatsapp-messages.ts

@@ -0,0 +1,51 @@
+/**
+ * Persistent WhatsApp message keys.
+ *
+ * The WhatsApp frontend hands every message it sees a numeric Talon id
+ * and needs the WhatsApp key (and, for forwards and media re-downloads,
+ * the whole proto) back later. Its in-memory store is a bounded cache;
+ * this table is the record, so a reply, reaction or download addressed
+ * at a message from before the last restart still resolves.
+ *
+ * The proto travels as JSON — the frontend serialises and rehydrates it;
+ * storage never imports Baileys.
+ */
+
+import * as repo from "./repositories/whatsapp-messages-repo.js";
+
+export type { WhatsAppMessageRecord } from "./repositories/whatsapp-messages-repo.js";
+
+/** How long a message's key (and retained proto) stays retrievable. */
+const WHATSAPP_MESSAGE_RETENTION_MS = 180 * 24 * 60 * 60 * 1000;
+
+/** Persist a message; a (chat, msg_id) already stored is left as is. */
+export function saveWhatsAppMessage(record: repo.WhatsAppMessageRecord): void {
+  repo.insert(record);
+}
+
+export function getWhatsAppMessage(
+  msgId: number,
+): repo.WhatsAppMessageRecord | undefined {
+  return repo.byMsgId(msgId);
+}
+
+export function getWhatsAppMessageByWaId(
+  waId: string,
+): repo.WhatsAppMessageRecord | undefined {
+  return repo.byWaId(waId);
+}
+
+/** Highest Talon id ever persisted — the restart seed for the id counter. */
+export function maxWhatsAppMsgId(): number | undefined {
+  return repo.maxMsgId();
+}
+
+/** Drop rows past the retention window; returns the number removed. */
+export function pruneWhatsAppMessages(now = Date.now()): number {
+  return repo.deleteOlderThan(now - WHATSAPP_MESSAGE_RETENTION_MS);
+}
+
+/** Test seam: forget every persisted message. */
+export function clearWhatsAppMessages(): void {
+  repo.deleteAll();
+}