frizz 0.9.0 → 0.10.1

package/dist/dev-child.js

@@ -727,6 +727,20 @@ function ensureProjectIdFile(root, home = homedir3(), seed) {
 function hasAny(dir, names) {
   return names.some((name) => existsSync2(join4(dir, name)));
 }
+function isHomeDirectory(dir, home = homedir3()) {
+  const canonical = (value) => {
+    try {
+      return realpathSync2(resolve3(value));
+    } catch {
+      return resolve3(value);
+    }
+  };
+  try {
+    return canonical(dir) === canonical(home);
+  } catch {
+    return false;
+  }
+}
 function existingProjectId(dir) {
   const fromFile = readProjectIdFile(dir);
   if (fromFile) return fromFile;
@@ -736,6 +750,9 @@ function existingProjectId(dir) {
     return void 0;
   }
 }
+function hasProjectMarker(dir) {
+  return hasAny(dir, REPO_MARKERS) || hasAny(dir, PROJECT_MARKERS);
+}
 function discoverProjectRoot(cwd = process.cwd(), home = homedir3()) {
   let dir;
   try {
@@ -754,6 +771,11 @@ function discoverProjectRoot(cwd = process.cwd(), home = homedir3()) {
   }
   return dir;
 }
+function chosenProjectRoot(chosen, home = homedir3()) {
+  const dir = resolve3(chosen);
+  const discovered = discoverProjectRoot(dir, home);
+  return discovered === dir || hasProjectMarker(discovered) ? discovered : dir;
+}
 var FRIZZ_DIR, ID_FILE, SELF_IGNORE, REPO_MARKERS, PROJECT_MARKERS;
 var init_project_root = __esm({
   "packages/server/src/project-root.ts"() {
@@ -13053,12 +13075,12 @@ function parseAwaitingYaml(text2) {
 function isAwaitingItemKind(kind) {
   return AWAITING_ITEM_KINDS.includes(kind);
 }
-function parseAwaitingDuration(value) {
+function parseAwaitingDurationRaw(value) {
   const m = AWAITING_DURATION_RE.exec(value.trim());
   if (!m) return null;
   const ms = Number(m[1]) * DURATION_UNIT_MS[m[2]];
   if (!Number.isFinite(ms) || ms <= 0) return null;
-  return Math.min(ms, AWAITING_FOR_MAX_MS);
+  return ms;
 }
 function isInterruptMarker(text2) {
   return INTERRUPT_MARKERS.includes(text2.trim());
@@ -13383,7 +13405,7 @@ function parseGithubWakeSteer(text2) {
 function frizzRoute(path) {
   return `${FRIZZ_ROUTE_PREFIX}${path.startsWith("/") ? path : `/${path}`}`;
 }
-var import_yaml, ATTACHMENT_IMAGE_EXTENSIONS, ATTACHMENT_TEXT_EXTENSIONS, ATTACHMENT_OFFICE_EXTENSIONS, ATTACHMENT_DATA_EXTENSIONS, ATTACHMENT_ARCHIVE_EXTENSIONS, ATTACHMENT_DOC_EXTENSIONS, ATTACHMENT_EXTENSIONS, ATTACHMENT_MAX_BASE64_CHARS, ATTACHMENT_MAX_BYTES, ATTACHMENT_EXT_SET, ATTACHMENT_ACCEPT, FrizzStatus, BlockMechanism, RuntimeState, Backend, CodexModel, ThreadProfileOption, ThreadAgent, SubAgentView, BgShellView, CompletionHoldOp, CompletionHold, AskOption, AskQuestion, PendingAsk, AwaitingHint, RETIRED_AWAITING_KINDS, RETIRED_LINE_RE, RETIRED_AWAITING_REPLACEMENT, AWAITING_KEY_RE, AWAITING_YAML_KEYS, AWAITING_SEQUENCE_KEYS, AWAITING_HINT_MAX, AWAITING_HINT_VALUE_MAX, AWAITING_TITLE_MAX, AWAITING_ITEM_KINDS, AWAITING_DURATION_RE, DURATION_UNIT_MS, AWAITING_FOR_MAX_MS, SnoozeUntil, SNOOZE_PROMPT_MAX, SnoozePrompt, RECURRING_PROMPT_MAX, RECURRING_MIN_INTERVAL_SECONDS, RECURRING_MAX_INTERVAL_SECONDS, RecurringPromptText, RecurringIntervalSeconds, ThreadRecurringPrompt, INTERRUPT_MARKERS, ALLDONE_SENTINEL, OPT_OUT_NOTE, OVER_QUESTION_NOTE, TIMER_PROMPT_MAX, TIMER_MAX_DELAY_SECONDS, TIMER_MAX_ARMED, TimerPromptText, SIGNOFF_NUDGE_MARKER, SIGNOFF_NUDGE_MESSAGE, PARK_CORRECTION_NAMES_LEAD, PARK_CORRECTION_RETIRED_LEAD, PARK_CORRECTION_QUESTION_LEAD, ThreadWatchKind, GithubChecksState, GithubMergeState, GithubWatchStatus, ThreadWatchView, PR_WATCH_DEFAULT_FOR_MS, PR_WATCH_MAX_ARMED, PrWatchView, AddOwnPrWatchInput, AddOwnPrWatchResult, DropOwnPrWatchInput, DropOwnPrWatchResult, OwnWatchKind, AddOwnWatchInput, OwnWatchView, AddOwnWatchResult, DropOwnWatchInput, DropOwnWatchResult, OWN_WATCH_MAX_ARMED, AskQuestionKind, ASK_MAX_DEPTH, ASK_MAX_PER_CALL, ASK_MAX_OPEN, AskedOptionSchema, AskedQuestionSchema, AskInput, RegisteredQuestionView, AskResult, UnaskInput, UnaskResult, QuestionAnswerSchema, AnswerQuestionsInput, AnswerQuestionsResult, DismissQuestionsInput, DismissQuestionsResult, BURIED_ANSWERS_HEADER, ANSWER_FOLLOW_UP_MARKER, DISMISSED_ANSWER, MarkOwnDoneInput, MarkOwnDoneResult, ListOwnPrWatchesInput, OwnPrWatchesResult, ThreadTimerView, ThreadFence, LimitWindow, LimitPause, ThreadView, BoardErrorItem, BoardSnapshot, QuotaWindow, ProviderQuota, QuotaSnapshot, ProviderAuth, AccountEmails, AuthSnapshot, AccountLogoutInput, AccountLogoutResult, AccountLoginStartInput, AccountLoginStartResult, AccountLoginStatusInput, AccountLoginStatusResult, PermissionMode, LocalFileOpener, Settings, DispatchProviderPreferences, DispatchPreferences, DispatchProfileSnapshot, SetDispatchPreferenceInput, DispatchInput, ADOPT_THREAD_MESSAGE_MAX_CHARS, AdoptThreadInput, AdoptThreadResult, AdoptSessionInput, FollowUpInput, UnqueueFollowUpInput, UnqueueFollowUpResult, DeliverQueuedNowInput, DeliverQueuedNowResult, SetThreadSnoozeInput, SetThreadRecurringPromptInput, SetOwnThreadRecurringPromptInput, SetOwnThreadRecurringPromptResult, GetOwnThreadRecurringPromptInput, OwnThreadRecurringPromptResult, SetOwnThreadTimerInput, CancelOwnThreadTimerInput, ListOwnThreadTimersInput, OwnThreadTimersResult, ThreadActivityItem, ListOwnThreadActivityInput, OwnThreadActivityResult, SetOwnThreadTimerResult, CancelOwnThreadTimerResult, SetOwnThreadStopHookInput, SetOwnThreadHeartbeatInput, ThreadPluginReloadResult, RenameThreadInput, AiRenameThreadInput, AiRenameThreadResult, SetOwnThreadTitleInput, SetOwnThreadTitleResult, SetThreadPermissionInput, SetThreadPermissionResult, ThreadProfileOptionsInput, ThreadProfileOptionsResult, ThreadSkillSource, ThreadSkill, ThreadSkillsInput, ThreadSkillsResult, SetThreadProfileInput, SetThreadProfileResult, DISPATCH_TASK_BANNER, DISPATCH_TASK_BANNER_MARKER, GITHUB_DISPATCH_UI_BOUNDARY, WAKE_TIME_HEADER_TAIL, HUMAN_GAP_FLOOR_MS, HUMAN_GAP_NOTE_TAIL, WAKE_DELIVERY_TOKEN_TAIL, WAKE_DELIVERY_TOKEN_LINE, NOISE_PREFIXES, AGENT_MESSAGE_WRAPPER, GithubWakeItem, GithubWakeSteer, WAKE_SCOPE, WAKE_REVIEW_LEAD, WAKE_BACKLOG_TAIL, WAKE_REF, WAKE_SINGLE, WAKE_MULTI_HEAD, WAKE_ITEM, WAKE_MORE, PR_WATCH_FINISHED, PR_WATCH_CI_PASSED, PR_WATCH_CI_FAILED, GithubStatus, GithubRefCard, GithubRefPreviewInput, GithubRefPreviewResult, GithubItem, GithubListInput, GithubListResult, GithubBatchInput, GithubBatchResult, BoardMeta, ServerEvent, TranscriptEdit, TranscriptTodo, TranscriptToolCall, TranscriptPart, TranscriptMessage, TranscriptPageCursor, EditedFile, TranscriptPage, TranscriptEarlierInput, SocketTranscriptSlug, SocketClientMsg, ProjectCard, PROJECT_ICON_EXTENSIONS, PROJECT_ICON_MAX_BASE64_CHARS, DirectoryPickResult, ThreadLocation, FRIZZ_ROUTE_PREFIX, DEFAULT_PORT, threadIdentityName;
+var import_yaml, ATTACHMENT_IMAGE_EXTENSIONS, ATTACHMENT_TEXT_EXTENSIONS, ATTACHMENT_OFFICE_EXTENSIONS, ATTACHMENT_DATA_EXTENSIONS, ATTACHMENT_ARCHIVE_EXTENSIONS, ATTACHMENT_DOC_EXTENSIONS, ATTACHMENT_EXTENSIONS, ATTACHMENT_MAX_BASE64_CHARS, ATTACHMENT_MAX_BYTES, ATTACHMENT_EXT_SET, ATTACHMENT_ACCEPT, FrizzStatus, BlockMechanism, RuntimeState, Backend, CodexModel, ThreadProfileOption, ThreadAgent, SubAgentView, BgShellView, CompletionHoldOp, CompletionHold, AskOption, AskQuestion, PendingAsk, AwaitingHint, RETIRED_AWAITING_KINDS, RETIRED_LINE_RE, RETIRED_AWAITING_REPLACEMENT, AWAITING_KEY_RE, AWAITING_YAML_KEYS, AWAITING_SEQUENCE_KEYS, AWAITING_HINT_MAX, AWAITING_HINT_VALUE_MAX, AWAITING_TITLE_MAX, AWAITING_ITEM_KINDS, AWAITING_DURATION_RE, DURATION_UNIT_MS, AWAITING_FOR_MAX_MS, SnoozeUntil, SNOOZE_PROMPT_MAX, SnoozePrompt, RECURRING_PROMPT_MAX, RECURRING_MIN_INTERVAL_SECONDS, RECURRING_MAX_INTERVAL_SECONDS, RecurringPromptText, RecurringIntervalSeconds, ThreadRecurringPrompt, INTERRUPT_MARKERS, ALLDONE_SENTINEL, OPT_OUT_NOTE, OVER_QUESTION_NOTE, TIMER_PROMPT_MAX, TIMER_MAX_DELAY_SECONDS, TIMER_MAX_ARMED, TimerPromptText, SIGNOFF_NUDGE_MARKER, SIGNOFF_NUDGE_MESSAGE, PARK_CORRECTION_NAMES_LEAD, PARK_CORRECTION_RETIRED_LEAD, PARK_CORRECTION_QUESTION_LEAD, ThreadWatchKind, GithubChecksState, GithubMergeState, GithubWatchStatus, ThreadWatchView, PR_WATCH_FOR_MAX_MS, PR_WATCH_DEFAULT_FOR_MS, PR_WATCH_MAX_ARMED, PrWatchView, AddOwnPrWatchInput, AddOwnPrWatchResult, DropOwnPrWatchInput, DropOwnPrWatchResult, OwnWatchKind, AddOwnWatchInput, OwnWatchView, AddOwnWatchResult, DropOwnWatchInput, DropOwnWatchResult, OWN_WATCH_MAX_ARMED, AskQuestionKind, ASK_MAX_DEPTH, AskedOptionSchema, AskedQuestionSchema, AskInput, RegisteredQuestionView, AskResult, UnaskInput, UnaskResult, QuestionAnswerSchema, AnswerQuestionsInput, AnswerQuestionsResult, DismissQuestionsInput, DismissQuestionsResult, BURIED_ANSWERS_HEADER, ANSWER_FOLLOW_UP_MARKER, DISMISSED_ANSWER, MarkOwnDoneInput, MarkOwnDoneResult, ListOwnPrWatchesInput, OwnPrWatchesResult, ThreadTimerView, ThreadFence, LimitWindow, LimitPause, ThreadView, BoardErrorItem, BoardSnapshot, QuotaWindow, ProviderQuota, QuotaSnapshot, ProviderAuth, AccountEmails, AuthSnapshot, AccountLogoutInput, AccountLogoutResult, AccountLoginStartInput, AccountLoginStartResult, AccountLoginStatusInput, AccountLoginStatusResult, PermissionMode, LocalFileOpener, Settings, DispatchProviderPreferences, DispatchPreferences, DispatchProfileSnapshot, SetDispatchPreferenceInput, DispatchInput, ADOPT_THREAD_MESSAGE_MAX_CHARS, AdoptThreadInput, AdoptThreadResult, AdoptSessionInput, FollowUpInput, UnqueueFollowUpInput, UnqueueFollowUpResult, DeliverQueuedNowInput, DeliverQueuedNowResult, SetThreadSnoozeInput, SetThreadPinnedInput, SetThreadRecurringPromptInput, SetOwnThreadRecurringPromptInput, SetOwnThreadRecurringPromptResult, GetOwnThreadRecurringPromptInput, OwnThreadRecurringPromptResult, SetOwnThreadTimerInput, CancelOwnThreadTimerInput, ListOwnThreadTimersInput, OwnThreadTimersResult, ThreadActivityItem, ListOwnThreadActivityInput, OwnThreadActivityResult, SetOwnThreadTimerResult, CancelOwnThreadTimerResult, SetOwnThreadStopHookInput, SetOwnThreadHeartbeatInput, ThreadPluginReloadResult, RenameThreadInput, AiRenameThreadInput, AiRenameThreadResult, SetOwnThreadTitleInput, SetOwnThreadTitleResult, SetThreadPermissionInput, SetThreadPermissionResult, ThreadProfileOptionsInput, ThreadProfileOptionsResult, ThreadSkillSource, ThreadSkill, ThreadSkillsInput, ThreadSkillsResult, SetThreadProfileInput, SetThreadProfileResult, DISPATCH_TASK_BANNER, DISPATCH_TASK_BANNER_MARKER, GITHUB_DISPATCH_UI_BOUNDARY, WAKE_TIME_HEADER_TAIL, HUMAN_GAP_FLOOR_MS, HUMAN_GAP_NOTE_TAIL, WAKE_DELIVERY_TOKEN_TAIL, WAKE_DELIVERY_TOKEN_LINE, NOISE_PREFIXES, AGENT_MESSAGE_WRAPPER, GithubWakeItem, GithubWakeSteer, WAKE_SCOPE, WAKE_REVIEW_LEAD, WAKE_BACKLOG_TAIL, WAKE_REF, WAKE_SINGLE, WAKE_MULTI_HEAD, WAKE_ITEM, WAKE_MORE, PR_WATCH_FINISHED, PR_WATCH_CI_PASSED, PR_WATCH_CI_FAILED, GithubStatus, GithubRefCard, GithubRefPreviewInput, GithubRefPreviewResult, GithubItem, GithubListInput, GithubListResult, GithubBatchInput, GithubBatchResult, BoardMeta, ServerEvent, TranscriptEdit, TranscriptTodo, TranscriptToolCall, TranscriptPart, TranscriptMessage, TranscriptPageCursor, EditedFile, TranscriptPage, TranscriptEarlierInput, SocketTranscriptSlug, SocketFilePath, SocketTranscriptClientMsg, SocketFileClientMsg, SocketClientMsg, ProjectCard, PROJECT_ICON_EXTENSIONS, PROJECT_ICON_MAX_BASE64_CHARS, DirectoryPickResult, ThreadLocation, FRIZZ_ROUTE_PREFIX, DEFAULT_PORT, threadIdentityName;
 var init_src = __esm({
   "packages/shared/src/index.ts"() {
     "use strict";
@@ -13663,8 +13685,13 @@ var init_src = __esm({
       subAgentCount: external_exports.number().default(0),
       // total live sub-agents (≥ subAgents.length)
       bgShells: external_exports.array(CompletionHoldOp).default([]),
-      bgShellCount: external_exports.number().default(0)
+      bgShellCount: external_exports.number().default(0),
       // total live background shells (≥ bgShells.length)
+      // The worker is DEAD and its recorded turn never ended — cut off by a reboot, a signal or a crash
+      // mid-tool-call (router.cutOffHold). Nothing is running, so nothing will be killed; the hold exists
+      // because the thread is not finished and Done would say it was. Optional rather than defaulted so it
+      // is absent (⇒ false) on every hold that is not this one, and a pre-change client reads them unchanged.
+      cutOff: external_exports.boolean().optional()
     });
     AskOption = external_exports.object({
       label: external_exports.string(),
@@ -13867,7 +13894,8 @@ var init_src = __esm({
        *  known, so a timer row always carries this. */
       timer: external_exports.object({ fireAt: external_exports.string(), prompt: external_exports.string() }).strict().optional()
     }).strict();
-    PR_WATCH_DEFAULT_FOR_MS = 6 * 60 * 60 * 1e3;
+    PR_WATCH_FOR_MAX_MS = 365 * 24 * 60 * 60 * 1e3;
+    PR_WATCH_DEFAULT_FOR_MS = 30 * 24 * 60 * 60 * 1e3;
     PR_WATCH_MAX_ARMED = 32;
     PrWatchView = external_exports.object({
       id: external_exports.string(),
@@ -13883,13 +13911,18 @@ var init_src = __esm({
       /** `owner/repo#123` or a PR URL. Parsed server-side; an unparseable ref is refused rather than stored,
        *  because a watcher that can never fire is worse than none — the worker rests believing it is covered. */
       target: external_exports.string().trim().min(1).max(200),
-      /** How long to watch, as a DURATION (`30m`, `2h`, `3d` — parseAwaitingDuration).
+      /** How long to watch, as a DURATION (`2h`, `3d`, `180d` — parseAwaitingDurationRaw, capped at
+       *  PR_WATCH_FOR_MAX_MS).
        *
        *  A PR nobody ever reviews would otherwise be polled forever, and a thread parked on it would wait
        *  forever with it — the same unbounded wait the awaiting fence's `for:` closes, one level down. A
        *  duration rather than an instant for the same reason it is one there: it cannot be written in the
        *  past (maintainer 2026-08-15, asking for it explicitly).
        *
+       *  BOUNDED IS NOT THE SAME AS SHORT, and conflating them is what made this field a noise source. The
+       *  bound exists so a forgotten watcher stops polling eventually, which a year satisfies exactly as
+       *  well as a day — and a day spent it against every external PR, which does not move on that clock.
+       *
        *  REQUIRED BY THE TOOL, OPTIONAL ON THE WIRE, and the asymmetry is deliberate. A worker's MCP server
        *  outlives every frizz restart, so a session dispatched before this existed still holds a binary that
        *  cannot send it — and making the RPC reject that would break `watch_pr` outright for every thread
@@ -13904,6 +13937,12 @@ var init_src = __esm({
       /** True when this exact PR was ALREADY watched by this thread, so the call registered nothing new.
        *  Re-registering after a compaction is the common case, and a duplicate would double every wake. */
       alreadyArmed: external_exports.boolean(),
+      /** When this watcher runs out. Read back so the worker sees the duration it ACTUALLY got rather than
+       *  the one it asked for — on a re-registration that is the original expiry, which the call left alone. */
+      expiresAt: external_exports.string(),
+      /** The `for:` the worker wrote, present ONLY when it exceeded the ceiling and was capped. A clamp
+       *  nobody is told about is a worker resting on a year of coverage it does not have. */
+      clampedFrom: external_exports.string().optional(),
       watches: external_exports.array(PrWatchView)
     }).strict();
     DropOwnPrWatchInput = external_exports.object({
@@ -13930,7 +13969,11 @@ var init_src = __esm({
        *  that is both the stronger check and the one that catches the real mistake: naming a sub-agent under
        *  `kind: "shell"`, which is what put two sub-agents under a "Background shells" heading on 2026-08-26. */
       target: external_exports.string().trim().min(1).max(200),
-      /** REQUIRED, and a DURATION (`30m`, `2h`, `3d` — parseAwaitingDuration, capped at 24h).
+      /** REQUIRED, and a DURATION (`30m`, `2h`, `3d` — parseAwaitingDurationRaw, capped at 24h).
+       *
+       *  STILL A DAY, where a PR watcher now gets a year: this names a shell or a sub-agent, which lives
+       *  inside the session that launched it, so a wait standing longer than a day is one whose target is
+       *  almost certainly already gone.
        *
        *  No default and no wire-level optionality, unlike `AddOwnPrWatchInput.for`: that field is optional
        *  only to keep working for sessions dispatched before it existed, and this RPC has no such sessions.
@@ -13955,6 +13998,10 @@ var init_src = __esm({
       /** True when this exact (kind, target) was already watched, so the call registered nothing new and the
        *  existing expiry stands. Re-registering after a wake or a compaction is the common, correct case. */
       alreadyArmed: external_exports.boolean(),
+      /** The `for:` the worker wrote, present ONLY when it exceeded the ceiling and was capped — the twin of
+       *  `AddOwnPrWatchResult.clampedFrom`, for the same reason: a silent clamp is a worker resting on
+       *  coverage it does not have. */
+      clampedFrom: external_exports.string().optional(),
       watches: external_exports.array(OwnWatchView)
     }).strict();
     DropOwnWatchInput = external_exports.object({
@@ -13968,25 +14015,38 @@ var init_src = __esm({
     OWN_WATCH_MAX_ARMED = 24;
     AskQuestionKind = external_exports.enum(["question", "multi"]);
     ASK_MAX_DEPTH = 3;
-    ASK_MAX_PER_CALL = 4;
-    ASK_MAX_OPEN = 12;
     AskedOptionSchema = external_exports.lazy(() => external_exports.object({
-      label: external_exports.string().trim().min(1).max(120),
-      description: external_exports.string().trim().max(400).optional(),
+      // 400, not the 120 it launched with (2026-09-03): a label is a chip line, but "Post the drafted
+      // comment as written" plus its qualifier runs long, and the fence has no cap at all. The answer's
+      // `chosen` carries labels, so its per-item cap matches this one.
+      label: external_exports.string().trim().min(1).max(400),
+      // 20000, not the 4000 the retired `preview` had (2026-09-03): a description is allowed to BE the rich
+      // body — a diff, a drafted comment, a table — and a real diff exceeds 4000.
+      description: external_exports.string().trim().max(2e4).optional(),
       recommended: external_exports.boolean().optional(),
       preview: external_exports.string().max(4e3).optional(),
-      followUps: external_exports.array(AskedQuestionSchema).max(ASK_MAX_PER_CALL).optional()
+      // No count cap, like `options` (2026-09-03); the tree is bounded by ASK_MAX_DEPTH instead.
+      followUps: external_exports.array(AskedQuestionSchema).optional()
     }).strict());
     AskedQuestionSchema = external_exports.lazy(() => external_exports.object({
-      question: external_exports.string().trim().min(1).max(600),
+      // 4000, not the 600 it launched with (2026-09-03): this field is the whole card context — everything
+      // the human needs to answer cold — and a question that carries its own evidence needs the room. The
+      // answer restates it, so QuestionAnswerSchema's cap matches.
+      question: external_exports.string().trim().min(1).max(4e3),
       header: external_exports.string().trim().max(24).optional(),
       kind: AskQuestionKind,
       danger: external_exports.boolean().optional(),
-      options: external_exports.array(AskedOptionSchema).max(8).optional()
+      // UNBOUNDED, deliberately. This carried `.max(8)` from launch until 2026-09-03, when the maintainer
+      // asked for the cap to go ("allow arbitrary numbers of options"): a `multi` over a long list — which
+      // gates to run, which of twenty findings to act on — is a real shape, and the card letters past 26
+      // (`AA.`) already. The count is the worker's to choose; the answer's `chosen` is unbounded to match.
+      options: external_exports.array(AskedOptionSchema).optional()
     }).strict());
     AskInput = external_exports.object({
       slug: ThreadSlug,
-      questions: external_exports.array(AskedQuestionSchema).min(1).max(ASK_MAX_PER_CALL)
+      // No cap on the count (four until 2026-09-03): the tool's own text says "several at once is one
+      // call — register them together", and a cap here told a worker with six to batch and then refused it.
+      questions: external_exports.array(AskedQuestionSchema).min(1)
     }).strict();
     RegisteredQuestionView = external_exports.object({
       /** Minted by frizz. The worker never chose it, which is why an answer RESTATES the question text —
@@ -14010,17 +14070,19 @@ var init_src = __esm({
     }).strict();
     QuestionAnswerSchema = external_exports.lazy(() => external_exports.object({
       questionId: external_exports.string().min(1).max(64),
-      question: external_exports.string().min(1).max(600),
-      chosen: external_exports.array(external_exports.string().max(200)).max(8),
+      question: external_exports.string().min(1).max(4e3),
+      // No count cap: a `multi` may carry any number of options (see AskedQuestionSchema), and the human
+      // may pick every one of them. The per-item cap is the option label's.
+      chosen: external_exports.array(external_exports.string().max(400)),
       text: external_exports.string().max(8e3).optional(),
-      followUps: external_exports.array(QuestionAnswerSchema).max(ASK_MAX_PER_CALL).optional()
+      followUps: external_exports.array(QuestionAnswerSchema).optional()
     }).strict());
     AnswerQuestionsInput = external_exports.object({
       slug: ThreadSlug,
       /** SUBMITTED AS A UNIT. The card sends whatever was answered in one call, because a per-question send
        *  would half-wake a turn: the worker would come back to a payload it cannot act on and would have to
        *  ask again for the rest. */
-      answers: external_exports.array(QuestionAnswerSchema).min(1).max(ASK_MAX_OPEN)
+      answers: external_exports.array(QuestionAnswerSchema).min(1)
     }).strict();
     AnswerQuestionsResult = external_exports.object({
       /** The ids that were open and are now answered. An id that was already settled is silently absent
@@ -14030,7 +14092,7 @@ var init_src = __esm({
     }).strict();
     DismissQuestionsInput = external_exports.object({
       slug: ThreadSlug,
-      ids: external_exports.array(external_exports.string().min(1).max(64)).min(1).max(ASK_MAX_OPEN)
+      ids: external_exports.array(external_exports.string().min(1).max(64)).min(1)
     }).strict();
     DismissQuestionsResult = external_exports.object({
       dismissed: external_exports.array(external_exports.string()),
@@ -14213,6 +14275,11 @@ var init_src = __esm({
       // AUTO-bump (the scheduler resumes the agent with exactly this text) rather than a reminder, which is
       // the distinction the held row's tooltip renders. Absent ⇒ the card merely re-surfaces.
       snoozePrompt: external_exports.string().optional(),
+      // The instant the human PINNED this thread (absent = not pinned). A pinned thread leaves the rail's
+      // band system entirely — Rested/Active/Snoozed/Done — and holds the pinned band at the very top, in
+      // this instant's order. Lifecycle metadata like the snooze: written only by the pin/unpin verb, and
+      // it outranks every derived state (a pinned thread that finishes stays pinned).
+      pinnedAt: external_exports.string().optional(),
       /** The EVENT snooze on the resting card is armed for this exact rest — the human has said "hide this
        *  until something reports". Distinct from `snoozedUntil`, which is a wall-clock park on the whole
        *  thread: this one has no deadline and clears itself when the thread comes to a NEW rest.
@@ -14458,6 +14525,12 @@ var init_src = __esm({
       // Code caps to the model's real window. Optional so an old blob parses; defaultSettings pins 500_000
       // (maintainer 2026-08-26: "a default compaction window of 500k by default").
       autoCompactWindow: external_exports.number().int().positive().optional(),
+      // The prompt-cache tier a NEW Claude worker writes to. "auto" leaves the CLI's own choice (1h on a
+      // subscription); "5m" and "1h" reach the worker as CLAUDE_CODE_PROMPT_CACHE_TTL (and the sub-agent
+      // twin). The 1h tier bills a cache write at 2x input against 1.25x for 5m; on 2026-09-03 cache
+      // writes were 51% of a day's spend while the entries were invalidated every 15–30 minutes anyway
+      // (see claudePromptCacheEnv). Optional so an old blob parses; defaultSettings pins "auto".
+      promptCacheTtl: external_exports.enum(["auto", "5m", "1h"]).optional(),
       // The GitHub batch-dispatch prompt template (the picker's per-item worker prompt). Optional: when
       // unset OR blank the server falls back to its exported DEFAULT_GITHUB_PROMPT. Substitution tokens
       // the server fills: {repo} {n} {title} {url} {labels} {body}. The leading `THREAD: <slug>` tag is
@@ -14596,6 +14669,11 @@ var init_src = __esm({
       // can never leave an armed prompt behind.
       prompt: SnoozePrompt.nullable().optional()
     }).strict();
+    SetThreadPinnedInput = external_exports.object({
+      slug: ThreadSlug,
+      sessionId: external_exports.string().min(1),
+      pinned: external_exports.boolean()
+    }).strict();
     SetThreadRecurringPromptInput = external_exports.object({
       slug: ThreadSlug,
       sessionId: external_exports.string().min(1),
@@ -15287,10 +15365,16 @@ ${DISPATCH_TASK_BANNER}
       cursor: TranscriptPageCursor
     }).strict();
     SocketTranscriptSlug = ThreadSlug;
-    SocketClientMsg = external_exports.discriminatedUnion("t", [
+    SocketFilePath = external_exports.string().min(1).max(4096);
+    SocketTranscriptClientMsg = external_exports.discriminatedUnion("t", [
       external_exports.object({ t: external_exports.literal("sub"), topic: external_exports.literal("transcript"), slug: SocketTranscriptSlug }).strict(),
       external_exports.object({ t: external_exports.literal("unsub"), topic: external_exports.literal("transcript"), slug: SocketTranscriptSlug }).strict()
     ]);
+    SocketFileClientMsg = external_exports.discriminatedUnion("t", [
+      external_exports.object({ t: external_exports.literal("sub"), topic: external_exports.literal("file"), path: SocketFilePath }).strict(),
+      external_exports.object({ t: external_exports.literal("unsub"), topic: external_exports.literal("file"), path: SocketFilePath }).strict()
+    ]);
+    SocketClientMsg = external_exports.union([SocketTranscriptClientMsg, SocketFileClientMsg]);
     ProjectCard = external_exports.object({
       id: external_exports.string(),
       slug: external_exports.string(),
@@ -16818,7 +16902,7 @@ function createShutdownBarrier(options) {
     void drainPromise.catch(() => void 0);
     return drainPromise;
   };
-  const close = () => {
+  const close2 = () => {
     if (closePromise) return closePromise;
     closePromise = deadline(beginDrain(), options.timeoutMs).catch((error) => {
       if (error instanceof ShutdownTimeoutError) {
@@ -16832,7 +16916,7 @@ function createShutdownBarrier(options) {
     get closing() {
       return closing;
     },
-    close,
+    close: close2,
     whenDrained: beginDrain
   };
 }
@@ -16912,13 +16996,13 @@ function linkLatest(dir, target) {
   }
 }
 function pruneRunLogs(dir, keep = RETAINED_RUNS, days = RETAINED_DAYS, now = Date.now()) {
-  let entries;
+  let entries2;
   try {
-    entries = readdirSync2(dir).filter((name) => name.endsWith(".log") && name !== "latest.log");
+    entries2 = readdirSync2(dir).filter((name) => name.endsWith(".log") && name !== "latest.log");
   } catch {
     return;
   }
-  const dated = entries.map((name) => {
+  const dated = entries2.map((name) => {
     try {
       return { name, at: statSync3(join8(dir, name)).mtimeMs };
     } catch {
@@ -18549,6 +18633,12 @@ function slugMintedFromTitle(slug, title) {
 }
 function ensureStorageSchema(db) {
   db.exec(STORAGE_SCHEMA);
+  for (const column of ["pinned_at TEXT"]) {
+    try {
+      db.exec(`ALTER TABLE session ADD COLUMN ${column}`);
+    } catch {
+    }
+  }
 }
 function createStorage(source, projectId) {
   const owned = typeof source === "string";
@@ -18813,6 +18903,7 @@ function createStorage(source, projectId) {
     WHERE project_id = @project_id AND slug = ? AND session_id = ? AND runtime_generation = ?
   `);
   const snoozedUntilStmt = scope.prepare("UPDATE session SET snoozed_until = ?, snooze_prompt = ? WHERE project_id = @project_id AND slug = ?");
+  const pinnedAtStmt = scope.prepare("UPDATE session SET pinned_at = ? WHERE project_id = @project_id AND slug = ?");
   const snoozedUntilIfCurrentStmt = scope.prepare(`
     UPDATE session SET snoozed_until = ?
     WHERE project_id = @project_id AND slug = ? AND session_id = ? AND runtime_generation = ?
@@ -18995,7 +19086,7 @@ function createStorage(source, projectId) {
     WHERE project_id = @project_id AND id = ? AND state = 'open'
   `);
   const undeliveredSettlementsStmt = scope.prepare(
-    "SELECT * FROM thread_question WHERE project_id = @project_id AND state IN ('answered', 'dismissed') AND delivered = 0 ORDER BY settled_at, id"
+    "SELECT * FROM thread_question WHERE project_id = @project_id AND state IN ('answered', 'dismissed') AND delivered = 0 ORDER BY asked_at, rowid"
   );
   const markSettlementDeliveredStmt = scope.prepare(
     "UPDATE thread_question SET delivered = 1 WHERE project_id = @project_id AND id = ? AND delivered = 0"
@@ -19168,6 +19259,7 @@ function createStorage(source, projectId) {
     SET model = ?, effort = ?, profile_revision = profile_revision + 1
     WHERE project_id = @project_id AND slug = ? AND session_id = ? AND runtime_generation = ?
       AND runtime_control IS NULL AND profile_pending_model IS NULL AND profile_pending_effort IS NULL
+      AND (profile_set_at IS NULL OR backend = 'codex')
       AND (model IS NOT ? OR effort IS NOT ?)
   `);
   const beginRuntimeGenerationStmt = scope.prepare(`
@@ -19498,6 +19590,7 @@ function createStorage(source, projectId) {
     // never be written without a deadline to fire it.
     setSnoozedUntil: (slug, until, prompt = null) => void snoozedUntilStmt.run(until, until === null ? null : prompt, slug),
     setSnoozedUntilIfCurrent: (slug, sessionId, generation, until) => snoozedUntilIfCurrentStmt.run(until, slug, sessionId, generation).changes === 1,
+    setPinnedAt: (slug, at) => void pinnedAtStmt.run(at, slug),
     setBgSnoozeRestedAtIfCurrent: (slug, sessionId, generation, restedAt) => bgSnoozeRestedAtIfCurrentStmt.run(restedAt, slug, sessionId, generation).changes === 1,
     setRecurringPromptIfCurrent: (slug, sessionId, generation, write) => recurringStmt.run(...recurringArgs(write), slug, sessionId, generation).changes === 1,
     setRecurringPromptBySlug: (slug, write) => recurringBySlugStmt.run(...recurringArgs(write), slug).changes === 1,
@@ -19505,7 +19598,7 @@ function createStorage(source, projectId) {
     resetSignoffNudges: (slug) => void resetNudgesStmt.run(slug),
     countParkBump: (slug, anchor) => void countParkBumpStmt.run(anchor, slug),
     resetParkBumps: (slug) => void resetParkBumpsStmt.run(slug),
-    armPrWatch: (watch) => void armPrWatchStmt.run(watch),
+    armPrWatch: (watch2) => void armPrWatchStmt.run(watch2),
     listPrWatches: (slug, opts) => (opts?.armedOnly ? armedPrWatchesBySlugStmt : prWatchesBySlugStmt).all(slug),
     getPrWatch: (id) => prWatchByIdStmt.get(id),
     armedPrWatches: () => armedPrWatchesStmt.all(),
@@ -19782,6 +19875,7 @@ var init_storage = __esm({
       snoozed_until TEXT,
       snooze_prompt TEXT,
       bg_snooze_rested_at TEXT,
+      pinned_at   TEXT,
       meta        TEXT,
       seen_at     TEXT,
       transcript_id TEXT,
@@ -20196,6 +20290,9 @@ var init_settings = __esm({
       // 500K tokens: half the 1M window every Claude worker is dispatched with. See the schema for why a
       // worker left to compact at 1M is the biggest single reason a Frizz thread out-spends the TUI.
       autoCompactWindow: 5e5,
+      // "auto" = the CLI's own tier (1h on a subscription). See the schema and claudePromptCacheEnv for
+      // when "5m" is the cheaper choice.
+      promptCacheTtl: "auto",
       // Hidden until asked for — see the schema for why.
       projectRail: false
     });
@@ -20345,13 +20442,13 @@ function discoverTranscriptDir(logDir, sessionId, memo3 = strandedLogDirs) {
   let best;
   for (const dir of memo3) best = better(best, dir);
   if (best) return best.dir;
-  let entries;
+  let entries2;
   try {
-    entries = readdirSync3(dirname7(logDir), { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+    entries2 = readdirSync3(dirname7(logDir), { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
   } catch {
     return void 0;
   }
-  for (const entry of entries) best = better(best, join11(dirname7(logDir), entry));
+  for (const entry of entries2) best = better(best, join11(dirname7(logDir), entry));
   if (!best) return void 0;
   memo3.add(best.dir);
   return best.dir;
@@ -21272,10 +21369,10 @@ function boundedJson(value, label, state, depth) {
     return value.map((entry, index) => boundedJson(entry, `${label}[${index}]`, state, depth + 1));
   }
   if (!value || typeof value !== "object") throw new ClaudeAgentSdkProtocolError(`${label} contains a non-JSON value`);
-  const entries = Object.entries(value);
-  if (entries.length > 256) throw new ClaudeAgentSdkProtocolError(`${label} contains too many object fields`);
+  const entries2 = Object.entries(value);
+  if (entries2.length > 256) throw new ClaudeAgentSdkProtocolError(`${label} contains too many object fields`);
   const output = {};
-  for (const [key, entry] of entries) {
+  for (const [key, entry] of entries2) {
     if (RESERVED_KEYS.has(key) || utf8Bytes(key) > 256 || UNSAFE_TEXT2.test(key)) {
       UNSAFE_TEXT2.lastIndex = 0;
       throw new ClaudeAgentSdkProtocolError(`${label} contains an invalid object key`);
@@ -21414,10 +21511,10 @@ var init_claude_broker_diagnostics = __esm({
 // packages/server/src/detached-daemons.ts
 import { existsSync as existsSync4 } from "node:fs";
 import { fileURLToPath } from "node:url";
-function resolveDetachedDaemonEntry(moduleUrl, basename13) {
-  const candidates = [`./${basename13}.js`, `./${basename13}.ts`].map((rel) => fileURLToPath(new URL(rel, moduleUrl)));
+function resolveDetachedDaemonEntry(moduleUrl, basename14) {
+  const candidates = [`./${basename14}.js`, `./${basename14}.ts`].map((rel) => fileURLToPath(new URL(rel, moduleUrl)));
   const found = candidates.find((path) => existsSync4(path));
-  if (!found) throw new Error(`frizz is missing the ${basename13} entry \u2014 looked for ${candidates.join(" and ")}`);
+  if (!found) throw new Error(`frizz is missing the ${basename14} entry \u2014 looked for ${candidates.join(" and ")}`);
   return found;
 }
 var init_detached_daemons = __esm({
@@ -22537,8 +22634,8 @@ function createTailStateCache(scope, schema = foldSchemaDigest()) {
       }
       return map;
     },
-    put(entries) {
-      if (!usable || !upsert || entries.length === 0) return;
+    put(entries2) {
+      if (!usable || !upsert || entries2.length === 0) return;
       try {
         const write = db.transaction((batch) => {
           for (const entry of batch) {
@@ -22559,7 +22656,7 @@ function createTailStateCache(scope, schema = foldSchemaDigest()) {
             });
           }
         });
-        write(entries);
+        write(entries2);
       } catch {
       }
     },
@@ -24132,7 +24229,7 @@ ${ask}`;
       }
     }
     if (cacheDirty.size === 0) return;
-    const entries = [];
+    const entries2 = [];
     try {
       for (const key of cacheDirty) {
         const foreign = key.startsWith("foreign:");
@@ -24141,12 +24238,12 @@ ${ask}`;
         const row = foreign ? null : deps.storage.getSession(key) ?? null;
         if (!foreign && !row) continue;
         const entry = cacheSnapshot(state, row);
-        if (entry) entries.push(entry);
+        if (entry) entries2.push(entry);
       }
     } catch {
     }
     cacheDirty.clear();
-    tailCache.put(entries);
+    tailCache.put(entries2);
   }
   function consume(state, backend, onLine) {
     let size;
@@ -25140,9 +25237,9 @@ function stringifyOutput(output) {
 }
 function collectRollouts(dir, out, budget) {
   if (budget.n <= 0) return;
-  const entries = safeReaddir(dir);
-  const dirs = entries.filter((e) => e.isDirectory()).sort(descByName);
-  const files = entries.filter((e) => e.isFile() && e.name.startsWith("rollout-") && e.name.endsWith(".jsonl")).sort(descByName);
+  const entries2 = safeReaddir(dir);
+  const dirs = entries2.filter((e) => e.isDirectory()).sort(descByName);
+  const files = entries2.filter((e) => e.isFile() && e.name.startsWith("rollout-") && e.name.endsWith(".jsonl")).sort(descByName);
   for (const d of dirs) {
     if (budget.n <= 0) return;
     collectRollouts(join19(dir, d.name), out, budget);
@@ -28715,7 +28812,7 @@ var require_stream = __commonJS({
         terminateOnDestroy = false;
         duplex.destroy(err);
       });
-      ws.once("close", function close() {
+      ws.once("close", function close2() {
         if (duplex.destroyed) return;
         duplex.push(null);
       });
@@ -28730,7 +28827,7 @@ var require_stream = __commonJS({
           called = true;
           callback(err2);
         });
-        ws.once("close", function close() {
+        ws.once("close", function close2() {
           if (!called) callback(err);
           process.nextTick(emitClose, duplex);
         });
@@ -29262,13 +29359,18 @@ function claudeCompactionEnv(settings) {
   if (window === void 0 || !Number.isInteger(window) || window <= 0) return {};
   return { [CLAUDE_AUTO_COMPACT_WINDOW_ENV]: String(window) };
 }
+function claudePromptCacheEnv(settings) {
+  const ttl = settings?.promptCacheTtl;
+  if (ttl !== "5m" && ttl !== "1h") return {};
+  return { [CLAUDE_PROMPT_CACHE_TTL_ENV]: ttl, [CLAUDE_SUBAGENT_PROMPT_CACHE_TTL_ENV]: ttl };
+}
 function claudeCompactionWindowOf(env) {
   const raw2 = env?.[CLAUDE_AUTO_COMPACT_WINDOW_ENV];
   if (raw2 === void 0) return void 0;
   const window = Number(raw2);
   return Number.isInteger(window) && window > 0 ? window : void 0;
 }
-var FRIZZ_MCP, WORKER_MAX_WEB_SEARCHES, WORKER_MAX_SUBAGENTS, WORKER_MAX_CONCURRENT_SUBAGENTS, CLAUDE_WORKER_ENV, CLAUDE_AUTO_COMPACT_WINDOW_ENV, WORKER_DISALLOWED_TOOLS;
+var FRIZZ_MCP, WORKER_MAX_WEB_SEARCHES, WORKER_MAX_SUBAGENTS, WORKER_MAX_CONCURRENT_SUBAGENTS, CLAUDE_WORKER_ENV, CLAUDE_AUTO_COMPACT_WINDOW_ENV, CLAUDE_PROMPT_CACHE_TTL_ENV, CLAUDE_SUBAGENT_PROMPT_CACHE_TTL_ENV, WORKER_DISALLOWED_TOOLS;
 var init_types2 = __esm({
   "packages/server/src/backend/types.ts"() {
     "use strict";
@@ -29286,6 +29388,8 @@ var init_types2 = __esm({
       BASH_MAX_TIMEOUT_MS: String(24 * 60 * 60 * 1e3)
     };
     CLAUDE_AUTO_COMPACT_WINDOW_ENV = "CLAUDE_CODE_AUTO_COMPACT_WINDOW";
+    CLAUDE_PROMPT_CACHE_TTL_ENV = "CLAUDE_CODE_PROMPT_CACHE_TTL";
+    CLAUDE_SUBAGENT_PROMPT_CACHE_TTL_ENV = "CLAUDE_CODE_SUBAGENT_PROMPT_CACHE_TTL";
     WORKER_DISALLOWED_TOOLS = ["AskUserQuestion"];
   }
 });
@@ -29294,18 +29398,18 @@ var init_types2 = __esm({
 function tomlString(value) {
   return JSON.stringify(value);
 }
-function inlineTable(entries) {
-  return `{${entries.map(([k, v]) => `${k}=${v}`).join(",")}}`;
+function inlineTable(entries2) {
+  return `{${entries2.map(([k, v]) => `${k}=${v}`).join(",")}}`;
 }
 function serverTable(command, args, env) {
-  const entries = [
+  const entries2 = [
     ["command", tomlString(command)],
     ["args", `[${args.map(tomlString).join(",")}]`]
   ];
   if (env && Object.keys(env).length > 0) {
-    entries.push(["env", inlineTable(Object.entries(env).map(([k, v]) => [k, tomlString(v)]))]);
+    entries2.push(["env", inlineTable(Object.entries(env).map(([k, v]) => [k, tomlString(v)]))]);
   }
-  return inlineTable(entries);
+  return inlineTable(entries2);
 }
 function codexMcpConfigArgs(frizzMcp, nodeBin = process.execPath) {
   const args = [];
@@ -30413,10 +30517,10 @@ function mcpFields(raw2) {
   if (schema.type !== "object" || schema.properties === null || typeof schema.properties !== "object" || Array.isArray(schema.properties)) {
     throw new RpcProtocolError(-32602, "MCP elicitation schema must describe object properties");
   }
-  const entries = Object.entries(schema.properties).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0);
-  if (entries.length > 32) throw new RpcProtocolError(-32602, "MCP elicitation has too many fields");
+  const entries2 = Object.entries(schema.properties).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0);
+  if (entries2.length > 32) throw new RpcProtocolError(-32602, "MCP elicitation has too many fields");
   const required = new Set(Array.isArray(schema.required) ? schema.required.filter((value) => typeof value === "string") : []);
-  return entries.map(([id, field]) => mcpField(id, field, required.has(id)));
+  return entries2.map(([id, field]) => mcpField(id, field, required.has(id)));
 }
 function userInputFields(questions) {
   return questions.map((question) => {
@@ -32841,14 +32945,14 @@ function sessionsDir2(codexHome) {
 }
 function newestRollouts(dir, out, budget) {
   if (budget.n <= 0) return;
-  let entries;
+  let entries2;
   try {
-    entries = readdirSync7(dir, { withFileTypes: true });
+    entries2 = readdirSync7(dir, { withFileTypes: true });
   } catch {
     return;
   }
-  const dirs = entries.filter((e) => e.isDirectory()).map((e) => e.name).sort(descByName2);
-  const files = entries.filter((e) => e.isFile() && e.name.startsWith("rollout-") && e.name.endsWith(".jsonl")).map((e) => e.name).sort(descByName2);
+  const dirs = entries2.filter((e) => e.isDirectory()).map((e) => e.name).sort(descByName2);
+  const files = entries2.filter((e) => e.isFile() && e.name.startsWith("rollout-") && e.name.endsWith(".jsonl")).map((e) => e.name).sort(descByName2);
   for (const d of dirs) {
     if (budget.n <= 0) return;
     newestRollouts(join22(dir, d), out, budget);
@@ -33607,7 +33711,7 @@ function readAwaitingPark(hints) {
     if (isAwaitingItemKind(h.kind)) {
       if (value) items.push({ kind: h.kind, value });
     } else if (h.kind === "for") {
-      forMs = parseAwaitingDuration(value);
+      forMs = parseAwaitingDurationRaw(value);
     }
   }
   return { items, forMs };
@@ -33625,9 +33729,13 @@ function parkIsHonoured(park, live) {
   if (park.forMs === null) return false;
   return unaccountedItems(park.items, live).length === 0;
 }
+function parkForMaxMs(park) {
+  if (park.items.length === 0) return AWAITING_FOR_MAX_MS;
+  return park.items.every((i) => i.kind === "pr") ? PR_WATCH_FOR_MAX_MS : AWAITING_FOR_MAX_MS;
+}
 function parkExpiresAt(park, fenceAtMs) {
   if (park.forMs === null || !Number.isFinite(fenceAtMs)) return null;
-  return fenceAtMs + Math.min(park.forMs, AWAITING_FOR_MAX_MS);
+  return fenceAtMs + Math.min(park.forMs, parkForMaxMs(park));
 }
 function readGithubStatusBook(raw2) {
   if (!raw2 || typeof raw2 !== "object" || Array.isArray(raw2)) return {};
@@ -33657,18 +33765,148 @@ var init_awaiting = __esm({
   }
 });
 
+// packages/server/src/backend/project-mcp-servers.ts
+import { readFileSync as readFileSync16 } from "node:fs";
+import { homedir as homedir10 } from "node:os";
+import { join as join25 } from "node:path";
+function readJsonObject(path) {
+  try {
+    const parsed = JSON.parse(readFileSync16(path, "utf8"));
+    return parsed !== null && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function objectField(source, key) {
+  const value = source?.[key];
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function stringList(source, key) {
+  const value = source?.[key];
+  return Array.isArray(value) ? value.filter((entry) => typeof entry === "string") : [];
+}
+function stringMap(value) {
+  if (value === null || typeof value !== "object" || Array.isArray(value)) return void 0;
+  const out = {};
+  for (const [key, entry] of Object.entries(value)) {
+    if (typeof entry === "string") out[key] = entry;
+  }
+  return out;
+}
+function expandMcpEnvRefs(value, env) {
+  let unresolved = false;
+  const out = value.replace(ENV_REF, (_match, name, fallback) => {
+    const resolved = env[name];
+    if (resolved !== void 0) return resolved;
+    if (fallback !== void 0) return fallback;
+    unresolved = true;
+    return "";
+  });
+  return unresolved ? void 0 : out;
+}
+function expandMap(map, env) {
+  if (!map) return void 0;
+  const out = {};
+  for (const [key, value] of Object.entries(map)) {
+    const expanded = expandMcpEnvRefs(value, env);
+    if (expanded === void 0) return null;
+    out[key] = expanded;
+  }
+  return out;
+}
+function normalizeMcpServer(raw2, env) {
+  if (raw2 === null || typeof raw2 !== "object" || Array.isArray(raw2)) return void 0;
+  const record = raw2;
+  const type = typeof record.type === "string" ? record.type : void 0;
+  if (type === "http" || type === "sse") {
+    if (typeof record.url !== "string") return void 0;
+    const url = expandMcpEnvRefs(record.url, env);
+    const headers = expandMap(stringMap(record.headers), env);
+    if (url === void 0 || headers === null) return void 0;
+    return { type, url, ...headers ? { headers } : {} };
+  }
+  if (type !== void 0 && type !== "stdio") return void 0;
+  if (typeof record.command !== "string") return void 0;
+  const command = expandMcpEnvRefs(record.command, env);
+  if (command === void 0) return void 0;
+  const args = [];
+  for (const entry of Array.isArray(record.args) ? record.args : []) {
+    if (typeof entry !== "string") return void 0;
+    const expanded = expandMcpEnvRefs(entry, env);
+    if (expanded === void 0) return void 0;
+    args.push(expanded);
+  }
+  const serverEnv = expandMap(stringMap(record.env), env);
+  if (serverEnv === null) return void 0;
+  return { command, ...args.length ? { args } : {}, ...serverEnv ? { env: serverEnv } : {} };
+}
+function collectApproval(layers) {
+  const approval = { all: false, enabled: /* @__PURE__ */ new Set(), disabled: /* @__PURE__ */ new Set() };
+  for (const layer of layers) {
+    if (layer?.enableAllProjectMcpServers === true) approval.all = true;
+    for (const name of stringList(layer, "enabledMcpjsonServers")) approval.enabled.add(name);
+    for (const name of stringList(layer, "disabledMcpjsonServers")) approval.disabled.add(name);
+  }
+  return approval;
+}
+function userScopeRemoteServers(account, cwd, env) {
+  const out = {};
+  const maps = [objectField(account, "mcpServers"), objectField(objectField(objectField(account, "projects"), cwd), "mcpServers")];
+  for (const map of maps) {
+    for (const [name, raw2] of Object.entries(map ?? {})) {
+      const server = normalizeMcpServer(raw2, env);
+      if (server && server.type !== void 0 && server.type !== "stdio") out[name] = server;
+    }
+  }
+  return out;
+}
+function projectMcpServers(cwd, options = {}) {
+  const env = options.env ?? process.env;
+  const home = options.home ?? homedir10();
+  const configOverride = options.claudeConfigDir ?? (env.CLAUDE_CONFIG_DIR?.trim() ? env.CLAUDE_CONFIG_DIR.trim() : void 0);
+  const accountFile = configOverride ? join25(configOverride, ".claude.json") : join25(home, ".claude.json");
+  const userSettingsFile = join25(configOverride ?? join25(home, ".claude"), "settings.json");
+  const account = readJsonObject(accountFile);
+  const out = userScopeRemoteServers(account, cwd, env);
+  const declared = objectField(readJsonObject(join25(cwd, ".mcp.json")), "mcpServers");
+  if (!declared) return out;
+  const approval = collectApproval([
+    readJsonObject(join25(cwd, ".claude", "settings.json")),
+    readJsonObject(join25(cwd, ".claude", "settings.local.json")),
+    readJsonObject(userSettingsFile),
+    objectField(objectField(account, "projects"), cwd)
+  ]);
+  for (const [name, raw2] of Object.entries(declared)) {
+    if (approval.disabled.has(name)) continue;
+    if (!approval.all && !approval.enabled.has(name)) continue;
+    const server = normalizeMcpServer(raw2, env);
+    if (server) out[name] = server;
+  }
+  return out;
+}
+function workerMcpServers(project, frizz) {
+  return { ...project ?? {}, ...frizz ?? {} };
+}
+var ENV_REF;
+var init_project_mcp_servers = __esm({
+  "packages/server/src/backend/project-mcp-servers.ts"() {
+    "use strict";
+    ENV_REF = /\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\}/g;
+  }
+});
+
 // packages/server/src/worker-plugin-dir.ts
 import { existsSync as existsSync8 } from "node:fs";
-import { dirname as dirname10, join as join25 } from "node:path";
+import { dirname as dirname10, join as join26 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function resolveWorkerPluginDir(moduleUrl = import.meta.url, env = process.env) {
   const override = env.FRIZZ_WORKER_PLUGIN_DIR;
-  if (override && existsSync8(join25(override, ".claude-plugin", "plugin.json")))
+  if (override && existsSync8(join26(override, ".claude-plugin", "plugin.json")))
     return override;
   let current = dirname10(fileURLToPath2(moduleUrl));
   for (; ; ) {
-    const candidate = join25(current, "cc-worker");
-    if (existsSync8(join25(candidate, ".claude-plugin", "plugin.json"))) return candidate;
+    const candidate = join26(current, "cc-worker");
+    if (existsSync8(join26(candidate, ".claude-plugin", "plugin.json"))) return candidate;
     const parent = dirname10(current);
     if (parent === current) return void 0;
     current = parent;
@@ -33697,6 +33935,7 @@ function buildWorkerPrompt(kind = "claude", opts = {}) {
     AGENT_COMPLETION,
     VISUAL_EVIDENCE,
     QUALITY_BAR,
+    TOKEN_ECONOMY,
     QUESTIONS,
     STOP_CRITERION,
     lean ? null : TRIVIAL_PROMPTS
@@ -33706,7 +33945,7 @@ function buildWorkerPrompt(kind = "claude", opts = {}) {
   out = out.replaceAll("{{FRIZZ_MONITORS_DIR}}", opts.monitorsDir?.trim() || MONITORS_DIR_FALLBACK);
   return out;
 }
-var INLINE, INTRO, DEFER, OPENING, ACTIVITY_CAPTIONS, SIGNALS, AGENT_COMPLETION, VISUAL_EVIDENCE, QUALITY_BAR, QUESTIONS, STOP_CRITERION, TRIVIAL_PROMPTS, THREAD_NAME, SCRATCHPAD, BACKEND, SPAWN_THREAD, THREAD_EXECUTION, MONITORS_DIR_FALLBACK;
+var INLINE, INTRO, DEFER, OPENING, ACTIVITY_CAPTIONS, SIGNALS, AGENT_COMPLETION, VISUAL_EVIDENCE, QUALITY_BAR, TOKEN_ECONOMY, QUESTIONS, STOP_CRITERION, TRIVIAL_PROMPTS, THREAD_NAME, SCRATCHPAD, BACKEND, SPAWN_THREAD, THREAD_EXECUTION, MONITORS_DIR_FALLBACK;
 var init_workerPrompt = __esm({
   "packages/server/src/workerPrompt.ts"() {
     "use strict";
@@ -33914,7 +34153,14 @@ exactly ONE of them.
     Register FIRST: this line states the wait, it does not create one. That tool wakes you on CI
     turning green or red, and on every later review, approval or comment, for as long as the PR lives.
   - \`for:\` \u2014 **REQUIRED**, and a DURATION: \`30s\`, \`15m\`, \`2h\`, \`3d\`. Never an instant. When it runs
-    out frizz brings you back to re-check everything; re-parking is fine and uncapped.
+    out frizz brings you back to re-check everything; re-parking is fine and uncapped. Capped at a day,
+    except on a park naming ONLY \`prs:\`, where it runs to a year.
+  - **A PULL REQUEST IN SOMEONE ELSE'S REPO TAKES MONTHS, SO ASK FOR MONTHS** \u2014 \`for: 180d\`, and give
+    \`mcp__frizz__watch_pr\` the same. It moves on its maintainers' clock, not yours, so a short \`for:\`
+    expires against a PR nothing has touched: a wake carrying no news, and a re-arm, once per expiry
+    until somebody notices. Long is free \u2014 real activity wakes you the moment it lands either way, and
+    the human snoozes or archives the thread when they want it gone. Hours are for a PR you control and
+    a check you expect to settle today.
   - \`title:\` \u2014 OPTIONAL, the card's heading: **40 characters or fewer**, sentence case, naming THIS
     wait ("Fork-CI approval", "Nightly bench, arm 3 of 3"); longer is trimmed on a word boundary.
     Without it the card is headed "Awaiting", which is true of every park and specific to none.
@@ -34001,6 +34247,19 @@ reads when images are unavailable.`;
   formatter, a rename sweep) \u2014 run it, then name the files it touched in your handoff.
 - Ground every load-bearing claim in code, a command, or a doc you actually read \u2014 never memory. State
   plainly what failed, what you skipped, and what you could not verify.`;
+    TOKEN_ECONOMY = `## Every message you send re-reads your whole context
+
+The API call is the unit of cost, not the tokens you type: each message re-reads your entire context
+(150k\u2013450k tokens for most of an effort) whether it carries one tool call or ten.
+
+- **Batch independent tool calls into ONE message.** List privately what you need next; then request
+  every item that does not depend on another's result in the same response.
+- **One Bash call, several commands.** Chain the steps of one job with \`&&\` / \`;\` and print
+  labelled sections. Use absolute paths; never spend a call on \`cd\` alone.
+- **Never poll from the turn.** A \`sleep\`-and-check loop is a full re-read every iteration. A
+  background shell, a sub-agent or a registered watch wakes you when the thing is done.
+- **Finish the turn's whole job before you rest.** Every wake is a new turn on the full context, so
+  do not rest on a step you could take now.`;
     QUESTIONS = `## Questions for the human
 
 You run under a dashboard, not a live chat, so your FINAL MESSAGE is the whole interface. Open with 2-4
@@ -34055,10 +34314,11 @@ fence is answerable only while its message is on screen, so a question written i
 the transcript scrolls or your context is compacted, while a registration is still there tomorrow. It
 takes \`questions\` \u2014 several at once, each with \`question\`, \`kind\` (\`question\` = pick one,
 \`multi\` = pick several, no options at all = free text), an optional \`danger\`, and \`options\` each
-carrying a \`label\`, a one-line \`description\`, an optional \`recommended\`, an optional \`preview\`
-(markdown the human sees when they pick it \u2014 the diff, the message that would be posted), and optional
-\`followUps\`: questions that become live ONLY if that option is taken, so you can ask "and if so,
-which?" without asking it of somebody who said no. **REGISTERING A QUESTION DOES NOT END YOUR TURN** \u2014
+carrying a \`label\`, a \`description\` (one line for a simple fork, or FULL MARKDOWN over several
+lines \u2014 a list of consequences, a code block, the diff an option would produce, the message that would
+be posted; it renders inside the option, so the human sees it BEFORE choosing), an optional
+\`recommended\`, and optional \`followUps\`: questions that become live ONLY if that option is taken,
+so you can ask "and if so, which?" without asking it of somebody who said no. **REGISTERING A QUESTION DOES NOT END YOUR TURN** \u2014
 it carries no timeout and waits on a person, so keep doing everything that does not depend on the
 answer. The answer comes back as its own wake, restating what was asked. Withdraw one you no longer
 need with \`mcp__frizz__unask\`, above all when you work the answer out yourself. **ON A THREAD
@@ -34793,12 +35053,12 @@ var init_claude_broker_client = __esm({
 });
 
 // packages/server/src/backend/claude-permission-interactions.ts
-import { homedir as homedir10 } from "node:os";
+import { homedir as homedir11 } from "node:os";
 function clip(text2, max) {
   return text2.length > max ? `${text2.slice(0, max - 1)}\u2026` : text2;
 }
 function tildePath(path) {
-  const home = homedir10();
+  const home = homedir11();
   if (!path.startsWith(home)) return path;
   const rest = path.slice(home.length);
   return rest === "" ? "~" : rest.startsWith("/") ? `~${rest}` : path;
@@ -35044,7 +35304,7 @@ var init_claude_permission_interactions = __esm({
 import { randomUUID as randomUUID12 } from "node:crypto";
 function withFrizzThreadSlug(servers, slug) {
   const frizz = servers?.[FRIZZ_MCP.name];
-  if (!frizz) return servers;
+  if (!frizz || !("command" in frizz)) return servers;
   return { ...servers, [FRIZZ_MCP.name]: { ...frizz, env: { ...frizz.env, FRIZZ_THREAD_SLUG: slug } } };
 }
 function claudeBrokerBridgeEnabled(env = process.env) {
@@ -35172,6 +35432,7 @@ function createClaudeAgentBrokerBridge(deps) {
       // The auto-compact ceiling, from Settings (500K by default). Without it a `[1m]` worker compacts
       // only near 1M, re-sending up to 5x a TUI session's conversation on every turn past 200K.
       ...claudeCompactionEnv(deps.getSettings?.()),
+      ...claudePromptCacheEnv(deps.getSettings?.()),
       ...we?.permDir ? { FRIZZ_PERM_DIR: we.permDir } : {},
       // The cc-worker plugin's PreToolUse hook DENIES AskUserQuestion, because without frizz in the
       // loop a blocking question freezes a headless worker where nobody can answer it. On the broker path
@@ -35447,19 +35708,19 @@ var init_claude_agent_broker_bridge = __esm({
 });
 
 // packages/server/src/backend/auth-status.ts
-import { join as join26 } from "node:path";
-import { homedir as homedir11, platform as platform2 } from "node:os";
-import { readFileSync as readFileSync16, statSync as statSync11 } from "node:fs";
+import { join as join27 } from "node:path";
+import { homedir as homedir12, platform as platform2 } from "node:os";
+import { readFileSync as readFileSync17, statSync as statSync11 } from "node:fs";
 import { execFile as execFile4 } from "node:child_process";
 import { promisify as promisify4 } from "node:util";
 function claudeConfigDir2() {
   const override = process.env.CLAUDE_CONFIG_DIR;
-  return override && override.trim() ? override : join26(homedir11(), ".claude");
+  return override && override.trim() ? override : join27(homedir12(), ".claude");
 }
 function claudeFileState(configDir) {
   let raw2;
   try {
-    raw2 = readFileSync16(join26(configDir, ".credentials.json"), "utf8");
+    raw2 = readFileSync17(join27(configDir, ".credentials.json"), "utf8");
   } catch (err) {
     return err.code === "ENOENT" ? "absent" : "error";
   }
@@ -35492,7 +35753,7 @@ function readCodexAuthState(codexHome = defaultCodexHome()) {
   if (process.env.OPENAI_API_KEY || process.env.CODEX_API_KEY || process.env.CODEX_ACCESS_TOKEN) return "authed";
   let raw2;
   try {
-    raw2 = readFileSync16(join26(codexHome, "auth.json"), "utf8");
+    raw2 = readFileSync17(join27(codexHome, "auth.json"), "utf8");
   } catch (err) {
     return err.code === "ENOENT" ? "signed-out" : "unknown";
   }
@@ -35557,7 +35818,7 @@ function asEmail(value) {
 }
 function claudeAccountFile() {
   const override = process.env.CLAUDE_CONFIG_DIR;
-  return override && override.trim() ? join26(override, ".claude.json") : join26(homedir11(), ".claude.json");
+  return override && override.trim() ? join27(override, ".claude.json") : join27(homedir12(), ".claude.json");
 }
 function readClaudeAccountEmail(path = claudeAccountFile()) {
   let stat2;
@@ -35570,7 +35831,7 @@ function readClaudeAccountEmail(path = claudeAccountFile()) {
   if (memo3 && memo3.path === path && memo3.mtimeMs === stat2.mtimeMs && memo3.size === stat2.size) return memo3.email;
   let email;
   try {
-    const doc = JSON.parse(readFileSync16(path, "utf8"));
+    const doc = JSON.parse(readFileSync17(path, "utf8"));
     email = asEmail(doc?.oauthAccount?.emailAddress);
   } catch {
     email = void 0;
@@ -35581,7 +35842,7 @@ function readClaudeAccountEmail(path = claudeAccountFile()) {
 function readCodexAccountEmail(codexHome = defaultCodexHome()) {
   let doc;
   try {
-    doc = JSON.parse(readFileSync16(join26(codexHome, "auth.json"), "utf8"));
+    doc = JSON.parse(readFileSync17(join27(codexHome, "auth.json"), "utf8"));
   } catch {
     return void 0;
   }
@@ -35649,8 +35910,8 @@ var init_auth_status = __esm({
 });
 
 // packages/server/src/dispatch.ts
-import { closeSync as closeSync12, constants, existsSync as existsSync9, fstatSync as fstatSync2, lstatSync as lstatSync3, openSync as openSync13, readFileSync as readFileSync17, realpathSync as realpathSync7, statSync as statSync12, writeFileSync as writeFileSync10, mkdirSync as mkdirSync13, rmSync as rmSync9 } from "node:fs";
-import { basename as basename6, join as join27, dirname as dirname11 } from "node:path";
+import { closeSync as closeSync12, constants, existsSync as existsSync9, fstatSync as fstatSync2, lstatSync as lstatSync3, openSync as openSync13, readFileSync as readFileSync18, realpathSync as realpathSync7, statSync as statSync12, writeFileSync as writeFileSync10, mkdirSync as mkdirSync13, rmSync as rmSync9 } from "node:fs";
+import { basename as basename6, join as join28, dirname as dirname11 } from "node:path";
 import { createHash as createHash11, randomUUID as randomUUID13 } from "node:crypto";
 function fallbackTitle(prompt) {
   const firstLine2 = prompt.trim().split("\n", 1)[0].trim();
@@ -35669,7 +35930,7 @@ function fallbackTitle(prompt) {
 }
 function resolveSlug(frizzDir, base, taken) {
   base = ThreadSlug.parse(base);
-  const isTaken = (slug) => existsSync9(join27(frizzDir, `${slug}.md`)) || (taken?.(slug) ?? false);
+  const isTaken = (slug) => existsSync9(join28(frizzDir, `${slug}.md`)) || (taken?.(slug) ?? false);
   if (!isTaken(base)) return base;
   for (let n = 2; ; n++) {
     const suffix = `-${n}`;
@@ -35686,12 +35947,12 @@ function resolveLegacyThreadFile(projectDir, value) {
   if (!parsed.success) return null;
   try {
     const projectRoot = realpathSync7(projectDir);
-    const frizzPath = join27(projectRoot, ".frizz");
+    const frizzPath = join28(projectRoot, ".frizz");
     const frizzStat = lstatSync3(frizzPath);
     if (!frizzStat.isDirectory() || frizzStat.isSymbolicLink()) return null;
     const realFrizz = realpathSync7(frizzPath);
     if (dirname11(realFrizz) !== projectRoot || basename6(realFrizz) !== ".frizz") return null;
-    const path = join27(realFrizz, `${parsed.data}.md`);
+    const path = join28(realFrizz, `${parsed.data}.md`);
     const before = lstatSync3(path);
     if (!before.isFile() || before.isSymbolicLink()) return null;
     const realPath = realpathSync7(path);
@@ -35702,7 +35963,7 @@ function resolveLegacyThreadFile(projectDir, value) {
     const fd = openSync13(path, constants.O_RDONLY | constants.O_NOFOLLOW);
     try {
       openedBefore = fstatSync2(fd);
-      contents = readFileSync17(fd);
+      contents = readFileSync18(fd);
       openedAfter = fstatSync2(fd);
     } finally {
       closeSync12(fd);
@@ -35735,7 +35996,7 @@ function boardAuthorizesAdoption(board, slug) {
   return !board.errorItems.some((item) => item.file === `${slug}.md`);
 }
 function ensureSafeDirectDirectory(parent, name) {
-  const path = join27(parent, name);
+  const path = join28(parent, name);
   try {
     mkdirSync13(path);
   } catch (error) {
@@ -35765,8 +36026,8 @@ function loadWorkerPrompt(kind = "claude") {
 function monitorScriptsDir() {
   const plugin = workerPluginDir();
   if (!plugin) return void 0;
-  const dir = join27(plugin, "skills", "gh", "scripts");
-  return existsSync9(join27(dir, "ci-watch.mjs")) ? dir : void 0;
+  const dir = join28(plugin, "skills", "gh", "scripts");
+  return existsSync9(join28(dir, "ci-watch.mjs")) ? dir : void 0;
 }
 function codexScratchpadHookConfig(hookScript, sessionId) {
   if (!hookScript || !sessionId) return {};
@@ -35778,7 +36039,7 @@ function codexScratchpadHookConfig(hookScript, sessionId) {
       }
     ]
   });
-  const bashBackgroundHook = join27(dirname11(hookScript), "bash-background.mjs");
+  const bashBackgroundHook = join28(dirname11(hookScript), "bash-background.mjs");
   return {
     bypass_hook_trust: true,
     hooks: {
@@ -35804,7 +36065,7 @@ function codexScratchpadHookConfig(hookScript, sessionId) {
 }
 function scratchpadHookScript() {
   const plugin = workerPluginDir();
-  return plugin ? join27(plugin, "hooks", "scratchpad.mjs") : void 0;
+  return plugin ? join28(plugin, "hooks", "scratchpad.mjs") : void 0;
 }
 function composePrompt(sessionId, prompt, kind = "claude") {
   const children2 = kind === "codex" ? "Native sub-agents share it \u2014 have each write its OWN file rather than all editing one." : "Name it in a sub-agent's prompt when you want its notes to land somewhere you can read; give each child its OWN file rather than having them all edit one.";
@@ -35820,12 +36081,12 @@ function scratchpadOrientation(sessionId, kind = "claude") {
   return `SCRATCH DIRECTORY: .frizz/threads/${sessionId}/ \u2014 yours, free-form, as many files as you like, and nothing is expected in it. A single direct task usually needs none; writing notes is never a substitute for doing the work (${children2}). Nothing in this directory is read automatically; if you want a note back after a compaction, mcp__frizz__goal with post_compaction: true re-sends a prompt of your choosing.`;
 }
 function frizzConfigBlock(projectDir) {
-  const path = join27(projectDir, "FRIZZ.md");
+  const path = join28(projectDir, "FRIZZ.md");
   let body;
   try {
     const st = statSync12(path);
     if (!st.isFile() || st.size > FRIZZ_MD_MAX_BYTES) return "";
-    body = readFileSync17(path, "utf8").trim();
+    body = readFileSync18(path, "utf8").trim();
   } catch {
     return "";
   }
@@ -35860,7 +36121,7 @@ function resolveFrizzMcp(target, moduleUrl = import.meta.url, env = process.env,
   const { stateDir, serverLock, projectId } = typeof target === "string" ? { stateDir: target } : target;
   const pluginDir = resolveWorkerPluginDir(moduleUrl, env);
   if (!pluginDir) return void 0;
-  const scriptPath = join27(pluginDir, "bin", FRIZZ_MCP.script);
+  const scriptPath = join28(pluginDir, "bin", FRIZZ_MCP.script);
   if (!existsSync9(scriptPath)) return void 0;
   return {
     scriptPath,
@@ -35870,7 +36131,7 @@ function resolveFrizzMcp(target, moduleUrl = import.meta.url, env = process.env,
     ...slug ? { slug } : {}
   };
 }
-function claudeMcpConfig(mcp) {
+function claudeMcpConfig(mcp, project) {
   const mcpServers = {};
   const allowedTools = [];
   if (mcp) {
@@ -35878,13 +36139,16 @@ function claudeMcpConfig(mcp) {
     mcpServers[FRIZZ_MCP.name] = { command: process.execPath, args: [mcp.scriptPath], env };
     allowedTools.push(`mcp__${FRIZZ_MCP.name}`);
   }
-  return { mcpServers, allowedTools };
+  return { mcpServers: workerMcpServers(project, mcpServers), allowedTools };
 }
-function claudeMcpFlags(mcp) {
-  const { mcpServers, allowedTools } = claudeMcpConfig(mcp);
-  if (Object.keys(mcpServers).length === 0) return [];
+function claudeMcpFlags(mcp, project) {
+  const { mcpServers, allowedTools } = claudeMcpConfig(mcp, project);
+  const argv = ["--strict-mcp-config"];
+  if (Object.keys(mcpServers).length === 0) return argv;
   const config = JSON.stringify({ mcpServers });
-  return ["--mcp-config", config, `--allowedTools=${allowedTools.join(",")}`];
+  argv.push("--mcp-config", config);
+  if (allowedTools.length > 0) argv.push(`--allowedTools=${allowedTools.join(",")}`);
+  return argv;
 }
 function workerDisallowedToolFlags() {
   return [`--disallowedTools=${WORKER_DISALLOWED_TOOLS.join(",")}`];
@@ -35896,7 +36160,7 @@ function buildClaudeCommand(opts) {
   if (effort.effort) argv.push("--effort", effort.effort);
   argv.push(...claudeUltracodeFlags(effort));
   if (opts.pluginDir) argv.push("--plugin-dir", opts.pluginDir);
-  argv.push(...claudeMcpFlags(opts.frizzMcp));
+  argv.push(...claudeMcpFlags(opts.frizzMcp, opts.projectMcpServers));
   argv.push(...workerDisallowedToolFlags());
   const worker = opts.workerPrompt ?? loadWorkerPrompt();
   const system = [worker, opts.extraSystemPrompt?.trim()].filter(Boolean).join("\n\n");
@@ -35929,7 +36193,7 @@ function buildClaudeResumeCommand(opts) {
   if (effort.effort) argv.push("--effort", effort.effort);
   argv.push(...claudeUltracodeFlags(effort));
   if (opts.pluginDir) argv.push("--plugin-dir", opts.pluginDir);
-  argv.push(...claudeMcpFlags(opts.frizzMcp));
+  argv.push(...claudeMcpFlags(opts.frizzMcp, opts.projectMcpServers));
   argv.push(...workerDisallowedToolFlags());
   const worker = opts.workerPrompt ?? loadWorkerPrompt();
   const system = [worker, opts.extraSystemPrompt?.trim()].filter(Boolean).join("\n\n");
@@ -35940,7 +36204,7 @@ function buildClaudeResumeCommand(opts) {
 }
 function createDispatcher(deps) {
   const readBoardSource = deps.readBoard ?? readBoard;
-  const frizzDir = join27(deps.project.dir, ".frizz");
+  const frizzDir = join28(deps.project.dir, ".frizz");
   const adoptionRuntime = deps.adoptionRuntime ?? productionRuntime;
   function cleanupPrewrites(built) {
     for (const path of new Set(built.prewrite.map((file) => file.path))) {
@@ -35953,7 +36217,7 @@ function createDispatcher(deps) {
   function cleanupDispatchFiles(scratchRel, built, sessionId) {
     cleanupPrewrites(built);
     try {
-      rmSync9(join27(deps.project.dir, scratchRel), { force: true, recursive: true });
+      rmSync9(join28(deps.project.dir, scratchRel), { force: true, recursive: true });
     } catch {
     }
     cleanupAdoptionSessionFiles(deps.project.dir, sessionId);
@@ -36328,6 +36592,7 @@ var init_dispatch = __esm({
     init_src();
     init_logging();
     init_project();
+    init_project_mcp_servers();
     init_types2();
     init_types2();
     init_worker_plugin_dir();
@@ -36385,8 +36650,8 @@ var init_dispatch = __esm({
 import {
   watch as fsWatch
 } from "node:fs";
-import { homedir as homedir12 } from "node:os";
-import { join as join28 } from "node:path";
+import { homedir as homedir13 } from "node:os";
+import { join as join29 } from "node:path";
 import watcher from "@parcel/watcher";
 function appServerTurnStalled(liveness, lastActivityAt, nowMs) {
   if (!liveness) return false;
@@ -36515,7 +36780,7 @@ function safeQuestionAnswer(raw2) {
     return void 0;
   }
 }
-function answersInFlight(rows, lastUserAt) {
+function answersInFlight(rows, lastUserAt, wakeOnDismissals = false) {
   const userAt = lastUserAt ? Date.parse(lastUserAt) : Number.NaN;
   const answers = [];
   const dismissed = [];
@@ -36531,7 +36796,8 @@ function answersInFlight(rows, lastUserAt) {
     const parsed = safeQuestionAnswer(q.answer);
     if (parsed) answers.push(parsed);
   }
-  return answers.length > 0 ? questionAnswerMessage(answers, dismissed) : void 0;
+  if (answers.length > 0) return questionAnswerMessage(answers, dismissed);
+  return wakeOnDismissals && dismissed.length > 0 ? questionsCancelledWakeMessage(dismissed.length) : void 0;
 }
 function hasRegisteredBackgroundPark(tele, armedWatches, nowMs) {
   return armedWatches.some((w) => {
@@ -36681,7 +36947,8 @@ function resolveSessionProfile(row, tele) {
   const observedAt = tele?.profileAt ? Date.parse(tele.profileAt) : NaN;
   const spawnedAt = Date.parse(row.spawned_at);
   const setAt = row.profile_set_at ? Date.parse(row.profile_set_at) : NaN;
-  const supersededByOperatorSet = Number.isFinite(setAt) && setAt > observedAt;
+  const operatorSetSticks = (row.backend ?? "claude") !== "codex";
+  const supersededByOperatorSet = Number.isFinite(setAt) && (operatorSetSticks || setAt > observedAt);
   const observedIsCurrent = Number.isFinite(observedAt) && Number.isFinite(spawnedAt) && observedAt >= spawnedAt && !supersededByOperatorSet;
   const observedModel = tele?.model ? normalizeObservedThreadModel(row.backend ?? "claude", tele.model) ?? tele.model.trim() : void 0;
   const model = (!persistedModel || observedIsCurrent ? observedModel : void 0) || persistedModel;
@@ -36781,7 +37048,7 @@ function sessionThreadView(projectDir, storage, row, rawTele, registeredLegacyTe
     const spec = safeQuestionSpec(q.spec);
     if (spec) questions.push({ id: q.id, spec, askedAt: new Date(q.asked_at).toISOString() });
   }
-  const inFlightAnswers = answersInFlight(questionRows, rawTele?.lastUserAt);
+  const inFlightAnswers = answersInFlight(questionRows, rawTele?.lastUserAt, row.recurring_on_rest === 1 && Boolean(row.recurring_prompt?.trim()));
   const armedWatches = storage.listThreadWatches(row.slug, { armedOnly: true }).map((w) => ({
     id: w.id,
     kind: w.kind,
@@ -36866,6 +37133,7 @@ function sessionThreadView(projectDir, storage, row, rawTele, registeredLegacyTe
     // Only meaningful while the snooze is still pending — a prompt without a live deadline is an
     // already-delivered (or superseded) bump the row has not been swept clean of yet.
     snoozePrompt: snoozedUntil ? row.snooze_prompt ?? void 0 : void 0,
+    pinnedAt: row.pinned_at ?? void 0,
     // The event-snooze, as a fact the CHAT can read. `awaitingBackground` still ignores it — that flag
     // states whether the thread is waiting, which the snooze does not change — so the suppression is a
     // presentation rule the client applies, not a second opinion about the thread's state.
@@ -37083,7 +37351,7 @@ function createBoard(project, storage, bus, tailer, bootId, deps = {}) {
       ...project.githubRepo ? { githubRepo: project.githubRepo } : {},
       projectSlug: findByPath(project.dir)?.slug,
       // So the client can expand a `~` a worker wrote in prose (see BoardSnapshot.homeDir).
-      homeDir: homedir12()
+      homeDir: homedir13()
     };
     const sessionThreads = buildSessionThreads(assembledAtMs);
     armSnoozeWake(sessionThreads, assembledAtMs);
@@ -37184,7 +37452,7 @@ function createBoard(project, storage, bus, tailer, bootId, deps = {}) {
     if (parcelSub || stopped) return Promise.resolve();
     if (watchSetup) return watchSetup;
     const setup = (async () => {
-      const next = await subscribe(join28(project.dir, ".frizz"), () => scheduleRebuild());
+      const next = await subscribe(join29(project.dir, ".frizz"), () => scheduleRebuild());
       if (stopped) {
         await next.unsubscribe();
         return;
@@ -37284,6 +37552,9 @@ var init_board = __esm({
 });
 
 // packages/server/src/wake-store.ts
+function isQuietWindowExempt(hintKey) {
+  return WAKE_QUIET_EXEMPT_HINT_PREFIXES.some((prefix) => hintKey.startsWith(prefix));
+}
 function delivery(row) {
   return {
     id: row.id,
@@ -37334,14 +37605,22 @@ function ensureWakeDeliverySchema(db) {
       ON wake_delivery(project_id, state, next_attempt_at, created_at);
   `);
 }
-function createWakeDeliveryStore(scope) {
+function createWakeDeliveryStore(scope, options = {}) {
   const db = scope.db;
   ensureWakeDeliverySchema(db);
+  const quietWindowMs = Math.max(0, options.quietWindowMs ?? WAKE_QUIET_WINDOW_MS);
   const byId = scope.prepare("SELECT * FROM wake_delivery WHERE project_id = @project_id AND id = ?");
   const all = scope.prepare("SELECT * FROM wake_delivery WHERE project_id = @project_id ORDER BY created_at, id");
   const open = scope.prepare(
     "SELECT * FROM wake_delivery WHERE project_id = @project_id AND state IN ('pending', 'leased') ORDER BY created_at, id"
   );
+  const pendingForStmt = scope.prepare(
+    "SELECT * FROM wake_delivery WHERE project_id = @project_id AND thread_slug = ? AND session_id = ? AND state = 'pending' ORDER BY created_at, id"
+  );
+  const lastHandoffStmt = scope.prepare(`
+    SELECT MAX(MAX(COALESCE(delivered_at, 0), COALESCE(sent_at, 0))) AS at
+    FROM wake_delivery WHERE project_id = @project_id AND thread_slug = ?
+  `);
   const insert = scope.prepare(`
     INSERT INTO wake_delivery (
       project_id, id, thread_slug, session_id, fence_id, hint_key, message, reason, state, attempts,
@@ -37349,7 +37628,7 @@ function createWakeDeliveryStore(scope) {
       delivered_at, terminal_at
     ) VALUES (
       @project_id, @id, @slug, @sessionId, @fenceId, @hintKey, @message, @reason, 'pending', 0,
-      @now, NULL, NULL, NULL, @now, @now, NULL, NULL
+      @notBefore, NULL, NULL, NULL, @now, @now, NULL, NULL
     )
     ON CONFLICT DO NOTHING
   `);
@@ -37376,6 +37655,12 @@ function createWakeDeliveryStore(scope) {
       last_error = NULL, sent_at = NULL, updated_at = @now
     WHERE project_id = @project_id AND id = @id AND state = 'pending' AND next_attempt_at <= @now AND attempts < @maxAttempts
   `);
+  const adoptStmt = scope.prepare(`
+    UPDATE wake_delivery SET
+      state = 'leased', attempts = attempts + 1, lease_owner = @owner, lease_until = @leaseUntil,
+      last_error = NULL, sent_at = NULL, updated_at = @now
+    WHERE project_id = @project_id AND id = @id AND state = 'pending' AND attempts < @maxAttempts
+  `);
   const deferFailureStmt = scope.prepare(`
     UPDATE wake_delivery SET
       lease_until = @retryAt, last_error = @error, updated_at = @now
@@ -37416,7 +37701,12 @@ function createWakeDeliveryStore(scope) {
     WHERE project_id = @project_id AND id = @id AND state IN ('pending', 'leased')
   `);
   const enqueueTxn = db.transaction((input, now) => {
-    const created = insert.run({ ...input, now }).changes === 1;
+    let notBefore = now;
+    if (quietWindowMs > 0 && !isQuietWindowExempt(input.hintKey)) {
+      const lastHandoff = lastHandoffStmt.get(input.slug)?.at ?? 0;
+      if (lastHandoff > 0) notBefore = Math.max(now, lastHandoff + quietWindowMs);
+    }
+    const created = insert.run({ ...input, now, notBefore }).changes === 1;
     const row = byId.get(input.id);
     if (!row) throw new Error("wake delivery disappeared while it was being enqueued");
     if (row.thread_slug !== input.slug || row.session_id !== input.sessionId || row.fence_id !== input.fenceId || row.hint_key !== input.hintKey || row.message !== input.message || row.reason !== input.reason) {
@@ -37432,6 +37722,10 @@ function createWakeDeliveryStore(scope) {
     if (claimStmt.run({ id: candidate.id, owner, now, leaseUntil, maxAttempts }).changes !== 1) return void 0;
     return delivery(byId.get(candidate.id));
   });
+  const adoptTxn = db.transaction((id, owner, now, leaseUntil, maxAttempts) => {
+    if (adoptStmt.run({ id, owner, now, leaseUntil, maxAttempts }).changes !== 1) return void 0;
+    return delivery(byId.get(id));
+  });
   return {
     enqueue: (input, now) => enqueueTxn.immediate(input, now),
     get: (id) => {
@@ -37440,7 +37734,9 @@ function createWakeDeliveryStore(scope) {
     },
     list: () => all.all().map(delivery),
     listOpen: () => open.all().map(delivery),
+    pendingFor: (slug, sessionId) => pendingForStmt.all(slug, sessionId).map(delivery),
     claim: (owner, now, leaseUntil, maxAttempts) => claimTxn.immediate(owner, now, leaseUntil, maxAttempts),
+    adopt: (id, owner, now, leaseUntil, maxAttempts) => adoptTxn.immediate(id, owner, now, leaseUntil, maxAttempts),
     deferFailure: (id, owner, now, retryAt, error) => deferFailureStmt.run({
       id,
       owner,
@@ -37459,10 +37755,12 @@ function createWakeDeliveryStore(scope) {
     supersede: (id, now, reason) => supersedeStmt.run({ id, now, reason: reason.slice(0, 500) }).changes === 1
   };
 }
-var OUTBOX_CAP, WAKE_DELIVERY_TABLES;
+var WAKE_QUIET_WINDOW_MS, WAKE_QUIET_EXEMPT_HINT_PREFIXES, OUTBOX_CAP, WAKE_DELIVERY_TABLES;
 var init_wake_store = __esm({
   "packages/server/src/wake-store.ts"() {
     "use strict";
+    WAKE_QUIET_WINDOW_MS = 5 * 6e4;
+    WAKE_QUIET_EXEMPT_HINT_PREFIXES = ["answers:", "limit:"];
     OUTBOX_CAP = 2e3;
     WAKE_DELIVERY_TABLES = ["wake_delivery"];
   }
@@ -37745,9 +38043,9 @@ function createGithubReviewFetcher(deps = {}) {
       for (const entry of batch.values()) for (const resolve12 of entry.resolve) resolve12({ status: "deferred" });
       return;
     }
-    const entries = [...batch.values()];
-    for (let offset = 0; offset < entries.length; offset += MAX_REFS_PER_REQUEST) {
-      const chunk = entries.slice(offset, offset + MAX_REFS_PER_REQUEST);
+    const entries2 = [...batch.values()];
+    for (let offset = 0; offset < entries2.length; offset += MAX_REFS_PER_REQUEST) {
+      const chunk = entries2.slice(offset, offset + MAX_REFS_PER_REQUEST);
       if (offset > 0 && now() < rateLimitBlockedUntilMs) {
         for (const entry of chunk) for (const resolve12 of entry.resolve) resolve12({ status: "deferred" });
         continue;
@@ -37960,11 +38258,11 @@ function failedCheckNames(rollup, runs = [], cap = 8) {
   return { names: names.slice(0, cap), omitted: Math.max(0, names.length - cap) };
 }
 function githubWatchStatus(pr, polledAt) {
-  const entries = Array.isArray(pr.rollup) ? pr.rollup.filter((c) => c && typeof c === "object") : [];
+  const entries2 = Array.isArray(pr.rollup) ? pr.rollup.filter((c) => c && typeof c === "object") : [];
   let running = 0;
   let passed = 0;
   let failed = 0;
-  for (const c of entries) {
+  for (const c of entries2) {
     const status = typeof c.status === "string" ? c.status : void 0;
     const state2 = typeof c.state === "string" ? c.state : void 0;
     const conclusion = typeof c.conclusion === "string" ? c.conclusion : void 0;
@@ -37974,19 +38272,19 @@ function githubWatchStatus(pr, polledAt) {
     else passed++;
   }
   const state = pr.state === "MERGED" ? "merged" : pr.state === "CLOSED" ? "closed" : "open";
-  const checks = entries.length === 0 ? "none" : failed > 0 ? "failing" : running > 0 ? "running" : "passing";
+  const checks = entries2.length === 0 ? "none" : failed > 0 ? "failing" : running > 0 ? "running" : "passing";
   const merge = pr.mergeable === "CONFLICTING" ? "conflicting" : pr.mergeable !== "MERGEABLE" ? "unknown" : checks === "failing" || pr.reviewDecision === "CHANGES_REQUESTED" || pr.reviewDecision === "REVIEW_REQUIRED" ? "blocked" : "mergeable";
   return {
     checks,
     running,
     passed,
     failed,
-    failing: failedCheckNames(entries, pr.workflowRuns ?? []).names,
+    failing: failedCheckNames(entries2, pr.workflowRuns ?? []).names,
     merge,
     state,
     polledAt,
     head: pr.head,
-    failureSig: failureSignature(entries)
+    failureSig: failureSignature(entries2)
   };
 }
 function wakeDeliveryId(slug, sessionId, fenceId) {
@@ -38215,7 +38513,7 @@ function createScheduler(deps) {
   const confirmGraceMs = Math.max(1, deps.confirmGraceMs ?? 6e4);
   const deliveryBatchSize = Math.max(0, deps.deliveryBatchSize ?? 50);
   const deliveryOwner = randomUUID14();
-  const outbox = createWakeDeliveryStore(deps.storage.scope);
+  const outbox = createWakeDeliveryStore(deps.storage.scope, { quietWindowMs: deps.wakeQuietWindowMs ?? WAKE_QUIET_WINDOW_MS });
   const reviewFailures = /* @__PURE__ */ new Map();
   let timer = null;
   let activeTick = null;
@@ -38311,9 +38609,14 @@ function createScheduler(deps) {
     }
     return "superseded";
   }
-  function isDeliverableNow(item, context) {
+  function isDeliverableNow(item, context, nowMs) {
     if (context === "current-idle") return true;
-    return context === "current-busy" && (isHeartbeatFenceId(item.fenceId) || isTimerFenceId(item.fenceId) || isCompactFenceId(item.fenceId));
+    if (context !== "current-busy") return false;
+    if (isHeartbeatFenceId(item.fenceId) || isTimerFenceId(item.fenceId) || isCompactFenceId(item.fenceId)) return true;
+    return nowMs - item.createdAt >= MID_TURN_HOLD_MAX_MS;
+  }
+  function heldPastBound(item, context, nowMs) {
+    return context === "current-busy" && item.sentAt === null && item.lastError === WAKE_HOLD_DEFERRAL && nowMs - item.createdAt >= MID_TURN_HOLD_MAX_MS;
   }
   function activityLabel(a) {
     if (a.kind === "comment") return "comment";
@@ -38517,7 +38820,7 @@ function createScheduler(deps) {
       if (tele.authFault) continue;
       if (tele.apiFault) continue;
       const questionRows = deps.storage.listThreadQuestions(row.slug);
-      if (tele.lastFence || tele.pendingQuestion || registeredDoneFence(deps.storage.getThreadDone(row.slug), tele.lastUserAt) !== void 0 || questionRows.some((q) => q.state === "open") || answersInFlight(questionRows, tele.lastUserAt) !== void 0 || deps.storage.listThreadWatches(row.slug, { armedOnly: true }).length > 0) {
+      if (tele.lastFence || tele.pendingQuestion || registeredDoneFence(deps.storage.getThreadDone(row.slug), tele.lastUserAt) !== void 0 || questionRows.some((q) => q.state === "open") || answersInFlight(questionRows, tele.lastUserAt, row.recurring_on_rest === 1 && Boolean(row.recurring_prompt?.trim())) !== void 0 || deps.storage.listThreadWatches(row.slug, { armedOnly: true }).length > 0) {
         if ((row.signoff_nudges ?? 0) > 0) deps.storage.resetSignoffNudges(row.slug);
         continue;
       }
@@ -38724,12 +39027,27 @@ ${clock}`;
     }
   }
   const prWatchPolledAt = /* @__PURE__ */ new Map();
+  function readPrWatchHeld(raw2) {
+    if (!raw2 || typeof raw2 !== "object") return void 0;
+    const h = raw2;
+    if (!Array.isArray(h.items)) return void 0;
+    const items = h.items.flatMap((i) => GithubWakeItem.safeParse(i).success ? [i] : []);
+    const c = h.checks && typeof h.checks === "object" ? h.checks : void 0;
+    const checks = c && (c.verdict === "passing" || c.verdict === "failing") ? {
+      verdict: c.verdict,
+      passed: Number(c.passed) || 0,
+      failed: Number(c.failed) || 0,
+      failing: Array.isArray(c.failing) ? c.failing.filter((x) => typeof x === "string") : []
+    } : void 0;
+    return { items, omitted: Number(h.omitted) || 0, ...checks ? { checks } : {} };
+  }
   function readPrWatchCursor(raw2) {
     try {
       const parsed = raw2 ? JSON.parse(raw2) : null;
       if (!parsed || typeof parsed !== "object") return { seen: [] };
       const seen = Array.isArray(parsed.seen) ? parsed.seen.filter((x) => typeof x === "string") : [];
-      return { seen, checks: typeof parsed.checks === "string" ? parsed.checks : void 0, report: Number(parsed.report) || 0 };
+      const held = readPrWatchHeld(parsed.held);
+      return { seen, checks: typeof parsed.checks === "string" ? parsed.checks : void 0, report: Number(parsed.report) || 0, ...held ? { held } : {} };
     } catch {
       return { seen: [] };
     }
@@ -38812,7 +39130,7 @@ ${clock}`;
         }), `pr-watch ${key} ${st.state}`, nowMs);
         continue;
       }
-      if (waiting) continue;
+      if (waiting && !cursor.held) continue;
       const terminal = st && (st.checks === "passing" || st.checks === "failing") ? st.checks : void 0;
       const stamp = terminal !== void 0 ? `${st?.head ?? "?"}:${terminal}:${st?.failureSig ?? ""}` : void 0;
       const checksChanged = stamp !== void 0 && cursor.checks !== stamp;
@@ -38829,37 +39147,42 @@ ${clock}`;
         return Number.isFinite(landed) && landed > w.created_at;
       });
       const named = fresh.slice(0, REVIEW_STEER_CAP);
-      const reviewSteer = fresh.length > 0 ? formatGithubWakeSteer({
-        ref: key,
-        omitted: fresh.length - named.length,
-        items: [...named].reverse().map((a) => ({
-          label: activityLabel(a),
-          actor: a.actor,
-          bot: isBotGithubActor(a),
-          ...a.at ? { at: a.at } : {},
-          ...a.url ? { url: a.url } : {}
-        }))
-      }) : void 0;
+      const freshItems = [...named].reverse().map((a) => ({
+        label: activityLabel(a),
+        actor: a.actor,
+        bot: isBotGithubActor(a),
+        ...a.at ? { at: a.at } : {},
+        ...a.url ? { url: a.url } : {}
+      }));
       const nextCursor = {
         seen: acts ? [.../* @__PURE__ */ new Set([...cursor.seen, ...acts.map((a) => a.id)])].slice(-REVIEW_SEEN_CAP) : cursor.seen,
         // The STAMP, so the next poll compares against the commit as well as the colour.
         checks: stamp ?? cursor.checks,
         report: cursor.report ?? 0
       };
-      if (!checksChanged && !reviewSteer) {
+      if (!checksChanged && fresh.length === 0) {
         if (JSON.stringify(nextCursor) !== JSON.stringify(cursor)) {
           deps.storage.setPrWatchCursor(w.id, JSON.stringify(nextCursor));
         }
         continue;
       }
       deps.storage.setSnoozedUntil(row.slug, null);
+      const held = waiting ? cursor.held : void 0;
+      const items = [...held?.items ?? [], ...freshItems];
+      const carried = {
+        items: items.slice(-REVIEW_STEER_CAP),
+        omitted: (held?.omitted ?? 0) + (fresh.length - named.length) + Math.max(0, items.length - REVIEW_STEER_CAP),
+        ...checksChanged && terminal ? { checks: { verdict: terminal, passed: st.passed, failed: st.failed, failing: st.failing } } : held?.checks ? { checks: held.checks } : {}
+      };
+      const review = carried.items.length > 0 ? formatGithubWakeSteer({ ref: key, items: carried.items, omitted: carried.omitted }) : void 0;
       const report = nextReport(cursor);
+      if (waiting) outbox.supersede(waiting.id, nowMs, `folded into report ${report}, which says this and everything since`);
       enqueuePrWatchWake(row, w.id, report, prWatchWakeMessage({
         target: key,
-        ...checksChanged && terminal ? { checks: { verdict: terminal, passed: st.passed, failed: st.failed, failing: st.failing } } : {},
-        ...reviewSteer ? { review: reviewSteer } : {}
-      }), `pr-watch ${key}${checksChanged ? ` CI ${terminal}` : ""}${reviewSteer ? " review" : ""}`, nowMs);
-      deps.storage.setPrWatchCursor(w.id, JSON.stringify({ ...nextCursor, report }));
+        ...carried.checks ? { checks: carried.checks } : {},
+        ...review ? { review } : {}
+      }), `pr-watch ${key}${carried.checks ? ` CI ${carried.checks.verdict}` : ""}${review ? " review" : ""}`, nowMs);
+      deps.storage.setPrWatchCursor(w.id, JSON.stringify({ ...nextCursor, report, held: carried }));
     }
   }
   function nextReport(cursor) {
@@ -39085,6 +39408,7 @@ ${clock}`;
       if (tele.authFault) continue;
       if (tele.apiFault) continue;
       if (restMessageIsSignedOff(deps.storage, row.slug, tele, registeredPrWatchesOf(deps.storage, row.slug), armedTimerIdsOf(deps.storage, row.slug))) continue;
+      if (answersInFlight(deps.storage.listThreadQuestions(row.slug), tele.lastUserAt, true) !== void 0) continue;
       const reminder = outbox.get(wakeDeliveryId(row.slug, row.session_id, signoffFenceId(restedAt)));
       if (reminder && reminder.state !== "superseded" && reminder.state !== "exhausted") continue;
       const fenceId = stopHookFenceId(armed.armedAt, restedAt);
@@ -39155,11 +39479,8 @@ ${clock}`;
       const context = deliveryContext(item);
       if (context === "confirmed") {
         outbox.confirm(item.id, nowMs);
-        settleSnooze(item);
-        settleSchedulePrompt(item);
-        settleRestPrompt(item);
-        settleCompactPrompt(item);
-        settleTimer(item);
+        settleDelivered(item);
+        confirmFrame(item, nowMs);
         continue;
       }
       if (context === "superseded") {
@@ -39200,7 +39521,7 @@ ${clock}`;
         }
         continue;
       }
-      if (context !== "current-idle") continue;
+      if (context !== "current-idle" && !heldPastBound(item, context, nowMs)) continue;
       const recovered = outbox.recoverExpired(
         item.id,
         nowMs,
@@ -39215,6 +39536,63 @@ ${clock}`;
       }
     }
   }
+  function settleDelivered(item) {
+    settleSnooze(item);
+    settleSchedulePrompt(item);
+    settleRestPrompt(item);
+    settleCompactPrompt(item);
+    settleTimer(item);
+  }
+  function adoptCompanions(carrier, claimedAt) {
+    if (isQuestionAnswerFenceId(carrier.fenceId)) return [];
+    const adopted = [];
+    for (const sibling of outbox.pendingFor(carrier.slug, carrier.sessionId)) {
+      if (sibling.id === carrier.id || isQuestionAnswerFenceId(sibling.fenceId)) continue;
+      const context = deliveryContext(sibling);
+      if (context === "confirmed") {
+        outbox.confirm(sibling.id, now());
+        settleDelivered(sibling);
+        continue;
+      }
+      if (context === "superseded") {
+        outbox.supersede(sibling.id, now(), "the exact awaiting fence or session was superseded before delivery");
+        settleSnooze(sibling);
+        continue;
+      }
+      if (!isDeliverableNow(sibling, context, claimedAt)) continue;
+      const leased = outbox.adopt(sibling.id, deliveryOwner, claimedAt, claimedAt + deliveryLeaseMs, maxDeliveryAttempts);
+      if (leased) adopted.push(leased);
+    }
+    return adopted;
+  }
+  function mergedWakeMessage(frame, spokeAt) {
+    const sections = [];
+    for (const part of frame) {
+      const body2 = stripWakeTimeHeader(part.message).trim();
+      const same = sections.find((s) => s.reason === part.reason && s.body === body2);
+      if (same) same.count++;
+      else sections.push({ reason: part.reason, body: body2, count: 1 });
+    }
+    const lead = `Frizz held ${frame.length} wakes for this thread and is delivering them together, oldest first. Each is under its own heading; read all of them before acting on any.`;
+    const body = sections.map((s, i) => `### ${i + 1}. ${s.reason}${s.count > 1 ? ` \u2014 ${s.count} identical events` : ""}
+
+${s.body}`);
+    return `${lead}
+
+${body.join("\n\n")}
+
+${wakeTimeHeader(now(), spokeAt)}`;
+  }
+  function confirmFrame(carrier, nowMs) {
+    if (carrier.sentAt === null) return;
+    for (const d of outbox.listOpen()) {
+      if (d.id === carrier.id || d.slug !== carrier.slug || d.sessionId !== carrier.sessionId) continue;
+      if (d.state !== "leased" || d.sentAt !== carrier.sentAt) continue;
+      if (!outbox.confirm(d.id, nowMs)) continue;
+      settleDelivered(d);
+      log3(`waker: delivered ${d.slug} \u2014 ${d.reason} (in the same frame as: ${carrier.reason})`);
+    }
+  }
   async function deliverDue() {
     for (let delivered = 0; delivered < deliveryBatchSize; delivered++) {
       const claimedAt = now();
@@ -39224,11 +39602,7 @@ ${clock}`;
       const context = deliveryContext(item);
       if (context === "confirmed") {
         outbox.confirm(item.id, now());
-        settleSnooze(item);
-        settleSchedulePrompt(item);
-        settleRestPrompt(item);
-        settleCompactPrompt(item);
-        settleTimer(item);
+        settleDelivered(item);
         continue;
       }
       if (context === "superseded") {
@@ -39236,44 +39610,55 @@ ${clock}`;
         settleSnooze(item);
         continue;
       }
-      if (!isDeliverableNow(item, context)) {
+      if (!isDeliverableNow(item, context, claimedAt)) {
         const deferredAt = now();
         outbox.deferFailure(
           item.id,
           deliveryOwner,
           deferredAt,
           deferredAt + Math.max(deliveryLeaseMs, retryDelay(item.attempts)),
-          "delivery deferred until exact awaiting telemetry is idle and available"
+          WAKE_HOLD_DEFERRAL
         );
         continue;
       }
+      const companions = adoptCompanions(item, claimedAt);
+      const frame = [...companions, item].sort((a, b) => a.createdAt - b.createdAt || a.id.localeCompare(b.id));
+      const message = companions.length === 0 ? item.message : mergedWakeMessage(frame, deps.tailer.get(item.slug)?.lastAssistantAt);
+      if (companions.length > 0) {
+        log3(`waker: merged ${frame.length} wakes for ${item.slug} into one delivery \u2014 ${frame.map((d) => d.reason).join("; ")}`);
+      }
       try {
-        await deps.resume(item.slug, item.message, item.id);
+        await deps.resume(item.slug, message, item.id);
       } catch (error) {
-        const message = error instanceof Error ? error.message : String(error);
+        const message2 = error instanceof Error ? error.message : String(error);
         const failedAt = now();
         if (error?.terminalDelivery === true) {
-          outbox.supersede(item.id, failedAt, message);
-          settleSnooze(item);
-          settleTimer(item);
-          log3(`waker: delivery ABANDONED for ${item.slug} (terminal, no retry): ${message}`);
+          for (const d of frame) {
+            outbox.supersede(d.id, failedAt, message2);
+            settleSnooze(d);
+            settleTimer(d);
+          }
+          log3(`waker: delivery ABANDONED for ${item.slug} (terminal, no retry): ${message2}`);
           continue;
         }
-        outbox.deferFailure(
-          item.id,
-          deliveryOwner,
-          failedAt,
-          failedAt + Math.max(deliveryLeaseMs, retryDelay(item.attempts)),
-          message
-        );
-        log3(`waker: delivery FAILED for ${item.slug} (attempt ${item.attempts} of ${maxDeliveryAttempts}): ${message}`);
+        for (const d of frame) {
+          outbox.deferFailure(
+            d.id,
+            deliveryOwner,
+            failedAt,
+            failedAt + Math.max(deliveryLeaseMs, retryDelay(d.attempts)),
+            message2
+          );
+        }
+        log3(`waker: delivery FAILED for ${item.slug} (attempt ${item.attempts} of ${maxDeliveryAttempts}): ${message2}`);
         continue;
       }
       const runtime = deps.wakeRuntimeState?.(item.slug, item.sessionId) ?? "unknown";
       if (runtime !== "unknown") {
         const sentAt = now();
         if (outbox.markSent(item.id, deliveryOwner, sentAt, sentAt + confirmGraceMs)) {
-          settleSignoffNudge(item);
+          for (const d of companions) outbox.markSent(d.id, deliveryOwner, sentAt, sentAt + confirmGraceMs);
+          for (const d of frame) settleSignoffNudge(d);
           log3(`waker: sent ${item.slug} \u2014 ${item.reason}; confirming within ${Math.round(confirmGraceMs / 1e3)}s`);
           checkpoint("after-delivery", item);
           continue;
@@ -39282,16 +39667,15 @@ ${clock}`;
       const retried = item.attempts > 1 ? ` (on attempt ${item.attempts})` : "";
       log3(`waker: delivered ${item.slug} \u2014 ${item.reason}${retried}`);
       checkpoint("after-delivery", item);
-      if (!outbox.acknowledge(item.id, deliveryOwner, now())) {
+      const acked = frame.filter((d) => outbox.acknowledge(d.id, deliveryOwner, now()));
+      if (!acked.includes(item)) {
         log3(`waker: delivery acknowledgement lost ownership for ${item.slug}; preserving the authoritative terminal state`);
-        continue;
       }
-      settleSnooze(item);
-      settleSchedulePrompt(item);
-      settleRestPrompt(item);
-      settleCompactPrompt(item);
-      settleTimer(item);
-      settleSignoffNudge(item);
+      for (const d of acked) {
+        settleDelivered(d);
+        settleSignoffNudge(d);
+      }
+      if (!acked.includes(item)) continue;
       const acknowledged = outbox.get(item.id);
       if (acknowledged) checkpoint("after-ack", acknowledged);
     }
@@ -39412,7 +39796,7 @@ ${clock}`;
     }
   };
 }
-var execFileAsync4, LIMIT_FENCE_PREFIX, LIMIT_HINT_PREFIX, LIMIT_RESUME_GRACE_MS, LIMIT_RESUME_HEADROOM_PERCENT, LIMIT_HEADROOM_MIN_FAULT_AGE_MS, REPORT_FENCE_PREFIX, REPORT_HINT_PREFIX, SNOOZE_FENCE_PREFIX, SNOOZE_HINT_PREFIX, HEARTBEAT_FENCE_PREFIX, HEARTBEAT_HINT_PREFIX, STOP_HOOK_FENCE_PREFIX, STOP_HOOK_HINT_KEY, COMPACT_FENCE_PREFIX, COMPACT_HINT_KEY, TIMER_FENCE_PREFIX, TIMER_HINT_PREFIX, SHELL_FENCE_PREFIX, PR_WATCH_FENCE_PREFIX, PR_WATCH_EXPIRED_FENCE_PREFIX, OWN_WATCH_EXPIRED_FENCE_PREFIX, QUESTION_ANSWER_FENCE_PREFIX, PR_WATCH_POLL_MS, SIGNOFF_FENCE_PREFIX, SIGNOFF_HINT_KEY, SIGNOFF_NUDGE_MAX, PARK_BUMP_MAX, SIGNOFF_NUDGE_SETTING, PARK_FENCE_PREFIX, GITHUB_STATUS_CAP, REVIEW_SEEN_CAP, REVIEW_STEER_CAP, AWAITING_KEY_OF;
+var execFileAsync4, LIMIT_FENCE_PREFIX, LIMIT_HINT_PREFIX, LIMIT_RESUME_GRACE_MS, LIMIT_RESUME_HEADROOM_PERCENT, LIMIT_HEADROOM_MIN_FAULT_AGE_MS, REPORT_FENCE_PREFIX, REPORT_HINT_PREFIX, SNOOZE_FENCE_PREFIX, SNOOZE_HINT_PREFIX, HEARTBEAT_FENCE_PREFIX, HEARTBEAT_HINT_PREFIX, STOP_HOOK_FENCE_PREFIX, STOP_HOOK_HINT_KEY, COMPACT_FENCE_PREFIX, COMPACT_HINT_KEY, TIMER_FENCE_PREFIX, TIMER_HINT_PREFIX, SHELL_FENCE_PREFIX, PR_WATCH_FENCE_PREFIX, PR_WATCH_EXPIRED_FENCE_PREFIX, OWN_WATCH_EXPIRED_FENCE_PREFIX, QUESTION_ANSWER_FENCE_PREFIX, PR_WATCH_POLL_MS, SIGNOFF_FENCE_PREFIX, SIGNOFF_HINT_KEY, SIGNOFF_NUDGE_MAX, PARK_BUMP_MAX, SIGNOFF_NUDGE_SETTING, PARK_FENCE_PREFIX, GITHUB_STATUS_CAP, REVIEW_SEEN_CAP, REVIEW_STEER_CAP, AWAITING_KEY_OF, MID_TURN_HOLD_MAX_MS, WAKE_HOLD_DEFERRAL;
 var init_scheduler = __esm({
   "packages/server/src/scheduler.ts"() {
     "use strict";
@@ -39467,6 +39851,8 @@ var init_scheduler = __esm({
       timer: "timers",
       pr: "prs"
     };
+    MID_TURN_HOLD_MAX_MS = 10 * 6e4;
+    WAKE_HOLD_DEFERRAL = "delivery deferred until exact awaiting telemetry is idle and available";
   }
 });
 
@@ -39546,7 +39932,7 @@ var init_resume = __esm({
 });
 
 // packages/server/src/backend/claude.ts
-import { join as join29 } from "node:path";
+import { join as join30 } from "node:path";
 function toolResultText2(content) {
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
@@ -39615,7 +40001,8 @@ function createClaudeBackend(opts) {
         pluginDir: workerPluginDir(),
         workerPrompt: o.workerContract,
         extraSystemPrompt: o.extraSystemPrompt,
-        frizzMcp: o.frizzMcp
+        frizzMcp: o.frizzMcp,
+        projectMcpServers: (opts.resolveProjectMcpServers ?? projectMcpServers)(o.cwd)
       });
       return { argv, env: claudeWorkerEnvironment(), prewrite: [] };
     },
@@ -39630,12 +40017,13 @@ function createClaudeBackend(opts) {
         pluginDir: workerPluginDir(),
         workerPrompt: o.workerContract,
         extraSystemPrompt: o.extraSystemPrompt,
-        frizzMcp: o.frizzMcp
+        frizzMcp: o.frizzMcp,
+        projectMcpServers: (opts.resolveProjectMcpServers ?? projectMcpServers)(o.cwd)
       });
       return { argv, env: claudeWorkerEnvironment(), prewrite: [] };
     },
     transcriptPath(sessionId) {
-      return join29(opts.logDir, `${sessionId}.jsonl`);
+      return join30(opts.logDir, `${sessionId}.jsonl`);
     },
     parseLine(line) {
       return parseClaudeLine(line);
@@ -39653,6 +40041,7 @@ function createClaudeBackend(opts) {
 var init_claude = __esm({
   "packages/server/src/backend/claude.ts"() {
     "use strict";
+    init_project_mcp_servers();
     init_dispatch();
     init_tailer();
   }
@@ -39805,12 +40194,12 @@ var init_login_utility = __esm({
 
 // packages/server/src/backend/codex-app-server-diagnostics.ts
 import { appendFileSync as appendFileSync3, mkdirSync as mkdirSync14, renameSync as renameSync8, statSync as statSync13 } from "node:fs";
-import { join as join30 } from "node:path";
+import { join as join31 } from "node:path";
 function codexDiagnosticLogPath(stateDir, projectId) {
-  return join30(stateDir, "codex-app-server", `${projectId}.diagnostics.log`);
+  return join31(stateDir, "codex-app-server", `${projectId}.diagnostics.log`);
 }
 function createCodexDiagnosticSink(stateDir, projectId, now = () => /* @__PURE__ */ new Date()) {
-  const dir = join30(stateDir, "codex-app-server");
+  const dir = join31(stateDir, "codex-app-server");
   const path = codexDiagnosticLogPath(stateDir, projectId);
   let ensured = false;
   return (event) => {
@@ -39842,7 +40231,7 @@ var init_codex_app_server_diagnostics = __esm({
 import { execFile as execFile7 } from "node:child_process";
 import { readdirSync as readdirSync8, unlinkSync as unlinkSync4 } from "node:fs";
 import { connect as connectSocket } from "node:net";
-import { join as join31 } from "node:path";
+import { join as join32 } from "node:path";
 function parseLsofSocketNames(stdout) {
   const referenced = /* @__PURE__ */ new Set();
   for (const line of stdout.split("\n")) {
@@ -39859,7 +40248,7 @@ function sweepStaleSockets(options, deps = {}) {
   const keep = new Set(options.keep ?? []);
   let candidates;
   try {
-    candidates = (deps.readdir ?? readdirSync8)(options.dir).filter((name) => name.startsWith(options.prefix) && name.endsWith(".sock")).map((name) => join31(options.dir, name)).filter((path) => !keep.has(path));
+    candidates = (deps.readdir ?? readdirSync8)(options.dir).filter((name) => name.startsWith(options.prefix) && name.endsWith(".sock")).map((name) => join32(options.dir, name)).filter((path) => !keep.has(path));
   } catch {
     return;
   }
@@ -39909,7 +40298,7 @@ var init_stale_socket_sweep = __esm({
 
 // packages/server/src/orphan-reaper.ts
 import { execFileSync as execFileSync5 } from "node:child_process";
-import { readFileSync as readFileSync18 } from "node:fs";
+import { readFileSync as readFileSync19 } from "node:fs";
 import { dirname as dirname12 } from "node:path";
 function firstTokenBasename(command) {
   const first = command.trimStart().split(/\s+/, 1)[0] ?? "";
@@ -40176,7 +40565,7 @@ var init_orphan_reaper = __esm({
     defaultExec = (file, args) => execFileSync5(file, args, { encoding: "utf8", maxBuffer: 16 * 1024 * 1024, timeout: 1e4 });
     defaultReadEnv = (pid) => {
       try {
-        return readFileSync18(`/proc/${pid}/environ`, "utf8");
+        return readFileSync19(`/proc/${pid}/environ`, "utf8");
       } catch {
         return null;
       }
@@ -40323,9 +40712,9 @@ var init_thread_hibernation = __esm({
 });
 
 // packages/server/src/context.ts
-import { join as join32 } from "node:path";
+import { join as join33 } from "node:path";
 import { randomUUID as randomUUID15 } from "node:crypto";
-import { homedir as homedir13 } from "node:os";
+import { homedir as homedir14 } from "node:os";
 function reconcileSessions(storage) {
   for (const row of storage.allSessions()) {
     if (isHeadlessRow(row)) continue;
@@ -40471,9 +40860,9 @@ async function createContext(opts = {}) {
   }
 }
 function createContextUnchecked(opts, resources) {
-  const home = opts.home ?? homedir13();
+  const home = opts.home ?? homedir14();
   const project = opts.project ?? resolveProject();
-  const storage = createStorage(opts.database ?? join32(project.stateDir, "ui.db"), project.id);
+  const storage = createStorage(opts.database ?? join33(project.stateDir, "ui.db"), project.id);
   resources.storage = storage;
   const bus = new Bus();
   const transcriptChange = new Emitter();
@@ -40622,7 +41011,8 @@ function createContextUnchecked(opts, resources) {
     // The frizz worker environment — the SDK equivalent of the CLI argv's --plugin-dir / --mcp-config.
     // Computed ONCE here (constant per project) and applied on every broker fork so a broker worker
     // gets the frizz sub-agent profiles, the frizz MCP server (the only one frizz mounts), and the
-    // cc-worker hooks. A project's own `.mcp.json` servers load on top of these, not through them.
+    // cc-worker hooks. The project's own `.mcp.json` servers are merged in by the broker daemon at each
+    // fork (project-mcp-servers.ts): under `--strict-mcp-config` nothing mounts that frizz did not hand over.
     workerEnv: {
       pluginDir: workerPluginDir(),
       ...claudeMcpConfig(resolveFrizzMcp(frizzMcpTarget)),
@@ -40765,6 +41155,8 @@ ${wakeDeliveryToken(deliveryId)}`;
             Date.now(),
             (tailer.get(slug)?.subAgents ?? []).some((agent) => agent.state === "running")
           )
+        }).then(() => {
+          if (row.exited === 1) storage.setExitedIfCurrent(slug, row.session_id, row.runtime_generation ?? 0, false);
         });
       }
       resumeThread(
@@ -43523,7 +43915,7 @@ var init_server = __esm({
 });
 
 // packages/server/src/repair.ts
-import { existsSync as existsSync11, readFileSync as readFileSync19, writeFileSync as writeFileSync11 } from "node:fs";
+import { existsSync as existsSync11, readFileSync as readFileSync20, writeFileSync as writeFileSync11 } from "node:fs";
 import { basename as basename7, dirname as dirname13, resolve as resolve7 } from "node:path";
 function quoteValue(v) {
   if (/^[\w./#:+-]+$/.test(v)) return v;
@@ -43539,7 +43931,7 @@ function repairThreadFile(frizzDir, file) {
   if (dirname13(abs) !== root) throw new RepairError(`refusing to repair "${file}": not directly under .frizz/`);
   if (!abs.endsWith(".md")) throw new RepairError(`refusing to repair "${file}": not a .md thread file`);
   if (!existsSync11(abs)) throw new RepairError(`no thread file to repair: ${basename7(abs)}`);
-  const content = readFileSync19(abs, "utf8");
+  const content = readFileSync20(abs, "utf8");
   const firstLine2 = content.replace(/^/, "").split(/\r?\n/).find((l) => l.trim() !== "");
   if (firstLine2?.trim() === "---") {
     throw new RepairError(`${basename7(abs)} already opens with a "---" block \u2014 repair only heals a MISSING frontmatter block`);
@@ -43617,7 +44009,7 @@ var init_edited_files = __esm({
 });
 
 // cc-worker/hooks/bash-background.mjs
-import { readFileSync as readFileSync20 } from "node:fs";
+import { readFileSync as readFileSync21 } from "node:fs";
 import { basename as basename8 } from "node:path";
 import { pathToFileURL } from "node:url";
 function emit(obj) {
@@ -43766,7 +44158,7 @@ var init_bash_background = __esm({
     if (isDirectHookExecution(process.argv[1], import.meta.url)) {
       try {
         const env = process.argv.includes("--frizz-thread") ? { ...process.env, FRIZZ_THREAD: process.env.FRIZZ_THREAD || "codex-worker" } : process.env;
-        emit(evaluateBashBackgroundHook(JSON.parse(readFileSync20(0, "utf8")), env));
+        emit(evaluateBashBackgroundHook(JSON.parse(readFileSync21(0, "utf8")), env));
       } catch {
         emit({});
       }
@@ -43775,11 +44167,11 @@ var init_bash_background = __esm({
 });
 
 // packages/server/src/transcript.ts
-import { closeSync as closeSync13, existsSync as existsSync12, fstatSync as fstatSync3, mkdirSync as mkdirSync15, openSync as openSync14, readdirSync as readdirSync9, readFileSync as readFileSync21, readSync as readSync7, renameSync as renameSync9, statSync as statSync14, unlinkSync as unlinkSync5, writeFileSync as writeFileSync12 } from "node:fs";
+import { closeSync as closeSync13, existsSync as existsSync12, fstatSync as fstatSync3, mkdirSync as mkdirSync15, openSync as openSync14, readdirSync as readdirSync9, readFileSync as readFileSync22, readSync as readSync7, renameSync as renameSync9, statSync as statSync14, unlinkSync as unlinkSync5, writeFileSync as writeFileSync12 } from "node:fs";
 import { createHash as createHash13 } from "node:crypto";
 import { StringDecoder as StringDecoder4 } from "node:string_decoder";
-import { join as join33 } from "node:path";
-import { homedir as homedir14 } from "node:os";
+import { join as join34 } from "node:path";
+import { homedir as homedir15 } from "node:os";
 function formatTokens(n) {
   if (n >= 1e6) return `${(n / 1e6).toFixed(1)}M`;
   if (n >= 1e3) return `${Math.round(n / 1e3)}k`;
@@ -44329,18 +44721,18 @@ function looksLikeImage(buf, ext) {
 }
 function pruneScreenshotCache() {
   try {
-    const entries = readdirSync9(SCREENSHOT_CACHE_DIR).filter((n) => !n.startsWith("."));
-    if (entries.length <= SCREENSHOT_CACHE_MAX) return;
-    const byMtime = entries.map((n) => {
+    const entries2 = readdirSync9(SCREENSHOT_CACHE_DIR).filter((n) => !n.startsWith("."));
+    if (entries2.length <= SCREENSHOT_CACHE_MAX) return;
+    const byMtime = entries2.map((n) => {
       try {
-        return { n, m: statSync14(join33(SCREENSHOT_CACHE_DIR, n)).mtimeMs };
+        return { n, m: statSync14(join34(SCREENSHOT_CACHE_DIR, n)).mtimeMs };
       } catch {
         return { n, m: 0 };
       }
     }).sort((a, b) => b.m - a.m);
     for (const { n } of byMtime.slice(SCREENSHOT_CACHE_MAX)) {
       try {
-        unlinkSync5(join33(SCREENSHOT_CACHE_DIR, n));
+        unlinkSync5(join34(SCREENSHOT_CACHE_DIR, n));
       } catch {
       }
     }
@@ -44370,14 +44762,14 @@ function persistBase64Image(mediaType, data, idKey) {
   const ext = IMAGE_MEDIA_EXT[typeof mediaType === "string" ? mediaType.toLowerCase() : ""];
   if (!ext || !data) return void 0;
   const name = createHash13("sha256").update(idKey).digest("hex").slice(0, 32);
-  const path = join33(SCREENSHOT_CACHE_DIR, `${name}.${ext}`);
+  const path = join34(SCREENSHOT_CACHE_DIR, `${name}.${ext}`);
   try {
     if (existsSync12(path)) return path;
     if (data.length > SCREENSHOT_MAX_BASE64) return void 0;
     const buf = Buffer.from(data, "base64");
     if (buf.length === 0 || !looksLikeImage(buf, ext)) return void 0;
     mkdirSync15(SCREENSHOT_CACHE_DIR, { recursive: true });
-    const tmp = join33(SCREENSHOT_CACHE_DIR, `.${name}.${process.pid}.${screenshotTmpSeq++}.tmp`);
+    const tmp = join34(SCREENSHOT_CACHE_DIR, `.${name}.${process.pid}.${screenshotTmpSeq++}.tmp`);
     writeFileSync12(tmp, buf);
     renameSync9(tmp, path);
     pruneScreenshotCache();
@@ -44392,14 +44784,14 @@ function persistSentFile(srcPath, idKey) {
   const outExt = ext === "jpeg" ? "jpg" : ext;
   try {
     const name = createHash13("sha256").update(idKey).digest("hex").slice(0, 32);
-    const dest = join33(SCREENSHOT_CACHE_DIR, `${name}.${outExt}`);
+    const dest = join34(SCREENSHOT_CACHE_DIR, `${name}.${outExt}`);
     if (existsSync12(dest)) return dest;
     const size = statSync14(srcPath).size;
     if (size === 0 || size > SENT_IMAGE_MAX_BYTES) return void 0;
-    const buf = readFileSync21(srcPath);
+    const buf = readFileSync22(srcPath);
     if (!looksLikeImage(buf, outExt)) return void 0;
     mkdirSync15(SCREENSHOT_CACHE_DIR, { recursive: true });
-    const tmp = join33(SCREENSHOT_CACHE_DIR, `.${name}.${process.pid}.${screenshotTmpSeq++}.tmp`);
+    const tmp = join34(SCREENSHOT_CACHE_DIR, `.${name}.${process.pid}.${screenshotTmpSeq++}.tmp`);
     writeFileSync12(tmp, buf);
     renameSync9(tmp, dest);
     pruneScreenshotCache();
@@ -44837,7 +45229,7 @@ function readTranscript(project, sessionId) {
 }
 function verifyIncrementalParse(path, identityPrefix, incremental) {
   try {
-    const fresh = parseTranscript(readFileSync21(path, "utf8"), identityPrefix);
+    const fresh = parseTranscript(readFileSync22(path, "utf8"), identityPrefix);
     const a = JSON.stringify(incremental);
     const b = JSON.stringify(fresh);
     if (a !== b) {
@@ -44857,16 +45249,16 @@ function verifyIncrementalParse(path, identityPrefix, incremental) {
   }
 }
 function logDirOf(project) {
-  return join33(homedir14(), ".claude", "projects", project.cwdSlug);
+  return join34(homedir15(), ".claude", "projects", project.cwdSlug);
 }
 function resolveTranscriptPath(project, sessionId) {
-  const path = join33(logDirOf(project), `${sessionId}.jsonl`);
+  const path = join34(logDirOf(project), `${sessionId}.jsonl`);
   try {
     if (statSync14(path).size > 0) return path;
   } catch {
   }
   const stranded = discoverTranscriptDir(logDirOf(project), sessionId);
-  return stranded ? join33(stranded, `${sessionId}.jsonl`) : path;
+  return stranded ? join34(stranded, `${sessionId}.jsonl`) : path;
 }
 function projectCodexTranscript(raw2, identityPrefix = "codex") {
   const out = [];
@@ -45395,10 +45787,10 @@ function wrappedInvocations(source) {
     let open = nameStart + name.length;
     while (/\s/.test(source[open] ?? "")) open++;
     if (source[open] !== "(") continue;
-    const close = matchingParen(source, open);
-    if (close === -1) break;
-    out.push({ name, args: source.slice(open + 1, close).trim() });
-    i = close;
+    const close2 = matchingParen(source, open);
+    if (close2 === -1) break;
+    out.push({ name, args: source.slice(open + 1, close2).trim() });
+    i = close2;
   }
   return out;
 }
@@ -46074,7 +46466,7 @@ function readEarlierThreadTranscriptPage(project, storage, slug, cursor, backend
 }
 function readCodexTranscriptFile(absPath, nativeId = absPath) {
   try {
-    return parseCodexTranscript(readFileSync21(absPath, "utf8"), `codex:${nativeId}`);
+    return parseCodexTranscript(readFileSync22(absPath, "utf8"), `codex:${nativeId}`);
   } catch {
     return [];
   }
@@ -46172,7 +46564,7 @@ function projectTranscriptPageAgentLifecycles(page, lookup, peerLookup) {
 function readTranscriptFile(absPath) {
   try {
     const pathKey = createHash13("sha256").update(absPath).digest("base64url").slice(0, 16);
-    return parseTranscript(readFileSync21(absPath, "utf8"), `claude-file:${pathKey}`);
+    return parseTranscript(readFileSync22(absPath, "utf8"), `claude-file:${pathKey}`);
   } catch {
     return [];
   }
@@ -46271,9 +46663,9 @@ var init_open_external = __esm({
 
 // packages/server/src/local-file.ts
 import { spawn as spawn6 } from "node:child_process";
-import { readFileSync as readFileSync22, realpathSync as realpathSync8, statSync as statSync15 } from "node:fs";
-import { homedir as homedir15 } from "node:os";
-import { isAbsolute as isAbsolute4, join as join34, resolve as resolve8, sep as sep2 } from "node:path";
+import { readFileSync as readFileSync23, realpathSync as realpathSync8, statSync as statSync15 } from "node:fs";
+import { homedir as homedir16 } from "node:os";
+import { isAbsolute as isAbsolute4, join as join35, resolve as resolve8, sep as sep2 } from "node:path";
 function isUnder(real, root) {
   let rootReal;
   try {
@@ -46300,10 +46692,10 @@ function resolveLocalFile(rawPath, roots) {
   }
   return real;
 }
-function resolveOpenableFile(raw2, projectDir, roots, home = homedir15()) {
+function resolveOpenableFile(raw2, projectDir, roots, home = homedir16()) {
   const trimmed = raw2.trim().replace(/:\d+(?::\d+)?$/, "");
   if (!trimmed) return null;
-  const abs = trimmed === "~" ? home : trimmed.startsWith("~/") ? join34(home, trimmed.slice(2)) : isAbsolute4(trimmed) ? trimmed : resolve8(projectDir, trimmed);
+  const abs = trimmed === "~" ? home : trimmed.startsWith("~/") ? join35(home, trimmed.slice(2)) : isAbsolute4(trimmed) ? trimmed : resolve8(projectDir, trimmed);
   try {
     return resolveLocalFile(abs, roots);
   } catch {
@@ -46312,7 +46704,7 @@ function resolveOpenableFile(raw2, projectDir, roots, home = homedir15()) {
 }
 function readLocalTextFile(rawPath, roots) {
   const path = resolveLocalFile(rawPath, roots);
-  const bytes = readFileSync22(path);
+  const bytes = readFileSync23(path);
   if (bytes.subarray(0, 8192).includes(0)) throw new Error("Local file is not a text file");
   if (bytes.length <= MARKDOWN_READ_LIMIT) return { path, text: bytes.toString("utf8"), truncated: false };
   const head = bytes.subarray(0, MARKDOWN_READ_LIMIT);
@@ -46323,12 +46715,19 @@ function readLocalMarkdown(rawPath, roots) {
   if (!MARKDOWN_FILE_EXT.test(rawPath.trim())) throw new Error("Local file is not a Markdown file");
   const path = resolveLocalFile(rawPath, roots);
   if (!MARKDOWN_FILE_EXT.test(path)) throw new Error("Local file is not a Markdown file");
-  const bytes = readFileSync22(path);
+  const bytes = readFileSync23(path);
   if (bytes.length <= MARKDOWN_READ_LIMIT) return { path, markdown: bytes.toString("utf8"), truncated: false };
   const head = bytes.subarray(0, MARKDOWN_READ_LIMIT);
   const lastBreak = head.lastIndexOf(10);
   return { path, markdown: head.subarray(0, lastBreak > 0 ? lastBreak : head.length).toString("utf8"), truncated: true };
 }
+function resolveWatchableLocalFile(rawPath, roots) {
+  const path = resolveLocalFile(rawPath, roots);
+  if (MARKDOWN_FILE_EXT.test(rawPath.trim()) && !MARKDOWN_FILE_EXT.test(path)) {
+    throw new Error("Local file is not a Markdown file");
+  }
+  return path;
+}
 function defaultSpawn(command, args, options) {
   return spawn6(command, [...args], options);
 }
@@ -47022,12 +47421,12 @@ var init_directory_picker = __esm({
 });
 
 // packages/server/src/router.ts
-import { readFileSync as readFileSync23, statSync as statSync17 } from "node:fs";
-import { join as join35, resolve as resolve9 } from "node:path";
+import { readFileSync as readFileSync24, statSync as statSync17 } from "node:fs";
+import { join as join36, resolve as resolve9 } from "node:path";
 import { randomUUID as randomUUID16 } from "node:crypto";
 import { basename as basename9, dirname as dirname14 } from "node:path";
 import { existsSync as existsSync13, mkdirSync as mkdirSync16, rmSync as rmSync10, writeFileSync as writeFileSync13 } from "node:fs";
-import { homedir as homedir16 } from "node:os";
+import { homedir as homedir17 } from "node:os";
 function validateGithubDispatchProfile(input) {
   validateThreadProfile(input.backend, input.model, input.effort);
 }
@@ -47122,6 +47521,10 @@ function holdOps(ops) {
     state: op.state
   }));
 }
+function cutOffHold(telemetry) {
+  if (telemetry?.turn !== "in-flight") return void 0;
+  return { turnInFlight: true, cutOff: true, unobservable: false, subAgents: [], subAgentCount: 0, bgShells: [], bgShellCount: 0 };
+}
 async function completeRegisteredThread(storage, row, terminateLive, runtime = cachedLivenessTerminator, telemetry, codex, claudeBroker) {
   const binding = adoptionRuntimeBinding(storage, row);
   if (binding.kind === "conflict") {
@@ -47130,7 +47533,7 @@ async function completeRegisteredThread(storage, row, terminateLive, runtime = c
   const appServerCodex = isAppServerCodexRow(row);
   const brokerClaude = isBrokerClaudeRow(row);
   const live = brokerClaude ? claudeBroker?.isDaemonAlive(row.session_id) ?? false : appServerCodex ? appServerCodexTurnLive(codex, row) : false;
-  const hold = live && !terminateLive ? completionConfirmationHold(telemetry) : void 0;
+  const hold = terminateLive ? void 0 : live ? completionConfirmationHold(telemetry) : cutOffHold(telemetry);
   if (hold) return { needsConfirmation: true, hold };
   if (live) {
     await stopThreadRuntime(storage, row, runtime, codex, claudeBroker);
@@ -47183,10 +47586,10 @@ function projectCard(entry, stale) {
     iconIsCustom: entry.iconSource === "custom" ? true : void 0
   };
 }
-function addProjectAtPath(input) {
+function addProjectAtPath(input, home = homedir17()) {
   const typed = input.trim();
   if (!typed) throw new Error("Enter a folder path.");
-  const expanded = typed === "~" || typed.startsWith("~/") ? join35(homedir16(), typed.slice(1)) : typed;
+  const expanded = typed === "~" || typed.startsWith("~/") ? join36(home, typed.slice(1)) : typed;
   const absolute = resolve9(expanded);
   let stats;
   try {
@@ -47195,12 +47598,13 @@ function addProjectAtPath(input) {
     throw new Error(`No folder at ${absolute}`);
   }
   if (!stats.isDirectory()) throw new Error(`That is a file, not a folder: ${absolute}`);
-  const root = discoverProjectRoot(absolute);
-  const id = ensureProjectIdFile(root, homedir16(), existingProjectId(root));
+  const root = chosenProjectRoot(absolute, home);
+  if (isHomeDirectory(root, home)) throw new Error("The home folder cannot be a project \u2014 choose a folder inside it.");
+  const id = ensureProjectIdFile(root, home, existingProjectId(root));
   const remoteOwner = resolveProjectLabel(root)?.split("/")[0];
-  let registered = registerProject({ dir: root, id, remoteOwner });
+  let registered = registerProject({ dir: root, id, remoteOwner }, home);
   if (registered.action === "duplicate") {
-    registered = registerProject({ dir: root, id: writeProjectIdFile(root, randomUUID16()), remoteOwner });
+    registered = registerProject({ dir: root, id: writeProjectIdFile(root, randomUUID16()), remoteOwner }, home);
   }
   if (!registered.entry) throw new Error("Could not register that folder.");
   return projectCard(registered.entry, false);
@@ -47231,7 +47635,7 @@ function storeProjectIcon(id, name, bytes) {
 function setProjectIconFromFile(id, file) {
   let bytes;
   try {
-    bytes = readFileSync23(file);
+    bytes = readFileSync24(file);
   } catch {
     throw new Error("That file could not be read.");
   }
@@ -47239,7 +47643,7 @@ function setProjectIconFromFile(id, file) {
   return storeProjectIcon(id, file, bytes);
 }
 function createRouter(ctx) {
-  const frizzDir = join35(ctx.project.dir, ".frizz");
+  const frizzDir = join36(ctx.project.dir, ".frizz");
   const openRoots = openableFileRoots(ctx.project);
   function isAutoTitledSession(slug) {
     return ctx.storage.getSession(slug)?.title_auto === 1;
@@ -47390,6 +47794,9 @@ function createRouter(ctx) {
     if (row.claude_runtime !== "broker" || !ctx.claudeBroker) {
       return blocked("Steering a sub-agent needs the Claude session broker; this thread predates it.");
     }
+    if (ctx.tailer.get(slug)?.turn === "in-flight") {
+      return blocked("The thread is working on its own turn right now, and a steer sent mid-turn is delivered to the thread instead of this sub-agent. The box comes back when the thread rests.");
+    }
     return { sessionId: row.session_id };
   }
   function codexShellTarget(slug, id) {
@@ -47644,9 +48051,10 @@ function createRouter(ctx) {
     //
     // WHY THE GATE IS STRICT. Measured live: addressing a child that has ALREADY SETTLED does not
     // error and does not vanish — the CLI falls the message back onto the MAIN thread, where the
-    // parent obeys it as if the operator had typed it into the thread composer. So an ungated steer
-    // is not a no-op, it is a misdelivery. `subAgentSteerable` is the single predicate that decides,
-    // and the drawer's prompt box is rendered off the same answer.
+    // parent obeys it as if the operator had typed it into the thread composer. A steer sent while
+    // the parent's own turn is IN FLIGHT misdelivers the same way (absorbed into that turn — see the
+    // predicate). So an ungated steer is not a no-op, it is a misdelivery. `subAgentSteerable` is the
+    // single predicate that decides, and the drawer's prompt box is rendered off the same answer.
     subAgentSteer: mutation({
       input: external_exports.object({ slug: ThreadSlug, id: external_exports.string(), message: external_exports.string().min(1), deliveryId: external_exports.string().optional() }).strict(),
       output: external_exports.object({ delivered: external_exports.boolean() }),
@@ -47915,6 +48323,7 @@ ${gapNote}` : input.message;
               mayHaveLiveBackgroundWork(ctx.tailer.get(input.slug))
             )
           });
+          if (row.exited === 1) ctx.storage.setExitedIfCurrent(input.slug, row.session_id, row.runtime_generation ?? 0, false);
           if (input.freshProcess) retireOutstandingDeliveries(ctx.storage, input.slug);
           const preempted = input.interrupt === true && bridge.interruptTurn({ threadSlug: input.slug, sessionId: row.session_id });
           if (input.deliveryId) {
@@ -48191,6 +48600,19 @@ ${gapNote}` : input.message;
         ctx.board.refresh();
       }
     }),
+    // Pin/unpin: the human lifts a thread out of the rail's band system into the pinned band at the
+    // very top (or drops it back in). Same editability gate as the snooze, but NO archived refusal —
+    // the pin deliberately outranks Done, so a pinned thread that finishes stays pinned until unpinned.
+    setThreadPinned: mutation({
+      input: SetThreadPinnedInput,
+      handler: async ({ input }) => {
+        currentOwnedSession(input.slug, input.sessionId);
+        const thread = (await ctx.board.snapshot()).threads.find((candidate) => candidate.id === input.slug);
+        if (!thread || thread.kind !== "session" || thread.foreign) throw new Error(`thread ${input.slug} is not editable`);
+        ctx.storage.setPinnedAt(input.slug, input.pinned ? (/* @__PURE__ */ new Date()).toISOString() : null);
+        ctx.board.refresh();
+      }
+    }),
     // Re-read the worker plugin closure INTO the live session: hooks, skills, agent profiles and MCP
     // servers, without restarting the process. This is `/reload-plugins` driven from the board.
     //
@@ -48239,7 +48661,7 @@ ${gapNote}` : input.message;
           throw new Error("This thread moved on; reopen it and try again");
         }
         if (input.stopHook && input.prompt?.trim() && autonomousGoal(row) === void 0) {
-          cancelQuestionsForAutonomy(input.slug);
+          if (cancelQuestionsForAutonomy(input.slug) > 0) ctx.scheduler.kick();
         }
         ctx.board.refresh();
       }
@@ -48271,7 +48693,7 @@ ${gapNote}` : input.message;
           throw new Error(`thread ${input.slug} could not be updated`);
         }
         if (input.stopHook && input.prompt?.trim() && autonomousGoal(row) === void 0) {
-          cancelQuestionsForAutonomy(input.slug);
+          if (cancelQuestionsForAutonomy(input.slug) > 0) ctx.scheduler.kick();
         }
         ctx.board.refresh();
         return { replaced };
@@ -48431,14 +48853,19 @@ ${gapNote}` : input.message;
         const armed = ctx.storage.listPrWatches(input.slug, { armedOnly: true });
         const existing = armed.find((w) => w.owner === ref.owner && w.repo === ref.repo && w.number === ref.number);
         const target = `${ref.owner}/${ref.repo}#${ref.number}`;
-        if (existing) return { id: existing.id, target, alreadyArmed: true, watches: armedPrWatchViews(input.slug) };
+        if (existing) {
+          const expiresAt = new Date(existing.expires_at ?? Date.now()).toISOString();
+          return { id: existing.id, target, alreadyArmed: true, expiresAt, watches: armedPrWatchViews(input.slug) };
+        }
         if (armed.length >= PR_WATCH_MAX_ARMED) {
           throw new Error(`this thread already watches ${armed.length} pull requests (the limit is ${PR_WATCH_MAX_ARMED}) \u2014 drop one first`);
         }
-        const forMs = input.for === void 0 ? PR_WATCH_DEFAULT_FOR_MS : parseAwaitingDuration(input.for);
-        if (forMs === null) {
-          throw new Error(`\`for: ${input.for}\` is not a duration \u2014 give one like \`30m\`, \`2h\` or \`3d\` (max 24h)`);
+        const asked = input.for === void 0 ? PR_WATCH_DEFAULT_FOR_MS : parseAwaitingDurationRaw(input.for);
+        if (asked === null) {
+          throw new Error(`\`for: ${input.for}\` is not a duration \u2014 give one like \`2h\`, \`3d\` or \`180d\` (max 365d)`);
         }
+        const forMs = Math.min(asked, PR_WATCH_FOR_MAX_MS);
+        const clampedFrom = input.for !== void 0 && asked > PR_WATCH_FOR_MAX_MS ? { clampedFrom: input.for } : {};
         const probe = await ctx.probePr(ref);
         if (!probe.ok) {
           throw new Error(
@@ -48450,7 +48877,7 @@ ${gapNote}` : input.message;
         ctx.storage.clearThreadDone(input.slug);
         ctx.storage.armPrWatch({ id, slug: input.slug, owner: ref.owner, repo: ref.repo, number: ref.number, createdAtMs: now, expiresAtMs: now + forMs });
         ctx.board.refresh();
-        return { id, target, alreadyArmed: false, watches: armedPrWatchViews(input.slug) };
+        return { id, target, alreadyArmed: false, expiresAt: new Date(now + forMs).toISOString(), ...clampedFrom, watches: armedPrWatchViews(input.slug) };
       }
     }),
     dropOwnPrWatch: mutation({
@@ -48495,16 +48922,18 @@ ${gapNote}` : input.message;
         if (armed.length >= OWN_WATCH_MAX_ARMED) {
           throw new Error(`this thread already holds ${armed.length} watches (the limit is ${OWN_WATCH_MAX_ARMED}) \u2014 drop one first`);
         }
-        const forMs = parseAwaitingDuration(input.for);
-        if (forMs === null) {
+        const asked = parseAwaitingDurationRaw(input.for);
+        if (asked === null) {
           throw new Error(`\`for: ${input.for}\` is not a duration \u2014 give one like \`30m\`, \`2h\` or \`3d\` (max 24h)`);
         }
+        const forMs = Math.min(asked, AWAITING_FOR_MAX_MS);
+        const clampedFrom = asked > AWAITING_FOR_MAX_MS ? { clampedFrom: input.for } : {};
         const now = Date.now();
         const id = `wch_${randomUUID16().replace(/-/g, "").slice(0, 12)}`;
         ctx.storage.clearThreadDone(input.slug);
         ctx.storage.armThreadWatch({ id, slug: input.slug, kind: input.kind, target, createdAtMs: now, expiresAtMs: now + forMs });
         ctx.board.refresh();
-        return { id, kind: input.kind, target, alreadyArmed: false, watches: armedOwnWatchViews(input.slug) };
+        return { id, kind: input.kind, target, alreadyArmed: false, ...clampedFrom, watches: armedOwnWatchViews(input.slug) };
       }
     }),
     dropOwnWatch: mutation({
@@ -48547,12 +48976,6 @@ Say which way you went and why in your write-up, so the human can course-correct
         }
         const faults = input.questions.flatMap((q) => askedQuestionFaults(q));
         if (faults.length > 0) throw new Error(faults.join("\n"));
-        const open = ctx.storage.listThreadQuestions(input.slug, { openOnly: true });
-        if (open.length + input.questions.length > ASK_MAX_OPEN) {
-          throw new Error(
-            `this thread already has ${open.length} unanswered question(s); the limit is ${ASK_MAX_OPEN}. Withdraw the ones you no longer need answered with \`unask\`, or decide them yourself.`
-          );
-        }
         const now = Date.now();
         const registered = input.questions.map((spec) => {
           const id = `qst_${randomUUID16().replace(/-/g, "").slice(0, 12)}`;
@@ -48787,12 +49210,13 @@ Say which way you went and why in your write-up, so the human can course-correct
       output: external_exports.object({ path: external_exports.string(), markdown: external_exports.string(), truncated: external_exports.boolean() }),
       handler: async ({ input }) => readLocalMarkdown(input.path, openRoots)
     }),
-    // A project file's SOURCE, for the fullscreen page's file viewer. Rooted at the project directory
-    // ONLY — see readLocalTextFile for why this gate is narrower than openRoots.
+    // A file's SOURCE, for the fullscreen page's file viewer. The SAME openable roots as the Markdown
+    // reader — see readLocalTextFile for why the project-directory-only gate this replaced refused 41%
+    // of the rail's own rows (a worker's checkout is very often a worktree outside the project dir).
     localFile: query({
       input: external_exports.object({ path: external_exports.string().max(4096) }).strict(),
       output: external_exports.object({ path: external_exports.string(), text: external_exports.string(), truncated: external_exports.boolean() }),
-      handler: async ({ input }) => readLocalTextFile(input.path, [ctx.project.dir])
+      handler: async ({ input }) => readLocalTextFile(input.path, openRoots)
     }),
     // Batch-classify path REFERENCES (as they appear in inline code) → their canonical openable path, or
     // null when a candidate doesn't resolve to a real file under the openable roots. The client renders
@@ -49191,8 +49615,8 @@ Say which way you went and why in your write-up, so the human can course-correct
      * Register a directory as a project, from the grid's phantom card.
      *
      * The same authority as running `frizz` in that directory, and strictly less: this registers and
-     * resolves an id, it dispatches nothing. Everything it does — walk up to the project root, mint or
-     * adopt `.frizz/.id`, write the index — is what the CLI already does on every launch.
+     * resolves an id, it dispatches nothing. The root comes from chosenProjectRoot — a folder inside
+     * a checkout adds the checkout, but an adopted plain-directory ancestor never captures the pick.
      */
     projectAdd: mutation({
       input: external_exports.object({ path: external_exports.string().min(1) }),
@@ -49573,7 +49997,7 @@ var init_compression = __esm({
 });
 
 // packages/server/src/local-image.ts
-import { readFileSync as readFileSync24, realpathSync as realpathSync9, statSync as statSync18 } from "node:fs";
+import { readFileSync as readFileSync25, realpathSync as realpathSync9, statSync as statSync18 } from "node:fs";
 import { extname as extname2, isAbsolute as isAbsolute5 } from "node:path";
 function resolveLocalImage(rawPath) {
   if (!rawPath || !isAbsolute5(rawPath)) return { status: 400 };
@@ -49587,7 +50011,7 @@ function resolveLocalImage(rawPath) {
   }
   try {
     if (!statSync18(real).isFile()) return { status: 404 };
-    return { status: 200, contentType, body: readFileSync24(real) };
+    return { status: 200, contentType, body: readFileSync25(real) };
   } catch {
     return { status: 404 };
   }
@@ -49607,9 +50031,9 @@ var init_local_image = __esm({
 });
 
 // packages/server/src/project-icon.ts
-import { readFileSync as readFileSync25, readdirSync as readdirSync10, realpathSync as realpathSync10, statSync as statSync19 } from "node:fs";
-import { homedir as homedir17 } from "node:os";
-import { basename as basename10, dirname as dirname15, extname as extname3, join as join36, relative as relative2, sep as sep3 } from "node:path";
+import { readFileSync as readFileSync26, readdirSync as readdirSync10, realpathSync as realpathSync10, statSync as statSync19 } from "node:fs";
+import { homedir as homedir18 } from "node:os";
+import { basename as basename10, dirname as dirname15, extname as extname3, join as join37, relative as relative2, sep as sep3 } from "node:path";
 function normalizeStem(stem) {
   const sized = stem.toLowerCase().replace(/[@-]\d+(\.\d+)?x(\d+)?$/u, "").replace(/[-_]\d{2,4}$/u, "");
   const normalized = sized.replace(VARIANT_SUFFIX, "");
@@ -49627,7 +50051,7 @@ function sizeScore(dimensions) {
   return Math.max(0, Math.min(40, Math.round(Math.log2(edge / 24) * 8)));
 }
 function under(root, relativeDirectory) {
-  return relativeDirectory ? join36(root, relativeDirectory) : root;
+  return relativeDirectory ? join37(root, relativeDirectory) : root;
 }
 function listFiles(directory) {
   try {
@@ -49649,19 +50073,19 @@ function iconDirectories(root) {
   for (const asset of ASSET_DIRECTORIES) directories.push(under(root, asset));
   for (const host of HOST_DIRECTORIES) {
     if (!children2.has(host)) continue;
-    for (const asset of ASSET_DIRECTORIES) directories.push(under(join36(root, host), asset));
+    for (const asset of ASSET_DIRECTORIES) directories.push(under(join37(root, host), asset));
   }
   for (const extra of EXTRA_DIRECTORIES) directories.push(under(root, extra));
   for (const container of WORKSPACE_CONTAINERS) {
     if (!children2.has(container)) continue;
     let members;
     try {
-      members = readdirSync10(join36(root, container), { withFileTypes: true }).filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).map((entry) => entry.name);
+      members = readdirSync10(join37(root, container), { withFileTypes: true }).filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).map((entry) => entry.name);
     } catch {
       continue;
     }
     for (const member of members) {
-      for (const asset of ASSET_DIRECTORIES) directories.push(under(join36(root, container, member), asset));
+      for (const asset of ASSET_DIRECTORIES) directories.push(under(join37(root, container, member), asset));
     }
   }
   return [...new Set(directories)];
@@ -49669,13 +50093,13 @@ function iconDirectories(root) {
 function manifestIcons(manifestPath) {
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync25(manifestPath, "utf8"));
+    parsed = JSON.parse(readFileSync26(manifestPath, "utf8"));
   } catch {
     return [];
   }
   if (!Array.isArray(parsed?.icons)) return [];
   const directory = dirname15(manifestPath);
-  return parsed.icons.map((icon) => typeof icon?.src === "string" ? icon.src : void 0).filter((src) => !!src && !/^(https?:)?\/\//u.test(src) && !src.startsWith("data:")).map((src) => join36(directory, src.replace(/[?#].*$/u, "").replace(/^\//u, "")));
+  return parsed.icons.map((icon) => typeof icon?.src === "string" ? icon.src : void 0).filter((src) => !!src && !/^(https?:)?\/\//u.test(src) && !src.startsWith("data:")).map((src) => join37(directory, src.replace(/[?#].*$/u, "").replace(/^\//u, "")));
 }
 function projectIconCandidates(root) {
   const projectStem = normalizeStem(basename10(root)).normalized;
@@ -49694,7 +50118,7 @@ function projectIconCandidates(root) {
     for (const name of listFiles(directory)) {
       const extension2 = extname3(name).toLowerCase();
       if (MANIFEST_NAMES.includes(name.toLowerCase())) {
-        for (const icon of manifestIcons(join36(directory, name))) {
+        for (const icon of manifestIcons(join37(directory, name))) {
           if (MEASURABLE_IMAGE_EXTENSIONS.has(extname3(icon).toLowerCase())) {
             fromManifest.add(icon);
             files.push({ path: icon, directory: dirname15(icon) });
@@ -49705,7 +50129,7 @@ function projectIconCandidates(root) {
       if (!MEASURABLE_IMAGE_EXTENSIONS.has(extension2)) continue;
       const stem = name.slice(0, name.length - extension2.length);
       if (normalizeStem(stem).normalized === "favicon") iconHomes.add(directory);
-      files.push({ path: join36(directory, name), directory });
+      files.push({ path: join37(directory, name), directory });
       if (files.length >= MAX_CANDIDATES) break;
     }
   }
@@ -49747,7 +50171,7 @@ function iconMediaType(path) {
 }
 function resolveProjectIconResponse(id, options = {}) {
   if (!id) return { status: 400 };
-  const home = options.home ?? homedir17();
+  const home = options.home ?? homedir18();
   const entry = readRegistry(home).projects.find((project) => project.id === id);
   if (!entry) return { status: 404 };
   const path = resolveProjectIcon(id, (root) => detectProjectIcon(root)?.path, { home });
@@ -49770,7 +50194,7 @@ function resolveProjectIconResponse(id, options = {}) {
   });
   if (!roots.some((root) => real === root || real.startsWith(root + sep3))) return { status: 404 };
   try {
-    return { status: 200, contentType, body: readFileSync25(real) };
+    return { status: 200, contentType, body: readFileSync26(real) };
   } catch {
     return { status: 404 };
   }
@@ -49882,8 +50306,8 @@ var init_project_icon = __esm({
 });
 
 // packages/server/src/local-visualization.ts
-import { readdirSync as readdirSync11, readFileSync as readFileSync26, realpathSync as realpathSync11, statSync as statSync20 } from "node:fs";
-import { join as join37, sep as sep4 } from "node:path";
+import { readdirSync as readdirSync11, readFileSync as readFileSync27, realpathSync as realpathSync11, statSync as statSync20 } from "node:fs";
+import { join as join38, sep as sep4 } from "node:path";
 function children(path, pattern) {
   try {
     return readdirSync11(path, { withFileTypes: true }).filter((entry) => entry.isDirectory() && pattern.test(entry.name)).map((entry) => entry.name).sort().reverse();
@@ -49895,7 +50319,7 @@ function isUnder2(path, root) {
   return path === root || path.startsWith(root.endsWith(sep4) ? root : root + sep4);
 }
 function resolveFragment(projectDir, sessionId, file) {
-  const base = join37(projectDir, ".codex", "visualizations");
+  const base = join38(projectDir, ".codex", "visualizations");
   let projectReal;
   let baseReal;
   try {
@@ -49906,12 +50330,12 @@ function resolveFragment(projectDir, sessionId, file) {
   }
   if (!isUnder2(baseReal, projectReal)) return null;
   for (const year of children(base, YEAR_PART)) {
-    const yearDir = join37(base, year);
+    const yearDir = join38(base, year);
     for (const month of children(yearDir, DATE_PART)) {
-      const monthDir = join37(yearDir, month);
+      const monthDir = join38(yearDir, month);
       for (const day of children(monthDir, DATE_PART)) {
-        const sessionRoot = join37(baseReal, year, month, day, sessionId);
-        const candidate = join37(monthDir, day, sessionId, file);
+        const sessionRoot = join38(baseReal, year, month, day, sessionId);
+        const candidate = join38(monthDir, day, sessionId, file);
         try {
           const real = realpathSync11(candidate);
           if (isUnder2(real, sessionRoot) && statSync20(real).isFile()) return real;
@@ -49997,7 +50421,7 @@ function resolveLocalVisualization(projectDir, sessionId, file) {
   try {
     const size = statSync20(path).size;
     if (size > MAX_FRAGMENT_BYTES) return { status: 413 };
-    fragment = readFileSync26(path, "utf8");
+    fragment = readFileSync27(path, "utf8");
   } catch {
     return { status: 404 };
   }
@@ -50040,7 +50464,7 @@ var init_local_visualization = __esm({
 
 // packages/server/src/app.ts
 import { mkdirSync as mkdirSync17, writeFileSync as writeFileSync14 } from "node:fs";
-import { join as join38 } from "node:path";
+import { join as join39 } from "node:path";
 import { randomUUID as randomUUID17 } from "node:crypto";
 function createApp(ctx, options = {}) {
   const app = new Hono2();
@@ -50144,10 +50568,10 @@ function createApp(ctx, options = {}) {
     if (typeof body.data !== "string" || body.data.length > ATTACHMENT_MAX_BASE64_CHARS) return c.json({ error: "bad payload" }, 400);
     const ext = `.${attachmentExtension(name)}`;
     const buf = Buffer.from(body.data, "base64");
-    const dir = join38(ctx.project.stateDir, "attachments");
+    const dir = join39(ctx.project.stateDir, "attachments");
     mkdirSync17(dir, { recursive: true });
     const base = name.replace(/\.[^.]+$/, "").replace(/[^a-zA-Z0-9_-]+/g, "-").slice(0, 40) || "file";
-    const path = join38(dir, `${Date.now()}-${randomUUID17().slice(0, 8)}-${base}${ext}`);
+    const path = join39(dir, `${Date.now()}-${randomUUID17().slice(0, 8)}-${base}${ext}`);
     writeFileSync14(path, buf);
     return c.json({ path });
   });
@@ -50634,6 +51058,7 @@ function createAppSocketServer(deps) {
   const maxOutputBufferBytes = deps.maxOutputBufferBytes ?? APP_SOCKET_MAX_OUTPUT_BUFFER_BYTES;
   const maxConnections = boundedCount(deps.maxConnections, APP_SOCKET_MAX_CONNECTIONS);
   const maxSubscriptions = deps.maxSubscriptionsPerConnection ?? APP_SOCKET_MAX_SUBSCRIPTIONS;
+  const maxFileWatches = boundedCount(deps.maxFileWatchesPerConnection, APP_SOCKET_MAX_FILE_WATCHES);
   const maxMessagesPerWindow = deps.maxMessagesPerWindow ?? APP_SOCKET_MAX_MESSAGES_PER_WINDOW;
   const messageWindowMs = deps.messageWindowMs ?? APP_SOCKET_MESSAGE_WINDOW_MS;
   const maxBufferedKeyframeEvents = deps.maxBufferedKeyframeEvents ?? APP_SOCKET_MAX_BUFFERED_KEYFRAME_EVENTS;
@@ -50673,6 +51098,55 @@ function createAppSocketServer(deps) {
   let pendingUpgrades = 0;
   const socketOrigins = /* @__PURE__ */ new WeakMap();
   const lastSig = /* @__PURE__ */ new Map();
+  const fileWatches = /* @__PURE__ */ new WeakMap();
+  let fileWatchCount = 0;
+  function subscribeFile(ws, path) {
+    let held = fileWatches.get(ws);
+    if (!held) {
+      held = /* @__PURE__ */ new Map();
+      fileWatches.set(ws, held);
+    }
+    if (held.has(path)) return;
+    if (held.size >= maxFileWatches) {
+      closeSocket(ws, 1008, "subscription limit exceeded");
+      return;
+    }
+    const watchFile = deps.watchFile;
+    if (!watchFile) return;
+    let release;
+    try {
+      release = watchFile(path, () => {
+        sendMsg(ws, { t: "file-changed", path });
+      });
+    } catch {
+      return;
+    }
+    held.set(path, release);
+    fileWatchCount++;
+  }
+  function unsubscribeFile(ws, path) {
+    const held = fileWatches.get(ws);
+    const release = held?.get(path);
+    if (!held || !release) return;
+    held.delete(path);
+    fileWatchCount--;
+    try {
+      release();
+    } catch {
+    }
+  }
+  function dropFileWatches(ws) {
+    const held = fileWatches.get(ws);
+    if (!held) return;
+    fileWatches.delete(ws);
+    for (const release of held.values()) {
+      fileWatchCount--;
+      try {
+        release();
+      } catch {
+      }
+    }
+  }
   function closeSocket(ws, code, reason) {
     if (ws.readyState === ws.CLOSED || ws.readyState === ws.CLOSING) return;
     try {
@@ -51145,6 +51619,11 @@ function createAppSocketServer(deps) {
         return;
       }
       const msg = parsed.data;
+      if (msg.topic === "file") {
+        if (msg.t === "sub") subscribeFile(ws, msg.path);
+        else unsubscribeFile(ws, msg.path);
+        return;
+      }
       if (msg.t === "sub") {
         if (registry.isSubscribed(ws, msg.slug)) return;
         if (registry.slugsFor(ws).length >= maxSubscriptions) {
@@ -51165,6 +51644,7 @@ function createAppSocketServer(deps) {
       }
       clearInterval(heartbeat);
       cancelPendingSubscriptionPush(ws);
+      dropFileWatches(ws);
       const terminationTimer = terminationTimers.get(ws);
       if (terminationTimer) clearTimeout(terminationTimer);
       terminationTimers.delete(ws);
@@ -51288,10 +51768,13 @@ function createAppSocketServer(deps) {
     },
     get pendingTranscriptRefreshes() {
       return pendingTranscriptRefreshes.size;
+    },
+    get fileWatchCount() {
+      return fileWatchCount;
     }
   };
 }
-var WS_PATH, SubscriptionRegistry, HEARTBEAT_MS, APP_SOCKET_MAX_MESSAGE_BYTES, APP_SOCKET_MAX_LOGICAL_FRAME_BYTES, APP_SOCKET_MAX_OUTPUT_BUFFER_BYTES, APP_SOCKET_MAX_CONNECTIONS, APP_SOCKET_MAX_SUBSCRIPTIONS, APP_SOCKET_MAX_MESSAGES_PER_WINDOW, APP_SOCKET_MESSAGE_WINDOW_MS, APP_SOCKET_MAX_BUFFERED_KEYFRAME_EVENTS, APP_SOCKET_MAX_TRANSCRIPT_READS_PER_ORIGIN, APP_SOCKET_MAX_TRANSCRIPT_READS_OVERALL, APP_SOCKET_TRANSCRIPT_READ_WINDOW_MS, APP_SOCKET_MAX_TRANSCRIPT_CACHE_ENTRIES, APP_SOCKET_MAX_TRANSCRIPT_CACHE_BYTES;
+var WS_PATH, SubscriptionRegistry, HEARTBEAT_MS, APP_SOCKET_MAX_MESSAGE_BYTES, APP_SOCKET_MAX_LOGICAL_FRAME_BYTES, APP_SOCKET_MAX_OUTPUT_BUFFER_BYTES, APP_SOCKET_MAX_CONNECTIONS, APP_SOCKET_MAX_SUBSCRIPTIONS, APP_SOCKET_MAX_FILE_WATCHES, APP_SOCKET_MAX_MESSAGES_PER_WINDOW, APP_SOCKET_MESSAGE_WINDOW_MS, APP_SOCKET_MAX_BUFFERED_KEYFRAME_EVENTS, APP_SOCKET_MAX_TRANSCRIPT_READS_PER_ORIGIN, APP_SOCKET_MAX_TRANSCRIPT_READS_OVERALL, APP_SOCKET_TRANSCRIPT_READ_WINDOW_MS, APP_SOCKET_MAX_TRANSCRIPT_CACHE_ENTRIES, APP_SOCKET_MAX_TRANSCRIPT_CACHE_BYTES;
 var init_app_socket = __esm({
   "packages/server/src/app-socket.ts"() {
     "use strict";
@@ -51374,6 +51857,7 @@ var init_app_socket = __esm({
     APP_SOCKET_MAX_OUTPUT_BUFFER_BYTES = 4 * 1024 * 1024;
     APP_SOCKET_MAX_CONNECTIONS = 64;
     APP_SOCKET_MAX_SUBSCRIPTIONS = 32;
+    APP_SOCKET_MAX_FILE_WATCHES = 16;
     APP_SOCKET_MAX_MESSAGES_PER_WINDOW = 120;
     APP_SOCKET_MESSAGE_WINDOW_MS = 1e3;
     APP_SOCKET_MAX_BUFFERED_KEYFRAME_EVENTS = 256;
@@ -51385,11 +51869,60 @@ var init_app_socket = __esm({
   }
 });
 
+// packages/server/src/local-file-watch.ts
+import { watch } from "node:fs";
+import { basename as basename11, dirname as dirname16 } from "node:path";
+function close(path) {
+  const entry = entries.get(path);
+  if (!entry) return;
+  entries.delete(path);
+  if (entry.timer) clearTimeout(entry.timer);
+  try {
+    entry.watcher.close();
+  } catch {
+  }
+}
+function watchLocalFile(path, onChange) {
+  let entry = entries.get(path);
+  if (!entry) {
+    const name = basename11(path);
+    const watcher2 = watch(dirname16(path), { persistent: false }, (_event, changed) => {
+      if (changed !== null && changed !== void 0 && changed.toString() !== name) return;
+      const current = entries.get(path);
+      if (!current) return;
+      if (current.timer) clearTimeout(current.timer);
+      current.timer = setTimeout(() => {
+        current.timer = null;
+        for (const listener of current.listeners) listener();
+      }, SETTLE_MS);
+      current.timer.unref?.();
+    });
+    entry = { watcher: watcher2, listeners: /* @__PURE__ */ new Set(), timer: null };
+    watcher2.on("error", () => close(path));
+    entries.set(path, entry);
+  }
+  entry.listeners.add(onChange);
+  return () => {
+    const current = entries.get(path);
+    if (!current) return;
+    current.listeners.delete(onChange);
+    if (current.listeners.size === 0) close(path);
+  };
+}
+var SETTLE_MS, entries;
+var init_local_file_watch = __esm({
+  "packages/server/src/local-file-watch.ts"() {
+    "use strict";
+    SETTLE_MS = 50;
+    entries = /* @__PURE__ */ new Map();
+  }
+});
+
 // packages/server/src/boot-progress.ts
-import { mkdirSync as mkdirSync18, readFileSync as readFileSync27, renameSync as renameSync10, rmSync as rmSync11, writeFileSync as writeFileSync15 } from "node:fs";
-import { basename as basename11, dirname as dirname16, join as join39 } from "node:path";
+import { mkdirSync as mkdirSync18, readFileSync as readFileSync28, renameSync as renameSync10, rmSync as rmSync11, writeFileSync as writeFileSync15 } from "node:fs";
+import { basename as basename12, dirname as dirname17, join as join40 } from "node:path";
 function bootProgressPath(stateDir) {
-  return join39(stateDir, BOOT_PROGRESS_NAME);
+  return join40(stateDir, BOOT_PROGRESS_NAME);
 }
 function createBootProgressPublisher(stateDir, minIntervalMs = 200) {
   if (!stateDir) {
@@ -51409,8 +51942,8 @@ function createBootProgressPublisher(stateDir, minIntervalMs = 200) {
     lastAt = now;
     step++;
     try {
-      mkdirSync18(dirname16(path), { recursive: true, mode: 448 });
-      const temp = join39(dirname16(path), `.${basename11(path)}.${process.pid}.tmp`);
+      mkdirSync18(dirname17(path), { recursive: true, mode: 448 });
+      const temp = join40(dirname17(path), `.${basename12(path)}.${process.pid}.tmp`);
       writeFileSync15(temp, `${JSON.stringify({ pid: process.pid, step, phase, at: new Date(now).toISOString() })}
 `, "utf8");
       renameSync10(temp, path);
@@ -51963,17 +52496,17 @@ var init_legacy_project_db = __esm({
 
 // packages/server/src/frizz-db.ts
 import { existsSync as existsSync14, mkdirSync as mkdirSync19, readdirSync as readdirSync12, renameSync as renameSync11, statSync as statSync21 } from "node:fs";
-import { basename as basename12, dirname as dirname17, join as join40 } from "node:path";
+import { basename as basename13, dirname as dirname18, join as join41 } from "node:path";
 function frizzDatabaseLocation(options) {
   if (options.stateDir !== void 0) {
-    const projectsDir = dirname17(options.stateDir);
-    if (basename12(projectsDir) === "projects") {
-      return { path: options.path ?? join40(dirname17(projectsDir), "ui.db"), projectsDir };
+    const projectsDir = dirname18(options.stateDir);
+    if (basename13(projectsDir) === "projects") {
+      return { path: options.path ?? join41(dirname18(projectsDir), "ui.db"), projectsDir };
     }
-    return { path: options.path ?? join40(options.stateDir, "ui.db"), projectsDir: void 0 };
+    return { path: options.path ?? join41(options.stateDir, "ui.db"), projectsDir: void 0 };
   }
   const data = options.home ? frizzPaths({ home: options.home }).data : frizzRoots().data;
-  return { path: options.path ?? join40(data, "ui.db"), projectsDir: join40(data, "projects") };
+  return { path: options.path ?? join41(data, "ui.db"), projectsDir: join41(data, "projects") };
 }
 function ensureFrizzSchema(db) {
   db.exec(`
@@ -51992,7 +52525,7 @@ function ensureFrizzSchema(db) {
 }
 function openFrizzDatabase(options = {}) {
   const { path, projectsDir } = frizzDatabaseLocation(options);
-  mkdirSync19(dirname17(path), { recursive: true });
+  mkdirSync19(dirname18(path), { recursive: true });
   const db = new sqlite_default(path);
   db.pragma("busy_timeout = 5000");
   db.pragma("journal_mode = WAL");
@@ -52004,10 +52537,10 @@ function openFrizzDatabase(options = {}) {
     );
     for (const projectId of retiredLegacyProjectIds(projectsDir)) {
       if (alreadyImported.has(projectId)) continue;
-      const dir = join40(projectsDir, projectId);
+      const dir = join41(projectsDir, projectId);
       try {
-        renameSync11(join40(dir, "ui.db.imported"), join40(dir, "ui.db"));
-        db.prepare("INSERT INTO imported_project (project_id, source, rows, imported_at) VALUES (?, ?, 0, ?)").run(projectId, join40(dir, "ui.db"), (/* @__PURE__ */ new Date()).toISOString());
+        renameSync11(join41(dir, "ui.db.imported"), join41(dir, "ui.db"));
+        db.prepare("INSERT INTO imported_project (project_id, source, rows, imported_at) VALUES (?, ?, 0, ?)").run(projectId, join41(dir, "ui.db"), (/* @__PURE__ */ new Date()).toISOString());
         alreadyImported.add(projectId);
         log.info("frizz-db", `${projectId}: restored ui.db.imported to ui.db and recorded it as imported`);
       } catch (error) {
@@ -52017,7 +52550,7 @@ function openFrizzDatabase(options = {}) {
     }
     for (const projectId of legacyProjectIds(projectsDir)) {
       if (alreadyImported.has(projectId)) continue;
-      const legacyPath = join40(projectsDir, projectId, "ui.db");
+      const legacyPath = join41(projectsDir, projectId, "ui.db");
       try {
         const rows = importLegacyProject(db, projectId, legacyPath);
         imported.push({ projectId, rows });
@@ -52050,7 +52583,7 @@ function projectIdsWithFile(projectsDir, file) {
   if (!existsSync14(projectsDir)) return [];
   return readdirSync12(projectsDir).filter((name) => {
     try {
-      return statSync21(join40(projectsDir, name, file)).isFile();
+      return statSync21(join41(projectsDir, name, file)).isFile();
     } catch {
       return false;
     }
@@ -52060,7 +52593,7 @@ function legacyProjectIds(projectsDir) {
   return projectIdsWithFile(projectsDir, "ui.db");
 }
 function retiredLegacyProjectIds(projectsDir) {
-  return projectIdsWithFile(projectsDir, "ui.db.imported").filter((id) => !existsSync14(join40(projectsDir, id, "ui.db")));
+  return projectIdsWithFile(projectsDir, "ui.db.imported").filter((id) => !existsSync14(join41(projectsDir, id, "ui.db")));
 }
 function tableColumns(db, schema, table) {
   return db.prepare(`PRAGMA ${schema}.table_info(${table})`).all().map((c) => c.name);
@@ -52213,8 +52746,8 @@ var init_tenant_prime = __esm({
 
 // packages/server/src/project-teardown.ts
 import { rmSync as rmSync12 } from "node:fs";
-import { homedir as homedir18 } from "node:os";
-import { dirname as dirname18, resolve as resolve10 } from "node:path";
+import { homedir as homedir19 } from "node:os";
+import { dirname as dirname19, resolve as resolve10 } from "node:path";
 async function stopProjectWorkers(ctx) {
   let stopped = 0;
   for (const row of ctx.storage.allSessions()) {
@@ -52229,12 +52762,12 @@ async function stopProjectWorkers(ctx) {
   }
   return stopped;
 }
-function deleteProjectState(projectId, home = homedir18()) {
+function deleteProjectState(projectId, home = homedir19()) {
   const target = projectStateDir(projectId, home);
   if (!/^[\w.-]+$/u.test(projectId) || projectId === "." || projectId === "..") {
     throw new Error(`Refusing to delete state for a malformed project id: ${projectId}`);
   }
-  if (dirname18(resolve10(target)) !== resolve10(dirname18(projectStateDir("x", home)))) {
+  if (dirname19(resolve10(target)) !== resolve10(dirname19(projectStateDir("x", home)))) {
     throw new Error(`Refusing to delete ${target} \u2014 it is not a project state directory`);
   }
   rmSync12(target, { recursive: true, force: true });
@@ -52262,11 +52795,11 @@ __export(index_exports, {
   unknownProjectPage: () => unknownProjectPage
 });
 import { createServer } from "node:http";
-import { readFileSync as readFileSync28, existsSync as existsSync15 } from "node:fs";
-import { dirname as dirname19, join as join41, resolve as resolve11, extname as extname4, normalize } from "node:path";
+import { readFileSync as readFileSync29, existsSync as existsSync15 } from "node:fs";
+import { dirname as dirname20, join as join42, resolve as resolve11, extname as extname4, normalize } from "node:path";
 function readServerAddressHolder(path) {
   try {
-    const value = JSON.parse(readFileSync28(path, "utf8"));
+    const value = JSON.parse(readFileSync29(path, "utf8"));
     if (typeof value?.pid !== "number") return void 0;
     return { pid: value.pid, port: typeof value.port === "number" ? value.port : -1 };
   } catch {
@@ -52366,11 +52899,11 @@ function createShutdownSignalHandler(options) {
 }
 function serveStatic(distDir, req, res) {
   const rel = normalize((req.url ?? "/").split("?")[0]).replace(/^(\.\.[/\\])+/, "");
-  let file = join41(distDir, rel === "/" ? "index.html" : rel);
-  if (!file.startsWith(distDir)) file = join41(distDir, "index.html");
-  if (!existsSync15(file)) file = join41(distDir, "index.html");
+  let file = join42(distDir, rel === "/" ? "index.html" : rel);
+  if (!file.startsWith(distDir)) file = join42(distDir, "index.html");
+  if (!existsSync15(file)) file = join42(distDir, "index.html");
   try {
-    const body = readFileSync28(file);
+    const body = readFileSync29(file);
     res.writeHead(200, { "content-type": MIME[extname4(file)] ?? "application/octet-stream" });
     res.end(body);
   } catch {
@@ -52472,7 +53005,11 @@ async function startServer(opts = {}) {
       // The /ws producer is the one the live UI actually renders, so a dead owner has to reach it
       // too — projecting only the RPC is the exact half-fix the × already had to correct once.
       (slug) => c.tailer.ownerGone?.(slug) ?? false
-    )
+    ),
+    // A reader's live watch on the file it shows. Gated as the read is (one set of openable roots for
+    // both readers, plus the Markdown reader's canonical-extension check) and watched by CANONICAL
+    // path, so a symlinked `.md` and its target are one watch.
+    watchFile: (path, onChange) => watchLocalFile(resolveWatchableLocalFile(path, openableFileRoots(c.project)), onChange)
   });
   let githubInit;
   let terminal;
@@ -52616,7 +53153,7 @@ async function startServer(opts = {}) {
       if (statusPath && statusIdentity) runtime.removeStatus(statusPath, statusIdentity);
       if (statusPath && statusIdentity) {
         try {
-          runtime.removeStatus(serverAddressPathForStateDir(dirname19(statusPath)), statusIdentity);
+          runtime.removeStatus(serverAddressPathForStateDir(dirname20(statusPath)), statusIdentity);
         } catch {
         }
       }
@@ -52745,7 +53282,7 @@ async function startServer(opts = {}) {
     }
     statusPath = serverLockPathFor(ctx.project);
     const webRoot = resolve11(import.meta.dirname, "..", "..", "web");
-    const distDir = opts.webDistDir ? resolve11(opts.webDistDir) : join41(webRoot, "dist");
+    const distDir = opts.webDistDir ? resolve11(opts.webDistDir) : join42(webRoot, "dist");
     startupPhase = "Vite";
     if (opts.dev) {
       try {
@@ -52821,7 +53358,7 @@ async function startServer(opts = {}) {
       if (vite) {
         vite.middlewares(req, res, () => {
           try {
-            const html = readFileSync28(join41(webRoot, "index.html"), "utf8");
+            const html = readFileSync29(join42(webRoot, "index.html"), "utf8");
             void vite.transformIndexHtml(url, html).then((out) => {
               res.writeHead(200, { "content-type": "text/html" });
               res.end(out);
@@ -52975,6 +53512,8 @@ var init_index = __esm({
     init_app_socket();
     init_shutdown();
     init_project();
+    init_local_file();
+    init_local_file_watch();
     init_project_launch();
     init_frizz_paths();
     init_project_identity();
@@ -53026,7 +53565,7 @@ var init_index = __esm({
       }
     };
     isApiUrl = (url) => url === FRIZZ_ROUTE_PREFIX || url.startsWith(`${FRIZZ_ROUTE_PREFIX}/`);
-    serverLockPathFor = (project) => join41(project.stateDir, "server.lock");
+    serverLockPathFor = (project) => join42(project.stateDir, "server.lock");
     MIME = {
       ".html": "text/html",
       ".js": "text/javascript",
@@ -53045,7 +53584,7 @@ init_project_launch();
 init_shutdown();
 init_logging();
 import { existsSync as existsSync16 } from "node:fs";
-import { join as join42 } from "node:path";
+import { join as join43 } from "node:path";
 process.on("uncaughtException", (error) => {
   log.error("dev-child", `uncaught exception: ${error instanceof Error ? error.stack ?? error.message : error}`);
   process.exit(1);
@@ -53085,7 +53624,7 @@ try {
     ];
     if (!existsSync16(stableWebDist)) throw new Error("stable artifact launch is missing its verified web directory");
     for (const [name, directory, requiredFile] of required) {
-      if (!directory || !existsSync16(join42(directory, requiredFile)))
+      if (!directory || !existsSync16(join43(directory, requiredFile)))
         throw new Error(`stable artifact launch is missing verified ${name}`);
     }
   }