feat(tui): surface plugin failures

packages/protocol/openapi.json

@@ -13083,9 +13083,6 @@
           },
           "text": {
             "type": "string"
-          },
-          "description": {
-            "type": "string"
           }
         },
         "required": ["id", "time", "type", "text"],

packages/tui/src/app.tsx

@@ -38,7 +38,6 @@ import {
   TuiStartupProvider,
   TuiTerminalEnvironmentProvider,
   useTuiApp,
-  useTuiPaths,
   useTuiStartup,
   type TuiApp,
 } from "./context/runtime"
@@ -86,7 +85,6 @@ import { ArgsProvider, useArgs, type Args } from "./context/args"
 import open from "open"
 import { PromptRefProvider, usePromptRef } from "./context/prompt"
 import { Config, ConfigProvider, useConfig } from "./config"
-import { newSessionLocation } from "./config/new-session-location"
 import { PluginProvider, usePlugin, type PackageResolver } from "./plugin/context"
 import { tuiPluginDirectories } from "./plugin/discovery"
 import { PluginRoute, Slot } from "./plugin/render"
@@ -455,7 +453,6 @@ function App(props: { pair?: DialogPairCredentials }) {
   const log = useLog({ component: "app" })
   const app = useTuiApp()
   const startup = useTuiStartup()
-  const paths = useTuiPaths()
   const config = useConfig()
   const devtools = createMemo(() => config.data.debug?.devtools ?? app.channel === "local")
   const route = useRoute()
@@ -662,13 +659,10 @@ function App(props: { pair?: DialogPairCredentials }) {
         run: () => {
           route.navigate({
             type: "home",
-            location: newSessionLocation(
-              config.data.session.new_location,
-              paths.cwd,
+            location:
               route.data.type === "session"
                 ? (data.session.get(route.data.sessionID)?.location ?? location.ref)
                 : undefined,
-            ),
           })
           dialog.clear()
         },

packages/tui/src/component/devtools-bar.tsx

@@ -384,18 +384,16 @@ export function DevToolsBar() {
               >
                 {turnTokens() ? "[x]" : "[ ]"} Turn token usage
               </Action>
-              <Show when={Boolean(turnTokens())}>
-                <Action
-                  onClick={() =>
-                    void config.update((draft) => {
-                      draft.debug = { ...draft.debug, turn_tokens: verboseTurnTokens() ? true : "verbose" }
-                    })
-                  }
-                  hoverBackground
-                >
-                  {verboseTurnTokens() ? "[x]" : "[ ]"} Turn token usage (verbose)
-                </Action>
-              </Show>
+              <Action
+                onClick={() =>
+                  void config.update((draft) => {
+                    draft.debug = { ...draft.debug, turn_tokens: verboseTurnTokens() ? true : "verbose" }
+                  })
+                }
+                hoverBackground
+              >
+                {verboseTurnTokens() ? "[x]" : "[ ]"} Turn token usage (verbose)
+              </Action>
             </box>
             <For each={groups()}>
               {(group) => (

packages/tui/src/component/dialog-config.tsx

@@ -93,15 +93,6 @@ export const settings: Setting[] = [
     labels: ["off", "on"],
     keywords: ["attachments", "images", "tool output"],
   },
-  {
-    title: "New session location",
-    category: "Session",
-    path: ["session", "new_location"],
-    default: "launch",
-    values: ["launch", "inherit"],
-    labels: ["launch directory", "active session"],
-    keywords: ["directory", "cwd", "inherit"],
-  },
   {
     title: "Enabled",
     category: "Tabs",

packages/tui/src/component/dialog-error-details.tsx

@@ -1,6 +1,6 @@
-import { CliRenderEvents, TextAttributes, type ScrollBoxRenderable } from "@opentui/core"
-import { useKeyboard, useRenderer, useTerminalDimensions } from "@opentui/solid"
-import { createEffect, createMemo, createSignal, onCleanup, onMount } from "solid-js"
+import { TextAttributes, type ScrollBoxRenderable } from "@opentui/core"
+import { useKeyboard, useTerminalDimensions } from "@opentui/solid"
+import { createMemo, createSignal, onMount } from "solid-js"
 import { useConfig } from "../config"
 import { useClipboard } from "../context/clipboard"
 import { Keymap } from "../context/keymap"
@@ -15,33 +15,14 @@ export function DialogErrorDetails(props: { title: string; error: string; onBack
   const toast = useToast()
   const theme = useTheme("elevated")
   const overlayTheme = useTheme("overlay")
-  const renderer = useRenderer()
   const dimensions = useTerminalDimensions()
   const config = useConfig().data
   const [copied, setCopied] = createSignal(false)
-  const [scrollable, setScrollable] = createSignal(false)
   const height = createMemo(() => Math.max(3, Math.floor(dimensions().height / 2) - 5))
   let scroll: ScrollBoxRenderable | undefined
-  let measure: (() => void) | undefined
 
   onMount(() => dialog.setSize("large"))
 
-  createEffect(() => {
-    dimensions()
-    props.error
-    if (measure) renderer.off(CliRenderEvents.FRAME, measure)
-    measure = () => {
-      measure = undefined
-      setScrollable(Boolean(scroll && scroll.scrollHeight > scroll.viewport.height))
-    }
-    renderer.once(CliRenderEvents.FRAME, measure)
-    renderer.requestRender()
-  })
-
-  onCleanup(() => {
-    if (measure) renderer.off(CliRenderEvents.FRAME, measure)
-  })
-
   const copy = () => {
     void clipboard
       .write(props.error)
@@ -51,14 +32,11 @@ export function DialogErrorDetails(props: { title: string; error: string; onBack
 
   Keymap.createLayer(() => ({
     mode: "modal",
-    commands: [
-      { bind: "escape", title: "Back", group: "Dialog", run: props.onBack },
-      { bind: "c", title: "Copy details", group: "Dialog", run: copy },
-    ],
+    commands: [{ bind: "escape", title: "Back", group: "Dialog", run: props.onBack }],
   }))
 
   useKeyboard((event) => {
-    if (!scrollable()) return
+    if (event.name === "c") return copy()
     if (event.name === "up") return scroll?.scrollBy(-1)
     if (event.name === "down") return scroll?.scrollBy(1)
     if (event.name === "pageup") return scroll?.scrollBy(-height())
@@ -74,7 +52,7 @@ export function DialogErrorDetails(props: { title: string; error: string; onBack
           {props.title}
         </text>
         <text fg={theme.text.subdued} onMouseUp={props.onBack}>
-          esc
+          esc back
         </text>
       </box>
       <text fg={theme.text.feedback.error.default}>✗ Failed</text>
@@ -97,17 +75,9 @@ export function DialogErrorDetails(props: { title: string; error: string; onBack
         </scrollbox>
       </box>
       <box flexDirection="row" justifyContent="space-between">
-        <text>
-          <span style={{ fg: theme.text.default }}>
-            <b>{scrollable() ? "↑/↓" : ""}</b>
-          </span>
-          <span style={{ fg: theme.text.subdued }}>{scrollable() ? " scroll" : ""}</span>
-        </text>
-        <text onMouseUp={copy}>
-          <span style={{ fg: copied() ? theme.text.feedback.success.default : theme.text.default }}>
-            <b>{copied() ? "✓ copied" : "c"}</b>
-          </span>
-          <span style={{ fg: theme.text.subdued }}>{copied() ? "" : " copy details"}</span>
+        <text fg={theme.text.subdued}>↑↓ scroll</text>
+        <text fg={theme.text.subdued} onMouseUp={copy}>
+          {copied() ? "✓ copied" : "c copy details"}
         </text>
       </box>
     </box>

packages/tui/src/component/session-tabs.tsx

@@ -27,8 +27,6 @@ import { marqueeText } from "../util/marquee"
 
 // A long title fades out over its last cells instead of cutting hard.
 const FADE_WIDTH = 4
-// The add button renders as " + " at the end of the strip, so the tab layout leaves it room.
-const ADD_TAB_WIDTH = 3
 const MARQUEE_DELAY = 600
 const MARQUEE_INTERVAL = 100
 
@@ -44,7 +42,6 @@ export const EMPTY_SESSION_TAB_STATUS: SessionTabsStatus = {
 }
 export type SessionTabsController = Pick<ContextController, "tabs" | "current" | "select" | "close" | "move"> & {
   newTab?: () => boolean
-  add?: () => void
   status(sessionID: string): SessionTabsStatus
 }
 
@@ -106,23 +103,22 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
   const separatorUpperPulseColor = createMemo(() => tint(theme.background.default, theme.text.default, 0.04))
   const separatorLowerPulseColor = createMemo(() => tint(theme.background.default, theme.text.default, 0.05))
   const [hovered, setHovered] = createSignal<string>()
-  const [addHovered, setAddHovered] = createSignal(false)
   const marquee = createMarquee(hovered, animations)
   const [dragging, setDragging] = createSignal<string>()
   const [preview, setPreview] = createSignal<{ sessionID: string; index: number }>()
   const newTab = () => tabs.newTab?.() ?? false
-  const activeID = createMemo(() => (newTab() ? undefined : tabs.current()))
+  const activeID = createMemo(() => (newTab() ? NEW_SESSION_TAB.sessionID : tabs.current()))
   const ordered = createMemo(() => {
     const pending = preview()
     if (!pending) return tabs.tabs()
     return moveSessionTab(tabs.tabs(), pending.sessionID, pending.index)
   })
-  const items = ordered
+  const items = createMemo(() => (newTab() ? [...ordered(), NEW_SESSION_TAB] : ordered()))
   const statuses = createMemo(
     () =>
       new Map(
         items().map((tab) => {
-          const status = tabs.status(tab.sessionID)
+          const status = tab === NEW_SESSION_TAB ? EMPTY_SESSION_TAB_STATUS : tabs.status(tab.sessionID)
           return [
             tab.sessionID,
             {
@@ -149,8 +145,6 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
 
   createEffect(() => {
     if (!scroll) return
-    // The promoted new-session slot sits below the list, so bring the rail's bottom into view.
-    if (newTab()) return scroll.scrollTo(Math.max(0, items().length * 3 + 1 - scroll.viewport.height))
     const index = items().findIndex((tab) => tab.sessionID === activeID())
     if (index === -1) return
     const top = index * 3
@@ -177,7 +171,7 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
               const selected = () => activeID() === tab.sessionID
               const status = createMemo(() => itemStatus(tab))
               const [sweepLevel, setSweepLevel] = createSignal(0)
-              const session = createMemo(() => data.session.get(tab.sessionID))
+              const session = createMemo(() => (tab === NEW_SESSION_TAB ? undefined : data.session.get(tab.sessionID)))
               const project = createMemo(() => {
                 const value = session()
                 return value ? data.project.get(value.projectID) : undefined
@@ -194,6 +188,7 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
               const visibleTitleParts = createMemo(() => Locale.graphemes(visibleTitle()))
               const titleFades = createMemo(() => stringWidth(title()) >= titleWidth() && titleWidth() > FADE_WIDTH)
               const detail = createMemo(() => {
+                if (tab === NEW_SESSION_TAB) return Locale.takeWidth("Start a new session", titleWidth())
                 const value = session()
                 return Locale.takeWidth(projectName(project(), value?.location.directory) ?? "", titleWidth())
               })
@@ -265,7 +260,7 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
                 setDragging(undefined)
                 const pending = preview()
                 if (pending?.sessionID === tab.sessionID) tabs.move(pending.sessionID, pending.index)
-                tabs.select(tab.sessionID)
+                if (tab !== NEW_SESSION_TAB) tabs.select(tab.sessionID)
               }
               return (
                 <box
@@ -282,7 +277,7 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
                   }}
                   onMouseUp={release}
                   onMouseDrag={(event) => {
-                    if (!rail) return
+                    if (!rail || tab === NEW_SESSION_TAB) return
                     const target = Math.max(
                       0,
                       Math.min(
@@ -391,7 +386,7 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
                         onMouseUp={(event) => {
                           if (hovered() !== tab.sessionID) return
                           event.stopPropagation()
-                          tabs.close(tab.sessionID)
+                          tabs.close(tab === NEW_SESSION_TAB ? undefined : tab.sessionID)
                         }}
                       >
                         {hovered() === tab.sessionID ? "×" : ""}
@@ -422,63 +417,6 @@ function VerticalSessionTabs(props: { controller?: SessionTabsController; animat
               )
             }}
           </For>
-          {/* One slot with two states: a subdued affordance that promotes in place into the
-              active new-session tab, instead of spawning a separate pseudo tab above itself. */}
-          <Show when={tabs.add || newTab()}>
-            <box
-              height={1}
-              width="100%"
-              position="relative"
-              flexDirection="row"
-              paddingLeft={1}
-              backgroundColor={
-                newTab()
-                  ? theme.background.action.primary.selected
-                  : addHovered()
-                    ? theme.background.action.primary.hovered
-                    : theme.background.default
-              }
-              onMouseOver={() => setAddHovered(true)}
-              onMouseOut={() => setAddHovered(false)}
-              onMouseUp={() => {
-                if (!newTab()) tabs.add?.()
-              }}
-            >
-              <text
-                width={2}
-                fg={newTab() ? activeNumber() : addHovered() ? theme.text.default : idleNumber()}
-                selectable={false}
-                attributes={newTab() ? TextAttributes.BOLD : undefined}
-              >
-                +
-              </text>
-              <text
-                fg={newTab() || addHovered() ? theme.text.default : theme.text.subdued}
-                wrapMode="none"
-                selectable={false}
-                attributes={newTab() ? TextAttributes.BOLD : undefined}
-              >
-                {NEW_SESSION_TAB_TITLE}
-              </text>
-              <Show when={newTab()}>
-                <text
-                  position="absolute"
-                  right={1}
-                  zIndex={2}
-                  width={1}
-                  fg={theme.text.subdued}
-                  selectable={false}
-                  onMouseUp={(event) => {
-                    if (!addHovered()) return
-                    event.stopPropagation()
-                    tabs.close()
-                  }}
-                >
-                  {addHovered() ? "×" : ""}
-                </text>
-              </Show>
-            </box>
-          </Show>
         </box>
       </scrollbox>
     </box>
@@ -493,7 +431,6 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
   const config = useConfig().data
   const animations = () => props.animations ?? config.animations ?? true
   const [hovered, setHovered] = createSignal<string>()
-  const [addHovered, setAddHovered] = createSignal(false)
   const marquee = createMarquee(hovered, animations)
   const [dragging, setDragging] = createSignal<string>()
   // A drag reorders a local preview and persists one move on release instead of writing
@@ -512,10 +449,7 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
     if (!pending) return tabs.tabs()
     return moveSessionTab(tabs.tabs(), pending.sessionID, pending.index)
   })
-  // The promoted new-session slot joins the strip as the active tab; the idle plus affordance
-  // and the promoted slot are mutually exclusive states of one control.
   const items = createMemo(() => (newTab() ? [...ordered(), NEW_SESSION_TAB] : ordered()))
-  const showPlus = () => Boolean(tabs.add) && !newTab()
   createEffect(() => {
     const pending = preview()
     if (!pending || dragging()) return
@@ -523,12 +457,7 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
     if (index === -1 || index === Math.min(pending.index, tabs.tabs().length - 1)) setPreview(undefined)
   })
   const layout = createMemo((previous: ReturnType<typeof adaptiveSessionTabLayout> | undefined) =>
-    adaptiveSessionTabLayout(
-      items(),
-      activeID(),
-      dimensions().width - (showPlus() ? ADD_TAB_WIDTH : 0),
-      previous?.start,
-    ),
+    adaptiveSessionTabLayout(items(), activeID(), dimensions().width, previous?.start),
   )
   const statuses = createMemo(
     () =>
@@ -775,7 +704,7 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
                   {" "}
                 </text>
                 <text width={numberWidth()} fg={numberColor()} selectable={false} attributes={bold()}>
-                  {tab === NEW_SESSION_TAB ? "+" : sessionTabShortcutLabel(tabNumber() - 1)}
+                  {sessionTabShortcutLabel(tabNumber() - 1)}
                 </text>
                 <text
                   width={availableTitleWidth()}
@@ -817,19 +746,6 @@ function HorizontalSessionTabs(props: { controller?: SessionTabsController; anim
           {" " + layout().after}›
         </text>
       </Show>
-      <Show when={showPlus()}>
-        <text
-          width={ADD_TAB_WIDTH}
-          fg={addHovered() ? theme.text.default : theme.text.subdued}
-          bg={addHovered() ? theme.background.action.primary.hovered : undefined}
-          selectable={false}
-          onMouseOver={() => setAddHovered(true)}
-          onMouseOut={() => setAddHovered(false)}
-          onMouseUp={() => tabs.add?.()}
-        >
-          {" + "}
-        </text>
-      </Show>
     </box>
   )
 }

packages/tui/src/config/index.tsx

@@ -137,9 +137,6 @@ export const Info = Schema.Struct({
       markdown: Schema.optional(Schema.Literals(["source", "rendered"])).annotate({
         description: "Show Markdown syntax markers or conceal them in rendered transcript content",
       }),
-      new_location: Schema.optional(Schema.Literals(["launch", "inherit"])).annotate({
-        description: "Start new sessions in the TUI launch directory or inherit the active session location",
-      }),
     }),
   ).annotate({ description: "Session transcript presentation settings" }),
   tabs: Schema.optional(
@@ -205,7 +202,7 @@ export const Info = Schema.Struct({
 })
 export type Info = Schema.Schema.Type<typeof Info>
 
-export type Resolved = Omit<Info, "attention" | "cursor" | "keybinds" | "leader" | "mouse" | "session" | "tabs"> & {
+export type Resolved = Omit<Info, "attention" | "cursor" | "keybinds" | "leader" | "mouse" | "tabs"> & {
   attention: {
     enabled: boolean
     notifications: boolean
@@ -221,9 +218,6 @@ export type Resolved = Omit<Info, "attention" | "cursor" | "keybinds" | "leader"
     style: "block" | "underline" | "line" | "default"
     blinking: boolean
   }
-  session: Omit<NonNullable<Info["session"]>, "new_location"> & {
-    new_location: "launch" | "inherit"
-  }
   tabs: {
     enabled: boolean
     scope: "global" | "cwd"
@@ -265,10 +259,6 @@ export function resolve(input: Info, options: { terminalSuspend: boolean }): Res
           blinking: input.cursor.blinking ?? true,
         }
       : undefined,
-    session: {
-      ...input.session,
-      new_location: input.session?.new_location ?? "launch",
-    },
     tabs: {
       ...input.tabs,
       enabled: input.tabs?.enabled ?? true,

packages/tui/src/config/new-session-location.ts

@@ -1,10 +0,0 @@
-import type { LocationRef } from "@opencode-ai/client/promise"
-
-export function newSessionLocation(
-  mode: "launch" | "inherit",
-  launchDirectory: string,
-  current?: LocationRef,
-): LocationRef {
-  if (mode === "inherit" && current) return current
-  return { directory: launchDirectory }
-}

packages/tui/src/context/session-tabs.tsx

@@ -7,7 +7,6 @@ import { withTimestampedFallback } from "@opencode-ai/util/session-title-fallbac
 import { useEvent } from "./event"
 import { useRoute } from "./route"
 import { useConfig } from "../config"
-import { useLocation } from "./location"
 import { useStorage } from "./storage"
 import { useTuiPaths } from "./runtime"
 import {
@@ -49,7 +48,6 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
     const data = useData()
     const event = useEvent()
     const config = useConfig().data
-    const location = useLocation()
     const paths = useTuiPaths()
     const enabled = () => config.tabs.enabled
     // Keyed reconcile keeps tab object identity across reorders, so strip rows move instead of
@@ -251,14 +249,6 @@ export const { use: useSessionTabs, provider: SessionTabsProvider } = createSimp
         if (!enabled()) return
         route.navigate({ type: "session", sessionID: root(sessionID) })
       },
-      add() {
-        if (!enabled()) return
-        const sessionID = current()
-        route.navigate({
-          type: "home",
-          location: (sessionID ? data.session.get(sessionID)?.location : undefined) ?? location.ref,
-        })
-      },
       close(sessionID?: string) {
         if (!enabled()) return
         const target = sessionID ? root(sessionID) : current()

packages/tui/src/feature-plugins/home/footer.tsx

@@ -3,17 +3,7 @@ import { createMemo, Match, Show, Switch } from "solid-js"
 import { useTerminalDimensions } from "@opentui/solid"
 import { usePlugin } from "../../plugin/context"
 
-export function homeFooterVisibility(width: number) {
-  return {
-    mcpCommand: width >= 64,
-    pluginCommand: width >= 80,
-    version: width >= 64,
-  }
-}
-
 function Mcp(props: { context: Plugin.Context }) {
-  const dimensions = useTerminalDimensions()
-  const visibility = createMemo(() => homeFooterVisibility(dimensions().width))
   const list = createMemo(() => props.context.data.location.mcp.server.list(props.context.location) ?? [])
   const failed = createMemo(() => list().filter((item) => item.status.status === "failed").length)
   const count = createMemo(() => list().filter((item) => item.status.status === "connected").length)
@@ -40,17 +30,13 @@ function Mcp(props: { context: Plugin.Context }) {
             </Match>
           </Switch>
         </text>
-        <Show when={visibility().mcpCommand}>
-          <text fg={props.context.theme.text.subdued}>/mcps</text>
-        </Show>
+        <text fg={props.context.theme.text.subdued}>/mcps</text>
       </box>
     </Show>
   )
 }
 
 function Plugins(props: { context: Plugin.Context }) {
-  const dimensions = useTerminalDimensions()
-  const visibility = createMemo(() => homeFooterVisibility(dimensions().width))
   const plugins = usePlugin()
   const failed = createMemo(() => plugins.list().filter((item) => item.status === "failed").length)
 
@@ -61,9 +47,7 @@ function Plugins(props: { context: Plugin.Context }) {
           <span style={{ fg: props.context.theme.text.feedback.error.default }}>⊙ </span>
           {failed()} plugin{failed() === 1 ? "" : "s"} failed
         </text>
-        <Show when={visibility().pluginCommand}>
-          <text fg={props.context.theme.text.subdued}>/plugins</text>
-        </Show>
+        <text fg={props.context.theme.text.subdued}>/plugins</text>
       </box>
     </Show>
   )
@@ -71,7 +55,6 @@ function Plugins(props: { context: Plugin.Context }) {
 
 function View(props: { context: Plugin.Context }) {
   const dimensions = useTerminalDimensions()
-  const visibility = createMemo(() => homeFooterVisibility(dimensions().width))
 
   return (
     <Show when={dimensions().height >= 12 && dimensions().width >= 44}>
@@ -88,11 +71,9 @@ function View(props: { context: Plugin.Context }) {
         <Mcp context={props.context} />
         <Plugins context={props.context} />
         <box flexGrow={1} />
-        <Show when={visibility().version}>
-          <box flexShrink={0}>
-            <text fg={props.context.theme.text.subdued}>{props.context.app.version}</text>
-          </box>
-        </Show>
+        <box flexShrink={0}>
+          <text fg={props.context.theme.text.subdued}>{props.context.app.version}</text>
+        </box>
       </box>
     </Show>
   )

packages/tui/src/feature-plugins/system/plugins.tsx

@@ -34,38 +34,35 @@ function View(props: { context: Plugin.Context; plugins: ReturnType<typeof usePl
           ),
         }),
       )
-    const external = props.plugins
-      .list()
-      .filter((plugin) => plugin.status !== "unsupported")
-      .map(
-        (plugin): DialogSelectOption<string> => ({
-          title: plugin.id ?? plugin.target,
-          value: plugin.id ?? plugin.target,
-          category: "External",
-          searchText: plugin.target,
-          footer: (
-            <span
-              style={{
-                fg:
-                  plugin.status === "active"
-                    ? props.context.theme.text.feedback.success.default
-                    : plugin.status === "failed"
-                      ? props.context.theme.text.feedback.error.default
-                      : props.context.theme.text.subdued,
-              }}
-            >
-              {plugin.status}
-            </span>
-          ),
-        }),
-      )
+    const external = props.plugins.list().map(
+      (plugin): DialogSelectOption<string> => ({
+        title: "id" in plugin ? plugin.id : plugin.target,
+        value: "id" in plugin ? plugin.id : plugin.target,
+        category: "External",
+        searchText: plugin.target,
+        footer: (
+          <span
+            style={{
+              fg:
+                plugin.status === "active"
+                  ? props.context.theme.text.feedback.success.default
+                  : plugin.status === "failed"
+                    ? props.context.theme.text.feedback.error.default
+                    : props.context.theme.text.subdued,
+            }}
+          >
+            {plugin.status}
+          </span>
+        ),
+      }),
+    )
     return [...builtins, ...external].sort((a, b) => a.title.localeCompare(b.title))
   })
 
   const failure = (value: string | undefined) =>
     props.plugins.list().find((plugin) => {
       if (plugin.status !== "failed") return false
-      return (plugin.id ?? plugin.target) === value
+      return ("id" in plugin ? plugin.id : plugin.target) === value
     })
 
   createEffect(() => {
@@ -115,10 +112,7 @@ function View(props: { context: Plugin.Context; plugins: ReturnType<typeof usePl
               {
                 title: "toggle",
                 command: "plugins.toggle",
-                disabled: (option) => {
-                  const failed = failure(option?.value)
-                  return Boolean(failed && !("id" in failed && failed.id))
-                },
+                disabled: (option) => Boolean(failure(option?.value)),
                 onTrigger: toggle,
               },
             ]}

packages/tui/src/feature-plugins/system/storybook/session-tabs.tsx

@@ -105,21 +105,9 @@ function SessionTabsStory(props: { context: Plugin.Context }) {
     }
   }
 
-  const addTab = () => {
-    const next = FIXTURE_TABS.find((fixture) => !tabs().some((tab) => tab.sessionID === fixture.sessionID))
-    if (!next) {
-      setLastEvent("all fixture tabs are open")
-      return
-    }
-    setItems([...tabs().map((tab) => ({ ...tab })), { sessionID: next.sessionID }])
-    select(next.sessionID)
-    setLastEvent(`tab ${number(next.sessionID)} opened untitled; run it to earn its title`)
-  }
-
   const controller = {
     tabs,
     current: active,
-    add: addTab,
     status(sessionID) {
       return statuses()[sessionID] ?? EMPTY_SESSION_TAB_STATUS
     },
@@ -295,7 +283,21 @@ function SessionTabsStory(props: { context: Plugin.Context }) {
           startRun(current)
         },
       },
-      { bind: "t", title: "Add tab", group: "Storybook", run: addTab },
+      {
+        bind: "t",
+        title: "Add tab",
+        group: "Storybook",
+        run() {
+          const next = FIXTURE_TABS.find((fixture) => !tabs().some((tab) => tab.sessionID === fixture.sessionID))
+          if (!next) {
+            setLastEvent("all fixture tabs are open")
+            return
+          }
+          setItems([...tabs().map((tab) => ({ ...tab })), { sessionID: next.sessionID }])
+          select(next.sessionID)
+          setLastEvent(`tab ${number(next.sessionID)} opened untitled; run it to earn its title`)
+        },
+      },
       { bind: "d", title: "Close tab", group: "Storybook", run: () => controller.close() },
       {
         bind: "r",

packages/tui/src/mini/runtime.ts

@@ -11,7 +11,6 @@
 import { SessionMessage } from "@opencode-ai/schema/session-message"
 import type { LocationRef } from "@opencode-ai/client/promise"
 import type { Config } from "../config"
-import { newSessionLocation } from "../config/new-session-location"
 import { loadRunAgents, loadRunCommands, loadRunReferences } from "./catalog.shared"
 import {
   resolveMiniSettings,
@@ -49,7 +48,6 @@ type Reconnect = (signal: AbortSignal) => Promise<RunInput["sdk"]>
 
 type RunRuntimeInput = {
   host: MiniHost
-  directory: string
   boot: () => Promise<BootContext>
   resolveSession: (sdk: RunInput["sdk"], signal: AbortSignal) => Promise<ResolvedSession>
   createSession?: CreateSession
@@ -943,11 +941,7 @@ async function runInteractiveRuntime(input: RunRuntimeInput, deps: RunRuntimeDep
               const created = await createSession(
                 state.sdk,
                 {
-                  location: newSessionLocation(
-                    (await tuiConfigTask).session.new_location,
-                    input.directory,
-                    state.location,
-                  ),
+                  location: state.location,
                   agent: state.agent,
                   model: state.model,
                   variant: state.activeVariant,
@@ -1105,7 +1099,6 @@ export async function runInteractiveDeferredMode(input: RunDeferredInput, deps?:
   return runInteractiveRuntime(
     {
       host: input.host,
-      directory: input.directory,
       files: input.files,
       initialInput: input.initialInput,
       thinking: input.thinking,

packages/tui/src/mini/types.ts

@@ -392,7 +392,7 @@ export type FormCancel = {
   location?: LocationRef
 }
 
-export type RunTuiConfig = Pick<Config.Resolved, "keybinds" | "leader" | "theme" | "mini" | "session">
+export type RunTuiConfig = Pick<Config.Resolved, "keybinds" | "leader" | "theme" | "mini">
 
 export type MiniSettings = {
   thinking: "show" | "hide"

packages/tui/src/plugin/context.tsx

@@ -34,7 +34,7 @@ export interface PackageResolver {
 type State =
   | { readonly target: string; readonly id: string; readonly status: "active" | "inactive" }
   | { readonly target: string; readonly status: "unsupported" }
-  | { readonly target: string; readonly id?: string; readonly status: "failed"; readonly error: string }
+  | { readonly target: string; readonly status: "failed"; readonly error: string }
 
 type RegisteredPlugin = {
   readonly id: string
@@ -271,7 +271,6 @@ export function PluginProvider(props: ParentProps<{ packages: PackageResolver; d
         if (!local && !previous) npmFailures.set(target, resolved.error)
         failures.push({
           target,
-          id: previous?.plugin.id,
           status: "failed",
           error: previous?.active ? `${resolved.error} (previous version still active)` : resolved.error,
         })
@@ -377,7 +376,7 @@ export function PluginProvider(props: ParentProps<{ packages: PackageResolver; d
         // A failed reload keeps this item running; the failure entry covers it.
         if (failedTargets.has(item.target)) return []
         const error = errors.get(item.plugin.id)
-        if (error) return [{ target: item.target, id: item.plugin.id, status: "failed", error }]
+        if (error) return [{ target: item.target, status: "failed", error }]
         const status = store.registrations[item.plugin.id]?.active ? "active" : "inactive"
         return [{ target: item.target, id: item.plugin.id, status }]
       }),

packages/tui/src/routes/session/index.tsx

@@ -1222,11 +1222,6 @@ function TurnTokenUsage(props: {
 }) {
   const config = useConfig()
   const theme = useTheme()
-  const renderer = useRenderer()
-  // Collapsed by default: one summary line for the whole turn. Click to
-  // open the full per-step table, click again to close.
-  const [expanded, setExpanded] = createSignal(false)
-  const [hover, setHover] = createSignal(false)
   const verbose = () => config.data.debug?.turn_tokens === "verbose"
   const steps = createMemo(() => {
     let previousCache = props.previousCache
@@ -1262,78 +1257,49 @@ function TurnTokenUsage(props: {
     cached: Math.max("Cached".length, ...steps().map((item) => item.cached.toLocaleString().length)),
     total: Math.max("Total".length, ...steps().map((item) => item.total.toLocaleString().length)),
   }))
-  const summary = createMemo(() => {
-    const items = steps()
-    const last = items[items.length - 1]
-    return {
-      count: items.length,
-      newTokens: items.reduce((sum, item) => sum + item.newTokens, 0),
-      cached: last?.cached ?? 0,
-      total: last?.total ?? 0,
-      reuseDrops: items.filter((item) => item.reuseDrop !== undefined).length,
-    }
-  })
   return (
     <Show when={Boolean(config.data.debug?.turn_tokens) && steps().length > 0}>
       <box paddingLeft={3} flexDirection="column">
-        <box
-          flexDirection="row"
-          onMouseOver={() => setHover(true)}
-          onMouseOut={() => setHover(false)}
-          onMouseUp={() => {
-            if (renderer.getSelection()?.getSelectedText()) return
-            setExpanded((value) => !value)
-          }}
-        >
-          <text fg={hover() ? theme.text.default : theme.text.subdued} wrapMode="none">
-            <span>{expanded() ? "- " : "+ "}</span>
-            <span style={{ attributes: TextAttributes.BOLD }}>Tokens</span>
-            <span>
-              : {summary().count} {summary().count === 1 ? "step" : "steps"} · {summary().newTokens.toLocaleString()}{" "}
-              new · {summary().cached.toLocaleString()} cached · {summary().total.toLocaleString()} total
-            </span>
-            <Show when={summary().reuseDrops > 0}>
-              <span style={{ fg: theme.text.feedback.warning.default }}>
-                {" "}
-                · ! {summary().reuseDrops} likely cache {summary().reuseDrops === 1 ? "bust" : "busts"}
-              </span>
-            </Show>
+        <box flexDirection="row">
+          <text width={INLINE_TOOL_ICON_WIDTH} fg={theme.text.subdued}>
+            ◈
+          </text>
+          <text fg={theme.text.subdued} attributes={TextAttributes.BOLD}>
+            Tokens
           </text>
         </box>
-        <Show when={expanded()}>
-          <box paddingLeft={INLINE_TOOL_ICON_WIDTH}>
-            <text fg={theme.text.subdued} attributes={TextAttributes.ITALIC}>
-              {"Step".padEnd(columns().step + 2)}
-              {"New".padStart(columns().newTokens)}
-              {"  "}
-              {"Cached".padStart(columns().cached)}
-              {"  "}
-              {"Total".padStart(columns().total)}
-            </text>
-          </box>
-          <For each={steps()}>
-            {(item) => (
-              <box paddingLeft={INLINE_TOOL_ICON_WIDTH} flexDirection="column">
-                <text fg={verbose() && item.finish === "tool-call" ? undefined : theme.text.subdued}>
-                  {item.finish.padEnd(columns().step + 2)}
-                  <span style={{ attributes: TextAttributes.BOLD }}>
-                    {item.newTokens.toLocaleString().padStart(columns().newTokens)}
-                  </span>
-                  {"  "}
-                  {item.cached.toLocaleString().padStart(columns().cached)}
-                  {"  "}
-                  {item.total.toLocaleString().padStart(columns().total)}
+        <box paddingLeft={INLINE_TOOL_ICON_WIDTH}>
+          <text fg={theme.text.subdued} attributes={TextAttributes.ITALIC}>
+            {"Step".padEnd(columns().step + 2)}
+            {"New".padStart(columns().newTokens)}
+            {"  "}
+            {"Cached".padStart(columns().cached)}
+            {"  "}
+            {"Total".padStart(columns().total)}
+          </text>
+        </box>
+        <For each={steps()}>
+          {(item) => (
+            <box paddingLeft={INLINE_TOOL_ICON_WIDTH} flexDirection="column">
+              <text fg={verbose() && item.finish === "tool-call" ? undefined : theme.text.subdued}>
+                {item.finish.padEnd(columns().step + 2)}
+                <span style={{ attributes: TextAttributes.BOLD }}>
+                  {item.newTokens.toLocaleString().padStart(columns().newTokens)}
+                </span>
+                {"  "}
+                {item.cached.toLocaleString().padStart(columns().cached)}
+                {"  "}
+                {item.total.toLocaleString().padStart(columns().total)}
+              </text>
+              <TurnTokenToolCalls tools={item.tools} />
+              <Show when={item.reuseDrop !== undefined}>
+                <text fg={theme.text.feedback.warning.default}>
+                  ! Likely cache bust: {item.reuseDrop?.toLocaleString()} fewer cached tokens than the previous step
                 </text>
-                <TurnTokenToolCalls tools={item.tools} />
-                <Show when={item.reuseDrop !== undefined}>
-                  <text fg={theme.text.feedback.warning.default}>
-                    ! Likely cache bust: {item.reuseDrop?.toLocaleString()} fewer cached tokens than the previous step
-                  </text>
-                </Show>
-              </box>
-            )}
-          </For>
-        </Show>
+              </Show>
+            </box>
+          )}
+        </For>
       </box>
     </Show>
   )

packages/tui/test/config-v2.test.tsx

@@ -25,8 +25,6 @@ test("validates the session tabs setting", () => {
   expect(() => decode({ tabs: { enabled: "on" } })).toThrow()
   expect(decode({ prompt: { image_preview: true } })).toEqual({ prompt: { image_preview: true } })
   expect(decode({ session: { image_preview: true } })).toEqual({ session: { image_preview: true } })
-  expect(decode({ session: { new_location: "inherit" } })).toEqual({ session: { new_location: "inherit" } })
-  expect(() => decode({ session: { new_location: "current" } })).toThrow()
 })
 
 test("resolves nested config and keybind defaults", () => {
@@ -47,7 +45,6 @@ test("resolves nested config and keybind defaults", () => {
   expect(config.diffs).toEqual({ view: "split" })
   expect(config.debug).toEqual({ devtools: true })
   expect(config.tabs).toEqual({ enabled: true, scope: "cwd", layout: "horizontal" })
-  expect(config.session.new_location).toBe("launch")
 })
 
 test("shows resolved tab defaults in settings", () => {
@@ -56,10 +53,6 @@ test("shows resolved tab defaults in settings", () => {
   expect(settings.find((setting) => setting.path.join(".") === "tabs.layout")?.default).toBe("horizontal")
 })
 
-test("shows the new session location default in settings", () => {
-  expect(settings.find((setting) => setting.path.join(".") === "session.new_location")?.default).toBe("launch")
-})
-
 test("provides config and its host interface", async () => {
   const config = resolve({}, { terminalSuspend: true })
   let current = {}

packages/tui/test/context/session-tabs.test.tsx

@@ -7,7 +7,6 @@ import path from "path"
 import { ConfigProvider } from "../../src/config"
 import { ClientProvider, useClient } from "../../src/context/client"
 import { DataProvider, useData } from "../../src/context/data"
-import { LocationProvider } from "../../src/context/location"
 import { RouteProvider, useRoute } from "../../src/context/route"
 import { TuiAppProvider } from "../../src/context/runtime"
 import { SessionTabsProvider, useSessionTabs } from "../../src/context/session-tabs"
@@ -87,11 +86,9 @@ async function renderSessionTabs(
             >
               <ClientProvider api={createApi(calls.fetch)}>
                 <DataProvider>
-                  <LocationProvider>
-                    <SessionTabsProvider>
-                      <Probe />
-                    </SessionTabsProvider>
-                  </LocationProvider>
+                  <SessionTabsProvider>
+                    <Probe />
+                  </SessionTabsProvider>
                 </DataProvider>
               </ClientProvider>
             </RouteProvider>
@@ -275,17 +272,3 @@ test("tracks a temporary new session tab across close and creation", async () =>
     await setup.destroy()
   }
 })
-
-test("add opens the new session tab carrying the current session's location", async () => {
-  const setup = await renderSessionTabs("first")
-
-  try {
-    await wait(() => setup.tabs.current() === "first" && setup.data.session.get("first") !== undefined)
-    setup.tabs.add()
-    expect(setup.route.data).toEqual({ type: "home", location: { directory } })
-    await wait(() => setup.tabs.newTab())
-    expect(setup.tabs.tabs().map((tab) => tab.sessionID)).toEqual(["first"])
-  } finally {
-    await setup.destroy()
-  }
-})

packages/tui/test/feature-plugins/home-footer.test.ts

@@ -1,13 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { homeFooterVisibility } from "../../src/feature-plugins/home/footer"
-
-describe("home footer visibility", () => {
-  test("keeps failure labels readable at the minimum supported width", () => {
-    expect(homeFooterVisibility(44)).toEqual({ mcpCommand: false, pluginCommand: false, version: false })
-  })
-
-  test("adds secondary hints as space becomes available", () => {
-    expect(homeFooterVisibility(64)).toEqual({ mcpCommand: true, pluginCommand: false, version: true })
-    expect(homeFooterVisibility(80)).toEqual({ mcpCommand: true, pluginCommand: true, version: true })
-  })
-})

packages/tui/test/new-session-location.test.ts

@@ -1,19 +0,0 @@
-import { expect, test } from "bun:test"
-import { newSessionLocation } from "../src/config/new-session-location"
-
-test("uses the launch directory by default", () => {
-  expect(newSessionLocation("launch", "/launch", { directory: "/session", workspaceID: "work-1" })).toEqual({
-    directory: "/launch",
-  })
-})
-
-test("inherits the active session location when configured", () => {
-  expect(newSessionLocation("inherit", "/launch", { directory: "/session", workspaceID: "work-1" })).toEqual({
-    directory: "/session",
-    workspaceID: "work-1",
-  })
-})
-
-test("falls back to the launch directory without an active session", () => {
-  expect(newSessionLocation("inherit", "/launch")).toEqual({ directory: "/launch" })
-})

packages/www/openapi.json

@@ -13083,9 +13083,6 @@
           },
           "text": {
             "type": "string"
-          },
-          "description": {
-            "type": "string"
           }
         },
         "required": ["id", "time", "type", "text"],

packages/www/public/openapi.json

@@ -13083,9 +13083,6 @@
           },
           "text": {
             "type": "string"
-          },
-          "description": {
-            "type": "string"
           }
         },
         "required": ["id", "time", "type", "text"],