frizz-server 0.13.7 → 0.13.8

package/dist/dev-child.js

@@ -12362,7 +12362,7 @@ var init_interactions = __esm({
     InteractionFieldId = external_exports.string().min(1).max(128).regex(/^[A-Za-z_][A-Za-z0-9_.:-]*$/).refine((value) => !["__proto__", "constructor", "prototype"].includes(value), "reserved field id");
     InteractionDecisionId = external_exports.string().min(1).max(80).regex(/^[A-Za-z0-9][A-Za-z0-9._:-]*$/);
     InteractionProvider = external_exports.object({
-      kind: external_exports.enum(["claude", "codex", "frizz"]),
+      kind: external_exports.enum(["claude", "codex", "acp", "frizz"]),
       name: InteractionLabel.optional(),
       version: InteractionOpaqueId.optional()
     }).strict();
@@ -13200,6 +13200,20 @@ function attachmentExtension(name) {
 function isAllowedAttachmentName(name) {
   return ATTACHMENT_EXT_SET.has(attachmentExtension(name));
 }
+function acpSlugParts(model) {
+  if (typeof model !== "string" || !model.startsWith(ACP_MODEL_PREFIX)) return void 0;
+  const rest = model.slice(ACP_MODEL_PREFIX.length);
+  const at = rest.indexOf("@");
+  const agent = at === -1 ? rest : rest.slice(0, at);
+  const id = at === -1 ? "" : rest.slice(at + 1);
+  return agent ? { agent, ...id ? { model: id } : {} } : void 0;
+}
+function acpAgentIdFromModel(model) {
+  return acpSlugParts(model)?.agent;
+}
+function acpModelIdFromModel(model) {
+  return acpSlugParts(model)?.model;
+}
 function isDirectSubAgent(agent) {
   return (agent.depth ?? 1) === 1;
 }
@@ -13268,9 +13282,9 @@ function trimAwaitingTitle(raw2) {
 }
 function splitAwaitingFrontmatter(raw2) {
   const lines = raw2.split("\n").map((l) => l.replace(/\r$/, ""));
-  const delimiter2 = lines.findIndex((l) => /^\s*---+\s*$/.test(l));
-  const frontmatter = delimiter2 === -1 ? lines : lines.slice(0, delimiter2);
-  const after = delimiter2 === -1 ? [] : lines.slice(delimiter2 + 1);
+  const delimiter3 = lines.findIndex((l) => /^\s*---+\s*$/.test(l));
+  const frontmatter = delimiter3 === -1 ? lines : lines.slice(0, delimiter3);
+  const after = delimiter3 === -1 ? [] : lines.slice(delimiter3 + 1);
   const rest = [];
   const yamlLines = [];
   const titleLines = [];
@@ -13554,6 +13568,11 @@ function questionsCancelledWakeMessage(count) {
 function queuedThread(t) {
   return t.kind === "session" && t.foreign !== true && t.needsYou === true && t.state !== "archived";
 }
+function requireEffortOutsideAcp(profile, ctx) {
+  if (profile.backend !== "acp" && profile.effort === void 0) {
+    ctx.addIssue({ code: external_exports.ZodIssueCode.custom, path: ["effort"], message: `effort is required for a ${profile.backend} profile` });
+  }
+}
 function formatElapsed(ms) {
   if (!Number.isFinite(ms) || ms < 0) return "an unknown time";
   const s = Math.floor(ms / 1e3);
@@ -13704,7 +13723,7 @@ function parseGithubWakeSteer(text2) {
 function frizzRoute(path3) {
   return `${FRIZZ_ROUTE_PREFIX}${path3.startsWith("/") ? path3 : `/${path3}`}`;
 }
-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, PR_WATCH_SPENT_TRAILER, PR_WATCH_ARMED_TRAILER, SHELL_DONE_TRAILER, ISSUE_WATCH_SPENT_TRAILER, ISSUE_WATCH_ARMED_TRAILER, SIGNOFF_NUDGE_MARKER, SIGNOFF_NUDGE_MESSAGE, PARK_CORRECTION_NAMES_LEAD, PARK_CORRECTION_RETIRED_LEAD, PARK_CORRECTION_QUESTION_LEAD, ThreadWatchKind, GithubChecksState, GithubMergeState, GithubWatchStatus, GithubIssueStatus, 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, QUESTION_FENCE_RETIRED_AT, 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, ProviderError, ThreadLinkView, UpsertOwnLinkInput, UpsertOwnLinkResult, DropOwnLinkInput, DropOwnLinkResult, 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, WAKE_TRAILERS, 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_GATED, PR_WATCH_STATE, 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 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, AcpAgent, ACP_MODEL_PREFIX, AcpAgentModel, AcpAgentModels, AcpAgentModelsInput, 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, PR_WATCH_SPENT_TRAILER, PR_WATCH_ARMED_TRAILER, SHELL_DONE_TRAILER, ISSUE_WATCH_SPENT_TRAILER, ISSUE_WATCH_ARMED_TRAILER, SIGNOFF_NUDGE_MARKER, SIGNOFF_NUDGE_MESSAGE, PARK_CORRECTION_NAMES_LEAD, PARK_CORRECTION_RETIRED_LEAD, PARK_CORRECTION_QUESTION_LEAD, ThreadWatchKind, GithubChecksState, GithubMergeState, GithubWatchStatus, GithubIssueStatus, 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, QUESTION_FENCE_RETIRED_AT, 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, ProviderError, ThreadLinkView, UpsertOwnLinkInput, UpsertOwnLinkResult, DropOwnLinkInput, DropOwnLinkResult, ThreadView, BoardErrorItem, BoardSnapshot, QuotaWindow, ProviderQuota, QuotaSnapshot, ProviderAuth, AccountEmails, AuthSnapshot, AccountBackend, AccountLogoutInput, AccountLogoutResult, AccountLoginStartInput, AccountLoginStartResult, AccountLoginStatusInput, AccountLoginStatusResult, PermissionMode, LocalFileOpener, Settings, DispatchProviderPreferences, DispatchPreferences, DispatchProfileSnapshotShape, 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, WAKE_TRAILERS, 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_GATED, PR_WATCH_STATE, 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";
@@ -13823,7 +13842,7 @@ var init_src = __esm({
       "exited"
       // the worker process that owned this session is gone, or is no longer driving its turn
     ]);
-    Backend = external_exports.enum(["claude", "codex"]);
+    Backend = external_exports.enum(["claude", "codex", "acp"]);
     CodexModel = external_exports.object({
       slug: external_exports.string(),
       displayName: external_exports.string(),
@@ -13837,6 +13856,24 @@ var init_src = __esm({
       contextWindow: external_exports.number().int().positive().optional(),
       maxContextWindow: external_exports.number().int().positive().optional()
     });
+    AcpAgent = external_exports.object({
+      id: external_exports.string(),
+      label: external_exports.string(),
+      command: external_exports.string(),
+      available: external_exports.boolean()
+    });
+    ACP_MODEL_PREFIX = "acp:";
+    AcpAgentModel = external_exports.object({ id: external_exports.string(), name: external_exports.string() });
+    AcpAgentModels = external_exports.object({
+      agentId: external_exports.string(),
+      models: external_exports.array(AcpAgentModel),
+      /** The model the agent opens a session on when Frizz asks for none. */
+      current: external_exports.string().optional(),
+      /** Why the list is empty, when the probe could not open a session (not installed, not logged in…). */
+      error: external_exports.string().optional(),
+      probedAt: external_exports.string()
+    });
+    AcpAgentModelsInput = external_exports.object({ agentId: external_exports.string().min(1).max(100), refresh: external_exports.boolean().optional() }).strict();
     ThreadProfileOption = external_exports.object({
       model: external_exports.string().min(1),
       label: external_exports.string().min(1),
@@ -14848,14 +14885,15 @@ var init_src = __esm({
       codex: ProviderAuth,
       emails: AccountEmails
     });
-    AccountLogoutInput = external_exports.object({ backend: external_exports.enum(["claude", "codex"]) }).strict();
+    AccountBackend = external_exports.enum(["claude", "codex"]);
+    AccountLogoutInput = external_exports.object({ backend: AccountBackend }).strict();
     AccountLogoutResult = external_exports.object({
       status: external_exports.enum(["done", "blocked", "failed"]),
       auth: ProviderAuth,
       activeThreads: external_exports.number().int().positive().optional(),
       detail: external_exports.string().max(200).optional()
     });
-    AccountLoginStartInput = external_exports.object({ backend: external_exports.enum(["claude", "codex"]) }).strict();
+    AccountLoginStartInput = external_exports.object({ backend: AccountBackend }).strict();
     AccountLoginStartResult = external_exports.object({ attemptId: ThreadSlug });
     AccountLoginStatusInput = external_exports.object({ attemptId: ThreadSlug }).strict();
     AccountLoginStatusResult = external_exports.object({
@@ -14930,6 +14968,15 @@ var init_src = __esm({
       // it (codex compacts at 90% of the resolved window). Unset ⇒ nothing is sent and the model's stock
       // window applies. Optional so an old blob parses; defaultSettings leaves it unset.
       codexContextWindow: external_exports.number().int().positive().optional(),
+      // The operator's OWN Agent Client Protocol agents, merged over the built-in catalogue by id
+      // (server/backend/acp-agents.ts). `command` is an executable name on PATH or an absolute path;
+      // `args` is what puts it into ACP mode (`["acp"]`, `["--acp"]`). Optional so an old blob parses.
+      acpAgents: external_exports.array(external_exports.object({
+        id: external_exports.string().trim().min(1).max(64).regex(/^[a-z0-9][a-z0-9._-]*$/i),
+        label: external_exports.string().trim().min(1).max(80),
+        command: external_exports.string().trim().min(1).max(1024),
+        args: external_exports.array(external_exports.string().max(1024)).max(32).optional()
+      })).max(32).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
@@ -14956,28 +15003,38 @@ var init_src = __esm({
     DispatchPreferences = external_exports.object({
       backend: Backend,
       claude: DispatchProviderPreferences,
-      codex: DispatchProviderPreferences
+      codex: DispatchProviderPreferences,
+      // Optional because every record written before the ACP backend existed lacks it, and a required
+      // key would fail those records' parse and silently reset the operator's saved profile.
+      acp: DispatchProviderPreferences.optional()
     });
-    DispatchProfileSnapshot = external_exports.object({
+    DispatchProfileSnapshotShape = external_exports.object({
       backend: Backend,
       model: external_exports.string().trim().min(1).max(200),
-      effort: Settings.shape.effort.unwrap(),
+      // Required for Claude and Codex (the refinement below); absent for an ACP agent, which runs with
+      // whatever model and effort its own CLI is configured for — Frizz has no effort axis to offer there.
+      effort: Settings.shape.effort,
       // IGNORED: dispatch permission is decided server-side (workerDispatchPermission) from the
       // non-interactive floor plus the operator's Settings choice, never per dispatch. Optional so old
       // clients that still send it parse.
       permissionMode: PermissionMode.optional()
     }).strict();
+    DispatchProfileSnapshot = DispatchProfileSnapshotShape.superRefine(requireEffortOutsideAcp);
     SetDispatchPreferenceInput = external_exports.discriminatedUnion("field", [
       external_exports.object({ field: external_exports.literal("backend"), value: Backend }),
       external_exports.object({
         field: external_exports.literal("profile"),
         backend: Backend,
         model: external_exports.string().trim().min(1).max(200),
-        effort: Settings.shape.effort.unwrap()
+        // Optional ONLY for an ACP profile (see DispatchProfileSnapshot); a Claude/Codex profile without
+        // an effort is refused below rather than silently stored as "default".
+        effort: Settings.shape.effort
       }),
       external_exports.object({ field: external_exports.literal("model"), backend: Backend, value: external_exports.string().trim().min(1).max(200) }),
       external_exports.object({ field: external_exports.literal("effort"), backend: Backend, value: Settings.shape.effort.unwrap() })
-    ]);
+    ]).superRefine((update, ctx) => {
+      if (update.field === "profile") requireEffortOutsideAcp(update, ctx);
+    });
     DispatchInput = external_exports.object({
       // Optional: when omitted, dispatch derives a fallback title from the prompt (Claude later renames
       // the session via ai-title, which the UI prefers for display). The thread FILE always gets a
@@ -15379,9 +15436,9 @@ ${DISPATCH_TASK_BANNER}
       page: external_exports.number().int().positive(),
       pageCount: external_exports.number().int().positive()
     });
-    GithubBatchInput = DispatchProfileSnapshot.extend({
+    GithubBatchInput = DispatchProfileSnapshotShape.extend({
       items: external_exports.array(external_exports.object({ kind: external_exports.enum(["issue", "pr"]), number: external_exports.number().int().positive() })).min(1)
-    }).strict();
+    }).strict().superRefine(requireEffortOutsideAcp);
     GithubBatchResult = external_exports.object({
       dispatched: external_exports.array(external_exports.object({ number: external_exports.number(), kind: external_exports.string(), slug: ThreadSlug })),
       failed: external_exports.array(external_exports.object({ number: external_exports.number(), kind: external_exports.string(), error: external_exports.string() }))
@@ -19055,7 +19112,7 @@ var init_project_scope = __esm({
 
 // packages/server/src/storage.ts
 function isHeadlessRow(row) {
-  return row.backend === "codex" && row.codex_runtime === "app-server" || row.backend === "claude" && row.claude_runtime === "broker";
+  return row.backend === "codex" && row.codex_runtime === "app-server" || row.backend === "claude" && row.claude_runtime === "broker" || row.backend === "acp";
 }
 function isBrokerClaudeRow(row) {
   return row.backend === "claude" && row.claude_runtime === "broker";
@@ -19078,7 +19135,7 @@ function groupBySlug(rows) {
 }
 function ensureStorageSchema(db) {
   db.exec(STORAGE_SCHEMA);
-  for (const column of ["pinned_at TEXT"]) {
+  for (const column of ["pinned_at TEXT", "acp_agent TEXT"]) {
     try {
       db.exec(`ALTER TABLE session ADD COLUMN ${column}`);
     } catch {
@@ -19673,6 +19730,7 @@ function createStorage(source, projectId) {
   const agentSessionStmt = scope.prepare("UPDATE session SET agent_session_id = ? WHERE project_id = @project_id AND slug = ?");
   const codexRuntimeStmt = scope.prepare("UPDATE session SET codex_runtime = ? WHERE project_id = @project_id AND slug = ?");
   const claudeRuntimeStmt = scope.prepare("UPDATE session SET claude_runtime = ? WHERE project_id = @project_id AND slug = ?");
+  const acpAgentStmt = scope.prepare("UPDATE session SET acp_agent = ? WHERE project_id = @project_id AND slug = ?");
   const profileStmt = scope.prepare("UPDATE session SET model = ?, effort = ?, profile_set_at = ? WHERE project_id = @project_id AND slug = ?");
   const permissionModeStmt = scope.prepare("UPDATE session SET permission_mode = ?, permission_set_at = ? WHERE project_id = @project_id AND slug = ?");
   const permissionPendingStmt = scope.prepare("UPDATE session SET permission_pending = ? WHERE project_id = @project_id AND slug = ?");
@@ -19802,7 +19860,8 @@ function createStorage(source, projectId) {
     runtime_control: row.runtime_control ?? null,
     runtime_control_revision: row.runtime_control_revision ?? 0,
     codex_runtime: row.codex_runtime ?? null,
-    claude_runtime: row.claude_runtime ?? null
+    claude_runtime: row.claude_runtime ?? null,
+    acp_agent: row.acp_agent ?? null
   });
   const getAdoptionRuntimeSnapshot = db.transaction((slug) => ({
     // Claim first is intentional: a finalized claim disappearing before the current-row validation
@@ -19834,7 +19893,7 @@ function createStorage(source, projectId) {
   const retireAdoptionAttempt = (claim, retiredAtMs = Date.now()) => {
     putRetiredAdoptionAttempt.run(claim.attempt_token, claim.slug, claim.session_id, retiredAtMs);
   };
-  const withAdoptionSpawnFence = (slug, attemptToken, leaseExpiresAtMs, spawn7) => {
+  const withAdoptionSpawnFence = (slug, attemptToken, leaseExpiresAtMs, spawn8) => {
     ThreadSlug.parse(slug);
     if (!Number.isSafeInteger(leaseExpiresAtMs)) return { acquired: false };
     db.exec("BEGIN IMMEDIATE");
@@ -19866,7 +19925,7 @@ function createStorage(source, projectId) {
         bound = true;
         return true;
       };
-      const value = spawn7(bindPane);
+      const value = spawn8(bindPane);
       if (!bound) {
         if (db.inTransaction) db.exec("ROLLBACK");
         throw new Error("adoption spawn returned without binding its exact pane");
@@ -20185,6 +20244,7 @@ function createStorage(source, projectId) {
     setAgentSession: (slug, agentSessionId) => void agentSessionStmt.run(agentSessionId, slug),
     setCodexRuntime: (slug, runtime) => void codexRuntimeStmt.run(runtime, slug),
     setClaudeRuntime: (slug, runtime) => void claudeRuntimeStmt.run(runtime, slug),
+    setAcpAgent: (slug, agentId) => void acpAgentStmt.run(agentId, slug),
     setProfile: (slug, model, effort) => void profileStmt.run(model, effort, (/* @__PURE__ */ new Date()).toISOString(), slug),
     setPermissionMode: (slug, permissionMode) => void permissionModeStmt.run(permissionMode, (/* @__PURE__ */ new Date()).toISOString(), slug),
     setPermissionPending: (slug, permissionMode) => void permissionPendingStmt.run(permissionMode, slug),
@@ -20413,6 +20473,8 @@ var init_storage = __esm({
       -- Claude transport discriminator: 'broker' = a session-broker-owned Agent SDK session; NULL/'tmux'
       -- is the pre-broker legacy value, same story.
       claude_runtime TEXT,
+      -- ACP agent id (backend/acp-agents.ts) for backend='acp' rows; also in the ALTER list below.
+      acp_agent TEXT,
       -- THE RECURRING PROMPT (scheduler.ts SOURCES 4, 5 and 7): one text, three independent triggers \u2014
       -- every time the thread rests, every N ms on a clock, and/or every time its context is compacted.
       -- All flags 0 = off; there is no separate enable column, because another flag could only ever
@@ -20865,9 +20927,16 @@ function defaultDispatchPreferences(settings, codexModels = []) {
   return {
     backend,
     claude: backend === "claude" ? selected : { permissionMode: "auto" },
-    codex: backend === "codex" ? selected : { permissionMode: "default" }
+    codex: backend === "codex" ? selected : { permissionMode: "default" },
+    // The ACP slot exists only once the operator has chosen an agent: it has no permission axis (the
+    // agent's own CLI decides), so there is no default worth writing, and every record written before
+    // the backend existed lacks the key.
+    ...backend === "acp" ? { acp: selected } : {}
   };
 }
+function profileOf(prefs, backend) {
+  return prefs[backend] ?? {};
+}
 function getDispatchPreferences(storage, settings, home, codexModels = []) {
   const machine = readMachineDispatchPreferences(home);
   if (machine) return machine;
@@ -20884,13 +20953,13 @@ function setDispatchPreference(storage, settings, home, update, codexModels = []
       ...current,
       backend: update.backend,
       [update.backend]: {
-        ...current[update.backend],
+        ...profileOf(current, update.backend),
         model: update.model,
         effort: update.effort
       }
     };
   } else {
-    const profile = current[update.backend];
+    const profile = profileOf(current, update.backend);
     next = {
       ...current,
       ...update.field === "model" ? { backend: update.backend } : {},
@@ -20928,8 +20997,8 @@ function userInfoParts(raw2) {
   const encoded = encodedMatch?.index ?? -1;
   const index = literal === -1 ? encoded : encoded === -1 ? literal : Math.min(literal, encoded);
   if (index <= 0) return null;
-  const delimiter2 = value.slice(index, index + (index === encoded ? 3 : 1));
-  return { username: value.slice(0, index), delimiter: delimiter2, password: value.slice(index + delimiter2.length) };
+  const delimiter3 = value.slice(index, index + (index === encoded ? 3 : 1));
+  return { username: value.slice(0, index), delimiter: delimiter3, password: value.slice(index + delimiter3.length) };
 }
 function redactUserInfoToken(raw2, options) {
   const parts = userInfoParts(raw2);
@@ -20952,11 +21021,11 @@ function redactCredentialSyntax(raw2, options = {}) {
   let value = raw2;
   value = value.replace(
     URL_USERINFO_RE,
-    (_whole, scheme, username, delimiter2, password) => `${scheme}${username}${delimiter2}${replacement(options, password)}@`
+    (_whole, scheme, username, delimiter3, password) => `${scheme}${username}${delimiter3}${replacement(options, password)}@`
   );
   value = value.replace(
     URL_ENCODED_USERINFO_RE,
-    (_whole, scheme, username, delimiter2, password) => `${scheme}${username}${delimiter2}${replacement(options, password)}@`
+    (_whole, scheme, username, delimiter3, password) => `${scheme}${username}${delimiter3}${replacement(options, password)}@`
   );
   value = value.replace(
     USER_FLAG_RE,
@@ -21605,6 +21674,7 @@ function threadProfileOptions(backend) {
       }))
     };
   }
+  if (backend === "acp") return { backend, options: [] };
   throw new Error("This thread has an unknown backend; its runtime profile cannot be changed");
 }
 function validateThreadProfile(backend, model, effort) {
@@ -24897,7 +24967,7 @@ ${ask}`;
     void nowMs;
     void backend;
     if (state.foreign) return { permPrompt: false };
-    if (turn === "in-flight" && row.backend !== "codex" && permMarkerBlocks(state, row)) {
+    if (turn === "in-flight" && row.backend !== "codex" && row.backend !== "acp" && permMarkerBlocks(state, row)) {
       return { permPrompt: true };
     }
     return { permPrompt: false };
@@ -25221,7 +25291,7 @@ ${ask}`;
     if (state.stallLogged) return;
     if (row.exited && rowIsArchived(row)) return;
     state.stallLogged = true;
-    const detail2 = isBrokerClaudeRow(row) && deps.project.stateDir ? `no worker terminal to capture (broker runtime). Daemon diagnostics: ${claudeBrokerDiagnosticLogPath(deps.project.stateDir, row.session_id)}` : isHeadlessRow(row) ? `no worker terminal to capture (headless ${row.backend === "codex" ? "codex app-server" : "claude broker"} runtime)` : "no worker output captured (this build captures no terminal)";
+    const detail2 = isBrokerClaudeRow(row) && deps.project.stateDir ? `no worker terminal to capture (broker runtime). Daemon diagnostics: ${claudeBrokerDiagnosticLogPath(deps.project.stateDir, row.session_id)}` : isHeadlessRow(row) ? `no worker terminal to capture (headless ${row.backend === "codex" ? "codex app-server" : row.backend === "acp" ? "ACP agent" : "claude broker"} runtime)` : "no worker output captured (this build captures no terminal)";
     log.error(
       "tailer",
       `thread ${row.slug} (session ${row.session_id}): no transcript ${DISCOVERY_GRACE_MS / 1e3}s after dispatch \u2014 likely a boot failure. ${detail2.slice(0, 4e3)}`
@@ -25367,7 +25437,7 @@ ${detail2}
       if (primeProgress && primed % PRIME_PROGRESS_EVERY === 0) primeProgress(primed, rows.length);
       primed++;
       const backend = resolveBackend(row.backend);
-      const nativeId = row.agent_session_id ?? row.transcript_id ?? row.session_id;
+      const nativeId = row.backend === "acp" ? row.session_id : row.agent_session_id ?? row.transcript_id ?? row.session_id;
       const known = states.get(row.slug);
       const runtimeGeneration = row.runtime_generation ?? 0;
       const keepable = known !== void 0 && known.sessionId === row.session_id && known.nativeSessionId === nativeId && known.runtimeGeneration === runtimeGeneration;
@@ -25388,7 +25458,7 @@ ${detail2}
         states.set(row.slug, state);
       }
       const prevNoTranscript = state.noTranscript;
-      if (row.backend !== "codex" && !resolveTranscript(state, row, nowMs)) continue;
+      if (row.backend !== "codex" && row.backend !== "acp" && !resolveTranscript(state, row, nowMs)) continue;
       if (!state.primed) {
         if (primeDeferred(row)) {
           primeIncomplete = true;
@@ -26546,19 +26616,19 @@ function searchPath2(env) {
 function vendoredNativeBeside(launcherJs, arch, access) {
   const triple = WINDOWS_TRIPLE[arch];
   if (!triple) return void 0;
-  const { dirname: dirname25, join: join47 } = win322;
-  const pkgRoot = dirname25(dirname25(launcherJs));
+  const { dirname: dirname26, join: join49 } = win322;
+  const pkgRoot = dirname26(dirname26(launcherJs));
   const platformPkg = `codex-win32-${arch}`;
   const vendorRoots = [
-    join47(pkgRoot, "node_modules", "@openai", platformPkg, "vendor"),
+    join49(pkgRoot, "node_modules", "@openai", platformPkg, "vendor"),
     // nested under the package
-    join47(dirname25(pkgRoot), platformPkg, "vendor"),
+    join49(dirname26(pkgRoot), platformPkg, "vendor"),
     // hoisted beside it: <prefix>\node_modules\@openai\<pkg>
-    join47(pkgRoot, "vendor")
+    join49(pkgRoot, "vendor")
     // the pre-platform-package layout, binaries inside @openai/codex itself
   ];
   for (const root of vendorRoots) {
-    const exe = join47(root, triple, "bin", "codex.exe");
+    const exe = join49(root, triple, "bin", "codex.exe");
     if (access(exe, "exists")) return exe;
   }
   return void 0;
@@ -31659,6 +31729,62 @@ var init_auth_status = __esm({
   }
 });
 
+// packages/server/src/backend/codex-execution-health.ts
+import { execFile as execFile5 } from "node:child_process";
+function probeHostMacOSServices() {
+  return new Promise((resolve12) => {
+    execFile5(MACOS_SERVICE_PROBE[0], MACOS_SERVICE_PROBE.slice(1), {
+      timeout: MACOS_SERVICE_PROBE_TIMEOUT_MS,
+      killSignal: "SIGKILL",
+      maxBuffer: 64 * 1024
+    }, (error) => resolve12(!error));
+  });
+}
+var MACOS_SERVICE_PROBE, MACOS_SERVICE_PROBE_TIMEOUT_MS, CodexExecutionHealth;
+var init_codex_execution_health = __esm({
+  "packages/server/src/backend/codex-execution-health.ts"() {
+    "use strict";
+    MACOS_SERVICE_PROBE = ["/bin/launchctl", "print", "system/com.apple.configd"];
+    MACOS_SERVICE_PROBE_TIMEOUT_MS = 3e3;
+    CodexExecutionHealth = class {
+      constructor(platform3 = process.platform, hostProbe = probeHostMacOSServices) {
+        this.platform = platform3;
+        this.hostProbe = hostProbe;
+      }
+      checking = /* @__PURE__ */ new WeakMap();
+      check(connection, scope) {
+        if (this.platform !== "darwin") return Promise.resolve();
+        const pending = this.checking.get(connection);
+        if (pending) return pending;
+        const check = this.probe(connection, scope);
+        this.checking.set(connection, check);
+        void check.finally(() => this.checking.delete(connection)).catch(() => void 0);
+        return check;
+      }
+      async probe(connection, scope) {
+        let detail2;
+        try {
+          const raw2 = await connection.request("command/exec", {
+            command: MACOS_SERVICE_PROBE,
+            cwd: "/",
+            timeoutMs: MACOS_SERVICE_PROBE_TIMEOUT_MS,
+            sandboxPolicy: { type: "dangerFullAccess" }
+          }, MACOS_SERVICE_PROBE_TIMEOUT_MS + 1e3);
+          const result = raw2;
+          if (result?.exitCode === 0 && typeof result.stdout === "string" && result.stdout.includes("system/com.apple.configd = {")) return;
+          detail2 = typeof result?.exitCode === "number" ? `launchctl exited ${result.exitCode}` : "invalid probe response";
+        } catch {
+          detail2 = "the local service probe failed or timed out";
+        }
+        const hostHealthy = await this.hostProbe().catch(() => false);
+        throw new Error(
+          `Codex cannot access macOS system services (${detail2}; ${scope}). New conversations and turns are blocked; existing work and conversation history were not changed. ` + (hostHealthy ? "Frizz's host context is healthy, but this backend is not. Stop this project's Codex turns before replacing its shared backend; restarting Frizz alone can reuse it." : "Frizz's host context also failed the check. Relaunch Frizz from a fresh terminal after stopping this project's Codex turns; its shared backend must also be replaced.")
+        );
+      }
+    };
+  }
+});
+
 // packages/server/src/backend/codex-app-server.ts
 import { createHash as createHash10, randomUUID as randomUUID11 } from "node:crypto";
 import { StringDecoder as StringDecoder3 } from "node:string_decoder";
@@ -32320,6 +32446,7 @@ var init_codex_app_server = __esm({
     init_auth_status();
     init_codex_mcp();
     init_codex_error();
+    init_codex_execution_health();
     init_types2();
     init_logging();
     CODEX_APP_SERVER_PROVIDER = "codex-app-server";
@@ -32603,7 +32730,7 @@ var init_codex_app_server = __esm({
         child.on("exit", () => this.fail("exit", new Error("Codex app-server exited")));
         child.on("error", () => this.fail("error", new Error("Codex app-server process failed")));
       }
-      async request(method, params) {
+      async request(method, params, timeoutMs = this.timeoutMs) {
         if (this.closed) throw new Error("Codex app-server connection is closed");
         if (this.pending.size >= MAX_OUTBOUND_REQUESTS) throw new Error("Codex app-server outbound request queue is full");
         if (!Number.isSafeInteger(this.nextId)) throw new Error("Codex app-server request id space is exhausted");
@@ -32612,7 +32739,7 @@ var init_codex_app_server = __esm({
           const timer = setTimeout(() => {
             this.pending.delete(id);
             reject(new Error(`Codex app-server request timed out: ${method}`));
-          }, this.timeoutMs);
+          }, timeoutMs);
           this.pending.set(id, { resolve: resolve12, reject, timer });
         });
         try {
@@ -32887,6 +33014,8 @@ var init_codex_app_server = __esm({
       host;
       codexBin;
       timeoutMs;
+      executionHealth;
+      executionScope = "";
       /** Identity of the app-server PROCESS behind the current connection (see CodexAppServerAttachment). */
       daemonGeneration = "";
       /** ChatGPT account the current app-server cached when its process started. */
@@ -32936,6 +33065,7 @@ var init_codex_app_server = __esm({
       operationWaiters = /* @__PURE__ */ new Set();
       shutdownPromise = null;
       constructor(options) {
+        this.executionHealth = options.executionHealth ?? new CodexExecutionHealth();
         this.options = options;
         this.now = options.now ?? (() => /* @__PURE__ */ new Date());
         this.makeId = options.id ?? randomUUID11;
@@ -33172,6 +33302,7 @@ var init_codex_app_server = __esm({
         const releaseOperation = this.beginOperation();
         try {
           const connection = await this.ensureConnected();
+          await this.checkExecutionHealth(connection);
           const binding = this.bindingForScope(input.threadSlug, input.sessionId);
           if (!binding) throw new Error("Codex app-server steer requires a bridge-owned session");
           if (binding.connection_epoch !== this.connectionEpoch || binding.state !== "active") {
@@ -33365,7 +33496,8 @@ var init_codex_app_server = __esm({
         if (bound === 0) return;
         const releaseOperation = this.beginOperation();
         try {
-          await this.ensureConnected();
+          const connection = await this.ensureConnected();
+          await this.checkExecutionHealth(connection);
           await this.autoResumeInterruptedTurns();
         } catch {
         } finally {
@@ -33609,6 +33741,7 @@ var init_codex_app_server = __esm({
         for (let attempt = 0; ; attempt++) {
           const desiredAccountId = (this.options.codexAuthAccountId ?? readCodexAccountId)();
           const connection = await this.ensureConnected();
+          await this.checkExecutionHealth(connection);
           if (!desiredAccountId || this.processAuthAccountId === desiredAccountId) return connection;
           if (attempt >= MAX_AUTH_REPLACEMENT_ATTEMPTS) return connection;
           if (!this.authReplacement) {
@@ -33621,6 +33754,17 @@ var init_codex_app_server = __esm({
           if (!await this.awaitAuthReplacement(this.authReplacement)) return connection;
         }
       }
+      async checkExecutionHealth(connection) {
+        try {
+          await this.executionHealth.check(connection, this.executionScope);
+        } catch (error) {
+          const detail2 = error.message;
+          this.options.diagnostic?.({ event: "execution-health-failed", detail: detail2 });
+          log.error("codex", detail2);
+          throw error;
+        }
+        if (this.connection !== connection) throw new Error("Codex app-server changed during its execution health check");
+      }
       /** Await an armed replacement for at most AUTH_REPLACEMENT_WAIT_MS. `false` = it is still waiting for
        *  the project to go idle, so the caller should proceed rather than hang; a rejection propagates. */
       async awaitAuthReplacement(replacement2) {
@@ -33695,6 +33839,7 @@ var init_codex_app_server = __esm({
           authAccountId
         });
         const child = attachment.process;
+        this.executionScope = `project ${this.options.projectDir}, backend PID ${attachment.daemonPid}, generation ${attachment.generation}`;
         let connection;
         connection = new JsonlRpcConnection(
           child,
@@ -35219,7 +35364,7 @@ var init_thread_links = __esm({
 });
 
 // packages/server/src/frizz.ts
-import { execFile as execFile5 } from "node:child_process";
+import { execFile as execFile6 } from "node:child_process";
 import { lstatSync as lstatSync2, realpathSync as realpathSync7 } from "node:fs";
 import { basename as basename5, dirname as dirname10, join as join27, resolve as resolve6 } from "node:path";
 import { promisify as promisify5 } from "node:util";
@@ -35279,7 +35424,7 @@ var init_frizz = __esm({
   "packages/server/src/frizz.ts"() {
     "use strict";
     init_src();
-    execFileP = promisify5(execFile5);
+    execFileP = promisify5(execFile6);
   }
 });
 
@@ -35571,6 +35716,12 @@ var init_workerPrompt = __esm({
       "codex": {
         "SESSION_KIND": "codex",
         "RESUME_CMD": "codex resume"
+      },
+      // An ACP agent has no resume command Frizz can name: the session lives inside the agent and Frizz
+      // re-opens it over the protocol. The token still has to resolve, so it names the mechanism.
+      "acp": {
+        "SESSION_KIND": "coding-agent",
+        "RESUME_CMD": "(Frizz re-opens the session over ACP)"
       }
     };
     INTRO = `You are a dispatched worker agent \u2014 a top-level \`{{FRIZZ_SESSION_KIND}}\` session frizz spawned to drive ONE
@@ -36102,7 +36253,23 @@ emptied window. Whether to keep notes, and whether to arm anything, is yours to
 even with \`fork_turns: "none"\`, and one undifferentiated "keep the doc current" mandate is what once
 made a child replace a whole shared document with its task notes and then delete the replacement as a
 misguided rollback. One file per writer \u2014 \`<agent>-<topic>.md\` \u2014 removes that failure entirely: there
-is nothing to merge, so there is nothing to clobber. Never edit or delete a file another agent wrote.`
+is nothing to merge, so there is nothing to clobber. Never edit or delete a file another agent wrote.`,
+      acp: `## Your scratch directory
+
+\`.frizz/threads/<session-id>/\` (exact path in your session-start context) \u2014 a folder that is YOURS, for
+as many files as you like, in whatever format you like. It starts EMPTY and nothing is expected in it.
+Frizz reads nothing here automatically.
+
+**IT IS OPTIONAL, IT IS NOT A DELIVERABLE, AND WRITING NOTES IS NOT DOING THE WORK.** It exists in case
+you want it. A single direct task usually needs nothing here: just do the task. Never let a note stand
+in for an action \u2014 recording "next: X" when the human asked for X is not progress on X, and a turn that
+ends right after a scratch write is nearly always a turn that stopped for no reason. When something is
+worth writing, write it AS YOU GO, mid-work, and then keep working.
+
+**Notes here can come back after a compaction, if you want that.** Nothing points you at this directory
+once your context is summarized \u2014 but the frizz \`goal\` tool can arm a goal, and one armed with
+\`post_compaction: true\` re-sends a prompt of your choosing (which can link a file here) into the
+emptied window. Whether to keep notes, and whether to arm anything, is yours to decide per effort.`
     };
     BACKEND = {
       claude: `## Sub-agents
@@ -36361,7 +36528,31 @@ The sandbox governs what you may touch, and a denial is the
 sandbox \u2014 not a bug: \`read-only\` (inspect, never write), \`workspace-write\` (edit inside the repo,
 denied outside), or \`danger-full-access\` (unrestricted). Approvals are off (\`approvalPolicy: never\`), so a
 sandbox-denied action fails straight back to you rather than prompting a human \u2014 adapt, or surface
-the blocker in your final message.`
+the blocker in your final message.`,
+      acp: `## Your harness, and the frizz tools inside it
+
+You are running as a coding agent that Frizz drives over the Agent Client Protocol (ACP). Frizz did
+not build your harness: your file, shell, search and sub-agent tools are your own, your permission
+prompts are your harness's (Frizz shows each one to the human as a card and relays the answer), and
+Frizz's own tools reach you as an MCP server named \`frizz\`. Your harness spells its tools with its own
+prefix \u2014 \`frizz_ask\`, \`frizz_done\`, \`frizz_watch\` \u2026 on OpenCode; \`mcp__frizz__ask\` on others \u2014 so
+wherever this contract writes \`mcp__frizz__<verb>\`, call the \`<verb>\` tool of the \`frizz\` server the
+way your harness lists it. Every verb below exists there: \`ask\`, \`unask\`, \`done\`, \`watch\`,
+\`unwatch\`, \`watch_pr\`, \`timer\`, \`goal\`, \`title\`, \`link\`, \`unlink\`, \`activity\`, \`spawn_thread\`.
+
+## Sub-agents
+
+Frizz does not dispatch sub-agents for you and cannot see the ones your harness runs, so a helper you
+spawn through your own tools is invisible on the dashboard until you report what it found. Prefer to
+do the work inline; when you do fan out, collect every child's result before you rest and fold it into
+your own write-up. \`SendMessage\` and the \`Agent\` tool named elsewhere in this contract are Claude
+Code's \u2014 use your harness's equivalent, or none.
+
+## Follow-ups arrive between turns
+
+A message the human sends while you are working is QUEUED and delivered as your next turn the moment
+this one ends \u2014 nothing can interrupt you mid-turn except a stop. So rest promptly when a turn's work is
+done rather than idling inside it, and read the newest human message first when a turn opens.`
     };
     SPAWN_THREAD = `## Spawning a separate frizz thread
 
@@ -36452,12 +36643,98 @@ Dispatches share a vocabulary for the deliverable and quality bar, not for fleet
 For a non-trivial change: plan, implement, run the repo's build/lint/test gates, inspect every changed
 call site and downstream effect, self-review the diff, fix confirmed findings, and rerun affected
 checks. Add fresh-context reviewer agents only under the explicit delegation policy above. Review
-advice is evidence to judge, not a verdict to copy. Depth scales with blast radius.`
+advice is evidence to judge, not a verdict to copy. Depth scales with blast radius.`,
+      acp: `## Thread types
+
+Recognize which KIND of effort you own and match the deliverable to it:
+
+- **Research** \u2014 find out what's true. Deliverable is FINDINGS: traces, measurements, exact paths and
+  errors, each load-bearing claim carrying a primary-source \`file:line\` or URL you actually opened. A
+  bug investigation is headed for a FIX, so close with ranked fix options and one recommendation.
+- **Audit** \u2014 adversarially verify something that exists. Check every prong against the reference,
+  re-verify load-bearing verdicts, cite evidence. Complete = every prong checked.
+- **Implementation** \u2014 land a DECIDED thing. Plan briefly \u2192 implement \u2192 run the repo's gates \u2192
+  self-review the diff \u2192 fold in every real finding. Complete = MERGED into the project's mainline with
+  docs updated and gates green.
+- **Planning** \u2014 the DESIGN is the deliverable: a durable plan file, open questions surfaced and then
+  resolved into decisions in that file. A plan that exists only in chat has not been written.
+
+## Substantive implementation
+
+For a non-trivial change: plan, implement, run the repo's build/lint/test gates, inspect every changed
+call site and downstream effect, self-review the diff, fix confirmed findings, and rerun affected
+checks. Depth scales with blast radius and yields to the project's conventions.`
     };
     MONITORS_DIR_FALLBACK = "<frizz>/cc-worker/skills/gh/scripts";
   }
 });
 
+// packages/server/src/backend/acp-agents.ts
+import { accessSync as accessSync3, constants, statSync as statSync14 } from "node:fs";
+import { delimiter as delimiter2, isAbsolute as isAbsolute6, join as join30 } from "node:path";
+function isExecutableFile(path3) {
+  try {
+    if (!statSync14(path3).isFile()) return false;
+    if (process.platform !== "win32") accessSync3(path3, constants.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function findOnPath(command, env = process.env) {
+  if (isAbsolute6(command)) return isExecutableFile(command) ? command : void 0;
+  const dirs = (env.PATH ?? env.Path ?? "").split(delimiter2).filter(Boolean);
+  const exts = process.platform === "win32" ? ["", ...(env.PATHEXT ?? ".EXE;.CMD;.BAT").split(";")] : [""];
+  for (const dir of dirs) {
+    for (const ext of exts) {
+      const candidate = join30(dir, command + ext.toLowerCase());
+      if (isExecutableFile(candidate)) return candidate;
+      if (ext && isExecutableFile(join30(dir, command + ext))) return join30(dir, command + ext);
+    }
+  }
+  return void 0;
+}
+function acpAgentSpecs(custom2) {
+  const byId = /* @__PURE__ */ new Map();
+  for (const spec of ACP_AGENT_CATALOGUE) byId.set(spec.id, spec);
+  for (const spec of custom2 ?? []) if (spec.id && spec.command) byId.set(spec.id, { ...spec, args: [...spec.args ?? []] });
+  return [...byId.values()];
+}
+function listAcpAgents(custom2, env = process.env) {
+  return acpAgentSpecs(custom2).map((spec) => {
+    const bin = findOnPath(spec.command, env);
+    return bin ? { ...spec, bin } : { ...spec };
+  });
+}
+function resolveAcpAgent(id, custom2, env = process.env) {
+  const spec = acpAgentSpecs(custom2).find((s) => s.id === id);
+  if (!spec) return void 0;
+  const bin = findOnPath(spec.command, env);
+  return bin ? { ...spec, bin } : { ...spec };
+}
+var ACP_AGENT_CATALOGUE;
+var init_acp_agents = __esm({
+  "packages/server/src/backend/acp-agents.ts"() {
+    "use strict";
+    init_src();
+    ACP_AGENT_CATALOGUE = [
+      { id: "opencode", label: "OpenCode", command: "opencode", args: ["acp"] },
+      { id: "cursor", label: "Cursor agent", command: "cursor-agent", args: ["acp"] },
+      { id: "gemini", label: "Gemini CLI", command: "gemini", args: ["--acp"] },
+      { id: "copilot", label: "GitHub Copilot CLI", command: "copilot", args: ["--acp"] },
+      { id: "kilo", label: "Kilo", command: "kilo", args: ["acp"] },
+      { id: "qwen", label: "Qwen Code", command: "qwen", args: ["--acp"] },
+      { id: "goose", label: "goose", command: "goose", args: ["acp"] },
+      { id: "kimi", label: "Kimi CLI", command: "kimi", args: ["acp"] },
+      // `grok agent stdio` is ACP over stdio (registry: `npx @xai-official/grok agent stdio`); verified
+      // live 2026-09-16 against grok 1.0.13 — it mounted the probe MCP server and called its tool.
+      { id: "grok", label: "Grok Build", command: "grok", args: ["agent", "stdio"] },
+      // pi has no native ACP mode; `pi-acp` is its registry wrapper and takes no arguments.
+      { id: "pi", label: "pi", command: "pi-acp", args: [] }
+    ];
+  }
+});
+
 // packages/server/src/backend/claude-broker-client.ts
 import net from "node:net";
 function connectClaudeBroker(socketPath, handlers, options = {}) {
@@ -37360,8 +37637,8 @@ var init_claude_agent_broker_bridge = __esm({
 });
 
 // packages/server/src/dispatch.ts
-import { closeSync as closeSync12, constants, existsSync as existsSync10, fstatSync as fstatSync2, lstatSync as lstatSync3, openSync as openSync13, readFileSync as readFileSync20, realpathSync as realpathSync8, statSync as statSync14, writeFileSync as writeFileSync10, mkdirSync as mkdirSync13, rmSync as rmSync9 } from "node:fs";
-import { basename as basename6, join as join30, dirname as dirname12 } from "node:path";
+import { closeSync as closeSync12, constants as constants2, existsSync as existsSync10, fstatSync as fstatSync2, lstatSync as lstatSync3, openSync as openSync13, readFileSync as readFileSync20, realpathSync as realpathSync8, statSync as statSync15, writeFileSync as writeFileSync10, mkdirSync as mkdirSync13, rmSync as rmSync9 } from "node:fs";
+import { basename as basename6, join as join31, dirname as dirname12 } 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();
@@ -37380,7 +37657,7 @@ function fallbackTitle(prompt) {
 }
 function resolveSlug(frizzDir, base, taken) {
   base = ThreadSlug.parse(base);
-  const isTaken = (slug) => existsSync10(join30(frizzDir, `${slug}.md`)) || (taken?.(slug) ?? false);
+  const isTaken = (slug) => existsSync10(join31(frizzDir, `${slug}.md`)) || (taken?.(slug) ?? false);
   if (!isTaken(base)) return base;
   for (let n = 2; ; n++) {
     const suffix = `-${n}`;
@@ -37397,12 +37674,12 @@ function resolveLegacyThreadFile(projectDir, value) {
   if (!parsed.success) return null;
   try {
     const projectRoot = realpathSync8(projectDir);
-    const frizzPath = join30(projectRoot, ".frizz");
+    const frizzPath = join31(projectRoot, ".frizz");
     const frizzStat = lstatSync3(frizzPath);
     if (!frizzStat.isDirectory() || frizzStat.isSymbolicLink()) return null;
     const realFrizz = realpathSync8(frizzPath);
     if (dirname12(realFrizz) !== projectRoot || basename6(realFrizz) !== ".frizz") return null;
-    const path3 = join30(realFrizz, `${parsed.data}.md`);
+    const path3 = join31(realFrizz, `${parsed.data}.md`);
     const before = lstatSync3(path3);
     if (!before.isFile() || before.isSymbolicLink()) return null;
     const realPath = realpathSync8(path3);
@@ -37410,7 +37687,7 @@ function resolveLegacyThreadFile(projectDir, value) {
     let contents;
     let openedBefore;
     let openedAfter;
-    const fd = openSync13(path3, constants.O_RDONLY | constants.O_NOFOLLOW);
+    const fd = openSync13(path3, constants2.O_RDONLY | constants2.O_NOFOLLOW);
     try {
       openedBefore = fstatSync2(fd);
       contents = readFileSync20(fd);
@@ -37446,7 +37723,7 @@ function boardAuthorizesAdoption(board, slug) {
   return !board.errorItems.some((item) => item.file === `${slug}.md`);
 }
 function ensureSafeDirectDirectory(parent, name) {
-  const path3 = join30(parent, name);
+  const path3 = join31(parent, name);
   try {
     mkdirSync13(path3);
   } catch (error) {
@@ -37476,8 +37753,8 @@ function loadWorkerPrompt(kind = "claude") {
 function monitorScriptsDir() {
   const plugin = workerPluginDir();
   if (!plugin) return void 0;
-  const dir = join30(plugin, "skills", "gh", "scripts");
-  return existsSync10(join30(dir, "ci-watch.mjs")) ? dir : void 0;
+  const dir = join31(plugin, "skills", "gh", "scripts");
+  return existsSync10(join31(dir, "ci-watch.mjs")) ? dir : void 0;
 }
 function codexScratchpadHookConfig(hookScript, sessionId) {
   if (!hookScript || !sessionId) return {};
@@ -37489,7 +37766,7 @@ function codexScratchpadHookConfig(hookScript, sessionId) {
       }
     ]
   });
-  const bashBackgroundHook = join30(dirname12(hookScript), "bash-background.mjs");
+  const bashBackgroundHook = join31(dirname12(hookScript), "bash-background.mjs");
   return {
     bypass_hook_trust: true,
     hooks: {
@@ -37515,7 +37792,7 @@ function codexScratchpadHookConfig(hookScript, sessionId) {
 }
 function scratchpadHookScript() {
   const plugin = workerPluginDir();
-  return plugin ? join30(plugin, "hooks", "scratchpad.mjs") : void 0;
+  return plugin ? join31(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.";
@@ -37531,10 +37808,10 @@ 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 path3 = join30(projectDir, "FRIZZ.md");
+  const path3 = join31(projectDir, "FRIZZ.md");
   let body;
   try {
-    const st = statSync14(path3);
+    const st = statSync15(path3);
     if (!st.isFile() || st.size > FRIZZ_MD_MAX_BYTES) return "";
     body = readFileSync20(path3, "utf8").trim();
   } catch {
@@ -37575,7 +37852,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 = join30(pluginDir, "bin", FRIZZ_MCP.script);
+  const scriptPath = join31(pluginDir, "bin", FRIZZ_MCP.script);
   if (!existsSync10(scriptPath)) return void 0;
   return {
     scriptPath,
@@ -37658,7 +37935,7 @@ function buildClaudeResumeCommand(opts) {
 }
 function createDispatcher(deps) {
   const readBoardSource = deps.readBoard ?? readBoard;
-  const frizzDir = join30(deps.project.dir, ".frizz");
+  const frizzDir = join31(deps.project.dir, ".frizz");
   const adoptionRuntime = deps.adoptionRuntime ?? productionRuntime;
   function cleanupPrewrites(built) {
     for (const path3 of new Set(built.prewrite.map((file) => file.path))) {
@@ -37671,7 +37948,7 @@ function createDispatcher(deps) {
   function cleanupDispatchFiles(scratchRel, built, sessionId) {
     cleanupPrewrites(built);
     try {
-      rmSync9(join30(deps.project.dir, scratchRel), { force: true, recursive: true });
+      rmSync9(join31(deps.project.dir, scratchRel), { force: true, recursive: true });
     } catch {
     }
     cleanupAdoptionSessionFiles(deps.project.dir, sessionId);
@@ -37681,7 +37958,7 @@ function createDispatcher(deps) {
       input = DispatchInput.parse(input);
       const settings = deps.getSettings();
       const kind = opts?.backend ?? "claude";
-      if (deps.preflightAuth && await deps.preflightAuth(kind).catch(() => "unknown") === "signed-out") {
+      if (kind !== "acp" && deps.preflightAuth && await deps.preflightAuth(kind).catch(() => "unknown") === "signed-out") {
         throw new ProviderAuthRequiredError(kind);
       }
       if (kind === "codex" && deps.preflightCodexBinary && await deps.preflightCodexBinary().catch(() => "unknown") === "missing") {
@@ -37754,6 +38031,52 @@ function createDispatcher(deps) {
           throw new Error(`Codex app-server could not start this thread: ${err.message}. Check that \`codex\` is installed and its app-server protocol matches the pinned revision (re-pin if you upgraded codex).`);
         }
       }
+      if (kind === "acp") {
+        const bridge = deps.acpBridge;
+        const agentId = acpAgentIdFromModel(model);
+        if (!bridge || !agentId) {
+          cleanupDispatchFiles(scratchRel, { argv: [], env: {}, prewrite: [] }, sessionId);
+          throw new Error(!bridge ? "The ACP bridge is unavailable; cannot start this thread." : `An ACP dispatch needs an agent: pick one in the composer (model \`acp:<agent>\`), got ${JSON.stringify(model ?? null)}.`);
+        }
+        const firstPrompt = [loadWorkerPrompt("acp"), scratchpadOrientation(sessionId, kind), frizzConfigBlock(deps.project.dir), prompt].filter(Boolean).join("\n\n");
+        try {
+          const spawned = await bridge.spawnDispatch({ threadSlug: slug, sessionId, cwd: deps.project.dir, agentId, modelId: acpModelIdFromModel(model), prompt: firstPrompt, userText: input.prompt });
+          deps.storage.upsertSession({
+            slug,
+            session_id: sessionId,
+            thread_name: threadIdentityName(slug),
+            spawned_at: (/* @__PURE__ */ new Date()).toISOString(),
+            last_read_at: null,
+            unread: 0,
+            exited: 0,
+            archived: 0,
+            rested_at: null,
+            title_auto: input.title?.trim() ? 0 : 1,
+            title_locked: 0,
+            title: registryTitle,
+            state: "open",
+            meta: null,
+            seen_at: null,
+            transcript_id: null,
+            model: model ?? null,
+            effort: null,
+            permission_mode: permissionMode
+          });
+          deps.storage.setBackend(slug, "acp");
+          deps.storage.setAgentSession(slug, spawned.acpSessionId);
+          deps.storage.setAcpAgent(slug, agentId);
+          void deps.board.rebuild().catch(() => {
+          });
+          return { slug, sessionId };
+        } catch (err) {
+          try {
+            bridge.releaseSession(slug, sessionId, "session-deleted");
+          } catch {
+          }
+          cleanupDispatchFiles(scratchRel, { argv: [], env: {}, prewrite: [] }, sessionId);
+          throw new Error(`The ACP agent could not start this thread: ${err.message}`);
+        }
+      }
       if (kind === "claude") {
         const bridge = deps.claudeBroker;
         if (!bridge) {
@@ -38059,6 +38382,8 @@ var init_dispatch = __esm({
     init_worker_plugin_dir();
     init_workerPrompt();
     init_codex();
+    init_acp_agents();
+    init_src();
     init_claude_agent_broker_bridge();
     init_claude_effort();
     init_auth_status();
@@ -38101,7 +38426,10 @@ var init_dispatch = __esm({
     FRIZZ_MD_MAX_BYTES = 64 * 1024;
     WORKER_DISPATCH_PERMISSION = {
       claude: "auto",
-      codex: "bypassPermissions"
+      codex: "bypassPermissions",
+      // An ACP agent's permissions are its own (plans/acp-backend.md, decision 7): Frizz sends no mode and
+      // mirrors whatever the agent asks as a card. The value here is recorded on the row and nothing else.
+      acp: "auto"
     };
     missingPluginReported = false;
   }
@@ -38113,7 +38441,7 @@ import {
   watch as fsWatch
 } from "node:fs";
 import { homedir as homedir14 } from "node:os";
-import { dirname as dirname13, join as join31 } from "node:path";
+import { dirname as dirname13, join as join32 } from "node:path";
 import watcher from "@parcel/watcher";
 function appServerTurnStalled(liveness, lastActivityAt, nowMs) {
   if (!liveness) return false;
@@ -38653,7 +38981,7 @@ function sessionThreadView(projectDir, storage, row, rawTele, registeredLegacyTe
     // from today's dispatch preference: unknown/migrated rows remain unmarked, while rows whose
     // database default was explicitly normalized to "claude" get the same per-thread identity as
     // Codex rows.
-    backend: row.backend === "claude" || row.backend === "codex" ? row.backend : void 0,
+    backend: row.backend === "claude" || row.backend === "codex" || row.backend === "acp" ? row.backend : void 0,
     // Only a persisted, validated per-session value is exposed. A migrated row stays visibly unknown;
     // never label it with today's global defaults (which may not match its running process).
     permissionMode,
@@ -38960,7 +39288,7 @@ function createBoard(project, storage, bus, tailer, bootId, deps = {}) {
     if (parcelSub || stopped) return Promise.resolve();
     if (watchSetup) return watchSetup;
     const setup = (async () => {
-      const dir = join31(project.dir, ".frizz");
+      const dir = join32(project.dir, ".frizz");
       const roots = /* @__PURE__ */ new Set([dir]);
       try {
         roots.add(realpathSync9(dir));
@@ -38975,7 +39303,7 @@ function createBoard(project, storage, bus, tailer, bootId, deps = {}) {
           }
           if (events.some((event) => isBoardRelevantFrizzPath(roots, event.path))) scheduleRebuild();
         },
-        { ignore: FRIZZ_WATCH_IGNORED_DIRS.map((name) => join31(dir, name)) }
+        { ignore: FRIZZ_WATCH_IGNORED_DIRS.map((name) => join32(dir, name)) }
       );
       if (stopped) {
         await next.unsubscribe();
@@ -39293,7 +39621,7 @@ var init_wake_store = __esm({
 });
 
 // packages/server/src/github-review.ts
-import { execFile as execFile6 } from "node:child_process";
+import { execFile as execFile7 } from "node:child_process";
 import { promisify as promisify6 } from "node:util";
 function refKey(ref) {
   return `${ref.kind === "issue" ? "issue:" : ""}${ref.owner}/${ref.repo}#${ref.number}`;
@@ -39712,7 +40040,7 @@ var execFileAsync4, GH_TIMEOUT_MS, GH_MAX_BUFFER, REQUEST_TIMEOUT_MS, MAX_REFS_P
 var init_github_review = __esm({
   "packages/server/src/github-review.ts"() {
     "use strict";
-    execFileAsync4 = promisify6(execFile6);
+    execFileAsync4 = promisify6(execFile7);
     GH_TIMEOUT_MS = 3e4;
     GH_MAX_BUFFER = 1024 * 1024;
     REQUEST_TIMEOUT_MS = 3e4;
@@ -39849,7 +40177,7 @@ var init_pr_watch_noise = __esm({
 });
 
 // packages/server/src/scheduler.ts
-import { execFile as execFile7 } from "node:child_process";
+import { execFile as execFile8 } from "node:child_process";
 import { promisify as promisify7 } from "node:util";
 import { createHash as createHash12, randomUUID as randomUUID14 } from "node:crypto";
 function failureSignature(rollup) {
@@ -41740,7 +42068,7 @@ var init_scheduler = __esm({
     init_pr_watch_noise();
     init_github_review();
     init_logging();
-    execFileAsync5 = promisify7(execFile7);
+    execFileAsync5 = promisify7(execFile8);
     LIMIT_FENCE_PREFIX = "limit
";
     LIMIT_HINT_PREFIX = "limit:";
     LIMIT_RESUME_GRACE_MS = 6e4;
@@ -41862,7 +42190,7 @@ var init_resume = __esm({
 });
 
 // packages/server/src/backend/claude.ts
-import { join as join32 } from "node:path";
+import { join as join33 } from "node:path";
 function toolResultText2(content) {
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
@@ -41953,7 +42281,7 @@ function createClaudeBackend(opts) {
       return { argv, env: claudeWorkerEnvironment(), prewrite: [] };
     },
     transcriptPath(sessionId) {
-      return join32(opts.logDir, `${sessionId}.jsonl`);
+      return join33(opts.logDir, `${sessionId}.jsonl`);
     },
     parseLine(line) {
       return parseClaudeLine(line);
@@ -41977,6 +42305,1181 @@ var init_claude = __esm({
   }
 });
 
+// packages/server/src/backend/acp-transcript.ts
+import { appendFileSync as appendFileSync3, existsSync as existsSync12, mkdirSync as mkdirSync14, readFileSync as readFileSync21 } from "node:fs";
+import { dirname as dirname14, join as join34 } from "node:path";
+function acpTranscriptPath(stateDir, sessionId) {
+  return join34(stateDir, ACP_TRANSCRIPT_DIR, `${sessionId}.jsonl`);
+}
+function parseAcpRecord(line) {
+  if (!line.trim()) return void 0;
+  let raw2;
+  try {
+    raw2 = JSON.parse(line);
+  } catch {
+    return void 0;
+  }
+  if (!raw2 || typeof raw2 !== "object" || typeof raw2.kind !== "string") return void 0;
+  const kind = raw2.kind;
+  if (kind === "acp-session" || kind === "acp-note" || EVENT_KINDS.has(kind)) return raw2;
+  return void 0;
+}
+function parseAcpLine(line) {
+  const rec = parseAcpRecord(line);
+  if (!rec || rec.kind === "acp-session" || rec.kind === "acp-note") return [];
+  const { messageId: _m, acp: _a, ...ev } = rec;
+  return [ev];
+}
+function createAcpBackend(opts) {
+  return {
+    kind: "acp",
+    buildSpawn(_o) {
+      throw new Error("acp runs via the ACP bridge; this argv builder has no live caller");
+    },
+    buildResume(_o) {
+      throw new Error("acp runs via the ACP bridge; this argv builder has no live caller");
+    },
+    // Deterministic: the bridge names the file after the frizz session id, so no discovery step.
+    transcriptPath(sessionId) {
+      return acpTranscriptPath(opts.stateDir, sessionId);
+    },
+    parseLine: parseAcpLine,
+    foldLine(state, line) {
+      const rec = parseAcpRecord(line);
+      if (!rec) return;
+      if (rec.kind === "acp-session") {
+        if (rec.model) {
+          state.model = rec.model;
+          state.profileAt = rec.at;
+          state.profileRevision = (state.profileRevision ?? 0) + 1;
+        }
+        return;
+      }
+      for (const ev of parseAcpLine(line)) applyEvent(state, ev);
+    }
+  };
+}
+function clip2(text2, max) {
+  return text2.length > max ? `${text2.slice(0, max - 1)}\u2026` : text2;
+}
+function toolTarget(rawInput, acp) {
+  const input = rawInput && typeof rawInput === "object" ? rawInput : void 0;
+  const command = typeof input?.command === "string" ? input.command : void 0;
+  const path3 = typeof input?.filePath === "string" ? input.filePath : typeof input?.file_path === "string" ? input.file_path : typeof input?.path === "string" ? input.path : acp?.locations?.[0];
+  return { command, path: path3, input };
+}
+function toolCallFor(ev, acp) {
+  const { command, path: path3, input } = toolTarget(ev.input, acp);
+  const detail2 = command ?? path3 ?? acp?.title ?? "";
+  const call = { name: ev.name, status: "pending" };
+  if (detail2) call.detail = clip2(detail2, 500);
+  if (command) call.command = command;
+  else if (input && Object.keys(input).length) call.input = clip2(JSON.stringify(input, null, 2), TOOL_TEXT_MAX);
+  return call;
+}
+function upgradeToolTarget(call, acp) {
+  if (!acp || call.command || call.detail && call.detail !== call.name) return;
+  const { command, path: path3, input } = toolTarget(acp.input, acp);
+  const detail2 = command ?? path3;
+  if (!detail2) return;
+  call.detail = clip2(detail2, 500);
+  if (command) call.command = command;
+  else if (input && Object.keys(input).length && !call.input) call.input = clip2(JSON.stringify(input, null, 2), TOOL_TEXT_MAX);
+}
+function projectAcpTranscript(raw2, identityPrefix = "acp") {
+  const out = [];
+  let current;
+  let currentMessageId;
+  const openTools = /* @__PURE__ */ new Map();
+  const lines = raw2.split("\n");
+  const close2 = () => {
+    current = void 0;
+    currentMessageId = void 0;
+  };
+  const openAssistant = (i, at) => {
+    if (!current) {
+      current = { sourceId: `${identityPrefix}:${i}`, role: "assistant", text: "", tools: [], parts: [], ...at ? { at } : {} };
+      out.push(current);
+    }
+    return current;
+  };
+  const appendText = (msg, text2) => {
+    const last = msg.parts[msg.parts.length - 1];
+    if (last?.kind === "text") last.text += text2;
+    else msg.parts.push({ kind: "text", text: text2 });
+    msg.text = msg.parts.filter((p) => p.kind === "text").map((p) => p.text).join("\n\n");
+  };
+  const appendTool = (msg, tool) => {
+    const last = msg.parts[msg.parts.length - 1];
+    if (last?.kind === "tools") last.tools.push(tool);
+    else msg.parts.push({ kind: "tools", tools: [tool] });
+    msg.tools.push(tool);
+  };
+  for (let i = 0; i < lines.length; i++) {
+    const rec = parseAcpRecord(lines[i]);
+    if (!rec) continue;
+    switch (rec.kind) {
+      case "acp-session":
+      case "acp-note":
+      case "title":
+      case "context-usage":
+      case "compaction":
+      case "agent-report":
+      case "agent-instruction":
+        break;
+      case "user-message": {
+        close2();
+        const text2 = rec.text ?? "";
+        out.push({ sourceId: `${identityPrefix}:${i}`, role: "user", text: text2, tools: [], parts: [], ...rec.at ? { at: rec.at } : {}, ...rec.synthetic ? { wake: true } : {} });
+        break;
+      }
+      case "turn-start":
+        break;
+      case "turn-end":
+        close2();
+        break;
+      case "reasoning": {
+        close2();
+        out.push({ sourceId: `${identityPrefix}:${i}`, role: "assistant", kind: "reasoning", text: rec.text, tools: [], parts: [], ...rec.at ? { at: rec.at } : {} });
+        break;
+      }
+      case "assistant-text": {
+        const msg = openAssistant(i, rec.at);
+        const mid = rec.messageId;
+        if (mid && mid === currentMessageId) {
+          const last = msg.parts[msg.parts.length - 1];
+          if (last?.kind === "text") {
+            last.text += rec.text;
+            msg.text = msg.parts.filter((p) => p.kind === "text").map((p) => p.text).join("\n\n");
+            break;
+          }
+        }
+        currentMessageId = mid;
+        appendText(msg, rec.text);
+        break;
+      }
+      case "tool-call": {
+        const msg = openAssistant(i, rec.at);
+        currentMessageId = void 0;
+        const call = toolCallFor(rec, rec.acp);
+        openTools.set(rec.id, call);
+        appendTool(msg, call);
+        break;
+      }
+      case "tool-result": {
+        const call = openTools.get(rec.id);
+        if (!call) break;
+        openTools.delete(rec.id);
+        const failed = rec.acp?.status === "failed" || rec.acp?.kind === "failed";
+        call.status = failed ? "failed" : "completed";
+        upgradeToolTarget(call, rec.acp);
+        if (rec.text) call.output = clip2(rec.text, TOOL_TEXT_MAX);
+        break;
+      }
+      case "provider-error": {
+        const msg = openAssistant(i, rec.at);
+        msg.providerError = rec.error;
+        close2();
+        break;
+      }
+    }
+  }
+  return out;
+}
+function readAcpTranscriptFile(absPath, nativeId = absPath) {
+  try {
+    return projectAcpTranscript(readFileSync21(absPath, "utf8"), `acp:${nativeId}`);
+  } catch {
+    return [];
+  }
+}
+var ACP_TRANSCRIPT_DIR, EVENT_KINDS, AcpTranscriptWriter, TOOL_TEXT_MAX;
+var init_acp_transcript = __esm({
+  "packages/server/src/backend/acp-transcript.ts"() {
+    "use strict";
+    init_tailer();
+    ACP_TRANSCRIPT_DIR = "acp";
+    EVENT_KINDS = /* @__PURE__ */ new Set([
+      "turn-start",
+      "turn-end",
+      "provider-error",
+      "assistant-text",
+      "user-message",
+      "tool-call",
+      "tool-result",
+      "reasoning",
+      "agent-report",
+      "agent-instruction",
+      "title",
+      "compaction",
+      "context-usage"
+    ]);
+    AcpTranscriptWriter = class {
+      constructor(path3) {
+        this.path = path3;
+        mkdirSync14(dirname14(path3), { recursive: true });
+        if (!existsSync12(path3)) appendFileSync3(path3, "");
+      }
+      append(record) {
+        appendFileSync3(this.path, JSON.stringify(record) + "\n");
+      }
+    };
+    TOOL_TEXT_MAX = 12e3;
+  }
+});
+
+// packages/server/src/backend/acp-types.ts
+function parseSessionUpdate(raw2) {
+  const parsed = AcpSessionUpdateKnown.safeParse(raw2);
+  return parsed.success ? parsed.data : { sessionUpdate: "unknown", raw: raw2 };
+}
+function contentText(block) {
+  if (!block) return void 0;
+  if (block.type === "text" && typeof block.text === "string") return block.text;
+  if (block.type === "resource") {
+    const r = block.resource;
+    return typeof r?.text === "string" ? r.text : void 0;
+  }
+  return void 0;
+}
+var ACP_PROTOCOL_VERSION, JsonRpcId, JsonRpcError, JsonRpcInbound, ACP_ERROR_AUTH_REQUIRED, ACP_ERROR_METHOD_NOT_FOUND, ACP_ERROR_INTERNAL, AcpAuthMethod, AcpAgentCapabilities, AcpInitializeResult, AcpMcpServerStdio, AcpConfigOption, AcpNewSessionResult, AcpSetConfigOptionResult, AcpLoadSessionResult, AcpContentBlock, AcpToolKind, AcpToolCallStatus, AcpToolCallContent, AcpToolCallLocation, ToolCallFields, AcpToolCallUpdate, AcpPlanEntry, AcpSessionUpdateKnown, AcpSessionNotification, AcpStopReason, AcpPromptResult, AcpPermissionOptionKind, AcpPermissionOption, AcpRequestPermissionParams;
+var init_acp_types = __esm({
+  "packages/server/src/backend/acp-types.ts"() {
+    "use strict";
+    init_zod();
+    ACP_PROTOCOL_VERSION = 1;
+    JsonRpcId = external_exports.union([external_exports.string(), external_exports.number()]);
+    JsonRpcError = external_exports.object({
+      code: external_exports.number(),
+      message: external_exports.string(),
+      data: external_exports.unknown().optional()
+    }).passthrough();
+    JsonRpcInbound = external_exports.union([
+      external_exports.object({ jsonrpc: external_exports.literal("2.0").optional(), id: JsonRpcId, result: external_exports.unknown() }).passthrough(),
+      external_exports.object({ jsonrpc: external_exports.literal("2.0").optional(), id: JsonRpcId, error: JsonRpcError }).passthrough(),
+      external_exports.object({ jsonrpc: external_exports.literal("2.0").optional(), id: JsonRpcId, method: external_exports.string(), params: external_exports.unknown().optional() }).passthrough(),
+      external_exports.object({ jsonrpc: external_exports.literal("2.0").optional(), method: external_exports.string(), params: external_exports.unknown().optional() }).passthrough()
+    ]);
+    ACP_ERROR_AUTH_REQUIRED = -32e3;
+    ACP_ERROR_METHOD_NOT_FOUND = -32601;
+    ACP_ERROR_INTERNAL = -32603;
+    AcpAuthMethod = external_exports.object({
+      id: external_exports.string(),
+      name: external_exports.string().optional(),
+      description: external_exports.string().optional(),
+      // Absent = "agent" (call `authenticate {methodId}`); "terminal" = relaunch the same program
+      // interactively with `args`/`env` — which Frizz does not do; it tells the operator instead.
+      type: external_exports.string().optional()
+    }).passthrough();
+    AcpAgentCapabilities = external_exports.object({
+      loadSession: external_exports.boolean().optional(),
+      promptCapabilities: external_exports.object({ image: external_exports.boolean().optional(), audio: external_exports.boolean().optional(), embeddedContext: external_exports.boolean().optional() }).passthrough().optional(),
+      mcpCapabilities: external_exports.object({ http: external_exports.boolean().optional(), sse: external_exports.boolean().optional() }).passthrough().optional(),
+      // Object markers: `{}` present = supported, absent = not.
+      sessionCapabilities: external_exports.object({
+        list: external_exports.unknown().optional(),
+        resume: external_exports.unknown().optional(),
+        close: external_exports.unknown().optional(),
+        fork: external_exports.unknown().optional(),
+        delete: external_exports.unknown().optional()
+      }).passthrough().optional()
+    }).passthrough();
+    AcpInitializeResult = external_exports.object({
+      protocolVersion: external_exports.number(),
+      agentCapabilities: AcpAgentCapabilities.optional(),
+      authMethods: external_exports.array(AcpAuthMethod).optional(),
+      agentInfo: external_exports.object({ name: external_exports.string().optional(), title: external_exports.string().optional(), version: external_exports.string().optional() }).passthrough().optional()
+    }).passthrough();
+    AcpMcpServerStdio = external_exports.object({
+      name: external_exports.string(),
+      command: external_exports.string(),
+      args: external_exports.array(external_exports.string()),
+      env: external_exports.array(external_exports.object({ name: external_exports.string(), value: external_exports.string() }))
+    });
+    AcpConfigOption = external_exports.object({
+      id: external_exports.string(),
+      name: external_exports.string().optional(),
+      category: external_exports.string().optional(),
+      type: external_exports.string().optional(),
+      currentValue: external_exports.unknown().optional(),
+      options: external_exports.array(external_exports.object({ value: external_exports.string(), name: external_exports.string().optional() }).passthrough()).optional()
+    }).passthrough();
+    AcpNewSessionResult = external_exports.object({
+      sessionId: external_exports.string().min(1),
+      configOptions: external_exports.array(AcpConfigOption).nullish(),
+      modes: external_exports.unknown().optional()
+    }).passthrough();
+    AcpSetConfigOptionResult = external_exports.object({ configOptions: external_exports.array(AcpConfigOption).nullish() }).passthrough();
+    AcpLoadSessionResult = external_exports.object({
+      configOptions: external_exports.array(AcpConfigOption).nullish(),
+      modes: external_exports.unknown().optional()
+    }).passthrough();
+    AcpContentBlock = external_exports.union([
+      external_exports.object({ type: external_exports.literal("text"), text: external_exports.string() }).passthrough(),
+      external_exports.object({ type: external_exports.literal("resource_link"), uri: external_exports.string(), name: external_exports.string().optional() }).passthrough(),
+      external_exports.object({ type: external_exports.literal("resource"), resource: external_exports.object({ uri: external_exports.string(), text: external_exports.string().optional() }).passthrough() }).passthrough(),
+      external_exports.object({ type: external_exports.literal("image"), mimeType: external_exports.string().optional(), data: external_exports.string().optional() }).passthrough(),
+      external_exports.object({ type: external_exports.string() }).passthrough()
+    ]);
+    AcpToolKind = external_exports.enum(["read", "edit", "delete", "move", "search", "execute", "think", "fetch", "switch_mode", "other"]);
+    AcpToolCallStatus = external_exports.enum(["pending", "in_progress", "completed", "failed"]);
+    AcpToolCallContent = external_exports.union([
+      external_exports.object({ type: external_exports.literal("content"), content: AcpContentBlock }).passthrough(),
+      external_exports.object({ type: external_exports.literal("diff"), path: external_exports.string(), oldText: external_exports.string().nullish(), newText: external_exports.string() }).passthrough(),
+      external_exports.object({ type: external_exports.literal("terminal"), terminalId: external_exports.string() }).passthrough(),
+      external_exports.object({ type: external_exports.string() }).passthrough()
+    ]);
+    AcpToolCallLocation = external_exports.object({ path: external_exports.string(), line: external_exports.number().nullish() }).passthrough();
+    ToolCallFields = {
+      toolCallId: external_exports.string(),
+      title: external_exports.string().optional(),
+      kind: external_exports.string().optional(),
+      status: external_exports.string().optional(),
+      content: external_exports.array(AcpToolCallContent).nullish(),
+      locations: external_exports.array(AcpToolCallLocation).nullish(),
+      rawInput: external_exports.unknown().optional(),
+      rawOutput: external_exports.unknown().optional()
+    };
+    AcpToolCallUpdate = external_exports.object(ToolCallFields).passthrough();
+    AcpPlanEntry = external_exports.object({ content: external_exports.string(), priority: external_exports.string().optional(), status: external_exports.string().optional() }).passthrough();
+    AcpSessionUpdateKnown = external_exports.discriminatedUnion("sessionUpdate", [
+      external_exports.object({ sessionUpdate: external_exports.literal("user_message_chunk"), content: AcpContentBlock, messageId: external_exports.string().optional() }).passthrough(),
+      external_exports.object({ sessionUpdate: external_exports.literal("agent_message_chunk"), content: AcpContentBlock, messageId: external_exports.string().optional() }).passthrough(),
+      external_exports.object({ sessionUpdate: external_exports.literal("agent_thought_chunk"), content: AcpContentBlock, messageId: external_exports.string().optional() }).passthrough(),
+      external_exports.object({ sessionUpdate: external_exports.literal("tool_call"), ...ToolCallFields }).passthrough(),
+      external_exports.object({ sessionUpdate: external_exports.literal("tool_call_update"), ...ToolCallFields }).passthrough(),
+      external_exports.object({ sessionUpdate: external_exports.literal("plan"), entries: external_exports.array(AcpPlanEntry) }).passthrough(),
+      external_exports.object({ sessionUpdate: external_exports.literal("usage_update"), used: external_exports.number(), size: external_exports.number(), cost: external_exports.unknown().optional() }).passthrough(),
+      external_exports.object({ sessionUpdate: external_exports.literal("session_info_update"), title: external_exports.string().nullish(), updatedAt: external_exports.string().nullish() }).passthrough(),
+      external_exports.object({ sessionUpdate: external_exports.literal("config_option_update"), configOptions: external_exports.array(AcpConfigOption) }).passthrough(),
+      external_exports.object({ sessionUpdate: external_exports.literal("compaction_update"), compactionId: external_exports.string().optional(), status: external_exports.string().optional() }).passthrough()
+    ]);
+    AcpSessionNotification = external_exports.object({ sessionId: external_exports.string(), update: external_exports.unknown() }).passthrough();
+    AcpStopReason = external_exports.enum(["end_turn", "max_tokens", "max_turn_requests", "refusal", "cancelled"]);
+    AcpPromptResult = external_exports.object({
+      // A string, not the enum: a future reason must not turn a finished turn into a parse failure.
+      stopReason: external_exports.string(),
+      usage: external_exports.object({ inputTokens: external_exports.number().optional(), outputTokens: external_exports.number().optional(), totalTokens: external_exports.number().optional() }).passthrough().nullish()
+    }).passthrough();
+    AcpPermissionOptionKind = external_exports.enum(["allow_once", "allow_always", "reject_once", "reject_always"]);
+    AcpPermissionOption = external_exports.object({
+      optionId: external_exports.string(),
+      name: external_exports.string().optional(),
+      // A string: an unknown kind renders as an opaque choice rather than failing the whole request.
+      kind: external_exports.string().optional()
+    }).passthrough();
+    AcpRequestPermissionParams = external_exports.object({
+      sessionId: external_exports.string(),
+      toolCall: AcpToolCallUpdate,
+      options: external_exports.array(AcpPermissionOption)
+    }).passthrough();
+  }
+});
+
+// packages/server/src/backend/acp-rpc.ts
+import { spawn as spawn6 } from "node:child_process";
+import { StringDecoder as StringDecoder4 } from "node:string_decoder";
+var spawnAcpChild, AcpRequestError, AcpRemoteError, AcpConnectionClosed, AcpRequestTimeout, DEFAULT_TIMEOUT_MS, DEFAULT_MAX_LINE_BYTES, AcpConnection;
+var init_acp_rpc = __esm({
+  "packages/server/src/backend/acp-rpc.ts"() {
+    "use strict";
+    init_acp_types();
+    spawnAcpChild = ({ command, args, cwd, env }) => spawn6(command, args, { cwd, env, stdio: ["pipe", "pipe", "pipe"], windowsHide: true });
+    AcpRequestError = class extends Error {
+      constructor(code, message, data) {
+        super(message);
+        this.code = code;
+        this.data = data;
+      }
+    };
+    AcpRemoteError = class extends Error {
+      constructor(method, error) {
+        super(`${method}: ${error.message} (${error.code})`);
+        this.method = method;
+        this.error = error;
+      }
+    };
+    AcpConnectionClosed = class extends Error {
+      constructor(method, reason) {
+        super(`${method}: agent connection closed (${reason})`);
+        this.method = method;
+        this.reason = reason;
+      }
+    };
+    AcpRequestTimeout = class extends Error {
+      constructor(method, timeoutMs) {
+        super(`${method}: no response from the agent within ${Math.round(timeoutMs / 1e3)}s`);
+        this.method = method;
+        this.timeoutMs = timeoutMs;
+      }
+    };
+    DEFAULT_TIMEOUT_MS = 6e4;
+    DEFAULT_MAX_LINE_BYTES = 8 * 1024 * 1024;
+    AcpConnection = class {
+      constructor(process2, options) {
+        this.process = process2;
+        this.options = options;
+        const maxLine = options.maxLineBytes ?? DEFAULT_MAX_LINE_BYTES;
+        this.exitPromise = new Promise((resolve12) => {
+          process2.on("exit", (code, signal) => {
+            this.settleClosed(`exit ${signal ?? code ?? "?"}`);
+            resolve12({ code, signal });
+          });
+          process2.on("error", (err) => {
+            this.settleClosed(err.message);
+            resolve12({ code: null, signal: null });
+          });
+        });
+        process2.stdout?.on("data", (chunk) => {
+          this.buffer += typeof chunk === "string" ? chunk : this.decoder.write(chunk);
+          let nl;
+          while ((nl = this.buffer.indexOf("\n")) >= 0) {
+            const line = this.buffer.slice(0, nl);
+            this.buffer = this.buffer.slice(nl + 1);
+            if (this.overflowing) {
+              this.overflowing = false;
+              continue;
+            }
+            this.handleLine(line);
+          }
+          if (this.buffer.length > maxLine) {
+            options.onDiagnostic?.({ kind: "oversized-line", message: `dropped a stdout line longer than ${maxLine} bytes` });
+            this.buffer = "";
+            this.overflowing = true;
+          }
+        });
+        process2.stderr?.on("data", (chunk) => {
+          const text2 = String(chunk);
+          for (const line of text2.split("\n")) {
+            if (!line.trim()) continue;
+            this.stderrTail.push(line.slice(0, 2e3));
+            if (this.stderrTail.length > 40) this.stderrTail.shift();
+            options.onDiagnostic?.({ kind: "stderr", message: line.slice(0, 2e3) });
+          }
+        });
+      }
+      nextId = 1;
+      pending = /* @__PURE__ */ new Map();
+      decoder = new StringDecoder4("utf8");
+      buffer = "";
+      overflowing = false;
+      closedReason;
+      exitPromise;
+      stderrTail = [];
+      /** The last lines the agent wrote to stderr — what a failed dispatch shows the operator. */
+      get recentStderr() {
+        return this.stderrTail;
+      }
+      get closed() {
+        return this.closedReason !== void 0;
+      }
+      /** Resolves when the process has exited (or failed to start). */
+      get exited() {
+        return this.exitPromise;
+      }
+      request(method, params, opts = {}) {
+        if (this.closedReason !== void 0) return Promise.reject(new AcpConnectionClosed(method, this.closedReason));
+        const id = this.nextId++;
+        const timeoutMs = opts.timeoutMs ?? this.options.requestTimeoutMs ?? DEFAULT_TIMEOUT_MS;
+        return new Promise((resolve12, reject) => {
+          const timer = timeoutMs > 0 ? setTimeout(() => {
+            this.pending.delete(id);
+            reject(new AcpRequestTimeout(method, timeoutMs));
+          }, timeoutMs) : void 0;
+          timer?.unref?.();
+          this.pending.set(id, { method, resolve: resolve12, reject, timer });
+          if (!this.write({ jsonrpc: "2.0", id, method, params })) {
+            this.pending.delete(id);
+            if (timer) clearTimeout(timer);
+            reject(new AcpConnectionClosed(method, this.closedReason ?? "stdin closed"));
+          }
+        });
+      }
+      /** A prompt turn is long-lived by design (its response IS the end of the turn), so it is the one
+       *  request that must not time out; callers pass `timeoutMs: 0` through this alias for readability. */
+      requestOpenEnded(method, params) {
+        return this.request(method, params, { timeoutMs: 0 });
+      }
+      notify(method, params) {
+        this.write({ jsonrpc: "2.0", method, params });
+      }
+      /** Close stdin (the protocol's teardown) and, if the agent has not exited after `graceMs`, kill it. */
+      async close(graceMs = 3e3) {
+        try {
+          this.process.stdin?.end();
+        } catch {
+        }
+        if (this.closedReason !== void 0) return;
+        const exited = await Promise.race([this.exitPromise.then(() => true), new Promise((r) => setTimeout(() => r(false), graceMs).unref?.())]);
+        if (!exited) {
+          try {
+            this.process.kill("SIGKILL");
+          } catch {
+          }
+        }
+      }
+      write(frame) {
+        if (this.closedReason !== void 0) return false;
+        const stdin = this.process.stdin;
+        if (!stdin || stdin.writableEnded || stdin.destroyed) return false;
+        try {
+          stdin.write(JSON.stringify(frame) + "\n");
+          return true;
+        } catch (err) {
+          this.settleClosed(err.message);
+          return false;
+        }
+      }
+      settleClosed(reason) {
+        if (this.closedReason !== void 0) return;
+        this.closedReason = reason;
+        for (const [id, p] of this.pending) {
+          this.pending.delete(id);
+          if (p.timer) clearTimeout(p.timer);
+          p.reject(new AcpConnectionClosed(p.method, reason));
+        }
+      }
+      handleLine(line) {
+        if (!line.trim()) return;
+        let raw2;
+        try {
+          raw2 = JSON.parse(line);
+        } catch {
+          this.options.onDiagnostic?.({ kind: "junk-line", message: line.slice(0, 500) });
+          return;
+        }
+        const parsed = JsonRpcInbound.safeParse(raw2);
+        if (!parsed.success) {
+          this.options.onDiagnostic?.({ kind: "protocol", message: `unrecognized frame: ${line.slice(0, 500)}` });
+          return;
+        }
+        const frame = parsed.data;
+        if (typeof frame.method === "string") {
+          if (frame.id !== void 0) this.handleRequest(frame.id, frame.method, frame.params);
+          else this.options.onNotification(frame.method, frame.params);
+          return;
+        }
+        const id = frame.id;
+        const p = this.pending.get(id);
+        if (!p) {
+          this.options.onDiagnostic?.({ kind: "protocol", message: `response to unknown request id ${String(id)}` });
+          return;
+        }
+        this.pending.delete(id);
+        if (p.timer) clearTimeout(p.timer);
+        if (frame.error !== void 0) p.reject(new AcpRemoteError(p.method, frame.error));
+        else p.resolve(frame.result);
+      }
+      handleRequest(id, method, params) {
+        void this.options.onRequest(method, params).then(
+          (result) => {
+            this.write({ jsonrpc: "2.0", id, result: result ?? {} });
+          },
+          (err) => {
+            const e = err instanceof AcpRequestError ? { code: err.code, message: err.message, ...err.data !== void 0 ? { data: err.data } : {} } : { code: -32603, message: err instanceof Error ? err.message : String(err) };
+            if (!(err instanceof AcpRequestError)) this.options.onDiagnostic?.({ kind: "unhandled-request", message: `${method}: ${e.message}` });
+            this.write({ jsonrpc: "2.0", id, error: e });
+          }
+        );
+      }
+    };
+  }
+});
+
+// packages/server/src/backend/acp-bridge.ts
+function clip3(text2, max) {
+  return text2.length > max ? `${text2.slice(0, max - 1)}\u2026` : text2;
+}
+function frizzMcpServer(mcp, slug) {
+  if (!mcp) return [];
+  return [{
+    name: FRIZZ_MCP.name,
+    command: process.execPath,
+    args: [mcp.scriptPath],
+    env: Object.entries(frizzMcpEnv({ ...mcp, slug })).map(([name, value]) => ({ name, value }))
+  }];
+}
+function toolResultText3(tc) {
+  const parts = [];
+  for (const c of tc.content ?? []) {
+    if (c.type === "content") {
+      const t = contentText(c.content);
+      if (t) parts.push(t);
+    } else if (c.type === "diff") parts.push(`--- ${c.path}
+${c.newText}`);
+  }
+  if (parts.length) return parts.join("\n");
+  const raw2 = tc.rawOutput;
+  if (raw2 && typeof raw2 === "object" && typeof raw2.output === "string") return raw2.output;
+  if (typeof tc.rawOutput === "string") return tc.rawOutput;
+  return "";
+}
+function buildAcpPermissionInteraction(params, owner, agent) {
+  const tc = params.toolCall;
+  const input = tc.rawInput && typeof tc.rawInput === "object" ? tc.rawInput : void 0;
+  const command = typeof input?.command === "string" ? input.command : "";
+  const isCommand = tc.kind === "execute" && command !== "";
+  const isFile = (tc.kind === "edit" || tc.kind === "delete" || tc.kind === "move") && (tc.locations?.[0]?.path || typeof input?.filePath === "string" || typeof input?.path === "string");
+  const payloadKind = isCommand ? "command-approval" : isFile ? "file-approval" : "permission-approval";
+  const optionByDecision = /* @__PURE__ */ new Map();
+  const allowedDecisions = [];
+  const add = (id, semantic, label, optionId, description) => {
+    if (optionByDecision.has(id)) return;
+    optionByDecision.set(id, optionId);
+    allowedDecisions.push({ id, semantic, label: clip3(label, 150), ...description ? { description: clip3(description, 500) } : {} });
+  };
+  for (const opt of params.options) {
+    const label = opt.name ?? opt.kind ?? opt.optionId;
+    const once = payloadKind === "permission-approval" ? "grant-turn" : "accept";
+    const always = payloadKind === "permission-approval" ? "grant-session" : "acceptForSession";
+    const deny = payloadKind === "permission-approval" ? "deny" : "decline";
+    if (opt.kind === "allow_once") add(once, "approve", label, opt.optionId, "Allow this once.");
+    else if (opt.kind === "allow_always") add(always, "approve", label, opt.optionId, "Allow for the rest of this session.");
+    else if (opt.kind === "reject_once" || opt.kind === "reject_always") add(deny, "deny", label, opt.optionId, "Block this tool call.");
+  }
+  if (!allowedDecisions.some((d) => d.semantic === "deny")) return null;
+  const title = clip3(tc.title ?? (isCommand ? "Run a command?" : "Approve a tool call?"), 150);
+  const previewLines = [command || "", ...Object.entries(input ?? {}).filter(([k, v]) => k !== "command" && v !== "" && v !== null).map(([k, v]) => `${k}: ${typeof v === "string" ? v : JSON.stringify(v)}`)].filter(Boolean);
+  const preview = clip3(redactCredentialSyntax(previewLines.join("\n\n")), 6e3);
+  const pathLabel = clip3(tc.locations?.[0]?.path ?? (typeof input?.filePath === "string" ? input.filePath : typeof input?.path === "string" ? input.path : ""), 1e3);
+  const base = {
+    protocolVersion: INTERACTION_PROTOCOL_VERSION,
+    contentFormat: "plain-text",
+    provider: { kind: "acp", name: agent.label },
+    source: { kind: "tool", id: clip3(tc.toolCallId, 500), label: clip3(tc.title ?? tc.kind ?? "tool", 150) },
+    owner: { projectId: owner.projectId, threadSlug: owner.threadSlug, sessionId: owner.sessionId, turnId: clip3(tc.toolCallId, 500), itemId: clip3(tc.toolCallId, 500), sessionEpoch: 0, capabilityRevision: 0 },
+    providerRequestId: clip3(tc.toolCallId, 500),
+    allowedDecisions,
+    expiresAt: null
+  };
+  const payload = payloadKind === "command-approval" ? { kind: "command-approval", title, command: { summary: clip3(command.replace(/\s+/g, " "), 150), preview, redacted: true, workingDirectoryLabel: clip3(owner.cwd, 1e3) } } : payloadKind === "file-approval" ? { kind: "file-approval", title, operation: tc.kind === "delete" ? "delete" : tc.kind === "move" ? "move" : "write", pathLabel: pathLabel || "(unknown path)", ...preview ? { diffPreview: preview } : {} } : { kind: "permission-approval", title, permission: clip3(tc.kind ?? "tool", 250), ...preview ? { preview } : {}, workingDirectoryLabel: clip3(owner.cwd, 1e3) };
+  const parsed = InteractionRequest.safeParse({ ...base, payload });
+  return parsed.success ? { request: parsed.data, optionByDecision } : null;
+}
+function createAcpBridge(options) {
+  return new AcpBridge(options);
+}
+var AUTH_HINT, ACP_MODEL_CACHE_MS, AcpBridge;
+var init_acp_bridge = __esm({
+  "packages/server/src/backend/acp-bridge.ts"() {
+    "use strict";
+    init_src();
+    init_credential_redaction();
+    init_logging();
+    init_acp_agents();
+    init_acp_rpc();
+    init_acp_transcript();
+    init_acp_types();
+    init_types2();
+    init_worker_env();
+    AUTH_HINT = "The agent needs a login first. ";
+    ACP_MODEL_CACHE_MS = 10 * 6e4;
+    AcpBridge = class {
+      constructor(options) {
+        this.options = options;
+        this.unsubscribe = options.interactions?.subscribe((change) => {
+          for (const live of this.sessions.values()) {
+            const pending = live.pendingPerms.get(change.interactionId);
+            if (!pending || change.lifecycle === "pending") continue;
+            live.pendingPerms.delete(change.interactionId);
+            const record = options.interactions.get(pending.scope, change.interactionId);
+            const decisionId = change.lifecycle === "resolved" ? record?.resolution?.decisionId : void 0;
+            const optionId = decisionId ? pending.optionByDecision.get(decisionId) : void 0;
+            pending.resolve(optionId ? { outcome: { outcome: "selected", optionId } } : { outcome: { outcome: "cancelled" } });
+          }
+        });
+      }
+      sessions = /* @__PURE__ */ new Map();
+      unsubscribe;
+      closed = false;
+      now() {
+        return (this.options.now?.() ?? /* @__PURE__ */ new Date()).toISOString();
+      }
+      diagnostic(slug, kind, message) {
+        this.options.onDiagnostic?.({ threadSlug: slug, kind, message });
+        if (kind !== "stderr") log.debug("acp", `[${slug}] ${kind}: ${message}`);
+      }
+      /** The agents this bridge can launch, with the operator's own entries merged in. */
+      agents() {
+        return acpAgentSpecs(this.options.customAgents?.());
+      }
+      resolveAgent(agentId) {
+        const agent = resolveAcpAgent(agentId, this.options.customAgents?.(), this.options.env ?? process.env);
+        if (!agent) throw new Error(`Unknown ACP agent "${agentId}". Add it under settings.acpAgents or pick one of: ${this.agents().map((a) => a.id).join(", ")}.`);
+        if (!agent.bin) throw new Error(`The ACP agent "${agent.label}" is not installed: \`${agent.command}\` is not on PATH. Install it, or point settings.acpAgents at its executable.`);
+        return agent;
+      }
+      // ---- session lifecycle ----------------------------------------------------------------------
+      /** Spawn the agent, initialize, and open (or load) a session. Throws an actionable error on any
+       *  failure and leaves nothing behind. */
+      async open(input) {
+        const { threadSlug: slug, sessionId, cwd } = input;
+        const agent = this.resolveAgent(input.agentId);
+        const env = inheritWorkerEnvironment(this.options.env ?? process.env);
+        const spawn8 = this.options.spawn ?? spawnAcpChild;
+        const proc = spawn8({ command: agent.bin, args: agent.args, cwd, env });
+        const writer = new AcpTranscriptWriter(acpTranscriptPath(this.options.stateDir, sessionId));
+        let live;
+        const conn = new AcpConnection(proc, {
+          onRequest: (method, params) => live ? this.handleRequest(live, method, params) : Promise.reject(new AcpRequestError(ACP_ERROR_INTERNAL, "session not ready")),
+          onNotification: (method, params) => {
+            if (live && method === "session/update") this.handleNotification(live, params);
+          },
+          onDiagnostic: (d) => this.diagnostic(slug, d.kind, d.message),
+          requestTimeoutMs: this.options.initializeTimeoutMs ?? 6e4
+        });
+        const fail = async (err) => {
+          await conn.close(500);
+          const stderr = conn.recentStderr.slice(-3).join(" | ");
+          const e = err instanceof Error ? err : new Error(String(err));
+          throw new Error(`${e.message}${stderr ? ` (agent stderr: ${clip3(stderr, 400)})` : ""}`);
+        };
+        let init;
+        try {
+          init = AcpInitializeResult.parse(await conn.request("initialize", {
+            protocolVersion: ACP_PROTOCOL_VERSION,
+            clientCapabilities: { fs: { readTextFile: false, writeTextFile: false }, terminal: false },
+            clientInfo: { name: "frizz", version: "0" }
+          }));
+        } catch (err) {
+          return fail(err instanceof Error ? new Error(`${agent.label} did not complete the ACP handshake: ${err.message}`) : err);
+        }
+        const mcpServers = frizzMcpServer(this.options.frizzMcp, slug);
+        live = { slug, sessionId, cwd, agent, conn, init, acpSessionId: "", writer, loading: false, queue: [], pendingPerms: /* @__PURE__ */ new Map(), tools: /* @__PURE__ */ new Map(), exited: false };
+        void conn.exited.then(() => {
+          if (live) this.onExit(live);
+        });
+        const authError = (err) => {
+          const hint = (init.authMethods ?? []).map((m) => m.description ?? m.name ?? m.id).filter(Boolean).join("; ");
+          return new Error(`${AUTH_HINT}${agent.label} refused to open a session: ${err.error.message}.${hint ? ` ${hint}.` : ""}`);
+        };
+        let resumed = "fresh";
+        if (input.acpSessionId && init.agentCapabilities?.loadSession) {
+          live.loading = true;
+          try {
+            const loaded = AcpLoadSessionResult.parse(await conn.request("session/load", { sessionId: input.acpSessionId, cwd, mcpServers }));
+            live.acpSessionId = input.acpSessionId;
+            this.adoptModel(live, loaded.configOptions);
+            resumed = "loaded";
+          } catch (err) {
+            if (err instanceof AcpRemoteError && err.error.code === ACP_ERROR_AUTH_REQUIRED) return fail(authError(err));
+            this.diagnostic(slug, "protocol", `session/load ${input.acpSessionId} failed (${err.message}); starting a fresh session`);
+          } finally {
+            live.loading = false;
+          }
+        }
+        if (!live.acpSessionId) {
+          try {
+            const created = AcpNewSessionResult.parse(await conn.request("session/new", { cwd, mcpServers }));
+            live.acpSessionId = created.sessionId;
+            this.adoptModel(live, created.configOptions);
+          } catch (err) {
+            if (err instanceof AcpRemoteError && err.error.code === ACP_ERROR_AUTH_REQUIRED) return fail(authError(err));
+            return fail(err instanceof Error ? new Error(`${agent.label} could not open a session: ${err.message}`) : err);
+          }
+        }
+        const modelProblem = await this.applyModel(live, input.modelId);
+        if (resumed === "fresh") {
+          writer.append({ kind: "acp-session", at: this.now(), agent: { id: agent.id, ...init.agentInfo?.name ? { name: init.agentInfo.name } : {}, ...init.agentInfo?.version ? { version: init.agentInfo.version } : {} }, acpSessionId: live.acpSessionId, cwd, ...live.model ? { model: live.model } : {} });
+          if (input.acpSessionId) writer.append({ kind: "acp-note", at: this.now(), text: `Resumed with a fresh ${agent.label} session: the previous one (${input.acpSessionId}) could not be loaded, so the agent no longer has the earlier conversation.` });
+        }
+        if (modelProblem) writer.append({ kind: "acp-note", at: this.now(), text: modelProblem });
+        this.sessions.set(sessionId, live);
+        return { live, resumed };
+      }
+      /** The agent's model option (`category: "model"`, else the one literally named `model`). */
+      modelOption(configOptions) {
+        return configOptions?.find((o) => o.category === "model") ?? configOptions?.find((o) => o.id === "model");
+      }
+      adoptModel(live, configOptions) {
+        const option = this.modelOption(configOptions);
+        if (!option) return;
+        live.modelOptionId = option.id;
+        if (typeof option.currentValue === "string") live.model = option.currentValue;
+      }
+      /** Ask the agent for the thread's model when it is not already the one in effect. Returns the note
+       *  to write when the agent refused — the thread runs on, on the agent's own model, and says so. */
+      async applyModel(live, modelId) {
+        if (!modelId || modelId === live.model) return void 0;
+        try {
+          const res = AcpSetConfigOptionResult.parse(await live.conn.request("session/set_config_option", { sessionId: live.acpSessionId, configId: live.modelOptionId ?? "model", value: modelId }));
+          this.adoptModel(live, res.configOptions);
+          if (live.model !== modelId && res.configOptions?.length) return `${live.agent.label} did not switch to ${modelId}; the session runs on ${live.model ?? "its own default model"}.`;
+          if (!res.configOptions?.length) live.model = modelId;
+          return void 0;
+        } catch (err) {
+          const message = err instanceof AcpRemoteError ? err.error.message : err.message;
+          this.diagnostic(live.slug, "protocol", `session/set_config_option ${modelId} failed: ${message}`);
+          return `${live.agent.label} could not switch to ${modelId} (${clip3(message, 200)}); the session runs on ${live.model ?? "its own default model"}.`;
+        }
+      }
+      // ---- the model catalogue an agent advertises -----------------------------------------------------
+      modelProbes = /* @__PURE__ */ new Map();
+      modelCache = /* @__PURE__ */ new Map();
+      /** The models an agent offers, read by opening a throwaway session (there is no other way to ask:
+       *  ACP advertises models only in a session's config options). Cached per agent for ten minutes; a
+       *  probe that cannot open a session (not installed, not logged in) yields an empty list with the
+       *  reason, never a throw, so the composer degrades to the agent's own default. */
+      agentModels(agentId, cwd, opts = {}) {
+        const cached2 = this.modelCache.get(agentId);
+        if (cached2 && !opts.refresh && Date.now() - Date.parse(cached2.probedAt) < ACP_MODEL_CACHE_MS) return Promise.resolve(cached2);
+        const inflight = this.modelProbes.get(agentId);
+        if (inflight) return inflight;
+        const probe = this.probeModels(agentId, cwd).then((result) => {
+          if (!result.error) this.modelCache.set(agentId, result);
+          return result;
+        }).finally(() => this.modelProbes.delete(agentId));
+        this.modelProbes.set(agentId, probe);
+        return probe;
+      }
+      async probeModels(agentId, cwd) {
+        const probedAt = this.now();
+        const empty = (error) => ({ agentId, models: [], error, probedAt });
+        let agent;
+        try {
+          agent = this.resolveAgent(agentId);
+        } catch (err) {
+          return empty(err.message);
+        }
+        const env = inheritWorkerEnvironment(this.options.env ?? process.env);
+        const spawn8 = this.options.spawn ?? spawnAcpChild;
+        let proc;
+        try {
+          proc = spawn8({ command: agent.bin, args: agent.args, cwd, env });
+        } catch (err) {
+          return empty(`${agent.label} could not start: ${err.message}`);
+        }
+        const conn = new AcpConnection(proc, {
+          onRequest: () => Promise.reject(new AcpRequestError(ACP_ERROR_METHOD_NOT_FOUND, "probe session takes no requests")),
+          onNotification: () => {
+          },
+          onDiagnostic: (d) => this.diagnostic(`probe:${agentId}`, d.kind, d.message),
+          requestTimeoutMs: this.options.initializeTimeoutMs ?? 6e4
+        });
+        try {
+          const init = AcpInitializeResult.parse(await conn.request("initialize", {
+            protocolVersion: ACP_PROTOCOL_VERSION,
+            clientCapabilities: { fs: { readTextFile: false, writeTextFile: false }, terminal: false },
+            clientInfo: { name: "frizz", version: "0" }
+          }));
+          const created = AcpNewSessionResult.parse(await conn.request("session/new", { cwd, mcpServers: [] }));
+          const option = this.modelOption(created.configOptions);
+          const current = typeof option?.currentValue === "string" ? option.currentValue : void 0;
+          void init;
+          return {
+            agentId,
+            models: (option?.options ?? []).map((o) => ({ id: o.value, name: o.name ?? o.value })),
+            ...current ? { current } : {},
+            probedAt
+          };
+        } catch (err) {
+          const message = err instanceof AcpRemoteError && err.error.code === ACP_ERROR_AUTH_REQUIRED ? `${AUTH_HINT}${agent.label} refused to open a session: ${err.error.message}` : `${agent.label}: ${err.message}`;
+          return empty(clip3(message, 400));
+        } finally {
+          await conn.close(500);
+        }
+      }
+      onExit(live) {
+        if (live.exited) return;
+        live.exited = true;
+        this.retirePermissions(live, "provider-cancelled");
+        if (live.turn) {
+        }
+        if (this.sessions.get(live.sessionId) === live) this.sessions.delete(live.sessionId);
+        this.options.onStatusChange?.();
+      }
+      // ---- public API --------------------------------------------------------------------------------
+      async spawnDispatch(input) {
+        if (this.closed) throw new Error("ACP bridge is closed");
+        const { live } = await this.open(input);
+        void this.runTurn(live, input.prompt, input.userText, void 0);
+        return this.info(live);
+      }
+      /** Deliver a follow-up: to the live session, to a re-opened one (load or fresh), or into the queue
+       *  when a turn is running. Returns the (possibly new) ACP session id so the caller can re-pin it. */
+      async followUp(input) {
+        if (this.closed) throw new Error("ACP bridge is closed");
+        let live = this.sessions.get(input.sessionId);
+        let resumed = "live";
+        if (!live || live.exited || live.conn.closed) {
+          const opened = await this.open(input);
+          live = opened.live;
+          resumed = opened.resumed;
+        }
+        if (live.turn) {
+          live.queue.push({ text: input.text, ...input.deliveryId ? { deliveryId: input.deliveryId } : {} });
+          return { ...this.info(live), state: "queued", resumed };
+        }
+        void this.runTurn(live, input.text, input.text, input.deliveryId);
+        return { ...this.info(live), state: "delivered", resumed };
+      }
+      /** `session/cancel`, then wait (bounded) for the prompt to return. `interrupted: false` when no turn
+       *  was running. The queue is NOT discarded — a follow-up typed during the turn still goes out. */
+      async interruptTurn(threadSlug, sessionId) {
+        const live = this.sessions.get(sessionId);
+        if (!live || live.slug !== threadSlug || !live.turn) return { interrupted: false };
+        live.turn.cancelRequested = true;
+        live.conn.notify("session/cancel", { sessionId: live.acpSessionId });
+        const settled = await Promise.race([live.turn.done.then(() => true), new Promise((r) => setTimeout(() => r(false), 15e3).unref?.())]);
+        if (!settled) {
+          await live.conn.close(1e3);
+          return { interrupted: true };
+        }
+        return { interrupted: true };
+      }
+      releaseSession(threadSlug, sessionId, reason) {
+        const live = this.sessions.get(sessionId);
+        if (!live || live.slug !== threadSlug) return;
+        this.sessions.delete(sessionId);
+        live.queue.length = 0;
+        this.retirePermissions(live, "provider-cancelled");
+        if (live.turn) live.conn.notify("session/cancel", { sessionId: live.acpSessionId });
+        void live.conn.close(reason === "shutdown" ? 1e3 : 3e3);
+      }
+      turnLiveness(threadSlug, sessionId) {
+        const live = this.sessions.get(sessionId);
+        if (!live || live.slug !== threadSlug) return void 0;
+        return { sessionLive: !live.exited && !live.conn.closed, turnActive: live.turn !== void 0, queued: live.queue.length };
+      }
+      session(threadSlug, sessionId) {
+        const live = this.sessions.get(sessionId);
+        return live && live.slug === threadSlug ? this.info(live) : void 0;
+      }
+      ownsInteraction(scope, interactionId) {
+        const live = this.sessions.get(scope.sessionId);
+        return live !== void 0 && live.slug === scope.threadSlug && live.pendingPerms.has(interactionId);
+      }
+      async shutdown() {
+        this.closed = true;
+        this.unsubscribe?.();
+        const all = [...this.sessions.values()];
+        this.sessions.clear();
+        await Promise.all(all.map(async (live) => {
+          this.retirePermissions(live, "provider-cancelled");
+          await live.conn.close(1e3);
+        }));
+      }
+      info(live) {
+        return {
+          acpSessionId: live.acpSessionId,
+          agent: { id: live.agent.id, ...live.init.agentInfo?.name ? { name: live.init.agentInfo.name } : {}, ...live.init.agentInfo?.version ? { version: live.init.agentInfo.version } : {} },
+          ...live.model ? { model: live.model } : {}
+        };
+      }
+      // ---- the turn ---------------------------------------------------------------------------------
+      async runTurn(live, sendText, recordText, deliveryId) {
+        let finish;
+        const done = new Promise((r) => {
+          finish = r;
+        });
+        const turn = { startedAt: this.now(), ...deliveryId ? { deliveryId } : {}, text: "", messageText: "", thought: "", cancelRequested: false, done, finish };
+        live.turn = turn;
+        live.writer.append({ kind: "user-message", at: turn.startedAt, text: recordText, synthetic: false });
+        live.writer.append({ kind: "turn-start", at: turn.startedAt });
+        this.options.onStatusChange?.();
+        try {
+          const raw2 = await live.conn.requestOpenEnded("session/prompt", { sessionId: live.acpSessionId, prompt: [{ type: "text", text: sendText }] });
+          const result = AcpPromptResult.parse(raw2);
+          this.flushThought(live);
+          const finalText = this.flushText(live, true);
+          live.writer.append({ kind: "turn-end", at: this.now(), ...finalText !== void 0 ? { finalText } : {}, successful: result.stopReason !== "refusal" && result.stopReason !== "cancelled" });
+          if (result.stopReason === "cancelled") live.writer.append({ kind: "acp-note", at: this.now(), text: "Turn cancelled." });
+        } catch (err) {
+          this.flushThought(live);
+          const finalText = this.flushText(live, true);
+          const at = this.now();
+          const abortedByUs = turn.cancelRequested && err instanceof AcpRemoteError && err.error.code === ACP_ERROR_INTERNAL;
+          if (abortedByUs) {
+            live.writer.append({ kind: "turn-end", at, ...finalText !== void 0 ? { finalText } : {}, successful: false });
+            live.writer.append({ kind: "acp-note", at, text: "Turn cancelled." });
+          } else {
+            const message = err instanceof AcpRemoteError ? err.error.code === ACP_ERROR_AUTH_REQUIRED ? `${AUTH_HINT}${err.error.message}` : err.error.message : err.message;
+            live.writer.append({ kind: "provider-error", at, error: { message: clip3(message, 2e3), ...err instanceof AcpRemoteError ? { code: String(err.error.code) } : {} } });
+            live.writer.append({ kind: "turn-end", at, ...finalText !== void 0 ? { finalText } : {}, successful: false });
+          }
+        } finally {
+          this.retirePermissions(live, "turn-ended");
+          if (live.turn === turn) live.turn = void 0;
+          turn.finish();
+          this.options.onStatusChange?.();
+          const next = live.queue.shift();
+          if (next && !live.exited && !live.conn.closed) void this.runTurn(live, next.text, next.text, next.deliveryId);
+        }
+      }
+      /** Write the buffered text as one record. Returns, for a FINAL flush, the whole text of the agent's
+       *  last message (every partial flush included) — what the turn-end carries as `finalText`, so the
+       *  fold's preview and fence parsing see the complete message, never the last chunk. */
+      flushText(live, final) {
+        const turn = live.turn;
+        if (!turn) return void 0;
+        if (turn.flushTimer) {
+          clearTimeout(turn.flushTimer);
+          turn.flushTimer = void 0;
+        }
+        if (turn.text) {
+          const text2 = turn.text;
+          turn.text = "";
+          live.writer.append({ kind: "assistant-text", at: this.now(), text: text2, final, ...turn.messageId ? { messageId: turn.messageId } : {} });
+        }
+        return final && turn.messageText ? turn.messageText : void 0;
+      }
+      flushThought(live) {
+        const turn = live.turn;
+        if (!turn?.thought.trim()) {
+          if (turn) turn.thought = "";
+          return;
+        }
+        live.writer.append({ kind: "reasoning", at: this.now(), text: turn.thought });
+        turn.thought = "";
+      }
+      scheduleFlush(live) {
+        const turn = live.turn;
+        if (!turn || turn.flushTimer) return;
+        turn.flushTimer = setTimeout(() => {
+          turn.flushTimer = void 0;
+          this.flushText(live, false);
+        }, this.options.flushMs ?? 1e3);
+        turn.flushTimer.unref?.();
+      }
+      handleNotification(live, params) {
+        if (live.loading) return;
+        const parsed = AcpSessionNotification.safeParse(params);
+        if (!parsed.success) {
+          this.diagnostic(live.slug, "protocol", "malformed session/update");
+          return;
+        }
+        const update = parseSessionUpdate(parsed.data.update);
+        const turn = live.turn;
+        switch (update.sessionUpdate) {
+          case "agent_thought_chunk": {
+            if (!turn) return;
+            const t = contentText(update.content);
+            if (t) turn.thought += t;
+            return;
+          }
+          case "agent_message_chunk": {
+            if (!turn) return;
+            this.flushThought(live);
+            const t = contentText(update.content);
+            if (!t) return;
+            if (update.messageId && turn.messageId && update.messageId !== turn.messageId) {
+              this.flushText(live, false);
+              turn.messageText = "";
+            }
+            if (update.messageId) turn.messageId = update.messageId;
+            turn.text += t;
+            turn.messageText += t;
+            this.scheduleFlush(live);
+            return;
+          }
+          case "tool_call": {
+            this.flushThought(live);
+            this.flushText(live, false);
+            if (turn) turn.messageText = "";
+            const meta = { ...update.kind ? { kind: update.kind } : {}, ...update.title ? { title: update.title } : {}, locations: (update.locations ?? []).map((l) => l.path), written: true };
+            live.tools.set(update.toolCallId, meta);
+            live.writer.append({ kind: "tool-call", at: this.now(), id: update.toolCallId, name: update.title ?? update.kind ?? "tool", input: update.rawInput ?? {}, acp: { ...meta.kind ? { kind: meta.kind } : {}, ...meta.title ? { title: meta.title } : {}, locations: meta.locations ?? [] } });
+            if (update.status === "completed" || update.status === "failed") this.recordToolResult(live, update);
+            return;
+          }
+          case "tool_call_update": {
+            let meta = live.tools.get(update.toolCallId);
+            if (!meta) {
+              meta = { written: false };
+              live.tools.set(update.toolCallId, meta);
+            }
+            if (update.kind) meta.kind = update.kind;
+            if (update.title) meta.title = update.title;
+            if (update.locations?.length) meta.locations = update.locations.map((l) => l.path);
+            if (!meta.written) {
+              this.flushThought(live);
+              this.flushText(live, false);
+              meta.written = true;
+              live.writer.append({ kind: "tool-call", at: this.now(), id: update.toolCallId, name: meta.title ?? meta.kind ?? "tool", input: update.rawInput ?? {}, acp: { ...meta.kind ? { kind: meta.kind } : {}, ...meta.title ? { title: meta.title } : {}, locations: meta.locations ?? [] } });
+            }
+            if (update.status === "completed" || update.status === "failed") this.recordToolResult(live, update);
+            return;
+          }
+          case "usage_update":
+            this.flushText(live, false);
+            if (update.used > 0) live.writer.append({ kind: "context-usage", at: this.now(), tokens: update.used, window: update.size });
+            return;
+          case "session_info_update":
+            if (update.title) live.writer.append({ kind: "title", title: clip3(update.title, 200) });
+            return;
+          case "config_option_update":
+            this.adoptModel(live, update.configOptions);
+            return;
+          case "plan":
+          case "user_message_chunk":
+          case "compaction_update":
+            return;
+          case "unknown":
+            this.diagnostic(live.slug, "update", `unhandled session/update ${String(update.raw?.sessionUpdate)}`);
+            return;
+        }
+      }
+      recordToolResult(live, tc) {
+        const meta = live.tools.get(tc.toolCallId);
+        if (meta?.status === "completed" || meta?.status === "failed") return;
+        if (meta) meta.status = tc.status;
+        const input = tc.rawInput && typeof tc.rawInput === "object" ? tc.rawInput : void 0;
+        live.writer.append({ kind: "tool-result", at: this.now(), id: tc.toolCallId, text: clip3(toolResultText3(tc), 2e4), acp: { ...tc.status ? { kind: tc.status } : {}, ...meta?.locations?.length ? { locations: meta.locations } : {}, ...input && Object.keys(input).length ? { input } : {} } });
+      }
+      // ---- the agent asking us ------------------------------------------------------------------------
+      async handleRequest(live, method, params) {
+        if (method === "session/request_permission") return this.handlePermission(live, params);
+        throw new AcpRequestError(ACP_ERROR_METHOD_NOT_FOUND, `frizz does not implement ${method}`);
+      }
+      handlePermission(live, params) {
+        const parsed = AcpRequestPermissionParams.safeParse(params);
+        const cancelled = { outcome: { outcome: "cancelled" } };
+        if (!parsed.success) return Promise.resolve(cancelled);
+        const store = this.options.interactions;
+        const reject = parsed.data.options.find((o) => o.kind === "reject_once") ?? parsed.data.options.find((o) => o.kind === "reject_always");
+        const failClosed = reject ? { outcome: { outcome: "selected", optionId: reject.optionId } } : cancelled;
+        if (!store) {
+          this.diagnostic(live.slug, "permission", "no interaction store; denying the request");
+          return Promise.resolve(failClosed);
+        }
+        const built = buildAcpPermissionInteraction(parsed.data, { projectId: this.options.projectId, threadSlug: live.slug, sessionId: live.sessionId, cwd: live.cwd }, { id: live.agent.id, label: live.agent.label });
+        if (!built) {
+          this.diagnostic(live.slug, "permission", "request could not be represented as a card; denying");
+          return Promise.resolve(failClosed);
+        }
+        const scope = { projectId: this.options.projectId, threadSlug: live.slug, sessionId: live.sessionId };
+        let id;
+        try {
+          id = store.create(built.request).interaction.id;
+        } catch (err) {
+          this.diagnostic(live.slug, "permission", `could not record the approval: ${err.message}`);
+          return Promise.resolve(failClosed);
+        }
+        return new Promise((resolve12) => {
+          live.pendingPerms.set(id, { resolve: resolve12, optionByDecision: built.optionByDecision, scope });
+          this.options.onStatusChange?.();
+        });
+      }
+      /** Cancel every open card for a session that can no longer answer one, answering the agent
+       *  `cancelled` for each. Hygiene, so it never throws. */
+      retirePermissions(live, reason) {
+        if (!live.pendingPerms.size) return;
+        const store = this.options.interactions;
+        let swept = [];
+        try {
+          swept = store?.cancelForSession(live.slug, live.sessionId, reason) ?? [];
+        } catch {
+        }
+        for (const record of swept) live.pendingPerms.get(record.id)?.resolve({ outcome: { outcome: "cancelled" } });
+        for (const [id, pending] of live.pendingPerms) {
+          pending.resolve({ outcome: { outcome: "cancelled" } });
+          live.pendingPerms.delete(id);
+        }
+      }
+    };
+  }
+});
+
 // packages/server/src/login-utility.ts
 import { randomBytes } from "node:crypto";
 import pty from "node-pty";
@@ -42154,27 +43657,27 @@ 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 statSync15 } from "node:fs";
-import { join as join33 } from "node:path";
+import { appendFileSync as appendFileSync4, mkdirSync as mkdirSync15, renameSync as renameSync8, statSync as statSync16 } from "node:fs";
+import { join as join35 } from "node:path";
 function codexDiagnosticLogPath(stateDir, projectId) {
-  return join33(stateDir, "codex-app-server", `${projectId}.diagnostics.log`);
+  return join35(stateDir, "codex-app-server", `${projectId}.diagnostics.log`);
 }
 function createCodexDiagnosticSink(stateDir, projectId, now = () => /* @__PURE__ */ new Date()) {
-  const dir = join33(stateDir, "codex-app-server");
+  const dir = join35(stateDir, "codex-app-server");
   const path3 = codexDiagnosticLogPath(stateDir, projectId);
   let ensured = false;
   return (event) => {
     if (event.event === "stderr") return;
     try {
       if (!ensured) {
-        mkdirSync14(dir, { recursive: true });
+        mkdirSync15(dir, { recursive: true });
         ensured = true;
       }
       try {
-        if (statSync15(path3).size > MAX_BYTES2) renameSync8(path3, `${path3}.1`);
+        if (statSync16(path3).size > MAX_BYTES2) renameSync8(path3, `${path3}.1`);
       } catch {
       }
-      appendFileSync3(path3, `${JSON.stringify({ at: now().toISOString(), ...event })}
+      appendFileSync4(path3, `${JSON.stringify({ at: now().toISOString(), ...event })}
 `);
     } catch {
     }
@@ -42189,10 +43692,10 @@ var init_codex_app_server_diagnostics = __esm({
 });
 
 // packages/server/src/backend/stale-socket-sweep.ts
-import { execFile as execFile8 } from "node:child_process";
+import { execFile as execFile9 } from "node:child_process";
 import { readdirSync as readdirSync8, unlinkSync as unlinkSync4 } from "node:fs";
 import { connect as connectSocket } from "node:net";
-import { join as join34 } from "node:path";
+import { join as join36 } from "node:path";
 function parseLsofSocketNames(stdout) {
   const referenced = /* @__PURE__ */ new Set();
   for (const line of stdout.split("\n")) {
@@ -42209,7 +43712,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) => join34(options.dir, name)).filter((path3) => !keep.has(path3));
+    candidates = (deps.readdir ?? readdirSync8)(options.dir).filter((name) => name.startsWith(options.prefix) && name.endsWith(".sock")).map((name) => join36(options.dir, name)).filter((path3) => !keep.has(path3));
   } catch {
     return;
   }
@@ -42236,7 +43739,7 @@ var init_stale_socket_sweep = __esm({
   "packages/server/src/backend/stale-socket-sweep.ts"() {
     "use strict";
     defaultListReferenced = (prefix, done) => {
-      execFile8("lsof", ["-U", "-F", "n"], { timeout: 3e4, maxBuffer: 16 * 1024 * 1024 }, (error, stdout) => {
+      execFile9("lsof", ["-U", "-F", "n"], { timeout: 3e4, maxBuffer: 16 * 1024 * 1024 }, (error, stdout) => {
         if (!stdout) return done(null);
         if (error && !stdout.includes(prefix)) return done(null);
         done(parseLsofSocketNames(stdout));
@@ -42259,8 +43762,8 @@ var init_stale_socket_sweep = __esm({
 
 // packages/server/src/orphan-reaper.ts
 import { execFileSync as execFileSync4 } from "node:child_process";
-import { readFileSync as readFileSync21 } from "node:fs";
-import { dirname as dirname14 } from "node:path";
+import { readFileSync as readFileSync22 } from "node:fs";
+import { dirname as dirname15 } from "node:path";
 function firstTokenBasename(command) {
   const first = command.trimStart().split(/\s+/, 1)[0] ?? "";
   const slash = first.lastIndexOf("/");
@@ -42488,7 +43991,7 @@ function sweepOrphansOnce(deps = {}) {
 }
 function sweepStaleBrokerSockets() {
   try {
-    sweepStaleSockets({ dir: dirname14(claudeBrokerSocketPath("", "")), prefix: CLAUDE_BROKER_SOCKET_PREFIX });
+    sweepStaleSockets({ dir: dirname15(claudeBrokerSocketPath("", "")), prefix: CLAUDE_BROKER_SOCKET_PREFIX });
   } catch {
   }
 }
@@ -42538,7 +44041,7 @@ var init_orphan_reaper = __esm({
     defaultExec = (file, args) => execFileSync4(file, args, { encoding: "utf8", maxBuffer: 16 * 1024 * 1024, timeout: 1e4 });
     defaultReadEnv = (pid) => {
       try {
-        return readFileSync21(`/proc/${pid}/environ`, "utf8");
+        return readFileSync22(`/proc/${pid}/environ`, "utf8");
       } catch {
         return null;
       }
@@ -42686,7 +44189,7 @@ var init_thread_hibernation = __esm({
 });
 
 // packages/server/src/context.ts
-import { join as join35 } from "node:path";
+import { join as join37 } from "node:path";
 import { randomUUID as randomUUID15 } from "node:crypto";
 import { homedir as homedir15 } from "node:os";
 function reconcileSessions(storage) {
@@ -42713,6 +44216,9 @@ function partialContextCleanup(resources) {
     codexAppServer: createRetryableCleanup(async () => {
       await resources.codexAppServer?.shutdown();
     }),
+    acpBridge: createRetryableCleanup(async () => {
+      await resources.acpBridge?.shutdown();
+    }),
     claudeBroker: createRetryableCleanup(async () => {
       resources.claudeBroker?.close();
       resources.claudeRuntimeIngest?.close();
@@ -42836,7 +44342,7 @@ async function createContext(opts = {}) {
 function createContextUnchecked(opts, resources) {
   const home = opts.home ?? homedir15();
   const project = opts.project ?? resolveProject();
-  const storage = createStorage(opts.database ?? join35(project.stateDir, "ui.db"), project.id);
+  const storage = createStorage(opts.database ?? join37(project.stateDir, "ui.db"), project.id);
   resources.storage = storage;
   const bus = new Bus();
   const transcriptChange = new Emitter();
@@ -42911,7 +44417,8 @@ function createContextUnchecked(opts, resources) {
   };
   const claudeBackend = createClaudeBackend({ logDir: defaultLogDir(project), claudeBin: opts.claudeBin });
   const codexBackend = createCodexBackend({});
-  const backendFor = (kind) => kind === "codex" ? codexBackend : claudeBackend;
+  const acpBackend = createAcpBackend({ stateDir: project.stateDir });
+  const backendFor = (kind) => kind === "codex" ? codexBackend : kind === "acp" ? acpBackend : claudeBackend;
   const codexAppServer = codexAppServerBridgeEnabled() ? createCodexAppServerBridge({
     projectId: project.id,
     projectDir: project.dir,
@@ -42963,6 +44470,19 @@ function createContextUnchecked(opts, resources) {
   }
   void codexAppServer?.warmUp();
   opts.startup?.afterPhase?.("Codex app-server bridge");
+  const acpBridge = createAcpBridge({
+    projectId: project.id,
+    stateDir: project.stateDir,
+    frizzMcp: resolveFrizzMcp(frizzMcpTarget),
+    interactions: storage.interactions,
+    env: process.env,
+    customAgents: () => getSettings(storage, home).acpAgents,
+    onStatusChange: () => board?.refresh()
+  });
+  resources.acpBridge = acpBridge;
+  contextUnsubscribers.push(storage.subscribeSessionLifecycle((event) => {
+    acpBridge.releaseSession(event.previous.slug, event.previous.session_id, event.type === "replaced" ? "session-replaced" : "session-deleted");
+  }));
   const claudeRuntimeIngest = claudeBrokerBridgeEnabled() ? createClaudeRuntimeIngest({ nudge: () => tailer.nudge?.() }) : void 0;
   resources.claudeRuntimeIngest = claudeRuntimeIngest;
   const claudeBroker = claudeBrokerBridgeEnabled() ? createClaudeAgentBrokerBridge({
@@ -43074,6 +44594,7 @@ function createContextUnchecked(opts, resources) {
     claudeBin: opts.claudeBin,
     backendFor,
     codexAppServer,
+    acpBridge,
     claudeBroker,
     // Auth preflight (claude-auth plan, Slice A): Claude reads its local credential and confirms only
     // a positive signed-out against its CLI (readClaudePreflightAuth — the comment there records why
@@ -43113,6 +44634,21 @@ ${wakeDeliveryToken(deliveryId)}`;
         }
         return deliverCodexWake({ bridge, storage, cwd: project.dir, row, slug, deliveryMessage, deliveryId });
       }
+      if (row?.backend === "acp") {
+        return acpBridge.followUp({
+          threadSlug: slug,
+          sessionId: row.session_id,
+          cwd: project.dir,
+          agentId: row.acp_agent ?? "",
+          modelId: acpModelIdFromModel(row.model),
+          acpSessionId: row.agent_session_id,
+          text: deliveryMessage,
+          deliveryId
+        }).then((r) => {
+          if (r.acpSessionId !== row.agent_session_id) storage.setAgentSession(slug, r.acpSessionId);
+          if (row.exited === 1) storage.setExitedIfCurrent(slug, row.session_id, row.runtime_generation ?? 0, false);
+        });
+      }
       if (row?.backend === "claude" && row.claude_runtime === "broker") {
         if (!claudeBroker) {
           process.stderr.write(`[frizz] claude-broker wake for ${slug} dropped: the session broker is unavailable
@@ -43178,6 +44714,7 @@ ${wakeDeliveryToken(deliveryId)}`;
     storage,
     interactions: storage.interactions,
     codexAppServer,
+    acpBridge,
     claudeBroker,
     board,
     tailer,
@@ -43219,6 +44756,8 @@ var init_context = __esm({
     init_resume();
     init_claude();
     init_codex();
+    init_acp_transcript();
+    init_acp_bridge();
     init_auth_status();
     init_login_utility();
     init_usage_limit();
@@ -45895,8 +47434,8 @@ var init_server = __esm({
 });
 
 // packages/server/src/repair.ts
-import { existsSync as existsSync12, readFileSync as readFileSync22, writeFileSync as writeFileSync11 } from "node:fs";
-import { basename as basename7, dirname as dirname15, resolve as resolve8 } from "node:path";
+import { existsSync as existsSync13, readFileSync as readFileSync23, writeFileSync as writeFileSync11 } from "node:fs";
+import { basename as basename7, dirname as dirname16, resolve as resolve8 } from "node:path";
 function quoteValue(v) {
   if (/^[\w./#:+-]+$/.test(v)) return v;
   return `"${v.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
@@ -45908,10 +47447,10 @@ function deriveTitle(body, slug) {
 function repairThreadFile(frizzDir, file) {
   const root = resolve8(frizzDir);
   const abs = resolve8(root, file);
-  if (dirname15(abs) !== root) throw new RepairError(`refusing to repair "${file}": not directly under .frizz/`);
+  if (dirname16(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 (!existsSync12(abs)) throw new RepairError(`no thread file to repair: ${basename7(abs)}`);
-  const content = readFileSync22(abs, "utf8");
+  if (!existsSync13(abs)) throw new RepairError(`no thread file to repair: ${basename7(abs)}`);
+  const content = readFileSync23(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`);
@@ -46104,7 +47643,7 @@ var init_repo_files = __esm({
 });
 
 // cc-worker/hooks/bash-background.mjs
-import { readFileSync as readFileSync23, realpathSync as realpathSync10 } from "node:fs";
+import { readFileSync as readFileSync24, realpathSync as realpathSync10 } from "node:fs";
 import { basename as basename8 } from "node:path";
 import { fileURLToPath as fileURLToPath4, pathToFileURL } from "node:url";
 function emit(obj) {
@@ -46124,8 +47663,8 @@ function withoutHeredocBodies(command) {
       return " ".repeat(line.length);
     }
     for (const match2 of line.matchAll(/<<-?\s*(?:'([^']+)'|"([^"]+)"|([A-Za-z_][A-Za-z0-9_-]*))/g)) {
-      const delimiter2 = match2[1] ?? match2[2] ?? match2[3];
-      if (delimiter2) pending.push(delimiter2);
+      const delimiter3 = match2[1] ?? match2[2] ?? match2[3];
+      if (delimiter3) pending.push(delimiter3);
     }
     active = pending.shift();
     return line;
@@ -46259,7 +47798,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(readFileSync23(0, "utf8")), env));
+        emit(evaluateBashBackgroundHook(JSON.parse(readFileSync24(0, "utf8")), env));
       } catch {
         emit({});
       }
@@ -46268,10 +47807,10 @@ var init_bash_background = __esm({
 });
 
 // packages/server/src/transcript.ts
-import { closeSync as closeSync13, existsSync as existsSync13, fstatSync as fstatSync3, mkdirSync as mkdirSync15, openSync as openSync14, readdirSync as readdirSync9, readFileSync as readFileSync24, readSync as readSync7, renameSync as renameSync9, statSync as statSync16, unlinkSync as unlinkSync5, writeFileSync as writeFileSync12 } from "node:fs";
+import { closeSync as closeSync13, existsSync as existsSync14, fstatSync as fstatSync3, mkdirSync as mkdirSync16, openSync as openSync14, readdirSync as readdirSync9, readFileSync as readFileSync25, readSync as readSync7, renameSync as renameSync9, statSync as statSync17, 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 join36 } from "node:path";
+import { StringDecoder as StringDecoder5 } from "node:string_decoder";
+import { join as join38 } from "node:path";
 import { homedir as homedir16 } from "node:os";
 function formatTokens(n) {
   if (n >= 1e6) return `${(n / 1e6).toFixed(1)}M`;
@@ -46851,14 +48390,14 @@ function pruneScreenshotCache() {
     if (entries2.length <= SCREENSHOT_CACHE_MAX) return;
     const byMtime = entries2.map((n) => {
       try {
-        return { n, m: statSync16(join36(SCREENSHOT_CACHE_DIR, n)).mtimeMs };
+        return { n, m: statSync17(join38(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(join36(SCREENSHOT_CACHE_DIR, n));
+        unlinkSync5(join38(SCREENSHOT_CACHE_DIR, n));
       } catch {
       }
     }
@@ -46888,14 +48427,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 path3 = join36(SCREENSHOT_CACHE_DIR, `${name}.${ext}`);
+  const path3 = join38(SCREENSHOT_CACHE_DIR, `${name}.${ext}`);
   try {
-    if (existsSync13(path3)) return path3;
+    if (existsSync14(path3)) return path3;
     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 = join36(SCREENSHOT_CACHE_DIR, `.${name}.${process.pid}.${screenshotTmpSeq++}.tmp`);
+    mkdirSync16(SCREENSHOT_CACHE_DIR, { recursive: true });
+    const tmp = join38(SCREENSHOT_CACHE_DIR, `.${name}.${process.pid}.${screenshotTmpSeq++}.tmp`);
     writeFileSync12(tmp, buf);
     renameSync9(tmp, path3);
     pruneScreenshotCache();
@@ -46910,14 +48449,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 = join36(SCREENSHOT_CACHE_DIR, `${name}.${outExt}`);
-    if (existsSync13(dest)) return dest;
-    const size = statSync16(srcPath).size;
+    const dest = join38(SCREENSHOT_CACHE_DIR, `${name}.${outExt}`);
+    if (existsSync14(dest)) return dest;
+    const size = statSync17(srcPath).size;
     if (size === 0 || size > SENT_IMAGE_MAX_BYTES) return void 0;
-    const buf = readFileSync24(srcPath);
+    const buf = readFileSync25(srcPath);
     if (!looksLikeImage(buf, outExt)) return void 0;
-    mkdirSync15(SCREENSHOT_CACHE_DIR, { recursive: true });
-    const tmp = join36(SCREENSHOT_CACHE_DIR, `.${name}.${process.pid}.${screenshotTmpSeq++}.tmp`);
+    mkdirSync16(SCREENSHOT_CACHE_DIR, { recursive: true });
+    const tmp = join38(SCREENSHOT_CACHE_DIR, `.${name}.${process.pid}.${screenshotTmpSeq++}.tmp`);
     writeFileSync12(tmp, buf);
     renameSync9(tmp, dest);
     pruneScreenshotCache();
@@ -46935,7 +48474,7 @@ function viewImageCall(path3, idKey) {
     ...image ? { outputImage: image } : {}
   };
 }
-function toolResultText3(content) {
+function toolResultText4(content) {
   if (typeof content === "string") return content.trim() || null;
   if (Array.isArray(content)) {
     const joined = content.filter((b) => b?.type === "text" && typeof b.text === "string").map((b) => b.text).join("\n");
@@ -46966,7 +48505,7 @@ function attachToolResults(rec, pending, backgroundShells, backgroundTaskIds, ch
     const ackAgentId = typeof rec.toolUseResult?.agentId === "string" ? rec.toolUseResult.agentId.trim() : "";
     const dispatchId = entry.calls.find((c) => typeof c.agentId === "string" && c.agentId)?.agentId;
     if (ackAgentId && dispatchId) childDispatchIds.set(ackAgentId, dispatchId);
-    const text2 = toolResultText3(b.content);
+    const text2 = toolResultText4(b.content);
     if (text2 && entry.name === "TaskList") {
       const todos = parseTodoListResult(text2);
       if (todos) for (const call of entry.calls) call.todos = todos;
@@ -47319,7 +48858,7 @@ function retainedFoldEntry(path3, identityPrefix, fileId, size) {
   }
   const hit = entry !== void 0;
   if (!entry) {
-    entry = { identityPrefix, fold: createTranscriptFold(identityPrefix), bytesRead: 0, decoder: new StringDecoder4("utf8"), fileId };
+    entry = { identityPrefix, fold: createTranscriptFold(identityPrefix), bytesRead: 0, decoder: new StringDecoder5("utf8"), fileId };
   } else {
     transcriptCache.delete(path3);
   }
@@ -47355,7 +48894,7 @@ function readTranscript(project, sessionId) {
 }
 function verifyIncrementalParse(path3, identityPrefix, incremental) {
   try {
-    const fresh = parseTranscript(readFileSync24(path3, "utf8"), identityPrefix);
+    const fresh = parseTranscript(readFileSync25(path3, "utf8"), identityPrefix);
     const a = JSON.stringify(incremental);
     const b = JSON.stringify(fresh);
     if (a !== b) {
@@ -47375,16 +48914,16 @@ function verifyIncrementalParse(path3, identityPrefix, incremental) {
   }
 }
 function logDirOf(project) {
-  return join36(homedir16(), ".claude", "projects", project.cwdSlug);
+  return join38(homedir16(), ".claude", "projects", project.cwdSlug);
 }
 function resolveTranscriptPath(project, sessionId) {
-  const path3 = join36(logDirOf(project), `${sessionId}.jsonl`);
+  const path3 = join38(logDirOf(project), `${sessionId}.jsonl`);
   try {
-    if (statSync16(path3).size > 0) return path3;
+    if (statSync17(path3).size > 0) return path3;
   } catch {
   }
   const stranded = discoverTranscriptDir(logDirOf(project), sessionId);
-  return stranded ? join36(stranded, `${sessionId}.jsonl`) : path3;
+  return stranded ? join38(stranded, `${sessionId}.jsonl`) : path3;
 }
 function projectCodexTranscript(raw2, identityPrefix = "codex") {
   const out = [];
@@ -47759,7 +49298,7 @@ function codexDirectToolCall(name, obj, callId) {
         detail: strField(obj.task_name) ?? "sub-agent",
         subagentType: codexAgentCell(obj),
         agentId: callId,
-        input: compactFields(obj, ["agent_type", "fork_context", "fork_turns", "service_tier"])
+        prompt: typeof obj.message === "string" && obj.message.trim() && strField(obj.message) !== ENCRYPTED_PAYLOAD ? capAgentPrompt(obj.message) : void 0
       };
     case "send_message":
       return codexPeerMessageCall("Send message", target, obj);
@@ -47871,14 +49410,6 @@ function codexAgentCell(obj) {
   const effort = strField(obj.reasoning_effort);
   return model && effort ? `${model}/${effort}` : model ?? effort;
 }
-function compactFields(obj, keys) {
-  const projected = {};
-  for (const key of keys) {
-    const value = obj[key];
-    if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") projected[key] = value;
-  }
-  return Object.keys(projected).length ? renderToolInput(projected) : void 0;
-}
 function formatCompactDuration(ms) {
   if (ms < 1e3) return `${Math.round(ms)}ms`;
   if (ms < 6e4) return `${Math.round(ms / 1e3)}s`;
@@ -48434,9 +49965,9 @@ function defaultCodexBackend() {
 function sourceForThread(project, storage, slug, backendFor) {
   const row = storage.getSession(slug);
   if (row) {
-    const backend = row.backend === "codex" ? "codex" : "claude";
-    const nativeId = backend === "codex" ? row.agent_session_id ?? row.session_id : row.transcript_id ?? row.session_id;
-    const path3 = backend === "codex" ? (backendFor?.("codex") ?? defaultCodexBackend()).transcriptPath(nativeId) : resolveTranscriptPath(project, nativeId);
+    const backend = row.backend === "codex" ? "codex" : row.backend === "acp" ? "acp" : "claude";
+    const nativeId = backend === "codex" ? row.agent_session_id ?? row.session_id : backend === "acp" ? row.session_id : row.transcript_id ?? row.session_id;
+    const path3 = backend === "codex" ? (backendFor?.("codex") ?? defaultCodexBackend()).transcriptPath(nativeId) : backend === "acp" ? backendFor?.("acp")?.transcriptPath(nativeId) : resolveTranscriptPath(project, nativeId);
     if (!path3) return void 0;
     return {
       slug,
@@ -48449,7 +49980,7 @@ function sourceForThread(project, storage, slug, backendFor) {
   }
   if (!FOREIGN_SESSION_ID_RE.test(slug)) return void 0;
   const claudePath = resolveTranscriptPath(project, slug);
-  if (existsSync13(claudePath)) {
+  if (existsSync14(claudePath)) {
     return { slug, sessionId: slug, nativeId: slug, backend: "claude", runtimeGeneration: 0, path: claudePath };
   }
   const rollout = (backendFor?.("codex") ?? defaultCodexBackend()).transcriptPath(slug);
@@ -48543,6 +50074,7 @@ function fixedSnapshot(source) {
 function projectSnapshot(snapshot) {
   const prefix = `${snapshot.backend}:${snapshot.nativeId}`;
   if (snapshot.backend === "codex") return retireStaleQueuedBubbles(projectCodexTranscript(snapshot.raw, prefix));
+  if (snapshot.backend === "acp") return retireStaleQueuedBubbles(projectAcpTranscript(snapshot.raw, prefix));
   const { entry } = retainedFoldEntry(snapshot.path, prefix, snapshot.fileKey, snapshot.size);
   ingestBounded(entry, snapshot.size, (from, length) => snapshot.readRange(from, length));
   return retireStaleQueuedBubbles([...entry.fold.allMessages()]);
@@ -48599,7 +50131,7 @@ function decodeTranscriptCursor(cursor) {
   }
   const p = value;
   const validText2 = (s, max) => typeof s === "string" && s.length > 0 && s.length <= max && !/[\0\r\n]/.test(s);
-  if (!p || p.v !== 1 || !validText2(p.slug, 256) || !validText2(p.sessionId, 256) || !validText2(p.nativeId, 256) || p.backend !== "claude" && p.backend !== "codex" || !Number.isSafeInteger(p.runtimeGeneration) || (p.runtimeGeneration ?? -1) < 0 || !validText2(p.fileKey, 256) || !Number.isSafeInteger(p.snapshotBytes) || (p.snapshotBytes ?? -1) < 0 || !validText2(p.prefixDigest, 128) || !validText2(p.anchorSourceId, 768)) throw new Error("invalid transcript cursor");
+  if (!p || p.v !== 1 || !validText2(p.slug, 256) || !validText2(p.sessionId, 256) || !validText2(p.nativeId, 256) || p.backend !== "claude" && p.backend !== "codex" && p.backend !== "acp" || !Number.isSafeInteger(p.runtimeGeneration) || (p.runtimeGeneration ?? -1) < 0 || !validText2(p.fileKey, 256) || !Number.isSafeInteger(p.snapshotBytes) || (p.snapshotBytes ?? -1) < 0 || !validText2(p.prefixDigest, 128) || !validText2(p.anchorSourceId, 768)) throw new Error("invalid transcript cursor");
   return p;
 }
 function messageBytes(message) {
@@ -48715,7 +50247,7 @@ function readEarlierThreadTranscriptPage(project, storage, slug, cursor, backend
 }
 function readCodexTranscriptFile(absPath, nativeId = absPath) {
   try {
-    return parseCodexTranscript(readFileSync24(absPath, "utf8"), `codex:${nativeId}`);
+    return parseCodexTranscript(readFileSync25(absPath, "utf8"), `codex:${nativeId}`);
   } catch {
     return [];
   }
@@ -48723,6 +50255,11 @@ function readCodexTranscriptFile(absPath, nativeId = absPath) {
 function readThreadTranscript(project, storage, slug, backendFor) {
   const row = storage.getSession(slug);
   if (row) {
+    if (row.backend === "acp") {
+      const path3 = backendFor?.("acp")?.transcriptPath(row.session_id);
+      const acpLedger = parseDeliveryLedger(row.delivery_ledger);
+      return projectDeliveryLedger(path3 ? readAcpTranscriptFile(path3, row.session_id) : [], acpLedger);
+    }
     if (row.backend === "codex") {
       const backend = backendFor?.("codex") ?? defaultCodexBackend();
       const nativeId = row.agent_session_id ?? row.session_id;
@@ -48813,7 +50350,7 @@ function projectTranscriptPageAgentLifecycles(page, lookup, peerLookup) {
 function readTranscriptFile(absPath) {
   try {
     const pathKey = createHash13("sha256").update(absPath).digest("base64url").slice(0, 16);
-    return parseTranscript(readFileSync24(absPath, "utf8"), `claude-file:${pathKey}`);
+    return parseTranscript(readFileSync25(absPath, "utf8"), `claude-file:${pathKey}`);
   } catch {
     return [];
   }
@@ -48829,6 +50366,7 @@ var init_transcript = __esm({
     init_delivery_marker();
     init_completion_relay();
     init_codex();
+    init_acp_transcript();
     init_discover();
     init_tailer();
     init_credential_redaction();
@@ -48889,7 +50427,7 @@ var init_transcript = __esm({
 });
 
 // packages/server/src/open-external.ts
-import { spawn as spawn6 } from "node:child_process";
+import { spawn as spawn7 } from "node:child_process";
 function validateExternalUrl(raw2) {
   let parsed;
   try {
@@ -48911,7 +50449,7 @@ async function openExternalUrl(raw2, options = {}) {
   const v = validateExternalUrl(raw2);
   if (!v.ok) throw new Error(v.reason);
   const spec = externalUrlOpenCommand(v.url, options.platform);
-  const child = (options.spawn ?? spawn6)(spec.command, [...spec.args], { detached: true, stdio: "ignore", windowsHide: true });
+  const child = (options.spawn ?? spawn7)(spec.command, [...spec.args], { detached: true, stdio: "ignore", windowsHide: true });
   try {
     await awaitOpenerStart(child, spec.command);
     return { opened: true };
@@ -49210,7 +50748,7 @@ var init_github_hovercard = __esm({
 });
 
 // packages/server/src/backend/account-actions.ts
-import { execFile as execFile9 } from "node:child_process";
+import { execFile as execFile10 } from "node:child_process";
 import { promisify as promisify8 } from "node:util";
 function liveThreadsForBackend(threads, backend) {
   let count = 0;
@@ -49223,6 +50761,7 @@ function liveThreadsForBackend(threads, backend) {
   return count;
 }
 async function runProviderLogout(opts) {
+  if (opts.backend === "acp") return { status: "failed", detail: "Log out with the agent's own CLI; Frizz holds no credential for an ACP agent.", auth: "unknown" };
   if (opts.liveThreads > 0) {
     return { status: "blocked", activeThreads: opts.liveThreads, auth: (await readAuthSnapshot({ claudeBin: opts.claudeBin }))[opts.backend] };
   }
@@ -49245,7 +50784,7 @@ var init_account_actions = __esm({
   "packages/server/src/backend/account-actions.ts"() {
     "use strict";
     init_auth_status();
-    execFileAsync6 = promisify8(execFile9);
+    execFileAsync6 = promisify8(execFile10);
     LIVE_RUNTIMES = /* @__PURE__ */ new Set(["spawning", "running", "perm-prompt"]);
   }
 });
@@ -49378,12 +50917,12 @@ var init_background_shell_output = __esm({
 });
 
 // packages/server/src/image-header.ts
-import { closeSync as closeSync15, openSync as openSync16, readSync as readSync9, statSync as statSync17 } from "node:fs";
+import { closeSync as closeSync15, openSync as openSync16, readSync as readSync9, statSync as statSync18 } from "node:fs";
 import { extname } from "node:path";
 function readHead3(path3, budget) {
   let fd;
   try {
-    const size = statSync17(path3).size;
+    const size = statSync18(path3).size;
     if (size === 0) return void 0;
     const buffer = Buffer.alloc(Math.min(size, budget));
     fd = openSync16(path3, "r");
@@ -49520,7 +51059,7 @@ var init_image_header = __esm({
 });
 
 // packages/server/src/directory-picker.ts
-import { execFile as execFile10 } from "node:child_process";
+import { execFile as execFile11 } from "node:child_process";
 import { promisify as promisify9 } from "node:util";
 async function pickImageFile(startIn, prompt = "Choose an image for this project", platform3 = process.platform) {
   if (platform3 === "darwin") {
@@ -49602,20 +51141,22 @@ var run2, PICKER_TIMEOUT_MS, OSASCRIPT;
 var init_directory_picker = __esm({
   "packages/server/src/directory-picker.ts"() {
     "use strict";
-    run2 = promisify9(execFile10);
+    run2 = promisify9(execFile11);
     PICKER_TIMEOUT_MS = 5 * 6e4;
     OSASCRIPT = (prompt) => `POSIX path of (choose folder with prompt ${JSON.stringify(prompt)})`;
   }
 });
 
 // packages/server/src/router.ts
-import { readFileSync as readFileSync25, statSync as statSync18 } from "node:fs";
-import { join as join37, resolve as resolve9 } from "node:path";
+import { readFileSync as readFileSync26, statSync as statSync19 } from "node:fs";
+import { join as join39, resolve as resolve9 } from "node:path";
 import { randomUUID as randomUUID16 } from "node:crypto";
-import { basename as basename9, dirname as dirname16 } from "node:path";
-import { existsSync as existsSync14, mkdirSync as mkdirSync16, rmSync as rmSync10, writeFileSync as writeFileSync13 } from "node:fs";
+import { basename as basename9, dirname as dirname17 } from "node:path";
+import { existsSync as existsSync15, mkdirSync as mkdirSync17, rmSync as rmSync10, writeFileSync as writeFileSync13 } from "node:fs";
 import { homedir as homedir17 } from "node:os";
 function validateGithubDispatchProfile(input) {
+  if (input.backend === "acp") return;
+  if (input.effort === void 0) throw new Error(`Unsupported ${input.backend} model/effort pair: ${input.model} / (no effort)`);
   validateThreadProfile(input.backend, input.model, input.effort);
 }
 function githubDispatcherRequest(input, item) {
@@ -49638,7 +51179,11 @@ function isAppServerCodexRow(row) {
 function appServerCodexTurnLive(codex, row) {
   return codex?.turnLiveness(row.slug, row.session_id)?.bridgeTurn === true;
 }
-async function stopThreadRuntime(storage, row, runtime = cachedLivenessTerminator, codex, claudeBroker) {
+async function stopThreadRuntime(storage, row, runtime = cachedLivenessTerminator, codex, claudeBroker, acp) {
+  if (row.backend === "acp") {
+    if (!acp?.turnLiveness(row.slug, row.session_id)?.turnActive) return "absent";
+    return (await acp.interruptTurn(row.slug, row.session_id)).interrupted ? "stopped" : "absent";
+  }
   if (isAppServerCodexRow(row)) {
     if (!appServerCodexTurnLive(codex, row)) return "absent";
     if (!codex) throw new Error("The Codex app-server is unavailable; nothing was stopped");
@@ -49679,9 +51224,9 @@ function stopRegisteredRuntime(storage, row, runtime = cachedLivenessTerminator)
   }
   return "stopped";
 }
-async function stopRuntimeBySlug(storage, slug, runtime = cachedLivenessTerminator, codex, claudeBroker) {
+async function stopRuntimeBySlug(storage, slug, runtime = cachedLivenessTerminator, codex, claudeBroker, acp) {
   const row = storage.getSession(slug);
-  if (row) return { outcome: await stopThreadRuntime(storage, row, runtime, codex, claudeBroker), row };
+  if (row) return { outcome: await stopThreadRuntime(storage, row, runtime, codex, claudeBroker, acp), row };
   if (storage.getAdoptionClaim(slug)) throw new Error("An adoption attempt is in progress; nothing was stopped");
   throw new Error("No registered runtime identity is available; nothing was stopped");
 }
@@ -49713,18 +51258,18 @@ 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) {
+async function completeRegisteredThread(storage, row, terminateLive, runtime = cachedLivenessTerminator, telemetry, codex, claudeBroker, acp) {
   const binding = adoptionRuntimeBinding(storage, row);
   if (binding.kind === "conflict") {
     throw new Error("This thread has a competing adoption attempt; nothing was changed");
   }
   const appServerCodex = isAppServerCodexRow(row);
   const brokerClaude = isBrokerClaudeRow(row);
-  const live = brokerClaude ? claudeBroker?.isDaemonAlive(row.session_id) ?? false : appServerCodex ? appServerCodexTurnLive(codex, row) : false;
+  const live = brokerClaude ? claudeBroker?.isDaemonAlive(row.session_id) ?? false : appServerCodex ? appServerCodexTurnLive(codex, row) : row.backend === "acp" ? acp?.turnLiveness(row.slug, row.session_id)?.turnActive ?? false : false;
   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);
+    await stopThreadRuntime(storage, row, runtime, codex, claudeBroker, acp);
     if (!appServerCodex && !brokerClaude && binding.kind === "unbound" && runtime.isLive(row.slug)) {
       throw new Error("The session could not be confirmed stopped; it was not marked done");
     }
@@ -49735,7 +51280,7 @@ async function completeRegisteredThread(storage, row, terminateLive, runtime = c
   }
   return { needsConfirmation: false };
 }
-async function stopAndForgetRegisteredRuntime(storage, row, runtime = cachedLivenessTerminator, codex, claudeBroker) {
+async function stopAndForgetRegisteredRuntime(storage, row, runtime = cachedLivenessTerminator, codex, claudeBroker, acp) {
   const binding = adoptionRuntimeBinding(storage, row);
   if (binding.kind === "conflict") {
     throw new Error("This thread changed while it was being dismissed; nothing was removed");
@@ -49745,7 +51290,7 @@ async function stopAndForgetRegisteredRuntime(storage, row, runtime = cachedLive
     runtimeGeneration: row.runtime_generation ?? 0,
     adoptionAttemptToken: binding.kind === "bound" ? binding.claim.attempt_token : null
   };
-  await stopThreadRuntime(storage, row, runtime, codex, claudeBroker);
+  await stopThreadRuntime(storage, row, runtime, codex, claudeBroker, acp);
   const forgotten = storage.forgetSessionIfCurrent(row.slug, expected);
   if (!forgotten) {
     throw new Error("This thread resumed or was replaced while it was being dismissed; the new worker was preserved");
@@ -49777,11 +51322,11 @@ function projectCard(entry, stale) {
 function addProjectAtPath(input, home = homedir17()) {
   const typed = input.trim();
   if (!typed) throw new Error("Enter a folder path.");
-  const expanded = typed === "~" || typed.startsWith("~/") ? join37(home, typed.slice(1)) : typed;
+  const expanded = typed === "~" || typed.startsWith("~/") ? join39(home, typed.slice(1)) : typed;
   const absolute = resolve9(expanded);
   let stats;
   try {
-    stats = statSync18(absolute);
+    stats = statSync19(absolute);
   } catch {
     throw new Error(`No folder at ${absolute}`);
   }
@@ -49806,7 +51351,7 @@ function storeProjectIcon(id, name, bytes) {
   if (!entry) throw new Error("No such project.");
   if (bytes.length === 0) throw new Error("That file is empty.");
   const path3 = customIconPath(id, `.${extension2}`);
-  mkdirSync16(dirname16(path3), { recursive: true });
+  mkdirSync17(dirname17(path3), { recursive: true });
   writeFileSync13(path3, bytes);
   if (!imageDimensions(path3)) {
     rmSync10(path3, { force: true });
@@ -49823,7 +51368,7 @@ function storeProjectIcon(id, name, bytes) {
 function setProjectIconFromFile(id, file) {
   let bytes;
   try {
-    bytes = readFileSync25(file);
+    bytes = readFileSync26(file);
   } catch {
     throw new Error("That file could not be read.");
   }
@@ -49856,7 +51401,7 @@ function mergeSubAgentSteers(messages, steers) {
   return merged;
 }
 function createRouter(ctx) {
-  const frizzDir = join37(ctx.project.dir, ".frizz");
+  const frizzDir = join39(ctx.project.dir, ".frizz");
   const openRoots = openableFileRoots(ctx.project);
   function isAutoTitledSession(slug) {
     return ctx.storage.getSession(slug)?.title_auto === 1;
@@ -50483,6 +52028,28 @@ function createRouter(ctx) {
 ${gapNote}` : input.message;
         if (row) reopenArchivedThreadForFollowUp(ctx, row);
         if (row) wakeParkedThreadForFollowUp(ctx, row);
+        if (row?.backend === "acp") {
+          const bridge = ctx.acpBridge;
+          if (!bridge) throw new Error("The ACP bridge is unavailable; cannot deliver this follow-up");
+          const result = await bridge.followUp({
+            threadSlug: input.slug,
+            sessionId: row.session_id,
+            cwd: ctx.project.dir,
+            agentId: row.acp_agent ?? "",
+            modelId: acpModelIdFromModel(row.model),
+            acpSessionId: row.agent_session_id,
+            text: messageForWorker,
+            ...input.deliveryId ? { deliveryId: input.deliveryId } : {}
+          });
+          if (result.acpSessionId !== row.agent_session_id) ctx.storage.setAgentSession(input.slug, result.acpSessionId);
+          if (row.exited === 1) ctx.storage.setExitedIfCurrent(input.slug, row.session_id, row.runtime_generation ?? 0, false);
+          if (input.deliveryId) {
+            appendDelivery(ctx.storage, input.slug, { id: input.deliveryId, text: input.message, state: result.state === "queued" ? "enqueued" : "delivered" });
+            ctx.transcriptChange.emit([input.slug]);
+          }
+          ctx.board.refresh();
+          return;
+        }
         if (row?.backend === "codex") {
           const bridge = ctx.codexAppServer;
           if (!bridge) throw new Error("Codex app-server is unavailable; cannot deliver this follow-up");
@@ -50668,6 +52235,7 @@ ${gapNote}` : input.message;
         const thread = (await ctx.board.snapshot()).threads.find((t) => t.id === input.slug);
         if (!thread || thread.foreign || thread.kind !== "session") throw new Error(`thread ${input.slug} is not editable`);
         const permRow = ctx.storage.getSession(input.slug);
+        if (permRow?.backend === "acp") throw new Error("An ACP agent enforces its own permissions; Frizz has no mode to set on it");
         if (permRow?.backend === "codex") {
           ctx.storage.setPermissionMode(input.slug, input.permissionMode);
           ctx.board.refresh();
@@ -50713,7 +52281,9 @@ ${gapNote}` : input.message;
         const row = ctx.storage.getSession(input.slug);
         if (!row) throw new Error(`thread ${input.slug} has no session to ask for skills`);
         let skills;
-        if (row.backend === "codex") {
+        if (row.backend === "acp") {
+          skills = [];
+        } else if (row.backend === "codex") {
           if (!isAppServerCodexRow(row) || !ctx.codexAppServer) {
             throw new Error("This Codex thread has no app-server session to ask for skills");
           }
@@ -50734,6 +52304,7 @@ ${gapNote}` : input.message;
         const thread = (await ctx.board.snapshot()).threads.find((candidate) => candidate.id === input.slug);
         if (!thread || thread.foreign || thread.kind !== "session") throw new Error(`thread ${input.slug} is not editable`);
         const profRow = ctx.storage.getSession(input.slug);
+        if (profRow?.backend === "acp") throw new Error("An ACP agent chooses its own model; Frizz offers no profile for it yet");
         if (profRow?.backend === "codex") {
           ctx.storage.setProfile(input.slug, input.model, input.effort);
           ctx.board.refresh();
@@ -50806,7 +52377,8 @@ ${gapNote}` : input.message;
           cachedLivenessTerminator,
           ctx.tailer.get(input.slug),
           ctx.codexAppServer,
-          ctx.claudeBroker
+          ctx.claudeBroker,
+          ctx.acpBridge
         );
         if (!result.needsConfirmation) ctx.board.refresh();
         return result;
@@ -51400,7 +52972,7 @@ Say which way you went and why in your write-up, so the human can course-correct
         if (t && t.runtime !== "exited") {
           throw new Error("only a stalled or exited session can be dismissed \u2014 archive a live one instead");
         }
-        await stopAndForgetRegisteredRuntime(ctx.storage, row, cachedLivenessTerminator, ctx.codexAppServer, ctx.claudeBroker);
+        await stopAndForgetRegisteredRuntime(ctx.storage, row, cachedLivenessTerminator, ctx.codexAppServer, ctx.claudeBroker, ctx.acpBridge);
         ctx.tailer.forget(input.slug);
         ctx.board.refresh();
       }
@@ -51518,7 +53090,7 @@ Say which way you went and why in your write-up, so the human can course-correct
       handler: async ({ input }) => {
         assertLegacyMutationAllowed(input.slug);
         if (input.status === "dismissed") {
-          const stopped = await stopRuntimeBySlug(ctx.storage, input.slug, cachedLivenessTerminator, ctx.codexAppServer, ctx.claudeBroker);
+          const stopped = await stopRuntimeBySlug(ctx.storage, input.slug, cachedLivenessTerminator, ctx.codexAppServer, ctx.claudeBroker, ctx.acpBridge);
           if (stopped.row && !ctx.storage.setExitedIfCurrent(
             stopped.row.slug,
             stopped.row.session_id,
@@ -51622,7 +53194,7 @@ Say which way you went and why in your write-up, so the human can course-correct
     killAgent: mutation({
       input: SlugInput,
       handler: async ({ input }) => {
-        const stopped = await stopRuntimeBySlug(ctx.storage, input.slug, cachedLivenessTerminator, ctx.codexAppServer, ctx.claudeBroker);
+        const stopped = await stopRuntimeBySlug(ctx.storage, input.slug, cachedLivenessTerminator, ctx.codexAppServer, ctx.claudeBroker, ctx.acpBridge);
         if (stopped.row && !ctx.storage.setExitedIfCurrent(
           stopped.row.slug,
           stopped.row.session_id,
@@ -51641,6 +53213,20 @@ Say which way you went and why in your write-up, so the human can course-correct
       output: external_exports.array(CodexModel),
       handler: async () => readCodexModels()
     }),
+    // The ACP agents Frizz knows how to launch, with `available` for the ones on this machine's PATH.
+    // The composer lists the available ones as `acp:<id>` models (plans/acp-backend.md, decision 9).
+    acpAgents: query({
+      output: external_exports.array(AcpAgent),
+      handler: async () => listAcpAgents(ctx.getSettings().acpAgents).map((a) => ({ id: a.id, label: a.label, command: a.command, available: a.bin !== void 0 }))
+    }),
+    // The models one ACP agent advertises — read by opening a throwaway session in the project dir
+    // (cached in the bridge), so it is a separate query the composer asks only once a model picker
+    // needs it, never on every board load.
+    acpAgentModels: query({
+      input: AcpAgentModelsInput,
+      output: AcpAgentModels,
+      handler: async ({ input }) => ctx.acpBridge ? ctx.acpBridge.agentModels(input.agentId, ctx.project.dir, { refresh: input.refresh === true }) : { agentId: input.agentId, models: [], error: "The ACP bridge is unavailable", probedAt: (/* @__PURE__ */ new Date()).toISOString() }
+    }),
     // Provider subscription quota (5h + weekly rate-limit windows) for the sidebar status bar. Codex
     // reads live from the app-server's `account/rateLimits/read`, falling back to the rollout JSONL
     // frizz already tails; Claude delegates to Claude Code's own non-interactive `/usage` command.
@@ -51690,7 +53276,7 @@ Say which way you went and why in your write-up, so the human can course-correct
         const { state, backend } = ctx.loginUtility.status(input.attemptId);
         const auth = await readAuthSnapshot({ claudeBin: ctx.claudeBin });
         if (state === "exited") ctx.loginUtility.cancel(input.attemptId);
-        return { state, auth: auth[backend ?? "claude"] };
+        return { state, auth: backend === "acp" ? "unknown" : auth[backend ?? "claude"] };
       }
     }),
     accountLoginCancel: mutation({
@@ -51859,7 +53445,7 @@ Say which way you went and why in your write-up, so the human can course-correct
         }
         const updated = clearProjectIcon(input.id);
         if (!updated) throw new Error("No such project.");
-        return projectCard(updated, !existsSync14(updated.path));
+        return projectCard(updated, !existsSync15(updated.path));
       }
     }),
     /**
@@ -51928,6 +53514,16 @@ Say which way you went and why in your write-up, so the human can course-correct
       output: Settings,
       handler: async ({ input }) => ctx.setSettings(input)
     }),
+    // Context controls live in the new-thread picker. Patch only the chosen field against the
+    // latest settings, synchronously, rather than replacing unrelated settings from a stale drawer.
+    contextWindowSet: mutation({
+      input: external_exports.object({ backend: external_exports.enum(["claude", "codex"]), tokens: external_exports.number().int().positive().nullable() }),
+      output: Settings,
+      handler: async ({ input }) => ctx.setSettings({
+        ...ctx.getSettings(),
+        [input.backend === "claude" ? "autoCompactWindow" : "codexContextWindow"]: input.tokens ?? void 0
+      })
+    }),
     // Clear the stored settings blob so defaults (incl. the shipped default preamble) apply again.
     settingsReset: mutation({
       input: external_exports.object({}),
@@ -52032,6 +53628,7 @@ var init_router5 = __esm({
     init_server();
     init_src();
     init_context();
+    init_acp_agents();
     init_storage();
     init_usage_limit();
     init_board();
@@ -52219,7 +53816,7 @@ var init_local_origin = __esm({
 });
 
 // packages/server/src/compression.ts
-import { brotliCompressSync, gzipSync, constants as constants2 } from "node:zlib";
+import { brotliCompressSync, gzipSync, constants as constants3 } from "node:zlib";
 function negotiateEncoding(acceptEncoding) {
   if (!acceptEncoding) return null;
   const offers = /* @__PURE__ */ new Map();
@@ -52242,9 +53839,9 @@ function negotiateEncoding(acceptEncoding) {
 function compress(body, encoding) {
   const out = encoding === "br" ? brotliCompressSync(body, {
     params: {
-      [constants2.BROTLI_PARAM_QUALITY]: 4,
+      [constants3.BROTLI_PARAM_QUALITY]: 4,
       // Telling brotli the input size lets it size its window instead of guessing.
-      [constants2.BROTLI_PARAM_SIZE_HINT]: body.byteLength
+      [constants3.BROTLI_PARAM_SIZE_HINT]: body.byteLength
     }
   }) : gzipSync(body, { level: 6 });
   return Uint8Array.from(out);
@@ -52265,10 +53862,10 @@ var init_compression = __esm({
 });
 
 // packages/server/src/local-image.ts
-import { readFileSync as readFileSync26, realpathSync as realpathSync11, statSync as statSync19 } from "node:fs";
-import { extname as extname2, isAbsolute as isAbsolute6 } from "node:path";
+import { readFileSync as readFileSync27, realpathSync as realpathSync11, statSync as statSync20 } from "node:fs";
+import { extname as extname2, isAbsolute as isAbsolute7 } from "node:path";
 function resolveLocalImage(rawPath) {
-  if (!rawPath || !isAbsolute6(rawPath)) return { status: 400 };
+  if (!rawPath || !isAbsolute7(rawPath)) return { status: 400 };
   const contentType = IMAGE_CONTENT_TYPE[extname2(rawPath).toLowerCase()];
   if (!contentType) return { status: 400 };
   let real;
@@ -52278,8 +53875,8 @@ function resolveLocalImage(rawPath) {
     return { status: 404 };
   }
   try {
-    if (!statSync19(real).isFile()) return { status: 404 };
-    return { status: 200, contentType, body: readFileSync26(real) };
+    if (!statSync20(real).isFile()) return { status: 404 };
+    return { status: 200, contentType, body: readFileSync27(real) };
   } catch {
     return { status: 404 };
   }
@@ -52299,9 +53896,9 @@ var init_local_image = __esm({
 });
 
 // packages/server/src/project-icon.ts
-import { readFileSync as readFileSync27, readdirSync as readdirSync10, realpathSync as realpathSync12, statSync as statSync20 } from "node:fs";
+import { readFileSync as readFileSync28, readdirSync as readdirSync10, realpathSync as realpathSync12, statSync as statSync21 } from "node:fs";
 import { homedir as homedir18 } from "node:os";
-import { basename as basename10, dirname as dirname17, extname as extname3, join as join38, relative as relative2, sep as sep3 } from "node:path";
+import { basename as basename10, dirname as dirname18, extname as extname3, join as join40, 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, "");
@@ -52319,7 +53916,7 @@ function sizeScore(dimensions) {
   return Math.max(0, Math.min(40, Math.round(Math.log2(edge / 24) * 8)));
 }
 function under(root, relativeDirectory) {
-  return relativeDirectory ? join38(root, relativeDirectory) : root;
+  return relativeDirectory ? join40(root, relativeDirectory) : root;
 }
 function listFiles(directory) {
   try {
@@ -52341,19 +53938,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(join38(root, host), asset));
+    for (const asset of ASSET_DIRECTORIES) directories.push(under(join40(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(join38(root, container), { withFileTypes: true }).filter((entry) => entry.isDirectory() && !entry.name.startsWith(".")).map((entry) => entry.name);
+      members = readdirSync10(join40(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(join38(root, container, member), asset));
+      for (const asset of ASSET_DIRECTORIES) directories.push(under(join40(root, container, member), asset));
     }
   }
   return [...new Set(directories)];
@@ -52361,13 +53958,13 @@ function iconDirectories(root) {
 function manifestIcons(manifestPath) {
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync27(manifestPath, "utf8"));
+    parsed = JSON.parse(readFileSync28(manifestPath, "utf8"));
   } catch {
     return [];
   }
   if (!Array.isArray(parsed?.icons)) return [];
-  const directory = dirname17(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) => join38(directory, src.replace(/[?#].*$/u, "").replace(/^\//u, "")));
+  const directory = dirname18(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) => join40(directory, src.replace(/[?#].*$/u, "").replace(/^\//u, "")));
 }
 function projectIconCandidates(root) {
   const projectStem = normalizeStem(basename10(root)).normalized;
@@ -52386,10 +53983,10 @@ 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(join38(directory, name))) {
+        for (const icon of manifestIcons(join40(directory, name))) {
           if (MEASURABLE_IMAGE_EXTENSIONS.has(extname3(icon).toLowerCase())) {
             fromManifest.add(icon);
-            files.push({ path: icon, directory: dirname17(icon) });
+            files.push({ path: icon, directory: dirname18(icon) });
           }
         }
         continue;
@@ -52397,7 +53994,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: join38(directory, name), directory });
+      files.push({ path: join40(directory, name), directory });
       if (files.length >= MAX_CANDIDATES) break;
     }
   }
@@ -52449,7 +54046,7 @@ function resolveProjectIconResponse(id, options = {}) {
   let real;
   try {
     real = realpathSync12(path3);
-    if (!statSync20(real).isFile()) return { status: 404 };
+    if (!statSync21(real).isFile()) return { status: 404 };
   } catch {
     return { status: 404 };
   }
@@ -52462,7 +54059,7 @@ function resolveProjectIconResponse(id, options = {}) {
   });
   if (!roots.some((root) => real === root || real.startsWith(root + sep3))) return { status: 404 };
   try {
-    return { status: 200, contentType, body: readFileSync27(real) };
+    return { status: 200, contentType, body: readFileSync28(real) };
   } catch {
     return { status: 404 };
   }
@@ -52574,8 +54171,8 @@ var init_project_icon = __esm({
 });
 
 // packages/server/src/local-visualization.ts
-import { readdirSync as readdirSync11, readFileSync as readFileSync28, realpathSync as realpathSync13, statSync as statSync21 } from "node:fs";
-import { join as join39, sep as sep4 } from "node:path";
+import { readdirSync as readdirSync11, readFileSync as readFileSync29, realpathSync as realpathSync13, statSync as statSync22 } from "node:fs";
+import { join as join41, sep as sep4 } from "node:path";
 function children(path3, pattern) {
   try {
     return readdirSync11(path3, { withFileTypes: true }).filter((entry) => entry.isDirectory() && pattern.test(entry.name)).map((entry) => entry.name).sort().reverse();
@@ -52587,7 +54184,7 @@ function isUnder2(path3, root) {
   return path3 === root || path3.startsWith(root.endsWith(sep4) ? root : root + sep4);
 }
 function resolveFragment(projectDir, sessionId, file) {
-  const base = join39(projectDir, ".codex", "visualizations");
+  const base = join41(projectDir, ".codex", "visualizations");
   let projectReal;
   let baseReal;
   try {
@@ -52598,15 +54195,15 @@ function resolveFragment(projectDir, sessionId, file) {
   }
   if (!isUnder2(baseReal, projectReal)) return null;
   for (const year of children(base, YEAR_PART)) {
-    const yearDir = join39(base, year);
+    const yearDir = join41(base, year);
     for (const month of children(yearDir, DATE_PART)) {
-      const monthDir = join39(yearDir, month);
+      const monthDir = join41(yearDir, month);
       for (const day of children(monthDir, DATE_PART)) {
-        const sessionRoot = join39(baseReal, year, month, day, sessionId);
-        const candidate = join39(monthDir, day, sessionId, file);
+        const sessionRoot = join41(baseReal, year, month, day, sessionId);
+        const candidate = join41(monthDir, day, sessionId, file);
         try {
           const real = realpathSync13(candidate);
-          if (isUnder2(real, sessionRoot) && statSync21(real).isFile()) return real;
+          if (isUnder2(real, sessionRoot) && statSync22(real).isFile()) return real;
         } catch {
         }
       }
@@ -52687,9 +54284,9 @@ function resolveLocalVisualization(projectDir, sessionId, file) {
   if (!path3) return { status: 404 };
   let fragment;
   try {
-    const size = statSync21(path3).size;
+    const size = statSync22(path3).size;
     if (size > MAX_FRAGMENT_BYTES) return { status: 413 };
-    fragment = readFileSync28(path3, "utf8");
+    fragment = readFileSync29(path3, "utf8");
   } catch {
     return { status: 404 };
   }
@@ -52731,8 +54328,8 @@ var init_local_visualization = __esm({
 });
 
 // packages/server/src/app.ts
-import { mkdirSync as mkdirSync17, writeFileSync as writeFileSync14 } from "node:fs";
-import { join as join40 } from "node:path";
+import { mkdirSync as mkdirSync18, writeFileSync as writeFileSync14 } from "node:fs";
+import { join as join42 } from "node:path";
 import { randomUUID as randomUUID17 } from "node:crypto";
 function createApp(ctx, options = {}) {
   const app = new Hono2();
@@ -52836,10 +54433,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 = join40(ctx.project.stateDir, "attachments");
-    mkdirSync17(dir, { recursive: true });
+    const dir = join42(ctx.project.stateDir, "attachments");
+    mkdirSync18(dir, { recursive: true });
     const base = name.replace(/\.[^.]+$/, "").replace(/[^a-zA-Z0-9_-]+/g, "-").slice(0, 40) || "file";
-    const path3 = join40(dir, `${Date.now()}-${randomUUID17().slice(0, 8)}-${base}${ext}`);
+    const path3 = join42(dir, `${Date.now()}-${randomUUID17().slice(0, 8)}-${base}${ext}`);
     writeFileSync14(path3, buf);
     return c.json({ path: path3 });
   });
@@ -54151,11 +55748,11 @@ var init_app_socket = __esm({
 });
 
 // packages/server/src/local-file-watch.ts
-import { statSync as statSync22, watch } from "node:fs";
-import { basename as basename11, dirname as dirname18 } from "node:path";
+import { statSync as statSync23, watch } from "node:fs";
+import { basename as basename11, dirname as dirname19 } from "node:path";
 function stampOf(path3) {
   try {
-    const s = statSync22(path3, { bigint: true });
+    const s = statSync23(path3, { bigint: true });
     return `${s.ino}:${s.size}:${s.mtimeNs}`;
   } catch {
     return "gone";
@@ -54175,7 +55772,7 @@ function watchLocalFile(path3, onChange) {
   let entry = entries.get(path3);
   if (!entry) {
     const name = basename11(path3);
-    const watcher2 = watch(dirname18(path3), { persistent: false }, (_event, changed) => {
+    const watcher2 = watch(dirname19(path3), { persistent: false }, (_event, changed) => {
       if (changed !== null && changed !== void 0 && changed.toString() !== name) return;
       const current = entries.get(path3);
       if (!current) return;
@@ -54211,10 +55808,10 @@ var init_local_file_watch = __esm({
 });
 
 // packages/server/src/boot-progress.ts
-import { mkdirSync as mkdirSync18, readFileSync as readFileSync29, renameSync as renameSync10, rmSync as rmSync11, writeFileSync as writeFileSync15 } from "node:fs";
-import { basename as basename12, dirname as dirname19, join as join41 } from "node:path";
+import { mkdirSync as mkdirSync19, readFileSync as readFileSync30, renameSync as renameSync10, rmSync as rmSync11, writeFileSync as writeFileSync15 } from "node:fs";
+import { basename as basename12, dirname as dirname20, join as join43 } from "node:path";
 function bootProgressPath(stateDir) {
-  return join41(stateDir, BOOT_PROGRESS_NAME);
+  return join43(stateDir, BOOT_PROGRESS_NAME);
 }
 function createBootProgressPublisher(stateDir, minIntervalMs = 200) {
   if (!stateDir) {
@@ -54234,8 +55831,8 @@ function createBootProgressPublisher(stateDir, minIntervalMs = 200) {
     lastAt = now;
     step++;
     try {
-      mkdirSync18(dirname19(path3), { recursive: true, mode: 448 });
-      const temp = join41(dirname19(path3), `.${basename12(path3)}.${process.pid}.tmp`);
+      mkdirSync19(dirname20(path3), { recursive: true, mode: 448 });
+      const temp = join43(dirname20(path3), `.${basename12(path3)}.${process.pid}.tmp`);
       writeFileSync15(temp, `${JSON.stringify({ pid: process.pid, step, phase, at: new Date(now).toISOString() })}
 `, "utf8");
       renameSync10(temp, path3);
@@ -54251,22 +55848,23 @@ function createBootProgressPublisher(stateDir, minIntervalMs = 200) {
     }
   });
 }
-var BOOT_PROGRESS_NAME;
+var BOOT_PROGRESS_NAME, BOOT_HARD_TIMEOUT_MS;
 var init_boot_progress = __esm({
   "packages/server/src/boot-progress.ts"() {
     "use strict";
     BOOT_PROGRESS_NAME = "boot.progress";
+    BOOT_HARD_TIMEOUT_MS = 10 * 6e4;
   }
 });
 
 // packages/server/src/runtime-lease.ts
-import { existsSync as existsSync15, mkdirSync as mkdirSync19, readdirSync as readdirSync12, readFileSync as readFileSync30, unlinkSync as unlinkSync6, writeFileSync as writeFileSync16 } from "node:fs";
-import { dirname as dirname20, join as join42 } from "node:path";
+import { existsSync as existsSync16, mkdirSync as mkdirSync20, readdirSync as readdirSync12, readFileSync as readFileSync31, unlinkSync as unlinkSync6, writeFileSync as writeFileSync16 } from "node:fs";
+import { dirname as dirname21, join as join44 } from "node:path";
 function runtimeVersionDir(bin) {
-  let dir = dirname20(bin);
+  let dir = dirname21(bin);
   for (let step = 0; step < MAX_ASCENT; step++) {
-    if (existsSync15(join42(dir, PROVISIONED_MARKER))) return dir;
-    const parent = dirname20(dir);
+    if (existsSync16(join44(dir, PROVISIONED_MARKER))) return dir;
+    const parent = dirname21(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
@@ -54284,9 +55882,9 @@ function leaseRuntime(bin, role) {
   const versionDir = runtimeVersionDir(bin);
   if (!versionDir) return () => {
   };
-  const path3 = join42(versionDir, LEASES_DIR, `${process.pid}.json`);
+  const path3 = join44(versionDir, LEASES_DIR, `${process.pid}.json`);
   try {
-    mkdirSync19(dirname20(path3), { recursive: true });
+    mkdirSync20(dirname21(path3), { recursive: true });
     const lease = { pid: process.pid, role, bin, at: (/* @__PURE__ */ new Date()).toISOString() };
     writeFileSync16(path3, JSON.stringify(lease));
   } catch {
@@ -54301,7 +55899,7 @@ function leaseRuntime(bin, role) {
   };
 }
 function liveRuntimeLeases(versionDir) {
-  const dir = join42(versionDir, LEASES_DIR);
+  const dir = join44(versionDir, LEASES_DIR);
   let names;
   try {
     names = readdirSync12(dir);
@@ -54311,10 +55909,10 @@ function liveRuntimeLeases(versionDir) {
   const live = [];
   for (const name of names) {
     if (!name.endsWith(".json")) continue;
-    const path3 = join42(dir, name);
+    const path3 = join44(dir, name);
     let lease;
     try {
-      lease = JSON.parse(readFileSync30(path3, "utf8"));
+      lease = JSON.parse(readFileSync31(path3, "utf8"));
     } catch {
       continue;
     }
@@ -54345,25 +55943,25 @@ import { createHash as createHash15 } from "node:crypto";
 import {
   chmodSync as chmodSync2,
   closeSync as closeSync16,
-  existsSync as existsSync16,
-  mkdirSync as mkdirSync20,
+  existsSync as existsSync17,
+  mkdirSync as mkdirSync21,
   openSync as openSync17,
-  readFileSync as readFileSync31,
+  readFileSync as readFileSync32,
   readdirSync as readdirSync13,
   renameSync as renameSync11,
   rmSync as rmSync12,
-  statSync as statSync23,
+  statSync as statSync24,
   writeFileSync as writeFileSync17,
   writeSync as writeSync2
 } from "node:fs";
-import { dirname as dirname21, isAbsolute as isAbsolute7, join as join43, normalize, relative as relative3, sep as sep5 } from "node:path";
+import { dirname as dirname22, isAbsolute as isAbsolute8, join as join45, normalize, relative as relative3, sep as sep5 } from "node:path";
 import { Readable, Transform, Writable as Writable3 } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { createGunzip } from "node:zlib";
 function runtimesRoot(env = process.env) {
   const override = env[RUNTIMES_DIR_ENV];
-  if (override && isAbsolute7(override)) return override;
-  return join43(frizzRoots().cache, "runtimes");
+  if (override && isAbsolute8(override)) return override;
+  return join45(frizzRoots().cache, "runtimes");
 }
 function isMusl() {
   if (process.platform !== "linux") return false;
@@ -54380,16 +55978,16 @@ function runtimeCoordinates(backend, platform3 = process.platform, arch = proces
   return { pkg: "@openai/codex", packageVersion: `${CODEX_VERSION}-${platform3}-${arch}`, label: CODEX_VERSION, binary: `codex${exe}` };
 }
 function provisionedBinary(backend, root, label) {
-  const dir = join43(root, backend, label);
+  const dir = join45(root, backend, label);
   let marker;
   try {
-    marker = JSON.parse(readFileSync31(join43(dir, MARKER), "utf8"));
+    marker = JSON.parse(readFileSync32(join45(dir, MARKER), "utf8"));
   } catch {
     return void 0;
   }
   if (typeof marker.binary !== "string" || marker.label !== label) return void 0;
-  const bin = join43(dir, marker.binary);
-  return existsSync16(bin) ? bin : void 0;
+  const bin = join45(dir, marker.binary);
+  return existsSync17(bin) ? bin : void 0;
 }
 function octal(buffer, offset, length) {
   const text2 = buffer.toString("latin1", offset, offset + length).replace(/\0.*$/su, "").trim();
@@ -54402,18 +56000,18 @@ function safeEntryPath(dest, name) {
   const parts = name.split("/").filter((part) => part.length > 0);
   if (parts.length < 2) return void 0;
   const rel = normalize(parts.slice(1).join(sep5));
-  if (isAbsolute7(rel) || rel === ".." || rel.startsWith(`..${sep5}`)) return void 0;
-  const full = join43(dest, rel);
+  if (isAbsolute8(rel) || rel === ".." || rel.startsWith(`..${sep5}`)) return void 0;
+  const full = join45(dest, rel);
   const back = relative3(dest, full);
-  if (back.startsWith("..") || isAbsolute7(back)) return void 0;
+  if (back.startsWith("..") || isAbsolute8(back)) return void 0;
   return full;
 }
 function locateBinary(dir, backend, binary) {
   if (backend === "claude") {
-    const direct = join43(dir, binary);
-    return existsSync16(direct) ? direct : void 0;
+    const direct = join45(dir, binary);
+    return existsSync17(direct) ? direct : void 0;
   }
-  const vendor = join43(dir, "vendor");
+  const vendor = join45(dir, "vendor");
   let triples;
   try {
     triples = readdirSync13(vendor);
@@ -54421,8 +56019,8 @@ function locateBinary(dir, backend, binary) {
     return void 0;
   }
   for (const triple of triples) {
-    const candidate = join43(vendor, triple, "bin", binary);
-    if (existsSync16(candidate)) return candidate;
+    const candidate = join45(vendor, triple, "bin", binary);
+    if (existsSync17(candidate)) return candidate;
   }
   return void 0;
 }
@@ -54437,12 +56035,12 @@ async function provisionRuntime(backend, options) {
   const registry = options.registry ?? REGISTRY;
   const progress = options.onProgress ?? (() => {
   });
-  const backendDir = join43(root, backend);
-  const finalDir = join43(backendDir, coordinates.label);
-  const partial = join43(backendDir, `.partial-${coordinates.label}-${process.pid}`);
-  mkdirSync20(backendDir, { recursive: true });
+  const backendDir = join45(root, backend);
+  const finalDir = join45(backendDir, coordinates.label);
+  const partial = join45(backendDir, `.partial-${coordinates.label}-${process.pid}`);
+  mkdirSync21(backendDir, { recursive: true });
   rmSync12(partial, { recursive: true, force: true });
-  mkdirSync20(partial);
+  mkdirSync21(partial);
   try {
     const manifestUrl = `${registry}/${coordinates.pkg.replace("/", "%2F")}/${coordinates.packageVersion}`;
     progress(`resolving ${coordinates.pkg}@${coordinates.packageVersion}`);
@@ -54486,7 +56084,7 @@ async function provisionRuntime(backend, options) {
       binary: relative3(partial, bin),
       at: (/* @__PURE__ */ new Date()).toISOString()
     };
-    writeFileSync17(join43(partial, MARKER), `${JSON.stringify(marker, null, 2)}
+    writeFileSync17(join45(partial, MARKER), `${JSON.stringify(marker, null, 2)}
 `, "utf8");
     const rename2 = options.rename ?? renameSync11;
     try {
@@ -54495,7 +56093,7 @@ async function provisionRuntime(backend, options) {
           rename2(partial, finalDir);
           break;
         } catch (err) {
-          if (attempt >= RENAME_ATTEMPTS || !TRANSIENT_HANDLE_CODES.has(errorCode4(err) ?? "") || existsSync16(finalDir)) throw err;
+          if (attempt >= RENAME_ATTEMPTS || !TRANSIENT_HANDLE_CODES.has(errorCode4(err) ?? "") || existsSync17(finalDir)) throw err;
           await new Promise((resolve12) => setTimeout(resolve12, options.retryDelayMs ?? RENAME_RETRY_DELAY_MS));
         }
       }
@@ -54506,7 +56104,7 @@ async function provisionRuntime(backend, options) {
       return { bin: theirs, label: coordinates.label, fetched: false };
     }
     progress("ready");
-    return { bin: join43(finalDir, marker.binary), label: coordinates.label, fetched: true };
+    return { bin: join45(finalDir, marker.binary), label: coordinates.label, fetched: true };
   } catch (err) {
     rmSync12(partial, { recursive: true, force: true });
     throw err;
@@ -54514,7 +56112,7 @@ async function provisionRuntime(backend, options) {
 }
 function sweepRuntimes(backend, root, keepLabel, now = Date.now(), deps = {}) {
   const rm2 = deps.rm ?? defaultSweepRm;
-  const backendDir = join43(root, backend);
+  const backendDir = join45(root, backend);
   let entries2;
   try {
     entries2 = readdirSync13(backendDir);
@@ -54524,10 +56122,10 @@ function sweepRuntimes(backend, root, keepLabel, now = Date.now(), deps = {}) {
   const sweep = { removed: [], kept: [] };
   for (const entry of entries2) {
     if (entry === keepLabel) continue;
-    const full = join43(backendDir, entry);
+    const full = join45(backendDir, entry);
     if (entry.startsWith(".partial-")) {
       try {
-        if (now - statSync23(full).mtimeMs < 24 * 60 * 60 * 1e3) continue;
+        if (now - statSync24(full).mtimeMs < 24 * 60 * 60 * 1e3) continue;
       } catch {
         continue;
       }
@@ -54707,7 +56305,7 @@ var init_runtimes = __esm({
             return;
           case "5": {
             const dir = safeEntryPath(this.dest, name);
-            if (dir) mkdirSync20(dir, { recursive: true });
+            if (dir) mkdirSync21(dir, { recursive: true });
             return;
           }
           case "0":
@@ -54715,7 +56313,7 @@ var init_runtimes = __esm({
           case "7": {
             const file = safeEntryPath(this.dest, name);
             if (!file) return;
-            mkdirSync20(dirname21(file), { recursive: true });
+            mkdirSync21(dirname22(file), { recursive: true });
             this.fd = openSync17(file, "w", octal(header, 100, 8) & 511 || 420);
             this.written.push(file);
             return;
@@ -55292,18 +56890,18 @@ var init_legacy_project_db = __esm({
 });
 
 // packages/server/src/frizz-db.ts
-import { existsSync as existsSync17, mkdirSync as mkdirSync21, readdirSync as readdirSync14, renameSync as renameSync12, statSync as statSync24 } from "node:fs";
-import { basename as basename13, dirname as dirname22, join as join44 } from "node:path";
+import { existsSync as existsSync18, mkdirSync as mkdirSync22, readdirSync as readdirSync14, renameSync as renameSync12, statSync as statSync25 } from "node:fs";
+import { basename as basename13, dirname as dirname23, join as join46 } from "node:path";
 function frizzDatabaseLocation(options) {
   if (options.stateDir !== void 0) {
-    const projectsDir = dirname22(options.stateDir);
+    const projectsDir = dirname23(options.stateDir);
     if (basename13(projectsDir) === "projects") {
-      return { path: options.path ?? join44(dirname22(projectsDir), "ui.db"), projectsDir };
+      return { path: options.path ?? join46(dirname23(projectsDir), "ui.db"), projectsDir };
     }
-    return { path: options.path ?? join44(options.stateDir, "ui.db"), projectsDir: void 0 };
+    return { path: options.path ?? join46(options.stateDir, "ui.db"), projectsDir: void 0 };
   }
   const data = options.home ? frizzPaths({ home: options.home }).data : frizzRoots().data;
-  return { path: options.path ?? join44(data, "ui.db"), projectsDir: join44(data, "projects") };
+  return { path: options.path ?? join46(data, "ui.db"), projectsDir: join46(data, "projects") };
 }
 function ensureFrizzSchema(db) {
   db.exec(`
@@ -55322,7 +56920,7 @@ function ensureFrizzSchema(db) {
 }
 function openFrizzDatabase(options = {}) {
   const { path: path3, projectsDir } = frizzDatabaseLocation(options);
-  mkdirSync21(dirname22(path3), { recursive: true });
+  mkdirSync22(dirname23(path3), { recursive: true });
   const db = new sqlite_default(path3);
   db.pragma("busy_timeout = 5000");
   db.pragma("journal_mode = WAL");
@@ -55334,10 +56932,10 @@ function openFrizzDatabase(options = {}) {
     );
     for (const projectId of retiredLegacyProjectIds(projectsDir)) {
       if (alreadyImported.has(projectId)) continue;
-      const dir = join44(projectsDir, projectId);
+      const dir = join46(projectsDir, projectId);
       try {
-        renameSync12(join44(dir, "ui.db.imported"), join44(dir, "ui.db"));
-        db.prepare("INSERT INTO imported_project (project_id, source, rows, imported_at) VALUES (?, ?, 0, ?)").run(projectId, join44(dir, "ui.db"), (/* @__PURE__ */ new Date()).toISOString());
+        renameSync12(join46(dir, "ui.db.imported"), join46(dir, "ui.db"));
+        db.prepare("INSERT INTO imported_project (project_id, source, rows, imported_at) VALUES (?, ?, 0, ?)").run(projectId, join46(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) {
@@ -55347,7 +56945,7 @@ function openFrizzDatabase(options = {}) {
     }
     for (const projectId of legacyProjectIds(projectsDir)) {
       if (alreadyImported.has(projectId)) continue;
-      const legacyPath = join44(projectsDir, projectId, "ui.db");
+      const legacyPath = join46(projectsDir, projectId, "ui.db");
       try {
         const rows = importLegacyProject(db, projectId, legacyPath);
         imported.push({ projectId, rows });
@@ -55377,10 +56975,10 @@ function openFrizzDatabase(options = {}) {
   };
 }
 function projectIdsWithFile(projectsDir, file) {
-  if (!existsSync17(projectsDir)) return [];
+  if (!existsSync18(projectsDir)) return [];
   return readdirSync14(projectsDir).filter((name) => {
     try {
-      return statSync24(join44(projectsDir, name, file)).isFile();
+      return statSync25(join46(projectsDir, name, file)).isFile();
     } catch {
       return false;
     }
@@ -55390,7 +56988,7 @@ function legacyProjectIds(projectsDir) {
   return projectIdsWithFile(projectsDir, "ui.db");
 }
 function retiredLegacyProjectIds(projectsDir) {
-  return projectIdsWithFile(projectsDir, "ui.db.imported").filter((id) => !existsSync17(join44(projectsDir, id, "ui.db")));
+  return projectIdsWithFile(projectsDir, "ui.db.imported").filter((id) => !existsSync18(join46(projectsDir, id, "ui.db")));
 }
 function tableColumns(db, schema, table) {
   return db.prepare(`PRAGMA ${schema}.table_info(${table})`).all().map((c) => c.name);
@@ -55546,7 +57144,7 @@ var init_tenant_prime = __esm({
 // packages/server/src/project-teardown.ts
 import { rmSync as rmSync13 } from "node:fs";
 import { homedir as homedir19 } from "node:os";
-import { dirname as dirname23, resolve as resolve10 } from "node:path";
+import { dirname as dirname24, resolve as resolve10 } from "node:path";
 async function stopProjectWorkers(ctx) {
   let stopped = 0;
   for (const row of ctx.storage.allSessions()) {
@@ -55566,7 +57164,7 @@ function deleteProjectState(projectId, home = homedir19()) {
   if (!/^[\w.-]+$/u.test(projectId) || projectId === "." || projectId === "..") {
     throw new Error(`Refusing to delete state for a malformed project id: ${projectId}`);
   }
-  if (dirname23(resolve10(target)) !== resolve10(dirname23(projectStateDir("x", home)))) {
+  if (dirname24(resolve10(target)) !== resolve10(dirname24(projectStateDir("x", home)))) {
     throw new Error(`Refusing to delete ${target} \u2014 it is not a project state directory`);
   }
   rmSync13(target, { recursive: true, force: true });
@@ -55595,11 +57193,11 @@ __export(index_exports, {
   unknownProjectPage: () => unknownProjectPage
 });
 import { createServer } from "node:http";
-import { readFileSync as readFileSync32, existsSync as existsSync18, statSync as statSync25 } from "node:fs";
-import { dirname as dirname24, join as join45, resolve as resolve11, extname as extname4, posix as posix2, sep as sep6 } from "node:path";
+import { readFileSync as readFileSync33, existsSync as existsSync19, statSync as statSync26 } from "node:fs";
+import { dirname as dirname25, join as join47, resolve as resolve11, extname as extname4, posix as posix2, sep as sep6 } from "node:path";
 function readServerAddressHolder(path3) {
   try {
-    const value = JSON.parse(readFileSync32(path3, "utf8"));
+    const value = JSON.parse(readFileSync33(path3, "utf8"));
     if (typeof value?.pid !== "number") return void 0;
     return { pid: value.pid, port: typeof value.port === "number" ? value.port : -1 };
   } catch {
@@ -55724,12 +57322,12 @@ function staticIsFresh(req, etag, mtimeMs) {
 }
 function serveStatic(distDir, req, res) {
   const rel = posix2.normalize((req.url ?? "/").split("?")[0].replace(/\\/g, "/")).replace(/^(\.\.[/\\])+/, "");
-  let file = join45(distDir, rel === "/" ? "index.html" : rel);
-  if (!file.startsWith(distDir + sep6)) file = join45(distDir, "index.html");
-  if (!existsSync18(file)) file = join45(distDir, "index.html");
+  let file = join47(distDir, rel === "/" ? "index.html" : rel);
+  if (!file.startsWith(distDir + sep6)) file = join47(distDir, "index.html");
+  if (!existsSync19(file)) file = join47(distDir, "index.html");
   try {
-    const stats = statSync25(file);
-    const cacheControl = file.startsWith(join45(distDir, "assets") + sep6) ? STATIC_CACHE_IMMUTABLE : STATIC_CACHE_REVALIDATE;
+    const stats = statSync26(file);
+    const cacheControl = file.startsWith(join47(distDir, "assets") + sep6) ? STATIC_CACHE_IMMUTABLE : STATIC_CACHE_REVALIDATE;
     const etag = `"${stats.size.toString(16)}-${Math.trunc(stats.mtimeMs).toString(16)}"`;
     const headers = {
       "content-type": MIME[extname4(file)] ?? "application/octet-stream",
@@ -55745,7 +57343,7 @@ function serveStatic(distDir, req, res) {
       res.end();
       return;
     }
-    let body = readFileSync32(file);
+    let body = readFileSync33(file);
     const accept = req.headers["accept-encoding"];
     const encoding = negotiateEncoding(Array.isArray(accept) ? accept.join(",") : accept);
     if (encoding && shouldCompress(new Headers({ "content-type": headers["content-type"] }), body.byteLength)) {
@@ -56007,7 +57605,7 @@ async function startServer(opts = {}) {
       if (statusPath && statusIdentity) runtime.removeStatus(statusPath, statusIdentity);
       if (statusPath && statusIdentity) {
         try {
-          runtime.removeStatus(serverAddressPathForStateDir(dirname24(statusPath)), statusIdentity);
+          runtime.removeStatus(serverAddressPathForStateDir(dirname25(statusPath)), statusIdentity);
         } catch {
         }
       }
@@ -56145,7 +57743,7 @@ async function startServer(opts = {}) {
     }
     statusPath = serverLockPathFor(ctx.project);
     const webRoot = resolve11(import.meta.dirname, "..", "..", "web");
-    const distDir = opts.webDistDir ? resolve11(opts.webDistDir) : join45(webRoot, "dist");
+    const distDir = opts.webDistDir ? resolve11(opts.webDistDir) : join47(webRoot, "dist");
     startupPhase = "Vite";
     if (opts.dev) {
       try {
@@ -56221,7 +57819,7 @@ async function startServer(opts = {}) {
       if (vite) {
         vite.middlewares(req, res, () => {
           try {
-            const html = readFileSync32(join45(webRoot, "index.html"), "utf8");
+            const html = readFileSync33(join47(webRoot, "index.html"), "utf8");
             void vite.transformIndexHtml(url, html).then((out) => {
               res.writeHead(200, { "content-type": "text/html" });
               res.end(out);
@@ -56233,7 +57831,7 @@ async function startServer(opts = {}) {
         });
         return;
       }
-      if (existsSync18(distDir)) {
+      if (existsSync19(distDir)) {
         serveStatic(distDir, req, res);
         return;
       }
@@ -56431,7 +58029,7 @@ var init_index = __esm({
       }
     };
     isApiUrl = (url) => url === FRIZZ_ROUTE_PREFIX || url.startsWith(`${FRIZZ_ROUTE_PREFIX}/`);
-    serverLockPathFor = (project) => join45(project.stateDir, "server.lock");
+    serverLockPathFor = (project) => join47(project.stateDir, "server.lock");
     MIME = {
       ".html": "text/html",
       ".js": "text/javascript",
@@ -56454,8 +58052,8 @@ init_project();
 init_project_launch();
 init_shutdown();
 init_logging();
-import { existsSync as existsSync19 } from "node:fs";
-import { join as join46 } from "node:path";
+import { existsSync as existsSync20 } from "node:fs";
+import { join as join48 } from "node:path";
 
 // packages/server/src/native-helper.ts
 import { chmodSync, statSync as statSync4 } from "node:fs";
@@ -56532,9 +58130,9 @@ try {
       ["FRIZZ_SCRIPTS_DIR", process.env.FRIZZ_SCRIPTS_DIR, "index.mjs"],
       ["FRIZZ_WORKER_PLUGIN_DIR", process.env.FRIZZ_WORKER_PLUGIN_DIR, ".claude-plugin/plugin.json"]
     ];
-    if (!existsSync19(stableWebDist)) throw new Error("stable artifact launch is missing its verified web directory");
+    if (!existsSync20(stableWebDist)) throw new Error("stable artifact launch is missing its verified web directory");
     for (const [name, directory, requiredFile] of required) {
-      if (!directory || !existsSync19(join46(directory, requiredFile)))
+      if (!directory || !existsSync20(join48(directory, requiredFile)))
         throw new Error(`stable artifact launch is missing verified ${name}`);
     }
   }