fix(plugin): own effect plugin runtime

.changeset/plugin-effect-runtime.md

@@ -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.

.github/workflows/test.yml

@@ -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

bun.lock

@@ -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=="],
 

nix/hashes.json

@@ -1,8 +1,8 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-2bkzaLe/n63btVRQNhu8LXCtMZJArX1Kedi5U40l1xw=",
-    "aarch64-linux": "sha256-5Cs9M3hvDKAymo71y8oZ7jj3pEm+MI+HHhuSuV7UvtM=",
-    "aarch64-darwin": "sha256-LsJcuxE/NMu+vUFdpBKHc2z0sC0C5bRMlH1Kj+ns9dY=",
-    "x86_64-darwin": "sha256-KDjmKC3JZD8I5A7gi+dYIl0dgHVt20/DwkM9RKBWiJk="
+    "x86_64-linux": "sha256-LvDHCOm8OAZfvb0I0L6AbdOevRoQmEJnnqrSgAiNHv8=",
+    "aarch64-linux": "sha256-O0L0iHjb4cwl9xWHIna8VFHyQzoAKzfY8oMpVNayMOg=",
+    "aarch64-darwin": "sha256-ETP8FE71NqufYDUbR7tBdsMEOVQ44wLmsZBeZiSRBRY=",
+    "x86_64-darwin": "sha256-WUcoLldDriT3QxcdlnBQhuPrxDNub0EDvvZXk/pDMpY="
   }
 }

package.json

@@ -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",

packages/ai/src/protocols/anthropic-messages.ts

@@ -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
         }

packages/ai/src/protocols/gemini.ts

@@ -1,4 +1,4 @@
-import { Effect, Option, Schema } from "effect"
+import { Effect, Schema } from "effect"
 import { Tool } from "@opencode-ai/schema/tool"
 import { Route } from "../route/client.js"
 import { Auth } from "../route/auth.js"
@@ -125,7 +125,6 @@ const GeminiContentPart = Schema.Union([
   GeminiFunctionCallPart,
   GeminiFunctionResponsePart,
 ])
-const decodeGeminiContentPart = Schema.decodeUnknownOption(GeminiContentPart)
 
 const GeminiContent = Schema.Struct({
   role: optionalNull(Schema.Literals(["user", "model"])),
@@ -133,11 +132,6 @@ const GeminiContent = Schema.Struct({
 })
 type GeminiContent = Schema.Schema.Type<typeof GeminiContent>
 
-const GeminiResponseContent = Schema.Struct({
-  role: optionalNull(Schema.Literals(["user", "model"])),
-  parts: optionalNull(Schema.Array(Schema.Unknown)),
-})
-
 const GeminiSystemInstruction = Schema.Struct({
   parts: Schema.Array(Schema.Struct({ text: Schema.String })),
 })
@@ -206,7 +200,7 @@ const GeminiUsage = Schema.Struct({
 type GeminiUsage = Schema.Schema.Type<typeof GeminiUsage>
 
 const GeminiCandidate = Schema.Struct({
-  content: optionalNull(GeminiResponseContent),
+  content: optionalNull(GeminiContent),
   finishReason: optionalNull(Schema.String),
 })
 
@@ -228,7 +222,6 @@ const GeminiEvent = Schema.Struct({
 type GeminiEvent = Schema.Schema.Type<typeof GeminiEvent>
 
 interface ParserState {
-  readonly route: string
   readonly finishReason?: string
   readonly hasToolCalls: boolean
   readonly promptFeedback?: GeminiPromptFeedback
@@ -605,21 +598,7 @@ const step = (state: ParserState, event: GeminiEvent) => {
   // Supplier ids must be tracked across chunks of the same response, not just within one event's parts.
   const seenCallIds = new Set(nextState.seenCallIds)
 
-  for (const input of candidate.content.parts ?? []) {
-    if (
-      ProviderShared.isRecord(input) &&
-      !("text" in input) &&
-      !("inlineData" in input) &&
-      !("functionCall" in input) &&
-      !("functionResponse" in input)
-    )
-      continue
-    const decoded = decodeGeminiContentPart(input)
-    if (Option.isNone(decoded))
-      return Effect.fail(
-        ProviderShared.eventError(ADAPTER, `Invalid ${state.route} stream event`, ProviderShared.encodeJson(event)),
-      )
-    const part = decoded.value
+  for (const part of candidate.content.parts ?? []) {
     const signature = "thoughtSignature" in part && part.thoughtSignature ? part.thoughtSignature : undefined
     // Gemini attaches replay signatures to thought parts, visible text, or function calls;
     // each block kind must retain the signature attached to its own parts.
@@ -712,11 +691,7 @@ export const protocol = Protocol.make({
   },
   stream: {
     event: Protocol.jsonEvent(GeminiEvent),
-    initial: (request) => ({
-      route: `${request.model.provider}/${request.model.route.id}`,
-      hasToolCalls: false,
-      lifecycle: Lifecycle.initial(),
-    }),
+    initial: () => ({ hasToolCalls: false, lifecycle: Lifecycle.initial() }),
     step,
     onHalt: finish,
   },

packages/ai/src/protocols/open-responses.ts

@@ -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`)

packages/ai/src/protocols/openai-chat.ts

@@ -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),
   }
 })
 

packages/ai/src/protocols/openai-responses.ts

@@ -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`)

packages/ai/src/protocols/utils/partial-json-options.ts

@@ -1,64 +0,0 @@
-/*
- * Adapted from partial-json by the Promplate Dev Team:
- * https://github.com/promplate/partial-json-parser-js/blob/main/src/options.ts
- * Licensed under the MIT License; see partial-json.ts for the complete notice.
- */
-
-/**
- * allow partial strings like `"hello \u12` to be parsed as `"hello `
- */
-export const STR = 0b000000001
-
-/**
- * allow partial numbers like `123.` to be parsed as `123`
- */
-export const NUM = 0b000000010
-
-/**
- * allow partial arrays like `[1, 2,` to be parsed as `[1, 2]`
- */
-export const ARR = 0b000000100
-
-/**
- * allow partial objects like `{"a": 1, "b":` to be parsed as `{"a": 1}`
- */
-export const OBJ = 0b000001000
-
-/**
- * allow `nu` to be parsed as `null`
- */
-export const NULL = 0b000010000
-
-/**
- * allow `tr` to be parsed as `true`, and `fa` to be parsed as `false`
- */
-export const BOOL = 0b000100000
-
-/**
- * allow `Na` to be parsed as `NaN`
- */
-export const NAN = 0b001000000
-
-/**
- * allow `Inf` to be parsed as `Infinity`
- */
-export const INFINITY = 0b010000000
-
-/**
- * allow `-Inf` to be parsed as `-Infinity`
- */
-export const _INFINITY = 0b100000000
-
-export const INF = INFINITY | _INFINITY
-export const SPECIAL = NULL | BOOL | INF | NAN
-export const ATOM = STR | NUM | SPECIAL
-export const COLLECTION = ARR | OBJ
-export const ALL = ATOM | COLLECTION
-
-/**
- * Control what types you allow to be partially parsed.
- * The default is to allow all types to be partially parsed, which in most cases is the best option.
- */
-export const Allow = { STR, NUM, ARR, OBJ, NULL, BOOL, NAN, INFINITY, _INFINITY, INF, SPECIAL, ATOM, COLLECTION, ALL }
-
-export default Allow

packages/ai/src/protocols/utils/partial-json.ts

@@ -1,223 +0,0 @@
-/*
- * Adapted from partial-json by the Promplate Dev Team:
- * https://github.com/promplate/partial-json-parser-js
- *
- * MIT License
- *
- * Copyright (c) 2023 Promplate Dev Team
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import { Schema } from "effect"
-import { Allow } from "./partial-json-options.js"
-export * from "./partial-json-options.js"
-
-export class PartialJSON extends Error {}
-export class MalformedJSON extends Error {}
-
-const decodeJson = Schema.decodeUnknownSync(Schema.fromJsonString(Schema.Unknown))
-
-/** Parse complete or incomplete JSON, restricted by the supplied partial-value flags. */
-export function parseJSON(jsonString: string, allowPartial = Allow.ALL): unknown {
-  if (typeof jsonString !== "string") throw new TypeError(`expecting str, got ${typeof jsonString}`)
-  const input = jsonString.trim()
-  if (!input) throw new Error(`${jsonString} is empty`)
-  try {
-    return decodeJson(input)
-  } catch {}
-  return _parseJSON(input, allowPartial)
-}
-
-const _parseJSON = (jsonString: string, allow: number) => {
-  const length = jsonString.length
-  let index = 0
-
-  const markPartialJSON = (message: string): never => {
-    throw new PartialJSON(`${message} at position ${index}`)
-  }
-
-  const throwMalformedError = (message: string): never => {
-    throw new MalformedJSON(`${message} at position ${index}`)
-  }
-
-  const parseAny = (): unknown => {
-    skipBlank()
-    if (index >= length) markPartialJSON("Unexpected end of input")
-    if (jsonString[index] === '"') return parseStr()
-    if (jsonString[index] === "{") return parseObj()
-    if (jsonString[index] === "[") return parseArr()
-    if (
-      jsonString.substring(index, index + 4) === "null" ||
-      (Allow.NULL & allow && length - index < 4 && "null".startsWith(jsonString.substring(index)))
-    ) {
-      index += 4
-      return null
-    }
-    if (
-      jsonString.substring(index, index + 4) === "true" ||
-      (Allow.BOOL & allow && length - index < 4 && "true".startsWith(jsonString.substring(index)))
-    ) {
-      index += 4
-      return true
-    }
-    if (
-      jsonString.substring(index, index + 5) === "false" ||
-      (Allow.BOOL & allow && length - index < 5 && "false".startsWith(jsonString.substring(index)))
-    ) {
-      index += 5
-      return false
-    }
-    if (
-      jsonString.substring(index, index + 8) === "Infinity" ||
-      (Allow.INFINITY & allow && length - index < 8 && "Infinity".startsWith(jsonString.substring(index)))
-    ) {
-      index += 8
-      return Infinity
-    }
-    if (
-      jsonString.substring(index, index + 9) === "-Infinity" ||
-      (Allow._INFINITY & allow &&
-        1 < length - index &&
-        length - index < 9 &&
-        "-Infinity".startsWith(jsonString.substring(index)))
-    ) {
-      index += 9
-      return -Infinity
-    }
-    if (
-      jsonString.substring(index, index + 3) === "NaN" ||
-      (Allow.NAN & allow && length - index < 3 && "NaN".startsWith(jsonString.substring(index)))
-    ) {
-      index += 3
-      return NaN
-    }
-    return parseNum()
-  }
-
-  const parseStr = (): string => {
-    const start = index
-    let escape = false
-    index++
-    while (index < length && (jsonString[index] !== '"' || (escape && jsonString[index - 1] === "\\"))) {
-      escape = jsonString[index] === "\\" ? !escape : false
-      index++
-    }
-    if (jsonString.charAt(index) === '"') {
-      try {
-        return decodeJson(jsonString.substring(start, ++index - Number(escape))) as string
-      } catch (error) {
-        throwMalformedError(String(error))
-      }
-    }
-    if (Allow.STR & allow) {
-      try {
-        return decodeJson(`${jsonString.substring(start, index - Number(escape))}"`) as string
-      } catch {
-        return decodeJson(`${jsonString.substring(start, jsonString.lastIndexOf("\\"))}"`) as string
-      }
-    }
-    return markPartialJSON("Unterminated string literal")
-  }
-
-  const parseObj = (): Record<string, unknown> => {
-    index++
-    skipBlank()
-    const object: Record<string, unknown> = {}
-    try {
-      while (jsonString[index] !== "}") {
-        skipBlank()
-        if (index >= length && Allow.OBJ & allow) return object
-        const key = parseStr()
-        skipBlank()
-        index++
-        try {
-          object[key] = parseAny()
-        } catch (error) {
-          if (Allow.OBJ & allow) return object
-          throw error
-        }
-        skipBlank()
-        if (jsonString[index] === ",") index++
-      }
-    } catch {
-      if (Allow.OBJ & allow) return object
-      return markPartialJSON("Expected '}' at end of object")
-    }
-    index++
-    return object
-  }
-
-  const parseArr = (): unknown[] => {
-    index++
-    const array: unknown[] = []
-    try {
-      while (jsonString[index] !== "]") {
-        array.push(parseAny())
-        skipBlank()
-        if (jsonString[index] === ",") index++
-      }
-    } catch {
-      if (Allow.ARR & allow) return array
-      return markPartialJSON("Expected ']' at end of array")
-    }
-    index++
-    return array
-  }
-
-  const parseNum = (): unknown => {
-    if (index === 0) {
-      if (jsonString === "-") throwMalformedError("Not sure what '-' is")
-      try {
-        return decodeJson(jsonString)
-      } catch (error) {
-        if (Allow.NUM & allow) {
-          try {
-            return decodeJson(jsonString.substring(0, jsonString.lastIndexOf("e")))
-          } catch {}
-        }
-        throwMalformedError(String(error))
-      }
-    }
-
-    const start = index
-    if (jsonString[index] === "-") index++
-    while (jsonString[index] && !",]}".includes(jsonString[index])) index++
-    if (index === length && !(Allow.NUM & allow)) markPartialJSON("Unterminated number literal")
-
-    try {
-      return decodeJson(jsonString.substring(start, index))
-    } catch (error) {
-      if (jsonString.substring(start, index) === "-") markPartialJSON("Not sure what '-' is")
-      try {
-        return decodeJson(jsonString.substring(start, jsonString.lastIndexOf("e")))
-      } catch {
-        throwMalformedError(String(error))
-      }
-    }
-  }
-
-  const skipBlank = () => {
-    while (index < length && " \n\r\t".includes(jsonString[index])) index++
-  }
-
-  return parseAny()
-}
-
-export const parse = parseJSON

packages/ai/src/schema/options.ts

@@ -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 {

packages/ai/test/compile.test.ts

@@ -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,

packages/ai/test/fixtures/recordings/cloudflare-workers-ai/cloudflare-workers-ai-gpt-oss-20b-tools-tool-call.json

@@ -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 @@
       }
     }
   ]
-}
+}

packages/ai/test/partial-json.test.ts

@@ -1,43 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { Allow, MalformedJSON, PartialJSON, parse } from "../src/protocols/utils/partial-json.js"
-
-describe("partial JSON", () => {
-  test("parses complete JSON", () => {
-    expect(parse('{"key":"value","items":[1,true,null]}')).toEqual({
-      key: "value",
-      items: [1, true, null],
-    })
-
-    const object = parse('{"__proto__":{"safe":true}}') as Record<string, unknown>
-    expect(Object.hasOwn(object, "__proto__")).toBe(true)
-  })
-
-  test("parses partial strings", () => {
-    expect(parse('"hello')).toBe("hello")
-    expect(parse('"hello \\u12')).toBe("hello ")
-    expect(() => parse('"hello', ~Allow.STR)).toThrow(PartialJSON)
-  })
-
-  test("controls partial collection values independently", () => {
-    expect(parse('["', Allow.ARR)).toEqual([])
-    expect(parse('["', Allow.ARR | Allow.STR)).toEqual([""])
-    expect(parse('{"key":"', Allow.OBJ)).toEqual({})
-    expect(parse('{"key":"', Allow.OBJ | Allow.STR)).toEqual({ key: "" })
-  })
-
-  test("parses partial literals and numbers", () => {
-    expect(parse("nu", Allow.NULL)).toBeNull()
-    expect(parse("tr", Allow.BOOL)).toBe(true)
-    expect(parse("fa", Allow.BOOL)).toBe(false)
-    expect(parse("1e", Allow.NUM)).toBe(1)
-  })
-
-  test("distinguishes disallowed partial values from malformed values", () => {
-    expect(() => parse("[", Allow.STR)).toThrow(PartialJSON)
-    expect(() => parse("n", ~Allow.NULL)).toThrow(MalformedJSON)
-  })
-
-  test("rejects empty input", () => {
-    expect(() => parse("  ")).toThrow("is empty")
-  })
-})

packages/ai/test/provider/anthropic-messages.test.ts

@@ -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(

packages/ai/test/provider/gemini.test.ts

@@ -906,54 +906,6 @@ describe("Gemini route", () => {
     }),
   )
 
-  it.effect("ignores unknown response parts", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents({
-              candidates: [
-                {
-                  content: {
-                    role: "model",
-                    parts: [
-                      { text: "Hello " },
-                      { executableCode: { language: "PYTHON", code: "print('ignored')" } },
-                      { text: "world" },
-                    ],
-                  },
-                  finishReason: "STOP",
-                },
-              ],
-            }),
-          ),
-        ),
-      )
-
-      expect(response.text).toBe("Hello world")
-      expect(response.finishReason).toEqual({ normalized: "stop", raw: "STOP" })
-    }),
-  )
-
-  it.effect("rejects malformed recognized response parts", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents({
-              candidates: [{ content: { role: "model", parts: [{ text: 42 }] } }],
-            }),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(error).toBeInstanceOf(AIError)
-      expect(error.reason).toMatchObject({ _tag: "InvalidProviderOutput" })
-      expect(error.message).toContain("Invalid google/gemini stream event")
-    }),
-  )
-
   it.effect("preserves thoughtSignature for reasoning and tool-call continuation", () =>
     Effect.gen(function* () {
       const body = sseEvents({

packages/ai/test/provider/openai-chat.test.ts

@@ -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,
       })
     }),
   )

packages/ai/test/provider/openai-compatible-chat.test.ts

@@ -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,
             },
           },
         ],

packages/ai/test/provider/openai-compatible-responses.test.ts

@@ -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({

packages/ai/test/provider/openai-responses.test.ts

@@ -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(

packages/ai/test/tool-runtime.test.ts

@@ -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(

packages/app/e2e/regression/session-message-revert.spec.ts

@@ -20,47 +20,45 @@ const messages = [
   },
   { id: "msg_second", type: "user", text: "Second prompt", time: { created: 4 } },
 ] satisfies SessionMessageInfo[]
-const session = {
-  id: sessionID,
-  slug: "session-message-revert",
-  projectID,
-  directory,
-  title: "Session message revert",
-  agent: "build",
-  model: { id: "test", providerID: "opencode" },
-  version: "dev",
-  time: { created: 1, updated: 4 },
-}
-const fixture = {
-  directory,
-  project: {
-    id: projectID,
-    worktree: directory,
-    canonical: directory,
-    vcs: "git",
-    name: "session-message-revert",
-    time: { created: 1, updated: 1 },
-    sandboxes: [],
-  },
-  provider: {
-    all: [
-      {
-        id: "opencode",
-        name: "OpenCode",
-        models: { test: { id: "test", name: "Test", variants: {}, limit: { context: 200_000 } } },
-      },
-    ],
-    connected: ["opencode"],
-    default: { providerID: "opencode", modelID: "test" },
-  },
-  pageMessages: () => ({ items: messages }),
-}
 
 test("reverts directly to the selected user message", async ({ page }) => {
   const staged: { sessionID: string; messageID: string }[] = []
   await mockOpenCodeServer(page, {
-    ...fixture,
-    sessions: [session],
+    directory,
+    project: {
+      id: projectID,
+      worktree: directory,
+      canonical: directory,
+      vcs: "git",
+      name: "session-message-revert",
+      time: { created: 1, updated: 1 },
+      sandboxes: [],
+    },
+    provider: {
+      all: [
+        {
+          id: "opencode",
+          name: "OpenCode",
+          models: { test: { id: "test", name: "Test", variants: {}, limit: { context: 200_000 } } },
+        },
+      ],
+      connected: ["opencode"],
+      default: { providerID: "opencode", modelID: "test" },
+    },
+    sessions: [
+      {
+        id: sessionID,
+        slug: "session-message-revert",
+        projectID,
+        directory,
+        title: "Session message revert",
+        agent: "build",
+        model: { id: "test", providerID: "opencode" },
+        version: "dev",
+        time: { created: 1, updated: 4 },
+      },
+    ],
+    pageMessages: () => ({ items: messages }),
     onRevertStage: (input) => staged.push(input),
   })
   await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
@@ -79,19 +77,3 @@ test("reverts directly to the selected user message", async ({ page }) => {
   await expect(page.getByRole("textbox", { name: "Prompt" })).toHaveText("Second prompt")
   expect(staged).toEqual([{ sessionID, messageID: "msg_second" }])
 })
-
-test("hides revert actions in a child session", async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    ...fixture,
-    sessions: [
-      { ...session, id: "ses_parent", slug: "parent", title: "Parent session" },
-      { ...session, parentID: "ses_parent" },
-    ],
-  })
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  await expectSessionTitle(page, "Session message revert")
-
-  const message = page.locator('[data-message-id="msg_second"]')
-  await message.hover()
-  await expect(message.getByRole("button", { name: "Revert message" })).toHaveCount(0)
-})

packages/app/e2e/regression/terminal-composer-focus.spec.ts

@@ -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)

packages/app/src/composer/submit.ts

@@ -274,8 +274,15 @@ async function sendCommand(
   const request = await buildSubmissionRequest(session, value)
   await session.api.command({
     sessionID: session.id,
+    id: value.id,
     command: command.command,
-    text: command.arguments,
+    arguments: command.arguments,
+    agent: value.selection.agent,
+    model: {
+      id: value.selection.model.modelID,
+      providerID: value.selection.model.providerID,
+      variant: value.selection.variant,
+    },
     files: request.files.map((file) => ({ uri: file.uri, name: file.name, mention: file.mention })),
     agents: request.agents,
     skills: request.skills,

packages/app/src/session/commands/use-session-commands.tsx

@@ -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({

packages/app/src/session/composer/adapter.ts

@@ -37,11 +37,7 @@ export function createActiveComposerAdapter(input: {
       current: () => data.session.get(id),
       admitted: (messageID) => data.session.input.has(id, messageID) || !!data.session.message.get(id, messageID),
     }),
-    interrupt: () =>
-      server.api.session
-        .interrupt({ sessionID: id, continue: true })
-        .then(() => undefined)
-        .catch(() => undefined),
+    interrupt: () => server.api.session.interrupt({ sessionID: id, continue: true }).catch(() => undefined),
   }
   return adapter
 }

packages/app/src/session/composer/region.tsx

@@ -156,7 +156,6 @@ export function createActiveSessionRegion(input: {
     session: input.session,
     setActiveMessage: input.timeline.actions.setActiveMessage,
   })
-  const revertMessage: NonNullable<SessionUserActions["revert"]> = ({ messageID }) => revert.to(messageID)
   useComposerCommands()
   useSessionCommands({
     session: input.session,
@@ -179,13 +178,7 @@ export function createActiveSessionRegion(input: {
 
   return {
     actions: {
-      timeline: {
-        get revert() {
-          if (input.session.data.isChild()) return
-          return revertMessage
-        },
-        openAttachment,
-      } satisfies SessionUserActions,
+      timeline: { revert: ({ messageID }) => revert.to(messageID), openAttachment } satisfies SessionUserActions,
     },
     region: {
       centered: input.screen.centered,

packages/cli/src/acp/event.ts

@@ -76,7 +76,6 @@ export async function streamTurn(input: {
   readonly cwd: string
   readonly start: TurnStart
   readonly writeTextFile: boolean
-  readonly action?: boolean
   readonly submit: (signal: AbortSignal) => Promise<unknown>
   readonly control: TurnControl
   readonly childSessionUpdate?: (update: ChildSessionUpdate) => Promise<void>
@@ -346,11 +345,6 @@ export async function streamTurn(input: {
     await input.submit(control.admission.signal).catch((error) => {
       if (!control.cancelled) throw error
     })
-    if (input.action) {
-      streamController.abort()
-      await completed.catch(() => {})
-      return response(undefined, undefined, "succeeded", control.cancelled, undefined)
-    }
     if (control.cancelled) {
       await input.client.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
       if (!started) {

packages/cli/src/acp/service.ts

@@ -326,7 +326,6 @@ export function make(input: { readonly client: OpenCodeClient; readonly connecti
         cwd: state.cwd,
         start: prepared.start,
         writeTextFile: capabilities.writeTextFile,
-        action: prepared.command !== undefined,
         control,
         connectionSignal: input.connection.signal,
         sessionSignal: state.abort.signal,
@@ -378,8 +377,9 @@ async function submitPrompt(client: OpenCodeClient, session: Attached, prompt: P
     return client.session.command(
       {
         sessionID: session.id,
+        id: prompt.start.id,
         command: prompt.command.name,
-        text: prompt.slash?.args ?? "",
+        arguments: prompt.slash?.args,
         files: prompt.files,
         delivery: "steer",
       },

packages/cli/src/commands/commands.ts

@@ -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 = {

packages/cli/src/framework/runtime.ts

@@ -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)
           }),

packages/cli/src/node/plugin-runtime.effect.ts

@@ -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 },
 }

packages/cli/src/node/plugin-runtime.promise.ts

@@ -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,
 }

packages/cli/src/services/standalone.ts

@@ -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",
   })

packages/cli/src/services/updater-action.ts

@@ -1,5 +1,5 @@
 export type Policy = boolean | "notify"
-export type Action = "none" | "notify" | "upgrade"
+export type Action = "none" | "upgrade"
 
 const maximumComponent = "9007199254740991"
 const versionPattern =
@@ -12,7 +12,7 @@ export function action(current: string, latest: string, policy: Policy): Action
   if (!currentVersion || !latestVersion || sameRelease(currentVersion, latestVersion)) return "none"
   // Major upgrades are never installed automatically.
   if (currentVersion.major !== latestVersion.major) return "none"
-  return policy === "notify" ? "notify" : "upgrade"
+  return "upgrade"
 }
 
 function parseReleaseVersion(input: string) {

packages/cli/src/services/updater.test.ts

@@ -12,12 +12,8 @@ describe("updater", () => {
   test("automatically updates patches and minors", () => {
     expect(action("1.2.3", "1.2.4", true)).toBe("upgrade")
     expect(action("1.2.3", "1.3.0", true)).toBe("upgrade")
-  })
-
-  test("reports patches and minors without automatically installing them", () => {
-    expect(action("1.2.3", "1.2.4", "notify")).toBe("notify")
-    expect(action("1.2.3", "1.3.0", "notify")).toBe("notify")
-    expect(action("1.2.3", "1.2.3", "notify")).toBe("none")
+    expect(action("1.2.3", "1.2.4", "notify")).toBe("upgrade")
+    expect(action("1.2.3", "1.3.0", "notify")).toBe("upgrade")
   })
 
   test("skips when autoupdate is disabled", () => {

packages/cli/src/services/updater.ts

@@ -162,8 +162,6 @@ export const layer = Layer.effect(
           })
           const next = action(OPENCODE_VERSION, version, policy)
           if (next === "none") return yield* Effect.logInfo("update check done", { action: "up-to-date" })
-          if (next === "notify")
-            return yield* Effect.logInfo("OpenCode update available", { current: OPENCODE_VERSION, latest: version })
           const detected = yield* method()
           if (!detected) return yield* Effect.logWarning("automatic update skipped: installation method not found")
           yield* upgrade(detected, version)

packages/cli/test/acp/event-behavior.test.ts

@@ -601,7 +601,6 @@ describe("acp event behavior", () => {
       },
       onInterrupt({ sessionID, send }) {
         send(durableEvent("session.execution.interrupted", { sessionID, reason: "user" }))
-        return true
       },
     })
     const result = streamTurn({
@@ -625,7 +624,7 @@ describe("acp event behavior", () => {
       await withTimeout(submitted.promise, "cancel test prompt was not admitted")
       control.cancelled = true
       control.admission.abort()
-      expect(await fixture.client.session.interrupt({ sessionID: "ses_cancel" })).toEqual({ interrupted: true })
+      await fixture.client.session.interrupt({ sessionID: "ses_cancel" })
 
       const response = await withTimeout(result, "cancelled turn did not terminate")
       expect(response).toMatchObject({ stopReason: "cancelled" })

packages/cli/test/acp/event.test.ts

@@ -121,42 +121,3 @@ test("acp prompt resolves after ordered turn updates", async () => {
     controller.enqueue(encoder.encode(`data: ${JSON.stringify(event)}\n\n`))
   }
 })
-
-test("acp action resolves without prompt lifecycle events", async () => {
-  const encoder = new TextEncoder()
-  const server = Bun.serve({
-    port: 0,
-    fetch(request) {
-      if (new URL(request.url).pathname !== "/api/event") return new Response(null, { status: 404 })
-      return new Response(
-        new ReadableStream<Uint8Array>({
-          start(controller) {
-            controller.enqueue(encoder.encode(`data: ${JSON.stringify({ type: "server.connected", data: {} })}\n\n`))
-          },
-        }),
-        { headers: { "content-type": "text/event-stream" } },
-      )
-    },
-  })
-
-  try {
-    const response = await streamTurn({
-      client: OpenCode.make({ baseUrl: server.url.toString() }),
-      connection: {
-        sessionUpdate: async () => {},
-        requestPermission: async () => ({ outcome: { outcome: "cancelled" } }),
-      },
-      sessionID: "ses_test",
-      cwd: "/workspace",
-      start: { type: "input", id: "msg_action" },
-      writeTextFile: false,
-      action: true,
-      control: { cancelled: false, admission: new AbortController() },
-      submit: async () => {},
-    })
-
-    expect(response).toMatchObject({ stopReason: "end_turn" })
-  } finally {
-    await server.stop(true)
-  }
-})

packages/cli/test/acp/service-fixture.ts

@@ -87,6 +87,7 @@ export const planAgent = {
 export const reviewCommand = {
   name: "review",
   description: "Review changes",
+  template: "",
 } satisfies CommandInfo
 
 export const verifySkill = {

packages/cli/test/acp/service-usage.test.ts

@@ -12,7 +12,13 @@ describe("acp service prompt routing and usage", () => {
           return Response.json({ data: makeSession("ses_routes") })
         }
         if (request.method === "POST" && request.path === "/api/session/ses_routes/command") {
-          return new Response(null, { status: 204 })
+          const id = requestID(request)
+          completeTurn(context, "ses_routes", {
+            id: `evt_${id}`,
+            type: "session.inbox.delivered",
+            data: { sessionID: "ses_routes", inboxID: id },
+          })
+          return Response.json({ data: {} })
         }
         if (request.method === "POST" && request.path === "/api/session/ses_routes/skill") {
           const id = requestID(request)
@@ -59,8 +65,9 @@ describe("acp service prompt routing and usage", () => {
     const skill = fixture.requests.find((request) => request.path === "/api/session/ses_routes/skill")
     const compact = fixture.requests.find((request) => request.path === "/api/session/ses_routes/compact")
     expect(command?.body).toMatchObject({
+      id: expect.any(String),
       command: "review",
-      text: "now",
+      arguments: "now",
       files: [],
       delivery: "steer",
     })

packages/cli/test/acp/sse-fixture.ts

@@ -20,7 +20,7 @@ type FixtureOptions = {
   readonly onInterrupt?: (input: {
     readonly sessionID: string
     readonly send: (event: unknown) => void
-  }) => boolean | Promise<boolean>
+  }) => void | Promise<void>
   readonly onPermissionReply?: (input: {
     readonly sessionID: string
     readonly requestID: string
@@ -152,9 +152,8 @@ export function createSseFixture(options: FixtureOptions = {}) {
 
       const interrupt = /^\/api\/session\/([^/]+)\/interrupt$/.exec(url.pathname)
       if (interrupt?.[1]) {
-        const interrupted =
-          (await options.onInterrupt?.({ sessionID: decodeURIComponent(interrupt[1]), send })) ?? false
-        return Response.json({ interrupted })
+        await options.onInterrupt?.({ sessionID: decodeURIComponent(interrupt[1]), send })
+        return new Response(null, { status: 204 })
       }
 
       return new Response(null, { status: 404 })

packages/cli/vite.node.config.ts

@@ -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`

packages/client/src/effect/api/api.ts

@@ -255,14 +255,18 @@ export type SessionPromptOperation<E = never> = (input: SessionPromptInput) => E
 
 export type SessionCommandInput = {
   readonly sessionID: Session.ID
+  readonly id?: SessionMessage.ID | undefined
   readonly command: string
-  readonly text: string
+  readonly arguments?: string | undefined
+  readonly agent?: Agent.ID | undefined
+  readonly model?: Model.Ref | undefined
   readonly files?: ReadonlyArray<PromptInput.FileAttachment> | undefined
   readonly agents?: ReadonlyArray<AgentAttachment> | undefined
   readonly skills?: ReadonlyArray<PromptInput.SkillAttachment> | undefined
   readonly delivery?: SessionInbox.Delivery | undefined
+  readonly resume?: boolean | undefined
 }
-export type SessionCommandOutput = void
+export type SessionCommandOutput = SessionInbox.User
 export type SessionCommandOperation<E = never> = (input: SessionCommandInput) => Effect.Effect<SessionCommandOutput, E>
 
 export type SessionSkillInput = {
@@ -998,7 +1002,7 @@ export type SessionLogOutput =
 export type SessionLogOperation<E = never> = (input: SessionLogInput) => Stream.Stream<SessionLogOutput, E>
 
 export type SessionInterruptInput = { readonly sessionID: Session.ID; readonly continue?: boolean | undefined }
-export type SessionInterruptOutput = { readonly interrupted: boolean }
+export type SessionInterruptOutput = void
 export type SessionInterruptOperation<E = never> = (
   input: SessionInterruptInput,
 ) => Effect.Effect<SessionInterruptOutput, E>
@@ -1108,7 +1112,11 @@ export interface ModelApi<E = never> {
   readonly default: ModelDefaultOperation<E>
 }
 
-export type GenerateTextInput = { readonly prompt: string; readonly model?: Model.Ref | undefined }
+export type GenerateTextInput = {
+  readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+  readonly prompt: string
+  readonly model?: Model.Ref | undefined
+}
 export type GenerateTextOutput = { readonly text: string }
 export type GenerateTextOperation<E = never> = (input: GenerateTextInput) => Effect.Effect<GenerateTextOutput, E>
 
@@ -1691,23 +1699,6 @@ export interface WorktreeApi<E = never> {
   readonly refresh: WorktreeRefreshOperation<E>
 }
 
-export type WorkspaceCreateInput = { readonly id?: Workspace.ID | undefined; readonly provider: string }
-export type WorkspaceCreateOutput = Workspace.ID
-export type WorkspaceCreateOperation<E = never> = (
-  input: WorkspaceCreateInput,
-) => Effect.Effect<WorkspaceCreateOutput, E>
-
-export type WorkspaceDestroyInput = { readonly workspaceID: Workspace.ID }
-export type WorkspaceDestroyOutput = Workspace.DestroyResult
-export type WorkspaceDestroyOperation<E = never> = (
-  input: WorkspaceDestroyInput,
-) => Effect.Effect<WorkspaceDestroyOutput, E>
-
-export interface WorkspaceApi<E = never> {
-  readonly create: WorkspaceCreateOperation<E>
-  readonly destroy: WorkspaceDestroyOperation<E>
-}
-
 export type VcsGetInput = {
   readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
 }
@@ -1825,7 +1816,6 @@ export interface AppApi<E = never> {
   readonly shell: ShellApi<E>
   readonly reference: ReferenceApi<E>
   readonly worktree: WorktreeApi<E>
-  readonly workspace: WorkspaceApi<E>
   readonly vcs: VcsApi<E>
   readonly debug: DebugApi<E>
   readonly migration: MigrationApi<E>

packages/client/src/effect/generated/client.ts

@@ -214,10 +214,6 @@ import type {
   WorktreeRemoveOutput,
   WorktreeRefreshInput,
   WorktreeRefreshOutput,
-  WorkspaceCreateInput,
-  WorkspaceCreateOutput,
-  WorkspaceDestroyInput,
-  WorkspaceDestroyOutput,
   VcsGetInput,
   VcsGetOutput,
   VcsStatusInput,
@@ -444,14 +440,21 @@ const EndpointSessionCommand = (raw: RawClient["server.session"]) => (input: Ses
     raw["session.command"]({
       params: { sessionID: input["sessionID"] },
       payload: {
+        id: input["id"],
         command: input["command"],
-        text: input["text"],
+        arguments: input["arguments"],
+        agent: input["agent"],
+        model: input["model"],
         files: input["files"],
         agents: input["agents"],
         skills: input["skills"],
         delivery: input["delivery"],
+        resume: input["resume"],
       },
-    }).pipe(Effect.mapError(mapClientError)),
+    }).pipe(
+      Effect.mapError(mapClientError),
+      Effect.map((value) => value.data),
+    ),
   )
 
 const EndpointSessionSkill = (raw: RawClient["server.session"]) => (input: SessionSkillInput) =>
@@ -721,7 +724,10 @@ const adaptGroupModel = (raw: RawClient["server.model"]) => ({
 
 const EndpointGenerateText = (raw: RawClient["server.generate"]) => (input: GenerateTextInput) =>
   preserveEffect<GenerateTextOutput>()(
-    raw["generate.text"]({ payload: { prompt: input["prompt"], model: input["model"] } }).pipe(
+    raw["generate.text"]({
+      query: { location: input["location"] },
+      payload: { prompt: input["prompt"], model: input["model"] },
+    }).pipe(
       Effect.mapError(mapClientError),
       Effect.map((value) => value.data),
     ),
@@ -1272,24 +1278,6 @@ const adaptGroupWorktree = (raw: RawClient["server.worktree"]) => ({
   refresh: EndpointWorktreeRefresh(raw),
 })
 
-const EndpointWorkspaceCreate = (raw: RawClient["server.workspace"]) => (input: WorkspaceCreateInput) =>
-  preserveEffect<WorkspaceCreateOutput>()(
-    raw["workspace.create"]({ payload: { id: input["id"], provider: input["provider"] } }).pipe(
-      Effect.mapError(mapClientError),
-      Effect.map((value) => value.data),
-    ),
-  )
-
-const EndpointWorkspaceDestroy = (raw: RawClient["server.workspace"]) => (input: WorkspaceDestroyInput) =>
-  preserveEffect<WorkspaceDestroyOutput>()(
-    raw["workspace.destroy"]({ params: { workspaceID: input["workspaceID"] } }).pipe(Effect.mapError(mapClientError)),
-  )
-
-const adaptGroupWorkspace = (raw: RawClient["server.workspace"]) => ({
-  create: EndpointWorkspaceCreate(raw),
-  destroy: EndpointWorkspaceDestroy(raw),
-})
-
 const EndpointVcsGet = (raw: RawClient["server.vcs"]) => (input?: VcsGetInput) =>
   preserveEffect<VcsGetOutput>()(
     raw["vcs.get"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError)),
@@ -1380,7 +1368,6 @@ const adaptClient = (raw: RawClient) => ({
   shell: adaptGroupShell(raw["server.shell"]),
   reference: adaptGroupReference(raw["server.reference"]),
   worktree: adaptGroupWorktree(raw["server.worktree"]),
-  workspace: adaptGroupWorkspace(raw["server.workspace"]),
   vcs: adaptGroupVcs(raw["server.vcs"]),
   debug: adaptGroupDebug(raw["server.debug"]),
   migration: adaptGroupMigration(raw["server.migration"]),

packages/client/src/promise/generated/client.ts

@@ -210,10 +210,6 @@ import type {
   WorktreeRemoveOutput,
   WorktreeRefreshInput,
   WorktreeRefreshOutput,
-  WorkspaceCreateInput,
-  WorkspaceCreateOutput,
-  WorkspaceDestroyInput,
-  WorkspaceDestroyOutput,
   VcsGetInput,
   VcsGetOutput,
   VcsStatusInput,
@@ -635,24 +631,28 @@ export function make(options: ClientOptions) {
           requestOptions,
         ).then((value) => value.data),
       command: (input: SessionCommandInput, requestOptions?: RequestOptions) =>
-        request<SessionCommandOutput>(
+        request<{ readonly data: SessionCommandOutput }>(
           {
             method: "POST",
             path: `/api/session/${encodeURIComponent(input.sessionID)}/command`,
             body: {
+              id: input["id"],
               command: input["command"],
-              text: input["text"],
+              arguments: input["arguments"],
+              agent: input["agent"],
+              model: input["model"],
               files: input["files"],
               agents: input["agents"],
               skills: input["skills"],
               delivery: input["delivery"],
+              resume: input["resume"],
             },
-            successStatus: 204,
-            declaredStatuses: [404, 500, 400, 401],
-            empty: true,
+            successStatus: 200,
+            declaredStatuses: [409, 400, 404, 500, 401],
+            empty: false,
           },
           requestOptions,
-        ),
+        ).then((value) => value.data),
       skill: (input: SessionSkillInput, requestOptions?: RequestOptions) =>
         request<SessionSkillOutput>(
           {
@@ -880,9 +880,9 @@ export function make(options: ClientOptions) {
             method: "POST",
             path: `/api/session/${encodeURIComponent(input.sessionID)}/interrupt`,
             query: { continue: input["continue"] },
-            successStatus: 200,
+            successStatus: 204,
             declaredStatuses: [404, 400, 401],
-            empty: false,
+            empty: true,
           },
           requestOptions,
         ),
@@ -979,6 +979,7 @@ export function make(options: ClientOptions) {
           {
             method: "POST",
             path: `/api/generate`,
+            query: { location: input["location"] },
             body: { prompt: input["prompt"], model: input["model"] },
             successStatus: 200,
             declaredStatuses: [400, 503, 401],
@@ -1769,31 +1770,6 @@ export function make(options: ClientOptions) {
           requestOptions,
         ),
     },
-    workspace: {
-      create: (input: WorkspaceCreateInput, requestOptions?: RequestOptions) =>
-        request<{ readonly data: WorkspaceCreateOutput }>(
-          {
-            method: "POST",
-            path: `/api/workspace`,
-            body: { id: input["id"], provider: input["provider"] },
-            successStatus: 200,
-            declaredStatuses: [409, 404, 401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ).then((value) => value.data),
-      destroy: (input: WorkspaceDestroyInput, requestOptions?: RequestOptions) =>
-        request<WorkspaceDestroyOutput>(
-          {
-            method: "DELETE",
-            path: `/api/workspace/${encodeURIComponent(input.workspaceID)}`,
-            successStatus: 200,
-            declaredStatuses: [500, 401, 400],
-            empty: false,
-          },
-          requestOptions,
-        ),
-    },
     vcs: {
       get: (input?: VcsGetInput, requestOptions?: RequestOptions) =>
         request<VcsGetOutput>(

packages/client/src/promise/generated/types.ts

@@ -176,8 +176,6 @@ export type ToolFileContent1 = { type: "file"; uri: string; mime: string; name?:
 
 export type EventLogSynced = { type: "log.synced"; aggregateID: string; seq?: number }
 
-export type SessionInterruptResponse = { interrupted: boolean }
-
 export type ModelReasoningField = "reasoning" | "reasoning_content" | "reasoning_text" | (string & {})
 
 export type ModelMaxTokensField = "max_completion_tokens" | "max_tokens"
@@ -313,8 +311,6 @@ export type PermissionSavedInfo = { id: string; projectID: string; action: strin
 
 export type FileSystemEntry = { path: string; type: "file" | "directory" }
 
-export type CommandInfo = { name: string; description?: string }
-
 export type SkillInfo = {
   id: string
   name: string
@@ -382,8 +378,6 @@ export type WorktreeDirectory = { directory: string; strategy?: string }
 
 export type WorktreeInfo = { directory: string }
 
-export type WorkspaceDestroyResult = { destroyed: boolean }
-
 export type VcsBranch = { current?: string; default?: string }
 
 export type VcsFileStatus = {
@@ -397,6 +391,15 @@ export type WebSearchProvider = { id: string; name: string }
 
 export type WebSearchResult = { url: string; title?: string; content?: string; time: { published?: number } }
 
+export type CommandInfo = {
+  name: string
+  template: string
+  description?: string
+  agent?: string
+  model?: ModelRef
+  subtask?: boolean
+}
+
 export type ProviderRequest = {
   settings: ProviderSettings
   headers: { [x: string]: string }
@@ -2217,13 +2220,13 @@ export type CommandNotFoundError = {
 export const isCommandNotFoundError = (value: unknown): value is CommandNotFoundError =>
   typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "CommandNotFoundError"
 
-export type CommandExecutionError = {
-  readonly _tag: "CommandExecutionError"
+export type CommandEvaluationError = {
+  readonly _tag: "CommandEvaluationError"
   readonly command: string
   readonly message: string
 }
-export const isCommandExecutionError = (value: unknown): value is CommandExecutionError =>
-  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "CommandExecutionError"
+export const isCommandEvaluationError = (value: unknown): value is CommandEvaluationError =>
+  typeof value === "object" && value !== null && "_tag" in value && value["_tag"] === "CommandEvaluationError"
 
 export type SkillNotFoundError = {
   readonly _tag: "SkillNotFoundError"
@@ -3634,9 +3637,35 @@ export type SessionPromptOutput = { data: SessionInboxUser }["data"]
 
 export type SessionCommandInput = {
   readonly sessionID: { readonly sessionID: string }["sessionID"]
+  readonly id?: {
+    readonly id?: string | null
+    readonly command: string
+    readonly arguments?: string | null
+    readonly agent?: string | null
+    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
+    readonly files?: ReadonlyArray<{
+      readonly uri: string
+      readonly name?: string
+      readonly description?: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly agents?: ReadonlyArray<{
+      readonly name: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly skills?: ReadonlyArray<{
+      readonly id: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly delivery?: ("steer" | "queue") | null
+    readonly resume?: boolean | null
+  }["id"]
   readonly command: {
+    readonly id?: string | null
     readonly command: string
-    readonly text: string
+    readonly arguments?: string | null
+    readonly agent?: string | null
+    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3652,10 +3681,14 @@ export type SessionCommandInput = {
       readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
     }>
     readonly delivery?: ("steer" | "queue") | null
+    readonly resume?: boolean | null
   }["command"]
-  readonly text: {
+  readonly arguments?: {
+    readonly id?: string | null
     readonly command: string
-    readonly text: string
+    readonly arguments?: string | null
+    readonly agent?: string | null
+    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3671,10 +3704,60 @@ export type SessionCommandInput = {
       readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
     }>
     readonly delivery?: ("steer" | "queue") | null
-  }["text"]
+    readonly resume?: boolean | null
+  }["arguments"]
+  readonly agent?: {
+    readonly id?: string | null
+    readonly command: string
+    readonly arguments?: string | null
+    readonly agent?: string | null
+    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
+    readonly files?: ReadonlyArray<{
+      readonly uri: string
+      readonly name?: string
+      readonly description?: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly agents?: ReadonlyArray<{
+      readonly name: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly skills?: ReadonlyArray<{
+      readonly id: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly delivery?: ("steer" | "queue") | null
+    readonly resume?: boolean | null
+  }["agent"]
+  readonly model?: {
+    readonly id?: string | null
+    readonly command: string
+    readonly arguments?: string | null
+    readonly agent?: string | null
+    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
+    readonly files?: ReadonlyArray<{
+      readonly uri: string
+      readonly name?: string
+      readonly description?: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly agents?: ReadonlyArray<{
+      readonly name: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly skills?: ReadonlyArray<{
+      readonly id: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly delivery?: ("steer" | "queue") | null
+    readonly resume?: boolean | null
+  }["model"]
   readonly files?: {
+    readonly id?: string | null
     readonly command: string
-    readonly text: string
+    readonly arguments?: string | null
+    readonly agent?: string | null
+    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3690,10 +3773,14 @@ export type SessionCommandInput = {
       readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
     }>
     readonly delivery?: ("steer" | "queue") | null
+    readonly resume?: boolean | null
   }["files"]
   readonly agents?: {
+    readonly id?: string | null
     readonly command: string
-    readonly text: string
+    readonly arguments?: string | null
+    readonly agent?: string | null
+    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3709,10 +3796,14 @@ export type SessionCommandInput = {
       readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
     }>
     readonly delivery?: ("steer" | "queue") | null
+    readonly resume?: boolean | null
   }["agents"]
   readonly skills?: {
+    readonly id?: string | null
     readonly command: string
-    readonly text: string
+    readonly arguments?: string | null
+    readonly agent?: string | null
+    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3728,10 +3819,14 @@ export type SessionCommandInput = {
       readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
     }>
     readonly delivery?: ("steer" | "queue") | null
+    readonly resume?: boolean | null
   }["skills"]
   readonly delivery?: {
+    readonly id?: string | null
     readonly command: string
-    readonly text: string
+    readonly arguments?: string | null
+    readonly agent?: string | null
+    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3747,10 +3842,34 @@ export type SessionCommandInput = {
       readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
     }>
     readonly delivery?: ("steer" | "queue") | null
+    readonly resume?: boolean | null
   }["delivery"]
+  readonly resume?: {
+    readonly id?: string | null
+    readonly command: string
+    readonly arguments?: string | null
+    readonly agent?: string | null
+    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
+    readonly files?: ReadonlyArray<{
+      readonly uri: string
+      readonly name?: string
+      readonly description?: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly agents?: ReadonlyArray<{
+      readonly name: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly skills?: ReadonlyArray<{
+      readonly id: string
+      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
+    }>
+    readonly delivery?: ("steer" | "queue") | null
+    readonly resume?: boolean | null
+  }["resume"]
 }
 
-export type SessionCommandOutput = void
+export type SessionCommandOutput = { data: SessionInboxUser }["data"]
 
 export type SessionSkillInput = {
   readonly sessionID: { readonly sessionID: string }["sessionID"]
@@ -3934,7 +4053,7 @@ export type SessionInterruptInput = {
   readonly continue?: { readonly continue?: boolean | undefined }["continue"]
 }
 
-export type SessionInterruptOutput = SessionInterruptResponse
+export type SessionInterruptOutput = void
 
 export type SessionBackgroundInput = { readonly sessionID: { readonly sessionID: string }["sessionID"] }
 
@@ -4005,6 +4124,9 @@ export type ModelDefaultOutput = {
 }
 
 export type GenerateTextInput = {
+  readonly location?: {
+    readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined
+  }["location"]
   readonly prompt: {
     readonly prompt: string
     readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
@@ -5630,17 +5752,6 @@ export type WorktreeRefreshInput = { readonly projectID: { readonly projectID: s
 
 export type WorktreeRefreshOutput = void
 
-export type WorkspaceCreateInput = {
-  readonly id?: { readonly id?: string | undefined; readonly provider: string }["id"]
-  readonly provider: { readonly id?: string | undefined; readonly provider: string }["provider"]
-}
-
-export type WorkspaceCreateOutput = { data: string }["data"]
-
-export type WorkspaceDestroyInput = { readonly workspaceID: { readonly workspaceID: string }["workspaceID"] }
-
-export type WorkspaceDestroyOutput = WorkspaceDestroyResult
-
 export type VcsGetInput = {
   readonly location?: {
     readonly location?: { readonly directory?: string | undefined; readonly workspace?: string | undefined } | undefined

packages/client/test/effect.test.ts

@@ -172,14 +172,7 @@ test("session methods retain decoded Effect inputs and outputs", async () => {
       return Effect.succeed(HttpClientResponse.fromWeb(request, Response.json(session)))
     }
     if (request.method === "POST") {
-      return Effect.succeed(
-        HttpClientResponse.fromWeb(
-          request,
-          request.url.includes("/interrupt")
-            ? Response.json({ interrupted: true })
-            : new Response(null, { status: 204 }),
-        ),
-      )
+      return Effect.succeed(HttpClientResponse.fromWeb(request, new Response(null, { status: 204 })))
     }
     return Effect.succeed(
       HttpClientResponse.fromWeb(request, Response.json({ data: [session.data], cursor: { next: "next" } })),
@@ -209,12 +202,12 @@ test("session methods retain decoded Effect inputs and outputs", async () => {
     const log = yield* client.session
       .log({ sessionID: Session.ID.make("ses_test"), after: Event.Seq.make(0) })
       .pipe(Stream.runCollect)
-    const interrupted = yield* client.session.interrupt({ sessionID: Session.ID.make("ses_test") })
+    yield* client.session.interrupt({ sessionID: Session.ID.make("ses_test") })
     const message = yield* client.session.message({
       sessionID: Session.ID.make("ses_test"),
       messageID: SessionMessage.ID.make("msg_model"),
     })
-    return { page, active, created, admitted, context, log, interrupted, message }
+    return { page, active, created, admitted, context, log, message }
   }).pipe(Effect.provideService(HttpClient.HttpClient, httpClient), Effect.runPromise)
 
   const listed = result.page.data[0]
@@ -223,7 +216,6 @@ test("session methods retain decoded Effect inputs and outputs", async () => {
   expect(DateTime.toEpochMillis(listed.time.idle)).toBe(1_717_171_717_002)
   expect(DateTime.toEpochMillis(listed.time.viewed)).toBe(1_717_171_717_001)
   expect(result.active).toEqual({ ses_test: { type: "running" } })
-  expect(result.interrupted).toEqual({ interrupted: true })
   expect(Object.getPrototypeOf(result.page.data[0])).toBe(Object.prototype)
   expect(Object.getPrototypeOf(result.created)).toBe(Object.prototype)
   expect(result.created.id).toBe("ses_test")

packages/client/test/promise.test.ts

@@ -30,7 +30,6 @@ test("exposes every standard HTTP API group", () => {
     "question",
     "reference",
     "worktree",
-    "workspace",
     "vcs",
     "debug",
     "migration",
@@ -82,21 +81,6 @@ test("config.get returns ordered config entries for a location", async () => {
   expect(request?.url).toBe("http://localhost:3000/api/config?location%5Bdirectory%5D=%2Ftmp%2Fproject")
 })
 
-test("generate.text uses the locationless public contract", async () => {
-  let request: Request | undefined
-  const client = OpenCode.make({
-    baseUrl: "http://localhost:3000",
-    fetch: async (input, init) => {
-      request = input instanceof Request ? input : new Request(input, init)
-      return Response.json({ data: { text: "pong" } })
-    },
-  })
-
-  expect(await client.generate.text({ prompt: "ping" })).toEqual({ text: "pong" })
-  expect(request?.url).toBe("http://localhost:3000/api/generate")
-  expect(await request?.json()).toEqual({ prompt: "ping" })
-})
-
 test("websearch.query uses the public HTTP contract", async () => {
   let request: Request | undefined
   const client = OpenCode.make({
@@ -296,21 +280,6 @@ test("worktree methods use the global project contract", async () => {
   expect(await requests[2]?.json()).toEqual({ directory: "/tmp/worktrees/api", force: false })
 })
 
-test("workspace.destroy returns the transition result", async () => {
-  let request: Request | undefined
-  const client = OpenCode.make({
-    baseUrl: "http://localhost:3000",
-    fetch: async (input, init) => {
-      request = input instanceof Request ? input : new Request(input, init)
-      return Response.json({ destroyed: false })
-    },
-  })
-
-  expect(await client.workspace.destroy({ workspaceID: "wrk_missing" })).toEqual({ destroyed: false })
-  expect(request?.method).toBe("DELETE")
-  expect(request?.url).toBe("http://localhost:3000/api/workspace/wrk_missing")
-})
-
 test("shell list and remove use the public HTTP contract", async () => {
   const requests: Array<{ method: string; url: string }> = []
   const shell = {
@@ -547,7 +516,6 @@ test("session methods use the public HTTP contract", async () => {
       if (url.includes("/message/")) return Response.json({ data: modelSwitchedMessage })
       if (url.endsWith("/api/session/active")) return Response.json({ data: { ses_test: { type: "running" } } })
       if (init?.method === "POST" && url.endsWith("/api/session")) return Response.json(session)
-      if (url.includes("/interrupt")) return Response.json({ interrupted: true })
       if (init?.method === "POST") return new Response(null, { status: 204 })
       return Response.json({ data: [session.data], cursor: { next: "next" } })
     },
@@ -579,7 +547,7 @@ test("session methods use the public HTTP contract", async () => {
   const context = await client.session.context({ sessionID: "ses_test" })
   const log = []
   for await (const item of client.session.log({ sessionID: "ses_test", after: 0 })) log.push(item)
-  const interrupted = await client.session.interrupt({ sessionID: "ses_test", continue: true })
+  await client.session.interrupt({ sessionID: "ses_test", continue: true })
   const message = await client.session.message({ sessionID: "ses_test", messageID: "msg_model" })
 
   expect(page.cursor.next).toBe("next")
@@ -588,7 +556,6 @@ test("session methods use the public HTTP contract", async () => {
   expect(created.id).toBe("ses_test")
   expect(admitted.id).toBe("msg_test")
   expect(generated.text).toBe("A transient answer")
-  expect(interrupted).toEqual({ interrupted: true })
   expect(synthetic).toMatchObject({ type: "synthetic", data: { text: "Completed" }, delivery: "queue" })
   expect(context).toEqual([])
   expect(log).toEqual([modelSwitchedEvent, synced])

packages/core/script/build.ts

@@ -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")

packages/core/src/command.ts

@@ -1,32 +1,26 @@
 export * as Command from "./command.js"
 
-import { Command } from "@opencode-ai/schema/command"
-import type { PromptInput } from "@opencode-ai/schema/prompt-input"
-import type { Session } from "@opencode-ai/schema/session"
-import type { SessionInbox } from "@opencode-ai/schema/session-inbox"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
-import { Context, Effect, Layer, Schema } from "effect"
-import { Bus } from "./bus.js"
+import { Context, Effect, Layer, Schema, Types } from "effect"
+import { Command } from "@opencode-ai/schema/command"
 import { State } from "./state.js"
+import { MCP } from "./mcp/index.js"
+import { Bus } from "./bus.js"
+import { AppProcess } from "@opencode-ai/util/process"
+import { ChildProcess } from "effect/unstable/process"
+import { Location } from "./location.js"
+import { ShellSelect } from "./shell/select.js"
 
 export const Info = Command.Info
 export type Info = Command.Info
 export { Event } from "@opencode-ai/schema/command"
 
-export interface Invocation {
-  readonly sessionID: Session.ID
-  readonly prompt: PromptInput.Prompt
-  readonly delivery: SessionInbox.Delivery
+export type Evaluation = {
+  readonly text: string
 }
 
-export interface Definition {
-  readonly name: string
-  readonly description?: string
-  readonly execute: (input: Invocation) => Effect.Effect<void, unknown>
-}
-
-export type Draft = {
-  add: (definition: Definition) => void
+export type Data = {
+  commands: Map<string, Types.DeepMutable<Info>>
 }
 
 export class NotFoundError extends Schema.TaggedError<NotFoundError>()("Command.NotFoundError", {
@@ -34,73 +28,234 @@ export class NotFoundError extends Schema.TaggedError<NotFoundError>()("Command.
   message: Schema.String,
 }) {}
 
-export class ExecutionError extends Schema.TaggedError<ExecutionError>()("Command.ExecutionError", {
+export class EvaluationError extends Schema.TaggedError<EvaluationError>()("Command.EvaluationError", {
   command: Schema.String,
   message: Schema.String,
 }) {}
 
+export type Draft = {
+  list: () => readonly Info[]
+  get: (name: string) => Info | undefined
+  update: (name: string, update: (command: Types.DeepMutable<Info>) => void) => void
+  remove: (name: string) => void
+}
+
 export interface Interface extends State.Transformable<Draft> {
   readonly get: (name: string) => Effect.Effect<Info | undefined>
   readonly list: () => Effect.Effect<Info[]>
-  readonly execute: (input: {
+  readonly evaluate: (input: {
     readonly name: string
-    readonly invocation: Invocation
-  }) => Effect.Effect<void, NotFoundError | ExecutionError>
+    readonly arguments?: string
+  }) => Effect.Effect<Evaluation, NotFoundError | EvaluationError>
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/Command") {}
 
-export const layer = Layer.effect(
-  Service,
-  Effect.gen(function* () {
-    const bus = yield* Bus.Service
-    const state = State.create<Map<string, Definition>, Draft>({
-      name: "command",
-      initial: () => new Map(),
-      draft: (draft) => ({
-        add: (definition) => draft.set(definition.name, definition),
-      }),
-      finalize: () => bus.publish(Command.Event.Updated, {}).pipe(Effect.asVoid),
-    })
-    const info = (definition: Definition) =>
-      Info.make({
-        name: definition.name,
-        description: definition.description,
+const layer = () =>
+  Layer.effect(
+    Service,
+    Effect.gen(function* () {
+      const mcp = yield* MCP.Service
+      const bus = yield* Bus.Service
+      const processes = yield* AppProcess.Service
+      const location = yield* Location.Service
+      const shell = yield* ShellSelect.Service
+      const state = State.create<Data, Draft>({
+        name: "command",
+        initial: () => ({ commands: new Map() }),
+        draft: (draft) => ({
+          list: () => Array.from(draft.commands.values()) as Info[],
+          get: (name) => draft.commands.get(name),
+          update: (name, update) => {
+            const current = draft.commands.get(name) ?? ({ name, template: "" } as Types.DeepMutable<Info>)
+            if (!draft.commands.has(name)) draft.commands.set(name, current)
+            update(current)
+            current.name = name
+          },
+          remove: (name) => {
+            draft.commands.delete(name)
+          },
+        }),
+        finalize: () => bus.publish(Command.Event.Updated, {}).pipe(Effect.asVoid),
+      })
+      const staticCommand = (name: string) => state.get().commands.get(name) as Info | undefined
+      const mcpCommands = Effect.fnUntraced(function* () {
+        return (yield* mcp.prompts()).map((prompt) =>
+          Info.make({
+            name: mcpCommandName(prompt.server, prompt.name),
+            template: "",
+            description: prompt.description,
+          }),
+        )
       })
 
-    return Service.of({
-      reload: state.reload,
-      transform: state.transform,
-      get: Effect.fn("Command.get")((name) =>
-        Effect.sync(() => {
-          const definition = state.get().get(name)
-          return definition ? info(definition) : undefined
+      return Service.of({
+        reload: state.reload,
+        transform: state.transform,
+        get: Effect.fn("Command.get")(function* (name) {
+          const command = staticCommand(name)
+          if (command) return command
+          return (yield* mcpCommands()).find((command) => command.name === name)
         }),
-      ),
-      list: Effect.fn("Command.list")(() => Effect.sync(() => Array.from(state.get().values(), info))),
-      execute: Effect.fn("Command.execute")(function* (input) {
-        const definition = state.get().get(input.name)
-        if (!definition)
-          return yield* new NotFoundError({ command: input.name, message: `Command not found: ${input.name}` })
-        return yield* definition.execute(input.invocation).pipe(
-          Effect.tapError((error) => Effect.logError("command execution failed", { command: input.name, error })),
-          Effect.mapError((error) => new ExecutionError({ command: input.name, message: errorMessage(error) })),
+        list: Effect.fn("Command.list")(function* () {
+          const commands = Array.from(state.get().commands.values()) as Info[]
+          const names = new Set(commands.map((command) => command.name))
+          return [...commands, ...(yield* mcpCommands()).filter((command) => !names.has(command.name))]
+        }),
+        evaluate: Effect.fn("Command.evaluate")(function* (input) {
+          const command = staticCommand(input.name)
+          if (command)
+            return yield* evaluateTemplate(input.name, command.template, input.arguments ?? "", {
+              location,
+              processes,
+              shell,
+            })
+
+          const prompt = (yield* mcp.prompts()).find(
+            (prompt) => mcpCommandName(prompt.server, prompt.name) === input.name,
+          )
+          if (!prompt)
+            return yield* new NotFoundError({ command: input.name, message: `Command not found: ${input.name}` })
+          const result = yield* mcp
+            .prompt({
+              server: prompt.server,
+              name: prompt.name,
+              args: Object.fromEntries(
+                (prompt.arguments ?? []).map((argument, index) => [
+                  argument.name,
+                  parseArguments(input.arguments ?? "")[index] ?? "",
+                ]),
+              ),
+            })
+            .pipe(
+              Effect.catchTag("MCP.NotFoundError", () =>
+                Effect.fail(
+                  new EvaluationError({
+                    command: input.name,
+                    message: `MCP server could not be found while evaluating prompt: ${prompt.server}`,
+                  }),
+                ),
+              ),
+            )
+          if (!result)
+            return yield* new EvaluationError({
+              command: input.name,
+              message: `MCP prompt could not be evaluated: ${prompt.server}:${prompt.name}`,
+            })
+          return {
+            text: result.messages
+              .map((message) => promptMessageText(message.content))
+              .join("\n")
+              .trim(),
+          }
+        }),
+      })
+    }),
+  )
+
+function evaluateTemplate(
+  command: string,
+  template: string,
+  input: string,
+  services: {
+    readonly location: Location.Info
+    readonly processes: AppProcess.Interface
+    readonly shell: ShellSelect.Interface
+  },
+) {
+  return Effect.gen(function* () {
+    const expanded = evaluateArguments(template, input)
+    return { text: yield* evaluateShell(command, expanded, services) }
+  })
+}
+
+function evaluateArguments(template: string, input: string) {
+  const args = parseArguments(input)
+  const placeholders = template.match(placeholderRegex) ?? []
+  const last = Math.max(0, ...placeholders.map((item) => Number(item.slice(1))))
+  const expanded = template.replaceAll(placeholderRegex, (_, index) => {
+    const position = Number(index)
+    const argIndex = position - 1
+    if (argIndex >= args.length) return ""
+    if (position === last) return args.slice(argIndex).join(" ")
+    return args[argIndex]
+  })
+  const withArguments = expanded.replaceAll("$ARGUMENTS", input)
+  if (placeholders.length === 0 && !template.includes("$ARGUMENTS") && input.trim())
+    return `${withArguments}\n\n${input}`.trim()
+  return withArguments.trim()
+}
+
+const evaluateShell = Effect.fnUntraced(function* (
+  command: string,
+  text: string,
+  services: {
+    readonly location: Location.Info
+    readonly processes: AppProcess.Interface
+    readonly shell: ShellSelect.Interface
+  },
+) {
+  const matches = Array.from(text.matchAll(shellRegex))
+  if (matches.length === 0) return text
+  const shell = yield* services.shell.preferred()
+  const outputs = yield* Effect.forEach(
+    matches,
+    (match) => {
+      const source = match[1] ?? ""
+      return services.processes
+        .run(
+          ChildProcess.make(shell, ShellSelect.args(shell, source), {
+            cwd: services.location.directory,
+            stdin: "ignore",
+          }),
+          {
+            combineOutput: true,
+          },
         )
-      }),
-    })
-  }),
-)
+        .pipe(
+          Effect.map((result) => (result.output ?? Buffer.concat([result.stdout, result.stderr])).toString("utf8")),
+          Effect.mapError(
+            (error) =>
+              new EvaluationError({
+                command,
+                message: `Shell interpolation failed for ${JSON.stringify(source)}: ${error.message}`,
+              }),
+          ),
+        )
+    },
+    { concurrency: 2 },
+  )
+  const iterator = outputs[Symbol.iterator]()
+  return text.replace(shellRegex, () => iterator.next().value ?? "")
+})
+
+function parseArguments(input: string) {
+  return (input.match(argsRegex) ?? []).map((arg) => arg.replace(quoteTrimRegex, ""))
+}
+
+function promptMessageText(content: unknown) {
+  if (typeof content === "string") return content
+  if (!content || typeof content !== "object") return ""
+  if (!("type" in content) || content.type !== "text") return ""
+  if (!("text" in content) || typeof content.text !== "string") return ""
+  return content.text
+}
+
+function mcpCommandName(server: string, prompt: string) {
+  return `${sanitize(server)}:${sanitize(prompt)}`
+}
+
+function sanitize(value: string) {
+  return value.replace(/[^a-zA-Z0-9_-]/g, "_")
+}
+
+const argsRegex = /(?:\[Image\s+\d+\]|"[^"]*"|'[^']*'|[^\s"']+)/gi
+const placeholderRegex = /\$(\d+)/g
+const quoteTrimRegex = /^["']|["']$/g
+const shellRegex = /!`([^`]+)`/g
 
 export const node = makeLocationNode({
   service: Service,
-  layer,
-  deps: [Bus.node],
+  layer: layer(),
+  deps: [MCP.node, Bus.node, AppProcess.node, Location.node, ShellSelect.node],
 })
-
-function errorMessage(error: unknown) {
-  if (error instanceof Error) return error.message
-  if (typeof error === "string") return error
-  if (error && typeof error === "object" && "message" in error && typeof error.message === "string")
-    return error.message
-  return "Command execution failed"
-}

packages/core/src/config/plugin/command.ts

@@ -1,18 +1,12 @@
 export * as ConfigCommandPlugin from "./command.js"
 
 import { define } from "@opencode-ai/plugin/effect/plugin"
-import { Agent } from "@opencode-ai/schema/agent"
 import { Info, type Entry } from "@opencode-ai/schema/config"
 import { ConfigCommand } from "@opencode-ai/schema/config/command"
-import { Model } from "@opencode-ai/schema/model"
-import { Provider } from "@opencode-ai/schema/provider"
-import { AppProcess } from "@opencode-ai/util/process"
 import path from "path"
 import { Effect, Option, Schema, Stream } from "effect"
-import { ChildProcess } from "effect/unstable/process"
+import { Command } from "../../command.js"
 import { Config } from "../../config.js"
-import { Location } from "../../location.js"
-import { ShellSelect } from "../../shell/select.js"
 import { FSUtil } from "@opencode-ai/util/fs-util"
 import { ConfigMarkdown } from "../markdown.js"
 
@@ -29,9 +23,6 @@ export const Plugin = define({
       const commands = yield* loadDirectory(fs, entry.path)
       return [{ commands: Object.fromEntries(commands.map((command) => [command.name, command.info])) }]
     })
-    const location = yield* Location.Service
-    const processes = yield* AppProcess.Service
-    const shell = yield* ShellSelect.Service
     const load = Effect.fn("ConfigCommandPlugin.load")(function* () {
       return yield* Effect.forEach(yield* config.entries(), loadEntry).pipe(Effect.map((documents) => documents.flat()))
     })
@@ -60,41 +51,17 @@ export const Plugin = define({
     yield* ctx.command.transform((draft) => {
       for (const document of loaded.documents) {
         for (const [name, command] of Object.entries(document.commands ?? {})) {
-          draft.add({
-            name,
-            description: command.description,
-            execute: (input) =>
-              Effect.gen(function* () {
-                const agent = command.agent === undefined ? undefined : Agent.ID.make(command.agent)
-                const commandAgent = yield* Effect.gen(function* () {
-                  if (agent === undefined) return
-                  const session = yield* ctx.session.get({ sessionID: input.sessionID })
-                  if (session.agent !== agent) yield* ctx.session.switchAgent({ sessionID: input.sessionID, agent })
-                  return (yield* ctx.agent.get({ agentID: agent })).data
-                })
-                const model =
-                  command.model === undefined
-                    ? commandAgent?.model
-                    : {
-                        id: Model.ID.make(command.model.model),
-                        providerID: Provider.ID.make(command.model.providerID),
-                        ...(command.model.variant === undefined
-                          ? {}
-                          : { variant: Model.VariantID.make(command.model.variant) }),
-                      }
-                if (model !== undefined) yield* ctx.session.switchModel({ sessionID: input.sessionID, model })
-                yield* ctx.session.prompt({
-                  ...input.prompt,
-                  sessionID: input.sessionID,
-                  text: yield* evaluateTemplate(command.template, input.prompt.text, {
-                    config,
-                    location,
-                    processes,
-                    shell,
-                  }),
-                  delivery: input.delivery,
-                })
-              }).pipe(Effect.asVoid),
+          draft.update(name, (item) => {
+            item.template = command.template
+            if (command.description !== undefined) item.description = command.description
+            if (command.agent !== undefined) item.agent = command.agent
+            if (command.model !== undefined)
+              item.model = {
+                id: command.model.model,
+                providerID: command.model.providerID,
+                ...(command.model.variant === undefined ? {} : { variant: command.model.variant }),
+              }
+            if (command.subtask !== undefined) item.subtask = command.subtask
           })
         }
       }
@@ -147,67 +114,3 @@ function decode(directory: string, filepath: string, content: string) {
     info,
   }
 }
-
-function evaluateTemplate(
-  template: string,
-  input: string,
-  services: {
-    readonly config: Config.Interface
-    readonly location: Location.Info
-    readonly processes: AppProcess.Interface
-    readonly shell: ShellSelect.Interface
-  },
-) {
-  return Effect.gen(function* () {
-    const args = parseArguments(input)
-    const placeholders = template.match(placeholderRegex) ?? []
-    const last = Math.max(0, ...placeholders.map((item) => Number(item.slice(1))))
-    const expanded = template.replaceAll(placeholderRegex, (_, index) => {
-      const position = Number(index)
-      const argIndex = position - 1
-      if (argIndex >= args.length) return ""
-      if (position === last) return args.slice(argIndex).join(" ")
-      return args[argIndex]
-    })
-    const withArguments = expanded.replaceAll("$ARGUMENTS", input)
-    const text =
-      placeholders.length === 0 && !template.includes("$ARGUMENTS") && input.trim()
-        ? `${withArguments}\n\n${input}`.trim()
-        : withArguments.trim()
-    const matches = Array.from(text.matchAll(shellRegex))
-    if (matches.length === 0) return text
-    const shell = yield* services.shell.preferred()
-    const outputs = yield* Effect.forEach(
-      matches,
-      (match) => {
-        const source = match[1] ?? ""
-        return services.processes
-          .run(
-            ChildProcess.make(shell, ShellSelect.args(shell, source), {
-              cwd: services.location.directory,
-              stdin: "ignore",
-            }),
-            { combineOutput: true },
-          )
-          .pipe(
-            Effect.map((result) => (result.output ?? Buffer.concat([result.stdout, result.stderr])).toString("utf8")),
-            Effect.mapError((error) =>
-              new Error(`Shell interpolation failed for ${JSON.stringify(source)}: ${error.message}`),
-            ),
-          )
-      },
-      { concurrency: 2 },
-    )
-    const iterator = outputs[Symbol.iterator]()
-    return text.replace(shellRegex, () => iterator.next().value ?? "")
-  })
-}
-
-function parseArguments(input: string) {
-  return (input.match(argsRegex) ?? []).map((arg) => arg.replace(quoteTrimRegex, ""))
-}
-
-const argsRegex = /(?:\[Image\s+\d+\]|"[^"]*"|'[^']*'|[^\s"']+)/gi
-const placeholderRegex = /\$(\d+)/g
-const quoteTrimRegex = /^["']|["']$/g
-const shellRegex = /!`([^`]+)`/g

packages/core/src/mcp/index.ts

@@ -2,7 +2,7 @@ export * as MCP from "./index.js"
 
 import { Mcp } from "@opencode-ai/schema/mcp"
 import { McpEvent } from "@opencode-ai/schema/mcp-event"
-import { ephemeral } from "@opencode-ai/schema/event"
+import { Command } from "@opencode-ai/schema/command"
 import { createHash } from "node:crypto"
 import { isDeepStrictEqual } from "node:util"
 import { Cause, Context, Effect, Exit, FiberSet, Latch, Layer, Schema, Scope, Stream, Types } from "effect"
@@ -19,7 +19,6 @@ import { State } from "../state.js"
 import type { MCPClient } from "./client.js"
 
 export const ServerName = Schema.String.pipe(Schema.brand("MCP.ServerName"))
-export const PromptsChanged = ephemeral({ type: "mcp.prompts.changed", schema: { server: Schema.String } })
 export type ServerName = typeof ServerName.Type
 
 // The status union is a public wire contract, so it lives in @opencode-ai/schema and is re-exported here.
@@ -454,7 +453,7 @@ export const layer = (options?: Options) =>
           Effect.map((defs) => {
             entry.prompts = defs.map((def) => toPrompt(name, def))
           }),
-          Effect.andThen(bus.publish(PromptsChanged, { server: name })),
+          Effect.andThen(bus.publish(Command.Event.Updated, {})),
         )
 
       // Runs a connection callback under the server lock, dropping it if the connection is no longer
@@ -573,7 +572,7 @@ export const layer = (options?: Options) =>
         yield* Scope.close(scope, Exit.void)
         yield* bus.publish(McpEvent.ToolsChanged, { server: name }).pipe(Effect.ignore)
         yield* bus.publish(McpEvent.ResourcesChanged, { server: name }).pipe(Effect.ignore)
-        yield* bus.publish(PromptsChanged, { server: name }).pipe(Effect.ignore)
+        yield* bus.publish(Command.Event.Updated, {}).pipe(Effect.ignore)
       })
 
       const disposeServer = Effect.fnUntraced(function* (name: ServerName, entry: ServerEntry) {

packages/core/src/models-dev.ts

@@ -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) =>

packages/core/src/plugin/command.ts

@@ -1,10 +1,8 @@
 export * as CommandPlugin from "./command.js"
 
 import { define } from "@opencode-ai/plugin/effect/plugin"
-import { Effect, Stream } from "effect"
-import { Bus } from "../bus.js"
+import { Effect } from "effect"
 import { Location } from "../location.js"
-import { MCP } from "../mcp/index.js"
 import PROMPT_INITIALIZE from "./command/initialize.txt"
 import PROMPT_REVIEW from "./command/review.txt"
 
@@ -12,104 +10,15 @@ export const Plugin = define({
   id: "opencode.command",
   effect: Effect.fn(function* (ctx) {
     const location = yield* Location.Service
-    const mcp = yield* MCP.Service
-    const bus = yield* Bus.Service
-    const loaded = { prompts: [] as MCP.Prompt[] }
-    yield* bus
-      .subscribe(MCP.PromptsChanged)
-      .pipe(
-        Stream.runForEach(() =>
-          mcp.prompts().pipe(
-            Effect.tap((prompts) => Effect.sync(() => (loaded.prompts = prompts))),
-            Effect.andThen(ctx.command.reload()),
-          ),
-        ),
-        Effect.forkScoped({ startImmediately: true }),
-      )
-    loaded.prompts = yield* mcp.prompts()
     yield* ctx.command.transform((draft) => {
-      draft.add({
-        name: "init",
-        description: "guided AGENTS.md setup",
-        execute: (input) =>
-          ctx.session
-            .prompt({
-              ...input.prompt,
-              sessionID: input.sessionID,
-              text: append(PROMPT_INITIALIZE.replace("${path}", location.project.directory), input.prompt.text),
-              delivery: input.delivery,
-            })
-            .pipe(Effect.asVoid),
+      draft.update("init", (command) => {
+        command.template = PROMPT_INITIALIZE.replace("${path}", location.project.directory)
+        command.description = "guided AGENTS.md setup"
       })
-      draft.add({
-        name: "review",
-        description: "review changes [commit|branch|pr], defaults to uncommitted",
-        execute: (input) =>
-          ctx.session
-            .prompt({
-              ...input.prompt,
-              sessionID: input.sessionID,
-              text: append(PROMPT_REVIEW.replace("${path}", location.project.directory), input.prompt.text),
-              delivery: input.delivery,
-            })
-            .pipe(Effect.asVoid),
+      draft.update("review", (command) => {
+        command.template = PROMPT_REVIEW.replace("${path}", location.project.directory)
+        command.description = "review changes [commit|branch|pr], defaults to uncommitted"
       })
-      for (const prompt of loaded.prompts) {
-        draft.add({
-          name: mcpCommandName(prompt.server, prompt.name),
-          description: prompt.description,
-          execute: (input) =>
-            Effect.gen(function* () {
-              const result = yield* mcp.prompt({
-                server: prompt.server,
-                name: prompt.name,
-                args: Object.fromEntries(
-                  (prompt.arguments ?? []).map((argument, index) => [
-                    argument.name,
-                    parseArguments(input.prompt.text)[index] ?? "",
-                  ]),
-                ),
-              })
-              if (!result) return yield* Effect.fail(new Error(`MCP prompt not found: ${prompt.server}:${prompt.name}`))
-              yield* ctx.session.prompt({
-                ...input.prompt,
-                sessionID: input.sessionID,
-                text: result.messages
-                  .map((message) => promptMessageText(message.content))
-                  .join("\n")
-                  .trim(),
-                delivery: input.delivery,
-              })
-            }).pipe(Effect.asVoid),
-        })
-      }
     })
   }),
 })
-
-function append(template: string, input: string) {
-  return [template, input.trim()].filter(Boolean).join("\n\n")
-}
-
-function parseArguments(input: string) {
-  return (input.match(argsRegex) ?? []).map((argument) => argument.replace(quoteTrimRegex, ""))
-}
-
-function promptMessageText(content: unknown) {
-  if (typeof content === "string") return content
-  if (!content || typeof content !== "object") return ""
-  if (!("type" in content) || content.type !== "text") return ""
-  if (!("text" in content) || typeof content.text !== "string") return ""
-  return content.text
-}
-
-function mcpCommandName(server: string, prompt: string) {
-  return `${sanitize(server)}:${sanitize(prompt)}`
-}
-
-function sanitize(value: string) {
-  return value.replace(/[^a-zA-Z0-9_-]/g, "_")
-}
-
-const argsRegex = /(?:\[Image\s+\d+\]|"[^"]*"|'[^']*'|[^\s"']+)/gi
-const quoteTrimRegex = /^["']|["']$/g

packages/core/src/plugin/host.ts

@@ -402,10 +402,7 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: Interface, p
       command: runtime.session.command,
       rename: runtime.session.rename,
       synthetic: runtime.session.synthetic,
-      interrupt: (input) =>
-        runtime.session
-          .interrupt(input.sessionID, { continue: input.continue })
-          .pipe(Effect.map((interrupted) => ({ interrupted }))),
+      interrupt: (input) => runtime.session.interrupt(input.sessionID),
       wait: (input) => runtime.session.wait(input.sessionID),
     },
   } satisfies Plugin.Context

packages/core/src/plugin/internal.ts

@@ -236,7 +236,6 @@ const pre = [
   MCPCodeModeExclusionPlugin.Plugin,
   WellKnownPlugin.Plugin,
   AgentPlugin.Plugin,
-  PlanPlugin.Plugin,
   CommandPlugin.Plugin,
   SkillPlugin.Plugin,
   ...SystemPromptPlugin.Plugins,
@@ -275,6 +274,7 @@ const post = [
   ConfigWebSearchPlugin.Plugin,
   VariantPlugin.Plugin,
   ConfigPolicyPlugin.Plugin,
+  PlanPlugin.Plugin,
 ] as const satisfies readonly InternalPlugin[]
 
 export const list = Effect.fn("PluginInternal.list")(function* () {

packages/core/src/plugin/provider/openai.ts

@@ -1,7 +1,6 @@
 import type { IntegrationOAuthMethodRegistration } from "@opencode-ai/plugin/effect/integration"
 import { define } from "@opencode-ai/plugin/effect/plugin"
 import { Deferred, Effect, Option, Schema, Semaphore, Stream } from "effect"
-import type { Server } from "node:http"
 import { App } from "../../app.js"
 import { Credential } from "../../credential.js"
 import { Bus } from "../../bus.js"
@@ -13,9 +12,6 @@ import type { PluginInternal } from "../internal.js"
 const clientID = "app_EMoamEEZ73f0CkXaXp7hrann"
 const issuer = "https://auth.openai.com"
 const callbackPort = 1455
-const callbackFallbackPort = 1457
-const callbackBindAttempts = 10
-const callbackBindRetryDelay = 200
 const pollingSafetyMargin = 3000
 const codexBaseURL = "https://chatgpt.com/backend-api/codex"
 const browserMethodID = Integration.MethodID.make("chatgpt-browser")
@@ -59,10 +55,11 @@ const browser = (app: App.Info) =>
         const pkce = yield* Effect.promise(generatePKCE)
         const state = base64UrlEncode(crypto.getRandomValues(new Uint8Array(32)).buffer)
         const code = yield* Deferred.make<string, Error>()
+        const redirect = `http://localhost:${callbackPort}/auth/callback`
         // Lazy so runtimes without a loopback listener (workerd) never evaluate node:http.
         const { createServer } = yield* Effect.promise(() => import("node:http"))
         const server = createServer((request, response) => {
-          const url = new URL(request.url ?? "/", "http://localhost")
+          const url = new URL(request.url ?? "/", `http://localhost:${callbackPort}`)
           if (url.pathname !== "/auth/callback") {
             response.writeHead(404).end("Not found")
             return
@@ -89,9 +86,11 @@ const browser = (app: App.Info) =>
             .writeHead(200, { "Content-Type": "text/html" })
             .end(OauthCallbackPage.success({ provider: "ChatGPT" }))
         })
-        const port = yield* listen(server)
+        yield* Effect.callback<void, Error>((resume) => {
+          server.once("error", (error) => resume(Effect.fail(error)))
+          server.listen(callbackPort, "localhost", () => resume(Effect.void))
+        })
         yield* Effect.addFinalizer(() => Effect.sync(() => server.close()))
-        const redirect = `http://localhost:${port}/auth/callback`
         return {
           mode: "auto" as const,
           url: authorizeURL(redirect, pkce, state),
@@ -105,66 +104,6 @@ const browser = (app: App.Info) =>
     refresh: (value) => refresh(browserMethodID, value, app),
   }) satisfies IntegrationOAuthMethodRegistration
 
-function listen(server: Server) {
-  return bind(server, callbackPort).pipe(
-    Effect.as(callbackPort),
-    Effect.catchIf(addressInUse, () =>
-      cancel(callbackPort).pipe(
-        Effect.ignore,
-        Effect.andThen(Effect.sleep(callbackBindRetryDelay)),
-        Effect.andThen(bindWithRetry(server, callbackPort, callbackBindAttempts - 1)),
-        Effect.as(callbackPort),
-        Effect.catchIf(addressInUse, () =>
-          bindWithRetry(server, callbackFallbackPort, callbackBindAttempts).pipe(
-            Effect.as(callbackFallbackPort),
-            Effect.catchIf(addressInUse, () =>
-              Effect.fail(
-                new Error(
-                  `OpenAI browser login needs local port ${callbackPort} or ${callbackFallbackPort}, but both are already in use. Stop the processes using those ports or choose ChatGPT Pro/Plus (headless), then try again.`,
-                ),
-              ),
-            ),
-          ),
-        ),
-      ),
-    ),
-  )
-}
-
-function bindWithRetry(server: Server, port: number, attempts: number): Effect.Effect<void, Error> {
-  return bind(server, port).pipe(
-    Effect.catchIf(
-      (error) => addressInUse(error) && attempts > 1,
-      () => Effect.sleep(callbackBindRetryDelay).pipe(Effect.andThen(bindWithRetry(server, port, attempts - 1))),
-    ),
-  )
-}
-
-function bind(server: Server, port: number) {
-  return Effect.callback<void, Error>((resume) => {
-    const onError = (error: Error) => resume(Effect.fail(error))
-    server.once("error", onError)
-    server.listen(port, "localhost", () => {
-      server.off("error", onError)
-      resume(Effect.void)
-    })
-  })
-}
-
-function cancel(port: number) {
-  return Effect.tryPromise({
-    try: (signal) =>
-      fetch(`http://localhost:${port}/cancel`, {
-        signal: AbortSignal.any([signal, AbortSignal.timeout(2000)]),
-      }),
-    catch: (cause) => cause,
-  })
-}
-
-function addressInUse(error: Error) {
-  return "code" in error && error.code === "EADDRINUSE"
-}
-
 const headless = (app: App.Info) =>
   ({
     integrationID: Integration.ID.make("openai"),

packages/core/src/plugin/skill/opencode.md

@@ -146,10 +146,8 @@ bug.
 
 For questions about creating, configuring, loading, publishing, or migrating
 plugins, fetch the full [plugins guide](https://opencode.ai/v2/docs/build/plugins)
-before answering. Refer to this guide when the user wants to build a plugin. It
-covers hooks, transforms, tools, plugin context capabilities, and package
-entrypoints. Plugins can also extend the TUI; for those, fetch the
-[CLI plugin guide](https://opencode.ai/v2/docs/build/plugins/cli).
+before answering. This includes questions about the Effect plugin API, hooks,
+transforms, tools, plugin context capabilities, and package entrypoints.
 
 ## [Service](https://opencode.ai/v2/docs/troubleshooting#check-the-background-service)
 

packages/core/src/plugin/supervisor.ts

@@ -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
 })
 

packages/core/src/session.ts

@@ -246,14 +246,26 @@ export interface Interface {
     prompt: string
   }) => Effect.Effect<string, NotFoundError | SessionGenerate.Error>
   readonly command: (input: {
+    id?: SessionMessage.ID
     sessionID: SessionSchema.ID
     command: string
-    text: string
+    arguments?: string
+    agent?: Agent.ID
+    model?: Model.Ref
     files?: PromptInput.Prompt["files"]
     agents?: PromptInput.Prompt["agents"]
     skills?: PromptInput.Prompt["skills"]
     delivery?: SessionInbox.Delivery
-  }) => Effect.Effect<void, NotFoundError | Command.NotFoundError | Command.ExecutionError>
+    resume?: boolean
+  }) => Effect.Effect<
+    SessionInbox.User,
+    | NotFoundError
+    | PromptConflictError
+    | AttachmentError
+    | SkillNotFoundError
+    | Command.NotFoundError
+    | Command.EvaluationError
+  >
   readonly shell: (input: {
     id?: Event.ID
     sessionID: SessionSchema.ID
@@ -272,7 +284,7 @@ export interface Interface {
   readonly active: Effect.Effect<ReadonlySet<SessionSchema.ID>>
   readonly background: (sessionID: SessionSchema.ID) => Effect.Effect<void, NotFoundError>
   readonly resume: (sessionID: SessionSchema.ID) => Effect.Effect<void, NotFoundError | SessionRunner.RunError>
-  readonly interrupt: (sessionID: SessionSchema.ID, options?: { readonly continue?: boolean }) => Effect.Effect<boolean>
+  readonly interrupt: (sessionID: SessionSchema.ID, options?: { readonly continue?: boolean }) => Effect.Effect<void>
   readonly synthetic: (input: {
     id?: SessionMessage.ID
     sessionID: SessionSchema.ID
@@ -643,19 +655,35 @@ const layer = Layer.effect(
           yield* plugins.flush
           return yield* Command.Service
         }).pipe(Effect.provide(locations.get(session.location)))
-        const delivery = input.delivery ?? "steer"
-        yield* commands.execute({
-          name: input.command,
-          invocation: {
-            sessionID: input.sessionID,
-            prompt: {
-              text: input.text,
-              files: input.files,
-              agents: input.agents,
-              skills: input.skills,
-            },
-            delivery,
-          },
+        const command = yield* commands.get(input.command)
+        if (!command)
+          return yield* new Command.NotFoundError({
+            command: input.command,
+            message: `Command not found: ${input.command}`,
+          })
+        const evaluated = yield* commands.evaluate({ name: input.command, arguments: input.arguments })
+
+        // TODO(v2 commands): decide whether command-level subtask/background execution belongs in v2 commands.
+        const agent = command.agent ?? input.agent
+        const commandAgent = yield* Effect.gen(function* () {
+          if (!command.agent) return undefined
+          const agents = yield* Agent.Service.pipe(Effect.provide(locations.get(session.location)))
+          return yield* agents.get(Agent.ID.make(command.agent))
+        })
+        const model = command.model ?? commandAgent?.model ?? input.model
+        if (agent !== undefined && session.agent !== Agent.ID.make(agent))
+          yield* result.switchAgent({ sessionID: input.sessionID, agent: Agent.ID.make(agent) })
+        if (model !== undefined) yield* result.switchModel({ sessionID: input.sessionID, model })
+
+        return yield* result.prompt({
+          id: input.id,
+          sessionID: input.sessionID,
+          text: evaluated.text,
+          files: input.files,
+          agents: input.agents,
+          skills: input.skills,
+          delivery: input.delivery,
+          resume: input.resume,
         })
       }),
       shell: Effect.fn("Session.shell")(function* (input) {

packages/core/src/session/execution.ts

@@ -24,10 +24,9 @@ export interface Interface {
   /**
    * Interrupt active work owned by this process. Idle interruption is a no-op. Resolves once
    * the interruption is accepted; cleanup settles asynchronously in the execution fiber.
-   * Returns whether an active execution was interrupted. Compose with `awaitIdle` when
-   * settlement matters.
+   * Compose with `awaitIdle` when settlement matters.
    */
-  readonly interrupt: (sessionID: SessionSchema.ID, options?: { readonly continue?: boolean }) => Effect.Effect<boolean>
+  readonly interrupt: (sessionID: SessionSchema.ID, options?: { readonly continue?: boolean }) => Effect.Effect<void>
   /** Resolves once this process owns no active execution for the Session. Returns immediately when idle and never starts work. */
   readonly awaitIdle: (sessionID: SessionSchema.ID) => Effect.Effect<void>
 }
@@ -141,8 +140,8 @@ export const layer = Layer.effect(
       active: coordinator.active,
       interrupt: (sessionID, options) =>
         Effect.gen(function* () {
-          const interrupted = yield* coordinator.interrupt(sessionID, "user")
-          if (!options?.continue) return interrupted
+          yield* coordinator.interrupt(sessionID, "user")
+          if (!options?.continue) return
           // Resume steering input and between-turn control work from the interrupted
           // intent. Queued next-turn prompts stay parked: a steer-scoped drain never
           // promotes them, and a control item behind a queued prompt waits its turn.
@@ -152,10 +151,9 @@ export const layer = Layer.effect(
           // rows inside uninterruptible publications, so a steer row is either still
           // promotable here or was fully delivered and needs no resumption.
           const next = yield* SessionInbox.nextPromotable(db, sessionID, "input")
-          if (next === undefined) return interrupted
+          if (next === undefined) return
           if (next.delivery === "steer" || next.type === "compaction" || next.type === "move")
             yield* coordinator.wake(sessionID, "steer")
-          return interrupted
         }),
       resume: coordinator.run,
       wake: coordinator.wake,
@@ -177,7 +175,7 @@ export const noopLayer = Layer.succeed(
     active: Effect.succeed(new Set()),
     resume: () => Effect.void,
     wake: () => Effect.void,
-    interrupt: () => Effect.succeed(false),
+    interrupt: () => Effect.void,
     awaitIdle: () => Effect.void,
   }),
 )

packages/core/src/session/message.ts

@@ -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"

packages/core/src/session/run-coordinator.ts

@@ -14,10 +14,9 @@ export interface Coordinator<Key, E, Reason = never> {
   /**
    * Stops the active execution and clears its doorbell. No-op when idle. Resolves once the
    * interruption is accepted, not when cleanup settles: the execution fiber finishes its
-   * finalizers and settled hook on its own time. Returns whether an active execution was
-   * interrupted. Compose with `awaitIdle` for settlement.
+   * finalizers and settled hook on its own time. Compose with `awaitIdle` for settlement.
    */
-  readonly interrupt: (key: Key, reason?: Reason) => Effect.Effect<boolean>
+  readonly interrupt: (key: Key, reason?: Reason) => Effect.Effect<void>
   /** Resolves once no execution is active for the key. Returns immediately when already idle and never starts work. */
   readonly awaitIdle: (key: Key) => Effect.Effect<void>
 }
@@ -135,16 +134,16 @@ export const make = <Key, E, Reason = never>(options: {
         start(key, false, scope)
       })
 
-    const interrupt = (key: Key, reason?: Reason): Effect.Effect<boolean> =>
-      Effect.sync(() => {
+    const interrupt = (key: Key, reason?: Reason): Effect.Effect<void> =>
+      Effect.suspend(() => {
         const execution = executions.get(key)
-        if (execution === undefined || execution.stopping) return false
+        if (execution === undefined || execution.stopping) return Effect.void
         if (execution.owner === undefined) {
           // Settlement window: the owner exited but the settled hook has not finished. The
           // terminal outcome is already decided, so no reason attaches — but the interrupt
           // still claims the recorded wakes so settle does not start a dead-intent successor.
           execution.pendingWake = undefined
-          return false
+          return Effect.void
         }
         execution.stopping = true
         // Wakes recorded so far belong to the interrupted intent; the interrupt claims them.
@@ -154,7 +153,7 @@ export const make = <Key, E, Reason = never>(options: {
         // Fire and forget: nobody benefits from waiting out cleanup here, and callers like
         // the interrupt endpoint must acknowledge immediately even when finalizers are slow.
         fork(Fiber.interrupt(execution.owner))
-        return true
+        return Effect.void
       })
 
     // One execution's `done` already spans coalesced continuations; re-check after it

packages/core/src/session/schema.ts

@@ -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"
 

packages/core/src/session/stats.ts

@@ -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,
             )

packages/core/src/tool/runtime.ts

@@ -1,18 +1,7 @@
 import type { ToolDefinition } from "@opencode-ai/ai"
 import { Tool } from "@opencode-ai/schema/tool"
 import type { StandardJSONSchemaV1, StandardSchemaV1 } from "@standard-schema/spec"
-import { Cache, Effect, JsonSchema, Schema, SchemaRepresentation } from "effect"
-
-const jsonSchemas = Effect.runSync(
-  Cache.make<JsonSchema.JsonSchema, Schema.Codec<unknown> | undefined>({
-    capacity: 100,
-    lookup: (schema) =>
-      Effect.try({
-        try: () => jsonSchema(schema),
-        catch: () => undefined,
-      }).pipe(Effect.orElseSucceed(() => undefined)),
-  }),
-)
+import { Effect, JsonSchema, Schema } from "effect"
 
 export const definition = (tool: Tool.Info<any, any>): ToolDefinition => ({
   name: effectiveName(tool),
@@ -61,20 +50,7 @@ const decodeInput = (schema: Tool.ValueSchema<any>, value: unknown) => {
       Effect.mapError((error) => new Tool.Error({ message: `Invalid tool input: ${error.message}` })),
     )
   if (isStandardSchema(schema)) return validateStandard(schema, value, "Invalid tool input")
-  return Cache.get(jsonSchemas, schema).pipe(
-    Effect.flatMap((schema) =>
-      schema === undefined ? Effect.succeed(value) : Schema.decodeUnknownEffect(schema)(value),
-    ),
-    Effect.mapError((error) => new Tool.Error({ message: `Invalid tool input: ${error.message}` })),
-  )
-}
-
-const jsonSchema = (schema: JsonSchema.JsonSchema) => {
-  const draft =
-    (typeof schema.$schema === "string" && schema.$schema.includes("draft-07")) || "definitions" in schema
-      ? JsonSchema.fromSchemaDraft07(schema)
-      : JsonSchema.fromSchemaDraft2020_12(schema)
-  return Schema.make<Schema.Codec<unknown>>(SchemaRepresentation.fromJsonSchemaDocument(draft).ast)
+  return Effect.succeed(value)
 }
 
 const encodeOutput = (schema: Tool.ValueSchema<any>, value: unknown) => {

packages/core/src/workspace.ts

@@ -25,18 +25,9 @@ export class Info extends Schema.Class<Info>("Workspace.Info")({
 
 export class NotFound extends Schema.TaggedError<NotFound>()("Workspace.NotFound", { workspaceID: ID }) {}
 
-export class CreateConflict extends Schema.TaggedError<CreateConflict>()("Workspace.CreateConflict", {
-  workspaceID: ID,
-  provider: Schema.String,
-  existingProvider: Schema.String,
-}) {}
-
 export interface Interface {
   /** Instantly commits a logical workspace ID. No provider work happens here. */
-  readonly create: (input: {
-    readonly id?: ID
-    readonly provider: string
-  }) => Effect.Effect<ID, CreateConflict | WorkspaceDriver.ProviderNotFound>
+  readonly create: (provider: string) => Effect.Effect<ID, WorkspaceDriver.ProviderNotFound>
   /** Starts or joins the shared attempt that makes the backing resource real, then returns it. */
   readonly provision: (
     workspaceID: ID,
@@ -44,11 +35,9 @@ export interface Interface {
   readonly connect: (
     workspaceID: ID,
   ) => Effect.Effect<EnvironmentDriver, NotFound | WorkspaceDriver.Error | WorkspaceDriver.ProviderNotFound>
-  /** Makes the workspace absent; reports whether this call destroyed an existing workspace. */
-  readonly destroy: (workspaceID: ID) => Effect.Effect<
-    Workspace.DestroyResult,
-    WorkspaceDriver.Error | WorkspaceDriver.ProviderNotFound
-  >
+  readonly destroy: (
+    workspaceID: ID,
+  ) => Effect.Effect<void, NotFound | WorkspaceDriver.Error | WorkspaceDriver.ProviderNotFound>
 }
 
 export interface Options {
@@ -90,16 +79,13 @@ const layer = (options: Options) =>
       const fork = yield* FiberSet.makeRuntime<never, void, never>()
       const idleThreshold = Duration.toMillis(options.idleThreshold ?? Duration.minutes(20))
 
-      const find = (workspaceID: ID) =>
-        db
+      const load = Effect.fn("Workspace.load")(function* (workspaceID: ID) {
+        const row = yield* db
           .select()
           .from(WorkspaceTable)
           .where(eq(WorkspaceTable.id, workspaceID))
           .get()
           .pipe(Effect.orDie)
-
-      const load = Effect.fn("Workspace.load")(function* (workspaceID: ID) {
-        const row = yield* find(workspaceID)
         if (!row) return yield* new NotFound({ workspaceID })
         return row
       })
@@ -221,39 +207,15 @@ const layer = (options: Options) =>
       }).pipe(Effect.repeat(Schedule.spaced(options.pollInterval ?? Duration.minutes(1))), Effect.forkScoped)
 
       return Service.of({
-        create: Effect.fn("Workspace.create")(function* (input) {
-          const workspaceID = input.id ?? ID.create()
-          const existing = yield* db
-            .select({ provider: WorkspaceTable.provider })
-            .from(WorkspaceTable)
-            .where(eq(WorkspaceTable.id, workspaceID))
-            .get()
-            .pipe(Effect.orDie)
-          if (existing) {
-            if (existing.provider === input.provider) return workspaceID
-            return yield* new CreateConflict({
-              workspaceID,
-              provider: input.provider,
-              existingProvider: existing.provider,
-            })
-          }
-          yield* registry.get(input.provider)
+        create: Effect.fn("Workspace.create")(function* (provider) {
+          yield* registry.get(provider)
+          const workspaceID = ID.create()
           const now = yield* Clock.currentTimeMillis
-          const inserted = yield* db
+          yield* db
             .insert(WorkspaceTable)
-            .values({ id: workspaceID, provider: input.provider, binding: null, created_at: now, last_used_at: now })
-            .onConflictDoNothing()
-            .returning({ id: WorkspaceTable.id })
-            .get()
+            .values({ id: workspaceID, provider, binding: null, created_at: now, last_used_at: now })
+            .run()
             .pipe(Effect.orDie)
-          if (inserted) return workspaceID
-          const row = yield* load(workspaceID).pipe(Effect.orDie)
-          if (row.provider !== input.provider)
-            return yield* new CreateConflict({
-              workspaceID,
-              provider: input.provider,
-              existingProvider: row.provider,
-            })
           return workspaceID
         }),
         provision,
@@ -305,10 +267,9 @@ const layer = (options: Options) =>
             attempts.delete(workspaceID)
             Deferred.doneUnsafe(attempt, Exit.fail(new NotFound({ workspaceID })))
           }
-          return yield* locks.withLock(workspaceID)(
+          yield* locks.withLock(workspaceID)(
             Effect.gen(function* () {
-              const row = yield* find(workspaceID)
-              if (!row) return { destroyed: false }
+              const row = yield* load(workspaceID)
               const connection = connections.get(workspaceID)
               connections.delete(workspaceID)
               if (connection) yield* Scope.close(connection.scope, Exit.void)
@@ -323,7 +284,6 @@ const layer = (options: Options) =>
                 ),
               )
               yield* db.delete(WorkspaceTable).where(eq(WorkspaceTable.id, workspaceID)).run().pipe(Effect.orDie)
-              return { destroyed: true }
             }),
           )
         }),

packages/core/test/command.test.ts

@@ -1,71 +1,77 @@
 import { describe, expect } from "bun:test"
+import { Effect } from "effect"
 import { Command } from "@opencode-ai/core/command"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { Session } from "@opencode-ai/schema/session"
-import { Effect } from "effect"
+import { Location } from "@opencode-ai/core/location"
+import { MCP } from "@opencode-ai/core/mcp/index"
+import { Model } from "@opencode-ai/core/model"
+import { Provider } from "@opencode-ai/core/provider"
+import { emptyMcpLayer, testLocationLayer } from "./fixture/mcp"
 import { testEffect } from "./lib/effect"
 
-const it = testEffect(AppNodeBuilder.build(Command.node))
+const it = testEffect(
+  AppNodeBuilder.build(Command.node, [
+    [MCP.node, emptyMcpLayer],
+    [Location.node, testLocationLayer],
+  ]),
+)
 
 describe("Command", () => {
-  it.effect("registers and executes callback commands", () =>
+  it.effect("applies command transforms and preserves later overrides", () =>
     Effect.gen(function* () {
       const command = yield* Command.Service
-      const calls: Command.Invocation[] = []
-      yield* command.transform((draft) => {
-        draft.add({
-          name: "goal",
-          description: "Manage the session goal",
-          execute: (input) => Effect.sync(() => calls.push(input)),
+      yield* command.transform((editor) => {
+        editor.update("review", (command) => {
+          command.template = "First"
+          command.description = "Review code"
+        })
+        editor.update("review", (command) => {
+          command.template = "Second"
+          command.model = {
+            id: Model.ID.make("claude"),
+            providerID: Provider.ID.make("anthropic"),
+            variant: Model.VariantID.make("high"),
+          }
         })
       })
 
-      expect(yield* command.get("goal")).toEqual(
-        Command.Info.make({ name: "goal", description: "Manage the session goal" }),
-      )
-      const invocation = {
-        sessionID: Session.ID.make("ses_test"),
-        prompt: { text: "ship it", files: [{ uri: "file:///tmp/plan.md" }] },
-        delivery: "steer" as const,
-      }
-      yield* command.execute({ name: "goal", invocation })
-      expect(calls).toEqual([invocation])
-    }),
-  )
-
-  it.effect("replaces commands with later definitions", () =>
-    Effect.gen(function* () {
-      const command = yield* Command.Service
-      yield* command.transform((draft) => {
-        draft.add({ name: "goal", description: "First", execute: () => Effect.void })
-        draft.add({ name: "goal", description: "Second", execute: () => Effect.void })
-      })
-
-      expect(yield* command.list()).toEqual([Command.Info.make({ name: "goal", description: "Second" })])
-    }),
-  )
-
-  it.effect("returns callback error messages without stack traces", () =>
-    Effect.gen(function* () {
-      const command = yield* Command.Service
-      yield* command.transform((draft) => {
-        draft.add({
-          name: "fail",
-          execute: () => Effect.fail(new Error("command failed")),
-        })
-      })
-
-      const error = yield* command
-        .execute({
-          name: "fail",
-          invocation: {
-            sessionID: Session.ID.make("ses_test"),
-            prompt: { text: "" },
-            delivery: "steer",
+      expect(yield* command.get("review")).toEqual(
+        Command.Info.make({
+          name: "review",
+          template: "Second",
+          description: "Review code",
+          model: {
+            id: Model.ID.make("claude"),
+            providerID: Provider.ID.make("anthropic"),
+            variant: Model.VariantID.make("high"),
           },
+        }),
+      )
+      expect(yield* command.list()).toEqual([
+        Command.Info.make({
+          name: "review",
+          template: "Second",
+          description: "Review code",
+          model: {
+            id: Model.ID.make("claude"),
+            providerID: Provider.ID.make("anthropic"),
+            variant: Model.VariantID.make("high"),
+          },
+        }),
+      ])
+    }),
+  )
+
+  it.effect("evaluates command template shell blocks", () =>
+    Effect.gen(function* () {
+      const command = yield* Command.Service
+      yield* command.transform((editor) => {
+        editor.update("review", (command) => {
+          command.template = "Output: !`echo command-output`"
         })
-        .pipe(Effect.flip)
-      expect(error).toMatchObject({ _tag: "Command.ExecutionError", message: "command failed" })
+      })
+
+      expect((yield* command.evaluate({ name: "review" })).text.replace(/\r?\n$/, "")).toEqual("Output: command-output")
     }),
   )
 })

packages/core/test/config/command.test.ts

@@ -1,13 +1,11 @@
 import fs from "fs/promises"
 import path from "path"
 import { describe, expect } from "bun:test"
-import { DateTime, Deferred, Effect, Fiber, Layer, Option, PubSub, Schema, Stream } from "effect"
+import { Deferred, Effect, Fiber, Layer, Option, PubSub, Schema, Stream } from "effect"
 import { advance, drain } from "../lib/clock"
 import { Directory, Document, Event, Info } from "@opencode-ai/schema/config"
-import { Session } from "@opencode-ai/schema/session"
-import { SessionInbox } from "@opencode-ai/schema/session-inbox"
-import { SessionMessage } from "@opencode-ai/schema/session-message"
 import { Command } from "@opencode-ai/core/command"
+import { Agent } from "@opencode-ai/core/agent"
 import { Config } from "@opencode-ai/core/config"
 import { ConfigCommandPlugin } from "@opencode-ai/core/config/plugin/command"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
@@ -17,11 +15,11 @@ import { Bus } from "@opencode-ai/core/bus"
 import { Credential } from "@opencode-ai/core/credential"
 import { WellKnown } from "@opencode-ai/core/wellknown"
 import { Global } from "@opencode-ai/util/global"
-import { AppProcess } from "@opencode-ai/util/process"
 import { Location } from "@opencode-ai/core/location"
 import { MCP } from "@opencode-ai/core/mcp/index"
+import { Model } from "@opencode-ai/core/model"
+import { Provider } from "@opencode-ai/core/provider"
 import { AbsolutePath } from "@opencode-ai/core/schema"
-import { ShellSelect } from "@opencode-ai/core/shell/select"
 import { Watcher } from "@opencode-ai/core/filesystem/watcher"
 import { emptyCredentialNode, emptyWellknownNode } from "../fixture/config-nodes"
 import { emptyConfigLayer, emptyMcpLayer, testLocationLayer } from "../fixture/mcp"
@@ -30,25 +28,12 @@ import { tmpdir } from "../fixture/tmpdir"
 import { testEffect } from "../lib/effect"
 import { host } from "../plugin/host"
 
-const shellLayer = Layer.succeed(
-  ShellSelect.Service,
-  ShellSelect.Service.of({
-    preferred: () => Effect.succeed("sh"),
-    transform: () => Effect.die("unused shell.transform"),
-    reload: () => Effect.die("unused shell.reload"),
-  }),
-)
-
 const it = testEffect(
-  AppNodeBuilder.build(
-    LayerNode.group([Command.node, Bus.node, FSUtil.node, AppProcess.node, Location.node, ShellSelect.node]),
-    [
-      [MCP.node, emptyMcpLayer],
-      [Config.node, emptyConfigLayer],
-      [Location.node, testLocationLayer],
-      [ShellSelect.node, shellLayer],
-    ],
-  ),
+  AppNodeBuilder.build(LayerNode.group([Command.node, Bus.node, FSUtil.node]), [
+    [MCP.node, emptyMcpLayer],
+    [Config.node, emptyConfigLayer],
+    [Location.node, testLocationLayer],
+  ]),
 )
 const decode = Schema.decodeUnknownSync(Info)
 
@@ -80,7 +65,6 @@ Review files`,
           const bus = yield* Bus.Service
           const update = yield* bus.publish(Event.Updated, {})
           const updates = yield* PubSub.unbounded<typeof update>()
-          const prompts: { text: string; files?: readonly { readonly uri: string }[]; delivery?: string }[] = []
           yield* ConfigCommandPlugin.Plugin.effect(
             host({
               command: {
@@ -89,20 +73,6 @@ Review files`,
                 reload: command.reload,
               },
               event: { subscribe: () => Stream.fromPubSub(updates) },
-              session: {
-                prompt: (input) =>
-                  Effect.sync(() => {
-                    prompts.push({ text: input.text, files: input.files, delivery: input.delivery })
-                    return SessionInbox.User.make({
-                      id: SessionMessage.ID.make("msg_test"),
-                      sessionID: input.sessionID,
-                      timeCreated: DateTime.makeUnsafe(0),
-                      type: "user",
-                      payload: { text: input.text },
-                      delivery: input.delivery ?? "steer",
-                    })
-                  }),
-              },
             }),
           ).pipe(
             Effect.provide(
@@ -119,46 +89,28 @@ Review files`,
           expect(yield* command.list()).toEqual([
             Command.Info.make({
               name: "review",
+              template: "Review files",
               description: "File review",
+              agent: Agent.ID.make("reviewer"),
+              model: {
+                providerID: Provider.ID.make("anthropic"),
+                id: Model.ID.make("claude"),
+                variant: Model.VariantID.make("high"),
+              },
+              subtask: true,
             }),
-            Command.Info.make({ name: "empty" }),
-            Command.Info.make({ name: "nested/docs" }),
-          ])
-          yield* command.execute({
-            name: "nested/docs",
-            invocation: {
-              sessionID: Session.ID.make("ses_test"),
-              prompt: { text: "details", files: [{ uri: "file:///tmp/context.md" }] },
-              delivery: "queue",
-            },
-          })
-          expect(prompts).toEqual([
-            {
-              text: "Write docs\n\ndetails",
-              files: [{ uri: "file:///tmp/context.md" }],
-              delivery: "queue",
-            },
+            Command.Info.make({ name: "empty", template: "" }),
+            Command.Info.make({ name: "nested/docs", template: "Write docs" }),
           ])
 
-          yield* Effect.promise(() =>
-            fs.writeFile(path.join(tmp.path, "commands", "review.md"), markdown("Review again", "Review again")),
-          )
+          yield* Effect.promise(() => fs.writeFile(path.join(tmp.path, "commands", "review.md"), "Review again"))
           yield* Effect.sleep("10 millis")
           yield* PubSub.publish(updates, update)
           for (let attempt = 0; attempt < 100; attempt++) {
-            if ((yield* command.get("review"))?.description === "Review again") break
+            if ((yield* command.get("review"))?.template === "Review again") break
             yield* Effect.sleep("10 millis")
           }
-          expect((yield* command.get("review"))?.description).toBe("Review again")
-          yield* command.execute({
-            name: "review",
-            invocation: {
-              sessionID: Session.ID.make("ses_test"),
-              prompt: { text: "latest" },
-              delivery: "steer",
-            },
-          })
-          expect(prompts.at(-1)?.text).toBe("Review again\n\nlatest")
+          expect((yield* command.get("review"))?.template).toBe("Review again")
         }),
       ),
     ),
@@ -241,13 +193,11 @@ Review files`,
           yield* advance(() => reloads >= 1)
           expect(reloads).toBe(1)
 
-          yield* Effect.promise(() =>
-            fs.writeFile(path.join(directory, "review.md"), markdown("Review twice", "Review twice")),
-          )
+          yield* Effect.promise(() => fs.writeFile(path.join(directory, "review.md"), "Review twice"))
           yield* configTest.emitChange({ type: "update", path: path.join(directory, "review.md") })
           yield* advance(() => reloads >= 2)
           expect(reloads).toBe(2)
-          expect((yield* command.get("review"))?.description).toBe("Review twice")
+          expect((yield* command.get("review"))?.template).toBe("Review twice")
         }).pipe(Effect.provide(Config.testLayer([directoryEntry(tmp.path)]))),
       ),
     ),
@@ -282,12 +232,10 @@ Review files`,
           expect(reloads).toBe(0)
 
           // The feed stays live after unrelated updates.
-          yield* Effect.promise(() =>
-            fs.writeFile(path.join(directory, "review.md"), markdown("Review related", "Review related")),
-          )
+          yield* Effect.promise(() => fs.writeFile(path.join(directory, "review.md"), "Review related"))
           yield* configTest.emitChange({ type: "create", path: path.join(directory, "review.md") })
           yield* advance(() => reloads >= 1)
-          expect((yield* command.get("review"))?.description).toBe("Review related")
+          expect((yield* command.get("review"))?.template).toBe("Review related")
         }).pipe(Effect.provide(Config.testLayer([directoryEntry(tmp.path)]))),
       ),
     ),
@@ -324,47 +272,28 @@ describeNative("ConfigCommandPlugin native watcher", () => {
         yield* watchReady(config, global)
 
         const created = yield* nextCommandUpdate(bus)
-        yield* fs.writeFileString(
-          path.join(global, "commands", "review.md"),
-          markdown("Review native", "Review native"),
-        )
+        yield* fs.writeFileString(path.join(global, "commands", "review.md"), "Review native")
         yield* Fiber.join(created).pipe(Effect.timeout("10 seconds"))
-        expect((yield* command.get("review"))?.description).toBe("Review native")
+        expect((yield* command.get("review"))?.template).toBe("Review native")
 
         const updated = yield* nextCommandUpdate(bus)
-        yield* fs.writeFileString(
-          path.join(global, "commands", "review.md"),
-          markdown("Review native again", "Review native again"),
-        )
+        yield* fs.writeFileString(path.join(global, "commands", "review.md"), "Review native again")
         yield* Fiber.join(updated).pipe(Effect.timeout("10 seconds"))
-        expect((yield* command.get("review"))?.description).toBe("Review native again")
+        expect((yield* command.get("review"))?.template).toBe("Review native again")
       }).pipe(
         Effect.provide(
-          AppNodeBuilder.build(
-            LayerNode.group([
-              Command.node,
-              Config.node,
-              Bus.node,
-              FSUtil.node,
-              AppProcess.node,
-              Global.node,
-              Location.node,
-              ShellSelect.node,
-            ]),
+          AppNodeBuilder.build(LayerNode.group([Command.node, Config.node, Bus.node, FSUtil.node]), [
             [
-              [
-                Location.node,
-                Layer.succeed(
-                  Location.Service,
-                  Location.Service.of(location({ directory: AbsolutePath.make(path.join(tmp, "project")) })),
-                ),
-              ],
-              [Global.node, Global.layerWith({ config: global, home: path.join(global, "home") })],
-              [ShellSelect.node, shellLayer],
-              [Credential.node, emptyCredentialNode],
-              [WellKnown.node, emptyWellknownNode],
+              Location.node,
+              Layer.succeed(
+                Location.Service,
+                Location.Service.of(location({ directory: AbsolutePath.make(path.join(tmp, "project")) })),
+              ),
             ],
-          ),
+            [Global.node, Global.layerWith({ config: global, home: path.join(global, "home") })],
+            [Credential.node, emptyCredentialNode],
+            [WellKnown.node, emptyWellknownNode],
+          ]),
         ),
       )
     }),
@@ -408,10 +337,6 @@ function directoryEntry(directory: string) {
   return new Directory({ type: "directory", path: AbsolutePath.make(directory) })
 }
 
-function markdown(description: string, template: string) {
-  return `---\ndescription: ${description}\n---\n${template}`
-}
-
 function sourceCases() {
   return [
     {
@@ -420,37 +345,33 @@ function sourceCases() {
       mutate: (directory: string) =>
         Effect.promise(async () => {
           const file = path.join(directory, "review.md")
-          await fs.writeFile(file, markdown("Review created", "Review created"))
+          await fs.writeFile(file, "Review created")
           return [{ type: "create" as const, path: file }]
         }),
       verify: (command: Command.Interface) =>
         Effect.gen(function* () {
-          expect((yield* command.get("review"))?.description).toBe("Review created")
+          expect((yield* command.get("review"))?.template).toBe("Review created")
         }),
     },
     {
       name: "updated",
       prepare: (directory: string) =>
-        Effect.promise(() =>
-          fs.writeFile(path.join(directory, "review.md"), markdown("Review first", "Review first")),
-        ),
+        Effect.promise(() => fs.writeFile(path.join(directory, "review.md"), "Review first")),
       mutate: (directory: string) =>
         Effect.promise(async () => {
           const file = path.join(directory, "review.md")
-          await fs.writeFile(file, markdown("Review updated", "Review updated"))
+          await fs.writeFile(file, "Review updated")
           return [{ type: "update" as const, path: file }]
         }),
       verify: (command: Command.Interface) =>
         Effect.gen(function* () {
-          expect((yield* command.get("review"))?.description).toBe("Review updated")
+          expect((yield* command.get("review"))?.template).toBe("Review updated")
         }),
     },
     {
       name: "renamed",
       prepare: (directory: string) =>
-        Effect.promise(() =>
-          fs.writeFile(path.join(directory, "review.md"), markdown("Review renamed", "Review renamed")),
-        ),
+        Effect.promise(() => fs.writeFile(path.join(directory, "review.md"), "Review renamed")),
       mutate: (directory: string) =>
         Effect.promise(async () => {
           const previous = path.join(directory, "review.md")
@@ -464,7 +385,7 @@ function sourceCases() {
       verify: (command: Command.Interface) =>
         Effect.gen(function* () {
           expect(yield* command.get("review")).toBeUndefined()
-          expect((yield* command.get("release"))?.description).toBe("Review renamed")
+          expect((yield* command.get("release"))?.template).toBe("Review renamed")
         }),
     },
     {

packages/core/test/config/plugin.test.ts

@@ -52,17 +52,6 @@ describe("PluginSupervisor config", () => {
     ),
   )
 
-  it.live("allows the built-in Plan agent to be disabled", () =>
-    withLocation(
-      { agents: { plan: { disabled: true } } },
-      Effect.gen(function* () {
-        yield* ready()
-        const agents = yield* Agent.Service
-        expect(yield* agents.get(Agent.ID.make("plan"))).toBeUndefined()
-      }),
-    ),
-  )
-
   it.live("loads configured Promise plugins with options", () =>
     withLocation(
       {

packages/core/test/config/reload.test.ts

@@ -14,22 +14,16 @@ import { Bus } from "@opencode-ai/core/bus"
 import { Integration } from "@opencode-ai/core/integration"
 import { Plugin } from "@opencode-ai/core/plugin"
 import { PluginHost } from "@opencode-ai/core/plugin/host"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { Provider } from "@opencode-ai/core/provider"
 import { Reference } from "@opencode-ai/core/reference"
 import { Skill } from "@opencode-ai/core/skill"
-import { ShellSelect } from "@opencode-ai/core/shell/select"
 import { Global } from "@opencode-ai/util/global"
-import { AppProcess } from "@opencode-ai/util/process"
-import { Effect, Layer, Schema } from "effect"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
+import { Effect, Schema } from "effect"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { testEffect } from "../lib/effect"
 import { PluginTestLayer } from "../plugin/fixture"
 
-const it = testEffect(
-  Layer.merge(PluginTestLayer, AppNodeBuilder.build(LayerNode.group([AppProcess.node, ShellSelect.node]))),
-)
+const it = testEffect(PluginTestLayer)
 const decode = Schema.decodeUnknownSync(Info)
 const document = path.join(import.meta.dir, "opencode.json")
 

packages/core/test/plugin/command.test.ts

@@ -1,18 +1,10 @@
 import { describe, expect } from "bun:test"
 import { Effect, Layer } from "effect"
 import { Command } from "@opencode-ai/core/command"
-import { Bus } from "@opencode-ai/core/bus"
 import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
 import { Location } from "@opencode-ai/core/location"
-import { MCP } from "@opencode-ai/core/mcp/index"
 import { CommandPlugin } from "@opencode-ai/core/plugin/command"
 import { AbsolutePath } from "@opencode-ai/core/schema"
-import { Session } from "@opencode-ai/schema/session"
-import { SessionInbox } from "@opencode-ai/schema/session-inbox"
-import { SessionMessage } from "@opencode-ai/schema/session-message"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { DateTime } from "effect"
-import { emptyMcpLayer } from "../fixture/mcp"
 import { location } from "../fixture/location"
 import { testEffect } from "../lib/effect"
 import { host } from "./host"
@@ -23,18 +15,12 @@ const locationLayer = Layer.succeed(
   Location.Service,
   Location.Service.of(location({ directory }, { projectDirectory: project })),
 )
-const it = testEffect(
-  AppNodeBuilder.build(LayerNode.group([Command.node, MCP.node, Bus.node]), [
-    [MCP.node, emptyMcpLayer],
-    [Location.node, locationLayer],
-  ]),
-)
+const it = testEffect(AppNodeBuilder.build(Command.node, [[Location.node, locationLayer]]))
 
 describe("CommandPlugin.Plugin", () => {
   it.effect("registers built-in init and review commands", () =>
     Effect.gen(function* () {
       const command = yield* Command.Service
-      const prompts: { text: string; files?: readonly { readonly uri: string }[] }[] = []
       yield* CommandPlugin.Plugin.effect(
         host({
           command: {
@@ -42,20 +28,6 @@ describe("CommandPlugin.Plugin", () => {
             transform: command.transform,
             reload: command.reload,
           },
-          session: {
-            prompt: (input) =>
-              Effect.sync(() => {
-                prompts.push({ text: input.text, files: input.files })
-                return SessionInbox.User.make({
-                  id: SessionMessage.ID.make("msg_test"),
-                  sessionID: input.sessionID,
-                  timeCreated: DateTime.makeUnsafe(0),
-                  type: "user",
-                  payload: { text: input.text },
-                  delivery: input.delivery ?? "steer",
-                })
-              }),
-          },
         }),
       ).pipe(
         Effect.provideService(
@@ -68,24 +40,11 @@ describe("CommandPlugin.Plugin", () => {
         name: "init",
         description: "guided AGENTS.md setup",
       })
+      expect((yield* command.get("init"))?.template).toContain("`/repo`")
       expect(yield* command.get("review")).toMatchObject({
         name: "review",
         description: "review changes [commit|branch|pr], defaults to uncommitted",
       })
-      yield* command.execute({
-        name: "init",
-        invocation: {
-          sessionID: Session.ID.make("ses_test"),
-          prompt: { text: "extra context", files: [{ uri: "file:///tmp/context.md" }] },
-          delivery: "queue",
-        },
-      })
-      expect(prompts).toEqual([
-        {
-          text: expect.stringContaining("extra context"),
-          files: [{ uri: "file:///tmp/context.md" }],
-        },
-      ])
     }),
   )
 })

packages/core/test/plugin/fixtures/config-effect-plugin.ts

@@ -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",

packages/core/test/plugin/promise.test.ts

@@ -121,7 +121,7 @@ describe("fromPromise", () => {
     }),
   )
 
-  it.effect("preserves interrupt results and rejected Promise behavior", () =>
+  it.effect("preserves no-content and rejected Promise behavior", () =>
     Effect.gen(function* () {
       const seen: unknown[] = []
       const host = testHost({
@@ -131,7 +131,7 @@ describe("fromPromise", () => {
               return Effect.fail(new Error("interrupt failed"))
             }
             expect(input.continue).toBe(true)
-            return Effect.succeed({ interrupted: false })
+            return Effect.void
           },
           switchAgent: (input) => Effect.sync(() => seen.push(input)),
           switchModel: (input) => Effect.sync(() => seen.push(input)),
@@ -144,9 +144,7 @@ describe("fromPromise", () => {
         define({
           id: "promise-session-interrupt",
           setup: async (ctx) => {
-            expect(await ctx.session.interrupt({ sessionID: "ses_success", continue: true })).toEqual({
-              interrupted: false,
-            })
+            expect(await ctx.session.interrupt({ sessionID: "ses_success", continue: true })).toBeUndefined()
             await expect(ctx.session.interrupt({ sessionID: "ses_failure" })).rejects.toThrow("interrupt failed")
             expect(await ctx.session.switchAgent({ sessionID: "ses_success", agent: "build" })).toBeUndefined()
             expect(

packages/core/test/session-execution.test.ts

@@ -128,25 +128,12 @@ describe("SessionExecution lifecycle", () => {
       yield* Deferred.await(draining)
       expect((yield* claims(database))[sessionID]).toBe(true)
 
-      expect(yield* execution.interrupt(sessionID)).toBeTrue()
+      yield* execution.interrupt(sessionID)
       yield* execution.awaitIdle(sessionID)
       expect((yield* claims(database))[sessionID]).toBe(false)
     }),
   )
 
-  it.effect("reports an idle interrupt as a no-op", () =>
-    Effect.gen(function* () {
-      const sessionID = Session.ID.make("ses_idle_cancel")
-      const scope = yield* Scope.make()
-      yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void))
-      const context = yield* buildExecution(scope, () => Effect.never)
-      const execution = Context.get(context, SessionExecution.Service)
-
-      expect(yield* execution.interrupt(sessionID)).toBeFalse()
-      expect(yield* execution.active).not.toContain(sessionID)
-    }),
-  )
-
   it.effect("starts every claimed execution without waiting for earlier drains to finish", () =>
     Effect.gen(function* () {
       const database = yield* Database.Service

packages/core/test/session-prompt.test.ts

@@ -48,7 +48,6 @@ const execution = Layer.succeed(
       Effect.sync(() => {
         interruptCalls.push(sessionID)
         interruptContinuations.push(options?.continue)
-        return activeSessions.delete(sessionID)
       }),
     wake: (sessionID) =>
       Effect.sync(() => {
@@ -194,7 +193,7 @@ describe("Session.prompt", () => {
       interruptCalls.length = 0
       wakeCalls.length = 0
 
-      expect(yield* session.interrupt(sessionID)).toBeFalse()
+      yield* session.interrupt(sessionID)
       expect(interruptCalls).toEqual([sessionID])
       expect(wakeCalls).toEqual([])
       expect(yield* session.messages({ sessionID })).toEqual([])

packages/core/test/session-run-coordinator.test.ts

@@ -236,7 +236,7 @@ describe("SessionRunCoordinator", () => {
           drain: () => Effect.void,
           settled: (_key, _exit, reason) => Effect.sync(() => void reasons.push(reason)),
         })
-        expect(yield* coordinator.interrupt("session", "user")).toBeFalse()
+        yield* coordinator.interrupt("session", "user")
         yield* coordinator.run("session")
         expect(reasons).toEqual([undefined])
       }),
@@ -260,7 +260,7 @@ describe("SessionRunCoordinator", () => {
 
         const run = yield* coordinator.run("session").pipe(Effect.forkChild)
         yield* Deferred.await(settling)
-        expect(yield* coordinator.interrupt("session", "user")).toBeFalse()
+        yield* coordinator.interrupt("session", "user")
         yield* Deferred.succeed(release, undefined)
         yield* Fiber.join(run)
         yield* coordinator.run("session")
@@ -315,7 +315,7 @@ describe("SessionRunCoordinator", () => {
         const idle = yield* coordinator.awaitIdle("session").pipe(Effect.forkChild)
         yield* Effect.yieldNow
         yield* coordinator.wake("session")
-        expect(yield* coordinator.interrupt("session", "user")).toBeTrue()
+        yield* coordinator.interrupt("session", "user")
         yield* Deferred.await(interrupted)
 
         const exits = yield* Fiber.awaitAll([first, second, idle])

packages/core/test/session-stats.test.ts

@@ -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({

packages/core/test/tool-schema.test.ts

@@ -152,21 +152,19 @@ test("portable schema failures become tool failures", async () => {
     },
   }
 
-  const error = await Effect.runPromise(
-    Effect.flip(
-      execute(
-        {
-          name: "invalid",
-          description: "Invalid",
-          input,
-          execute: () => Effect.succeed({ content: "unused" }),
-        },
-        1,
-        {} as Tool.Context,
-      ),
+  const error = await Effect.runPromiseExit(
+    execute(
+      {
+        name: "invalid",
+        description: "Invalid",
+        input,
+        execute: () => Effect.succeed({ content: "unused" }),
+      },
+      1,
+      {} as Tool.Context,
     ),
   )
-  expect(error).toEqual(new Tool.Error({ message: "Invalid tool input: expected a string" }))
+  expect(error.toString()).toContain("Invalid tool input: expected a string")
 })
 
 test("canonical results carry metadata with typed output", async () => {
@@ -187,21 +185,8 @@ test("canonical results carry metadata with typed output", async () => {
   })
 })
 
-test("raw JSON schemas validate and decode tool input", async () => {
-  const input = {
-    type: "object",
-    properties: {
-      value: { type: "string" },
-      nested: {
-        type: "object",
-        properties: { count: { type: "integer", minimum: 1 } },
-        required: ["count"],
-        additionalProperties: false,
-      },
-    },
-    required: ["value"],
-    additionalProperties: false,
-  }
+test("raw JSON schemas are render-only and omitted output means model-only", async () => {
+  const input = { type: "object", properties: { value: { type: "string" } } }
   const tool: Info = {
     name: "raw",
     description: "Raw tool",
@@ -212,61 +197,11 @@ test("raw JSON schemas validate and decode tool input", async () => {
   expect(definition(tool)).toEqual({
     name: "raw",
     description: "Raw tool",
-    inputSchema: input,
+    inputSchema: { type: "object", properties: { value: { type: "string" } } },
   })
-  expect(await Effect.runPromise(execute(tool, { value: "ok", extra: true }, {} as Tool.Context))).toEqual({
+  expect(await Effect.runPromise(execute(tool, { value: 1 }, {} as Tool.Context))).toEqual({
     output: undefined,
-    content: [{ type: "text", text: '{"value":"ok"}' }],
-  })
-  expect(await Effect.runPromise(Effect.flip(execute(tool, { value: 1 }, {} as Tool.Context)))).toEqual(
-    new Tool.Error({ message: 'Invalid tool input: Expected string\n  at ["value"]' }),
-  )
-  expect(await Effect.runPromise(Effect.flip(execute(tool, {}, {} as Tool.Context)))).toEqual(
-    new Tool.Error({ message: 'Invalid tool input: Missing key\n  at ["value"]' }),
-  )
-  expect(
-    await Effect.runPromise(Effect.flip(execute(tool, { value: "ok", nested: { count: 0 } }, {} as Tool.Context))),
-  ).toEqual(
-    new Tool.Error({
-      message: 'Invalid tool input: Expected a value greater than or equal to 1\n  at ["nested"]["count"]',
-    }),
-  )
-})
-
-test("raw JSON schemas resolve draft-07 definitions", async () => {
-  const tool: Info = {
-    name: "draft-07",
-    description: "Draft-07 tool",
-    input: {
-      type: "object",
-      properties: { value: { $ref: "#/definitions/value" } },
-      required: ["value"],
-      definitions: { value: { type: "string" } },
-    },
-    execute: (input) => Effect.succeed({ content: JSON.stringify(input) }),
-  }
-
-  expect(await Effect.runPromise(execute(tool, { value: "ok" }, {} as Tool.Context))).toMatchObject({
-    content: [{ type: "text", text: '{"value":"ok"}' }],
-  })
-  expect(await Effect.runPromise(Effect.flip(execute(tool, { value: 1 }, {} as Tool.Context)))).toEqual(
-    new Tool.Error({ message: 'Invalid tool input: Expected value\n  at ["value"]' }),
-  )
-})
-
-test("raw JSON schemas pass input through when they cannot be imported", async () => {
-  const tool: Info = {
-    name: "invalid-schema",
-    description: "Invalid schema tool",
-    input: {
-      type: "object",
-      properties: { value: { $ref: "#/$defs/missing" } },
-    },
-    execute: (input) => Effect.succeed({ content: JSON.stringify(input) }),
-  }
-
-  expect(await Effect.runPromise(execute(tool, { value: 1, extra: true }, {} as Tool.Context))).toMatchObject({
-    content: [{ type: "text", text: '{"value":1,"extra":true}' }],
+    content: [{ type: "text", text: '{"value":1}' }],
   })
 })
 

packages/core/test/tool-shell.test.ts

@@ -115,7 +115,7 @@ const executionNode = makeGlobalNode({
         active: Effect.succeed(new Set()),
         resume: complete,
         wake: () => Effect.void,
-        interrupt: () => Effect.succeed(false),
+        interrupt: () => Effect.void,
         awaitIdle: (id) => complete(id).pipe(Effect.exit, Effect.asVoid),
       })
     }),

packages/core/test/tool-subagent.test.ts

@@ -88,7 +88,7 @@ const executionNode = makeGlobalNode({
         active: Effect.succeed(new Set()),
         resume: complete,
         wake: () => Effect.void,
-        interrupt: () => Effect.succeed(false),
+        interrupt: () => Effect.void,
         awaitIdle: (sessionID) => complete(sessionID).pipe(Effect.exit, Effect.asVoid),
       })
     }),

packages/core/test/workspace.test.ts

@@ -41,7 +41,7 @@ const driver = WorkspaceDriver.make({
 const it = testEffect(
   AppNodeBuilder.build(
     LayerNode.group([Database.node, Workspace.configured({ idleThreshold: "5 minutes", pollInterval: "1 minute" })]),
-    [[WorkspaceDriver.node, WorkspaceDriver.registryNode({ fake: driver, other: driver })]],
+    [[WorkspaceDriver.node, WorkspaceDriver.registryNode({ fake: driver })]],
   ),
 )
 
@@ -77,7 +77,7 @@ it.effect("rejects unregistered workspace providers", () =>
 it.effect("creates and persists an ID without provisioning", () =>
   Effect.gen(function* () {
     const workspace = yield* Workspace.Service
-    const workspaceID = yield* workspace.create({ provider: "fake" })
+    const workspaceID = yield* workspace.create("fake")
 
     expect(workspaceID.startsWith("wrk_")).toBe(true)
     expect(calls).toEqual([])
@@ -89,76 +89,12 @@ it.effect("creates and persists an ID without provisioning", () =>
   }),
 )
 
-it.effect("creates a workspace with a caller-supplied ID", () =>
-  Effect.gen(function* () {
-    const workspace = yield* Workspace.Service
-    const id = Workspace.ID.create()
-
-    expect(yield* workspace.create({ id, provider: "fake" })).toBe(id)
-    expect(
-      yield* Database.Service.use(({ db }) =>
-        db.select().from(WorkspaceTable).where(eq(WorkspaceTable.id, id)).get(),
-      ).pipe(Effect.orDie),
-    ).toMatchObject({ id, provider: "fake", binding: null })
-  }),
-)
-
-it.effect("reuses a caller-supplied ID with the same provider", () =>
-  Effect.gen(function* () {
-    const workspace = yield* Workspace.Service
-    const id = Workspace.ID.create()
-
-    expect(yield* workspace.create({ id, provider: "fake" })).toBe(id)
-    expect(yield* workspace.create({ id, provider: "fake" })).toBe(id)
-    expect(
-      yield* Database.Service.use(({ db }) =>
-        db.select().from(WorkspaceTable).where(eq(WorkspaceTable.id, id)).all(),
-      ).pipe(Effect.orDie),
-    ).toHaveLength(1)
-    expect(calls).toEqual([])
-  }),
-)
-
-it.effect("rejects a caller-supplied ID already assigned to another provider", () =>
-  Effect.gen(function* () {
-    const workspace = yield* Workspace.Service
-    const id = Workspace.ID.create()
-    yield* workspace.create({ id, provider: "fake" })
-
-    expect(yield* workspace.create({ id, provider: "other" }).pipe(Effect.flip)).toEqual(
-      new Workspace.CreateConflict({ workspaceID: id, provider: "other", existingProvider: "fake" }),
-    )
-  }),
-)
-
-it.effect("resolves an existing caller-supplied ID before provider lookup", () =>
-  Effect.gen(function* () {
-    const workspace = yield* Workspace.Service
-    const id = Workspace.ID.create()
-    yield* Database.Service.use(({ db }) =>
-      db
-        .insert(WorkspaceTable)
-        .values({ id, provider: "missing", binding: null, created_at: 0, last_used_at: 0 })
-        .run(),
-    ).pipe(Effect.orDie)
-
-    expect(yield* workspace.create({ id, provider: "missing" })).toBe(id)
-    expect(yield* workspace.create({ id, provider: "another-missing" }).pipe(Effect.flip)).toEqual(
-      new Workspace.CreateConflict({
-        workspaceID: id,
-        provider: "another-missing",
-        existingProvider: "missing",
-      }),
-    )
-  }),
-)
-
 it.effect("destroys an unprovisioned workspace through the driver with a null binding", () =>
   Effect.gen(function* () {
     const workspace = yield* Workspace.Service
-    const workspaceID = yield* workspace.create({ provider: "fake" })
+    const workspaceID = yield* workspace.create("fake")
 
-    expect(yield* workspace.destroy(workspaceID)).toEqual({ destroyed: true })
+    yield* workspace.destroy(workspaceID)
     expect(calls).toEqual([{ operation: "destroy", binding: null }])
     expect(
       yield* Database.Service.use(({ db }) =>
@@ -168,31 +104,10 @@ it.effect("destroys an unprovisioned workspace through the driver with a null bi
   }),
 )
 
-it.effect("succeeds without calling the driver when the workspace does not exist", () =>
-  Effect.gen(function* () {
-    const workspace = yield* Workspace.Service
-    const workspaceID = Workspace.ID.create()
-
-    expect(yield* workspace.destroy(workspaceID)).toEqual({ destroyed: false })
-    expect(calls).toEqual([])
-  }),
-)
-
-it.effect("reports whether destroy removed an existing workspace", () =>
-  Effect.gen(function* () {
-    const workspace = yield* Workspace.Service
-    const workspaceID = yield* workspace.create({ provider: "fake" })
-
-    expect(yield* workspace.destroy(workspaceID)).toEqual({ destroyed: true })
-    expect(yield* workspace.destroy(workspaceID)).toEqual({ destroyed: false })
-    expect(calls).toEqual([{ operation: "destroy", binding: null }])
-  }),
-)
-
 it.effect("starts eager provisioning in the background and lets callers join it", () =>
   Effect.gen(function* () {
     const workspace = yield* Workspace.Service
-    const workspaceID = yield* workspace.create({ provider: "fake" })
+    const workspaceID = yield* workspace.create("fake")
     const gate = yield* gateCreate()
 
     const eager = yield* workspace.provision(workspaceID).pipe(Effect.forkScoped({ startImmediately: true }))
@@ -211,7 +126,7 @@ it.effect("starts eager provisioning in the background and lets callers join it"
 it.effect("starts lazy provisioning on the first spawn", () =>
   Effect.gen(function* () {
     const workspace = yield* Workspace.Service
-    const workspaceID = yield* workspace.create({ provider: "fake" })
+    const workspaceID = yield* workspace.create("fake")
     const environment = yield* workspace.connect(workspaceID)
     const gate = yield* gateCreate()
 
@@ -230,7 +145,7 @@ it.effect("starts lazy provisioning on the first spawn", () =>
 it.effect("shares provisioning between concurrent first spawns", () =>
   Effect.gen(function* () {
     const workspace = yield* Workspace.Service
-    const workspaceID = yield* workspace.create({ provider: "fake" })
+    const workspaceID = yield* workspace.create("fake")
     const environment = yield* workspace.connect(workspaceID)
     const gate = yield* gateCreate()
 
@@ -254,7 +169,7 @@ it.effect("shares provisioning between concurrent first spawns", () =>
 it.effect("keeps shared provisioning alive when a waiter is interrupted", () =>
   Effect.gen(function* () {
     const workspace = yield* Workspace.Service
-    const workspaceID = yield* workspace.create({ provider: "fake" })
+    const workspaceID = yield* workspace.create("fake")
     const gate = yield* gateCreate()
 
     const owner = yield* workspace.provision(workspaceID).pipe(Effect.forkScoped({ startImmediately: true }))
@@ -272,7 +187,7 @@ it.effect("keeps shared provisioning alive when a waiter is interrupted", () =>
 it.effect("interrupts in-flight provisioning on destroy and fails waiters with NotFound", () =>
   Effect.gen(function* () {
     const workspace = yield* Workspace.Service
-    const workspaceID = yield* workspace.create({ provider: "fake" })
+    const workspaceID = yield* workspace.create("fake")
     const gate = yield* gateCreate()
 
     const waiter = yield* workspace.provision(workspaceID).pipe(Effect.forkScoped({ startImmediately: true }))
@@ -293,7 +208,7 @@ it.effect("interrupts in-flight provisioning on destroy and fails waiters with N
 it.effect("shares a failed attempt and retries the same workspace ID", () =>
   Effect.gen(function* () {
     const workspace = yield* Workspace.Service
-    const workspaceID = yield* workspace.create({ provider: "fake" })
+    const workspaceID = yield* workspace.create("fake")
     const started = yield* Deferred.make<void>()
     const release = yield* Deferred.make<void>()
     let fail = true
@@ -327,7 +242,7 @@ it.effect("shares a failed attempt and retries the same workspace ID", () =>
 it.effect("persists the workspace lifecycle and reconnects after idle suspension", () =>
   Effect.gen(function* () {
     const workspace = yield* Workspace.Service
-    const workspaceID = yield* workspace.create({ provider: "fake" })
+    const workspaceID = yield* workspace.create("fake")
     const created = yield* workspace.provision(workspaceID)
 
     expect(created.id).toBe(workspaceID)
@@ -362,7 +277,7 @@ it.effect("persists the workspace lifecycle and reconnects after idle suspension
 it.effect("surfaces wake failures through the spawn error channel", () =>
   Effect.gen(function* () {
     const workspace = yield* Workspace.Service
-    const created = yield* workspace.provision(yield* workspace.create({ provider: "fake" }))
+    const created = yield* workspace.provision(yield* workspace.create("fake"))
     const environment = yield* workspace.connect(created.id)
     yield* Effect.scoped(environment.spawner.spawn(ChildProcess.make("connect"))).pipe(Effect.exit)
 

packages/function/package.json

@@ -5,9 +5,6 @@
   "private": true,
   "type": "module",
   "license": "MIT",
-  "scripts": {
-    "test": "bun test"
-  },
   "devDependencies": {
     "@cloudflare/workers-types": "catalog:",
     "@tsconfig/node22": "22.0.2",

packages/function/src/api.ts

@@ -5,7 +5,6 @@ import { jwtVerify, createRemoteJWKSet } from "jose"
 import { createAppAuth } from "@octokit/auth-app"
 import { Octokit } from "@octokit/rest"
 import { Resource } from "sst"
-import { parseRepositoryClaim } from "./github"
 
 type Env = {
   SYNC_SERVER: DurableObjectNamespace<SyncServer>
@@ -270,41 +269,42 @@ export default new Hono<{ Bindings: Env }>()
 
     // verify token
     const JWKS = createRemoteJWKSet(new URL(JWKS_URL))
-    let repository: ReturnType<typeof parseRepositoryClaim>
+    let owner, repo
     try {
       const { payload } = await jwtVerify(token, JWKS, {
         issuer: GITHUB_ISSUER,
         audience: EXPECTED_AUDIENCE,
       })
-      repository = parseRepositoryClaim(payload)
+      const sub = payload.sub // e.g. 'repo:my-org/my-repo:ref:refs/heads/main'
+      const parts = sub.split(":")[1].split("/")
+      owner = parts[0]
+      repo = parts[1]
     } catch (err) {
       console.error("Token verification failed:", err)
       return c.json({ error: "Invalid or expired token" }, { status: 403 })
     }
 
-    try {
-      const auth = createAppAuth({
-        appId: Resource.GITHUB_APP_ID.value,
-        privateKey: Resource.GITHUB_APP_PRIVATE_KEY.value,
-      })
-      const appAuth = await auth({ type: "app" })
-      const octokit = new Octokit({ auth: appAuth.token })
-      const { data: installation } = await octokit.apps.getRepoInstallation({
-        owner: repository.owner,
-        repo: repository.repo,
-      })
-      const installationAuth = await auth({
-        type: "installation",
-        installationId: installation.id,
-      })
-      return c.json({ token: installationAuth.token })
-    } catch (error) {
-      console.error("GitHub App token exchange failed:", error)
-      return c.json(
-        { error: `Failed to exchange GitHub App token for ${repository.owner}/${repository.repo}` },
-        { status: 502 },
-      )
-    }
+    // Create app JWT token
+    const auth = createAppAuth({
+      appId: Resource.GITHUB_APP_ID.value,
+      privateKey: Resource.GITHUB_APP_PRIVATE_KEY.value,
+    })
+    const appAuth = await auth({ type: "app" })
+
+    // Lookup installation
+    const octokit = new Octokit({ auth: appAuth.token })
+    const { data: installation } = await octokit.apps.getRepoInstallation({
+      owner,
+      repo,
+    })
+
+    // Get installation token
+    const installationAuth = await auth({
+      type: "installation",
+      installationId: installation.id,
+    })
+
+    return c.json({ token: installationAuth.token })
   })
   /**
    * Used by the GitHub action to get GitHub installation access token given user PAT token (used when testing `opencode github run` locally)

packages/function/src/github.ts

@@ -1,14 +0,0 @@
-import type { JWTPayload } from "jose"
-
-export function parseRepositoryClaim(payload: JWTPayload) {
-  const claim = payload.repository
-  if (typeof claim !== "string") throw new Error("Repository claim is missing")
-
-  const parts = claim.split("/")
-  if (parts.length !== 2 || !parts[0] || !parts[1]) throw new Error("Repository claim is invalid")
-
-  return {
-    owner: parts[0],
-    repo: parts[1],
-  }
-}

packages/function/test/github.test.ts

@@ -1,39 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { parseRepositoryClaim } from "../src/github"
-
-describe("parseRepositoryClaim", () => {
-  test("reads repository identity with a legacy subject", () => {
-    expect(
-      parseRepositoryClaim({
-        repository: "octocat/my-repo",
-        sub: "repo:octocat/my-repo:ref:refs/heads/main",
-      }),
-    ).toEqual({ owner: "octocat", repo: "my-repo" })
-  })
-
-  test("reads repository identity with an immutable subject", () => {
-    expect(
-      parseRepositoryClaim({
-        repository: "octocat/my-repo",
-        sub: "repo:octocat@123456/my-repo@456789:ref:refs/heads/main",
-      }),
-    ).toEqual({ owner: "octocat", repo: "my-repo" })
-  })
-
-  test("does not depend on a repository path in a customized subject", () => {
-    expect(
-      parseRepositoryClaim({
-        repository: "octocat/my-repo",
-        sub: "repository_owner:octocat:repository_visibility:private",
-      }),
-    ).toEqual({ owner: "octocat", repo: "my-repo" })
-  })
-
-  test("rejects a missing repository claim", () => {
-    expect(() => parseRepositoryClaim({})).toThrow("Repository claim is missing")
-  })
-
-  test("rejects an invalid repository claim", () => {
-    expect(() => parseRepositoryClaim({ repository: "octocat" })).toThrow("Repository claim is invalid")
-  })
-})

packages/merman/package.json

@@ -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"
   },

packages/merman/script/layout-audit.ts

@@ -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
-}

packages/merman/src/flowchart/drawing.ts

@@ -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,

packages/merman/src/flowchart/flowchart.test.ts

@@ -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)
   })
 })

packages/merman/src/flowchart/labels.ts

@@ -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)))
 }

packages/merman/src/flowchart/layout.ts

@@ -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")
 }

packages/merman/src/flowchart/options.ts

@@ -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
 }

packages/merman/src/flowchart/routing.ts

@@ -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"