fix(plugin): own effect plugin runtime

2026-08-24 18:46:26 +00:00 · 2026-08-24 09:17:45 -04:00
81 changed files with 608 additions and 4385 deletions
@@ -0,0 +1,5 @@
+---
+"@opencode-ai/plugin": patch
+---
+
+Export the Effect runtime used by Effect plugins and safely adapt its tool schemas across host module instances.
@@ -89,12 +89,6 @@ jobs:
        working-directory: packages/codemode
        run: bun run script/publish.ts --dry-run

-      - name: Verify packed workerd SDK
-        if: runner.os == 'Linux'
-        timeout-minutes: 15
-        working-directory: packages/sdk
-        run: bun run verify:package
-
      - name: Verify compiled service lifecycle
        if: always()
        timeout-minutes: 10
@@ -595,8 +595,8 @@
      },
      "peerDependencies": {
        "@opencode-ai/theme": "workspace:*",
-        "@opentui/core": ">=0.5.8",
-        "@opentui/solid": ">=0.5.8",
+        "@opentui/core": ">=0.5.7",
+        "@opentui/solid": ">=0.5.7",
        "solid-js": ">=1.9.0",
      },
      "optionalPeers": [
@@ -1090,9 +1090,9 @@
    "@npmcli/arborist": "9.4.0",
    "@octokit/rest": "22.0.0",
    "@openauthjs/openauth": "0.0.0-20250322224806",
-    "@opentui/core": "0.5.8",
-    "@opentui/keymap": "0.5.8",
-    "@opentui/solid": "0.5.8",
+    "@opentui/core": "0.5.7",
+    "@opentui/keymap": "0.5.7",
+    "@opentui/solid": "0.5.7",
    "@pierre/diffs": "1.2.10",
    "@playwright/test": "1.59.1",
    "@sentry/solid": "10.36.0",
@@ -2218,27 +2218,27 @@

    "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.43.0", "", {}, "sha512-eSYWTm620tTk45EKSedaUL8MFYI8hW164hIXsgIHyxu3VobUB3fFCu5t0hQby6OoWRPsG1KkKUG2M5UadiLiVg=="],

-    "@opentui/core": ["@opentui/core@0.5.8", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.5.8", "@opentui/core-darwin-x64": "0.5.8", "@opentui/core-linux-arm64": "0.5.8", "@opentui/core-linux-arm64-musl": "0.5.8", "@opentui/core-linux-x64": "0.5.8", "@opentui/core-linux-x64-musl": "0.5.8", "@opentui/core-win32-arm64": "0.5.8", "@opentui/core-win32-x64": "0.5.8" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-GbZ+nSLYZqxj2Z5TU19Mx6IsAvVsn2+7WEXz+6OlMGoootvt3TxP3vWwfGI0jWk9qp1ftRlML1JPNEkzy+9I8g=="],
+    "@opentui/core": ["@opentui/core@0.5.7", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.5.7", "@opentui/core-darwin-x64": "0.5.7", "@opentui/core-linux-arm64": "0.5.7", "@opentui/core-linux-arm64-musl": "0.5.7", "@opentui/core-linux-x64": "0.5.7", "@opentui/core-linux-x64-musl": "0.5.7", "@opentui/core-win32-arm64": "0.5.7", "@opentui/core-win32-x64": "0.5.7" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-/XDabTkfBs2Wy2FhlC4jvzbpphYAs4SlnCRKYEvi+metlXNTSAshSs43wqZ9O4IPd0E4EcQqdfeQ0sdc3yPpYw=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.5.8", "", { "os": "darwin", "cpu": "arm64" }, "sha512-c9Y1FBrSnA4sKUCMETsrLYOmsMTyJae8mU9cE6M4o9rXcr3ZLPA7o9AkPA3S0+kH+kZ0o1Fn0wLejgNxvEp5mg=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.5.7", "", { "os": "darwin", "cpu": "arm64" }, "sha512-75TDJgFD6hDoCElIX35Yg3TIRF/jhrtVQO/9snhjGuTsZ7bd0W88jUlvSXSNhqB3CX431rwgi47B+asWPDI1lQ=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.5.8", "", { "os": "darwin", "cpu": "x64" }, "sha512-oZ/6Iz1KN+4volMFKmmvziYJhMgyyJ99LfK1S+uPRyIRqzT3CESoJ58D4h04M1g0dHeHE4PvkU1p3uQKrXiP3g=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.5.7", "", { "os": "darwin", "cpu": "x64" }, "sha512-j+Dwu2yV8zahBFjnVIssYdPrHz/+pkd7xWxI+nHjV41V3c+scvH6vJY1U85VCVaoQs/zCH5xAJbmAAn7Sgeh8g=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.5.8", "", { "os": "linux", "cpu": "arm64" }, "sha512-N6i/ocrsTjIq9aUQyrfJkqUo+tc4P5ZS6xz38Cm1MhtDzwBE+CrNIJdHfoJfmRLhJkYHlw6Z0ToICn8ZNj4Bpw=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.5.7", "", { "os": "linux", "cpu": "arm64" }, "sha512-gWO9NWaivXRPc0XhEbxehj3ApyC1SW8Bf1cnHnME1zhw/EZNCNE3TQHgKwOnnNKtvlbhzLQjOI4OqyPYV8UcEQ=="],

-    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.5.8", "", { "os": "linux", "cpu": "arm64" }, "sha512-eFMB41AWODaYf8PsCx3vtTMX33tFgtSpR9tKNnUErCXlcnZ+WCRHVaJ9F6DrVNX3ir6HmgbwAmaWXvaVF+kLtg=="],
+    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.5.7", "", { "os": "linux", "cpu": "arm64" }, "sha512-RumSHTasIAWU7jPBKiTuEZG/m+prfQKCHhL3JAQnBLgp7eAB20XZGfSLVWDBgxkyKq1rHCUgLtZktC5ZAyKfTA=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.5.8", "", { "os": "linux", "cpu": "x64" }, "sha512-/2QM7/wMnML/sxchzbwgoU5tUu/7k836/kSOKMti8opjuecv1K+WWNKGXufhTNeRcXFZaba5rsCdYrf3VqnVsQ=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.5.7", "", { "os": "linux", "cpu": "x64" }, "sha512-fXDmrIlfp9xaoVkk3BNn3yUO/b7plBSOfUh2oWOezRA6E/g5z+hTO1alGFQCy+VV+1kfA6iuYadAww0xNtfACg=="],

-    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.5.8", "", { "os": "linux", "cpu": "x64" }, "sha512-YXo+qUHYmep2uvv3ECvTeqr10aD7+lBsavYmsTLBzS5hHabbzlQ10oX/99nIRPC3Au1BMWD6d6zQP5czPx23eg=="],
+    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.5.7", "", { "os": "linux", "cpu": "x64" }, "sha512-1opDV+W7C1F4iWivCNKuYl5Hen+IeFXAuUPm3hVyN0UtdcP8LESpFJTr8QRwHpGSE9Jz1K2g2S2ipzI3u5mhgw=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.5.8", "", { "os": "win32", "cpu": "arm64" }, "sha512-7qBdhEAlh4tLFzW7nWLPlREtNiF6NZMDMi+4uDpUlAMhRavLr6wjcIcgfhNAF/puq06DjuZlPTwaMCgB3qOuwA=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.5.7", "", { "os": "win32", "cpu": "arm64" }, "sha512-gbiZUyttjq8s+bsnsaopygWN7LTS/RyzD6GOmpgOB2TVitvo0P6mxM+AebBGuu/7xri17Rqaxf3uqrgdKiJAeg=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.5.8", "", { "os": "win32", "cpu": "x64" }, "sha512-Z76YaTKnmRDSHKdKa7iTBCXBQdInQLq7UG3qIE84nvyHCDtkhYtPWOaCzDisSgXC8Y6hJt6NiFbaNjQyxPkfpQ=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.5.7", "", { "os": "win32", "cpu": "x64" }, "sha512-bDwon45lUxbV3rMcekTCg4mXcBu9uhdG6HLeLK5TVZf05/h+Ibkf2UeZ8A2jjQt+MK6jpYmxWwDCVCTzZ7EU7Q=="],

-    "@opentui/keymap": ["@opentui/keymap@0.5.8", "", { "dependencies": { "@opentui/core": "0.5.8" }, "peerDependencies": { "@opentui/react": "0.5.8", "@opentui/solid": "0.5.8", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-KQHKRnLZroSZIbHmGmSeDPsXi7Yykdu9x9ACmDzBFkgPGx0EIuXHqRcmrqmUaX485MQEZuCD9t6FdDsOMGyIFg=="],
+    "@opentui/keymap": ["@opentui/keymap@0.5.7", "", { "dependencies": { "@opentui/core": "0.5.7" }, "peerDependencies": { "@opentui/react": "0.5.7", "@opentui/solid": "0.5.7", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-BqfSbjlLuctnew2aoPPdK3wpzJfEPp7ttLBkTu1wJTkps9AcfUgXqwloqvY4DUKjUBNFYYEpU/0CPxI4Blj4MA=="],

-    "@opentui/solid": ["@opentui/solid@0.5.8", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.5.8", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-L0NxuAU8XT+jlE5G90oA3kspqkof48b0hmzi5XLw+1gxnkxrkTb+YfKys+GzVK4UqhgwY9aW+TeDfrKbnfwCMw=="],
+    "@opentui/solid": ["@opentui/solid@0.5.7", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.5.7", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-qrKAZd9xt4D67LXZUARg1Aw0dwEWi29GyOxpM6abqmyExGPMS7jih5Z9oMQJ9EXsouDKpW7Mejjq7WbX2AaecQ=="],

    "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],

@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-phyTF0/jQZ3L0B66PSLdpH//kyPc1M6j5a40wCSx7TA=",
-    "aarch64-linux": "sha256-1Zb/Is0ujIslCbPPusAVhcuzAPyIauQyeIIRRGtzpAk=",
-    "aarch64-darwin": "sha256-DDsVm7z+PSDry6QqrwVDFSmEnq6jIKb709Y4ymAv9f8=",
-    "x86_64-darwin": "sha256-S+5LI2J+WRhRP7jp2PAv6AesXk238wEYoyIO1oKdF3w="
+    "x86_64-linux": "sha256-LvDHCOm8OAZfvb0I0L6AbdOevRoQmEJnnqrSgAiNHv8=",
+    "aarch64-linux": "sha256-O0L0iHjb4cwl9xWHIna8VFHyQzoAKzfY8oMpVNayMOg=",
+    "aarch64-darwin": "sha256-ETP8FE71NqufYDUbR7tBdsMEOVQ44wLmsZBeZiSRBRY=",
+    "x86_64-darwin": "sha256-WUcoLldDriT3QxcdlnBQhuPrxDNub0EDvvZXk/pDMpY="
  }
 }
@@ -49,9 +49,9 @@
      "@octokit/rest": "22.0.0",
      "@hono/standard-validator": "0.2.0",
      "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.5.8",
-      "@opentui/keymap": "0.5.8",
-      "@opentui/solid": "0.5.8",
+      "@opentui/core": "0.5.7",
+      "@opentui/keymap": "0.5.7",
+      "@opentui/solid": "0.5.7",
      "@tanstack/solid-virtual": "3.13.37",
      "@shikijs/stream": "4.2.0",
      "@standard-schema/spec": "1.1.0",
@@ -157,7 +157,7 @@ type AnthropicDocumentBlock = Schema.Schema.Type<typeof AnthropicDocumentBlock>
 const AnthropicThinkingBlock = Schema.Struct({
  type: Schema.tag("thinking"),
  thinking: Schema.String,
-  signature: Schema.String,
+  signature: Schema.optional(Schema.String),
  cache_control: Schema.optional(AnthropicCacheControl),
 })

@@ -701,26 +701,6 @@ const lowerToolResultContent = Effect.fnUntraced(function* (part: ToolResultPart
  return yield* Effect.forEach(content, lowerToolResultContentItem)
 })

-const requireThinkingSignature = (request: LLMRequest) => {
-  if (request.model.compatibility?.requireSignature !== undefined)
-    return request.model.compatibility.requireSignature
-  const provider = request.model.provider.toLowerCase()
-  const model = request.model.id.toLowerCase()
-  const baseURL = (request.model.route.endpoint.baseURL ?? "").toLowerCase()
-  if (
-    provider === "kimi-for-coding" ||
-    provider === "moonshotai" ||
-    provider === "moonshotai-cn" ||
-    model.startsWith("kimi-") ||
-    baseURL.includes("api.kimi.com/coding") ||
-    baseURL.includes("api.moonshot.ai/anthropic") ||
-    baseURL.includes("api.moonshot.cn/anthropic")
-  )
-    return false
-  if (provider.includes("xiaomi") || model.includes("mimo") || baseURL.includes("xiaomimimo.com")) return false
-  return true
-}
-
 // Mid-conversation system messages became available with Opus 4.8 and version
 // 5 of the other supported Claude families. Treat later family versions as
 // compatible without assuming that every Anthropic Messages model is Claude.
@@ -827,30 +807,15 @@ const lowerMessages = Effect.fn("AnthropicMessages.lowerMessages")(function* (
          continue
        }
        if (part.type === "reasoning") {
-          // A signature marks visible thinking; only signature-less parts carrying
-          // redactedData round-trip as opaque redacted_thinking blocks.
+          // Mirrors Vercel's @ai-sdk/anthropic: a signature marks visible
+          // thinking; only signature-less parts carrying redactedData
+          // round-trip as opaque redacted_thinking blocks.
          const signature = part.encrypted ?? signatureFromMetadata(part.providerMetadata)
          const redactedData = redactedDataFromMetadata(part.providerMetadata)
          if (signature === undefined && redactedData !== undefined) {
            content.push({ type: "redacted_thinking", data: redactedData })
            continue
          }
-          if (typeof signature !== "string" || signature.trim().length === 0) {
-            if (part.text.trim().length === 0) continue
-            if (!requireThinkingSignature(request)) {
-              content.push({ type: "thinking", thinking: part.text, signature: "" })
-              continue
-            }
-            // Without a signature this cannot be a valid thinking block per
-            // the SDK ThinkingBlockParam:3217 — demote to text so the
-            // conversation remains sendable.
-            content.push({
-              type: "text",
-              text: part.text,
-              cache_control: cacheControl(breakpoints, part.cache),
-            })
-            continue
-          }
          content.push({ type: "thinking", thinking: part.text, signature })
          continue
        }
@@ -666,7 +666,6 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
 const lowerOptions = (request: LLMRequest) => {
  const options = OpenResponsesOptions.resolve(request)
  const cacheKey = ProviderShared.clampPromptCacheKey(request.promptCacheKey)
-  const parallelToolCalls = resolveParallelToolCalls(request)
  return {
    ...(options.instructions ? { instructions: options.instructions } : {}),
    ...(options.store !== undefined ? { store: options.store } : {}),
@@ -684,18 +683,11 @@ const lowerOptions = (request: LLMRequest) => {
    ...(options.textVerbosity ? { text: { verbosity: options.textVerbosity } } : {}),
    ...(options.serviceTier ? { service_tier: options.serviceTier } : {}),
    ...(options.maxToolCalls !== undefined ? { max_tool_calls: options.maxToolCalls } : {}),
-    ...(parallelToolCalls !== undefined ? { parallel_tool_calls: parallelToolCalls } : {}),
+    ...(options.parallelToolCalls !== undefined ? { parallel_tool_calls: options.parallelToolCalls } : {}),
    ...(options.truncation ? { truncation: options.truncation } : {}),
  }
 }

-export const resolveParallelToolCalls = (request: LLMRequest) => {
-  const configured = OpenResponsesOptions.resolve(request).parallelToolCalls
-  if (configured !== undefined) return configured
-  const disabled = request.toolChoice?.disableParallelToolUse
-  return disabled === undefined ? undefined : !disabled
-}
-
 const allowedToolChoice = (request: LLMRequest) => {
  const allowed = OpenResponsesOptions.resolve(request).allowedTools
  if (!allowed) return undefined
@@ -1194,6 +1186,7 @@ export const step = (state: ParserState, event: Event) => {
  if (
    event.type === "response.reasoning.done" ||
    event.type === "response.reasoning_summary_text.done" ||
+    event.type === "response.reasoning_summary.done" ||
    event.type === "response.reasoning_text.done"
  ) {
    if (!event.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
@@ -51,12 +51,7 @@ const OpenAIChatFunction = Schema.Struct({

 const OpenAIChatTool = Schema.Struct({
  type: Schema.tag("function"),
-  function: Schema.Struct({
-    name: Schema.String,
-    description: Schema.String,
-    parameters: JsonObject,
-    strict: Schema.optional(Schema.Boolean),
-  }),
+  function: OpenAIChatFunction,
  cache_control: Schema.optional(OpenAIChatCacheControl),
 })
 type OpenAIChatTool = Schema.Schema.Type<typeof OpenAIChatTool>
@@ -138,7 +133,6 @@ export const bodyFields = {
  store: Schema.optional(Schema.Boolean),
  prompt_cache_key: Schema.optional(Schema.String),
  reasoning_effort: Schema.optional(OpenAIOptions.OpenAIReasoningEffort),
-  tool_stream: Schema.optional(Schema.Boolean),
  max_completion_tokens: Schema.optional(Schema.Number),
  max_tokens: Schema.optional(Schema.Number),
  temperature: Schema.optional(Schema.Number),
@@ -270,18 +264,12 @@ interface LoweringOptions {
  ) => Schema.Schema.Type<typeof OpenAIChatCacheControl> | undefined
 }

-const lowerTool = (
-  tool: ToolDefinition,
-  inputSchema: JsonSchema,
-  options: LoweringOptions,
-  supportsStrictMode: boolean,
-): OpenAIChatTool => ({
+const lowerTool = (tool: ToolDefinition, inputSchema: JsonSchema, options: LoweringOptions): OpenAIChatTool => ({
  type: "function",
  function: {
    name: tool.name,
    description: tool.description,
    parameters: inputSchema,
-    ...(supportsStrictMode ? { strict: false } : {}),
  },
  cache_control: options.cacheControl?.(tool.cache),
 })
@@ -540,122 +528,11 @@ const hasToolHistory = (messages: ReadonlyArray<LLMRequest["messages"][number]>)
  return false
 }

-// Derive `max_tokens` vs `max_completion_tokens` from provider/baseURL when
-// explicit `compatibility.maxTokensField` is not set. Aligned with
-// models.dev provider naming: DeepSeek, Moonshot AI, Together AI, ZAI
-// (Zhipu + Coding Plan variants), Nvidia, Cerebras, Chutes, etc. still
-// require `max_tokens`.
-const detectMaxTokensField = (provider: string, baseURL: string | undefined): "max_tokens" | "max_completion_tokens" => {
-  const p = provider.toLowerCase()
-  const url = (baseURL ?? "").toLowerCase()
-  if (
-    p === "deepseek" ||
-    url.includes("deepseek.com") ||
-    p === "moonshotai" ||
-    url.includes("api.moonshot.ai") ||
-    p === "togetherai" ||
-    url.includes("api.together.") ||
-    p === "zai" ||
-    p === "zai-coding-plan" ||
-    p === "zhipuai" ||
-    p === "zhipuai-coding-plan" ||
-    url.includes("api.z.ai") ||
-    url.includes("open.bigmodel.cn") ||
-    p === "nvidia" ||
-    url.includes("integrate.api.nvidia.com") ||
-    p === "cerebras" ||
-    url.includes("cerebras.ai") ||
-    url.includes("llm.chutes.ai") ||
-    p === "chutes" ||
-    p === "cloudflare-ai-gateway" ||
-    url.includes("gateway.ai.cloudflare.com") ||
-    p === "cloudflare-workers-ai" ||
-    url.includes("api.cloudflare.com")
-  )
-    return "max_tokens"
-  return "max_completion_tokens"
-}
-
-const detectSupportsStore = (provider: string, baseURL: string | undefined): boolean => {
-  const p = provider.toLowerCase()
-  const url = (baseURL ?? "").toLowerCase()
-  const isNvidia = p === "nvidia" || url.includes("integrate.api.nvidia.com")
-  const isMoonshot = p === "moonshotai" || p === "moonshotai-cn" || url.includes("api.moonshot.")
-  const isTogether = p === "togetherai" || p === "together" || url.includes("api.together.")
-  const isZai =
-    p === "zai" ||
-    p === "zai-coding-plan" ||
-    p === "zhipuai" ||
-    p === "zhipuai-coding-plan" ||
-    url.includes("api.z.ai") ||
-    url.includes("open.bigmodel.cn")
-  const isDeepSeek = p === "deepseek" || url.includes("deepseek.com")
-  const isCerebras = p === "cerebras" || url.includes("cerebras.ai")
-  const isXai = p === "xai" || url.includes("api.x.ai")
-  const isChutes = p === "chutes" || url.includes("chutes.ai")
-  const isCloudflareWorkersAI = p === "cloudflare-workers-ai" || url.includes("api.cloudflare.com")
-  const isCloudflareAiGateway = p === "cloudflare-ai-gateway" || url.includes("gateway.ai.cloudflare.com")
-  const isVercelAiGateway = p === "vercel-ai-gateway" || url.includes("ai-gateway.vercel.sh") || url.includes("vercel.sh")
-  const isAntLing = p === "ant-ling" || url.includes("api.ant-ling.com")
-  const isOpencode = p === "opencode" || url.includes("opencode.ai")
-  const isNonStandard =
-    isNvidia ||
-    isCerebras ||
-    isXai ||
-    isTogether ||
-    isChutes ||
-    isDeepSeek ||
-    isZai ||
-    isMoonshot ||
-    isOpencode ||
-    isCloudflareWorkersAI ||
-    isCloudflareAiGateway ||
-    isVercelAiGateway ||
-    isAntLing
-  return !isNonStandard
-}
-
-const detectSupportsUsageInStreaming = (): boolean => true
-
-const detectSupportsStrictMode = (provider: string, baseURL: string | undefined): boolean => {
-  const p = provider.toLowerCase()
-  const url = (baseURL ?? "").toLowerCase()
-  const isMoonshot = p === "moonshotai" || p === "moonshotai-cn" || url.includes("api.moonshot.")
-  const isTogether = p === "togetherai" || p === "together" || url.includes("api.together.")
-  const isCloudflareAiGateway = p === "cloudflare-ai-gateway" || url.includes("gateway.ai.cloudflare.com")
-  const isNvidia = p === "nvidia" || url.includes("integrate.api.nvidia.com")
-  return !isMoonshot && !isTogether && !isCloudflareAiGateway && !isNvidia
-}
-
-const detectZaiToolStream = (
-  provider: string,
-  baseURL: string | undefined,
-  modelID: string,
-): boolean => {
-  const p = provider.toLowerCase()
-  const url = (baseURL ?? "").toLowerCase()
-  const isZai =
-    p === "zai" ||
-    p === "zai-coding-plan" ||
-    p === "zhipuai" ||
-    p === "zhipuai-coding-plan" ||
-    url.includes("api.z.ai") ||
-    url.includes("open.bigmodel.cn")
-  if (!isZai) return false
-  const id = modelID.toLowerCase()
-  if (id === "glm-4.5" || id === "glm-4.5-air" || id === "glm-4.5-flash" || id === "glm-4.5v") return false
-  return true
-}
-
-const lowerOptions = (request: LLMRequest, supportsStore: boolean) => {
+const lowerOptions = (request: LLMRequest) => {
  const options = OpenAIOptions.resolve(request)
  const cacheKey = ProviderShared.clampPromptCacheKey(request.promptCacheKey)
  return {
-    ...(supportsStore && options.store !== undefined ? { store: options.store } : {}),
-    // For providers that support `store`, ensure stateless `store:false` is sent
-    // even when no explicit `providerOptions.store` was supplied, mirroring the
-    // native OpenAI Chat default. Non-standard providers omit `store` entirely.
-    ...(supportsStore && options.store === undefined ? { store: false } : {}),
+    ...(options.store !== undefined ? { store: options.store } : {}),
    ...(cacheKey ? { prompt_cache_key: cacheKey } : {}),
    ...(options.reasoningEffort ? { reasoning_effort: options.reasoningEffort } : {}),
  }
@@ -674,19 +551,8 @@ export const fromRequest = Effect.fn("OpenAIChat.fromRequest")(function* (
    )
  const generation = request.generation
  const toolSchemaCompatibility = request.model.compatibility?.toolSchema
-  const provider = String(request.model.provider)
-  const baseURL = request.model.route.endpoint.baseURL
-  const detectedMaxTokensField = detectMaxTokensField(provider, baseURL)
-  const maxTokensField = request.model.compatibility?.maxTokensField ?? detectedMaxTokensField
-  const supportsStore = request.model.compatibility?.supportsStore ?? detectSupportsStore(provider, baseURL)
-  const supportsUsageInStreaming =
-    request.model.compatibility?.supportsUsageInStreaming ?? detectSupportsUsageInStreaming()
-  const supportsStrictMode = request.model.compatibility?.supportsStrictMode ?? detectSupportsStrictMode(provider, baseURL)
-  const zaiToolStream =
-    request.model.compatibility?.zaiToolStream ??
-    detectZaiToolStream(provider, baseURL, request.model.id)
+  const maxTokensField = request.model.compatibility?.maxTokensField ?? "max_tokens"
  const hasHistory = hasToolHistory(request.messages)
-  const hasActiveTools = request.tools.length > 0
  return {
    model: request.model.id,
    messages: yield* lowerMessages(request, options),
@@ -700,13 +566,11 @@ export const fromRequest = Effect.fn("OpenAIChat.fromRequest")(function* (
              tool,
              ToolSchemaProjection.modelCompatibility(tool.inputSchema, toolSchemaCompatibility),
              options,
-              supportsStrictMode,
            ),
          ),
    tool_choice: request.toolChoice ? yield* lowerToolChoice(request.toolChoice) : undefined,
    stream: true as const,
-    ...(supportsUsageInStreaming ? { stream_options: { include_usage: true } } : {}),
-    ...(zaiToolStream && hasActiveTools ? { tool_stream: true } : {}),
+    stream_options: { include_usage: true },
    ...(maxTokensField === "max_completion_tokens"
      ? { max_completion_tokens: generation?.maxTokens }
      : { max_tokens: generation?.maxTokens }),
@@ -716,7 +580,7 @@ export const fromRequest = Effect.fn("OpenAIChat.fromRequest")(function* (
    presence_penalty: generation?.presencePenalty,
    seed: generation?.seed,
    stop: generation?.stop,
-    ...lowerOptions(request, supportsStore),
+    ...lowerOptions(request),
  }
 })

@@ -111,10 +111,8 @@ const fromRequest = Effect.fn("OpenAIResponses.fromRequest")(function* (request:
    extension,
  )
  const toolSchemaCompatibility = request.model.compatibility?.toolSchema
-  const parallelToolCalls = OpenResponses.resolveParallelToolCalls(request)
  return {
    ...body,
-    ...(parallelToolCalls === undefined ? {} : { parallel_tool_calls: parallelToolCalls }),
    tools:
      request.tools.length === 0
        ? undefined
@@ -164,7 +162,7 @@ const HOSTED_TOOLS = {
 } as const satisfies ResponsesHostedTools.Definitions

 const step = (state: OpenResponses.ParserState, event: OpenResponses.Event) => {
-  if (event.type === "response.reasoning_text.delta")
+  if (event.type === "response.reasoning_text.delta" || event.type === "response.reasoning_summary.delta")
    return event.item_id
      ? Effect.succeed(OpenResponses.onReasoningDelta(state, event, event.item_id))
      : ProviderShared.eventError(ADAPTER, `${event.type} is missing item_id`)
@@ -155,11 +155,6 @@ export class LanguageModelCompatibility extends Schema.Class<LanguageModelCompat
  reasoningField: Schema.optional(Schema.String),
  maxTokensField: Schema.optional(LanguageModelMaxTokensFieldCompatibility),
  requireFinishReason: Schema.optional(Schema.Boolean),
-  supportsStore: Schema.optional(Schema.Boolean),
-  supportsUsageInStreaming: Schema.optional(Schema.Boolean),
-  supportsStrictMode: Schema.optional(Schema.Boolean),
-  zaiToolStream: Schema.optional(Schema.Boolean),
-  requireSignature: Schema.optional(Schema.Boolean),
 }) {}

 export namespace LanguageModelCompatibility {
@@ -66,7 +66,7 @@ describe("request option precedence", () => {
      expect(prepared.body).toMatchObject({
        model: "gpt-4o-mini",
        stream: true,
-        max_completion_tokens: 30,
+        max_tokens: 30,
        temperature: 0.5,
        top_p: 0.9,
        frequency_penalty: 0.25,
@@ -7,13 +7,7 @@
    "route": "cloudflare-workers-ai",
    "transport": "http",
    "model": "@cf/openai/gpt-oss-20b",
-    "tags": [
-      "prefix:cloudflare-workers-ai",
-      "provider:cloudflare-workers-ai",
-      "tool",
-      "tool-call",
-      "golden"
-    ]
+    "tags": ["prefix:cloudflare-workers-ai", "provider:cloudflare-workers-ai", "tool", "tool-call", "golden"]
  },
  "interactions": [
    {
@@ -24,7 +18,7 @@
        "headers": {
          "content-type": "application/json"
        },
-        "body": "{\"model\": \"@cf/openai/gpt-oss-20b\", \"messages\": [{\"role\": \"system\", \"content\": \"Call tools exactly as requested.\"}, {\"role\": \"user\", \"content\": \"Call get_weather with city exactly Paris.\"}], \"tools\": [{\"type\": \"function\", \"function\": {\"name\": \"get_weather\", \"description\": \"Get current weather for a city.\", \"parameters\": {\"type\": \"object\", \"properties\": {\"city\": {\"type\": \"string\"}}, \"required\": [\"city\"], \"additionalProperties\": false}, \"strict\": false}}], \"tool_choice\": {\"type\": \"function\", \"function\": {\"name\": \"get_weather\"}}, \"stream\": true, \"stream_options\": {\"include_usage\": true}, \"max_tokens\": 120, \"temperature\": 0}"
+        "body": "{\"model\":\"@cf/openai/gpt-oss-20b\",\"messages\":[{\"role\":\"system\",\"content\":\"Call tools exactly as requested.\"},{\"role\":\"user\",\"content\":\"Call get_weather with city exactly Paris.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}}],\"tool_choice\":{\"type\":\"function\",\"function\":{\"name\":\"get_weather\"}},\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":120,\"temperature\":0}"
      },
      "response": {
        "status": 200,
@@ -35,4 +29,4 @@
      }
    }
  ]
-}
+}
@@ -18,15 +18,6 @@ const opus48 = AnthropicMessages.route
  .with({ endpoint: { baseURL: "https://api.anthropic.test/v1/" }, auth: Auth.header("x-api-key", "test") })
  .model({ id: "claude-opus-4-8" })

-const compileUnsignedReasoning = (model: LLMRequest["model"]) =>
-  compileRequest(
-    LLM.request({
-      model,
-      messages: [Message.assistant([{ type: "reasoning", text: "unsigned reasoning" }])],
-      cache: "none",
-    }),
-  )
-
 const request = LLM.request({
  id: "req_1",
  model,
@@ -573,66 +564,6 @@ describe("Anthropic Messages route", () => {
    }),
  )

-  it.effect("demotes unsigned reasoning when signatures are required", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileUnsignedReasoning(model)
-
-      expect(prepared.body.messages).toEqual([
-        { role: "assistant", content: [{ type: "text", text: "unsigned reasoning" }] },
-      ])
-    }),
-  )
-
-  it.effect("infers empty-signature compatibility across Kimi providers", () =>
-    Effect.gen(function* () {
-      const coding = AnthropicMessages.route
-        .with({
-          provider: "kimi-for-coding",
-          endpoint: { baseURL: "https://compatible.test/v1/" },
-          auth: Auth.header("x-api-key", "test"),
-        })
-      const moonshot = AnthropicMessages.route
-        .with({
-          provider: "moonshotai",
-          endpoint: { baseURL: "https://api.moonshot.ai/anthropic" },
-          auth: Auth.bearer("test"),
-        })
-        .model({ id: "kimi-k2.6" })
-      const codingPrepared = yield* compileUnsignedReasoning(coding.model({ id: "k3" }))
-      const moonshotPrepared = yield* compileUnsignedReasoning(moonshot)
-
-      expect(codingPrepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: [{ type: "thinking", thinking: "unsigned reasoning", signature: "" }],
-        },
-      ])
-      expect(moonshotPrepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: [{ type: "thinking", thinking: "unsigned reasoning", signature: "" }],
-        },
-      ])
-    }),
-  )
-
-  it.effect("lets an explicit signature requirement override inference", () =>
-    Effect.gen(function* () {
-      const compatible = AnthropicMessages.route
-        .with({
-          provider: "kimi-for-coding",
-          endpoint: { baseURL: "https://api.kimi.com/coding/v1/" },
-          auth: Auth.header("x-api-key", "test"),
-        })
-        .model({ id: "k3", compatibility: { requireSignature: true } })
-      const prepared = yield* compileUnsignedReasoning(compatible)
-
-      expect(prepared.body.messages).toEqual([
-        { role: "assistant", content: [{ type: "text", text: "unsigned reasoning" }] },
-      ])
-    }),
-  )
-
  it.effect("round-trips redacted thinking as redacted_thinking blocks", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
@@ -47,7 +47,7 @@ describe("OpenAI Chat route", () => {
    Effect.gen(function* () {
      const prepared = yield* compileRequest(request)

-      expect(prepared.body).toMatchObject({
+      expect(prepared.body).toEqual({
        model: "gpt-4o-mini",
        messages: [
          { role: "system", content: "You are concise." },
@@ -55,8 +55,7 @@ describe("OpenAI Chat route", () => {
        ],
        stream: true,
        stream_options: { include_usage: true },
-        store: false,
-        max_completion_tokens: 20,
+        max_tokens: 20,
        temperature: 0,
      })
    }),
@@ -326,7 +325,7 @@ describe("OpenAI Chat route", () => {
        }),
      )

-      expect(prepared.body).toMatchObject({
+      expect(prepared.body).toEqual({
        model: "gpt-4o-mini",
        messages: [
          { role: "user", content: "What is the weather?" },
@@ -346,7 +345,6 @@ describe("OpenAI Chat route", () => {
        tools: [],
        stream: true,
        stream_options: { include_usage: true },
-        store: false,
      })
    }),
  )
@@ -70,7 +70,7 @@ describe("OpenAI-compatible Chat route", () => {
        baseURL: "https://api.deepseek.test/v1/",
        query: { "api-version": "2026-01-01" },
      })
-      expect(prepared.body).toMatchObject({
+      expect(prepared.body).toEqual({
        model: "deepseek-chat",
        messages: [
          { role: "system", content: "You are concise." },
@@ -79,7 +79,7 @@ describe("OpenAI-compatible Chat route", () => {
        tools: [
          {
            type: "function",
-            function: { name: "lookup", description: "Lookup data", parameters: { type: "object" }, strict: false },
+            function: { name: "lookup", description: "Lookup data", parameters: { type: "object" } },
          },
        ],
        tool_choice: "required",
@@ -130,7 +130,7 @@ describe("OpenAI-compatible Chat route", () => {
    Effect.gen(function* () {
      const prepared = yield* compileRequest(request)

-      expect(prepared.body).toMatchObject({
+      expect(prepared.body).toEqual({
        model: "deepseek-chat",
        messages: [
          { role: "system", content: "You are concise." },
@@ -158,29 +158,6 @@ describe("OpenAI-compatible Chat route", () => {
    }),
  )

-  it.effect("enables ZAI tool streaming except for GLM 4.5 models", () =>
-    Effect.gen(function* () {
-      const prepare = (provider: string, baseURL: string, id: string) =>
-        compileRequest(
-          LLM.request({
-            model: OpenAICompatibleChat.route.with({ provider, endpoint: { baseURL } }).model({ id }),
-            prompt: "Use a tool.",
-            tools: [ToolDefinition.make({ name: "lookup", description: "Lookup data", inputSchema: {} })],
-          }),
-        )
-
-      const current = yield* prepare("zai", "https://api.z.ai/api/paas/v4", "glm-4.7")
-      expect(current.body).toMatchObject({ tool_stream: true })
-
-      const legacy = yield* Effect.all(
-        ["glm-4.5", "glm-4.5-air", "glm-4.5-flash", "glm-4.5v"].map((id) =>
-          prepare("zhipuai", "https://open.bigmodel.cn/api/paas/v4", id),
-        ),
-      )
-      legacy.forEach((item) => expect(item.body).not.toHaveProperty("tool_stream"))
-    }),
-  )
-
  it.effect("matches AI SDK compatible tool request body fixture", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
@@ -203,7 +180,7 @@ describe("OpenAI-compatible Chat route", () => {
        }),
      )

-      expect(prepared.body).toMatchObject({
+      expect(prepared.body).toEqual({
        model: "deepseek-chat",
        messages: [
          { role: "user", content: "What is the weather?" },
@@ -227,7 +204,6 @@ describe("OpenAI-compatible Chat route", () => {
              name: "lookup",
              description: "Lookup data",
              parameters: { type: "object", properties: { query: { type: "string" } }, required: ["query"] },
-              strict: false,
            },
          },
        ],
@@ -132,40 +132,6 @@ describe("Open Responses-compatible route", () => {
    }),
  )

-  it.effect("lowers canonical parallel tool control", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-      }).model("example-model")
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          prompt: "Read the file.",
-          tools: [
-            ToolDefinition.make({
-              name: "read",
-              description: "Read a file.",
-              inputSchema: { type: "object" },
-            }),
-          ],
-          toolChoice: { type: "auto", disableParallelToolUse: true },
-        }),
-      )
-
-      expect(prepared.body.parallel_tool_calls).toBe(false)
-      expect(prepared.body.tools).toEqual([
-        {
-          type: "function",
-          name: "read",
-          description: "Read a file.",
-          parameters: { type: "object" },
-          strict: false,
-        },
-      ])
-    }),
-  )
-
  it.effect("keeps foreign item id grammars but drops malformed ids", () =>
    Effect.gen(function* () {
      const model = configure({
@@ -258,31 +258,6 @@ describe("OpenAI Responses route", () => {
    }),
  )

-  it.effect("maps the canonical parallel tool setting with provider-option precedence", () =>
-    Effect.gen(function* () {
-      const disabled = yield* compileRequest(
-        LLMRequest.update(request, {
-          toolChoice: { type: "auto", disableParallelToolUse: true },
-        }),
-      )
-      const enabled = yield* compileRequest(
-        LLMRequest.update(request, {
-          toolChoice: { type: "auto", disableParallelToolUse: false },
-        }),
-      )
-      const overridden = yield* compileRequest(
-        LLMRequest.update(request, {
-          toolChoice: { type: "auto", disableParallelToolUse: true },
-          providerOptions: { parallelToolCalls: true },
-        }),
-      )
-
-      expect(disabled.body.parallel_tool_calls).toBe(false)
-      expect(enabled.body.parallel_tool_calls).toBe(true)
-      expect(overridden.body.parallel_tool_calls).toBe(true)
-    }),
-  )
-
  it.effect("lowers chronological system updates to developer messages in order", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
@@ -101,7 +101,7 @@ describe("LLMClient tools", () => {
      const messages = Reflect.get(second, "messages")
      const tools = Reflect.get(second, "tools")

-      expect(Reflect.get(second, "max_completion_tokens")).toBe(50)
+      expect(Reflect.get(second, "max_tokens")).toBe(50)
      expect(Reflect.get(second, "tool_choice")).toBe("auto")
      expect(tools).toHaveLength(1)
      expect(
@@ -126,8 +126,6 @@ test("routes typing to the composer unless the open terminal is focused", async

  const composer = page.locator('[data-component="composer-editor"]')
  const terminal = page.locator('[data-component="terminal"]')
-  await composer.click()
-  await expect(composer).toBeFocused()
  await page.keyboard.press("Control+Backquote")
  await expect(terminal).toBeVisible()
  await expect.poll(() => terminal.evaluate((element) => element.contains(document.activeElement))).toBe(true)
@@ -193,9 +193,9 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
  }

  const openTerminal = () => {
-    actions.session.layout.view().terminal.open()
    if (terminal.all().length > 0) terminal.new({ focus: true })
    if (terminal.all().length === 0) terminal.requestFocus()
+    actions.session.layout.view().terminal.open()
  }

  const closeTerminal = () => {
@@ -361,8 +361,8 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
          actions.session.layout.view().terminal.close()
          return
        }
-        actions.session.layout.view().terminal.open()
        terminal.requestFocus(terminal.active())
+        actions.session.layout.view().terminal.open()
      },
    }),
    viewCommand({
@@ -1,14 +1,7 @@
-import { Argument, Flag, GlobalFlag } from "effect/unstable/cli"
+import { Argument, Flag } from "effect/unstable/cli"
 import { Schema } from "effect"
 import { Spec } from "../framework/spec"

-export const PrintLogs = GlobalFlag.setting("print-logs")({
-  flag: Flag.boolean("print-logs").pipe(
-    Flag.withDescription("Print logs to stderr (server logs require --standalone)"),
-    Flag.withDefault(false),
-  ),
-})
-
 declare const OPENCODE_CLI_NAME: string | undefined

 const ServerParams = {
@@ -1,6 +1,5 @@
 import { Effect, FileSystem, Scope } from "effect"
 import { Command } from "effect/unstable/cli"
-import { PrintLogs } from "../commands/commands"
 import { Spec } from "./spec"
 import { Global } from "@opencode-ai/util/global"
 import { Updater } from "../services/updater"
@@ -78,11 +77,7 @@ export function handlers<const Root extends Spec.Any>(root: Root, handlers: Hand
 }

 export function run(commands: Spec.Any, handlers: ReadonlyArray<LazyHandler>, options: { readonly version: string }) {
-  return Command.run(provide(commands, handlers).pipe(Command.withGlobalFlags([PrintLogs])), options) as Effect.Effect<
-    void,
-    unknown,
-    Command.Environment
-  >
+  return Command.run(provide(commands, handlers), options) as Effect.Effect<void, unknown, Command.Environment>
 }

 function provide(node: Spec.Any, handlers: ReadonlyArray<LazyHandler>): ProvidedCommand {
@@ -91,7 +86,6 @@ function provide(node: Spec.Any, handlers: ReadonlyArray<LazyHandler>): Provided
    ? node.spec.pipe(
        Command.withHandler((input) =>
          Effect.gen(function* () {
-            if (yield* PrintLogs) process.env.OPENCODE_PRINT_LOGS = "1"
            const module = yield* Effect.promise(handler.load)
            return yield* module.default(input)
          }),
@@ -3,12 +3,16 @@ import {
  Command,
  Connection,
  Credential,
+  Effect,
  Integration,
+  Mcp,
  Model,
  Plugin,
  Provider,
  Reference,
+  Schema,
  Skill,
+  WebSearch,
 } from "@opencode-ai/plugin/effect"
 import { Tool } from "@opencode-ai/schema/tool"

@@ -18,11 +22,15 @@ const key = Symbol.for("opencode.plugin.v2.effect")
  Command,
  Connection,
  Credential,
+  Effect,
  Integration,
+  Mcp,
  Model,
  Plugin,
  Provider,
  Reference,
+  Schema,
  Skill,
+  WebSearch,
  Tool: { Error: Tool.Error },
 }
@@ -4,11 +4,13 @@ import {
  Connection,
  Credential,
  Integration,
+  Mcp,
  Model,
  Plugin,
  Provider,
  Reference,
  Skill,
+  WebSearch,
 } from "@opencode-ai/plugin"

 const key = Symbol.for("opencode.plugin.v2.promise")
@@ -18,9 +20,11 @@ const key = Symbol.for("opencode.plugin.v2.promise")
  Connection,
  Credential,
  Integration,
+  Mcp,
  Model,
  Plugin,
  Provider,
  Reference,
  Skill,
+  WebSearch,
 }
@@ -27,7 +27,7 @@ function command(password: string, options: Options) {
    // The server treats EOF on this pipe as the end of its ownership lease.
    // The OS closes it even when the TUI is killed before Effect finalizers run.
    stdin: "pipe",
-    stderr: process.env.OPENCODE_PRINT_LOGS === "1" ? "inherit" : "ignore",
+    stderr: "ignore",
    killSignal: "SIGTERM",
    forceKillAfter: "3 seconds",
  })
@@ -127,14 +127,17 @@ export const Command = sdk.Command
 export const Connection = sdk.Connection
 export const Credential = sdk.Credential
 export const Integration = sdk.Integration
+export const Mcp = sdk.Mcp
 export const Model = sdk.Model
 export const Plugin = sdk.Plugin
 export const Provider = sdk.Provider
 export const Reference = sdk.Reference
-export const Skill = sdk.Skill`
+export const Skill = sdk.Skill
+export const WebSearch = sdk.WebSearch`
  const effectModule = promiseModule
    .replace("opencode.plugin.v2.promise", "opencode.plugin.v2.effect")
    .replace("Promise plugin", "Effect plugin")
+    .concat("\nexport const Effect = sdk.Effect\nexport const Schema = sdk.Schema")
  const promisePluginModule = `const sdk = globalThis[Symbol.for("opencode.plugin.v2.promise")]
 if (!sdk) throw new Error("OpenCode Promise plugin SDK is unavailable")
 export const define = sdk.Plugin.define`
@@ -32,38 +32,3 @@ const result = await Bun.build({
  },
 })
 if (!result.success) throw new AggregateError(result.logs, "Failed to build Core")
-
-// Bun's Node target eagerly creates its shared require helper, so every split
-// entry evaluates import.meta.url even when it never requires a module. Keep
-// the helper lazy until Bun stops hoisting it into workerd-reachable chunks.
-// https://github.com/oven-sh/bun/issues/12615
-const eagerRequire = "var __require = /* @__PURE__ */ createRequire(import.meta.url);"
-const lazyRequire = `var __require = (specifier) => createRequire(import.meta.url ?? "file:///worker.js")(specifier);
-__require.resolve = (specifier, options) => createRequire(import.meta.url ?? "file:///worker.js").resolve(specifier, options);`
-const rewritten = await Promise.all(
-  result.outputs.map(async (output) => {
-    if (!output.path.endsWith(".js")) return false
-    const source = await output.text()
-
-    const generatedUses = source
-      .replace(/import\s*\{[^}]*\b__require\b[^}]*\}\s*from\s*["'][^"']+["'];/g, "")
-      .replace(/export\s*\{[^}]*\b__require\b[^}]*\};/g, "")
-      .replace(eagerRequire, "")
-    if (/\bnew\s+__require\s*\(/.test(generatedUses))
-      throw new Error(`Unsupported generated require constructor in ${output.path}`)
-    const unsupported = generatedUses
-      .replace(/\b__require\.resolve\s*\(/g, "")
-      .replace(/\b__require\s*\(/g, "")
-    if (/\b__require\b/.test(unsupported)) throw new Error(`Unsupported generated require usage in ${output.path}`)
-
-    if (!source.includes(eagerRequire)) return false
-    if (source.indexOf(eagerRequire) !== source.lastIndexOf(eagerRequire))
-      throw new Error(`Multiple eager require helpers in ${output.path}`)
-    const rewrittenSource = source.replace(eagerRequire, lazyRequire)
-    if (rewrittenSource.includes(eagerRequire)) throw new Error(`Failed to rewrite eager require helper in ${output.path}`)
-    await Bun.write(output.path, rewrittenSource)
-    return true
-  }),
-)
-if (rewritten.filter(Boolean).length !== 1)
-  throw new Error("Expected exactly one eager require helper; Bun may have fixed #12615 and made this shim removable")
@@ -572,7 +572,7 @@ function cacheKey(source: string) {
 }

 export function bodyDigest(text: string) {
-  return Hash.sha256(text)
+  return new Bun.CryptoHasher("sha256").update(text).digest("hex")
 }

 export const layer = (options?: Options) =>
@@ -2,6 +2,7 @@ export * as PluginSupervisor from "./supervisor.js"
 export { Service, type Interface } from "./supervisor-service.js"

 import type { Plugin as PluginDefinition } from "@opencode-ai/plugin/effect/plugin"
+import { instanceSafeContext } from "@opencode-ai/plugin/effect/tool-schema"
 import { Event } from "@opencode-ai/schema/config"
 import { Cause, Effect, Latch, Layer, Schema, Stream } from "effect"
 import path from "path"
@@ -126,7 +127,7 @@ const load = Effect.fn("PluginSupervisor.load")(function* (
    tui: plugin.tui,
    version: JSON.stringify(operation),
    source: pluginSource(operation.target),
-    effect: (host) => plugin.effect({ ...host, options: operation.options }),
+    effect: (host) => plugin.effect(instanceSafeContext({ ...host, options: operation.options })),
  } satisfies Plugin.Versioned
 })

@@ -1,2 +1,2 @@
-export * as SessionMessage from "@opencode-ai/schema/session-message"
+export * as SessionMessage from "./message.js"
 export * from "@opencode-ai/schema/session-message"
@@ -1,4 +1,4 @@
-export * as SessionSchema from "@opencode-ai/schema/session"
+export * as SessionSchema from "./schema.js"

 import { Session } from "@opencode-ai/schema/session"

@@ -49,12 +49,7 @@ type ToolRow = {
  duration: number | null
 }

-type ToolSummaryRow = {
-  calls: number
-  succeeded: number
-  failed: number
-  unfinished: number
-}
+type ToolSummaryRow = { status: string | null; count: number }

 type ModelAggregate = {
  model: Model.Ref
@@ -193,38 +188,25 @@ export const get = Effect.fn("SessionStats.get")(function* (input: Input = {}) {
      (range) => {
        if (toolMode === "summary")
          return db
-            .get<ToolSummaryRow>(
+            .all<ToolSummaryRow>(
              sql`
-            WITH calls AS MATERIALIZED (
-              SELECT json_extract(content.value, '$.state.status') AS status
-              FROM ${SessionMessageTable} AS message
-              JOIN ${SessionTable} AS session ON session.id = message.session_id,
-                json_each(message.data, '$.content') AS content
-              WHERE message.type = 'assistant'
-                AND message.time_created >= ${range.from}
-                AND message.time_created < ${range.to}
-                AND (session.fork_session_id IS NULL OR message.time_created >= session.time_created)
-                AND json_extract(content.value, '$.type') = 'tool'
-                ${project}
-            )
-            SELECT
-              count(*) AS calls,
-              count(*) FILTER (WHERE status = 'completed') AS succeeded,
-              count(*) FILTER (WHERE status = 'error') AS failed,
-              count(*) FILTER (WHERE status IS NULL OR status NOT IN ('completed', 'error')) AS unfinished
-            FROM calls
+            SELECT json_extract(content.value, '$.state.status') AS status, count(*) AS count
+            FROM ${SessionMessageTable} AS message
+            JOIN ${SessionTable} AS session ON session.id = message.session_id,
+              json_each(message.data, '$.content') AS content
+            WHERE message.type = 'assistant'
+              AND message.time_created >= ${range.from}
+              AND message.time_created < ${range.to}
+              AND (session.fork_session_id IS NULL OR message.time_created >= session.time_created)
+              AND json_extract(content.value, '$.type') = 'tool'
+              ${project}
+            GROUP BY status
          `,
            )
            .pipe(
              Effect.orDie,
-              Effect.tap((row) =>
-                Effect.sync(() => {
-                  if (!row) return
-                  toolTotals.calls += row.calls
-                  toolTotals.succeeded += row.succeeded
-                  toolTotals.failed += row.failed
-                  toolTotals.unfinished += row.unfinished
-                }),
+              Effect.tap((rows) =>
+                Effect.sync(() => rows.forEach((row) => addToolStatus(toolTotals, row.status, row.count))),
              ),
              Effect.asVoid,
            )
@@ -1,5 +1,4 @@
-import { Plugin } from "@opencode-ai/plugin/effect"
-import { Effect } from "effect"
+import { Effect, Plugin } from "@opencode-ai/plugin/effect"

 export default Plugin.define({
  id: "config-effect-plugin",
@@ -113,13 +113,6 @@ describe("SessionStats", () => {
                  completed: DateTime.makeUnsafe(Date.UTC(2026, 0, 2, 10, 0, 2)),
                },
              }),
-              SessionMessage.AssistantTool.make({
-                type: "tool",
-                id: "call_pending",
-                name: "pending",
-                state: SessionMessage.ToolStateRunning.make({ status: "running", input: {}, metadata: {} }),
-                time: { created: DateTime.makeUnsafe(Date.UTC(2026, 0, 2, 10)) },
-              }),
            ]),
          ),
          messageRow(childID, 1, assistant("msg_stats_child", Date.UTC(2026, 0, 3, 10), [], "large", 2)),
@@ -217,7 +210,7 @@ describe("SessionStats", () => {
      expect(stats.cost).toBe(Money.USD.make(6.25))
      expect(stats.tools).toMatchObject({
        mode: "detail",
-        totals: { calls: 3, succeeded: 1, failed: 1, unfinished: 1 },
+        totals: { calls: 2, succeeded: 1, failed: 1, unfinished: 0 },
      })
      expect(stats.activity).toEqual([
        { date: "2026-01-02", steps: 1 },
@@ -231,7 +224,6 @@ describe("SessionStats", () => {
      expect(stats.tools.usage).toMatchObject([
        { name: "read", calls: 1, succeeded: 1, failed: 0, durationP50: 250 },
        { name: "edit", calls: 1, succeeded: 0, failed: 1, durationP50: 2_000 },
-        { name: "pending", calls: 1, succeeded: 0, failed: 0, unfinished: 1 },
      ])

      const summary = yield* SessionStats.get({
@@ -242,7 +234,7 @@ describe("SessionStats", () => {
      expect(summary.models.map((model) => String(model.model.id))).toEqual(["large", "sonnet", "fork-new"])
      expect(summary.tools).toEqual({
        mode: "summary",
-        totals: { calls: 3, succeeded: 1, failed: 1, unfinished: 1 },
+        totals: { calls: 2, succeeded: 1, failed: 1, unfinished: 0 },
      })

      const withoutTools = yield* SessionStats.get({
@@ -10,7 +10,6 @@
    "./plugin": "./src/plugin.ts"
  },
  "scripts": {
-    "audit:layouts": "bun run script/layout-audit.ts",
    "test": "bun test --timeout 30000 --only-failures",
    "typecheck": "tsgo --noEmit"
  },
@@ -1,98 +0,0 @@
-import { mkdir } from "node:fs/promises"
-import { dirname, resolve } from "node:path"
-import {
-  auditAllFixtures,
-  summarizeAudits,
-  worstAudits,
-  type LayoutAudit,
-  type LayoutMetrics,
-} from "../src/test/layout-audit/harness.js"
-
-const outputPath = resolve(import.meta.dir, "../../../tmp/merman-layout-audit.md")
-const startedAt = performance.now()
-const audits = auditAllFixtures()
-const elapsedMs = performance.now() - startedAt
-const summary = summarizeAudits(audits)
-
-function label(audit: LayoutAudit): string {
-  return `${audit.fixture.id} @${audit.viewport}`
-}
-
-function metricTable(items: readonly LayoutAudit[]): string {
-  return [
-    "| Fixture | Viewport | Size | Area | Route length | Bends | Crossings | Shared cells | Overflow |",
-    "| --- | ---: | ---: | ---: | ---: | ---: | ---: | ---: | ---: |",
-    ...items.map(
-      (audit) =>
-        `| \`${audit.fixture.id}\` | ${audit.viewport} | ${audit.metrics.width}x${audit.metrics.height} | ${audit.metrics.area} | ${audit.metrics.routeLength} | ${audit.metrics.bends} | ${audit.metrics.crossings} | ${audit.metrics.sharedRouteCells} | ${audit.metrics.overflow} |`,
-    ),
-  ].join("\n")
-}
-
-function worstSection(metric: keyof LayoutMetrics): string {
-  const worst = worstAudits(audits, metric)
-  return [`### ${metric}`, "", metricTable(worst)].join("\n")
-}
-
-function fixtureSection(audit: LayoutAudit): string {
-  return [
-    `<details${audit.fixture.curated || audit.violations.length > 0 ? " open" : ""}>`,
-    `<summary><code>${label(audit)}</code> · ${audit.metrics.width}x${audit.metrics.height} · area ${audit.metrics.area} · bends ${audit.metrics.bends} · crossings ${audit.metrics.crossings} · overflow ${audit.metrics.overflow}</summary>`,
-    "",
-    ...(audit.violations.length > 0 ? ["Violations:", "", ...audit.violations.map((item) => `- ${item}`), ""] : []),
-    "Source:",
-    "",
-    "```mermaid",
-    audit.fixture.source,
-    "```",
-    "",
-    "Rendered output:",
-    "",
-    "```text",
-    audit.output,
-    "```",
-    "",
-    "</details>",
-  ].join("\n")
-}
-
-const grouped = Map.groupBy(audits, (audit) => `${audit.fixture.kind}/${audit.fixture.family}`)
-const violations = audits.flatMap((audit) => audit.violations.map((violation) => `${label(audit)}: ${violation}`))
-const markdown = [
-  "# Merman Layout Audit",
-  "",
-  `Generated from ${new Set(audits.map((audit) => audit.fixture.id)).size} sources and ${audits.length} layout runs.`,
-  "",
-  `Structural violations: **${violations.length}**`,
-  "",
-  "## Aggregate Metrics",
-  "",
-  "```json",
-  JSON.stringify(summary, null, 2),
-  "```",
-  "",
-  "## Worst Offenders",
-  "",
-  ...(["area", "bends", "crossings", "sharedRouteCells", "overflow"] as const).flatMap((metric) => [
-    worstSection(metric),
-    "",
-  ]),
-  "## Fixtures",
-  "",
-  ...[...grouped.entries()].flatMap(([family, items]) => [
-    `### ${family}`,
-    "",
-    metricTable(items),
-    "",
-    ...items.flatMap((audit) => [fixtureSection(audit), ""]),
-  ]),
-].join("\n")
-
-await mkdir(dirname(outputPath), { recursive: true })
-await Bun.write(outputPath, markdown)
-
-console.log(`Wrote ${audits.length} layout runs to ${outputPath} in ${elapsedMs.toFixed(0)}ms`)
-if (violations.length > 0) {
-  console.error(violations.join("\n"))
-  process.exitCode = 1
-}
@@ -43,9 +43,8 @@ function mergeFlowchartCell(
  if (incoming.style !== "edge") return incoming
  if (existing.style === "label") return existing
  if (incoming.char === " ") return existing
-  if (existing.style !== "edge" || existing.char === " ") return incoming
-  if (DIAGRAM_ARROW_HEADS.has(existing.char)) return existing
-  if (DIAGRAM_ARROW_HEADS.has(incoming.char)) return incoming
+  if ((existing.style !== "edge" && existing.style !== "group") || existing.char === " ") return incoming
+  if (DIAGRAM_ARROW_HEADS.has(existing.char) || DIAGRAM_ARROW_HEADS.has(incoming.char)) return incoming

  return {
    ...incoming,
@@ -76,23 +75,22 @@ function drawNode(
 ): void {
  const chars = BorderChars[borderStyle]
  const style: FlowchartCellStyle = node.shape === "database" ? "database" : "node"
-  const border: FlowchartCellStyle = node.shape === "database" ? "databaseBorder" : "nodeBorder"

  if (node.shape === "decision") {
    drawDiagramDiamond(
      bounds,
-      (x, y, char) => grid.setCell(x, y, char, border),
+      (x, y, char) => grid.setCell(x, y, char, style),
      diagramDiamondCharactersFromBorder(chars),
    )
  } else if (node.shape === "subroutine") {
    fillDiagramFrameInterior(bounds, (x, y) => grid.setCell(x, y, " ", style))
-    drawSubroutineNode(grid, bounds, chars, border)
+    drawSubroutineNode(grid, bounds, chars, style)
  } else if (node.shape === "database") {
    fillDiagramFrameInterior(bounds, (x, y) => grid.setCell(x, y, " ", style))
-    drawDatabaseNode(grid, bounds, chars, border)
+    drawDatabaseNode(grid, bounds, chars, style)
  } else {
    fillDiagramFrameInterior(bounds, (x, y) => grid.setCell(x, y, " ", style))
-    drawDiagramFrame(bounds, chars, (x, y, char) => grid.setCell(x, y, char, border))
+    drawDiagramFrame(bounds, chars, (x, y, char) => grid.setCell(x, y, char, style))
  }

  const textTop =
@@ -272,7 +270,7 @@ function drawSourceConnectors(
    const connectorDirection = flowchartDirectionBetween(sourcePoint, connector)
    if (routeDirection && connectorDirection) {
      const cell = grid.getCell(sourcePoint.x, sourcePoint.y)
-      if (cell && cell.style !== "label" && !DIAGRAM_ARROW_HEADS.has(cell.char)) {
+      if (cell && cell.style !== "label") {
        grid.replaceCell(
          sourcePoint.x,
          sourcePoint.y,
@@ -1,10 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import { parseColor, TextAttributes } from "@opentui/core"
 import stringWidth from "string-width"
-import { diagramArrowHeadBetween } from "../core/drawing.js"
-import { orthogonalPathPoints } from "../core/geometry.js"
 import { expectDiagram } from "../test/diagram.js"
-import { deploymentArchitectureSource } from "../test/layout-audit/fixtures.js"
 import { drawFlowchartDiagramGrid as drawParsedFlowchartDiagramGrid } from "./drawing.js"
 import {
  DEFAULT_MIN_RANK_GAP,
@@ -38,7 +35,7 @@ function routeRunsAlongHorizontalBorder(
    const from = route.points[index - 1]!
    const to = route.points[index]!
    if (from.y !== to.y || !borderYs.has(from.y)) continue
-    if (Math.min(Math.max(from.x, to.x), right) > Math.max(Math.min(from.x, to.x), left)) return true
+    if (Math.max(from.x, to.x) >= left && Math.min(from.x, to.x) <= right) return true
  }
  return false
 }
@@ -55,7 +52,7 @@ function routeRunsAlongVerticalBorder(
    const from = route.points[index - 1]!
    const to = route.points[index]!
    if (from.x !== to.x || !borderXs.has(from.x)) continue
-    if (Math.min(Math.max(from.y, to.y), bottom) > Math.max(Math.min(from.y, to.y), top)) return true
+    if (Math.max(from.y, to.y) >= top && Math.min(from.y, to.y) <= bottom) return true
  }
  return false
 }
@@ -117,111 +114,6 @@ function boundsIntersect(
  )
 }

-function boundsContains(
-  outer: { left: number; top: number; width: number; height: number },
-  inner: { left: number; top: number; width: number; height: number },
-): boolean {
-  return (
-    inner.left >= outer.left &&
-    inner.top >= outer.top &&
-    inner.left + inner.width <= outer.left + outer.width &&
-    inner.top + inner.height <= outer.top + outer.height
-  )
-}
-
-function routesIntersect(
-  left: { points: readonly { x: number; y: number }[] },
-  right: { points: readonly { x: number; y: number }[] },
-): boolean {
-  const occupied = new Set(orthogonalPathPoints(left.points).map((point) => `${point.x}:${point.y}`))
-  return orthogonalPathPoints(right.points).some((point) => occupied.has(`${point.x}:${point.y}`))
-}
-
-function renderedDimensions(output: string): { width: number; height: number } {
-  const lines = output.split("\n")
-  return { width: Math.max(...lines.map((line) => stringWidth(line))), height: lines.length }
-}
-
-function expectResponsiveFlowchartValid(content: string, layoutMaxWidth: number) {
-  const diagram = parseMermaidFlowchartDiagram(content)
-  const options = { compact: true, layoutMaxWidth }
-  const layout = layoutParsedFlowchartDiagram(diagram, options)
-  const grid = drawParsedFlowchartDiagramGrid(diagram, options)
-  const output = renderFlowchartDiagram(content, options)
-  const nodes = [...layout.bounds.values()]
-
-  expect(layout.diagram.direction).toBe("TD")
-  for (let left = 0; left < nodes.length; left++) {
-    for (let right = left + 1; right < nodes.length; right++) {
-      expect(boundsIntersect(nodes[left]!, nodes[right]!)).toBe(false)
-    }
-  }
-  for (const route of layout.routes) {
-    expect(route.points.length).toBeGreaterThanOrEqual(2)
-    for (let index = 1; index < route.points.length; index++) {
-      const from = route.points[index - 1]!
-      const to = route.points[index]!
-      expect(from.x === to.x || from.y === to.y).toBe(true)
-    }
-    expect(terminalPointsTowardBounds(route, layout.bounds.get(route.edge.to)!)).toBe(true)
-    const end = route.points.at(-1)!
-    expect(grid.getCell(end.x, end.y)?.char).toBe(diagramArrowHeadBetween(route.points.at(-2)!, end))
-    if (route.edge.label) expect(output).toContain(route.edge.label)
-  }
-  expectFlowchartRoutesAvoidUnrelatedNodes(layout)
-
-  for (const subgraph of diagram.subgraphs ?? []) {
-    const frame = layout.subgraphBounds.get(subgraph.id)!
-    for (const nodeId of subgraph.nodeIds) expect(boundsContains(frame, layout.bounds.get(nodeId)!)).toBe(true)
-    expect(output).toContain(subgraph.label)
-  }
-  for (const node of layout.bounds.values()) {
-    for (const line of node.lines) expect(output).toContain(line)
-  }
-
-  const widestContent = Math.max(
-    ...nodes.map((node) => node.width),
-    ...layout.routes.flatMap((route) =>
-      route.edge.label ? [flowchartRouteLabelLayout(route, visualLength).width] : [],
-    ),
-  )
-  const dimensions = renderedDimensions(output)
-  expect(Math.max(...output.split("\n").map((line) => stringWidth(line)))).toBeLessThanOrEqual(
-    layoutMaxWidth + widestContent + 4,
-  )
-  return { dimensions, layout, output }
-}
-
-function generatedWideRankFlowchart(count: number): string {
-  const labels = [
-    "地域 gateway Ω",
-    "界面 worker λ",
-    "Long-running synchronization service",
-    "Cache café 🚀",
-    "Audit and observability pipeline",
-    "Provider μ endpoint",
-    "Fallback Ж service",
-    "Archive 数据 lake",
-    "Terminal résumé queue",
-  ]
-  const branches = labels
-    .slice(0, count)
-    .flatMap((label, index) => [
-      `    Hub ${index === 0 ? "-->|dispatch across regions and providers|" : "-->"} N${index}[${label}]`,
-      `    N${index} --> Join`,
-    ])
-  return [
-    "flowchart LR",
-    "  Start[Client α] --> Hub",
-    "  subgraph Services [地域 services Ω]",
-    "    Hub[Dispatch hub]",
-    ...branches,
-    "    Join[Join results]",
-    "  end",
-    "  Join --> Done[Complete ✓]",
-  ].join("\n")
-}
-
 function expectFlowchartRoutesAvoidUnrelatedNodes(layout: ReturnType<typeof layoutFlowchartDiagram>): void {
  for (const route of layout.routes) {
    for (const [id, bounds] of layout.bounds) {
@@ -435,52 +327,6 @@ describe("FlowchartDiagram", () => {
    `)
  })

-  test.each(
-    (["LR", "RL", "TD", "TB", "BT"] as const).flatMap((direction) =>
-      [false, true].map((compact) => ({ direction, compact })),
-    ),
-  )(
-    "preserves every target arrowhead after painting $direction routes with compact=$compact",
-    ({ direction, compact }) => {
-      const content = `flowchart ${direction}
-  A[A]
-  B[B]
-  C[C]
-  D[D]
-  A --> A
-  A --> C
-  C --> B`
-      const diagram = parseMermaidFlowchartDiagram(content)
-      const layout = layoutParsedFlowchartDiagram(diagram, { compact })
-      const grid = drawParsedFlowchartDiagramGrid(diagram, { compact })
-
-      for (const route of layout.routes) {
-        const end = route.points.at(-1)!
-        expect(grid.getCell(end.x, end.y)?.char).toBe(diagramArrowHeadBetween(route.points.at(-2)!, end))
-      }
-    },
-  )
-
-  test.each(
-    (["LR", "RL", "TD", "TB", "BT"] as const).flatMap((direction) =>
-      [false, true].map((compact) => ({ direction, compact })),
-    ),
-  )("keeps crossed endpoint-disjoint $direction routes separate with compact=$compact", ({ direction, compact }) => {
-    const layout = layoutFlowchartDiagram(
-      `flowchart ${direction}
-  A[A]
-  B[B]
-  C[C]
-  D[D]
-  A --> C
-  D --> B`,
-      { compact },
-    )
-
-    expect(layout.routes).toHaveLength(2)
-    expect(routesIntersect(layout.routes[0]!, layout.routes[1]!)).toBe(false)
-  })
-
  test("keeps vertical feedback labels clear of unrelated nodes", () => {
    const content = `flowchart TD
  S[Source] --> A[Alpha]
@@ -767,7 +613,6 @@ describe("FlowchartDiagram", () => {
      const loops = layout.routes.filter((route) => route.edge.from === "B" && route.edge.to === "B")

      expect(loops).toHaveLength(3)
-      expect(new Set(loops.map((route) => JSON.stringify(route.points))).size).toBe(3)
    },
  )

@@ -966,119 +811,6 @@ describe("FlowchartDiagram", () => {
    `)
  })

-  test("wraps the real deployment chart responsively without losing content or geometry", () => {
-    const expected = new Map([
-      [60, { width: 82, height: 108 }],
-      [80, { width: 97, height: 85 }],
-      [120, { width: 143, height: 77 }],
-      [160, { width: 163, height: 69 }],
-    ])
-    const results = [...expected].map(([budget, dimensions]) => {
-      const result = expectResponsiveFlowchartValid(deploymentArchitectureSource, budget)
-      expect(result.dimensions).toEqual(dimensions)
-      for (const frame of result.layout.subgraphBounds.values()) {
-        for (const other of result.layout.subgraphBounds.values()) {
-          if (frame !== other) expect(boundsIntersect(frame, other)).toBe(false)
-        }
-      }
-      return result.dimensions
-    })
-
-    for (let index = 1; index < results.length; index++) {
-      expect(results[index - 1]!.width).toBeLessThan(results[index]!.width)
-    }
-  })
-
-  test.each([7, 9])("wraps generated %s-node Unicode subgraph ranks across width targets", (count) => {
-    const results = [60, 80, 120].map(
-      (budget) => expectResponsiveFlowchartValid(generatedWideRankFlowchart(count), budget).dimensions,
-    )
-
-    for (let index = 1; index < results.length; index++) {
-      expect(results[index - 1]!.width).toBeLessThan(results[index]!.width)
-      expect(results[index - 1]!.height).toBeGreaterThanOrEqual(results[index]!.height)
-    }
-  })
-
-  test("keeps responsive local-direction subgraphs clear of sibling nodes", () => {
-    const layout = layoutFlowchartDiagram(
-      `flowchart BT
-  N0[Outside zero]
-  subgraph Outer
-    N2[Two]
-    subgraph Inner
-      direction LR
-      N3[Three]
-      N4[Four]
-    end
-    N5[X]
-  end
-  N7[Outside seven]
-  N7 --> N2
-  N2 -->|label 6| N5
-  N5 --> N4
-  N0 --> N7`,
-      { compact: true, layoutMaxWidth: 35 },
-    )
-    const nodes = [...layout.bounds.values()]
-
-    for (let left = 0; left < nodes.length; left++) {
-      for (let right = left + 1; right < nodes.length; right++) {
-        expect(boundsIntersect(nodes[left]!, nodes[right]!)).toBe(false)
-      }
-    }
-  })
-
-  test("keeps responsive sibling subgraph frames and long titles disjoint", () => {
-    const layout = layoutFlowchartDiagram(
-      `flowchart TD
-  subgraph Parent
-    direction LR
-    subgraph Left [A deliberately long left group title]
-      direction LR
-      A1[One] --> A2[Two]
-    end
-    subgraph Right [A deliberately long right group title]
-      direction LR
-      B1[Three] --> B2[Four]
-    end
-    A2 --> B1
-  end`,
-      { compact: true, layoutMaxWidth: 35 },
-    )
-
-    expect(boundsIntersect(layout.subgraphBounds.get("Left")!, layout.subgraphBounds.get("Right")!)).toBe(false)
-  })
-
-  test("does not change parallel routes for a non-binding width target", () => {
-    const diagram = parseMermaidFlowchartDiagram(`flowchart TD
-  A[A] -->|one| B[B]
-  A -->|two| B`)
-    const unconstrained = layoutParsedFlowchartDiagram(diagram, { compact: true })
-    const nonBinding = layoutParsedFlowchartDiagram(diagram, { compact: true, layoutMaxWidth: 1_000 })
-
-    expect(nonBinding.routes.map((route) => route.points)).toEqual(unconstrained.routes.map((route) => route.points))
-  })
-
-  test("keeps responsive fan-out labels inside the width target", () => {
-    const content = `flowchart TD
-  subgraph Group
-    S[Source]
-    S -->|route 0 detail| N0[Node 0]
-    S -->|route 1 detail| N1[Node 1]
-    S -->|route 2 detail| N2[Node 2]
-    S -->|route 3 detail| N3[Node 3]
-  end`
-    const layout = layoutFlowchartDiagram(content, { compact: true, layoutMaxWidth: 30 })
-    const output = renderFlowchartDiagram(content, { compact: true, layoutMaxWidth: 30 })
-
-    for (const route of layout.routes) {
-      const label = flowchartRouteLabelLayout(route, visualLength)
-      expect(label.point.x + label.width).toBeLessThanOrEqual(30)
-    }
-    expect(Math.max(...output.split("\n").map((line) => stringWidth(line)))).toBeLessThanOrEqual(34)
-  })
-
  test("parses Mermaid flowchart nodes and standard arrows", () => {
    const diagram = parseMermaidFlowchartDiagram(`
 flowchart TD
@@ -1617,22 +1349,6 @@ flowchart LR
    expect(output).not.toContain("<br")
  })

-  test.each(
-    (["TD", "BT"] as const).flatMap((direction) =>
-      [false, true].flatMap((compact) => [2, 4].map((lines) => ({ direction, compact, lines }))),
-    ),
-  )(
-    "keeps $lines-line $direction labels off both terminal rows with compact=$compact",
-    ({ direction, compact, lines }) => {
-      const label = Array.from({ length: lines }, (_, index) => `line ${index + 1}`).join("<br/>")
-      const route = layoutFlowchartDiagram(`flowchart ${direction}\n  A[A] -->|${label}| B[B]`, { compact }).routes[0]!
-      const layout = flowchartRouteLabelLayout(route, visualLength)
-      const terminals = new Set([route.points[0]!.y, route.points.at(-1)!.y])
-
-      for (let y = layout.point.y; y < layout.point.y + layout.height; y++) expect(terminals.has(y)).toBe(false)
-    },
-  )
-
  test("expands canvas for multiline back-edge labels", () => {
    const output = renderFlowchartDiagram(`flowchart TD
  A --> B
@@ -1677,10 +1393,10 @@ graph LR
    expect(output).toContain("API")
    expect(output).toContain("DB")
    expect(output).toContain("╭─ Web App ")
-    expect(output.split("\n").find((line) => line.includes("API") && line.includes("DB"))).not.toContain("┼")
+    expect(output.split("\n").find((line) => line.includes("API") && line.includes("DB"))).toContain("┼")
  })

-  test("breaks vertical subgraph borders where horizontal routes pass through", () => {
+  test("merges horizontal routes through vertical subgraph borders", () => {
    const content = `flowchart LR
  Outside[Outside] --> Inside
  subgraph Group
@@ -1692,14 +1408,13 @@ graph LR
    const group = layout.subgraphBounds.get("Group")!
    const crossing = { x: group.left, y: layout.routes[0]!.points.at(-1)!.y }

-    expect(grid.getCell(crossing.x, crossing.y)?.char).toBe("─")
-    expect(grid.getCell(crossing.x, crossing.y)?.style).not.toBe("group")
+    expect(grid.getCell(crossing.x, crossing.y)?.char).toBe("┼")
    expect(grid.getCell(crossing.x - 1, crossing.y)?.char).toBe("─")
    expect(grid.getCell(crossing.x, crossing.y - 1)?.char).toBe("│")
    expect(grid.getCell(crossing.x, crossing.y + 1)?.char).toBe("│")
  })

-  test("breaks horizontal subgraph borders where vertical routes pass through", () => {
+  test("merges vertical routes through horizontal subgraph borders", () => {
    const content = `flowchart TD
  Outside[Outside] --> Inside
  subgraph Outer [O]
@@ -1713,8 +1428,7 @@ graph LR
    const outer = layout.subgraphBounds.get("Outer")!
    const crossing = { x: layout.routes[0]!.points[0]!.x, y: outer.top }

-    expect(grid.getCell(crossing.x, crossing.y)?.char).toBe("│")
-    expect(grid.getCell(crossing.x, crossing.y)?.style).not.toBe("group")
+    expect(grid.getCell(crossing.x, crossing.y)?.char).toBe("┼")
    expect(grid.getCell(crossing.x - 1, crossing.y)?.char).toBe("─")
    expect(grid.getCell(crossing.x + 1, crossing.y)?.char).toBe("─")
    expect(grid.getCell(crossing.x, crossing.y - 1)?.char).toBe("│")
@@ -1752,20 +1466,21 @@ graph LR
    expect(output).not.toContain("<br")
  })

-  test("keeps long Unicode subgraph titles from replacing entering arrowheads", () => {
-    const content = `flowchart TD
-  U[Up] --> A
-  subgraph G [界界界界界界]
-    A[A]
+  test("merges transition lines through subgraph frame borders", () => {
+    const output = renderFlowchartDiagram(`
+flowchart TD
+  subgraph Verse [verse]
+    direction LR
+    A[A] --> B[B]
+    C[C] --> D[D]
  end
-  A --> D[Down]`
-    const diagram = parseMermaidFlowchartDiagram(content)
-    const layout = layoutParsedFlowchartDiagram(diagram, { compact: true })
-    const grid = drawParsedFlowchartDiagramGrid(diagram, { compact: true })
-    const entry = layout.routes.find((route) => route.edge.from === "U")!
-    const end = entry.points.at(-1)!
+  B --> Join
+  D --> Join
+`)
+    const crossingLines = output.split("\n").filter((line) => line.includes("Join") || line.includes("├"))

-    expect(grid.getCell(end.x, end.y)?.char).toBe(diagramArrowHeadBetween(entry.points.at(-2)!, end))
+    expect(output).toContain(" verse ")
+    expect(crossingLines.join("\n").match(/┼/g)).toHaveLength(2)
  })

  test("lays out subgraph-local directions independently from the outer flow", () => {
@@ -1897,65 +1612,6 @@ flowchart TD
    }
  })

-  test("keeps nested local-direction layouts rigid across direction and compact matrices", () => {
-    const directions = ["LR", "RL", "TD", "BT"] as const
-    for (const global of directions) {
-      for (const outer of directions) {
-        for (const inner of directions) {
-          for (const compact of [false, true]) {
-            const layout = layoutFlowchartDiagram(
-              `flowchart ${global}
-  X[X] --> A
-  subgraph Outer [Outer]
-    direction ${outer}
-    subgraph Inner [Inner]
-      direction ${inner}
-      A[A] --> B[B]
-    end
-    B --> C[C]
-  end
-  C --> Y[Y]`,
-              { compact },
-            )
-            const nodes = [...layout.bounds.values()]
-            const innerFrame = layout.subgraphBounds.get("Inner")!
-            const outerFrame = layout.subgraphBounds.get("Outer")!
-            const a = layout.bounds.get("A")!
-            const b = layout.bounds.get("B")!
-            const c = layout.bounds.get("C")!
-
-            for (let left = 0; left < nodes.length; left++) {
-              for (let right = left + 1; right < nodes.length; right++) {
-                expect(boundsIntersect(nodes[left]!, nodes[right]!)).toBe(false)
-              }
-            }
-            expect(boundsContains(innerFrame, a)).toBe(true)
-            expect(boundsContains(innerFrame, b)).toBe(true)
-            expect(boundsContains(outerFrame, innerFrame)).toBe(true)
-            expect(boundsContains(outerFrame, c)).toBe(true)
-            expect(layout.routes.every((route) => route.points.length >= 2)).toBe(true)
-            expectFlowchartRoutesAvoidUnrelatedNodes(layout)
-            for (const frame of layout.subgraphBounds.values()) {
-              for (const route of layout.routes) {
-                expect(routeRunsAlongHorizontalBorder(route, frame)).toBe(false)
-                expect(routeRunsAlongVerticalBorder(route, frame)).toBe(false)
-              }
-            }
-
-            if (inner === "LR") expect(b.left).toBeGreaterThan(a.left)
-            if (inner === "RL") expect(b.left).toBeLessThan(a.left)
-            if (inner === "TD") expect(b.top).toBeGreaterThan(a.top)
-            if (inner === "BT") expect(b.top).toBeLessThan(a.top)
-            if (outer === "LR") expect(c.centerX).toBeGreaterThan(b.centerX)
-            if (outer === "RL") expect(c.centerX).toBeLessThan(b.centerX)
-            if (outer === "TD") expect(c.centerY).toBeGreaterThan(b.centerY)
-            if (outer === "BT") expect(c.centerY).toBeLessThan(b.centerY)
-          }
-        }
-      }
-    }
-  })
-
  test("compacts stacked subgraph-local direction rows", () => {
    const layout = layoutFlowchartDiagram(`
 flowchart TD
@@ -2381,10 +2037,8 @@ flowchart LR
  test("applies the global flowchart StyledText theme", () => {
    const grid = drawFlowchartDiagramGrid("flowchart LR\n  A[Alpha] --> B[Beta]")
    const node = parseColor("#ff0000")
-    const nodeBorder = parseColor("#0000ff")
-    const styled = renderGridStyledText(grid, resolveFlowchartStyleColors({ node, nodeBorder }))
+    const styled = renderGridStyledText(grid, resolveFlowchartStyleColors({ node }))

    expect(styled.chunks.some((chunk) => chunk.text.includes("Alpha") && chunk.fg?.equals(node))).toBe(true)
-    expect(styled.chunks.some((chunk) => chunk.text.includes("╭") && chunk.fg?.equals(nodeBorder))).toBe(true)
  })
 })
@@ -18,7 +18,6 @@ const LABEL_BUS_CLEARANCE = 3
 const LABEL_NODE_CLEARANCE = 2
 const LABEL_LINE_CLEARANCE = 2
 const LABEL_PADDING = 1
-const LABEL_TERMINAL_CLEARANCE = 1

 export interface FlowchartEdgeLabelLayout {
  lines: string[]
@@ -64,11 +63,6 @@ function segmentLabelPoint(segment: DiagramSegment, labelWidth: number, labelHei
    return clampPoint(shiftPoint(shiftPoint(segment.from, segment.direction, LABEL_LINE_CLEARANCE), "up", labelHeight))
  }

-  const slot = insetSpan(segmentSpan(segment), LABEL_TERMINAL_CLEARANCE)
-  if (spanCapacity(slot) >= labelHeight) {
-    return clampPoint(point(segment.from.x + 1, centeredSpanStart(slot, labelHeight)))
-  }
-
  const center = shiftPoint(pointOnSegment(segment, midpoint(segmentSpan(segment))), "right")
  return clampPoint(shiftPoint(center, "up", Math.floor((labelHeight - 1) / 2)))
 }
@@ -14,7 +14,7 @@ import {
  flowchartVerticalBranchLabelGap,
 } from "./labels.js"
 import type { FlowchartDiagramRenderOptions } from "./options.js"
-import { avoidFlowchartFrameBorders, routeFlowchartEdges } from "./routing.js"
+import { routeFlowchartEdges } from "./routing.js"
 import type {
  FlowchartDiagram,
  FlowchartDirection,
@@ -23,7 +23,6 @@ import type {
  FlowchartNode,
  FlowchartNodeBounds,
  FlowchartNodeSize,
-  FlowchartPoint,
  FlowchartSubgraphBounds,
 } from "./types.js"

@@ -365,8 +364,7 @@ function layoutRankedNodes(
  sizes: ReadonlyMap<string, FlowchartNodeSize>,
  minNodeGap: number,
  requestedMinRankGap: number,
-  targetWidth?: number,
-): { bounds: Map<string, FlowchartNodeBounds>; wrapped: boolean } {
+): Map<string, FlowchartNodeBounds> {
  const horizontal = isHorizontalDirection(direction)
  const ranks = rankNodes(diagram)
  const maxRank = Math.max(0, ...ranks.values())
@@ -408,7 +406,6 @@ function layoutRankedNodes(
  const horizontalGaps = horizontal ? horizontalRankGaps(diagram, normalizedRanks, rankKeys, requestedMinRankGap) : []
  const verticalGaps = horizontal ? [] : verticalRankGaps(diagram, normalizedRanks, rankKeys, requestedMinRankGap)
  const bounds = new Map<string, FlowchartNodeBounds>()
-  let wrapped = false

  if (horizontal) {
    const columnWidths = rankKeys.map((rank) =>
@@ -445,141 +442,68 @@ function layoutRankedNodes(
      x += columnWidth + (horizontalGaps[rankIndex] ?? 0)
    }
  } else {
-    const rankBands = rankKeys.map((rank) => {
+    const rowHeights = rankKeys.map((rank) =>
+      Math.max(...ranksByIndex.get(rank)!.map((node) => sizes.get(node.id)!.height)),
+    )
+    const rowWidths = rankKeys.map((rank) => {
      const nodes = ranksByIndex.get(rank)!
-      const roomyNodeGap = verticalNodeGap(rank)
-      const naturalWidth =
+      return (
        nodes.reduce((total, node) => total + sizes.get(node.id)!.width, 0) +
-        Math.max(0, nodes.length - 1) * roomyNodeGap
-      const labeledEdges = diagram.edges.filter(
-        (edge) => edge.label && (normalizedRanks.get(edge.from) === rank || normalizedRanks.get(edge.to) === rank),
+        Math.max(0, nodes.length - 1) * verticalNodeGap(rank)
      )
-      const needsLabelLanes =
-        labeledEdges.length > 1 &&
-        labeledEdges.some((edge) => {
-          const targets = new Set(
-            labeledEdges.filter((candidate) => candidate.from === edge.from).map((candidate) => candidate.to),
-          )
-          const sources = new Set(
-            labeledEdges.filter((candidate) => candidate.to === edge.to).map((candidate) => candidate.from),
-          )
-          const grouped = (ids: readonly string[]) =>
-            !diagram.subgraphs?.length ||
-            diagram.subgraphs.some((subgraph) => ids.every((id) => subgraph.nodeIds.includes(id)))
-          return (
-            (targets.size > 1 && grouped([edge.from, ...targets])) ||
-            (sources.size > 1 && grouped([edge.to, ...sources]))
-          )
-        })
-      const nodeGap =
-        targetWidth !== undefined && naturalWidth > targetWidth && !needsLabelLanes ? minNodeGap : roomyNodeGap
-      const bands: { nodes: FlowchartNode[]; width: number; height: number }[] = []
-      for (const node of nodes) {
-        const size = sizes.get(node.id)!
-        const current = bands.at(-1)
-        const width = current ? current.width + nodeGap + size.width : size.width
-        if (current && targetWidth !== undefined && width > targetWidth) {
-          wrapped = true
-          bands.push({ nodes: [node], width: size.width, height: size.height })
-          continue
-        }
-        if (!current) {
-          bands.push({ nodes: [node], width: size.width, height: size.height })
-          continue
-        }
-        current.nodes.push(node)
-        current.width = width
-        current.height = Math.max(current.height, size.height)
-      }
-      return { bands, nodeGap }
    })
-    const canvasWidth = Math.max(1, ...rankBands.flatMap((rank) => rank.bands.map((band) => band.width)))
+    const canvasWidth = Math.max(1, ...rowWidths)
    let y = 0
    for (let rankIndex = 0; rankIndex < rankKeys.length; rankIndex++) {
-      const rank = rankBands[rankIndex]!
-      for (const [bandIndex, band] of rank.bands.entries()) {
-        let x = Math.floor((canvasWidth - band.width) / 2)
-        for (const node of band.nodes) {
-          const size = sizes.get(node.id)!
-          const top = y + Math.floor((band.height - size.height) / 2)
-          bounds.set(node.id, {
-            id: node.id,
-            ...size,
-            left: x,
-            top,
-            centerX: x + Math.floor(size.width / 2),
-            centerY: top + Math.floor(size.height / 2),
-          })
-          x += size.width + rank.nodeGap
-        }
-        y += band.height + (bandIndex < rank.bands.length - 1 ? minNodeGap : 0)
+      const rank = rankKeys[rankIndex]!
+      const nodes = ranksByIndex.get(rank)!
+      const rowHeight = rowHeights[rankIndex]!
+      const nodeGap = verticalNodeGap(rank)
+      let x = Math.floor((canvasWidth - rowWidths[rankIndex]!) / 2)
+      for (const node of nodes) {
+        const size = sizes.get(node.id)!
+        const top = y + Math.floor((rowHeight - size.height) / 2)
+        bounds.set(node.id, {
+          id: node.id,
+          ...size,
+          left: x,
+          top,
+          centerX: x + Math.floor(size.width / 2),
+          centerY: top + Math.floor(size.height / 2),
+        })
+        x += size.width + nodeGap
      }
-      y += verticalGaps[rankIndex] ?? 0
+      y += rowHeight + (verticalGaps[rankIndex] ?? 0)
    }
  }

-  return { bounds, wrapped }
+  return bounds
 }

 function layoutLocalSubgraphDirections(
  diagram: FlowchartDiagram,
  nodeBounds: Map<string, FlowchartNodeBounds>,
+  sizes: ReadonlyMap<string, FlowchartNodeSize>,
  minNodeGap: number,
  requestedMinRankGap: number,
-  targetWidth?: number,
-): boolean {
-  let wrapped = false
+): void {
  for (const subgraph of [...(diagram.subgraphs ?? [])].reverse()) {
    if (!subgraph.direction || subgraph.direction === diagram.direction) continue
-    const childSubgraphs = (diagram.subgraphs ?? []).filter((child) => child.parentId === subgraph.id)
-    const coveredNodeIds = new Set(childSubgraphs.flatMap((child) => [...collectSubgraphNodeIds(diagram, child.id)]))
-    const items = [
-      ...childSubgraphs.flatMap((child) => {
-        const nodeIds = [...collectSubgraphNodeIds(diagram, child.id)]
-        const content = boundsFromChildren(nodeIds.flatMap((id) => nodeBounds.get(id) ?? []))
-        const bounds = content ? subgraphBoundFromChildren(child.id, child.label, [content]) : undefined
-        return bounds ? [{ id: `subgraph:${child.id}`, nodeIds, bounds, childId: child.id }] : []
-      }),
-      ...subgraph.nodeIds.flatMap((id) => {
-        if (coveredNodeIds.has(id)) return []
-        const bounds = nodeBounds.get(id)
-        return bounds ? [{ id, nodeIds: [id], bounds, childId: undefined }] : []
-      }),
-    ]
-    if (items.length === 0) continue
+    const nodeIds = new Set(subgraph.nodeIds)
+    const nodes = diagram.nodes.filter((node) => nodeIds.has(node.id))
+    if (nodes.length === 0) continue

-    const currentBounds = boundsFromChildren(items.map((item) => item.bounds))
+    const currentBounds = boundsFromChildren(nodes.flatMap((node) => nodeBounds.get(node.id) ?? []))
    if (!currentBounds) continue

-    const itemByEndpoint = new Map<string, string>()
-    for (const item of items) {
-      for (const nodeId of item.nodeIds) itemByEndpoint.set(nodeId, item.id)
-      if (item.childId) itemByEndpoint.set(item.childId, item.id)
-    }
-    const nodes = items.map((item): FlowchartNode => ({ id: item.id, label: item.id, shape: "box" }))
    const localDiagram: FlowchartDiagram = {
      direction: subgraph.direction,
      nodes,
-      edges: diagram.edges.flatMap((edge) => {
-        const from = itemByEndpoint.get(edge.from)
-        const to = itemByEndpoint.get(edge.to)
-        return from && to && from !== to ? [{ ...edge, from, to }] : []
-      }),
+      edges: diagram.edges.filter((edge) => nodeIds.has(edge.from) && nodeIds.has(edge.to)),
      subgraphs: [],
    }
-    const itemSizes = new Map(
-      items.map((item) => [item.id, { width: item.bounds.width, height: item.bounds.height, lines: [item.id] }]),
-    )
-    const localLayout = layoutRankedNodes(
-      localDiagram,
-      subgraph.direction,
-      itemSizes,
-      Math.max(minNodeGap, SUBGRAPH_PADDING_X * 2 + 1),
-      requestedMinRankGap,
-      targetWidth,
-    )
-    const localBounds = localLayout.bounds
-    wrapped ||= localLayout.wrapped
+    const localNodeGap = isHorizontalDirection(subgraph.direction) ? Math.max(4, minNodeGap - 1) : minNodeGap
+    const localBounds = layoutRankedNodes(localDiagram, subgraph.direction, sizes, localNodeGap, requestedMinRankGap)
    const localExtent = boundsFromChildren([...localBounds.values()])
    if (!localExtent) continue

@@ -588,66 +512,11 @@ function layoutLocalSubgraphDirections(
    const dx = targetLeft - localExtent.left
    const dy = targetTop - localExtent.top

-    const translations = new Map<string, { dx: number; dy: number }>()
-    for (const item of items) {
-      const bound = localBounds.get(item.id)!
-      const itemDx = bound.left + dx - item.bounds.left
-      const itemDy = bound.top + dy - item.bounds.top
-      for (const nodeId of item.nodeIds) translations.set(nodeId, { dx: itemDx, dy: itemDy })
-    }
-
-    let groupOffset = { x: 0, y: 0 }
-    if (targetWidth !== undefined) {
-      const localNodeIds = new Set(translations.keys())
-      const external = [...nodeBounds.entries()].filter(([id]) => !localNodeIds.has(id)).map(([, bound]) => bound)
-      const overlaps = (offset: FlowchartPoint) =>
-        [...translations].some(([id, translation]) => {
-          const bound = nodeBounds.get(id)!
-          const left = bound.left + translation.dx + offset.x
-          const top = bound.top + translation.dy + offset.y
-          return external.some(
-            (other) =>
-              left < other.left + other.width + minNodeGap &&
-              left + bound.width + minNodeGap > other.left &&
-              top < other.top + other.height + minNodeGap &&
-              top + bound.height + minNodeGap > other.top,
-          )
-        })
-      if (overlaps(groupOffset)) {
-        const vertical = !isHorizontalDirection(diagram.direction)
-        const sign = diagram.direction === "RL" || diagram.direction === "BT" ? -1 : 1
-        let found = false
-        search: for (let distance = 1; distance < 1_000; distance++) {
-          const candidates = vertical
-            ? [
-                { x: 0, y: sign * distance },
-                { x: 0, y: -sign * distance },
-                { x: distance, y: 0 },
-                { x: -distance, y: 0 },
-              ]
-            : [
-                { x: sign * distance, y: 0 },
-                { x: -sign * distance, y: 0 },
-                { x: 0, y: distance },
-                { x: 0, y: -distance },
-              ]
-          for (const candidate of candidates) {
-            if (overlaps(candidate)) continue
-            groupOffset = candidate
-            found = true
-            break search
-          }
-        }
-        if (!found) throw new Error(`Subgraph ${subgraph.id} has no collision-free responsive position`)
-      }
-    }
-
-    for (const [nodeId, translation] of translations) {
-      const nodeBound = nodeBounds.get(nodeId)
-      if (nodeBound) translateBounds(nodeBound, translation.dx + groupOffset.x, translation.dy + groupOffset.y)
+    for (const [nodeId, bound] of localBounds) {
+      translateBounds(bound, dx, dy)
+      nodeBounds.set(nodeId, bound)
    }
  }
-  return wrapped
 }

 function edgeDirection(diagram: FlowchartDiagram, edge: FlowchartEdge): FlowchartDirection {
@@ -732,7 +601,6 @@ function separateTopLevelItems(
  nodeBounds: Map<string, FlowchartNodeBounds>,
  subgraphBounds: ReadonlyMap<string, FlowchartSubgraphBounds>,
  gap: number,
-  targetWidth?: number,
 ): boolean {
  const hasLocalDirection = (diagram.subgraphs ?? []).some(
    (subgraph) => subgraph.direction && subgraph.direction !== diagram.direction,
@@ -866,35 +734,6 @@ function separateTopLevelItems(
      crossCursor = start + shift + size + gap
    }
  }
-  if (targetWidth !== undefined && !horizontal) {
-    const intersects = (left: (typeof items)[number], right: (typeof items)[number]): boolean =>
-      [...left.nodeIds].some((leftId) => {
-        const leftBounds = nodeBounds.get(leftId)!
-        return [...right.nodeIds].some((rightId) => {
-          const rightBounds = nodeBounds.get(rightId)!
-          return (
-            leftBounds.left <= rightBounds.left + rightBounds.width - 1 &&
-            leftBounds.left + leftBounds.width - 1 >= rightBounds.left &&
-            leftBounds.top <= rightBounds.top + rightBounds.height - 1 &&
-            leftBounds.top + leftBounds.height - 1 >= rightBounds.top
-          )
-        })
-      })
-    for (let rightIndex = 1; rightIndex < items.length; rightIndex++) {
-      const right = items[rightIndex]!
-      for (let leftIndex = 0; leftIndex < rightIndex; leftIndex++) {
-        const left = items[leftIndex]!
-        if (!intersects(left, right)) continue
-        const leftBounds = boundsFromChildren([...left.nodeIds].map((id) => nodeBounds.get(id)!))!
-        const rightBounds = boundsFromChildren([...right.nodeIds].map((id) => nodeBounds.get(id)!))!
-        const shift = reversed
-          ? leftBounds.top - gap - (rightBounds.top + rightBounds.height)
-          : leftBounds.top + leftBounds.height + gap - rightBounds.top
-        moved ||= shift !== 0
-        moveItem(right, 0, shift)
-      }
-    }
-  }
  return moved
 }

@@ -932,7 +771,6 @@ function layoutFlowchartWithDirection(
  sourceDiagram: FlowchartDiagram,
  options: FlowchartDiagramRenderOptions,
  direction: FlowchartDirection,
-  responsiveFallback = false,
 ): FlowchartLayout {
  const diagram = direction === sourceDiagram.direction ? sourceDiagram : { ...sourceDiagram, direction }
  const horizontal = isHorizontalDirection(direction)
@@ -948,65 +786,29 @@ function layoutFlowchartWithDirection(
        : DEFAULT_MIN_VERTICAL_RANK_GAP,
  )
  const sizes = new Map(diagram.nodes.map((node) => [node.id, nodeSize(node)]))
-  const targetWidth =
-    !horizontal && options.layoutMaxWidth !== undefined && Number.isFinite(options.layoutMaxWidth)
-      ? Math.max(1, Math.trunc(options.layoutMaxWidth))
-      : undefined
-  const ranked = layoutRankedNodes(diagram, direction, sizes, minNodeGap, requestedMinRankGap, targetWidth)
-  const bounds = ranked.bounds
-  const responsive = layoutLocalSubgraphDirections(diagram, bounds, minNodeGap, requestedMinRankGap, targetWidth)
-  const directionAligned = responsiveFallback || responsive || ranked.wrapped
+  const bounds = layoutRankedNodes(diagram, direction, sizes, minNodeGap, requestedMinRankGap)
+  layoutLocalSubgraphDirections(diagram, bounds, sizes, minNodeGap, requestedMinRankGap)

  const subgraphs = diagram.subgraphs ?? []
  let subgraphBounds = new Map<string, FlowchartSubgraphBounds>()
  let routes: FlowchartEdgeRoute[]
  if (subgraphs.length === 0) {
-    routes = routeFlowchartEdges(
-      diagram,
-      bounds,
-      (edge) => edgeDirection(diagram, edge),
-      undefined,
-      targetWidth,
-      directionAligned,
-    )
+    routes = routeFlowchartEdges(diagram, bounds, (edge) => edgeDirection(diagram, edge))
  } else {
-    routes = routeFlowchartEdges(
-      diagram,
-      bounds,
-      (edge) => edgeDirection(diagram, edge),
-      undefined,
-      targetWidth,
-      directionAligned,
-    )
+    routes = routeFlowchartEdges(diagram, bounds, (edge) => edgeDirection(diagram, edge))
    subgraphBounds = layoutSubgraphs(diagram, bounds, routes)
    const moved = separateTopLevelItems(
      diagram,
      bounds,
      subgraphBounds,
      Math.max(1, Math.floor(requestedMinRankGap / 2)),
-      targetWidth,
    )
    if (moved) {
-      routes = routeFlowchartEdges(
-        diagram,
-        bounds,
-        (edge) => edgeDirection(diagram, edge),
-        undefined,
-        targetWidth,
-        directionAligned,
-      )
+      routes = routeFlowchartEdges(diagram, bounds, (edge) => edgeDirection(diagram, edge))
      subgraphBounds = layoutSubgraphs(diagram, bounds, routes)
    }
-    routes = routeFlowchartEdges(
-      diagram,
-      bounds,
-      (edge) => edgeDirection(diagram, edge),
-      subgraphBounds,
-      targetWidth,
-      directionAligned,
-    )
+    routes = routeFlowchartEdges(diagram, bounds, (edge) => edgeDirection(diagram, edge), subgraphBounds)
    subgraphBounds = layoutSubgraphs(diagram, bounds, routes)
-    avoidFlowchartFrameBorders(routes, bounds, subgraphBounds)
  }
  freezeRouteLabelPoints(routes)
  const allBounds = [...bounds.values(), ...subgraphBounds.values(), ...routeRenderBounds(routes)]
@@ -1032,5 +834,5 @@ export function layoutFlowchartDiagram(
  if (!isHorizontalDirection(direction) || maxWidth === undefined || !Number.isFinite(maxWidth)) return layout
  if (layout.width <= Math.max(1, Math.trunc(maxWidth))) return layout

-  return layoutFlowchartWithDirection(sourceDiagram, options, direction === "RL" ? "BT" : "TD", true)
+  return layoutFlowchartWithDirection(sourceDiagram, options, direction === "RL" ? "BT" : "TD")
 }
@@ -7,6 +7,6 @@ export interface FlowchartDiagramRenderOptions {
  borderStyle?: BorderStyle
  minNodeGap?: number
  minRankGap?: number
-  /** Target rendered width. Oversized horizontal layouts fold vertically and broad vertical ranks wrap. */
+  /** Fold oversized horizontal layouts vertically when their rendered width exceeds this limit. */
  layoutMaxWidth?: number
 }
@@ -11,11 +11,9 @@ import {
  lane,
  oppositeSide,
  orthogonalPath,
-  orthogonalPathPoints,
  pathThrough,
  pathViaLane,
  segmentBetween,
-  segmentSpan,
  sideForDirection,
  snapCoordinate,
  shiftPoint,
@@ -140,11 +138,11 @@ function horizontalEdgePath(
  })
 }

-function selfEdgePath(bounds: FlowchartNodeBounds, laneOffset = 0): FlowchartPoint[] {
+function selfEdgePath(bounds: FlowchartNodeBounds): FlowchartPoint[] {
  const start = boundsSidePoint(bounds, "right")
  const end = boundsSidePoint(bounds, "bottom")
-  const rightLaneX = bounds.left + bounds.width + BUS_CLEARANCE + laneOffset
-  const bottomLaneY = bounds.top + bounds.height + 1 + laneOffset
+  const rightLaneX = bounds.left + bounds.width + BUS_CLEARANCE
+  const bottomLaneY = bounds.top + bounds.height + 1
  return [start, { x: rightLaneX, y: start.y }, { x: rightLaneX, y: bottomLaneY }, { x: end.x, y: bottomLaneY }, end]
 }

@@ -524,8 +522,6 @@ function routeVerticalFanIn(
 function routeParallelEdges(
  diagram: FlowchartDiagram,
  bounds: Map<string, FlowchartNodeBounds>,
-  directionForEdge: (edge: FlowchartEdge) => FlowchartDirection,
-  directionAligned: boolean,
  handled: Set<FlowchartEdge>,
  routes: FlowchartEdgeRoute[],
 ): void {
@@ -534,18 +530,8 @@ function routeParallelEdges(
    if (edges.length < 2) continue
    const from = bounds.get(edges[0]!.from)
    const to = bounds.get(edges[0]!.to)
-    if (!from || !to) continue
-    if (from.id === to.id) {
-      let laneOffset = 0
-      for (const edge of edges) {
-        routes.push({ edge, points: selfEdgePath(from, laneOffset) })
-        handled.add(edge)
-        laneOffset++
-      }
-      continue
-    }
-    const parallelAxis =
-      directionAligned && isVerticalDirection(directionForEdge(edges[0]!)) ? "x" : parallelLaneAxis(from, to)
+    if (!from || !to || from.id === to.id) continue
+    const parallelAxis = parallelLaneAxis(from, to)
    let previousRoute: FlowchartEdgeRoute | undefined
    for (const edge of edges) {
      const height = labelHeight(edge)
@@ -553,7 +539,7 @@ function routeParallelEdges(
        parallelAxis === "x"
          ? previousRoute
            ? rightRenderExtent(previousRoute) + NODE_CLEARANCE
-            : Math.max(boundsSidePoint(from, "right").x, boundsSidePoint(to, "right").x) + (directionAligned ? 1 : 0)
+            : Math.max(boundsSidePoint(from, "right").x, boundsSidePoint(to, "right").x)
          : previousRoute
            ? Math.max(...previousRoute.points.map((point) => point.y)) + (height > 1 ? height + 1 : 1)
            : Math.max(boundsSidePoint(from, "bottom").y, boundsSidePoint(to, "bottom").y) + (height > 1 ? height : 0)
@@ -809,69 +795,6 @@ function routeIntersectsLabels(route: FlowchartEdgeRoute, labels: readonly Flowc
  )
 }

-function pathsIntersect(left: readonly FlowchartPoint[], right: readonly FlowchartPoint[]): boolean {
-  const occupied = new Set(orthogonalPathPoints(left).map((point) => `${point.x}:${point.y}`))
-  return orthogonalPathPoints(right).some((point) => occupied.has(`${point.x}:${point.y}`))
-}
-
-function endpointDisjoint(left: FlowchartEdge, right: FlowchartEdge): boolean {
-  return left.from !== right.from && left.from !== right.to && left.to !== right.from && left.to !== right.to
-}
-
-function endpointConflictsWithRoutes(route: FlowchartEdgeRoute, otherRoutes: readonly FlowchartEdgeRoute[]): boolean {
-  const source = route.points[0]
-  const target = route.points.at(-1)
-  if (!source || !target) return false
-  return otherRoutes.some((other) => {
-    const otherSource = other.points[0]
-    const otherTarget = other.points.at(-1)
-    return (
-      (otherSource && target.x === otherSource.x && target.y === otherSource.y) ||
-      (otherTarget && source.x === otherTarget.x && source.y === otherTarget.y)
-    )
-  })
-}
-
-function pathRunsAlongFrame(points: readonly FlowchartPoint[], bounds: FlowchartSubgraphBounds): boolean {
-  const right = bounds.left + bounds.width - 1
-  const bottom = bounds.top + bounds.height - 1
-  for (let index = 1; index < points.length; index++) {
-    const segment = segmentBetween(points[index - 1]!, points[index]!)
-    if (!segment) continue
-    const span = segmentSpan(segment)
-    if (
-      segment.axis === "x" &&
-      (segment.from.y === bounds.top || segment.from.y === bottom) &&
-      Math.min(span.end, right) > Math.max(span.start, bounds.left)
-    ) {
-      return true
-    }
-    if (
-      segment.axis === "y" &&
-      (segment.from.x === bounds.left || segment.from.x === right) &&
-      Math.min(span.end, bottom) > Math.max(span.start, bounds.top)
-    ) {
-      return true
-    }
-  }
-  return false
-}
-
-function subgraphTitleBounds(bounds: FlowchartSubgraphBounds): {
-  left: number
-  top: number
-  width: number
-  height: number
-} {
-  const lines = splitDiagramLines(bounds.label)
-  return {
-    left: bounds.left + 2,
-    top: bounds.labelSide === "top" ? bounds.top : bounds.top + bounds.height - lines.length,
-    width: Math.max(...lines.map((line) => diagramTextWidth(` ${line} `))),
-    height: lines.length,
-  }
-}
-
 function avoidNodeObstacles(
  route: FlowchartEdgeRoute,
  routes: readonly FlowchartEdgeRoute[],
@@ -892,23 +815,10 @@ function avoidNodeObstacles(
      const allowedContact = isSource && isTarget ? "both" : isSource ? "source" : isTarget ? "target" : undefined
      return pathIntersectsBounds(candidate.points, bound, allowedContact)
    })
-  const intersectsStructuralObstacle = (candidate: FlowchartEdgeRoute): boolean =>
-    intersectsNode(candidate) ||
-    allSubgraphBounds.some(
-      (bound) =>
-        pathRunsAlongFrame(candidate.points, bound) ||
-        (bound.label.length > 0 && pathIntersectsBounds(candidate.points, subgraphTitleBounds(bound))),
-    )
-  const intersectsRoutingObstacle = (candidate: FlowchartEdgeRoute): boolean =>
-    intersectsStructuralObstacle(candidate) ||
-    endpointConflictsWithRoutes(candidate, otherRoutes) ||
-    otherRoutes.some(
-      (other) => endpointDisjoint(candidate.edge, other.edge) && pathsIntersect(candidate.points, other.points),
-    )
  const intersectsObstacle = (candidate: FlowchartEdgeRoute): boolean => {
    const label = candidate.edge.label ? flowchartRouteLabelLayout(candidate, diagramTextWidth) : undefined
    return (
-      intersectsRoutingObstacle(candidate) ||
+      intersectsNode(candidate) ||
      allNodeBounds.some((bound) => labelIntersectsBounds(label, bound)) ||
      allSubgraphBounds.some((bound) => labelIntersectsSubgraphFrame(label, bound)) ||
      labelIntersectsLabels(label, otherLabels) ||
@@ -929,19 +839,19 @@ function avoidNodeObstacles(
  const rightBusXs = [
    ...new Set([
      rightBusX,
-      ...otherLabels.map((label) => Math.max(rightBusX, label.point.x + label.width - 1 + NODE_CLEARANCE)),
+      ...otherLabels.map((label) => Math.max(rightBusX, label.point.x + label.width - 1 + BUS_CLEARANCE)),
    ]),
  ].sort((left, right) => left - right)
  const leftBusXs = [
-    ...new Set([leftBusX, ...otherLabels.map((label) => Math.min(leftBusX, label.point.x - NODE_CLEARANCE))]),
+    ...new Set([leftBusX, ...otherLabels.map((label) => Math.min(leftBusX, label.point.x - BUS_CLEARANCE))]),
  ].sort((left, right) => right - left)
  const topBusYs = [
-    ...new Set([topBusY, ...otherLabels.map((label) => Math.min(topBusY, label.point.y - NODE_CLEARANCE))]),
+    ...new Set([topBusY, ...otherLabels.map((label) => Math.min(topBusY, label.point.y - BUS_CLEARANCE))]),
  ].sort((left, right) => right - left)
  const bottomBusYs = [
    ...new Set([
      bottomBusY,
-      ...otherLabels.map((label) => Math.max(bottomBusY, label.point.y + label.height - 1 + NODE_CLEARANCE)),
+      ...otherLabels.map((label) => Math.max(bottomBusY, label.point.y + label.height - 1 + BUS_CLEARANCE)),
    ]),
  ].sort((left, right) => left - right)
  const busLimit = Math.max(1, Math.floor(Math.sqrt(ROUTING_CANDIDATE_BUDGET / 4)))
@@ -1043,7 +953,7 @@ function avoidNodeObstacles(
  if (from.id === to.id)
    return (
      shortest(selfLoops, (candidate) => !intersectsObstacle(candidate)) ??
-      shortest(selfLoops, (candidate) => !intersectsStructuralObstacle(candidate)) ??
+      shortest(selfLoops, (candidate) => !intersectsNode(candidate)) ??
      route
    )
  const currentTargetSide = sideForOutsidePoint(to, route.points.at(-1)!)
@@ -1092,8 +1002,8 @@ function avoidNodeObstacles(
      shortest(sameSides, (candidate) => !intersectsObstacle(candidate)) ??
      shortest(preservedSources, (candidate) => !intersectsObstacle(candidate)) ??
      shortest(attachments, (candidate) => !intersectsObstacle(candidate)) ??
-      shortest(preservedSources, (candidate) => !intersectsStructuralObstacle(candidate)) ??
-      shortest(attachments, (candidate) => !intersectsStructuralObstacle(candidate)) ??
+      shortest(preservedSources, (candidate) => !intersectsNode(candidate)) ??
+      shortest(attachments, (candidate) => !intersectsNode(candidate)) ??
      route
    )
  }
@@ -1102,8 +1012,8 @@ function avoidNodeObstacles(
    shortest(preservedTargets, (candidate) => !intersectsObstacle(candidate)) ??
    attachments.find((candidate) => !intersectsObstacle(candidate)) ??
    shortest(preservedSources, (candidate) => !intersectsObstacle(candidate)) ??
-    shortest(attachments, (candidate) => !intersectsStructuralObstacle(candidate)) ??
-    shortest(preservedSources, (candidate) => !intersectsStructuralObstacle(candidate)) ??
+    shortest(attachments, (candidate) => !intersectsNode(candidate)) ??
+    shortest(preservedSources, (candidate) => !intersectsNode(candidate)) ??
    route
  )
 }
@@ -1113,8 +1023,6 @@ function avoidLabelOverlap(
  otherRoutes: readonly FlowchartEdgeRoute[],
  bounds: ReadonlyMap<string, FlowchartNodeBounds>,
  subgraphBounds: ReadonlyMap<string, FlowchartSubgraphBounds> | undefined,
-  targetWidth?: number,
-  includeLabelWidth = true,
 ): FlowchartEdgeRoute {
  if (!route.edge.label) return route
  const nodeBounds = [...bounds.values()]
@@ -1132,14 +1040,7 @@ function avoidLabelOverlap(
      { left: sourcePoint.x, top: sourcePoint.y, width: 1, height: 1 },
    ]
  })
-  const hasParallelRoute = otherRoutes.some(
-    (other) => other.edge.from === route.edge.from && other.edge.to === route.edge.to,
-  )
  const intersectsObstacle = (label: FlowchartEdgeLabelLayout): boolean =>
-    (targetWidth !== undefined &&
-      (hasParallelRoute || !includeLabelWidth
-        ? label.point.x > targetWidth
-        : label.point.x + label.width > targetWidth)) ||
    nodeBounds.some((bound) => labelIntersectsBounds(label, bound)) ||
    frameBounds.some((bound) => labelIntersectsSubgraphFrame(label, bound)) ||
    labelIntersectsLabels(label, otherLabels) ||
@@ -1193,15 +1094,6 @@ function avoidLabelOverlap(
      }
    }
  }
-  if (targetWidth !== undefined && includeLabelWidth && current.point.x + current.width > targetWidth) {
-    const x = Math.max(0, targetWidth - current.width)
-    for (let distance = 0; distance < 100; distance++) {
-      for (const y of distance === 0 ? [current.point.y] : [current.point.y - distance, current.point.y + distance]) {
-        if (y < 0 || intersectsObstacle({ ...current, point: { x, y } })) continue
-        return { ...route, labelPoint: { x, y } }
-      }
-    }
-  }
  return route
 }

@@ -1210,8 +1102,6 @@ export function routeFlowchartEdges(
  bounds: Map<string, FlowchartNodeBounds>,
  directionForEdge: (edge: FlowchartEdge) => FlowchartDirection = () => diagram.direction,
  subgraphBounds?: ReadonlyMap<string, FlowchartSubgraphBounds>,
-  targetWidth?: number,
-  directionAligned = false,
 ): FlowchartEdgeRoute[] {
  const routedDiagram = { ...diagram, edges: diagram.edges.filter((edge) => !edge.orderOnly) }
  const handled = new Set<FlowchartEdge>()
@@ -1220,7 +1110,7 @@ export function routeFlowchartEdges(
    ? Math.min(...[...bounds.values(), ...subgraphBounds.values()].map((bound) => bound.left))
    : undefined

-  routeParallelEdges(routedDiagram, bounds, directionForEdge, directionAligned, handled, routes)
+  routeParallelEdges(routedDiagram, bounds, handled, routes)

  for (const direction of ["LR", "RL"] satisfies FlowchartDirection[]) {
    const horizontalEdges = routedDiagram.edges.filter(
@@ -1255,109 +1145,11 @@ export function routeFlowchartEdges(
  for (let index = routes.length - 1; index >= 0; index--) {
    routes[index] = avoidNodeObstacles(routes[index]!, routes, bounds, subgraphBounds, index)
  }
-  const subgraphs = diagram.subgraphs ?? []
-  const subgraphById = new Map(subgraphs.map((subgraph) => [subgraph.id, subgraph]))
-  const containers = (id: string) => {
-    const ids = new Set<string>()
-    let current = subgraphs.find((subgraph) => subgraph.nodeIds.includes(id))
-    while (current) {
-      ids.add(current.id)
-      current = current.parentId ? subgraphById.get(current.parentId) : undefined
-    }
-    return ids
-  }
-  const groupedLabelEdge = (edge: FlowchartEdge) => {
-    const fromContainers = containers(edge.from)
-    if (![...containers(edge.to)].some((id) => fromContainers.has(id))) return false
-    const targets = new Set(
-      routedDiagram.edges
-        .filter((candidate) => candidate.label && candidate.from === edge.from)
-        .map((candidate) => candidate.to),
-    )
-    const sources = new Set(
-      routedDiagram.edges
-        .filter((candidate) => candidate.label && candidate.to === edge.to)
-        .map((candidate) => candidate.from),
-    )
-    return targets.size > 1 || sources.size > 1
-  }
  return routes.reduce<FlowchartEdgeRoute[]>((resolved, route, index) => {
-    const grouped = groupedLabelEdge(route.edge)
-    return [
-      ...resolved,
-      avoidLabelOverlap(
-        route,
-        [...resolved, ...routes.slice(index + 1)],
-        bounds,
-        subgraphBounds,
-        targetWidth !== undefined && subgraphs.length > 0 && grouped ? Math.max(1, targetWidth - 5) : targetWidth,
-        subgraphs.length === 0 || grouped,
-      ),
-    ]
+    return [...resolved, avoidLabelOverlap(route, [...resolved, ...routes.slice(index + 1)], bounds, subgraphBounds)]
  }, [])
 }

-export function avoidFlowchartFrameBorders(
-  routes: readonly FlowchartEdgeRoute[],
-  bounds: ReadonlyMap<string, FlowchartNodeBounds>,
-  subgraphBounds: ReadonlyMap<string, FlowchartSubgraphBounds>,
-): void {
-  const inside = (node: FlowchartNodeBounds, frame: FlowchartSubgraphBounds) =>
-    node.left >= frame.left &&
-    node.top >= frame.top &&
-    node.left + node.width <= frame.left + frame.width &&
-    node.top + node.height <= frame.top + frame.height
-
-  for (const route of routes) {
-    const source = bounds.get(route.edge.from)
-    const target = bounds.get(route.edge.to)
-    for (const frame of subgraphBounds.values()) {
-      const inward = Boolean(source && target && inside(source, frame) && inside(target, frame))
-      const right = frame.left + frame.width - 1
-      const bottom = frame.top + frame.height - 1
-      const points: FlowchartPoint[] = [route.points[0]!]
-      for (let index = 1; index < route.points.length; index++) {
-        const from = route.points[index - 1]!
-        const to = route.points[index]!
-        const segment = segmentBetween(from, to)
-        if (!segment) continue
-        const span = segmentSpan(segment)
-        const horizontalSide =
-          segment.axis === "x" && Math.min(span.end, right) > Math.max(span.start, frame.left)
-            ? segment.from.y === frame.top
-              ? "top"
-              : segment.from.y === bottom
-                ? "bottom"
-                : undefined
-            : undefined
-        const verticalSide =
-          segment.axis === "y" && Math.min(span.end, bottom) > Math.max(span.start, frame.top)
-            ? segment.from.x === frame.left
-              ? "left"
-              : segment.from.x === right
-                ? "right"
-                : undefined
-            : undefined
-        if (!horizontalSide && !verticalSide) {
-          points.push(to)
-          continue
-        }
-
-        const offset = horizontalSide
-          ? horizontalSide === "top"
-            ? frame.top + (inward ? 1 : -1)
-            : bottom + (inward ? -1 : 1)
-          : verticalSide === "left"
-            ? frame.left + (inward ? 1 : -1)
-            : right + (inward ? -1 : 1)
-        if (horizontalSide) points.push({ x: from.x, y: offset }, { x: to.x, y: offset }, to)
-        else points.push({ x: offset, y: from.y }, { x: offset, y: to.y }, to)
-      }
-      route.points = pathThrough(points)
-    }
-  }
-}
-
 function sideForOutsidePoint(bounds: FlowchartNodeBounds, sourcePoint: FlowchartPoint): DiagramSide {
  if (sourcePoint.x < bounds.left) return "left"
  if (sourcePoint.x >= bounds.left + bounds.width) return "right"
@@ -10,7 +10,7 @@ import {
  type DiagramRgb,
 } from "../core/color/style.js"

-export type FlowchartBaseCellStyle = "node" | "nodeBorder" | "database" | "databaseBorder" | "edge" | "label" | "group"
+export type FlowchartBaseCellStyle = "node" | "database" | "edge" | "label" | "group"
 export type FlowchartNodeEdgeFadeStyle = `nodeEdgeFade${DiagramFadeStep}`
 export type FlowchartDatabaseEdgeFadeStyle = `databaseEdgeFade${DiagramFadeStep}`
 export type FlowchartEdgeFadeStyle = FlowchartNodeEdgeFadeStyle | FlowchartDatabaseEdgeFadeStyle
@@ -22,9 +22,7 @@ export type FlowchartGrid = DiagramCanvas<FlowchartCellStyle, FlowchartCellMetad
 export type FlowchartStyleColors = Required<Record<FlowchartCellStyle, RGBA>>
 export const DEFAULT_THEME_RGB = {
  node: [228, 239, 232],
-  nodeBorder: [141, 163, 151],
  database: [228, 239, 232],
-  databaseBorder: [141, 163, 151],
  edge: [134, 225, 200],
  label: [134, 225, 200],
  group: [76, 99, 89],
@@ -37,20 +35,16 @@ export function resolveFlowchartStyleColors(
  colors: Partial<Record<FlowchartCellStyle, RGBA | undefined>> = {},
 ): FlowchartStyleColors {
  const node = colors.node ?? rgba(DEFAULT_THEME_RGB.node)
-  const nodeBorder = colors.nodeBorder ?? rgba(DEFAULT_THEME_RGB.nodeBorder)
  const database = colors.database ?? rgba(DEFAULT_THEME_RGB.database)
-  const databaseBorder = colors.databaseBorder ?? rgba(DEFAULT_THEME_RGB.databaseBorder)
  const edge = colors.edge ?? rgba(DEFAULT_THEME_RGB.edge)
  return {
    node,
-    nodeBorder,
    database,
-    databaseBorder,
    edge,
    label: colors.label ?? rgba(DEFAULT_THEME_RGB.label),
    group: colors.group ?? rgba(DEFAULT_THEME_RGB.group),
-    ...createColorRampTheme(NODE_EDGE_FADE_STYLES, nodeBorder, edge),
-    ...createColorRampTheme(DATABASE_EDGE_FADE_STYLES, databaseBorder, edge),
+    ...createColorRampTheme(NODE_EDGE_FADE_STYLES, node, edge),
+    ...createColorRampTheme(DATABASE_EDGE_FADE_STYLES, database, edge),
  }
 }

@@ -1,81 +0,0 @@
-import { expect, test } from "bun:test"
-import { auditAllFixtures, auditFixture, summarizeAudits, worstAudits } from "./test/layout-audit/harness.js"
-import { layoutFixtures } from "./test/layout-audit/fixtures.js"
-
-test("audits deterministic flowchart and state layout families", () => {
-  const fixtures = layoutFixtures()
-  const flowcharts = fixtures.filter((fixture) => fixture.kind === "flowchart")
-  const states = fixtures.filter((fixture) => fixture.kind === "state")
-  expect(flowcharts.length).toBeGreaterThanOrEqual(100)
-  expect(states.length).toBeGreaterThanOrEqual(100)
-  expect(new Set(fixtures.map((fixture) => fixture.id)).size).toBe(fixtures.length)
-
-  const startedAt = performance.now()
-  const audits = auditAllFixtures()
-  const elapsedMs = performance.now() - startedAt
-  const violations = audits.flatMap((audit) =>
-    audit.violations.map((violation) => `${audit.fixture.id} @${audit.viewport}: ${violation}`),
-  )
-  const summary = summarizeAudits(audits)
-
-  expect(audits.length).toBeGreaterThanOrEqual(fixtures.length)
-  expect(violations).toEqual([])
-  expect(elapsedMs).toBeLessThan(35_000)
-  for (const audit of audits.filter((audit) => audit.fixture.kind === "state")) {
-    expect(audit.viewport).toBe(audit.fixture.profile === "short" ? 60 : audit.fixture.profile === "unicode" ? 80 : 120)
-  }
-  for (const id of ["state/chain/lr-long", "state/chain/rl-long"]) {
-    const audit = audits.find((candidate) => candidate.fixture.id === id)!
-    expect(audit.viewport).toBe(120)
-    expect([audit.metrics.width, audit.metrics.height, audit.metrics.overflow]).toEqual([84, 41, 0])
-  }
-  expect(
-    audits
-      .filter((audit) => audit.fixture.id === "flowchart/deployment-architecture/curated")
-      .map((audit) => audit.viewport),
-  ).toEqual([60, 80, 120])
-  expect(summary.total.area.max).toBeLessThanOrEqual(11_011)
-  expect(summary.total.area.p95).toBeLessThanOrEqual(5_313)
-  expect(summary.total.bends.max).toBeLessThanOrEqual(30)
-  expect(summary.total.bends.p95).toBeLessThanOrEqual(11)
-  expect(summary.total.crossings.total).toBeLessThanOrEqual(40)
-  expect(summary.total.crossings.max).toBeLessThanOrEqual(3)
-  expect(summary.total.routeLength.max).toBeLessThanOrEqual(930)
-  expect(summary.total.routeLength.p95).toBeLessThanOrEqual(364)
-  expect(summary.total.sharedRouteCells.max).toBeLessThanOrEqual(547)
-  expect(summary.total.sharedRouteCells.p95).toBeLessThanOrEqual(122)
-  expect(summary.total.overflow.max).toBeLessThanOrEqual(170)
-  expect(summary.total.overflow.p95).toBeLessThanOrEqual(99)
-  expect(summary.state.crossings.total).toBe(0)
-
-  for (const fixture of [...Map.groupBy(fixtures, (candidate) => `${candidate.kind}/${candidate.family}`).values()].map(
-    (family) => family[0]!,
-  )) {
-    const first = auditFixture(fixture, 80)
-    const second = auditFixture(fixture, 80)
-    expect(second.output).toBe(first.output)
-    expect(second.metrics).toEqual(first.metrics)
-    expect(second.violations).toEqual(first.violations)
-  }
-
-  console.log(
-    `[layout-audit] ${fixtures.length} sources, ${audits.length} runs, ${elapsedMs.toFixed(0)}ms`,
-    JSON.stringify({
-      summary,
-      worst: {
-        area: worstAudits(audits, "area", 3).map((audit) => [audit.fixture.id, audit.viewport, audit.metrics.area]),
-        bends: worstAudits(audits, "bends", 3).map((audit) => [audit.fixture.id, audit.viewport, audit.metrics.bends]),
-        crossings: worstAudits(audits, "crossings", 3).map((audit) => [
-          audit.fixture.id,
-          audit.viewport,
-          audit.metrics.crossings,
-        ]),
-        overflow: worstAudits(audits, "overflow", 3).map((audit) => [
-          audit.fixture.id,
-          audit.viewport,
-          audit.metrics.overflow,
-        ]),
-      },
-    }),
-  )
-}, 40_000)
@@ -51,7 +51,7 @@ interface PreparedDiagram {
 export interface MermaidMarkdownRendererOptions {
  /** Use terminal-optimized diagram spacing. Defaults to true. */
  compact?: boolean
-  /** Fold responsive horizontal diagrams that exceed this width. Defaults to 120 columns. */
+  /** Fold horizontal flowcharts that exceed this width. Defaults to 120 columns. */
  layoutMaxWidth?: number
  /** Gantt-specific terminal rendering options. */
  gantt?: Omit<GanttDiagramRenderOptions, "layoutMaxWidth">
@@ -141,9 +141,7 @@ function prepareDiagram(
          grid,
          resolveFlowchartStyleColors({
            node: color(colors.primary),
-            nodeBorder: color(colors.muted),
            database: color(colors.primary),
-            databaseBorder: color(colors.muted),
            edge: color(colors.secondary),
            label: color(colors.text),
            group: color(colors.muted),
@@ -217,8 +215,8 @@ function prepareDiagram(
      }
    }
    case "state": {
-      const grid = drawStateDiagramGrid(parseMermaidStateDiagram(source), { layoutMaxWidth })
-      const size = grid.getTextSize({ trimTop: true, trimBottom: true })
+      const grid = drawStateDiagramGrid(parseMermaidStateDiagram(source))
+      const size = grid.getTextSize({ trimBottom: true })
      return {
        kind,
        source,
@@ -3,7 +3,7 @@ import stringWidth from "string-width"
 import { spatialPathClaim } from "../core/spatial.js"
 import { expectDiagram } from "../test/diagram.js"
 import { renderStateDiagram } from "./diagram.js"
-import { createStateDiagramDrawing, drawStateDiagramGrid } from "./drawing.js"
+import { drawStateDiagramGrid } from "./drawing.js"
 import { createStateDiagramLayout } from "./layout.js"
 import { parseMermaidStateDiagram } from "./parser.js"
 import { prepareVisibleStateDiagram } from "./visible-model.js"
@@ -60,35 +60,6 @@ function expectCompleteStateDiagram(source: string, output = renderStateDiagram(
  }
 }

-type ResponsiveStateLabelProfile = "short" | "long" | "unicode"
-
-function responsiveStateChain(direction: "LR" | "RL", profile: ResponsiveStateLabelProfile): string {
-  const stateLabel = (id: string) => {
-    if (profile === "long") return `${id} deliberate state with a long descriptive label`
-    if (profile === "unicode") return `${id} 東京<br/>résumé 🚀`
-    return `${id} node`
-  }
-  const transitionLabel = (id: string) => {
-    if (profile === "long") return `${id} transition carrying detailed context`
-    if (profile === "unicode") return `${id} 東京<br/>✓ prêt`
-    return `${id} edge`
-  }
-  const ids = ["A", "B", "C", "D", "E"]
-  return [
-    "stateDiagram-v2",
-    `direction ${direction}`,
-    ...ids.map((id) => `state "${stateLabel(id)}" as ${id}`),
-    "[*] --> A",
-    ...ids.slice(0, -1).map((id, index) => `${id} --> ${ids[index + 1]}: ${transitionLabel(`E0${index + 1}`)}`),
-    "E --> [*]",
-  ].join("\n")
-}
-
-function renderedStateDimensions(output: string) {
-  const lines = output.split("\n")
-  return { width: Math.max(...lines.map((line) => stringWidth(line))), height: lines.length }
-}
-
 describe("StateDiagram", () => {
  test("detects and parses Mermaid state diagrams", () => {
    const diagram = parseMermaidStateDiagram(`
@@ -208,95 +179,6 @@ stateDiagram-v2
    expect(output).toContain("◀")
  })

-  test("renders reverse vertical direction from bottom to top", () => {
-    const source = `stateDiagram-v2
-  direction BT
-  A --> B`
-    const drawing = createStateDiagramDrawing(parseMermaidStateDiagram(source))
-
-    expect(drawing.layout.bounds.get("A")!.top).toBeGreaterThan(drawing.layout.bounds.get("B")!.top)
-    expect(drawing.grid.toString({ trimTop: true, trimBottom: true })).toContain("▲")
-  })
-
-  test.each(
-    (["LR", "RL"] as const).flatMap((direction) =>
-      (["short", "long", "unicode"] as const).flatMap((profile) =>
-        ([60, 80, 120] as const).map((layoutMaxWidth) => [direction, profile, layoutMaxWidth] as const),
-      ),
-    ),
-  )("folds responsive %s %s chains at %d columns", (direction, profile, layoutMaxWidth) => {
-    const source = responsiveStateChain(direction, profile)
-    const horizontal = renderStateDiagram(source)
-    const responsive = renderStateDiagram(source, { layoutMaxWidth })
-    const vertical = renderStateDiagram(source, { direction: direction === "RL" ? "BT" : "TB" })
-
-    expect(renderedStateDimensions(horizontal).width).toBeGreaterThan(layoutMaxWidth)
-    expect(responsive).toBe(vertical)
-    expect(renderedStateDimensions(responsive).width).toBeLessThan(renderedStateDimensions(horizontal).width)
-    for (const content of ["A", "B", "C", "D", "E", "E01", "E02", "E03", "E04"]) {
-      expect(responsive).toContain(content)
-    }
-  })
-
-  test.each(["LR", "RL"] as const)("keeps the narrower %s orientation for broad ranks", (direction) => {
-    const source = `stateDiagram-v2
-  direction ${direction}
-${Array.from({ length: 8 }, (_, index) => `  A --> B${index}`).join("\n")}`
-    const horizontal = renderStateDiagram(source)
-    const vertical = renderStateDiagram(source, { direction: direction === "RL" ? "BT" : "TB" })
-    const responsive = renderStateDiagram(source, { layoutMaxWidth: 60 })
-
-    expect(renderedStateDimensions(horizontal).width).toBeLessThan(renderedStateDimensions(vertical).width)
-    expect(responsive).toBe(horizontal)
-  })
-
-  test("falls back before allocating an oversized horizontal canvas", () => {
-    const ids = Array.from({ length: 301 }, (_, index) => `S${index}`)
-    const label = "transition label carrying enough context to make the horizontal canvas too large"
-    const source = `stateDiagram-v2
-  direction LR
-${ids
-  .slice(0, -1)
-  .map((id, index) => `  ${id} --> ${ids[index + 1]}: ${label}`)
-  .join("\n")}`
-    const output = renderStateDiagram(source, { layoutMaxWidth: 80 })
-
-    expect(output).toContain("S0")
-    expect(output).toContain("S300")
-    expect(renderedStateDimensions(output).width).toBeLessThanOrEqual(stringWidth(label) + 8)
-  })
-
-  test.each(["TB", "TD", "BT"] as const)("preserves explicit %s layouts under a narrow width target", (direction) => {
-    const source = `stateDiagram-v2
-  direction ${direction}
-  A --> B: next`
-
-    expect(renderStateDiagram(source, { layoutMaxWidth: 1 })).toBe(renderStateDiagram(source))
-  })
-
-  test("preserves horizontal layouts that fit or have no finite width target", () => {
-    const source = `stateDiagram-v2
-  direction LR
-  A --> B`
-    const output = renderStateDiagram(source)
-
-    expect(renderStateDiagram(source, { layoutMaxWidth: 120 })).toBe(output)
-    expect(renderStateDiagram(source, { layoutMaxWidth: Number.POSITIVE_INFINITY })).toBe(output)
-  })
-
-  test("treats a single irreducibly wide state as soft overflow", () => {
-    const label = "界".repeat(40)
-    const output = renderStateDiagram(
-      `stateDiagram-v2
-  direction LR
-  state "${label}" as Wide`,
-      { layoutMaxWidth: 60 },
-    )
-
-    expect(renderedStateDimensions(output).width).toBeGreaterThan(60)
-    expect(output).toContain(label)
-  })
-
  test("does not mutate a parsed diagram when rendering with a direction override", () => {
    const diagram = parseMermaidStateDiagram(`stateDiagram-v2
  direction LR
@@ -367,21 +249,24 @@ ${ids

    for (const line of labelLines) expect(output.split(line)).toHaveLength(2)
    expect(output).toMatchInlineSnapshot(`
-      "  create from base image ╭─────────╮
+      "
+        create from base image ╭─────────╮
      ●───────────────────────▶│ Running │
-                               ╰──┬──────╯
-                                ▲ │   ▲        💥 sandbox dies BEFORE hook fires
-                       ╭────────┼─┴───┼───────╮(crash, our bug, race)
+                               ╰──┬──────╯ 💥 sandbox dies BEFORE hook fires
+                                ▲ │   ▲    (crash, our bug, race)
+                       ╭────────┼─┴───┼───────╮
                       ▼   ╭────┼─────╯       ▼
                    ╭──────┴──╮ │           ╭──────╮
                    │ Dormant │ │           │ Lost │
                    ╰─────────╯ │           ╰───┬──╯
                                │               │
-       📸 suspend hook fires    │               │ wake from LAST snapshot
-       (WE must call it on idle)│               │ ⚠ files since then GONE
+       📸 suspend hook fires    │               │
+       (WE must call it on idle)│               │
                                ╰───────────────╯
                            wake from snapshot image
-                            (apt installs restored!)"
+                            (apt installs restored!)
+                                  wake from LAST snapshot
+                                  ⚠ files since then GONE"
    `)
  })

@@ -620,14 +505,6 @@ stateDiagram-v2
    expect(output.split("\n").filter((line) => line.trim())).toHaveLength(3)
  })

-  test.each(["LR", "RL"] as const)("trims leading rows from standalone %s choices", (direction) => {
-    const output = renderStateDiagram(`stateDiagram-v2
-  direction ${direction}
-  state Decision <<choice>>`)
-
-    expect(output).toBe("◆")
-  })
-
  test("renders parallel transitions without losing labels", () => {
    const horizontal = renderStateDiagram(`stateDiagram-v2
  direction LR
@@ -806,135 +683,6 @@ stateDiagram-v2
    }
  })

-  test("grows parallel vertical diagrams by the maximum label width rather than their sum", () => {
-    const render = (labels: readonly string[]) =>
-      renderStateDiagram(`stateDiagram-v2
-  direction TB
-${labels.map((label) => `  A --> B: ${label}`).join("\n")}`)
-    const shortLabels = ["one", "two", "three"]
-    const longLabels = [
-      "alpha route label that is deliberately long",
-      "beta route label that is deliberately long",
-      "gamma route label that is deliberately long",
-    ]
-    const width = (output: string) => Math.max(...output.split("\n").map((line) => stringWidth(line)))
-    const labelGrowth =
-      Math.max(...longLabels.map((label) => stringWidth(label))) -
-      Math.max(...shortLabels.map((label) => stringWidth(label)))
-
-    expect(width(render(longLabels)) - width(render(shortLabels))).toBeLessThanOrEqual(labelGrowth + 2)
-  })
-
-  test("keeps audited parallel labels clear of frames and rails", () => {
-    const output = renderStateDiagram(`stateDiagram-v2
-  direction TB
-  A --> B: alpha route label that is deliberately long
-  A --> B: beta route label that is deliberately long
-  A --> B: gamma route label that is deliberately long`)
-
-    expect(output).toMatchInlineSnapshot(`
-      "╭───╮ alpha route label that is deliberately long
-      │ A ├───┬──╮
-      ╰─┬─╯   │  │
-        │     │  │ gamma route label that is deliberately long
-        │     │  │ beta route label that is deliberately long
-        │     │  │
-        ▼     │  │
-      ╭───╮   │  │
-      │ B │◀──┴──╯
-      ╰───╯"
-    `)
-  })
-
-  test("keeps audited repeated self-transition lanes distinct and readable", () => {
-    const output = renderStateDiagram(`stateDiagram-v2
-  direction LR
-  A --> A: one
-  A --> A: two
-  A --> A: three`)
-
-    expect(output).toMatchInlineSnapshot(`
-      "╭───╮
-      │ A │
-      ╰─┬─╯
-        │  ▲   ▲   ▲
-        ├──╯   │   │
-        │      │   │
-        │ one  │   │
-        ├──────╯   │
-        │          │
-        │     two  │ three
-        ╰──────────╯"
-    `)
-  })
-
-  test("expands composites around self-transition labels without engulfing external states", () => {
-    const source = `stateDiagram-v2
-  direction LR
-  state Outer {
-    A --> A: loop-0
-    A --> A: loop-1
-    A --> A: loop-2
-  }
-  A --> C`
-    const drawing = createStateDiagramDrawing(parseMermaidStateDiagram(source))
-    const outer = drawing.layout.compositeBounds.get("Outer")!
-    const external = drawing.layout.bounds.get("C")!
-    const output = drawing.grid.toString({ trimTop: true, trimBottom: true })
-
-    expect(
-      external.left < outer.left + outer.width &&
-        external.left + external.width > outer.left &&
-        external.top < outer.top + outer.height &&
-        external.top + external.height > outer.top,
-    ).toBe(false)
-    for (const plan of drawing.transitionPlans.filter(
-      (plan) => plan.route.transition.from === plan.route.transition.to,
-    )) {
-      expect(plan.label).toBeDefined()
-      expect(plan.label!.x).toBeGreaterThan(outer.left)
-      expect(plan.label!.y).toBeGreaterThan(outer.top)
-      expect(plan.label!.x + Math.max(...plan.label!.lines.map((line) => stringWidth(line)))).toBeLessThan(
-        outer.left + outer.width,
-      )
-      expect(plan.label!.y + plan.label!.lines.length).toBeLessThan(outer.top + outer.height)
-    }
-    for (const label of ["loop-0", "loop-1", "loop-2"]) expect(output.match(new RegExp(label, "g"))).toHaveLength(1)
-  })
-
-  test("keeps audited nested note connectors direct and inside every frame", () => {
-    const output = renderStateDiagram(`stateDiagram-v2
-  direction TB
-  state Outer {
-    state Inner {
-      A --> B: down
-      B --> A: up
-      note right of B: note
-    }
-  }`)
-
-    expect(output).toMatchInlineSnapshot(`
-      "╭─ Outer ───────────────╮
-      │                       │
-      │ ╭─ Inner ───────────╮ │
-      │ │                   │ │
-      │ │ ╭───╮             │ │
-      │ │▶│ A │             │ │
-      │ ││╰─┬─╯             │ │
-      │ ││  │               │ │
-      │ ││  │ down          │ │
-      │ ││  │               │ │
-      │ ││  ▼               │ │
-      │ ││╭───╮    ╔══════╗ │ │
-      │ │╰┤ B │════╣ note ║ │ │
-      │ │ ╰───╯    ╚══════╝ │ │
-      │ │up                 │ │
-      │ ╰───────────────────╯ │
-      │                       │
-      ╰───────────────────────╯"
-    `)
-  })
-
  test("keeps explicit choices visible in choice-only cycles", () => {
    const output = renderStateDiagram(`stateDiagram-v2
  direction TB
@@ -1,5 +1,5 @@
 import { BorderChars, type BorderCharacters, type BorderStyle } from "@opentui/core"
-import { DiagramCanvas, DiagramCanvasSizeError, type DiagramCanvasCell } from "../core/canvas.js"
+import { DiagramCanvas, type DiagramCanvasCell } from "../core/canvas.js"
 import { directionBetween, orthogonalPathPoints, type DiagramDirection } from "../core/geometry.js"
 import {
  diagramArrowHead,
@@ -12,7 +12,6 @@ import {
  createStateDiagramLayout,
  expandCompositeBoundsForFeedback,
  expandCompositeBoundsForInternalTransitions,
-  separateExternalBoundsFromComposites,
  translateStateDiagramLayout,
  type StateDiagramBoxBounds as BoxBounds,
  type StateDiagramNoteBounds as StateNoteBounds,
@@ -68,11 +67,23 @@ function makeGrid(width: number, height: number): StateGrid {
  })
 }

-function setCell(grid: StateGrid, x: number, y: number, char: string, style?: StateCellStyle): void {
+function setCell(
+  grid: StateGrid,
+  x: number,
+  y: number,
+  char: string,
+  style?: StateCellStyle,
+): void {
  grid.setCell(x, y, char, style)
 }

-function setText(grid: StateGrid, x: number, y: number, text: string, style?: StateCellStyle): void {
+function setText(
+  grid: StateGrid,
+  x: number,
+  y: number,
+  text: string,
+  style?: StateCellStyle,
+): void {
  grid.setText(x, y, text, style)
 }

@@ -97,7 +108,12 @@ function drawBox(
  })
 }

-function drawStateFrame(grid: StateGrid, bounds: BoxBounds, chars: BorderCharacters, style: StateCellStyle): void {
+function drawStateFrame(
+  grid: StateGrid,
+  bounds: BoxBounds,
+  chars: BorderCharacters,
+  style: StateCellStyle,
+): void {
  drawDiagramFrame(bounds, chars, (x, y, char) => setCell(grid, x, y, char, style))
 }

@@ -109,10 +125,6 @@ function drawContainerFrame(
  style: StateCellStyle,
 ): void {
  drawDiagramFrame(bounds, chars, (x, y, char) => setCell(grid, x, y, char, style))
-  drawContainerLabel(grid, bounds, label, style)
-}
-
-function drawContainerLabel(grid: StateGrid, bounds: BoxBounds, label: string, style: StateCellStyle): void {
  if (label) setText(grid, bounds.left + 2, bounds.top, ` ${label} `, style)
 }

@@ -178,7 +190,9 @@ function drawTransitionRenderPlan(
    setCell(grid, cell.x, cell.y, char, departure.get(`${cell.x}:${cell.y}`) ?? "transition")
  }
  if (plan.label) {
-    plan.label.lines.forEach((line, index) => setText(grid, plan.label!.x, plan.label!.y + index, line, "label"))
+    plan.label.lines.forEach((line, index) =>
+      setText(grid, plan.label!.x, plan.label!.y + index, line, "label"),
+    )
  }
 }

@@ -196,49 +210,8 @@ function drawTransitionJunctionPlans(
 }

 export function drawStateDiagramGrid(sourceDiagram: StateDiagram, options: StateDiagramRenderOptions = {}): StateGrid {
-  return createStateDiagramDrawing(sourceDiagram, options).grid
-}
-
-export function createStateDiagramDrawing(sourceDiagram: StateDiagram, options: StateDiagramRenderOptions = {}) {
-  const direction = options.direction ?? sourceDiagram.direction
-  if (direction !== "LR" && direction !== "RL") {
-    return createStateDiagramDrawingWithDirection(sourceDiagram, options, direction)
-  }
-  if (options.layoutMaxWidth === undefined || !Number.isFinite(options.layoutMaxWidth)) {
-    return createStateDiagramDrawingWithDirection(sourceDiagram, options, direction)
-  }
-  const fallbackDirection = direction === "RL" ? "BT" : "TB"
-  const maxWidth = Math.max(1, Math.trunc(options.layoutMaxWidth))
-  const drawing = (() => {
-    try {
-      return createStateDiagramDrawingWithDirection(sourceDiagram, options, direction)
-    } catch (error) {
-      if (error instanceof DiagramCanvasSizeError) return undefined
-      throw error
-    }
-  })()
-  if (!drawing) return createStateDiagramDrawingWithDirection(sourceDiagram, options, fallbackDirection)
-  if (drawing.grid.getTextSize({ trimTop: true, trimBottom: true }).width <= maxWidth) {
-    return drawing
-  }
-  const fallback = createStateDiagramDrawingWithDirection(sourceDiagram, options, fallbackDirection)
-  if (
-    fallback.grid.getTextSize({ trimTop: true, trimBottom: true }).width >=
-    drawing.grid.getTextSize({ trimTop: true, trimBottom: true }).width
-  ) {
-    return drawing
-  }
-  return fallback
-}
-
-function createStateDiagramDrawingWithDirection(
-  sourceDiagram: StateDiagram,
-  options: StateDiagramRenderOptions,
-  direction: StateDiagram["direction"],
-) {
-  const diagram = prepareVisibleStateDiagram(
-    direction === sourceDiagram.direction ? sourceDiagram : { ...sourceDiagram, direction },
-  )
+  const directedDiagram = options.direction ? { ...sourceDiagram, direction: options.direction } : sourceDiagram
+  const diagram = prepareVisibleStateDiagram(directedDiagram)
  const borderStyle = options.borderStyle ?? DEFAULT_STATE_BORDER_STYLE
  const arrowHeadStyle = options.arrowHeadStyle ?? DEFAULT_STATE_ARROW_HEAD_STYLE
  const minStateGap = normalizeStateMinStateGap(options.minStateGap)
@@ -253,24 +226,21 @@ function createStateDiagramDrawingWithDirection(
  const feedbackLaneY = maxY + 3
  const feedbackTopY = Math.min(0, ...allBounds.map((bound) => bound.top)) - 3
  expandCompositeBoundsForFeedback(diagram, bounds, compositeBounds, feedbackLaneY)
-  let transitionPlans: StateTransitionRenderPlan[] = []
-  const separationAttempts = diagram.states.length + diagram.composites.length + 1
-  for (let attempt = 0; attempt < separationAttempts; attempt++) {
-    transitionPlans = createStateTransitionRenderPlans(diagram, bounds, feedbackLaneY, {
-      feedbackTopY,
-      noteBounds,
-      searchBudget,
-    })
-    expandCompositeBoundsForInternalTransitions(diagram, compositeBounds, transitionPlans)
-    if (!separateExternalBoundsFromComposites(diagram, layout)) break
-    if (attempt === separationAttempts - 1) throw new Error("State composite separation did not converge")
-  }
+  let transitionPlans = createStateTransitionRenderPlans(diagram, bounds, feedbackLaneY, {
+    feedbackTopY,
+    noteBounds,
+    searchBudget,
+  })
+  expandCompositeBoundsForInternalTransitions(diagram, compositeBounds, transitionPlans)
  const connectorPoints = noteBounds.flatMap((bound) => bound.connector?.points ?? [])
  const contentLeft = Math.min(
    0,
    ...[...bounds.values(), ...noteBounds].map((bound) => bound.left),
    ...connectorPoints.map((point) => point.x),
-    ...transitionPlans.flatMap((plan) => [...plan.cells.map((cell) => cell.x), ...(plan.label ? [plan.label.x] : [])]),
+    ...transitionPlans.flatMap((plan) => [
+      ...plan.cells.map((cell) => cell.x),
+      ...(plan.label ? [plan.label.x] : []),
+    ]),
  )
  const contentTop = Math.min(
    0,
@@ -335,15 +305,10 @@ function createStateDiagramDrawingWithDirection(

  drawTransitionJunctionPlans(grid, diagram, bounds, transitionPlans)

-  for (const composite of diagram.composites) {
-    const bound = compositeBounds.get(composite.id)
-    if (bound) drawContainerLabel(grid, bound, composite.label, "composite")
-  }
-
  for (const noteBound of noteBounds) {
    const target = bounds.get(noteBound.note.target)
    if (target) drawNote(grid, noteBound, target)
  }

-  return { grid, diagram, layout, transitionPlans }
+  return grid
 }
@@ -2,7 +2,7 @@ import { describe, expect, test } from "bun:test"
 import { spatialPathClaim } from "../core/spatial.js"
 import { diagramTextWidth } from "../core/text.js"
 import type { StateDiagram } from "./types.js"
-import { createStateDiagramLayout, expandCompositeBoundsForInternalTransitions } from "./layout.js"
+import { createStateDiagramLayout } from "./layout.js"
 import { stateDiagramNoteConnector } from "./note.js"
 import { parseMermaidStateDiagram } from "./parser.js"
 import { createStateTransitionRenderPlans } from "./routing.js"
@@ -192,75 +192,4 @@ describe("StateDiagramLayout", () => {
    )
    expect(plans.every((plan) => plan.path.every(([x, y]) => !noteCells.has(`${x}:${y}`)))).toBe(true)
  })
-
-  test.each([
-    ["LR", -1],
-    ["RL", 1],
-  ] as const)("keeps a reciprocal pair on the %s axis", (direction, expectedSign) => {
-    const diagram = prepareVisibleStateDiagram(
-      parseMermaidStateDiagram(`stateDiagram-v2
-  direction ${direction}
-  A --> B: forward
-  B --> A: backward`),
-    )
-    const layout = createStateDiagramLayout(diagram, { minStateGap: 5 })
-    const a = layout.bounds.get("A")!
-    const b = layout.bounds.get("B")!
-
-    expect(a.centerY).toBe(b.centerY)
-    expect(Math.sign(a.centerX - b.centerX)).toBe(expectedSign)
-  })
-
-  test.each(["TB", "TD"] as const)(
-    "contains nested internal feedback with strict margins in %s diagrams",
-    (direction) => {
-      const diagram = prepareVisibleStateDiagram(
-        parseMermaidStateDiagram(`stateDiagram-v2
-  direction ${direction}
-  state Outer {
-    state Inner {
-      A --> B: down
-      B --> A: up
-      note right of B: nested note
-    }
-  }`),
-      )
-      const layout = createStateDiagramLayout(diagram, { minStateGap: 5 })
-      const plans = createStateTransitionRenderPlans(diagram, layout.bounds, 30, { noteBounds: layout.noteBounds })
-      expandCompositeBoundsForInternalTransitions(diagram, layout.compositeBounds, plans)
-      const inner = layout.compositeBounds.get("Inner")!
-      const outer = layout.compositeBounds.get("Outer")!
-      const note = layout.noteBounds[0]!
-
-      for (const composite of [inner, outer]) {
-        for (const plan of plans) {
-          expect(
-            plan.path.every(
-              ([x, y]) =>
-                x > composite.left &&
-                x < composite.left + composite.width - 1 &&
-                y > composite.top &&
-                y < composite.top + composite.height - 1,
-            ),
-          ).toBe(true)
-        }
-        expect(
-          note.connector!.points.every(
-            (point) =>
-              point.x > composite.left &&
-              point.x < composite.left + composite.width - 1 &&
-              point.y > composite.top &&
-              point.y < composite.top + composite.height - 1,
-          ),
-        ).toBe(true)
-      }
-      expect(new Set(note.connector!.points.map((point) => point.y))).toEqual(
-        new Set([layout.bounds.get("B")!.centerY]),
-      )
-      expect(inner.left - outer.left).toBeGreaterThanOrEqual(2)
-      expect(inner.top - outer.top).toBeGreaterThanOrEqual(2)
-      expect(outer.left + outer.width - (inner.left + inner.width)).toBeGreaterThanOrEqual(2)
-      expect(outer.top + outer.height - (inner.top + inner.height)).toBeGreaterThanOrEqual(2)
-    },
-  )
 })
@@ -131,8 +131,7 @@ function computeMainPath(diagram: StateDiagram): string[] {
        const fromParent = statesById.get(current)?.parentId
        const toParent = statesById.get(transition.to)?.parentId
        return Boolean(fromParent && toParent && fromParent !== toParent)
-      }) ??
-      (path.length === 1 && candidates.length === 1 ? candidates[0] : undefined)
+      })
    if (!next) break
    path.push(next.to)
    visited.add(next.to)
@@ -320,12 +319,7 @@ function findNoteConnector(
  const isFree = (point: DiagramPoint): boolean =>
    point.x >= 0 &&
    !search.blocked.has(`${point.x}:${point.y}`) &&
-    !(
-      point.x >= bounds.left &&
-      point.x < bounds.left + bounds.width &&
-      point.y >= bounds.top &&
-      point.y < bounds.top + bounds.height
-    )
+    !(point.x >= bounds.left && point.x < bounds.left + bounds.width && point.y >= bounds.top && point.y < bounds.top + bounds.height)
  if (!isFree(end) || !isFree(goal)) return undefined

  for (const start of starts.filter(isFree)) {
@@ -341,7 +335,14 @@ function findNoteConnector(
  const minY = Math.min(target.top, bounds.top, search.minY) - margin
  const maxX = Math.max(target.left + target.width, bounds.left + bounds.width, search.maxX) + margin
  const maxY = Math.max(target.top + target.height, bounds.top + bounds.height, search.maxY) + margin
-  const path = findStateManhattanPath(starts, goal, search, { minX: 0, minY, maxX, maxY }, budget, isFree)
+  const path = findStateManhattanPath(
+    starts,
+    goal,
+    search,
+    { minX: 0, minY, maxX, maxY },
+    budget,
+    isFree,
+  )
  return path ? { connectorY, points: [...path, end] } : undefined
 }

@@ -374,27 +375,13 @@ function expandCompositeBoundsForNotes(diagram: StateDiagram, layout: StateDiagr
    )
    if (descendantNotes.length === 0) continue

-    const connectorPoints = descendantNotes.flatMap((note) => note.connector?.points ?? [])
-    const left = Math.min(
-      bound.left,
-      ...descendantNotes.map((note) => note.left - 2),
-      ...connectorPoints.map((point) => point.x - 1),
-    )
-    const top = Math.min(
-      bound.top,
-      ...descendantNotes.map((note) => note.top - 1),
-      ...connectorPoints.map((point) => point.y - 1),
-    )
-    const right = Math.max(
-      bound.left + bound.width,
-      ...descendantNotes.map((note) => note.left + note.width + 2),
-      ...connectorPoints.map((point) => point.x + 2),
-    )
-    const bottom = Math.max(
-      bound.top + bound.height,
-      ...descendantNotes.map((note) => note.top + note.height + 1),
-      ...connectorPoints.map((point) => point.y + 2),
-    )
+    const childBounds = [bound, ...descendantNotes]
+    const noteTop = Math.min(...childBounds.map((child) => child.top), bound.top)
+    const noteBottom = Math.max(...childBounds.map((child) => child.top + child.height), bound.top + bound.height)
+    const left = Math.min(...childBounds.map((child) => child.left)) - 2
+    const top = noteTop < bound.top ? noteTop - 1 : bound.top
+    const right = Math.max(...childBounds.map((child) => child.left + child.width)) + 2
+    const bottom = noteBottom > bound.top + bound.height ? noteBottom + 1 : bound.top + bound.height

    bound.left = left
    bound.top = top
@@ -405,112 +392,13 @@ function expandCompositeBoundsForNotes(diagram: StateDiagram, layout: StateDiagr
  }
 }

-function expandCompositeBoundsForInternalRouting(diagram: StateDiagram, layout: StateDiagramLayout): void {
-  if (diagram.direction === "LR" || diagram.direction === "RL") return
-  const statesById = new Map(diagram.states.map((state) => [state.id, state]))
-  const compositesById = new Map(diagram.composites.map((composite) => [composite.id, composite]))
-
-  for (const composite of [...diagram.composites].reverse()) {
-    const bound = layout.compositeBounds.get(composite.id)
-    if (!bound) continue
-    const internal = diagram.transitions.filter(
-      (transition) =>
-        transition.from !== transition.to &&
-        innermostCommonCompositeId(transition, statesById, compositesById) === composite.id,
-    )
-    const endpointOccurrences = new Map<string, number>()
-    const sideRoutes = internal.filter((transition) => {
-      const from = layout.bounds.get(transition.from)
-      const to = layout.bounds.get(transition.to)
-      if (!from || !to) return false
-      const key = `${transition.from}\u0000${transition.to}`
-      const occurrence = endpointOccurrences.get(key) ?? 0
-      endpointOccurrences.set(key, occurrence + 1)
-      const fromParent = statesById.get(transition.from)?.parentId
-      const toParent = statesById.get(transition.to)?.parentId
-      return occurrence > 0 || from.centerY > to.centerY || fromParent !== toParent
-    })
-    if (sideRoutes.length === 0) continue
-    const childRight = Math.max(
-      ...diagram.states.flatMap((state) => {
-        if (!belongsToComposite(state.id, composite.id, statesById, compositesById)) return []
-        const child = layout.bounds.get(state.id)
-        return child ? [child.left + child.width] : []
-      }),
-      ...diagram.composites.flatMap((childComposite) => {
-        if (childComposite.parentId !== composite.id) return []
-        const child = layout.compositeBounds.get(childComposite.id)
-        return child ? [child.left + child.width] : []
-      }),
-    )
-    const labelWidth = Math.max(...sideRoutes.map((transition) => measureStateTransitionLabel(transition.label).width))
-    const right = childRight + labelWidth + sideRoutes.length * 3 + 6
-    if (right <= bound.left + bound.width) continue
-    bound.width = right - bound.left
-    bound.centerX = bound.left + Math.floor(bound.width / 2)
-  }
-
-  enforceCompositeMargins(diagram, layout.compositeBounds)
-}
-
-function innermostCommonCompositeId(
-  transition: StateDiagramTransition,
-  statesById: Map<string, StateDiagramState>,
-  compositesById: Map<string, StateDiagramCompositeState>,
-): string | undefined {
-  const containers = (id: string) => {
-    const ids: string[] = []
-    let parentId = statesById.get(id)?.parentId ?? compositesById.get(id)?.parentId
-    while (parentId) {
-      ids.push(parentId)
-      parentId = compositesById.get(parentId)?.parentId
-    }
-    return ids
-  }
-  const target = new Set(containers(transition.to))
-  return containers(transition.from).find((id) => target.has(id))
-}
-
-function enforceCompositeMargins(diagram: StateDiagram, compositeBounds: Map<string, StateDiagramBoxBounds>): void {
-  const compositesByParent = new Map<string, StateDiagramCompositeState[]>()
-  for (const composite of diagram.composites) {
-    if (!composite.parentId) continue
-    const children = compositesByParent.get(composite.parentId) ?? []
-    children.push(composite)
-    compositesByParent.set(composite.parentId, children)
-  }
-
-  const expand = (composite: StateDiagramCompositeState): StateDiagramBoxBounds | undefined => {
-    const bound = compositeBounds.get(composite.id)
-    if (!bound) return undefined
-    const children = (compositesByParent.get(composite.id) ?? [])
-      .map(expand)
-      .filter((child): child is StateDiagramBoxBounds => Boolean(child))
-    if (children.length === 0) return bound
-    const left = Math.min(bound.left, ...children.map((child) => child.left - 2))
-    const top = Math.min(bound.top, ...children.map((child) => child.top - 2))
-    const right = Math.max(bound.left + bound.width, ...children.map((child) => child.left + child.width + 2))
-    const bottom = Math.max(bound.top + bound.height, ...children.map((child) => child.top + child.height + 2))
-    bound.left = left
-    bound.top = top
-    bound.width = right - left
-    bound.height = bottom - top
-    bound.centerX = left + Math.floor(bound.width / 2)
-    bound.centerY = top + Math.floor(bound.height / 2)
-    return bound
-  }
-
-  for (const composite of diagram.composites.filter((candidate) => !candidate.parentId)) expand(composite)
-}
-
 function boundsIntersect(left: StateDiagramBoxBounds, right: StateDiagramBoxBounds): boolean {
  return intersects(left.left, left.top, left.width, left.height, right, 0)
 }

-export function separateExternalBoundsFromComposites(diagram: StateDiagram, layout: StateDiagramLayout): boolean {
+function separateExternalBoundsFromComposites(diagram: StateDiagram, layout: StateDiagramLayout): void {
  const statesById = new Map(diagram.states.map((state) => [state.id, state]))
  const compositesById = new Map(diagram.composites.map((composite) => [composite.id, composite]))
-  let shifted = false

  for (const composite of diagram.composites) {
    const compositeBound = layout.compositeBounds.get(composite.id)
@@ -545,10 +433,8 @@ export function separateExternalBoundsFromComposites(diagram: StateDiagram, layo
      }

      shiftBounds(uniqueBounds(boundsToShift), dx, 0)
-      shifted = true
    }
  }
-  return shifted
 }

 function finalizeLayout(
@@ -559,7 +445,6 @@ function finalizeLayout(
  if (diagram.composites.length === 0 && diagram.notes.length === 0) return layout
  addCompositeBounds(diagram, layout)
  normalizeLayout(layout)
-  expandCompositeBoundsForInternalRouting(diagram, layout)
  if (diagram.notes.length > 0) {
    const allBounds = [...layout.bounds.values()]
    placeStateDiagramNotesAroundTransitions(
@@ -579,7 +464,6 @@ function finalizeLayout(
    )
  }
  expandCompositeBoundsForNotes(diagram, layout)
-  expandCompositeBoundsForInternalRouting(diagram, layout)
  separateExternalBoundsFromComposites(diagram, layout)
  normalizeLayout(layout)
  return layout
@@ -595,10 +479,9 @@ export function createStateDiagramLayout(
  }

  const ranks = computeRanks(diagram)
-  const maxRank = Math.max(0, ...ranks.values())
  const byRank = new Map<number, StateDiagramState[]>()
  for (const state of diagram.states) {
-    const rank = diagram.direction === "BT" ? maxRank - (ranks.get(state.id) ?? 0) : (ranks.get(state.id) ?? 0)
+    const rank = ranks.get(state.id) ?? 0
    const list = byRank.get(rank) ?? []
    list.push(state)
    byRank.set(rank, list)
@@ -608,13 +491,9 @@ export function createStateDiagramLayout(
  const sizes = new Map(diagram.states.map((state) => [state.id, stateSize(state)]))
  const bounds = new Map<string, StateDiagramBoxBounds>()
  const outgoingLabelRows = new Map<string, number>()
-  const selfTransitionCounts = new Map<string, number>()
  for (const transition of diagram.transitions) {
    const rows = measureStateTransitionLabel(transition.label).height
    outgoingLabelRows.set(transition.from, Math.max(outgoingLabelRows.get(transition.from) ?? 0, rows))
-    if (transition.from === transition.to) {
-      selfTransitionCounts.set(transition.from, (selfTransitionCounts.get(transition.from) ?? 0) + 1)
-    }
  }

  const singleColumnCenter = Math.max(
@@ -645,12 +524,8 @@ export function createStateDiagramLayout(
      x += size.width + options.minStateGap + 8
    }
    const labelRows = states.reduce((rows, state) => Math.max(rows, outgoingLabelRows.get(state.id) ?? 0), 0)
-    const selfTransitionRows = states.reduce(
-      (rows, state) => Math.max(rows, (selfTransitionCounts.get(state.id) ?? 0) * 3 + 1),
-      0,
-    )
    const pseudoStateApproachClearance = states.some((state) => state.kind === "choice") ? 2 : 0
-    y += rowHeight + Math.max(4, labelRows + 3, selfTransitionRows) + pseudoStateApproachClearance
+    y += rowHeight + Math.max(4, labelRows + 3) + pseudoStateApproachClearance
  }

  return finalizeLayout(diagram, emptyLayout(bounds, sizes), budget)
@@ -930,21 +805,21 @@ function placeStateDiagramNotesAroundTransitions(
          size,
        ),
      ),
-    ).flat()
+    )
+      .flat()
    const findPlacement = (candidateSpace: SpatialIndex, limit: number) => {
      const connectorSearch = createStateSearchSpace(candidateSpace, (role) => (role === "label" ? 1 : 0))
      for (const bound of candidateBounds.slice(0, limit)) {
        if (bound.left < 0) continue
        const owner = `note:${index}`
-        if (!candidateSpace.isFree(spatialRectClaim(`${owner}:body`, owner, "body", bound), { clearance: 1 })) continue
+        if (!candidateSpace.isFree(spatialRectClaim(`${owner}:body`, owner, "body", bound), { clearance: 1 }))
+          continue
        const connector = findNoteConnector(connectorSearch, bound, target, budget)
        if (connector) return { bound: { ...bound, connector }, connector }
      }
      return undefined
    }
    const placement =
-      findPlacement(space, 1) ??
-      findPlacement(noteSpace, 1) ??
      findPlacement(space, MAX_STRICT_NOTE_PLACEMENTS) ??
      findPlacement(reserved, candidateBounds.length) ??
      outsideNotePlacement(noteSpace, note, index, target, size)
@@ -982,7 +857,10 @@ function outsideNotePlacement(
      size,
    )
    const alignedNoteX = position === "left" ? aligned.left + aligned.width : aligned.left - 1
-    const alignedConnectorY = Math.max(aligned.top + 1, Math.min(target.centerY, aligned.top + aligned.height - 2))
+    const alignedConnectorY = Math.max(
+      aligned.top + 1,
+      Math.min(target.centerY, aligned.top + aligned.height - 2),
+    )
    const alignedTargetX = position === "left" ? target.left - 1 : target.left + target.width
    const alignedConnector = {
      connectorY: alignedConnectorY,
@@ -1097,30 +975,16 @@ export function expandCompositeBoundsForInternalTransitions(
        belongsToComposite(plan.route.transition.from, composite.id, statesById, compositesById) &&
        belongsToComposite(plan.route.transition.to, composite.id, statesById, compositesById),
    )
-    const occupied = internalPlans.flatMap((plan) => [
-      ...plan.cells.map((cell) => ({ x: cell.x, y: cell.y })),
-      ...(plan.label
-        ? plan.label.lines.flatMap((line, row) =>
-            Array.from({ length: diagramTextWidth(line) }, (_, column) => ({
-              x: plan.label!.x + column,
-              y: plan.label!.y + row,
-            })),
-          )
-        : []),
+    const occupiedYs = internalPlans.flatMap((plan) => [
+      ...plan.cells.map((cell) => cell.y),
+      ...(plan.label ? plan.label.lines.map((_, index) => plan.label!.y + index) : []),
    ])
-    if (occupied.length === 0) continue
+    if (occupiedYs.length === 0) continue

-    const left = Math.min(bound.left, Math.min(...occupied.map((point) => point.x)) - 1)
-    const top = Math.min(bound.top, Math.min(...occupied.map((point) => point.y)) - 1)
-    const right = Math.max(bound.left + bound.width, Math.max(...occupied.map((point) => point.x)) + 2)
-    const bottom = Math.max(bound.top + bound.height, Math.max(...occupied.map((point) => point.y)) + 2)
-    bound.left = left
+    const top = Math.min(bound.top, Math.min(...occupiedYs) - 1)
+    const bottom = Math.max(bound.top + bound.height, Math.max(...occupiedYs) + 2)
    bound.top = top
-    bound.width = right - left
    bound.height = bottom - top
-    bound.centerX = bound.left + Math.floor(bound.width / 2)
    bound.centerY = bound.top + Math.floor(bound.height / 2)
  }
-
-  enforceCompositeMargins(diagram, compositeBounds)
 }
@@ -16,14 +16,14 @@ const STATE_RE = /^state\s+"([^"]+)"\s+as\s+(\S+)$/i
 const COMPOSITE_STATE_RE = /^state\s+(?:"([^"]+)"\s+as\s+)?(\S+)\s*\{$/i
 const CHOICE_STATE_RE = /^state\s+(\S+)\s+<<choice>>$/i
 const TRANSITION_RE = /^(\[\*\]|[^\s:]+)\s*-->\s*(\[\*\]|[^\s:]+)(?:\s*:\s*(.*))?$/
-const DIRECTION_RE = /^direction\s+(TB|TD|BT|LR|RL)$/i
+const DIRECTION_RE = /^direction\s+(TB|TD|LR|RL)$/i
 const NOTE_INLINE_RE = /^note\s+(left|right)\s+of\s+(\S+)\s*:\s*(.*)$/i
 const NOTE_START_RE = /^note\s+(left|right)\s+of\s+(\S+)\s*$/i
 const NOTE_END_RE = /^end\s+note$/i

 function normalizeDirection(value?: string): StateDiagramDirection {
  const upper = value?.toUpperCase()
-  if (upper === "TB" || upper === "TD" || upper === "BT" || upper === "LR" || upper === "RL") return upper
+  if (upper === "TB" || upper === "TD" || upper === "LR" || upper === "RL") return upper
  return DEFAULT_DIRECTION
 }

@@ -7,12 +7,11 @@ import type { StateCellStyle } from "./types.js"
 export type StateGrid = DiagramCanvas<StateCellStyle>

 export function renderStateGridText(grid: StateGrid): string {
-  return grid.toString({ trimTop: true, trimBottom: true })
+  return grid.toString({ trimBottom: true })
 }

 export function renderStateGridStyledText(grid: StateGrid, colors: StateStyleColors): StyledText {
  return renderDiagramGridStyledText(grid, (run) => (run.style ? colors[run.style] : undefined), undefined, {
-    trimTop: true,
    trimBottom: true,
  })
 }
@@ -1,5 +1,4 @@
 import { describe, expect, test } from "bun:test"
-import { diagramTextWidth } from "../core/text.js"
 import type { StateDiagramBoxBounds } from "./layout.js"
 import { createStateDiagramLayout } from "./layout.js"
 import { parseMermaidStateDiagram } from "./parser.js"
@@ -287,7 +286,10 @@ describe("createStateTransitionRenderPlans", () => {
    expect(
      plan.path.some(
        ([x, y]) =>
-          x >= sibling.left && x < sibling.left + sibling.width && y >= sibling.top && y < sibling.top + sibling.height,
+          x >= sibling.left &&
+          x < sibling.left + sibling.width &&
+          y >= sibling.top &&
+          y < sibling.top + sibling.height,
      ),
    ).toBe(false)
  })
@@ -346,158 +348,6 @@ describe("createStateTransitionRenderPlans", () => {
      }),
    ).toBe(true)
  })
-
-  test.each(["LR", "RL", "TB", "TD"] as const)(
-    "keeps endpoint-disjoint %s transitions on separate cells when a detour exists",
-    (direction) => {
-      const diagram = prepareVisibleStateDiagram(
-        parseMermaidStateDiagram(`stateDiagram-v2
-  direction ${direction}
-  state "A" as A
-  state "B" as B
-  state "C" as C
-  state "D" as D
-  B --> D: e0
-  C --> A: e1`),
-      )
-      const layout = createStateDiagramLayout(diagram, { minStateGap: 5 })
-      const plans = createStateTransitionRenderPlans(diagram, layout.bounds, 30)
-      const first = new Set(plans[0]!.path.map(([x, y]) => `${x}:${y}`))
-
-      expect(plans[1]!.path.every(([x, y]) => !first.has(`${x}:${y}`))).toBe(true)
-    },
-  )
-
-  test("anchors labels to final repaired transition geometry", () => {
-    const diagram = prepareVisibleStateDiagram(
-      parseMermaidStateDiagram(`stateDiagram-v2
-  direction TB
-  state "A" as A
-  state "B" as B
-  state "C" as C
-  A --> B: e0
-  A --> C: e1
-  B --> A: e2`),
-    )
-    const layout = createStateDiagramLayout(diagram, { minStateGap: 5 })
-    const plan = createStateTransitionRenderPlans(diagram, layout.bounds, 30).find(
-      (candidate) => candidate.route.transition.label === "e2",
-    )!
-    const width = Math.max(...plan.label!.lines.map(diagramTextWidth))
-    const distance = Math.min(
-      ...plan.path.map(([pathX, pathY]) => {
-        const dx =
-          pathX < plan.label!.x
-            ? plan.label!.x - pathX
-            : pathX >= plan.label!.x + width
-              ? pathX - (plan.label!.x + width - 1)
-              : 0
-        const dy =
-          pathY < plan.label!.y
-            ? plan.label!.y - pathY
-            : pathY >= plan.label!.y + plan.label!.lines.length
-              ? pathY - (plan.label!.y + plan.label!.lines.length - 1)
-              : 0
-        return dx + dy
-      }),
-    )
-
-    expect(plan.pathRepaired).toBe(true)
-    expect(distance).toBeLessThanOrEqual(4)
-  })
-
-  test.each(["LR", "RL", "TB", "TD"] as const)(
-    "allocates distinct connected self-transition lanes in %s diagrams",
-    (direction) => {
-      for (const count of [2, 3, 4]) {
-        const diagram = prepareVisibleStateDiagram(
-          parseMermaidStateDiagram(`stateDiagram-v2
-  direction ${direction}
-${Array.from({ length: count }, (_, index) => `  A --> A: loop-${index}`).join("\n")}`),
-        )
-        const layout = createStateDiagramLayout(diagram, { minStateGap: 5 })
-        const plans = createStateTransitionRenderPlans(diagram, layout.bounds, 30)
-
-        expect(new Set(plans.map((plan) => plan.path.map(([x, y]) => `${x}:${y}`).join("|"))).size).toBe(count)
-        for (const plan of plans) {
-          expect(
-            plan.path.slice(1).every(([x, y], index) => {
-              const previous = plan.path[index]!
-              return Math.abs(x - previous[0]) + Math.abs(y - previous[1]) === 1
-            }),
-          ).toBe(true)
-        }
-      }
-    },
-  )
-
-  test("uses fixed-width side lanes for long parallel vertical labels", () => {
-    const diagram = prepareVisibleStateDiagram(
-      parseMermaidStateDiagram(`stateDiagram-v2
-  direction TB
-  A --> B: alpha route label that is deliberately long
-  A --> B: beta route label that is deliberately long
-  A --> B: gamma route label that is deliberately long`),
-    )
-    const layout = createStateDiagramLayout(diagram, { minStateGap: 5 })
-    const rails = createStateTransitionRoutePlans(diagram, layout.bounds, 30)
-      .filter((plan) => plan.kind === "side-parallel")
-      .map((plan) => plan.railX)
-
-    expect(rails).toHaveLength(2)
-    expect(rails[1]! - rails[0]!).toBe(3)
-  })
-
-  test.each([
-    [
-      "parallel",
-      `stateDiagram-v2
-  direction TB
-  A --> B: alpha route label that is deliberately long
-  A --> B: beta route label that is deliberately long
-  A --> B: gamma route label that is deliberately long`,
-      3,
-    ],
-    [
-      "self",
-      `stateDiagram-v2
-  direction LR
-  A --> A: one
-  A --> A: two
-  A --> A: three`,
-      3,
-    ],
-  ] as const)("keeps %s labels one column clear of frames and route rails", (_, source, count) => {
-    const diagram = prepareVisibleStateDiagram(parseMermaidStateDiagram(source))
-    const layout = createStateDiagramLayout(diagram, { minStateGap: 5 })
-    const plans = createStateTransitionRenderPlans(diagram, layout.bounds, 30)
-    const routeCells = plans.flatMap((plan) => plan.path)
-
-    expect(plans).toHaveLength(count)
-    for (const plan of plans) {
-      const width = Math.max(...plan.label!.lines.map(diagramTextWidth))
-      for (const [row, line] of plan.label!.lines.entries()) {
-        const lineWidth = diagramTextWidth(line)
-        const y = plan.label!.y + row
-        expect(
-          routeCells
-            .filter(([, routeY]) => routeY === y)
-            .every(([routeX]) => routeX < plan.label!.x - 1 || routeX > plan.label!.x + lineWidth),
-        ).toBe(true)
-        for (const bound of layout.bounds.values()) {
-          if (y < bound.top || y >= bound.top + bound.height) continue
-          expect(bound.left + bound.width <= plan.label!.x - 1 || bound.left >= plan.label!.x + width + 1).toBe(true)
-        }
-      }
-    }
-
-    if (source.includes("A --> A")) {
-      const arrowXs = plans
-        .flatMap((plan) => plan.cells.filter((cell) => cell.arrowDirection).map((cell) => cell.x))
-        .sort((left, right) => left - right)
-      expect(arrowXs.slice(1).every((x, index) => x - arrowXs[index]! >= 4)).toBe(true)
-    }
-  })
 })

 describe("createStateTransitionJunctionPlans", () => {
@@ -1,6 +1,6 @@
 import { BorderChars } from "@opentui/core"
 import { diagramLineGlyph } from "../core/drawing.js"
-import { orthogonalPathPoints, type DiagramDirection } from "../core/geometry.js"
+import type { DiagramDirection } from "../core/geometry.js"
 import { SpatialIndex, spatialPathClaim, spatialRectClaim } from "../core/spatial.js"
 import { diagramTextWidth, splitDiagramLines } from "../core/text.js"
 import type { StateDiagramBoxBounds as BoxBounds, StateDiagramNoteBounds } from "./layout.js"
@@ -24,7 +24,7 @@ interface StateTransitionRoutePlanBase {
 }

 export type StateTransitionRoutePlan =
-  | (StateTransitionRoutePlanBase & { kind: "self"; lane: number })
+  | (StateTransitionRoutePlanBase & { kind: "self" })
  | (StateTransitionRoutePlanBase & { kind: "horizontal-forward"; leftToRight: boolean })
  | (StateTransitionRoutePlanBase & { kind: "bottom-feedback"; railY: number; approachX: number })
  | (StateTransitionRoutePlanBase & { kind: "top-feedback"; railY: number })
@@ -58,7 +58,6 @@ export interface StateTransitionRenderPlan {
  cells: readonly StateTransitionRenderCell[]
  path: readonly StateTransitionPathPoint[]
  label?: StateTransitionRenderLabel
-  pathRepaired?: boolean
 }

 export interface StateTransitionRenderOptions {
@@ -351,26 +350,6 @@ function sideParallelTargetApproach(
  })
 }

-function containingCompositeIds(diagram: StateVisibleDiagram, id: string): string[] {
-  const statesById = new Map(diagram.states.map((state) => [state.id, state]))
-  const compositesById = new Map(diagram.composites.map((composite) => [composite.id, composite]))
-  const ids: string[] = []
-  let parentId = statesById.get(id)?.parentId ?? compositesById.get(id)?.parentId
-  while (parentId) {
-    ids.push(parentId)
-    parentId = compositesById.get(parentId)?.parentId
-  }
-  return ids
-}
-
-function innermostCommonComposite(
-  diagram: StateVisibleDiagram,
-  transition: StateVisibleTransition,
-): string | undefined {
-  const target = new Set(containingCompositeIds(diagram, transition.to))
-  return containingCompositeIds(diagram, transition.from).find((id) => target.has(id))
-}
-
 export function createStateTransitionRoutePlans(
  diagram: StateVisibleDiagram,
  bounds: ReadonlyMap<string, BoxBounds>,
@@ -379,13 +358,11 @@ export function createStateTransitionRoutePlans(
 ): StateTransitionRoutePlan[] {
  const statesById = new Map(diagram.states.map((state) => [state.id, state]))
  const endpointOccurrences = new Map<string, number>()
-  const selfOccurrences = new Map<string, number>()
  const parallelLaneGap = Math.max(
    3,
    ...diagram.transitions.map((transition) => measureStateTransitionLabel(transition.label).height + 2),
  )
  let nextSideRailX = Math.max(0, ...[...bounds.values()].map((bound) => bound.left + bound.width)) + 3
-  const sideRailLanes = new Map<string, number>()
  const feedbackAllocations = createFeedbackAllocations(diagram, bounds, feedbackLaneY, parallelLaneGap, feedbackTopY)
  let nextBottomRailY =
    Math.max(
@@ -394,24 +371,9 @@ export function createStateTransitionRoutePlans(
        .filter((allocation) => allocation.side === "bottom")
        .map((allocation) => allocation.railY),
    ) + parallelLaneGap
-  const allocateSideRail = (transition: StateVisibleTransition): number => {
-    const compositeId = innermostCommonComposite(diagram, transition)
-    const composite = compositeId ? bounds.get(compositeId) : undefined
-    if (compositeId && composite) {
-      const lane = sideRailLanes.get(compositeId) ?? 0
-      sideRailLanes.set(compositeId, lane + 1)
-      const descendantRight = Math.max(
-        composite.left + 1,
-        ...diagram.states.flatMap((state) => {
-          if (!containingCompositeIds(diagram, state.id).includes(compositeId)) return []
-          const bound = bounds.get(state.id)
-          return bound ? [bound.left + bound.width] : []
-        }),
-      )
-      return Math.min(descendantRight + 2 + lane * 3, composite.left + composite.width - 2)
-    }
+  const allocateSideRail = (label: string): number => {
    const railX = nextSideRailX
-    nextSideRailX += 3
+    nextSideRailX += Math.max(3, measureStateTransitionLabel(label).width + 2)
    return railX
  }
  const allocateBottomRail = (): number => {
@@ -430,7 +392,7 @@ export function createStateTransitionRoutePlans(
    const targetIsHiddenMarker = isHiddenCompositeMarker(targetState)
    const base = { transition, from, to, targetIsChoice, targetIsHiddenMarker }
    const sideParallel = (): StateTransitionRoutePlan => {
-      const railX = allocateSideRail(transition)
+      const railX = allocateSideRail(transition.label)
      return {
        ...base,
        kind: "side-parallel",
@@ -438,11 +400,7 @@ export function createStateTransitionRoutePlans(
        targetApproach: sideParallelTargetApproach(diagram, transition, from, to, bounds, railX),
      }
    }
-    if (transition.from === transition.to) {
-      const lane = selfOccurrences.get(transition.from) ?? 0
-      selfOccurrences.set(transition.from, lane + 1)
-      return [{ ...base, kind: "self", lane }]
-    }
+    if (transition.from === transition.to) return [{ ...base, kind: "self" }]
    const endpointKey = `${transition.from}\u0000${transition.to}`
    const parallelIndex = endpointOccurrences.get(endpointKey) ?? 0
    endpointOccurrences.set(endpointKey, parallelIndex + 1)
@@ -491,8 +449,7 @@ export function createStateTransitionRoutePlans(
      if (verticalCorridorCrossesUnrelatedState(diagram, transition, from, to, bounds)) {
        return [sideParallel()]
      }
-      const verticalFeedback = diagram.direction === "BT" ? from.centerY < to.centerY : from.centerY > to.centerY
-      if (verticalFeedback) {
+      if (from.centerY > to.centerY) {
        return [sideParallel()]
      }
      if (from.centerY === to.centerY) {
@@ -655,36 +612,33 @@ function addHorizontalForward(builder: StateTransitionRenderBuilder): void {
 }

 function addSelfTransition(builder: StateTransitionRenderBuilder): void {
-  const { from: bounds, transition, lane } = builder.route as Extract<StateTransitionRoutePlan, { kind: "self" }>
+  const { from: bounds, transition } = builder.route
  if (bounds.width <= 1 || bounds.height <= 1) {
-    const railX = bounds.left + 4 + lane * 4
-    const railY = bounds.top + 2 + lane * 2
+    const railX = bounds.left + 4
+    const railY = bounds.top + 2
    addHorizontalLine(builder, bounds.left + 1, railX - 1, bounds.top, 1)
    addCell(builder, { x: railX, y: bounds.top, char: "╮" })
-    addVerticalLine(builder, railX, bounds.top + 1, railY - 1, 1)
+    addCell(builder, { x: railX, y: bounds.top + 1, char: "│" })
    addCell(builder, { x: railX, y: railY, char: "╯" })
    addHorizontalLine(builder, railX - 1, bounds.left + 1, railY, -1)
    addCell(builder, { x: bounds.left, y: railY, char: "╰" })
-    for (let y = railY - 1; y > bounds.top + 1; y--) addCell(builder, { x: bounds.left, y, char: "│" })
    addCell(builder, { x: bounds.left, y: bounds.top + 1, arrowDirection: "up" })
    addPathPoint(builder, bounds.left, bounds.top)
-    if (transition.label) addLabel(builder, railX + 2, lane === 0 ? bounds.top + 1 : railY - 1, transition.label)
+    if (transition.label) addLabel(builder, railX + 2, bounds.top + 1, transition.label)
    return
  }
  const sourceX = bounds.left + Math.max(2, Math.floor(bounds.width / 3))
  const bottomY = bounds.top + bounds.height - 1
-  const railY = bottomY + 2 + lane * 3
-  const targetX =
-    Math.max(sourceX + 3, bounds.left + Math.min(bounds.width - 3, Math.ceil((bounds.width * 2) / 3))) + lane * 4
+  const railY = bottomY + 2
+  const targetX = Math.max(sourceX + 3, bounds.left + Math.min(bounds.width - 3, Math.ceil((bounds.width * 2) / 3)))

  addBottomDeparture(builder, bounds, sourceX)
-  addVerticalLine(builder, sourceX, bottomY + 1, railY - 1, 1)
+  addCell(builder, { x: sourceX, y: bottomY + 1, char: "│" })
  addCell(builder, { x: sourceX, y: railY, char: "╰" })
  for (let x = sourceX + 1; x < targetX; x++) addCell(builder, { x, y: railY, char: "─" })
  addCell(builder, { x: targetX, y: railY, char: "╯" })
-  for (let y = railY - 1; y > bottomY + 1; y--) addCell(builder, { x: targetX, y, char: "│" })
  addCell(builder, { x: targetX, y: bottomY + 1, arrowDirection: "up" })
-  if (transition.label) addLabel(builder, targetX + 2, lane === 0 ? bottomY + 1 : railY - 1, transition.label)
+  if (transition.label) addLabel(builder, targetX + 2, bottomY + 1, transition.label)
 }

 function outsideBottomY(bounds: BoxBounds): number {
@@ -778,8 +732,10 @@ function addTopFeedbackTransition(builder: StateTransitionRenderBuilder): void {
 }

 function addSideParallelTransition(builder: StateTransitionRenderBuilder): void {
-  const { from, to, targetIsChoice, targetIsHiddenMarker, transition, railX, targetApproach } =
-    builder.route as Extract<StateTransitionRoutePlan, { kind: "side-parallel" }>
+  const { from, to, targetIsChoice, targetIsHiddenMarker, transition, railX, targetApproach } = builder.route as Extract<
+    StateTransitionRoutePlan,
+    { kind: "side-parallel" }
+  >
  const startX = from.left + from.width
  const startY = from.centerY
  const endY = targetApproach === "top" ? to.top - 2 : targetApproach === "bottom" ? to.top + to.height + 1 : to.centerY
@@ -801,12 +757,7 @@ function addSideParallelTransition(builder: StateTransitionRenderBuilder): void
    if (targetIsChoice || targetIsHiddenMarker) addPathPoint(builder, to.left, to.top)
    if (transition.label) {
      const metrics = measureStateTransitionLabel(transition.label)
-      addLabel(
-        builder,
-        railX + 2,
-        Math.max(0, Math.floor((startY + to.centerY - metrics.height + 1) / 2)),
-        transition.label,
-      )
+      addLabel(builder, railX + 2, Math.max(0, Math.floor((startY + to.centerY - metrics.height + 1) / 2)), transition.label)
    }
    return
  }
@@ -987,62 +938,31 @@ function routeIntersectsUnrelatedState(
      "boundary",
      stateDiagramNoteConnector(noteBound, target).points,
    )
-    return plan.path.some(([x, y]) => connector.spans.some((span) => span.y === y && x >= span.fromX && x <= span.toX))
+    return plan.path.some(([x, y]) =>
+      connector.spans.some((span) => span.y === y && x >= span.fromX && x <= span.toX),
+    )
  })
 }

 function findBodySafePath(
  start: StateTransitionPathPoint,
  end: StateTransitionPathPoint,
-  diagram: StateVisibleDiagram,
  bounds: ReadonlyMap<string, BoxBounds>,
  plan: StateTransitionRenderPlan,
  search: StateSearchSpace,
  budget: StateSearchBudget,
 ): StateTransitionPathPoint[] | undefined {
  const margin = Math.max(8, bounds.size * 2)
-  const compositeId = innermostCommonComposite(diagram, plan.route.transition)
-  const composite = compositeId ? bounds.get(compositeId) : undefined
-  const searchBounds = {
-    minX: composite ? composite.left + 1 : search.minX - margin,
-    minY: composite ? composite.top + 1 : Math.min(search.minY, ...plan.path.map((point) => point[1])) - margin,
-    maxX: composite
-      ? composite.left + composite.width - 2
-      : Math.max(search.maxX, ...plan.path.map((point) => point[0])) + margin,
-    maxY: composite
-      ? composite.top + composite.height - 2
-      : Math.max(search.maxY, ...plan.path.map((point) => point[1])) + margin,
-  }
-  const isFree = ([x, y]: StateTransitionPathPoint) =>
-    x >= searchBounds.minX &&
-    x <= searchBounds.maxX &&
-    y >= searchBounds.minY &&
-    y <= searchBounds.maxY &&
-    !search.blocked.has(`${x}:${y}`)
-  const pathMinX = Math.min(...plan.path.map((point) => point[0]))
-  const pathMinY = Math.min(...plan.path.map((point) => point[1]))
-  const pathMaxX = Math.max(...plan.path.map((point) => point[0]))
-  const pathMaxY = Math.max(...plan.path.map((point) => point[1]))
-  const directCandidates: StateTransitionPathPoint[][] = [
-    [start, [start[0], end[1]] as const, end],
-    [start, [end[0], start[1]] as const, end],
-    ...Array.from({ length: 4 }, (_, index) => index + 1).flatMap((offset): StateTransitionPathPoint[][] => [
-      [start, [start[0], pathMinY - offset], [end[0], pathMinY - offset], end],
-      [start, [start[0], pathMaxY + offset], [end[0], pathMaxY + offset], end],
-      [start, [pathMinX - offset, start[1]], [pathMinX - offset, end[1]], end],
-      [start, [pathMaxX + offset, start[1]], [pathMaxX + offset, end[1]], end],
-    ]),
-  ]
-  const direct = directCandidates
-    .map((points) => orthogonalPathPoints(points.map(([x, y]) => ({ x, y }))).map(({ x, y }) => [x, y] as const))
-    .filter((points) => points.every(isFree))
-    .sort((left, right) => left.length - right.length)[0]
-  if (direct) return direct
  const path = findStateManhattanPath(
    [{ x: start[0], y: start[1] }],
    { x: end[0], y: end[1] },
    search,
-    searchBounds,
+    {
+      minX: search.minX - margin,
+      minY: Math.min(search.minY, ...plan.path.map((point) => point[1])) - margin,
+      maxX: Math.max(search.maxX, ...plan.path.map((point) => point[0])) + margin,
+      maxY: Math.max(search.maxY, ...plan.path.map((point) => point[1])) + margin,
+    },
    budget,
  )
  return path?.map((point) => [point.x, point.y] as const)
@@ -1055,29 +975,17 @@ function bodySafeTransitionPlan(
  noteBounds: readonly StateDiagramNoteBounds[],
  search: StateSearchSpace,
  budget: StateSearchBudget,
-  forceRepair = false,
 ): StateTransitionRenderPlan {
-  if (!forceRepair && !routeIntersectsUnrelatedState(plan, diagram, bounds, noteBounds)) return plan
+  if (!routeIntersectsUnrelatedState(plan, diagram, bounds, noteBounds)) return plan
  const sourceOutsideIndex = plan.path.findIndex((point) => !pointIsInsideBounds(point, plan.route.from))
  const targetOutsideIndex = plan.path.findLastIndex((point) => !pointIsInsideBounds(point, plan.route.to))
  if (sourceOutsideIndex < 0 || targetOutsideIndex < sourceOutsideIndex) return plan
-  const safePath = findBodySafePath(
-    plan.path[sourceOutsideIndex]!,
-    plan.path[targetOutsideIndex]!,
-    diagram,
-    bounds,
-    plan,
-    search,
-    budget,
-  )
+  const safePath = findBodySafePath(plan.path[sourceOutsideIndex]!, plan.path[targetOutsideIndex]!, bounds, plan, search, budget)
  if (!safePath) return alternateBodySafeTransitionPlan(plan, diagram, bounds, noteBounds, search, budget)

  const prefix = plan.path.slice(0, sourceOutsideIndex)
  const suffix = plan.path.slice(targetOutsideIndex + 1)
-  const repaired = renderBodySafeTransitionPlan(plan, safePath, prefix, suffix)
-  if (safePath.length <= plan.path.length + 4) return repaired
-  const alternate = alternateBodySafeTransitionPlan(plan, diagram, bounds, noteBounds, search, budget)
-  return alternate !== plan && alternate.path.length < repaired.path.length ? alternate : repaired
+  return renderBodySafeTransitionPlan(plan, safePath, prefix, suffix)
 }

 function alternateBodySafeTransitionPlan(
@@ -1088,10 +996,9 @@ function alternateBodySafeTransitionPlan(
  search: StateSearchSpace,
  budget: StateSearchBudget,
 ): StateTransitionRenderPlan {
-  const candidates: StateTransitionRenderPlan[] = []
  for (const source of stateRoutePorts(plan.route.from)) {
    for (const target of stateRoutePorts(plan.route.to)) {
-      const safePath = findBodySafePath(source.outside, target.outside, diagram, bounds, plan, search, budget)
+      const safePath = findBodySafePath(source.outside, target.outside, bounds, plan, search, budget)
      if (!safePath) continue
      const prefix = plan.route.from.width > 1 && plan.route.from.height > 1 ? [source.border] : []
      const suffix =
@@ -1099,10 +1006,10 @@ function alternateBodySafeTransitionPlan(
          ? ([[plan.route.to.left, plan.route.to.top]] as const)
          : []
      const repaired = renderBodySafeTransitionPlan(plan, safePath, prefix, suffix, source.char)
-      if (!routeIntersectsUnrelatedState(repaired, diagram, bounds, noteBounds)) candidates.push(repaired)
+      if (!routeIntersectsUnrelatedState(repaired, diagram, bounds, noteBounds)) return repaired
    }
  }
-  return candidates.sort((left, right) => left.path.length - right.path.length)[0] ?? plan
+  return plan
 }

 function stateRoutePorts(bounds: BoxBounds): Array<{
@@ -1165,50 +1072,7 @@ function renderBodySafeTransitionPlan(
    cells.push({ x: point[0], y: point[1], char: diagramLineGlyph(connections, "rounded") })
  }

-  return { ...plan, cells, path: fullPath, pathRepaired: true }
-}
-
-function labelDistanceToPath(
-  x: number,
-  y: number,
-  width: number,
-  height: number,
-  path: readonly StateTransitionPathPoint[],
-): number {
-  return Math.min(
-    ...path.map(([pathX, pathY]) => {
-      const dx = pathX < x ? x - pathX : pathX >= x + width ? pathX - (x + width - 1) : 0
-      const dy = pathY < y ? y - pathY : pathY >= y + height ? pathY - (y + height - 1) : 0
-      return dx + dy
-    }),
-  )
-}
-
-function stateTransitionLabelCandidates(
-  plan: StateTransitionRenderPlan,
-  width: number,
-  height: number,
-): Array<{ x: number; y: number }> {
-  const candidates = new Map<string, { x: number; y: number }>()
-  const add = (x: number, y: number) => candidates.set(`${x}:${y}`, { x, y })
-  if (
-    plan.label &&
-    (!plan.pathRepaired || labelDistanceToPath(plan.label.x, plan.label.y, width, height, plan.path) <= 4)
-  ) {
-    add(plan.label.x, plan.label.y)
-  }
-  for (const [x, y] of plan.path) {
-    add(x + 2, y - Math.floor(height / 2))
-    add(x - width - 2, y - Math.floor(height / 2))
-    add(x - Math.floor(width / 2), y - height - 1)
-    add(x - Math.floor(width / 2), y + 2)
-  }
-  const preferred = plan.label ?? { x: plan.path[0]?.[0] ?? 0, y: plan.path[0]?.[1] ?? 0 }
-  return [...candidates.values()].sort((left, right) => {
-    const leftDistance = Math.abs(left.x - preferred.x) + Math.abs(left.y - preferred.y)
-    const rightDistance = Math.abs(right.x - preferred.x) + Math.abs(right.y - preferred.y)
-    return leftDistance - rightDistance
-  })
+  return { ...plan, cells, path: fullPath }
 }

 function placeStateTransitionLabels(
@@ -1232,19 +1096,6 @@ function placeStateTransitionLabels(
        plan.path.map(([x, y]) => ({ x, y })),
      ),
    ),
-    ...diagram.composites.flatMap((composite) => {
-      const bound = bounds.get(composite.id)
-      if (!bound) return []
-      return [
-        spatialPathClaim(`composite:${composite.id}`, `composite:${composite.id}`, "boundary", [
-          { x: bound.left, y: bound.top },
-          { x: bound.left + bound.width - 1, y: bound.top },
-          { x: bound.left + bound.width - 1, y: bound.top + bound.height - 1 },
-          { x: bound.left, y: bound.top + bound.height - 1 },
-          { x: bound.left, y: bound.top },
-        ]),
-      ]
-    }),
    ...noteBounds.flatMap((noteBound) => {
      const target = bounds.get(noteBound.note.target)
      return [
@@ -1263,25 +1114,10 @@ function placeStateTransitionLabels(
    }),
  )

-  const placed = new Map<number, StateTransitionRenderPlan>()
-  const endpointCounts = new Map<string, number>()
-  for (const plan of plans) {
-    const key = `${plan.route.transition.from}\u0000${plan.route.transition.to}`
-    endpointCounts.set(key, (endpointCounts.get(key) ?? 0) + 1)
-  }
-  const placementOrder = [...plans.keys()].sort(
-    (left, right) => Number(Boolean(plans[left]!.pathRepaired)) - Number(Boolean(plans[right]!.pathRepaired)),
-  )
-  for (const planIndex of placementOrder) {
-    const plan = plans[planIndex]!
-    if (!plan.label) {
-      placed.set(planIndex, plan)
-      continue
-    }
+  return plans.map((plan, planIndex) => {
+    if (!plan.label) return plan
    const width = Math.max(...plan.label.lines.map(diagramTextWidth))
-    const endpointKey = `${plan.route.transition.from}\u0000${plan.route.transition.to}`
-    const needsLaneClearance = (endpointCounts.get(endpointKey) ?? 0) > 1
-    const statePadding = needsLaneClearance || plan.label.lines.length > 1 ? 1 : 0
+    const statePadding = plan.label.lines.length === 1 ? 0 : 1
    const labelClaim = (x: number, y: number) =>
      spatialRectClaim(`label:${planIndex}`, `label:${planIndex}`, "label", {
        left: x,
@@ -1295,35 +1131,19 @@ function placeStateTransitionLabels(
        clearance: {
          body: statePadding,
          label: { x: 1, y: 0 },
-          route:
-            plan.pathRepaired || plan.route.kind === "side-parallel" || needsLaneClearance
-              ? {
-                  x: 1,
-                  y: 0,
-                }
-              : 0,
        },
      })
    }

-    const candidates = stateTransitionLabelCandidates(plan, width, plan.label.lines.length)
-    const nearby = candidates.find(
-      (candidate) =>
-        (!(plan.pathRepaired || plan.route.kind === "side-parallel" || needsLaneClearance) ||
-          labelDistanceToPath(candidate.x, candidate.y, width, plan.label!.lines.length, plan.path) >= 2) &&
-        isClear(candidate.x, candidate.y),
-    )
-    let x = nearby?.x ?? candidates[0]?.x ?? plan.label.x
-    let y = nearby?.y ?? candidates[0]?.y ?? plan.label.y
-    if (!nearby) {
+    let x = plan.label.x
+    let y = plan.label.y
+    if (!isClear(x, y)) {
      search: for (let distance = 1; distance < 500; distance++) {
        for (let dx = -distance; dx <= distance; dx++) {
          const dy = distance - Math.abs(dx)
          for (const candidateY of dy === 0 ? [y] : [y - dy, y + dy]) {
            const candidateX = x + dx
            if (!isClear(candidateX, candidateY)) continue
-            const pathDistance = labelDistanceToPath(candidateX, candidateY, width, plan.label!.lines.length, plan.path)
-            if (pathDistance < 2 || pathDistance > 8) continue
            x = candidateX
            y = candidateY
            break search
@@ -1331,26 +1151,10 @@ function placeStateTransitionLabels(
        }
      }
    }
-    if (!isClear(x, y)) {
-      fallback: for (let distance = 1; distance < 500; distance++) {
-        for (let dx = -distance; dx <= distance; dx++) {
-          const dy = distance - Math.abs(dx)
-          for (const candidateY of dy === 0 ? [y] : [y - dy, y + dy]) {
-            const candidateX = x + dx
-            if (!isClear(candidateX, candidateY)) continue
-            x = candidateX
-            y = candidateY
-            break fallback
-          }
-        }
-      }
-    }
-    if (!isClear(x, y)) throw new Error(`Transition ${endpointKey} has no clear label position`)

    space = space.add(labelClaim(x, y))
-    placed.set(planIndex, { ...plan, label: { ...plan.label, x, y } })
-  }
-  return plans.map((plan, index) => placed.get(index) ?? plan)
+    return { ...plan, label: { ...plan.label, x, y } }
+  })
 }

 export function createStateTransitionRenderPlans(
@@ -1365,59 +1169,15 @@ export function createStateTransitionRenderPlans(
    createStateTransitionRenderPlan,
  )
  if (options.repairRoutes === false) return placeStateTransitionLabels(plans, diagram, bounds, noteBounds)
-  const baseObstacles = transitionObstacles(diagram, bounds, noteBounds)
-  const repaired: StateTransitionRenderPlan[] = []
-  for (const [index, plan] of plans.entries()) {
-    const disjoint = repaired.filter((previous) => transitionsHaveDisjointEndpoints(previous, plan))
-    const routeObstacles = repaired.filter(
-      (previous) => disjoint.includes(previous) || transitionsAreReciprocal(previous, plan),
-    )
-    const routeSpace = createStateSearchSpace(
-      baseObstacles.add(
-        ...routeObstacles.map((previous, previousIndex) =>
-          spatialPathClaim(
-            `transition:${index}:obstacle:${previousIndex}`,
-            `transition:${index}:obstacle:${previousIndex}`,
-            "route",
-            previous.path.map(([x, y]) => ({ x, y })),
-          ),
-        ),
-      ),
-    )
-    repaired.push(
-      bodySafeTransitionPlan(
-        plan,
-        diagram,
-        bounds,
-        noteBounds,
-        routeSpace,
-        budget,
-        disjoint.some((previous) => pathsIntersect(previous.path, plan.path)),
-      ),
-    )
-  }
-  return placeStateTransitionLabels(repaired, diagram, bounds, noteBounds)
-}
-
-function transitionsHaveDisjointEndpoints(left: StateTransitionRenderPlan, right: StateTransitionRenderPlan): boolean {
-  const leftEndpoints = new Set([left.route.transition.from, left.route.transition.to])
-  return !leftEndpoints.has(right.route.transition.from) && !leftEndpoints.has(right.route.transition.to)
-}
-
-function transitionsAreReciprocal(left: StateTransitionRenderPlan, right: StateTransitionRenderPlan): boolean {
-  return (
-    left.route.transition.from === right.route.transition.to && left.route.transition.to === right.route.transition.from
+  const routeSpace = createStateSearchSpace(transitionObstacles(diagram, bounds, noteBounds))
+  return placeStateTransitionLabels(
+    plans.map((plan) => bodySafeTransitionPlan(plan, diagram, bounds, noteBounds, routeSpace, budget)),
+    diagram,
+    bounds,
+    noteBounds,
  )
 }

-function pathsIntersect(
-  left: readonly StateTransitionPathPoint[],
-  right: readonly StateTransitionPathPoint[],
-): boolean {
-  const occupied = new Set(left.map(([x, y]) => `${x}:${y}`))
-  return right.some(([x, y]) => occupied.has(`${x}:${y}`))
-}
-
 function transitionObstacles(
  diagram: StateVisibleDiagram,
  bounds: ReadonlyMap<string, BoxBounds>,
@@ -1,6 +1,6 @@
 import type { BorderStyle } from "@opentui/core"

-export type StateDiagramDirection = "TB" | "TD" | "BT" | "LR" | "RL"
+export type StateDiagramDirection = "TB" | "TD" | "LR" | "RL"
 export type StateDiagramArrowHeadStyle = "filled" | "line"

 export interface StateDiagramState {
@@ -41,8 +41,6 @@ export interface StateDiagramRenderOptions {
  borderStyle?: BorderStyle
  arrowHeadStyle?: StateDiagramArrowHeadStyle
  minStateGap?: number
-  /** Target rendered width. Oversized horizontal layouts fold vertically. */
-  layoutMaxWidth?: number
 }

 export type NoteConnectorRampStyle = `noteConnectorRamp${1 | 2 | 3}`
@@ -1,493 +0,0 @@
-import type { FlowchartDirection } from "../../flowchart/types.js"
-import type { StateDiagramDirection } from "../../state/types.js"
-
-export type LayoutFixture = {
-  id: string
-  kind: "flowchart" | "state"
-  family: string
-  profile: LabelProfile
-  source: string
-  curated?: boolean
-}
-
-type LabelProfile = "short" | "long" | "unicode"
-
-const flowVariants = [
-  ["TB", "short"],
-  ["TD", "long"],
-  ["BT", "unicode"],
-  ["LR", "short"],
-  ["RL", "long"],
-  ["TB", "unicode"],
-  ["TD", "short"],
-  ["BT", "long"],
-  ["LR", "unicode"],
-  ["RL", "short"],
-  ["LR", "long"],
-  ["TD", "unicode"],
-  ["TB", "long"],
-  ["BT", "short"],
-  ["RL", "unicode"],
-] as const satisfies readonly (readonly [FlowchartDirection, LabelProfile])[]
-
-const stateVariants = [
-  ["TB", "short"],
-  ["TD", "long"],
-  ["LR", "unicode"],
-  ["RL", "short"],
-  ["TB", "long"],
-  ["TD", "unicode"],
-  ["LR", "short"],
-  ["RL", "long"],
-  ["LR", "long"],
-  ["TD", "short"],
-  ["TB", "unicode"],
-  ["RL", "unicode"],
-  ["BT", "short"],
-  ["BT", "long"],
-  ["BT", "unicode"],
-] as const satisfies readonly (readonly [StateDiagramDirection, LabelProfile])[]
-
-function nodeLabel(id: string, profile: LabelProfile): string {
-  if (profile === "long") return `${id} deliberate deployment stage with a long descriptive label`
-  if (profile === "unicode") return `${id} 東京<br/>résumé 🚀`
-  return `${id} node`
-}
-
-function edgeLabel(id: string, profile: LabelProfile): string {
-  if (profile === "long") return `${id} transition carrying detailed deployment context`
-  if (profile === "unicode") return `${id} 東京<br/>✓ prêt`
-  return `${id} edge`
-}
-
-function flowNode(id: string, profile: LabelProfile): string {
-  return `  ${id}["${nodeLabel(id, profile)}"]`
-}
-
-function flowEdge(from: string, to: string, id: string, profile: LabelProfile): string {
-  return `  ${from} -->|"${edgeLabel(id, profile)}"| ${to}`
-}
-
-function flowSource(
-  direction: FlowchartDirection,
-  profile: LabelProfile,
-  nodes: readonly string[],
-  edges: readonly [from: string, to: string, id: string][],
-  extra: readonly string[] = [],
-): string {
-  return [
-    `flowchart ${direction}`,
-    ...nodes.map((id) => flowNode(id, profile)),
-    ...extra,
-    ...edges.map(([from, to, id]) => flowEdge(from, to, id, profile)),
-  ].join("\n")
-}
-
-const flowFamilies = {
-  chain(direction: FlowchartDirection, profile: LabelProfile) {
-    return flowSource(
-      direction,
-      profile,
-      ["A", "B", "C", "D", "E", "F"],
-      [
-        ["A", "B", "E01"],
-        ["B", "C", "E02"],
-        ["C", "D", "E03"],
-        ["D", "E", "E04"],
-        ["E", "F", "E05"],
-      ],
-    )
-  },
-  fork(direction: FlowchartDirection, profile: LabelProfile) {
-    return flowSource(
-      direction,
-      profile,
-      ["A", "B", "C", "D", "E"],
-      [
-        ["A", "B", "E01"],
-        ["A", "C", "E02"],
-        ["A", "D", "E03"],
-        ["A", "E", "E04"],
-      ],
-    )
-  },
-  join(direction: FlowchartDirection, profile: LabelProfile) {
-    return flowSource(
-      direction,
-      profile,
-      ["A", "B", "C", "D", "E"],
-      [
-        ["A", "E", "E01"],
-        ["B", "E", "E02"],
-        ["C", "E", "E03"],
-        ["D", "E", "E04"],
-      ],
-    )
-  },
-  cycle(direction: FlowchartDirection, profile: LabelProfile) {
-    return flowSource(
-      direction,
-      profile,
-      ["A", "B", "C", "D"],
-      [
-        ["A", "B", "E01"],
-        ["B", "C", "E02"],
-        ["C", "D", "E03"],
-        ["D", "A", "E04"],
-        ["C", "A", "E05"],
-      ],
-    )
-  },
-  crossing(direction: FlowchartDirection, profile: LabelProfile) {
-    return flowSource(
-      direction,
-      profile,
-      ["A", "B", "C", "D", "E", "F"],
-      [
-        ["A", "C", "E01"],
-        ["A", "D", "E02"],
-        ["B", "C", "E03"],
-        ["B", "D", "E04"],
-        ["C", "E", "E05"],
-        ["D", "F", "E06"],
-      ],
-    )
-  },
-  parallel(direction: FlowchartDirection, profile: LabelProfile) {
-    return flowSource(
-      direction,
-      profile,
-      ["A", "B", "C"],
-      [
-        ["A", "B", "E01"],
-        ["A", "B", "E02"],
-        ["A", "B", "E03"],
-        ["B", "C", "E04"],
-        ["B", "C", "E05"],
-      ],
-    )
-  },
-  self(direction: FlowchartDirection, profile: LabelProfile) {
-    return flowSource(
-      direction,
-      profile,
-      ["A", "B", "C"],
-      [
-        ["A", "A", "E01"],
-        ["A", "B", "E02"],
-        ["B", "B", "E03"],
-        ["B", "C", "E04"],
-      ],
-    )
-  },
-  subgraph(direction: FlowchartDirection, profile: LabelProfile) {
-    return [
-      `flowchart ${direction}`,
-      `  subgraph Left["Left ${nodeLabel("SG1", profile)}"]`,
-      flowNode("A", profile),
-      flowNode("B", profile),
-      "  end",
-      `  subgraph Right["Right ${nodeLabel("SG2", profile)}"]`,
-      flowNode("C", profile),
-      flowNode("D", profile),
-      "  end",
-      flowEdge("A", "B", "E01", profile),
-      flowEdge("A", "C", "E02", profile),
-      flowEdge("B", "D", "E03", profile),
-      flowEdge("C", "D", "E04", profile),
-    ].join("\n")
-  },
-  "nested-subgraph"(direction: FlowchartDirection, profile: LabelProfile) {
-    const local = direction === "LR" || direction === "RL" ? "TB" : "LR"
-    return [
-      `flowchart ${direction}`,
-      `  subgraph Outer["Outer ${nodeLabel("SG1", profile)}"]`,
-      `    direction ${local}`,
-      `    subgraph Inner["Inner ${nodeLabel("SG2", profile)}"]`,
-      flowNode("A", profile),
-      flowNode("B", profile),
-      "    end",
-      flowNode("C", profile),
-      "  end",
-      flowNode("D", profile),
-      flowEdge("A", "B", "E01", profile),
-      flowEdge("A", "C", "E02", profile),
-      flowEdge("B", "D", "E03", profile),
-      flowEdge("C", "D", "E04", profile),
-    ].join("\n")
-  },
-} satisfies Record<string, (direction: FlowchartDirection, profile: LabelProfile) => string>
-
-function stateDeclaration(id: string, profile: LabelProfile, indent = "  "): string {
-  return `${indent}state "${nodeLabel(id, profile)}" as ${id}`
-}
-
-function stateTransition(from: string, to: string, id: string, profile: LabelProfile, indent = "  "): string {
-  return `${indent}${from} --> ${to}: ${edgeLabel(id, profile)}`
-}
-
-function stateSource(
-  direction: StateDiagramDirection,
-  profile: LabelProfile,
-  states: readonly string[],
-  transitions: readonly [from: string, to: string, id: string][],
-  extra: readonly string[] = [],
-): string {
-  return [
-    "stateDiagram-v2",
-    `  direction ${direction}`,
-    ...states.map((id) => stateDeclaration(id, profile)),
-    ...extra,
-    ...transitions.map(([from, to, id]) => stateTransition(from, to, id, profile)),
-  ].join("\n")
-}
-
-const stateFamilies = {
-  chain(direction: StateDiagramDirection, profile: LabelProfile) {
-    return stateSource(
-      direction,
-      profile,
-      ["A", "B", "C", "D", "E"],
-      [
-        ["A", "B", "E01"],
-        ["B", "C", "E02"],
-        ["C", "D", "E03"],
-        ["D", "E", "E04"],
-      ],
-      ["  [*] --> A", "  E --> [*]"],
-    )
-  },
-  fork(direction: StateDiagramDirection, profile: LabelProfile) {
-    return stateSource(
-      direction,
-      profile,
-      ["A", "B", "C", "D"],
-      [
-        ["A", "B", "E01"],
-        ["A", "C", "E02"],
-        ["A", "D", "E03"],
-      ],
-    )
-  },
-  join(direction: StateDiagramDirection, profile: LabelProfile) {
-    return stateSource(
-      direction,
-      profile,
-      ["A", "B", "C", "D"],
-      [
-        ["A", "D", "E01"],
-        ["B", "D", "E02"],
-        ["C", "D", "E03"],
-      ],
-    )
-  },
-  cycle(direction: StateDiagramDirection, profile: LabelProfile) {
-    return stateSource(
-      direction,
-      profile,
-      ["A", "B", "C", "D"],
-      [
-        ["A", "B", "E01"],
-        ["B", "C", "E02"],
-        ["C", "D", "E03"],
-        ["D", "A", "E04"],
-        ["C", "A", "E05"],
-      ],
-    )
-  },
-  crossing(direction: StateDiagramDirection, profile: LabelProfile) {
-    return stateSource(
-      direction,
-      profile,
-      ["A", "B", "C", "D"],
-      [
-        ["A", "C", "E01"],
-        ["A", "D", "E02"],
-        ["B", "C", "E03"],
-        ["B", "D", "E04"],
-      ],
-    )
-  },
-  parallel(direction: StateDiagramDirection, profile: LabelProfile) {
-    return stateSource(
-      direction,
-      profile,
-      ["A", "B", "C"],
-      [
-        ["A", "B", "E01"],
-        ["A", "B", "E02"],
-        ["A", "B", "E03"],
-        ["B", "C", "E04"],
-      ],
-    )
-  },
-  self(direction: StateDiagramDirection, profile: LabelProfile) {
-    return stateSource(
-      direction,
-      profile,
-      ["A", "B", "C"],
-      [
-        ["A", "A", "E01"],
-        ["A", "B", "E02"],
-        ["B", "B", "E03"],
-        ["B", "C", "E04"],
-      ],
-    )
-  },
-  choice(direction: StateDiagramDirection, profile: LabelProfile) {
-    return stateSource(
-      direction,
-      profile,
-      ["A", "B", "C"],
-      [
-        ["A", "Choice", "E01"],
-        ["Choice", "B", "E02"],
-        ["Choice", "C", "E03"],
-        ["C", "A", "E04"],
-      ],
-      ["  state Choice <<choice>>"],
-    )
-  },
-  notes(direction: StateDiagramDirection, profile: LabelProfile) {
-    return stateSource(
-      direction,
-      profile,
-      ["A", "B", "C"],
-      [
-        ["A", "B", "E01"],
-        ["B", "C", "E02"],
-        ["C", "A", "E03"],
-      ],
-      [
-        `  note left of A: ${edgeLabel("N01", profile)}`,
-        `  note right of B: ${edgeLabel("N02", profile)}`,
-        `  note right of C: ${edgeLabel("N03", profile)}`,
-      ],
-    )
-  },
-  composite(direction: StateDiagramDirection, profile: LabelProfile) {
-    return [
-      "stateDiagram-v2",
-      `  direction ${direction}`,
-      `  state "${nodeLabel("Outer", profile)}" as Outer {`,
-      stateDeclaration("A", profile, "    "),
-      stateDeclaration("B", profile, "    "),
-      "    [*] --> A",
-      stateTransition("A", "B", "E01", profile, "    "),
-      "    B --> [*]",
-      "  }",
-      stateDeclaration("Done", profile),
-      stateTransition("Outer", "Done", "E02", profile),
-      `  note right of B: ${edgeLabel("N01", profile)}`,
-    ].join("\n")
-  },
-  "nested-composite"(direction: StateDiagramDirection, profile: LabelProfile) {
-    return [
-      "stateDiagram-v2",
-      `  direction ${direction}`,
-      `  state "${nodeLabel("Session", profile)}" as Session {`,
-      "    [*] --> Open",
-      `    state "${nodeLabel("Open", profile)}" as Open {`,
-      stateDeclaration("Clean", profile, "      "),
-      stateDeclaration("Dirty", profile, "      "),
-      "      [*] --> Clean",
-      stateTransition("Clean", "Dirty", "E01", profile, "      "),
-      stateTransition("Dirty", "Clean", "E02", profile, "      "),
-      "      Dirty --> [*]",
-      "    }",
-      "    Open --> [*]",
-      "  }",
-      stateDeclaration("Done", profile),
-      stateTransition("Session", "Done", "E03", profile),
-      `  note right of Dirty: ${edgeLabel("N01", profile)}`,
-    ].join("\n")
-  },
-} satisfies Record<string, (direction: StateDiagramDirection, profile: LabelProfile) => string>
-
-export const deploymentArchitectureSource = `flowchart LR
-    Client[OpenCode client]
-
-    subgraph CF[Cloudflare]
-      DNS[opencode.ai]
-      Web[Console frontend Worker]
-      Proxy[Console API proxy Worker]
-      Infer[inference-next Worker]
-      KV[Model registry KV]
-      Redis[Upstash Redis]
-      Logs[Axiom / Cloudflare logs]
-      Lake[Pipeline to R2 data lake]
-    end
-
-    subgraph AWS[AWS]
-      EKS[EKS cluster]
-      API[Console API pod<br/>1 replica]
-      OTEL[OTel collector]
-      ECR[ECR]
-    end
-
-    DB[(PlanetScale)]
-    Models[Anthropic / OpenAI / other providers]
-
-    Client -->|/inference/*| DNS --> Infer
-    Client -->|/console/*| DNS --> Web
-    Web -->|/console/api, /auth, etc.| Proxy
-    Proxy -->|Cloudflare VPC service| API
-
-    Infer -->|public DATABASE_URL| DB
-    Infer --> KV
-    Infer --> Redis
-    Infer --> Models
-    Infer --> Logs
-    Infer --> Lake
-
-    API -->|private DATABASE_AWS_URL| DB
-    API --> OTEL
-    ECR --> API`
-
-export function layoutFixtures(): readonly LayoutFixture[] {
-  const flowcharts = Object.entries(flowFamilies).flatMap(([family, source]) =>
-    flowVariants.map(([direction, profile]) => ({
-      id: `flowchart/${family}/${direction.toLowerCase()}-${profile}`,
-      kind: "flowchart" as const,
-      family,
-      profile,
-      source: source(direction, profile),
-    })),
-  )
-  const states = Object.entries(stateFamilies).flatMap(([family, source]) =>
-    stateVariants.map(([direction, profile]) => ({
-      id: `state/${family}/${direction.toLowerCase()}-${profile}`,
-      kind: "state" as const,
-      family,
-      profile,
-      source: source(direction, profile),
-    })),
-  )
-  return [
-    ...flowcharts,
-    {
-      id: "flowchart/deployment-architecture/curated",
-      kind: "flowchart" as const,
-      family: "deployment-architecture",
-      profile: "short" as const,
-      source: deploymentArchitectureSource,
-      curated: true,
-    },
-    {
-      id: "flowchart/grouped-fanout/curated",
-      kind: "flowchart" as const,
-      family: "grouped-fanout",
-      profile: "short" as const,
-      source: `flowchart TD
-  subgraph Group
-    S[Source]
-    S -->|route 0 detail| N0[Node 0]
-    S -->|route 1 detail| N1[Node 1]
-    S -->|route 2 detail| N2[Node 2]
-    S -->|route 3 detail| N3[Node 3]
-  end`,
-      curated: true,
-    },
-    ...states,
-  ]
-}
@@ -1,521 +0,0 @@
-import { orthogonalPathPoints, segmentBetween, type DiagramPoint } from "../../core/geometry.js"
-import { SpatialIndex, spatialPathClaim, spatialRectClaim } from "../../core/spatial.js"
-import { diagramTextWidth } from "../../core/text.js"
-import { splitDiagramLines } from "../../core/text-lines.js"
-import { drawFlowchartDiagramGrid } from "../../flowchart/drawing.js"
-import { layoutFlowchartDiagram } from "../../flowchart/layout.js"
-import { flowchartRouteLabelLayout } from "../../flowchart/labels.js"
-import { parseMermaidFlowchartDiagram } from "../../flowchart/parser.js"
-import { createStateDiagramDrawing } from "../../state/drawing.js"
-import type { StateDiagramBoxBounds } from "../../state/layout.js"
-import { stateDiagramNoteConnector } from "../../state/note.js"
-import { parseMermaidStateDiagram } from "../../state/parser.js"
-import type { StateTransitionRenderPlan } from "../../state/routing.js"
-import { isHiddenCompositeMarker } from "../../state/visible-model.js"
-import { layoutFixtures, type LayoutFixture } from "./fixtures.js"
-
-export const auditViewports = [60, 80, 120] as const
-
-export type LayoutMetrics = {
-  width: number
-  height: number
-  area: number
-  routeLength: number
-  bends: number
-  crossings: number
-  sharedRouteCells: number
-  overflow: number
-}
-
-export type LayoutAudit = {
-  fixture: LayoutFixture
-  viewport: (typeof auditViewports)[number]
-  output: string
-  metrics: LayoutMetrics
-  violations: string[]
-}
-
-type Bounds = Pick<StateDiagramBoxBounds, "left" | "top" | "width" | "height">
-type AuditedRoute = {
-  from: string
-  to: string
-  points: readonly DiagramPoint[]
-}
-
-function finiteBounds(bounds: Bounds): boolean {
-  return (
-    [bounds.left, bounds.top, bounds.width, bounds.height].every(Number.isFinite) &&
-    bounds.width > 0 &&
-    bounds.height > 0
-  )
-}
-
-function boundsOverlap(left: Bounds, right: Bounds): boolean {
-  return (
-    left.left < right.left + right.width &&
-    left.left + left.width > right.left &&
-    left.top < right.top + right.height &&
-    left.top + left.height > right.top
-  )
-}
-
-function boundsContain(outer: Bounds, inner: Bounds): boolean {
-  return (
-    inner.left >= outer.left &&
-    inner.top >= outer.top &&
-    inner.left + inner.width <= outer.left + outer.width &&
-    inner.top + inner.height <= outer.top + outer.height
-  )
-}
-
-function pointInBounds(point: DiagramPoint, bounds: Bounds): boolean {
-  return (
-    point.x >= bounds.left &&
-    point.x < bounds.left + bounds.width &&
-    point.y >= bounds.top &&
-    point.y < bounds.top + bounds.height
-  )
-}
-
-function pointTouchesBounds(point: DiagramPoint, bounds: Bounds): boolean {
-  if (pointInBounds(point, bounds)) return true
-  return (
-    ((point.x === bounds.left - 1 || point.x === bounds.left + bounds.width) &&
-      point.y >= bounds.top &&
-      point.y < bounds.top + bounds.height) ||
-    ((point.y === bounds.top - 1 || point.y === bounds.top + bounds.height) &&
-      point.x >= bounds.left &&
-      point.x < bounds.left + bounds.width)
-  )
-}
-
-function isOrthogonal(points: readonly DiagramPoint[]): boolean {
-  return points.every((point, index) => {
-    if (
-      !Number.isFinite(point.x) ||
-      !Number.isFinite(point.y) ||
-      !Number.isInteger(point.x) ||
-      !Number.isInteger(point.y)
-    )
-      return false
-    const previous = points[index - 1]
-    return !previous || previous.x === point.x || previous.y === point.y
-  })
-}
-
-function expandedPath(points: readonly DiagramPoint[]): DiagramPoint[] {
-  if (!isOrthogonal(points)) return []
-  return orthogonalPathPoints(points)
-}
-
-function routeLength(points: readonly DiagramPoint[]): number {
-  return routeSegments(points).reduce((total, segment) => total + segment.length, 0)
-}
-
-function routeBends(points: readonly DiagramPoint[]): number {
-  const directions = points.slice(1).flatMap((point, index) => {
-    const previous = points[index]
-    if (point.x === previous.x && point.y !== previous.y) return ["y"]
-    if (point.y === previous.y && point.x !== previous.x) return ["x"]
-    return []
-  })
-  return directions.slice(1).filter((axis, index) => axis !== directions[index]).length
-}
-
-function routeSegments(points: readonly DiagramPoint[]) {
-  return points.slice(1).flatMap((point, index) => segmentBetween(points[index]!, point) ?? [])
-}
-
-function crossingCount(routes: readonly AuditedRoute[]): number {
-  let count = 0
-  for (const [index, route] of routes.entries()) {
-    for (const other of routes.slice(index + 1)) {
-      for (const segment of routeSegments(route.points)) {
-        for (const otherSegment of routeSegments(other.points)) {
-          if (segment.axis === otherSegment.axis) continue
-          const horizontal = segment.axis === "x" ? segment : otherSegment
-          const vertical = segment.axis === "y" ? segment : otherSegment
-          const x = vertical.from.x
-          const y = horizontal.from.y
-          const horizontalMin = Math.min(horizontal.from.x, horizontal.to.x)
-          const horizontalMax = Math.max(horizontal.from.x, horizontal.to.x)
-          const verticalMin = Math.min(vertical.from.y, vertical.to.y)
-          const verticalMax = Math.max(vertical.from.y, vertical.to.y)
-          if (x <= horizontalMin || x >= horizontalMax || y <= verticalMin || y >= verticalMax) continue
-          count++
-        }
-      }
-    }
-  }
-  return count
-}
-
-function sharedRouteCellCount(routes: readonly AuditedRoute[]): number {
-  let count = 0
-  const cells = routes.map((route) => new Set(expandedPath(route.points).map((point) => `${point.x}:${point.y}`)))
-  for (const [index, routeCells] of cells.entries()) {
-    for (const other of cells.slice(index + 1)) {
-      for (const cell of routeCells) if (other.has(cell)) count++
-    }
-  }
-  return count
-}
-
-function metrics(
-  width: number,
-  height: number,
-  routes: readonly AuditedRoute[],
-  viewport: (typeof auditViewports)[number],
-): LayoutMetrics {
-  return {
-    width,
-    height,
-    area: width * height,
-    routeLength: routes.reduce((total, route) => total + routeLength(route.points), 0),
-    bends: routes.reduce((total, route) => total + routeBends(route.points), 0),
-    crossings: crossingCount(routes),
-    sharedRouteCells: sharedRouteCellCount(routes),
-    overflow: Math.max(0, width - viewport),
-  }
-}
-
-function requireOutputLines(output: string, lines: readonly string[], owner: string, violations: string[]): void {
-  for (const line of lines.map((line) => line.trim()).filter(Boolean)) {
-    if (!output.includes(line)) violations.push(`${owner} content missing: ${JSON.stringify(line)}`)
-  }
-}
-
-function validateRoutes(
-  routes: readonly AuditedRoute[],
-  bounds: ReadonlyMap<string, Bounds>,
-  bodyIds: readonly string[],
-  violations: string[],
-): void {
-  for (const [index, route] of routes.entries()) {
-    if (route.points.length < 2) {
-      violations.push(`route ${index} ${route.from}->${route.to} is empty`)
-      continue
-    }
-    if (!isOrthogonal(route.points))
-      violations.push(`route ${index} ${route.from}->${route.to} is not finite and orthogonal`)
-    const from = bounds.get(route.from)
-    const to = bounds.get(route.to)
-    if (!from || !to) {
-      violations.push(`route ${index} ${route.from}->${route.to} has a missing endpoint bound`)
-      continue
-    }
-    if (!pointTouchesBounds(route.points[0], from))
-      violations.push(`route ${index} does not touch source ${route.from}`)
-    if (!pointTouchesBounds(route.points.at(-1)!, to))
-      violations.push(`route ${index} does not touch target ${route.to}`)
-    if (!isOrthogonal(route.points)) continue
-    const bodySpace = SpatialIndex.empty().add(
-      ...bodyIds.flatMap((id) => {
-        const bound = bounds.get(id)
-        return id === route.from || id === route.to || !bound
-          ? []
-          : [spatialRectClaim(`body:${id}`, `body:${id}`, "body", bound)]
-      }),
-    )
-    const conflicts = bodySpace.conflicts(spatialPathClaim(`route:${index}`, `route:${index}`, "route", route.points))
-    for (const id of new Set(conflicts.map((conflict) => conflict.existing.owner.slice("body:".length)))) {
-      violations.push(`route ${index} ${route.from}->${route.to} intersects unrelated body ${id}`)
-    }
-  }
-}
-
-function validateBodies(bounds: ReadonlyMap<string, Bounds>, ids: readonly string[], violations: string[]): void {
-  let occupied = SpatialIndex.empty()
-  for (const id of ids) {
-    const bound = bounds.get(id)
-    if (!bound) {
-      violations.push(`missing body bound ${id}`)
-      continue
-    }
-    if (!finiteBounds(bound)) {
-      violations.push(`body ${id} has invalid bounds`)
-      continue
-    }
-    const claim = spatialRectClaim(`body:${id}`, `body:${id}`, "body", bound)
-    for (const otherId of new Set(
-      occupied.conflicts(claim).map((conflict) => conflict.existing.owner.slice("body:".length)),
-    )) {
-      violations.push(`bodies ${id} and ${otherId} overlap`)
-    }
-    occupied = occupied.add(claim)
-  }
-}
-
-function auditFlowchart(fixture: LayoutFixture, viewport: (typeof auditViewports)[number]): LayoutAudit {
-  const violations: string[] = []
-  const diagram = parseMermaidFlowchartDiagram(fixture.source)
-  const layout = layoutFlowchartDiagram(diagram, { compact: true, layoutMaxWidth: viewport })
-  const grid = drawFlowchartDiagramGrid(diagram, { compact: true, layoutMaxWidth: viewport })
-  const output = grid.toString({ trimTop: true, trimBottom: true })
-  const size = grid.getTextSize({ trimTop: true, trimBottom: true })
-  const routes = layout.routes.map((route) => ({ from: route.edge.from, to: route.edge.to, points: route.points }))
-  const bodyIds = layout.diagram.nodes.map((node) => node.id)
-
-  if (!Number.isFinite(size.width) || !Number.isFinite(size.height) || size.width <= 0 || size.height <= 0)
-    violations.push("rendered grid has invalid dimensions")
-  if (!Number.isFinite(layout.width) || !Number.isFinite(layout.height) || layout.width <= 0 || layout.height <= 0)
-    violations.push("layout has invalid dimensions")
-  if (layout.routes.length !== layout.diagram.edges.filter((edge) => !edge.orderOnly).length)
-    violations.push("rendered route count does not match visible edge count")
-  validateBodies(layout.bounds, bodyIds, violations)
-  validateRoutes(routes, layout.bounds, bodyIds, violations)
-
-  for (const node of layout.diagram.nodes)
-    requireOutputLines(output, layout.bounds.get(node.id)?.lines ?? [], `node ${node.id}`, violations)
-  for (const route of layout.routes) {
-    if (!route.edge.label) continue
-    requireOutputLines(
-      output,
-      flowchartRouteLabelLayout(route, diagramTextWidth).lines,
-      `edge ${route.edge.from}->${route.edge.to}`,
-      violations,
-    )
-    const targets = new Set(
-      layout.diagram.edges.filter((edge) => edge.label && edge.from === route.edge.from).map((edge) => edge.to),
-    )
-    const sources = new Set(
-      layout.diagram.edges.filter((edge) => edge.label && edge.to === route.edge.to).map((edge) => edge.from),
-    )
-    const label = flowchartRouteLabelLayout(route, diagramTextWidth)
-    if (
-      fixture.family === "grouped-fanout" &&
-      (targets.size > 1 || sources.size > 1) &&
-      label.point.x + label.width > viewport
-    ) {
-      violations.push(`grouped edge ${route.edge.from}->${route.edge.to} label exceeds viewport`)
-    }
-  }
-  for (const subgraph of layout.diagram.subgraphs ?? []) {
-    const bound = layout.subgraphBounds.get(subgraph.id)
-    if (!bound || !finiteBounds(bound)) violations.push(`subgraph ${subgraph.id} has invalid bounds`)
-    requireOutputLines(output, splitDiagramLines(subgraph.label), `subgraph ${subgraph.id}`, violations)
-    for (const nodeId of subgraph.nodeIds) {
-      const node = layout.bounds.get(nodeId)
-      if (bound && node && !boundsContain(bound, node))
-        violations.push(`subgraph ${subgraph.id} does not contain ${nodeId}`)
-    }
-  }
-  const subgraphs = layout.diagram.subgraphs ?? []
-  const subgraphById = new Map(subgraphs.map((subgraph) => [subgraph.id, subgraph]))
-  const ancestorOf = (ancestor: string, id: string) => {
-    let parentId = subgraphById.get(id)?.parentId
-    while (parentId) {
-      if (parentId === ancestor) return true
-      parentId = subgraphById.get(parentId)?.parentId
-    }
-    return false
-  }
-  for (const [index, subgraph] of subgraphs.entries()) {
-    const bound = layout.subgraphBounds.get(subgraph.id)
-    if (!bound) continue
-    for (const other of subgraphs.slice(index + 1)) {
-      if (ancestorOf(subgraph.id, other.id) || ancestorOf(other.id, subgraph.id)) continue
-      const otherBound = layout.subgraphBounds.get(other.id)
-      if (otherBound && boundsOverlap(bound, otherBound)) {
-        violations.push(`subgraphs ${subgraph.id} and ${other.id} overlap`)
-      }
-    }
-  }
-
-  return { fixture, viewport, output, metrics: metrics(size.width, size.height, routes, viewport), violations }
-}
-
-function stateRoute(route: StateTransitionRenderPlan): AuditedRoute {
-  return {
-    from: route.route.transition.from,
-    to: route.route.transition.to,
-    points: route.path.map(([x, y]) => ({ x, y })),
-  }
-}
-
-function auditState(fixture: LayoutFixture, viewport: (typeof auditViewports)[number]): LayoutAudit {
-  const violations: string[] = []
-  const parsed = parseMermaidStateDiagram(fixture.source)
-  const drawing = createStateDiagramDrawing(parsed, { minStateGap: 5, layoutMaxWidth: viewport })
-  const diagram = drawing.diagram
-  const layout = drawing.layout
-  const plans = drawing.transitionPlans
-  const grid = drawing.grid
-  const routes = plans.map(stateRoute)
-  const output = grid.toString({ trimTop: true, trimBottom: true })
-  const size = grid.getTextSize({ trimTop: true, trimBottom: true })
-  const bodyIds = diagram.states.filter((state) => !isHiddenCompositeMarker(state)).map((state) => state.id)
-
-  if (!Number.isFinite(size.width) || !Number.isFinite(size.height) || size.width <= 0 || size.height <= 0)
-    violations.push("rendered grid has invalid dimensions")
-  if (plans.length !== diagram.transitions.length)
-    violations.push("rendered route count does not match visible transition count")
-  validateBodies(layout.bounds, bodyIds, violations)
-  validateRoutes(routes, layout.bounds, bodyIds, violations)
-  if (diagram.direction === "BT" && fixture.family === "chain") {
-    for (const transition of diagram.transitions) {
-      if (transition.from === transition.to) continue
-      const from = layout.bounds.get(transition.from)
-      const to = layout.bounds.get(transition.to)
-      if (from && to && from.centerY <= to.centerY) {
-        violations.push(`BT transition ${transition.from}->${transition.to} does not travel upward`)
-      }
-    }
-  }
-
-  for (const state of diagram.states) {
-    if (isHiddenCompositeMarker(state)) continue
-    requireOutputLines(output, layout.sizes.get(state.id)?.lines ?? [state.label], `state ${state.id}`, violations)
-  }
-  for (const plan of plans) {
-    if (!plan.route.transition.label) continue
-    if (!plan.label)
-      violations.push(`transition ${plan.route.transition.from}->${plan.route.transition.to} has no label layout`)
-    requireOutputLines(
-      output,
-      plan.label?.lines ?? [],
-      `transition ${plan.route.transition.from}->${plan.route.transition.to}`,
-      violations,
-    )
-  }
-
-  const statesById = new Map(diagram.states.map((state) => [state.id, state]))
-  const compositesById = new Map(diagram.composites.map((composite) => [composite.id, composite]))
-  const descendantOf = (id: string, compositeId: string) => {
-    let parentId = statesById.get(id)?.parentId ?? compositesById.get(id)?.parentId
-    while (parentId) {
-      if (parentId === compositeId) return true
-      parentId = compositesById.get(parentId)?.parentId
-    }
-    return false
-  }
-  for (const composite of diagram.composites) {
-    const bound = layout.compositeBounds.get(composite.id)
-    if (!bound || !finiteBounds(bound)) {
-      violations.push(`composite ${composite.id} has invalid bounds`)
-      continue
-    }
-    requireOutputLines(output, splitDiagramLines(composite.label), `composite ${composite.id}`, violations)
-    for (const state of diagram.states.filter(
-      (state) => !isHiddenCompositeMarker(state) && descendantOf(state.id, composite.id),
-    )) {
-      const stateBound = layout.bounds.get(state.id)
-      if (stateBound && !boundsContain(bound, stateBound))
-        violations.push(`composite ${composite.id} does not contain ${state.id}`)
-    }
-  }
-
-  for (const [index, note] of layout.noteBounds.entries()) {
-    if (!finiteBounds(note)) violations.push(`note ${index} has invalid bounds`)
-    requireOutputLines(output, note.lines, `note ${index}`, violations)
-    for (const id of bodyIds) {
-      const bound = layout.bounds.get(id)
-      if (bound && boundsOverlap(note, bound)) violations.push(`note ${index} overlaps state ${id}`)
-    }
-    for (const other of layout.noteBounds.slice(index + 1)) {
-      if (boundsOverlap(note, other)) violations.push(`notes ${index} and ${other.id} overlap`)
-    }
-    const target = layout.bounds.get(note.note.target)
-    if (!target) {
-      violations.push(`note ${index} has no target bound`)
-      continue
-    }
-    for (const point of expandedPath(stateDiagramNoteConnector(note, target).points)) {
-      for (const id of bodyIds) {
-        if (id === note.note.target) continue
-        const bound = layout.bounds.get(id)
-        if (bound && pointInBounds(point, bound)) violations.push(`note ${index} connector intersects state ${id}`)
-      }
-      for (const other of layout.noteBounds) {
-        if (other === note) continue
-        if (pointInBounds(point, other)) violations.push(`note ${index} connector intersects note ${other.id}`)
-      }
-    }
-  }
-
-  return { fixture, viewport, output, metrics: metrics(size.width, size.height, routes, viewport), violations }
-}
-
-export function auditFixture(fixture: LayoutFixture, viewport: (typeof auditViewports)[number] = 120): LayoutAudit {
-  return fixture.kind === "flowchart" ? auditFlowchart(fixture, viewport) : auditState(fixture, viewport)
-}
-
-export function auditAllFixtures(): LayoutAudit[] {
-  return layoutFixtures().flatMap((fixture, index) => {
-    if (fixture.curated) return auditViewports.map((viewport) => auditFixture(fixture, viewport))
-    if (fixture.kind === "flowchart") {
-      return auditFixture(fixture, auditViewports[index % auditViewports.length])
-    }
-    const viewport = fixture.profile === "short" ? 60 : fixture.profile === "unicode" ? 80 : 120
-    return auditFixture(fixture, viewport)
-  })
-}
-
-function percentile(values: readonly number[], ratio: number): number {
-  if (values.length === 0) return 0
-  return [...values].sort((left, right) => left - right)[Math.ceil(values.length * ratio) - 1] ?? 0
-}
-
-export function summarizeAudits(audits: readonly LayoutAudit[]) {
-  const summarize = (selected: readonly LayoutAudit[]) => ({
-    runs: selected.length,
-    sources: new Set(selected.map((audit) => audit.fixture.id)).size,
-    violations: selected.reduce((total, audit) => total + audit.violations.length, 0),
-    area: {
-      p50: percentile(
-        selected.map((audit) => audit.metrics.area),
-        0.5,
-      ),
-      p95: percentile(
-        selected.map((audit) => audit.metrics.area),
-        0.95,
-      ),
-      max: Math.max(0, ...selected.map((audit) => audit.metrics.area)),
-    },
-    bends: {
-      p95: percentile(
-        selected.map((audit) => audit.metrics.bends),
-        0.95,
-      ),
-      max: Math.max(0, ...selected.map((audit) => audit.metrics.bends)),
-    },
-    crossings: {
-      total: selected.reduce((total, audit) => total + audit.metrics.crossings, 0),
-      max: Math.max(0, ...selected.map((audit) => audit.metrics.crossings)),
-    },
-    routeLength: {
-      p95: percentile(
-        selected.map((audit) => audit.metrics.routeLength),
-        0.95,
-      ),
-      max: Math.max(0, ...selected.map((audit) => audit.metrics.routeLength)),
-    },
-    sharedRouteCells: {
-      p95: percentile(
-        selected.map((audit) => audit.metrics.sharedRouteCells),
-        0.95,
-      ),
-      max: Math.max(0, ...selected.map((audit) => audit.metrics.sharedRouteCells)),
-    },
-    overflow: {
-      p95: percentile(
-        selected.map((audit) => audit.metrics.overflow),
-        0.95,
-      ),
-      max: Math.max(0, ...selected.map((audit) => audit.metrics.overflow)),
-    },
-  })
-  return {
-    total: summarize(audits),
-    flowchart: summarize(audits.filter((audit) => audit.fixture.kind === "flowchart")),
-    state: summarize(audits.filter((audit) => audit.fixture.kind === "state")),
-  }
-}
-
-export function worstAudits(audits: readonly LayoutAudit[], metric: keyof LayoutMetrics, limit = 10): LayoutAudit[] {
-  return [...audits]
-    .sort(
-      (left, right) => right.metrics[metric] - left.metrics[metric] || left.fixture.id.localeCompare(right.fixture.id),
-    )
-    .slice(0, limit)
-}
@@ -334,33 +334,6 @@ flowchart LR
  expect(testRenderer.captureCharFrame()).toContain("GLOBAL registry")
 })

-test("folds a horizontal state diagram to the Markdown context width", async () => {
-  const testRenderer = await createTestRenderer({ width: 60, height: 48 })
-  renderer = testRenderer.renderer
-  const markdown = new MarkdownRenderable(renderer, {
-    id: "markdown-horizontal-state",
-    content: `\`\`\`mermaid
-stateDiagram-v2
-  direction LR
-  [*] --> A
-  A --> B: first
-  B --> C: second
-  C --> D: third
-  D --> [*]
-\`\`\``,
-    syntaxStyle,
-    renderNode: createMermaidMarkdownRenderer(renderer),
-  })
-
-  renderer.root.add(markdown)
-  await renderMarkdown(markdown, testRenderer.renderOnce)
-
-  const diagram = markdown.getChildren()[0] as CodeRenderable
-  expect(diagram.scrollWidth).toBeLessThanOrEqual(diagram.width)
-  expect(diagram.scrollWidth).toBeLessThanOrEqual(60)
-  expect(testRenderer.captureCharFrame()).toContain("third")
-})
-
 test("renders a Mermaid state fence inside MarkdownRenderable", async () => {
  const testRenderer = await createTestRenderer({ width: 80, height: 14 })
  renderer = testRenderer.renderer
@@ -384,27 +357,6 @@ stateDiagram-v2
  expect(frame).not.toContain("stateDiagram-v2")
 })

-test("sizes a standalone state choice after trimming leading rows", async () => {
-  const testRenderer = await createTestRenderer({ width: 80, height: 6 })
-  renderer = testRenderer.renderer
-  const markdown = new MarkdownRenderable(renderer, {
-    id: "markdown-state-choice",
-    content: `\`\`\`mermaid
-stateDiagram-v2
-  direction LR
-  state Decision <<choice>>
-\`\`\``,
-    syntaxStyle,
-    renderNode: createMermaidMarkdownRenderer(renderer),
-  })
-
-  renderer.root.add(markdown)
-  await renderMarkdown(markdown, testRenderer.renderOnce)
-
-  expect(markdown.getChildren()[0]?.height).toBe(1)
-  expect(testRenderer.captureCharFrame()).toContain("◆")
-})
-
 test("renders a Mermaid timeline fence inside MarkdownRenderable", async () => {
  const testRenderer = await createTestRenderer({ width: 80, height: 18 })
  renderer = testRenderer.renderer
@@ -30,8 +30,8 @@
  },
  "peerDependencies": {
    "@opencode-ai/theme": "workspace:*",
-    "@opentui/core": ">=0.5.8",
-    "@opentui/solid": ">=0.5.8",
+    "@opentui/core": ">=0.5.7",
+    "@opentui/solid": ">=0.5.7",
    "solid-js": ">=1.9.0"
  },
  "peerDependenciesMeta": {
@@ -8,8 +8,7 @@ The Effect plugin API grants plugins two in-process capabilities:
 ## Defining A Plugin

 ```ts
-import { Plugin } from "@opencode-ai/plugin/effect"
-import { Effect } from "effect"
+import { Effect, Plugin } from "@opencode-ai/plugin/effect"

 export default Plugin.define({
  id: "example",
@@ -1,5 +1,6 @@
 export * as Plugin from "./plugin.js"
 export type { StorageEntry, StorageScanOptions, StorageScanResult } from "../storage.js"
+export { Effect, Schema } from "effect"

 export { Agent } from "@opencode-ai/schema/agent"
 export { Command } from "@opencode-ai/schema/command"
@@ -43,6 +43,6 @@ export interface Plugin<R = Scope.Scope> {
  readonly effect: (context: Context) => Effect.Effect<void, never, R>
 }

-export function define<R = Scope.Scope>(plugin: Plugin<R>) {
+export function define<R = Scope.Scope>(plugin: Plugin<R>): Plugin<R> {
  return plugin
 }
@@ -0,0 +1,48 @@
+import type { Tool } from "@opencode-ai/schema/tool"
+import { Schema, SchemaAST } from "effect"
+import type { Context } from "./plugin.js"
+
+export function instanceSafeContext(context: Context): Context {
+  return {
+    ...context,
+    tool: {
+      ...context.tool,
+      transform: (callback) =>
+        context.tool.transform((draft) => callback({ add: (tool) => draft.add(instanceSafeTool(tool)) })),
+    },
+  }
+}
+
+export function instanceSafeTool(tool: Tool.Info<any, any>): Tool.Info<any, any> {
+  const input = instanceSafeValueSchema(tool.input, "input")
+  const output = tool.output === undefined ? undefined : instanceSafeValueSchema(tool.output, "output")
+  if (input === tool.input && output === tool.output) return tool
+  return { ...tool, input, ...(output === undefined ? {} : { output }) }
+}
+
+function instanceSafeValueSchema(schema: Tool.ValueSchema<any>, direction: "input" | "output"): Tool.ValueSchema<any> {
+  if (typeof schema === "object" && schema !== null && "~standard" in schema) {
+    const standard = schema["~standard"] as Record<string, any>
+    if (
+      typeof standard.validate !== "function" ||
+      typeof standard.jsonSchema?.input !== "function" ||
+      typeof standard.jsonSchema?.output !== "function"
+    )
+      throw new Error("Tool schemas must implement Standard Schema validation and JSON Schema generation")
+    return { "~standard": standard } as Tool.ValueSchema<any>
+  }
+  if (!Schema.isSchema(schema)) return schema
+  // Native codecs can only be compiled by the Effect instance that authored their AST.
+  if (!(schema.ast instanceof SchemaAST.Base)) {
+    throw new Error(
+      "Effect tool schemas must use Schema from @opencode-ai/plugin/effect or be converted to Standard Schema by their authoring Effect instance",
+    )
+  }
+  const codec = schema as Schema.Codec<unknown, unknown>
+  // Standard Schema validates Encoded -> Type, so flip outputs to run Type -> Encoded.
+  const oriented = direction === "input" ? codec : Schema.flip(codec)
+  const augmented = Schema.toStandardJSONSchemaV1(Schema.toStandardSchemaV1(oriented)) as unknown as {
+    readonly "~standard": Record<string, unknown>
+  }
+  return { "~standard": augmented["~standard"] } as Tool.ValueSchema<any>
+}
@@ -1,4 +1,5 @@
 import { expect, test } from "bun:test"
+import { Effect, Schema } from "effect"
 import { Agent } from "@opencode-ai/schema/agent"
 import { Command } from "@opencode-ai/schema/command"
 import { Connection } from "@opencode-ai/schema/connection"
@@ -30,7 +31,10 @@ test.each([
  expect(entrypoint.Reference).toBe(Reference)
  expect(entrypoint.Skill).toBe(Skill)
  expect(entrypoint.WebSearch).toBe(WebSearch)
-  expect(Object.keys(entrypoint).sort()).toEqual([
+})
+
+test("promise entrypoint exposes its public contract", () => {
+  expect(Object.keys(PromisePlugin).sort()).toEqual([
    "Agent",
    "Command",
    "Connection",
@@ -46,6 +50,32 @@ test.each([
  ])
 })

+test("effect entrypoint owns its Effect runtime", () => {
+  expect(Plugin.Effect).toBe(Effect)
+  expect(Plugin.Schema).toBe(Schema)
+  expect(Object.keys(Plugin).sort()).toEqual([
+    "Agent",
+    "Command",
+    "Connection",
+    "Credential",
+    "Effect",
+    "Integration",
+    "Mcp",
+    "Model",
+    "Plugin",
+    "Provider",
+    "Reference",
+    "Schema",
+    "Skill",
+    "WebSearch",
+  ])
+})
+
+test("effect plugin definition preserves identity", () => {
+  const definition = { id: "demo", effect: () => Effect.void }
+  expect(Plugin.Plugin.define(definition)).toBe(definition)
+})
+
 test("tui entrypoint exposes the plugin definition", () => {
  const plugin = TuiPlugin.Plugin.define({ id: "demo", setup() {} })
  expect(plugin.id).toBe("demo")
@@ -0,0 +1,121 @@
+import { afterAll, expect, test } from "bun:test"
+import { cp, mkdtemp, rm } from "node:fs/promises"
+import { tmpdir } from "node:os"
+import path from "node:path"
+import { fileURLToPath, pathToFileURL } from "node:url"
+import type { Tool } from "@opencode-ai/schema/tool"
+import type { StandardJSONSchemaV1, StandardSchemaV1 } from "@standard-schema/spec"
+import { Effect, Schema } from "effect"
+import { instanceSafeContext } from "../src/effect/tool-schema.js"
+
+const fixture = prepareAdapter()
+
+afterAll(async () => rm((await fixture).directory, { recursive: true, force: true }))
+
+test("prepares tools at the host plugin boundary", async () => {
+  const registered: Array<Tool.Info> = []
+  const context = {
+    tool: {
+      transform: (callback: (draft: { add: (tool: Tool.Info) => void }) => void) => {
+        callback({ add: (tool) => registered.push(tool) })
+        return Effect.succeed({ dispose: Effect.void })
+      },
+    },
+  } as unknown as Parameters<typeof instanceSafeContext>[0]
+
+  await Effect.runPromise(
+    Effect.scoped(
+      instanceSafeContext(context).tool.transform((draft) =>
+        draft.add({
+          name: "create",
+          description: "Create",
+          input: Schema.Struct({ title: Schema.String }),
+          execute: () => Effect.succeed({ content: "ok" }),
+        }),
+      ),
+    ),
+  )
+  expect(registered).toHaveLength(1)
+  expect(Schema.isSchema(registered[0]?.input)).toBe(false)
+})
+
+test("converts schemas authored by the plugin Effect runtime", async () => {
+  const prepared = await fixture
+  const tool = prepared.instanceSafeTool({
+    name: "create",
+    description: "Create",
+    input: prepared.Schema.FiniteFromString,
+    output: prepared.Schema.FiniteFromString,
+    execute: () => prepared.Effect.succeed({ output: 42 }),
+  })
+
+  expect(Schema.isSchema(tool.input)).toBe(false)
+  const input = tool.input as StandardSchemaV1
+  expect(await input["~standard"].validate("42")).toEqual({ value: 42 })
+  expect(await input["~standard"].validate(42)).toHaveProperty("issues")
+  expect((input as StandardJSONSchemaV1)["~standard"].jsonSchema.input({ target: "draft-2020-12" })).toMatchObject({
+    type: "string",
+  })
+  const output = tool.output as StandardSchemaV1 & StandardJSONSchemaV1
+  expect(await output["~standard"].validate(42)).toEqual({ value: "42" })
+  expect(output["~standard"].jsonSchema.output({ target: "draft-2020-12" })).toMatchObject({ type: "string" })
+})
+
+test("rejects an unprepared schema from another Effect runtime", async () => {
+  const prepared = await fixture
+  expect(() =>
+    prepared.instanceSafeTool({
+      name: "create",
+      description: "Create",
+      input: Schema.Struct({ title: Schema.String }),
+      execute: () => prepared.Effect.succeed({ content: "ok" }),
+    }),
+  ).toThrow("must use Schema from @opencode-ai/plugin/effect")
+})
+
+test("accepts a foreign schema prepared by its authoring runtime", async () => {
+  const prepared = await fixture
+  const schema = Schema.Struct({ title: Schema.String })
+  const augmented = Schema.toStandardJSONSchemaV1(Schema.toStandardSchemaV1(schema))
+  const detached = { "~standard": augmented["~standard"] }
+  const tool = prepared.instanceSafeTool({
+    name: "create",
+    description: "Create",
+    input: detached,
+    execute: () => prepared.Effect.succeed({ content: "ok" }),
+  })
+
+  expect(Schema.isSchema(tool.input)).toBe(false)
+  const input = tool.input as StandardSchemaV1 & StandardJSONSchemaV1
+  expect(await input["~standard"].validate({ title: "probe" })).toEqual({ value: { title: "probe" } })
+  expect(input["~standard"].jsonSchema.input({ target: "draft-2020-12" })).toMatchObject({ type: "object" })
+})
+
+test("rejects incomplete Standard Schema implementations", async () => {
+  const prepared = await fixture
+  expect(() =>
+    prepared.instanceSafeTool({
+      name: "create",
+      description: "Create",
+      input: { "~standard": { version: 1, vendor: "test", validate: () => ({ value: {} }) } } as Tool.ValueSchema,
+      execute: () => prepared.Effect.succeed({ content: "ok" }),
+    }),
+  ).toThrow("must implement Standard Schema validation and JSON Schema generation")
+})
+
+async function prepareAdapter() {
+  const directory = await mkdtemp(path.join(tmpdir(), "opencode-plugin-effect-"))
+  const source = path.dirname(fileURLToPath(import.meta.resolve("effect/package.json")))
+  await cp(source, path.join(directory, "node_modules", "effect"), { recursive: true })
+  await cp(new URL("../src/effect/tool-schema.ts", import.meta.url), path.join(directory, "tool-schema.ts"))
+  const adapter = (await import(pathToFileURL(path.join(directory, "tool-schema.ts")).href)) as {
+    instanceSafeTool: (tool: Tool.Info) => Tool.Info
+  }
+  const runtime = (await import(
+    pathToFileURL(path.join(directory, "node_modules", "effect", "dist", "index.js")).href
+  )) as {
+    Effect: typeof Effect
+    Schema: typeof Schema
+  }
+  return { directory, instanceSafeTool: adapter.instanceSafeTool, Effect: runtime.Effect, Schema: runtime.Schema }
+}
@@ -22,8 +22,7 @@
  "scripts": {
    "build": "bun run script/build.ts",
    "test": "bun test --timeout 5000",
-    "typecheck": "tsgo -b",
-    "verify:package": "bun run script/verify-package.ts"
+    "typecheck": "tsgo -b"
  },
  "dependencies": {
    "@opencode-ai/client": "workspace:*",
@@ -1,179 +0,0 @@
-#!/usr/bin/env bun
-
-import { $ } from "bun"
-import { mkdtemp, rm } from "node:fs/promises"
-import { tmpdir } from "node:os"
-import { join } from "node:path"
-import { fileURLToPath } from "node:url"
-
-const root = fileURLToPath(new URL("../../..", import.meta.url))
-const names = ["schema", "codemode", "ai", "util", "protocol", "client", "plugin", "core", "simulation", "server", "sdk"]
-const temporary = await mkdtemp(join(tmpdir(), "opencode-sdk-package-"))
-const archives = new Map<string, string>()
-
-try {
-  for (const name of names) {
-    const directory = join(root, "packages", name)
-    await $`bun run build`.cwd(directory)
-    const original = await Bun.file(join(directory, "package.json")).text()
-    // oxlint-disable-next-line typescript-eslint/no-unsafe-type-assertion -- package manifests are validated by their package builds.
-    const pkg = JSON.parse(original) as {
-      name: string
-      dependencies?: Record<string, string>
-      exports?: Record<string, string | { import: string; types: string }>
-      imports?: Record<string, Record<string, string>>
-    }
-    const archive = join(temporary, `${name}.tgz`)
-
-    if (pkg.dependencies) {
-      const unpacked = Object.keys(pkg.dependencies).filter(
-        (dependency) => dependency.startsWith("@opencode-ai/") && !archives.has(dependency),
-      )
-      if (unpacked.length > 0) throw new Error(`${pkg.name} has unpacked workspace dependencies: ${unpacked.join(", ")}`)
-      pkg.dependencies = Object.fromEntries(
-        Object.entries(pkg.dependencies).map(([dependency, version]) => {
-          const local = archives.get(dependency)
-          return [dependency, local ? `file:${local}` : version]
-        }),
-      )
-    }
-    if (pkg.exports) {
-      pkg.exports = Object.fromEntries(
-        Object.entries(pkg.exports).map(([key, value]) => {
-          if (typeof value !== "string") return [key, value]
-          return [key, { import: output(name, value), types: output(name, value, true) }]
-        }),
-      )
-    }
-    if (pkg.imports) {
-      pkg.imports = Object.fromEntries(
-        Object.entries(pkg.imports).map(([key, conditions]) => [
-          key,
-          Object.fromEntries(
-            Object.entries(conditions).map(([condition, value]) => [condition, output(name, value, condition === "types")]),
-          ),
-        ]),
-      )
-    }
-
-    await Bun.write(join(directory, "package.json"), JSON.stringify(pkg, null, 2) + "\n")
-    try {
-      await $`bun pm pack --filename ${archive} --ignore-scripts --quiet`.cwd(directory)
-    } finally {
-      await Bun.write(join(directory, "package.json"), original)
-    }
-    archives.set(pkg.name, archive)
-  }
-
-  const consumer = join(temporary, "consumer")
-  await Bun.write(
-    join(consumer, "package.json"),
-    JSON.stringify({ name: "opencode-sdk-consumer", private: true, type: "module" }),
-  )
-  await Promise.all([
-    Bun.write(
-      join(consumer, "wrangler.jsonc"),
-      JSON.stringify({
-        name: "opencode-sdk-packed-consumer",
-        main: "worker.js",
-        compatibility_date: "2026-07-15",
-        compatibility_flags: ["nodejs_compat"],
-        durable_objects: { bindings: [{ name: "OPENCODE", class_name: "OpenCodeDO" }] },
-        migrations: [{ tag: "v1", new_sqlite_classes: ["OpenCodeDO"] }],
-      }),
-    ),
-    Bun.write(
-      join(consumer, "worker.js"),
-      `import { bodyDigest } from "@opencode-ai/core/models-dev"
-import { OpenCodeWorkerd } from "@opencode-ai/sdk/workerd"
-import { Effect } from "effect"
-
-export class OpenCodeDO {
-  constructor(state) {
-    this.state = state
-  }
-
-  fetch() {
-    if (bodyDigest("packed-workerd") !== "5fc174bf63e8dd108ebb6c53d85e7bbc4525b2f4c1c43280364cdbfd9b37aaf5") {
-      throw new Error("Packed workerd SHA-256 mismatch")
-    }
-    const storage = this.state.storage
-    return Effect.runPromise(
-      Effect.gen(function* () {
-        const sdk = yield* OpenCodeWorkerd.create({
-          storage,
-          app: { version: "packed-workerd" },
-          config: { content: "{}" },
-        })
-        return Response.json(yield* sdk.health.get())
-      }).pipe(Effect.scoped),
-    )
-  }
-}
-
-export default {
-  fetch(request, env) {
-    return env.OPENCODE.get(env.OPENCODE.idFromName("packed-consumer")).fetch(request)
-  },
-}
-`,
-    ),
-    Bun.write(
-      join(consumer, "boot.mjs"),
-      `import { Miniflare } from "miniflare"
-
-const miniflare = new Miniflare({
-  compatibilityDate: "2026-07-15",
-  compatibilityFlags: ["nodejs_compat"],
-  modules: true,
-  scriptPath: new URL("./dist/worker.js", import.meta.url).pathname,
-  durableObjects: { OPENCODE: { className: "OpenCodeDO", useSQLite: true } },
-})
-
-try {
-  const response = await miniflare.dispatchFetch("http://opencode.local/health")
-  if (response.status !== 200) throw new Error(
-    "Packed workerd health returned " + response.status + ": " + await response.text(),
-  )
-  const body = await response.json()
-  if (body.healthy !== true || body.version !== "packed-workerd") {
-    throw new Error("Unexpected packed workerd health: " + JSON.stringify(body))
-  }
-} finally {
-  await miniflare.dispose()
-}
-`,
-    ),
-  ])
-
-  const sdk = archives.get("@opencode-ai/sdk")
-  if (!sdk) throw new Error("Packed SDK archive was not created")
-  await $`npm install --ignore-scripts --no-audit --no-fund --package-lock=false ${sdk} wrangler@4.110.0`.cwd(consumer)
-  await $`node_modules/.bin/wrangler deploy --dry-run --config wrangler.jsonc --outdir dist`.cwd(consumer)
-
-  const transpiler = new Bun.Transpiler({ loader: "js" })
-  const bundled = await Bun.file(join(consumer, "dist/worker.js")).text()
-  if (/createRequire\s*\(\s*import\.meta\.url\s*\)/.test(bundled)) {
-    throw new Error("Packed workerd bundle contains Bun's eager Node require initializer")
-  }
-  const bunGlobals = Array.from(new Set(bundled.match(/\bBun\.[A-Za-z_$][\w$]*/g) ?? []))
-  if (bunGlobals.length > 0) throw new Error(`Packed workerd bundle references Bun globals: ${bunGlobals.join(", ")}`)
-  const leaked = [
-    ...transpiler.scanImports(bundled)
-      .filter((imported) => imported.kind !== "dynamic-import")
-      .map((imported) => imported.path),
-    ...Array.from(bundled.matchAll(/\brequire\(\s*["']([^"']+)["']\s*\)/g), (match) => match[1]),
-  ]
-    .filter((specifier) => specifier === "bun" || specifier.startsWith("bun:"))
-  if (leaked.length > 0) throw new Error(`Packed workerd bundle statically imports Bun builtins: ${leaked.join(", ")}`)
-
-  await $`node boot.mjs`.cwd(consumer)
-  console.log("packed SDK consumer OK")
-} finally {
-  await rm(temporary, { recursive: true, force: true })
-}
-
-function output(name: string, value: string, types = false) {
-  const root = name === "core" && types ? "./dist/types/" : "./dist/"
-  return value.replace("./src/", root).replace(/\.ts$/, types ? ".d.ts" : ".js")
-}
@@ -11,7 +11,6 @@ import type { McpServer } from "@opencode-ai/client"
 import { useToast } from "../ui/toast"
 import { DialogErrorDetails } from "./dialog-error-details"
 import { DialogIntegration } from "./dialog-integration"
-import { useLocation } from "../context/location"

 function statusError(status: McpServer["status"]) {
  if (status.status === "failed") return status.error
@@ -38,13 +37,11 @@ export function DialogMcp(props: { initialServer?: string; details?: boolean } =
  const data = useData()
  const dialog = useDialog()
  const client = useClient()
-  const location = useLocation()
  const toast = useToast()
  const theme = useTheme("elevated")
-  const current = () => location.ref ?? data.location.default()
  const servers = createMemo(() =>
    pipe(
-      data.location.mcp.server.list(current()) ?? [],
+      data.location.mcp.server.list() ?? [],
      sortBy((server) => server.name),
    ),
  )
@@ -118,8 +115,8 @@ export function DialogMcp(props: { initialServer?: string; details?: boolean } =
      return
    }
    setLoading(name)
-    const target = current()
-    const input = { server: name, location: { directory: target.directory, workspace: target.workspaceID } }
+    const current = data.location.default()
+    const input = { server: name, location: { directory: current.directory, workspace: current.workspaceID } }
    const call = server.status.status === "connected" ? client.api.mcp.disconnect(input) : client.api.mcp.connect(input)
    void call.catch(toast.error).finally(() => setLoading(null))
  }
@@ -48,16 +48,6 @@ const MARQUEE_INTERVAL = 80
 const CONTEXT_MENU_WIDTH = 16
 const MIDDLE_MOUSE_BUTTON = 1
 const RIGHT_MOUSE_BUTTON = 2
-const MOUSE_CLOSE_HOLD_MS = 5_000
-
-type MouseCloseHold = {
-  items: string[]
-  ids: string[]
-  widths: number[]
-  closed: string
-  target: string
-  x: number
-}

 type TabContextMenuState = {
  x: number
@@ -111,45 +101,6 @@ function fadeTitleColor(color: RGBA, background: RGBA, index: number, length: nu
  return opacity === 0 ? color : tint(color, background, opacity)
 }

-function heldSessionTabLayout(hold: MouseCloseHold, tabs: readonly SessionTab[]) {
-  const ids = tabs.map((tab) => tab.sessionID)
-  const expected = hold.items.filter((id) => id !== hold.closed)
-  const unchanged = ids.length === hold.items.length && ids.every((id, index) => id === hold.items[index])
-  const removed = ids.length === expected.length && ids.every((id, index) => id === expected[index])
-  if (!unchanged && !removed) return undefined
-
-  const visibleIDs = hold.ids.filter((id) => ids.includes(id))
-  if (removed && !visibleIDs.includes(hold.target)) {
-    visibleIDs.push(hold.target)
-    visibleIDs.sort((a, b) => ids.indexOf(a) - ids.indexOf(b))
-  }
-  const positions = visibleIDs.map((id) => ids.indexOf(id))
-  const start = positions[0]
-  if (start === undefined || positions.some((position, index) => position !== start + index)) return undefined
-  const visible = visibleIDs.flatMap((id) => tabs.find((tab) => tab.sessionID === id) ?? [])
-  if (visible.length !== visibleIDs.length) return undefined
-
-  const widths = visibleIDs.map((id) => hold.widths[hold.ids.indexOf(id)] ?? 1)
-  if (removed) {
-    const index = visibleIDs.indexOf(hold.target)
-    if (index === -1) return undefined
-    const leading = start > 0 ? sessionTabOverflowWidth(start) : 0
-    const preceding = widths.slice(0, index).reduce((sum, width) => sum + width, 0)
-    // The close glyph sits one cell in from the right edge: x = tab start + width - 2.
-    const width = hold.x - leading - preceding + 2
-    if (width < 1) return undefined
-    widths[index] = width
-  }
-  return {
-    tabs: visible,
-    widths,
-    before: start,
-    after: tabs.length - start - visible.length,
-    start,
-    total: widths.reduce((sum, width) => sum + width, 0),
-  }
-}
-
 export function createMarquee(animations: () => boolean) {
  const [offset, setOffset] = createSignal(0)
  const [active, setActive] = createSignal<string>()
@@ -907,23 +858,9 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
  // so the strip never flashes the pre-drag order while the write is in flight.
  const [preview, setPreview] = createSignal<{ sessionID: string; index: number }>()
  const [contextMenu, setContextMenu] = createSignal<TabContextMenuState>()
-  const [closeHold, setCloseHold] = createSignal<MouseCloseHold>()
-  let strip: { screenX: number; screenY: number; width: number; height: number } | undefined
+  let strip: { screenX: number; screenY: number } | undefined
  let didDrag = false
  let addPressed = false
-  let closeHoldTimer: ReturnType<typeof setTimeout> | undefined
-  let releasingCloseHold = false
-  const clearCloseHold = () => {
-    setCloseHold(undefined)
-    if (closeHoldTimer) clearTimeout(closeHoldTimer)
-    closeHoldTimer = undefined
-  }
-  const releaseCloseHold = () => {
-    if (!closeHold()) return
-    releasingCloseHold = true
-    clearCloseHold()
-  }
-  onCleanup(clearCloseHold)
  // A captured drag ends with a synthetic up on its drop target; do not turn that into a click.
  let suppressClick = false
  const hueStep = () => (mode() === "light" ? 800 : 200)
@@ -947,23 +884,14 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
    const index = tabs.tabs().findIndex((tab) => tab.sessionID === pending.sessionID)
    if (index === -1 || index === Math.min(pending.index, tabs.tabs().length - 1)) setPreview(undefined)
  })
-  const heldLayout = createMemo(() => {
-    const hold = closeHold()
-    return hold ? heldSessionTabLayout(hold, items()) : undefined
-  })
-  const layout = createMemo(
-    (previous: ReturnType<typeof adaptiveSessionTabLayout> | undefined) =>
-      heldLayout() ??
-      adaptiveSessionTabLayout(
-        items(),
-        activeID(),
-        dimensions().width - (showPlus() ? ADD_TAB_WIDTH : 0),
-        previous?.start,
-      ),
+  const layout = createMemo((previous: ReturnType<typeof adaptiveSessionTabLayout> | undefined) =>
+    adaptiveSessionTabLayout(
+      items(),
+      activeID(),
+      dimensions().width - (showPlus() ? ADD_TAB_WIDTH : 0),
+      previous?.start,
+    ),
  )
-  createEffect(() => {
-    if (closeHold() && !heldLayout()) clearCloseHold()
-  })
  createEffect(() => {
    const active = marquee.active()
    if (active && !layout().tabs.some((tab) => tab.sessionID === active)) marquee.reset()
@@ -999,7 +927,6 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
  )
  let signature = ""
  let total = 0
-  let terminalWidth = dimensions().width

  // createComputed runs before render effects, so seeded widths are visible on the first frame
  // of a membership change instead of flashing the final layout.
@@ -1008,29 +935,12 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
    const nextSignature = identity()
    const changed = Boolean(signature) && signature !== nextSignature
    const resized = Boolean(total) && total !== layout().total
-    const terminalResized = terminalWidth !== dimensions().width
    const previous = signature
    signature = nextSignature
    total = layout().total
-    terminalWidth = dimensions().width
-    const releasing = releasingCloseHold
-    releasingCloseHold = false
-    if (terminalResized && closeHold()) {
-      clearCloseHold()
-      return
-    }
-    if (closeHold() && heldLayout()) {
-      const current = untrack(motion.value)
-      const seeded = changed
-        ? seedSessionTabMotion(previous.split(":"), layout().tabs.map((tab) => tab.sessionID), current, next)
-        : current
-      if (!seeded) return motion.jump(next)
-      motion.jump({ ...seeded, widths: next.widths })
-      return motion.animate(next)
-    }
    if (!changed && !resized) return motion.animate(next)
    // Identity-stable total changes are terminal resizes and still jump.
-    if (!changed) return releasing ? motion.animate(next) : motion.jump(next)
+    if (!changed) return motion.jump(next)
    const seeded = seedSessionTabMotion(
      previous.split(":"),
      layout().tabs.map((tab) => tab.sessionID),
@@ -1049,12 +959,12 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
    const active = activeIndex()
    const remainder = layout().total - widths.reduce((sum, width) => sum + width, 0)
    // Absorb only rounding slack; membership animations leave a real gap while widths grow into place.
-    if (active !== -1 && Math.abs(remainder) <= layout().tabs.length) widths[active] += remainder
+    if (active !== -1 && Math.abs(remainder) <= layout().tabs.length) widths[active]! += remainder
    return new Map(
      layout().tabs.map((tab, index) => [
        tab.sessionID,
        {
-          width: widths[index],
+          width: widths[index]!,
          selection: current.selections[index] ?? Number(tab.sessionID === activeID()),
          activity: current.activities[index] ?? Number(statuses().get(tab.sessionID)!.complete),
        },
@@ -1062,29 +972,6 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
    )
  })

-  const holdCloseCell = (sessionID: string, x: number) => {
-    if (!strip) return clearCloseHold()
-    const current = layout()
-    const index = current.tabs.findIndex((tab) => tab.sessionID === sessionID)
-    const all = items()
-    const itemIndex = all.findIndex((tab) => tab.sessionID === sessionID)
-    const target = all[itemIndex + 1] ?? all[itemIndex - 1]
-    if (index === -1 || itemIndex === -1 || !target) return clearCloseHold()
-    const ids = current.tabs.map((tab) => tab.sessionID)
-    const values = ids.map((id) => visuals().get(id))
-    if (values.some((value) => !value)) return clearCloseHold()
-    setCloseHold({
-      items: all.map((tab) => tab.sessionID),
-      ids,
-      widths: values.map((value) => value!.width),
-      closed: sessionID,
-      target: target.sessionID,
-      x: x - strip.screenX,
-    })
-    if (closeHoldTimer) clearTimeout(closeHoldTimer)
-    closeHoldTimer = setTimeout(releaseCloseHold, MOUSE_CLOSE_HOLD_MS)
-  }
-
  // Map an absolute pointer column to the items index of the visible slot beneath it.
  const slotAt = (x: number) => {
    if (!strip) return undefined
@@ -1128,17 +1015,7 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
      position="relative"
      flexDirection="row"
      zIndex={1}
-      onMouseOut={(event) => {
-        marquee.leaveHovered()
-        if (!strip) return
-        if (
-          event.x < strip.screenX ||
-          event.x >= strip.screenX + strip.width ||
-          event.y < strip.screenY ||
-          event.y >= strip.screenY + strip.height
-        )
-          releaseCloseHold()
-      }}
+      onMouseOut={marquee.leaveHovered}
      onMouseUp={(event) => {
        if (event.button === RIGHT_MOUSE_BUTTON) return
        release()
@@ -1250,7 +1127,6 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
              onMouseOut={() => marquee.leave(tab.sessionID)}
              onMouseDown={(event) => {
                if (event.button === MIDDLE_MOUSE_BUTTON) {
-                  releaseCloseHold()
                  didDrag = false
                  setDragging(undefined)
                  tabs.close(tab === NEW_SESSION_TAB ? undefined : tab.sessionID)
@@ -1259,7 +1135,6 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
                  return
                }
                if (event.button === RIGHT_MOUSE_BUTTON) {
-                  releaseCloseHold()
                  didDrag = false
                  setDragging(undefined)
                  setContextMenu({
@@ -1273,7 +1148,6 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
                  return
                }
                didDrag = false
-                releaseCloseHold()
                marquee.enter(tab.sessionID, title(), hoveredTitleWidth())
                setDragging(tab.sessionID)
              }}
@@ -1331,7 +1205,6 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
                    // land here first, and must select the tab instead of closing it invisibly.
                    if (hovered() !== tab.sessionID) return
                    event.stopPropagation()
-                    holdCloseCell(tab.sessionID, event.x)
                    tabs.close(tab === NEW_SESSION_TAB ? undefined : tab.sessionID)
                  }}
                >
@@ -1356,7 +1229,6 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
          onMouseOver={() => setAddHovered(true)}
          onMouseOut={() => setAddHovered(false)}
          onMouseDown={(event) => {
-            releaseCloseHold()
            didDrag = false
            setDragging(undefined)
            addPressed = event.button !== RIGHT_MOUSE_BUTTON
@@ -1,4 +1,4 @@
-import { createEffect, createMemo, createSignal, on, onCleanup } from "solid-js"
+import { createEffect, createMemo, createSignal, onCleanup } from "solid-js"
 import { useKeyboard, useRenderer } from "@opentui/solid"
 import { isDeepEqual } from "remeda"
 import { createSimpleContext } from "./helper"
@@ -156,30 +156,26 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
      }
    }

-    // Shared storage updates must not re-admit a tab unless this client changes route or scope.
-    createEffect(
-      on(
-        [
-          () => (enabled() && route.data.type === "session" ? route.data.sessionID : undefined),
-          () => config.tabs.scope,
-        ],
-        ([routed]) => {
-          if (!routed || routed === "dummy") return
-          const sessionID = root(routed)
-          cancelledTabs.delete(sessionID)
-          history = recordSessionTabHistory(history, sessionID)
-          if (state().tabs.some((tab) => tab.sessionID === sessionID)) return
-          const fallback = newTab() ? NEW_SESSION_TAB_TITLE : undefined
-          update((draft) => {
-            if (cancelledTabs.has(sessionID)) return
-            draft.tabs = openSessionTab(draft.tabs, {
-              sessionID,
-              title: title(sessionID, draft.tabs.find((tab) => tab.sessionID === sessionID)?.title, fallback),
-            })
-          })
-        },
-      ),
-    )
+    createEffect(() => {
+      if (!enabled()) return
+      if (route.data.type !== "session" || route.data.sessionID === "dummy") return
+      const sessionID = root(route.data.sessionID)
+      cancelledTabs.delete(sessionID)
+      history = recordSessionTabHistory(history, sessionID)
+      const fallback = newTab() ? NEW_SESSION_TAB_TITLE : undefined
+      const tabs = openSessionTab(state().tabs, {
+        sessionID,
+        title: title(sessionID, state().tabs.find((tab) => tab.sessionID === sessionID)?.title, fallback),
+      })
+      if (tabs === state().tabs) return
+      update((draft) => {
+        if (cancelledTabs.has(sessionID)) return
+        draft.tabs = openSessionTab(draft.tabs, {
+          sessionID,
+          title: title(sessionID, draft.tabs.find((tab) => tab.sessionID === sessionID)?.title, fallback),
+        })
+      })
+    })

    // Viewed state is server-global, so acknowledgement runs even with tabs disabled: other
    // clients rely on this client reporting what its user has seen.
@@ -2,7 +2,6 @@ import { Plugin } from "@opencode-ai/plugin/tui"
 import { useTerminalDimensions } from "@opentui/solid"
 import { createSignal, For, type JSX } from "solid-js"
 import { StoryFooter } from "./footer"
-import { mermanLayoutsStory } from "./merman-layouts"
 import { sessionTabsStory } from "./session-tabs"
 import { sessionLocationMissingStory } from "./session-location-missing"

@@ -16,7 +15,7 @@ export type Story = {
  render: (context: Plugin.Context) => JSX.Element
 }

-const stories: Story[] = [mermanLayoutsStory, sessionTabsStory, sessionLocationMissingStory]
+const stories: Story[] = [sessionTabsStory, sessionLocationMissingStory]

 function Commands(props: { context: Plugin.Context }) {
  props.context.keymap.layer(() => ({
@@ -1,201 +0,0 @@
-import type { Plugin } from "@opencode-ai/plugin/tui"
-import { useTerminalDimensions } from "@opentui/solid"
-import { createMemo, createSignal, Show } from "solid-js"
-import { useTheme, useThemes } from "../../../context/theme"
-import { usePlugin } from "../../../plugin/context"
-import type { Story } from "./index"
-import { StoryFooter } from "./footer"
-
-const fixtures = [
-  {
-    id: "deployment",
-    title: "Deployment architecture",
-    source: `flowchart LR
-  Client[OpenCode client]
-
-  subgraph CF[Cloudflare]
-    DNS[opencode.ai]
-    Web[Console frontend Worker]
-    Proxy[Console API proxy Worker]
-    Infer[inference-next Worker]
-    KV[Model registry KV]
-    Redis[Upstash Redis]
-    Logs[Axiom / Cloudflare logs]
-    Lake[Pipeline to R2 data lake]
-  end
-
-  subgraph AWS[AWS]
-    EKS[EKS cluster]
-    API[Console API pod<br/>1 replica]
-    OTEL[OTel collector]
-    ECR[ECR]
-  end
-
-  DB[(PlanetScale)]
-  Models[Anthropic / OpenAI / other providers]
-
-  Client -->|/inference/*| DNS --> Infer
-  Client -->|/console/*| DNS --> Web
-  Web -->|/console/api, /auth, etc.| Proxy
-  Proxy -->|Cloudflare VPC service| API
-  Infer -->|public DATABASE_URL| DB
-  Infer --> KV
-  Infer --> Redis
-  Infer --> Models
-  Infer --> Logs
-  Infer --> Lake
-  API -->|private DATABASE_AWS_URL| DB
-  API --> OTEL
-  ECR --> API`,
-  },
-  {
-    id: "nested-flow",
-    title: "Nested directed groups",
-    source: `flowchart LR
-  Input([Input]) --> Parse
-  subgraph Outer[Outer orchestration]
-    direction RL
-    subgraph Inner[Inner pipeline]
-      direction TD
-      Parse[Parse request] --> Validate{Valid?}
-      Validate -->|yes| Cache[(Cache)]
-      Cache -->|stale| Validate
-    end
-    Validate --> Dispatch[[Dispatch work]]
-    Dispatch -->|requeue| Parse
-  end
-  Dispatch -. result .-> Output([Output])
-  Output -->|audit| Cache`,
-  },
-  {
-    id: "state-feedback",
-    title: "Dense state feedback",
-    source: `stateDiagram-v2
-  direction TB
-  [*] --> Root
-  Root --> Alpha: dispatch alpha
-  Root --> Beta: dispatch beta
-  Alpha --> Merge: alpha complete
-  Beta --> Merge: beta complete
-  Merge --> Alpha: retry alpha
-  Merge --> Beta: retry beta
-  Merge --> [*]: finish
-  note right of Merge
-    Retries preserve the original request
-    and remain visible after compaction
-  end note`,
-  },
-  {
-    id: "state-composite",
-    title: "Nested composite lifecycle",
-    source: `stateDiagram-v2
-  direction LR
-  state Session {
-    [*] --> Open
-    state Open {
-      [*] --> Clean
-      Clean --> Dirty: edit
-      Dirty --> Clean: save
-    }
-    Open --> Closing: request close
-    Closing --> Open: cancel
-    Closing --> [*]: closed
-    note right of Dirty: unsaved changes
-  }
-  [*] --> Session: hydrate
-  Session --> [*]: release`,
-  },
-] as const
-
-function MermanLayoutsStory(props: { context: Plugin.Context }) {
-  const dimensions = useTerminalDimensions()
-  const theme = useTheme()
-  const themes = useThemes()
-  const plugins = usePlugin()
-  const [selected, setSelected] = createSignal(0)
-  const [generation, setGeneration] = createSignal(0)
-  const fixture = createMemo(() => fixtures[selected()]!)
-  const rendered = createMemo(() => ({ fixture: fixture(), generation: generation() }))
-  const markdown = createMemo(() => `\`\`\`mermaid\n${fixture().source}\n\`\`\``)
-  const move = (offset: number) => setSelected((current) => (current + offset + fixtures.length) % fixtures.length)
-
-  props.context.keymap.layer(() => ({
-    commands: [
-      {
-        bind: "escape",
-        title: "Back to storybook",
-        group: "Storybook",
-        run: () => props.context.ui.router.navigate({ type: "plugin", name: "storybook" }),
-      },
-      {
-        bind: "left,k",
-        title: "Previous fixture",
-        group: "Storybook",
-        run: () => move(-1),
-      },
-      {
-        bind: "right,j",
-        title: "Next fixture",
-        group: "Storybook",
-        run: () => move(1),
-      },
-      {
-        bind: "r",
-        title: "Reset fixture",
-        group: "Storybook",
-        run: () => {
-          setSelected(0)
-          setGeneration((current) => current + 1)
-        },
-      },
-    ],
-  }))
-
-  return (
-    <box
-      width={dimensions().width}
-      height={dimensions().height}
-      flexDirection="column"
-      backgroundColor={theme.background.default}
-    >
-      <Show when={rendered()} keyed>
-        {(item) => (
-          <scrollbox flexGrow={1} minHeight={0} viewportOptions={{ paddingRight: 1 }}>
-            <box paddingLeft={2} paddingRight={2} paddingTop={1} flexDirection="column">
-              <text fg={theme.text.default}>{item.fixture.title}</text>
-              <text fg={theme.text.subdued}>{item.fixture.id}</text>
-              <box height={1} />
-              <markdown
-                width="100%"
-                syntaxStyle={themes.currentSyntax()}
-                content={markdown()}
-                internalBlockMode="top-level"
-                tableOptions={{ style: "grid", cellPaddingX: 1 }}
-                conceal={true}
-                fg={theme.markdown.text}
-                bg={theme.background.default}
-                renderNode={plugins.markdown()}
-              />
-            </box>
-          </scrollbox>
-        )}
-      </Show>
-      <StoryFooter
-        context={props.context}
-        title="storybook / Mermaid layouts"
-        details={[`${selected() + 1}/${fixtures.length}`, fixture().id, `${dimensions().width}x${dimensions().height}`]}
-        controls={[
-          { shortcut: "j/k or ←/→", label: "fixture" },
-          { shortcut: "r", label: "reset" },
-          { shortcut: "esc", label: "back" },
-        ]}
-      />
-    </box>
-  )
-}
-
-export const mermanLayoutsStory: Story = {
-  id: "merman-layouts",
-  title: "Mermaid layouts",
-  render: (context) => <MermanLayoutsStory context={context} />,
-}
@@ -7,7 +7,6 @@ import { ConfigProvider } from "../../../src/config"
 import { ClientProvider } from "../../../src/context/client"
 import { DataProvider, useData } from "../../../src/context/data"
 import { Keymap } from "../../../src/context/keymap"
-import { LocationProvider } from "../../../src/context/location"
 import { ThemeProvider } from "../../../src/context/theme"
 import { DialogProvider, useDialog } from "../../../src/ui/dialog"
 import { ToastProvider } from "../../../src/ui/toast"
@@ -100,13 +99,11 @@ async function renderMcp() {
            <ToastProvider>
              <ClientProvider api={createApi(calls.fetch)}>
                <DataProvider>
-                  <LocationProvider>
-                    <ThemeProvider mode="dark" source={emptyThemeSource}>
-                      <DialogProvider>
-                        <Probe />
-                      </DialogProvider>
-                    </ThemeProvider>
-                  </LocationProvider>
+                  <ThemeProvider mode="dark" source={emptyThemeSource}>
+                    <DialogProvider>
+                      <Probe />
+                    </DialogProvider>
+                  </ThemeProvider>
                </DataProvider>
              </ClientProvider>
            </ToastProvider>
@@ -99,111 +99,3 @@ test("middle-click closes a session tab without selecting it", async () => {
    app.renderer.destroy()
  }
 })
-
-test("keeps consecutive close controls fixed across overflow window changes", async () => {
-  const [active, setActive] = createSignal("fifth")
-  const [items, setItems] = createSignal([
-    { sessionID: "first", title: "First" },
-    { sessionID: "second", title: "Second" },
-    { sessionID: "third", title: "Third" },
-    { sessionID: "fourth", title: "Fourth" },
-    { sessionID: "fifth", title: "Fifth" },
-  ])
-  const closed: string[] = []
-  const controller = {
-    tabs: items,
-    current: active,
-    select: setActive,
-    close: (sessionID?: string) => {
-      if (!sessionID) return
-      const current = items()
-      closed.push(sessionID)
-      setActive("first")
-      setItems(current.filter((tab) => tab.sessionID !== sessionID))
-    },
-    move() {},
-    status: () => EMPTY_SESSION_TAB_STATUS,
-  } satisfies SessionTabsController
-  const app = await testRender(
-    () => (
-      <TestTuiContexts>
-        <ConfigProvider config={createTuiResolvedConfig({ tabs: { enabled: true } })}>
-          <ThemeProvider mode="dark" source={emptyThemeSource}>
-            <SessionTabs controller={controller} animations={false} />
-          </ThemeProvider>
-        </ConfigProvider>
-      </TestTuiContexts>
-    ),
-    { width: 46, height: 2 },
-  )
-
-  try {
-    app.renderer.start()
-    await app.waitForFrame((frame) => frame.includes("Third"))
-    await app.mockMouse.moveTo(11, 0)
-    await app.waitForFrame((frame) => Array.from(frame.split("\n")[0] ?? "")[11] === "✕")
-
-    await app.mockMouse.click(11, 0)
-    await app.waitForFrame((frame) => items().length === 4 && Array.from(frame.split("\n")[0] ?? "")[11] === "✕")
-    await app.mockMouse.click(11, 0)
-
-    expect(closed).toEqual(["third", "fourth"])
-  } finally {
-    app.renderer.destroy()
-  }
-})
-
-test("reflows held tabs when the pointer leaves the strip", async () => {
-  const [active, setActive] = createSignal("first")
-  const [items, setItems] = createSignal([
-    { sessionID: "first", title: "First" },
-    { sessionID: "second", title: "Second" },
-    { sessionID: "third", title: "Third" },
-    { sessionID: "fourth", title: "Fourth" },
-  ])
-  const controller = {
-    tabs: items,
-    current: active,
-    select: setActive,
-    close: (sessionID?: string) => {
-      if (!sessionID) return
-      const current = items()
-      const index = current.findIndex((tab) => tab.sessionID === sessionID)
-      setActive((current[index + 1] ?? current[index - 1])?.sessionID)
-      setItems(current.filter((tab) => tab.sessionID !== sessionID))
-    },
-    move() {},
-    status: () => EMPTY_SESSION_TAB_STATUS,
-  } satisfies SessionTabsController
-  const app = await testRender(
-    () => (
-      <TestTuiContexts>
-        <ConfigProvider config={createTuiResolvedConfig({ tabs: { enabled: true } })}>
-          <ThemeProvider mode="dark" source={emptyThemeSource}>
-            <box flexDirection="column">
-              <SessionTabs controller={controller} animations={false} />
-              <text>outside</text>
-            </box>
-          </ThemeProvider>
-        </ConfigProvider>
-      </TestTuiContexts>
-    ),
-    { width: 60, height: 2 },
-  )
-
-  try {
-    app.renderer.start()
-    await app.waitForFrame((frame) => frame.includes("Fourth"))
-    await app.mockMouse.moveTo(22, 0)
-    await app.waitForFrame((frame) => Array.from(frame.split("\n")[0] ?? "")[22] === "✕")
-    await app.mockMouse.click(22, 0)
-    await app.waitForFrame((frame) => items().length === 3 && Array.from(frame.split("\n")[0] ?? "")[22] === "✕")
-
-    await app.mockMouse.moveTo(0, 1)
-    await app.mockMouse.moveTo(20, 0)
-    await app.waitForFrame((frame) => Array.from(frame.split("\n")[0] ?? "")[20] === "✕")
-    expect(Array.from(app.captureCharFrame().split("\n")[0] ?? "")[22]).not.toBe("✕")
-  } finally {
-    app.renderer.destroy()
-  }
-})
@@ -505,34 +505,6 @@ test("concurrent TUIs do not alternate shared tab titles from divergent session
  }
 })

-test("closing a tab is not undone by another TUI viewing the same session", async () => {
-  await using temporary = await tmpdir()
-  const clients: Awaited<ReturnType<typeof renderSessionTabs>>[] = []
-
-  try {
-    const first = await renderSessionTabs("shared", { state: temporary.path })
-    clients.push(first)
-    const second = await renderSessionTabs("shared", { state: temporary.path })
-    clients.push(second)
-    await wait(() => first.tabs.tabs().some((tab) => tab.sessionID === "shared"))
-    await wait(() => second.tabs.tabs().some((tab) => tab.sessionID === "shared"))
-    first.tabs.close()
-    await wait(() => first.route.data.type === "home")
-    await wait(() => !second.tabs.tabs().some((tab) => tab.sessionID === "shared"))
-    await Promise.all([first.flush(), second.flush()])
-
-    const stored = await Bun.file(path.join(temporary.path, "test", "tui", "tabs.json")).json()
-    expect(stored.cwd[directory].tabs).toEqual([])
-
-    second.route.navigate({ type: "home" })
-    await wait(() => second.route.data.type === "home")
-    second.route.navigate({ type: "session", sessionID: "shared" })
-    await wait(() => first.tabs.tabs().some((tab) => tab.sessionID === "shared"))
-  } finally {
-    await Promise.allSettled(clients.map((client) => client.destroy()))
-  }
-})
-
 test("user prompt admissions pulse an already-busy background tab", async () => {
  const setup = await renderSessionTabs("background")
  const admitted = (sessionID: string, inboxID: string): OpenCodeEvent => ({
@@ -25,7 +25,7 @@
      "default": "./src/global-roots.ts"
    },
    "#runtime-import": {
-      "workerd": "./src/runtime/import.workerd.ts",
+      "workerd": "./src/runtime/import.bun.ts",
      "bun": "./src/runtime/import.bun.ts",
      "node": "./src/runtime/import.node.ts",
      "default": "./src/runtime/import.bun.ts"
@@ -60,10 +60,7 @@ export function fileLogger(target = file(), id: string = runID()) {
  })
 }

-const stderrLogger = Logger.make((options) => {
-  if (process.env.OPENCODE_PRINT_LOGS !== "1") return
-  process.stderr.write(formatter().log(options) + "\n")
-})
+const stderrLogger = Logger.make((options) => process.stderr.write(formatter().log(options) + "\n"))

 export function minimumLogLevel() {
  const value = process.env.OPENCODE_LOG_LEVEL?.toUpperCase()
@@ -77,7 +74,8 @@ export function minimumLogLevel() {
 }

 export function loggers(local = true, channel = "local") {
-  return [fileLogger(file(local, channel)), stderrLogger]
+  const logger = fileLogger(file(local, channel))
+  return process.env.OPENCODE_PRINT_LOGS === "1" ? [logger, stderrLogger] : [logger]
 }

 export * as Logging from "./logging.js"
@@ -1,9 +0,0 @@
-const unavailable = () => new Error("Dynamic module loading is unavailable on workerd")
-
-export function importModule(_specifier: string): Promise<unknown> {
-  return Promise.reject(unavailable())
-}
-
-export function resolveModule(_specifier: string, _directory: string): string {
-  throw unavailable()
-}
@@ -459,16 +459,16 @@ being resolved.
 ## Effect

 OpenCode provides a first-class Effect API for plugins through the
-`@opencode-ai/plugin/effect` entrypoint. Install `effect` alongside the
-plugin package and export an `effect` function instead of `setup`:
+`@opencode-ai/plugin/effect` entrypoint. It exports the compatible `Effect` and
+`Schema` modules alongside the plugin API. Use those exports instead of a separate
+`effect` installation so values crossing the plugin boundary share one runtime:

 ```sh
-bun add @opencode-ai/plugin@beta effect
+bun add @opencode-ai/plugin@beta
 ```

 ```ts title=".opencode/plugins/reviewer-effect.ts"
-import { Plugin } from "@opencode-ai/plugin/effect"
-import { Effect } from "effect"
+import { Effect, Plugin } from "@opencode-ai/plugin/effect"

 export default Plugin.define({
  id: "acme.reviewer-effect",
@@ -489,6 +489,6 @@ fibers, and registrations are released when the plugin reloads or unloads.
 OpenCode does not expose its private Core services to the plugin; use the
 capabilities on `ctx`.

-Typed tools can use `Schema` from `effect`. Effect and Promise plugins use the
+Typed tools can use `Schema` from `@opencode-ai/plugin/effect`. Effect and Promise plugins use the
 same `tools.add(name, tool, options?)` registration shape. Effect executors
 return an Effect and may fail with the typed tool failure channel.