talon-agent 4.3.0 → 4.3.2

package/src/core/engine/gateway-actions/triggers.ts

@@ -21,17 +21,17 @@ import {
   DEFAULT_TIMEOUT_SECONDS,
   MAX_ACTIVE_PER_CHAT,
   type TriggerLanguage,
-} from "../../../storage/trigger-store.js";
+} from "../../../storage/triggers.js";
 import {
   cancelTrigger,
   spawnTrigger,
 } from "../../background/triggers/index.js";
 import { log } from "../../../util/log.js";
-import { validateJobModelOverride } from "./shared.js";
+import { validateJobModelOverride } from "./validation.js";
 import type { SharedActionHandlers } from "./types.js";
 
 export const triggerHandlers: SharedActionHandlers = {
-  trigger_create: async (body, chatId) => {
+  trigger_create: async (body, chatId, _backend, chatKey) => {
     const name = String(body.name ?? "").trim();
     const language = body.language;
     const script = String(body.script ?? "");
@@ -55,14 +55,13 @@ export const triggerHandlers: SharedActionHandlers = {
     const timeoutErr = validateTimeout(timeoutSeconds);
     if (timeoutErr) return { ok: false, error: timeoutErr };
 
-    const chatIdStr = String(chatId);
-    if (getTriggerByName(chatIdStr, name)) {
+    if (getTriggerByName(chatKey, name)) {
       return {
         ok: false,
         error: `A trigger named "${name}" already exists in this chat. Cancel it first or pick a different name.`,
       };
     }
-    const active = getActiveTriggersForChat(chatIdStr);
+    const active = getActiveTriggersForChat(chatKey);
     if (active.length >= MAX_ACTIVE_PER_CHAT) {
       return {
         ok: false,
@@ -70,18 +69,10 @@ export const triggerHandlers: SharedActionHandlers = {
       };
     }
 
-    const numericChatId = Number(chatId);
-    if (!Number.isFinite(numericChatId)) {
-      return {
-        ok: false,
-        error: `Cannot derive numeric chatId from ${chatId}`,
-      };
-    }
-
     // Validate the model up front so a bad id is rejected here instead of
     // silently failing at fire time.
     if (model) {
-      const modelErr = await validateJobModelOverride(chatId, model);
+      const modelErr = await validateJobModelOverride(chatKey, model);
       if (modelErr) return { ok: false, error: modelErr };
     }
 
@@ -89,19 +80,19 @@ export const triggerHandlers: SharedActionHandlers = {
     const lang = language as TriggerLanguage;
     let scriptPath: string;
     try {
-      scriptPath = writeScriptFile(chatIdStr, id, lang, script);
+      scriptPath = writeScriptFile(chatKey, id, lang, script);
     } catch (err) {
       return {
         ok: false,
         error: `Failed to write script: ${err instanceof Error ? err.message : err}`,
       };
     }
-    const logPath = triggerLogPath(chatIdStr, id);
+    const logPath = triggerLogPath(chatKey, id);
 
     const trigger = {
       id,
-      chatId: chatIdStr,
-      numericChatId,
+      chatId: chatKey,
+      numericChatId: chatId,
       name,
       language: lang,
       scriptPath,
@@ -151,8 +142,8 @@ export const triggerHandlers: SharedActionHandlers = {
     };
   },
 
-  trigger_list: (body, chatId) => {
-    const triggers = getTriggersForChat(String(chatId));
+  trigger_list: (body, chatId, _backend, chatKey) => {
+    const triggers = getTriggersForChat(chatKey);
     if (triggers.length === 0)
       return { ok: true, text: "No triggers in this chat." };
     const lines = triggers.map((t) => {
@@ -181,12 +172,12 @@ export const triggerHandlers: SharedActionHandlers = {
     };
   },
 
-  trigger_cancel: (body, chatId) => {
+  trigger_cancel: (body, chatId, _backend, chatKey) => {
     const triggerId = String(body.trigger_id ?? "");
     if (!triggerId) return { ok: false, error: "Missing trigger_id" };
     const t = getTrigger(triggerId);
     if (!t) return { ok: false, error: `Trigger ${triggerId} not found` };
-    if (t.chatId !== String(chatId))
+    if (t.chatId !== chatKey)
       return { ok: false, error: "Trigger belongs to a different chat" };
     const wasRunning = cancelTrigger(triggerId);
     if (!wasRunning) {
@@ -201,12 +192,12 @@ export const triggerHandlers: SharedActionHandlers = {
     };
   },
 
-  trigger_logs: (body, chatId) => {
+  trigger_logs: (body, chatId, _backend, chatKey) => {
     const triggerId = String(body.trigger_id ?? "");
     if (!triggerId) return { ok: false, error: "Missing trigger_id" };
     const t = getTrigger(triggerId);
     if (!t) return { ok: false, error: `Trigger ${triggerId} not found` };
-    if (t.chatId !== String(chatId))
+    if (t.chatId !== chatKey)
       return { ok: false, error: "Trigger belongs to a different chat" };
     const lines = Math.min(500, Math.max(1, Number(body.lines ?? 80)));
     const { tail, truncated } = readTriggerLogTail(t.logPath, lines);
@@ -219,12 +210,12 @@ export const triggerHandlers: SharedActionHandlers = {
     };
   },
 
-  trigger_delete: (body, chatId) => {
+  trigger_delete: (body, chatId, _backend, chatKey) => {
     const triggerId = String(body.trigger_id ?? "");
     if (!triggerId) return { ok: false, error: "Missing trigger_id" };
     const t = getTrigger(triggerId);
     if (!t) return { ok: false, error: `Trigger ${triggerId} not found` };
-    if (t.chatId !== String(chatId))
+    if (t.chatId !== chatKey)
       return { ok: false, error: "Trigger belongs to a different chat" };
     // Cancel first if it's still running so we don't orphan a child
     cancelTrigger(triggerId);

package/src/core/engine/gateway-actions/types.ts

@@ -9,10 +9,20 @@
 import type { ActionResult } from "../../types.js";
 import type { Backend } from "../../agent-runtime/capabilities.js";
 
+/**
+ * `chatId` is the frontend's numeric id — the only identity the HTTP bridge
+ * carries. `chatKey` is the chat's canonical string id (the dispatcher's
+ * `chatId`, which every store is keyed on): for Telegram it is just
+ * `String(chatId)`, for every other frontend it is the real id the numeric
+ * one was derived from (`d_…`, `wa_…`, `discord_…`). Handlers that persist,
+ * look up, or route by chat must use `chatKey`, never `String(chatId)` —
+ * a `d_…` chat's jobs stored under its numeric id fire into Telegram.
+ */
 type SharedActionHandler = (
   body: Record<string, unknown>,
   chatId: number,
-  backend?: Backend | null,
+  backend: Backend | null | undefined,
+  chatKey: string,
 ) => Promise<ActionResult> | ActionResult;
 
 export type SharedActionHandlers = Record<string, SharedActionHandler>;

package/src/core/engine/gateway-actions/{shared.ts → validation.ts}

@@ -1,6 +1,6 @@
 /**
- * Helpers shared across shared-action domains: due-date parsing and per-job
- * model-override validation.
+ * Field validation shared by the goal, cron and trigger actions: due-date
+ * parsing and per-job model-override validation.
  */
 
 import { resolveExplicitModelRef } from "../../models/active-model.js";
@@ -30,15 +30,14 @@ export function parseDueDate(value: unknown): number | undefined {
  * when it isn't, or `null` when it's valid.
  */
 export async function validateJobModelOverride(
-  chatId: number,
+  chatKey: string,
   model: string,
 ): Promise<string | null> {
   try {
-    const chatIdStr = String(chatId);
     const ref = await resolveExplicitModelRef(
       model,
-      getBackendForChat(chatIdStr),
-      getBackendIdForChat(chatIdStr),
+      getBackendForChat(chatKey),
+      getBackendIdForChat(chatKey),
     );
     if (!ref) {
       return (

package/src/core/engine/gateway.ts

@@ -307,6 +307,11 @@ export class Gateway {
     const action = typeof body.action === "string" ? body.action : "";
     if (!action) return { ok: false, error: "Missing action" };
     const t0 = Date.now();
+    // The canonical string id for this chat. The bridge only carries the
+    // numeric id, but the turn's Thread is keyed by the dispatcher's string
+    // chatId — hand that to the handlers so a `d_…`/`wa_…` chat's cron jobs,
+    // triggers and history land under the id the rest of the engine uses.
+    const chatKey = this.loom.stringIdForNumeric(chatId) ?? String(chatId);
 
     try {
       // Try frontend first — it has richer implementations (e.g. userbot history)
@@ -326,7 +331,7 @@ export class Gateway {
       }
 
       // Try plugin actions (loaded from external plugin packages)
-      const pluginResult = await handlePluginAction(body, String(chatId));
+      const pluginResult = await handlePluginAction(body, chatKey);
       if (pluginResult) {
         logDebug(
           "gateway",
@@ -336,7 +341,12 @@ export class Gateway {
       }
 
       // Shared actions last — provides in-memory fallbacks for history, cron, etc.
-      const shared = await handleSharedAction(body, chatId, this.backend);
+      const shared = await handleSharedAction(
+        body,
+        chatId,
+        this.backend,
+        chatKey,
+      );
       if (shared) {
         logDebug(
           "gateway",

package/src/core/prompt/assemble.ts

@@ -63,8 +63,8 @@ import { log } from "../../util/log.js";
 import { loadSystemTemplate } from "./templates.js";
 import { renderMemoryView } from "./memory-view.js";
 import { renderWorkspaceListing } from "./workspace-listing.js";
-import { renderSkillsPrompt } from "../../storage/skill-store.js";
-import { renderStickerLibraryPrompt } from "../../storage/sticker-store.js";
+import { renderSkillsPrompt } from "../../storage/skills.js";
+import { renderStickerLibraryPrompt } from "../../storage/stickers.js";
 import { getSoul } from "../soul/service.js";
 
 // ── Types ───────────────────────────────────────────────────────────────────

package/src/core/scripts/runner.ts

@@ -16,7 +16,7 @@ import { spawn } from "node:child_process";
 import { dirs } from "../../util/paths.js";
 import { log } from "../../util/log.js";
 import { commandForLanguage } from "../background/triggers/index.js";
-import type { Script } from "../../storage/script-store.js";
+import type { Script } from "../../storage/scripts.js";
 
 export const DEFAULT_SCRIPT_TIMEOUT_SECONDS = 60;
 const MAX_SCRIPT_TIMEOUT_SECONDS = 300;

package/src/core/soul/forgetting.ts

@@ -93,7 +93,7 @@ export function effectiveStrength(
   );
 }
 
-export interface FsrsReinforceOpts {
+export interface FsrsReinforceOptions {
   readonly now: number;
   readonly cfg: SoulConfig;
   readonly amount: number;
@@ -111,7 +111,7 @@ export interface FsrsReinforceOpts {
  */
 export function reinforceFsrs(
   state: ActivationState,
-  opts: FsrsReinforceOpts,
+  opts: FsrsReinforceOptions,
 ): ActivationState {
   if (!Number.isFinite(halfLifeForKind(opts.cfg, opts.kind))) {
     state.salience += opts.amount;

package/src/core/soul/salience.ts

@@ -60,7 +60,7 @@ export function confidence(state: ActivationState): number {
   return Math.tanh(state.evidence / 4);
 }
 
-export interface ReinforceOpts {
+export interface ReinforceOptions {
   readonly now: number;
   readonly halfLifeMs: number;
   /** Salience increment for this activation (>= 0). */
@@ -74,7 +74,11 @@ export interface ReinforceOpts {
  * first (so the additive bump composes correctly with time), then adds the
  * increment and accumulates signed evidence.
  */
-export function reinforce(dag: SoulDag, hash: Hash, opts: ReinforceOpts): void {
+export function reinforce(
+  dag: SoulDag,
+  hash: Hash,
+  opts: ReinforceOptions,
+): void {
   const s = dag.stateOf(hash);
   s.salience = effectiveSalience(s, opts.now, opts.halfLifeMs) + opts.amount;
   s.evidence += opts.valence;
@@ -111,7 +115,7 @@ export function coactivate(
   }
 }
 
-export interface PredictionErrorOpts {
+export interface PredictionErrorOptions {
   readonly now: number;
   readonly halfLifeMs: number;
   /** How strongly the observed signal corrects the prediction, in (0, 1]. */
@@ -129,7 +133,7 @@ export function applyPredictionError(
   dag: SoulDag,
   hash: Hash,
   observed: number,
-  opts: PredictionErrorOpts,
+  opts: PredictionErrorOptions,
 ): number {
   const s = dag.stateOf(hash);
   const predicted = effectiveSalience(s, opts.now, opts.halfLifeMs);

package/src/core/weaver/loom.ts

@@ -22,6 +22,8 @@ export interface ContextRegistry {
   activeContextCount(): number;
   /** Resolve a string chat id to the numeric id of its active context. */
   numericForStringId(stringId: string): number | null;
+  /** Resolve a numeric id to the string chat id of its active context. */
+  stringIdForNumeric(numericChatId: number): string | null;
   /** Number of live Threads in the registry. */
   size(): number;
 }
@@ -146,6 +148,15 @@ export class Loom implements ContextRegistry {
     return thread?.contextActive ? (thread.numericChatId ?? null) : null;
   }
 
+  /**
+   * Resolve a numeric id to the string chat id of its active context — the
+   * Thread key, which is the dispatcher's `chatId` (see `acquireContext`).
+   * Null outside a turn: the numeric index only mirrors held contexts.
+   */
+  stringIdForNumeric(numericChatId: number): string | null {
+    return this.byNumeric.get(numericChatId)?.chatId ?? null;
+  }
+
   private resolve(id: number | string): Thread | undefined {
     if (typeof id === "number") return this.byNumeric.get(id);
     const direct = this.threads.get(id);

package/src/frontend/discord/actions/{shared.ts → buttons.ts}

@@ -1,63 +1,10 @@
 /**
- * Shared helpers for Discord action handlers: clean error mapping, channel
- * resolution, and button-row construction.
+ * Button-row construction for model-authored inline buttons (Discord
+ * components), with custom_id namespacing and de-duplication.
  */
 
-import {
-  type Client,
-  type TextBasedChannel,
-  ActionRowBuilder,
-  ButtonBuilder,
-  ButtonStyle,
-} from "discord.js";
-import type { ActionResult } from "../../../core/types.js";
-import { lookupDiscordChat } from "../handlers/index.js";
+import { ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js";
 import { safeSlice } from "../formatting.js";
-import { logWarn } from "../../../util/log.js";
-import { mapDiscordError } from "../errors.js";
-
-/** Run a Discord action; convert DiscordAPIError into a clean ActionResult. */
-export async function tryAction(
-  context: string,
-  fn: () => Promise<ActionResult>,
-): Promise<ActionResult> {
-  try {
-    return await fn();
-  } catch (err) {
-    const mapped = mapDiscordError(err, context);
-    if (mapped) return mapped;
-    return {
-      ok: false,
-      error: `${context} failed: ${err instanceof Error ? err.message : err}`,
-    };
-  }
-}
-
-export async function resolveChannel(
-  client: Client,
-  numericChatId: number,
-): Promise<TextBasedChannel | null> {
-  const info = lookupDiscordChat(numericChatId);
-  if (!info) return null;
-  try {
-    const ch = await client.channels.fetch(info.channelId);
-    if (ch && "send" in ch && (ch as TextBasedChannel).isSendable?.()) {
-      return ch as TextBasedChannel;
-    }
-    if (info.userId) {
-      const user = await client.users.fetch(info.userId);
-      const dm = await user.createDM();
-      return dm as TextBasedChannel;
-    }
-    return null;
-  } catch (err) {
-    logWarn(
-      "discord",
-      `resolveChannel failed for chat ${numericChatId}: ${err instanceof Error ? err.message : err}`,
-    );
-    return null;
-  }
-}
 
 export function buildButtonRows(
   rows: Array<

package/src/frontend/discord/actions/channels.ts

@@ -0,0 +1,34 @@
+/**
+ * Resolve a registered Discord chat to a sendable channel (guild channel or
+ * the user's DM).
+ */
+
+import type { Client, TextBasedChannel } from "discord.js";
+import { lookupDiscordChat } from "../handlers/index.js";
+import { logWarn } from "../../../util/log.js";
+
+export async function resolveChannel(
+  client: Client,
+  numericChatId: number,
+): Promise<TextBasedChannel | null> {
+  const info = lookupDiscordChat(numericChatId);
+  if (!info) return null;
+  try {
+    const ch = await client.channels.fetch(info.channelId);
+    if (ch && "send" in ch && (ch as TextBasedChannel).isSendable?.()) {
+      return ch as TextBasedChannel;
+    }
+    if (info.userId) {
+      const user = await client.users.fetch(info.userId);
+      const dm = await user.createDM();
+      return dm as TextBasedChannel;
+    }
+    return null;
+  } catch (err) {
+    logWarn(
+      "discord",
+      `resolveChannel failed for chat ${numericChatId}: ${err instanceof Error ? err.message : err}`,
+    );
+    return null;
+  }
+}

package/src/frontend/discord/actions/chat-info.ts

@@ -6,7 +6,7 @@
 
 import { ChannelType } from "discord.js";
 import { logWarn } from "../../../util/log.js";
-import { tryAction } from "./shared.js";
+import { tryAction } from "./try-action.js";
 import type { DiscordActionHandlers } from "./types.js";
 
 export const chatInfoHandlers: DiscordActionHandlers = {

package/src/frontend/discord/actions/index.ts

@@ -23,7 +23,7 @@
 import type { Client } from "discord.js";
 import type { Gateway } from "../../../core/engine/gateway.js";
 import type { ActionResult } from "../../../core/types.js";
-import { resolveChannel } from "./shared.js";
+import { resolveChannel } from "./channels.js";
 import { messagingHandlers, restoreScheduledMessages } from "./messaging.js";
 import { mediaHandlers } from "./media.js";
 import { chatInfoHandlers } from "./chat-info.js";

package/src/frontend/discord/actions/media.ts

@@ -11,7 +11,7 @@ import { withRetry } from "../../../core/engine/gateway.js";
 import { sendChunked } from "../handlers/index.js";
 import { suppressMentions, DISCORD_MAX_TEXT } from "../formatting.js";
 import { maxAttachmentBytes } from "../errors.js";
-import { tryAction } from "./shared.js";
+import { tryAction } from "./try-action.js";
 import type { DiscordActionHandlers } from "./types.js";
 
 const sendAttachment: DiscordActionHandlers[string] = (

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

@@ -19,8 +19,10 @@ import {
   listScheduledForChat,
   MAX_OVERDUE_MS,
   type ScheduledMessage,
-} from "../../../storage/scheduled-store.js";
-import { tryAction, resolveChannel, buildButtonRows } from "./shared.js";
+} from "../../../storage/scheduled.js";
+import { tryAction } from "./try-action.js";
+import { resolveChannel } from "./channels.js";
+import { buildButtonRows } from "./buttons.js";
 import type { DiscordActionHandlers } from "./types.js";
 
 // ── Scheduled sends (persistent) ─────────────────────────────────────────────

package/src/frontend/discord/actions/try-action.ts

@@ -0,0 +1,24 @@
+/**
+ * Run a Discord action with uniform error mapping: DiscordAPIError becomes a
+ * clean ActionResult, anything else a labelled failure.
+ */
+
+import type { ActionResult } from "../../../core/types.js";
+import { mapDiscordError } from "../errors.js";
+
+/** Run a Discord action; convert DiscordAPIError into a clean ActionResult. */
+export async function tryAction(
+  context: string,
+  fn: () => Promise<ActionResult>,
+): Promise<ActionResult> {
+  try {
+    return await fn();
+  } catch (err) {
+    const mapped = mapDiscordError(err, context);
+    if (mapped) return mapped;
+    return {
+      ok: false,
+      error: `${context} failed: ${err instanceof Error ? err.message : err}`,
+    };
+  }
+}

package/src/frontend/discord/admin.ts

@@ -19,11 +19,11 @@ import {
   getAllCronJobs,
   describeSchedule,
   nextRunAt,
-} from "../../storage/cron-store.js";
+} from "../../storage/cron.js";
 import { getActiveCount } from "../../core/engine/dispatcher.js";
 import { getPulseStatus } from "../../core/background/pulse.js";
 import { getHealthStatus, getRecentErrors } from "../../util/watchdog.js";
-import { formatDuration, formatModelLabel } from "./helpers.js";
+import { formatDuration, formatModelLabel } from "./render.js";
 import {
   DISCORD_MAX_TEXT,
   DISCORD_SAFE_RESERVE,

package/src/frontend/discord/callbacks/components/settings.ts

@@ -31,7 +31,7 @@ import {
   enablePulse,
   isPulseEnabled,
 } from "../../../../core/background/pulse.js";
-import { renderSettingsText, EFFORT_DESCRIPTIONS } from "../../helpers.js";
+import { renderSettingsText, EFFORT_DESCRIPTIONS } from "../../render.js";
 import {
   getBackendIdForChat,
   resolveChatBackend,

package/src/frontend/discord/callbacks/modals.ts

@@ -8,7 +8,7 @@ import type { Gateway } from "../../../core/engine/gateway.js";
 import { setChatPulseInterval } from "../../../storage/chat-settings.js";
 import { registerChat, enablePulse } from "../../../core/background/pulse.js";
 import { isInteractionAllowed } from "../handlers/index.js";
-import { parseInterval, formatDuration } from "../helpers.js";
+import { parseInterval, formatDuration } from "../render.js";
 import { logError } from "../../../util/log.js";
 
 export async function handleModalSubmit(

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

@@ -18,7 +18,7 @@ import {
   formatDuration,
   renderMetricsMessages,
   renderDoctorMessages,
-} from "../helpers.js";
+} from "../render.js";
 import { collectDoctorReport } from "../../../core/doctor.js";
 import { getSoul } from "../../../core/soul/service.js";
 import { getMetrics, getTodayMetrics } from "../../../storage/metrics.js";
@@ -34,7 +34,7 @@ import {
   getRepoRoot,
   runSelfUpdate,
 } from "../../../core/update/self-update.js";
-import { reply } from "./shared.js";
+import { reply } from "./interaction.js";
 
 export async function handleRestart(
   i: ChatInputCommandInteraction,

package/src/frontend/discord/commands/info.ts

@@ -11,13 +11,13 @@ import {
   formatDuration,
   renderMeshReport,
   renderUsageMessage,
-} from "../helpers.js";
+} from "../render.js";
 import type { TalonConfig } from "../../../util/config.js";
 import { collectPlanUsage } from "../../shared/plan-usage-report.js";
 import { getLoadedPlugins } from "../../../core/plugin/index.js";
 import { getMeshService } from "../../../core/mesh/index.js";
 import type { MeshPingResult } from "../../../core/mesh/service.js";
-import { reply } from "./shared.js";
+import { reply } from "./interaction.js";
 
 export async function handleStart(
   i: ChatInputCommandInteraction,

package/src/frontend/discord/commands/{shared.ts → interaction.ts}

@@ -1,5 +1,6 @@
 /**
- * Helpers shared by the Discord slash-command handlers + router.
+ * Interaction accessors for the Discord slash-command handlers + router:
+ * chat-id derivation, chunked reply, client.
  */
 
 import { type ChatInputCommandInteraction, MessageFlags } from "discord.js";

package/src/frontend/discord/commands/router.ts

@@ -21,7 +21,7 @@ import {
   handleComponentInteraction,
   handleModalSubmit,
 } from "../callbacks/index.js";
-import { chatIdFromInteraction, reply, client } from "./shared.js";
+import { chatIdFromInteraction, reply, client } from "./interaction.js";
 import {
   handleStart,
   handleHelp,

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

@@ -14,7 +14,7 @@ import {
   formatTokenCount,
   formatBytes,
   formatUsd,
-} from "../helpers.js";
+} from "../render.js";
 import {
   getBackendIdForChat,
   resolveChatBackend,
@@ -24,7 +24,7 @@ import {
   collectSessionStatus,
 } from "../../shared/session-status.js";
 import { stopCurrentTurn } from "../../../core/engine/dispatcher.js";
-import { reply } from "./shared.js";
+import { reply } from "./interaction.js";
 
 export async function handleReset(
   i: ChatInputCommandInteraction,

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

@@ -33,7 +33,7 @@ import {
   parseInterval,
   renderSettingsText,
   EFFORT_DESCRIPTIONS,
-} from "../helpers.js";
+} from "../render.js";
 import {
   displayReasoningEffort,
   getActiveReasoningLevels,
@@ -45,7 +45,7 @@ import {
 } from "../../../core/engine/backend-controller/index.js";
 import { resolveActiveModelForChat } from "../../../core/models/active-model.js";
 import { safeSlice } from "../formatting.js";
-import { reply } from "./shared.js";
+import { reply } from "./interaction.js";
 import {
   buildModelPickerView,
   MODEL_NAV_PREFIX,

package/src/frontend/discord/{helpers.ts → render.ts}

@@ -1,5 +1,6 @@
 /**
- * Shared helpers for Discord commands, callbacks, and the settings panel.
+ * Message rendering for Discord commands, callbacks, and the settings panel:
+ * metrics, doctor, mesh, usage and settings text, sized to Discord's limits.
  *
  * Discord-specific quirks vs the Telegram helpers:
  *  - settings panel uses Components (Buttons + Select Menus), not inline keyboard.

package/src/frontend/native/extensions.ts

@@ -22,7 +22,7 @@ import { performPluginReload } from "../../core/engine/gateway-actions/plugins.j
 import { getPluginPromptAdditions } from "../../core/plugin/index.js";
 import { listPluginItems, setPluginEnabled } from "../../core/plugin/manage.js";
 import { notifyPromptInputsChanged } from "../../core/prompt/invalidation.js";
-import { listSkills, setSkillEnabled } from "../../storage/skill-store.js";
+import { listSkills, setSkillEnabled } from "../../storage/skills.js";
 import { rebuildSystemPrompt, type TalonConfig } from "../../util/config.js";
 import { log } from "../../util/log.js";
 import type { PluginItem, SkillItem, ToggleResult } from "./protocol.js";