diff --git a/CHANGELOG.md b/CHANGELOG.md
index e72bd98042..4a4db04c2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,14 +7,6 @@ file is the human-readable summary of what changed and why.
 
 ## Unreleased
 
-### Branding
-
-- **`codev --mini` splashes carry the CoDev mark** — the compact badge on the
-  entry and exit banners is now the `c` of the CoDev wordmark instead of the
-  inherited `o`, and it is drawn in the brand secondary (teal in dark, purple
-  in light) so it matches the home-screen banner rather than the muted detail
-  text beside it. The background pulse's `go` wordmark is unchanged.
-
 ### Sessions
 
 - **`Ctrl+C` interrupts a running turn** — while the agent is working, `Ctrl+C`
@@ -101,14 +93,6 @@ file is the human-readable summary of what changed and why.
 
 ### Prompt
 
-- **`cwd:branch` in the prompt footer** — the prompt footer shows the abbreviated
-  working directory with a `:branch` suffix (updating live on branch switches),
-  left of the open-file label. The last path segment and branch render in the text
-  color with the parent path muted, matching the sidebar footer; long paths are
-  middle-truncated so narrow terminals never overflow. Hidden while the sidebar
-  is visible, since the sidebar footer already shows the same `cwd:branch`.
-  ([#65](https://github.com/quickbeard/codev-code/pull/65),
-  [#70](https://github.com/quickbeard/codev-code/pull/70))
 - **Files first in `@` autocomplete** — `@` mention results list files and
   directories before references, agents, and MCP resources in the TUI, the web
   app, and the `codev run` footer. A few rows stay reserved for non-file results
diff --git a/DIVERGENCES.md b/DIVERGENCES.md
index e78e9f3b9d..f8f9f20c7e 100644
--- a/DIVERGENCES.md
+++ b/DIVERGENCES.md
@@ -117,7 +117,6 @@ from the squash message first, or use a plain merge.
 | `packages/tui/src/component/dialog-provider.tsx`, `packages/tui/src/component/dialog-model.tsx`, `packages/opencode/src/cli/cmd/providers.ts` | Filter `opencode`/`opencode-go` out of provider pickers and the `/model` dialog (model list + Favorites/Recent; the model dialog's opencode-first sort became a plain name sort) | Upstream's hosted offerings (Zen/Go) are detours for gateway users. | Keep our filters. |
 | `packages/tui/src/component/dialog-provider.tsx` | The "Other" custom-provider option routes into the fork-only `runCustomProviderFlow` (component/dialog-custom-provider.tsx, new file) — id → API key → optional base URL → model discovery via `/v1/models` → `provider.<id>` block PATCHed into global codev.json (key stays in auth.json) — instead of upstream's credential-only `ApiMethod`; the local `promptCustomProviderID` helper moved into that flow (upstream's "only stores a credential" description no longer holds). `ApiMethod`'s `custom` prop is now unreferenced but left in place. | An empty base URL keeps upstream's credential-only behavior; with one, the provider is usable without hand-editing codev.json. The configure gate's "Custom provider" option shares the same flow. | Keep our `onSelect` + import and the helper deletion; take upstream's changes to `ApiMethod`/other methods (the flow only wraps the entry point). |
 | `packages/tui/src/component/prompt/index.tsx` | Gated the prompt footer's model/provider indicator on `useConnected()` (the shared "a real provider is configured" predicate) | Don't advertise the free hosted Zen default (e.g. "Big Pickle · OpenCode Zen") in the footer while nothing is configured — same rationale and predicate as `app.tsx`'s startup gate and the provider/model filters. A configured gateway/real provider, or a deliberately-authenticated opencode/opencode-go, still shows its model. | Keep the extra `Show` condition; take upstream's surrounding changes. |
-| `packages/tui/src/component/prompt/index.tsx` | Added a `directoryLabel` memo (abbreviated cwd, `:branch` suffix when known, middle-truncated; last path segment + branch in text color, parent path muted, matching the sidebar footer) rendered as the first item of the prompt footer's right-side group, left of the editor open-file label. The memo delegates to `directoryFooterLabel(...)` and the render goes through a `<DirectoryLabel ... hidden={props.sidebarVisible}>` component — both in the fork-only `./directory-label.tsx`. `Prompt` takes a `sidebarVisible?: boolean` prop that `routes/session/index.tsx` passes from its `sidebarVisible()` memo. | Keep the working directory and branch visible at a glance from the prompt (the home-footer `Directory` only shows once a destination is selected, and the sidebar — the other place showing the branch — is hidden by default), but suppress the label while the sidebar is visible since the sidebar footer already shows the same `cwd:branch`. | Keep the `directoryLabel` memo, the `directoryFooterLabel`/`DirectoryLabel` imports from the fork-only `./directory-label.tsx`, the `sidebarVisible` prop + the `hidden={props.sidebarVisible}` gate on `<DirectoryLabel>`, and the `sidebarVisible={sidebarVisible()}` prop on `<Prompt>`; take upstream's surrounding footer changes. |
 | `packages/tui/src/component/prompt/index.tsx` | The busy-state footer arm (`status().type !== "idle"`) also renders `props.hint` after the `esc interrupt` text, gated on `status().type !== "retry"` | The hidden-sidebar hint (see the `routes/session/index.tsx` hint row) only rendered in the footer `Switch`'s idle fallback arm, so it vanished for the whole duration of a running turn — exactly when todos are being created. Retry keeps its `space-between` error row uncluttered. | Keep the `<Show when={status().type !== "retry"}>{props.hint}</Show>` line in the busy `Match` arm (additive); take upstream's surrounding changes. |
 | `packages/tui/src/component/prompt/index.tsx` | Removed the editor open-file label from the footer's right-side group and lifted the state behind it out of `Prompt`: the local `dismissedEditorSelectionKey` signal and the `editorContext`/`editorPath`/`editorSelectionLabel`/`editorFileLabel`/`editorFileLabelDisplay`/`editorContextLabelState` memos are gone, replaced by `useEditorLabel()` (fork-only `src/context/editor-label.tsx`) — `selection()` feeds the `prompt.editor_context.clear` `enabled` predicate and the submit-time editor part, `state()` replaces `editor.labelState()` there, and `dismiss()` replaces the local `dismissEditorContext`. The pure helpers `hasEditorRangeSelection`/`getEditorRangeLabel` moved to that context module and are imported back for `formatEditorContext`. | The label now lives in the sidebar footer (see its row above). The dismissal state had to move with it: the sidebar must label the *effective* selection — the one this file actually attaches on submit — or it would advertise context the prompt has dismissed and won't send. | Keep the deletions, the `useEditorLabel` import + its three call sites, and the helper import from `../../context/editor-label`; take upstream's surrounding changes. If upstream reworks the editor-context label, apply the change to `editorContextFileLabel` in the fork-only sidebar module rather than restoring the footer render. |
 | `packages/tui/src/app.tsx` | Mounted `<EditorLabelProvider>` (fork-only `./context/editor-label`) immediately inside `<EditorContextProvider>` | The effective-editor-selection state is shared by the prompt and the sidebar footer, so it has to be provided above both. | Keep the import and the wrapper; take upstream's surrounding provider changes. If upstream moves `EditorContextProvider`, keep ours directly inside it. |
diff --git a/packages/tui/src/component/prompt/directory-label.tsx b/packages/tui/src/component/prompt/directory-label.tsx
deleted file mode 100644
index 83141a22c0..0000000000
--- a/packages/tui/src/component/prompt/directory-label.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Show } from "solid-js"
-import type { RGBA } from "@opentui/core"
-import { abbreviateHome } from "../../runtime"
-import { Locale } from "../../util/locale"
-
-// Builds the prompt footer's directory label: the abbreviated working
-// directory with an optional `:branch` suffix, middle-truncated to a
-// width-derived cap, then split into a muted parent path and the
-// highlighted final segment. The same split styling matches the sidebar
-// footer's cwd:branch line.
-export function directoryFooterLabel(input: { directory: string; home: string; branch?: string; width: number }) {
-  const label = abbreviateHome(input.directory, input.home)
-  const full = Locale.truncateMiddle(
-    input.branch ? `${label}:${input.branch}` : label,
-    Math.max(12, Math.min(48, Math.floor(input.width / 3))),
-  )
-  const list = full.split("/")
-  return {
-    parent: list.length > 1 ? list.slice(0, -1).join("/") + "/" : undefined,
-    name: list.at(-1) ?? "",
-  }
-}
-
-// Renders the directory label in the prompt footer, with the parent path muted
-// and the final segment highlighted. `hidden` suppresses it entirely — the
-// prompt footer passes the sidebar's visibility here so the label isn't
-// duplicated while the sidebar already shows the same cwd:branch.
-export function DirectoryLabel(props: {
-  value: ReturnType<typeof directoryFooterLabel>
-  text: RGBA
-  muted: RGBA
-  hidden?: boolean
-}) {
-  return (
-    <Show when={!props.hidden}>
-      <text fg={props.text}>
-        <Show when={props.value.parent}>
-          <span style={{ fg: props.muted }}>{props.value.parent}</span>
-        </Show>
-        {props.value.name}
-      </text>
-    </Show>
-  )
-}
diff --git a/packages/tui/src/component/prompt/index.tsx b/packages/tui/src/component/prompt/index.tsx
index 84e111afd3..e420897258 100644
--- a/packages/tui/src/component/prompt/index.tsx
+++ b/packages/tui/src/component/prompt/index.tsx
@@ -18,7 +18,6 @@ import { Flag } from "@opencode-ai/core/flag/flag"
 import { tint, useTheme } from "../../context/theme"
 import { EmptyBorder, SplitBorder } from "../../ui/border"
 import { useTuiPaths, useTuiTerminalEnvironment } from "../../context/runtime"
-import { directoryFooterLabel, DirectoryLabel } from "./directory-label"
 import { useClipboard } from "../../context/clipboard"
 import { Spinner } from "../spinner"
 import { useSDK } from "../../context/sdk"
@@ -71,10 +70,6 @@ export type PromptProps = {
   ref?: (ref: PromptRef | undefined) => void
   hint?: JSX.Element
   right?: JSX.Element
-  // When the sidebar is visible it already shows the cwd:branch in its
-  // footer, so the prompt footer suppresses its own directory label to
-  // avoid the duplicate.
-  sidebarVisible?: boolean
   showPlaceholder?: boolean
   placeholders?: {
     normal?: string[]
@@ -177,14 +172,6 @@ export function Prompt(props: PromptProps) {
   // Fork: the effective selection lives in EditorLabel — the sidebar footer
   // labels the same one this attaches on submit.
   const editorLabel = useEditorLabel()
-  const directoryLabel = createMemo(() =>
-    directoryFooterLabel({
-      directory: project.instance.directory() || paths.cwd,
-      home: paths.home,
-      branch: sync.data.vcs?.branch,
-      width: dimensions().width,
-    }),
-  )
   const [auto, setAuto] = createSignal<AutocompleteRef>()
   const workspace = usePromptWorkspace(props.sessionID)
   const move = usePromptMove({ projectID: project.project, sessionID: () => props.sessionID })
@@ -1661,12 +1648,6 @@ export function Prompt(props: PromptProps) {
           </Switch>
           <Show when={status().type !== "retry"}>
             <box gap={2} flexDirection="row">
-              <DirectoryLabel
-                value={directoryLabel()}
-                text={theme.text}
-                muted={theme.textMuted}
-                hidden={props.sidebarVisible}
-              />
               <Switch>
                 <Match when={store.mode === "normal"}>
                   <Switch>
diff --git a/packages/tui/src/routes/session/index.tsx b/packages/tui/src/routes/session/index.tsx
index 69820f1640..5c64e735fb 100644
--- a/packages/tui/src/routes/session/index.tsx
+++ b/packages/tui/src/routes/session/index.tsx
@@ -1363,7 +1363,6 @@ export function Session() {
                       }}
                       placeholders={messages().length === 0 ? placeholder : undefined}
                       sessionID={route.sessionID}
-                      sidebarVisible={sidebarVisible()}
                       right={<pluginRuntime.Slot name="session_prompt_right" session_id={route.sessionID} />}
                       hint={
                         <Show when={sidebarHint()} fallback={<text />}>
diff --git a/packages/tui/test/directory-label-view.test.tsx b/packages/tui/test/directory-label-view.test.tsx
deleted file mode 100644
index 8bf4e2609b..0000000000
--- a/packages/tui/test/directory-label-view.test.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { expect, test } from "bun:test"
-import { RGBA } from "@opentui/core"
-import { testRender } from "@opentui/solid"
-import { DirectoryLabel, directoryFooterLabel } from "../src/component/prompt/directory-label"
-
-const text = RGBA.fromHex("#ffffff")
-const muted = RGBA.fromHex("#808080")
-
-async function render(hidden: boolean) {
-  const value = directoryFooterLabel({ directory: "/tmp/opencode/packages/tui", home: "", branch: "main", width: 300 })
-  const app = await testRender(
-    () => (
-      <box width={60} height={3}>
-        <DirectoryLabel value={value} text={text} muted={muted} hidden={hidden} />
-      </box>
-    ),
-    { width: 60, height: 3 },
-  )
-  try {
-    await app.renderOnce()
-    return app.captureCharFrame()
-  } finally {
-    app.renderer.destroy()
-  }
-}
-
-// PR #65: the footer renders the cwd:branch (parent path + highlighted segment).
-test("renders the cwd:branch label when not hidden", async () => {
-  const frame = await render(false)
-  expect(frame).toContain("/tmp/opencode/packages/tui:main")
-})
-
-// PR #70: passing the sidebar's visibility as `hidden` suppresses the label.
-test("suppresses the label when hidden", async () => {
-  const frame = await render(true)
-  expect(frame).not.toContain("tui:main")
-  expect(frame).not.toContain("packages")
-})
diff --git a/packages/tui/test/directory-label.test.ts b/packages/tui/test/directory-label.test.ts
deleted file mode 100644
index 988ccc076a..0000000000
--- a/packages/tui/test/directory-label.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { expect, test } from "bun:test"
-import { directoryFooterLabel } from "../src/component/prompt/directory-label"
-
-// PR #65: the prompt footer's directory label.
-
-test("splits an abbreviated home path into a muted parent and highlighted name", () => {
-  const label = directoryFooterLabel({ directory: "/home/test/project", home: "/home/test", width: 300 })
-  expect(label.parent).toBe("~/")
-  expect(label.name).toBe("project")
-})
-
-test("appends the branch as a :suffix on the final segment", () => {
-  const label = directoryFooterLabel({ directory: "/home/test/project", home: "/home/test", branch: "main", width: 300 })
-  expect(label.parent).toBe("~/")
-  expect(label.name).toBe("project:main")
-})
-
-test("omits the branch suffix when no branch is known", () => {
-  const label = directoryFooterLabel({ directory: "/home/test/project", home: "/home/test", width: 300 })
-  expect(label.name).not.toContain(":")
-})
-
-test("keeps an absolute path verbatim when it is outside home", () => {
-  const label = directoryFooterLabel({ directory: "/tmp/opencode/packages/tui", home: "", branch: "main", width: 300 })
-  expect(label.parent).toBe("/tmp/opencode/packages/")
-  expect(label.name).toBe("tui:main")
-})
-
-test("leaves parent undefined for a single-segment path", () => {
-  const label = directoryFooterLabel({ directory: "project", home: "", branch: "main", width: 300 })
-  expect(label.parent).toBeUndefined()
-  expect(label.name).toBe("project:main")
-})
-
-test("middle-truncates long paths to a width-derived cap while preserving the branch", () => {
-  // width 60 -> cap floor(60/3) = 20.
-  const label = directoryFooterLabel({ directory: "/tmp/opencode/packages/tui", home: "", branch: "main", width: 60 })
-  // The branch stays visible on the tail even after truncation.
-  expect(label.name).toBe("tui:main")
-  // The ellipsis lands in the elided parent, and the whole label fits the cap.
-  expect(label.parent).toContain("…")
-  expect(((label.parent ?? "") + label.name).length).toBeLessThanOrEqual(20)
-})
-
-test("clamps the truncation cap to a floor of 12 for very narrow terminals", () => {
-  // width 10 -> floor(10/3) = 3, clamped up to 12.
-  const label = directoryFooterLabel({ directory: "/very/long/path/name/goes/here", home: "", width: 10 })
-  expect(((label.parent ?? "") + label.name).length).toBeLessThanOrEqual(12)
-})
-
-test("clamps the truncation cap to a ceiling of 48 for very wide terminals", () => {
-  // width 3000 -> floor = 1000, clamped down to 48.
-  const long = "/" + Array.from({ length: 40 }, (_, index) => `segment${index}`).join("/")
-  const label = directoryFooterLabel({ directory: long, home: "", width: 3000 })
-  expect(((label.parent ?? "") + label.name).length).toBeLessThanOrEqual(48)
-})
diff --git a/packages/tui/test/prompt-footer-directory.test.tsx b/packages/tui/test/prompt-footer-directory.test.tsx
deleted file mode 100644
index a5c01521fc..0000000000
--- a/packages/tui/test/prompt-footer-directory.test.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { expect, mock, test } from "bun:test"
-import { createTestRenderer } from "@opentui/core/testing"
-import { Effect } from "effect"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { Global } from "@opencode-ai/core/global"
-import { createTuiResolvedConfig } from "./fixture/tui-runtime"
-import { createEventSource, createFetch, directory, json } from "./fixture/tui-sdk"
-
-async function waitForFrame(setup: Awaited<ReturnType<typeof createTestRenderer>>, fn: (frame: string) => boolean) {
-  const start = Date.now()
-  while (true) {
-    await setup.renderOnce()
-    const frame = setup.captureCharFrame()
-    if (fn(frame)) return frame
-    if (Date.now() - start > 15_000) throw new Error("timed out waiting for frame:\n" + frame)
-    await Bun.sleep(25)
-  }
-}
-
-const session = {
-  id: "ses_test",
-  title: "Demo session",
-  slug: "test",
-  projectID: "proj_test",
-  directory,
-  version: "0.0.0-test",
-  time: { created: 1, updated: 1 },
-}
-
-// PR #65 end-to-end: the running prompt footer surfaces the abbreviated cwd
-// with the /vcs "main" branch suffixed. The width is kept <= 120 so the sidebar
-// stays hidden regardless of the persisted `sidebar` kv (its `auto` mode only
-// docks the sidebar on wide terminals), which keeps the footer label — the
-// place PR #70 later suppresses when the sidebar is shown — on screen.
-test("prompt footer shows the cwd:branch label in the running app", async () => {
-  const setup = await createTestRenderer({ width: 80, height: 24, useThread: false })
-  const core = await import("@opentui/core")
-  mock.module("@opentui/core", () => ({ ...core, createCliRenderer: async () => setup.renderer }))
-  const events = createEventSource()
-  const calls = createFetch((url) => {
-    if (url.pathname === "/session") return json([session])
-    if (url.pathname.startsWith("/session/ses_test/message")) return json([])
-    if (url.pathname === "/session/ses_test/todo") return json([])
-    if (url.pathname === "/session/ses_test/diff") return json([])
-    if (url.pathname === "/session/ses_test") return json(session)
-    if (url.pathname === "/project/proj_test/directories") return json([])
-    // Register a paid model so the fork's first-run configure dialog stays
-    // closed and focus remains on the prompt.
-    if (url.pathname === "/config/providers")
-      return json({
-        providers: [{ id: "test", name: "Test", models: { m1: { name: "M1", cost: { input: 1 } } } }],
-        default: { test: "m1" },
-      })
-    return undefined
-  }, events)
-
-  let started!: () => void
-  const ready = new Promise<void>((resolve) => {
-    started = resolve
-  })
-
-  try {
-    const { run } = await import("../src/app")
-    const task = Effect.runPromise(
-      run({
-        url: "http://test",
-        directory,
-        config: createTuiResolvedConfig({ plugin_enabled: {} }),
-        fetch: calls.fetch,
-        events: events.source,
-        args: { continue: true },
-        pluginHost: {
-          // The session prompt is a slot default; the slot view renders
-          // nothing until the slot registry is set up.
-          async start(input) {
-            input.runtime.setupSlots(input.api)
-            started()
-          },
-          async dispose() {},
-        },
-      }).pipe(Effect.provide(AppNodeBuilder.build(Global.node))),
-    )
-    await ready
-
-    // The label is middle-truncated at this width, but the final segment plus
-    // the branch survive, so `tui:main` is the stable marker.
-    const frame = await waitForFrame(setup, (f) => f.includes("tui:main"))
-    expect(frame).toContain("tui:main")
-
-    process.emit("SIGHUP")
-    await task
-  } finally {
-    if (!setup.renderer.isDestroyed) setup.renderer.destroy()
-    mock.restore()
-  }
-}, 30_000)