talon-agent 5.28.0 → 5.30.0

package/src/storage/media-index.ts

@@ -73,7 +73,19 @@ function importLegacyMediaIndex(): void {
 
 // ── CRUD ────────────────────────────────────────────────────────────────────
 
-export function addMedia(entry: Omit<MediaEntry, "id">): void {
+/**
+ * Index a downloaded file and dedupe it against identical content.
+ *
+ * Resolves to the path the message's media now lives at — the
+ * canonical copy when the download duplicated one already on disk
+ * (the fresh file is then deleted), otherwise `entry.filePath`.
+ * Callers MUST use the resolved path for anything they show the
+ * model: the original path may no longer exist once this settles.
+ *
+ * The row is written synchronously, so it is queryable before the
+ * hash finishes.
+ */
+export async function addMedia(entry: Omit<MediaEntry, "id">): Promise<string> {
   try {
     repo.upsert(entry);
   } catch (err) {
@@ -85,13 +97,32 @@ export function addMedia(entry: Omit<MediaEntry, "id">): void {
     recordError(
       `Media index write failed: ${err instanceof Error ? err.message : err}`,
     );
-    return;
+    return entry.filePath;
   }
-  // Hash + dedupe off the hot path — the caller is mid-message-handling
-  // and the row is already queryable without the hash.
-  void hashAndDedupe(entry).catch((err) =>
-    logError("media", `Media content hash failed for ${entry.filePath}`, err),
+  // Serialize dedupe: two identical files hashed concurrently (e.g. an
+  // album) could otherwise each pick the other as canonical and both
+  // get unlinked.
+  const run = dedupeChain.then(() => hashAndDedupe(entry));
+  dedupeChain = run.then(
+    () => undefined,
+    () => undefined,
   );
+  try {
+    return await run;
+  } catch (err) {
+    logError("media", `Media content hash failed for ${entry.filePath}`, err);
+    return entry.filePath;
+  }
+}
+
+let dedupeChain: Promise<void> = Promise.resolve();
+
+/** The indexed entry for a message, if any. */
+export function getMediaForMessage(
+  chatId: string,
+  msgId: number,
+): MediaEntry | undefined {
+  return repo.byMessage(chatId, msgId);
 }
 
 /**
@@ -101,15 +132,15 @@ export function addMedia(entry: Omit<MediaEntry, "id">): void {
  * canonical copy and drop the duplicate file, so re-posted media costs
  * one copy on disk no matter how many messages carry it.
  */
-async function hashAndDedupe(entry: Omit<MediaEntry, "id">): Promise<void> {
-  if (!existsSync(entry.filePath)) return; // gone already (expiry, tests)
+async function hashAndDedupe(entry: Omit<MediaEntry, "id">): Promise<string> {
+  if (!existsSync(entry.filePath)) return entry.filePath; // gone already (expiry, tests)
   const hash = await blake3HexFile(entry.filePath);
   repo.setContentHash(entry.chatId, entry.msgId, hash);
 
   const canonical = repo.firstByContentHash(hash, entry.chatId, entry.msgId);
-  if (!canonical) return;
-  if (canonical.filePath === entry.filePath) return; // re-download of the same path
-  if (!existsSync(canonical.filePath)) return; // canonical copy lost — keep ours
+  if (!canonical) return entry.filePath;
+  if (canonical.filePath === entry.filePath) return entry.filePath; // re-download of the same path
+  if (!existsSync(canonical.filePath)) return entry.filePath; // canonical copy lost — keep ours
 
   repo.setFilePath(entry.chatId, entry.msgId, canonical.filePath);
   setMessageFilePath(entry.chatId, entry.msgId, canonical.filePath);
@@ -131,6 +162,7 @@ async function hashAndDedupe(entry: Omit<MediaEntry, "id">): Promise<void> {
       );
     }
   }
+  return canonical.filePath;
 }
 
 /** Get recent media for a chat, newest first. */

package/src/storage/repositories/media-index-repo.ts

@@ -33,7 +33,7 @@ export type MediaEntry = {
   timestamp: number;
   /**
    * BLAKE3 hex digest of the file contents (native/blake3-wasm).
-   * Filled in asynchronously after addMedia; undefined until hashed.
+   * Filled in by addMedia before it resolves; undefined until hashed.
    */
   contentHash?: string;
 };
@@ -112,6 +112,17 @@ export function firstByContentHash(
   return row ? rowToEntry(row) : undefined;
 }
 
+/** The entry for one message, if indexed. */
+export function byMessage(
+  chatId: string,
+  msgId: number,
+): MediaEntry | undefined {
+  const row = getDatabase()
+    .prepare(mediaIndexSql.byMessage)
+    .get(chatId, msgId) as Row | undefined;
+  return row ? rowToEntry(row) : undefined;
+}
+
 /** Entries currently pointing at a file — dedupe makes this > 1. */
 export function countByFilePath(filePath: string): number {
   const row = getDatabase()

package/src/storage/sql/media-index.sql

@@ -43,3 +43,7 @@ ORDER BY timestamp ASC, rowid ASC LIMIT 1
 
 -- name: countByFilePath
 SELECT COUNT(*) AS n FROM media_index WHERE file_path = ?
+
+-- name: byMessage
+SELECT chat_id, msg_id, sender_name, type, file_path, caption, timestamp, content_hash
+FROM media_index WHERE chat_id = ? AND msg_id = ?

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

@@ -767,6 +767,8 @@ FROM media_index
 WHERE content_hash = ? AND NOT (chat_id = ? AND msg_id = ?)
 ORDER BY timestamp ASC, rowid ASC LIMIT 1`,
   countByFilePath: `SELECT COUNT(*) AS n FROM media_index WHERE file_path = ?`,
+  byMessage: `SELECT chat_id, msg_id, sender_name, type, file_path, caption, timestamp, content_hash
+FROM media_index WHERE chat_id = ? AND msg_id = ?`,
 } as const;
 
 export const memorySql = {

package/src/util/log.ts

@@ -72,6 +72,7 @@ export type LogComponent =
   | "memory"
   | "stickers"
   | "backup"
+  | "secrets"
   | "router"
   | "backend-controller"
   | "fetch";

package/src/util/paths.ts

@@ -88,6 +88,12 @@ export const dirs = {
   skills: resolve(TALON_ROOT, "workspace", "skills"),
   /** Key material (bridge TLS identity, release keys): ~/.talon/keys/ */
   keys: resolve(TALON_ROOT, "keys"),
+  /**
+   * Operator secrets, one file per value (mode 600): ~/.talon/secrets/.
+   * Written by the secret drop (`/secret <name>`, `request_secret`) so a
+   * password never has to travel through a chat message.
+   */
+  secrets: resolve(TALON_ROOT, "secrets"),
   /**
    * The talon:// namespace on disk: ~/.talon/ns/. Holds one symlink per
    * file-backed mount (home → workspace/, skills/, …); while the daemon