talon-agent 4.6.0 → 5.0.0

package/src/frontend/telegram/commands/admin.ts

@@ -1,5 +1,5 @@
 /**
- * Admin + maintenance commands — /admin, /metrics, /doctor, /dream, /soul,
+ * Admin + maintenance commands — /admin, /metrics, /doctor, /dream,
  * /restart, /update — plus the unknown-command "did you mean…?" suggester.
  *
  * Most commands here gate on the configured admin user id via
@@ -14,8 +14,7 @@ import {
   getRepoRoot,
   runSelfUpdate,
 } from "../../../core/update/self-update.js";
-import { forceDream } from "../../../core/background/dream.js";
-import { getSoul } from "../../../core/soul/service.js";
+import { forceDream } from "../../../core/background/dream/index.js";
 import { escapeHtml } from "../formatting.js";
 import { closestMatch } from "../../../native/strsim.js";
 import {
@@ -126,39 +125,6 @@ function registerDreamCommand(bot: Bot): void {
   });
 }
 
-// /soul — introspect the compiled identity (read-only). `/soul dream`
-// (admin) runs the organic maintenance pass. Inert when the soul is
-// disabled (TALON_SOUL_ENABLED), so it's safe to ship dormant.
-function registerSoulCommand(bot: Bot): void {
-  bot.command("soul", async (ctx) => {
-    const soul = getSoul();
-    if (!soul.enabled) {
-      await ctx.reply("Soul is disabled (set TALON_SOUL_ENABLED to enable).");
-      return;
-    }
-    const arg = (ctx.match ?? "").trim().toLowerCase();
-    if (arg === "dream") {
-      if (!isAuthorizedAdmin(ctx)) {
-        await ctx.reply("Not authorized.");
-        return;
-      }
-      const sent = await ctx.reply("🧠 Soul dreaming...");
-      void soul
-        .dream()
-        .then(() =>
-          bot.api.editMessageText(
-            ctx.chat.id,
-            sent.message_id,
-            "🧠 Soul dream complete.",
-          ),
-        )
-        .catch(() => undefined);
-      return;
-    }
-    await ctx.reply(soul.introspect());
-  });
-}
-
 function registerRestartCommand(bot: Bot): void {
   bot.command("restart", async (ctx) => {
     if (!isAuthorizedAdmin(ctx)) {
@@ -275,7 +241,6 @@ export function registerAdminCommands(
   registerUsageCommand(bot, config);
   registerDoctorCommand(bot, config);
   registerDreamCommand(bot);
-  registerSoulCommand(bot);
   registerRestartCommand(bot);
   const updateRepoRoot = config.devBuild ? getRepoRoot() : null;
   if (updateRepoRoot) registerUpdateCommand(bot, config, updateRepoRoot);

package/src/frontend/telegram/commands/index.ts

@@ -8,7 +8,7 @@
  *   - `memory`      — /memory (read-only view of the typed memory store)
  *   - `session`     — /reset /status
  *   - `settings`    — /model /effort /pulse /settings
- *   - `admin`       — /admin /metrics /doctor /dream /soul /restart /update
+ *   - `admin`       — /admin /metrics /doctor /dream /restart /update
  *                     + the unknown-command suggester
  *
  * `registerCommands` wires every group onto the bot in an order that ends

package/src/frontend/telegram/commands/session.ts

@@ -20,6 +20,10 @@ import {
   performSessionReset,
   collectSessionStatus,
 } from "../../shared/session-status.js";
+import {
+  formatCacheTempLine,
+  formatDaemonLine,
+} from "../../shared/status-context.js";
 import { stopCurrentTurn } from "../../../core/engine/dispatcher.js";
 import type { RegisterDeps } from "./state.js";
 
@@ -74,6 +78,7 @@ export function registerSessionCommands(
             `  Read ${formatTokenCount(s.cache.read)}${s.cache.showsWrite ? `  Write ${formatTokenCount(s.cache.write)}` : ""}`,
           ]
         : []),
+      ...(s.cacheTemp ? [`  ${formatCacheTempLine(s.cacheTemp)}`] : []),
       `  Input ${formatTokenCount(s.inputTokens)}  Output ${formatTokenCount(s.outputTokens)}${s.costUsd > 0 ? `  Cost ${formatUsd(s.costUsd)}` : ""}`,
       "",
       ...(s.plan
@@ -91,6 +96,7 @@ export function registerSessionCommands(
       `<b>Session</b>   ${s.sessionName ? `"${escapeHtml(s.sessionName)}" ` : ""}${s.sessionId ? "<code>" + escapeHtml(s.sessionId.slice(0, 8)) + "...</code>" : "<i>(new)</i>"} · ${s.sessionAge} old`,
       `<b>Uptime</b>    ${s.uptime} · ${s.activeSessionCount} active session${s.activeSessionCount === 1 ? "" : "s"}`,
       `<b>Runtime</b>   ${escapeHtml(s.runtime)} · ${formatBytes(s.rssBytes)} RSS`,
+      escapeHtml(formatDaemonLine(s.daemon)),
     ];
     await ctx.reply(lines.join("\n"), { parse_mode: "HTML" });
   });

package/src/frontend/telegram/commands/settings.ts

@@ -17,7 +17,7 @@ import {
   disablePulse,
   enablePulse,
   isPulseEnabled,
-} from "../../../core/background/pulse.js";
+} from "../../../core/background/pulse/pulse.js";
 import { escapeHtml } from "../formatting.js";
 import {
   formatModelLabel,

package/src/frontend/telegram/handlers/messages.ts

@@ -13,7 +13,6 @@ import { setMessageFilePath } from "../../../storage/history.js";
 import { addMedia } from "../../../storage/media-index.js";
 import { appendDailyLog } from "../../../storage/daily-log.js";
 import { logError } from "../../../util/log.js";
-import { recordMessageSignal } from "../../../core/soul/taps.js";
 import {
   getSenderName,
   getReplyContext,
@@ -178,15 +177,6 @@ export async function handleTextMessage(
   );
   const prompt = fwdCtx + replyCtx + replyPhotoCtx + (ctx.message.text ?? "");
 
-  // Soul tap: a message reaching here is addressed to Talon (DM, mention, or
-  // reply). If it reads as a standing directive or a correction, record it as
-  // evidence. No-op unless the soul is enabled.
-  recordMessageSignal({
-    text: ctx.message.text ?? "",
-    actor: sender,
-    addressedToBot: true,
-  });
-
   enqueueMessage(bot, config, chatId, ctx.chat.id, {
     prompt,
     replyToId: ctx.message.message_id,

package/src/frontend/telegram/index.ts

@@ -10,7 +10,6 @@ import { Bot, InputFile, API_CONSTANTS } from "grammy";
 import { autoRetry } from "@grammyjs/auto-retry";
 import { apiThrottler } from "@grammyjs/transformer-throttler";
 import type { TalonConfig } from "../../core/config/index.js";
-import { soulEnabled } from "../../core/soul/settings.js";
 import type { ContextManager } from "../../core/types.js";
 import type { Gateway } from "../../core/engine/gateway.js";
 import { createTelegramActionHandler, sendText } from "./actions/index.js";
@@ -127,13 +126,10 @@ export function createTelegramFrontend(
       });
       // Beyond grammY's defaults: `chat_join_request` feeds the moderation
       // tool's pending-join cache (inert unless the bot admins an
-      // approval-gated chat), and `message_reaction` feeds the soul's
-      // reaction tap — subscribed only when the soul is enabled, so a
-      // soulless deployment's reaction behaviour is unchanged.
+      // approval-gated chat).
       const allowedUpdates = [
         ...API_CONSTANTS.DEFAULT_UPDATE_TYPES,
         "chat_join_request" as const,
-        ...(soulEnabled(config.soul) ? ["message_reaction" as const] : []),
       ];
       await bot.start({
         allowed_updates: allowedUpdates,

package/src/frontend/telegram/middleware.ts

@@ -12,13 +12,12 @@ import type { TalonConfig } from "../../core/config/index.js";
 import { pushMessage } from "../../storage/history.js";
 import type { HistoryMessage } from "../../storage/repositories/history-repo.js";
 import { allowChat, revokeChat } from "./userbot.js";
-import { registerChat } from "../../core/background/pulse.js";
+import { registerChat } from "../../core/background/pulse/pulse.js";
 import { log } from "../../util/log.js";
 import { getSenderName } from "./handlers/index.js";
 import { noteUpdateId } from "./update-offset.js";
 import { noteInboundThread } from "./topics.js";
 import { recordJoinRequest } from "./join-requests.js";
-import { newlyAddedEmojis, recordReactionToBot } from "../../core/soul/taps.js";
 import {
   handleTextMessage,
   handlePhotoMessage,
@@ -147,18 +146,6 @@ function captureHistory(
   return next();
 }
 
-// ── Reaction tap — feed reactions on Talon's own messages to the soul ────
-// Telegram only delivers `message_reaction` updates when subscribed via
-// allowed_updates (see index.ts) and, in groups, when the bot is an admin.
-// The handler is inert unless the soul is enabled.
-function tapReaction(ctx: Filter<Context, "message_reaction">): void {
-  const mr = ctx.messageReaction;
-  // Ignore the bot reacting to messages itself.
-  if (mr.user?.id === ctx.me.id) return;
-  const added = newlyAddedEmojis(mr.old_reaction, mr.new_reaction);
-  recordReactionToBot(mr.chat.id, mr.message_id, added);
-}
-
 // ── Join requests — cache for moderate(op="list_join_requests") ─────────
 // Delivered only when subscribed via allowed_updates (see index.ts) and
 // the bot admins a chat whose invite link requires approval. Stored, not
@@ -208,7 +195,6 @@ function registerMessageHandlers(bot: Bot, config: TalonConfig): void {
 export function registerMiddleware(bot: Bot, config: TalonConfig): void {
   bot.use(trackUpdateOffset);
   bot.on("message", captureHistory);
-  bot.on("message_reaction", tapReaction);
   bot.on("chat_join_request", cacheJoinRequest);
   bot.on("my_chat_member", revokeOnRemoval);
   registerMessageHandlers(bot, config);

package/src/frontend/whatsapp/access.ts

@@ -1,12 +1,12 @@
 /**
  * Access gates — the allow-lists are the entire permission model. DMs
- * match `allowedJids` (see identity.ts); groups go through `groupPolicy`
+ * match `allowedJids` (see connection/identity.ts); groups go through `groupPolicy`
  * and, in mention mode, must address the bot.
  */
 
 import type { WAMessage } from "baileys";
 import { logWarn } from "../../util/log.js";
-import { bareId } from "./identity.js";
+import { bareId } from "./connection/identity.js";
 import type { WhatsAppRuntime } from "./runtime.js";
 
 /**

package/src/frontend/whatsapp/actions/history.ts

@@ -17,8 +17,8 @@ import {
   getMessageById,
   setMessageFilePath,
 } from "../../../storage/history.js";
-import { saveInboundMedia } from "../media-store.js";
-import { lookupMessage, resolveKey } from "../message-store.js";
+import { saveInboundMedia } from "../messages/media-store.js";
+import { lookupMessage, resolveKey } from "../messages/message-store.js";
 import { tryAction } from "./try-action.js";
 import type { WhatsAppActionHandlers } from "./types.js";
 

package/src/frontend/whatsapp/actions/messaging.ts

@@ -11,8 +11,8 @@ import { randomUUID } from "node:crypto";
 import { proto } from "baileys";
 import { log } from "../../../util/log.js";
 import { toWhatsAppText } from "../formatting.js";
-import { lookupMessage, resolveKey } from "../message-store.js";
-import { recordPin, listPins, forgetPin } from "../pins.js";
+import { lookupMessage, resolveKey } from "../messages/message-store.js";
+import { recordPin, listPins, forgetPin } from "../messages/pins.js";
 import { tryAction } from "./try-action.js";
 import { resolveQuoted, sendContent, sendText, boundedSend } from "./send.js";
 import type { WhatsAppActionHandlers } from "./types.js";

package/src/frontend/whatsapp/actions/moderation.ts

@@ -194,7 +194,7 @@ export const moderationHandlers: WhatsAppActionHandlers = {
 
         case "unpin_all": {
           // WhatsApp unpins individually; clear the ones Talon placed.
-          const { listPins } = await import("../pins.js");
+          const { listPins } = await import("../messages/pins.js");
           const pins = listPins(chat.chatId);
           return {
             ok: true,

package/src/frontend/whatsapp/actions/send.ts

@@ -8,7 +8,7 @@ import type { AnyMessageContent, WAMessage, WASocket } from "baileys";
 import { log } from "../../../util/log.js";
 import type { ActionResult } from "../../../core/types.js";
 import { toWhatsAppChunks } from "../formatting.js";
-import { lookupMessage, rememberMessage } from "../message-store.js";
+import { lookupMessage, rememberMessage } from "../messages/message-store.js";
 import { pushMessage, type HistoryMessage } from "../../../storage/history.js";
 import type { WhatsAppChatInfo } from "../registry.js";
 

package/src/frontend/whatsapp/commands.ts

@@ -15,7 +15,7 @@
 import { log } from "../../util/log.js";
 import { recordMessageProcessed } from "../../util/watchdog.js";
 import { getChatSettings } from "../../storage/chat-settings.js";
-import { isPulseEnabled } from "../../core/background/pulse.js";
+import { isPulseEnabled } from "../../core/background/pulse/pulse.js";
 import {
   DEFAULT_PULSE_INTERVAL_MS,
   formatBytes,
@@ -29,6 +29,10 @@ import {
   performSessionReset,
   type SessionStatusData,
 } from "../shared/session-status.js";
+import {
+  formatCacheTempLine,
+  formatDaemonLine,
+} from "../shared/status-context.js";
 import {
   describeChatEffort,
   describeChatModels,
@@ -43,7 +47,7 @@ import {
   type ModelOverview,
 } from "../shared/model-commands.js";
 import { sendText } from "./actions/send.js";
-import { identityAllowed, type Identity } from "./identity.js";
+import { identityAllowed, type Identity } from "./connection/identity.js";
 import type { WhatsAppChatInfo } from "./registry.js";
 import type { WhatsAppRuntime } from "./runtime.js";
 
@@ -199,6 +203,7 @@ function renderStatus(s: SessionStatusData): string {
       `Cache: ${s.cache.hitPct}% hit · read ${formatTokenCount(s.cache.read)}${s.cache.showsWrite ? ` · write ${formatTokenCount(s.cache.write)}` : ""}`,
     );
   }
+  if (s.cacheTemp) lines.push(formatCacheTempLine(s.cacheTemp));
   if (s.plan) {
     lines.push(
       "",
@@ -216,6 +221,7 @@ function renderStatus(s: SessionStatusData): string {
     `**Session** ${s.sessionName ? `"${s.sessionName}" ` : ""}${s.sessionId ? `\`${s.sessionId.slice(0, 8)}…\`` : "(new)"} · ${s.sessionAge} old`,
     `**Uptime** ${s.uptime} · ${s.activeSessionCount} active session${s.activeSessionCount === 1 ? "" : "s"}`,
     `**Runtime** ${s.runtime} · ${formatBytes(s.rssBytes)} RSS`,
+    formatDaemonLine(s.daemon),
   );
   return lines.join("\n");
 }

package/src/frontend/whatsapp/{connection.ts → connection/connection.ts}

@@ -9,19 +9,19 @@ import { readFile } from "node:fs/promises";
 import { resolve as resolvePath } from "node:path";
 import makeWASocket, { type AuthenticationState, type WASocket } from "baileys";
 import qrcode from "qrcode-terminal";
-import { log, logError, logWarn } from "../../util/log.js";
-import { dirs } from "../../util/paths.js";
-import { notifyAdmin } from "../../core/frontend-runtime/admin-notify.js";
+import { log, logError, logWarn } from "../../../util/log.js";
+import { dirs } from "../../../util/paths.js";
+import { notifyAdmin } from "../../../core/frontend-runtime/admin-notify.js";
 import { useAtomicAuthState } from "./auth-state.js";
 import { bareId } from "./identity.js";
-import { handleInbound } from "./inbound.js";
+import { handleInbound } from "../messages/inbound.js";
 import { classifyClose, isPaired, REPLACED_BACKOFF_MS } from "./pairing.js";
 import { isManualPairingActive, onPairingComplete } from "./pairing-lock.js";
 import {
   RECONNECT_BASE_MS,
   RECONNECT_MAX_MS,
   type WhatsAppRuntime,
-} from "./runtime.js";
+} from "../runtime.js";
 import { makeWaLogger } from "./wa-logger.js";
 
 /** What the connection loop should do after a socket ends. */

package/src/frontend/whatsapp/{pairing-service.ts → connection/pairing-service.ts}

@@ -16,9 +16,9 @@ import QRCode from "qrcode";
 import type {
   PairingAttempt,
   PairingOutcome,
-} from "../../core/frontend-runtime/pairing-broker.js";
-import { log, logError } from "../../util/log.js";
-import { dirs } from "../../util/paths.js";
+} from "../../../core/frontend-runtime/pairing-broker.js";
+import { log, logError } from "../../../util/log.js";
+import { dirs } from "../../../util/paths.js";
 import { useAtomicAuthState, flushAuthWrites } from "./auth-state.js";
 import { classifyClose } from "./pairing.js";
 import { acquireManualPairing, releaseManualPairing } from "./pairing-lock.js";

package/src/frontend/whatsapp/{wa-logger.ts → connection/wa-logger.ts}

@@ -3,11 +3,11 @@
  * that already has structured logging. Bridge warn+ into Talon's log and
  * drop the rest. The shape is pino's minimal logger contract.
  *
- * Shared by the frontend socket (index.ts) and the manual pairing socket
+ * Shared by the frontend socket (../index.ts) and the manual pairing socket
  * (pairing-service.ts).
  */
 
-import { logError, logWarn } from "../../util/log.js";
+import { logError, logWarn } from "../../../util/log.js";
 
 export function makeWaLogger(): never {
   const fmt = (args: unknown[]): string =>

package/src/frontend/whatsapp/index.ts

@@ -26,15 +26,15 @@ import { log, logError, logWarn } from "../../util/log.js";
 import { maxMsgIdForChatPrefix } from "../../storage/history.js";
 import { createWhatsAppActionHandler } from "./actions/index.js";
 import { sendText, setWhatsAppBotName } from "./actions/send.js";
-import { seedMessageStore } from "./message-store.js";
+import { seedMessageStore } from "./messages/message-store.js";
 import {
   maxWhatsAppMsgId,
   pruneWhatsAppMessages,
 } from "../../storage/whatsapp-messages.js";
-import { flushAuthWrites } from "./auth-state.js";
+import { flushAuthWrites } from "./connection/auth-state.js";
 import { registerPairingProvider } from "../../core/frontend-runtime/pairing-broker.js";
-import { beginPairingAttempt } from "./pairing-service.js";
-import { runConnectionLoop } from "./connection.js";
+import { beginPairingAttempt } from "./connection/pairing-service.js";
+import { runConnectionLoop } from "./connection/connection.js";
 import { lookupWhatsAppChat, type WhatsAppChatInfo } from "./registry.js";
 import { createWhatsAppRuntime } from "./runtime.js";
 

package/src/frontend/whatsapp/{inbound.ts → messages/inbound.ts}

@@ -1,35 +1,35 @@
 /**
  * One inbound message, from `messages.upsert` to the model's turn:
  * access gates → media saved to the workspace → history recorded →
- * slash commands (commands.ts) → catch-up policy → `execute()`.
+ * slash commands (../commands.ts) → catch-up policy → `execute()`.
  */
 
 import { isJidGroup, type WAMessage } from "baileys";
-import type { AgentEvent } from "../../core/agent-runtime/events.js";
-import { log, logError } from "../../util/log.js";
-import { execute } from "../../core/engine/dispatcher.js";
-import { toolInputToRecord } from "../../core/agent-runtime/events.js";
-import { appendDailyLog } from "../../storage/daily-log.js";
-import { pushMessage } from "../../storage/history.js";
-import { relayInbound } from "../../core/engine/cross-chat-relay.js";
+import type { AgentEvent } from "../../../core/agent-runtime/events.js";
+import { log, logError } from "../../../util/log.js";
+import { execute } from "../../../core/engine/dispatcher.js";
+import { toolInputToRecord } from "../../../core/agent-runtime/events.js";
+import { appendDailyLog } from "../../../storage/daily-log.js";
+import { pushMessage } from "../../../storage/history.js";
+import { relayInbound } from "../../../core/engine/cross-chat-relay.js";
 import {
   recordMessageProcessed,
   recordMessageReceived,
-} from "../../util/watchdog.js";
-import { isAddressedToSelf, isGroupAllowed } from "./access.js";
-import { handleWhatsAppCommand } from "./commands.js";
-import { sendText } from "./actions/send.js";
+} from "../../../util/watchdog.js";
+import { isAddressedToSelf, isGroupAllowed } from "../access.js";
+import { handleWhatsAppCommand } from "../commands.js";
+import { sendText } from "../actions/send.js";
 import {
   bareId,
   canonicalId,
   identityAllowed,
   resolveIdentity,
   type Identity,
-} from "./identity.js";
+} from "../connection/identity.js";
 import { saveInboundMedia, type SavedMedia } from "./media-store.js";
 import { lookupByWaId, rememberMessage } from "./message-store.js";
-import { registerWhatsAppChat, type WhatsAppChatInfo } from "./registry.js";
-import type { WhatsAppRuntime } from "./runtime.js";
+import { registerWhatsAppChat, type WhatsAppChatInfo } from "../registry.js";
+import type { WhatsAppRuntime } from "../runtime.js";
 import { runTurnWithRecovery, shouldReplyToCatchUp } from "./turn-recovery.js";
 
 export type InboundOptions = { catchUp?: boolean };

package/src/frontend/whatsapp/{media-store.ts → messages/media-store.ts}

@@ -11,10 +11,10 @@
 import { mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { downloadMediaMessage, type WAMessage } from "baileys";
-import { makeWaLogger } from "./wa-logger.js";
-import { addMedia } from "../../storage/media-index.js";
-import { logWarn } from "../../util/log.js";
-import { dirs } from "../../util/paths.js";
+import { makeWaLogger } from "../connection/wa-logger.js";
+import { addMedia } from "../../../storage/media-index.js";
+import { logWarn } from "../../../util/log.js";
+import { dirs } from "../../../util/paths.js";
 
 /** Media kinds Talon's index understands, keyed by WhatsApp message field. */
 const MEDIA_KINDS = [

package/src/frontend/whatsapp/{message-store.ts → messages/message-store.ts}

@@ -24,7 +24,7 @@ import {
   saveWhatsAppMessage,
   clearWhatsAppMessages,
   type WhatsAppMessageRecord,
-} from "../../storage/whatsapp-messages.js";
+} from "../../../storage/whatsapp-messages.js";
 
 export type StoredMessage = {
   /** Talon-facing numeric id. */

package/src/frontend/whatsapp/{turn-recovery.ts → messages/turn-recovery.ts}

@@ -6,7 +6,7 @@
  * the log — the WhatsApp user's message was marked read and then nothing
  * ever came back, which reads as being ignored.
  *
- * Split from index.ts so the policy is unit-testable without a Baileys
+ * Split from ../index.ts so the policy is unit-testable without a Baileys
  * socket: the caller injects the turn and the delivery.
  */
 
@@ -14,13 +14,13 @@ import {
   classify,
   friendlyMessage,
   RETRY_ELAPSED_CAP_MS,
-} from "../../core/errors.js";
-import { log, logError } from "../../util/log.js";
+} from "../../../core/errors.js";
+import { log, logError } from "../../../util/log.js";
 import {
   recordError,
   recordMessageProcessed,
   recordMessageSettled,
-} from "../../util/watchdog.js";
+} from "../../../util/watchdog.js";
 
 export type TurnRecoveryDeps = {
   chatId: string;

package/src/frontend/whatsapp/registry.ts

@@ -10,7 +10,7 @@
 
 import { isJidGroup, jidNormalizedUser } from "baileys";
 import { deriveNumericChatId } from "../../util/chat-id.js";
-import { bareId } from "./identity.js";
+import { bareId } from "./connection/identity.js";
 
 export type WhatsAppChatInfo = {
   /** Talon chat id: wa_dm_<number> or wa_group_<id>. */

package/src/frontend/whatsapp/runtime.ts

@@ -11,7 +11,7 @@
 import type { WASocket } from "baileys";
 import type { TalonConfig } from "../../core/config/index.js";
 import type { Gateway } from "../../core/engine/gateway.js";
-import { bareId } from "./identity.js";
+import { bareId } from "./connection/identity.js";
 
 type WhatsAppSettings = {
   allowedJids: string[];

package/src/index.ts

@@ -9,7 +9,7 @@
  */
 
 import { MCP_LAUNCH_SUBCOMMAND, runSupervisor } from "./util/mcp-launcher.js";
-import { LUA_RUN_SUBCOMMAND, runLuaMain } from "./core/scripting/lua-runner.js";
+import { LUA_RUN_SUBCOMMAND, runLuaMain } from "./core/scripts/lua.js";
 
 if (process.argv[2] === MCP_LAUNCH_SUBCOMMAND) {
   await runSupervisor(process.argv.slice(3));

package/src/storage/db.ts

@@ -69,7 +69,7 @@ let db: SqlDatabase | null = null;
  * Column reconciliation runs first: `ALTER TABLE … ADD COLUMN` has no
  * IF NOT EXISTS form, so columns added to already-shipped tables
  * (media_index.content_hash, sessions.metrics,
- * history_messages.attachments) are ensured by attempting the ALTER and
+ * history_messages.attachments, sessions.last_turn_ended_at) are ensured by attempting the ALTER and
  * swallowing the two expected failures — "duplicate column name"
  * (column already there) and "no such table" (fresh database; the
  * CREATE TABLE in schema.sql includes the column).
@@ -100,6 +100,11 @@ function ensureSchema(database: SqlDatabase): void {
   } catch {
     /* duplicate column or no such table — both mean nothing to do */
   }
+  try {
+    database.exec(dbSql.addSessionsLastTurnEndedAtColumn);
+  } catch {
+    /* duplicate column or no such table — both mean nothing to do */
+  }
   database.exec("BEGIN");
   try {
     database.exec(SCHEMA);

package/src/storage/memory.ts

@@ -206,6 +206,25 @@ function similarityQuery(text: string): string {
     .join(" OR ");
 }
 
+/**
+ * The near-duplicate probe, in one place: live rows of the same
+ * kind + subject whose text best matches `text` (bm25 order), with
+ * `excludeId` left out. `assertMemory` excludes the row it just wrote;
+ * a caller probing *before* writing has nothing to exclude and passes
+ * `0`, which is not a valid rowid.
+ */
+function similarRows(
+  kind: MemoryKind,
+  subject: string,
+  text: string,
+  excludeId: number,
+  limit: number,
+): MemoryRow[] {
+  const match = similarityQuery(text);
+  if (!match) return [];
+  return repo.similar(match, kind, subject, excludeId, limit);
+}
+
 /**
  * Load a row that a mutation is about to change, or explain why it
  * can't. Only a live row is mutable: a dropped one is in the graveyard
@@ -280,10 +299,13 @@ export function assertMemory(input: MemoryInput): {
   const row = normalize(input);
   return inTransaction(() => {
     const id = insertWithHistory(row, "assert");
-    const match = similarityQuery(row.text);
-    const similar = match
-      ? repo.similar(match, row.kind, row.subject, id, SIMILAR_LIMIT)
-      : [];
+    const similar = similarRows(
+      row.kind,
+      row.subject,
+      row.text,
+      id,
+      SIMILAR_LIMIT,
+    );
     return { id, similar };
   });
 }
@@ -478,14 +500,43 @@ export function listMemories(opts: MemoryListOptions = {}): MemoryRow[] {
  * input is quoted into a literal FTS5 expression by the shared
  * `ftsQuote` core, so operators and punctuation in a query are matched
  * as text rather than parsed as syntax.
+ *
+ * `match` picks how the query's terms combine:
+ *
+ *   - `"all"` (default) — every term must appear. Right for a search
+ *     someone typed on purpose (`talon memory search`, `/memory`).
+ *   - `"any"` — terms are OR-ed and bm25 ranks, the same expression
+ *     near-duplicate detection already uses. Right for a query that is
+ *     a whole sentence nobody wrote as a query — a chat turn's inbound
+ *     message (`core/memory/turn-retrieval.ts`), where AND-ing every
+ *     word means matching nothing.
  */
 export function searchMemories(
   query: string,
-  opts: { kind?: MemoryKind; limit?: number } = {},
+  opts: { kind?: MemoryKind; limit?: number; match?: "all" | "any" } = {},
 ): MemoryRow[] {
-  const match = ftsQuote(query);
-  if (!match) return [];
-  return repo.searchFts(match, opts.kind, opts.limit ?? DEFAULT_SEARCH_LIMIT);
+  const expr = opts.match === "any" ? similarityQuery(query) : ftsQuote(query);
+  if (!expr) return [];
+  return repo.searchFts(expr, opts.kind, opts.limit ?? DEFAULT_SEARCH_LIMIT);
+}
+
+/**
+ * The near-duplicate candidates a claim *would* report if it were
+ * asserted now — the same FTS probe `assertMemory` runs, without
+ * writing anything.
+ *
+ * This is what lets the write path offer supersede-instead-of-append
+ * before a second row exists (plan §3.2): `remember` probes first, and
+ * only inserts once the caller has either picked a row to supersede or
+ * said the claim really is separate.
+ */
+export function findSimilarMemories(
+  kind: MemoryKind,
+  subject: string,
+  text: string,
+  limit: number = SIMILAR_LIMIT,
+): MemoryRow[] {
+  return similarRows(kind, subject, text, 0, limit);
 }
 
 /** The audit trail for one row, oldest entry first. */