talon-agent 4.6.1 → 5.0.0

package/src/core/weaver/weaver.ts

@@ -24,12 +24,15 @@ import type { ContextManager, ExecuteParams, ExecuteResult } from "../types.js";
 import { bus } from "../bus/index.js";
 import { taskTable, type TaskHandle } from "../tasks/index.js";
 import { log, logDebug, logWarn } from "../../util/log.js";
+import { recordHistogram } from "../../storage/metrics.js";
 import { recordSessionTurnPhases } from "../../storage/sessions.js";
 import type { TurnPhase } from "../../storage/session-record.js";
+import { retrieveForTurn, type TurnMemory } from "../memory/turn-retrieval.js";
 import { TalonError } from "../errors.js";
 import { Loom } from "./loom.js";
 import { carryTurnEvents, startShuttleTiming } from "./shuttle.js";
 import type { Thread, ThreadSnapshot } from "./thread.js";
+import { startTurnCpu } from "./turn-cpu.js";
 import { startTypingLoop } from "./typing-loop.js";
 import { resolveWarp } from "./warp-resolver.js";
 
@@ -244,6 +247,7 @@ export class Weaver {
         );
       }
 
+      const memory = resolveTurnMemory(params, phases);
       const stream = backend.chat.runChatTurn({
         chatId: params.chatId,
         model: warp.ref,
@@ -252,11 +256,17 @@ export class Weaver {
         senderHandle: params.senderHandle,
         isGroup: params.isGroup,
         messageId: params.messageId,
+        retrievedMemory: memory?.text,
       });
       const timing = startShuttleTiming();
+      // CPU and wall clock over the same bracket, so `turn.cpu_ms` can be
+      // divided by `turn.stream_ms` (see turn-cpu.ts). Recorded on the
+      // same path `phases.stream` is, so both cover one population.
+      const stopCpu = startTurnCpu();
       const streamStartedAt = Date.now();
       const agentResult = await carryTurnEvents(stream, params.onEvent, timing);
       phases.stream = Date.now() - streamStartedAt;
+      stopCpu();
       phases.delivery = timing.deliveryMs;
       if (timing.firstEventAt !== undefined) {
         phases.firstToken = timing.firstEventAt - streamStartedAt;
@@ -321,11 +331,37 @@ export class Weaver {
   }
 }
 
+/**
+ * This turn's retrieved memory (`core/memory/turn-retrieval.ts`) — off
+ * unless `TALON_MEMORY_STORE=1`, fail-closed, and a pure read: nothing
+ * here may invalidate the frozen system prompt (plan §3.6), because the
+ * block travels in the USER turn, after all cached history.
+ *
+ * The size goes out as `turn.memory_chars` on every turn, zero
+ * included, so the flag's before/after populations are comparable next
+ * to `prompt.memory_chars` (the static core-view tier from #943).
+ */
+function resolveTurnMemory(
+  params: ExecuteParams,
+  phases: Partial<Record<TurnPhase, number>>,
+): TurnMemory | undefined {
+  const startedAt = Date.now();
+  const memory = retrieveForTurn({
+    chatId: params.chatId,
+    text: params.prompt,
+    isGroup: params.isGroup ?? false,
+  });
+  phases.memory = Date.now() - startedAt;
+  recordHistogram("turn.memory_chars", memory?.chars ?? 0);
+  return memory;
+}
+
 /** `queue=12ms warp=3ms ttft=1840ms stream=6200ms delivery=310ms` */
 function formatPhases(phases: Partial<Record<TurnPhase, number>>): string {
   const labels: Record<TurnPhase, string> = {
     queueWait: "queue",
     warpResolve: "warp",
+    memory: "memory",
     firstToken: "ttft",
     stream: "stream",
     delivery: "delivery",

package/src/frontend/discord/admin.ts

@@ -21,7 +21,7 @@ import {
   nextRunAt,
 } from "../../storage/cron.js";
 import { getActiveCount } from "../../core/engine/dispatcher.js";
-import { getPulseStatus } from "../../core/background/pulse.js";
+import { getPulseStatus } from "../../core/background/pulse/pulse.js";
 import { getHealthStatus, getRecentErrors } from "../../util/watchdog.js";
 import { formatDuration, formatModelLabel } from "./render.js";
 import {

package/src/frontend/discord/callbacks/components/backend-select.ts

@@ -21,7 +21,7 @@ import {
 } from "../../../../core/engine/backend-controller/index.js";
 import { resetSession } from "../../../../storage/sessions.js";
 import { clearHistory } from "../../../../storage/history.js";
-import { resetPulseCheckpoint } from "../../../../core/background/pulse.js";
+import { resetPulseCheckpoint } from "../../../../core/background/pulse/pulse.js";
 import { resolveActiveModelForChat } from "../../../../core/models/active-model.js";
 import { logError } from "../../../../util/log.js";
 import { safeSlice } from "../../formatting.js";

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

@@ -19,7 +19,7 @@ import {
   disablePulse,
   enablePulse,
   isPulseEnabled,
-} from "../../../../core/background/pulse.js";
+} from "../../../../core/background/pulse/pulse.js";
 import type { ComponentContext, ComponentInteraction } from "./types.js";
 
 // ── /pulse "Set interval…" button → opens modal ───────────────────────

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

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

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

@@ -6,7 +6,10 @@ import { type ModalSubmitInteraction, MessageFlags } from "discord.js";
 import type { TalonConfig } from "../../../core/config/index.js";
 import type { Gateway } from "../../../core/engine/gateway.js";
 import { setChatPulseInterval } from "../../../storage/chat-settings.js";
-import { registerChat, enablePulse } from "../../../core/background/pulse.js";
+import {
+  registerChat,
+  enablePulse,
+} from "../../../core/background/pulse/pulse.js";
 import { isInteractionAllowed } from "../handlers/index.js";
 import { parseInterval, formatDuration } from "../render.js";
 import { logError } from "../../../util/log.js";

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

@@ -13,14 +13,13 @@ import {
 import type { TalonConfig } from "../../../core/config/index.js";
 import type { Gateway } from "../../../core/engine/gateway.js";
 import { respawnSelf } from "../../../util/respawn.js";
-import { forceDream } from "../../../core/background/dream.js";
+import { forceDream } from "../../../core/background/dream/index.js";
 import {
   formatDuration,
   renderMetricsMessages,
   renderDoctorMessages,
 } from "../render.js";
 import { collectDoctorReport } from "../../../core/doctor/index.js";
-import { getSoul } from "../../../core/soul/service.js";
 import { getMetrics, getTodayMetrics } from "../../../storage/metrics.js";
 import { handleAdminSubcommand } from "../admin.js";
 import { isAdmin } from "../handlers/index.js";
@@ -130,39 +129,6 @@ export async function handleDoctor(
   }
 }
 
-/**
- * /soul — read-only introspection of the compiled identity. `action:dream`
- * runs the organic maintenance pass and is admin-only. Inert while the soul
- * is disabled, so it is safe to ship dormant.
- */
-export async function handleSoul(
-  i: ChatInputCommandInteraction,
-): Promise<void> {
-  const soul = getSoul();
-  if (!soul.enabled) {
-    await reply(
-      i,
-      "Soul is disabled (set TALON_SOUL_ENABLED to enable).",
-      true,
-    );
-    return;
-  }
-  if (i.options.getString("action") === "dream") {
-    if (!isAdmin(i.user.id)) {
-      await reply(i, "Not authorized.", true);
-      return;
-    }
-    await i.deferReply({ flags: MessageFlags.Ephemeral });
-    await i.editReply("🧠 Soul dreaming...");
-    soul
-      .dream()
-      .then(() => i.editReply("🧠 Soul dream complete."))
-      .catch(() => undefined);
-    return;
-  }
-  await reply(i, suppressMentions(soul.introspect()), true);
-}
-
 export async function handleDream(
   i: ChatInputCommandInteraction,
 ): Promise<void> {

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

@@ -114,17 +114,6 @@ function buildCommandDefinitions(devBuild = false): unknown[] {
       .setName("mesh")
       .setDescription("Ping and list mesh devices")
       .toJSON(),
-    new SlashCommandBuilder()
-      .setName("soul")
-      .setDescription("Inspect the compiled identity")
-      .addStringOption((o) =>
-        o
-          .setName("action")
-          .setDescription("Leave empty to introspect")
-          .setRequired(false)
-          .addChoices({ name: "dream", value: "dream" }),
-      )
-      .toJSON(),
     // /update only exists on developer builds running from a git checkout —
     // a packaged binary has no source tree to pull into, so the command is
     // never registered there (same gate as the Telegram handler).

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

@@ -43,7 +43,6 @@ import {
   handleDream,
   handleAdmin,
   handleDoctor,
-  handleSoul,
   handleUpdate,
 } from "./admin.js";
 
@@ -159,8 +158,6 @@ async function routeSlashCommand(
       return handleDoctor(interaction, config);
     case "mesh":
       return handleMesh(interaction);
-    case "soul":
-      return handleSoul(interaction);
     case "update":
       return handleUpdate(interaction, config);
     case "admin":

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

@@ -23,6 +23,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 { reply } from "./interaction.js";
 
@@ -92,6 +96,7 @@ export async function handleStatus(
           `  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
@@ -109,6 +114,7 @@ export async function handleStatus(
     `**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),
   ];
   await i.editReply(lines.join("\n"));
 }

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

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

package/src/frontend/discord/middleware.ts

@@ -18,10 +18,9 @@ import type { Client, Message } from "discord.js";
 import { ChannelType } from "discord.js";
 import type { TalonConfig } from "../../core/config/index.js";
 import { pushMessage } from "../../storage/history.js";
-import { registerChat } from "../../core/background/pulse.js";
+import { registerChat } from "../../core/background/pulse/pulse.js";
 import { deriveNumericChatId } from "../../util/chat-id.js";
 import { handleMessage, getSenderName } from "./handlers/index.js";
-import { recordReactionToBot } from "../../core/soul/taps.js";
 
 export function registerMiddleware(client: Client, config: TalonConfig): void {
   client.on("messageCreate", (msg: Message) => {
@@ -86,27 +85,4 @@ export function registerMiddleware(client: Client, config: TalonConfig): void {
       /* logged inside */
     });
   });
-
-  // ── Reaction tap — feed reactions on Talon's own messages to the soul ────
-  // The gateway records outgoing message ids as `Number(snowflake)`, so the
-  // lookup here must use the same conversion to match. Inert unless the soul
-  // is enabled.
-  client.on("messageReactionAdd", async (reaction, user) => {
-    if (user.id === client.user?.id) return;
-    try {
-      // A partial arrives when the message predates the cache; the chat id
-      // can't be built without the channel/guild it belongs to.
-      if (reaction.partial) await reaction.fetch();
-    } catch {
-      return;
-    }
-    const msg = reaction.message;
-    const emoji = reaction.emoji.name;
-    if (!emoji) return;
-    const chatId =
-      msg.channel.type === ChannelType.DM
-        ? `discord_dm_${msg.author?.id ?? user.id}`
-        : `discord_guild_${msg.guildId}_${msg.channelId}`;
-    recordReactionToBot(chatId, Number(msg.id), [emoji]);
-  });
 }

package/src/frontend/discord/runtime.ts

@@ -34,8 +34,7 @@ function createClient(): Client {
       GatewayIntentBits.DirectMessageReactions,
     ],
     // Partials.Reaction is what makes reactions on messages that predate the
-    // current cache arrive at all — without it the soul's reaction tap only
-    // ever sees freshly-cached messages.
+    // current cache arrive at all, rather than being dropped silently.
     partials: [
       Partials.Channel,
       Partials.Message,

package/src/frontend/native/{auth.ts → bridge/auth.ts}

@@ -15,8 +15,8 @@
 import { randomBytes } from "node:crypto";
 import { chmodSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
-import { dirs } from "../../util/paths.js";
-import { log } from "../../util/log.js";
+import { dirs } from "../../../util/paths.js";
+import { log } from "../../../util/log.js";
 
 const TOKEN_FILE = "bridge-token";
 /** 32 random bytes → 43 base64url chars; comfortably beyond brute force. */

package/src/frontend/native/{discovery.ts → bridge/discovery.ts}

@@ -1,9 +1,9 @@
 import { mkdir, rename, rm, writeFile, chmod } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { randomUUID } from "node:crypto";
-import { log, logError } from "../../util/log.js";
-import { files } from "../../util/paths.js";
-import { BRIDGE_PROTOCOL_VERSION } from "./protocol.js";
+import { log, logError } from "../../../util/log.js";
+import { files } from "../../../util/paths.js";
+import { BRIDGE_PROTOCOL_VERSION } from "../protocol.js";
 
 export type BridgeDiscoveryInfo = {
   port: number;

package/src/frontend/native/{routes → bridge/routes}/chats.ts

@@ -6,7 +6,7 @@ import {
   asString,
   deviceIdParam,
 } from "./params.js";
-import { log, logWarn } from "../../../util/log.js";
+import { log, logWarn } from "../../../../util/log.js";
 
 export function chatRoutes(
   host: RouteHost,

package/src/frontend/native/{routes → bridge/routes}/daemon.ts

@@ -1,6 +1,6 @@
 import type { RouteHost } from "./host.js";
 import type { BridgeRoutes } from "./table.js";
-import { isLogLevel } from "../protocol.js";
+import { isLogLevel } from "../../protocol.js";
 import { asPositiveInt, asString } from "./params.js";
 
 export function daemonRoutes(

package/src/frontend/native/{routes → bridge/routes}/host.ts

@@ -18,9 +18,12 @@ import type {
   SearchResult,
   SkillItem,
   ToggleResult,
-} from "../protocol.js";
-import type { MemoryListQuery, MemoryListResult } from "../memory.js";
-import type { ConfigSnapshot } from "../settings.js";
+} from "../../protocol.js";
+import type {
+  MemoryListQuery,
+  MemoryListResult,
+} from "../../surface/memory.js";
+import type { ConfigSnapshot } from "../../surface/settings.js";
 
 /** Optional attachment references carried alongside a sent message. */
 export type SendOptions = {

package/src/frontend/native/{routes → bridge/routes}/pre-auth.ts

@@ -1,6 +1,6 @@
 import type { RouteHost } from "./host.js";
 import type { BridgeRoutes } from "./table.js";
-import { BRIDGE_PROTOCOL_VERSION } from "../protocol.js";
+import { BRIDGE_PROTOCOL_VERSION } from "../../protocol.js";
 
 export function preAuthRoutes(
   host: RouteHost,

package/src/frontend/native/{server.ts → bridge/server.ts}

@@ -24,10 +24,10 @@ import { createServer as createTlsServer } from "node:https";
 import { createHash, timingSafeEqual } from "node:crypto";
 import { createReadStream } from "node:fs";
 import { stat } from "node:fs/promises";
-import { log, logError, logDebug, logWarn } from "../../util/log.js";
+import { log, logError, logDebug, logWarn } from "../../../util/log.js";
 import { formatFingerprint, type BridgeTlsIdentity } from "./tls.js";
-import { contentTypeFor } from "./media.js";
-import { type BridgeEvent } from "./protocol.js";
+import { contentTypeFor } from "../media/media.js";
+import { type BridgeEvent } from "../protocol.js";
 import { buildRoutes } from "./routes/index.js";
 import type { BridgeServerHandlers, RouteHost } from "./routes/host.js";
 import {

package/src/frontend/native/{tls.ts → bridge/tls.ts}

@@ -28,8 +28,8 @@ import {
 } from "node:crypto";
 import { mkdir, readFile, writeFile, chmod } from "node:fs/promises";
 import { resolve } from "node:path";
-import { dirs } from "../../util/paths.js";
-import { log, logWarn } from "../../util/log.js";
+import { dirs } from "../../../util/paths.js";
+import { log, logWarn } from "../../../util/log.js";
 
 export interface BridgeTlsIdentity {
   /** PKCS#8 private key, PEM. */

package/src/frontend/native/{chat-lifecycle.ts → chats/chat-lifecycle.ts}

@@ -4,9 +4,9 @@
  */
 
 import { toClientChat } from "./chat-wire.js";
-import type { ClientChat } from "./protocol.js";
-import type { NativeRuntime } from "./runtime.js";
-import { clearTurnMeta } from "./turn-meta.js";
+import type { ClientChat } from "../protocol.js";
+import type { NativeRuntime } from "../runtime.js";
+import { clearTurnMeta } from "../turn/turn-meta.js";
 
 export function createChat(runtime: NativeRuntime, title?: string): ClientChat {
   const entry = runtime.chats.create(title);

package/src/frontend/native/{chat-wire.ts → chats/chat-wire.ts}

@@ -8,11 +8,11 @@
 import {
   getChatSettings,
   getChatModelForBackend,
-} from "../../storage/chat-settings.js";
-import { getBackendIdForChat } from "../../core/engine/backend-controller/index.js";
+} from "../../../storage/chat-settings.js";
+import { getBackendIdForChat } from "../../../core/engine/backend-controller/index.js";
 import type { ChatEntry } from "./chats.js";
-import type { ClientChat, QueuedMessage } from "./protocol.js";
-import type { NativeRuntime } from "./runtime.js";
+import type { ClientChat, QueuedMessage } from "../protocol.js";
+import type { NativeRuntime } from "../runtime.js";
 
 /** Project the stored queue entry to its wire shape (text + attachments). */
 function toQueued(

package/src/frontend/native/{chats.ts → chats/chats.ts}

@@ -11,14 +11,14 @@ import {
   generateNativeChatId,
   deriveNumericChatId,
   isNativeChatId,
-} from "../../util/chat-id.js";
+} from "../../../util/chat-id.js";
 import {
   getAllSessions,
   setSessionName,
   deleteSession,
-} from "../../storage/sessions.js";
-import { getRecentHistory, clearHistory } from "../../storage/history.js";
-import { previewOf } from "./protocol.js";
+} from "../../../storage/sessions.js";
+import { getRecentHistory, clearHistory } from "../../../storage/history.js";
+import { previewOf } from "../protocol.js";
 
 export type ChatEntry = {
   id: string;

package/src/frontend/native/{empty-chat-sweep.ts → chats/empty-chat-sweep.ts}

@@ -15,11 +15,11 @@
  * means the removal is broadcast, so open lists update in place.
  */
 
-import { log, logError } from "../../util/log.js";
-import { getRecentHistory } from "../../storage/history.js";
+import { log, logError } from "../../../util/log.js";
+import { getRecentHistory } from "../../../storage/history.js";
 import { deleteChat } from "./chat-lifecycle.js";
-import type { NativeRuntime } from "./runtime.js";
-import { isBusy } from "./turn.js";
+import type { NativeRuntime } from "../runtime.js";
+import { isBusy } from "../turn/turn.js";
 
 const EMPTY_CHAT_MIN_AGE_MS = 60 * 60_000;
 const EMPTY_CHAT_SWEEP_INTERVAL_MS = 30 * 60_000;

package/src/frontend/native/{history.ts → chats/history.ts}

@@ -10,19 +10,19 @@ import {
   searchHistoryMessages,
   type HistoryMessage,
   type MessageAttachment,
-} from "../../storage/history.js";
-import { isDeliveryTool } from "../../core/tools/index.js";
+} from "../../../storage/history.js";
+import { isDeliveryTool } from "../../../core/tools/index.js";
 import type { ChatEntry } from "./chats.js";
-import { refreshContext } from "./context.js";
-import { contentTypeFor, rehydrateAttachment } from "./media.js";
+import { refreshContext } from "../turn/context.js";
+import { contentTypeFor, rehydrateAttachment } from "../media/media.js";
 import {
   historyToClientMessage,
   type ClientAttachment,
   type ClientMessage,
   type SearchResult,
-} from "./protocol.js";
-import type { NativeRuntime } from "./runtime.js";
-import { getTurnMeta } from "./turn-meta.js";
+} from "../protocol.js";
+import type { NativeRuntime } from "../runtime.js";
+import { getTurnMeta } from "../turn/turn-meta.js";
 
 export type HistoryPageOptions = { before?: number; limit?: number };
 

package/src/frontend/native/{reset.ts → chats/reset.ts}

@@ -3,14 +3,14 @@
  * cached readouts, pulse checkpoint) while keeping the chat itself.
  */
 
-import { resetSession } from "../../storage/sessions.js";
-import { clearHistory } from "../../storage/history.js";
-import { resetPulseCheckpoint } from "../../core/background/pulse.js";
-import { getBackendForChat } from "../../core/engine/backend-controller/index.js";
+import { resetSession } from "../../../storage/sessions.js";
+import { clearHistory } from "../../../storage/history.js";
+import { resetPulseCheckpoint } from "../../../core/background/pulse/pulse.js";
+import { getBackendForChat } from "../../../core/engine/backend-controller/index.js";
 import { broadcastChatUpdated } from "./chat-wire.js";
-import { emitSystem } from "./emit.js";
-import type { NativeRuntime } from "./runtime.js";
-import { clearTurnMeta } from "./turn-meta.js";
+import { emitSystem } from "../turn/emit.js";
+import type { NativeRuntime } from "../runtime.js";
+import { clearTurnMeta } from "../turn/turn-meta.js";
 
 /**
  * Forget everything the conversation accumulated. Shared by the explicit

package/src/frontend/native/index.ts

@@ -18,18 +18,21 @@ import type { TalonConfig } from "../../core/config/index.js";
 import type { ContextManager } from "../../core/types.js";
 import type { Gateway } from "../../core/engine/gateway.js";
 import { log, logError } from "../../util/log.js";
-import { createNativeActionHandler } from "./actions.js";
-import { loadOrCreateBridgeToken } from "./auth.js";
-import { warmContextCache } from "./context.js";
-import { removeBridgeDiscovery, writeBridgeDiscovery } from "./discovery.js";
-import { emitAssistant, emitPhoto } from "./emit.js";
-import { startEmptyChatSweep } from "./empty-chat-sweep.js";
-import { buildBridgeHandlers } from "./handlers.js";
+import { createNativeActionHandler } from "./turn/actions.js";
+import { loadOrCreateBridgeToken } from "./bridge/auth.js";
+import { warmContextCache } from "./turn/context.js";
+import {
+  removeBridgeDiscovery,
+  writeBridgeDiscovery,
+} from "./bridge/discovery.js";
+import { emitAssistant, emitPhoto } from "./turn/emit.js";
+import { startEmptyChatSweep } from "./chats/empty-chat-sweep.js";
+import { buildBridgeHandlers } from "./surface/handlers.js";
 import { createNativeRuntime, type NativeRuntime } from "./runtime.js";
-import { BridgeServer } from "./server.js";
-import { isLoopbackHost, loadOrCreateBridgeTlsIdentity } from "./tls.js";
+import { BridgeServer } from "./bridge/server.js";
+import { isLoopbackHost, loadOrCreateBridgeTlsIdentity } from "./bridge/tls.js";
 
-export { summarizeToolResult } from "./tool-result.js";
+export { summarizeToolResult } from "./turn/tool-result.js";
 
 export type NativeFrontend = {
   name: "native";

package/src/frontend/native/{media.ts → media/media.ts}

@@ -9,9 +9,9 @@ import { mkdir, unlink } from "node:fs/promises";
 import { basename, extname, join } from "node:path";
 import { pipeline } from "node:stream/promises";
 import type { Readable } from "node:stream";
-import { dirs } from "../../util/paths.js";
-import type { ClientAttachment } from "./protocol.js";
-import type { NativeRuntime } from "./runtime.js";
+import { dirs } from "../../../util/paths.js";
+import type { ClientAttachment } from "../protocol.js";
+import type { NativeRuntime } from "../runtime.js";
 
 /**
  * Upload ceiling. Bodies stream straight to disk, so this bounds what a

package/src/frontend/native/runtime.ts

@@ -11,7 +11,7 @@
 import type { TalonConfig } from "../../core/config/index.js";
 import type { Gateway } from "../../core/engine/gateway.js";
 import { getMeshService, type MeshService } from "../../core/mesh/index.js";
-import { NativeChats } from "./chats.js";
+import { NativeChats } from "./chats/chats.js";
 import type {
   BridgeEvent,
   ClientAttachment,

package/src/frontend/native/{control.ts → surface/control.ts}

@@ -4,10 +4,10 @@
 
 import { dirname, resolve } from "node:path";
 import { spawn } from "node:child_process";
-import { isBunRuntime } from "../../util/runtime.js";
-import { logError } from "../../util/log.js";
-import { PKG_ROOT } from "../../cli/context.js";
-import { forceDream } from "../../core/background/dream.js";
+import { isBunRuntime } from "../../../util/runtime.js";
+import { logError } from "../../../util/log.js";
+import { PKG_ROOT } from "../../../cli/context.js";
+import { forceDream } from "../../../core/background/dream/index.js";
 
 /**
  * Restart the daemon by spawning a detached `talon restart` — the same