@gajae-code/coding-agent 0.9.0 → 0.9.2

package/src/notifications/lifecycle-commands.ts

@@ -31,7 +31,7 @@ function normalizeLifecycleCommandToken(
 
 /** A parsed, validated lifecycle command (transport identity added by caller). */
 export type ParsedLifecycleCommand =
-	| { kind: "create"; target: SessionCreateTarget }
+	| { kind: "create"; target: SessionCreateTarget; modelPreset?: string }
 	| { kind: "close"; target: SessionCloseTarget }
 	| { kind: "resume"; target: SessionResumeTarget }
 	| { kind: "recent"; which: "create" | "resume" | "all" }
@@ -41,9 +41,9 @@ export type ParsedLifecycleCommand =
 
 const USAGE = [
 	"Session commands:",
-	"/session_create path <dir>",
-	"/session_create worktree <repo> <branch>",
-	"/session_create dir <newdir>",
+	"/session_create path <dir> [--mpreset <profile>]",
+	"/session_create worktree <repo> <branch> [--mpreset <profile>]",
+	"/session_create dir <newdir> [--mpreset <profile>]",
 	"/session_close <sessionId>",
 	"/session_resume <sessionId|prefix>",
 	"/session_recent [create|resume]",
@@ -69,6 +69,23 @@ export function isLifecycleCommandText(
 	return normalizeLifecycleCommandToken(rawCommand ?? "", ctx) !== undefined;
 }
 
+/** Extract `--mpreset <name>` (or `--mpreset=<name>`) from args, returning remaining positional args. */
+function extractModelPreset(args: string[]): { positional: string[]; modelPreset?: string } {
+	const positional: string[] = [];
+	let modelPreset: string | undefined;
+	for (let i = 0; i < args.length; i++) {
+		const arg = args[i]!;
+		if (arg === "--mpreset" && i + 1 < args.length) {
+			modelPreset = args[++i]!;
+		} else if (arg.startsWith("--mpreset=")) {
+			modelPreset = arg.slice("--mpreset=".length);
+		} else {
+			positional.push(arg);
+		}
+	}
+	return { positional, modelPreset };
+}
+
 /**
  * Parse a paired-chat message into a lifecycle command. Returns `none` for
  * non-lifecycle text, `usage`/`reject` for malformed input (no side effect), or
@@ -121,29 +138,33 @@ export function parseLifecycleCommand(
 		return { kind: "resume", target: { sessionIdOrPrefix: idOrPrefix } };
 	}
 
-	// /session_create <kind> ...
-	const kind = args[0];
+	// /session_create <kind> ... [--mpreset <profile>]
+	const { positional, modelPreset } = extractModelPreset(args);
+	if (modelPreset !== undefined && !isSafeIdentifier(modelPreset)) {
+		return { kind: "reject", reason: "invalid_target", message: `Invalid model preset name.\n\n${USAGE}` };
+	}
+	const kind = positional[0];
 	if (kind === "path") {
-		if (args.length !== 2) return { kind: "usage", message: USAGE };
-		const p = normalizeLifecyclePath(args[1]!);
+		if (positional.length !== 2) return { kind: "usage", message: USAGE };
+		const p = normalizeLifecyclePath(positional[1]!);
 		if (!p) return { kind: "reject", reason: "invalid_target", message: `Invalid path.\n\n${USAGE}` };
-		return { kind: "create", target: { kind: "existing_path", path: p } };
+		return { kind: "create", target: { kind: "existing_path", path: p }, modelPreset };
 	}
 	if (kind === "dir") {
-		if (args.length !== 2) return { kind: "usage", message: USAGE };
-		const p = normalizeLifecyclePath(args[1]!);
+		if (positional.length !== 2) return { kind: "usage", message: USAGE };
+		const p = normalizeLifecyclePath(positional[1]!);
 		if (!p) return { kind: "reject", reason: "invalid_target", message: `Invalid dir.\n\n${USAGE}` };
-		return { kind: "create", target: { kind: "plain_dir", path: p } };
+		return { kind: "create", target: { kind: "plain_dir", path: p }, modelPreset };
 	}
 	if (kind === "worktree") {
-		if (args.length !== 3) return { kind: "usage", message: USAGE };
-		const repo = normalizeLifecyclePath(args[1]!);
-		const branch = args[2]!;
+		if (positional.length !== 3) return { kind: "usage", message: USAGE };
+		const repo = normalizeLifecyclePath(positional[1]!);
+		const branch = positional[2]!;
 		if (!repo) return { kind: "reject", reason: "invalid_target", message: `Invalid repo path.\n\n${USAGE}` };
 		if (!isSafeBranch(branch)) {
 			return { kind: "reject", reason: "invalid_target", message: `Invalid branch name.\n\n${USAGE}` };
 		}
-		return { kind: "create", target: { kind: "worktree", repo, branch } };
+		return { kind: "create", target: { kind: "worktree", repo, branch }, modelPreset };
 	}
 	return { kind: "usage", message: USAGE };
 }

package/src/notifications/lifecycle-control-runtime.ts

@@ -127,22 +127,27 @@ function tmuxSessionNameFor(sessionId: string): string {
  *  The launched session id is carried via `GJC_SESSION_ID` in the child env (see
  *  {@link daemonSpawnCreate}); the root `gjc` launcher has no `--session-id`
  *  flag, so it must never appear in argv. Only flags the launch parser actually
- *  supports are emitted (`--worktree <branch>` for worktree targets). */
+ *  supports are emitted (`--worktree <branch>` for worktree targets,
+ *  `--mpreset <profile>` for model presets). */
 export function buildCreateArgv(
 	frame: SessionCreateFrame,
 	_ids: { intendedSessionId: string; startupPromptRef?: string },
 ): { cwd: string; args: string[] } {
+	const extraArgs: string[] = [];
+	if (frame.modelPreset) {
+		extraArgs.push("--mpreset", frame.modelPreset);
+	}
 	if (frame.target.kind === "worktree") {
 		const cwd = normalizeLifecyclePath(frame.target.repo);
 		if (!cwd) throw new Error("invalid_lifecycle_repo_path");
 		// Use the `--worktree=<branch>` form so the branch is a single argv token:
 		// a flag-shaped branch (e.g. `-x`) can never be mis-parsed as a separate
 		// launcher flag / detached-mode trigger.
-		return { cwd, args: [`--worktree=${frame.target.branch}`] };
+		return { cwd, args: [`--worktree=${frame.target.branch}`, ...extraArgs] };
 	}
 	const cwd = normalizeLifecyclePath(frame.target.path);
 	if (!cwd) throw new Error("invalid_lifecycle_path");
-	return { cwd, args: [] };
+	return { cwd, args: extraArgs };
 }
 
 /** Real daemon-safe tmux launcher: detached `tmux new-session -d` + GJC tags. */

package/src/notifications/reply-sent-store.ts

@@ -0,0 +1,134 @@
+/**
+ * Index of rich messages the daemon sent, mapping `${chat_id}:${message_id}` to
+ * the original markdown. Telegram does not echo a `sendRichMessage` message's
+ * text in a reply's `reply_to_message`, so a user replying to a rich final
+ * answer would otherwise strand the agent without the quoted context. The daemon
+ * records the markdown on every promoted send and looks it up on inbound replies
+ * to restore that context.
+ *
+ * Fail-closed and off-path-neutral: nothing is recorded unless a send was
+ * actually promoted to rich, `record` is a no-op on any error (the in-memory map
+ * is only mutated after the atomic persist succeeds), and `lookup` returns
+ * undefined on any miss or error, so a bad index write/read never kills the
+ * daemon.
+ */
+
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { daemonPaths } from "./daemon-paths";
+
+/** Max distinct (chat, message) entries retained; oldest-by-timestamp evicted past this. */
+const MAX_ENTRIES = 1000;
+/** Max stored characters of the original markdown per entry. */
+const MAX_TEXT_LENGTH = 2000;
+/** Persisted index filename under the notifications directory. */
+const INDEX_FILENAME = "telegram-rich-sent-index.json";
+
+/**
+ * Minimal async filesystem surface the store needs. Structurally a subset of the
+ * daemon's `TelegramDaemonFs`, so the daemon can pass its own `fs` straight
+ * through and tests can inject a fake.
+ */
+export interface ReplySentStoreFs {
+	mkdir(path: string, opts?: fs.MakeDirectoryOptions): Promise<unknown>;
+	readFile(path: string, encoding: BufferEncoding): Promise<string>;
+	writeFile(path: string, data: string, opts?: fs.WriteFileOptions): Promise<void>;
+	rename(oldPath: string, newPath: string): Promise<void>;
+	chmod(path: string, mode: number): Promise<void>;
+}
+
+const nodeFs: ReplySentStoreFs = fs.promises as unknown as ReplySentStoreFs;
+
+interface StoredEntry {
+	text: string;
+	ts: number;
+}
+
+interface PersistShape {
+	version: 1;
+	entries: Record<string, StoredEntry>;
+}
+
+/** Compose the stable per-message key. */
+function keyFor(chatId: string | number, messageId: number): string {
+	return `${chatId}:${messageId}`;
+}
+
+/** Drop oldest-by-timestamp entries until at most {@link MAX_ENTRIES} remain. */
+function evictToCap(entries: Map<string, StoredEntry>): void {
+	if (entries.size <= MAX_ENTRIES) return;
+	// Stable sort keeps insertion order among equal timestamps, so the oldest
+	// inserted entry is evicted first when timestamps tie.
+	const oldestFirst = [...entries.entries()].sort((a, b) => a[1].ts - b[1].ts);
+	const overflow = entries.size - MAX_ENTRIES;
+	for (let i = 0; i < overflow; i++) entries.delete(oldestFirst[i]![0]);
+}
+
+export class ReplySentStore {
+	readonly #dir: string;
+	readonly #file: string;
+	readonly #fsImpl: ReplySentStoreFs;
+	readonly #now: () => number;
+	#entries = new Map<string, StoredEntry>();
+
+	constructor(input: { agentDir: string; fs?: ReplySentStoreFs; now?: () => number }) {
+		this.#dir = daemonPaths(input.agentDir).dir;
+		this.#file = path.join(this.#dir, INDEX_FILENAME);
+		this.#fsImpl = input.fs ?? nodeFs;
+		this.#now = input.now ?? Date.now;
+	}
+
+	/** Restore the persisted index into memory. No-op on a missing or corrupt file. */
+	async load(): Promise<void> {
+		try {
+			const parsed = JSON.parse(await this.#fsImpl.readFile(this.#file, "utf8")) as Partial<PersistShape>;
+			const restored = new Map<string, StoredEntry>();
+			for (const [key, value] of Object.entries(parsed?.entries ?? {})) {
+				if (value && typeof value.text === "string" && typeof value.ts === "number") {
+					restored.set(key, { text: value.text, ts: value.ts });
+				}
+			}
+			evictToCap(restored);
+			this.#entries = restored;
+		} catch {
+			// Missing/corrupt index: keep the current in-memory map (empty on first load).
+		}
+	}
+
+	/**
+	 * Record the original markdown of a rich message the daemon just sent. The
+	 * text is capped at {@link MAX_TEXT_LENGTH}; the index is capped at
+	 * {@link MAX_ENTRIES} (oldest-by-timestamp evicted). No-op on any failure: the
+	 * in-memory map is only replaced after the atomic persist succeeds.
+	 */
+	async record(input: { chatId: string | number; messageId: number; text: string }): Promise<void> {
+		try {
+			const text = input.text.length > MAX_TEXT_LENGTH ? input.text.slice(0, MAX_TEXT_LENGTH) : input.text;
+			const next = new Map(this.#entries);
+			next.set(keyFor(input.chatId, input.messageId), { text, ts: this.#now() });
+			evictToCap(next);
+			await this.#persist(next);
+			this.#entries = next;
+		} catch {
+			// Best-effort: never let an index write kill the daemon.
+		}
+	}
+
+	/** Look up the original markdown for a message the daemon sent. undefined on miss or failure. */
+	lookup(input: { chatId: string | number; messageId: number }): string | undefined {
+		try {
+			return this.#entries.get(keyFor(input.chatId, input.messageId))?.text;
+		} catch {
+			return undefined;
+		}
+	}
+
+	async #persist(entries: Map<string, StoredEntry>): Promise<void> {
+		await this.#fsImpl.mkdir(this.#dir, { recursive: true, mode: 0o700 });
+		const payload: PersistShape = { version: 1, entries: Object.fromEntries(entries) };
+		const tmp = `${this.#file}.${process.pid}.${Date.now()}.${Math.random().toString(36).slice(2)}.tmp`;
+		await this.#fsImpl.writeFile(tmp, `${JSON.stringify(payload, null, 2)}\n`, { mode: 0o600 });
+		await this.#fsImpl.chmod(tmp, 0o600).catch(() => undefined);
+		await this.#fsImpl.rename(tmp, this.#file);
+	}
+}

package/src/notifications/rich-draft.ts

@@ -0,0 +1,107 @@
+/**
+ * Opt-in rich-draft streaming for a turn's in-progress preview.
+ *
+ * When the operator opts in (`richDraft.enabled`) the daemon streams LIVE turn
+ * markdown to the Bot API `sendRichMessageDraft` method as a debounced preview.
+ * Every failure is a harmless no-op (warn once, keep the daemon alive), and when
+ * off no draft call is ever made — so the off-state request bodies stay
+ * byte-identical.
+ */
+
+import type { BotApi } from "./telegram-daemon";
+import type { ThreadedSend } from "./threaded-render";
+
+/** Minimum gap between two draft sends for one session (debounce floor). */
+export const DRAFT_DEBOUNCE_MS = 1_500;
+
+/**
+ * Wrap raw markdown + a monotonic draft id in the `sendRichMessageDraft` request
+ * payload shape: mirrors `buildRichMessage`'s proven `rich_message.markdown`
+ * content wrapper, with a top-level `draft_id` selecting the draft revision to
+ * update (a routing param, like `message_thread_id`).
+ */
+export function buildRichDraft(draftId: number, raw: string): { draft_id: number; rich_message: { markdown: string } } {
+	return { draft_id: draftId, rich_message: { markdown: raw } };
+}
+
+/**
+ * Whether a granted send should stream a rich draft. Fail-closed: every clause
+ * must hold, otherwise no draft is sent. Mirrors `shouldPromoteRich` but targets
+ * the LIVE lane and the live-only `richDraftMarkdown` marker (set by
+ * `renderThreadedFrame` for non-finalized turn frames).
+ */
+export function shouldStreamDraft(input: { enabled?: boolean; send: ThreadedSend }): boolean {
+	const { enabled, send } = input;
+	return (
+		enabled === true &&
+		send.method === "sendMessage" &&
+		send.lane === "live" &&
+		typeof send.richDraftMarkdown === "string" &&
+		send.richDraftMarkdown.trim().length > 0
+	);
+}
+
+/**
+ * Per-session debounce + monotonic draft-id state for draft streaming. Skips a
+ * draft when less than `debounceMs` has elapsed since the session's last SENT
+ * draft (the rate-limit pool already coalesces live frames to the latest, so a
+ * skipped frame is naturally superseded by the next one). `reset` clears a
+ * session's window when its turn finalizes so the next turn starts fresh.
+ */
+export class DraftStreamState {
+	readonly #debounceMs: number;
+	readonly #lastSentAt = new Map<string, number>();
+	/** Daemon-global monotonic draft id: unique across sessions so two sessions
+	 * sharing one flat chat (no per-topic thread key) never collide on draft id. */
+	#nextDraftId = 0;
+
+	constructor(debounceMs: number = DRAFT_DEBOUNCE_MS) {
+		this.#debounceMs = debounceMs;
+	}
+
+	/**
+	 * If enough time has elapsed since the session's last draft, record `now` as
+	 * the new last-sent time and return the next monotonic draft id; otherwise
+	 * return `undefined` (debounced — the caller skips this frame).
+	 */
+	tryClaim(sessionId: string, now: number): number | undefined {
+		const last = this.#lastSentAt.get(sessionId);
+		if (last !== undefined && now - last < this.#debounceMs) return undefined;
+		this.#lastSentAt.set(sessionId, now);
+		const id = ++this.#nextDraftId;
+		return id;
+	}
+
+	/** Clear a session's debounce window (called when its turn finalizes). The
+	 * global draft id keeps incrementing so ids are never reused across turns. */
+	reset(sessionId: string): void {
+		this.#lastSentAt.delete(sessionId);
+	}
+}
+
+/**
+ * Best-effort delivery of a rich draft. Never throws and has no HTML fallback: a
+ * draft is a purely additive preview, so on any failure (a thrown transport
+ * error or an `{ ok: false }` JSON response — the transport returns `res.json()`
+ * for JSON methods, so `ok:false` does not throw) it warns exactly once and
+ * returns; the unchanged live HTML send still carries the content.
+ */
+export async function deliverDraft(
+	botApi: BotApi,
+	base: { chat_id: string | number; message_thread_id?: number },
+	draftId: number,
+	raw: string,
+	log?: { warn(msg: string): void },
+): Promise<void> {
+	let failure: string | undefined;
+	try {
+		const res = await botApi.call("sendRichMessageDraft", { ...base, ...buildRichDraft(draftId, raw) });
+		if (res !== null && typeof res === "object" && (res as { ok?: unknown }).ok === false) {
+			const description = (res as { description?: unknown }).description;
+			failure = typeof description === "string" && description.length > 0 ? description : "ok:false";
+		}
+	} catch (err) {
+		failure = err instanceof Error ? err.message : String(err);
+	}
+	if (failure !== undefined) log?.warn(`notifications: sendRichMessageDraft failed (${failure}); draft skipped`);
+}

package/src/notifications/rich-render.ts

@@ -0,0 +1,143 @@
+/**
+ * Rich-message promotion for stable non-editable Telegram text sends.
+ *
+ * When enabled, the daemon promotes eligible finalized `sendMessage` payloads
+ * carrying raw markdown to the Bot API `sendRichMessage` method. On any miss or
+ * failure the daemon keeps the unchanged HTML `sendMessage` path, so the
+ * off-state request bodies are byte-identical.
+ */
+
+import type { BotApi } from "./telegram-daemon";
+import type { ThreadedSend } from "./threaded-render";
+
+/**
+ * Telegram's hard per-message character ceiling (4096). Surfaced here purely as
+ * documentation and a marker for a future native rich-message splitter — it is
+ * intentionally NON-BEHAVIORAL and MUST stay that way: nothing in the rich path
+ * branches on this value.
+ *
+ * Overflow is already safe without it. The production final-answer text is capped
+ * at 3500 chars upstream (`summaryFromMessage(..., 3500)`), so a promoted
+ * `sendRichMessage` never approaches this ceiling; and if the Bot API ever rejects
+ * an oversized rich payload it returns `{ ok: false }`, which
+ * `deliverRichWithFallback` (below) turns into the chunked HTML `splitTelegramHtml`
+ * fallback (each chunk ≤ TELEGRAM_MESSAGE_LIMIT). This constant only marks where a
+ * future rich splitter would read its ceiling; wiring it into a branch would change
+ * byte-for-byte behavior and is out of scope.
+ */
+export const RICH_MESSAGE_LIMIT = 4096;
+
+/** Wrap raw markdown in the `sendRichMessage` request payload shape. */
+export function buildRichMessage(
+	raw: string,
+	extras: { reply_markup?: unknown } = {},
+): { rich_message: { markdown: string }; reply_markup?: unknown } {
+	return { rich_message: { markdown: raw }, ...extras };
+}
+
+/**
+ * Whether a granted send should be promoted to `sendRichMessage`. Fail-closed
+ * and class-aware: every clause must hold, otherwise the daemon keeps the HTML path.
+ */
+export function shouldPromoteRich(input: { enabled?: boolean; send: ThreadedSend }): boolean {
+	const { enabled, send } = input;
+	return (
+		enabled === true &&
+		send.method === "sendMessage" &&
+		send.lane === "finalized" &&
+		send.richClass === "final" &&
+		send.editable !== true &&
+		typeof send.richMarkdown === "string" &&
+		send.richMarkdown.trim().length > 0 &&
+		send.richMarkdown.length <= RICH_MESSAGE_LIMIT &&
+		typeof send.text === "string" &&
+		send.text.length > 0
+	);
+}
+
+/**
+ * Deliver the promoted rich message, falling back to `fallbackDeliver` (the
+ * unchanged HTML `sendMessage` loop) on any failure. A failure is either a
+ * thrown transport error or a `{ ok: false }` JSON response (the transport
+ * returns `res.json()` for JSON methods, so `ok:false` does not throw). On
+ * failure exactly one diagnostic is logged before the fallback runs; on success
+ * the fallback never runs.
+ *
+ * Returns the sent message's `message_id` on success (when the response carries
+ * one), otherwise `undefined` — including every failure/fallback path and a
+ * success whose response omits `result.message_id`. Callers that ignore the
+ * return value are unaffected.
+ */
+export async function deliverRichWithFallback(
+	botApi: BotApi,
+	base: { chat_id: string | number; message_thread_id?: number },
+	send: ThreadedSend,
+	fallbackDeliver: () => Promise<void>,
+	log?: { warn(msg: string): void },
+): Promise<number | undefined> {
+	let failure: string | undefined;
+	let messageId: number | undefined;
+	try {
+		const res = await botApi.call("sendRichMessage", { ...base, ...buildRichMessage(send.richMarkdown!) });
+		if (res !== null && typeof res === "object" && (res as { ok?: unknown }).ok === false) {
+			const description = (res as { description?: unknown }).description;
+			failure = typeof description === "string" && description.length > 0 ? description : "ok:false";
+		} else {
+			const candidate = (res as { result?: { message_id?: unknown } } | null)?.result?.message_id;
+			if (typeof candidate === "number") messageId = candidate;
+		}
+	} catch (err) {
+		failure = err instanceof Error ? err.message : String(err);
+	}
+	if (failure === undefined) return messageId;
+	log?.warn(`notifications: sendRichMessage failed (${failure}); falling back to HTML`);
+	await fallbackDeliver();
+	return undefined;
+}
+
+/**
+ * Deliver an action-needed (ask/idle) message via `sendRichMessage`, falling
+ * back to the unchanged HTML chunk loop on any failure. Mirrors
+ * {@link deliverRichWithFallback} but takes an explicit markdown body plus an
+ * optional top-level `reply_markup` (probe-confirmed: `sendRichMessage` accepts
+ * `reply_markup` alongside `rich_message`), and surfaces a structured outcome so
+ * the daemon can route inbound replies to the resulting message id.
+ *
+ * On rich success: returns `{ messageId, usedRich: true, usedFallback: false }`
+ * where `messageId` is `res.result.message_id` when present. On a `{ ok:false }`
+ * response or a thrown transport error: warns exactly once, runs `htmlFallback`,
+ * and returns `{ messageId, usedRich: false, usedFallback: true }` where
+ * `messageId` is the fallback's return value (the last HTML chunk's id).
+ */
+export async function deliverRichActionWithFallback(
+	botApi: BotApi,
+	base: { chat_id: string | number; message_thread_id?: number },
+	opts: { markdown: string; replyMarkup?: unknown; requireMessageId?: boolean },
+	htmlFallback: () => Promise<number | undefined>,
+	log?: { warn(msg: string): void },
+): Promise<{ messageId?: number; usedRich: boolean; usedFallback: boolean }> {
+	let failure: string | undefined;
+	let messageId: number | undefined;
+	try {
+		const res = await botApi.call("sendRichMessage", {
+			...base,
+			...buildRichMessage(opts.markdown, opts.replyMarkup === undefined ? {} : { reply_markup: opts.replyMarkup }),
+		});
+		if (res !== null && typeof res === "object" && (res as { ok?: unknown }).ok === false) {
+			const description = (res as { description?: unknown }).description;
+			failure = typeof description === "string" && description.length > 0 ? description : "ok:false";
+		} else {
+			const candidate = (res as { result?: { message_id?: unknown } } | null)?.result?.message_id;
+			if (typeof candidate === "number") messageId = candidate;
+			// Ask messages MUST be reply-routable: if a rich success carries no numeric
+			// message_id, fall back to HTML so a routable id is guaranteed.
+			else if (opts.requireMessageId) failure = "rich response missing message_id";
+		}
+	} catch (err) {
+		failure = err instanceof Error ? err.message : String(err);
+	}
+	if (failure === undefined) return { messageId, usedRich: true, usedFallback: false };
+	log?.warn(`notifications: sendRichMessage(action) failed (${failure}); falling back to HTML`);
+	const fallbackId = await htmlFallback();
+	return { messageId: fallbackId, usedRich: false, usedFallback: true };
+}

package/src/notifications/telegram-daemon-cli.ts

@@ -1,6 +1,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { YAML } from "bun";
+import { withFileLock } from "../config/file-lock";
 import type { Settings } from "../config/settings";
 import { getNotificationConfig, isTelegramConfigured } from "./config";
 import { daemonPaths } from "./daemon-paths";
@@ -14,7 +15,9 @@ type TelegramDaemonRunner = {
 type TelegramDaemonConstructor = new (opts: TelegramDaemonOptions) => TelegramDaemonRunner;
 
 export interface RunDaemonInternalDeps {
-	SettingsImpl?: { init: (options?: { agentDir?: string }) => Promise<Pick<Settings, "get" | "getAgentDir">> };
+	SettingsImpl?: {
+		init: (options?: { agentDir?: string }) => Promise<Pick<Settings, "get" | "getAgentDir" | "set" | "flush">>;
+	};
 	DaemonImpl?: TelegramDaemonConstructor;
 	processPid?: number;
 	pidAlive?: (pid: number) => boolean;
@@ -34,6 +37,17 @@ function getByPath(obj: unknown, pathSegments: string[]): unknown {
 	return current;
 }
 
+function setByPath(obj: Record<string, unknown>, pathSegments: string[], value: unknown): void {
+	let current = obj;
+	for (let i = 0; i < pathSegments.length - 1; i++) {
+		const segment = pathSegments[i]!;
+		const next = current[segment];
+		if (!next || typeof next !== "object" || Array.isArray(next)) current[segment] = {};
+		current = current[segment] as Record<string, unknown>;
+	}
+	current[pathSegments[pathSegments.length - 1]!] = value;
+}
+
 function asString(value: unknown): string | undefined {
 	return typeof value === "string" && value.length > 0 ? value : undefined;
 }
@@ -49,7 +63,7 @@ function asIdleTimeoutMs(value: unknown): number {
 export function createLightweightDaemonSettings(input: {
 	agentDir: string;
 	rawConfig?: unknown;
-}): Pick<Settings, "get" | "getAgentDir"> {
+}): Pick<Settings, "get" | "getAgentDir" | "set" | "flush"> {
 	const rawConfig = input.rawConfig && typeof input.rawConfig === "object" ? input.rawConfig : {};
 	return {
 		get(pathName: string): unknown {
@@ -64,6 +78,10 @@ export function createLightweightDaemonSettings(input: {
 				case "notifications.slack.botToken":
 				case "notifications.slack.channelId":
 					return asString(value);
+				case "notifications.telegram.rich.enabled":
+					return asBoolean(value, true);
+				case "notifications.telegram.richDraft.enabled":
+					return asBoolean(value, false);
 				case "notifications.redact":
 					return asBoolean(value, false);
 				case "notifications.verbosity":
@@ -77,10 +95,45 @@ export function createLightweightDaemonSettings(input: {
 		getAgentDir(): string {
 			return input.agentDir;
 		},
-	} as Pick<Settings, "get" | "getAgentDir">;
+		async set(pathName: string, value: unknown): Promise<void> {
+			// Back onto config.yml directly (the full Settings class is not loaded in
+			// the spawned daemon process). Contend on the SAME per-file lock as
+			// Settings.#saveNow and re-read UNDER the lock, patching only this key, so
+			// a concurrent main-process save can never drop unrelated settings (no
+			// whole-file last-writer-wins). The write is atomic (tmp + rename) so a
+			// crash mid-write can never truncate config.yml, and any failure propagates
+			// so the `/rich` handler leaves runtime state unchanged. The in-memory view
+			// is updated only after the durable write succeeds.
+			const segments = pathName.split(".");
+			const configPath = path.join(input.agentDir, "config.yml");
+			await withFileLock(configPath, async () => {
+				let onDisk: Record<string, unknown> = {};
+				try {
+					const parsed = YAML.parse(await fs.promises.readFile(configPath, "utf8"));
+					if (parsed && typeof parsed === "object") onDisk = parsed as Record<string, unknown>;
+				} catch (error) {
+					if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
+				}
+				setByPath(onDisk, segments, value);
+				await fs.promises.mkdir(path.dirname(configPath), { recursive: true });
+				const tmpPath = `${configPath}.tmp.${process.pid}.${Date.now()}`;
+				await fs.promises.writeFile(tmpPath, YAML.stringify(onDisk), { mode: 0o600 });
+				await fs.promises.rename(tmpPath, configPath);
+			});
+			setByPath(rawConfig as Record<string, unknown>, segments, value);
+		},
+		async flush(): Promise<void> {
+			// The set() above is synchronously durable (it awaits the atomic tmp+rename
+			// write under the shared file lock), so there is never a pending save to
+			// flush. Present so the daemon can await flush() uniformly regardless of
+			// which Settings implementation is injected.
+		},
+	} as Pick<Settings, "get" | "getAgentDir" | "set" | "flush">;
 }
 
-export async function loadLightweightDaemonSettings(agentDir: string): Promise<Pick<Settings, "get" | "getAgentDir">> {
+export async function loadLightweightDaemonSettings(
+	agentDir: string,
+): Promise<Pick<Settings, "get" | "getAgentDir" | "set" | "flush">> {
 	const configPath = path.join(agentDir, "config.yml");
 	let rawConfig: unknown = {};
 	try {
@@ -94,7 +147,7 @@ export async function loadLightweightDaemonSettings(agentDir: string): Promise<P
 async function resolveDaemonSettings(
 	agentDir: string,
 	deps: RunDaemonInternalDeps,
-): Promise<Pick<Settings, "get" | "getAgentDir">> {
+): Promise<Pick<Settings, "get" | "getAgentDir" | "set" | "flush">> {
 	if (deps.SettingsImpl) return await deps.SettingsImpl.init({ agentDir });
 	return await loadLightweightDaemonSettings(agentDir);
 }
@@ -156,6 +209,8 @@ export async function runDaemonInternal(argv: string[], deps: RunDaemonInternalD
 		botToken: cfg.botToken,
 		chatId: cfg.chatId,
 		idleTimeoutMs: cfg.idleTimeoutMs,
+		rich: cfg.rich,
+		richDraft: cfg.richDraft,
 		pid: deps.processPid ?? process.pid,
 		control: {
 			shouldStop: async owner => {