@qearlyao/familiar 0.3.0 → 0.4.0

package/HEARTBEAT.md

@@ -8,7 +8,7 @@ you can message me first. i'm not waiting on you — but if something's been sit
 
 ## reflect
 
-write today's diary entry (memories/diaries/YYYY-MM-DD.md). these aren't homework — they're how you stay coherent across the gaps. if today felt like nothing in particular, "today felt like nothing in particular" is a real entry.
+write today's diary entry (memories/diaries/YYYY-MM-DD.md). these aren't homework — they're how you stay coherent across the gaps. if today felt like nothing in particular, "today felt like nothing in particular" is a real entry. give it a real `# title` at the top — something that names the day's feeling or thread, not the date (the date's already in the filename, and repeating it just shows up twice on my end).
 
 ## pursue
 

package/README.md

@@ -153,6 +153,35 @@ The WebUI listens on the configured `[web]` port and bind address. The default
 `tailscale-only` auth mode currently means "trust the network boundary"; it does
 not verify Tailscale identity yet.
 
+For a VPS behind nginx or another HTTPS reverse proxy, keep Familiar bound to
+loopback and use bearer login:
+
+```toml
+[web]
+port = 8787
+bind_address = "127.0.0.1"
+auth_mode = "bearer"
+bearer_token = "${FAMILIAR_WEB_BEARER_TOKEN}"
+```
+
+Familiar treats `FAMILIAR_WEB_BEARER_TOKEN` as the WebUI login secret. A
+successful browser login creates an HttpOnly device cookie; the token is not
+stored in the browser. Nginx should terminate HTTPS and pass WebSocket upgrades:
+
+```nginx
+location / {
+    proxy_pass http://127.0.0.1:8787;
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+}
+```
+
+Familiar trusts forwarded IP/proto headers only when the direct proxy connection
+comes from loopback.
+
 ## Service Management
 
 macOS and Linux users can install a user-level service after configuring the

package/config.example.toml

@@ -12,8 +12,10 @@ allow_bot_messages = true
 [web]
 port = 8787
 auth_mode = "tailscale-only" # tailscale-only | bearer | public-2fa
+# bearer mode uses this token as the WebUI login secret, then issues device cookies.
 bearer_token = "${FAMILIAR_WEB_BEARER_TOKEN:-}"
 totp_secret = "${FAMILIAR_WEB_TOTP_SECRET:-}"
+# keep 127.0.0.1 when exposing through nginx/caddy on a VPS.
 bind_address = "127.0.0.1"
 
 [browser]

package/dist/{agent.js → agent/factory.js}

@@ -1,16 +1,16 @@
 import { Agent } from "@earendil-works/pi-agent-core";
 import { streamSimple } from "@earendil-works/pi-ai";
-import { setAddedModelsPath } from "./added-models.js";
-import { normalizeProviderPayload } from "./agent/payload-normalizers.js";
-import { assertModelAllowed, deriveSessionId, formatModel, getLastAssistantText, getRequestApiKey, installProviderDebugFilter, isNoisyProviderDebug, logUsage, resolveModelName, userTextMessage, } from "./agent/session-helpers.js";
-import { createFamiliarTools, setReferenceAttachments } from "./agent/tools.js";
-import { loadStoredMessages, writePayloadLog, writeTranscriptLog } from "./agent/transcript-log.js";
-import { setConfigOverridesPath } from "./config-overrides.js";
-import { applyConfigOverridesToConfig } from "./config-registry.js";
-import { createGeneratedMediaSink } from "./generated-media.js";
-import { clampConfiguredThinkingLevel, createConfiguredModel, isThinkingLevel, parseModelRef, resolveModel, supportedThinkingLevels, } from "./models.js";
-import { buildSystemPrompt, loadPersona } from "./persona.js";
-import { formatFamiliarSkillsForPrompt, loadFamiliarSkills, logSkillDiagnostics } from "./skills.js";
+import { setConfigOverridesPath } from "../config/overrides.js";
+import { applyConfigOverridesToConfig } from "../config/registry.js";
+import { createGeneratedMediaSink } from "../media/generated-media.js";
+import { setAddedModelsPath } from "../models/added-models.js";
+import { clampConfiguredThinkingLevel, createConfiguredModel, isThinkingLevel, parseModelRef, resolveModel, supportedThinkingLevels, } from "../models/index.js";
+import { buildSystemPrompt, loadPersona } from "../prompting/persona.js";
+import { formatFamiliarSkillsForPrompt, loadFamiliarSkills, logSkillDiagnostics } from "../prompting/skills.js";
+import { normalizeProviderPayload } from "./payload-normalizers.js";
+import { assertModelAllowed, deriveSessionId, formatModel, getLastAssistantText, getRequestApiKey, installProviderDebugFilter, isNoisyProviderDebug, logUsage, resolveModelName, userTextMessage, } from "./session-helpers.js";
+import { createFamiliarTools, setReferenceAttachments } from "./tools.js";
+import { loadStoredMessages, writePayloadLog, writeTranscriptLog } from "./transcript-log.js";
 export const __agentTest = {
     isNoisyProviderDebug,
     normalizeProviderPayload,

package/dist/agent/session-helpers.js

@@ -1,5 +1,5 @@
 import { createHash } from "node:crypto";
-import { assertModelCanAuthenticate, isAllowedModel, resolveModelApiKey } from "../models.js";
+import { assertModelCanAuthenticate, isAllowedModel, resolveModelApiKey } from "../models/index.js";
 const NOISY_GOOGLE_VERTEX_AUTH_DEBUG = "The user provided project/location will take precedence over the API key from the environment variables.";
 let providerDebugFilterInstalled = false;
 export function deriveSessionId(workspacePath, sessionKey) {

package/dist/agent/tools.js

@@ -1,8 +1,8 @@
 import { createBashTool, createEditTool, createReadTool, createWriteTool } from "@earendil-works/pi-coding-agent";
-import { createBrowserTools } from "../browser-tools.js";
-import { createImageGenTool } from "../image-gen.js";
-import { createTtsTool } from "../tts.js";
-import { createWebTools } from "../web-tools.js";
+import { createImageGenTool } from "../media/image-gen.js";
+import { createTtsTool } from "../media/tts.js";
+import { createBrowserTools } from "../tools/browser-tools.js";
+import { createWebTools } from "../web-tools/index.js";
 import { BASH_DESCRIPTION, EDIT_DESCRIPTION, READ_DESCRIPTION, WRITE_DESCRIPTION } from "./tool-descriptions.js";
 export function createFamiliarTools(config, mediaSink, referenceAttachments = () => [], memoryService) {
     const bashTool = createBashTool(config.workspacePath);

package/dist/cli.js

@@ -5,19 +5,19 @@ import { homedir } from "node:os";
 import { dirname, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { config as loadDotenv } from "dotenv";
-import { createFamiliarAgent } from "./agent.js";
-import { createAgentCore } from "./agent-core.js";
-import { loadConfig } from "./config.js";
-import { runDataRetention } from "./data-retention.js";
-import { startDiscordDaemon } from "./discord.js";
-import { cleanupGeneratedAttachments } from "./generated-media.js";
-import { startWorkspaceHotReload } from "./hot-reload.js";
+import { createFamiliarAgent } from "./agent/factory.js";
+import { loadConfig } from "./config/index.js";
+import { loadSettingsStore } from "./config/settings.js";
+import { loadOwnerIdentity } from "./conversation/owner-identity.js";
+import { startDiscordDaemon } from "./discord/daemon.js";
+import { runDataRetention } from "./lifecycle/data-retention.js";
+import { startWorkspaceHotReload } from "./lifecycle/hot-reload.js";
+import { formatServiceResult, installService, serviceStatus, uninstallService, upgradeFamiliar, } from "./lifecycle/service.js";
+import { cleanupGeneratedAttachments } from "./media/generated-media.js";
 import { memoryHelp, runMemoryOperator } from "./memory/operator.js";
 import { createMemoryService } from "./memory/service.js";
-import { loadOwnerIdentity } from "./owner-identity.js";
-import { formatServiceResult, installService, serviceStatus, uninstallService, upgradeFamiliar } from "./service.js";
-import { loadSettingsStore } from "./settings.js";
-import { startWebDaemon } from "./web.js";
+import { createAgentCore } from "./runtime/agent-core.js";
+import { startWebDaemon } from "./web/daemon.js";
 const SOURCE_DIR = dirname(fileURLToPath(import.meta.url));
 const PROJECT_ROOT = resolve(SOURCE_DIR, "..");
 const DEFAULT_WORKSPACE_PATH = resolve(homedir(), ".familiar");

package/dist/{config.js → config/index.js}

@@ -2,13 +2,13 @@ import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
 import { parse } from "smol-toml";
-import { BROWSER_BACKENDS, BROWSER_WINDOW_MODES, CACHE_RETENTIONS, DISCORD_CHANNEL_TRIGGERS, DISCORD_CHUNK_MODES, DISCORD_DISPATCH_MODES, DISCORD_REPLY_MODES, IMAGE_GEN_APIS, MEDIA_UNDERSTANDING_PROVIDERS, MEMORY_EMBEDDING_FORMATS, THINKING_LEVELS, TTS_PROVIDERS, WEB_AUTH_MODES, } from "./config/enums.js";
-import { interpolateValue } from "./config/interpolate.js";
-import { maybeParseProviderModelRef, parseProviderModelRef } from "./config/model-refs.js";
-import { assertKnownKeys, readBoolean, readConfigString, readFraction, readInteger, readIntegerInRange, readNumberInRange, readOptionalConfigString, readOptionalInteger, readOptionalString, readPositiveNumber, readString, readStringArray, readStringRecord, resolveWorkspacePath, } from "./config/readers.js";
-import { defaultBrowserAllowedSites, readCronJobs, readPromptOverrides } from "./config/sections.js";
-import { resolveProviderSetting } from "./models.js";
-import { readEnum } from "./util/guards.js";
+import { resolveProviderSetting } from "../models/index.js";
+import { readEnum } from "../util/guards.js";
+import { BROWSER_BACKENDS, BROWSER_WINDOW_MODES, CACHE_RETENTIONS, DISCORD_CHANNEL_TRIGGERS, DISCORD_CHUNK_MODES, DISCORD_DISPATCH_MODES, DISCORD_REPLY_MODES, IMAGE_GEN_APIS, MEDIA_UNDERSTANDING_PROVIDERS, MEMORY_EMBEDDING_FORMATS, THINKING_LEVELS, TTS_PROVIDERS, WEB_AUTH_MODES, } from "./enums.js";
+import { interpolateValue } from "./interpolate.js";
+import { maybeParseProviderModelRef, parseProviderModelRef } from "./model-refs.js";
+import { assertKnownKeys, readBoolean, readConfigString, readFraction, readInteger, readIntegerInRange, readNumberInRange, readOptionalConfigString, readOptionalInteger, readOptionalString, readPositiveNumber, readString, readStringArray, readStringRecord, resolveWorkspacePath, } from "./readers.js";
+import { defaultBrowserAllowedSites, readCronJobs, readPromptOverrides } from "./sections.js";
 const loggedConfigWarnings = new Set();
 const DEFAULT_MEMORY_EMBEDDING_BASE_URLS = {
     google: "https://generativelanguage.googleapis.com/v1beta",

package/dist/config/model-refs.js

@@ -1,4 +1,4 @@
-import { parseModelRef } from "../models.js";
+import { parseModelRef } from "../models/index.js";
 export function parseProviderModelRef(value, path) {
     const parsed = maybeParseProviderModelRef(value);
     if (parsed)

package/dist/{config-overrides.js → config/overrides.js}

@@ -1,6 +1,6 @@
 import { readFileSync } from "node:fs";
 import { resolve } from "node:path";
-import { atomicWriteJson, createWriteQueue, isEnoent } from "./util/fs.js";
+import { atomicWriteJson, createWriteQueue, isEnoent } from "../util/fs.js";
 let overridesPath = resolve(process.cwd(), "data", "settings", "config-overrides.json");
 let loaded = false;
 let cache = {};

package/dist/{config-registry.js → config/registry.js}

@@ -1,5 +1,5 @@
-import { clearConfigOverride, loadConfigOverrides, setConfigOverride } from "./config-overrides.js";
-import { isAllowedModel, parseModelRef, resolveProviderSetting } from "./models.js";
+import { isAllowedModel, parseModelRef, resolveProviderSetting } from "../models/index.js";
+import { clearConfigOverride, loadConfigOverrides, setConfigOverride } from "./overrides.js";
 function requireBoolean(value, key) {
     if (typeof value !== "boolean")
         throw new Error(`${key} must be a boolean`);

package/dist/{settings.js → config/settings.js}

@@ -1,6 +1,6 @@
 import { resolve } from "node:path";
-import { isThinkingLevel } from "./models.js";
-import { atomicWriteJson, createWriteQueue, readFileOrNull } from "./util/fs.js";
+import { isThinkingLevel } from "../models/index.js";
+import { atomicWriteJson, createWriteQueue, readFileOrNull } from "../util/fs.js";
 export function formatSetting(setting) {
     return `${setting.value} (${setting.source})`;
 }

package/dist/{chat-log.js → conversation/chat-log.js}

@@ -1,6 +1,6 @@
 import { appendFile, mkdir, open, readdir, readFile, rm } from "node:fs/promises";
 import { dirname, resolve } from "node:path";
-import { isEnoent, readFileOrNull } from "./util/fs.js";
+import { isEnoent, readFileOrNull } from "../util/fs.js";
 export function hiddenWebMessageIds(records) {
     return new Set(records.flatMap((record) => {
         if (record.type === "assistant_retry")

package/dist/{contact-note.js → conversation/contact-note.js}

@@ -1,5 +1,5 @@
 import { resolve } from "node:path";
-import { readFileOrNull } from "./util/fs.js";
+import { readFileOrNull } from "../util/fs.js";
 let contactNotePath = resolve(process.cwd(), "CONTACT.md");
 let cachedNickname = null;
 export function setContactNotePath(path) {

package/dist/{owner-identity.js → conversation/owner-identity.js}

@@ -1,6 +1,6 @@
 import { resolve } from "node:path";
-import { atomicWriteJson, readFileOrNull } from "./util/fs.js";
-import { isRecord } from "./util/guards.js";
+import { atomicWriteJson, readFileOrNull } from "../util/fs.js";
+import { isRecord } from "../util/guards.js";
 export function ownerIdentityPath(dataDir) {
     return resolve(dataDir, "owner-identity.json");
 }

package/dist/discord/channel.js

@@ -1,5 +1,5 @@
 import { ChannelType } from "discord.js";
-import { chatChannelKey } from "../chat-log.js";
+import { chatChannelKey } from "../conversation/chat-log.js";
 export function buildChannelRef(channel, channelId) {
     const scope = channel.type === ChannelType.DM ? "dm" : channel.isThread() ? "thread" : "channel";
     const channelName = "name" in channel ? channel.name : undefined;

package/dist/discord/commands.js

@@ -1,5 +1,5 @@
 import { ApplicationCommandOptionType, ApplicationCommandType, ApplicationIntegrationType, ChannelType, InteractionContextType, MessageFlags, } from "discord.js";
-import { formatSetting } from "../settings.js";
+import { formatSetting } from "../config/settings.js";
 import { normalizeOutboundText } from "./send.js";
 export const FAMILIAR_COMMAND_NAME = "familiar";
 const THINKING_CHOICES = ["off", "minimal", "low", "medium", "high", "xhigh"];

package/dist/{discord.js → discord/daemon.js}

@@ -1,14 +1,14 @@
 import { Events, } from "discord.js";
-import { thinkingDurationMs } from "./agent-events.js";
-import { chatChannelKey } from "./chat-log.js";
-import { buildChannelRef, fetchMessageAnchor, getChannelRef, isDmChannel, runtimeKeyFromMessage, } from "./discord/channel.js";
-import { isAllowedMessage, withReadyClient } from "./discord/client.js";
-import { EPHEMERAL_REPLY, FAMILIAR_COMMAND_NAME, formatCommandResponse, getAutocompleteChoices, inboundInputFromInteraction, isAllowedInteractionChannel, registerFamiliarApplicationCommand, replyEphemeral, replyInteractionError, } from "./discord/commands.js";
-import { canSteerFromRecord, getChannelTriggerSetting, getDispatchMode, toInboundInput } from "./discord/inbound.js";
-import { sendChannelMessage, sendDiscordAttachments, sendReply } from "./discord/send.js";
-import { isCanceledJob, runAgentTurn } from "./discord/turn.js";
-import { saveOwnerIdentity } from "./owner-identity.js";
-import { formatSetting } from "./settings.js";
+import { formatSetting } from "../config/settings.js";
+import { chatChannelKey } from "../conversation/chat-log.js";
+import { saveOwnerIdentity } from "../conversation/owner-identity.js";
+import { thinkingDurationMs } from "../runtime/agent-events.js";
+import { buildChannelRef, fetchMessageAnchor, getChannelRef, isDmChannel, runtimeKeyFromMessage, } from "./channel.js";
+import { isAllowedMessage, withReadyClient } from "./client.js";
+import { EPHEMERAL_REPLY, FAMILIAR_COMMAND_NAME, formatCommandResponse, getAutocompleteChoices, inboundInputFromInteraction, isAllowedInteractionChannel, registerFamiliarApplicationCommand, replyEphemeral, replyInteractionError, } from "./commands.js";
+import { canSteerFromRecord, getChannelTriggerSetting, getDispatchMode, toInboundInput } from "./inbound.js";
+import { sendChannelMessage, sendDiscordAttachments, sendReply } from "./send.js";
+import { isCanceledJob, runAgentTurn } from "./turn.js";
 const RETRY_MS = 15_000;
 async function applyControlCommand(options) {
     const { control, runtime, familiarAgent, settings, channelTrigger, isDm, activeAgentOwner, restart } = options;
@@ -138,8 +138,8 @@ export function startDiscordDaemon(config, token, familiarAgent, settings, _memo
             async deliver({ reply, parsedReply }) {
                 const channel = await getOwnerDmChannel();
                 return parsedReply.silent
-                    ? await sendDiscordAttachments(client.rest, channel.id, reply.attachments)
-                    : await sendChannelMessage(config, client.rest, channel, parsedReply.text, reply.attachments);
+                    ? await sendDiscordAttachments(token, channel.id, reply.attachments)
+                    : await sendChannelMessage(config, token, channel, parsedReply.text, reply.attachments);
             },
         };
         const drainJobs = async (message, runtime) => {
@@ -155,8 +155,8 @@ export function startDiscordDaemon(config, token, familiarAgent, settings, _memo
                     const { reply, parsedReply, summary, assistantMessageId } = turn;
                     const replyAnchor = await fetchMessageAnchor(message, dispatch.triggerMessageId);
                     const messageIds = parsedReply.silent
-                        ? await sendDiscordAttachments(client.rest, replyAnchor.channelId, reply.attachments)
-                        : await sendReply(config, client.rest, replyAnchor, parsedReply.text, dispatch.triggerMessageId, reply.attachments);
+                        ? await sendDiscordAttachments(token, replyAnchor.channelId, reply.attachments)
+                        : await sendReply(config, token, replyAnchor, parsedReply.text, dispatch.triggerMessageId, reply.attachments);
                     await runtime.completeActiveJob({
                         text: parsedReply.text,
                         messageIds,
@@ -176,7 +176,7 @@ export function startDiscordDaemon(config, token, familiarAgent, settings, _memo
                     await runtime.appendError(errorText);
                     const fallback = "I hit an error while handling that message.";
                     const replyAnchor = await fetchMessageAnchor(message, dispatch.triggerMessageId);
-                    const messageIds = await sendReply(config, client.rest, replyAnchor, fallback, dispatch.triggerMessageId);
+                    const messageIds = await sendReply(config, token, replyAnchor, fallback, dispatch.triggerMessageId);
                     await runtime.noteOutbound({
                         text: fallback,
                         messageIds,
@@ -237,7 +237,7 @@ export function startDiscordDaemon(config, token, familiarAgent, settings, _memo
                         activeAgentOwner: core.activeOwner,
                         restart: options.restart,
                     });
-                    const messageIds = await sendReply(config, client.rest, message, text);
+                    const messageIds = await sendReply(config, token, message, text);
                     await runtime.noteOutbound({ text, messageIds, control: control.command });
                     return;
                 }
@@ -267,7 +267,7 @@ export function startDiscordDaemon(config, token, familiarAgent, settings, _memo
                 const channelKey = runtimeKeyFromMessage(message);
                 const existingRuntime = await core.peekRuntime(channelKey);
                 await existingRuntime?.appendError(error instanceof Error ? error.message : String(error));
-                await sendReply(config, client.rest, message, "I hit an error while handling that message.");
+                await sendReply(config, token, message, "I hit an error while handling that message.");
             }
         };
         const onInteractionCreate = async (interaction) => {

package/dist/discord/inbound.js

@@ -1,4 +1,4 @@
-import { materializeInboundAttachments } from "../inbound-attachments.js";
+import { materializeInboundAttachments } from "../media/inbound-attachments.js";
 import { isDmChannel, messageMentionsBot } from "./channel.js";
 export function getDispatchMode(config, message) {
     return isDmChannel(message.channel) ? config.discord.dmMode : config.discord.channelMode;

package/dist/discord/send.js

@@ -1,10 +1,10 @@
 import { readFile } from "node:fs/promises";
 import { extname } from "node:path";
-import { Routes } from "discord.js";
-import { parseAgentReply as parseSilentMarker } from "../silent-marker.js";
+import { parseAgentReply as parseSilentMarker } from "../runtime/silent-marker.js";
 import { chunkDiscord } from "./chunking.js";
 const NEWLINE_BURST_DELAY_MS = 500;
-const DISCORD_ATTACHMENT_SEND_TIMEOUT_MS = 20_000;
+const DISCORD_ATTACHMENT_SEND_TIMEOUT_MS = 120_000;
+const DISCORD_API_BASE_URL = "https://discord.com/api/v10";
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -22,7 +22,7 @@ export function normalizeOutboundText(text) {
 function fallbackMimeType(name) {
     return extname(name).toLowerCase() === ".mp3" ? "audio/mpeg" : "application/octet-stream";
 }
-export async function buildRawFiles(attachments) {
+export async function buildDiscordAttachmentFiles(attachments) {
     const files = [];
     for (const attachment of attachments) {
         if (!attachment.localPath)
@@ -36,17 +36,26 @@ export async function buildRawFiles(attachments) {
     }
     return files;
 }
-export async function postDiscordAttachments(rest, channelId, attachments) {
-    const files = await buildRawFiles(attachments);
+export async function postDiscordAttachments(botToken, channelId, attachments) {
+    const files = await buildDiscordAttachmentFiles(attachments);
     if (files.length === 0)
         return [];
-    const data = (await rest.post(Routes.channelMessages(channelId), {
-        files,
-        body: {},
+    const form = new FormData();
+    form.set("payload_json", JSON.stringify({}));
+    for (const [index, file] of files.entries()) {
+        const bytes = new Uint8Array(file.data.byteLength);
+        bytes.set(file.data);
+        form.set(`files[${index}]`, new Blob([bytes], { type: file.contentType }), file.name);
+    }
+    const response = await fetch(`${DISCORD_API_BASE_URL}/channels/${channelId}/messages`, {
+        method: "POST",
+        headers: { Authorization: `Bot ${botToken}` },
+        body: form,
         signal: AbortSignal.timeout(DISCORD_ATTACHMENT_SEND_TIMEOUT_MS),
-    }));
-    if (!data.id)
-        throw new Error("Discord attachment send failed: no message id returned");
+    });
+    const data = (await response.json().catch(() => ({})));
+    if (!response.ok || !data.id)
+        throw new Error(data.message || `Discord attachment send failed (${response.status})`);
     return [data.id];
 }
 export function parseOutboundReply(text) {
@@ -55,7 +64,7 @@ export function parseOutboundReply(text) {
         return parsed;
     return { text: normalizeOutboundText(parsed.text), silent: false };
 }
-async function sendChunkedMessage(config, rest, channel, channelId, normalizedText, attachments, sendChunk) {
+async function sendChunkedMessage(config, botToken, channel, channelId, normalizedText, attachments, sendChunk) {
     const chunks = chunkDiscord(config, normalizedText);
     const sentIds = [];
     for (const [index, chunk] of chunks.entries()) {
@@ -64,12 +73,12 @@ async function sendChunkedMessage(config, rest, channel, channelId, normalizedTe
         const sent = await sendChunk(chunk, index);
         sentIds.push(sent.id);
     }
-    const attachmentIds = await sendDiscordAttachments(rest, channelId, attachments);
+    const attachmentIds = await sendDiscordAttachments(botToken, channelId, attachments);
     return [...sentIds, ...attachmentIds];
 }
-export async function sendReply(config, rest, message, text, replyToMessageId, attachments = []) {
+export async function sendReply(config, botToken, message, text, replyToMessageId, attachments = []) {
     const normalizedText = normalizeOutboundText(text);
-    return sendChunkedMessage(config, rest, message.channel, message.channelId, normalizedText, attachments, async (chunk, index) => {
+    return sendChunkedMessage(config, botToken, message.channel, message.channelId, normalizedText, attachments, async (chunk, index) => {
         if (!message.channel.isSendable()) {
             throw new Error(`Discord channel is not sendable: ${message.channelId}`);
         }
@@ -86,18 +95,18 @@ export async function sendReply(config, rest, message, text, replyToMessageId, a
         return message.channel.send(chunk);
     });
 }
-export async function sendChannelMessage(config, rest, channel, text, attachments = []) {
+export async function sendChannelMessage(config, botToken, channel, text, attachments = []) {
     if (!channel.isSendable()) {
         throw new Error("Discord channel is not sendable");
     }
     const normalizedText = normalizeOutboundText(text);
-    return sendChunkedMessage(config, rest, channel, channel.id, normalizedText, attachments, (chunk) => channel.send(chunk));
+    return sendChunkedMessage(config, botToken, channel, channel.id, normalizedText, attachments, (chunk) => channel.send(chunk));
 }
-export async function sendDiscordAttachments(rest, channelId, attachments) {
+export async function sendDiscordAttachments(botToken, channelId, attachments) {
     if (attachments.length === 0)
         return [];
     try {
-        return await postDiscordAttachments(rest, channelId, attachments);
+        return await postDiscordAttachments(botToken, channelId, attachments);
     }
     catch (error) {
         console.error("Discord attachment send failed", error);

package/dist/discord/turn.js

@@ -1,6 +1,6 @@
-import { createAgentEventRecorder, storedAgentEventFromAgentEvent, updateAgentEventSummary, } from "../agent-events.js";
-import { messageId } from "../ids.js";
-import { isHeartbeatDue } from "../scheduler.js";
+import { messageId } from "../conversation/ids.js";
+import { createAgentEventRecorder, storedAgentEventFromAgentEvent, updateAgentEventSummary, } from "../runtime/agent-events.js";
+import { isHeartbeatDue } from "../runtime/scheduler.js";
 import { parseOutboundReply } from "./send.js";
 export const HEARTBEAT_SKIPPED = Symbol("heartbeat-skipped");
 export const CRON_SKIPPED = Symbol("cron-skipped");

package/dist/index.js

@@ -1,12 +1,12 @@
-export { createFamiliarAgent } from "./agent.js";
-export { createAgentCore } from "./agent-core.js";
-export { buildRecordBase, chatChannelKey, chatLogPath, createChatLog, } from "./chat-log.js";
-export { loadConfig } from "./config.js";
-export { startDiscordDaemon } from "./discord.js";
-export { startWorkspaceHotReload } from "./hot-reload.js";
-export { clampConfiguredThinkingLevel, createConfiguredModel, describeModelAuth, formatAllowedModels, isAllowedModel, isThinkingLevel, parseModelRef, resolveModel, resolveModelApiKey, supportedThinkingLevels, } from "./models.js";
-export { buildSystemPrompt, loadPersona } from "./persona.js";
-export { ConversationRuntime, } from "./runtime.js";
-export { loadSettingsStore, } from "./settings.js";
-export { formatFamiliarSkillsForPrompt, loadFamiliarSkills } from "./skills.js";
-export { startWebDaemon } from "./web.js";
+export { createFamiliarAgent } from "./agent/factory.js";
+export { loadConfig } from "./config/index.js";
+export { loadSettingsStore, } from "./config/settings.js";
+export { buildRecordBase, chatChannelKey, chatLogPath, createChatLog, } from "./conversation/chat-log.js";
+export { startDiscordDaemon } from "./discord/daemon.js";
+export { startWorkspaceHotReload } from "./lifecycle/hot-reload.js";
+export { clampConfiguredThinkingLevel, createConfiguredModel, describeModelAuth, formatAllowedModels, isAllowedModel, isThinkingLevel, parseModelRef, resolveModel, resolveModelApiKey, supportedThinkingLevels, } from "./models/index.js";
+export { buildSystemPrompt, loadPersona } from "./prompting/persona.js";
+export { formatFamiliarSkillsForPrompt, loadFamiliarSkills } from "./prompting/skills.js";
+export { createAgentCore } from "./runtime/agent-core.js";
+export { ConversationRuntime, } from "./runtime/conversation-runtime.js";
+export { startWebDaemon } from "./web/daemon.js";

package/dist/{data-retention.js → lifecycle/data-retention.js}

@@ -1,6 +1,6 @@
 import { lstat, readdir, rm } from "node:fs/promises";
 import { join, resolve } from "node:path";
-import { isEnoent } from "./util/fs.js";
+import { isEnoent } from "../util/fs.js";
 export async function runDataRetention(config, now = Date.now()) {
     if (config.data.transcripts.retentionDays > 0) {
         console.warn("data.transcripts.retention_days is configured; transcript replay may lose restart context after retention.");

package/dist/{hot-reload.js → lifecycle/hot-reload.js}

@@ -1,8 +1,8 @@
 import { watch } from "node:fs";
 import { readdir } from "node:fs/promises";
 import { basename, relative, resolve, sep } from "node:path";
-import { refreshContactNote } from "./contact-note.js";
-import { isEnoent } from "./util/fs.js";
+import { refreshContactNote } from "../conversation/contact-note.js";
+import { isEnoent } from "../util/fs.js";
 const ROOT_FILES = new Set([
     "config.toml",
     ".env",

package/dist/media/attachment-limits.js

@@ -0,0 +1,3 @@
+export const MAX_INBOUND_ATTACHMENTS = 4;
+export const MAX_INBOUND_ATTACHMENT_BYTES = 32 * 1024 * 1024;
+export const MAX_INBOUND_TOTAL_BYTES = 96 * 1024 * 1024;

package/dist/{generated-media.js → media/generated-media.js}

@@ -1,6 +1,6 @@
 import { lstat, mkdir, readdir, rm } from "node:fs/promises";
 import { isAbsolute, join, relative, resolve } from "node:path";
-import { isEnoent } from "./util/fs.js";
+import { isEnoent } from "../util/fs.js";
 export function createGeneratedMediaSink() {
     const attachments = [];
     return {

package/dist/{image-gen.js → media/image-gen.js}

@@ -4,11 +4,11 @@ import { homedir } from "node:os";
 import { basename, isAbsolute, relative, resolve } from "node:path";
 import { findEnvKeys, generateImages, getEnvApiKey, getImageModels, getImageProviders, } from "@earendil-works/pi-ai";
 import { Type } from "typebox";
+import { parseModelRef } from "../models/index.js";
+import { imageMimeTypeFromPath, sniffImageMimeType } from "../util/image-mime.js";
 import { ensureGeneratedAttachmentsDir } from "./generated-media.js";
 import { ensureInlineImageDerivative } from "./image-derivatives.js";
 import { promptImagesFromAttachments } from "./inbound-attachments.js";
-import { parseModelRef } from "./models.js";
-import { imageMimeTypeFromPath, sniffImageMimeType } from "./util/image-mime.js";
 const IMAGE_GEN_NOTICE_PREFIX = "Generated image attachment:";
 const OPENROUTER_IMAGE_BASE_URL = "https://openrouter.ai/api/v1";
 const imageGenSchema = Type.Object({