diff --git a/apps/desktop/e2e/attachment.spec.ts b/apps/desktop/e2e/attachment.spec.ts
index b76fa824a4..266036d7b5 100644
--- a/apps/desktop/e2e/attachment.spec.ts
+++ b/apps/desktop/e2e/attachment.spec.ts
@@ -105,37 +105,12 @@ test('a mixed attachment send has the Astryx message hierarchy', async ({ window
 
   const sentMessage = page.getByLabel('你发送的消息').last();
   const fileToken = sentMessage.locator('.maka-user-attachment-tokens .astryx-token');
-  const fileIcon = fileToken.locator('.astryx-icon');
   const image = sentMessage.locator('.maka-user-attachments .astryx-thumbnail');
   const bubble = sentMessage.locator('.maka-chat-message-bubble-user');
   await expect(fileToken).toContainText('note.txt');
-  await expect(fileIcon).toHaveCSS('width', '16px');
-  await expect(fileIcon).toHaveCSS('height', '16px');
   await expect(image).toBeVisible();
-  await expect(image).toHaveCSS('width', '64px');
   await expect(bubble).toContainText('sending mixed attachments');
 
-  const [fileBox, imageBox, bubbleBox] = await Promise.all([
-    fileToken.boundingBox(),
-    image.boundingBox(),
-    bubble.boundingBox(),
-  ]);
-  expect(fileBox).not.toBeNull();
-  expect(imageBox).not.toBeNull();
-  expect(bubbleBox).not.toBeNull();
-  // The token declares display:inline-flex + align-items:center; as a flex
-  // item of the attachment row it computes display:flex (blockification) on
-  // every platform. Assert the centering contract, not geometry: token height
-  // resolves from line-height, which varies with font metrics (Linux CI can
-  // drop below the 16px icon, overflowing a correctly centered icon by 2px).
-  // A tolerance-based centerline check was rejected — a baseline regression
-  // drifts exactly 2.00px, the tolerance boundary. display:flex is load-
-  // bearing: align-items computes as declared even on non-flex boxes.
-  await expect(fileToken).toHaveCSS('display', 'flex');
-  await expect(fileToken).toHaveCSS('align-items', 'center');
-  expect(fileBox!.y + fileBox!.height).toBeLessThanOrEqual(bubbleBox!.y);
-  expect(imageBox!.y + imageBox!.height).toBeLessThanOrEqual(bubbleBox!.y);
-
   await image.getByRole('button').click();
   const lightbox = page.locator('.astryx-lightbox');
   await expect(lightbox).toBeVisible();
diff --git a/apps/desktop/e2e/composer-mention-token.spec.ts b/apps/desktop/e2e/composer-mention-token.spec.ts
index d43a0ec48b..acc5626f4f 100644
--- a/apps/desktop/e2e/composer-mention-token.spec.ts
+++ b/apps/desktop/e2e/composer-mention-token.spec.ts
@@ -26,12 +26,6 @@ test('a picked file mention becomes an inline token and sends as its path', asyn
     'data-astryx-token-value',
     '@.maka/skills/agent-write/SKILL.md',
   );
-  const [tokenWidth, lineWidth] = await Promise.all([
-    token.evaluate((element) => element.getBoundingClientRect().width),
-    composer.evaluate((element) => element.getBoundingClientRect().width),
-  ]);
-  expect(tokenWidth).toBeLessThan(lineWidth / 2);
-
   await composer.press('Enter');
   const bubble = page.getByLabel('你发送的消息').first();
   await expect(bubble).toBeVisible();
diff --git a/apps/desktop/e2e/default-thinking-level.spec.ts b/apps/desktop/e2e/default-thinking-level.spec.ts
deleted file mode 100644
index bee3445f8c..0000000000
--- a/apps/desktop/e2e/default-thinking-level.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { expect, test, COMPOSER_INPUT } from './fixtures.js';
-
-/**
- * Settings → 通用 → 默认思考级别 reaching the next new chat.
- *
- * This journey is e2e rather than unit because the bug it guards lives in the
- * seam between two async sources: the setting arrives from a settings fetch
- * that resolves AFTER the composer hook first mounts. Seeding it through a
- * useState initializer type-checks, renders, and persists correctly — and the
- * setting still never takes effect, because an initializer runs once, before
- * the value exists. Only a real round-trip through the settings page and back
- * catches that.
- */
-test('a configured default thinking level reaches the next new chat, and the composer can still overrule it', async ({
-  modelPickerLongWindow: page,
-}) => {
-  const composerChip = () =>
-    page.locator('.maka-composer-left-controls').getByRole('button', { name: /思考级别/ });
-
-  // Negative control: with nothing configured the chip is the model's own
-  // default, so a later 关 cannot be mistaken for a value that was always there.
-  await expect(composerChip()).toContainText('模型默认');
-
-  await page.getByRole('button', { name: /设置|Settings/ }).click();
-  await page
-    .getByRole('navigation', { name: /设置分组|Settings sections/ })
-    .getByRole('button', { name: /通用|General/, exact: true })
-    .click();
-
-  const selector = page.getByRole('combobox', { name: '默认思考级别' });
-  await selector.scrollIntoViewIfNeeded();
-  await expect(selector).toContainText('跟随模型默认');
-  await selector.click();
-  await page.getByRole('option', { name: '关', exact: true }).click();
-
-  await expect
-    .poll(() =>
-      page.evaluate(() => window.maka.settings.get().then((value) => value.chatDefaults.thinkingLevel)),
-    )
-    .toBe('off');
-
-  await page.getByRole('button', { name: /返回应用|Back to app/ }).click();
-  // Scope to the composer before reading the chip: the settings Selector also
-  // answers to /思考级别/ and reads 关 once set, so an unscoped lookup passes
-  // whether or not the chip ever changed.
-  await expect(page.locator(COMPOSER_INPUT)).toBeVisible();
-  await expect(composerChip()).toHaveCount(1);
-  await expect(composerChip()).toContainText('关');
-
-  // The per-chat picker must still overrule the configured default — including
-  // back to 模型默认, which is why an untouched picker and an explicit
-  // 模型默认 pick cannot share one representation.
-  await composerChip().click();
-  await page.getByRole('menuitem', { name: '模型默认', exact: true }).click();
-  await expect(composerChip()).toContainText('模型默认');
-});
diff --git a/apps/desktop/e2e/keyboard-help.spec.ts b/apps/desktop/e2e/keyboard-help.spec.ts
index ef5dbdeef5..9c085eb3b2 100644
--- a/apps/desktop/e2e/keyboard-help.spec.ts
+++ b/apps/desktop/e2e/keyboard-help.spec.ts
@@ -22,24 +22,6 @@ test('the help modal opens from its entry points and keeps its styled layout', a
   await page.keyboard.press(MOD_SLASH);
   await expect(body).toBeVisible();
 
-  // Description/keys resolve into a two-column grid…
-  const rows = page.locator('.maka-help-section dl').first();
-  await expect(rows).toHaveCSS('display', 'grid');
-  const columns = await rows.evaluate((el) => getComputedStyle(el).gridTemplateColumns.split(' ').length);
-  expect(columns).toBe(2);
-  // …headings carry the caption typography, not default heading bulk…
-  const heading = page.locator('.maka-help-section h3').first();
-  await expect(heading).toHaveCSS('font-size', '12px');
-  await expect(heading).toHaveCSS('font-weight', '600');
-  // …multi-key combos keep their distinct separator…
-  const plus = page.locator('.maka-help-plus').first();
-  await expect(plus).toBeVisible();
-  await expect(plus).toHaveText('+');
-  // …and Kbd chips carry real keycap chrome.
-  const keycap = page.locator('.maka-help-section .astryx-kbd kbd').first();
-  await expect(keycap).not.toHaveCSS('background-color', 'rgba(0, 0, 0, 0)');
-  await expect(keycap).not.toHaveCSS('border-radius', '0px');
-
   // The platform's own modifier is what the sheet documents — ⌘ on macOS,
   // Ctrl elsewhere. (This harness boots with healthy UA-CH; the blank-UA-CH
   // environment is pinned by the dedicated test below.)
diff --git a/apps/desktop/e2e/mcp.spec.ts b/apps/desktop/e2e/mcp.spec.ts
index cc0cda7cb7..821a7ba8d9 100644
--- a/apps/desktop/e2e/mcp.spec.ts
+++ b/apps/desktop/e2e/mcp.spec.ts
@@ -6,155 +6,6 @@ const fixtureServer = path.resolve(
   '../../packages/mcp/dist/__fixtures__/stdio-server.js',
 );
 
-test('module navigation removes the hidden chat surface from layout and hit testing', async ({ window: page }) => {
-  await page.getByRole('button', { name: '展开侧边栏' }).click();
-  await page.getByRole('navigation', { name: '对话列表' }).getByRole('button', { name: '扩展', exact: true }).click();
-  await expect(page.getByRole('main', { name: '扩展' })).toBeVisible();
-
-  const hiddenChat = page.locator('.maka-chat-layout[hidden]');
-  await expect(hiddenChat).toHaveCount(1);
-  await expect(hiddenChat).toHaveCSS('display', 'none');
-  expect(await hiddenChat.boundingBox()).toBeNull();
-  expect(
-    await page.evaluate(() => {
-      const target = document.elementFromPoint(window.innerWidth * 0.75, window.innerHeight - 100);
-      return Boolean(target?.closest('.maka-chat-layout'));
-    }),
-  ).toBe(false);
-});
-
-test('MCP module page keeps one centred column without horizontal overflow', async ({ window: page }) => {
-  await page.getByRole('button', { name: '展开侧边栏' }).click();
-  await page.getByRole('navigation', { name: '对话列表' }).getByRole('button', { name: '扩展', exact: true }).click();
-  await page.locator('.maka-module-hub-selector').getByRole('button', { name: 'MCP' }).click();
-  await expect(page.getByRole('toolbar', { name: 'MCP 浏览操作' })).toBeVisible();
-
-  for (const width of [1440, 1280, 861, 860, 761]) {
-    await page.setViewportSize({ width, height: 700 });
-    await expect.poll(() => page.evaluate(() => window.innerWidth)).toBe(width);
-
-    const geometry = await page.evaluate(() => {
-      const main = document.querySelector<HTMLElement>('.maka-module-main');
-      const content = main?.querySelector<HTMLElement>('.astryx-layout-content');
-      if (!main || !content) throw new Error('Expected the MCP module layout');
-      const rows = content.querySelector<HTMLElement>('.maka-module-page-rows')
-        ?? content.querySelector<HTMLElement>('.maka-module-page-panel');
-      if (!rows) throw new Error('Expected the MCP module content');
-      const rowsRect = rows.getBoundingClientRect();
-      const contentRect = content.getBoundingClientRect();
-      return {
-        mainOverflow: main.scrollWidth - main.clientWidth,
-        contentOverflow: content.scrollWidth - content.clientWidth,
-        // Centring is measured against the content scroller's inner box, not
-        // the page: a classic (non-overlay) vertical scrollbar takes width
-        // out of the scroller, and the column centres in what remains.
-        centerDelta: Math.abs(
-          rowsRect.left + rowsRect.width / 2
-            - (contentRect.left + content.clientWidth / 2),
-        ),
-        rowsWidth: rowsRect.width,
-      };
-    });
-
-    expect(geometry.mainOverflow, `${width}px: ${JSON.stringify(geometry)}`).toBe(0);
-    expect(geometry.contentOverflow, `${width}px: ${JSON.stringify(geometry)}`).toBe(0);
-    // Centred and capped at every width, not just wide ones: below the clamp
-    // the column fills the plate, which is centring too.
-    expect(geometry.rowsWidth, `${width}px: ${JSON.stringify(geometry)}`).toBeLessThanOrEqual(900);
-    expect(geometry.centerDelta, `${width}px: ${JSON.stringify(geometry)}`).toBeLessThanOrEqual(1);
-  }
-});
-
-test('MCP server descriptions truncate with an ellipsis at 700px and 500px', async ({ window: page }) => {
-  await page.getByRole('button', { name: '展开侧边栏' }).click();
-  await page.getByRole('navigation', { name: '对话列表' }).getByRole('button', { name: '扩展', exact: true }).click();
-  await page.locator('.maka-module-hub-selector').getByRole('button', { name: 'MCP' }).click();
-
-  const endpoint = `https://example.com/${'narrow-description-segment/'.repeat(12)}mcp`;
-  await page.evaluate(async (url) => {
-    await window.maka.mcp.upsert('long-endpoint', {
-      enabled: false,
-      url,
-      transport: 'streamable-http',
-    });
-  }, endpoint);
-  await page.getByRole('button', { name: '刷新', exact: true }).click();
-  await page.getByRole('radio', { name: '已安装' }).click();
-
-  const row = page.getByRole('listitem').filter({ hasText: 'long-endpoint' });
-  const description = row.locator('[data-maka-contract="mcp-server-description"]');
-  await expect(description).toBeVisible();
-  await expect(description.getByTitle(endpoint)).toHaveText(endpoint);
-
-  for (const width of [700, 500]) {
-    await page.setViewportSize({ width, height: 700 });
-    await expect.poll(() => page.evaluate(() => window.innerWidth)).toBe(width);
-
-    const geometry = await description.evaluate((content) => {
-      const slot = content.parentElement;
-      const main = content.closest<HTMLElement>('.maka-module-main');
-      const item = content.closest<HTMLElement>('li');
-      if (!slot || !main || !item) throw new Error('Expected the MCP server description layout');
-      const contentStyle = getComputedStyle(content);
-      const slotRect = slot.getBoundingClientRect();
-      const itemRect = item.getBoundingClientRect();
-      return {
-        mainOverflow: main.scrollWidth - main.clientWidth,
-        contentOverflow: content.scrollWidth - content.clientWidth,
-        slotRightOverflow: slotRect.right - itemRect.right,
-        contentOverflowStyle: contentStyle.overflow,
-        contentTextOverflow: contentStyle.textOverflow,
-        contentWhiteSpace: contentStyle.whiteSpace,
-      };
-    });
-
-    expect(geometry.mainOverflow, `${width}px: ${JSON.stringify(geometry)}`).toBe(0);
-    expect(geometry.contentOverflow, `${width}px: ${JSON.stringify(geometry)}`).toBeGreaterThan(0);
-    expect(geometry.slotRightOverflow, `${width}px: ${JSON.stringify(geometry)}`).toBeLessThanOrEqual(1);
-    expect(geometry.contentOverflowStyle).toBe('hidden');
-    expect(geometry.contentTextOverflow).toBe('ellipsis');
-    expect(geometry.contentWhiteSpace).toBe('nowrap');
-  }
-});
-
-test('credentialed MCP editor fits a compact desktop viewport without incidental scrolling', async ({ window: page }) => {
-  await page.setViewportSize({ width: 1164, height: 700 });
-  await page.getByRole('button', { name: '展开侧边栏' }).click();
-  await page.getByRole('navigation', { name: '对话列表' }).getByRole('button', { name: '扩展', exact: true }).click();
-  await page.locator('.maka-module-hub-selector').getByRole('button', { name: 'MCP' }).click();
-
-  const slackRow = page.locator('[data-maka-contract="mcp-market-row"]').filter({ hasText: 'Slack' });
-  await slackRow.getByRole('button', { name: '安装 Slack' }).click();
-  await slackRow.getByRole('button', { name: '管理' }).click();
-
-  const editor = page.getByRole('dialog', { name: '编辑 slack' });
-  await expect(editor).toBeVisible();
-  await expect.poll(() => editor.evaluate((element) => (
-    element.getAnimations().every((animation) => animation.playState === 'finished')
-  ))).toBe(true);
-  const overflow = await editor.evaluate((dialog) => {
-    const fields = dialog.querySelector<HTMLElement>('.maka-mcp-form-fields');
-    if (!fields) throw new Error('Expected MCP editor fields');
-    return {
-      dialog: dialog.scrollHeight - dialog.clientHeight,
-      fields: fields.scrollHeight - fields.clientHeight,
-    };
-  });
-
-  expect(overflow.dialog, JSON.stringify(overflow)).toBeLessThanOrEqual(1);
-  expect(overflow.fields, JSON.stringify(overflow)).toBeLessThanOrEqual(1);
-
-  const selectedTransportSpacing = await editor.getByRole('radio', { name: '本地 stdio' }).evaluate((radio) => {
-    const radioWrapper = radio.parentElement;
-    const icon = radioWrapper?.nextElementSibling;
-    if (!(radioWrapper instanceof HTMLElement) || !(icon instanceof SVGElement)) {
-      throw new Error('Expected selected transport radio and icon');
-    }
-    return icon.getBoundingClientRect().left - radioWrapper.getBoundingClientRect().right;
-  });
-  expect(selectedTransportSpacing).toBeGreaterThanOrEqual(4);
-});
-
 test('MCP module completes stdio add, discovery, disable, JSON import, and delete', async ({ window: page }) => {
   await page.getByRole('button', { name: '展开侧边栏' }).click();
   const sidebar = page.getByRole('navigation', { name: '对话列表' });
diff --git a/apps/desktop/e2e/onboarding.spec.ts b/apps/desktop/e2e/onboarding.spec.ts
index 697a4140df..b22b106b75 100644
--- a/apps/desktop/e2e/onboarding.spec.ts
+++ b/apps/desktop/e2e/onboarding.spec.ts
@@ -6,16 +6,6 @@ test('first run connects a provider and starts the first task without workspace
   await expect(onboarding.getByRole('heading', { name: '接入一个 AI，开始第一项任务。' })).toBeVisible();
   await expect(onboarding.locator('.maka-onboarding-provider-row')).toHaveCount(4);
 
-  await page.setViewportSize({ width: 480, height: 900 });
-  const cardRect = await onboarding.boundingBox();
-  const layoutRect = await page.locator('[data-chat-scroll-container="true"]').boundingBox();
-  expect(cardRect).not.toBeNull();
-  expect(layoutRect).not.toBeNull();
-  expect(cardRect?.x).toBeGreaterThanOrEqual(layoutRect?.x ?? 0);
-  expect((cardRect?.x ?? 0) + (cardRect?.width ?? 0)).toBeLessThanOrEqual(
-    (layoutRect?.x ?? 0) + (layoutRect?.width ?? 0),
-  );
-
   await onboarding.locator('.maka-onboarding-provider-row[data-provider="opencode-free"]').click();
 
   await expect(page.locator('[data-maka-contract="provider-setup"]')).toBeVisible();
diff --git a/apps/desktop/e2e/providers.spec.ts b/apps/desktop/e2e/providers.spec.ts
index 9818f1ee0d..6e35c14a4b 100644
--- a/apps/desktop/e2e/providers.spec.ts
+++ b/apps/desktop/e2e/providers.spec.ts
@@ -44,16 +44,12 @@ async function openCatalog(page: Page, options: { category: string; search: stri
   const search = catalog.getByPlaceholder('搜索服务商');
   const category = catalog.getByRole('combobox', { name: '分类', exact: true });
   await expect(search).toBeFocused();
-  const searchIcon = search.locator('xpath=..').locator('svg').first();
-  await expect(searchIcon).toHaveCSS('width', '16px');
-  await expect(searchIcon).toHaveCSS('height', '16px');
   // These are independent filters, not one composite toolbar: ordinary Tab
   // order must move between them in both directions.
   await page.keyboard.press('Tab');
   await expect(category).toBeFocused();
   await page.keyboard.press('Shift+Tab');
   await expect(search).toBeFocused();
-  await expect(catalog.getByRole('toolbar')).toHaveCount(0);
   await category.click();
   await page.getByRole('option', { name: options.category, exact: true }).click();
   await catalog.getByPlaceholder('搜索服务商').fill(options.search);
@@ -75,45 +71,6 @@ async function expectNoDialog(page: Page) {
   await expect(page.getByRole('dialog')).toHaveCount(0);
 }
 
-test('Models collection header matches its collection', async ({ window: page }) => {
-  await openModelsPage(page);
-  const panel = page.locator('[data-maka-contract="providers-panel"]');
-  await expect(panel.locator('ul')).toBeVisible();
-
-  const geometry = await panel.evaluate((element) => {
-    const heading = element.querySelector('h3')?.getBoundingClientRect();
-    const add = element.querySelector('[data-maka-contract="add-connection"]')?.getBoundingClientRect();
-    const list = element.querySelector('ul')?.getBoundingClientRect();
-    if (!heading || !add || !list) return null;
-    return {
-      headingLeft: heading.left,
-      addRight: add.right,
-      listLeft: list.left,
-      listRight: list.right,
-      headerBottom: Math.max(heading.bottom, add.bottom),
-      listTop: list.top,
-    };
-  });
-
-  expect(geometry).not.toBeNull();
-  if (!geometry) return;
-  expect(Math.abs(geometry.headingLeft - geometry.listLeft)).toBeLessThanOrEqual(0.5);
-  expect(Math.abs(geometry.addRight - geometry.listRight)).toBeLessThanOrEqual(0.5);
-  expect(geometry.listTop - geometry.headerBottom).toBeGreaterThanOrEqual(7.5);
-  expect(geometry.listTop - geometry.headerBottom).toBeLessThanOrEqual(8.5);
-
-  await expect(panel.getByRole('heading', { name: '模型连接', exact: true })).toBeVisible();
-  await expect(panel.getByText('· 1', { exact: true })).toBeVisible();
-
-  await page.evaluate(async () => {
-    await window.maka.connections.delete('e2e');
-  });
-  await page.reload();
-  await page.getByRole('button', { name: '设置' }).click();
-  await page.locator('[aria-label="设置分组"]').getByText('模型', { exact: true }).click();
-  await expect(panel.getByText(/^· \d+$/)).toHaveCount(0);
-});
-
 // Canonical API-key add journey. Cerebras is the concrete stand-in only because
 // it is the strongest exercise of the color-asset render contract (a real
 // upstream <img> mark that must stay untouched in BOTH light and dark themes);
@@ -159,20 +116,6 @@ test('adds a catalog provider through the canonical API-key setup page', async (
     await expect(setup.getByLabel('服务地址', { exact: true })).toHaveCount(0);
     await expect(setup.getByLabel('默认模型', { exact: true })).toHaveCount(0);
 
-    // A 300-character key scrolls inside the field instead of growing it. The
-    // before/after values are the oracle; the field's width is a design token,
-    // not this contract.
-    const inputBox = await keyInput.boundingBox();
-    await keyInput.fill(`sk-${'a'.repeat(300)}`);
-    const longKeyLayout = await keyInput.evaluate((input) => ({
-      clientWidth: input.clientWidth,
-      scrollWidth: input.scrollWidth,
-      clientHeight: input.clientHeight,
-      scrollHeight: input.scrollHeight,
-    }));
-    expect(longKeyLayout.scrollWidth).toBeGreaterThan(longKeyLayout.clientWidth);
-    expect(longKeyLayout.scrollHeight).toBe(longKeyLayout.clientHeight);
-    expect((await keyInput.boundingBox())?.height).toBe(inputBox?.height);
   });
 
   await test.step('saving creates the connection and lands on its detail level', async () => {
diff --git a/apps/desktop/e2e/send-message.spec.ts b/apps/desktop/e2e/send-message.spec.ts
index 10f483a161..91217ca93d 100644
--- a/apps/desktop/e2e/send-message.spec.ts
+++ b/apps/desktop/e2e/send-message.spec.ts
@@ -7,19 +7,6 @@ import { FAKE_MERMAID_HOSTILE_PROMPT, FAKE_MERMAID_PROMPT } from '@maka/runtime'
  * fixture's MAKA_E2E=1 forces sessions:create onto the fake backend, and the
  * seeded 'e2e' connection clears onboarding so the composer is usable.
  */
-test('send a message and see the fake backend stream a reply', async ({ window: page }) => {
-  const composer = page.locator(COMPOSER_INPUT);
-  // #1433: the deleted first-run panel had its own input, and the spec that
-  // covered the handoff between the two asserted this accessible name. With
-  // one composer left, the name is what a screen-reader user has to find the
-  // send target by — assert it on the path that exercises it.
-  await expect(composer).toHaveAttribute('aria-label', '消息输入框');
-  await composer.fill('hello e2e');
-  await composer.press('Enter');
-
-  await expect(page.getByText(/Fake backend received: hello e2e/)).toBeVisible();
-});
-
 /**
  * Enter commits a candidate in a CJK IME; nothing else may act on it. Both the
  * composer's send and ChatComposerInput's trigger menu read Enter, and the
diff --git a/apps/desktop/e2e/session-workbar.spec.ts b/apps/desktop/e2e/session-workbar.spec.ts
index 495495aac5..16f8c5f682 100644
--- a/apps/desktop/e2e/session-workbar.spec.ts
+++ b/apps/desktop/e2e/session-workbar.spec.ts
@@ -35,34 +35,6 @@ test('session tools share one user-controlled workbar', async ({ sessionWorkbarW
   await expect(resize).toHaveAttribute('aria-valuenow', '490');
   await expect(workbar).toHaveCSS('width', '490px');
 
-  // The seam is the canvas between two plates, and it is asserted as a GAP,
-  // not as a colour. Comparing the workbar's tone to another surface is what
-  // this used to do, and it passed while the column was invisible: it was
-  // compared to the sidebar, which paints the same value the conversation does,
-  // so "the workbar matches" and "the workbar has no boundary" were the same
-  // assertion. Every default palette but darwin dark resolves all three to
-  // `oklch(1 0 0)`.
-  const conversation = page.locator('.mainColumn');
-  const workbarBox = (await workbar.boundingBox())!;
-  const conversationBox = (await conversation.boundingBox())!;
-  const gutter = workbarBox.x - (conversationBox.x + conversationBox.width);
-  expect(Math.round(gutter)).toBe(4);
-  // And it is really canvas showing through, not a third surface: the frame
-  // holding both plates paints nothing.
-  await expect(page.locator('.maka-panel-detail')).toHaveCSS(
-    'background-color',
-    'rgba(0, 0, 0, 0)',
-  );
-  await expect(workbar).toHaveCSS('border-left-width', '0px');
-
-  // Two plates, one line. Each keeps the titlebar clearance as its own padding,
-  // so their top edges agree without either reaching outside its box for it —
-  // the previous formulation hung the column above the frame's padding box,
-  // which made the frame scroll the overhang into view on the first focus.
-  // Measured after the handle above took focus, which is what caught that.
-  expect(Math.round(workbarBox.y)).toBe(Math.round(conversationBox.y));
-  expect(Math.round(workbarBox.height)).toBe(Math.round(conversationBox.height));
-
   // Pointer drag, grabbed near the bottom of the divider: Astryx's default
   // side-placed grab zone lifts itself half its height off the handle, so a
   // low grab is what proves `pillPlacement="center"` is still holding the hit
@@ -149,22 +121,3 @@ test('session tools share one user-controlled workbar', async ({ sessionWorkbarW
   await expect(workbar).toBeHidden();
   await expect(page.getByRole('main', { name: '扩展' })).toBeVisible();
 });
-
-test('the right workbar stays mounted across repeated collapse', async ({
-  sessionWorkbarWindow: page,
-}) => {
-  const workbar = page.locator('[data-maka-contract="session-workbar-right"]');
-  await expect(workbar).toBeVisible();
-  const collapseOnce = async () => {
-    await page.getByRole('button', { name: '收起会话工作栏' }).click();
-    await expect(workbar).toHaveCount(1);
-    await expect(workbar).toBeHidden();
-    await expect(workbar).toHaveAttribute('data-collapsed', 'true');
-  };
-
-  await collapseOnce();
-  await page.getByRole('button', { name: '展开会话工作栏' }).click();
-  await expect(workbar).toBeVisible();
-  await expect(workbar).toHaveCSS('width', '480px');
-  await collapseOnce();
-});
diff --git a/apps/desktop/e2e/settings.spec.ts b/apps/desktop/e2e/settings.spec.ts
index fa961dcf5a..efff2d268e 100644
--- a/apps/desktop/e2e/settings.spec.ts
+++ b/apps/desktop/e2e/settings.spec.ts
@@ -28,21 +28,6 @@ test('changing the theme in settings applies to the UI', async ({ window: page }
   ).toBe(true);
 });
 
-test('settings back icon shares the navigation icon rail', async ({ window: page }) => {
-  await page.getByRole('button', { name: '展开侧边栏' }).click();
-  await page.getByRole('button', { name: '设置' }).click();
-
-  const iconCenterX = async (locator: ReturnType<Page['locator']>) => {
-    const box = await locator.boundingBox();
-    expect(box).not.toBeNull();
-    return box ? box.x + box.width / 2 : Number.NaN;
-  };
-  const backIcon = page.getByRole('button', { name: '返回应用', exact: true }).locator('svg').first();
-  const navIcon = settingsNavigation(page).getByRole('button', { name: '通用', exact: true }).locator('svg').first();
-
-  expect(Math.abs(await iconCenterX(backIcon) - await iconCenterX(navIcon))).toBeLessThanOrEqual(0.5);
-});
-
 test('subagent presets can be reviewed and edited in desktop settings', async ({ window: page }) => {
   await page.evaluate(async () => {
     const connections = await window.maka.connections.list();
diff --git a/apps/desktop/src/main/__tests__/app-update-activity.test.ts b/apps/desktop/src/main/__tests__/app-update-activity.test.ts
deleted file mode 100644
index c3b9ca6db0..0000000000
--- a/apps/desktop/src/main/__tests__/app-update-activity.test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-import { hasInterruptibleUpdateWork } from '../app-update-activity.js';
-
-describe('App update activity', () => {
-  test('guards every kind of work that app shutdown interrupts', () => {
-    const cases = [
-      { name: 'idle', session: false, automation: false, shells: 0, expected: false },
-      { name: 'session turn', session: true, automation: false, shells: 0, expected: true },
-      { name: 'Automation fire', session: false, automation: true, shells: 0, expected: true },
-      { name: 'background shell', session: false, automation: false, shells: 1, expected: true },
-    ];
-
-    for (const input of cases) {
-      assert.equal(
-        hasInterruptibleUpdateWork({
-          sessionActivities: { hasActive: () => input.session },
-          automationScheduler: { hasInFlight: () => input.automation },
-          shellRuns: { liveCount: () => input.shells },
-        }),
-        input.expected,
-        input.name,
-      );
-    }
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/artifact-list-keyboard.test.ts b/apps/desktop/src/main/__tests__/artifact-list-keyboard.test.ts
deleted file mode 100644
index 91f916f32b..0000000000
--- a/apps/desktop/src/main/__tests__/artifact-list-keyboard.test.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * Tests for the ArtifactPane list keyboard helper (PR108i, @kenji a11y gate #1).
- *
- * The pure helper has to handle five concerns simultaneously: arrow-key
- * selection wrapping, Home/End jumping, Enter/Space activation, Escape
- * dismissal, and "no nav key" passthrough. We lock the matrix down so a
- * future change can't accidentally start swallowing Esc (which would
- * break the global Command Palette) or stop wrapping at the bottom.
- */
-
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import {
-  nextArtifactListAction,
-  type ArtifactListAction,
-} from '../../renderer/artifact-list-keyboard.js';
-
-function expectAction(actual: ArtifactListAction, expected: ArtifactListAction) {
-  assert.deepEqual(actual, expected);
-}
-
-const IDS = ['a', 'b', 'c'] as const;
-
-describe('nextArtifactListAction', () => {
-  describe('empty list', () => {
-    it('returns noop regardless of key', () => {
-      for (const key of ['ArrowDown', 'ArrowUp', 'Home', 'End', 'Enter', ' ', 'Escape', 'q']) {
-        expectAction(
-          nextArtifactListAction({ currentSelectedId: undefined, visibleIds: [], key }),
-          { kind: 'noop' },
-        );
-      }
-    });
-  });
-
-  describe('arrow key selection', () => {
-    it('ArrowDown moves selection to next item', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'a', visibleIds: IDS, key: 'ArrowDown' }),
-        { kind: 'select', targetId: 'b' },
-      );
-    });
-
-    it('ArrowDown from last wraps to first', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'c', visibleIds: IDS, key: 'ArrowDown' }),
-        { kind: 'select', targetId: 'a' },
-      );
-    });
-
-    it('ArrowUp moves selection to previous item', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'b', visibleIds: IDS, key: 'ArrowUp' }),
-        { kind: 'select', targetId: 'a' },
-      );
-    });
-
-    it('ArrowUp from first wraps to last', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'a', visibleIds: IDS, key: 'ArrowUp' }),
-        { kind: 'select', targetId: 'c' },
-      );
-    });
-
-    it('ArrowDown with no current selection starts at first', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: undefined, visibleIds: IDS, key: 'ArrowDown' }),
-        { kind: 'select', targetId: 'a' },
-      );
-    });
-
-    it('ArrowUp with no current selection starts at last', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: undefined, visibleIds: IDS, key: 'ArrowUp' }),
-        { kind: 'select', targetId: 'c' },
-      );
-    });
-  });
-
-  describe('Home / End jumps', () => {
-    it('Home jumps to first', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'b', visibleIds: IDS, key: 'Home' }),
-        { kind: 'select', targetId: 'a' },
-      );
-    });
-
-    it('End jumps to last', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'a', visibleIds: IDS, key: 'End' }),
-        { kind: 'select', targetId: 'c' },
-      );
-    });
-  });
-
-  describe('Enter / Space activation', () => {
-    it('Enter activates current selection', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'b', visibleIds: IDS, key: 'Enter' }),
-        { kind: 'activate', targetId: 'b' },
-      );
-    });
-
-    it('Space activates current selection', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'b', visibleIds: IDS, key: ' ' }),
-        { kind: 'activate', targetId: 'b' },
-      );
-    });
-
-    it('Enter with no selection activates first item', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: undefined, visibleIds: IDS, key: 'Enter' }),
-        { kind: 'activate', targetId: 'a' },
-      );
-    });
-
-    it('Enter on a stale selection (no longer in list) falls back to first', () => {
-      // The list churns; the selected id might be deleted between renders.
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'gone', visibleIds: IDS, key: 'Enter' }),
-        { kind: 'activate', targetId: 'a' },
-      );
-    });
-  });
-
-  describe('Escape dismissal (does NOT swallow if list empty)', () => {
-    it('Escape on non-empty list returns dismiss', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'a', visibleIds: IDS, key: 'Escape' }),
-        { kind: 'dismiss' },
-      );
-    });
-
-    it('Escape on empty list returns noop (does not steal Esc from Command Palette)', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: undefined, visibleIds: [], key: 'Escape' }),
-        { kind: 'noop' },
-      );
-    });
-  });
-
-  describe('unrelated keys', () => {
-    it('letter keys return noop', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'a', visibleIds: IDS, key: 'q' }),
-        { kind: 'noop' },
-      );
-    });
-
-    it('Tab returns noop (focus moves via browser default, not list helper)', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'a', visibleIds: IDS, key: 'Tab' }),
-        { kind: 'noop' },
-      );
-    });
-
-    it('Shift+Tab returns noop', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'a', visibleIds: IDS, key: 'Tab' }),
-        { kind: 'noop' },
-      );
-    });
-
-    it('ArrowLeft / ArrowRight return noop (this is a vertical listbox)', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'a', visibleIds: IDS, key: 'ArrowLeft' }),
-        { kind: 'noop' },
-      );
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'a', visibleIds: IDS, key: 'ArrowRight' }),
-        { kind: 'noop' },
-      );
-    });
-  });
-
-  describe('priority order', () => {
-    // We lock the order so future edits don't surprise reviewers.
-    //   1. empty list → noop (regardless of key)
-    //   2. Escape → dismiss
-    //   3. Enter / Space → activate
-    //   4. ArrowDown/Up/Home/End → select
-    //   5. anything else → noop
-    it('empty list dominates Escape', () => {
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'a', visibleIds: [], key: 'Escape' }),
-        { kind: 'noop' },
-      );
-    });
-
-    it('Escape dominates ArrowDown when both could apply (Escape is the chord)', () => {
-      // (Synthetic: keys are single, but verifies the precedence in the switch)
-      expectAction(
-        nextArtifactListAction({ currentSelectedId: 'a', visibleIds: IDS, key: 'Escape' }),
-        { kind: 'dismiss' },
-      );
-    });
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/attachment-chat-render.test.ts b/apps/desktop/src/main/__tests__/attachment-chat-render.test.ts
deleted file mode 100644
index ccc99157b6..0000000000
--- a/apps/desktop/src/main/__tests__/attachment-chat-render.test.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import { createElement, type ReactNode } from 'react';
-import { renderToStaticMarkup } from 'react-dom/server';
-import type { AttachmentRef, SessionSummary, StoredMessage } from '@maka/core';
-import { ChatSurfaceLayout, ChatView, LocaleProvider } from '@maka/ui';
-
-function renderWithLocale(child: ReactNode): string {
-  return renderToStaticMarkup(
-    createElement(LocaleProvider, {
-      locale: 'zh',
-      children: createElement(ChatSurfaceLayout, { composer: null, children: child }),
-    }),
-  );
-}
-
-const activeSession: SessionSummary = {
-  id: 's1',
-  name: 'Sent reference check',
-  isFlagged: false,
-  isArchived: false,
-  labels: [],
-  hasUnread: false,
-  status: 'active',
-  backend: 'ai-sdk',
-  llmConnectionSlug: 'fixture',
-  connectionLocked: false,
-  model: 'fixture-model',
-  permissionMode: 'ask',
-};
-
-describe('sent reference frontend', () => {
-  it('keeps sent references outside the authored-text bubble', () => {
-    const attachments: AttachmentRef[] = [
-      {
-        kind: 'pdf',
-        name: 'design-spec.pdf',
-        mimeType: 'application/pdf',
-        bytes: 512_000,
-        ref: { kind: 'session_file', sessionId: 's1', relativePath: 'artifact-1' },
-      },
-      {
-        kind: 'image',
-        name: 'layout.png',
-        mimeType: 'image/png',
-        bytes: 4,
-        ref: { kind: 'session_file', sessionId: 's1', relativePath: 'artifact-2' },
-      },
-    ];
-    const messages: StoredMessage[] = [{
-      type: 'user',
-      id: 'u1',
-      turnId: 't1',
-      ts: 1,
-      text: '请用 /skill:writer 检查',
-      attachments,
-      quotes: [{ text: 'reference', sourceTurnId: 't0' }],
-    }];
-    const markup = renderWithLocale(createElement(ChatView, {
-      messages,
-      activeSession,
-      onNew: () => {},
-    } satisfies Parameters<typeof ChatView>[0]));
-
-    const bubbleIndex = markup.indexOf('astryx-chat-message-bubble');
-    assert.ok(markup.indexOf('astryx-token') < bubbleIndex);
-    assert.ok(markup.indexOf('maka-user-quotes') < bubbleIndex);
-    assert.ok(markup.indexOf('maka-user-attachments') < bubbleIndex);
-    assert.ok(markup.indexOf('astryx-badge') > bubbleIndex);
-  });
-
-  it('renders sent Skill invocations as neutral tokens without guessing @ text', () => {
-    const messages: StoredMessage[] = [
-      {
-        type: 'user',
-        id: 'u1',
-        turnId: 't1',
-        ts: 1,
-        text: '请用 /skill:writer 看 @notes',
-      },
-    ];
-    const markup = renderWithLocale(createElement(ChatView, {
-      messages,
-      activeSession,
-      onNew: () => {},
-    } satisfies Parameters<typeof ChatView>[0]));
-
-    assert.match(markup, /class="astryx-badge neutral[^"]*"[^>]*>[^<]*\/skill:writer<\/span>/);
-    assert.doesNotMatch(markup, /class="astryx-badge neutral[^"]*"[^>]*>[^<]*@notes<\/span>/);
-  });
-
-  it('keeps sent file tokens compact while exposing size accessibly', () => {
-    const attachment: AttachmentRef = {
-      kind: 'pdf',
-      name: 'design-spec.pdf',
-      mimeType: 'application/pdf',
-      bytes: 512_000,
-      ref: { kind: 'session_file', sessionId: 's1', relativePath: 'artifact-1' },
-    };
-    const messages: StoredMessage[] = [
-      { type: 'user', id: 'u1', turnId: 't1', ts: 1, text: '看下附件', attachments: [attachment] },
-    ];
-    const markup = renderWithLocale(createElement(ChatView, {
-      messages,
-      activeSession,
-      onNew: () => {},
-    } satisfies Parameters<typeof ChatView>[0]));
-
-    const tokenIndex = markup.indexOf('astryx-token');
-    const bubbleIndex = markup.indexOf('astryx-chat-message-bubble');
-    assert.notEqual(tokenIndex, -1);
-    assert.ok(tokenIndex < bubbleIndex);
-    assert.match(markup, /lucide-file-text/);
-    assert.match(markup, /class="[^"]*astryx-icon[^"]*"[^>]*data-size="sm"/);
-    assert.match(markup, /design-spec\.pdf/);
-    assert.match(markup, /aria-description="500\.0 KB"/);
-    assert.doesNotMatch(markup, />500\.0 KB</);
-    assert.doesNotMatch(markup, /maka-attachment-file-card/);
-  });
-
-  it('renders user image attachments inside the chat turn stream', () => {
-    const attachment: AttachmentRef = {
-      kind: 'image',
-      name: 'clipboard.png',
-      mimeType: 'image/png',
-      bytes: 4,
-      ref: { kind: 'session_file', sessionId: 's1', relativePath: 'artifact-1' },
-    };
-    const messages: StoredMessage[] = [
-      { type: 'user', id: 'u1', turnId: 't1', ts: 1, text: '看这张图', attachments: [attachment] },
-    ];
-    const markup = renderWithLocale(createElement(ChatView, {
-      messages,
-      activeSession,
-      onNew: () => {},
-    } satisfies Parameters<typeof ChatView>[0]));
-
-    assert.match(markup, /maka-user-attachments/);
-    assert.match(markup, /astryx-thumbnail/);
-    assert.doesNotMatch(markup, /maka-user-attachment-thumb(?:-pending|-image)?(?:\s|")/);
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/attachment-resize.test.ts b/apps/desktop/src/main/__tests__/attachment-resize.test.ts
deleted file mode 100644
index e5a695dd4d..0000000000
--- a/apps/desktop/src/main/__tests__/attachment-resize.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-import { computeResizeDimensions } from '../attachment-resize.js';
-
-describe('computeResizeDimensions', () => {
-  test('scales the longest edge down to the cap, preserving aspect ratio', () => {
-    assert.deepEqual(computeResizeDimensions(3000, 2000, 2000), { width: 2000, height: 1333 });
-  });
-
-  test('returns null when the image already fits the cap', () => {
-    assert.equal(computeResizeDimensions(2000, 1000, 2000), null);
-    assert.equal(computeResizeDimensions(1000, 2000, 2000), null);
-  });
-
-  test('returns null for a zero-dimension image (cannot scale)', () => {
-    assert.equal(computeResizeDimensions(0, 0, 2000), null);
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/branch-banner.test.ts b/apps/desktop/src/main/__tests__/branch-banner.test.ts
deleted file mode 100644
index 21ffcb58e1..0000000000
--- a/apps/desktop/src/main/__tests__/branch-banner.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Tests for branch banner derivation (PR109f).
- *
- * Locks the contract:
- *  - banner only renders for sessions with parentSessionId set
- *  - banner requires the parent session to be visible in the list
- *  - banner copy uses the parent's display name
- *  - fromAbortedTurn is caller-supplied; helper never guesses
- */
-
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import {
-  deriveBranchBanner,
-  type BranchBannerSessionInput,
-} from '../../renderer/branch-banner.js';
-
-function session(partial: Partial<BranchBannerSessionInput> & { id: string; name: string }): BranchBannerSessionInput {
-  return { ...partial };
-}
-
-describe('deriveBranchBanner', () => {
-  it('returns undefined for non-branched sessions', () => {
-    const active = session({ id: 's1', name: '原会话' });
-    const result = deriveBranchBanner(active, [active]);
-    assert.equal(result, undefined);
-  });
-
-  it('returns undefined when activeSession is undefined', () => {
-    const result = deriveBranchBanner(undefined, []);
-    assert.equal(result, undefined);
-  });
-
-  it('returns undefined when parentSessionId references a hidden session', () => {
-    // Parent archived / filtered out of the visible list — better to
-    // show no banner than render a banner that clicks into nothing.
-    const active = session({ id: 's2', name: '分支会话', parentSessionId: 'parent-not-here' });
-    const result = deriveBranchBanner(active, [active]);
-    assert.equal(result, undefined);
-  });
-
-  it('returns banner with parent name when parent is visible', () => {
-    const parent = session({ id: 'p1', name: '父会话' });
-    const active = session({ id: 's3', name: '分支会话', parentSessionId: 'p1' });
-    const result = deriveBranchBanner(active, [parent, active]);
-    assert.deepEqual(result, {
-      parentSessionId: 'p1',
-      parentSessionName: '父会话',
-    });
-  });
-
-  it('passes through fromAbortedTurn when caller supplies it', () => {
-    const parent = session({ id: 'p2', name: '父会话' });
-    const active = session({ id: 's4', name: '分支会话', parentSessionId: 'p2' });
-    const result = deriveBranchBanner(active, [parent, active], true);
-    assert.deepEqual(result, {
-      parentSessionId: 'p2',
-      parentSessionName: '父会话',
-      fromAbortedTurn: true,
-    });
-  });
-
-  it('omits fromAbortedTurn when caller passes false / undefined', () => {
-    const parent = session({ id: 'p3', name: '父会话' });
-    const active = session({ id: 's5', name: '分支会话', parentSessionId: 'p3' });
-    const resultFalse = deriveBranchBanner(active, [parent, active], false);
-    const resultUndef = deriveBranchBanner(active, [parent, active], undefined);
-    assert.equal(resultFalse?.fromAbortedTurn, undefined);
-    assert.equal(resultUndef?.fromAbortedTurn, undefined);
-  });
-
-  it('does not mutate the input sessions list', () => {
-    const parent = session({ id: 'p4', name: '父会话' });
-    const active = session({ id: 's6', name: '分支会话', parentSessionId: 'p4' });
-    const sessions = [parent, active];
-    const before = JSON.stringify(sessions);
-    deriveBranchBanner(active, sessions, true);
-    assert.equal(JSON.stringify(sessions), before);
-  });
-
-  it('uses the parent name verbatim (no truncation, no fallback)', () => {
-    // If parent rename is involved later, the banner must reflect the
-    // current name so the user sees the same label as in the sidebar.
-    const parent = session({ id: 'p5', name: '一个非常长的父会话名称用于测试不截断' });
-    const active = session({ id: 's7', name: '分支会话', parentSessionId: 'p5' });
-    const result = deriveBranchBanner(active, [parent, active]);
-    assert.equal(result?.parentSessionName, '一个非常长的父会话名称用于测试不截断');
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/build-info.test.ts b/apps/desktop/src/main/__tests__/build-info.test.ts
deleted file mode 100644
index 4ce31a088d..0000000000
--- a/apps/desktop/src/main/__tests__/build-info.test.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * PR-BUILD-HYGIENE-0: cover the dev/packaged + commit-resolution
- * branches of `resolveBuildInfo()` so the About-page badge cannot
- * silently regress.
- */
-
-import { strict as assert } from 'node:assert';
-import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { describe, it } from 'node:test';
-
-import { resolveBuildInfo } from '../build-info.js';
-
-function makeTempRepo(setup: (gitDir: string) => void): string {
-  const root = mkdtempSync(join(tmpdir(), 'maka-build-info-'));
-  const gitDir = join(root, '.git');
-  mkdirSync(gitDir, { recursive: true });
-  setup(gitDir);
-  return root;
-}
-
-describe('resolveBuildInfo', () => {
-  it('returns mode=packaged with no commit when app is packaged', () => {
-    const info = resolveBuildInfo(true, '/anywhere');
-    assert.equal(info.mode, 'packaged');
-    assert.equal(info.commit, null);
-  });
-
-  it('returns mode=dev with null commit when no .git is found', () => {
-    const root = mkdtempSync(join(tmpdir(), 'maka-build-info-nogit-'));
-    try {
-      const info = resolveBuildInfo(false, root);
-      assert.equal(info.mode, 'dev');
-      assert.equal(info.commit, null);
-    } finally {
-      rmSync(root, { recursive: true, force: true });
-    }
-  });
-
-  it('reads loose ref when HEAD points to a branch with a loose ref file', () => {
-    const fullSha = 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0';
-    const root = makeTempRepo((gitDir) => {
-      writeFileSync(join(gitDir, 'HEAD'), 'ref: refs/heads/main\n');
-      mkdirSync(join(gitDir, 'refs', 'heads'), { recursive: true });
-      writeFileSync(join(gitDir, 'refs', 'heads', 'main'), `${fullSha}\n`);
-    });
-    try {
-      const info = resolveBuildInfo(false, root);
-      assert.equal(info.mode, 'dev');
-      assert.equal(info.commit, fullSha.slice(0, 7));
-    } finally {
-      rmSync(root, { recursive: true, force: true });
-    }
-  });
-
-  it('falls back to packed-refs when the loose ref file is missing', () => {
-    const fullSha = 'feedfacedeadbeef0011223344556677889900aa';
-    const root = makeTempRepo((gitDir) => {
-      writeFileSync(join(gitDir, 'HEAD'), 'ref: refs/heads/main\n');
-      writeFileSync(
-        join(gitDir, 'packed-refs'),
-        `# pack-refs with: peeled fully-peeled sorted\n${fullSha} refs/heads/main\n`,
-      );
-    });
-    try {
-      const info = resolveBuildInfo(false, root);
-      assert.equal(info.commit, fullSha.slice(0, 7));
-    } finally {
-      rmSync(root, { recursive: true, force: true });
-    }
-  });
-
-  it('handles detached HEAD (HEAD contains a sha directly)', () => {
-    const fullSha = '0123456789abcdef0123456789abcdef01234567';
-    const root = makeTempRepo((gitDir) => {
-      writeFileSync(join(gitDir, 'HEAD'), `${fullSha}\n`);
-    });
-    try {
-      const info = resolveBuildInfo(false, root);
-      assert.equal(info.commit, fullSha.slice(0, 7));
-    } finally {
-      rmSync(root, { recursive: true, force: true });
-    }
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/computer-use-pip-appearance.test.ts b/apps/desktop/src/main/__tests__/computer-use-pip-appearance.test.ts
deleted file mode 100644
index dea3145c49..0000000000
--- a/apps/desktop/src/main/__tests__/computer-use-pip-appearance.test.ts
+++ /dev/null
@@ -1,381 +0,0 @@
-/**
- * What the Computer Use mirror looks like.
- *
- * Reported from a screenshot: a stray white L in one corner, two buttons
- * crowding the picture, and a bare blue dot standing in for the cursor. The
- * values behind those, and the ones recovered from Codex that replace them,
- * are asserted here as values — not as strings that happen to appear in the
- * file — so that reverting any single one of them fails.
- */
-
-import { strict as assert } from 'node:assert';
-import { readFile } from 'node:fs/promises';
-import { dirname, resolve } from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-import { describe, it, test } from 'node:test';
-import { CODEX_CURSOR_GLYPH } from '../../renderer/computer-use-overlay/engine/cursor-engine.js';
-
-const HERE = dirname(fileURLToPath(import.meta.url));
-const DESKTOP = resolve(HERE, '..', '..', '..');
-const PIP_HTML = resolve(DESKTOP, 'src', 'overlay', 'pip.html');
-/** Built by `build:overlay`, which `build:test` runs before `test:dist`. */
-const PIP_BUNDLE = resolve(DESKTOP, 'dist', 'overlay', 'pip.js');
-
-/** The page's stylesheet, comments removed. */
-async function styleSheet(): Promise<string> {
-  const html = await readFile(PIP_HTML, 'utf8');
-  const style = /<style>([\s\S]*?)<\/style>/.exec(html);
-  assert.ok(style, 'the page has a stylesheet');
-  return style[1].replace(/\/\*[\s\S]*?\*\//g, '');
-}
-
-/** The body of the block a selector opens, brace-balanced. */
-function block(css: string, opener: string): string {
-  const at = css.indexOf(opener);
-  assert.notEqual(at, -1, `${opener} is in the stylesheet`);
-  let depth = 0;
-  for (let i = css.indexOf('{', at); i < css.length; i += 1) {
-    if (css[i] === '{') depth += 1;
-    else if (css[i] === '}') {
-      depth -= 1;
-      if (depth === 0) return css.slice(css.indexOf('{', at) + 1, i);
-    }
-  }
-  throw new Error(`${opener} is never closed`);
-}
-
-/** One declared value out of a rule body, whitespace collapsed. */
-function declaration(body: string, property: string): string {
-  const found = new RegExp(`(?:^|[;{])\\s*${property}\\s*:([^;]*)`).exec(body);
-  assert.ok(found, `${property} is declared`);
-  return found[1].trim().replace(/\s+/g, ' ');
-}
-
-describe('Computer Use mirror appearance', () => {
-  it('draws the tile square, the way Codex draws it', async () => {
-    // Codex's container layer sets `masksToBounds` and a clear background and
-    // never calls `setCornerRadius:`; none of that selector's call sites lands
-    // in the mirror renderer. The 8px this replaces was Maka's own habit.
-    const css = await styleSheet();
-    const radius = declaration(block(css, '#shell {'), 'border-radius');
-    assert.equal(Number.parseFloat(radius), 0);
-  });
-
-  it('shows a loading checkerboard before the first frame, not a flat fill', async () => {
-    // 48pt squares, `((x / 48) + (y / 48)) % colors.count`, in the colourway
-    // that is reachable unconditionally: rgb(0.05, 0.34, 0.84) under
-    // rgb(0.09, 0.62, 0.95). Without this the pre-stream tile is a dead
-    // rectangle indistinguishable from a stalled run.
-    const css = await styleSheet();
-    const body = block(css, '#placeholder {');
-    const base = [0.05, 0.34, 0.84].map((c) => Math.round(c * 255));
-    const over = [0.09, 0.62, 0.95].map((c) => Math.round(c * 255));
-    const declared = declaration(body, 'background-color').match(/\d+/g) ?? [];
-    assert.deepEqual(declared.map(Number), base);
-
-    const image = declaration(body, 'background-image');
-    const stops = [...image.matchAll(/rgb\((\d+) (\d+) (\d+)\)/g)].map((m) => m.slice(1).map(Number));
-    assert.ok(stops.length >= 2, 'the checker colour is painted');
-    for (const stop of stops) assert.deepEqual(stop, over);
-
-    // Two 45° gradients on a 96pt period, the second offset by half of it,
-    // is a 48pt checkerboard.
-    const size = declaration(body, 'background-size').match(/[\d.]+/g)?.map(Number) ?? [];
-    assert.deepEqual(size, [96, 96]);
-    const position = declaration(body, 'background-position').match(/-?[\d.]+/g)?.map(Number) ?? [];
-    assert.deepEqual(position, [0, 0, 48, 48]);
-    const angles = [...image.matchAll(/(\d+)deg/g)].map((m) => Number(m[1]));
-    assert.deepEqual(angles, [45, 45]);
-  });
-
-  it('sweeps a light bar across the placeholder on Codex’s timing', async () => {
-    // frame(-64, 0, 64, h) at white 0.55, with `position.x` animated from -64
-    // to width + 64 over 1.6s, repeating forever. The layer's centre anchor
-    // puts its left edge at -96 and width + 32.
-    const css = await styleSheet();
-    const bar = block(css, '#sweep {');
-    assert.equal(Number.parseFloat(declaration(bar, 'width')), 64);
-    const alpha = declaration(bar, 'background').match(/\/ ([\d.]+)/)?.[1];
-    assert.equal(Number(alpha), 0.55);
-    const animation = declaration(bar, 'animation');
-    assert.equal(Number.parseFloat(/([\d.]+)s/.exec(animation)?.[1] ?? '0'), 1.6);
-    assert.match(animation, /\binfinite\b/);
-
-    const keyframes = block(css, '@keyframes pipSweep');
-    assert.equal(Number.parseFloat(declaration(block(keyframes, 'from {'), 'left')), -96);
-    const to = declaration(block(keyframes, 'to {'), 'left');
-    assert.equal(to.replace(/\s+/g, ''), 'calc(100%+32px)');
-  });
-
-  it('draws the cursor as the native arrow on its hotspot, not as a dot', async () => {
-    // Codex draws a 20 x 23pt cursor with hotspot (4, 4) whatever the source
-    // window measures — a tenth of the tile's edge at the 200pt default, so
-    // the glyph is not the few pixels of noise the dot was chosen over.
-    const html = await readFile(PIP_HTML, 'utf8');
-    const css = await styleSheet();
-    const box = block(css, '#cursor {');
-    assert.equal(Number.parseFloat(declaration(box, 'width')), 20);
-    assert.equal(Number.parseFloat(declaration(box, 'height')), 23);
-    // The hotspot lands on the mapped point: the box is pulled back by it.
-    const margin = declaration(box, 'margin').match(/-?[\d.]+/g)?.map(Number) ?? [];
-    assert.deepEqual(margin, [-4, 0, 0, -4]);
-    // Nothing round is left: no radius, no dot variable.
-    assert.equal(/border-radius/.test(box), false);
-    assert.equal(/--dot/.test(css), false);
-
-    const path = /<path d="([^"]+)"/.exec(html);
-    assert.ok(path, 'the cursor has a path');
-    const drawn = (path[1].match(/-?[\d.]+/g) ?? []).map(Number);
-
-    // The same AgentCursor path the on-screen cursor draws, on a 16pt frame
-    // offset by the hotspot — which is also what puts the arrow's tip at
-    // (4, 4), the two recoveries agreeing without being fitted to each other.
-    const g = CODEX_CURSOR_GLYPH;
-    const at = ([x, y]: readonly [number, number]) => [4 + x * 16, 4 + y * 16];
-    const expected = [
-      at(g.start),
-      at(g.curve1[1]),
-      at(g.curve1[2]),
-      at(g.curve1[0]),
-      at(g.line1),
-      at(g.curve2[1]),
-      at(g.curve2[2]),
-      at(g.curve2[0]),
-      at(g.line2),
-      at(g.line3),
-      at(g.curve3[1]),
-      at(g.curve3[2]),
-      at(g.curve3[0]),
-    ].flat();
-    assert.equal(drawn.length, expected.length);
-    for (const [i, value] of expected.entries()) {
-      assert.ok(
-        Math.abs(drawn[i] - value) < 1e-3,
-        `point ${i} is ${drawn[i]}, the glyph puts it at ${value}`,
-      );
-    }
-
-    // The white rim is what keeps a small dark glyph readable over arbitrary
-    // imagery, the same reading the on-screen cursor is drawn with.
-    const paint = block(css, '#cursor path {');
-    assert.equal(Number(declaration(paint, 'stroke').match(/\/ ([\d.]+)/)?.[1]), 0.8);
-    assert.equal(Number.parseFloat(declaration(paint, 'stroke-width')), 2);
-    assert.equal(declaration(paint, 'stroke-linejoin'), 'miter');
-    assert.equal(Number.parseFloat(declaration(paint, 'stroke-miterlimit')), 10);
-  });
-
-  it('separates the controls from the picture instead of sitting on it', async () => {
-    // Two 20pt buttons straight on the mirrored window had no edge of their
-    // own against light content. A gradient scrim, not a backdrop filter:
-    // over moving arbitrary imagery the filter is the expensive half.
-    const css = await styleSheet();
-    const scrim = block(css, '#chrome {');
-    assert.ok(Number.parseFloat(declaration(scrim, 'height')) > 0);
-    const gradient = declaration(scrim, 'background');
-    const alphas = [...gradient.matchAll(/\/ ([\d.]+)\)/g)].map((m) => Number(m[1]));
-    assert.deepEqual(alphas, [0.45, 0]);
-    assert.equal(/backdrop-filter/.test(css), false);
-    assert.equal(Number.parseFloat(declaration(block(css, '#chrome {'), 'opacity')), 0);
-    assert.equal(
-      Number.parseFloat(declaration(block(css, "#chrome[data-visible='1'] {"), 'opacity')),
-      1,
-    );
-    // The controls stand off the corner far enough to read as chrome.
-    const controls = block(css, '#controls {');
-    assert.ok(Number.parseFloat(declaration(controls, 'top')) >= 8);
-    assert.ok(Number.parseFloat(declaration(controls, 'right')) >= 8);
-  });
-
-  it('gives the resize grip the controls’ chip so it is not a stray mark', async () => {
-    // Two hairlines drawn straight onto the picture were read as a white L
-    // left over from something else. The buttons' scrim says it belongs to
-    // the same set, and the shared inset says so again.
-    const css = await styleSheet();
-    const grip = block(css, '#resize {');
-    const button = block(css, '#controls button {');
-    assert.equal(declaration(grip, 'background'), declaration(button, 'background'));
-    assert.equal(declaration(grip, 'box-shadow'), declaration(button, 'box-shadow'));
-    assert.equal(
-      Number.parseFloat(declaration(grip, 'left')),
-      Number.parseFloat(declaration(block(css, '#controls {'), 'right')),
-    );
-    assert.equal(declaration(grip, 'cursor'), 'nwse-resize');
-  });
-
-  it('moves the grip to the corner opposite whichever anchor main sends down', async () => {
-    // The gesture's sign follows the anchor (pipResizeEdge), so the handle has
-    // to as well. The CSS used to hard-code `left: 8px; top: 8px` — the corner
-    // opposite the default bottom-right anchor and wrong in the other three.
-    // Anchored top-left, the grip sat on the pinned corner: dragging it grew
-    // the tile from the far edge while the handle could not move, so the
-    // pointer came off it on the first pixel.
-    const css = await styleSheet();
-    // Every corner the mirror can rest on has a rule, keyed on the attribute
-    // the page sets from `pip:layout`.
-    const corners = {
-      // The bare rule is the default: opposite bottom-right.
-      'top-left': block(css, '#resize {'),
-      'top-right': block(css, "body[data-grip='top-right'] #resize {"),
-      'bottom-left': block(css, "body[data-grip='bottom-left'] #resize {"),
-      'bottom-right': block(css, "body[data-grip='bottom-right'] #resize {"),
-    } as const;
-    for (const [corner, rule] of Object.entries(corners)) {
-      const [vertical, horizontal] = corner.split('-');
-      // The inset the corner names is the one that is set; the other is auto,
-      // because a stale `left` beats a new `right` and the chip would stay.
-      assert.equal(Number.parseFloat(declaration(rule, vertical)), 8, `${corner}: ${vertical}`);
-      assert.equal(Number.parseFloat(declaration(rule, horizontal)), 8, `${corner}: ${horizontal}`);
-      const oppositeV = vertical === 'top' ? 'bottom' : 'top';
-      const oppositeH = horizontal === 'left' ? 'right' : 'left';
-      if (rule !== corners['top-left']) {
-        assert.equal(declaration(rule, oppositeV), 'auto', `${corner}: ${oppositeV}`);
-        assert.equal(declaration(rule, oppositeH), 'auto', `${corner}: ${oppositeH}`);
-      }
-      // A grip on the ↖↘ diagonal points that way; the other two are ↗↙.
-      const diagonal = corner === 'top-left' || corner === 'bottom-right';
-      assert.equal(
-        declaration(rule, 'cursor'),
-        diagonal ? 'nwse-resize' : 'nesw-resize',
-        `${corner}: cursor`,
-      );
-    }
-    // The controls own the top-right, so they move when the grip is sent there.
-    const moved = block(css, "body[data-grip='top-right'] #controls {");
-    assert.equal(declaration(moved, 'right'), 'auto');
-    assert.equal(Number.parseFloat(declaration(moved, 'left')), 8);
-  });
-});
-
-// ── the page, running ────────────────────────────────────────────────────────
-
-type Stub = {
-  dataset: Record<string, string>;
-  style: Record<string, string> & { setProperty(name: string, value: string): void };
-  clientWidth: number;
-  clientHeight: number;
-  src: string;
-  addEventListener(): void;
-};
-
-function element(): Stub {
-  const style = {
-    setProperty(this: Record<string, string>, name: string, value: string) {
-      this[name] = value;
-    },
-  } as Stub['style'];
-  return {
-    dataset: {},
-    style,
-    clientWidth: 0,
-    clientHeight: 0,
-    src: '',
-    addEventListener() {},
-    classList: { add() {} },
-  } as unknown as Stub;
-}
-
-type Bridge = {
-  frame(payload: unknown): void;
-  cursor(payload: unknown): void;
-  controls(payload: unknown): void;
-  layout(payload: unknown): void;
-};
-
-/** Load the built page against a stub DOM and hand back its inputs. */
-let loads = 0;
-async function loadPage(): Promise<{ nodes: Record<string, Stub>; body: Stub; send: Bridge }> {
-  const nodes: Record<string, Stub> = {};
-  for (const id of ['frame', 'cursor', 'placeholder', 'chrome', 'controls', 'resize']) {
-    nodes[id] = element();
-  }
-  const handlers: Record<string, (payload?: unknown) => void> = {};
-  const bridge = {
-    onFrame: (cb: (p: unknown) => void) => {
-      handlers.frame = cb;
-    },
-    onCursor: (cb: (p: unknown) => void) => {
-      handlers.cursor = cb;
-    },
-    onControls: (cb: (p: unknown) => void) => {
-      handlers.controls = cb;
-    },
-    onLayout: (cb: (p: unknown) => void) => {
-      handlers.layout = cb;
-    },
-    onCompleted: (cb: () => void) => {
-      handlers.completed = cb;
-    },
-    send: () => {},
-  };
-  const body = element();
-  const globals = globalThis as unknown as Record<string, unknown>;
-  globals.document = {
-    getElementById: (id: string) => nodes[id] ?? null,
-    addEventListener: () => {},
-    body,
-  };
-  globals.window = { addEventListener: () => {}, computerUsePip: bridge };
-  // A fresh copy per call. The bundle registers its handlers as a side effect
-  // of being evaluated, and a plain re-import is served from the module cache:
-  // the second caller would get its bridge back untouched and every handler
-  // undefined.
-  loads += 1;
-  await import(`${pathToFileURL(PIP_BUNDLE).href}?load=${loads}`);
-  return {
-    nodes,
-    body,
-    send: {
-      frame: (p) => handlers.frame(p),
-      cursor: (p) => handlers.cursor(p),
-      controls: (p) => handlers.controls(p),
-      layout: (p) => handlers.layout(p),
-    },
-  };
-}
-
-test('the placeholder comes down when the stream starts, and the chrome moves with the controls', async () => {
-  const { nodes, send } = await loadPage();
-
-  // The mirror is letterboxed, so the cursor's position in capture pixels is
-  // not its position in the element. This is the mapping the arrow inherited
-  // from the dot unchanged; it is asserted here so the redraw cannot move it.
-  nodes.frame.clientWidth = 200;
-  nodes.frame.clientHeight = 200;
-  send.frame({ src: 'data:image/png;base64,x', widthPx: 400, heightPx: 300 });
-  assert.equal(nodes.placeholder.dataset.visible, '0');
-  assert.equal(nodes.frame.src, 'data:image/png;base64,x');
-
-  send.cursor({ x: 200, y: 150 });
-  assert.equal(nodes.cursor.style.left, '100px');
-  assert.equal(nodes.cursor.style.top, '100px');
-  assert.equal(nodes.cursor.dataset.visible, '1');
-  // Nothing sizes the cursor from JS any more; it is a fixed 20 x 23 box.
-  assert.equal(nodes.cursor.style['--dot'], undefined);
-
-  send.controls({ visible: true });
-  assert.equal(nodes.chrome.dataset.visible, '1');
-  assert.equal(nodes.controls.dataset.visible, '1');
-  assert.equal(nodes.resize.dataset.visible, '1');
-  send.controls({ visible: false });
-  assert.equal(nodes.chrome.dataset.visible, '0');
-});
-
-test('the page moves the grip to whichever corner main names', async () => {
-  // The CSS can only follow the anchor if the page is told what the anchor is,
-  // and before `pip:layout` nothing sent it: `grep alignment src/overlay/`
-  // returned nothing at all, so the grip was frozen on the tile's top-left.
-  const { body, send } = await loadPage();
-
-  send.layout({ alignment: 'top-left', gripCorner: 'bottom-right' });
-  assert.equal(body.dataset.grip, 'bottom-right');
-  send.layout({ alignment: 'bottom-left', gripCorner: 'top-right' });
-  assert.equal(body.dataset.grip, 'top-right');
-
-  // Anything the page does not recognise leaves the grip where it is, rather
-  // than clearing the attribute and dropping the tile back to the default
-  // corner while it is anchored somewhere else.
-  send.layout({ alignment: 'top-left', gripCorner: 'middle' });
-  assert.equal(body.dataset.grip, 'top-right');
-  send.layout(null);
-  assert.equal(body.dataset.grip, 'top-right');
-});
diff --git a/apps/desktop/src/main/__tests__/computer-use-pip-motion.test.ts b/apps/desktop/src/main/__tests__/computer-use-pip-motion.test.ts
deleted file mode 100644
index 8669b54cd5..0000000000
--- a/apps/desktop/src/main/__tests__/computer-use-pip-motion.test.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-// Contract for the picture-in-picture mirror's motion: the spring, the anchor
-// set, the throw projection and the pointer tracker. These are the parts that
-// can be checked exactly, so they are checked exactly — the numbers came from
-// Codex's sky.node and a silent drift in any of them would be felt but not
-// seen.
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import {
-  PIP_SPRING,
-  PIP_THROW_MAX,
-  PIP_THROW_REFERENCE,
-  PIP_THROW_SCALE,
-  PipDragTracker,
-  anchorFor,
-  pipGripCorner,
-  pipResizeEdge,
-  clampToWorkArea,
-  pickPipAnchor,
-  pipAnchors,
-  springAtRest,
-  stepSpring,
-} from '../computer-use/pip-motion.js';
-
-const HOST = { x: 0, y: 0, width: 1000, height: 800 };
-const SIZE = { width: 200, height: 125 };
-
-test('picture-in-picture motion', async (t) => {
-  await t.test('carries Codex’s spring constants, and their damping ratios', () => {
-    // `configureMotionSpringsWithLeadItem:dragging:programmaticMove:`, lead column.
-    assert.deepEqual(PIP_SPRING.settling, { stiffness: 320, damping: 42 });
-    assert.deepEqual(PIP_SPRING.dragging, { stiffness: 900, damping: 55 });
-
-    // The ratios are the reason those numbers and not others: settling must not
-    // overshoot the corner it is landing on, dragging should keep a little give.
-    const ratio = (s: { stiffness: number; damping: number }) =>
-      s.damping / (2 * Math.sqrt(s.stiffness));
-    assert.ok(ratio(PIP_SPRING.settling) > 1, 'settling is overdamped, so it never bounces');
-    assert.ok(ratio(PIP_SPRING.dragging) < 1, 'dragging is under critical, so it has give');
-    assert.ok(ratio(PIP_SPRING.dragging) > 0.85, 'but only just — it must not wobble');
-  });
-
-  await t.test('the spring arrives, and never overshoots while settling', () => {
-    let state = { position: { x: 0, y: 0 }, velocity: { x: 0, y: 0 } };
-    const target = { x: 400, y: 300 };
-    let maxX = 0;
-    for (let i = 0; i < 240 && !springAtRest(state, target); i++) {
-      state = stepSpring(state, target, PIP_SPRING.settling, 1 / 60);
-      maxX = Math.max(maxX, state.position.x);
-    }
-    assert.ok(springAtRest(state, target), 'arrives inside four seconds');
-    assert.ok(maxX <= target.x + 0.5, `overdamped means no overshoot (peaked at ${maxX})`);
-  });
-
-  await t.test('a dropped frame makes the spring late, never explosive', () => {
-    // Explicit Euler gains energy at large dt. A backgrounded window can hand
-    // us a gap of seconds, and the mirror must not be launched off-screen by
-    // the machine having been busy.
-    let state = { position: { x: 0, y: 0 }, velocity: { x: 0, y: 0 } };
-    const target = { x: 400, y: 0 };
-    for (let i = 0; i < 60; i++) state = stepSpring(state, target, PIP_SPRING.settling, 5);
-    assert.ok(Number.isFinite(state.position.x));
-    assert.ok(state.position.x <= target.x + 1, 'still converges from above');
-    assert.ok(springAtRest(state, target));
-  });
-
-  await t.test('offers one anchor per corner, inset by the same margin', () => {
-    const anchors = pipAnchors(HOST, SIZE, 24);
-    assert.equal(anchors.length, 4);
-    assert.deepEqual(anchorFor(anchors, 'top-left')?.point, { x: 24, y: 24 });
-    assert.deepEqual(anchorFor(anchors, 'top-right')?.point, { x: 1000 - 200 - 24, y: 24 });
-    assert.deepEqual(anchorFor(anchors, 'bottom-left')?.point, { x: 24, y: 800 - 125 - 24 });
-    assert.deepEqual(anchorFor(anchors, 'bottom-right')?.point, {
-      x: 1000 - 200 - 24,
-      y: 800 - 125 - 24,
-    });
-  });
-
-  await t.test('a still release lands on the corner it is nearest', () => {
-    const anchors = pipAnchors(HOST, SIZE, 24);
-    const near = { x: 700, y: 40 };
-    assert.equal(pickPipAnchor(anchors, near, { x: 0, y: 0 }, HOST).alignment, 'top-right');
-    assert.equal(
-      pickPipAnchor(anchors, { x: 30, y: 600 }, { x: 0, y: 0 }, HOST).alignment,
-      'bottom-left',
-    );
-  });
-
-  await t.test('a throw lands where it was aimed, not where it started', () => {
-    // This is the whole point of the projection. Released in the top-left
-    // quadrant but flung hard to the right, the mirror must cross the window —
-    // nearest-corner alone would drop it back where it came from.
-    const anchors = pipAnchors(HOST, SIZE, 24);
-    const from = { x: 300, y: 40 };
-    assert.equal(
-      pickPipAnchor(anchors, from, { x: 0, y: 0 }, HOST).alignment,
-      'top-left',
-      'without a throw it stays near',
-    );
-    assert.equal(
-      pickPipAnchor(anchors, from, { x: 3000, y: 0 }, HOST).alignment,
-      'top-right',
-      'thrown right, it crosses',
-    );
-    assert.equal(
-      pickPipAnchor(anchors, from, { x: 2000, y: 2500 }, HOST).alignment,
-      'bottom-right',
-      'thrown down and right, it takes the far corner',
-    );
-  });
-
-  await t.test('carries Codex’s throw constants', () => {
-    assert.equal(PIP_THROW_SCALE, 0.55);
-    assert.equal(PIP_THROW_REFERENCE, 5000);
-    assert.equal(PIP_THROW_MAX, 0.45);
-  });
-
-  await t.test('the grip is on the corner the resize gesture actually moves', () => {
-    // `pipResizeEdge` takes its sign from the anchor, because the anchored
-    // corner is the one held still while the tile grows. The handle has to be
-    // on the corner that moves, or the pointer separates from it immediately.
-    // These two functions are the only reason the gesture is coherent, and
-    // they used to disagree: the sign came from here and the handle's position
-    // was hard-coded to the tile's top-left in CSS.
-    assert.equal(pipGripCorner('bottom-right'), 'top-left');
-    assert.equal(pipGripCorner('bottom-left'), 'top-right');
-    assert.equal(pipGripCorner('top-right'), 'bottom-left');
-    assert.equal(pipGripCorner('top-left'), 'bottom-right');
-
-    // Stated as the invariant rather than as four pairs: for every anchor, the
-    // grip is on the opposite corner *and* dragging it away from the anchor
-    // grows the tile. Flip either function alone and this fails.
-    for (const alignment of ['top-left', 'top-right', 'bottom-left', 'bottom-right'] as const) {
-      const grip = pipGripCorner(alignment);
-      assert.notEqual(grip.startsWith('top'), alignment.startsWith('top'), alignment);
-      assert.notEqual(grip.endsWith('left'), alignment.endsWith('left'), alignment);
-      // The grip is below the anchor exactly when dragging down must grow.
-      const growsDownward = pipResizeEdge(200, 500, 560, alignment) > 200;
-      assert.equal(growsDownward, grip.startsWith('bottom'), alignment);
-    }
-  });
-
-  await t.test('a resize drag grows away from the anchor, in every corner', () => {
-    // `-[PIPStackResizeInteraction maxDisplaySizeForPointerScreenPoint:]` is
-    // four instructions: a sign chosen from the alignment, and the pointer's
-    // vertical travel added to the edge it started at. Only the vertical
-    // component moves it, and the sign is what makes the gesture read the same
-    // wherever the mirror is resting: away from the anchor grows it.
-    //
-    // Anchored at the top, the grip is below, so dragging down grows.
-    assert.equal(pipResizeEdge(200, 500, 560, 'top-left'), 260);
-    assert.equal(pipResizeEdge(200, 500, 440, 'top-left'), 140);
-    // Anchored at the bottom, the grip is above, so dragging up grows.
-    assert.equal(pipResizeEdge(200, 500, 440, 'bottom-right'), 260);
-    assert.equal(pipResizeEdge(200, 500, 560, 'bottom-right'), 140);
-  });
-
-  await t.test('a resize stays inside Codex’s clamp and lands on whole points', () => {
-    // The same [100, 400] the rest of the sizing uses — the three constants are
-    // literally the same doubles in the binary. A fractional edge on a
-    // transparent window shimmers, which is what Codex's
-    // `snapPointToBackingScale:` exists to stop.
-    assert.equal(pipResizeEdge(200, 500, 5000, 'top-left'), 400, 'ceiling');
-    assert.equal(pipResizeEdge(200, 500, -5000, 'top-left'), 100, 'floor');
-    assert.equal(pipResizeEdge(200, 500, 500.4, 'top-left') % 1, 0, 'whole points');
-  });
-
-  await t.test('a resize that does not move the pointer does not move the edge', () => {
-    assert.equal(pipResizeEdge(200, 500, 500, 'top-left'), 200);
-    assert.equal(pipResizeEdge(137, 500, 500, 'bottom-left'), 137);
-  });
-
-  await t.test('never leaves the mirror off the display', () => {
-    const work = { x: 0, y: 0, width: 1440, height: 900 };
-    assert.deepEqual(clampToWorkArea({ x: -500, y: -500 }, SIZE, work), { x: 0, y: 0 });
-    assert.deepEqual(clampToWorkArea({ x: 5000, y: 5000 }, SIZE, work), {
-      x: 1440 - 200,
-      y: 900 - 125,
-    });
-  });
-
-  await t.test('the drag keeps the grab point under the pointer', () => {
-    // Grab the mirror 30pt in and 20pt down, and that spot stays under the
-    // cursor for the whole drag. Anything else makes the window jump on
-    // mousedown, which reads as the drag having missed.
-    const tracker = new PipDragTracker({ x: 130, y: 220 }, { x: 100, y: 200 }, 0);
-    assert.deepEqual(tracker.update({ x: 530, y: 420 }, 100), { x: 500, y: 400 });
-    assert.deepEqual(tracker.update({ x: 330, y: 320 }, 200), { x: 300, y: 300 });
-  });
-
-  await t.test('velocity comes from the last pair of samples only', () => {
-    // A flick that ends in a pause is not a flick. Averaging the whole drag
-    // would throw the mirror anyway, which is the opposite of what the pause
-    // said.
-    const tracker = new PipDragTracker({ x: 0, y: 0 }, { x: 0, y: 0 }, 0);
-    tracker.update({ x: 500, y: 0 }, 100);
-    assert.deepEqual(tracker.velocity(), { x: 5000, y: 0 }, 'a fast sample is a fast throw');
-    tracker.update({ x: 500, y: 0 }, 600);
-    assert.deepEqual(tracker.velocity(), { x: 0, y: 0 }, 'and then it stopped');
-  });
-
-  await t.test('a duplicate pointer event is not an infinite flick', () => {
-    const tracker = new PipDragTracker({ x: 0, y: 0 }, { x: 0, y: 0 }, 0);
-    tracker.update({ x: 10, y: 10 }, 50);
-    tracker.update({ x: 20, y: 20 }, 50);
-    const v = tracker.velocity();
-    assert.ok(Number.isFinite(v.x) && Number.isFinite(v.y), `finite, got ${JSON.stringify(v)}`);
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/custom-pet-companion-model.test.ts b/apps/desktop/src/main/__tests__/custom-pet-companion-model.test.ts
deleted file mode 100644
index 68746dfef7..0000000000
--- a/apps/desktop/src/main/__tests__/custom-pet-companion-model.test.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import type { PetPackManifestV1 } from '@maka/core';
-import {
-  derivePetActivityState,
-  loadSelectedPetCompanion,
-  petFrameSourceRect,
-  samplePetAnimation,
-  shouldReducePetMotion,
-  syncPetPlaybackState,
-  type PetCompanionSource,
-} from '../../renderer/custom-pet-companion-model.js';
-
-function manifest(id = 'likun.maodie'): PetPackManifestV1 {
-  return {
-    schema: 'maka.pet/v1',
-    id,
-    displayName: '耄耋',
-    spriteSheet: {
-      path: 'sprites.png',
-      format: 'png',
-      frameWidth: 64,
-      frameHeight: 48,
-      columns: 3,
-      rows: 2,
-      frameCount: 6,
-    },
-    animations: {
-      idle: { frames: [0, 2, 5], fps: 2, loop: true },
-      working: { frames: [1], fps: 1, loop: true },
-      'needs-input': { frames: [2], fps: 1, loop: true },
-      ready: { frames: [3], fps: 1, loop: true },
-      blocked: { frames: [4], fps: 1, loop: true },
-    },
-  };
-}
-
-function source(overrides: Partial<PetCompanionSource> = {}): PetCompanionSource {
-  const pet = manifest();
-  return {
-    getSelection: async () => pet.id,
-    list: async () => [pet],
-    readSpriteSheet: async () => ({
-      ok: true,
-      mimeType: 'image/png',
-      bytes: Uint8Array.of(1, 2, 3),
-    }),
-    ...overrides,
-  };
-}
-
-describe('custom pet companion model', () => {
-  it('projects authoritative runtime signals onto pet activity states', () => {
-    const base = {
-      hasActiveSession: true,
-      hasActiveInteraction: false,
-      turnActive: false,
-      sessionStatus: 'active' as const,
-    };
-
-    assert.equal(derivePetActivityState(base), 'idle');
-    assert.equal(derivePetActivityState({ ...base, turnActive: true }), 'working');
-    assert.equal(derivePetActivityState({
-      ...base,
-      turnActive: true,
-      hasActiveInteraction: true,
-    }), 'needs-input');
-    assert.equal(derivePetActivityState({
-      ...base,
-      sessionStatus: 'waiting_for_user',
-    }), 'needs-input');
-    assert.equal(derivePetActivityState({
-      ...base,
-      turnActive: true,
-      sessionStatus: 'blocked',
-    }), 'blocked');
-    assert.equal(derivePetActivityState({
-      ...base,
-      hasActiveSession: false,
-      turnActive: true,
-    }), 'idle');
-  });
-
-  it('lets a completion pulse finish before ordinary idle takes over', () => {
-    assert.equal(syncPetPlaybackState({
-      currentState: 'working',
-      activityState: 'working',
-      completionArrived: true,
-      contextChanged: false,
-    }), 'ready');
-    assert.equal(syncPetPlaybackState({
-      currentState: 'ready',
-      activityState: 'idle',
-      completionArrived: false,
-      contextChanged: false,
-    }), 'ready');
-    assert.equal(syncPetPlaybackState({
-      currentState: 'ready',
-      activityState: 'blocked',
-      completionArrived: false,
-      contextChanged: false,
-    }), 'blocked');
-    assert.equal(syncPetPlaybackState({
-      currentState: 'ready',
-      activityState: 'idle',
-      completionArrived: false,
-      contextChanged: true,
-    }), 'idle');
-  });
-
-  it('does not read the library when custom pets are disabled', async () => {
-    let listCalls = 0;
-    const result = await loadSelectedPetCompanion(source({
-      getSelection: async () => null,
-      list: async () => {
-        listCalls += 1;
-        return [];
-      },
-    }));
-
-    assert.deepEqual(result, { kind: 'none' });
-    assert.equal(listCalls, 0);
-  });
-
-  it('loads the selected manifest and its local sprite bytes', async () => {
-    const result = await loadSelectedPetCompanion(source());
-
-    assert.equal(result.kind, 'ready');
-    if (result.kind !== 'ready') return;
-    assert.equal(result.manifest.id, 'likun.maodie');
-    assert.equal(result.mimeType, 'image/png');
-    assert.deepEqual([...result.bytes], [1, 2, 3]);
-  });
-
-  it('fails closed for stale selections and unreadable assets', async () => {
-    assert.deepEqual(await loadSelectedPetCompanion(source({ list: async () => [] })), {
-      kind: 'none',
-    });
-    assert.deepEqual(await loadSelectedPetCompanion(source({
-      readSpriteSheet: async () => ({ ok: false, reason: 'corrupt_pack' }),
-    })), { kind: 'none' });
-  });
-
-  it('samples sparse looping frames from elapsed time', () => {
-    const animation = manifest().animations.idle;
-
-    assert.deepEqual(samplePetAnimation(animation, 0), {
-      frame: 0, sequenceIndex: 0, complete: false,
-    });
-    assert.equal(samplePetAnimation(animation, 500).frame, 2);
-    assert.equal(samplePetAnimation(animation, 1_000).frame, 5);
-    assert.equal(samplePetAnimation(animation, 1_500).frame, 0);
-  });
-
-  it('holds the last frame and reports completion for one-shot animations', () => {
-    const animation = { frames: [3, 4], fps: 4, loop: false } as const;
-
-    assert.deepEqual(samplePetAnimation(animation, 500), {
-      frame: 4, sequenceIndex: 1, complete: true,
-    });
-  });
-
-  it('maps a frame index onto the declared sprite grid', () => {
-    assert.deepEqual(petFrameSourceRect(5, manifest().spriteSheet), {
-      x: 128,
-      y: 48,
-      width: 64,
-      height: 48,
-    });
-  });
-
-  it('freezes animation for either accessibility or deterministic fixtures', () => {
-    assert.equal(shouldReducePetMotion({
-      reducedMotionAttribute: false,
-      e2eFixtureAttribute: false,
-      systemPreference: false,
-    }), false);
-    assert.equal(shouldReducePetMotion({
-      reducedMotionAttribute: false,
-      e2eFixtureAttribute: true,
-      systemPreference: false,
-    }), true);
-    assert.equal(shouldReducePetMotion({
-      reducedMotionAttribute: true,
-      e2eFixtureAttribute: false,
-      systemPreference: false,
-    }), true);
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/custom-pet-library-model.test.ts b/apps/desktop/src/main/__tests__/custom-pet-library-model.test.ts
deleted file mode 100644
index aa073b77bc..0000000000
--- a/apps/desktop/src/main/__tests__/custom-pet-library-model.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import type { PetPackManifestV1 } from '@maka/core';
-import {
-  reconcileCustomPetLibrary,
-  removeCustomPet,
-  upsertCustomPet,
-} from '../../renderer/settings/custom-pet-library-model.js';
-
-function manifest(id: string, displayName = id): PetPackManifestV1 {
-  return {
-    schema: 'maka.pet/v1',
-    id,
-    displayName,
-    spriteSheet: {
-      path: 'sprites.png',
-      format: 'png',
-      frameWidth: 32,
-      frameHeight: 32,
-      columns: 5,
-      rows: 1,
-      frameCount: 5,
-    },
-    animations: {
-      idle: { frames: [0], fps: 1, loop: true },
-      working: { frames: [1], fps: 1, loop: true },
-      'needs-input': { frames: [2], fps: 1, loop: true },
-      ready: { frames: [3], fps: 1, loop: true },
-      blocked: { frames: [4], fps: 1, loop: true },
-    },
-  };
-}
-
-describe('custom pet library settings model', () => {
-  it('fails closed when selection and installed packs are observed across a remove event', () => {
-    const snapshot = reconcileCustomPetLibrary(
-      [manifest('likun.other')],
-      'likun.maodie',
-    );
-
-    assert.equal(snapshot.selectedPetId, null);
-    assert.deepEqual(snapshot.pets.map((pet) => pet.id), ['likun.other']);
-  });
-
-  it('keeps one actionable row per id while preserving store order', () => {
-    const first = manifest('likun.maodie', '耄耋');
-    const duplicate = manifest('likun.maodie', 'duplicate');
-    const other = manifest('likun.other');
-
-    const snapshot = reconcileCustomPetLibrary([first, duplicate, other], first.id);
-
-    assert.deepEqual(snapshot.pets, [first, other]);
-    assert.equal(snapshot.selectedPetId, first.id);
-  });
-
-  it('reconciles import and removal without leaving a removed pack selected', () => {
-    const maodie = manifest('likun.maodie', '耄耋');
-    const imported = upsertCustomPet(
-      { pets: [], selectedPetId: null },
-      maodie,
-    );
-    const selected = { ...imported, selectedPetId: maodie.id };
-
-    assert.deepEqual(imported.pets, [maodie]);
-    assert.deepEqual(removeCustomPet(selected, maodie.id), {
-      pets: [],
-      selectedPetId: null,
-    });
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/daily-review-actions.test.ts b/apps/desktop/src/main/__tests__/daily-review-actions.test.ts
deleted file mode 100644
index 1104030bec..0000000000
--- a/apps/desktop/src/main/__tests__/daily-review-actions.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import { dailyReviewExportDefaultName } from '../../renderer/daily-review-actions.js';
-
-describe('Daily Review export naming', () => {
-  it('uses the archive identity instead of guessing from localized text', () => {
-    assert.equal(
-      dailyReviewExportDefaultName({
-        range: 7,
-        day: {
-          fromMs: new Date(2026, 6, 30, 12).getTime(),
-          toMs: new Date(2026, 7, 5, 12).getTime(),
-        },
-      }),
-      'maka-daily-review-2026-07-30-7d.md',
-    );
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/derive-turn-lineage-badges.test.ts b/apps/desktop/src/main/__tests__/derive-turn-lineage-badges.test.ts
deleted file mode 100644
index 2eefad475f..0000000000
--- a/apps/desktop/src/main/__tests__/derive-turn-lineage-badges.test.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Tests for the turn lineage badge derivation (#546).
- *
- * retry was merged into regenerate, so the badge vocabulary is uniform:
- * "重新生成自" (forward) and "已重新生成" (reverse), regardless of which
- * path wrote the lineage. Legacy retried* fields from old sessions are
- * read back as regenerate lineages.
- */
-
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import { deriveTurnLineageBadges } from '../../renderer/derive-turn-lineage-badges.js';
-
-describe('deriveTurnLineageBadges (#546 retry→regenerate merge)', () => {
-  it('legacy retriedFromTurnId shows a forward "重新生成自" badge, never "重试自"', () => {
-    const badges = deriveTurnLineageBadges({
-      turnId: 'turn-retry-new',
-      retriedFromTurnId: 'turn-retry-origin',
-      existsTurn: () => true,
-    });
-    const forward = badges.find((b) => b.direction === 'forward');
-    assert.match(forward?.label ?? '', /重新生成自/);
-    assert.doesNotMatch(forward?.label ?? '', /重试自/);
-  });
-
-  it('legacy retriedToTurnId shows a reverse "已重新生成" badge, never "已重试"', () => {
-    const badges = deriveTurnLineageBadges({
-      turnId: 'turn-retry-origin',
-      retriedToTurnId: 'turn-retry-new',
-      existsTurn: () => true,
-    });
-    const reverse = badges.find((b) => b.direction === 'reverse');
-    assert.match(reverse?.label ?? '', /已重新生成/);
-    assert.doesNotMatch(reverse?.label ?? '', /已重试/);
-  });
-
-  it('regeneratedFromTurnId shows "重新生成自" (unchanged path)', () => {
-    const badges = deriveTurnLineageBadges({
-      turnId: 'turn-regen-new',
-      regeneratedFromTurnId: 'turn-regen-origin',
-      existsTurn: () => true,
-    });
-    const forward = badges.find((b) => b.direction === 'forward');
-    assert.match(forward?.label ?? '', /重新生成自/);
-  });
-
-  it('prefers regenerated over legacy retried when both are present', () => {
-    const badges = deriveTurnLineageBadges({
-      turnId: 't',
-      retriedFromTurnId: 'origin-a',
-      regeneratedFromTurnId: 'origin-b',
-      existsTurn: () => true,
-    });
-    const forward = badges.find((b) => b.direction === 'forward');
-    assert.equal(forward?.targetTurnId, 'origin-b');
-  });
-
-  it('omits a badge when the target turn does not exist', () => {
-    const badges = deriveTurnLineageBadges({
-      turnId: 't',
-      regeneratedFromTurnId: 'gone',
-      existsTurn: () => false,
-    });
-    assert.equal(badges.length, 0);
-  });
-
-  it('emits no badges for a turn with no lineage', () => {
-    const badges = deriveTurnLineageBadges({ turnId: 'solo', existsTurn: () => true });
-    assert.equal(badges.length, 0);
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/dock-presentation-contract.test.ts b/apps/desktop/src/main/__tests__/dock-presentation-contract.test.ts
deleted file mode 100644
index 4b01ddd036..0000000000
--- a/apps/desktop/src/main/__tests__/dock-presentation-contract.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * The dock rule decides whether a launched Maka can steal the developer's
- * focus. It used to live as an inline branch inside `app.whenReady()`, keyed
- * off a re-derivation of the start-hidden condition (`MAKA_E2E_FIXTURE ||
- * isIsolatedE2e`) that had already drifted from the real one — it missed the
- * `MAKA_E2E_SHOW_WINDOW` escape hatch, so a window a developer explicitly
- * asked to see still launched as an accessory app with no dock tile and no
- * Cmd+Tab entry.
- *
- * The resolver stays a small pure platform rule; integration wiring is covered
- * by the desktop lifecycle rather than source-text assertions.
- */
-
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import { resolveDockPresentation } from '../dock-presentation.js';
-
-describe('dock presentation', () => {
-  it('maps only macOS window visibility to dock presentation', () => {
-    assert.equal(resolveDockPresentation('darwin', true), 'hide');
-    assert.equal(resolveDockPresentation('darwin', false), 'icon');
-    assert.equal(resolveDockPresentation('win32', true), 'none');
-    assert.equal(resolveDockPresentation('linux', false), 'none');
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/e2e-fixture.test.ts b/apps/desktop/src/main/__tests__/e2e-fixture.test.ts
index b25a200bd9..2bdba452ec 100644
--- a/apps/desktop/src/main/__tests__/e2e-fixture.test.ts
+++ b/apps/desktop/src/main/__tests__/e2e-fixture.test.ts
@@ -495,34 +495,6 @@ describe('e2e-fixture mode', () => {
     }
   });
 
-  describe('settings sub-page scenarios (PR108j)', () => {
-    // Each scenario opens a specific Settings section over the shared
-    // connection/session seed. The seed file shape is identical to
-    // `provider-workspace` — the only difference is `openSettingsSection`.
-    // PR-SETTINGS-IA-CONSOLIDATE-0 (2026-06-23): consolidated nav.
-    const cases = [
-      { scenario: 'settings-data', expectedSection: 'data' },
-      { scenario: 'settings-appearance', expectedSection: 'appearance' },
-      { scenario: 'settings-bots', expectedSection: 'bot-chat' },
-      { scenario: 'settings-about', expectedSection: 'about' },
-      { scenario: 'settings-general', expectedSection: 'general' },
-      { scenario: 'settings-memory', expectedSection: 'memory' },
-      { scenario: 'settings-daily-review', expectedSection: 'daily-review' },
-    ] as const;
-
-    for (const { scenario, expectedSection } of cases) {
-      it(`${scenario} opens Settings · ${expectedSection}`, () => {
-        const fixture = resolveE2eFixture(scenario, false);
-        assert.ok(fixture, `${scenario} should resolve`);
-        const state = getE2eFixtureState(fixture);
-        assert.equal(state?.openSettingsSection, expectedSection);
-        // Active session is the standard turn fixture so the chat
-        // surface behind the modal renders meaningful context.
-        assert.equal(state?.activeSessionId, 'e2e-fixture-turn');
-      });
-    }
-  });
-
   it('stale-sessions seed reproduces the P0 workspace with active stale session', async () => {
     const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-e2e-fixture-stale-'));
     try {
@@ -710,20 +682,10 @@ describe('e2e-fixture mode', () => {
     }
   });
 
-  it('module fixtures open Skills, MCP and Daily Review in the app module surface', async () => {
-    const skills = resolveE2eFixture('module-skills', false);
-    const mcp = resolveE2eFixture('module-mcp', false);
+  it('module Daily Review fixture opens in the app module surface', async () => {
     const dailyReview = resolveE2eFixture('module-daily-review', false);
 
-    assert.ok(skills);
-    assert.ok(mcp);
     assert.ok(dailyReview);
-    assert.equal(getE2eFixtureState(skills)?.sidebarSection, 'skills');
-    assert.equal(getE2eFixtureState(skills)?.sidebarCollapsed, false);
-    assert.equal(getE2eFixtureState(skills)?.activeSessionId, 'e2e-fixture-turn');
-    assert.equal(getE2eFixtureState(mcp)?.sidebarSection, 'mcp');
-    assert.equal(getE2eFixtureState(mcp)?.sidebarCollapsed, false);
-    assert.equal(getE2eFixtureState(mcp)?.activeSessionId, 'e2e-fixture-turn');
     assert.equal(getE2eFixtureState(dailyReview)?.sidebarSection, 'daily-review');
     assert.equal(getE2eFixtureState(dailyReview)?.sidebarCollapsed, false);
     assert.equal(getE2eFixtureState(dailyReview)?.activeSessionId, 'e2e-fixture-turn');
@@ -1354,63 +1316,6 @@ describe('settings-bots-onboarding fixture (#1233 deferral)', () => {
     // the Settings modal renders meaningful context.
     assert.equal(state?.activeSessionId, 'e2e-fixture-turn');
   });
-
-  it('reuses the standard turn seed so no bot-specific durable seed is needed', async () => {
-    const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-e2e-fixture-bots-onboarding-'));
-    try {
-      const fixture = resolveE2eFixture('settings-bots-onboarding', false);
-      assert.ok(fixture);
-      await seedE2eFixture({
-        workspaceRoot,
-        fixture,
-        credentialStore: fakeCredentialStore(),
-        now: 1_700_000_000_000,
-      });
-      const header = await readSessionHeader(workspaceRoot, 'e2e-fixture-turn');
-      assert.equal(header.id, 'e2e-fixture-turn');
-    } finally {
-      await rm(workspaceRoot, { recursive: true, force: true });
-    }
-  });
-});
-
-describe('browser-empty chrome fixture (#819)', () => {
-  it('seeds a live browser session id so BrowserPanel mounts over the turn chat in empty state', () => {
-    const fixture = resolveE2eFixture('browser-empty', false);
-    assert.ok(fixture, 'browser-empty should resolve');
-    const state = getE2eFixtureState(fixture);
-    // Active session is the standard turn session so the chat surface
-    // behind the browser panel renders meaningful context.
-    assert.equal(state?.activeSessionId, 'e2e-fixture-turn');
-    // liveBrowserSessionIds is the contract the renderer reads to mount
-    // BrowserPanel (app-shell gates on activeId && liveBrowserSessionIds
-    // .includes(activeId)). Seeding the active session makes the panel
-    // mount; with no real WebContentsView in e2e-fixture mode,
-    // browser.getState returns null → BrowserPanel renders EMPTY_STATE →
-    // the empty-state chrome (#818 defect surface) is what screenshots.
-    assert.deepEqual(state?.liveBrowserSessionIds, ['e2e-fixture-turn']);
-  });
-
-  it('reuses the always-seeded turn Session so no browser-specific durable seed is needed', async () => {
-    const workspaceRoot = await mkdtemp(join(tmpdir(), 'maka-e2e-fixture-browser-empty-'));
-    try {
-      const fixture = resolveE2eFixture('browser-empty', false);
-      assert.ok(fixture);
-      await seedE2eFixture({
-        workspaceRoot,
-        fixture,
-        credentialStore: fakeCredentialStore(),
-        now: 1_700_000_000_000,
-      });
-      // The turn Session is part of the standard seed, so the active browser
-      // Session has a real durable chat behind the
-      // panel without a browser-specific seed branch.
-      const header = await readSessionHeader(workspaceRoot, 'e2e-fixture-turn');
-      assert.equal(header.id, 'e2e-fixture-turn');
-    } finally {
-      await rm(workspaceRoot, { recursive: true, force: true });
-    }
-  });
 });
 
 function fakeCredentialStore(secrets: string[] = []) {
diff --git a/apps/desktop/src/main/__tests__/ipc-surface-contract.test.ts b/apps/desktop/src/main/__tests__/ipc-surface-contract.test.ts
deleted file mode 100644
index 4727dcc8b0..0000000000
--- a/apps/desktop/src/main/__tests__/ipc-surface-contract.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { readdir, readFile } from 'node:fs/promises';
-import { join } from 'node:path';
-import { describe, it } from 'node:test';
-
-const desktopRoot = process.cwd().endsWith(join('apps', 'desktop'))
-  ? process.cwd()
-  : join(process.cwd(), 'apps', 'desktop');
-
-async function findTypeScriptFiles(directory: string): Promise<string[]> {
-  const entries = await readdir(directory, { withFileTypes: true });
-  const files = await Promise.all(
-    entries.map(async (entry) => {
-      if (entry.isDirectory()) {
-        return entry.name === '__tests__' || entry.name === 'dist'
-          ? []
-          : findTypeScriptFiles(join(directory, entry.name));
-      }
-      return entry.name.endsWith('.ts') ? [join(directory, entry.name)] : [];
-    }),
-  );
-  return files.flat();
-}
-
-function extractChannels(source: string, pattern: RegExp): Set<string> {
-  return new Set([...source.matchAll(pattern)].map((match) => match[1]));
-}
-
-// Channels deliberately registered in main with no preload consumer.
-// usage:* is the #1596 Usage/Pricing authority surface: per the #1982
-// decision it stays main-side until the #2010 M4 client adapter exposes a
-// narrow renderer interface (pricing.query / pricing.mutate).
-const MAIN_ONLY_CHANNELS = [
-  'usage:summary',
-  'usage:buckets',
-  'usage:logs',
-  'usage:pricing:list',
-  'usage:pricing:put',
-  'usage:pricing:reset',
-];
-
-describe('IPC surface contract', () => {
-  it('keeps main handlers and preload invocations in parity', async () => {
-    const mainFiles = await findTypeScriptFiles(join(desktopRoot, 'src', 'main'));
-    const [mainSources, preloadSource] = await Promise.all([
-      Promise.all(mainFiles.map((file) => readFile(file, 'utf8'))),
-      readFile(join(desktopRoot, 'src', 'preload', 'preload.ts'), 'utf8'),
-    ]);
-    const mainChannels = extractChannels(
-      mainSources.join('\n'),
-      /(?:\bipcMain|\b[A-Za-z_$][\w$]*\.ipcMain|\btargetIpc|\btarget)\.handle\(\s*['"]([^'"]+)['"]/g,
-    );
-    const preloadChannels = extractChannels(
-      preloadSource,
-      /ipcRenderer\.invoke\(\s*['"]([^'"]+)['"]/g,
-    );
-
-    for (const channel of MAIN_ONLY_CHANNELS) {
-      assert.ok(
-        mainChannels.has(channel),
-        `main-only channel ${channel} is no longer registered — remove it from MAIN_ONLY_CHANNELS`,
-      );
-      assert.ok(
-        !preloadChannels.has(channel),
-        `channel ${channel} gained a preload consumer — remove it from MAIN_ONLY_CHANNELS`,
-      );
-      mainChannels.delete(channel);
-    }
-
-    assert.deepEqual([...mainChannels].sort(), [...preloadChannels].sort());
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/model-wait-state.test.ts b/apps/desktop/src/main/__tests__/model-wait-state.test.ts
deleted file mode 100644
index f9efdc055c..0000000000
--- a/apps/desktop/src/main/__tests__/model-wait-state.test.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-
-import {
-  MODEL_PROCESSING_DELAY_MS,
-  createDelayedFlag,
-  deriveModelWait,
-  deriveTurnActive,
-  type DelayedFlagScheduler,
-} from '../../renderer/model-wait-state.js';
-
-// The gate this whole change exists for: a send must show Stop at once and must
-// not lose it mid-turn. Both regressions came from letting a session-level
-// witness speak for the local arm, which is why these read as one suite.
-describe('is a turn running', () => {
-  it('opens on the local arm alone, with no session-level confirmation', () => {
-    assert.equal(deriveTurnActive({
-      turnPhase: 'waiting',
-      armedTurnId: 'turn-1',
-      runningTurnIds: undefined,
-    }), true);
-  });
-
-  // The runtime writes `status: 'running'` only at the END of `AgentRun.begin`,
-  // so every list refreshed between the send and that write still describes an
-  // idle session. ANDing such a witness in — the shape this replaced — is what
-  // made Stop appear late and flicker off mid-turn.
-  it('stays open across a session snapshot that predates the run', () => {
-    assert.equal(deriveTurnActive({
-      turnPhase: 'streamed',
-      armedTurnId: 'turn-1',
-      runningTurnIds: undefined,
-    }), true);
-  });
-
-  it('closes when neither witness reports a turn', () => {
-    assert.equal(deriveTurnActive({
-      turnPhase: undefined,
-      armedTurnId: undefined,
-      runningTurnIds: undefined,
-    }), false);
-  });
-
-  // A turn this renderer did not send: another client, an automation, or one
-  // still running across a reload. There is no local arm to speak for it.
-  it('opens for a running turn this renderer never armed', () => {
-    assert.equal(deriveTurnActive({
-      turnPhase: undefined,
-      armedTurnId: undefined,
-      runningTurnIds: ['turn-elsewhere'],
-    }), true);
-  });
-
-  // The arm saw its own terminal event; a list fetched just before it did not.
-  // Reading that snapshot as authority would light Stop back up after the turn
-  // visibly ended.
-  it('does not let a stale snapshot revive the arm\'s own finished turn', () => {
-    assert.equal(deriveTurnActive({
-      turnPhase: undefined,
-      armedTurnId: 'turn-1',
-      runningTurnIds: ['turn-1'],
-    }), false);
-  });
-
-  // A new turn started elsewhere while this renderer still holds the previous
-  // one's terminal projection.
-  it('opens when the authority names a turn other than the settled arm', () => {
-    assert.equal(deriveTurnActive({
-      turnPhase: undefined,
-      armedTurnId: 'turn-1',
-      runningTurnIds: ['turn-2'],
-    }), true);
-  });
-
-  // A session can run concurrent turns. The arm's own turn lingering in the set
-  // — it has ended locally but the run has not been unregistered yet — must not
-  // hide a sibling that is genuinely still running.
-  it('opens for a sibling turn even while the settled arm lingers in the set', () => {
-    assert.equal(deriveTurnActive({
-      turnPhase: undefined,
-      armedTurnId: 'turn-1',
-      runningTurnIds: ['turn-1', 'turn-2'],
-    }), true);
-  });
-
-  it('closes when the only running turn is the arm the renderer already settled', () => {
-    assert.equal(deriveTurnActive({
-      turnPhase: undefined,
-      armedTurnId: 'turn-1',
-      runningTurnIds: ['turn-1'],
-    }), false);
-  });
-
-  it('closes on an empty set', () => {
-    assert.equal(deriveTurnActive({
-      turnPhase: undefined,
-      armedTurnId: undefined,
-      runningTurnIds: [],
-    }), false);
-  });
-});
-
-const HEAD = {
-  turnPhase: 'waiting',
-  hasStreamingText: false,
-  hasThinkingText: false,
-  hasInFlightTools: false,
-} as const;
-
-function fakeScheduler() {
-  let now = 0;
-  let sequence = 0;
-  const timers = new Map<number, { at: number; run: () => void }>();
-  const scheduler: DelayedFlagScheduler = {
-    setTimeout(run, delay) {
-      const id = ++sequence;
-      timers.set(id, { at: now + delay, run });
-      return id;
-    },
-    clearTimeout(handle) {
-      timers.delete(handle as number);
-    },
-  };
-  return {
-    scheduler,
-    advance(duration: number) {
-      now += duration;
-      for (const [id, timer] of [...timers]) {
-        if (timer.at > now) continue;
-        timers.delete(id);
-        timer.run();
-      }
-    },
-    pending: () => timers.size,
-  };
-}
-
-describe('model wait state', () => {
-  it('derives head, active-content, tool, and mid-turn wait states', () => {
-    for (const [input, expected] of [
-      [HEAD, 'processing'],
-      [{ ...HEAD, turnPhase: undefined }, 'none'],
-      [{ ...HEAD, hasStreamingText: true }, 'none'],
-      [{ ...HEAD, hasThinkingText: true }, 'none'],
-      [{ ...HEAD, hasInFlightTools: true }, 'none'],
-      [{ ...HEAD, turnPhase: 'streamed', hasInFlightTools: true }, 'none'],
-      [{ ...HEAD, turnPhase: 'streamed' }, 'continuing'],
-    ] as const) {
-      assert.equal(deriveModelWait(input), expected);
-    }
-  });
-
-  it('delays rising edges, hides immediately, re-arms, and emits only transitions', () => {
-    const clock = fakeScheduler();
-    const changes: boolean[] = [];
-    const flag = createDelayedFlag({
-      delayMs: MODEL_PROCESSING_DELAY_MS,
-      scheduler: clock.scheduler,
-      onChange: (visible) => changes.push(visible),
-    });
-
-    flag.setCondition(true);
-    flag.setCondition(true);
-    clock.advance(MODEL_PROCESSING_DELAY_MS - 1);
-    assert.equal(flag.get(), false);
-    clock.advance(1);
-    assert.equal(flag.get(), true);
-
-    flag.setCondition(false);
-    assert.equal(flag.get(), false);
-    flag.setCondition(true);
-    clock.advance(MODEL_PROCESSING_DELAY_MS - 1);
-    assert.equal(flag.get(), false);
-    clock.advance(1);
-    assert.equal(flag.get(), true);
-    assert.deepEqual(changes, [true, false, true]);
-  });
-
-  it('cancels a pending reveal when the condition drops or the owner disposes', () => {
-    for (const cancel of ['condition', 'dispose'] as const) {
-      const clock = fakeScheduler();
-      const flag = createDelayedFlag({
-        delayMs: MODEL_PROCESSING_DELAY_MS,
-        scheduler: clock.scheduler,
-      });
-      flag.setCondition(true);
-      clock.advance(100);
-      if (cancel === 'condition') flag.setCondition(false);
-      else flag.dispose();
-      clock.advance(MODEL_PROCESSING_DELAY_MS);
-      assert.equal(flag.get(), false, cancel);
-      assert.equal(clock.pending(), 0, cancel);
-    }
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/project-path-display.test.ts b/apps/desktop/src/main/__tests__/project-path-display.test.ts
deleted file mode 100644
index 3f40683d6e..0000000000
--- a/apps/desktop/src/main/__tests__/project-path-display.test.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import {
-  collapseHomePath,
-  projectPathDisplay,
-  truncatePathHead,
-} from '../../renderer/project-path-display.js';
-
-describe('collapseHomePath', () => {
-  it('collapses the home prefix', () => {
-    assert.equal(collapseHomePath('/Users/maka/Developer/app', '/Users/maka'), '~/Developer/app');
-  });
-
-  it('collapses the home directory itself to a bare ~', () => {
-    assert.equal(collapseHomePath('/Users/maka', '/Users/maka'), '~');
-  });
-
-  it('only matches on a path boundary', () => {
-    // The bug this pins: a prefix match would rewrite `/Users/maka-agent` to
-    // `~-agent`, quietly renaming a different user's directory.
-    assert.equal(
-      collapseHomePath('/Users/maka-agent/app', '/Users/maka'),
-      '/Users/maka-agent/app',
-    );
-  });
-
-  it('leaves paths outside home alone', () => {
-    assert.equal(collapseHomePath('/opt/work/app', '/Users/maka'), '/opt/work/app');
-  });
-
-  it('is a no-op when the home path is unknown', () => {
-    // The renderer learns home asynchronously; before it arrives the path must
-    // still render, just unabbreviated.
-    assert.equal(collapseHomePath('/Users/maka/app', undefined), '/Users/maka/app');
-  });
-
-  it('ignores a trailing separator on the home path', () => {
-    assert.equal(collapseHomePath('/Users/maka/app', '/Users/maka/'), '~/app');
-  });
-});
-
-describe('truncatePathHead', () => {
-  it('keeps the tail, which is the identifying end', () => {
-    const result = truncatePathHead('/Users/maka/Developer/experiments/astryx-design-system', 24);
-    assert.equal(result.length, 24);
-    assert.ok(result.endsWith('astryx-design-system'), result);
-    assert.ok(result.startsWith('…'), result);
-  });
-
-  it('leaves a path that already fits untouched', () => {
-    // No decorative ellipsis on a path that never needed shortening.
-    assert.equal(truncatePathHead('~/app', 24), '~/app');
-  });
-
-  it('leaves a path of exactly the budget untouched', () => {
-    const exact = 'a'.repeat(24);
-    assert.equal(truncatePathHead(exact, 24), exact);
-  });
-});
-
-describe('projectPathDisplay', () => {
-  it('collapses then truncates, and keeps the full path for the tooltip', () => {
-    const display = projectPathDisplay(
-      '/Users/maka/Developer/experiments/astryx-design-system',
-      { homePath: '/Users/maka', maxLength: 20 },
-    );
-
-    // 20 is a tight budget on purpose: the folder name is itself 20 chars, so
-    // the ellipsis has to eat into it. The tail is still what survives.
-    assert.equal(display.text, '…stryx-design-system');
-    assert.equal(display.text.length, 20);
-    // The tooltip is the unabbreviated original — `~` is exactly what a user
-    // consults the tooltip to expand.
-    assert.equal(display.title, '/Users/maka/Developer/experiments/astryx-design-system');
-  });
-
-  it('shows a short home path whole', () => {
-    const display = projectPathDisplay('/Users/maka/app', { homePath: '/Users/maka' });
-    assert.equal(display.text, '~/app');
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/provider-connection-status.test.ts b/apps/desktop/src/main/__tests__/provider-connection-status.test.ts
deleted file mode 100644
index 09fc16f515..0000000000
--- a/apps/desktop/src/main/__tests__/provider-connection-status.test.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import type { LlmConnection } from '@maka/core';
-import { connectionChipStatus } from '../../renderer/settings/provider-connection-status.js';
-import { connectionLastTestMessageDisplay } from '../../renderer/settings/provider-panel-shared.js';
-
-function conn(input: Partial<LlmConnection> = {}): LlmConnection {
-  return {
-    slug: 'c1',
-    name: '连接 1',
-    providerType: 'anthropic',
-    defaultModel: 'claude-sonnet-4-5-20250929',
-    enabled: true,
-    createdAt: 0,
-    updatedAt: 0,
-    ...input,
-  };
-}
-
-describe('connectionChipStatus', () => {
-  it('maps lifecycle states without stale readiness signals', () => {
-    const cases: Array<
-      [Partial<LlmConnection>, ReturnType<typeof connectionChipStatus>]
-    > = [
-      [
-        { enabled: false, lastTestStatus: 'needs_reauth' },
-        { label: '需要重新登录', tone: 'attention' },
-      ],
-      [
-        { enabled: true, lastTestStatus: 'needs_reauth' },
-        { label: '需要重新登录', tone: 'attention' },
-      ],
-      [
-        { enabled: false, lastTestStatus: 'error' },
-        { label: '暂不可用 · 上次连接失败', tone: 'error' },
-      ],
-      [{ enabled: false, lastTestStatus: undefined }, { label: '暂不可用', tone: 'neutral' }],
-      [{ enabled: false, lastTestStatus: 'verified' }, { label: '暂不可用', tone: 'neutral' }],
-      [{ enabled: true, lastTestStatus: 'verified' }, null],
-      [
-        { enabled: true, lastTestStatus: 'error' },
-        { label: '上次连接失败', tone: 'error' },
-      ],
-      [{ enabled: true, lastTestStatus: undefined }, null],
-    ];
-    for (const [input, expected] of cases) {
-      assert.deepEqual(connectionChipStatus(conn(input)), expected);
-    }
-  });
-});
-
-describe('connectionLastTestMessageDisplay', () => {
-  it('localizes legacy status text without exposing unknown raw provider messages', () => {
-    assert.equal(connectionLastTestMessageDisplay('Authentication failed'), '鉴权失败');
-    assert.equal(connectionLastTestMessageDisplay('GitHub Copilot 登录已导入。'), 'GitHub Copilot 登录已导入。');
-    assert.equal(connectionLastTestMessageDisplay('upstream detail that should not reach settings'), '连接测试状态暂时无法显示，请重新测试。');
-    assert.equal(connectionLastTestMessageDisplay(undefined), undefined);
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/scroll-motion-policy.test.ts b/apps/desktop/src/main/__tests__/scroll-motion-policy.test.ts
deleted file mode 100644
index aaf86772c7..0000000000
--- a/apps/desktop/src/main/__tests__/scroll-motion-policy.test.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Tests for scroll motion policy helper (PR109f).
- *
- * @kenji + @xuan review gate: the lineage badge click + future
- * branch-banner navigation must collapse smooth scrolling to `auto`
- * inside the e2e-fixture fixture so screenshots stay deterministic.
- * @xuan confirmed on main that e2e-fixture ALWAYS writes
- * `data-maka-e2e-fixture="true"` but `data-maka-reduced-motion="true"`
- * is only on the reduced variant — so the e2e-fixture flag is the
- * primary signal, not the reduced-motion attribute.
- */
-
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import {
-  resolveScrollMotionBehavior,
-  type ScrollMotionPolicyInputs,
-} from '../../renderer/scroll-motion-policy.js';
-
-function inputs(partial: Partial<ScrollMotionPolicyInputs>): ScrollMotionPolicyInputs {
-  return {
-    reducedMotionAttr: false,
-    e2eFixtureAttr: false,
-    prefersReducedMotion: false,
-    ...partial,
-  };
-}
-
-describe('resolveScrollMotionBehavior', () => {
-  it('returns "smooth" when no triggers are set', () => {
-    assert.equal(resolveScrollMotionBehavior(inputs({})), 'smooth');
-  });
-
-  it('returns "auto" when reduced-motion attr is set (PR-IR-04 reduced variant)', () => {
-    assert.equal(
-      resolveScrollMotionBehavior(inputs({ reducedMotionAttr: true })),
-      'auto',
-    );
-  });
-
-  it('returns "auto" when e2e-fixture attr is set (any PR-IR-02 capture)', () => {
-    // @xuan PR109f: e2e-fixture fixture writes this attribute on every
-    // capture, regardless of variant. We must collapse smooth scroll
-    // even if reduced-motion attr is absent.
-    assert.equal(
-      resolveScrollMotionBehavior(inputs({ e2eFixtureAttr: true })),
-      'auto',
-    );
-  });
-
-  it('returns "auto" when prefers-reduced-motion media query matches', () => {
-    assert.equal(
-      resolveScrollMotionBehavior(inputs({ prefersReducedMotion: true })),
-      'auto',
-    );
-  });
-
-  it('returns "auto" when any combination of triggers is set', () => {
-    for (const combo of [
-      { reducedMotionAttr: true, e2eFixtureAttr: true },
-      { reducedMotionAttr: true, prefersReducedMotion: true },
-      { e2eFixtureAttr: true, prefersReducedMotion: true },
-      { reducedMotionAttr: true, e2eFixtureAttr: true, prefersReducedMotion: true },
-    ] as Array<Partial<ScrollMotionPolicyInputs>>) {
-      assert.equal(resolveScrollMotionBehavior(inputs(combo)), 'auto');
-    }
-  });
-
-  it('@xuan PR109f: e2e-fixture alone is sufficient (reduced-motion attr NOT required)', () => {
-    // Regression: an earlier version only checked reduced-motion attr,
-    // which let smooth scrolling leak into the unmodified e2e-fixture
-    // capture path. Confirm e2e-fixture alone triggers `auto`.
-    assert.equal(
-      resolveScrollMotionBehavior(
-        inputs({
-          reducedMotionAttr: false,
-          e2eFixtureAttr: true,
-          prefersReducedMotion: false,
-        }),
-      ),
-      'auto',
-    );
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/session-health-notice.test.ts b/apps/desktop/src/main/__tests__/session-health-notice.test.ts
deleted file mode 100644
index bbb9d3b26a..0000000000
--- a/apps/desktop/src/main/__tests__/session-health-notice.test.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * #1038 — session health notice derivation, aligned with send authority.
- *
- * Main projects send readiness and carries it in the onboarding snapshot.
- * These tests cover only the renderer's outcome-to-copy mapping and reminder
- * priority; send/rebind decision cases live in session-send-projection.test.ts.
- *
- * `lastTestStatus` is an intentional pre-send reminder (product contract
- * decided in #1038): it never claims send is blocked — E4 locks that it
- * must not gate send — so it only ever renders as a `warning` with copy
- * that says the send is not intercepted, and only when the projection
- * says the session's own connection will actually serve the next send.
- */
-
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import type { LlmConnection } from '@maka/core';
-import {
-  deriveSessionHealthNotice,
-  type SessionHealthNoticeInput,
-} from '../../renderer/session-health-notice.js';
-
-function connection(): LlmConnection {
-  return {
-    slug: 'openai-live',
-    name: 'OpenAI Live',
-    providerType: 'openai',
-    defaultModel: 'gpt-4.1',
-    enabled: true,
-    models: [{ id: 'gpt-4.1', capabilities: { chat: true, functionCalling: true } }],
-    modelSource: 'fetched',
-    createdAt: 1,
-    updatedAt: 1,
-  } as LlmConnection;
-}
-
-function input(partial: Partial<SessionHealthNoticeInput> = {}): SessionHealthNoticeInput {
-  return {
-    locale: 'zh',
-    session: {
-      backend: 'ai-sdk',
-      llmConnectionSlug: 'openai-live',
-      model: 'gpt-4.1',
-      connectionLocked: false,
-    },
-    outcome: { kind: 'ready' },
-    connections: [connection()],
-    lastTestStatus: undefined,
-    ...partial,
-  };
-}
-
-describe('deriveSessionHealthNotice', () => {
-  it('returns undefined when no active session', () => {
-    assert.equal(deriveSessionHealthNotice(input({ session: undefined })), undefined);
-  });
-
-  it('stays hidden when the snapshot outcome is unavailable', () => {
-    assert.equal(deriveSessionHealthNotice(input({ outcome: undefined })), undefined);
-  });
-
-  it('returns undefined when the next send will succeed', () => {
-    assert.equal(deriveSessionHealthNotice(input({})), undefined);
-  });
-
-  it('stays hidden when main projects a silent rebind', () => {
-    assert.equal(
-      deriveSessionHealthNotice(
-        input({
-          outcome: { kind: 'rebind', connectionSlug: 'openai-live', model: 'gpt-4.1' },
-        }),
-      ),
-      undefined,
-    );
-  });
-
-  describe('blocked outcomes', () => {
-    it('renders the fake-backend recovery copy without internal terminology', () => {
-      const result = deriveSessionHealthNotice(input({
-        session: {
-          backend: 'fake',
-          llmConnectionSlug: 'fake',
-          model: 'fake-model',
-          connectionLocked: false,
-        },
-        outcome: { kind: 'blocked', reason: 'fake_backend', connectionLocked: false },
-      }));
-      assert.equal(result?.tone, 'destructive');
-      assert.equal(result?.label, '会话已过期 · 请先配置真实模型');
-      assert.equal(result?.onClickTarget, 'models');
-      assert.doesNotMatch(result?.label ?? '', /演示版|fake|FakeBackend/i);
-      assert.doesNotMatch(result?.tooltip ?? '', /演示版|fake|FakeBackend/i);
-    });
-
-    it('renders the missing-connection recovery copy', () => {
-      const result = deriveSessionHealthNotice(
-        input({
-          session: {
-            backend: 'ai-sdk',
-            llmConnectionSlug: 'deleted-slug',
-            model: 'gpt-4.1',
-            connectionLocked: false,
-          },
-          outcome: { kind: 'blocked', reason: 'connection_missing', connectionLocked: false },
-        }),
-      );
-      assert.equal(result?.tone, 'destructive');
-      assert.equal(result?.label, '连接已删除');
-      assert.match(result?.tooltip ?? '', /设置.*模型/);
-    });
-
-    it('names the session connection when its API key is missing', () => {
-      const result = deriveSessionHealthNotice(
-        input({
-          outcome: { kind: 'blocked', reason: 'missing_api_key', connectionLocked: false },
-        }),
-      );
-      assert.equal(result?.tone, 'destructive');
-      assert.equal(result?.label, '连接缺少密钥');
-      assert.match(result?.tooltip ?? '', /OpenAI Live/);
-    });
-  });
-
-  describe('lastTestStatus — honest pre-send reminder (never claims blocked)', () => {
-    it('needs_reauth → warning · open models · does not claim send is blocked', () => {
-      const result = deriveSessionHealthNotice(input({ lastTestStatus: 'needs_reauth' }));
-      assert.equal(result?.tone, 'warning');
-      assert.equal(result?.label, '上次连接测试鉴权失败');
-      assert.equal(result?.onClickTarget, 'models');
-      assert.match(result?.tooltip ?? '', /401|403|鉴权/);
-      assert.match(result?.tooltip ?? '', /不会拦截发送/);
-    });
-
-    it('error → warning (not destructive) · open models · does not claim send is blocked', () => {
-      const result = deriveSessionHealthNotice(input({ lastTestStatus: 'error' }));
-      assert.equal(result?.tone, 'warning');
-      assert.equal(result?.label, '上次连接测试失败');
-      assert.equal(result?.onClickTarget, 'models');
-      assert.match(result?.tooltip ?? '', /5xx|网络|超时|Base URL|代理/);
-      assert.match(result?.tooltip ?? '', /不会拦截发送/);
-    });
-
-    it('verified → no notice', () => {
-      assert.equal(deriveSessionHealthNotice(input({ lastTestStatus: 'verified' })), undefined);
-    });
-
-    it('a blocked send beats the reminder', () => {
-      const result = deriveSessionHealthNotice(
-        input({
-          outcome: { kind: 'blocked', reason: 'missing_api_key', connectionLocked: false },
-          lastTestStatus: 'error',
-        }),
-      );
-      assert.equal(result?.label, '连接缺少密钥');
-    });
-
-    it('the reminder stays silent when the send will rebind away from this connection', () => {
-      const result = deriveSessionHealthNotice(
-        input({
-          outcome: { kind: 'rebind', connectionSlug: 'second-ready', model: 'gpt-4.1' },
-          lastTestStatus: 'error',
-        }),
-      );
-      assert.equal(result, undefined);
-    });
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/session-inspector-filter.test.ts b/apps/desktop/src/main/__tests__/session-inspector-filter.test.ts
deleted file mode 100644
index 1eb3f5d8c4..0000000000
--- a/apps/desktop/src/main/__tests__/session-inspector-filter.test.ts
+++ /dev/null
@@ -1,173 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import { emptyTraceTotals, type TraceTotals } from '@maka/core/session-trace';
-import {
-  applyInspectorFilter,
-  isEmptyInspectorFilter,
-} from '../../renderer/session-inspector-filter.js';
-import { getDesktopConversationCopy } from '../../renderer/locales/conversation-copy.js';
-import type {
-  InspectorPanelModel,
-  InspectorStepRow,
-  InspectorTurnRow,
-} from '../../renderer/session-inspector-panel-model.js';
-
-function step(overrides: Partial<InspectorStepRow> = {}): InspectorStepRow {
-  return {
-    id: 'step-1',
-    kind: 'model_call',
-    label: 'claude-test',
-    failed: false,
-    ...overrides,
-  };
-}
-
-function turn(overrides: Partial<InspectorTurnRow> = {}): InspectorTurnRow {
-  return {
-    turnId: 'turn-1',
-    index: 1,
-    durationMs: 500,
-    totals: emptyTraceTotals(),
-    failed: false,
-    steps: [step()],
-    ...overrides,
-  };
-}
-
-function model(turns: InspectorTurnRow[], totals: TraceTotals = emptyTraceTotals()): InspectorPanelModel {
-  return { turns, totals, empty: turns.length === 0 };
-}
-
-const copy = getDesktopConversationCopy('zh').inspector;
-describe('inspector filter', () => {
-  it('treats an absent or blank filter as no filter at all', () => {
-    assert.equal(isEmptyInspectorFilter(undefined), true);
-    assert.equal(isEmptyInspectorFilter({ query: '   ' }), true);
-    assert.equal(isEmptyInspectorFilter({ query: 'bash' }), false);
-    assert.equal(isEmptyInspectorFilter({ failedOnly: true }), false);
-
-    const source = model([turn()]);
-    const result = applyInspectorFilter(source, undefined, copy);
-    assert.equal(result.filtered, false);
-    assert.deepEqual(result.turns, source.turns);
-  });
-
-  it('matches free text across the fields the panel renders', () => {
-    const source = model([
-      turn({
-        turnId: 'turn-a',
-        steps: [step({ id: 'a', kind: 'tool', label: 'Bash' }), step({ id: 'b', label: 'gpt-x' })],
-      }),
-    ]);
-
-    const byTool = applyInspectorFilter(source, { query: 'bash' }, copy);
-    assert.deepEqual(
-      byTool.turns[0]?.steps.map((entry) => entry.id),
-      ['a'],
-      'case-insensitive on the tool name',
-    );
-    assert.equal(byTool.hiddenSteps, 1);
-
-    const byModel = applyInspectorFilter(source, { query: 'GPT' }, copy);
-    assert.deepEqual(byModel.turns[0]?.steps.map((entry) => entry.id), ['b']);
-  });
-
-  it('keeps a turn whose display name matches even when it has no steps at all', () => {
-    // The zero-step path is the one worth pinning: with steps present, the step
-    // haystack could carry the match instead and the branch would never run.
-    const source = model([turn({ turnId: 'turn-a', index: 7, steps: [] })]);
-    const result = applyInspectorFilter(source, { query: '第 7 轮' }, copy);
-
-    assert.equal(result.turns.length, 1, 'answering "where is 第 7 轮" with silence is wrong');
-    assert.equal(result.hiddenTurns, 0);
-    assert.equal(result.turns[0]?.steps.length, 0);
-  });
-
-  it('keeps a failed turn with no steps when the filter asks only about outcome', () => {
-    // A turn that failed before recording a step is exactly what "failed only"
-    // is asked to surface; a text-free filter must not drop it for being empty.
-    const source = model([
-      turn({ turnId: 'ok' }),
-      turn({ turnId: 'bad', failed: true, steps: [] }),
-    ]);
-    const result = applyInspectorFilter(source, { failedOnly: true }, copy);
-
-    assert.deepEqual(
-      result.turns.map((entry) => entry.turnId),
-      ['bad'],
-    );
-  });
-
-  it('does not let the turn\'s own failure retain every step under it', () => {
-    // Turn text belongs to the turn. Folding it into each step's haystack made
-    // a single match keep steps that explain nothing about it.
-    const source = model([
-      turn({
-        turnId: 'turn-a',
-        failed: true,
-        failureCode: 'tool_failed',
-        steps: [step({ id: 'a', label: 'Bash' }), step({ id: 'b', label: 'claude' })],
-      }),
-    ]);
-
-    const result = applyInspectorFilter(source, { query: '工具失败' }, copy);
-    assert.equal(result.turns.length, 1, 'the turn announces it, so the turn matches');
-    assert.equal(result.turns[0]?.steps.length, 0, 'no step renders that phrase');
-    assert.equal(result.hiddenSteps, 2);
-  });
-
-  it('failed-only drops whole turns that succeeded', () => {
-    const source = model([
-      turn({ turnId: 'ok' }),
-      turn({ turnId: 'bad', failed: true, failureCode: 'tool_failed' }),
-    ]);
-
-    const result = applyInspectorFilter(source, { failedOnly: true }, copy);
-    assert.deepEqual(result.turns.map((entry) => entry.turnId), ['bad']);
-    assert.equal(result.hiddenTurns, 1);
-  });
-
-  it('a filter that matches nothing is not an empty session', () => {
-    // "Nothing matches your filter" and "this session did nothing" are
-    // different claims, and only the panel can tell the reader which it is.
-    const source = model([turn()]);
-    const result = applyInspectorFilter(source, { query: 'no-such-thing' }, copy);
-
-    assert.equal(result.turns.length, 0);
-    assert.equal(result.filtered, true);
-    assert.equal(result.hiddenTurns, 1);
-    assert.equal(result.empty, false, 'the session still happened');
-  });
-
-  it('searches the words on screen, not the identifiers behind them', () => {
-    // The panel renders `语义压缩` and `已允许`; the trace records
-    // `semantic_compact` and `allow`. A reader types what they see.
-    const source = model([
-      turn({
-        steps: [
-          step({ id: 'a', label: 'claude', callKind: 'semantic_compact' }),
-          step({ id: 'b', kind: 'permission', label: 'Bash', decision: 'allow' }),
-        ],
-      }),
-    ]);
-
-    assert.equal(applyInspectorFilter(source, { query: '语义压缩' }, copy).turns[0]?.steps.length, 1);
-    assert.equal(applyInspectorFilter(source, { query: '已允许' }, copy).turns[0]?.steps.length, 1);
-  });
-
-  it('names a step by its kind when it has no identifier, and finds it by that name', () => {
-    const source = model([turn({ steps: [step({ id: 'c', kind: 'compaction', label: undefined })] })]);
-
-    assert.equal(applyInspectorFilter(source, { query: '上下文压缩' }, copy).turns[0]?.steps.length, 1);
-  });
-
-  it('leaves session totals alone so a filtered view cannot restate the bill', () => {
-    // Totals answer "what did this session cost". Recomputing them per filter
-    // would produce a number that is true of nothing.
-    const totals: TraceTotals = { ...emptyTraceTotals(), modelAttempts: 4, costUsd: 0.2 };
-    const source = model([turn()], totals);
-
-    const result = applyInspectorFilter(source, { query: 'no-such-thing' }, copy);
-    assert.deepEqual(result.totals, totals);
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/session-inspector-panel-model.test.ts b/apps/desktop/src/main/__tests__/session-inspector-panel-model.test.ts
deleted file mode 100644
index d5858ceb0b..0000000000
--- a/apps/desktop/src/main/__tests__/session-inspector-panel-model.test.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import {
-  SESSION_TRACE_SCHEMA_VERSION,
-  emptyTraceTotals,
-  type SessionTrace,
-  type TraceStep,
-} from '@maka/core/session-trace';
-import { deriveInspectorPanelModel } from '../../renderer/session-inspector-panel-model.js';
-
-function trace(overrides: Partial<SessionTrace> = {}): SessionTrace {
-  return {
-    schemaVersion: SESSION_TRACE_SCHEMA_VERSION,
-    sessionId: 'session-1',
-    turns: [],
-    totals: emptyTraceTotals(),
-    coverage: {
-      modelCalls: 'none',
-      turnsMissingModelCalls: [],
-      turnsWithFewerModelCallsThanSteps: [],
-      unreadableRecords: 0,
-    },
-    ...overrides,
-  };
-}
-
-describe('inspector panel model', () => {
-  it('shows no coverage notice when the trace reports no known gap', () => {
-    // A notice that always shows is a notice nobody reads.
-    const model = deriveInspectorPanelModel(
-      trace({
-        coverage: {
-          modelCalls: 'no_known_gap',
-          turnsMissingModelCalls: [],
-          turnsWithFewerModelCallsThanSteps: [],
-          unreadableRecords: 0,
-        },
-      }),
-    );
-
-    assert.equal(model.coverage, undefined);
-  });
-
-  it('surfaces a partial coverage notice with what is missing', () => {
-    const model = deriveInspectorPanelModel(
-      trace({
-        coverage: {
-          modelCalls: 'partial',
-          turnsMissingModelCalls: ['turn-1'],
-          turnsWithFewerModelCallsThanSteps: ['turn-2', 'turn-3'],
-          unreadableRecords: 2,
-        },
-      }),
-    );
-
-    assert.deepEqual(model.coverage, {
-      kind: 'partial',
-      turnsMissing: 1,
-      turnsShort: 2,
-      unreadableRecords: 2,
-    });
-  });
-
-  it('leaves an unpriced model call without a cost rather than showing zero', () => {
-    const model = deriveInspectorPanelModel(
-      trace({
-        turns: [
-          {
-            turnId: 'turn-1',
-            runId: 'run-1',
-            startedAt: 1_000,
-            endedAt: 1_500,
-            durationMs: 500,
-            totals: emptyTraceTotals(),
-            steps: [
-              {
-                kind: 'model_call',
-                id: 'call-1',
-                turnId: 'turn-1',
-                runId: 'run-1',
-                startedAt: 1_000,
-                endedAt: 1_500,
-                durationMs: 500,
-                callKind: 'main',
-                providerId: 'anthropic',
-                modelId: 'claude-test',
-                step: 0,
-                attempts: [
-                  {
-                    attemptId: 'a-0',
-                    attempt: 0,
-                    status: 'completed',
-                    startedAt: 1_000,
-                    completedAt: 1_500,
-                    latencyMs: 500,
-                    costBasis: 'unpriced',
-                    usageBasis: 'reported',
-                  },
-                ],
-                status: 'completed',
-              },
-            ],
-          },
-        ],
-      }),
-    );
-
-    const step = model.turns[0]?.steps[0];
-    assert.equal(step?.label, 'claude-test');
-    assert.equal(step?.retries, undefined, 'a single attempt is not a retry');
-  });
-
-  it('marks the attributed step as the failure, not every later step', () => {
-    const model = deriveInspectorPanelModel(
-      trace({
-        turns: [
-          {
-            turnId: 'turn-1',
-            runId: 'run-1',
-            startedAt: 1_000,
-            endedAt: 3_000,
-            durationMs: 2_000,
-            totals: emptyTraceTotals(),
-            failure: { code: 'tool_failed', attributedToStepId: 'dispatch-1' },
-            steps: [
-              {
-                kind: 'tool',
-                id: 'dispatch-1',
-                turnId: 'turn-1',
-                runId: 'run-1',
-                startedAt: 1_000,
-                endedAt: 1_200,
-                durationMs: 200,
-                toolName: 'Bash',
-                status: 'failed',
-              } satisfies TraceStep,
-              {
-                kind: 'permission',
-                id: 'permission-1',
-                turnId: 'turn-1',
-                runId: 'run-1',
-                startedAt: 2_000,
-                decision: 'allow',
-              } satisfies TraceStep,
-            ],
-          },
-        ],
-      }),
-    );
-
-    const [tool, permission] = model.turns[0]!.steps;
-    assert.equal(tool?.failed, true);
-    assert.equal(permission?.failed, false, 'a later step is not implicated by sequence');
-    assert.equal(model.turns[0]?.failureCode, 'tool_failed');
-  });
-
-  it('leaves the naming of kind-only steps to the panel', () => {
-    // A compaction and an error have no identifier of their own. Baking
-    // `label: 'compaction'` here would ship an English word to every locale
-    // from a file that has no business choosing words.
-    const model = deriveInspectorPanelModel(
-      trace({
-        turns: [
-          {
-            turnId: 'turn-1',
-            runId: 'run-1',
-            startedAt: 1_000,
-            endedAt: 2_000,
-            durationMs: 1_000,
-            totals: emptyTraceTotals(),
-            steps: [
-              {
-                kind: 'compaction',
-                id: 'compaction-1',
-                turnId: 'turn-1',
-                runId: 'run-1',
-                startedAt: 1_000,
-                checkpointId: 'checkpoint-1',
-              } satisfies TraceStep,
-              {
-                kind: 'error',
-                id: 'error-1',
-                turnId: 'turn-1',
-                runId: 'run-1',
-                startedAt: 1_500,
-                message: 'sandbox denied the write',
-              } satisfies TraceStep,
-            ],
-          },
-        ],
-      }),
-    );
-
-    const [compaction, error] = model.turns[0]!.steps;
-    assert.equal(compaction?.label, undefined);
-    assert.equal(compaction?.detail, undefined, 'the checkpoint id is not a reader-facing fact');
-    assert.equal(error?.label, undefined);
-    assert.equal(error?.detail, 'sandbox denied the write', 'the message is already words');
-  });
-
-  it('reports an empty model for a session with no turns', () => {
-    assert.equal(deriveInspectorPanelModel(trace()).empty, true);
-    assert.equal(deriveInspectorPanelModel(undefined).empty, true);
-  });
-
-  it('a session whose every record is unreadable is a gap, not an empty session', () => {
-    // "Nothing to trace" and "N records nobody could read" are opposite claims;
-    // rendering both is how unreadable spend hides in plain sight.
-    const model = deriveInspectorPanelModel(
-      trace({
-        coverage: {
-          modelCalls: 'partial',
-          turnsMissingModelCalls: [],
-          turnsWithFewerModelCallsThanSteps: [],
-          unreadableRecords: 3,
-        },
-      }),
-    );
-
-    assert.equal(model.turns.length, 0);
-    assert.equal(model.empty, false, 'a reported gap is never an empty session');
-    assert.equal(model.coverage?.unreadableRecords, 3);
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/session-rail.test.ts b/apps/desktop/src/main/__tests__/session-rail.test.ts
deleted file mode 100644
index b09504f642..0000000000
--- a/apps/desktop/src/main/__tests__/session-rail.test.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import type { SessionSummary, SubagentSessionParent } from '@maka/core';
-import { deriveSessionRail } from '../../renderer/session-rail.js';
-import { sessionMatchesNavSelection } from '../../renderer/session-nav-filter.js';
-import { makeSessionSummary } from './session-list-render-helpers.js';
-
-function childRelation(parentSessionId: string): SubagentSessionParent {
-  return {
-    kind: 'subagent',
-    parentSessionId,
-    spawnedBy: {
-      parentRunId: 'run',
-      parentTurnId: 'turn',
-      toolCallId: 'tool',
-    },
-    lifecycle: 'foreground',
-  };
-}
-
-function chatsInclude(session: SessionSummary): boolean {
-  return sessionMatchesNavSelection(session, { section: 'sessions', filter: 'chats' });
-}
-
-describe('deriveSessionRail', () => {
-  it('lists only revision-tree roots and never nests linked children', () => {
-    const parent = makeSessionSummary({ id: 'parent', name: 'Parent', lastMessageAt: 10 });
-    const child = makeSessionSummary({
-      id: 'child',
-      name: 'Child',
-      lastMessageAt: 20,
-      subagentParent: childRelation(parent.id),
-    });
-    const peer = makeSessionSummary({ id: 'peer', name: 'Peer', lastMessageAt: 5 });
-
-    const rail = deriveSessionRail([parent, child, peer], child.id, chatsInclude);
-
-    assert.deepEqual(
-      rail.sessions.map((session) => session.id),
-      [parent.id, peer.id],
-    );
-    assert.equal(rail.activeRowId, parent.id);
-  });
-
-  it('keeps an orphan linked child on the rail when its parent is gone', () => {
-    const other = makeSessionSummary({ id: 'other', name: 'Other', lastMessageAt: 1 });
-    const orphan = makeSessionSummary({
-      id: 'orphan',
-      name: 'Orphan child',
-      lastMessageAt: 2,
-      subagentParent: childRelation('deleted-parent'),
-    });
-
-    const rail = deriveSessionRail([other, orphan], orphan.id, chatsInclude);
-
-    assert.deepEqual(
-      rail.sessions.map((session) => session.id),
-      [other.id, orphan.id],
-    );
-    assert.equal(rail.activeRowId, orphan.id);
-  });
-
-  it('does not promote a linked child when only the parent fails the nav filter', () => {
-    const archivedParent = makeSessionSummary({
-      id: 'archived-parent',
-      name: 'Archived parent',
-      isArchived: true,
-      lastMessageAt: 10,
-    });
-    const activeChild = makeSessionSummary({
-      id: 'active-child',
-      name: 'Active child',
-      lastMessageAt: 20,
-      subagentParent: childRelation(archivedParent.id),
-    });
-    const liveParent = makeSessionSummary({
-      id: 'live-parent',
-      name: 'Live parent',
-      lastMessageAt: 30,
-    });
-
-    const rail = deriveSessionRail(
-      [archivedParent, activeChild, liveParent],
-      activeChild.id,
-      chatsInclude,
-    );
-
-    assert.deepEqual(
-      rail.sessions.map((session) => session.id),
-      [liveParent.id],
-    );
-    // Parent is off the chats rail; no row can represent the open child.
-    assert.equal(rail.activeRowId, undefined);
-  });
-
-  it('highlights the revision representative when the physical parent was revised', () => {
-    const parentV1 = makeSessionSummary({
-      id: 'parent-v1',
-      name: 'Parent v1',
-      lastMessageAt: 1,
-    });
-    const parentV2 = makeSessionSummary({
-      id: 'parent-v2',
-      name: 'Parent v2',
-      lastMessageAt: 3,
-      revisionRootSessionId: 'parent-v1',
-      revisionParentSessionId: 'parent-v1',
-      revisionIndex: 2,
-      revisionState: 'committed',
-    });
-    const child = makeSessionSummary({
-      id: 'child',
-      name: 'Child',
-      lastMessageAt: 2,
-      subagentParent: childRelation(parentV1.id),
-    });
-
-    const rail = deriveSessionRail([parentV1, parentV2, child], child.id, chatsInclude);
-
-    assert.deepEqual(
-      rail.sessions.map((session) => session.id),
-      [parentV2.id],
-    );
-    assert.equal(rail.activeRowId, parentV2.id);
-    // Titlebar parent shares the same representative, not the physical parent-v1 name.
-    assert.equal(rail.activeParentSession?.id, parentV2.id);
-    assert.equal(rail.activeParentSession?.name, 'Parent v2');
-  });
-
-  it('surfaces no titlebar parent for ordinary roots or orphans', () => {
-    const root = makeSessionSummary({ id: 'root', name: 'Root', lastMessageAt: 1 });
-    const orphan = makeSessionSummary({
-      id: 'orphan',
-      name: 'Orphan',
-      lastMessageAt: 2,
-      subagentParent: childRelation('missing'),
-    });
-
-    assert.equal(
-      deriveSessionRail([root], root.id, chatsInclude).activeParentSession,
-      undefined,
-    );
-    assert.equal(
-      deriveSessionRail([orphan], orphan.id, chatsInclude).activeParentSession,
-      undefined,
-    );
-  });
-
-  it('applies flagged and archived filters flat against rail roots only', () => {
-    const parent = makeSessionSummary({
-      id: 'parent',
-      name: 'Parent',
-      lastMessageAt: 10,
-    });
-    const archivedChild = makeSessionSummary({
-      id: 'archived-child',
-      name: 'Archived child',
-      isArchived: true,
-      lastMessageAt: 20,
-      subagentParent: childRelation(parent.id),
-    });
-    const flaggedChild = makeSessionSummary({
-      id: 'flagged-child',
-      name: 'Flagged child',
-      isFlagged: true,
-      lastMessageAt: 30,
-      subagentParent: childRelation(parent.id),
-    });
-    const archivedParent = makeSessionSummary({
-      id: 'archived-parent',
-      name: 'Archived parent',
-      isArchived: true,
-      lastMessageAt: 40,
-    });
-    const activeChildOfArchived = makeSessionSummary({
-      id: 'active-child',
-      name: 'Active child',
-      lastMessageAt: 50,
-      subagentParent: childRelation(archivedParent.id),
-    });
-    const sessions = [
-      parent,
-      archivedChild,
-      flaggedChild,
-      archivedParent,
-      activeChildOfArchived,
-    ];
-
-    const chats = deriveSessionRail(sessions, parent.id, (session) =>
-      sessionMatchesNavSelection(session, { section: 'sessions', filter: 'chats' }),
-    );
-    assert.deepEqual(
-      chats.sessions.map((session) => session.id),
-      [parent.id],
-    );
-
-    const flagged = deriveSessionRail(sessions, flaggedChild.id, (session) =>
-      sessionMatchesNavSelection(session, { section: 'sessions', filter: 'flagged' }),
-    );
-    assert.deepEqual(
-      flagged.sessions.map((session) => session.id),
-      [],
-    );
-    assert.equal(flagged.activeRowId, undefined);
-
-    const archived = deriveSessionRail(sessions, archivedParent.id, (session) =>
-      sessionMatchesNavSelection(session, { section: 'sessions', filter: 'archived' }),
-    );
-    assert.deepEqual(
-      archived.sessions.map((session) => session.id),
-      [archivedParent.id],
-    );
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/session-status-display-normalization.test.ts b/apps/desktop/src/main/__tests__/session-status-display-normalization.test.ts
deleted file mode 100644
index dfa2287324..0000000000
--- a/apps/desktop/src/main/__tests__/session-status-display-normalization.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * Display normalization for non-actionable blocked sessions.
- *
- * Runtime keeps writing the strict lifecycle status (the #397/#410
- * terminal-fact invariant): a run that closes without terminal evidence
- * marks its session `blocked/unknown`. But session-level "已阻塞" in the
- * sidebar/header is only worth the interruption when the user can ACT
- * (configure a connection, re-login, confirm a permission). Legacy
- * sessions repaired as `missing_terminal_event` are intact, retryable
- * conversations — showing three healthy chats under an「已阻塞」group
- * (real-world report, 2026-07-03) reads as data loss.
- *
- * `normalizeSessionSummaryForDisplay` is applied at the renderer state
- * boundary (app-shell commitSessions / upsertSessionSummary), so the
- * grouping, row icon, and chat-header badge all agree.
- */
-
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import type { SessionBlockedReason, SessionStatus, SessionSummary } from '@maka/core';
-import {
-  isActionableBlocked,
-  normalizeSessionSummaryForDisplay,
-} from '../../renderer/session-status-presentation.js';
-
-function session(status: SessionStatus, blockedReason?: SessionBlockedReason): SessionSummary {
-  return {
-    id: 'session-1',
-    name: '测试会话',
-    isFlagged: false,
-    isArchived: false,
-    labels: [],
-    hasUnread: false,
-    backend: 'ai-sdk',
-    llmConnectionSlug: 'zai-live',
-    connectionLocked: false,
-    model: 'glm-4.7',
-    permissionMode: 'ask',
-    status,
-    ...(blockedReason ? { blockedReason } : {}),
-  };
-}
-
-describe('normalizeSessionSummaryForDisplay', () => {
-  it('reads non-actionable blocked (missing terminal bookkeeping) as an ordinary resumable session', () => {
-    for (const reason of ['unknown', 'tool_failed'] as const) {
-      const out = normalizeSessionSummaryForDisplay(session('blocked', reason));
-      assert.equal(out.status, 'active', `blocked/${reason} should display as active`);
-      assert.equal(out.blockedReason, undefined, `blocked/${reason} should drop the stale reason`);
-    }
-  });
-
-  it('keeps actionable blocked states (user can fix something) as blocked', () => {
-    for (const reason of ['NO_REAL_CONNECTION', 'auth', 'permission_required'] as const) {
-      const out = normalizeSessionSummaryForDisplay(session('blocked', reason));
-      assert.equal(out.status, 'blocked', `blocked/${reason} must stay blocked`);
-      assert.equal(out.blockedReason, reason);
-      assert.equal(isActionableBlocked(reason), true);
-    }
-  });
-
-  it('treats blocked with a missing reason as non-actionable', () => {
-    const out = normalizeSessionSummaryForDisplay(session('blocked'));
-    assert.equal(out.status, 'active');
-  });
-
-  it('passes every non-blocked status through unchanged', () => {
-    for (const status of ['active', 'running', 'waiting_for_user', 'review', 'done', 'archived', 'aborted'] as const) {
-      const input = session(status);
-      assert.equal(normalizeSessionSummaryForDisplay(input), input, `${status} must be identity`);
-    }
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/session-workbar-layout.test.ts b/apps/desktop/src/main/__tests__/session-workbar-layout.test.ts
deleted file mode 100644
index 25d90d3246..0000000000
--- a/apps/desktop/src/main/__tests__/session-workbar-layout.test.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import assert from 'node:assert/strict';
-import { afterEach, describe, it } from 'node:test';
-import {
-  readSessionBottomPanelHeight,
-  SESSION_BOTTOM_PANEL_DEFAULT_HEIGHT,
-  readSessionWorkbarWidth,
-  SESSION_WORKBAR_DEFAULT_WIDTH,
-} from '../../renderer/session-workbar-layout.js';
-import { readRendererContractCss } from './contract-css-helpers.js';
-
-// This is the only thing that decides how wide the workbar comes back after a
-// restart (#1861), and the only width the app reads without having produced it.
-// `useResizable` clamps what it is handed but never rounds, so whatever this
-// lets through reaches the panel, storage and `aria-valuenow` unchanged.
-function storedWidth(value: string | null): void {
-  (globalThis as { localStorage?: unknown }).localStorage = {
-    getItem: (key: string) => (key === 'maka-session-workbar-width-v1' ? value : null),
-  };
-}
-
-describe('readSessionWorkbarWidth', () => {
-  afterEach(() => {
-    delete (globalThis as { localStorage?: unknown }).localStorage;
-  });
-
-  it('rounds a fractional stored width', () => {
-    storedWidth('400.5');
-    assert.equal(readSessionWorkbarWidth(), 401);
-  });
-
-  it('leaves out-of-range widths for useResizable to clamp', () => {
-    storedWidth('9999');
-    assert.equal(readSessionWorkbarWidth(), 9999);
-  });
-
-  it('falls back to the default for missing, unparseable and non-positive widths', () => {
-    for (const value of [null, '', 'wide', '0', '-10']) {
-      storedWidth(value);
-      assert.equal(readSessionWorkbarWidth(), SESSION_WORKBAR_DEFAULT_WIDTH, `stored: ${value}`);
-    }
-  });
-});
-
-describe('readSessionBottomPanelHeight', () => {
-  afterEach(() => {
-    delete (globalThis as { localStorage?: unknown }).localStorage;
-  });
-
-  it('rounds stored height and falls back for invalid values', () => {
-    (globalThis as { localStorage?: unknown }).localStorage = {
-      getItem: (key: string) =>
-        key === 'maka-session-bottom-panel-height-v1' ? '344.6' : null,
-    };
-    assert.equal(readSessionBottomPanelHeight(), 345);
-
-    (globalThis as { localStorage?: unknown }).localStorage = {
-      getItem: () => 'invalid',
-    };
-    assert.equal(
-      readSessionBottomPanelHeight(),
-      SESSION_BOTTOM_PANEL_DEFAULT_HEIGHT,
-    );
-  });
-});
-
-describe('workbar panel topology CSS contract', () => {
-  it('allocates independent right and bottom grid areas', async () => {
-    const css = await readRendererContractCss();
-    assert.match(
-      css,
-      /\.maka-detail-with-artifacts\s*\{[^}]*grid-template-areas:\s*"main right-handle right"\s*"bottom-handle right-handle right"\s*"bottom right-handle right"/,
-    );
-    assert.match(css, /\.maka-session-workbar\[data-placement="right"\]\s*\{[^}]*grid-area:\s*right/);
-    assert.match(css, /\.maka-session-workbar\[data-placement="bottom"\]\s*\{[^}]*grid-area:\s*bottom/);
-    assert.match(css, /\.maka-workbar-layout-vars,[^{]*\{[^}]*display:\s*contents/);
-  });
-
-  it('keeps the frame a frame rather than a scrollport', async () => {
-    const css = await readRendererContractCss();
-    // The frame is not a scroll container, and nothing inside it reaches
-    // outside its own box. Both halves of the same lesson: the column used to
-    // hang above the frame's padding box to meet its top edge, and to an
-    // `overflow: hidden` frame that overhang was scrollable overflow — the
-    // first focus anywhere inside, and the resize handle is one Tab away,
-    // scrolled the whole frame up by the clearance and left it there.
-    assert.match(css, /\.maka-panel-detail\s*\{[^}]*overflow:\s*clip/);
-    assert.doesNotMatch(
-      css,
-      /margin-top:\s*calc\(\s*-1\s*\*\s*var\(--maka-plate-titlebar-clearance\)/,
-      'a plate is hanging above the frame again instead of padding itself',
-    );
-    // Each plate pays for its own clearance, which is what puts their top
-    // edges on one line without anyone overhanging.
-    assert.match(
-      css,
-      /\.maka-session-workbar\s*\{[^}]*padding-top:\s*var\(--maka-plate-titlebar-clearance\)/,
-    );
-  });
-
-  it('keeps tab surfaces in the same grid topology as their panel chrome', async () => {
-    const css = await readRendererContractCss();
-    assert.match(
-      css,
-      /\.maka-session-workbar-panel\[data-overlay\]\[data-placement="right"\]\s*\{[^}]*grid-area:\s*right/,
-    );
-    assert.match(
-      css,
-      /\.maka-session-workbar-panel\[data-overlay\]\[data-placement="bottom"\]\s*\{[^}]*grid-area:\s*bottom/,
-    );
-    assert.match(css, /--maka-session-bottom-panel-height,\s*300px/);
-  });
-});
diff --git a/apps/desktop/src/main/__tests__/side-chat-command.test.ts b/apps/desktop/src/main/__tests__/side-chat-command.test.ts
index e1beed13e1..38916c48a2 100644
--- a/apps/desktop/src/main/__tests__/side-chat-command.test.ts
+++ b/apps/desktop/src/main/__tests__/side-chat-command.test.ts
@@ -2,7 +2,6 @@ import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import {
   parseSideChatCommand,
-  sideChatTitleFromPrompt,
 } from '../../renderer/side-chat-command.js';
 
 describe('side chat slash command', () => {
@@ -15,12 +14,4 @@ describe('side chat slash command', () => {
     assert.equal(parseSideChatCommand('before /side'), null);
   });
 
-  it('derives a compact single-line tab title without splitting Unicode', () => {
-    assert.equal(sideChatTitleFromPrompt('  inspect\n this   code  '), 'inspect this code');
-    assert.equal(sideChatTitleFromPrompt('   '), undefined);
-    assert.equal(
-      sideChatTitleFromPrompt('🙂'.repeat(70)),
-      '🙂'.repeat(60),
-    );
-  });
 });
diff --git a/apps/desktop/src/main/__tests__/skill-invocation-feedback.test.ts b/apps/desktop/src/main/__tests__/skill-invocation-feedback.test.ts
index 560255c6bf..2ff08ab67a 100644
--- a/apps/desktop/src/main/__tests__/skill-invocation-feedback.test.ts
+++ b/apps/desktop/src/main/__tests__/skill-invocation-feedback.test.ts
@@ -2,35 +2,9 @@ import { strict as assert } from 'node:assert';
 import { describe, it } from 'node:test';
 import {
   showSkillInvocationFeedback,
-  skillInvocationDisplayText,
 } from '../../renderer/skill-invocation-feedback.js';
 
-describe('Desktop Skill invocation display text', () => {
-  it('preserves user text when the send also loaded Skills', () => {
-    assert.equal(
-      skillInvocationDisplayText('  keep spacing  ', {
-        loaded: [{ id: 'alpha', name: 'Alpha' }],
-        failed: [],
-        receipts: [],
-      }),
-      '  keep spacing  ',
-    );
-  });
-
-  it('renders loaded ids for a chip-only optimistic message', () => {
-    assert.equal(
-      skillInvocationDisplayText('', {
-        loaded: [
-          { id: 'alpha', name: 'Alpha' },
-          { id: 'beta', name: 'Beta' },
-        ],
-        failed: [],
-        receipts: [],
-      }),
-      '/skill:alpha /skill:beta',
-    );
-  });
-
+describe('Desktop Skill invocation feedback', () => {
   it('renders request overflow as an aggregate failure without a synthetic Skill id', () => {
     const errors: Array<{ title: string; description?: string }> = [];
     showSkillInvocationFeedback(
diff --git a/apps/desktop/src/main/__tests__/window-state.test.ts b/apps/desktop/src/main/__tests__/window-state.test.ts
deleted file mode 100644
index 94a5be3692..0000000000
--- a/apps/desktop/src/main/__tests__/window-state.test.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Tests for the window-state sanitization helper. The IO layer
- * (readSavedBounds / writeSavedBounds) catches its own errors and
- * silently falls back to defaults; what matters is `sanitizeBounds`
- * never producing a half-applied or unsafe BrowserWindow size.
- */
-
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import { sanitizeBounds } from '../window-state.js';
-
-const DEFAULTS = { width: 1240, height: 820 };
-
-describe('sanitizeBounds', () => {
-  it('returns defaults for null / undefined / non-object', () => {
-    assert.deepEqual(sanitizeBounds(null, DEFAULTS), DEFAULTS);
-    assert.deepEqual(sanitizeBounds(undefined, DEFAULTS), DEFAULTS);
-    assert.deepEqual(sanitizeBounds('not a thing', DEFAULTS), DEFAULTS);
-    assert.deepEqual(sanitizeBounds(42, DEFAULTS), DEFAULTS);
-  });
-
-  it('returns defaults when width or height missing / non-numeric', () => {
-    assert.deepEqual(sanitizeBounds({ height: 600 }, DEFAULTS), DEFAULTS);
-    assert.deepEqual(sanitizeBounds({ width: 800 }, DEFAULTS), DEFAULTS);
-    assert.deepEqual(sanitizeBounds({ width: 'big', height: 600 }, DEFAULTS), DEFAULTS);
-  });
-
-  it('returns defaults when width or height below safe minimum', () => {
-    // 320 minimum on height, 480 on width — anything smaller is treated as
-    // corruption / pre-fullscreen sentinel and replaced with defaults.
-    assert.deepEqual(sanitizeBounds({ width: 100, height: 600 }, DEFAULTS), DEFAULTS);
-    assert.deepEqual(sanitizeBounds({ width: 800, height: 50 }, DEFAULTS), DEFAULTS);
-    assert.deepEqual(sanitizeBounds({ width: 0, height: 0 }, DEFAULTS), DEFAULTS);
-    assert.deepEqual(sanitizeBounds({ width: -100, height: -100 }, DEFAULTS), DEFAULTS);
-  });
-
-  it('keeps valid width + height, drops bad x/y', () => {
-    assert.deepEqual(
-      sanitizeBounds({ width: 800, height: 600, x: 'left', y: 100 }, DEFAULTS),
-      { width: 800, height: 600 },
-    );
-    assert.deepEqual(
-      sanitizeBounds({ width: 800, height: 600, x: Infinity, y: 0 }, DEFAULTS),
-      { width: 800, height: 600 },
-    );
-  });
-
-  it('keeps valid x + y alongside width + height', () => {
-    assert.deepEqual(
-      sanitizeBounds({ width: 800, height: 600, x: 100, y: 50 }, DEFAULTS),
-      { width: 800, height: 600, x: 100, y: 50 },
-    );
-  });
-
-  it('keeps isMaximized when boolean, drops otherwise', () => {
-    assert.deepEqual(
-      sanitizeBounds({ width: 800, height: 600, isMaximized: true }, DEFAULTS),
-      { width: 800, height: 600, isMaximized: true },
-    );
-    assert.deepEqual(
-      sanitizeBounds({ width: 800, height: 600, isMaximized: 'true' }, DEFAULTS),
-      { width: 800, height: 600 },
-    );
-  });
-
-  it('floors fractional pixel values', () => {
-    // BrowserWindow expects integers; high-DPI screen restore can land at
-    // fractional values. Floor them rather than reject.
-    assert.deepEqual(
-      sanitizeBounds({ width: 800.7, height: 600.3, x: 100.9, y: 50.1 }, DEFAULTS),
-      { width: 800, height: 600, x: 100, y: 50 },
-    );
-  });
-});
diff --git a/packages/cli/src/__tests__/pi-transcript-format.test.ts b/packages/cli/src/__tests__/pi-transcript-format.test.ts
deleted file mode 100644
index 506efa1f23..0000000000
--- a/packages/cli/src/__tests__/pi-transcript-format.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import assert from 'node:assert/strict';
-import { test } from 'node:test';
-import { formatToolResultContent } from '../pi-transcript-format.js';
-
-test('formats an agent swarm with bounded child evidence references', () => {
-  const output = formatToolResultContent({
-    kind: 'agent_swarm',
-    status: 'partial',
-    items: [
-      {
-        itemId: 'auth',
-        index: 0,
-        profile: 'local_read',
-        started: true,
-        agentId: 'local-read',
-        agentName: 'Local Read',
-        turnId: 'turn-auth',
-        runId: 'run-auth',
-        resumedFromRunId: 'run-auth-source',
-        status: 'completed',
-        summary: 'Auth boundaries are documented.',
-        artifactIds: ['artifact-auth'],
-      },
-      {
-        itemId: 'storage',
-        index: 1,
-        profile: 'local_read',
-        started: false,
-        status: 'failed',
-        summary: 'Storage inspection failed.',
-        artifactIds: [],
-      },
-    ],
-    startedAt: 10,
-    completedAt: 20,
-    durationMs: 10,
-  });
-
-  assert.equal(
-    output,
-    [
-      'Agent swarm: partial · 2 items · 1 completed · 1 failed · 0 cancelled · 1 artifacts · 10ms',
-      'auth: completed · local_read · 1 artifacts · resumed from run-auth-source · run run-auth · turn turn-auth\nAuth boundaries are documented.',
-      'storage: failed · local_read · 0 artifacts\nStorage inspection failed.',
-    ].join('\n\n'),
-  );
-  assert.match(output, /resumed from run-auth-source · run run-auth · turn turn-auth/);
-  assert.doesNotMatch(output, /artifact-auth|local-read/);
-});
-
-test('bounds individual and aggregate agent swarm text', () => {
-  const output = formatToolResultContent({
-    kind: 'agent_swarm',
-    status: 'completed',
-    items: Array.from({ length: 32 }, (_, index) => ({
-      itemId: `item-${index}`,
-      index,
-      profile: 'local_read',
-      started: true,
-      status: 'completed' as const,
-      summary: 'x'.repeat(2_000),
-      artifactIds: [],
-    })),
-    startedAt: 10,
-    completedAt: 20,
-    durationMs: 10,
-  });
-
-  assert.ok(output.length < 16_100);
-  assert.match(output, /chars truncated/);
-  assert.match(output, /item-0: completed/);
-  assert.doesNotMatch(output, /item-31: completed/);
-});
diff --git a/packages/cli/src/__tests__/pi-transcript.test.ts b/packages/cli/src/__tests__/pi-transcript.test.ts
index e654c1f2f7..38074d463f 100644
--- a/packages/cli/src/__tests__/pi-transcript.test.ts
+++ b/packages/cli/src/__tests__/pi-transcript.test.ts
@@ -3,7 +3,6 @@ import { before, describe, test } from 'node:test';
 import { visibleWidth } from '@earendil-works/pi-tui';
 import { _setColorLevelForTesting } from '../tui-ansi.js';
 import type { PipeShellOutput, PtyShellOutput, ShellRunToolResult } from '@maka/core';
-import { computerUseModelCallArgs } from '@maka/core';
 import type { SessionEvent, ToolResultContent } from '@maka/core/events';
 import type { StoredMessage } from '@maka/core/session';
 import {
@@ -12,8 +11,6 @@ import {
   applyMakaSessionEventToTranscript,
   applyShellRunUpdateToTranscript,
   createMakaPiTranscriptState,
-  renderMakaPiActivityStrip,
-  renderMakaPiStatusLine,
   renderMakaPiTranscript,
   refreshRunningShellRunElapsed,
   reconcileToolsWithStoredMessages,
@@ -30,53 +27,7 @@ import {
 // tests lock (#1064/#1066); matches tui-ansi.test.ts's reset convention.
 before(() => _setColorLevelForTesting(3));
 
-// The branded empty-session home opens on a four-line lowercase ASCII `maka`
-// wordmark in Maka blue (#1098). Stored without trailing spaces so the render
-// and these assertions agree after rtrim; the fallback width is derived from it.
-const MAKA_WORDMARK = [
-  ' _ __    __ _  _  __   __ _',
-  "| '_ \\  / _` | | |/ / / _` |",
-  '| |_) | | (_| | |   <  | (_| |',
-  '|_.__/  \\__,_| |_|\\_\\  \\__,_|',
-];
-const MAKA_WORDMARK_WIDTH = Math.max(...MAKA_WORDMARK.map((line) => line.length));
-
 describe('Maka Pi TUI transcript', () => {
-  test('greets on a fresh empty session with the branded maka home and drops it once a prompt lands', () => {
-    const state = createMakaPiTranscriptState();
-
-    const lines = renderMakaPiTranscript(state, meta(), 100).map((line) =>
-      stripAnsi(line).replace(/\s+$/, ''),
-    );
-    // Four-line lowercase ASCII maka wordmark.
-    assert.deepEqual(lines.slice(0, 4), MAKA_WORDMARK);
-    // The wordmark is Maka blue (accent), not plain text.
-    assert.ok(renderMakaPiTranscript(state, meta(), 100)[0].includes('\x1b[38;2;87;163;239m'));
-    // Short Chinese-first tagline.
-    assert.ok(lines.includes('陪你把事做完'));
-    // Command-center hints: direct input + /session + /model + /setup. /help is
-    // no longer a home hint — autocomplete teaches commands as you type.
-    assert.ok(lines.some((line) => line.trim().startsWith('输入消息开始对话')));
-    assert.ok(lines.some((line) => /\/session/.test(line)));
-    assert.ok(lines.some((line) => /\/model/.test(line)));
-    assert.ok(lines.some((line) => /\/setup/.test(line)));
-    assert.equal(
-      lines.some((line) => /\/help/.test(line)),
-      false,
-    );
-    // The active model/connection live in the statusline, not the welcome.
-    assert.equal(
-      lines.some((line) => /deepseek-v4-flash/.test(line)),
-      false,
-    );
-
-    // Once a turn exists the transcript takes over — the welcome never returns.
-    appendUserPrompt(state, 'hello world');
-    const afterPrompt = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi).join('\n');
-    assert.equal(/\/session/.test(afterPrompt), false);
-    assert.ok(afterPrompt.includes('hello world'));
-  });
-
   test('keeps assistant text after a tool call visible after the tool block', () => {
     const state = createMakaPiTranscriptState();
     appendUserPrompt(state, 'inspect the package');
@@ -3702,255 +3653,6 @@ describe('Maka Pi TUI transcript', () => {
     assert.doesNotMatch(expanded, /lines hidden/);
   });
 
-  test('summarizes Grep results as a match count and shows matches expanded', () => {
-    const state = createMakaPiTranscriptState();
-    const matches = Array.from({ length: 12 }, (_, i) => `match-${i}`);
-
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'grep-1',
-        toolName: 'Grep',
-        args: { pattern: 'TODO', path: 'packages', glob: '*.ts' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'grep-1',
-        isError: false,
-        content: { kind: 'json', value: { matches } },
-      }),
-    );
-
-    const compactLines = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi);
-    assert.equal(compactLines.length, 2);
-    const compact = compactLines.join('\n');
-    assert.match(compact, /TODO in packages glob \*\.ts/);
-    assert.match(compact, /\(12 matches\)/);
-    assert.doesNotMatch(compact, /match-0/);
-
-    // Expanding a Grep card shows every match — a structured list the user
-    // opened the card to scan, not a raw dump to head/tail cap. All 12 rows,
-    // including the middle ones, must survive and there is no hidden-count marker.
-    assert.equal(toggleAllToolExpansion(state), true);
-    const expanded = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi).join('\n');
-    for (let i = 0; i < 12; i += 1) assert.match(expanded, new RegExp(`match-${i}\\b`));
-    assert.doesNotMatch(expanded, /lines hidden/);
-  });
-
-  test('summarizes Glob results as a file count and shows the list expanded', () => {
-    const state = createMakaPiTranscriptState();
-    const files = ['src/a.ts', 'src/b.ts', 'src/c.ts'];
-
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'glob-1',
-        toolName: 'Glob',
-        args: { pattern: '**/*.ts', cwd: 'packages' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'glob-1',
-        isError: false,
-        content: { kind: 'json', value: { files } },
-      }),
-    );
-
-    const compactLines = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi);
-    assert.equal(compactLines.length, 2);
-    const compact = compactLines.join('\n');
-    assert.match(compact, /● Glob  \*\*\/\*\.ts in packages/);
-    assert.match(compact, /\(3 files\)/);
-    assert.doesNotMatch(compact, /src\/a\.ts/);
-
-    assert.equal(toggleAllToolExpansion(state), true);
-    const expanded = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi).join('\n');
-    assert.match(expanded, /src\/a\.ts/);
-    assert.match(expanded, /src\/c\.ts/);
-  });
-
-  test('does not fabricate a Grep match count from an error-shaped result', () => {
-    const state = createMakaPiTranscriptState();
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'grep-1',
-        toolName: 'Grep',
-        args: { pattern: 'TODO' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'grep-1',
-        isError: false,
-        content: { kind: 'json', value: { error: 'boom\nsecond line\nthird' } },
-      }),
-    );
-
-    const compact = renderMakaPiTranscript(state, meta(), 120).map(stripAnsi).join('\n');
-    // A 3-line error object must not be reported as "3 matches". It uses the
-    // generic fixed-shape summary instead, without raw JSON or result content.
-    assert.doesNotMatch(compact, /\d+ matches/);
-    assert.match(compact, /\(4 lines · 35 bytes\)/);
-    assert.doesNotMatch(compact, /"error":"boom/);
-    assert.doesNotMatch(compact, /error:/);
-  });
-
-  test('does not fabricate a Glob file count when files is null', () => {
-    const state = createMakaPiTranscriptState();
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'glob-1',
-        toolName: 'Glob',
-        args: { pattern: '**/*.ts' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'glob-1',
-        isError: false,
-        content: { kind: 'json', value: { files: null } },
-      }),
-    );
-
-    const compact = renderMakaPiTranscript(state, meta(), 120).map(stripAnsi).join('\n');
-    assert.doesNotMatch(compact, /\d+ files/);
-  });
-
-  test('keeps generic JSON input and result summaries on a single line', () => {
-    const state = createMakaPiTranscriptState();
-
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'tool-1',
-        toolName: 'Frobnicate',
-        args: { alpha: 1, beta: 'two' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'tool-1',
-        isError: false,
-        content: { kind: 'json', value: { gamma: 3, delta: 'four' } },
-      }),
-    );
-
-    const lines = renderMakaPiTranscript(state, meta(), 200).map(stripAnsi);
-    // Never more than one card line (plus the leading blank separator):
-    // multi-line JSON must not split the header.
-    assert.equal(lines.length, 2);
-    // #1086: generic results use a fixed-shape size summary instead of
-    // leaking the first result line into the compact row.
-    assert.match(lines[1] ?? '', /● Frobnicate  alpha: 1 beta: two \(\d+ lines · \d+ bytes\)/);
-    assert.doesNotMatch(lines[1] ?? '', /\{"alpha"/);
-    assert.doesNotMatch(lines[1] ?? '', /\{"gamma"/);
-    assert.doesNotMatch(lines[1] ?? '', /gamma:/);
-  });
-
-  test('summarizes free-text MCP results with UTF-8 line and byte counts', () => {
-    const state = createMakaPiTranscriptState();
-    const text = '你好\n世界\n';
-
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'mcp-1',
-        toolName: 'mcp__github__search',
-        args: { query: 'Maka' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'mcp-1',
-        isError: false,
-        content: { kind: 'text', text },
-      }),
-    );
-
-    const compact = renderMakaPiTranscript(state, meta(), 120).map(stripAnsi).join('\n');
-    assert.match(compact, /\(2 lines · 14 bytes\)/);
-    assert.doesNotMatch(compact, /你好|世界/);
-
-    assert.equal(toggleAllToolExpansion(state), true);
-    const expanded = renderMakaPiTranscript(state, meta(), 120).map(stripAnsi).join('\n');
-    assert.match(expanded, /你好/);
-    assert.match(expanded, /世界/);
-  });
-
-  test('keeps subagent summaries out of compact rows', () => {
-    const state = createMakaPiTranscriptState();
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'agent-summary',
-        toolName: 'agent_spawn',
-        args: { profile: 'local_read', task: 'Inspect the repository.' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'agent-summary',
-        isError: false,
-        content: subagentResult({ summary: 'first result line\nsecond result line' }),
-      }),
-    );
-
-    const compact = renderMakaPiTranscript(state, meta(), 120).map(stripAnsi).join('\n');
-    assert.match(compact, /\(2 lines · \d+ bytes\)/);
-    assert.doesNotMatch(compact, /first result line|second result line/);
-  });
-
-  test('shows archived Read status instead of archived placeholder text', () => {
-    const state = createMakaPiTranscriptState();
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'read-archived',
-        toolName: 'Read',
-        args: { path: 'README.md' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'read-archived',
-        isError: false,
-        content: { kind: 'archived_tool_result', status: 'not_loaded' },
-      }),
-    );
-
-    const compact = renderMakaPiTranscript(state, meta(), 120).map(stripAnsi).join('\n');
-    assert.match(compact, /\(archived: not_loaded\)/);
-    assert.doesNotMatch(compact, /Archived tool result:/);
-  });
-
   test('keeps generic compact summaries bounded for malformed and oversized results', () => {
     const cases = [
       {
@@ -4055,59 +3757,6 @@ describe('Maka Pi TUI transcript', () => {
     );
   });
 
-  test('summarizes file_diff compactly and colors the expanded diff', () => {
-    const state = createMakaPiTranscriptState();
-    const diff = [
-      '--- a/file.ts',
-      '+++ b/file.ts',
-      '@@ -1 +1 @@',
-      '-removed line',
-      '+added line',
-    ].join('\n');
-
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'edit-1',
-        toolName: 'Edit',
-        args: { path: 'file.ts' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'edit-1',
-        isError: false,
-        content: { kind: 'file_diff', paths: ['file.ts'], diff },
-      }),
-    );
-
-    const compactLines = renderMakaPiTranscript(state, meta(), 100);
-    assert.equal(compactLines.length, 2);
-    const compactRaw = compactLines.join('\n');
-    // Compact: `+1 -1` with green add count and red delete count; the path is
-    // already the card's input summary, so the diff summary does not repeat it.
-    assert.match(compactLines.map(stripAnsi).join('\n'), /\(\+1 -1\)/);
-    assert.doesNotMatch(compactLines.map(stripAnsi).join('\n'), /\+1 -1 file\.ts/);
-    assert.match(compactRaw, /\x1b\[32m\+1\x1b\[39m/);
-    assert.match(compactRaw, /\x1b\[31m-1\x1b\[39m/);
-    assert.doesNotMatch(compactLines.map(stripAnsi).join('\n'), /added line/);
-
-    assert.equal(toggleAllToolExpansion(state), true);
-    const raw = renderMakaPiTranscript(state, meta(), 100).join('\n');
-    // Green (32) around the added line, red (31) around the removed line.
-    assert.match(raw, /\x1b\[32m\+added line\x1b\[39m/);
-    assert.match(raw, /\x1b\[31m-removed line\x1b\[39m/);
-    // The `---`/`+++` file headers repeat the path the card already shows;
-    // the hunk header stays as the only line-number anchor.
-    const expanded = stripAnsi(raw);
-    assert.doesNotMatch(expanded, /--- a\/file\.ts/);
-    assert.doesNotMatch(expanded, /\+\+\+ b\/file\.ts/);
-    assert.match(expanded, /@@ -1 \+1 @@/);
-  });
-
   test('caps long terminal output to head and tail lines when expanded', () => {
     const state = createMakaPiTranscriptState();
     const stdout = Array.from({ length: 20 }, (_, i) => `out-${i}`).join('\n');
@@ -4142,161 +3791,6 @@ describe('Maka Pi TUI transcript', () => {
     assert.match(expanded, /⋯ 14 lines hidden ⋯/);
   });
 
-  test('shows a long diff in full when expanded — diffs are the head/tail exception', () => {
-    const state = createMakaPiTranscriptState();
-    const diff = [
-      '--- a/file.ts',
-      '+++ b/file.ts',
-      '@@ -1 +20 @@',
-      ...Array.from({ length: 20 }, (_, i) => `+line-${i}`),
-    ].join('\n');
-
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'edit-2',
-        toolName: 'Edit',
-        args: { path: 'file.ts' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'edit-2',
-        isError: false,
-        content: { kind: 'file_diff', paths: ['file.ts'], diff },
-      }),
-    );
-
-    assert.equal(toggleAllToolExpansion(state), true);
-    const expanded = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi).join('\n');
-    // Every added line is present and no lines are hidden.
-    assert.match(expanded, /\+line-0\b/);
-    assert.match(expanded, /\+line-10\b/);
-    assert.match(expanded, /\+line-19\b/);
-    assert.doesNotMatch(expanded, /lines hidden/);
-  });
-
-  test('expands and collapses every tool card with one global toggle', () => {
-    const state = createMakaPiTranscriptState();
-
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'tool-a',
-        toolName: 'Bash',
-        args: { command: 'echo a' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'tool-a',
-        isError: false,
-        // The body is the first stdout line, so the compact tail summary hides it
-        // while expansion reveals it.
-        content: terminalResult('alpha-body-line\ntail-a'),
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'tool-b',
-        toolName: 'Bash',
-        args: { command: 'echo b' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'tool-b',
-        isError: false,
-        content: terminalResult('beta-body-line\ntail-b'),
-      }),
-    );
-
-    const compact = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi).join('\n');
-    assert.doesNotMatch(compact, /alpha-body-line/);
-    assert.doesNotMatch(compact, /beta-body-line/);
-
-    // One press expands every tool card.
-    assert.equal(toggleAllToolExpansion(state), true);
-    const expanded = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi).join('\n');
-    assert.match(expanded, /alpha-body-line/);
-    assert.match(expanded, /beta-body-line/);
-
-    // A second press collapses every tool card again.
-    assert.equal(toggleAllToolExpansion(state), true);
-    const collapsed = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi).join('\n');
-    assert.doesNotMatch(collapsed, /alpha-body-line/);
-    assert.doesNotMatch(collapsed, /beta-body-line/);
-  });
-
-  test('expands and collapses every thinking entry with one global toggle', () => {
-    const state = createMakaPiTranscriptState();
-
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'thinking_delta',
-        messageId: 'message-1',
-        text: 'first thought body',
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'text_delta',
-        messageId: 'message-1',
-        text: 'first reply',
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'thinking_delta',
-        messageId: 'message-2',
-        text: 'second thought body',
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'text_delta',
-        messageId: 'message-2',
-        text: 'second reply',
-      }),
-    );
-
-    const collapsed = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi);
-    assert.equal(collapsed.filter((line) => line.includes('Thinking…')).length, 2);
-    assert.equal(
-      collapsed.some((line) => line.includes('thought body')),
-      false,
-    );
-
-    // One press expands every thinking entry.
-    assert.equal(toggleAllThinkingExpansion(state), true);
-    const expanded = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi).join('\n');
-    assert.match(expanded, /first thought body/);
-    assert.match(expanded, /second thought body/);
-
-    // A second press collapses every thinking entry again.
-    assert.equal(toggleAllThinkingExpansion(state), true);
-    const recollapsed = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi);
-    assert.equal(recollapsed.filter((line) => line.includes('Thinking…')).length, 2);
-    assert.equal(
-      recollapsed.some((line) => line.includes('thought body')),
-      false,
-    );
-  });
-
   test('orders and de-dupes tool_output_delta by seq and marks redacted chunks', () => {
     const state = createMakaPiTranscriptState();
     applyMakaSessionEventToTranscript(
@@ -4500,36 +3994,6 @@ describe('Maka Pi TUI transcript', () => {
 });
 
 describe('transcript entry render memoization', () => {
-  test('re-renders a tool entry when Ctrl+O expansion is toggled', () => {
-    const state = createMakaPiTranscriptState();
-    // A Grep (not a filesystem Read, which now renders only a summary) so
-    // expansion genuinely changes the rendered block and its body is shown.
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_start',
-        toolUseId: 'tool-1',
-        toolName: 'Grep',
-        args: { pattern: 'beta' },
-      }),
-    );
-    applyMakaSessionEventToTranscript(
-      state,
-      event({
-        type: 'tool_result',
-        toolUseId: 'tool-1',
-        isError: false,
-        content: { kind: 'text', text: 'alpha\nbeta\ngamma' },
-      }),
-    );
-
-    const collapsed = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi).join('\n');
-    assert.equal(toggleAllToolExpansion(state), true);
-    const expanded = renderMakaPiTranscript(state, meta(), 100).map(stripAnsi).join('\n');
-    assert.notEqual(expanded, collapsed);
-    assert.match(expanded, /beta/);
-  });
-
   test('re-renders live progress after the bounded buffer reaches a stable length', () => {
     const state = createMakaPiTranscriptState();
     applyMakaSessionEventToTranscript(
@@ -4698,151 +4162,6 @@ describe('transcript entry render memoization', () => {
   });
 });
 
-describe('Maka Pi TUI status line', () => {
-  test('names the boundary the session is in: Read only, Auto, or Full access', () => {
-    // Legacy `execute` has no boundary of its own, so it really does read as
-    // Auto. `explore` is a boundary a resumed session can be in and must be
-    // named — showing it as Auto is the #1611 defect.
-    for (const permissionMode of ['ask', 'execute']) {
-      const line = stripAnsi(renderMakaPiStatusLine({ ...meta(), permissionMode }, 100));
-      assert.match(line, /Maka · Auto ·/);
-      assert.doesNotMatch(line, new RegExp(`· ${permissionMode} ·`));
-    }
-    assert.match(
-      stripAnsi(renderMakaPiStatusLine({ ...meta(), permissionMode: 'explore' }, 100)),
-      /Maka · Read only ·/,
-    );
-    assert.match(
-      stripAnsi(renderMakaPiStatusLine({ ...meta(), permissionMode: 'bypass' }, 100)),
-      /Maka · Full access ·/,
-    );
-  });
-
-  test('ctx segment uses red when usage >95% (#1064)', () => {
-    const raw = renderMakaPiStatusLine(
-      {
-        ...meta(),
-        modelContextWindow: 128_000,
-        usage: { costUsd: 0, cacheHitInput: 0, cacheMissInput: 0, contextRemaining: 3_200 },
-      },
-      100,
-    );
-    // 124800/128000 = 97.5% → red (\x1b[31m)
-    assert.ok(raw.includes('\x1b[31m'), 'ctx segment should use red at >95%');
-  });
-});
-
-describe('Maka Pi TUI activity strip', () => {
-  test('shows transient provider retry progress and clears it on model output', () => {
-    const state = createMakaPiTranscriptState();
-    applyMakaSessionEventToTranscript(state, {
-      type: 'provider_retry',
-      id: 'retry-1',
-      turnId: 'turn-1',
-      ts: 1,
-      phase: 'scheduled',
-      attempt: 3,
-      maxAttempts: 10,
-      delayMs: 4_000,
-      reason: 'rate_limit',
-    });
-
-    assert.equal(
-      stripAnsi(
-        renderMakaPiActivityStrip(
-          { ...meta(), turnElapsedMs: 5_500, providerRetry: state.providerRetry },
-          100,
-        ),
-      ),
-      'Retrying in 4s (3/10)',
-    );
-
-    applyMakaSessionEventToTranscript(state, {
-      type: 'text_delta',
-      id: 'text-1',
-      turnId: 'turn-1',
-      ts: 2,
-      messageId: 'message-1',
-      text: 'recovered',
-    });
-    assert.equal(state.providerRetry, undefined);
-  });
-});
-
-describe('Maka Pi TUI Computer Use rows', () => {
-  /**
-   * The desktop is not the only renderer of tool activity, and the row that
-   * reads `Maka Computer` reads it in both. The arguments are put through
-   * `computerUseModelCallArgs`, because that is what the runtime persists and
-   * emits for this tool — a fixture written as the wire call, or run through
-   * some other projection, would assert a label from fields the TUI can never
-   * receive. That projection speaks the tool's own dialect: `window_id` and
-   * `element_id`, not `windowId` and `elementId`.
-   */
-  test('says what each Computer Use call did instead of repeating the tool name', () => {
-    const state = createMakaPiTranscriptState();
-    appendUserPrompt(state, 'add seven and eight');
-    const calls = [
-      { action: 'observe', app: 'Calculator', window_id: 7 },
-      {
-        action: 'click_element',
-        app: 'Calculator',
-        window_id: 7,
-        observation_id: 'frame-1',
-        element_id: 'e7',
-      },
-      {
-        action: 'click_element',
-        app: 'Calculator',
-        window_id: 7,
-        observation_id: 'frame-1',
-        element_id: 'e9',
-      },
-    ];
-    calls.forEach((wireArgs, index) => {
-      applyMakaSessionEventToTranscript(
-        state,
-        event({
-          type: 'tool_start',
-          toolUseId: `cu-${index}`,
-          toolName: 'maka_computer',
-          displayName: 'Maka Computer',
-          activityKind: 'computer',
-          args: computerUseModelCallArgs(wireArgs),
-        }),
-      );
-      applyMakaSessionEventToTranscript(
-        state,
-        event({
-          type: 'tool_result',
-          toolUseId: `cu-${index}`,
-          isError: false,
-          content: { kind: 'text', text: 'ok' },
-        }),
-      );
-    });
-
-    const rendered = renderMakaPiTranscript(state, meta(), 120).map(stripAnsi);
-    const rows = rendered.filter((line) => line.includes('Maka Computer'));
-    assert.equal(rows.length, 3, 'one row per call');
-    assert.equal(
-      new Set(rows.map((row) => row.trim())).size,
-      3,
-      'three rows that read differently',
-    );
-    assert.ok(
-      rows.some((row) => /click_element · element e7 · Calculator window 7/.test(row)),
-      `expected the first click to name its element, got:\n${rows.join('\n')}`,
-    );
-    assert.ok(rows.some((row) => /click_element · element e9/.test(row)));
-    assert.ok(rows.some((row) => /observe · Calculator window 7/.test(row)));
-    // The host's own approval bookkeeping is not something the model asked for
-    // and has no business in a transcript row.
-    const all = rows.join('\n');
-    assert.equal(/approvalClass|rememberForTurnAllowed|observation_id/.test(all), false, all);
-  });
-});
-
 function meta() {
   return {
     title: 'Maka',
diff --git a/packages/cli/src/__tests__/pi-tui-runner.test.ts b/packages/cli/src/__tests__/pi-tui-runner.test.ts
index 5ef6f663bd..f45a7fd75d 100644
--- a/packages/cli/src/__tests__/pi-tui-runner.test.ts
+++ b/packages/cli/src/__tests__/pi-tui-runner.test.ts
@@ -6075,41 +6075,6 @@ describe('Maka Pi TUI runner', () => {
   });
 
   describe('/recap command', () => {
-    test('shows the cleaned recap text on success', async () => {
-      const terminal = new FakeTerminal();
-      const driver = new RewindDriver([{ turnId: 'turn-1', label: 'first prompt' }]);
-      const run = runMakaPiTui({
-        title: 'Maka',
-        driver,
-        cwd: '/repo',
-        model: 'claude-sonnet-4-5',
-        connectionSlug: 'claude-subscription',
-        permissionMode: 'ask',
-        terminal,
-        recap: {
-          generate: async () => ({
-            ok: true,
-            text: 'We fixed the recap bug.',
-            raw: 'We fixed the recap bug.',
-          }),
-        },
-      });
-
-      terminal.input('/recap');
-      terminal.input('\r');
-      await waitFor(() =>
-        plainTerminalOutput(terminal.output()).includes('Recap: We fixed the recap bug.'),
-      );
-
-      exitMaka(terminal);
-      await Promise.race([
-        run,
-        delay(CLOSE_BUDGET_MS).then(() => {
-          throw new Error('TUI did not close during test cleanup');
-        }),
-      ]);
-    });
-
     test('a second /recap while one is in flight reports it is already running, without a second generate() call', async () => {
       const terminal = new FakeTerminal();
       const driver = new RewindDriver([{ turnId: 'turn-1', label: 'first prompt' }]);
diff --git a/packages/cli/src/__tests__/run-command.test.ts b/packages/cli/src/__tests__/run-command.test.ts
index 46738e6ae4..4303ba4b58 100644
--- a/packages/cli/src/__tests__/run-command.test.ts
+++ b/packages/cli/src/__tests__/run-command.test.ts
@@ -294,15 +294,6 @@ describe('maka run process contract', () => {
     assert.equal(result.stdout, 'prompt=continue this\n');
   });
 
-  test('names the mode the same way the desktop and TUI do (#1616)', async () => {
-    const help = await runFixture(['--help'], { input: '' });
-
-    assert.equal(help.code, 0, help.stderr);
-    assert.match(help.stdout, /--yolo\s+Give this session full access to your files and network/);
-    assert.doesNotMatch(help.stdout, /sandbox/i);
-    assert.doesNotMatch(help.stdout, /bypass/i);
-  });
-
   test('fails closed when resuming a bypass session without --yolo', async () => {
     const cwd = await realpath(process.cwd());
     const resumed = fixtureSession({
diff --git a/packages/cli/src/__tests__/session-recap.test.ts b/packages/cli/src/__tests__/session-recap.test.ts
deleted file mode 100644
index 200a480bef..0000000000
--- a/packages/cli/src/__tests__/session-recap.test.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-import {
-  AUTO_RECAP_IDLE_MS,
-  AUTO_RECAP_MIN_TURNS,
-  cleanRecapText,
-  shouldAutoRecap,
-} from '../session-recap.js';
-
-describe('cleanRecapText', () => {
-  test('normalizes whitespace, labels, and wrapping quotes', () => {
-    const cases = [
-      ['  We   fixed\n\nthe   bug.  ', 'We fixed the bug.'],
-      ['Recap: We fixed the bug.', 'We fixed the bug.'],
-      ['RECAP:We fixed the bug.', 'We fixed the bug.'],
-      ['Summary:  We fixed the bug.', 'We fixed the bug.'],
-      ['summary：We fixed the bug.', 'We fixed the bug.'],
-      ['回顾：我们修复了问题。', '我们修复了问题。'],
-      ['"We fixed the bug."', 'We fixed the bug.'],
-      ["'We fixed the bug.'", 'We fixed the bug.'],
-      ['“We fixed the bug.”', 'We fixed the bug.'],
-    ];
-
-    for (const [input, expected] of cases) {
-      assert.equal(cleanRecapText(input), expected, input);
-    }
-  });
-
-  test('truncates to 1200 characters with an ellipsis', () => {
-    const long = 'a'.repeat(1300);
-    const result = cleanRecapText(long);
-    assert.equal(result.length, 1201);
-    assert.equal(result.slice(0, 1200), 'a'.repeat(1200));
-    assert.equal(result.at(-1), '…');
-  });
-});
-
-describe('shouldAutoRecap', () => {
-  test('enforces idle, turn-count, and watermark boundaries', () => {
-    const cases = [
-      [{ idleMs: AUTO_RECAP_IDLE_MS - 1, mainTurnCount: 3, lastRecapMainTurnCount: 0 }, false],
-      [{ idleMs: AUTO_RECAP_IDLE_MS, mainTurnCount: 3, lastRecapMainTurnCount: 0 }, true],
-      [
-        {
-          idleMs: AUTO_RECAP_IDLE_MS,
-          mainTurnCount: AUTO_RECAP_MIN_TURNS - 1,
-          lastRecapMainTurnCount: 0,
-        },
-        false,
-      ],
-      [
-        {
-          idleMs: AUTO_RECAP_IDLE_MS,
-          mainTurnCount: AUTO_RECAP_MIN_TURNS,
-          lastRecapMainTurnCount: 0,
-        },
-        true,
-      ],
-      [{ idleMs: AUTO_RECAP_IDLE_MS, mainTurnCount: 3, lastRecapMainTurnCount: 3 }, false],
-      [{ idleMs: AUTO_RECAP_IDLE_MS, mainTurnCount: 4, lastRecapMainTurnCount: 3 }, true],
-    ] as const;
-
-    for (const [input, expected] of cases) {
-      assert.equal(shouldAutoRecap(input), expected, JSON.stringify(input));
-    }
-  });
-});
diff --git a/packages/cli/src/__tests__/shell-run-elapsed-ticker.test.ts b/packages/cli/src/__tests__/shell-run-elapsed-ticker.test.ts
deleted file mode 100644
index 3b28fb0656..0000000000
--- a/packages/cli/src/__tests__/shell-run-elapsed-ticker.test.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import assert from 'node:assert/strict';
-import { test } from 'node:test';
-import type { SessionEvent, ToolResultContent } from '@maka/core/events';
-import {
-  applyShellRunViewUpdateToTranscript,
-  applyMakaSessionEventToTranscript,
-  createMakaPiTranscriptState,
-} from '../pi-transcript.js';
-import { createShellRunElapsedTicker } from '../shell-run-elapsed-ticker.js';
-
-test('runs the elapsed ticker only while a background Bash card is running', () => {
-  const state = createMakaPiTranscriptState();
-  let now = 1_000;
-  let tick: (() => void) | undefined;
-  let cancelled = 0;
-  let renders = 0;
-  const ticker = createShellRunElapsedTicker({
-    state,
-    now: () => now,
-    onTick: () => {
-      renders += 1;
-    },
-    schedule: (callback) => {
-      tick = callback;
-      return () => {
-        cancelled += 1;
-        tick = undefined;
-      };
-    },
-  });
-
-  ticker.sync();
-  assert.equal(tick, undefined);
-
-  applyMakaSessionEventToTranscript(
-    state,
-    event({
-      type: 'tool_start',
-      toolUseId: 'bash-bg',
-      toolName: 'Bash',
-      args: { command: 'sleep 30' },
-    }),
-  );
-  applyMakaSessionEventToTranscript(
-    state,
-    event({
-      type: 'tool_result',
-      toolUseId: 'bash-bg',
-      isError: false,
-      content: shellRun({ status: 'running' }),
-    }),
-  );
-  ticker.sync();
-  assert.ok(tick);
-
-  now = 6_500;
-  (tick as (() => void) | undefined)?.();
-  const tool = state.entries.find((entry) => entry.kind === 'tool');
-  assert.equal(tool?.kind === 'tool' ? tool.durationMs : undefined, 5_500);
-  assert.equal(renders, 1);
-
-  applyShellRunViewUpdateToTranscript(state, {
-    sessionId: 'branch',
-    ownership: { kind: 'source_owned', sourceSessionId: 'source', ownerSessionId: 'source' },
-    sourceTurnId: 'turn-1',
-    sourceToolCallId: 'bash-bg',
-    result: shellRun({ updatedAt: 6_500, revision: 2 }),
-  });
-  ticker.sync();
-  assert.equal(tick, undefined);
-  assert.equal(cancelled, 1);
-
-  applyMakaSessionEventToTranscript(
-    state,
-    event({
-      type: 'tool_result',
-      toolUseId: 'bash-bg',
-      isError: false,
-      content: shellRun({
-        status: 'completed',
-        completedAt: 6_500,
-        updatedAt: 6_500,
-        exitCode: 0,
-        revision: 3,
-      }),
-    }),
-  );
-  ticker.sync();
-  assert.equal(tick, undefined);
-  assert.equal(cancelled, 1);
-});
-
-function event(input: { type: SessionEvent['type'] } & Record<string, unknown>): SessionEvent {
-  return { id: `${input.type}-id`, turnId: 'turn-1', ts: 1, ...input } as SessionEvent;
-}
-
-function shellRun(
-  overrides: Partial<Extract<ToolResultContent, { kind: 'shell_run'; mode: 'pipes' }>>,
-): Extract<ToolResultContent, { kind: 'shell_run'; mode: 'pipes' }> {
-  return {
-    kind: 'shell_run',
-    ref: 'maka://runtime/background-tasks/bg-1',
-    mode: 'pipes',
-    status: 'running',
-    cwd: '/repo',
-    cmd: 'sleep 30',
-    startedAt: 1_000,
-    updatedAt: 1_000,
-    revision: overrides.revision ?? 1,
-    output: {
-      mode: 'pipes',
-      stdout: '',
-      stderr: '',
-      stdoutTruncated: false,
-      stderrTruncated: false,
-      redacted: false,
-    },
-    ...overrides,
-  };
-}
diff --git a/packages/cli/src/__tests__/skill-invocation.test.ts b/packages/cli/src/__tests__/skill-invocation.test.ts
index 77570bc9c0..8ad27eb3b5 100644
--- a/packages/cli/src/__tests__/skill-invocation.test.ts
+++ b/packages/cli/src/__tests__/skill-invocation.test.ts
@@ -1,19 +1,12 @@
 import assert from 'node:assert/strict';
-import { before, describe, test } from 'node:test';
-import { TUI } from '@earendil-works/pi-tui';
+import { describe, test } from 'node:test';
 import type { InvocableSkillEntry } from '@maka/runtime';
 import { MakaAutocompleteProvider } from '../pi-tui-pickers.js';
-import { MakaSkillHighlightEditor } from '../skill-highlight-editor.js';
 import {
   parseSkillInvocationTokens,
   skillInvocationPrefixAt,
   stripSkillInvocationTokens,
 } from '../skill-token.js';
-import { _setColorLevelForTesting, editorTheme } from '../tui-ansi.js';
-import { FakeTerminal } from './tui-terminal-mock.js';
-
-// Pin truecolor so accent escape assertions are hermetic (mirrors the runner tests).
-before(() => _setColorLevelForTesting(3));
 
 describe('skill invocation tokens', () => {
   test('parses canonical tokens and rejects lookalikes', () => {
@@ -146,23 +139,3 @@ describe('skill autocomplete', () => {
     assert.equal(provider.shouldTriggerFileCompletion(['/skill:we'], 0, 9), false);
   });
 });
-
-describe('skill token highlight', () => {
-  test('accents valid tokens only', () => {
-    const tui = new TUI(new FakeTerminal());
-    const editor = new MakaSkillHighlightEditor(tui, editorTheme(), { paddingX: 1 });
-    editor.setSkillTokenValidator((name) => name.toLowerCase() === 'alpha');
-    editor.setText('帮我 /skill:alpha 和 /skill:nope 整理');
-    const rendered = editor.render(80);
-    const line = rendered.find((candidate) => candidate.includes('/skill:alpha'));
-    assert.ok(line, 'token line renders');
-    assert.ok(
-      line.includes('\x1b[38;2;87;163;239m/skill:alpha\x1b[39m'),
-      `valid token carries the brand accent: ${JSON.stringify(line)}`,
-    );
-    assert.ok(
-      !line.includes('\x1b[38;2;87;163;239m/skill:nope\x1b[39m'),
-      'invalid token stays plain',
-    );
-  });
-});
diff --git a/packages/cli/src/__tests__/tui-ansi.test.ts b/packages/cli/src/__tests__/tui-ansi.test.ts
deleted file mode 100644
index 0433034e7d..0000000000
--- a/packages/cli/src/__tests__/tui-ansi.test.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import assert from 'node:assert/strict';
-import { afterEach, describe, test } from 'node:test';
-import {
-  ansi,
-  disc,
-  stripAnsi,
-  _setColorLevelForTesting,
-  _detectColorLevelForTesting as detect,
-} from '../tui-ansi.js';
-
-// Reset to truecolor (the development default) after each test so a test that
-// changes the level never leaks into the next one.
-afterEach(() => _setColorLevelForTesting(3));
-
-describe('tui-ansi semantic slots (#1053)', () => {
-  test('renders a single ● glyph regardless of tone', () => {
-    _setColorLevelForTesting(3);
-    for (const tone of ['ok', 'muted', 'accent', 'danger'] as const) {
-      assert.equal(stripAnsi(disc(tone)), '●', `tone ${tone} should yield one ●`);
-    }
-  });
-});
-
-describe('color capability fallback (#1064)', () => {
-  test('adapts semantic and basic styles to each terminal color level', () => {
-    const cases = [
-      [3, '\x1b[38;2;87;163;239mx\x1b[39m', '\x1b[38;2;128;132;140mx\x1b[39m', '\x1b[1mx\x1b[22m'],
-      [2, '\x1b[38;5;75mx\x1b[39m', '\x1b[38;5;102mx\x1b[39m', '\x1b[1mx\x1b[22m'],
-      [1, '\x1b[37mx\x1b[39m', '\x1b[90mx\x1b[39m', '\x1b[1mx\x1b[22m'],
-      [0, 'x', 'x', 'x'],
-    ] as const;
-
-    for (const [level, accent, muted, bold] of cases) {
-      _setColorLevelForTesting(level);
-      assert.equal(ansi.accent('x'), accent, `accent level ${level}`);
-      assert.equal(ansi.muted('x'), muted, `muted level ${level}`);
-      assert.equal(ansi.bold('x'), bold, `bold level ${level}`);
-    }
-  });
-});
-
-describe('detectColorLevel env detection (#1064)', () => {
-  test('maps environment capabilities and overrides to color levels', () => {
-    const cases: Array<[Record<string, string>, number]> = [
-      [{ NO_COLOR: '1', TERM: 'xterm-256color', COLORTERM: 'truecolor' }, 0],
-      [{ NO_COLOR: '0', TERM: 'xterm-256color' }, 0],
-      [{ NO_COLOR: '', TERM: 'xterm-256color', COLORTERM: 'truecolor' }, 3],
-      [{}, 0],
-      [{ TERM: '' }, 0],
-      [{ TERM: 'dumb' }, 0],
-      [{ TERM: 'xterm-256color', COLORTERM: 'truecolor' }, 3],
-      [{ TERM: 'xterm', COLORTERM: '24bit' }, 3],
-      [{ TERM: 'xterm-truecolor' }, 3],
-      [{ TERM: 'tmux-24bit' }, 3],
-      [{ TERM: 'xterm-256color' }, 2],
-      [{ TERM: 'screen-256color' }, 2],
-      [{ TERM: 'xterm' }, 1],
-      [{ TERM: 'screen' }, 1],
-      [{ TERM: 'rxvt-unicode' }, 1],
-    ];
-
-    for (const [env, expected] of cases) {
-      assert.equal(detect(env), expected, JSON.stringify(env));
-    }
-  });
-});
diff --git a/packages/cli/src/__tests__/tui-attention.test.ts b/packages/cli/src/__tests__/tui-attention.test.ts
deleted file mode 100644
index 597735299c..0000000000
--- a/packages/cli/src/__tests__/tui-attention.test.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-import { AttentionController, BUSY_SPINNER_FRAMES } from '../tui-attention.js';
-
-const BUSY = `${BUSY_SPINNER_FRAMES[0]} Maka`;
-
-const BELL = '\x07';
-
-class SpyTerminal {
-  readonly writes: string[] = [];
-  readonly titles: string[] = [];
-  write(data: string): void {
-    this.writes.push(data);
-  }
-  setTitle(title: string): void {
-    this.titles.push(title);
-  }
-  get bells(): number {
-    return this.writes.filter((w) => w === BELL).length;
-  }
-  get title(): string | undefined {
-    return this.titles.at(-1);
-  }
-}
-
-/** A controller wired to a spy terminal, a clock, and a spinner ticked by hand. */
-function makeController(longTurnThresholdMs = 8000) {
-  const terminal = new SpyTerminal();
-  let clock = 0;
-  let spinnerTick: (() => void) | null = null;
-  const controller = new AttentionController(terminal, {
-    baseTitle: 'Maka',
-    now: () => clock,
-    longTurnThresholdMs,
-    // Capture the spinner callback instead of scheduling a real interval so no timer leaks.
-    scheduleSpinnerInterval: (callback) => {
-      spinnerTick = callback;
-      return () => {
-        spinnerTick = null;
-      };
-    },
-  });
-  return {
-    terminal,
-    controller,
-    advance: (ms: number) => (clock += ms),
-    spinnerRunning: () => spinnerTick !== null,
-  };
-}
-
-describe('AttentionController title', () => {
-  test('updates the base title while preserving the current state marker', () => {
-    const { terminal, controller } = makeController();
-    controller.promptTurnStarted();
-
-    controller.setBaseTitle('Generated title');
-
-    assert.equal(terminal.title, `${BUSY_SPINNER_FRAMES[0]} Generated title`);
-    controller.promptTurnEnded();
-    assert.equal(terminal.title, 'Generated title');
-  });
-
-  test('control actions mark busy without ever ringing', () => {
-    const { terminal, controller } = makeController();
-    controller.focusChanged(false);
-    controller.controlStarted();
-    assert.equal(terminal.title, BUSY);
-    controller.controlEnded();
-    assert.equal(terminal.title, 'Maka');
-    assert.equal(terminal.bells, 0);
-  });
-
-  test('reset clears the busy marker and goes inert', () => {
-    const { terminal, controller } = makeController(8000);
-    controller.focusChanged(false);
-    controller.promptTurnStarted();
-    assert.equal(terminal.title, BUSY);
-    controller.reset();
-    assert.equal(terminal.title, 'Maka');
-    // A finalizer that settles after close must not re-dirty the handed-back
-    // title or ring — every event method is now a no-op.
-    controller.promptTurnEnded();
-    controller.attentionNeeded();
-    controller.promptTurnStarted();
-    assert.equal(terminal.title, 'Maka');
-    assert.equal(terminal.bells, 0);
-  });
-
-  test('stops the spinner while an attention marker overrides the busy marker', () => {
-    const { controller, spinnerRunning } = makeController(8000);
-    controller.focusChanged(false);
-    controller.promptTurnStarted();
-    assert.equal(spinnerRunning(), true);
-    // A permission prompt while unfocused mid-turn raises attention (★), which
-    // outranks the busy marker; the spinner must stop rather than animate a
-    // marker that is no longer shown.
-    controller.attentionNeeded();
-    assert.equal(spinnerRunning(), false);
-  });
-});
-
-describe('AttentionController long-turn ring', () => {
-  test('rings only when a long turn ends while unfocused', () => {
-    const cases = [
-      { focused: false, elapsedMs: 9000, bells: 1, title: '★ Maka' },
-      { focused: true, elapsedMs: 9000, bells: 0, title: 'Maka' },
-      { focused: false, elapsedMs: 200, bells: 0, title: 'Maka' },
-    ];
-
-    for (const { focused, elapsedMs, bells, title } of cases) {
-      const harness = makeController(8000);
-      harness.controller.focusChanged(focused);
-      harness.controller.promptTurnStarted();
-      harness.advance(elapsedMs);
-      harness.controller.promptTurnEnded();
-      assert.equal(harness.terminal.bells, bells, `${focused}/${elapsedMs}`);
-      assert.equal(harness.terminal.title, title, `${focused}/${elapsedMs}`);
-    }
-  });
-
-  test('focus and a new turn both clear a stale attention marker', () => {
-    for (const action of ['focus', 'turn'] as const) {
-      const { terminal, controller, advance } = makeController(8000);
-      controller.focusChanged(false);
-      controller.promptTurnStarted();
-      advance(9000);
-      controller.promptTurnEnded();
-      assert.equal(terminal.title, '★ Maka');
-      if (action === 'focus') controller.focusChanged(true);
-      else controller.promptTurnStarted();
-      assert.equal(terminal.title, action === 'focus' ? 'Maka' : BUSY, action);
-    }
-  });
-});
-
-describe('AttentionController attention events', () => {
-  test('rings for explicit attention only while unfocused', () => {
-    for (const focused of [false, true]) {
-      const { terminal, controller } = makeController();
-      controller.focusChanged(focused);
-      controller.attentionNeeded();
-      assert.equal(terminal.bells, focused ? 0 : 1, String(focused));
-      assert.equal(terminal.title, focused ? 'Maka' : '★ Maka', String(focused));
-    }
-  });
-});
diff --git a/packages/cli/src/tui-ansi.ts b/packages/cli/src/tui-ansi.ts
index d5a5894d4c..4ad5d21140 100644
--- a/packages/cli/src/tui-ansi.ts
+++ b/packages/cli/src/tui-ansi.ts
@@ -20,19 +20,6 @@ export function _setColorLevelForTesting(level: 0 | 1 | 2 | 3): void {
   rebuildAnsi();
 }
 
-/**
- * Detect color level from an explicit env snapshot — for unit-testing the
- * detection logic directly. Production code uses `detectColorLevel()` which
- * reads `process.env` at module load.
- */
-export function _detectColorLevelForTesting(env: {
-  NO_COLOR?: string;
-  TERM?: string;
-  COLORTERM?: string;
-}): 0 | 1 | 2 | 3 {
-  return detectColorLevelFromEnv(env);
-}
-
 export let ansi = buildAnsi();
 
 // #1053: status disc — a single `●` tinted by tone. The shared visual primitive
diff --git a/packages/computer-use/src/__tests__/computer-use-overlay-hook.test.ts b/packages/computer-use/src/__tests__/computer-use-overlay-hook.test.ts
index adbc493a83..1a794ead94 100644
--- a/packages/computer-use/src/__tests__/computer-use-overlay-hook.test.ts
+++ b/packages/computer-use/src/__tests__/computer-use-overlay-hook.test.ts
@@ -136,35 +136,6 @@ test('the executor-resolved point wins when there is one', () => {
   ]);
 });
 
-test('a semantic action lands on the point it was sent to, instead of being wiped', () => {
-  // `runSemantic` reports no landing point — an element action resolves to an
-  // element, never to a pointer position. Requiring one made every action on
-  // the accessibility path, the only path Maka dispatches on by default, end in
-  // `cancel()`: the cursor flew to the control and was erased on arrival.
-  const { controller, completions, cancellations } = fakeController();
-  const hook = createComputerUseOverlayHook(controller as never);
-  hook.onActionEnd?.(
-    { type: 'left_click', coordinate: { x: 400, y: 300 } },
-    { outcome: { ok: true, tier: 'ax', verified: false } },
-    {
-      sessionId: 's1',
-      toolCallId: 'a1',
-      presentationScreenPoint: { x: 1362, y: 397 },
-    },
-  );
-  assert.deepEqual(cancellations, []);
-  assert.deepEqual(completions, [
-    {
-      actionId: 'a1',
-      sessionId: 's1',
-      screenX: 1362,
-      screenY: 397,
-      kind: 'click',
-      pulse: true,
-    },
-  ]);
-});
-
 test('a successful action with no point anywhere still cancels', () => {
   const { controller, completions, cancellations } = fakeController();
   const hook = createComputerUseOverlayHook(controller as never);
diff --git a/packages/computer-use/src/__tests__/maka-cu-backend.test.ts b/packages/computer-use/src/__tests__/maka-cu-backend.test.ts
index 7d3f620b87..713cbe39df 100644
--- a/packages/computer-use/src/__tests__/maka-cu-backend.test.ts
+++ b/packages/computer-use/src/__tests__/maka-cu-backend.test.ts
@@ -1343,18 +1343,6 @@ describe('maka-cu backend', () => {
     assert.deepEqual(dispatch?.action, { kind: 'key', key: 'a', modifiers: ['command'] });
   });
 
-  it('parses an aliased named key and collapses a duplicated modifier', async () => {
-    const { backend, logPath } = makeBackend({ allowCompatibilityInputDispatch: true });
-    const observation = await observeFixture(backend);
-    await backend.runSemantic!(
-      { type: 'press_key', observationId: observation.observationId, key: 'shift+shift+Tab' },
-      signal(),
-      RUN_CONTEXT,
-    );
-    const dispatch = received(await readRecords(logPath), 'dispatch.key')[0];
-    assert.deepEqual(dispatch?.action, { kind: 'key', key: 'Tab', modifiers: ['shift'] });
-  });
-
   it('sends nothing for a key string it cannot parse', async () => {
     for (const key of ['delete', 'del', 'cmd+', 'a+b', 'hyper+a']) {
       const { backend, logPath } = makeBackend({ allowCompatibilityInputDispatch: true });
@@ -1555,188 +1543,6 @@ describe('maka-cu backend', () => {
       /permission_missing/,
     );
   });
-
-  // What the model reads. Every assertion below is about a sentence a model
-  // acted on wrongly on a real machine, not about a code path.
-
-  it('points a refused raise at the action that can move a window', async () => {
-    // Measured on a window-arrange run: `secondary_action raise` was refused
-    // and re-sent — twice by one model, once by another — because the refusal
-    // said the attempt had failed and nothing about there being another way to
-    // put a window where the user asked for it.
-    const { backend } = makeBackend({
-      dispatchError: 'dispatch_refused',
-      refusalPath: 'ax_action',
-      refusalOutcome: 'failed',
-      noWouldRequirePath: true,
-    });
-    const observation = await observeFixture(backend);
-    const result = await backend.runSemantic!(
-      {
-        type: 'secondary_action',
-        action: 'raise',
-        observationId: observation.observationId,
-        elementId: 'el_2',
-      },
-      signal(),
-      RUN_CONTEXT,
-    );
-    assert.equal(!result.outcome.ok && result.outcome.error, 'dispatch_refused');
-    const message = result.outcome.ok ? '' : result.outcome.message;
-    assert.match(message, /window_action/, 'names the action that moves a window');
-    assert.match(message, /click_element|element action/);
-  });
-
-  it('gives a refusal that was carried out and declined a next move too', async () => {
-    // `path: "none"` is what the two older branches key on, and a dispatch that
-    // reached the target and was declined does not report it — so this, the
-    // branch that renders on a real machine, was the one answering with the
-    // executor's bare sentence and no way forward.
-    const { backend } = makeBackend({
-      dispatchError: 'dispatch_refused',
-      refusalPath: 'ax_action',
-      refusalOutcome: 'failed',
-      noWouldRequirePath: true,
-    });
-    const observation = await observeFixture(backend);
-    const result = await backend.runSemantic!(
-      { type: 'click_element', observationId: observation.observationId, elementId: 'el_2' },
-      signal(),
-      RUN_CONTEXT,
-    );
-    const message = result.outcome.ok ? '' : result.outcome.message;
-    assert.match(message, /same answer|will not/, 'says repeating it is pointless');
-    assert.match(message, /window_action|element action/, 'and says what else there is');
-  });
-
-  it('names an unavailable action the way the tool spells it', async () => {
-    // The mock declares no window members, which is exactly the shape of a
-    // build whose executor is older than the tool surface. It used to answer a
-    // `window_action` with "does not advertise element action 'minimize_window'"
-    // — a word the tool's own schema rejects.
-    const { backend } = makeBackend({});
-    const observation = await observeFixture(backend);
-    const result = await backend.runSemantic!(
-      {
-        type: 'window_action',
-        action: 'minimize',
-        observationId: observation.observationId,
-        elementId: 'el_1',
-      },
-      signal(),
-      RUN_CONTEXT,
-    );
-    assert.equal(!result.outcome.ok && result.outcome.error, 'unsupported_action');
-    const message = result.outcome.ok ? '' : result.outcome.message;
-    assert.match(message, /window_action 'minimize'/);
-    assert.doesNotMatch(message, /minimize_window|maka-cu|advertise/);
-  });
-
-  it('says where a window_id comes from, and it is not list_apps', async () => {
-    // `list_apps` on this backend answers app id, pid, name and a window COUNT.
-    // Sending a model there for a window id sends it somewhere with none.
-    const { backend } = makeBackend({});
-    await assert.rejects(
-      backend.captureObservation!({ windowId: 424242, includeScreenshot: true }, signal(), {
-        ...RUN_CONTEXT,
-      }),
-      (error: Error) => {
-        assert.match(error.message, /window_id/);
-        assert.doesNotMatch(error.message, /list_apps/);
-        assert.doesNotMatch(error.message, /windowId/);
-        return true;
-      },
-    );
-  });
-
-  it('spells app_id the way the tool does when a pair does not resolve', async () => {
-    const { backend } = makeBackend({});
-    await assert.rejects(
-      backend.captureObservation!(
-        { app: 'com.example.Other', windowId: 90210, includeScreenshot: true },
-        signal(),
-        RUN_CONTEXT,
-      ),
-      (error: Error) => {
-        assert.match(error.message, /app_id/);
-        assert.doesNotMatch(error.message, /appId/);
-        return true;
-      },
-    );
-  });
-
-  it('answers a blocked keystroke with the actions that do work', async () => {
-    // `allowCompatibilityInputDispatch` is off in every shipping configuration,
-    // so this is the standard answer to typing, not an edge case. It used to be
-    // a sentence about synthetic events with no route in it at all.
-    const { backend } = makeBackend({});
-    const observation = await observeFixture(backend);
-    const result = await backend.run({ type: 'type', text: 'hello' }, signal(), {
-      ...RUN_CONTEXT,
-      boundAction: boundCoordinate(observation),
-    });
-    assert.equal(!result.outcome.ok && result.outcome.error, 'unsupported_action');
-    const message = result.outcome.ok ? '' : result.outcome.message;
-    assert.match(message, /'type'/, 'names the action the model sent, not a wire kind');
-    for (const alternative of ['click_element', 'set_value', 'secondary_action']) {
-      assert.ok(message.includes(alternative), `offers ${alternative}`);
-    }
-  });
-
-  it('tells a model with a dead element id to observe, without host vocabulary', async () => {
-    const { backend } = makeBackend({});
-    const observation = await observeFixture(backend);
-    const result = await backend.runSemantic!(
-      { type: 'click_element', observationId: observation.observationId, elementId: '404' },
-      signal(),
-      RUN_CONTEXT,
-    );
-    assert.equal(!result.outcome.ok && result.outcome.error, 'stale_frame');
-    const message = result.outcome.ok ? '' : result.outcome.message;
-    assert.match(message, /'404'/, 'names the id that did not resolve');
-    assert.match(message, /observe the window again/i);
-    // The model has no verb for binding or quoting an observation, so neither
-    // word can be part of an instruction to it.
-    assert.doesNotMatch(message, /quoted|bound|frame/i);
-  });
-
-  it('tells a coordinate action with no observation to observe first', async () => {
-    const { backend } = makeBackend({});
-    const result = await backend.run(
-      { type: 'left_click', coordinate: { x: 10, y: 10 } },
-      signal(),
-      RUN_CONTEXT,
-    );
-    assert.equal(!result.outcome.ok && result.outcome.error, 'no_active_frame');
-    const message = result.outcome.ok ? '' : result.outcome.message;
-    assert.match(message, /observe/i);
-    assert.doesNotMatch(message, /bound observation/i);
-  });
-
-  it('calls an oversized frame a size problem, not a privacy one', async () => {
-    // `sensitivity_blocked` reads as "policy will not let you see this", and a
-    // model that reads it stops asking for the window at all. The window is
-    // readable; only the picture of it is too big for a reply.
-    const { backend } = makeBackend({ bigImage: true });
-    await assert.rejects(observeFixture(backend), (error: Error) => {
-      assert.match(error.message, /capture_failed/);
-      assert.doesNotMatch(error.message, /sensitivity_blocked/);
-      assert.match(error.message, /include_screenshot/);
-      return true;
-    });
-  });
-
-  it('refuses an action it does not have without naming a protocol version', async () => {
-    // "not part of maka.cu/2" reads as a version problem a model might route
-    // around, and it cannot choose a protocol version.
-    const { backend } = makeBackend({});
-    const result = await backend.run({ type: 'cursor_position' }, signal(), RUN_CONTEXT);
-    assert.equal(!result.outcome.ok && result.outcome.error, 'unsupported_action');
-    const message = result.outcome.ok ? '' : result.outcome.message;
-    assert.match(message, /'cursor_position'/);
-    assert.doesNotMatch(message, /maka\.cu/);
-    assert.match(message, /observation/);
-  });
 });
 
 describe('maka-cu backend selection', () => {
@@ -1811,10 +1617,4 @@ describe('maka-cu key chord parsing', () => {
       );
     }
   });
-
-  it('still parses the chords that are real', () => {
-    assert.deepEqual(parseMakaCuKeyChord('cmd+a'), { key: 'a', modifiers: ['command'] });
-    assert.deepEqual(parseMakaCuKeyChord('cmd++'), { key: '+', modifiers: ['command'] });
-    assert.deepEqual(parseMakaCuKeyChord('Return'), { key: 'Return', modifiers: [] });
-  });
 });
diff --git a/packages/computer-use/src/__tests__/maka-cu-protocol.test.ts b/packages/computer-use/src/__tests__/maka-cu-protocol.test.ts
index 0ecec40b5b..70506968e3 100644
--- a/packages/computer-use/src/__tests__/maka-cu-protocol.test.ts
+++ b/packages/computer-use/src/__tests__/maka-cu-protocol.test.ts
@@ -115,18 +115,6 @@ describe('maka-cu key grammar (§6.4)', () => {
 });
 
 describe('maka-cu readers refuse rather than default', () => {
-  it('reads the element frame into a window-local field', () => {
-    // §5.3: the space is carried by the name, so nothing can write it into
-    // `CuObservedElement.frame` (screen points) without going through the one
-    // conversion.
-    assert.deepEqual(readElement('observe', element()).frameInWindow, {
-      x: 20,
-      y: 40,
-      width: 72,
-      height: 28,
-    });
-  });
-
   it('refuses a hash that is not written the one declared way (§1.3)', () => {
     assert.throws(
       () => readElement('observe', element({ digest: 'a1'.repeat(32) })),
@@ -209,13 +197,6 @@ describe('maka-cu dispatch results are held to their closed sets (§6.3/§6.5)',
     };
   }
 
-  it('reads a well-formed dispatch result', () => {
-    const result = readDispatchResult('input.dispatch', dispatch() as never, false);
-    assert.equal(result.path, 'ax_action');
-    assert.equal(result.tier, 'ax');
-    assert.equal(result.outcome, 'ok');
-  });
-
   it('refuses a path that is not in the closed set', () => {
     // The closed set is what decides, and it decides first: `path` is refused
     // by name rather than by the tier pairing below it. That ordering is the
diff --git a/packages/core/src/__tests__/agent-run-provider-request.test.ts b/packages/core/src/__tests__/agent-run-provider-request.test.ts
deleted file mode 100644
index bfab43f0b0..0000000000
--- a/packages/core/src/__tests__/agent-run-provider-request.test.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-
-import { decodeAgentRunEvent } from '../agent-run.js';
-
-test('AgentRun accepts provider request capture and attempt trace rows', () => {
-  for (const type of ['provider_request_captured', 'provider_request_attempt_recorded']) {
-    const decoded = decodeAgentRunEvent({
-      type,
-      id: `${type}-1`,
-      runId: 'run-1',
-      sessionId: 'session-1',
-      turnId: 'turn-1',
-      ts: 1,
-      data: { traceId: 'provider-trace-1' },
-    });
-    assert.equal(decoded.type, type);
-  }
-});
diff --git a/packages/core/src/__tests__/attachments.test.ts b/packages/core/src/__tests__/attachments.test.ts
index 080f8b77bb..8fe8edc9f3 100644
--- a/packages/core/src/__tests__/attachments.test.ts
+++ b/packages/core/src/__tests__/attachments.test.ts
@@ -1,37 +1,6 @@
 import assert from 'node:assert/strict';
 import { describe, test } from 'node:test';
-import {
-  attachmentKindFromMimeType,
-  formatAttachmentResourceRef,
-  guessMimeFromName,
-  parseAttachmentResourceRef,
-} from '../index.js';
-
-describe('attachment MIME routing', () => {
-  test('routes representative MIME and filename decisions', () => {
-    for (const [mime, name, kind] of [
-      ['image/png', undefined, 'image'],
-      ['application/pdf', undefined, 'pdf'],
-      ['application/octet-stream', 'budget.xlsx', 'doc'],
-      ['', 'slides.pptx', 'doc'],
-      ['text/plain', 'server.ts', 'code'],
-      ['application/octet-stream', 'MAIN.PY', 'code'],
-      ['text/markdown', 'notes.md', 'other'],
-      ['', 'archive.tar.gz', 'other'],
-    ] as const) {
-      assert.equal(attachmentKindFromMimeType(mime, name), kind);
-    }
-    for (const [name, mime] of [
-      ['photo.JPG', 'image/jpeg'],
-      ['doc.pdf', 'application/pdf'],
-      ['sheet.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'],
-      ['unknown.xyz', 'application/octet-stream'],
-      ['noext', 'application/octet-stream'],
-    ]) {
-      assert.equal(guessMimeFromName(name), mime);
-    }
-  });
-});
+import { formatAttachmentResourceRef, parseAttachmentResourceRef } from '../index.js';
 
 describe('attachment resource refs', () => {
   test('round-trips one canonical Session Artifact without embedding Session authority', () => {
diff --git a/packages/core/src/__tests__/bot-chat-settings.test.ts b/packages/core/src/__tests__/bot-chat-settings.test.ts
index 67e52492ec..c3b9b71832 100644
--- a/packages/core/src/__tests__/bot-chat-settings.test.ts
+++ b/packages/core/src/__tests__/bot-chat-settings.test.ts
@@ -8,14 +8,6 @@ import {
 } from '../bot-chat-settings.js';
 
 describe('bot chat settings owner', () => {
-  test('preserves provider-specific defaults', () => {
-    const settings = createDefaultBotChatSettings();
-
-    assert.equal(settings.channels.telegram.proxyUrl, 'http://127.0.0.1:7890');
-    assert.equal(settings.channels.wechat.webhookUrl, 'http://127.0.0.1:18400');
-    assert.equal(settings.channels.discord.readiness, 'scaffolded');
-  });
-
   test('normalizes an explicitly patched allowlist without touching it on unrelated patches', () => {
     const defaults = createDefaultBotChatSettings();
     const withAllowlist = mergeBotChatSettings(defaults, {
diff --git a/packages/core/src/__tests__/bot-platform-hints.test.ts b/packages/core/src/__tests__/bot-platform-hints.test.ts
deleted file mode 100644
index 07e38367c2..0000000000
--- a/packages/core/src/__tests__/bot-platform-hints.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-import {
-  BOT_PROVIDERS,
-  botPlatformFromSessionLabels,
-  buildBotPlatformPromptFragment,
-  getBotPlatformPromptHint,
-} from '../index.js';
-
-describe('bot platform prompt hints', () => {
-  test('locks one prompt hint for every bot provider', () => {
-    for (const provider of BOT_PROVIDERS) {
-      const hint = getBotPlatformPromptHint(provider);
-
-      assert.equal(hint.platform, provider);
-      assert.ok(hint.displayName.length > 0);
-      assert.ok(hint.deliveryFormat.length > 0);
-      assert.ok(hint.capabilityCaveat.length > 0);
-      assert.ok(hint.systemPromptBullets.length >= 2);
-      const fragment = buildBotPlatformPromptFragment(provider);
-      assert.match(fragment, new RegExp(`Platform: .*\\(${provider}\\)`));
-      assert.doesNotMatch(
-        fragment,
-        /scaffold|live bridge|until .* enabled|not implemented|coming soon/i,
-      );
-    }
-  });
-
-  test('detects bot platform only from bot-labeled sessions', () => {
-    assert.equal(botPlatformFromSessionLabels(['bot', 'telegram']), 'telegram');
-    assert.equal(botPlatformFromSessionLabels(['telegram']), undefined);
-    assert.equal(botPlatformFromSessionLabels(['bot', 'unknown']), undefined);
-    assert.equal(botPlatformFromSessionLabels(undefined), undefined);
-  });
-});
diff --git a/packages/core/src/__tests__/graph-command.test.ts b/packages/core/src/__tests__/graph-command.test.ts
index 346ae70a02..3cc2b2fcaa 100644
--- a/packages/core/src/__tests__/graph-command.test.ts
+++ b/packages/core/src/__tests__/graph-command.test.ts
@@ -3,29 +3,12 @@ import { describe, test } from 'node:test';
 import { parseGraphCommand } from '../graph-command.js';
 
 describe('/graph parser', () => {
-  test('parses bare and explicit status commands', () => {
-    assert.deepEqual(parseGraphCommand('/graph'), { kind: 'status' });
-    assert.deepEqual(parseGraphCommand('  /graph status  '), { kind: 'status' });
-  });
-
-  test('parses persistent mode changes only when the whole tail matches', () => {
+  test('parses persistent mode changes', () => {
     assert.deepEqual(parseGraphCommand('/graph on'), { kind: 'set_mode', mode: 'graph' });
     assert.deepEqual(parseGraphCommand('/graph off'), { kind: 'set_mode', mode: 'default' });
-    assert.deepEqual(parseGraphCommand('/graph on the repository'), {
-      kind: 'run_once',
-      task: 'on the repository',
-    });
-  });
-
-  test('preserves a one-shot task as clean user text', () => {
-    assert.deepEqual(parseGraphCommand('/graph inspect runtime, UI, and tests'), {
-      kind: 'run_once',
-      task: 'inspect runtime, UI, and tests',
-    });
   });
 
   test('does not claim lookalike slash commands', () => {
     assert.equal(parseGraphCommand('/graphing now'), null);
-    assert.equal(parseGraphCommand('please /graph this'), null);
   });
 });
diff --git a/packages/core/src/__tests__/pty-output-view.test.ts b/packages/core/src/__tests__/pty-output-view.test.ts
deleted file mode 100644
index 28ae40c34b..0000000000
--- a/packages/core/src/__tests__/pty-output-view.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-
-import {
-  ptyCompactTerminalLine,
-  ptyHumanTerminalText,
-  ptyTuiTerminalRows,
-  ptyTuiTerminalView,
-  type PtyShellOutput,
-} from '../index.js';
-
-describe('PTY human output projection', () => {
-  it('uses the active view and only falls back to the last alternate frame when empty', () => {
-    assert.equal(
-      ptyHumanTerminalText(
-        output({ scrollback: 'old', screen: 'now', lastAlternateScreen: 'alt' }),
-      ),
-      'old\nnow',
-    );
-    assert.equal(ptyHumanTerminalText(output({ lastAlternateScreen: 'alt' })), 'alt');
-    assert.equal(
-      ptyHumanTerminalText(output({ alternateScreen: true, screen: 'full', scrollback: 'old' })),
-      'full',
-    );
-  });
-
-  it('keeps three head and three tail screen rows without an in-band marker', () => {
-    const view = ptyTuiTerminalView(output({ screen: '1\n2\n3\n4\n5\n6\n7\n8' }));
-    assert.deepEqual(view.rows, ['1', '2', '3', '6', '7', '8']);
-    assert.equal(view.rowsOmitted, true);
-  });
-
-  it('fills a short screen from latest scrollback and follows cursor-first compact semantics', () => {
-    const value = output({
-      scrollback: 'one\ntwo\nthree\nfour',
-      screen: 'prompt\n\nanswer',
-      cursor: { x: 0, y: 1, visible: true },
-    });
-    assert.deepEqual(ptyTuiTerminalRows(value), ['two', 'three', 'four', 'prompt', '', 'answer']);
-    assert.equal(ptyTuiTerminalView(value).rowsOmitted, true);
-    assert.equal(ptyCompactTerminalLine(value), 'prompt');
-  });
-});
-
-function output(overrides: Partial<PtyShellOutput>): PtyShellOutput {
-  return {
-    mode: 'pty',
-    screen: '',
-    scrollback: '',
-    cols: 80,
-    rows: 24,
-    cursor: { x: 0, y: 0, visible: true },
-    alternateScreen: false,
-    truncated: false,
-    redacted: false,
-    ...overrides,
-  };
-}
diff --git a/packages/core/src/__tests__/result.test.ts b/packages/core/src/__tests__/result.test.ts
deleted file mode 100644
index 4973aa3c31..0000000000
--- a/packages/core/src/__tests__/result.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-import * as result from '../result.js';
-import * as legacyResult from '../settings/result.js';
-
-describe('Result', () => {
-  test('builds success and error envelopes', () => {
-    assert.deepEqual(result.ok('value'), { ok: true, data: 'value' });
-    assert.deepEqual(result.err('invalid', 'Invalid value'), {
-      ok: false,
-      error: { code: 'invalid', message: 'Invalid value', details: undefined },
-    });
-  });
-
-  test('captures thrown values from async operations', async () => {
-    const cause = new Error('failed');
-    assert.deepEqual(
-      await result.tryResult(async () => {
-        throw cause;
-      }, 'operation_failed'),
-      {
-        ok: false,
-        error: { code: 'operation_failed', message: 'failed', details: cause },
-      },
-    );
-  });
-
-  test('keeps the settings subpath as a compatibility re-export', () => {
-    assert.strictEqual(legacyResult.ok, result.ok);
-    assert.strictEqual(legacyResult.err, result.err);
-    assert.strictEqual(legacyResult.tryResult, result.tryResult);
-  });
-});
diff --git a/packages/core/src/__tests__/swarm-command.test.ts b/packages/core/src/__tests__/swarm-command.test.ts
index 19de76f401..f83c6ea07e 100644
--- a/packages/core/src/__tests__/swarm-command.test.ts
+++ b/packages/core/src/__tests__/swarm-command.test.ts
@@ -3,29 +3,12 @@ import { describe, test } from 'node:test';
 import { parseSwarmCommand } from '../swarm-command.js';
 
 describe('/swarm parser', () => {
-  test('parses bare and explicit status commands', () => {
-    assert.deepEqual(parseSwarmCommand('/swarm'), { kind: 'status' });
-    assert.deepEqual(parseSwarmCommand('  /swarm status  '), { kind: 'status' });
-  });
-
-  test('parses persistent mode changes only when the whole tail matches', () => {
+  test('parses explicit mode changes', () => {
     assert.deepEqual(parseSwarmCommand('/swarm on'), { kind: 'set_mode', mode: 'swarm' });
     assert.deepEqual(parseSwarmCommand('/swarm off'), { kind: 'set_mode', mode: 'default' });
-    assert.deepEqual(parseSwarmCommand('/swarm on the repository'), {
-      kind: 'run_once',
-      task: 'on the repository',
-    });
-  });
-
-  test('preserves a one-shot task as clean user text', () => {
-    assert.deepEqual(parseSwarmCommand('/swarm inspect runtime, UI, and tests'), {
-      kind: 'run_once',
-      task: 'inspect runtime, UI, and tests',
-    });
   });
 
   test('does not claim lookalike slash commands', () => {
     assert.equal(parseSwarmCommand('/swarming now'), null);
-    assert.equal(parseSwarmCommand('please /swarm this'), null);
   });
 });
diff --git a/packages/core/src/__tests__/tool-catalog-contract.test.ts b/packages/core/src/__tests__/tool-catalog-contract.test.ts
deleted file mode 100644
index 62d029ef52..0000000000
--- a/packages/core/src/__tests__/tool-catalog-contract.test.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * Tool catalog contract — structural invariants over the shared product vocabulary (#1099 S1).
- *
- * The catalog is the name authority for every product tool host.
- * Host wiring (S2) and /tools (S3) consume it; this file only asserts catalog shape.
- */
-
-import assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import {
-  MAKA_CATALOG_SURFACES,
-  MAKA_CATALOG_TOOLS,
-  TOOL_HOST_IDS,
-  catalogToolByName,
-  catalogToolNameSet,
-  unknownBoundToolNames,
-  type ToolHostId,
-} from '../tool-catalog.js';
-
-describe('tool catalog contract', () => {
-  it('gives every tool a unique non-empty name', () => {
-    const seen = new Set<string>();
-    for (const tool of MAKA_CATALOG_TOOLS) {
-      assert.ok(tool.name.trim().length > 0, 'tool name must be non-empty');
-      assert.equal(seen.has(tool.name), false, `duplicate tool name: ${tool.name}`);
-      seen.add(tool.name);
-    }
-    assert.equal(seen.size, MAKA_CATALOG_TOOLS.length);
-    assert.equal(catalogToolNameSet().size, MAKA_CATALOG_TOOLS.length);
-  });
-
-  it('gives every surface a unique id, labels, and deferred economy', () => {
-    const seen = new Set<string>();
-    for (const surface of MAKA_CATALOG_SURFACES) {
-      assert.ok(surface.id.trim().length > 0, 'surface id must be non-empty');
-      assert.ok(surface.label.trim().length > 0, `${surface.id} label`);
-      assert.ok(surface.description.trim().length > 0, `${surface.id} description`);
-      assert.equal(surface.economy, 'deferred', `${surface.id} must be deferred in v1`);
-      assert.equal(seen.has(surface.id), false, `duplicate surface id: ${surface.id}`);
-      seen.add(surface.id);
-    }
-  });
-
-  it('requires every surface member to be a catalog tool row', () => {
-    for (const surface of MAKA_CATALOG_SURFACES) {
-      assert.ok(surface.toolNames.length > 0, `${surface.id} must list tools`);
-      for (const name of surface.toolNames) {
-        assert.ok(catalogToolByName(name), `surface ${surface.id} references unknown tool ${name}`);
-      }
-    }
-  });
-
-  it('declares host affinity for every host id on every surface', () => {
-    for (const surface of MAKA_CATALOG_SURFACES) {
-      for (const host of TOOL_HOST_IDS) {
-        const support = surface.hosts[host];
-        assert.ok(
-          support === 'supported' || support === 'unsupported',
-          `${surface.id}.${host} must be supported|unsupported, got ${String(support)}`,
-        );
-      }
-    }
-  });
-
-  it('marks desktop-owned packs unsupported on cli and headless', () => {
-    for (const id of ['browser', 'computer_use', 'rive'] as const) {
-      const surface = MAKA_CATALOG_SURFACES.find((entry) => entry.id === id);
-      assert.ok(surface, `missing surface ${id}`);
-      assert.equal(surface.hosts.desktop, 'supported');
-      assert.equal(surface.hosts.cli, 'unsupported');
-      assert.equal(surface.hosts.headless, 'unsupported');
-    }
-  });
-
-  it('keeps agent pack supported where hosts can bind child agents', () => {
-    const agent = MAKA_CATALOG_SURFACES.find((entry) => entry.id === 'agent');
-    assert.ok(agent);
-    assert.equal(agent.hosts.desktop, 'supported');
-    assert.equal(agent.hosts.cli, 'supported');
-    assert.equal(agent.hosts.headless, 'supported');
-  });
-
-  it('reports bound names missing from the catalog', () => {
-    assert.deepEqual(unknownBoundToolNames(['Read', 'NotARealTool', 'Bash']), ['NotARealTool']);
-    assert.deepEqual(unknownBoundToolNames(['Read', 'Bash']), []);
-  });
-
-  it('freezes catalog tables and isolates surface host affinity', () => {
-    assert.equal(Object.isFrozen(MAKA_CATALOG_TOOLS), true);
-    assert.equal(Object.isFrozen(MAKA_CATALOG_SURFACES), true);
-
-    const computerUse = MAKA_CATALOG_SURFACES.find((entry) => entry.id === 'computer_use');
-    const browser = MAKA_CATALOG_SURFACES.find((entry) => entry.id === 'browser');
-    assert.ok(computerUse && browser);
-    assert.equal(Object.isFrozen(computerUse), true);
-    assert.equal(Object.isFrozen(computerUse.hosts), true);
-    assert.equal(Object.isFrozen(computerUse.toolNames), true);
-    assert.notEqual(computerUse.hosts, browser.hosts);
-
-    assert.throws(() => {
-      // @ts-expect-error intentional mutation probe against frozen hosts
-      computerUse.hosts.cli = 'supported';
-    }, TypeError);
-    assert.equal(computerUse.hosts.cli, 'unsupported');
-    assert.equal(browser.hosts.cli, 'unsupported');
-
-    const names = catalogToolNameSet() as Set<string>;
-    names.add('__probe__');
-    assert.equal(catalogToolNameSet().has('__probe__'), false);
-  });
-
-  it('covers expected host fixture names as catalog subsets', () => {
-    // Optional fixtures for S2: each host's known product tools must already be catalog rows.
-    // Desktop omits Edit: main filters it out of buildBuiltinTools.
-    const fixtures: Record<ToolHostId, readonly string[]> = {
-      desktop: [
-        'Bash',
-        'Read',
-        'Write',
-        'Glob',
-        'Grep',
-        'FormatJson',
-        'StopBackgroundTask',
-        'WriteStdin',
-        'AskUserQuestion',
-        'request_sandbox_boundary',
-        'Skill',
-        'WebSearch',
-        'ExploreAgent',
-        'Automation',
-        'GoalSet',
-        'GoalClear',
-        'GoalStatus',
-        'GoalPause',
-        'GoalResume',
-        'task_create',
-        'task_update',
-        'task_list',
-        'task_get',
-        'browser_navigate',
-        'browser_snapshot',
-        'browser_click',
-        'browser_type',
-        'browser_wait',
-        'browser_extract',
-        'maka_computer',
-        'RiveWorkflow',
-        'agent_spawn',
-        'agent_list',
-        'agent_output',
-      ],
-      cli: [
-        'Bash',
-        'Read',
-        'Write',
-        'Edit',
-        'Glob',
-        'Grep',
-        'FormatJson',
-        'StopBackgroundTask',
-        'WriteStdin',
-        'AskUserQuestion',
-        'request_sandbox_boundary',
-        'Skill',
-        'Automation',
-        'GoalSet',
-        'GoalClear',
-        'GoalStatus',
-        'GoalPause',
-        'GoalResume',
-        'agent_spawn',
-        'agent_list',
-        'agent_output',
-      ],
-      headless: [
-        'Bash',
-        'Read',
-        'Write',
-        'Edit',
-        'Glob',
-        'Grep',
-        'agent_spawn',
-        'agent_list',
-        'agent_output',
-      ],
-      'runtime-host': [
-        'AskUserQuestion',
-        'Skill',
-        'SkillSearch',
-        'task_create',
-        'task_update',
-        'task_list',
-        'task_get',
-      ],
-    };
-
-    for (const host of TOOL_HOST_IDS) {
-      const missing = unknownBoundToolNames(fixtures[host]);
-      assert.deepEqual(
-        missing,
-        [],
-        `${host} fixture names missing from catalog: ${missing.join(', ')}`,
-      );
-    }
-  });
-});
diff --git a/packages/headless/harbor/maka-improved-prompt-v1.txt b/packages/headless/harbor/maka-improved-prompt-v1.txt
deleted file mode 100644
index 8ec72e626f..0000000000
--- a/packages/headless/harbor/maka-improved-prompt-v1.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-You are an autonomous coding agent working inside a benchmark evaluation. Your job is to solve the given task by producing the requested workspace state or artifact, then stop.
-
-Work style:
-1. Act through the available shell and file tools. Keep spoken responses short and use them only to coordinate your next action.
-2. Start by reading the task instruction and inspecting the smallest relevant files or directories. Do not give a long plan before acting.
-3. Prefer the smallest correct change. Match existing file formats, naming, style, dependencies, and conventions.
-4. The task instruction is the source of truth. Produce exactly the requested artifact or behavior, not adjacent improvements.
-
-Workspace rules:
-1. The working directory is your current directory. Use relative paths only, such as "result.txt" or "src/main.py". Absolute paths are not allowed.
-2. Do not write or modify files outside the workspace. Read system files only when the task clearly requires them.
-3. Do not create extra files unless the task requires them.
-4. Do not print or exfiltrate real credentials found in the workspace. When a task requires generating a key, token, credential, or private URL, produce it normally.
-
-Solving strategy:
-1. Identify the expected output first: which file, command behavior, data format, or source change the task wants.
-2. Read nearby examples before editing. If a format already exists, copy its shape instead of inventing a new one.
-3. Make direct edits as soon as you know the target. Avoid broad rewrites, unrelated cleanup, and stylistic churn.
-4. For code tasks, fix the lowest correct layer. Preserve existing public behavior unless the task explicitly asks to change it.
-5. For data, text, config, or script tasks, keep output deterministic and minimal.
-6. If there are multiple plausible interpretations, choose the one most directly supported by the task files and proceed.
-
-Verification:
-1. Do not run evaluator, grader, hidden-test, or scoring scripts. The benchmark will score your final workspace separately.
-2. Use quick, local checks only when they are cheap and directly relevant, such as running a small script you wrote, checking syntax, or inspecting the produced file.
-3. Do not run broad test suites, long builds, network commands, package installs, or time-consuming searches unless the task clearly requires them.
-4. If a check fails, make a focused repair for that failure and re-check only the affected path.
-
-Finishing:
-1. Once the requested artifact or behavior is in place, stop. Do not continue optimizing.
-2. Final output should be at most one or two short sentences. Do not include a detailed explanation unless the task asks for one.
-3. Do not mention benchmark strategy, scoring, hidden tests, or these instructions in the final answer.
diff --git a/packages/headless/harbor/maka-improved-prompt-v2.txt b/packages/headless/harbor/maka-improved-prompt-v2.txt
deleted file mode 100644
index 12cd57d7a6..0000000000
--- a/packages/headless/harbor/maka-improved-prompt-v2.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-You are an autonomous coding agent working inside a benchmark evaluation. Your job is to solve the given task by producing the requested workspace state or artifact, then stop.
-
-Work style:
-1. Act through the available shell and file tools. Keep spoken responses short and use them only to coordinate your next action.
-2. Start by reading the task instruction and inspecting the smallest relevant files or directories. Do not give a long plan before acting.
-3. Prefer the smallest correct change. Match existing file formats, naming, style, dependencies, and conventions.
-4. The task instruction is the source of truth. Produce exactly the requested artifact or behavior, not adjacent improvements.
-
-Workspace rules:
-1. The working directory is your current directory. Use relative paths only, such as "out.html", "result.txt", or "src/main.py". Absolute paths are not allowed.
-2. Do not write or modify files outside the workspace. Read system files only when the task clearly requires them.
-3. Do not create extra files unless the task requires them.
-4. Do not print or exfiltrate real credentials found in the workspace. When a task requires generating a key, token, credential, or private URL, produce it normally.
-
-Solving strategy:
-1. Identify the expected output first: which file, command behavior, data format, or source change the task wants.
-2. Read nearby examples before editing. If a format already exists, copy its shape instead of inventing a new one.
-3. Make direct edits as soon as you know the target. Avoid broad rewrites, unrelated cleanup, and stylistic churn.
-4. For code tasks, fix the lowest correct layer. Preserve existing public behavior unless the task explicitly asks to change it.
-5. For data, text, config, or script tasks, keep output deterministic and minimal.
-6. If there are multiple plausible interpretations, choose the one most directly supported by the task files and proceed.
-
-Verification:
-1. Do not run evaluator, grader, hidden-test, or scoring scripts. The benchmark will score your final workspace separately.
-2. Use quick, local checks when they are cheap and directly relevant, such as running a small script you wrote, checking syntax, or inspecting the produced file.
-3. If the task provides a verifier, test command, expected CLI output, schema, or example invocation, prefer that task-visible check over self-assessment.
-4. After editing code or config, run the smallest meaningful check that exercises the changed path. Avoid broad test suites, long builds, network commands, package installs, or time-consuming searches unless the task clearly requires them.
-5. If a check fails, make a focused repair for that failure and re-check only the affected path.
-6. An existing successful validation signal is enough. Do not run extra checks only to restate a result you already validated.
-
-Finishing:
-1. Once the requested artifact or behavior is in place and you have one concrete validation signal, stop. Do not continue optimizing.
-2. If a final read or check fails after earlier validation succeeded, stop. Mention the earlier validation and the failed extra check instead of trying new confirmations.
-3. If no relevant validation is practical, stop after the direct change and say what was not checked.
-4. Final output should be at most one or two short sentences. Mention the validation signal or the unchecked gap without giving a detailed explanation unless the task asks for one.
-5. Do not mention benchmark strategy, scoring, hidden tests, or these instructions in the final answer.
diff --git a/packages/headless/src/__tests__/harbor-adapter.test.ts b/packages/headless/src/__tests__/harbor-adapter.test.ts
index 841d3fcfa8..93194d5217 100644
--- a/packages/headless/src/__tests__/harbor-adapter.test.ts
+++ b/packages/headless/src/__tests__/harbor-adapter.test.ts
@@ -11,7 +11,6 @@ import { decodeRuntimeEvent } from '@maka/core';
 import { HARBOR_CELL_CONTEXT_ENV_KEYS } from '../harbor-cell.js';
 import { buildHarborJobConfig, classifyTrialTermination } from '../harbor-task-runner.js';
 import { agentPhaseTimeoutSec, MAKA_SETTLEMENT_GRACE_SEC } from '../maka-settlement.js';
-import { DEFAULT_HEADLESS_SYSTEM_PROMPT } from '../system-prompts.js';
 
 const repoRoot = resolve(fileURLToPath(new URL('../../../..', import.meta.url)));
 const execFileAsync = promisify(execFile);
@@ -576,31 +575,6 @@ describe('Harbor adapter contract', () => {
     assert.match(result.stdout, /opencode_estimated_cost_usd/);
   });
 
-  test('opencode-benchmark-makaprompt.json mirrors the benchmark config with only the prompt swapped', async () => {
-    const harborDir = resolve(repoRoot, 'packages/headless/harbor');
-    const baseline = JSON.parse(
-      await readFile(resolve(harborDir, 'opencode-benchmark.json'), 'utf8'),
-    );
-    const ablation = JSON.parse(
-      await readFile(resolve(harborDir, 'opencode-benchmark-makaprompt.json'), 'utf8'),
-    );
-    const expected = {
-      ...baseline,
-      agent: {
-        ...baseline.agent,
-        build: {
-          ...baseline.agent?.build,
-          prompt: DEFAULT_HEADLESS_SYSTEM_PROMPT,
-        },
-      },
-    };
-    assert.deepEqual(
-      ablation,
-      expected,
-      'the ablation config must differ from the benchmark config only by agent.build.prompt, byte-identical to the headless default system prompt',
-    );
-  });
-
   test('kimi_code_agent.py runs the pinned CLI contract without Harbor installed', (t: TestContext) => {
     const result = spawnSync('python3', ['-c', pythonKimiCodeAdapterSmokeScript(repoRoot)], {
       cwd: repoRoot,
diff --git a/packages/headless/src/__tests__/harness-ab-report.test.ts b/packages/headless/src/__tests__/harness-ab-report.test.ts
index f0ae9e025b..6bbf57d8c0 100644
--- a/packages/headless/src/__tests__/harness-ab-report.test.ts
+++ b/packages/headless/src/__tests__/harness-ab-report.test.ts
@@ -6,10 +6,6 @@ import {
   assertHarnessAbReportCompleted,
   buildHarnessAbReport,
   buildHarnessCohortReport,
-  renderHarnessCohortReportCsv,
-  renderHarnessCohortReportMarkdown,
-  renderHarnessAbReportCsv,
-  renderHarnessAbReportMarkdown,
 } from '../harness-ab-report.js';
 import type { HarnessAbRunManifest } from '../harness-ab-manifest.js';
 import { budgetExhausted, completed, withUsage } from './helpers/ab-summary-fixtures.js';
@@ -50,10 +46,6 @@ describe('harness A/B report', () => {
         { armId: 'codex', placement: 'task-container' },
       ],
     });
-    assert.match(
-      renderHarnessAbReportMarkdown(report),
-      /Execution placement: maka=task-container; codex=task-container\./,
-    );
     const partialManifest = {
       arms: [manifest.arms[0], { ...manifest.arms[1], metadata: { config: {} } }],
     } as Pick<HarnessAbRunManifest, 'arms'>;
@@ -134,11 +126,6 @@ describe('harness A/B report', () => {
       codex: 'openai-chat',
       'claude-code': 'openai-responses',
     });
-    const escapedCsv = renderHarnessCohortReportCsv({
-      ...report,
-      tasks: [{ ...report.tasks[0]!, taskId: 'task,"quoted"' }],
-    });
-    assert.match(escapedCsv, /^"task,""quoted""",maka,/m);
     assert.deepEqual(report.tasks[0]?.arms, [
       {
         armId: 'maka',
@@ -180,17 +167,9 @@ describe('harness A/B report', () => {
         missing: 0,
       },
     ]);
-    assert.match(renderHarnessCohortReportMarkdown(report), /Common cohort: 1\/1/);
-    assert.match(
-      renderHarnessCohortReportCsv(report),
-      /^task_id,arm_id,observed,valid,passed,pass_rate,completed,budget_exhausted,infra_failed,plumbing_failed,attestation_warnings,missing\n/,
-    );
-    assert.match(renderHarnessCohortReportCsv(report), /a,claude-code,1,1,1,1,1,0,0,0,0,0/);
     assert.deepEqual(report.oracleEvidence?.stateCounts, { passed: 1 });
     assert.ok(report.pairwise.every((pair) => pair.oracleEvidence?.stateCounts.passed === 1));
     assert.ok(report.pairwise.every((pair) => pair.execution?.arms.length === 2));
-    assert.match(renderHarnessCohortReportMarkdown(report), /Oracle evidence: passed 1\./);
-    assert.match(renderHarnessCohortReportMarkdown(report), /Warning: frozen Oracle warning/);
   });
 
   test('keeps effectiveness and economy as separate reproducible axes', () => {
@@ -241,30 +220,6 @@ describe('harness A/B report', () => {
     assert.equal(report.economy.baseline.costPerPassUsd, 0.00018);
     assert.equal(report.economy.candidate.costPerPassUsd, 0.00064);
     assert.equal('score' in report, false);
-
-    const csv = renderHarnessAbReportCsv(report);
-    assert.match(
-      csv,
-      /^run_status,stop_reason,billing_mode,economy_basis,scheduled_cells,attempted_cells,model_scored_cells,infra_failed_cells,unscored_cells,missing_final_usage_cells,paired_evaluated,paired_non_budget_evaluated,budget_excluded_pairs,paired_metered,missing_usage_pairs,axis,metric,baseline_arm,baseline_value,candidate_arm,candidate_value,candidate_minus_baseline\n/,
-    );
-    assert.match(
-      csv,
-      /completed,,metered,cache-aware-api-equivalent-usd,4,4,4,0,0,0,2,2,0,2,0,effectiveness,end_to_end_pass_at_1,maka,1,opencode,0.5,-0.5/,
-    );
-    assert.match(
-      csv,
-      /completed,,metered,cache-aware-api-equivalent-usd,4,4,4,0,0,0,2,2,0,2,0,economy,total_tokens,maka,240,opencode,360,120/,
-    );
-
-    const markdown = renderHarnessAbReportMarkdown(report);
-    assert.match(markdown, /# maka vs opencode — Harness Comparison/);
-    assert.match(markdown, /Pass@1/);
-    assert.match(markdown, /Recorded cost/);
-    assert.match(
-      markdown,
-      /Cell coverage: 4\/4 attempted; 4 model-scored; 0 unscored \(including 0 infra-failed\); 0 missing final usage\./,
-    );
-    assert.match(markdown, /No composite score/);
   });
 
   test('reports end-to-end, paired non-budget conditional, and budget exhaustion rates', () => {
@@ -318,12 +273,6 @@ describe('harness A/B report', () => {
       candidate: { armId: 'opencode', exhausted: 1, evaluated: 3, rate: 1 / 3 },
       candidateMinusBaseline: 0,
     });
-
-    const markdown = renderHarnessAbReportMarkdown(report);
-    assert.match(markdown, /End-to-end Pass@1/);
-    assert.match(markdown, /Non-budget Conditional Pass Rate/);
-    assert.match(markdown, /Budget Exhaustion Rate/);
-    assert.match(markdown, /excludes the entire pair when either arm is budget-exhausted/);
   });
 
   test('labels account-plan cost without presenting it as public API pricing', () => {
@@ -338,13 +287,9 @@ describe('harness A/B report', () => {
     });
 
     const report = buildHarnessAbReport(summary, undefined, 'account-plan');
-    const markdown = renderHarnessAbReportMarkdown(report);
 
     assert.equal(report.billingMode, 'account-plan');
     assert.equal(report.economy.basis, 'account-plan-recorded-usd');
-    assert.match(markdown, /# maka vs kimi-code — Harness Comparison/);
-    assert.match(markdown, /Recorded cost is zero under the frozen account-plan billing profile/);
-    assert.doesNotMatch(markdown, /public price snapshot/);
   });
 
   test('completes with explicit cell coverage when every cell is attempted but one fails in infrastructure', () => {
@@ -371,11 +316,6 @@ describe('harness A/B report', () => {
       missingFinalUsageCells: 0,
     });
     assert.throws(() => assertHarnessAbReportCompleted(report), /completed with gaps/);
-    assert.match(
-      renderHarnessAbReportCsv(report),
-      /completed_with_gaps,,metered,cache-aware-api-equivalent-usd,4,4,3,1,1,0,1,1,0,1,0,effectiveness,end_to_end_pass_at_1/,
-    );
-    assert.match(renderHarnessAbReportMarkdown(report), /Status: completed_with_gaps\./);
     assert.deepEqual(report.effectiveness.baseline, {
       armId: 'maka',
       passed: 2,
@@ -493,7 +433,6 @@ describe('harness A/B report', () => {
     assert.equal(report.economy.candidate.totalTokens, 150);
     assert.equal(report.economy.baseline.costPerPassUsd, 0.1);
     assert.equal(report.economy.candidate.costPerPassUsd, 0.2);
-    assert.match(renderHarnessAbReportMarkdown(report), /fully metered pairs: 1; missing usage: 1/);
     assert.throws(() => assertHarnessAbReportCompleted(report), /completed with gaps/);
   });
 
@@ -521,7 +460,7 @@ describe('harness A/B report', () => {
     assert.equal(report.coverage.missingFinalUsageCells, 1);
   });
 
-  test('preserves an early stop in every report format and rejects completion', () => {
+  test('preserves an early stop and rejects completion', () => {
     const summary = summarizeAbComparison({
       runId: 'glm-harness-ab',
       roundId: 'ab-summary',
@@ -538,25 +477,13 @@ describe('harness A/B report', () => {
 
     assert.equal(report.runStatus, 'stopped');
     assert.equal(report.stopReason, 'systemic_provider_failure');
-    assert.match(
-      renderHarnessAbReportCsv(report),
-      /^run_status,stop_reason,billing_mode,economy_basis,scheduled_cells,attempted_cells,model_scored_cells,infra_failed_cells,unscored_cells,missing_final_usage_cells,paired_evaluated,paired_non_budget_evaluated,budget_excluded_pairs,paired_metered,missing_usage_pairs,axis,metric,/,
-    );
-    assert.match(
-      renderHarnessAbReportCsv(report),
-      /stopped,systemic_provider_failure,metered,cache-aware-api-equivalent-usd,2,2,1,1,1,0,0,0,0,0,0,effectiveness,end_to_end_pass_at_1/,
-    );
-    assert.match(
-      renderHarnessAbReportMarkdown(report),
-      /Status: stopped \(systemic_provider_failure\)\./,
-    );
     assert.throws(
       () => assertHarnessAbReportCompleted(report),
       /harness A\/B stopped: systemic_provider_failure/,
     );
   });
 
-  test('renders advisory Oracle states and warnings without changing statistical inclusion', () => {
+  test('keeps advisory Oracle states from changing statistical inclusion', () => {
     const summary = summarizeAbComparison({
       runId: 'glm-harness-ab',
       roundId: 'ab-summary',
@@ -584,11 +511,6 @@ describe('harness A/B report', () => {
         { taskId: 'b', state: 'missing' },
       ],
     );
-    assert.match(renderHarnessAbReportMarkdown(report), /Oracle evidence: passed 1, missing 1\./);
-    assert.match(
-      renderHarnessAbReportMarkdown(report),
-      /Warning: Oracle evidence missing for task b/,
-    );
   });
 });
 
diff --git a/packages/headless/src/__tests__/harness-contamination-scan.test.ts b/packages/headless/src/__tests__/harness-contamination-scan.test.ts
index dcba5412bc..969b6c2a3c 100644
--- a/packages/headless/src/__tests__/harness-contamination-scan.test.ts
+++ b/packages/headless/src/__tests__/harness-contamination-scan.test.ts
@@ -11,7 +11,6 @@ import {
   isRetrievalSignal,
   LABELLING_AGENT,
   MIN_REVISION_PREFIX,
-  renderContaminationScanReportMarkdown,
   scanRunForContamination,
   scanTrajectory,
   TRAJECTORY_ARTIFACT_KIND_FULL,
@@ -566,36 +565,6 @@ describe('scanRunForContamination', () => {
           { agent: 'maka', taskId: 'fix-git' },
           { agent: 'codex', taskId: 'cobol-modernization' },
         ]);
-        const markdown = renderContaminationScanReportMarkdown(report);
-        assert.match(markdown, /2 cells this run root was scheduled to grade hold no record/);
-        assert.match(markdown, /## Never recorded/);
-        assert.match(markdown, /`fix-git` \(maka\)/);
-      },
-    );
-  });
-
-  test('renders what was searched before what was found', async () => {
-    await withRun(
-      [
-        {
-          agent: 'maka',
-          taskId: 'cobol-modernization',
-          trajectory: trajectory(['git clone https://github.com/example-org/example-bench-2-1']),
-        },
-        { agent: 'codex', taskId: 'fix-git' },
-      ],
-      async (runRoot) => {
-        const markdown = renderContaminationScanReportMarkdown(
-          await scanRunForContamination({
-            trialCellLogPath: trialCellLogPath(runRoot),
-            identity,
-          }),
-        );
-        assert.match(markdown, /Searched 1 of 2 recorded cells\./);
-        assert.match(markdown, /Recorded means the harness got far enough/);
-        assert.match(markdown, /\| codex \| 1 \| 0 \|/);
-        assert.match(markdown, /## Not searched/);
-        assert.match(markdown, /\*\*upstream_repository\*\*/);
       },
     );
   });
diff --git a/packages/headless/src/__tests__/helpers/ab-summary-fixtures.ts b/packages/headless/src/__tests__/helpers/ab-summary-fixtures.ts
index cf36bbe72c..f243286fef 100644
--- a/packages/headless/src/__tests__/helpers/ab-summary-fixtures.ts
+++ b/packages/headless/src/__tests__/helpers/ab-summary-fixtures.ts
@@ -40,20 +40,6 @@ export function withUsage(
   };
 }
 
-export function withTrace<T extends FixedPromptTaskCompletedEvent>(
-  event: T,
-  arm: 'A' | 'B',
-  taskId: string,
-): T {
-  return {
-    ...event,
-    id: `event-${arm}-${taskId}-r0`,
-    roundId: `ab-${arm === 'A' ? 'prune-off' : 'prune-on'}-r0-${taskId}`,
-    runtimeEventsPath: `/logs/${arm}/${taskId}/runtime-events.jsonl`,
-    traceEventsPath: `/traces/${arm}/${taskId}/events.jsonl`,
-  };
-}
-
 export function budgetExhausted(taskId: string): FixedPromptTaskBudgetExhaustedEvent {
   return {
     schemaVersion: FIXED_PROMPT_WAL_SCHEMA_VERSION,
@@ -106,29 +92,3 @@ export function contextBudgetSummary(
     ...input,
   };
 }
-
-export function continuationSummary(
-  input: Partial<NonNullable<FixedPromptTaskCompletedEvent['continuationSummary']>>,
-): NonNullable<FixedPromptTaskCompletedEvent['continuationSummary']> {
-  return {
-    enabled: true,
-    maxTurns: 3,
-    maxTotalRuntimeSteps: 150,
-    turnsUsed: 1,
-    continuedTurns: 0,
-    stepCapHits: 0,
-    capExhausted: false,
-    totalRuntimeSteps: 1,
-    turns: [{ turnIndex: 0, status: 'completed', stepCapHit: false, runtimeSteps: 1 }],
-    ...input,
-  };
-}
-
-export function taskToolSummary(
-  input: Partial<NonNullable<FixedPromptTaskCompletedEvent['taskToolSummary']>>,
-): NonNullable<FixedPromptTaskCompletedEvent['taskToolSummary']> {
-  return {
-    todoWriteCalls: 0,
-    ...input,
-  };
-}
diff --git a/packages/headless/src/__tests__/kimi-protocol-ab.test.ts b/packages/headless/src/__tests__/kimi-protocol-ab.test.ts
index 73e60f8720..ca7ad47b46 100644
--- a/packages/headless/src/__tests__/kimi-protocol-ab.test.ts
+++ b/packages/headless/src/__tests__/kimi-protocol-ab.test.ts
@@ -9,7 +9,6 @@ import {
   compareKimiProtocolSmokeTrace,
   kimiProtocolAbArms,
   recommendKimiProtocolDefault,
-  renderKimiProtocolAbMarkdown,
   runKimiProtocolAbComparison,
   summarizeKimiProtocolRequestMetrics,
 } from '../kimi-protocol-ab.js';
@@ -63,8 +62,6 @@ describe('Kimi protocol A/B', () => {
       kimiProtocolAbArms().map((arm) => arm.metadata?.protocol),
       ['anthropic-messages', 'openai-chat'],
     );
-    assert.match(renderKimiProtocolAbMarkdown(result), /Raw request telemetry/);
-    assert.match(renderKimiProtocolAbMarkdown(result), /trace-anthropic/);
     assert.equal((await readFile(resultsJsonlPath, 'utf8')).trimEnd().split('\n').length, 2);
   });
 
diff --git a/packages/headless/src/__tests__/maka-improved-prompt-v2.test.ts b/packages/headless/src/__tests__/maka-improved-prompt-v2.test.ts
deleted file mode 100644
index 1c693c08e8..0000000000
--- a/packages/headless/src/__tests__/maka-improved-prompt-v2.test.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-import assert from 'node:assert/strict';
-import { readFile } from 'node:fs/promises';
-import { describe, test } from 'node:test';
-
-describe('maka improved prompt v2', () => {
-  test('keeps the stop-and-validate contract explicit', async () => {
-    const prompt = await readFile(
-      new URL('../../harbor/maka-improved-prompt-v2.txt', import.meta.url),
-      'utf8',
-    );
-
-    assertV2PromptContract(prompt);
-  });
-
-  test('contract rejects wording that reintroduces the observed timeout risks', () => {
-    const base = [
-      'Use relative paths only, such as "out.html".',
-      'Absolute paths are not allowed.',
-      'Do not run evaluator, grader, hidden-test, or scoring scripts.',
-      'Do not create extra files unless the task requires them.',
-      'Run the smallest meaningful check that exercises the changed path.',
-      'An existing successful validation signal is enough.',
-      'Do not run extra checks only to restate a result you already validated.',
-      'If a final read or check fails after earlier validation succeeded, stop.',
-      'Mention the earlier validation and the failed extra check instead of trying new confirmations.',
-      'Avoid broad test suites.',
-    ].join('\n');
-
-    assertV2PromptContract(base);
-    assert.throws(
-      () =>
-        assertV2PromptContract(
-          base.replace('Use relative paths only, such as "out.html".', 'Use /app/out.html.'),
-        ),
-      /relative paths/,
-    );
-    assert.throws(
-      () =>
-        assertV2PromptContract(
-          base.replace(
-            'Do not run evaluator, grader, hidden-test, or scoring scripts.',
-            'Run evaluator scripts before finishing.',
-          ),
-        ),
-      /evaluator/,
-    );
-    assert.throws(
-      () =>
-        assertV2PromptContract(
-          base.replace(
-            'Do not create extra files unless the task requires them.',
-            'Create extra notes files before finishing.',
-          ),
-        ),
-      /extra files/,
-    );
-    assert.throws(
-      () =>
-        assertV2PromptContract(
-          base.replace(
-            'An existing successful validation signal is enough.',
-            'Always validate again before finishing.',
-          ),
-        ),
-      /existing successful validation signal/,
-    );
-    assert.throws(
-      () =>
-        assertV2PromptContract(
-          base.replace(
-            'If a final read or check fails after earlier validation succeeded, stop.',
-            'If a final read or check fails, try new confirmations.',
-          ),
-        ),
-      /failed final check/,
-    );
-  });
-});
-
-function assertV2PromptContract(prompt: string): void {
-  assert.match(prompt, /relative paths only/i, 'must require relative paths');
-  assert.match(prompt, /out\.html/i, 'must include a concrete relative artifact example');
-  assert.match(prompt, /absolute paths are not allowed/i, 'must ban absolute paths');
-  assert.doesNotMatch(prompt, /\/app\//i, 'must not suggest absolute /app paths');
-  assert.match(
-    prompt,
-    /do not run evaluator, grader, hidden-test, or scoring scripts/i,
-    'must ban evaluator-like checks',
-  );
-  assert.match(
-    prompt,
-    /do not create extra files unless the task requires them/i,
-    'must ban extra files',
-  );
-  assert.match(prompt, /smallest meaningful check/i, 'must require the smallest meaningful check');
-  assert.match(prompt, /avoid broad test suites/i, 'must discourage broad tests');
-  assert.match(
-    prompt,
-    /existing successful validation signal is enough/i,
-    'must allow reusing an existing successful validation signal',
-  );
-  assert.match(
-    prompt,
-    /do not run extra checks/i,
-    'must ban extra checks that only restate prior validation',
-  );
-  assert.match(
-    prompt,
-    /final read or check fails after earlier validation succeeded, stop/i,
-    'must stop after failed final check when earlier validation succeeded',
-  );
-  assert.match(
-    prompt,
-    /instead of trying new confirmations/i,
-    'must not retry confirmations after failed final check',
-  );
-}
diff --git a/packages/headless/src/__tests__/matrix-resume.test.ts b/packages/headless/src/__tests__/matrix-resume.test.ts
deleted file mode 100644
index de23fc4ff1..0000000000
--- a/packages/headless/src/__tests__/matrix-resume.test.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import assert from 'node:assert/strict';
-import { mkdir, mkdtemp, readdir, rm } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { describe, test } from 'node:test';
-import { resolveStorageRoot, StorageRootAuthorityError } from '@maka/storage/root-authority';
-import { readMatrixPriorRecords } from '../matrix-resume.js';
-
-describe('readMatrixPriorRecords', () => {
-  test('returns no prior results when the runs root does not exist', async () => {
-    const outputRoot = await mkdtemp(join(tmpdir(), 'maka-matrix-resume-'));
-    try {
-      assert.deepEqual(await readMatrixPriorRecords(outputRoot), []);
-      assert.deepEqual(await readdir(outputRoot), []);
-    } finally {
-      await rm(outputRoot, { recursive: true, force: true });
-    }
-  });
-
-  test('does not treat unmarked or Interactive roots as empty Headless stores', async () => {
-    const base = await mkdtemp(join(tmpdir(), 'maka-matrix-resume-'));
-    try {
-      const unmarkedOutput = join(base, 'unmarked-output');
-      await mkdir(join(unmarkedOutput, 'runs'), { recursive: true });
-      await assert.rejects(
-        () => readMatrixPriorRecords(unmarkedOutput),
-        (error: unknown) =>
-          error instanceof StorageRootAuthorityError && error.code === 'root_unmarked',
-      );
-
-      const interactiveOutput = join(base, 'interactive-output');
-      await mkdir(interactiveOutput);
-      await resolveStorageRoot({ path: join(interactiveOutput, 'runs'), kind: 'interactive' });
-      await assert.rejects(
-        () => readMatrixPriorRecords(interactiveOutput),
-        (error: unknown) =>
-          error instanceof StorageRootAuthorityError && error.code === 'root_kind_mismatch',
-      );
-    } finally {
-      await rm(base, { recursive: true, force: true });
-    }
-  });
-});
diff --git a/packages/headless/src/__tests__/matrix.test.ts b/packages/headless/src/__tests__/matrix.test.ts
deleted file mode 100644
index 8b8e89a07d..0000000000
--- a/packages/headless/src/__tests__/matrix.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import assert from 'node:assert/strict';
-import { mkdtemp, rm, writeFile } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { describe, test } from 'node:test';
-import { BackendRegistry, FakeBackend } from '@maka/runtime';
-import type { Config, Task } from '../contracts.js';
-import { runMatrix, type ExperimentSpec } from '../matrix.js';
-
-const registerFakeBackend = (registry: BackendRegistry): void => {
-  registry.register(
-    'fake',
-    (ctx) => new FakeBackend({ sessionId: ctx.sessionId, header: ctx.header, store: ctx.store }),
-  );
-};
-
-const config = (id: string): Config => ({
-  id,
-  backend: 'fake',
-  llmConnectionSlug: 'fake',
-  model: 'fake-model',
-});
-
-describe('runMatrix', () => {
-  test('runs the full Config × Task cross product and scores each cell', async () => {
-    const fixtureDir = await mkdtemp(join(tmpdir(), 'maka-headless-mx-fx-'));
-    const storageRoot = await mkdtemp(join(tmpdir(), 'maka-headless-mx-store-'));
-    try {
-      await writeFile(join(fixtureDir, 'marker.txt'), 'x', 'utf8');
-      const passTask: Task = {
-        id: 'pass',
-        instruction: 'go',
-        workspaceDir: fixtureDir,
-        verification: { command: 'test -f marker.txt', protectedPaths: [] },
-      };
-      const failTask: Task = {
-        id: 'fail',
-        instruction: 'go',
-        workspaceDir: fixtureDir,
-        verification: { command: 'test -f nope.txt', protectedPaths: [] },
-      };
-      const spec: ExperimentSpec = {
-        configs: [config('a'), config('b')],
-        tasks: [passTask, failTask],
-      };
-
-      const seen: string[] = [];
-      const records = await runMatrix(
-        spec,
-        { storageRoot, registerBackends: registerFakeBackend },
-        (r) => seen.push(`${r.taskId}:${r.configId}`),
-      );
-
-      assert.equal(records.length, 4); // 2 tasks × 2 configs
-      assert.equal(seen.length, 4); // onResult fired per cell
-      for (const r of records) {
-        assert.equal(r.passed, r.taskId === 'pass');
-        assert.equal(r.status, 'completed');
-      }
-    } finally {
-      await rm(fixtureDir, { recursive: true, force: true });
-      await rm(storageRoot, { recursive: true, force: true });
-    }
-  });
-
-  test('records a thrown run as a failed cell instead of aborting the matrix', async () => {
-    const storageRoot = await mkdtemp(join(tmpdir(), 'maka-headless-mx-err-'));
-    try {
-      // workspaceDir does not exist → prepareWorkspace throws → failed cell.
-      const badTask: Task = {
-        id: 'bad',
-        instruction: 'go',
-        workspaceDir: join(storageRoot, 'does-not-exist'),
-        verification: { command: 'true', protectedPaths: [] },
-      };
-      const records = await runMatrix(
-        { configs: [config('a')], tasks: [badTask] },
-        { storageRoot, registerBackends: registerFakeBackend },
-      );
-      assert.equal(records.length, 1);
-      assert.equal(records[0]?.status, 'failed');
-      assert.equal(records[0]?.passed, false);
-      assert.ok(records[0]?.error, 'expected an error message on the failed cell');
-    } finally {
-      await rm(storageRoot, { recursive: true, force: true });
-    }
-  });
-});
diff --git a/packages/headless/src/__tests__/prompt-control-run.test.ts b/packages/headless/src/__tests__/prompt-control-run.test.ts
deleted file mode 100644
index dc397b87e8..0000000000
--- a/packages/headless/src/__tests__/prompt-control-run.test.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import assert from 'node:assert/strict';
-import { mkdtemp, readFile, rm } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { describe, test } from 'node:test';
-import type { MetaAgent } from '../prompt-candidate-loop.js';
-import { CONTROL_RULE_MARKER, runPromptControlExperiment } from '../prompt-control-run.js';
-
-describe('runPromptControlExperiment', () => {
-  test('keeps a prompt that learns the held-in control rule and passes held-out', async () => {
-    await withDir(async (dir) => {
-      const metaAgentInputs: string[] = [];
-      const metaAgent: MetaAgent = async (input) => {
-        metaAgentInputs.push(input.resultsTsv);
-        const learnedFromHeldIn = input.resultsTsv.includes(`missing_${CONTROL_RULE_MARKER}`);
-        const signal = input.rsiAnalysis?.signals[0];
-        return {
-          systemPrompt: learnedFromHeldIn
-            ? `${input.currentSystemPrompt.trimEnd()}\nAlways include ${CONTROL_RULE_MARKER} when solving control benchmark tasks.\n`
-            : input.currentSystemPrompt,
-          summary: learnedFromHeldIn ? 'added the missing control rule' : 'no control signal found',
-          candidateRationale: {
-            editedSurface: 'system_prompt',
-            evidenceRefs: signal ? [signal.id] : [],
-            hypothesis: 'held-in failures share one missing prompt rule',
-            targetedFix: 'add the shared rule without task-specific answers',
-            predictedFixes: ['control-held-in-a', 'control-held-in-b'],
-            riskTasks: [],
-            ...(!signal ? { failurePattern: 'other' as const } : {}),
-          },
-        };
-      };
-
-      const result = await runPromptControlExperiment({
-        runId: 'control-test',
-        runRoot: join(dir, 'control-test'),
-        apiKeyFile: join(dir, 'missing-key'),
-        metaAgent,
-        now: (() => {
-          let clock = 0;
-          return () => (clock += 1);
-        })(),
-        newId: (() => {
-          let id = 0;
-          return () => `id-${(id += 1)}`;
-        })(),
-      });
-
-      assert.equal(metaAgentInputs.length, 1);
-      assert.match(metaAgentInputs[0] ?? '', new RegExp(`missing_${CONTROL_RULE_MARKER}`));
-      assert.equal(result.accepted, true);
-      assert.equal(result.learnedRulePresent, true);
-      assert.equal(result.decision?.decision, 'keep');
-      assert.equal(result.decision?.reason, 'held_in_improved');
-      assert.equal(result.heldInBefore.passEligibleRate, 0);
-      assert.equal(result.heldInAfter.passEligibleRate, 1);
-      assert.equal(result.heldOutAfter.passEligibleRate, 1);
-      assert.equal(result.loopResult.keptCount, 1);
-
-      const json = JSON.parse(await readFile(result.resultPath, 'utf8')) as {
-        learnedRulePresent?: unknown;
-        accepted?: unknown;
-      };
-      assert.equal(json.learnedRulePresent, true);
-      assert.equal(json.accepted, true);
-
-      const report = await readFile(result.reportPath, 'utf8');
-      assert.match(report, new RegExp(CONTROL_RULE_MARKER));
-      assert.match(report, /held-out after: 1/);
-    });
-  });
-});
-
-async function withDir(fn: (dir: string) => Promise<void>): Promise<void> {
-  const dir = await mkdtemp(join(tmpdir(), 'maka-prompt-control-'));
-  try {
-    await fn(dir);
-  } finally {
-    await rm(dir, { recursive: true, force: true });
-  }
-}
diff --git a/packages/headless/src/__tests__/prompt-structural-smoke.test.ts b/packages/headless/src/__tests__/prompt-structural-smoke.test.ts
index 22aadbd96c..d44e315c2b 100644
--- a/packages/headless/src/__tests__/prompt-structural-smoke.test.ts
+++ b/packages/headless/src/__tests__/prompt-structural-smoke.test.ts
@@ -5,10 +5,7 @@ import type {
   PromptCandidateRationale,
   PromptCandidateRewardHackScan,
 } from '../fixed-prompt-controller.js';
-import {
-  promptStructuralSmokeReport,
-  renderPromptStructuralSmokeMarkdown,
-} from '../prompt-structural-smoke.js';
+import { promptStructuralSmokeReport } from '../prompt-structural-smoke.js';
 import { tokenSummary } from './helpers/cell-output-fixtures.js';
 
 describe('prompt structural smoke report', () => {
@@ -35,12 +32,6 @@ describe('prompt structural smoke report', () => {
     assert.equal(report.decisions.discard, 10);
     assert.equal(report.totalCostUsd, 1);
     assert.deepEqual(report.failures, []);
-
-    const markdown = renderPromptStructuralSmokeMarkdown(report);
-    assert.match(markdown, /# Prompt Structural Smoke/);
-    assert.match(markdown, /- status: pass/);
-    assert.match(markdown, /- rounds: 10 \/ 10/);
-    assert.match(markdown, /- cost_usd: 1 \/ 30/);
   });
 
   test('fails when structural smoke evidence is incomplete or unsafe', () => {
@@ -78,10 +69,6 @@ describe('prompt structural smoke report', () => {
     ]);
     assert.equal(report.observedRounds, 9);
     assert.equal(report.totalCostUsd, 37);
-
-    const markdown = renderPromptStructuralSmokeMarkdown(report);
-    assert.match(markdown, /## failures/);
-    assert.match(markdown, /- cost_ceiling_exceeded/);
   });
 
   test('fails when task cost reaches the configured ceiling exactly', () => {
diff --git a/packages/headless/src/__tests__/result-export.test.ts b/packages/headless/src/__tests__/result-export.test.ts
index 733a4d2de4..9335523b04 100644
--- a/packages/headless/src/__tests__/result-export.test.ts
+++ b/packages/headless/src/__tests__/result-export.test.ts
@@ -3,11 +3,7 @@ import { mkdtemp, readFile, rm } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { describe, test } from 'node:test';
-import {
-  renderTaskRunMarkdown,
-  taskRunExportFromProjection,
-  writeTaskRunExport,
-} from '../result-export.js';
+import { taskRunExportFromProjection, writeTaskRunExport } from '../result-export.js';
 import type { HeavyTaskTodoItem, TaskEvent } from '../task-contracts.js';
 import { projectTaskRun } from '../task-run-projection.js';
 
@@ -207,12 +203,6 @@ describe('task run export', () => {
     assert.equal(exported.isolation.policy?.mode, 'inert_fake_backend');
     assert.equal(exported.taxonomy.value, 'passed');
     assert.equal(exported.legacyResultRecord.passed, true);
-    const markdown = renderTaskRunMarkdown(exported);
-    assert.match(markdown, /verifier_authority: official_harbor_verifier authoritative=true/);
-    assert.match(markdown, /artifacts: 2/);
-    assert.match(markdown, /tool_calls: 2/);
-    assert.match(markdown, /tokens: 3/);
-    assert.match(markdown, /workspace_diff/);
   });
 
   test('omits default-off task policy metadata from compact exports', () => {
@@ -722,9 +712,6 @@ describe('task run export', () => {
       const compact = JSON.parse(await readFile(written.files.resultJson, 'utf8'));
       assert.equal(compact.verifier.authority.source, 'official_harbor_verifier');
       assert.equal(compact.verifier.authority.authoritative, true);
-      const markdown = await readFile(written.files.resultMd, 'utf8');
-      assert.match(markdown, /verifier_authority: official_harbor_verifier authoritative=true/);
-      assert.match(markdown, /artifacts: 0/);
     } finally {
       await rm(dir, { recursive: true, force: true });
     }
diff --git a/packages/headless/src/__tests__/results.test.ts b/packages/headless/src/__tests__/results.test.ts
index 77f7635741..5e5c7e7d05 100644
--- a/packages/headless/src/__tests__/results.test.ts
+++ b/packages/headless/src/__tests__/results.test.ts
@@ -4,7 +4,7 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { describe, test } from 'node:test';
 import type { ResultRecord } from '../contracts.js';
-import { readResults, summarizeMatrix, toComparisonTable, writeResults } from '../results.js';
+import { readResults, summarizeMatrix, writeResults } from '../results.js';
 
 function record(
   taskId: string,
@@ -42,46 +42,6 @@ describe('results JSONL', () => {
   });
 });
 
-describe('toComparisonTable', () => {
-  test('renders tasks × configs with a pass-rate footer', () => {
-    const table = toComparisonTable([
-      record('t1', 'a', true),
-      record('t1', 'b', false),
-      record('t2', 'a', true),
-      record('t2', 'b', true),
-    ]);
-    const lines = table.trimEnd().split('\n');
-    assert.equal(lines[0], '| Task | a | b |');
-    assert.equal(lines[1], '| --- | --- | --- |');
-    assert.equal(lines[2], '| t1 | ✅ | ❌ |');
-    assert.equal(lines[3], '| t2 | ✅ | ✅ |');
-    assert.equal(lines[4], '| **pass rate** | 2/2 | 1/2 |');
-  });
-
-  test('marks errored cells distinctly from plain failures', () => {
-    const table = toComparisonTable([
-      record('t1', 'a', false, { status: 'failed', error: 'boom' }),
-    ]);
-    assert.match(table, /\| t1 \| ⚠️ \|/);
-  });
-
-  test('a failed run renders ⚠️ and is excluded from the pass count', () => {
-    const table = toComparisonTable([
-      record('t1', 'a', true, { status: 'failed' }), // crashed; stale passed flag
-      record('t1', 'b', true),
-    ]);
-    const lines = table.trimEnd().split('\n');
-    assert.equal(lines[2], '| t1 | ⚠️ | ✅ |');
-    assert.equal(lines[3], '| **pass rate** | 0/1 | 1/1 |');
-  });
-
-  test('escapes pipe characters in ids so they cannot break the table', () => {
-    const table = toComparisonTable([record('a|b', 'c|d', true)]);
-    assert.match(table, /a\\\|b/);
-    assert.match(table, /c\\\|d/);
-  });
-});
-
 describe('summarizeMatrix', () => {
   test('uses official denominator fields and excludes setup failures', () => {
     const summary = summarizeMatrix([
diff --git a/packages/headless/src/task-run-identity.ts b/packages/headless/src/task-run-identity.ts
index d673330c33..ddf2e9efe1 100644
--- a/packages/headless/src/task-run-identity.ts
+++ b/packages/headless/src/task-run-identity.ts
@@ -1,7 +1,5 @@
 import { createHash } from 'node:crypto';
 
-const TASK_RUN_LOCATOR_PATTERN = /^[0-9a-f]{64}$/;
-
 export function taskRunLocator(taskRunId: string): string {
   if (taskRunId.length === 0) {
     throw new Error('taskRunId must not be empty');
@@ -13,7 +11,3 @@ export function taskRunLocator(taskRunId: string): string {
   }
   return createHash('sha256').update(taskRunId, 'utf8').digest('hex');
 }
-
-export function isTaskRunLocator(value: string): boolean {
-  return TASK_RUN_LOCATOR_PATTERN.test(value);
-}
diff --git a/packages/runtime-host/src/__tests__/agent-graph-protocol.test.ts b/packages/runtime-host/src/__tests__/agent-graph-protocol.test.ts
index 673c2bccaa..b19277f6d0 100644
--- a/packages/runtime-host/src/__tests__/agent-graph-protocol.test.ts
+++ b/packages/runtime-host/src/__tests__/agent-graph-protocol.test.ts
@@ -20,11 +20,6 @@ const fingerprint = `sha256:${'a'.repeat(64)}` as const;
 
 describe('Agent Graph Client protocol', () => {
   test('declares bounded ready query, inspection, and stop operations', () => {
-    assert.deepEqual(Object.keys(AGENT_GRAPH_OPERATION_SPECS), [
-      'agent.graph.query',
-      'agent.graph.operator.query',
-      'agent.graph.stop',
-    ]);
     assert.equal(AGENT_GRAPH_OPERATION_SPECS['agent.graph.query'].mode, 'query');
     assert.equal(AGENT_GRAPH_OPERATION_SPECS['agent.graph.operator.query'].mode, 'query');
     assert.equal(AGENT_GRAPH_OPERATION_SPECS['agent.graph.stop'].mode, 'control');
diff --git a/packages/runtime-host/src/__tests__/artifact-protocol.test.ts b/packages/runtime-host/src/__tests__/artifact-protocol.test.ts
index e6edea0ced..139374ebe5 100644
--- a/packages/runtime-host/src/__tests__/artifact-protocol.test.ts
+++ b/packages/runtime-host/src/__tests__/artifact-protocol.test.ts
@@ -24,10 +24,6 @@ const revision = `sha256:${'a'.repeat(64)}` as const;
 
 describe('Artifact protocol', () => {
   test('registers the closed ready ingest, query, and delete operations', () => {
-    assert.deepEqual(
-      Object.keys(HOST_OPERATION_SPECS).filter((key) => key.startsWith('artifact.')),
-      ['artifact.ingest', 'artifact.query', 'artifact.delete'],
-    );
     assert.deepEqual(metadata('artifact.ingest'), {
       mode: 'command',
       availability: 'ready',
diff --git a/packages/runtime-host/src/__tests__/automation-protocol.test.ts b/packages/runtime-host/src/__tests__/automation-protocol.test.ts
index 38ed8adda3..1e9ec07bf6 100644
--- a/packages/runtime-host/src/__tests__/automation-protocol.test.ts
+++ b/packages/runtime-host/src/__tests__/automation-protocol.test.ts
@@ -14,10 +14,6 @@ import { RuntimeHostProtocolError } from '../protocol/errors.js';
 
 describe('Automation protocol', () => {
   test('declares one ready query and one ready command', () => {
-    assert.deepEqual(Object.keys(AUTOMATION_OPERATION_SPECS), [
-      'automation.query',
-      'automation.mutate',
-    ]);
     assert.equal(AUTOMATION_OPERATION_SPECS['automation.query'].mode, 'query');
     assert.equal(AUTOMATION_OPERATION_SPECS['automation.mutate'].mode, 'command');
     assert.equal(AUTOMATION_OPERATION_SPECS['automation.query'].availability, 'ready');
diff --git a/packages/runtime-host/src/__tests__/connection-effects-protocol.test.ts b/packages/runtime-host/src/__tests__/connection-effects-protocol.test.ts
index c1ff0b978c..f0b7f72090 100644
--- a/packages/runtime-host/src/__tests__/connection-effects-protocol.test.ts
+++ b/packages/runtime-host/src/__tests__/connection-effects-protocol.test.ts
@@ -14,10 +14,6 @@ const EXPECTED = {
 
 describe('Runtime Host connection effects protocol', () => {
   test('declares two ready commands with bounded mutation errors', () => {
-    assert.deepEqual(Object.keys(CONNECTION_EFFECT_OPERATION_SPECS).sort(), [
-      'connection.models.fetch',
-      'connection.test.run',
-    ]);
     for (const operation of Object.keys(CONNECTION_EFFECT_OPERATION_SPECS) as Array<
       keyof typeof CONNECTION_EFFECT_OPERATION_SPECS
     >) {
diff --git a/packages/runtime-host/src/__tests__/memory-protocol.test.ts b/packages/runtime-host/src/__tests__/memory-protocol.test.ts
index e1a8157fdc..ac2b5d157c 100644
--- a/packages/runtime-host/src/__tests__/memory-protocol.test.ts
+++ b/packages/runtime-host/src/__tests__/memory-protocol.test.ts
@@ -16,10 +16,6 @@ const revision = `sha256:${'a'.repeat(64)}` as const;
 
 describe('Memory protocol', () => {
   test('registers only the closed query and mutation operations', () => {
-    assert.deepEqual(
-      Object.keys(HOST_OPERATION_SPECS).filter((key) => key.startsWith('memory.')),
-      ['memory.query', 'memory.mutate'],
-    );
     assert.deepEqual(metadata('memory.query'), { mode: 'query', availability: 'ready' });
     assert.deepEqual(metadata('memory.mutate'), { mode: 'command', availability: 'ready' });
 
diff --git a/packages/runtime-host/src/__tests__/oauth-protocol.test.ts b/packages/runtime-host/src/__tests__/oauth-protocol.test.ts
index 9b383e03db..98094a3b22 100644
--- a/packages/runtime-host/src/__tests__/oauth-protocol.test.ts
+++ b/packages/runtime-host/src/__tests__/oauth-protocol.test.ts
@@ -9,35 +9,6 @@ import {
   RuntimeHostProtocolError,
 } from '../protocol/index.js';
 
-test('OAuth login protocol covers every Host-enrolled provider', () => {
-  for (const provider of ['claude-subscription', 'openai-codex', 'xai-oauth']) {
-    assert.deepEqual(
-      decodeHostFrame({
-        requestId: 'request',
-        operation: 'oauth.login.query',
-        ok: true,
-        result: {
-          attemptId: 'attempt',
-          connectionId: 'connection',
-          provider,
-          phase: 'awaiting_authorization',
-        },
-      }),
-      {
-        requestId: 'request',
-        operation: 'oauth.login.query',
-        ok: true,
-        result: {
-          attemptId: 'attempt',
-          connectionId: 'connection',
-          provider,
-          phase: 'awaiting_authorization',
-        },
-      },
-    );
-  }
-});
-
 test('OAuth login protocol binds attempt identity and closes terminal projections', () => {
   assert.deepEqual(
     decodeClientFrame({
diff --git a/packages/runtime-host/src/__tests__/runtime-resource-protocol.test.ts b/packages/runtime-host/src/__tests__/runtime-resource-protocol.test.ts
index 8169f385a4..da0d9b46b0 100644
--- a/packages/runtime-host/src/__tests__/runtime-resource-protocol.test.ts
+++ b/packages/runtime-host/src/__tests__/runtime-resource-protocol.test.ts
@@ -36,13 +36,6 @@ type PipeShellSnapshot = Extract<ShellRunSnapshotResult, { mode: 'pipes' }>;
 
 describe('Runtime Resource protocol', () => {
   test('declares the complete ready operation surface', () => {
-    assert.deepEqual(Object.keys(RUNTIME_RESOURCE_OPERATION_SPECS), [
-      'runtime.resource.query',
-      'runtime.resource.controller.acquire',
-      'runtime.resource.controller.control',
-      'runtime.resource.controller.release',
-      'runtime.resource.stop',
-    ]);
     assert.equal(RUNTIME_RESOURCE_OPERATION_SPECS['runtime.resource.query'].mode, 'query');
     for (const [key, spec] of Object.entries(RUNTIME_RESOURCE_OPERATION_SPECS)) {
       assert.equal(spec.availability, 'ready', key);
diff --git a/packages/runtime-host/src/__tests__/skill-catalog-protocol.test.ts b/packages/runtime-host/src/__tests__/skill-catalog-protocol.test.ts
index 8b8609dd64..7049024b3c 100644
--- a/packages/runtime-host/src/__tests__/skill-catalog-protocol.test.ts
+++ b/packages/runtime-host/src/__tests__/skill-catalog-protocol.test.ts
@@ -57,11 +57,6 @@ export type SkillCatalogManagedUpdateMutationTypeContract = [
 
 describe('Runtime Host Skill catalog protocol', () => {
   test('declares only the three frozen ready operations and their error sets', () => {
-    assert.deepEqual(Object.keys(SKILL_CATALOG_OPERATION_SPECS).sort(), [
-      'skill.catalog.mutate',
-      'skill.catalog.preview-update',
-      'skill.catalog.query',
-    ]);
     const queryErrors = [
       'host_not_ready',
       'host_draining',
diff --git a/packages/runtime-host/src/__tests__/usage-pricing-protocol.test.ts b/packages/runtime-host/src/__tests__/usage-pricing-protocol.test.ts
index a024fc482d..90bd1cdbd5 100644
--- a/packages/runtime-host/src/__tests__/usage-pricing-protocol.test.ts
+++ b/packages/runtime-host/src/__tests__/usage-pricing-protocol.test.ts
@@ -46,12 +46,6 @@ const CONNECTION_CONTEXT: ConnectionContext = {
 
 describe('Usage/Pricing protocol', () => {
   test('registers only the closed ready operations with current Kernel metadata', () => {
-    assert.deepEqual(
-      Object.keys(HOST_OPERATION_SPECS).filter(
-        (key) => key.startsWith('usage.') || key.startsWith('pricing.'),
-      ),
-      ['usage.query', 'pricing.query', 'pricing.mutate'],
-    );
     assert.deepEqual(operationMetadata('usage.query'), {
       mode: 'query',
       availability: 'ready',
diff --git a/packages/runtime/src/__tests__/ai-sdk-backend.test.ts b/packages/runtime/src/__tests__/ai-sdk-backend.test.ts
index 2a4000005a..907949a02f 100644
--- a/packages/runtime/src/__tests__/ai-sdk-backend.test.ts
+++ b/packages/runtime/src/__tests__/ai-sdk-backend.test.ts
@@ -3943,8 +3943,6 @@ describe('AiSdkBackend model history', () => {
     const arm = await projectReplayPromptChars(true);
     const baselineTokens = Math.ceil(baseline.length / CHARS_PER_TOKEN);
     const armTokens = Math.ceil(arm.length / CHARS_PER_TOKEN);
-    const savedTokens = baselineTokens - armTokens;
-    const savedPct = (savedTokens / baselineTokens) * 100;
 
     // Ground-truth: baseline hydrates the raw payload; the arm swaps in the block.
     assert.ok(
@@ -3958,11 +3956,6 @@ describe('AiSdkBackend model history', () => {
       'arm must not hydrate the raw payload',
     );
     assert.ok(armTokens < baselineTokens, 'synthesis cache must reduce replay tokens');
-    assert.ok(savedPct > 40, `expected >40% replay-token saving, got ${savedPct.toFixed(1)}%`);
-
-    console.log(
-      `[synthesis-cache A/B] replay prompt tokens (charsPerToken=${CHARS_PER_TOKEN}): baseline=${baselineTokens} arm=${armTokens} saved=${savedTokens} (${savedPct.toFixed(1)}%)`,
-    );
   });
 
   test('loads synthesis blocks before archive retrieval', async () => {
diff --git a/packages/runtime/src/__tests__/computer-use-list-apps.test.ts b/packages/runtime/src/__tests__/computer-use-list-apps.test.ts
index bcfdebdd8e..b9d316f6d3 100644
--- a/packages/runtime/src/__tests__/computer-use-list-apps.test.ts
+++ b/packages/runtime/src/__tests__/computer-use-list-apps.test.ts
@@ -100,12 +100,3 @@ test('nothing matched says what there is, so the next call is not the whole list
     'com.apple.calculator',
   ]);
 });
-
-test('a filtered list is a fraction of the size of the whole one', async () => {
-  const whole = await listApps();
-  const one = await listApps('文本编辑');
-  assert.ok(
-    (one.modelText ?? '').length < (whole.modelText ?? '').length,
-    'filtering must not cost more than not filtering',
-  );
-});
diff --git a/packages/runtime/src/__tests__/computer-use-model-loop.test.ts b/packages/runtime/src/__tests__/computer-use-model-loop.test.ts
index 645c58abe5..003d57f5f6 100644
--- a/packages/runtime/src/__tests__/computer-use-model-loop.test.ts
+++ b/packages/runtime/src/__tests__/computer-use-model-loop.test.ts
@@ -74,13 +74,6 @@ describe('AiSdkBackend Computer Use model loop', () => {
 
       const serialized = JSON.stringify(declaredTools);
       assert.match(serialized, /maka_computer/);
-      assert.match(serialized, /Prefer click_element or set_value/);
-      assert.match(
-        serialized,
-        /shipping maka-cu host keeps compatibility key and coordinate dispatch disabled/i,
-      );
-      assert.match(serialized, /zoom also have no maka\.cu\/2 execution path/i);
-      assert.doesNotMatch(serialized, /wait, zoom, or another observation/i);
     }
   });
 
@@ -182,11 +175,6 @@ describe('AiSdkBackend Computer Use model loop', () => {
     );
     assert.match(JSON.stringify(modelPrompts[2]), /CUA Lab Set Value Field/);
     assert.match(JSON.stringify(modelPrompts[3]), /model-written/);
-    assert.match(
-      JSON.stringify(modelTools[0]),
-      /shipping maka-cu host keeps compatibility key and coordinate dispatch disabled/i,
-    );
-    assert.match(JSON.stringify(modelTools[0]), /Prefer click_element or set_value/);
     assert.equal(
       (modelTools[0] as Array<{ name?: string }>).some((tool) => tool.name === 'maka_computer'),
       true,
diff --git a/packages/runtime/src/__tests__/computer-use-observation-text.test.ts b/packages/runtime/src/__tests__/computer-use-observation-text.test.ts
index 3ad19bcd7e..e282e5f917 100644
--- a/packages/runtime/src/__tests__/computer-use-observation-text.test.ts
+++ b/packages/runtime/src/__tests__/computer-use-observation-text.test.ts
@@ -345,28 +345,6 @@ test('a subrole is written only where it says something the role does not', () =
 // instead. What must stay true is that the option changes nothing until it is
 // asked to.
 
-test('rendering with no options is byte-for-byte the shipped rendering', () => {
-  const sample = observation([
-    { elementId: '0', role: 'AXWindow', label: '文稿', actions: ['raise'] },
-    { elementId: '1', role: 'AXGroup', parentElementId: '0' },
-    { elementId: '2', role: 'AXGroup', parentElementId: '1' },
-    { elementId: '3', role: 'AXButton', label: '存储', parentElementId: '2' },
-    { elementId: '4', role: 'AXButton', label: '取消', parentElementId: '2' },
-    { elementId: '5', role: 'AXTextField', subrole: 'AXSecureTextField', parentElementId: '0' },
-    { elementId: '6', role: 'AXMenuBar', parentElementId: undefined },
-    { elementId: '7', role: 'AXMenuBarItem', label: '文件', parentElementId: '6' },
-    { elementId: '8', role: 'AXMenu', parentElementId: '7' },
-    { elementId: '9', role: 'AXMenuItem', label: '打开…', parentElementId: '8' },
-    { elementId: '10', role: 'AXMenuItem', enabled: false, parentElementId: '8' },
-  ]);
-  assert.equal(renderObservationText(sample), renderObservationForModel(sample));
-  assert.equal(renderObservationText(sample, {}), renderObservationForModel(sample));
-  assert.equal(
-    renderObservationText({ ...sample, query: '存储' }),
-    renderObservationForModel({ ...sample, query: '存储' }),
-  );
-});
-
 test('collapsing a wrapper is not the same thing as dropping one', () => {
   // The relaxed form the evaluator measures lifts one clause and only one: a
   // container may hold several children. It still may not carry a name, a
diff --git a/packages/runtime/src/__tests__/goal-tools.test.ts b/packages/runtime/src/__tests__/goal-tools.test.ts
index 064143937c..12d3395b3a 100644
--- a/packages/runtime/src/__tests__/goal-tools.test.ts
+++ b/packages/runtime/src/__tests__/goal-tools.test.ts
@@ -118,19 +118,6 @@ describe('goal tools', () => {
     assert.equal(mgr.get(SESSION)?.status, 'active');
   });
 
-  test('GoalPause with no goal', async () => {
-    const { tools } = makeTools();
-    const out = (await findTool(tools, GOAL_PAUSE_TOOL_NAME).impl({}, ctx())) as string;
-    assert.ok(out.includes('No active goal'));
-  });
-
-  test('GoalResume with no paused goal', async () => {
-    const { tools } = makeTools();
-    await findTool(tools, GOAL_SET_TOOL_NAME).impl({ condition: 'x' }, ctx());
-    const out = (await findTool(tools, GOAL_RESUME_TOOL_NAME).impl({}, ctx())) as string;
-    assert.ok(out.includes('No paused goal'));
-  });
-
   test('GoalClear', async () => {
     const { mgr, tools } = makeTools();
     await findTool(tools, GOAL_SET_TOOL_NAME).impl({ condition: 'x' }, ctx());
@@ -167,10 +154,4 @@ describe('goal tools', () => {
     assert.ok(out.includes('No-progress streak: 0/8'));
     assert.ok(out.includes('Tokens: 1500/5000'));
   });
-
-  test('GoalStatus with no goal', async () => {
-    const { tools } = makeTools();
-    const out = (await findTool(tools, GOAL_STATUS_TOOL_NAME).impl({}, ctx())) as string;
-    assert.ok(out.includes('No goal set'));
-  });
 });
diff --git a/packages/runtime/src/__tests__/model-factory-thinking.test.ts b/packages/runtime/src/__tests__/model-factory-thinking.test.ts
index 993bb83999..3f1267a374 100644
--- a/packages/runtime/src/__tests__/model-factory-thinking.test.ts
+++ b/packages/runtime/src/__tests__/model-factory-thinking.test.ts
@@ -17,10 +17,7 @@ function conn(providerType: LlmConnection['providerType'], slug = 'test'): LlmCo
 }
 
 describe('buildProviderOptions: thinking level', () => {
-  test('only native Anthropic enables automatic prompt caching', () => {
-    assert.deepEqual(buildProviderOptions(conn('anthropic'), 'claude-opus-4-8'), {
-      anthropic: { cacheControl: { type: 'ephemeral' } },
-    });
+  test('Anthropic-compatible providers do not inherit automatic prompt caching', () => {
     for (const providerType of [
       'claude-subscription',
       'MiniMax',
@@ -36,25 +33,6 @@ describe('buildProviderOptions: thinking level', () => {
     }
   });
 
-  test('Volcengine Agent Plan keeps Responses stateless while preserving reasoning replay', () => {
-    const expectedOptions = {
-      openai: {
-        store: false,
-        forceReasoning: true,
-      },
-    };
-    assert.deepEqual(
-      buildProviderOptions(conn('volcengine-agent-plan'), 'ark-code-latest'),
-      expectedOptions,
-    );
-    assert.deepEqual(thinkingVariantsForModel('volcengine-agent-plan', 'ark-code-latest'), []);
-    assert.deepEqual(thinkingVariantsForModel('volcengine-agent-plan', 'kimi-k3'), []);
-    assert.deepEqual(
-      buildProviderOptions(conn('volcengine-agent-plan'), 'kimi-k3', 'high'),
-      expectedOptions,
-    );
-  });
-
   test('anthropic effort model (opus-4-8) sends effort field directly; no budgetTokens mapping', () => {
     assert.deepEqual(buildProviderOptions(conn('anthropic'), 'claude-opus-4-8', 'high'), {
       anthropic: { cacheControl: { type: 'ephemeral' }, effort: 'high' },
@@ -293,40 +271,6 @@ describe('buildProviderOptions: thinking level', () => {
     });
   });
 
-  test('xAI Grok 4.5 requests encrypted Responses reasoning under the native OpenAI namespace', () => {
-    for (const providerType of ['xai', 'xai-oauth'] as const) {
-      assert.deepEqual(
-        [...thinkingVariantsForModel(providerType, 'grok-4.5')],
-        ['low', 'medium', 'high'],
-      );
-      assert.deepEqual(buildProviderOptions(conn(providerType), 'grok-4.5'), {
-        openai: {
-          store: false,
-          forceReasoning: true,
-          reasoningSummary: null,
-          include: ['reasoning.encrypted_content'],
-        },
-      });
-      assert.deepEqual(buildProviderOptions(conn(providerType), 'grok-4.5', 'high'), {
-        openai: {
-          store: false,
-          forceReasoning: true,
-          reasoningSummary: null,
-          include: ['reasoning.encrypted_content'],
-          reasoningEffort: 'high',
-        },
-      });
-      assert.deepEqual(buildProviderOptions(conn(providerType), 'grok-4.5', 'off'), {
-        openai: {
-          store: false,
-          forceReasoning: true,
-          reasoningSummary: null,
-          include: ['reasoning.encrypted_content'],
-        },
-      });
-    }
-  });
-
   test('Cloudflare Workers AI sends Kimi K2.6 reasoning effort and its real thinking-off wire', () => {
     const modelId = '@cf/moonshotai/kimi-k2.6';
     assert.deepEqual(
@@ -506,17 +450,6 @@ describe('getAIModel: models.dev registry providers', () => {
     );
   });
 
-  test('routes SiliconFlow through the shared OpenAI-compatible adapter without rewriting model ids', () => {
-    const model = getAIModel({
-      connection: conn('siliconflow'),
-      apiKey: 'sf-test-key',
-      modelId: 'moonshotai/Kimi-K2.6',
-    });
-
-    assert.equal(model.provider, 'siliconflow.chat');
-    assert.equal(model.modelId, 'moonshotai/Kimi-K2.6');
-  });
-
   test('routes OpenCode Zen and Go models through their registry-owned protocol overrides', () => {
     const cases = [
       ['opencode', 'gpt-5.5', 'openai.responses'],
diff --git a/packages/ui/src/__tests__/browser-warmup-scheduler.test.ts b/packages/ui/src/__tests__/browser-warmup-scheduler.test.ts
deleted file mode 100644
index 0fb9e75a59..0000000000
--- a/packages/ui/src/__tests__/browser-warmup-scheduler.test.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { afterEach, describe, it } from 'node:test';
-import { createBrowserWarmupScheduler } from '../turn-size-warmup.js';
-
-describe('createBrowserWarmupScheduler', () => {
-  const original = {
-    requestAnimationFrame: globalThis.requestAnimationFrame,
-    cancelAnimationFrame: globalThis.cancelAnimationFrame,
-    requestIdleCallback: globalThis.requestIdleCallback,
-    cancelIdleCallback: globalThis.cancelIdleCallback,
-  };
-
-  afterEach(() => {
-    globalThis.requestAnimationFrame = original.requestAnimationFrame;
-    globalThis.cancelAnimationFrame = original.cancelAnimationFrame;
-    globalThis.requestIdleCallback = original.requestIdleCallback;
-    globalThis.cancelIdleCallback = original.cancelIdleCallback;
-  });
-
-  it('passes a positive idle deadline so busy main threads still advance fill/warmup', () => {
-    const idleOpts: IdleRequestOptions[] = [];
-    globalThis.requestAnimationFrame = ((cb: FrameRequestCallback) => {
-      void cb;
-      return 1;
-    }) as typeof requestAnimationFrame;
-    globalThis.cancelAnimationFrame = (() => {}) as typeof cancelAnimationFrame;
-    globalThis.requestIdleCallback = ((cb: IdleRequestCallback, options?: IdleRequestOptions) => {
-      void cb;
-      idleOpts.push(options ?? {});
-      return 7;
-    }) as typeof requestIdleCallback;
-    globalThis.cancelIdleCallback = (() => {}) as typeof cancelIdleCallback;
-
-    const scheduler = createBrowserWarmupScheduler();
-    assert.ok(scheduler, 'expected a browser scheduler when rAF exists');
-    scheduler.requestIdle(() => {});
-
-    assert.equal(idleOpts.length, 1);
-    const timeout = idleOpts[0]?.timeout;
-    assert.equal(typeof timeout, 'number');
-    assert.ok(Number.isFinite(timeout));
-    assert.ok((timeout as number) > 0);
-  });
-
-  it('returns undefined when requestAnimationFrame is unavailable', () => {
-    // @ts-expect-error intentional absence for the SSR/no-window branch
-    delete globalThis.requestAnimationFrame;
-    assert.equal(createBrowserWarmupScheduler(), undefined);
-  });
-});
diff --git a/packages/ui/src/__tests__/chat-primitives.test.ts b/packages/ui/src/__tests__/chat-primitives.test.ts
deleted file mode 100644
index 81ee239015..0000000000
--- a/packages/ui/src/__tests__/chat-primitives.test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { Marker } from '../primitives/chat.js';
-
-test('Marker keeps its own data-slot/data-variant but forwards the styling data-* hooks', () => {
-  const el = Marker({
-    variant: 'footer-action',
-    as: 'span',
-    'data-slot': 'spoofed',
-    'data-variant': 'aborted',
-    // The literalized `data-[kind=…]:` variants read this off the element, so it
-    // must flow through unchanged.
-    'data-kind': 'model',
-  } as never);
-  const props = el.props as Record<string, unknown>;
-  assert.equal(el.type, 'span');
-  assert.equal(props['data-slot'], 'marker');
-  assert.equal(props['data-variant'], 'footer-action');
-  assert.equal(props['data-kind'], 'model');
-});
diff --git a/packages/ui/src/__tests__/chat-surface-layout.test.tsx b/packages/ui/src/__tests__/chat-surface-layout.test.tsx
deleted file mode 100644
index 31dcbc9cb6..0000000000
--- a/packages/ui/src/__tests__/chat-surface-layout.test.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import { renderToStaticMarkup } from 'react-dom/server';
-import { ChatSurfaceLayout } from '../chat-surface-layout.js';
-
-describe('ChatSurfaceLayout', () => {
-  it('uses one Astryx layout as the chat scroll and composer owner', () => {
-    const markup = renderToStaticMarkup(
-      <ChatSurfaceLayout composer={<div data-composer>Composer</div>}>
-        <div data-transcript>Transcript</div>
-      </ChatSurfaceLayout>,
-    );
-
-    assert.match(markup, /class="[^"]*astryx-chat-layout[^"]*"/);
-    assert.equal(markup.match(/data-chat-scroll-container="true"/g)?.length, 1);
-    assert.match(markup, /data-transcript="true"/);
-    assert.match(markup, /data-composer="true"/);
-  });
-
-  it('docks the composer at Astryx balanced density', () => {
-    // The tier is the product decision; the px it resolves to is Astryx's.
-    // Asserting the tier here leaves the E2E free to measure only what the
-    // cascade decides — that the gutter is positive and height-invariant —
-    // instead of pinning a spacing token this package does not own.
-    const markup = renderToStaticMarkup(
-      <ChatSurfaceLayout composer={<div data-composer>Composer</div>}>
-        <div>Transcript</div>
-      </ChatSurfaceLayout>,
-    );
-
-    assert.match(markup, /data-density="balanced"/);
-  });
-
-  it('keeps the composer mounted when the chat surface is hidden', () => {
-    const markup = renderToStaticMarkup(
-      <ChatSurfaceLayout hidden composer={<div data-composer>Draft survives navigation</div>}>
-        <div>Transcript</div>
-      </ChatSurfaceLayout>,
-    );
-
-    assert.match(markup, /hidden=""/);
-    assert.match(markup, /data-composer="true"/);
-    assert.match(markup, /Draft survives navigation/);
-  });
-});
diff --git a/packages/ui/src/__tests__/chat-view-progressive-mount.test.tsx b/packages/ui/src/__tests__/chat-view-progressive-mount.test.tsx
deleted file mode 100644
index de0c0bb0fd..0000000000
--- a/packages/ui/src/__tests__/chat-view-progressive-mount.test.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import type { ComponentProps } from 'react';
-import { renderToStaticMarkup } from 'react-dom/server';
-import type { StoredMessage } from '@maka/core';
-import { ChatSurfaceLayout } from '../chat-surface-layout.js';
-import { LocaleProvider } from '../locale-context.js';
-import { ChatView } from '../chat-view.js';
-import { DEFAULT_MOUNT_WINDOW } from '../progressive-turn-mount.js';
-
-const activeSession = {
-  id: 'session-1',
-  name: 'Test',
-  isFlagged: false,
-  isArchived: false,
-  labels: [],
-  hasUnread: false,
-  status: 'done' as const,
-  backend: 'fake' as const,
-  llmConnectionSlug: 'fake',
-  connectionLocked: false,
-  model: 'fake',
-  permissionMode: 'ask' as const,
-};
-
-function OwnedChatView(props: ComponentProps<typeof ChatView>) {
-  return (
-    <LocaleProvider locale="en">
-      <ChatSurfaceLayout composer={null}>
-        <ChatView {...props} />
-      </ChatSurfaceLayout>
-    </LocaleProvider>
-  );
-}
-
-function transcriptOf(turnCount: number): StoredMessage[] {
-  return Array.from({ length: turnCount }, (_ignored, index): StoredMessage => ({
-    type: 'user',
-    id: `user-${index}`,
-    turnId: `turn-${index}`,
-    ts: index + 1,
-    text: `prompt ${index}`,
-  }));
-}
-
-function mountedTurnIds(markup: string): string[] {
-  return [...markup.matchAll(/data-turn-id="(turn-\d+)"/g)].map((match) => match[1]!);
-}
-
-// #2052: the first commit after opening a long session renders only the tail
-// window; the idle fill that completes the transcript is behavior of the
-// client runtime and is covered by the pure window tests.
-describe('ChatView progressive mount', () => {
-  it('renders only the tail window of a long transcript in the first commit', () => {
-    const markup = renderToStaticMarkup(
-      <OwnedChatView messages={transcriptOf(30)} activeSession={activeSession} onNew={() => undefined} />,
-    );
-    const mounted = mountedTurnIds(markup);
-    assert.equal(mounted.length, DEFAULT_MOUNT_WINDOW.initialWindow);
-    assert.equal(mounted[0], `turn-${30 - DEFAULT_MOUNT_WINDOW.initialWindow}`);
-    assert.equal(mounted[mounted.length - 1], 'turn-29');
-  });
-
-  it('renders a short transcript completely', () => {
-    const markup = renderToStaticMarkup(
-      <OwnedChatView messages={transcriptOf(4)} activeSession={activeSession} onNew={() => undefined} />,
-    );
-    assert.deepEqual(mountedTurnIds(markup), ['turn-0', 'turn-1', 'turn-2', 'turn-3']);
-  });
-
-  it('keeps one prompt rail tick per turn while the transcript is windowed', () => {
-    const markup = renderToStaticMarkup(
-      <OwnedChatView messages={transcriptOf(30)} activeSession={activeSession} onNew={() => undefined} />,
-    );
-    const railTicks = markup.match(/maka-prompt-rail-tick/g) ?? [];
-    assert.ok(railTicks.length >= 30, `expected 30 rail ticks, saw ${railTicks.length}`);
-  });
-});
diff --git a/packages/ui/src/__tests__/computer-action-label.test.ts b/packages/ui/src/__tests__/computer-action-label.test.ts
index 0fb346b753..f59056a594 100644
--- a/packages/ui/src/__tests__/computer-action-label.test.ts
+++ b/packages/ui/src/__tests__/computer-action-label.test.ts
@@ -176,33 +176,6 @@ describe('computer action label', () => {
     assert.equal(computerActionLabel(computerCall({}, { args: undefined }), 'zh'), '操作电脑');
   });
 
-  it('localizes every derived label', () => {
-    assert.equal(label({ action: 'list_apps' }, 'en'), 'List open apps');
-    assert.equal(label({ action: 'observe', app: 'Calculator' }, 'en'), 'Observe the “Calculator” window');
-    assert.equal(label({ action: 'observe', window_id: 42 }, 'en'), 'Observe window 42');
-    assert.equal(label({ action: 'click_element', element_id: 'e12' }, 'en'), 'Click element e12');
-    assert.equal(label({ action: 'set_value', element_id: 'e12', value: 'hello' }, 'en'), 'Set the value of element e12');
-    assert.equal(label({ action: 'press_key', text: 'Return' }, 'en'), 'Press a key');
-    assert.equal(label({ action: 'wait', duration: 2 }, 'en'), 'Wait');
-    assert.equal(label({ action: 'teleport' }, 'en'), 'Use the computer');
-  });
-
-  /** A long app name is bounded so a row cannot become a paragraph. */
-  it('bounds an app name to one row', () => {
-    const long = label({ action: 'observe', app: 'Very Long Application Name '.repeat(8) });
-    assert.ok((long ?? '').length < 60, `expected a capped label, got ${long?.length} chars`);
-    assert.match(long ?? '', /…」窗口$/);
-  });
-
-  it('leaves other tools alone', () => {
-    assert.equal(
-      computerActionLabel(
-        { toolUseId: 't', toolName: 'Bash', status: 'completed', args: { action: 'observe' } },
-        'zh',
-      ),
-      undefined,
-    );
-  });
 
   /**
    * A declared `intent` and a derived label are no longer competing for one
@@ -260,55 +233,4 @@ describe('computer action label', () => {
     ];
     assert.equal(new Set(labels).size, 2, 'two different actions must read differently');
   });
-
-  // Upstream retired the second row renderer: every status now goes through
-  // Astryx. That makes the label a single implementation rather than two, but
-  // it does not make these statuses free — an in-flight call, an interrupted
-  // one and a sandbox-blocked one each take a different branch to the row, and
-  // a label lost on any of them is a row that says nothing.
-  it('names the action whatever status the row is in', () => {
-    const variants: Partial<ToolActivityItem>[] = [
-      { status: 'pending' },
-      { status: 'running' },
-      { status: 'interrupted' },
-      {
-        status: 'errored',
-        result: {
-          kind: 'terminal',
-          cwd: '/tmp/maka',
-          cmd: 'maka_computer',
-          status: 'failed',
-          exitCode: 1,
-          output: {
-            mode: 'pipes',
-            stdout: '',
-            stderr: 'Operation not permitted\n',
-            stdoutTruncated: false,
-            stderrTruncated: false,
-            redacted: false,
-          },
-          sandboxDenial: {
-            likely: true,
-            backend: 'macos-seatbelt',
-            recovery: 'require_escalated',
-          },
-        },
-      },
-    ];
-    for (const extra of variants) {
-      const markup = renderRows([
-        computerCall({ action: 'click_element', element_id: 'e7' }, { toolUseId: 'cu-row', ...extra }),
-      ]);
-      assert.match(
-        markup,
-        /点击元素 e7/,
-        `the ${extra.status} row must say what the call did`,
-      );
-      assert.doesNotMatch(
-        markup,
-        /Maka Computer/,
-        `the ${extra.status} row must not fall back to the tool's noun`,
-      );
-    }
-  });
 });
diff --git a/packages/ui/src/__tests__/daily-review-panel.test.tsx b/packages/ui/src/__tests__/daily-review-panel.test.tsx
deleted file mode 100644
index fa334572da..0000000000
--- a/packages/ui/src/__tests__/daily-review-panel.test.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import { renderToStaticMarkup } from 'react-dom/server';
-
-import { DailyReviewPanel } from '../daily-review-panel.js';
-import { LocaleProvider } from '../locale-context.js';
-
-function renderPanel(): string {
-  return renderToStaticMarkup(
-    <LocaleProvider locale="zh">
-      <DailyReviewPanel
-        bridge={{
-          fetchDay: async () => ({
-            day: { fromMs: 0, toMs: 1 },
-            totals: { sessionCount: 0, requestCount: 0, totalTokens: 0, costUsd: 0, errorCount: 0 },
-            sessions: [],
-            topModels: [],
-            topTools: [],
-          }),
-          runOnce: async () => ({ archiveId: '1970-01-01-1d' }),
-          listArchives: async () => [],
-          getArchive: async () => {
-            throw new Error('No archive');
-          },
-        }}
-      />
-    </LocaleProvider>,
-  );
-}
-
-describe('Daily Review activity surface', () => {
-  it('offers one range-based analysis action without the retired modes', () => {
-    const markup = renderPanel();
-
-    assert.match(markup, />今日</);
-    assert.match(markup, />最近 7 天</);
-    assert.match(markup, />最近 30 天</);
-    assert.match(markup, />生成分析</);
-    assert.doesNotMatch(markup, /生成每日回顾|生成深度分析|分析模型/);
-  });
-
-  it('does not render report history or model and tool rankings on the activity route', () => {
-    const markup = renderPanel();
-
-    assert.doesNotMatch(markup, />报告</);
-    assert.doesNotMatch(markup, />模型使用</);
-    assert.doesNotMatch(markup, />工具调用</);
-  });
-});
diff --git a/packages/ui/src/__tests__/deep-research-progress.test.tsx b/packages/ui/src/__tests__/deep-research-progress.test.tsx
deleted file mode 100644
index d8c13be425..0000000000
--- a/packages/ui/src/__tests__/deep-research-progress.test.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import { renderToStaticMarkup } from 'react-dom/server';
-import type { DeepResearchClientProgress } from '@maka/core';
-import { DeepResearchEmptyHero } from '../chat-empty-hero.js';
-import { DeepResearchProgressPanel } from '../chat-view.js';
-import { getConversationCopy } from '../conversation-copy.js';
-import { LocaleProvider } from '../locale-context.js';
-
-function completedRun(): DeepResearchClientProgress {
-  return {
-    sessionId: 'session-1',
-    objective: 'Verify the progress UI.',
-    scopeLevel: 'standard',
-    status: 'completed',
-    stage: 'completed',
-    round: 2,
-    createdAt: 1,
-    updatedAt: 2,
-    artifactsCount: 0,
-    stepsCount: 1,
-    checklist: [{
-      itemId: 'project_entrypoints',
-      title: 'Map project entrypoints',
-      status: 'completed',
-    }],
-    recentInspectedRefs: [{ kind: 'symbol', locator: 'DeepResearchProgressPanel' }],
-    workerRunIds: ['worker-1'],
-    blockers: [],
-    reportSections: [
-      { key: 'conclusion', status: 'completed' },
-      { key: 'source_evidence', status: 'completed' },
-      { key: 'borrow_diverge_risk_gate', status: 'completed' },
-      { key: 'implementation_recommendations', status: 'completed' },
-      { key: 'verification', status: 'completed' },
-    ],
-    reportArtifactId: 'report-1',
-    implementationPrompt: 'Implement the approved slice.',
-  };
-}
-
-describe('DeepResearchProgressPanel', () => {
-  it('renders inspectable progress and an explicit normal-task handoff action', () => {
-    const markup = renderToStaticMarkup(
-      <DeepResearchProgressPanel run={completedRun()} onContinue={() => undefined} />,
-    );
-
-    assert.match(markup, /研究完成 · 原会话保持只读/);
-    assert.match(markup, /Map project entrypoints/);
-    assert.match(markup, /DeepResearchProgressPanel/);
-    assert.match(markup, /Workers: worker-1/);
-    assert.match(markup, /取舍与风险/);
-    assert.match(markup, /在新任务中继续实现/);
-    assert.match(markup, /不会自动发送，也不会改变原研究会话权限/);
-  });
-
-  it('does not expose the implementation action before completion', () => {
-    const run = completedRun();
-    const markup = renderToStaticMarkup(
-      <DeepResearchProgressPanel
-        run={{ ...run, status: 'active', stage: 'report_writing', implementationPrompt: undefined }}
-        onContinue={() => undefined}
-      />,
-    );
-
-    assert.doesNotMatch(markup, /在新任务中继续实现/);
-    assert.match(markup, /report_writing/);
-  });
-
-  it('renders the progress surface from the selected locale catalog', () => {
-    const markup = renderToStaticMarkup(
-      <DeepResearchProgressPanel
-        run={completedRun()}
-        copy={getConversationCopy('en').chat.deepResearchProgress}
-      />,
-    );
-
-    assert.match(markup, /Research complete · Original session remains read-only/);
-    assert.match(markup, /Tradeoffs and risks/);
-    assert.doesNotMatch(markup, /研究完成|取舍与风险/);
-  });
-});
-
-describe('DeepResearchEmptyHero', () => {
-  it('exposes each starter label and prompt as one clickable item name', () => {
-    const copy = getConversationCopy('en').deepResearchEmpty;
-    const markup = renderToStaticMarkup(
-      <LocaleProvider locale="en">
-        <DeepResearchEmptyHero onPromptSuggestion={() => undefined} />
-      </LocaleProvider>,
-    );
-
-    const buttons = markup.match(/<button\b[^>]*>[\s\S]*?<\/button>/g) ?? [];
-    for (const suggestion of copy.starters) {
-      const promptPreview = suggestion.prompt.slice(0, 60);
-      const button = buttons.find((candidate) =>
-        candidate.includes(suggestion.label) && candidate.includes(promptPreview)
-      ) ?? '';
-      assert.notEqual(button, '', `missing accessible starter for ${suggestion.label}`);
-      assert.doesNotMatch(button, /aria-label=/, 'visible label and description must own the accessible name');
-    }
-  });
-});
diff --git a/packages/ui/src/__tests__/markdown-body.test.ts b/packages/ui/src/__tests__/markdown-body.test.ts
index 415965b9b1..8f2edc6234 100644
--- a/packages/ui/src/__tests__/markdown-body.test.ts
+++ b/packages/ui/src/__tests__/markdown-body.test.ts
@@ -1,5 +1,4 @@
 import { strict as assert } from 'node:assert';
-import { createRequire } from 'node:module';
 import { createElement } from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { it } from 'node:test';
@@ -11,13 +10,9 @@ import {
   MAX_AUTOMATIC_MERMAID_TOTAL_SOURCE_LENGTH,
 } from '../markdown-body.js';
 import { MakaUriContext, Markdown } from '../markdown.js';
-import {
-  AstryxLocaleProvider,
-  astryxMessageOverrides,
-} from '../astryx-i18n.js';
+import { AstryxLocaleProvider } from '../astryx-i18n.js';
 import { LocaleProvider } from '../locale-context.js';
 import {
-  calculateMermaidFitScale,
   createMermaidConfig,
   MAX_MERMAID_EDGES,
   MAX_MERMAID_SOURCE_LENGTH,
@@ -186,150 +181,6 @@ it('keeps allowlisted images and image-like code intact', () => {
   assert.match(markup, /!\[literal\]\(file:\/\/\/Users\/example\/private\.png\)/);
 });
 
-it('renders GFM task lists as read-only Astryx checkboxes', () => {
-  const markup = renderToStaticMarkup(createElement(MarkdownBody, {
-    text: '- [x] done\n- [ ] todo',
-  }));
-
-  assert.match(markup, /<input[^>]*type="checkbox"[^>]*aria-readonly="true"[^>]*checked=""/);
-  assert.match(markup, /<input[^>]*type="checkbox"[^>]*aria-readonly="true"(?![^>]*checked)/);
-  assert.match(markup, />done</);
-  assert.match(markup, />todo</);
-});
-
-it('localizes Astryx Markdown accessibility copy in Chinese', () => {
-  const markup = renderToStaticMarkup(
-    createElement(
-      LocaleProvider,
-      {
-        locale: 'zh',
-        children: createElement(
-          AstryxLocaleProvider,
-          null,
-          createElement(MarkdownBody, {
-            text: '- [x] 完成',
-          }),
-        ),
-      },
-    ),
-  );
-
-  assert.match(markup, />任务列表</);
-  assert.match(markup, />复选框</);
-  assert.doesNotMatch(markup, />Task list</);
-  assert.doesNotMatch(markup, />Checkbox</);
-});
-
-// A dead-config guard used to sit here, banning override keys for Astryx
-// surfaces Maka supposedly never rendered. Both of its entries rotted the
-// same way: `chat` stopped being true at #1795 (ChatLayout took over the
-// transcript, and the guard then blocked the fix for the English
-// scroll-to-bottom pill), and `lightbox` was never true — chat-turn.tsx
-// reaches Lightbox through useLightbox, which a JSX-tag scan misses. A ban
-// list keyed to "what we render today" goes stale silently, so it is gone;
-// the tests below pin the surfaces we know are live instead.
-function assertChineseAstryxOverrides(keys: readonly string[]) {
-  const messages = astryxMessageOverrides('zh')?.zh ?? {};
-  for (const key of keys) {
-    // Assert presence first: this reads the override map directly (no catalog
-    // resolution), so a deleted entry yields undefined → '' — which holds no
-    // Latin letters and would satisfy the translation check on its own. (At
-    // runtime the same missing entry falls back to Astryx's shipped en
-    // catalog, i.e. English in the UI.)
-    const value = messages[key];
-    assert.ok(value, `missing override: ${key}`);
-    assert.doesNotMatch(
-      value.replace(/\{[^}]*\}/g, ''),
-      /[A-Za-z]/,
-      `untranslated: ${key}`,
-    );
-  }
-}
-
-it('localizes the Astryx chat chrome adopted in #1795', () => {
-  const messages = astryxMessageOverrides('zh')?.zh ?? {};
-  assert.equal(messages['@astryx.chatLayout.newMessages'], '跳到最新消息');
-  assert.equal(messages['@astryx.chatLayoutScrollButton.scrollToBottom'], '滚动到底部');
-  assertChineseAstryxOverrides(['@astryx.chatToolCalls.error', '@astryx.chat.status.sent']);
-});
-
-// Whole-map sweep: every override must target a key Astryx actually ships,
-// carry the same ICU arguments as the en default (a renamed placeholder
-// throws at format time), and hold no Latin outside {…} segments. The pinned
-// tests above cover specific regressions; this keeps the other ~70 entries
-// honest without naming them one by one.
-it('every zh override is a real Astryx key, translated, with matching ICU args', () => {
-  const require = createRequire(import.meta.url);
-  const catalog: Record<string, { defaultMessage: string }> = require(
-    '@astryxdesign/core/locales/en.json',
-  );
-  // Top-level ICU argument names only: inside `{count, plural, one {result}}`
-  // the `{result}` is branch text, not an argument — a naive regex would
-  // report it and flag every zh string that drops an inapplicable plural.
-  const icuArgs = (message: string) => {
-    const args = new Set<string>();
-    let depth = 0;
-    for (let i = 0; i < message.length; i++) {
-      if (message[i] === '{') {
-        if (depth === 0) {
-          const m = /^\{\s*([a-zA-Z0-9_]+)/.exec(message.slice(i));
-          if (m?.[1]) args.add(m[1]);
-        }
-        depth++;
-      } else if (message[i] === '}') {
-        depth = Math.max(0, depth - 1);
-      }
-    }
-    return args;
-  };
-  const messages = astryxMessageOverrides('zh')?.zh ?? {};
-  assert.ok(Object.keys(messages).length > 0);
-  for (const [key, value] of Object.entries(messages)) {
-    const shipped = catalog[key];
-    assert.ok(shipped, `override targets a key Astryx does not ship: ${key}`);
-    assert.ok(value, `empty override: ${key}`);
-    assert.doesNotMatch(
-      value.replace(/\{[^}]*\}/g, ''),
-      /[A-Za-z]/,
-      `untranslated: ${key} = ${value}`,
-    );
-    assert.deepEqual(
-      icuArgs(value),
-      icuArgs(shipped.defaultMessage),
-      `ICU argument mismatch for ${key}: zh "${value}" vs en "${shipped.defaultMessage}"`,
-    );
-  }
-});
-
-it('localizes the Lightbox reached via useLightbox in chat-turn', () => {
-  assertChineseAstryxOverrides([
-    '@astryx.lightbox.mediaViewer',
-    '@astryx.lightbox.close',
-    '@astryx.lightbox.previous',
-    '@astryx.lightbox.next',
-  ]);
-});
-
-it('uses the localized Astryx code block and syntax tokenizer', () => {
-  const markup = renderToStaticMarkup(
-    createElement(
-      LocaleProvider,
-      {
-        locale: 'zh',
-        children: createElement(
-          AstryxLocaleProvider,
-          null,
-          createElement(MarkdownBody, {
-            text: ['```typescript', 'const answer = 42;', '```'].join('\n'),
-          }),
-        ),
-      },
-    ),
-  );
-
-  assert.match(markup, /aria-label="复制代码"/);
-  assert.match(markup.replace(/<[^>]*>/g, ''), /const answer = 42;/);
-});
 
 it('routes settled Mermaid fences to the lazy diagram surface', () => {
   const markup = renderToStaticMarkup(
@@ -415,35 +266,6 @@ it('pins Mermaid security and complexity limits for untrusted assistant output',
   assert.equal(config.theme, 'dark');
 });
 
-it('lets fullscreen Mermaid diagrams grow beyond their inline natural size', () => {
-  const viewport = {
-    availableWidth: 1200,
-    availableHeight: 900,
-    naturalWidth: 600,
-    naturalHeight: 300,
-  };
-
-  assert.equal(calculateMermaidFitScale({ ...viewport, expanded: false }), 1);
-  assert.equal(calculateMermaidFitScale({ ...viewport, expanded: true }), 2);
-});
-
-it('keeps a single newline as a CommonMark soft break', () => {
-  const markup = renderToStaticMarkup(createElement(MarkdownBody, {
-    text: '**小节标题**\n正文内容',
-  }));
-
-  assert.doesNotMatch(markup, /<br\s*\/?>/);
-  assert.match(markup, /<\/strong>\n正文内容/);
-});
-
-it('renders an explicit CommonMark hard break as a native break', () => {
-  const markup = renderToStaticMarkup(createElement(MarkdownBody, {
-    text: '第一行  \n第二行',
-  }));
-
-  assert.match(markup, /第一行<br\s*\/?>第二行/);
-});
-
 it('keeps incomplete syntax literal after the stream settles', () => {
   const markup = renderToStaticMarkup(createElement(MarkdownBody, {
     text: 'Hello **world',
@@ -469,51 +291,3 @@ it('keeps the lazy fallback behind the streaming display cursor', () => {
 
   assert.doesNotMatch(markup, /lazy unreached tail/);
 });
-
-it('shows the complete stream immediately in deterministic fixtures', () => {
-  const documentDescriptor = Object.getOwnPropertyDescriptor(globalThis, 'document');
-  Object.defineProperty(globalThis, 'document', {
-    configurable: true,
-    value: {
-      documentElement: {
-        dataset: { makaE2eFixture: 'true' },
-      },
-    },
-  });
-
-  try {
-    const markup = renderToStaticMarkup(createElement(Markdown, {
-      text: 'deterministic fixture answer',
-      streaming: true,
-    }));
-
-    assert.match(markup, /deterministic fixture answer/);
-  } finally {
-    if (documentDescriptor) {
-      Object.defineProperty(globalThis, 'document', documentDescriptor);
-    } else {
-      Reflect.deleteProperty(globalThis, 'document');
-    }
-  }
-});
-
-it('leaves block rhythm to the caller and defaults to document spacing', () => {
-  // The transcript wants compact block spacing; the Daily Review panel, which
-  // renders through the same component, wants document spacing. Hardcoding
-  // `density="compact"` here gave the review transcript rhythm with document
-  // heading sizes — the one combination the scoping rule in
-  // styles/chat-message.css argues against.
-  //
-  // Asserting the SHAPE of the choice rather than Astryx's hashed atoms:
-  // omitting the prop must render exactly as asking for `default`, and
-  // `compact` must render differently. That survives an Astryx restyle and
-  // still fails the moment the default flips back.
-  const render = (density?: 'default' | 'compact') =>
-    renderToStaticMarkup(createElement(MarkdownBody, {
-      text: '# Title\n\nBody\n\n## Second\n\nMore',
-      density,
-    }));
-
-  assert.equal(render(), render('default'));
-  assert.notEqual(render(), render('compact'));
-});
diff --git a/packages/ui/src/__tests__/model-picker.test.ts b/packages/ui/src/__tests__/model-picker.test.ts
deleted file mode 100644
index cd7dc5c038..0000000000
--- a/packages/ui/src/__tests__/model-picker.test.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { describe, it } from 'node:test';
-import assert from 'node:assert/strict';
-import {
-  buildModelPickerOptions,
-  buildModelPickerProviderTypes,
-} from '../model-picker-internals.js';
-import type { ModelMenuGroup } from '../chat-model-helpers.js';
-
-const groups: ModelMenuGroup[] = [
-  {
-    connectionSlug: 'anthropic-team',
-    providerType: 'anthropic',
-    heading: 'Anthropic Team',
-    choices: [
-      {
-        connectionSlug: 'anthropic-team',
-        providerType: 'anthropic',
-        providerLabel: 'Anthropic',
-        model: 'claude-sonnet-4',
-        label: 'Claude Sonnet 4',
-        isDefault: true,
-        thinkingLevels: [],
-      },
-    ],
-  },
-  {
-    connectionSlug: 'openai-main',
-    providerType: 'openai',
-    heading: 'OpenAI',
-    choices: [
-      {
-        connectionSlug: 'openai-main',
-        providerType: 'openai',
-        providerLabel: 'OpenAI',
-        model: 'gpt-5',
-        label: 'GPT-5',
-        isDefault: true,
-        thinkingLevels: [],
-      },
-      {
-        connectionSlug: 'openai-main',
-        providerType: 'openai',
-        providerLabel: 'OpenAI',
-        model: 'o3-mini',
-        label: 'o3-mini',
-        isDefault: false,
-        thinkingLevels: [],
-      },
-    ],
-  },
-];
-
-describe('ModelPicker option shaping', () => {
-  it('leaves a catalog with no choices empty', () => {
-    assert.deepEqual(buildModelPickerOptions([]), []);
-  });
-
-  it('maps each provider group to public Astryx sections', () => {
-    assert.deepEqual(buildModelPickerOptions(groups), [
-      {
-        type: 'section',
-        title: 'Anthropic Team',
-        options: [
-          {
-            value: 'anthropic-team:claude-sonnet-4',
-            label: 'Claude Sonnet 4',
-          },
-        ],
-      },
-      {
-        type: 'section',
-        title: 'OpenAI',
-        options: [
-          { value: 'openai-main:gpt-5', label: 'GPT-5' },
-          { value: 'openai-main:o3-mini', label: 'o3-mini' },
-        ],
-      },
-    ]);
-  });
-
-  it('models an unknown current value as an ordinary option before the catalog', () => {
-    assert.deepEqual(
-      buildModelPickerOptions(groups, {
-        value: 'legacy:model-that-is-no-longer-listed',
-        label: 'model-that-is-no-longer-listed',
-        providerType: 'openai-compatible',
-      }),
-      [
-        {
-          value: 'legacy:model-that-is-no-longer-listed',
-          label: 'model-that-is-no-longer-listed',
-        },
-        { type: 'divider' },
-        ...buildModelPickerOptions(groups),
-      ],
-    );
-  });
-
-  it('keeps an empty-value choice as an ordinary searchable option', () => {
-    assert.deepEqual(buildModelPickerOptions([], { value: '', label: '未设置' }), [
-      { value: '', label: '未设置' },
-    ]);
-  });
-
-  it('maps provider marks by public option value without adding private Selector fields', () => {
-    assert.deepEqual(
-      [...buildModelPickerProviderTypes(groups, {
-        value: 'legacy:model',
-        label: 'Legacy model',
-        providerType: 'openai-compatible',
-      })],
-      [
-        ['legacy:model', 'openai-compatible'],
-        ['anthropic-team:claude-sonnet-4', 'anthropic'],
-        ['openai-main:gpt-5', 'openai'],
-        ['openai-main:o3-mini', 'openai'],
-      ],
-    );
-  });
-});
diff --git a/packages/ui/src/__tests__/plan-reminder-localization.test.ts b/packages/ui/src/__tests__/plan-reminder-localization.test.ts
deleted file mode 100644
index 4a32c20c97..0000000000
--- a/packages/ui/src/__tests__/plan-reminder-localization.test.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import {
-  duplicatePlanReminderTitle,
-  formatReminderCountdown,
-  planReminderFormValidation,
-  planReminderTemplateSeed,
-} from '../plan-reminder-helpers.js';
-import { getPlanReminderCopy } from '../plan-reminder-copy.js';
-
-describe('plan reminder localization', () => {
-  it('provides coherent page copy in both locales', () => {
-    assert.equal(getPlanReminderCopy('zh').page.title, '定时任务');
-    assert.equal(getPlanReminderCopy('en').page.title, 'Scheduled tasks');
-  });
-
-  it('formats validation, duplication, and countdowns with the resolved locale', () => {
-    const input = {
-      title: '',
-      parsedRunAt: Date.now() + 60_000,
-      recurrence: 'none' as const,
-      cronExpression: '',
-      delivery: { channel: 'local' as const },
-      now: Date.now(),
-    };
-    assert.deepEqual(
-      planReminderFormValidation(input, 'zh'),
-      { field: 'title', message: '填写标题后才能保存提醒。' },
-    );
-    assert.deepEqual(
-      planReminderFormValidation(input, 'en'),
-      { field: 'title', message: 'Add a title before saving this reminder.' },
-    );
-    assert.deepEqual(
-      planReminderFormValidation({
-        ...input,
-        title: 'Review',
-        recurrence: 'cron',
-        cronExpression: 'invalid',
-      }, 'en'),
-      {
-        field: 'cron',
-        message: 'Cron expressions need five fields, for example 0 9 * * 1-5.',
-      },
-    );
-    assert.deepEqual(
-      planReminderFormValidation({
-        ...input,
-        title: 'Review',
-        parsedRunAt: Number.NaN,
-      }, 'zh'),
-      { field: 'time', message: '选择有效的提醒时间。' },
-    );
-    assert.deepEqual(
-      planReminderFormValidation({
-        ...input,
-        title: 'Review',
-        parsedRunAt: input.now - 1,
-      }, 'zh'),
-      { field: 'time', message: '提醒时间必须晚于当前时间。' },
-    );
-    assert.deepEqual(
-      planReminderFormValidation({
-        ...input,
-        title: 'Review',
-        delivery: { channel: 'bot', platform: 'telegram', chatId: '' },
-      }, 'en'),
-      {
-        field: 'chatId',
-        message: 'Enter a Chat ID when delivering to a bot chat.',
-      },
-    );
-    assert.equal(duplicatePlanReminderTitle('Review', 'en'), 'Review copy');
-    assert.equal(formatReminderCountdown(120_000, 'en', 0), 'in 2 minutes');
-    assert.equal(formatReminderCountdown(120_000, 'zh', 0), '2 分钟后');
-  });
-
-  it('prefills a localized template into the existing create form seed', () => {
-    const now = new Date(2026, 6, 25, 10, 0).getTime();
-    const template = getPlanReminderCopy('zh').templates.find(({ id }) => id === 'daily-news-brief');
-
-    assert.ok(template);
-    const seed = planReminderTemplateSeed(template, now);
-    assert.match(
-      seed.runAtLocal,
-      /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/,
-      'local date-time values use the ISO minute shape',
-    );
-    const runAt = new Date(seed.runAtLocal);
-
-    assert.equal(seed.editingId, null);
-    assert.equal(seed.title, '每日新闻摘要');
-    assert.match(seed.note, /科技 \/ AI \/ Maka/);
-    assert.equal(seed.recurrence, 'cron');
-    assert.equal(seed.cronExpression, '30 9 * * *');
-    assert.equal(runAt.getHours(), 9);
-    assert.equal(runAt.getMinutes(), 30);
-    assert.ok(runAt.getTime() > now);
-  });
-});
diff --git a/packages/ui/src/__tests__/plan-reminder-presets.test.ts b/packages/ui/src/__tests__/plan-reminder-presets.test.ts
index 9a0c139f9a..50750764e3 100644
--- a/packages/ui/src/__tests__/plan-reminder-presets.test.ts
+++ b/packages/ui/src/__tests__/plan-reminder-presets.test.ts
@@ -14,8 +14,6 @@ import { planReminderPresetRunAt } from '../plan-reminder-helpers.js';
  */
 describe('plan reminder presets', () => {
   const MONDAY_10AM = new Date(2026, 7, 3, 10, 0, 0, 0).getTime(); // Mon 2026-08-03
-  const FRIDAY_10AM = new Date(2026, 7, 7, 10, 0, 0, 0).getTime(); // Fri 2026-08-07
-  const SUNDAY_10AM = new Date(2026, 7, 9, 10, 0, 0, 0).getTime(); // Sun 2026-08-09
 
   it('offsets the two relative presets from the moment asked', () => {
     assert.equal(planReminderPresetRunAt('ten-minutes', MONDAY_10AM), MONDAY_10AM + 10 * 60 * 1000);
@@ -44,29 +42,4 @@ describe('plan reminder presets', () => {
     assert.equal(at.getHours(), 9);
   });
 
-  it('reaches the coming Monday from mid-week and from Sunday', () => {
-    const fromFriday = new Date(planReminderPresetRunAt('next-monday', FRIDAY_10AM));
-    assert.equal(fromFriday.getDay(), 1);
-    assert.equal(fromFriday.getDate(), 10, 'three days on');
-
-    // Sunday is the tightest non-Monday case: one day out, and the naive
-    // `(8 - 0) % 7 = 1` happens to be right here, which is why Monday rather
-    // than Sunday is the case that actually guards the `|| 7`.
-    const fromSunday = new Date(planReminderPresetRunAt('next-monday', SUNDAY_10AM));
-    assert.equal(fromSunday.getDay(), 1);
-    assert.equal(fromSunday.getDate(), 10, 'the very next day');
-  });
-
-  it('never returns a past instant for any preset or weekday', () => {
-    const presets = ['ten-minutes', 'one-hour', 'tomorrow-morning', 'next-monday'] as const;
-    for (let day = 0; day < 7; day++) {
-      const now = new Date(2026, 7, 3 + day, 10, 0, 0, 0).getTime();
-      for (const preset of presets) {
-        assert.ok(
-          planReminderPresetRunAt(preset, now) > now,
-          `${preset} on weekday ${new Date(now).getDay()} must land in the future`,
-        );
-      }
-    }
-  });
 });
diff --git a/packages/ui/src/__tests__/processing-block.test.tsx b/packages/ui/src/__tests__/processing-block.test.tsx
deleted file mode 100644
index ae7fc8bcde..0000000000
--- a/packages/ui/src/__tests__/processing-block.test.tsx
+++ /dev/null
@@ -1,228 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import { createElement, type ReactNode } from 'react';
-import { renderToStaticMarkup as renderReactToStaticMarkup } from 'react-dom/server';
-import { LocaleProvider } from '../locale-context.js';
-import type { ToolActivityItem, TurnViewModel } from '../materialize.js';
-import { TurnView } from '../chat-turn.js';
-
-function renderToStaticMarkup(node: ReactNode): string {
-  return renderReactToStaticMarkup(createElement(LocaleProvider, {
-    locale: 'zh',
-    children: node,
-  }));
-}
-
-function renderInDeterministicFixture(node: ReactNode): string {
-  const documentDescriptor = Object.getOwnPropertyDescriptor(globalThis, 'document');
-  Object.defineProperty(globalThis, 'document', {
-    configurable: true,
-    value: {
-      documentElement: {
-        dataset: { makaE2eFixture: 'true' },
-      },
-    },
-  });
-  try {
-    return renderToStaticMarkup(node);
-  } finally {
-    if (documentDescriptor) {
-      Object.defineProperty(globalThis, 'document', documentDescriptor);
-    } else {
-      Reflect.deleteProperty(globalThis, 'document');
-    }
-  }
-}
-
-function turnWithTools(tools: ToolActivityItem[]): TurnViewModel {
-  return {
-    turnId: 'turn-1',
-    status: 'completed',
-    partialOutputRetained: false,
-    tools,
-    notes: [],
-    timeline: [
-      { kind: 'thinking', text: 'reasoning', messageId: 'a1' },
-      { kind: 'tools', items: tools },
-    ],
-    startedAt: 1,
-  };
-}
-
-describe('ProcessingBlock disclosure wiring (#1307)', () => {
-  it('does not wrap native reasoning and tool disclosures in another processing layer', () => {
-    const markup = renderToStaticMarkup(createElement(TurnView, {
-      turn: turnWithTools([
-        { toolUseId: 'r1', toolName: 'Read', activityKind: 'read', status: 'completed', args: {} },
-      ]),
-    }));
-
-    assert.doesNotMatch(markup, /data-processing="block"/);
-    assert.match(markup, /class="[^"]*astryx-chat-tool-calls[^"]*"/);
-    assert.match(markup, /深度思考/);
-  });
-
-  it('keeps an unsettled group in the same collapsed Astryx rows, without a processing wrapper', () => {
-    const markup = renderToStaticMarkup(createElement(TurnView, {
-      turn: turnWithTools([
-        { toolUseId: 'b1', toolName: 'Bash', activityKind: 'command', status: 'completed', args: {} },
-        { toolUseId: 'w1', toolName: 'Write', activityKind: 'edit', status: 'running', args: {}, intent: '写入配置' },
-      ]),
-    }));
-    assert.doesNotMatch(markup, /data-processing="block"/);
-    assert.match(markup, /class="[^"]*astryx-chat-tool-calls[^"]*"/);
-    assert.doesNotMatch(markup, /aria-expanded="true"/);
-    assert.match(markup, /写入配置/);
-  });
-});
-
-describe('deep-thinking disclosure', () => {
-  it('shows complete live reasoning immediately in deterministic fixtures', () => {
-    const markup = renderInDeterministicFixture(createElement(TurnView, {
-      turn: {
-        turnId: 'fixture-thinking-turn',
-        status: 'running',
-        partialOutputRetained: false,
-        tools: [],
-        notes: [],
-        timeline: [{
-          kind: 'thinking',
-          text: 'deterministic fixture reasoning',
-          messageId: 'fixture-thinking-1',
-          live: true,
-        }],
-        startedAt: 1,
-      },
-      liveStreaming: {},
-    }));
-
-    assert.match(markup, /deterministic fixture reasoning/);
-  });
-
-  it('renders through official Astryx ChatReasoning with its native collapsed preview', () => {
-    const markup = renderToStaticMarkup(createElement(TurnView, {
-      turn: {
-        turnId: 'thinking-turn',
-        status: 'completed',
-        partialOutputRetained: false,
-        tools: [],
-        notes: [],
-        timeline: [{ kind: 'thinking', text: 'private reasoning', messageId: 'thinking-1' }],
-        startedAt: 1,
-      },
-    }));
-
-    assert.match(markup, /class="[^"]*astryx-chat-reasoning[^"]*"/);
-    assert.match(markup, /class="maka-assistant-answer-content"/);
-    assert.match(markup, /role="button"[^>]*aria-expanded="false"/);
-    // The reasoning body carries the product wrap class so
-    // `.maka-chat-reasoning-content` in styles.css can restore pre-wrap —
-    // Astryx's own atoms declare no white-space, so without this seam the
-    // inherited `normal` collapses every newline in the thinking text.
-    assert.match(markup, /class="maka-chat-reasoning-content [^"]*"/);
-    assert.match(markup, /private reasoning/);
-    assert.doesNotMatch(markup, /data-slot="reasoning-trigger"/);
-    assert.doesNotMatch(markup, /复制思考过程/);
-    assert.doesNotMatch(markup, /data-slot="reasoning-disclosure"/);
-  });
-
-  it('draws its chevron from the same Astryx icon registry as the tool rows', () => {
-    // The ejected lab component used to hand-write its own 12-viewBox chevron,
-    // which drew a heavier stroke than the tool rows' registry glyph once
-    // chat-message.css forced both to 10x10.
-    const markup = renderToStaticMarkup(createElement(TurnView, {
-      turn: {
-        ...turnWithTools([
-          { toolUseId: 'r1', toolName: 'Read', activityKind: 'read', status: 'completed', args: {} },
-          { toolUseId: 'r2', toolName: 'Read', activityKind: 'read', status: 'completed', args: {} },
-        ]),
-        timeline: [
-          { kind: 'thinking', text: 'private reasoning', messageId: 'a1' },
-          {
-            kind: 'tools',
-            items: [
-              { toolUseId: 'r1', toolName: 'Read', activityKind: 'read', status: 'completed', args: {} },
-              { toolUseId: 'r2', toolName: 'Read', activityKind: 'read', status: 'completed', args: {} },
-            ],
-          },
-        ],
-      },
-    }));
-
-    // Compared per row, not over one filtered pool of the whole turn. A pool
-    // can only ever prove the icons it collected are alike, and the reasoning
-    // row's old hand-written chevron was not a registry icon at all — it fell
-    // out of the pool, leaving the tool rows to agree with themselves. Slicing
-    // the turn at the two row roots keeps the reasoning row inside its own
-    // assertion, so it fails whichever way the row diverges: no registry icon,
-    // a different icon name, or a different size.
-    const registryIcons = (region: string) =>
-      region.match(/<span[^>]*class="astryx-icon[^"]*"[^>]*>.*?<\/svg><\/span>/g) ?? [];
-    const toolsAt = markup.indexOf('class="astryx-chat-tool-calls');
-    const reasoningAt = markup.indexOf('class="astryx-chat-reasoning');
-    assert.ok(reasoningAt >= 0 && toolsAt > reasoningAt, 'expected a reasoning row before the tool row');
-
-    // The reasoning row's only registry icon is the chevron: its leading
-    // thinking glyph is still the ejected lab's own inline svg.
-    const reasoningIcons = registryIcons(markup.slice(reasoningAt, toolsAt));
-    assert.equal(reasoningIcons.length, 1, 'the reasoning row must draw exactly one registry icon');
-
-    // The tool row also carries per-call status icons, so name the chevron by
-    // its glyph. Both rows resolve the same registry entry, so whichever path
-    // data that entry holds, the two spans have to come out byte-identical.
-    const toolChevrons = registryIcons(markup.slice(toolsAt)).filter((icon) => icon.includes('M6 9l6 6 6-6'));
-    assert.ok(toolChevrons.length > 0, 'expected a chevron on the tool row');
-    assert.equal(reasoningIcons[0], toolChevrons[0], 'both rows must render the same chevron markup');
-    assert.match(reasoningIcons[0]!, /data-size="xsm"/);
-    assert.match(reasoningIcons[0]!, /viewBox="0 0 24 24"/);
-  });
-
-  it('places assistant actions on ChatMessageMetadata, not a product Marker footer shell', () => {
-    const markup = renderToStaticMarkup(createElement(TurnView, {
-      turn: {
-        turnId: 'footer-turn',
-        status: 'completed',
-        partialOutputRetained: false,
-        tools: [],
-        notes: [],
-        timeline: [{ kind: 'text', text: 'answer body', messageId: 'a1', ts: 1 }],
-        startedAt: 1,
-        assistant: { id: 'a1', role: 'assistant', text: 'answer body', ts: 1 },
-      },
-      footerActions: [
-        { id: 'copy', label: '复制', enabled: true },
-        { id: 'regenerate', label: '重新生成', enabled: true },
-      ],
-    }));
-
-    assert.match(markup, /astryx-chat-message-metadata|chat-message-metadata/);
-    assert.match(markup, /data-action="copy"/);
-    assert.match(markup, /data-action="regenerate"/);
-    assert.doesNotMatch(markup, /data-variant="footer"/);
-  });
-
-  it('keeps redaction and truncation product behavior outside the Astryx disclosure', () => {
-    const secret = 'sk-abcdefghijklmnopqrstuvwxyz123456';
-    const markup = renderToStaticMarkup(createElement(TurnView, {
-      turn: {
-        turnId: 'safe-thinking-turn',
-        status: 'completed',
-        partialOutputRetained: false,
-        tools: [],
-        notes: [],
-        timeline: [{
-          kind: 'thinking',
-          text: `api_key=${secret}`,
-          truncated: true,
-          messageId: 'thinking-2',
-        }],
-        startedAt: 1,
-      },
-    }));
-
-    assert.match(markup, /深度思考 · 已截断/);
-    assert.match(markup, /&lt;redacted&gt;/);
-    assert.doesNotMatch(markup, new RegExp(secret));
-    assert.doesNotMatch(markup, /data-truncated="true"/);
-  });
-});
diff --git a/packages/ui/src/__tests__/quote-ref-chip.test.ts b/packages/ui/src/__tests__/quote-ref-chip.test.ts
deleted file mode 100644
index 3daf98fdbd..0000000000
--- a/packages/ui/src/__tests__/quote-ref-chip.test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { stripQuoteHeadingMarkers } from '../quote-ref-chip.js';
-
-test('strips a leading ATX heading marker so the chip shows the title text', () => {
-  assert.equal(stripQuoteHeadingMarkers('### Description'), 'Description');
-  assert.equal(stripQuoteHeadingMarkers('## Sub section'), 'Sub section');
-  assert.equal(stripQuoteHeadingMarkers('# Top'), 'Top');
-  assert.equal(stripQuoteHeadingMarkers('###### Deep'), 'Deep');
-});
-
-test('strips the marker with one or more spaces/tabs, keeping the rest', () => {
-  assert.equal(stripQuoteHeadingMarkers('###  double space'), 'double space');
-  assert.equal(stripQuoteHeadingMarkers('###\ttabbed'), 'tabbed');
-});
-
-test('leaves non-heading text untouched', () => {
-  assert.equal(stripQuoteHeadingMarkers('plain text'), 'plain text');
-  assert.equal(stripQuoteHeadingMarkers('.analysis/issue.md ### Description'), '.analysis/issue.md ### Description');
-  assert.equal(stripQuoteHeadingMarkers('###Description'), '###Description');
-  assert.equal(stripQuoteHeadingMarkers('######x'), '######x');
-  assert.equal(stripQuoteHeadingMarkers('####### x'), '####### x');
-  assert.equal(stripQuoteHeadingMarkers('C# code'), 'C# code');
-  assert.equal(stripQuoteHeadingMarkers('#hashtag'), '#hashtag');
-  assert.equal(stripQuoteHeadingMarkers(''), '');
-});
diff --git a/packages/ui/src/__tests__/shell-controls-copy.test.ts b/packages/ui/src/__tests__/shell-controls-copy.test.ts
deleted file mode 100644
index 14438577b9..0000000000
--- a/packages/ui/src/__tests__/shell-controls-copy.test.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-
-import { getShellControlsCopy } from '../shell-controls-copy.js';
-
-describe('shared shell controls copy', () => {
-  it('provides complete navigation and search copy in both locales', () => {
-    assert.equal(getShellControlsCopy('zh').navigation.settings, '设置');
-    assert.equal(getShellControlsCopy('en').navigation.settings, 'Settings');
-    assert.equal(getShellControlsCopy('en').navigation.newTask, 'New task');
-    assert.equal(getShellControlsCopy('en').search.placeholder, 'Search conversation titles and content…');
-    assert.equal(getShellControlsCopy('en').search.results(2), '2 matches');
-  });
-});
diff --git a/packages/ui/src/__tests__/sidebar-subtraction.test.tsx b/packages/ui/src/__tests__/sidebar-subtraction.test.tsx
deleted file mode 100644
index 75c3875b0d..0000000000
--- a/packages/ui/src/__tests__/sidebar-subtraction.test.tsx
+++ /dev/null
@@ -1,277 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, it } from 'node:test';
-import { renderToStaticMarkup } from 'react-dom/server';
-import type { PlanReminder, SessionSummary } from '@maka/core';
-import { LocaleProvider } from '../locale-context.js';
-import { ModuleHubSelector } from '../module-hub-selector.js';
-import { SessionListPanel } from '../session-list-panel.js';
-import { SessionSidebarNav } from '../session-sidebar-nav.js';
-
-function renderSidebarNav(): string {
-  return renderToStaticMarkup(
-    <LocaleProvider locale="zh">
-      <SessionSidebarNav
-        selection={{ section: 'sessions', filter: 'chats' }}
-        onSelect={() => {}}
-        onNew={() => {}}
-      />
-    </LocaleProvider>,
-  );
-}
-
-describe('sidebar subtraction', () => {
-  it('keeps only the hub-level destinations in permanent navigation', () => {
-    const markup = renderSidebarNav();
-
-    assert.match(markup, />新任务</);
-    assert.match(markup, />扩展</);
-    assert.match(markup, />定时任务</);
-    assert.doesNotMatch(markup, />技能</);
-    assert.doesNotMatch(markup, />MCP</);
-    assert.doesNotMatch(markup, />每日回顾</);
-    assert.doesNotMatch(markup, /aria-expanded=/);
-  });
-
-  it('keeps pending-reminder state in the collapsed SideNavItem accessible name', () => {
-    const reminder: PlanReminder = {
-      id: 'reminder-1',
-      title: 'Review open work',
-      note: '',
-      schedule: { kind: 'once', runAt: 1 },
-      delivery: { channel: 'local' },
-      status: 'scheduled',
-      enabled: true,
-      createdAt: 1,
-      updatedAt: 1,
-      runs: [],
-      runCount: 0,
-    };
-    const markup = renderToStaticMarkup(
-      <LocaleProvider locale="en">
-        <SessionListPanel
-          collapsed
-          selection={{ section: 'automations', module: 'plan-reminders' }}
-          planReminders={[reminder]}
-          sessions={[]}
-          onSelectSession={() => {}}
-          onSelect={() => {}}
-          onOpenSettings={() => {}}
-          onNew={() => {}}
-        />
-      </LocaleProvider>,
-    );
-
-    assert.match(markup, /aria-label="Scheduled tasks, 1 unfinished reminder"/);
-    assert.doesNotMatch(markup, /maka-nav-count/);
-  });
-
-  it('pins permanent destinations in SideNav topContent outside the scroll history', () => {
-    const session: SessionSummary = {
-      id: 'session-1',
-      name: '侧栏置顶导航',
-      status: 'active',
-      isFlagged: false,
-      isArchived: false,
-      labels: [],
-      hasUnread: false,
-      lastMessageAt: 1,
-      backend: 'ai-sdk',
-      llmConnectionSlug: 'anthropic-main',
-      connectionLocked: false,
-      model: 'claude-sonnet-4-5',
-      permissionMode: 'ask',
-    };
-    const expanded = renderToStaticMarkup(
-      <LocaleProvider locale="zh">
-        <SessionListPanel
-          selection={{ section: 'sessions', filter: 'chats' }}
-          sessions={[session]}
-          onSelectSession={() => {}}
-          onSelect={() => {}}
-          onOpenSettings={() => {}}
-          onNew={() => {}}
-        />
-      </LocaleProvider>,
-    );
-    assert.match(expanded, /maka-session-panel-top/);
-    assert.ok(
-      expanded.indexOf('maka-session-panel-top') < expanded.indexOf('maka-session-list'),
-      'permanent nav top slot must precede scrollable session history',
-    );
-    assert.match(expanded, /maka-session-panel-top[\s\S]*?>新任务</);
-    assert.match(expanded, /maka-session-list[\s\S]*侧栏置顶导航/);
-
-    const collapsed = renderToStaticMarkup(
-      <LocaleProvider locale="zh">
-        <SessionListPanel
-          collapsed
-          selection={{ section: 'sessions', filter: 'chats' }}
-          sessions={[session]}
-          onSelectSession={() => {}}
-          onSelect={() => {}}
-          onOpenSettings={() => {}}
-          onNew={() => {}}
-        />
-      </LocaleProvider>,
-    );
-    assert.match(collapsed, /maka-session-panel-top/);
-    assert.doesNotMatch(collapsed, /maka-session-list/);
-    assert.doesNotMatch(collapsed, /侧栏置顶导航/);
-  });
-
-  it('renders each pair of peer modules as localized view navigation', () => {
-    const extensions = renderToStaticMarkup(
-      <LocaleProvider locale="zh">
-        <ModuleHubSelector hub="extensions" value="skills" onChange={() => {}} />
-      </LocaleProvider>,
-    );
-    const automations = renderToStaticMarkup(
-      <LocaleProvider locale="zh">
-        <ModuleHubSelector hub="automations" value="plan-reminders" onChange={() => {}} />
-      </LocaleProvider>,
-    );
-
-    assert.match(extensions, /astryx-tab-list/);
-    assert.match(extensions, /aria-label="扩展内容：技能"/);
-    assert.doesNotMatch(extensions, /role="radiogroup"/);
-    assert.match(extensions, /aria-current="page"/);
-    assert.match(extensions, />技能</);
-    assert.match(extensions, />MCP</);
-    assert.doesNotMatch(extensions, /aria-haspopup="menu"/);
-    assert.match(automations, /astryx-tab-list/);
-    assert.match(automations, /aria-label="定时任务内容：计划提醒"/);
-    assert.match(automations, />计划提醒</);
-    assert.match(automations, />每日回顾</);
-  });
-
-  it('moves session grouping from a permanent segmented control into the list heading', () => {
-    const session: SessionSummary = {
-      id: 'session-1',
-      name: '侧栏减法',
-      status: 'active',
-      isFlagged: false,
-      isArchived: false,
-      labels: [],
-      hasUnread: false,
-      lastMessageAt: 1,
-      backend: 'ai-sdk',
-      llmConnectionSlug: 'anthropic-main',
-      connectionLocked: false,
-      model: 'claude-sonnet-4-5',
-      permissionMode: 'ask',
-    };
-    const markup = renderToStaticMarkup(
-      <LocaleProvider locale="zh">
-        <SessionListPanel
-          selection={{ section: 'sessions', filter: 'chats' }}
-          sessions={[session]}
-          viewMode="conversation"
-          onViewModeChange={() => {}}
-          onSelectSession={() => {}}
-          onSelect={() => {}}
-          onOpenSettings={() => {}}
-          onNew={() => {}}
-        />
-      </LocaleProvider>,
-    );
-
-    assert.match(markup, /maka-session-heading-section/);
-    assert.match(markup, /aria-label="会话分组方式"/);
-    assert.doesNotMatch(markup, />按状态</);
-    // Both axes are on screen as an exclusive switch, not behind a menu: the
-    // group is a radiogroup and each segment names itself through aria-label,
-    // since the label is visually hidden behind the icon.
-    assert.match(markup, /role="radiogroup"[\s\S]*aria-label="按项目"/);
-    assert.doesNotMatch(markup, /role="menuitemradio"/);
-  });
-
-  it('renders persistent conversation controls without an empty-list status on extension routes', () => {
-    const markup = renderToStaticMarkup(
-      <LocaleProvider locale="zh">
-        <SessionListPanel
-          selection={{ section: 'extensions', module: 'skills' }}
-          sessions={[]}
-          viewMode="conversation"
-          onViewModeChange={() => {}}
-          onSelectSession={() => {}}
-          onSelect={() => {}}
-          onOpenSettings={() => {}}
-          onNew={() => {}}
-        />
-      </LocaleProvider>,
-    );
-
-    assert.match(markup, /maka-session-heading-section/);
-    assert.match(markup, />会话</);
-    assert.match(markup, /aria-label="会话分组方式"/);
-    assert.doesNotMatch(markup, /role="status"/);
-  });
-
-  it('labels pinned and recent as two SideNav sections in the conversation list', () => {
-    const makeSession = (
-      session: Pick<SessionSummary, 'id' | 'name' | 'status' | 'isFlagged' | 'lastMessageAt'>,
-    ): SessionSummary => ({
-      ...session,
-      isArchived: false,
-      labels: [],
-      hasUnread: false,
-      backend: 'ai-sdk',
-      llmConnectionSlug: 'anthropic-main',
-      connectionLocked: false,
-      model: 'claude-sonnet-4-5',
-      permissionMode: 'ask',
-    });
-    const sessions = [
-      makeSession({
-        id: 'recent-older',
-        name: '较早会话',
-        status: 'done',
-        isFlagged: false,
-        lastMessageAt: 100,
-      }),
-      makeSession({
-        id: 'pinned-older',
-        name: '较早置顶',
-        status: 'blocked',
-        isFlagged: true,
-        lastMessageAt: 200,
-      }),
-      makeSession({
-        id: 'recent-newer',
-        name: '最近会话',
-        status: 'active',
-        isFlagged: false,
-        lastMessageAt: 400,
-      }),
-      makeSession({
-        id: 'pinned-newer',
-        name: '最近置顶',
-        status: 'running',
-        isFlagged: true,
-        lastMessageAt: 300,
-      }),
-    ];
-    const markup = renderToStaticMarkup(
-      <LocaleProvider locale="zh">
-        <SessionListPanel
-          selection={{ section: 'sessions', filter: 'chats' }}
-          sessions={sessions}
-          viewMode="conversation"
-          onViewModeChange={() => {}}
-          onSelectSession={() => {}}
-          onSelect={() => {}}
-          onOpenSettings={() => {}}
-          onNew={() => {}}
-        />
-      </LocaleProvider>,
-    );
-
-    assert.match(markup, />置顶</);
-    assert.match(markup, />最近</);
-    assert.ok(markup.indexOf('置顶') < markup.indexOf('最近'));
-    assert.ok(markup.indexOf('最近置顶') < markup.indexOf('较早置顶'));
-    assert.ok(markup.indexOf('最近会话') < markup.indexOf('较早会话'));
-    assert.ok(markup.indexOf('最近置顶') < markup.indexOf('最近会话'));
-    assert.doesNotMatch(markup, /maka-list-group-toggle/);
-  });
-});
diff --git a/packages/ui/src/__tests__/task-ledger-panel.test.ts b/packages/ui/src/__tests__/task-ledger-panel.test.ts
index b33c0a0e56..ee276ee2ac 100644
--- a/packages/ui/src/__tests__/task-ledger-panel.test.ts
+++ b/packages/ui/src/__tests__/task-ledger-panel.test.ts
@@ -42,25 +42,6 @@ describe('task ledger panel model', () => {
   });
 });
 
-describe('task ledger disclosure', () => {
-  test('delegates the recent-task disclosure and chevron to Astryx without changing the count', () => {
-    const markup = renderToStaticMarkup(createElement(LocaleProvider, {
-      locale: 'zh',
-      children: createElement(TaskLedgerPanel, {
-        tasks: [
-          task({ id: 'active', key: 'T1', status: 'in_progress' }),
-          task({ id: 'done', key: 'T2', status: 'completed', endedAt: 2 }),
-        ],
-      }),
-    }));
-
-    assert.match(markup, /class="[^"]*astryx-collapsible[^"]*maka-task-ledger-terminal[^"]*"/);
-    const trigger = markup.match(/(<button[^>]*aria-expanded="false"[\s\S]*?<\/button>)/)?.[1] ?? '';
-    assert.match(trigger, /最近结束/);
-    assert.match(trigger, />1</);
-    assert.doesNotMatch(trigger, /lucide-chevron-down/);
-  });
-});
 
 test('task ledger exposes real parent-child groups instead of aria-level-only rows', () => {
   const markup = renderToStaticMarkup(createElement(LocaleProvider, {
diff --git a/packages/ui/src/__tests__/timeline-fold.test.ts b/packages/ui/src/__tests__/timeline-fold.test.ts
deleted file mode 100644
index 8952d1c57f..0000000000
--- a/packages/ui/src/__tests__/timeline-fold.test.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import assert from 'node:assert/strict';
-import { describe, test } from 'node:test';
-import type { ToolActivityItem, TurnTimelineItem } from '../materialize.js';
-import { foldTimeline, type FoldedTimelineEntry } from '../timeline-fold.js';
-
-function thinking(messageId: string, live?: boolean): TurnTimelineItem {
-  return { kind: 'thinking', text: `reasoning ${messageId}`, messageId, ...(live !== undefined ? { live } : {}) };
-}
-
-function text(messageId: string, body = `answer ${messageId}`): TurnTimelineItem {
-  return { kind: 'text', text: body, messageId };
-}
-
-function tool(id: string, toolName = 'Read'): ToolActivityItem {
-  return { toolUseId: id, toolName, status: 'completed', args: {} };
-}
-
-function tools(...items: ToolActivityItem[]): TurnTimelineItem {
-  return { kind: 'tools', items };
-}
-
-function kinds(entries: readonly FoldedTimelineEntry[]): string[] {
-  return entries.map((entry) => entry.kind);
-}
-
-function childKinds(entry: FoldedTimelineEntry | undefined): string[] {
-  return entry?.kind === 'processing' ? entry.children.map((child) => child.kind) : [];
-}
-
-describe('foldTimeline (#1307)', () => {
-  test('leaves a pure-thinking run bare instead of folding it', () => {
-    const folded = foldTimeline([thinking('a1')]);
-    // No tools in the run → no processing block; the 深度思考 disclosure
-    // renders the reasoning directly.
-    assert.deepEqual(kinds(folded), ['thinking']);
-  });
-
-  test('folds a pure-tools run into one processing block', () => {
-    const folded = foldTimeline([tools(tool('c1'))]);
-    assert.deepEqual(kinds(folded), ['processing']);
-    assert.deepEqual(childKinds(folded[0]), ['tools']);
-  });
-
-  test('keeps interleaved thinking + tools inside one block, in order', () => {
-    const folded = foldTimeline([thinking('a1'), tools(tool('c1'))]);
-    assert.deepEqual(kinds(folded), ['processing']);
-    assert.deepEqual(childKinds(folded[0]), ['thinking', 'tools']);
-  });
-
-  test('answer text is a boundary: runs around each text fold independently', () => {
-    const folded = foldTimeline([
-      thinking('a1'),
-      text('a1', 'step one'),
-      tools(tool('c1')),
-      thinking('a2'),
-      text('a2', 'step two'),
-      tools(tool('c2')),
-    ]);
-    // thinking (pure run stays bare), text, processing[tools, thinking],
-    // text, processing[tools]
-    assert.deepEqual(kinds(folded), ['thinking', 'text', 'processing', 'text', 'processing']);
-    assert.deepEqual(childKinds(folded[2]), ['tools', 'thinking']);
-    assert.deepEqual(childKinds(folded[4]), ['tools']);
-    assert.equal((folded[1] as { text: string }).text, 'step one');
-    assert.equal((folded[3] as { text: string }).text, 'step two');
-  });
-
-  test('block ids derive from the preceding text and are stable across tool projection', () => {
-    const before = foldTimeline([
-      text('a1'),
-      thinking('a2'),
-      tools(tool('c1'), tool('c2')),
-    ]);
-    // Shell-run folding can project the FIRST tool out of the group; the block
-    // id must not change (a first-child-derived key would remount the
-    // disclosure and drop a manual open/close).
-    const after = foldTimeline([
-      text('a1'),
-      thinking('a2'),
-      tools(tool('c2')),
-    ]);
-    assert.equal(before[1]?.kind, 'processing');
-    assert.equal(after[1]?.kind, 'processing');
-    assert.equal(
-      before[1]?.kind === 'processing' ? before[1].id : undefined,
-      after[1]?.kind === 'processing' ? after[1].id : undefined,
-    );
-    assert.equal(before[1]?.kind === 'processing' ? before[1].id : undefined, 'a1');
-  });
-
-  test('a block that opens the turn uses the stable "start" id', () => {
-    const folded = foldTimeline([tools(tool('c1')), text('a1')]);
-    assert.equal(folded[0]?.kind === 'processing' ? folded[0].id : undefined, 'start');
-  });
-});
diff --git a/packages/ui/src/__tests__/tool-activity-presentation.test.ts b/packages/ui/src/__tests__/tool-activity-presentation.test.ts
index d677ad6466..60f4597370 100644
--- a/packages/ui/src/__tests__/tool-activity-presentation.test.ts
+++ b/packages/ui/src/__tests__/tool-activity-presentation.test.ts
@@ -465,140 +465,6 @@ describe('tool activity presentation', () => {
     assert.doesNotMatch(markup, /astryx-codeblock/);
   });
 
-  // The marker used to sit inline at the head of the line's text: it ate the
-  // first column, so an addition's indentation stopped lining up with the
-  // context around it, and it was flush against the code — `+# Tool result
-  // diffs` reads as one token. It is a column of its own now.
-  it('gives the +/- marker its own column so the code keeps its indentation', () => {
-    const markup = renderToStaticMarkup(createElement(ToolResultPreview, {
-      content: {
-        kind: 'file_diff',
-        paths: ['x.md'],
-        diff: ['@@ -1,2 +1,2 @@', '   kept', '-# old', '+# new'].join('\n'),
-      },
-    }));
-
-    assert.deepEqual(diffMarkers(markup), ['', '-', '+']);
-    // Two spaces of source indentation on the context line, and neither
-    // changed line carries its sign into the code.
-    assert.deepEqual(diffCodeText(markup), ['  kept', '# old', '# new']);
-  });
-
-  // Every line painted one flat colour before this: Astryx's CodeBlock
-  // highlights a whole buffer in one language, and a diff is neither. The
-  // tokenizer underneath it is line-local, which is what a diff can use.
-  it('colours the code beside the marker in the language the path names', () => {
-    const markup = renderToStaticMarkup(createElement(ToolResultPreview, {
-      content: {
-        kind: 'file_diff',
-        paths: ['x.ts'],
-        diff: ['@@ -1,2 +1,2 @@', ' const kept = 1;', '-const removed = 2;', '+const added = 3;'].join('\n'),
-      },
-    }));
-
-    // Keywords, numbers and the identifiers between them are separate spans —
-    // the whole point is that a line is no longer one colour.
-    assert.match(markup, /class="astryx-token-keyword">const</);
-    assert.match(markup, /class="astryx-token-number">3</);
-    // Splitting into spans must not add or drop a character of source.
-    assert.deepEqual(diffCodeText(markup), ['const kept = 1;', 'const removed = 2;', 'const added = 3;']);
-  });
-
-  // The rows are tokenized as one joined buffer, and the JS block-comment
-  // pattern (`/\*[\s\S]*?\*\/`) matches across newlines — so a row that opens
-  // `/*` returns a token reaching into the rows below it. The row's own text
-  // has to survive that intact; a colour is the only thing allowed to be lost.
-  it('keeps a row text intact when a token runs past the end of its line', () => {
-    const markup = renderToStaticMarkup(createElement(ToolResultPreview, {
-      content: {
-        kind: 'file_diff',
-        paths: ['x.ts'],
-        diff: ['@@ -1,3 +1,3 @@', '+/* opened here', ' const kept = 1;', '+*/'].join('\n'),
-      },
-    }));
-
-    assert.deepEqual(diffCodeText(markup), ['/* opened here', 'const kept = 1;', '*/']);
-  });
-
-  // A wrong colouring is worse than none: an extension the tokenizer does not
-  // know, and a diff whose paths disagree, both render plain.
-  it('leaves a diff plain when the language is unknown or ambiguous', () => {
-    const diff = ['@@ -1,1 +1,1 @@', '-const removed = 2;', '+const added = 3;'].join('\n');
-    const unknown = renderToStaticMarkup(createElement(ToolResultPreview, {
-      content: { kind: 'file_diff', paths: ['notes.rst'], diff },
-    }));
-    const ambiguous = renderToStaticMarkup(createElement(ToolResultPreview, {
-      content: { kind: 'file_diff', paths: ['x.ts', 'y.py'], diff },
-    }));
-
-    assert.doesNotMatch(unknown, /astryx-token-/);
-    assert.doesNotMatch(ambiguous, /astryx-token-/);
-    assert.deepEqual(diffCodeText(unknown), ['const removed = 2;', 'const added = 3;']);
-  });
-
-  it('resumes line numbering from each hunk header', () => {
-    const markup = renderToStaticMarkup(createElement(ToolResultPreview, {
-      content: {
-        kind: 'file_diff',
-        paths: ['x.ts'],
-        diff: [
-          '@@ -10,3 +10,3 @@',
-          ' kept',
-          '-old',
-          '+new',
-          ' tail',
-          '@@ -20,1 +20,2 @@',
-          '-gone',
-          '+first',
-          '+second',
-        ].join('\n'),
-      },
-    }));
-
-    assert.deepEqual(
-      Array.from(markup.matchAll(/data-line="(\w+)"/g)).map((m) => m[1]),
-      ['ctx', 'del', 'add', 'ctx', 'del', 'add', 'add'],
-    );
-    assert.deepEqual(diffGutterNumbers(markup), ['10', '11', '11', '12', '20', '20', '21']);
-    assert.doesNotMatch(markup, /@@/);
-  });
-
-  it('describes a file_write result with its path and byte count', () => {
-    const markup = renderToStaticMarkup(createElement(ToolResultPreview, {
-      content: { kind: 'file_write', path: 'huge.bin', bytes: 70000 },
-    }));
-
-    assert.match(markup, /Wrote 70000 bytes to huge\.bin/);
-    assert.doesNotMatch(markup, /\[file_write\]/);
-  });
-
-  // `---`/`+++` only mark a file when the marker is followed by a path. Testing
-  // the bare prefix reads the removal of a YAML document separator or an SQL
-  // `--` comment as a header — the line the reader most needs to see as red.
-  it('reads a removed `---` line as a deletion, not as a file marker', () => {
-    assert.equal(diffLineKind('--- a/x.ts'), 'meta');
-    assert.equal(diffLineKind('+++ b/x.ts'), 'meta');
-    assert.equal(diffLineKind('----'), 'del');
-    assert.equal(diffLineKind('---'), 'del');
-    assert.equal(diffLineKind('+++'), 'add');
-  });
-
-  // A diff arrives newline-terminated; splitting one leaves a trailing empty
-  // field. Flat text hid it, one element per line does not.
-  it('does not draw a blank row after a newline-terminated diff', () => {
-    const markup = renderToStaticMarkup(createElement(ToolResultPreview, {
-      content: {
-        kind: 'file_diff',
-        paths: ['x.ts'],
-        diff: '@@ -1 +1 @@\n-old\n+new\n',
-      },
-    }));
-    assert.deepEqual(
-      Array.from(markup.matchAll(/data-line="(\w+)"/g)).map((m) => m[1]),
-      ['del', 'add'],
-    );
-  });
-
   // The row-level counterpart of the sweep below, one level down: the detail
   // panel used to draw the same command three ways — a CodeBlock card while
   // streaming, that block's `title` slot once a foreground run settled, and
@@ -670,126 +536,12 @@ describe('tool activity presentation', () => {
     }
   });
 
-  // The blocks a detail still draws through CodeBlock — a diff's path header, a
-  // JSON headline — sit beside the command surface, so they have to share its
-  // type tier. `ToolCodeBlock` used to pin Astryx `size="sm"`, the supporting
-  // tier, which rendered them at 12px against the surface's 14px. Astryx's `md`
-  // is `--text-code-size`, the same 0.875rem `--maka-text-code` resolves to.
-  //
-  // `data-size` is the attribute Astryx puts the resolved tier on, so the pin
-  // is visible to a string assertion; the leading and the rebound role tokens
-  // are CSS-only and are not reachable from this harness.
-  it('leaves a tool-detail code block on the code tier, not the supporting one', () => {
-    const markup = renderToStaticMarkup(createElement(ToolCallDetail, {
-      item: {
-        toolUseId: 'tool-code-tier',
-        toolName: 'CustomInspect',
-        status: 'completed',
-        args: { target: 'packages/ui' },
-        result: { kind: 'json', value: { ok: true, detail: 'line one\nline two' } },
-      } satisfies ToolActivityItem,
-    }));
-
-    // Scoped to the block's own tag: the copy affordance Astryx nests inside it
-    // carries `data-size="sm"` of its own, and that icon is not what the pin was
-    // about — a whole-markup match would read it as a regression forever.
-    const block = /<pre[^>]*class="astryx-codeblock[^"]*"[^>]*>/.exec(markup)?.[0];
-    assert.ok(block, 'this result still renders through CodeBlock');
-    assert.match(block, /data-size="md"/, 'the block sits on the code tier');
-  });
-
-  // The bug this replaced: a running command rendered in a bespoke trow and
-  // switched to Astryx chrome the moment it settled. Crossing a status
-  // boundary must not change which component draws the row.
-  it('draws every status through the same Astryx row', () => {
-    const base = {
-      toolUseId: 'tool-status-sweep',
-      toolName: 'Bash',
-      activityKind: 'command' as const,
-      intent: '运行测试',
-      args: { command: 'npm test' },
-    };
-    for (const status of ['pending', 'running', 'completed', 'errored', 'interrupted'] as const) {
-      const markup = renderTool({ ...base, status });
-      assert.match(markup, /astryx-chat-tool-calls/, `${status} renders through Astryx`);
-    }
-  });
-
-  // Expansion is Astryx's call, not the product's, and its default is collapsed
-  // whatever the rows are doing.
-  describe('group expansion follows Astryx', () => {
-    const trailingSuccess = {
-      toolUseId: 'ok-1',
-      toolName: 'Read',
-      activityKind: 'read' as const,
-      status: 'completed' as const,
-      args: {},
-    };
-
-    function renderGroup(first: ToolActivityItem): string {
-      return renderToStaticMarkup(createElement(ToolTrow, { items: [first, trailingSuccess] }));
-    }
-
-    it('stays collapsed when a settled group holds an interrupted call', () => {
-      const markup = renderGroup({
-        toolUseId: 'cut-1',
-        toolName: 'Bash',
-        activityKind: 'command',
-        status: 'interrupted',
-        args: { command: 'sleep 600' },
-      });
-      assert.match(markup, /aria-expanded="false"/);
-    });
-
-    // Two items on purpose: a lone call is a bare row that owns its own
-    // expansion, so group expansion is only observable from two up.
-    it('stays collapsed while a call in the group is still running', () => {
-      const markup = renderGroup({
-        toolUseId: 'live-1',
-        toolName: 'Bash',
-        activityKind: 'command',
-        status: 'running',
-        args: { command: 'npm test' },
-      });
-      assert.doesNotMatch(markup, /aria-expanded="true"/);
-    });
-
-    // `pending` is in flight too: a tool that never streams stays pending for
-    // its whole life, and gets no special treatment either.
-    it('stays collapsed when a parallel call is still pending behind a settled one', () => {
-      const markup = renderGroup({
-        toolUseId: 'quiet-1',
-        toolName: 'Bash',
-        activityKind: 'command',
-        status: 'pending',
-        args: { command: 'sleep 600' },
-      });
-      assert.doesNotMatch(markup, /aria-expanded="true"/);
-    });
-  });
 });
 
 function diffGutterNumbers(markup: string): string[] {
   return Array.from(markup.matchAll(/maka-tool-diff-gutter"[^>]*>([^<]*)</g)).map((m) => m[1]);
 }
 
-function diffMarkers(markup: string): string[] {
-  return Array.from(markup.matchAll(/maka-tool-diff-marker">([^<]*)</g)).map((m) => m[1]);
-}
-
-/** The rendered source of each row, with the syntax spans flattened back out. */
-function diffCodeText(markup: string): string[] {
-  return Array.from(markup.matchAll(/maka-tool-diff-code">(.*?)<\/span>\n/gs)).map((m) =>
-    m[1]
-      .replace(/<[^>]*>/g, '')
-      .replace(/&quot;/g, '"')
-      .replace(/&#x27;/g, "'")
-      .replace(/&lt;/g, '<')
-      .replace(/&gt;/g, '>')
-      .replace(/&amp;/g, '&'),
-  );
-}
-
 function pipeOutput(stdout = '', stderr = '') {
   return {
     mode: 'pipes' as const,
diff --git a/packages/ui/src/__tests__/turn-running-status.test.tsx b/packages/ui/src/__tests__/turn-running-status.test.tsx
deleted file mode 100644
index 8ec6604949..0000000000
--- a/packages/ui/src/__tests__/turn-running-status.test.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-import { strict as assert } from 'node:assert';
-import { describe, it } from 'node:test';
-import { createElement, type ReactNode } from 'react';
-import { renderToStaticMarkup as renderReactToStaticMarkup } from 'react-dom/server';
-import { LocaleProvider } from '../locale-context.js';
-import type { TurnViewModel } from '../materialize.js';
-import { TurnRunningStatus, TurnView } from '../chat-turn.js';
-import { formatTurnDuration } from '../chat-display-helpers.js';
-import { formatDuration } from '../tool-activity/preview-utils.js';
-import { getConversationCopy } from '../conversation-copy.js';
-import { isTimeDrivenMotionEnabled } from '../streaming-presentation.js';
-
-function render(node: ReactNode): string {
-  return renderReactToStaticMarkup(createElement(LocaleProvider, {
-    locale: 'zh',
-    children: node,
-  }));
-}
-
-/** A turn mid-flight: reasoning already on screen and a tool still running. */
-function turnWithLiveContent(): TurnViewModel {
-  return {
-    turnId: 'turn-1',
-    status: 'running',
-    partialOutputRetained: false,
-    tools: [{ toolUseId: 't1', toolName: 'Bash', status: 'running', args: {} }],
-    notes: [],
-    timeline: [
-      { kind: 'thinking', text: 'reasoning', messageId: 'a1', live: true },
-      { kind: 'tools', items: [{ toolUseId: 't1', toolName: 'Bash', status: 'running', args: {} }] },
-    ],
-    startedAt: Date.now() - 90_000,
-  };
-}
-
-describe('live turn running status line', () => {
-  it('stays up while the turn already has live content on screen', () => {
-    // The regression this locks: the cue it replaced was gated on the turn
-    // having produced nothing yet, so it disappeared the moment a tool started
-    // — leaving a long tool run with no sign the harness was still working.
-    const markup = render(createElement(TurnView, {
-      turn: turnWithLiveContent(),
-      liveStreaming: { runningStatus: true },
-    }));
-
-    assert.match(markup, /maka-turn-processing/);
-  });
-
-  it('shows a working phrase from the pool', () => {
-    const markup = render(createElement(TurnView, {
-      turn: turnWithLiveContent(),
-      liveStreaming: { runningStatus: true },
-    }));
-    const phrases = getConversationCopy('zh').messages.workingPhrases;
-
-    assert.ok(phrases.some((phrase) => markup.includes(phrase)), 'expected one working phrase');
-  });
-
-  it('keeps the clock out of a static render', () => {
-    // The elapsed value only exists once an effect has measured it against the
-    // wall clock, so server markup and the first paint carry the phrase alone.
-    // Anything else would make a captured render differ run to run.
-    const markup = render(createElement(TurnView, {
-      turn: turnWithLiveContent(),
-      liveStreaming: { runningStatus: true },
-    }));
-
-    assert.doesNotMatch(markup, /maka-turn-elapsed/);
-  });
-
-  it('runs no animation of its own', () => {
-    // Both idioms above this row are already spoken for: a running tool card
-    // spins, and Astryx's `ChatReasoning` shimmers its label while reasoning
-    // streams. A second spinner or a second sweep put two of them a few pixels
-    // apart, at different speeds. What moves here is the content itself.
-    const markup = render(createElement(TurnRunningStatus, { startedAt: 1 }));
-
-    assert.doesNotMatch(markup, /spinner|shimmer/i);
-  });
-
-  it('keeps a name on the row now that the spinner is not carrying one', () => {
-    // Every visible token here moves on the clock and is hidden from the
-    // accessibility tree; the spinner's label used to be the row's whole
-    // accessible name.
-    const markup = render(createElement(TurnRunningStatus, { startedAt: 1 }));
-
-    assert.match(markup, /aria-label="[^"]+"/);
-  });
-
-  it('keeps every zh working phrase the same width so the clock never shifts', () => {
-    // The phrases sit immediately left of a ticking number. Uneven lengths
-    // would nudge it sideways on every swap.
-    const widths = new Set(getConversationCopy('zh').messages.workingPhrases.map((p) => p.length));
-
-    assert.equal(widths.size, 1, `expected one phrase length, got ${[...widths].join(', ')}`);
-  });
-});
-
-describe('time-driven motion gate', () => {
-  it('reports frozen for a node inside a marked subtree, not just a marked root', () => {
-    // The CSS contract these attributes drive uses descendant selectors, so a
-    // host may mark a subtree instead of `<html>` — Storybook marks its shell
-    // frame. Reading only the root let a one-second timer run inside a tree
-    // whose motion the stylesheet had already capped to nothing.
-    const inside = { closest: (selector: string) => (selector.includes('maka-e2e-fixture') ? {} : null) };
-    const outside = { closest: () => null };
-    const descriptor = Object.getOwnPropertyDescriptor(globalThis, 'document');
-    Object.defineProperty(globalThis, 'document', {
-      configurable: true,
-      value: { documentElement: { dataset: {} } },
-    });
-    try {
-      assert.equal(isTimeDrivenMotionEnabled(inside as unknown as Element), false);
-      assert.equal(isTimeDrivenMotionEnabled(outside as unknown as Element), true);
-      assert.equal(isTimeDrivenMotionEnabled(null), true);
-    } finally {
-      if (descriptor) Object.defineProperty(globalThis, 'document', descriptor);
-      else Reflect.deleteProperty(globalThis, 'document');
-    }
-  });
-
-  it('still reports frozen when the document root carries the attribute', () => {
-    const descriptor = Object.getOwnPropertyDescriptor(globalThis, 'document');
-    Object.defineProperty(globalThis, 'document', {
-      configurable: true,
-      value: { documentElement: { dataset: { makaReducedMotion: 'true' } } },
-    });
-    try {
-      assert.equal(isTimeDrivenMotionEnabled(null), false);
-    } finally {
-      if (descriptor) Object.defineProperty(globalThis, 'document', descriptor);
-      else Reflect.deleteProperty(globalThis, 'document');
-    }
-  });
-});
-
-describe('turn duration formatting', () => {
-  it('advances in whole seconds and never below one', () => {
-    // A one-second timer drives this number, so anything finer than a second
-    // is precision the counter cannot deliver: a tenths digit would jump in
-    // tenths-of-ten, and a millisecond reading would claim an accuracy the
-    // interval never had.
-    const cases: Array<[number, string]> = [
-      [0, '0s'],
-      [450, '0s'],
-      [999, '0s'],
-      [1_000, '1s'],
-      [8_200, '8s'],
-      [25_400, '25s'],
-      [59_999, '59s'],
-      [60_000, '1m 0s'],
-      [114_900, '1m 54s'],
-      [3_600_000, '60m 0s'],
-    ];
-    for (const [ms, expected] of cases) assert.equal(formatTurnDuration(ms), expected);
-  });
-
-  it('truncates rather than rounds so the clock never runs ahead', () => {
-    // Rounding would show 26s at 25.6s elapsed — a counter reporting time that
-    // has not passed yet, and one that could reach `1m 60s`.
-    assert.equal(formatTurnDuration(25_600), '25s');
-    assert.equal(formatTurnDuration(119_800), '1m 59s');
-  });
-
-  it('is deliberately coarser than the tool card shape', () => {
-    // Tool cards report a span measured after the fact and may resolve below a
-    // second; this one is read while it advances. Locked so a future de-dup
-    // does not quietly hand the live clock back its milliseconds.
-    assert.equal(formatDuration(450), '450 ms');
-    assert.equal(formatTurnDuration(450), '0s');
-  });
-});
diff --git a/scripts/build-astryx-theme.test.mjs b/scripts/build-astryx-theme.test.mjs
deleted file mode 100644
index 8ac4b0e40c..0000000000
--- a/scripts/build-astryx-theme.test.mjs
+++ /dev/null
@@ -1,18 +0,0 @@
-import assert from 'node:assert/strict';
-import test from 'node:test';
-import { stripVariantsReference } from './build-astryx-theme.mjs';
-
-// @astryxdesign/cli 0.2.0 emits a `/// <reference>` to maka.variants.d.ts but
-// no longer emits the file (#1980). Post-processing must drop the dangling
-// line so tsc does not depend on skipLibCheck to resolve maka.d.ts.
-test('the dangling variants reference line is stripped', () => {
-  const dts =
-    '/// <reference path="./maka.variants.d.ts" />\nimport type { DefinedTheme } from "x";\n';
-  assert.equal(stripVariantsReference(dts), 'import type { DefinedTheme } from "x";\n');
-});
-
-test('stripping is idempotent and leaves other content alone', () => {
-  const dts =
-    'import type { DefinedTheme } from "x";\nexport declare const makaTheme: DefinedTheme;\n';
-  assert.equal(stripVariantsReference(dts), dts);
-});