Merge remote-tracking branch 'origin/main' into fix/zh-cn-untranslated-labels-1

# Conflicts:
#	packages/app/src/i18n/resources/zh-CN.ts

packages/app/e2e/browser/composer-whitespace.spec.ts

@@ -87,19 +87,6 @@ test("blank composer lines remain present and keep their measured height", async
     const blankLines = "\n\n\n\n\n";
     const collapsedHeight = await composerHeight(page);
 
-    await test.step("remeasure the current draft when the window narrows", async () => {
-      await page.setViewportSize({ width: 1280, height: 1200 });
-      const text = "A sentence that wraps when the editor becomes narrower. ".repeat(8);
-      await composer.fill(text);
-      await expect(composer).toHaveValue(text);
-      await expect.poll(() => composerHeight(page)).toBeGreaterThan(collapsedHeight);
-      const wideHeight = await composerHeight(page);
-      await page.setViewportSize({ width: 480, height: 1200 });
-      await expect.poll(() => composerHeight(page)).toBeGreaterThan(wideHeight);
-      await expect(composer).toHaveValue(text);
-      await page.setViewportSize({ width: 1280, height: 720 });
-    });
-
     await test.step("grow the composer with blank lines followed by text", async () => {
       await composer.fill(`${blankLines}x`);
       await expect(composer).toHaveValue(`${blankLines}x`);
@@ -123,6 +110,18 @@ test("blank composer lines remain present and keep their measured height", async
       await expect(composer).toHaveValue("alpha\nbeta\nx");
       expect(filledTrailingLineHeight).toBe(trailingLineHeight);
     });
+
+    await test.step("remeasure the current draft when the window narrows", async () => {
+      await page.setViewportSize({ width: 1280, height: 1200 });
+      const text = "A sentence that wraps when the editor becomes narrower. ".repeat(8);
+      await composer.fill(text);
+      await expect(composer).toHaveValue(text);
+      await expect.poll(() => composerHeight(page)).toBeGreaterThan(collapsedHeight);
+      const wideHeight = await composerHeight(page);
+      await page.setViewportSize({ width: 480, height: 1200 });
+      await expect.poll(() => composerHeight(page)).toBeGreaterThan(wideHeight);
+      await expect(composer).toHaveValue(text);
+    });
   } finally {
     await agent.cleanup();
   }

packages/app/e2e/browser/plugin-sidebar-items.spec.ts

@@ -241,32 +241,6 @@ test.describe("Plugin sidebar items", () => {
     });
   });
 
-  test("a plugin screen toggles the sidebar on a wide layout", async ({ page }) => {
-    await page.setViewportSize(WIDE);
-    await gotoWorkspace(page, workspaceId);
-    const row = headerRow(page, SHOWCASE_PLUGIN_ID, "deploys");
-    await expect(row).toBeVisible({ timeout: 30_000 });
-
-    await row.click();
-    await expect(page.getByText("Deploys screen body", { exact: true })).toBeVisible();
-    await visibleTestId(page, "menu-button").click();
-    await expect(row).not.toBeVisible();
-    await visibleTestId(page, "menu-button").click();
-    await expect(row).toBeVisible();
-    await closeScreen(page);
-
-    // With the sidebar closed elsewhere, the screen's own toggle is the way back to it.
-    await visibleTestId(page, "menu-button").click();
-    await expect(row).not.toBeVisible();
-    await page.keyboard.press("Control+k");
-    const panel = page.getByTestId("command-center-panel");
-    await panel.getByTestId("command-center-input").fill("Open deploys");
-    await panel.getByRole("button", { name: "Open deploys", exact: true }).click();
-    await expect(page.getByText("Deploys screen body", { exact: true })).toBeVisible();
-    await visibleTestId(page, "menu-button").click();
-    await expect(row).toBeVisible();
-  });
-
   test("a header row's shortcut hint presses the row", async ({ page }) => {
     await page.setViewportSize(WIDE);
     await gotoWorkspace(page, workspaceId);

packages/app/e2e/browser/question-prompt-pagination.spec.ts

@@ -7,7 +7,6 @@ import {
   expectQuestionDismissEnabled,
   expectQuestionHidden,
   expectQuestionNavigationEnabled,
-  expectQuestionOptionPreview,
   expectQuestionOptionSelected,
   expectQuestionPrimaryActionDisabled,
   expectQuestionPrimaryActionEnabled,
@@ -62,10 +61,6 @@ test.describe("Question prompt pagination", () => {
       await expectQuestionOptionSelected(page, "App");
 
       await openQuestion(page, { index: 2, total: TOTAL_QUESTIONS });
-      await expectQuestionOptionPreview(page, {
-        option: "Behind feature flag",
-        preview: 'flags.enabled("new-surface")',
-      });
       await chooseQuestionOption(page, "Behind feature flag");
       await expectCurrentQuestion(page, {
         index: 3,

packages/app/e2e/browser/settings-i18n.spec.ts

@@ -15,6 +15,13 @@ test("Settings language selector switches General labels", async ({ page }) => {
   await page.getByRole("menuitem", { name: "简体中文 - Simplified Chinese", exact: true }).click();
 
   await expect(page.getByText("默认发送", { exact: true }).first()).toBeVisible();
+  await expect(page.getByText(/智能体运行时，Enter/).first()).toBeVisible();
+  const screenshotPath = test.info().outputPath("simplified-chinese-settings.png");
+  await page.screenshot({ path: screenshotPath, fullPage: true });
+  await test.info().attach("simplified-chinese-settings", {
+    path: screenshotPath,
+    contentType: "image/png",
+  });
 
   await page.getByRole("button", { name: "简体中文", exact: true }).click();
   await page.getByRole("menuitem", { name: "English - 英语", exact: true }).click();

packages/app/e2e/mobile/agent-device/native-question-option-preview-preconditions.md

@@ -1,7 +0,0 @@
-# Native question option preview
-
-`native-question-option-preview.android.ad` checks that every line of a long option preview is reachable on Android. Before replay, open a mock agent prompted with `emit synthetic questions` so its question card shows the first question, on a phone-sized emulator (validated on a 1080×1920 API 35 AVD). The flow opens the `rollout` question, drags slowly up from inside the "Behind feature flag" preview, and asserts the preview's last line is visible.
-
-```sh
-agent-device replay packages/app/e2e/mobile/agent-device/native-question-option-preview.android.ad --platform android --serial emulator-5554
-```

packages/app/e2e/mobile/agent-device/native-question-option-preview.android.ad

@@ -1,10 +0,0 @@
-context platform=android timeout=60000 retries=0
-env APP_ID=sh.paseo.debug
-
-open "${APP_ID}"
-wait "label=\"rollout\"" 20000
-press "label=\"rollout\""
-wait "id=\"question-form-option-preview\"" 10000
-gesture pan 570 1120 0 -440 600
-is visible "text=\"// LAST PREVIEW LINE\""
-close

packages/app/e2e/support/helpers/questions.ts

@@ -43,15 +43,6 @@ export async function expectQuestionOptionSelected(page: Page, option: string):
   await expect(questionOption(page, option)).toHaveAttribute("aria-checked", "true");
 }
 
-export async function expectQuestionOptionPreview(
-  page: Page,
-  input: { option: string; preview: string },
-): Promise<void> {
-  await expect(
-    questionOption(page, input.option).getByTestId("question-form-option-preview"),
-  ).toContainText(input.preview);
-}
-
 export async function openQuestion(
   page: Page,
   input: { index: number; total: number },

packages/app/src/agent-controls/labels.test.ts

@@ -29,15 +29,4 @@ describe("formatThinkingOptionLabel", () => {
     expect(formatThinkingOptionLabel({ id: "think-hard", label: "think-hard" })).toBe("Think hard");
     expect(formatThinkingOptionLabel({ id: "xhigh", label: "XHigh" })).toBe("Extra high");
   });
-
-  it("preserves provider-supplied xhigh labels with extra detail", () => {
-    expect(formatThinkingOptionLabel({ id: "xhigh", label: "XHigh (56 | 8m)" })).toBe(
-      "X high (56 | 8m)",
-    );
-    expect(formatThinkingOptionLabel({ id: "xhigh", label: "XHigh (45 | 6m)" })).toBe(
-      "X high (45 | 6m)",
-    );
-    expect(formatThinkingOptionLabel({ id: "xhigh" })).toBe("Extra high");
-    expect(formatThinkingOptionLabel({ id: "xhigh", label: "Extra high" })).toBe("Extra high");
-  });
 });

packages/app/src/agent-controls/labels.ts

@@ -34,9 +34,10 @@ export function formatAgentModeLabel(mode: ControlLabelInput): string {
 
 export function formatThinkingOptionLabel(option: ControlLabelInput): string {
   const rawLabel = (option.label ?? option.id).trim();
+  const compactId = option.id.replace(/[\s_-]+/g, "").toLowerCase();
   const compactLabel = rawLabel.replace(/[\s_-]+/g, "").toLowerCase();
 
-  if (compactLabel === "xhigh" || compactLabel === "extrahigh") {
+  if (compactId === "xhigh" || compactLabel === "xhigh") {
     return i18n.t("agentControls.thinking.extraHigh");
   }
 

packages/app/src/components/question-form-card-core.test.ts

@@ -147,29 +147,4 @@ describe("question form card core", () => {
       Response: "custom",
     });
   });
-
-  test("keeps option previews so options can be compared", () => {
-    const questions = parseQuestionFormQuestions({
-      questions: [
-        {
-          question: "Which layout?",
-          header: "Layout",
-          options: [
-            {
-              label: "Tabs",
-              description: "One tab per section",
-              preview: "<Tabs>\n  <Tab />\n</Tabs>",
-            },
-            { label: "Single page" },
-          ],
-          multiSelect: false,
-        },
-      ],
-    });
-
-    expect(questions?.[0]?.options).toEqual([
-      { label: "Tabs", description: "One tab per section", preview: "<Tabs>\n  <Tab />\n</Tabs>" },
-      { label: "Single page", description: undefined, preview: undefined },
-    ]);
-  });
 });

packages/app/src/components/question-form-card-core.ts

@@ -1,7 +1,6 @@
 export interface QuestionOption {
   label: string;
   description?: string;
-  preview?: string;
 }
 
 export interface QuestionFormQuestion {
@@ -47,7 +46,6 @@ export function parseQuestionFormQuestions(input: unknown): QuestionFormQuestion
       options.push({
         label: o.label,
         description: typeof o.description === "string" ? o.description : undefined,
-        preview: readOptionalString(o, "preview"),
       });
     }
     questions.push({

packages/app/src/components/question-form-card.tsx

@@ -10,7 +10,6 @@ import type { AgentPermissionResponse } from "@getpaseo/protocol/agent-types";
 import { isWeb } from "@/constants/platform";
 import { EditingTextInput as TextInput } from "@/components/ui/text-input";
 import type { EditingTextInputHandle } from "@/components/ui/text-input/types";
-import { ScrollableCodeSurface } from "@/components/ui/scrollable-code-surface";
 import {
   areQuestionsAnswered,
   buildQuestionFormAnswers,
@@ -30,9 +29,6 @@ interface QuestionFormCardProps {
 }
 
 const IS_WEB = isWeb;
-// Native previews are uncapped: inside the option's Pressable, Android never hands a
-// drag to the preview's nested scroll, so lines past a cap would be unreachable.
-const OPTION_PREVIEW_MAX_HEIGHT = IS_WEB ? 240 : undefined;
 
 function getQuestionInputPlaceholder({
   question,
@@ -137,20 +133,6 @@ function QuestionOptionRow({
           {option.description ? (
             <Text style={optionDescriptionStyle}>{option.description}</Text>
           ) : null}
-          {option.preview ? (
-            // Shown for every option at once so they can be compared before picking.
-            // Long lines wrap, as in Claude Code, since most previews are prose.
-            <ScrollableCodeSurface
-              tone="surface0"
-              maxHeight={OPTION_PREVIEW_MAX_HEIGHT}
-              horizontal={false}
-              selectable={false}
-              textStyle={styles.optionPreviewText}
-              testID="question-form-option-preview"
-            >
-              {option.preview}
-            </ScrollableCodeSurface>
-          ) : null}
         </View>
       </View>
     </Pressable>
@@ -722,10 +704,6 @@ const styles = StyleSheet.create((theme) => ({
     fontSize: theme.fontSize.base,
     lineHeight: 20,
   },
-  optionPreviewText: {
-    lineHeight: 20,
-    ...(isWeb ? { whiteSpace: "pre-wrap", overflowWrap: "break-word" } : null),
-  },
   selectionControl: {
     width: 18,
     height: 18,

packages/app/src/desktop/updates/desktop-app-updater.test.ts

@@ -474,7 +474,7 @@ describe("formatStatusText", () => {
           formatVersion,
           formatLastCheckedAt,
         }),
-      ).toBe("正在检查 app 更新...");
+      ).toBe("正在检查应用更新...");
       expect(
         formatStatusText({
           status: "available",

packages/app/src/git/policy.test.ts

@@ -755,13 +755,13 @@ describe("git-actions-policy", () => {
 
     expect(actions.primary).toMatchObject({
       id: "pull",
-      label: "Pull",
-      pendingLabel: "正在 pull...",
-      successLabel: "已 pull",
+      label: "拉取",
+      pendingLabel: "正在拉取...",
+      successLabel: "已拉取",
     });
     expect(actions.secondary.find((entry) => entry.id === "pr")).toMatchObject({
       label: "创建 PR",
-      unavailableMessage: "无法创建 PR，因为此分支还没有新的 commit",
+      unavailableMessage: "无法创建 PR，因为此分支还没有新的提交",
     });
   });
 

packages/app/src/i18n/resources.test.ts

@@ -168,6 +168,32 @@ describe("translation resources", () => {
     expect(countMatchingEnglishStrings(zhCN)).toBeLessThan(maxFallbackStrings);
   });
 
+  it("limits Chinese English matches to names, identifiers, and command examples", () => {
+    const englishStrings = flattenStrings(en);
+    const chineseStrings = flattenStrings(zhCN);
+    const matchingKeys = Object.entries(englishStrings)
+      .filter(([key, value]) => chineseStrings[key] === value)
+      .map(([key]) => key)
+      .sort();
+
+    expect(matchingKeys).toEqual(
+      [
+        "sidebar.help.discord",
+        "sidebar.help.appName",
+        "desktop.daemon.status.pid",
+        "settings.general.language.options.en",
+        "settings.appearance.theme.options.zinc",
+        "settings.appearance.theme.options.midnight",
+        "settings.appearance.theme.options.claude",
+        "settings.appearance.theme.options.ghostty",
+        "settings.host.appearance.preview.workspaceName",
+        "settings.host.terminalProfiles.namePlaceholder",
+        "settings.host.terminalProfiles.commandPlaceholder",
+        "settings.host.terminalProfiles.argsPlaceholder",
+      ].sort(),
+    );
+  });
+
   it("localizes the pull request empty state in every supported language", () => {
     for (const resource of [ar, es, fr, ja, ko, ptBR, ru, zhCN]) {
       expect(resource.panels.pullRequest.emptyTitle).not.toBe(en.panels.pullRequest.emptyTitle);
@@ -177,6 +203,28 @@ describe("translation resources", () => {
     }
   });
 
+  it("distinguishes Git stashing from staging in Chinese action and restore guidance", () => {
+    const unavailable = zhCN.workspace.git.actions.unavailable;
+    const branchSwitcher = zhCN.branchSwitcher;
+    const stashGuidance = [
+      unavailable.pullDirty,
+      unavailable.pullAndPushDirty,
+      unavailable.mergeDirty,
+      unavailable.updateDirty,
+      branchSwitcher.uncommittedMessage,
+      branchSwitcher.stashAndSwitch,
+      branchSwitcher.failedToStash,
+      branchSwitcher.restoreStashTitle,
+      branchSwitcher.restoreStashMessage,
+      branchSwitcher.stashRestored,
+    ];
+
+    for (const label of stashGuidance) {
+      expect(label).toContain("贮藏（stash）");
+      expect(label).not.toContain("暂存");
+    }
+  });
+
   it("preserves interpolation placeholders in every language", () => {
     expect(findInterpolationMismatches(ar)).toEqual([]);
     expect(findInterpolationMismatches(es)).toEqual([]);
@@ -214,7 +262,7 @@ describe("translation resources", () => {
     expect(ja.settings.providers.models.many).toBe("{{count}}つのモデル");
     expect(ptBR.settings.providers.models.many).toBe("{{count}} modelos");
     expect(ru.settings.providers.models.many).toBe("{{count}} моделей");
-    expect(zhCN.settings.providers.models.many).toBe("{{count}} 个 Model");
+    expect(zhCN.settings.providers.models.many).toBe("{{count}} 个模型");
   });
 
   it("preserves reviewed Korean status labels", () => {

packages/app/src/i18n/resources/plugin-settings.ts

@@ -396,7 +396,15 @@ export const pluginSettings = {
     },
   },
   "zh-CN": {
-    ...shared,
+    logs: {
+      action: "日志",
+      title: "日志：{{id}}",
+      loading: "正在加载日志…",
+      refresh: "刷新",
+      refreshing: "正在刷新…",
+      errorTitle: "无法加载插件日志",
+      empty: "暂无插件输出",
+    },
     screens: {
       open: "打开",
       offline: "连接到此主机以打开插件设置。",

packages/app/src/panels/agent-panel-descriptor.test.tsx

@@ -56,12 +56,12 @@ describe("buildDraftPanelDescriptor", () => {
     });
 
     expect(idleDescriptor).toMatchObject({
-      label: "新建 Agent",
-      subtitle: "新建 Agent",
+      label: "新建智能体",
+      subtitle: "新建智能体",
     });
     expect(creatingDescriptor).toMatchObject({
-      label: "新建 Agent",
-      subtitle: "正在创建 Agent",
+      label: "新建智能体",
+      subtitle: "正在创建智能体",
     });
     await i18n.changeLanguage("en");
   });

packages/app/src/plugins/surface-screen.tsx

@@ -8,7 +8,6 @@ import { StyleSheet, withUnistyles } from "react-native-unistyles";
 import { HeaderIconBadge } from "@/components/headers/header-icon-badge";
 import { HeaderToggleButton } from "@/components/headers/header-toggle-button";
 import { CompactHeader } from "@/components/headers/compact-header";
-import { SidebarMenuToggle } from "@/components/headers/sidebar-menu-toggle";
 import { ScreenHeader } from "@/components/headers/screen-header";
 import { ScreenTitle } from "@/components/headers/screen-title";
 import { HostFilter } from "@/components/hosts/host-filter";
@@ -173,7 +172,6 @@ export function PluginSurfaceScreen() {
   const headerLeft = useMemo(
     () => (
       <>
-        <SidebarMenuToggle />
         {Icon ? (
           <HeaderIconBadge>
             <ThemedPluginHeaderIcon Icon={Icon} uniProps={mutedColorMapping} />

packages/app/src/provider-selection/provider-selection.test.ts

@@ -428,7 +428,7 @@ describe("combined model selector data", () => {
           workspaceDirectory: "/repo",
           hasClient: true,
         }),
-      ).toEqual({ ok: false, reason: "初始 prompt 必填" });
+      ).toEqual({ ok: false, reason: "初始提示词必填" });
     } finally {
       await i18n.changeLanguage("en");
     }

packages/cli/src/commands/agent/ls.test.ts

@@ -1,60 +1,5 @@
 import { describe, expect, it } from "vitest";
-import type { AgentSnapshotPayload } from "@getpaseo/protocol/messages";
-import { buildAgentLsFetchOptions, listAgents } from "./ls.js";
-
-const daemonTarget = { kind: "endpoint" as const, host: "example.test:12345" };
-
-function createPagingClient() {
-  const daemonAgents: AgentSnapshotPayload[] = [3, 2, 1].map((n) => ({
-    id: `${n}${n}${n}${n}${n}${n}${n}${n}-0000-4000-8000-000000000000`,
-    provider: "codex",
-    title: `agent ${n}`,
-    status: "closed",
-    archivedAt: null,
-    cwd: "/tmp/project",
-    createdAt: `2026-10-0${n}T00:00:00.000Z`,
-    updatedAt: `2026-10-0${n}T00:00:00.000Z`,
-    labels: {},
-    model: null,
-    lastUserMessageAt: null,
-    currentModeId: null,
-    availableModes: [],
-    pendingPermissions: [],
-    persistence: null,
-    capabilities: {
-      supportsStreaming: true,
-      supportsSessionPersistence: true,
-      supportsDynamicModes: false,
-      supportsMcpServers: true,
-      supportsReasoningStream: true,
-      supportsToolInvocations: true,
-    },
-  }));
-
-  // The fake daemon pages two agents at a time, newest first by the requested key
-  // (updated_at by default), and agent 1 is updated right after the first page is served.
-  const fetchAgents = async (options?: {
-    sort?: { key: string }[];
-    page?: { cursor?: string };
-  }) => {
-    const key: "createdAt" | "updatedAt" =
-      options?.sort?.[0]?.key === "created_at" ? "createdAt" : "updatedAt";
-    const cursor = options?.page?.cursor;
-    const ordered = daemonAgents
-      .filter((agent) => cursor === undefined || agent[key] < cursor)
-      .sort((left, right) => right[key].localeCompare(left[key]));
-    const page = ordered.slice(0, 2);
-    const hasMore = ordered.length > 2;
-    if (cursor === undefined) {
-      daemonAgents[2]!.updatedAt = "2026-10-09T00:00:00.000Z";
-    }
-    return {
-      entries: page.map((agent) => ({ agent })),
-      pageInfo: { nextCursor: hasMore ? page[page.length - 1]![key] : null },
-    };
-  };
-  return { fetchAgents, close: async () => {} };
-}
+import { buildAgentLsFetchOptions } from "./ls.js";
 
 describe("buildAgentLsFetchOptions", () => {
   it("fetches active agents by default", () => {
@@ -121,13 +66,3 @@ describe("buildAgentLsFetchOptions", () => {
     });
   });
 });
-
-describe("runLsCommand", () => {
-  it("lists agents on every page, including one updated during the listing", async () => {
-    const result = await listAgents({ daemonTarget, all: true, global: true }, async () =>
-      createPagingClient(),
-    );
-
-    expect(result.data.map((item) => item.name)).toEqual(["agent 3", "agent 2", "agent 1"]);
-  });
-});

packages/cli/src/commands/agent/ls.ts

@@ -165,14 +165,6 @@ export function buildAgentLsFetchOptions(
   return fetchOptions;
 }
 
-interface AgentLsClient {
-  fetchAgents(options?: FetchAgentsOptions): Promise<{
-    entries: { agent: AgentSnapshotPayload }[];
-    pageInfo: { nextCursor: string | null };
-  }>;
-  close(): Promise<void>;
-}
-
 /**
  * Agent ls command semantics:
  * - `paseo agent ls`    → active non-archived agents
@@ -184,16 +176,7 @@ export async function runLsCommand(
   options: AgentLsOptions,
   _command: Command,
 ): Promise<AgentLsResult> {
-  return listAgents(options);
-}
-
-export async function listAgents(
-  options: AgentLsOptions,
-  connect: (
-    options: Parameters<typeof connectToDaemon>[0],
-  ) => Promise<AgentLsClient> = connectToDaemon,
-): Promise<AgentLsResult> {
-  const client = await connect({ target: options.daemonTarget });
+  const client = await connectToDaemon({ target: options.daemonTarget });
 
   try {
     const normalizedThinkingOptionId = options.thinking?.trim();
@@ -206,19 +189,8 @@ export async function listAgents(
     }
 
     const labelFilters = parseLabelFilters(options.label);
-    const fetchOptions = buildAgentLsFetchOptions(options);
-    let agents: AgentSnapshotPayload[] = [];
-    let cursor: string | undefined;
-    // createdAt never changes, so agents cannot move past the cursor while the pages are read.
-    do {
-      const payload = await client.fetchAgents({
-        ...fetchOptions,
-        sort: [{ key: "created_at", direction: "desc" }],
-        page: { limit: 200, ...(cursor ? { cursor } : {}) },
-      });
-      agents.push(...payload.entries.map((entry) => entry.agent));
-      cursor = payload.pageInfo.nextCursor ?? undefined;
-    } while (cursor);
+    const fetchPayload = await client.fetchAgents(buildAgentLsFetchOptions(options));
+    let agents = fetchPayload.entries.map((entry) => entry.agent);
 
     // By default, exclude archived agents. `-a` includes them.
     if (!options.all) {

packages/client/src/daemon-client-relay-e2ee-transport.ts

@@ -1,4 +1,3 @@
-import { MAX_RELAY_WEBSOCKET_MESSAGE_BYTES } from "@getpaseo/protocol/websocket-message-limit";
 import {
   createClientChannel,
   type EncryptedChannel,
@@ -9,11 +8,7 @@ import type {
   DaemonTransportFactory,
   TransportLogger,
 } from "./daemon-client-transport-types.js";
-import {
-  extractRelayMessage,
-  normalizeTransportPayload,
-  messageTooLargeError,
-} from "./daemon-client-transport-utils.js";
+import { extractRelayMessage, normalizeTransportPayload } from "./daemon-client-transport-utils.js";
 
 type OpenHandler = () => void;
 type CloseHandler = (event?: unknown) => void;
@@ -142,13 +137,7 @@ export function createEncryptedTransport(
       if (!channel) {
         throw new Error("Encrypted channel not ready");
       }
-      const payload = normalizeTransportPayload(data);
-      // Reject synchronously so the requesting operation fails without closing the transport.
-      const wireBytes = channel.outboundWireByteLength(payload);
-      if (wireBytes > MAX_RELAY_WEBSOCKET_MESSAGE_BYTES) {
-        throw messageTooLargeError(wireBytes, MAX_RELAY_WEBSOCKET_MESSAGE_BYTES);
-      }
-      void channel.send(payload).catch((error) => {
+      void channel.send(normalizeTransportPayload(data)).catch((error) => {
         emitError(error);
       });
     },

packages/client/src/daemon-client-transport-utils.ts

@@ -133,10 +133,3 @@ export function encodeUtf8String(value: string): Uint8Array {
   }
   return out;
 }
-
-export function messageTooLargeError(size: number, limit: number): Error {
-  const toMiB = (bytes: number) => (bytes / (1024 * 1024)).toFixed(1);
-  return new Error(
-    `Message is too large to send (${toMiB(size)} MiB). The limit is ${toMiB(limit)} MiB, so send fewer or smaller attachments.`,
-  );
-}

packages/client/src/daemon-client.test.ts

@@ -7527,29 +7527,3 @@ test.each([false, true])(
     await send;
   },
 );
-
-test("measures an outbound message in UTF-8 bytes against the daemon's message limit", async () => {
-  const mock = createMockTransport();
-  const client = new DaemonClient({
-    url: "ws://test",
-    clientId: "message_limit_unit_test",
-    transportFactory: () => mock.transport,
-    reconnect: { enabled: false },
-  });
-  clients.push(client);
-  const connectPromise = client.connect();
-  mock.triggerOpen();
-  await connectPromise;
-  const mib = 1024 * 1024;
-
-  // "é" is one UTF-16 unit but two UTF-8 bytes, so this text is ~98 MiB on the wire.
-  void client.sendMessage("agent-1", "é".repeat(49 * mib)).catch(() => undefined);
-  expect(mock.sent).toHaveLength(1);
-
-  // ~60M characters is under the 100 MiB limit; ~120 MiB of UTF-8 is over it.
-  await expect(client.sendMessage("agent-1", "é".repeat(60 * mib))).rejects.toThrow(
-    "Message is too large to send (120.0 MiB). The limit is 100.0 MiB",
-  );
-  expect(mock.sent).toHaveLength(1);
-  expect(client.getConnectionState().status).toBe("connected");
-});

packages/client/src/daemon-client.ts

@@ -1,4 +1,3 @@
-import { messageTooLargeError } from "./daemon-client-transport-utils.js";
 import { legacyUsageIcon } from "./legacy-usage-icons.js";
 import { subscribeTimeline, type TimelineMessage } from "./timeline-subscription/index.js";
 import { ProviderSnapshotUpdates } from "./provider-snapshots/index.js";
@@ -14,7 +13,6 @@ import type { z } from "zod";
 import type { SessionEventSubscription } from "@getpaseo/protocol/messages";
 import type { ClientCapability } from "@getpaseo/protocol/client-capabilities";
 import type { AgentAttentionNotificationPayload } from "@getpaseo/protocol/agent-attention-notification";
-import { MAX_WEBSOCKET_MESSAGE_BYTES } from "@getpaseo/protocol/websocket-message-limit";
 import {
   AgentCreateFailedStatusPayloadSchema,
   AgentCreatedStatusPayloadSchema,
@@ -1134,19 +1132,6 @@ function getTransportFrameSize(frame: string | Uint8Array | ArrayBuffer): number
   return frame.byteLength;
 }
 
-function assertTransportFrameFits(frame: string | Uint8Array | ArrayBuffer): void {
-  if (typeof frame !== "string") {
-    if (frame.byteLength > MAX_WEBSOCKET_MESSAGE_BYTES)
-      throw messageTooLargeError(frame.byteLength, MAX_WEBSOCKET_MESSAGE_BYTES);
-    return;
-  }
-  // UTF-8 needs at most three bytes per UTF-16 unit, so only a string near the limit is measured.
-  if (frame.length * 3 <= MAX_WEBSOCKET_MESSAGE_BYTES) return;
-  const size = new TextEncoder().encode(frame).byteLength;
-  if (size > MAX_WEBSOCKET_MESSAGE_BYTES)
-    throw messageTooLargeError(size, MAX_WEBSOCKET_MESSAGE_BYTES);
-}
-
 function describeInboundTransportFrame(
   frame: unknown,
   rawBytes: Uint8Array | null,
@@ -1782,8 +1767,6 @@ export class DaemonClient {
     if (!this.transport) {
       throw new DaemonConnectionError("Transport not connected");
     }
-    // The daemon closes the connection on an oversized message, and creations resubmit on reconnect.
-    assertTransportFrameFits(frame);
     const isOpen = this.beginTraceSection("paseo.ws.frame.outbound", {
       kind: typeof frame === "string" ? "text" : "binary",
       size: String(getTransportFrameSize(frame)),

packages/protocol/src/websocket-message-limit.ts

@@ -1,5 +0,0 @@
-/** Largest WebSocket message the daemon accepts. A bigger one closes the connection with 1009. */
-export const MAX_WEBSOCKET_MESSAGE_BYTES = 100 * 1024 * 1024;
-
-/** Largest encrypted frame the relay accepts. */
-export const MAX_RELAY_WEBSOCKET_MESSAGE_BYTES = 32 * 1024 * 1024;

packages/server/.env.example

@@ -11,10 +11,9 @@ OPENAI_TTS_BASE_URL=
 
 # TTS Configuration (optional - defaults shown)
 TTS_VOICE=alloy
-# Any voice the server knows: OpenAI ships alloy, echo, fable, onyx, nova, shimmer
+# Available voices: alloy, echo, fable, onyx, nova, shimmer
 TTS_MODEL=tts-1
-# OpenAI ships tts-1 (faster) and tts-1-hd (higher quality); self-hosted
-# servers accept whatever model id they serve. Case sensitive.
+# Available models: tts-1 (faster), tts-1-hd (higher quality)
 
 # Server Configuration
 # Location for runtime state (agents.json, etc.). Defaults to ~/.paseo

packages/server/package.json

@@ -89,7 +89,7 @@
     "speech:transcribe:local": "tsx scripts/transcribe-local-wav.ts",
     "test": "npm run test:unit && npm run test:integration",
     "test:unit": "vitest run --fileParallelism --exclude \"**/*.e2e.test.ts\"",
-    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/daemon-e2e/oversized-message.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\" && vitest run --maxWorkers=1 src/server/daemon-e2e/relay-transport.e2e.test.ts -t \"oversized attachments\"",
+    "test:integration": "vitest run --maxWorkers=1 src/server/daemon-e2e/filesystem.e2e.test.ts src/server/daemon-e2e/file-download.e2e.test.ts src/server/daemon-e2e/cli-logs-follow.e2e.test.ts src/server/creation/creation.e2e.test.ts src/server/daemon-e2e/terminal-workspace-sdk.e2e.test.ts src/server/daemon-e2e/models.e2e.test.ts src/server/daemon-e2e/live-preferences.e2e.test.ts src/server/agent/model-catalog.e2e.test.ts src/server/plugins/plugin-paseo-api.e2e.test.ts && vitest run --maxWorkers=1 src/server/daemon-e2e/git-operations.e2e.test.ts -t \"merges into\" && vitest run --maxWorkers=1 src/server/session.create-agent-worktree-autoarchive.e2e.test.ts -t \"creates a worktree and auto-archives both\" && vitest run --maxWorkers=1 src/server/agent/providers/opencode-bridge.local.e2e.test.ts -t \"versioned runtime\"",
     "test:hub-cli-contract": "vitest run --maxWorkers=1 src/server/hub/hub-cli-contract.test.ts",
     "test:integration:all": "npm run test:e2e",
     "test:integration:real": "vitest run real.e2e.test.ts",

packages/server/src/server/agent/mcp-server.test.ts

@@ -3296,50 +3296,6 @@ describe("create_agent MCP tool", () => {
     );
   });
 
-  it("notifies the caller when a created child finishes its initial turn before the turn start returns", async () => {
-    const workdir = await mkdtemp(join(tmpdir(), "mcp-create-fast-child-"));
-    const storage = new AgentStorage(join(workdir, "agents"), logger);
-    const parentClient = new HeldTurnAgentClient("claude", false);
-    const childClient = new HeldTurnAgentClient("codex", false, { finishTurnsDuringStart: true });
-    const agentManager = new AgentManager({
-      clients: { claude: parentClient, codex: childClient },
-      registry: storage,
-      logger,
-    });
-
-    try {
-      const parent = await agentManager.createAgent(
-        { provider: "claude", cwd: existingCwd },
-        undefined,
-        { workspaceId: "wks_parent" },
-      );
-      const server = await createAgentMcpServer({
-        agentManager,
-        agentStorage: storage,
-        callerAgentId: parent.id,
-        providerSnapshotManager: createOpenCodeManager().manager,
-        logger,
-      });
-
-      const response = await invokeToolWithParsedInput(registeredTool(server, "create_agent"), {
-        ...subagentCurrentWorkspace(),
-        title: "Fast Child",
-        provider: "codex/gpt-5.4",
-        initialPrompt: "Finish immediately",
-      });
-      const childId = z.object({ agentId: z.string() }).parse(response.structuredContent).agentId;
-
-      await vi.waitFor(() => {
-        const parentPrompts = parentClient.sessions[0]!.prompts;
-        expect(parentPrompts).toHaveLength(1);
-        expect(parentPrompts[0]).toContain(childId);
-        expect(parentPrompts[0]).toContain("finished");
-      });
-    } finally {
-      await removeAgentStateDir(agentManager, storage, workdir);
-    }
-  });
-
   it("creates detached caller agents without a parent label", async () => {
     const { agentManager, agentStorage, spies } = createTestDeps();
     spies.agentManager.getAgent.mockReturnValue({
@@ -3814,11 +3770,6 @@ const HELD_TURN_CAPABILITIES = {
   supportsToolInvocations: false,
 } as const;
 
-interface HeldTurnOptions {
-  /** Run the whole turn before the turn-start request returns. */
-  finishTurnsDuringStart?: boolean;
-}
-
 /**
  * Provider session that records every prompt it receives. With `holdTurns`, a started
  * turn stays running until `finishTurn()` so a caller's bounded wait can run out first.
@@ -3835,7 +3786,6 @@ class HeldTurnAgentSession implements AgentSession {
   constructor(
     readonly provider: AgentProvider,
     private readonly holdTurns: boolean,
-    private readonly options: HeldTurnOptions = {},
   ) {}
 
   /** Hold the next turn's acknowledgment, as a provider awaiting its turn-start request does. */
@@ -3869,13 +3819,6 @@ class HeldTurnAgentSession implements AgentSession {
       throw error;
     }
     const turnId = randomUUID();
-    if (this.options.finishTurnsDuringStart) {
-      // The whole turn runs before the turn-start request returns, as a provider whose
-      // start acknowledgment arrives together with the turn's completion does.
-      this.pushEvent({ type: "turn_started", provider: this.provider, turnId });
-      this.pushEvent({ type: "turn_completed", provider: this.provider, turnId });
-      return { turnId };
-    }
     this.activeTurnId = turnId;
     this.pushEvent({
       type: "timeline",
@@ -3983,7 +3926,6 @@ class HeldTurnAgentClient implements AgentClient {
   constructor(
     readonly provider: AgentProvider,
     private readonly holdTurns: boolean,
-    private readonly options: HeldTurnOptions = {},
   ) {}
 
   async isAvailable(): Promise<boolean> {
@@ -3991,7 +3933,7 @@ class HeldTurnAgentClient implements AgentClient {
   }
 
   async createSession(): Promise<AgentSession> {
-    const session = new HeldTurnAgentSession(this.provider, this.holdTurns, this.options);
+    const session = new HeldTurnAgentSession(this.provider, this.holdTurns);
     this.sessions.push(session);
     return session;
   }

packages/server/src/server/agent/providers/claude/agent.ts

@@ -2898,11 +2898,9 @@ class ClaudeAgentSession implements AgentSession {
       this.startFreshConversationSession();
       return;
     }
-    const currentSessionId = this.claudeSessionId;
     await revertClaudeConversation({
       sdk: this.rewindSdk,
-      sessionId: currentSessionId,
-      transcriptPath: currentSessionId ? this.resolveHistoryPath(currentSessionId) : null,
+      sessionId: this.claudeSessionId,
       messageId: target.messageId,
       resolveMessageId: (messageId) => this.resolveClaudeMessageId(messageId),
       setSessionId: (sessionId) => {

packages/server/src/server/agent/providers/claude/rewind.test.ts

@@ -1,15 +1,10 @@
-import { randomUUID } from "node:crypto";
-import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import path from "node:path";
-import { afterEach, describe, expect, test } from "vitest";
+import { describe, expect, test } from "vitest";
 import type { Query } from "@anthropic-ai/claude-agent-sdk";
 
 import {
   revertClaudeConversation,
   revertClaudeConversationAndFiles,
   revertClaudeFiles,
-  realClaudeRewindSdk,
 } from "./rewind.js";
 import { FakeClaudeSdk } from "./test-rewind-claude-sdk.js";
 
@@ -21,7 +16,6 @@ describe("Claude rewind", () => {
     await revertClaudeConversation({
       sdk: claude,
       sessionId,
-      transcriptPath: "/claude/projects/repo/original-session.jsonl",
       messageId: "user-message-1",
       setSessionId: (nextSessionId) => {
         sessionId = nextSessionId;
@@ -39,7 +33,6 @@ describe("Claude rewind", () => {
     await revertClaudeConversation({
       sdk: claude,
       sessionId,
-      transcriptPath: "/claude/projects/repo/original-session.jsonl",
       messageId: "timeline-message-1",
       resolveMessageId: () => "claude-jsonl-message-1",
       setSessionId: (nextSessionId) => {
@@ -83,7 +76,6 @@ describe("Claude rewind", () => {
       sdk: claude,
       query: claude.createQuery() as Query,
       sessionId,
-      transcriptPath: "/claude/projects/repo/original-session.jsonl",
       messageId: "user-message-1",
       setSessionId: (nextSessionId) => {
         sessionId = nextSessionId;
@@ -95,126 +87,3 @@ describe("Claude rewind", () => {
     expect(sessionId).toBe("forked-before-rehydrate");
   });
 });
-
-interface TranscriptLine {
-  type: "user" | "assistant";
-  uuid: string;
-  parentUuid: string | null;
-  text: string;
-}
-
-function writeTranscript(
-  transcriptPath: string,
-  sessionId: string,
-  lines: Array<TranscriptLine | string>,
-): void {
-  const entries = lines.map((line) => {
-    if (typeof line === "string") return line;
-    const { type, uuid, parentUuid, text } = line;
-    return JSON.stringify({
-      type,
-      uuid,
-      parentUuid,
-      sessionId,
-      cwd: "/repo",
-      timestamp: new Date().toISOString(),
-      message: { role: type, content: text },
-    });
-  });
-  writeFileSync(transcriptPath, `${entries.join("\n")}\n`, "utf8");
-}
-
-function readMessageTexts(transcriptPath: string): string[] {
-  const entries = readFileSync(transcriptPath, "utf8")
-    .trim()
-    .split("\n")
-    .map((line) => JSON.parse(line) as { message?: { content: string } });
-  return entries.flatMap((entry) => (entry.message ? [entry.message.content] : []));
-}
-
-describe("Claude rewind against the Claude SDK", () => {
-  let tempRoot: string | null = null;
-  const previousConfigDir = process.env.CLAUDE_CONFIG_DIR;
-
-  afterEach(() => {
-    if (tempRoot) rmSync(tempRoot, { recursive: true, force: true });
-    tempRoot = null;
-    if (previousConfigDir === undefined) {
-      delete process.env.CLAUDE_CONFIG_DIR;
-    } else {
-      process.env.CLAUDE_CONFIG_DIR = previousConfigDir;
-    }
-  });
-
-  test("forks a session that lives in a provider's own CLAUDE_CONFIG_DIR", async () => {
-    tempRoot = mkdtempSync(path.join(tmpdir(), "claude-rewind-config-dir-"));
-    // The provider sets CLAUDE_CONFIG_DIR for Claude Code; the daemon's own environment does not.
-    delete process.env.CLAUDE_CONFIG_DIR;
-    const projectDir = path.join(tempRoot, "custom-claude-dir", "projects", "-repo");
-    mkdirSync(projectDir, { recursive: true });
-    const sessionId = randomUUID();
-    const firstUser = randomUUID();
-    const firstReply = randomUUID();
-    const secondUser = randomUUID();
-    const transcriptPath = path.join(projectDir, `${sessionId}.jsonl`);
-    writeTranscript(transcriptPath, sessionId, [
-      { type: "user", uuid: firstUser, parentUuid: null, text: "first" },
-      { type: "assistant", uuid: firstReply, parentUuid: firstUser, text: "first reply" },
-      { type: "user", uuid: secondUser, parentUuid: firstReply, text: "second" },
-      { type: "assistant", uuid: randomUUID(), parentUuid: secondUser, text: "second reply" },
-    ]);
-    let currentSessionId = sessionId;
-
-    await revertClaudeConversation({
-      sdk: realClaudeRewindSdk,
-      sessionId,
-      transcriptPath,
-      messageId: firstReply,
-      setSessionId: (nextSessionId) => {
-        currentSessionId = nextSessionId;
-      },
-    });
-
-    expect(currentSessionId).not.toBe(sessionId);
-    expect(readMessageTexts(path.join(projectDir, `${currentSessionId}.jsonl`))).toEqual([
-      "first",
-      "first reply",
-    ]);
-  });
-
-  test("skips transcript lines that are not entries when forking", async () => {
-    tempRoot = mkdtempSync(path.join(tmpdir(), "claude-rewind-config-dir-"));
-    delete process.env.CLAUDE_CONFIG_DIR;
-    const projectDir = path.join(tempRoot, "custom-claude-dir", "projects", "-repo");
-    mkdirSync(projectDir, { recursive: true });
-    const sessionId = randomUUID();
-    const firstUser = randomUUID();
-    const firstReply = randomUUID();
-    const transcriptPath = path.join(projectDir, `${sessionId}.jsonl`);
-    writeTranscript(transcriptPath, sessionId, [
-      "null",
-      { type: "user", uuid: firstUser, parentUuid: null, text: "first" },
-      "[1, 2]",
-      '"text"',
-      "{}",
-      { type: "assistant", uuid: firstReply, parentUuid: firstUser, text: "first reply" },
-      { type: "user", uuid: randomUUID(), parentUuid: firstReply, text: "second" },
-    ]);
-    let currentSessionId = sessionId;
-
-    await revertClaudeConversation({
-      sdk: realClaudeRewindSdk,
-      sessionId,
-      transcriptPath,
-      messageId: firstReply,
-      setSessionId: (nextSessionId) => {
-        currentSessionId = nextSessionId;
-      },
-    });
-
-    expect(readMessageTexts(path.join(projectDir, `${currentSessionId}.jsonl`))).toEqual([
-      "first",
-      "first reply",
-    ]);
-  });
-});

packages/server/src/server/agent/providers/claude/rewind.ts

@@ -1,90 +1,29 @@
-import { appendFile, readFile } from "node:fs/promises";
-import path from "node:path";
-import {
-  forkSession as claudeForkSession,
-  type Query,
-  type SessionStore,
-  type SessionStoreEntry,
-} from "@anthropic-ai/claude-agent-sdk";
+import { forkSession as claudeForkSession, type Query } from "@anthropic-ai/claude-agent-sdk";
 
 export interface ClaudeRewindSdk {
   forkSession(
     sessionId: string,
-    options: { upToMessageId: string; transcriptPath: string },
+    options: { upToMessageId: string },
   ): Promise<{ sessionId: string }>;
 }
 
-// On its own, the SDK looks for the session under the daemon's CLAUDE_CONFIG_DIR, while a
-// provider can point Claude Code at another one. Forking through a store rooted at the
-// transcript's folder reads the session where Claude Code wrote it and writes the fork beside it.
 export const realClaudeRewindSdk: ClaudeRewindSdk = {
-  forkSession: (sessionId, options) =>
-    claudeForkSession(sessionId, {
-      upToMessageId: options.upToMessageId,
-      sessionStore: projectFolderSessionStore(path.dirname(options.transcriptPath)),
-    }),
+  forkSession: claudeForkSession,
 };
 
-function projectFolderSessionStore(projectFolder: string): SessionStore {
-  const transcriptPath = (sessionId: string) => path.join(projectFolder, `${sessionId}.jsonl`);
-  return {
-    async load({ sessionId }) {
-      let text: string;
-      try {
-        text = await readFile(transcriptPath(sessionId), "utf8");
-      } catch (error) {
-        if ((error as NodeJS.ErrnoException).code === "ENOENT") return null;
-        throw error;
-      }
-      return parseTranscriptEntries(text);
-    },
-    async append({ sessionId }, entries) {
-      const lines = entries.map((entry) => `${JSON.stringify(entry)}\n`).join("");
-      await appendFile(transcriptPath(sessionId), lines, "utf8");
-    },
-  };
-}
-
-function parseTranscriptEntries(text: string): SessionStoreEntry[] {
-  const entries: SessionStoreEntry[] = [];
-  for (const line of text.split("\n")) {
-    if (!line.trim()) continue;
-    let parsed: unknown;
-    try {
-      parsed = JSON.parse(line);
-    } catch {
-      // Skip a line that is not JSON, as the SDK's own transcript reader does.
-      continue;
-    }
-    if (isSessionStoreEntry(parsed)) entries.push(parsed);
-  }
-  return entries;
-}
-
-function isSessionStoreEntry(value: unknown): value is SessionStoreEntry {
-  return (
-    typeof value === "object" &&
-    value !== null &&
-    !Array.isArray(value) &&
-    typeof (value as { type?: unknown }).type === "string"
-  );
-}
-
 export async function revertClaudeConversation(input: {
   sdk: ClaudeRewindSdk;
   sessionId: string | null;
-  transcriptPath: string | null;
   messageId: string;
   resolveMessageId?: (messageId: string) => string | Promise<string>;
   setSessionId: (sessionId: string) => void;
 }): Promise<void> {
-  if (!input.sessionId || !input.transcriptPath) {
+  if (!input.sessionId) {
     throw new Error("Claude session is not ready for rewind");
   }
   const messageId = (await input.resolveMessageId?.(input.messageId)) ?? input.messageId;
   const fork = await input.sdk.forkSession(input.sessionId, {
     upToMessageId: messageId,
-    transcriptPath: input.transcriptPath,
   });
   input.setSessionId(fork.sessionId);
 }
@@ -105,7 +44,6 @@ export async function revertClaudeConversationAndFiles(input: {
   sdk: ClaudeRewindSdk;
   query: Query;
   sessionId: string | null;
-  transcriptPath: string | null;
   messageId: string;
   resolveMessageId?: (messageId: string) => string | Promise<string>;
   setSessionId: (sessionId: string) => void;

packages/server/src/server/agent/providers/claude/test-rewind-claude-sdk.ts

@@ -12,7 +12,7 @@ export class FakeClaudeSdk implements ClaudeRewindSdk {
 
   async forkSession(
     _sessionId: string,
-    options: { upToMessageId: string; transcriptPath: string },
+    options: { upToMessageId: string },
   ): Promise<{ sessionId: string }> {
     this.recordedForks.push({ upToMessageId: options.upToMessageId });
     return { sessionId: this.nextSessionId };

packages/server/src/server/agent/providers/mock-load-test-agent.ts

@@ -232,7 +232,6 @@ type SteeringReplayShape = "claude" | "codex";
 interface MockQuestionOption {
   label: string;
   description?: string;
-  preview?: string;
 }
 
 interface MockQuestionPromptQuestion {
@@ -272,16 +271,6 @@ function parseSettledAssistantImageMarkdown(prompt: AgentPromptInput): string |
   return match?.[1] ?? null;
 }
 
-const ROLLOUT_FLAG_PREVIEW = [
-  "Ship it dark behind the new-surface flag, then turn it on for internal users before everyone else.",
-  "",
-  'if (flags.enabled("new-surface")) {',
-  "  render(<NewSurface />);",
-  "}",
-  ...Array.from({ length: 40 }, (_, i) => `// rollout step ${i + 1}`),
-  "// LAST PREVIEW LINE",
-].join("\n");
-
 function parseMockQuestionPrompt(prompt: AgentPromptInput): MockQuestionPromptRequest | null {
   const text = promptToText(prompt);
   if (!/emit\s+(?:a\s+)?synthetic\s+questions?/i.test(text)) {
@@ -320,10 +309,7 @@ function parseMockQuestionPrompt(prompt: AgentPromptInput): MockQuestionPromptRe
       {
         question: "Which rollout should we use?",
         header: "rollout",
-        options: [
-          { label: "Immediately" },
-          { label: "Behind feature flag", preview: ROLLOUT_FLAG_PREVIEW },
-        ],
+        options: [{ label: "Immediately" }, { label: "Behind feature flag" }],
         multiSelect: false,
       },
       {

packages/server/src/server/agent/providers/omp/agent.test.ts

@@ -215,55 +215,6 @@ function createToolCatalog(): PaseoToolCatalog {
 }
 
 describe("OMP agent client and session", () => {
-  test("failed manual compact closes its progress row and shows the error", async () => {
-    const omp = new OmpHarness();
-    await omp.start();
-
-    const events = await omp.compact({}, new Error("compaction refused"));
-
-    expect(events).toEqual([
-      expect.objectContaining({
-        item: { type: "compaction", status: "loading", trigger: "manual" },
-      }),
-      expect.objectContaining({
-        item: { type: "compaction", status: "completed", trigger: "manual" },
-      }),
-      expect.objectContaining({
-        item: {
-          type: "assistant_message",
-          text: "[Error] Failed to compact context: compaction refused",
-        },
-      }),
-    ]);
-  });
-
-  test("manual compact shows its progress and publishes the compacted context usage", async () => {
-    const omp = new OmpHarness();
-    await omp.start();
-
-    const events = await omp.compact({
-      contextUsage: { tokens: 13_447, contextWindow: 272_000 },
-    });
-
-    expect(events).toEqual([
-      expect.objectContaining({
-        type: "timeline",
-        item: { type: "compaction", status: "loading", trigger: "manual" },
-      }),
-      expect.objectContaining({
-        type: "timeline",
-        item: { type: "compaction", status: "completed", trigger: "manual" },
-      }),
-      expect.objectContaining({
-        type: "usage_updated",
-        usage: expect.objectContaining({
-          contextWindowUsedTokens: 13_447,
-          contextWindowMaxTokens: 272_000,
-        }),
-      }),
-    ]);
-  });
-
   test("owns launch configuration and registers native host tools", async () => {
     const omp = new OmpHarness();
     await omp.start({ modeId: "ask" }, createToolCatalog());

packages/server/src/server/agent/providers/omp/agent.ts

@@ -714,7 +714,9 @@ export class OmpAgentSession implements AgentSession {
   private readonly pendingPromptResults = new Map<string, OmpPromptResult>();
   private pendingNoTurnCompletionAbort: AbortController | null = null;
   private lastKnownThinkingOptionId: string | null;
-  private manualCompactionRunning = false;
+  private outOfBandCompactionEmit: ((event: AgentStreamEvent) => void) | null = null;
+  private outOfBandCompactionStarted = false;
+  private outOfBandCompactionCompleted = false;
   private commandCache: AgentSlashCommand[] | null = null;
   private readonly subagentIndex = new OmpSubagentIndex();
   private readonly subagentCardTracker: OmpSubagentCardTracker;
@@ -1405,24 +1407,30 @@ export class OmpAgentSession implements AgentSession {
     customInstructions: string | undefined,
     emit: (event: AgentStreamEvent) => void,
   ): Promise<void> {
-    if (this.manualCompactionRunning) {
+    if (this.outOfBandCompactionEmit) {
       throw new Error("An OMP compact command is already running");
     }
-    // OMP answers a manual compact with its RPC response alone, without
-    // compaction_start or compaction_end, so the request owns both rows.
-    this.manualCompactionRunning = true;
-    const emitCompaction = (status: "loading" | "completed") =>
-      emit({
-        type: "timeline",
-        provider: this.provider,
-        item: { type: "compaction", status, trigger: "manual" },
-      });
-    emitCompaction("loading");
+    this.outOfBandCompactionEmit = emit;
+    this.outOfBandCompactionStarted = false;
+    this.outOfBandCompactionCompleted = false;
     try {
       await this.runtimeSession.compact(customInstructions);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      emitCompaction("completed");
+      if (
+        this.outOfBandCompactionEmit === emit &&
+        this.outOfBandCompactionStarted &&
+        !this.outOfBandCompactionCompleted
+      ) {
+        this.emitCompactionTimeline({
+          turnId: undefined,
+          item: {
+            type: "compaction",
+            status: "completed",
+            trigger: "manual",
+          },
+        });
+      }
       emit({
         type: "timeline",
         provider: this.provider,
@@ -1431,12 +1439,13 @@ export class OmpAgentSession implements AgentSession {
           text: `[Error] Failed to compact context: ${message}`,
         },
       });
-      return;
     } finally {
-      this.manualCompactionRunning = false;
+      if (this.outOfBandCompactionEmit === emit && !this.outOfBandCompactionStarted) {
+        this.outOfBandCompactionEmit = null;
+        this.outOfBandCompactionStarted = false;
+        this.outOfBandCompactionCompleted = false;
+      }
     }
-    emitCompaction("completed");
-    await this.usagePoller.refresh();
   }
 
   private async executeAutoCompactCommand(
@@ -1844,8 +1853,24 @@ export class OmpAgentSession implements AgentSession {
         return;
       }
       case "compaction_start":
+        this.emitCompactionTimeline({
+          turnId,
+          item: {
+            type: "compaction",
+            status: "loading",
+            trigger: event.reason === "manual" ? "manual" : "auto",
+          },
+        });
+        return;
       case "compaction_end":
-        this.handleCompactionEvent(event, turnId);
+        this.emitCompactionTimeline({
+          turnId,
+          item: {
+            type: "compaction",
+            status: "completed",
+            trigger: event.reason === "manual" ? "manual" : "auto",
+          },
+        });
         return;
       case "agent_end": {
         const messages = event.messages ?? [];
@@ -1899,24 +1924,35 @@ export class OmpAgentSession implements AgentSession {
     }
   }
 
-  private handleCompactionEvent(
-    event: Extract<OmpAgentSessionEvent, { type: "compaction_start" | "compaction_end" }>,
-    turnId: string | undefined,
-  ): void {
-    // A manual compact emits its own rows around the request.
-    if (this.manualCompactionRunning) {
-      return;
+  private emitCompactionTimeline(input: {
+    turnId: string | undefined;
+    item: Extract<AgentStreamEvent, { type: "timeline" }>["item"];
+  }): void {
+    const emitOutOfBand = this.outOfBandCompactionEmit;
+    if (emitOutOfBand && input.item.type === "compaction") {
+      if (input.item.status === "loading") {
+        this.outOfBandCompactionStarted = true;
+      }
+      if (input.item.status === "completed") {
+        this.outOfBandCompactionCompleted = true;
+      }
     }
-    this.emit({
+    const event: AgentStreamEvent = {
       type: "timeline",
       provider: this.provider,
-      turnId,
-      item: {
-        type: "compaction",
-        status: event.type === "compaction_start" ? "loading" : "completed",
-        trigger: event.reason === "manual" ? "manual" : "auto",
-      },
-    });
+      ...(emitOutOfBand ? {} : { turnId: input.turnId }),
+      item: input.item,
+    };
+    if (emitOutOfBand) {
+      emitOutOfBand(event);
+      if (input.item.type === "compaction" && input.item.status === "completed") {
+        this.outOfBandCompactionEmit = null;
+        this.outOfBandCompactionStarted = false;
+        this.outOfBandCompactionCompleted = false;
+      }
+      return;
+    }
+    this.emit(event);
   }
 
   private handleMessageUpdate(

packages/server/src/server/agent/providers/omp/test-utils/fake-omp.ts

@@ -168,6 +168,7 @@ export class FakeOmpSession implements OmpRuntimeSession {
   subagents: FakeOmpSubagentSnapshot[] = [];
   readonly subagentSubscriptionErrors = new Map<FakeOmpSubagentSubscriptionLevel, Error>();
   compactError: Error | null = null;
+  emitCompactEnd = true;
   getStateError: Error | null = null;
   promptAck: OmpPromptAck = {};
   branchResponse: { text?: string; cancelled?: boolean } = { text: "" };
@@ -265,8 +266,11 @@ export class FakeOmpSession implements OmpRuntimeSession {
   }
 
   async compact(customInstructions?: string): Promise<void> {
-    // Like OMP, answer a manual compact with the response alone, no compaction events.
     this.compactRequests.push(customInstructions === undefined ? {} : { customInstructions });
+    this.emit({ type: "compaction_start", reason: "manual" });
+    if (this.emitCompactEnd) {
+      this.emit({ type: "compaction_end", reason: "manual" });
+    }
     if (this.compactError) {
       throw this.compactError;
     }

packages/server/src/server/agent/providers/omp/test-utils/omp-harness.ts

@@ -19,12 +19,7 @@ import {
   type OmpProviderIdleScheduler,
 } from "../agent.js";
 import type { OmpUsagePollScheduler } from "../usage-poller.js";
-import type {
-  OmpAgentMessage,
-  OmpRpcSlashCommand,
-  OmpRuntimeEvent,
-  OmpSessionStats,
-} from "../rpc-types.js";
+import type { OmpAgentMessage, OmpRpcSlashCommand, OmpRuntimeEvent } from "../rpc-types.js";
 import { FakeOmp } from "./fake-omp.js";
 
 const CWD = "/tmp/paseo-omp-agent-test";
@@ -174,18 +169,6 @@ export class OmpHarness {
     return events;
   }
 
-  async compact(statsAfter: OmpSessionStats, error?: Error): Promise<AgentStreamEvent[]> {
-    const handler = this.requireSession().tryHandleOutOfBand("/compact");
-    if (!handler) throw new Error("OMP session did not handle /compact out-of-band");
-    const runtime = this.omp.latestSession();
-    const sessionEventCount = this.events.length;
-    const emitted: AgentStreamEvent[] = [];
-    runtime.stats = statsAfter;
-    runtime.compactError = error ?? null;
-    await handler.run({ emit: (event) => emitted.push(event) });
-    return [...emitted, ...this.events.slice(sessionEventCount)];
-  }
-
   async runPrompt(
     input: string,
     output: string,

packages/server/src/server/agent/providers/omp/usage-poller.test.ts

@@ -36,27 +36,6 @@ function deferred<T>() {
 }
 
 describe("OMP usage poller", () => {
-  test("refresh publishes usage without ending an active turn's polling", async () => {
-    const scheduler = new ManualPollScheduler();
-    const used: Array<number | undefined> = [];
-    let stats: OmpSessionStats = { contextUsage: { contextWindow: 200_000, tokens: 9_000 } };
-    const poller = new OmpUsagePoller({
-      scheduler,
-      readStats: async () => stats,
-      onUsage: (update) => used.push(update.contextWindowUsedTokens),
-      onPollError: (error) => {
-        throw error;
-      },
-    });
-
-    poller.startTurn();
-    stats = { contextUsage: { contextWindow: 200_000, tokens: 2_000 } };
-    await poller.refresh();
-
-    expect(used).toEqual([2_000]);
-    expect(scheduler.activePollCount()).toBe(1);
-  });
-
   test("emits only changed usage while active", async () => {
     const scheduler = new ManualPollScheduler();
     const updates: AgentUsage[] = [];

packages/server/src/server/agent/providers/omp/usage-poller.ts

@@ -105,17 +105,6 @@ export class OmpUsagePoller {
     this.publishUsage(usage, turnId);
   }
 
-  async refresh(): Promise<void> {
-    let usage: AgentUsage | undefined;
-    try {
-      usage = toAgentUsage(await this.options.readStats());
-    } catch (error) {
-      if (!this.closed) this.options.onPollError(error);
-      return;
-    }
-    if (!this.closed) this.publishUsage(usage);
-  }
-
   close(): void {
     this.closed = true;
     this.active = false;

packages/server/src/server/daemon-e2e/omp.real.e2e.test.ts

@@ -131,10 +131,10 @@ async function timeline(client: DaemonClient, agentId: string): Promise<AgentTim
   return result.entries.map((entry) => entry.item);
 }
 
-function compactionFiller(records = 1200): string {
+function compactionFiller(): string {
   const teas = ["assam", "darjeeling", "sencha", "oolong"];
   return Array.from(
-    { length: records },
+    { length: 1200 },
     (_, index) =>
       `Record ${String(index).padStart(5, "0")}: tea=${teas[index % teas.length]} origin=region-${index % 37} notes=lorem ipsum dolor sit amet`,
   ).join("\n");
@@ -234,27 +234,6 @@ afterEach(() => {
   roots.clear();
 });
 
-async function waitForTimelineItem(
-  client: DaemonClient,
-  agentId: string,
-  predicate: (item: AgentTimelineItem) => boolean,
-): Promise<AgentTimelineItem> {
-  const deadline = Date.now() + 60_000;
-  let items: AgentTimelineItem[] = [];
-  while (Date.now() < deadline) {
-    items = await timeline(client, agentId);
-    const item = items.find(predicate);
-    if (item) return item;
-    await new Promise((resolve) => setTimeout(resolve, 250));
-  }
-  throw new Error(`Timed out waiting for OMP timeline item: ${JSON.stringify(items)}`);
-}
-
-async function contextWindowUsedTokens(client: DaemonClient, agentId: string) {
-  const result = await client.fetchAgent(agentId);
-  return result?.agent.lastUsage?.contextWindowUsedTokens;
-}
-
 describe("daemon E2E (real OMP)", () => {
   test(
     "a prompt OMP rejects before its agent runs fails the turn with OMP's error",
@@ -279,48 +258,6 @@ describe("daemon E2E (real OMP)", () => {
     TIMEOUT_MS,
   );
 
-  test(
-    "manual compact shows its progress and refreshes context usage",
-    async () => {
-      const harness = await createHarness();
-      try {
-        const agent = await createAgent(harness, "manual-compact");
-        await promptAndFinish(harness, agent.id, "Reply exactly: ready");
-        await promptAndFinish(
-          harness,
-          agent.id,
-          `${compactionFiller(2500)}\n\nWhich tea is in record 00007? Reply with one word.`,
-        );
-        await promptAndFinish(harness, agent.id, "Reply exactly: after-filler");
-        const usedBefore = await contextWindowUsedTokens(harness.client, agent.id);
-        expect(usedBefore).toBeGreaterThan(20_000);
-
-        await harness.client.sendMessage(agent.id, "/compact");
-        await waitForTimelineItem(
-          harness.client,
-          agent.id,
-          (item) => item.type === "compaction" && item.status === "completed",
-        );
-
-        expect(await timeline(harness.client, agent.id)).toEqual(
-          expect.arrayContaining([
-            expect.objectContaining({ type: "compaction", status: "loading", trigger: "manual" }),
-            expect.objectContaining({ type: "compaction", status: "completed", trigger: "manual" }),
-          ]),
-        );
-        await harness.client.waitForAgentUpsert(
-          agent.id,
-          (snapshot) =>
-            (snapshot.lastUsage?.contextWindowUsedTokens ?? Infinity) < (usedBefore ?? 0),
-          60_000,
-        );
-      } finally {
-        await closeHarness(harness);
-      }
-    },
-    TIMEOUT_MS,
-  );
-
   test(
     "prompt, native tool, and resumed follow-up",
     async () => {

packages/server/src/server/daemon-e2e/oversized-message.e2e.test.ts

@@ -1,58 +0,0 @@
-import { describe, test, expect, beforeEach, afterEach } from "vitest";
-import { mkdtempSync, rmSync } from "fs";
-import { tmpdir } from "os";
-import path from "path";
-import { createDaemonTestContext, type DaemonTestContext } from "../test-utils/index.js";
-
-let ctx: DaemonTestContext;
-let cwd: string;
-
-beforeEach(async () => {
-  ctx = await createDaemonTestContext();
-  cwd = mkdtempSync(path.join(tmpdir(), "daemon-e2e-"));
-});
-
-afterEach(async () => {
-  await ctx.cleanup();
-  rmSync(cwd, { recursive: true, force: true });
-}, 60000);
-
-describe("a message larger than the daemon accepts", () => {
-  const oversizedImage = { data: "A".repeat(101 * 1024 * 1024), mimeType: "image/png" };
-
-  test("fails the creation and keeps the connection up", async () => {
-    const statuses: string[] = [];
-    const unsubscribe = ctx.client.subscribeConnectionStatus((state) => {
-      statuses.push(state.status);
-    });
-
-    await expect(
-      ctx.client.createAgent({
-        provider: "claude",
-        cwd,
-        title: "Oversized first message",
-        initialPrompt: "Describe these screens.",
-        images: [oversizedImage],
-      }),
-    ).rejects.toThrow(/too large/);
-    unsubscribe();
-
-    expect(statuses).toEqual(["connected"]);
-    expect((await ctx.client.fetchAgents()).entries).toEqual([]);
-  }, 30000);
-
-  test("fails the send and keeps the connection up", async () => {
-    const agent = await ctx.client.createAgent({ provider: "claude", cwd, title: "Agent" });
-    const statuses: string[] = [];
-    const unsubscribe = ctx.client.subscribeConnectionStatus((state) => {
-      statuses.push(state.status);
-    });
-
-    await expect(
-      ctx.client.sendMessage(agent.id, "Describe these screens.", { images: [oversizedImage] }),
-    ).rejects.toThrow(/too large/);
-    unsubscribe();
-
-    expect(statuses).toEqual(["connected"]);
-  }, 30000);
-});

packages/server/src/server/daemon-e2e/relay-transport.e2e.test.ts

@@ -1,6 +1,4 @@
 import { describe, expect, test } from "vitest";
-import { withTimeout } from "../../utils/promise-timeout.js";
-import { DaemonClient } from "../test-utils/daemon-client.js";
 import { WebSocket } from "ws";
 import pino from "pino";
 import { Writable } from "node:stream";
@@ -204,20 +202,12 @@ async function waitForCapturedLog(
     if (options.useLocalRelay) {
       relayArgs.push("--var", "PASEO_RELAY_UPSTREAM:");
     }
-    relayProcess = spawn(
-      process.execPath,
-      [
-        "--experimental-vm-modules",
-        path.resolve(relayDir, "../../node_modules/wrangler/wrangler-dist/cli.js"),
-        ...relayArgs.slice(1),
-      ],
-      {
-        cwd: relayDir,
-        env: { ...process.env },
-        stdio: ["ignore", "pipe", "pipe"],
-        detached: false,
-      },
-    );
+    relayProcess = spawn("npx", relayArgs, {
+      cwd: relayDir,
+      env: { ...process.env },
+      stdio: ["ignore", "pipe", "pipe"],
+      detached: false,
+    });
 
     relayProcess.stdout?.on("data", (data: Buffer) => {
       const lines = data
@@ -251,73 +241,6 @@ async function waitForCapturedLog(
     relayProcess = null;
   };
 
-  test("oversized attachments fail without disconnecting or resubmitting over the relay", async () => {
-    await startRelay({ useLocalRelay: true });
-    const daemon = await createTestPaseoDaemon({
-      relayEnabled: true,
-      relayEndpoint: `127.0.0.1:${relayPort}`,
-      relayUseTls: false,
-      relayPublicUseTls: false,
-    });
-    let client: DaemonClient | null = null;
-    try {
-      const offerUrl = await getPairingOfferUrl({
-        paseoHome: daemon.paseoHome,
-        relayEnabled: true,
-        relayEndpoint: daemon.config.relayEndpoint,
-      });
-      const { serverId, daemonPublicKeyB64 } = decodeOfferFromFragmentUrl(offerUrl);
-      client = new DaemonClient({
-        url: buildRelayWebSocketUrl({
-          endpoint: `127.0.0.1:${relayPort}`,
-          useTls: false,
-          serverId,
-          role: "client",
-        }),
-        e2ee: { enabled: true, daemonPublicKeyB64 },
-        reconnect: { baseDelayMs: 100, maxDelayMs: 100 },
-      });
-      await client.connect();
-      const statuses: string[] = [];
-      client.subscribeConnectionStatus((state) => statuses.push(state.status));
-      for (const imageMiB of [30, 61]) {
-        // Attachments are base64 in the JSON, then E2EE base64 expands the frame again.
-        const images = [
-          { data: "A".repeat(4 * Math.ceil((imageMiB * 1024 * 1024) / 3)), mimeType: "image/png" },
-        ];
-        await expect(
-          withTimeout(
-            client.createWorkspace({
-              source: { kind: "directory", path: daemon.staticDir },
-              agent: {
-                provider: "claude",
-                cwd: daemon.staticDir,
-                initialPrompt: "Describe these screens.",
-                images,
-              },
-            }),
-            10000,
-            "Workspace creation did not settle",
-          ),
-        ).rejects.toThrow(/too large.*32\.0 MiB/);
-        expect((await client.fetchAgents()).entries).toEqual([]);
-      }
-      const agent = await client.createAgent({ provider: "claude", cwd: daemon.staticDir });
-      await expect(
-        client.sendMessage(agent.id, "Describe these screens.", {
-          images: [{ data: "A".repeat(40 * 1024 * 1024), mimeType: "image/png" }],
-        }),
-      ).rejects.toThrow(/too large.*32\.0 MiB/);
-      await client.sendMessage(agent.id, "A small follow-up still works.");
-      expect((await client.fetchAgents()).entries).toHaveLength(1);
-      expect(statuses).toEqual(["connected"]);
-    } finally {
-      await client?.close();
-      await daemon.close();
-      await stopRelay();
-    }
-  }, 60000);
-
   test("daemon connects to relay and client ping/pong works through relay", async () => {
     process.env.PASEO_PRIMARY_LAN_IP = "192.168.1.12";
 

packages/server/src/server/persisted-config.test.ts

@@ -1,14 +1,4 @@
-import {
-  chmodSync,
-  lstatSync,
-  mkdirSync,
-  mkdtempSync,
-  readFileSync,
-  rmSync,
-  statSync,
-  symlinkSync,
-  writeFileSync,
-} from "node:fs";
+import { chmodSync, mkdtempSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
 import { describe, expect, test } from "vitest";
@@ -674,19 +664,6 @@ describe("PersistedConfigSchema voice mode config", () => {
     expect(parsed.features?.dictation?.stt?.language).toBe("fr");
     expect(parsed.features?.voiceMode?.stt?.language).toBe("de");
   });
-
-  test("accepts a voice and model from a self-hosted OpenAI-compatible server", () => {
-    const parsed = PersistedConfigSchema.parse({
-      features: {
-        voiceMode: {
-          tts: { provider: "openai", model: "kokoro-v1:Q8_0", voice: "aiden" },
-        },
-      },
-    });
-
-    expect(parsed.features?.voiceMode?.tts?.model).toBe("kokoro-v1:Q8_0");
-    expect(parsed.features?.voiceMode?.tts?.voice).toBe("aiden");
-  });
 });
 
 describe("loadPersistedConfig", () => {
@@ -866,35 +843,3 @@ describe.skipIf(process.platform === "win32")("persisted config file permissions
     }
   });
 });
-
-describe.skipIf(process.platform === "win32")(
-  "config.json symlinked from another directory",
-  () => {
-    test("saving writes through the symlink and leaves it in place", () => {
-      const parent = createTempHome();
-      const home = path.join(parent, "home");
-      const dotfiles = path.join(parent, "dotfiles");
-      const linkedConfigPath = path.join(dotfiles, "config.json");
-      const configPath = path.join(home, "config.json");
-      try {
-        mkdirSync(home);
-        mkdirSync(dotfiles, { mode: 0o755 });
-        chmodSync(dotfiles, 0o755);
-        writeFileSync(linkedConfigPath, '{ "version": 1 }\n');
-        symlinkSync(linkedConfigPath, configPath);
-
-        savePersistedConfig(home, { version: 1, daemon: { relay: { enabled: false } } });
-
-        expect(lstatSync(configPath).isSymbolicLink()).toBe(true);
-        expect(JSON.parse(readFileSync(linkedConfigPath, "utf8"))).toEqual({
-          version: 1,
-          daemon: { relay: { enabled: false } },
-        });
-        expect(modeOf(dotfiles)).toBe(0o755);
-        expect(modeOf(linkedConfigPath)).toBe(PRIVATE_FILE_MODE);
-      } finally {
-        rmSync(parent, { recursive: true, force: true });
-      }
-    });
-  },
-);

packages/server/src/server/persisted-config.ts

@@ -144,8 +144,7 @@ const FeatureVoiceModeSchema = z
       .object({
         provider: SpeechProviderIdSchema.optional(),
         model: z.string().min(1).optional(),
-        // Free-form: self-hosted OpenAI-compatible servers expose their own voice names.
-        voice: z.string().trim().min(1).optional(),
+        voice: z.enum(["alloy", "echo", "fable", "onyx", "nova", "shimmer"]).optional(),
         speakerId: z.number().int().optional(),
         speed: z.number().optional(),
       })

packages/server/src/server/private-files.ts

@@ -1,4 +1,4 @@
-import { chmodSync, mkdirSync, realpathSync, renameSync, rmSync, writeFileSync } from "node:fs";
+import { chmodSync, mkdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { randomUUID } from "node:crypto";
 import path from "node:path";
 
@@ -28,27 +28,14 @@ export function writePrivateFileAtomicSync(
   data: string | NodeJS.ArrayBufferView,
 ): void {
   ensurePrivateDirectory(path.dirname(filePath));
-  const destination = resolveSymlinkedFile(filePath);
-  const temporary = path.join(
-    path.dirname(destination),
-    `.${path.basename(destination)}.${process.pid}.${randomUUID()}`,
-  );
+  const parent = path.dirname(filePath);
+  const temporary = path.join(parent, `.${path.basename(filePath)}.${process.pid}.${randomUUID()}`);
   try {
     writeFileSync(temporary, data, { mode: PRIVATE_FILE_MODE });
-    renameSync(temporary, destination);
-    ensurePrivateFile(destination);
+    renameSync(temporary, filePath);
+    ensurePrivateFile(filePath);
   } catch (error) {
     rmSync(temporary, { force: true });
     throw error;
   }
 }
-
-// Renaming onto a symlink replaces the link, so write to the file it points at.
-function resolveSymlinkedFile(filePath: string): string {
-  try {
-    return realpathSync(filePath);
-  } catch (error) {
-    if ((error as NodeJS.ErrnoException).code === "ENOENT") return filePath;
-    throw error;
-  }
-}

packages/server/src/server/speech/providers/openai/config.test.ts

@@ -203,40 +203,4 @@ describe("resolveOpenAiSpeechConfig", () => {
     expect(resolved?.stt?.apiKey).toBe("stt-only-key");
     expect(resolved?.tts).toBeUndefined();
   });
-
-  test("sends the model and voice an OpenAI-compatible server serves, as written", () => {
-    const persisted = PersistedConfigSchema.parse({
-      providers: {
-        openai: { tts: { apiKey: "tts-key", baseUrl: "https://tts.example.com/v1" } },
-      },
-      features: {
-        voiceMode: { tts: { provider: "openai", model: "kokoro-v1:Q8_0", voice: "Aiden" } },
-      },
-    });
-
-    const resolved = resolveOpenAiSpeechConfig({
-      env: {} as NodeJS.ProcessEnv,
-      persisted,
-      providers: ALL_OPENAI,
-    });
-
-    expect(resolved?.tts?.model).toBe("kokoro-v1:Q8_0");
-    expect(resolved?.tts?.voice).toBe("Aiden");
-  });
-
-  test("accepts OpenAI's own gpt-4o-mini-tts model", () => {
-    const persisted = PersistedConfigSchema.parse({
-      providers: { openai: { tts: { apiKey: "tts-key" } } },
-      features: { voiceMode: { tts: { provider: "openai", model: "gpt-4o-mini-tts" } } },
-    });
-
-    const resolved = resolveOpenAiSpeechConfig({
-      env: {} as NodeJS.ProcessEnv,
-      persisted,
-      providers: ALL_OPENAI,
-    });
-
-    expect(resolved?.tts?.model).toBe("gpt-4o-mini-tts");
-    expect(resolved?.tts?.voice).toBe("alloy");
-  });
 });

packages/server/src/server/speech/providers/openai/config.ts

@@ -12,6 +12,10 @@ export interface OpenAiSpeechProviderConfig {
   tts?: Partial<TTSConfig> & { apiKey?: string };
 }
 
+const OpenAiTtsVoiceSchema = z.enum(["alloy", "echo", "fable", "onyx", "nova", "shimmer"]);
+
+const OpenAiTtsModelSchema = z.enum(["tts-1", "tts-1-hd"]);
+
 const NumberLikeSchema = z.union([z.number(), z.string().trim().min(1)]);
 
 const OptionalFiniteNumberSchema = NumberLikeSchema.pipe(
@@ -40,12 +44,14 @@ const OpenAiSttOptionsSchema = z.object({
   sttModel: OptionalTrimmedStringSchema,
 });
 
-// Voice and model are free-form so a self-hosted server can use its own ids; the
-// OpenAI catalog is only the default. Both are sent as written, because the
-// server owns those ids and their case (rosters use ids like kokoro-v1:Q8_0).
 const OpenAiTtsOptionsSchema = z.object({
-  ttsVoice: z.string().trim().default("alloy"),
-  ttsModel: z.string().trim().default(DEFAULT_OPENAI_TTS_MODEL),
+  ttsVoice: z.string().trim().toLowerCase().pipe(OpenAiTtsVoiceSchema).default("alloy"),
+  ttsModel: z
+    .string()
+    .trim()
+    .toLowerCase()
+    .pipe(OpenAiTtsModelSchema)
+    .default(DEFAULT_OPENAI_TTS_MODEL),
 });
 
 function isOpenAiProviderActive(provider: { enabled?: boolean; provider: string }): boolean {

packages/server/src/server/speech/providers/openai/tts.ts

@@ -8,8 +8,8 @@ export type { SpeechStreamResult };
 export interface TTSConfig {
   apiKey: string;
   baseUrl?: string;
-  model?: "tts-1" | "tts-1-hd" | (string & {});
-  voice?: "alloy" | "echo" | "fable" | "onyx" | "nova" | "shimmer" | (string & {});
+  model?: "tts-1" | "tts-1-hd";
+  voice?: "alloy" | "echo" | "fable" | "onyx" | "nova" | "shimmer";
   responseFormat?: "mp3" | "opus" | "aac" | "flac" | "wav" | "pcm";
 }
 

packages/server/src/server/websocket-server.ts

@@ -33,7 +33,6 @@ import {
 } from "./messages.js";
 import { asUint8Array, decodeBinaryFrame } from "@getpaseo/protocol/binary-frames/index";
 import type { TerminalActivity } from "@getpaseo/protocol/terminal-activity";
-import { MAX_WEBSOCKET_MESSAGE_BYTES } from "@getpaseo/protocol/websocket-message-limit";
 import type { HostnamesConfig } from "./hostnames.js";
 import { isHostnameAllowed } from "./hostnames.js";
 import {
@@ -823,7 +822,6 @@ export class VoiceAssistantWebSocketServer {
     const wss = new WebSocketServer({
       server,
       path: "/ws",
-      maxPayload: MAX_WEBSOCKET_MESSAGE_BYTES,
       handleProtocols: (protocols) => selectWebSocketProtocol(protocols, password),
       verifyClient: ({ req }, callback) => {
         this.verifyWsUpgrade(

packages/server/src/utils/checkout-git.ts

@@ -1,4 +1,3 @@
-import { MAX_RELAY_WEBSOCKET_MESSAGE_BYTES } from "@getpaseo/protocol/websocket-message-limit";
 import { resolve, dirname, basename } from "path";
 import { existsSync, realpathSync } from "fs";
 import { open as openFile, readFile, stat as statFile } from "fs/promises";
@@ -2153,13 +2152,13 @@ export async function getCheckoutSnapshotFacts(
 
 const PER_FILE_DIFF_MAX_BYTES = 1024 * 1024; // 1MB
 const TOTAL_DIFF_MAX_BYTES = 2 * 1024 * 1024; // 2MB
+const RELAY_MAX_FRAME_BYTES = 32 * 1024 * 1024;
 const CHECKOUT_DIFF_FRAME_HEADROOM_BYTES = 1024 * 1024;
 // Temporary until diffs load lazily per file. The Paseo relay's 32 MiB frame limit is
 // binding: string frames are encrypted and base64-encoded. Reserve 1 MiB plaintext for
 // the surrounding WebSocket JSON envelope after inverting that exact wire expansion.
 export const CHECKOUT_DIFF_MAX_STRUCTURED_BYTES =
-  maxBase64EncryptedPlaintextByteLength(MAX_RELAY_WEBSOCKET_MESSAGE_BYTES) -
-  CHECKOUT_DIFF_FRAME_HEADROOM_BYTES;
+  maxBase64EncryptedPlaintextByteLength(RELAY_MAX_FRAME_BYTES) - CHECKOUT_DIFF_FRAME_HEADROOM_BYTES;
 
 interface StructuredDiffAccumulator {
   files: ParsedDiffFile[];

packages/server/src/utils/worktree.test.ts

@@ -10,7 +10,6 @@ import {
   type WorktreeConfig,
 } from "./worktree";
 import { execFileSync } from "child_process";
-import { rm } from "node:fs/promises";
 import {
   mkdtempSync,
   mkdirSync,
@@ -90,8 +89,8 @@ describe("paseo worktree manager", () => {
     });
   });
 
-  afterEach(async () => {
-    await rm(tempDir, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 });
+  afterEach(() => {
+    rmSync(tempDir, { recursive: true, force: true });
   });
 
   it("treats a worktree as paseo-owned even when its .git admin is missing", async () => {

packages/website/public/schemas/paseo.config.v1.json

@@ -711,7 +711,7 @@
                 },
                 "voice": {
                   "type": "string",
-                  "minLength": 1
+                  "enum": ["alloy", "echo", "fable", "onyx", "nova", "shimmer"]
                 },
                 "speakerId": {
                   "type": "integer",