diff --git a/CHANGELOG.md b/CHANGELOG.md
index c11e1d5666..85c74433a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,13 @@ file is the human-readable summary of what changed and why.
 
 ### Sidebar
 
+- **Editor context moved to the sidebar** — the open editor file and selected
+  line range (e.g. `footer.tsx#42-58`) no longer sit in the prompt footer's
+  right-side group. They render in the sidebar footer instead, just above the
+  `cwd:branch` line, marked with a bullet that is accented while the selection
+  is still pending and muted once it has been sent. With the sidebar hidden the
+  label is not shown at all.
+
 - **Hidden-sidebar hint shows while busy** — the `ctrl+b N todos` hint from
   [#69](https://github.com/quickbeard/codev-code/pull/69) now also renders while
   a turn is running (next to `esc interrupt`), not just when the session is
diff --git a/DIVERGENCES.md b/DIVERGENCES.md
index f8c280b88c..9096aaf234 100644
--- a/DIVERGENCES.md
+++ b/DIVERGENCES.md
@@ -91,6 +91,7 @@ from the squash message first, or use a plain merge.
 | `packages/opencode/src/cli/ui.ts` | `wordmark`/`logo()` render the lowercase codev wordmark via `ansiWordmark` (bold brand teal + drop shadow on TTY) | Help banner matches the TUI home banner. | Keep our wordmark + logo(); take upstream's surrounding changes. |
 | `packages/tui/src/util/presentation.ts` | Local logo copy replaced by the shared `ansiWordmark` (brand teal + drop shadow) | Presentation-mode wordmark was still upstream-branded. | Keep our wordmark lines; take upstream's surrounding changes. |
 | `packages/tui/src/feature-plugins/sidebar/footer.tsx` | Removed the footer's brand + version line entirely (upstream's two-tone "Open"+"Code" spans, status dot, and `app.version`); the `cwd:branch` path is now the last footer item | The fork's sidebar doesn't advertise the product name/version; the path takes that bottom slot. (Supersedes the earlier single-"CoDev"-span rebrand of this line.) | Keep the line deleted; take upstream's surrounding changes. |
+| `packages/tui/src/feature-plugins/sidebar/footer.tsx` | Added the editor-context label above the `cwd:branch` line: `useEditorLabel()` (fork-only `src/context/editor-label.tsx`) supplies the effective selection, an `editorFile` memo formats it via `editorContextFileLabel(...)` at a fixed width of 36 (the sidebar's 42 columns less 2 of padding a side and 2 for the bullet), and `<EditorContextLabel>` renders it — both from the fork-only `./editor-context-label.tsx`. | The open file + selected range belong with the sidebar's other ambient session state rather than in the prompt footer's crowded keybind-hint row; they sit next to the cwd for a single "where am I working" group. Moved out of the prompt footer, which no longer shows it at all. | Keep the `useEditorLabel` import, the `editorFile` memo, and the `<EditorContextLabel>` element as the box's first child; take upstream's changes to the path display below it. |
 | `packages/tui/src/feature-plugins/sidebar/lsp.tsx` | Whole LSP section wrapped in `<Show when={!off()}>` so it renders nothing when `config.lsp` is falsy; the "LSPs are disabled" placeholder text removed (empty state is only "LSPs will activate as files are read") | A disabled feature shouldn't occupy sidebar space with a permanent placeholder. | Keep our `Show` wrapper + removed placeholder; take upstream's surrounding changes. |
 | `packages/opencode/src/cli/cmd/*.ts` (tui, run, serve, attach, pr, upgrade, uninstall, web) | Help `describe` strings "opencode" → "codev" | `--help` is the first thing users read. | Keep our strings. |
 | `packages/tui/src/app.tsx` | Terminal title "OpenCode"/"OC \|" → "CoDev Code"/"CC \|"; the configure-gate effect is a stateless forced-setup invariant — while `sync.status === "complete" && !useConnected() && dialog.stack.length === 0` it (re)opens the fork's `DialogConfigure` (component/dialog-configure.tsx, new file), so escaping any gate-launched flow or a credential-only save bounces back to the gate instead of an unconfigured chat (gates on `!useConnected()`, not `provider.length === 0` — hosted Zen free models always register); added the `codev.configure` command (`/configure`) and a `CODEV_CONFIGURE=1` mount hook for `codev configure`; home screen skipped — plain startup seeds the `dummy` session route and auto-opens a new empty session (reusing a leftover default-titled empty one via `openNewSession`/`findEmptySession`), `session.new` and the current-session `session.deleted` handler open a new session instead of navigating home, and the `-c` resolver prefers non-default-titled sessions so it lands on the last real conversation; added the `app.exit.confirm` command + `EXIT_CONFIRM_WINDOW` const (double-press Ctrl+C to quit: first press shows a toast, second within 1.5 s exits) and gathered its `app_exit_confirm` binding alongside `app_exit` | Tab title branding; first-run setup is a forced gate the user can't escape into an unconfigured chat (the invariant reopens it); `codev` starts directly in the session layout instead of the home screen; a stray Ctrl+C no longer quits on the first press. | Keep our strings, the invariant gate effect, dialog swap + command block, route seed, `openNewSession`/`findEmptySession` + call sites, the `-c` default-title filter, and the `app.exit.confirm` command + binding; take upstream's surrounding changes. |
@@ -116,6 +117,8 @@ from the squash message first, or use a plain merge.
 | `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. |
 | `packages/app/index.html` | `<title>` → "CoDev Code" | Web UI tab title. | Keep our title. |
 | `packages/app/src/pages/layout.tsx`, `packages/app/src/pages/layout-new.tsx` | Dropped the `<TabsInfoPopup />` mount and its import from both layouts (added upstream in v1.17.18); `HelpButton` stays. | `TabsInfoPopup` is a dev-channel-only "Introducing Tabs" promo whose `muted autoplay loop` `<video>` mounts on every layout render. The fork's Windows e2e runs on GPU-less GitHub-hosted runners (software GPU — see the runner-swap row), where continuous video decode wedges the GPU command buffer (`kTransientFailure`), making the whole app-e2e suite flaky and ~3–5× slower. It never ships (release builds use a non-`dev` `CODEV_CHANNEL`), so unmounting it costs users nothing. | Keep ours: don't re-add the `<TabsInfoPopup />` mount or restore it to the import. |
 | `packages/app/src/components/help-button.tsx` | Removed the `TabsInfoPopup` component, its `introducing-tabs.mp4` import, and the imports only it used; `HelpButton` stays. (The file's `VITE_OPENCODE_CHANNEL` → `VITE_CODEV_CHANNEL` gates follow the env-var rename row.) | The popup is upstream's temporary, OpenCode-branded "Introducing Tabs" promo (upstream's own comment says it's removable after the rollout), already unmounted per the row above; removing the definition lets the 13 MB video be deleted (row below). | Keep our removal; take upstream's changes to `HelpButton`. If upstream mounts `TabsInfoPopup` somewhere new, drop that mount per the row above. When upstream deletes the popup itself, this row and the two rows around it retire. |
diff --git a/packages/tui/src/app.tsx b/packages/tui/src/app.tsx
index 4e2fff5bce..0d919b93b3 100644
--- a/packages/tui/src/app.tsx
+++ b/packages/tui/src/app.tsx
@@ -32,6 +32,7 @@ import { ErrorComponent } from "./component/error-component"
 import { PluginRouteMissing } from "./component/plugin-route-missing"
 import { ProjectProvider, useProject } from "./context/project"
 import { EditorContextProvider } from "./context/editor"
+import { EditorLabelProvider } from "./context/editor-label"
 import { useEvent } from "./context/event"
 import { SDKProvider, useSDK } from "./context/sdk"
 import { StartupLoading } from "./component/startup-loading"
@@ -326,12 +327,14 @@ export const run = Effect.fn("Tui.run")(function* (input: TuiInput) {
                                                             <PromptHistoryProvider>
                                                               <PromptRefProvider>
                                                                 <EditorContextProvider>
-                                                                  <LocationProvider>
-                                                                    <App
-                                                                      onSnapshot={input.onSnapshot}
-                                                                      pluginHost={input.pluginHost}
-                                                                    />
-                                                                  </LocationProvider>
+                                                                  <EditorLabelProvider>
+                                                                    <LocationProvider>
+                                                                      <App
+                                                                        onSnapshot={input.onSnapshot}
+                                                                        pluginHost={input.pluginHost}
+                                                                      />
+                                                                    </LocationProvider>
+                                                                  </EditorLabelProvider>
                                                                 </EditorContextProvider>
                                                               </PromptRefProvider>
                                                             </PromptHistoryProvider>
diff --git a/packages/tui/src/component/prompt/index.tsx b/packages/tui/src/component/prompt/index.tsx
index dabc20ec05..84e111afd3 100644
--- a/packages/tui/src/component/prompt/index.tsx
+++ b/packages/tui/src/component/prompt/index.tsx
@@ -26,7 +26,8 @@ import { useRoute } from "../../context/route"
 import { useProject } from "../../context/project"
 import { useSync } from "../../context/sync"
 import { useEvent } from "../../context/event"
-import { editorSelectionKey, useEditorContext, type EditorSelection } from "../../context/editor"
+import { useEditorContext, type EditorSelection } from "../../context/editor"
+import { getEditorRangeLabel, hasEditorRangeSelection, useEditorLabel } from "../../context/editor-label"
 import { normalizePromptContent, openEditor } from "../../editor"
 import { useExit } from "../../context/exit"
 import { promptOffsetWidth } from "../../prompt/display"
@@ -118,19 +119,6 @@ function fadeColor(color: RGBA, alpha: number) {
   return RGBA.fromValues(color.r, color.g, color.b, color.a * alpha)
 }
 
-function hasEditorRangeSelection(selection: EditorSelection["ranges"][number]) {
-  return (
-    selection.selection.start.line !== selection.selection.end.line ||
-    selection.selection.start.character !== selection.selection.end.character
-  )
-}
-
-function getEditorRangeLabel(selection: EditorSelection["ranges"][number]) {
-  if (!hasEditorRangeSelection(selection)) return
-  if (selection.selection.start.line === selection.selection.end.line) return `#${selection.selection.start.line}`
-  return `#${selection.selection.start.line}-${selection.selection.end.line}`
-}
-
 function formatEditorContext(selection: EditorSelection) {
   const selected = selection.ranges.filter(hasEditorRangeSelection)
   if (selected.length === 0)
@@ -186,38 +174,9 @@ export function Prompt(props: PromptProps) {
   const animationsEnabled = createMemo(() => kv.get("animations_enabled", true))
   const list = createMemo(() => props.placeholders?.normal ?? [])
   const shell = createMemo(() => props.placeholders?.shell ?? [])
-  const fileContextEnabled = createMemo(() => kv.get("file_context_enabled", true))
-  const [dismissedEditorSelectionKey, setDismissedEditorSelectionKey] = createSignal<string>()
-  const editorContext = createMemo(() => {
-    const selection = fileContextEnabled() ? editor.selection() : undefined
-    if (!selection) return
-    return editorSelectionKey(selection) === dismissedEditorSelectionKey() ? undefined : selection
-  })
-  const editorPath = createMemo(() => editorContext()?.filePath)
-  const editorSelectionLabel = createMemo(() => {
-    const ranges = editorContext()?.ranges
-    if (!ranges) return
-    const first = ranges.find(hasEditorRangeSelection) ?? ranges[0]
-    if (!first) return
-    return [getEditorRangeLabel(first), ranges.length > 1 ? `+${ranges.length - 1}` : undefined]
-      .filter(Boolean)
-      .join(" ")
-  })
-  const editorFileLabel = createMemo(() => {
-    const value = editorPath()
-    if (!value) return
-    const filename = path.basename(value)
-    const file = /^index\.[^./]+$/.test(filename)
-      ? [path.basename(path.dirname(value)), filename].filter(Boolean).join("/")
-      : filename
-    return `${file.split(path.sep).join("/")}${editorSelectionLabel() ?? ""}`
-  })
-  const editorFileLabelDisplay = createMemo(() => {
-    const file = editorFileLabel()
-    if (!file) return
-    return Locale.truncateMiddle(file, Math.max(12, Math.min(48, Math.floor(dimensions().width / 3))))
-  })
-  const editorContextLabelState = createMemo(() => editor.labelState())
+  // 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,
@@ -251,10 +210,6 @@ export function Prompt(props: PromptProps) {
     }
   }
 
-  function dismissEditorContext() {
-    setDismissedEditorSelectionKey(editorSelectionKey(editorContext()))
-    editor.clearSelection()
-  }
   const fileStyleId = syntax().getStyleId("extmark.file")!
   const agentStyleId = syntax().getStyleId("extmark.agent")!
   const pasteStyleId = syntax().getStyleId("extmark.paste")!
@@ -387,9 +342,9 @@ export function Prompt(props: PromptProps) {
         title: "Remove editor context",
         name: "prompt.editor_context.clear",
         category: "Prompt",
-        enabled: Boolean(editorContext()),
+        enabled: Boolean(editorLabel.selection()),
         run: () => {
-          dismissEditorContext()
+          editorLabel.dismiss()
           dialog.clear()
         },
       },
@@ -1091,9 +1046,9 @@ export function Prompt(props: PromptProps) {
 
     // Capture mode before it gets reset
     const currentMode = store.mode
-    const editorSelection = editorContext()
+    const editorSelection = editorLabel.selection()
     const editorParts =
-      editorSelection && editor.labelState() === "pending"
+      editorSelection && editorLabel.state() === "pending"
         ? [
             {
               type: "text" as const,
@@ -1712,11 +1667,6 @@ export function Prompt(props: PromptProps) {
                 muted={theme.textMuted}
                 hidden={props.sidebarVisible}
               />
-              <Show when={editorContextLabelState() !== "none" ? editorFileLabelDisplay() : undefined}>
-                {(file) => (
-                  <text fg={editorContextLabelState() === "pending" ? theme.secondary : theme.textMuted}>{file()}</text>
-                )}
-              </Show>
               <Switch>
                 <Match when={store.mode === "normal"}>
                   <Switch>
diff --git a/packages/tui/src/context/editor-label.tsx b/packages/tui/src/context/editor-label.tsx
new file mode 100644
index 0000000000..fe09a90d5c
--- /dev/null
+++ b/packages/tui/src/context/editor-label.tsx
@@ -0,0 +1,49 @@
+import { createMemo, createSignal } from "solid-js"
+import { createSimpleContext } from "./helper"
+import { useKV } from "./kv"
+import { editorSelectionKey, useEditorContext, type EditorSelection } from "./editor"
+
+// Fork: the effective editor selection — the one the prompt actually attaches
+// on submit, and the one the sidebar footer labels. Lives here rather than
+// inside `Prompt` because both consume it: a sidebar label derived from the raw
+// `editor.selection()` would advertise context in exactly the case where the
+// prompt has dismissed it and won't send it.
+export const { use: useEditorLabel, provider: EditorLabelProvider } = createSimpleContext({
+  name: "EditorLabel",
+  init: () => {
+    const kv = useKV()
+    const editor = useEditorContext()
+    const [dismissed, setDismissed] = createSignal<string>()
+    const selection = createMemo(() => {
+      const value = kv.get("file_context_enabled", true) ? editor.selection() : undefined
+      if (!value) return
+      return editorSelectionKey(value) === dismissed() ? undefined : value
+    })
+
+    return {
+      selection,
+      state() {
+        return selection() ? editor.labelState() : ("none" as const)
+      },
+      // Remembering the key matters beyond clearing the store: Zed re-pushes the
+      // same selection on every focus change, which would otherwise resurrect it.
+      dismiss() {
+        setDismissed(editorSelectionKey(selection()))
+        editor.clearSelection()
+      },
+    }
+  },
+})
+
+export function hasEditorRangeSelection(selection: EditorSelection["ranges"][number]) {
+  return (
+    selection.selection.start.line !== selection.selection.end.line ||
+    selection.selection.start.character !== selection.selection.end.character
+  )
+}
+
+export function getEditorRangeLabel(selection: EditorSelection["ranges"][number]) {
+  if (!hasEditorRangeSelection(selection)) return
+  if (selection.selection.start.line === selection.selection.end.line) return `#${selection.selection.start.line}`
+  return `#${selection.selection.start.line}-${selection.selection.end.line}`
+}
diff --git a/packages/tui/src/feature-plugins/sidebar/editor-context-label.tsx b/packages/tui/src/feature-plugins/sidebar/editor-context-label.tsx
new file mode 100644
index 0000000000..812c9f91ca
--- /dev/null
+++ b/packages/tui/src/feature-plugins/sidebar/editor-context-label.tsx
@@ -0,0 +1,46 @@
+import path from "path"
+import { Show } from "solid-js"
+import type { RGBA } from "@opentui/core"
+import { getEditorRangeLabel, hasEditorRangeSelection } from "../../context/editor-label"
+import type { EditorLabelState, EditorSelection } from "../../context/editor"
+import { Locale } from "../../util/locale"
+
+// Builds the sidebar footer's editor-context label: the selected file's
+// basename (qualified with its directory when the name is an `index.*`, which
+// alone says nothing), suffixed with the first selected line range and a `+N`
+// for any further ranges, then middle-truncated to fit the sidebar.
+export function editorContextFileLabel(input: { selection: EditorSelection; width: number }) {
+  const filename = path.basename(input.selection.filePath)
+  const file = /^index\.[^./]+$/.test(filename)
+    ? [path.basename(path.dirname(input.selection.filePath)), filename].filter(Boolean).join("/")
+    : filename
+  const first = input.selection.ranges.find(hasEditorRangeSelection) ?? input.selection.ranges[0]
+  const range = first
+    ? [getEditorRangeLabel(first), input.selection.ranges.length > 1 ? `+${input.selection.ranges.length - 1}` : undefined]
+        .filter(Boolean)
+        .join(" ")
+    : ""
+  return Locale.truncateMiddle(`${file.split(path.sep).join("/")}${range}`, input.width)
+}
+
+// Renders the label above the sidebar footer's cwd:branch line, marked with a
+// bullet that carries the state: accented while the selection is still pending
+// (it goes out with the next prompt), muted once it has been sent.
+export function EditorContextLabel(props: {
+  label: string | undefined
+  state: EditorLabelState
+  text: RGBA
+  muted: RGBA
+  accent: RGBA
+}) {
+  return (
+    <Show when={props.state !== "none" && props.label}>
+      {(label) => (
+        <text fg={props.state === "pending" ? props.text : props.muted}>
+          <span style={{ fg: props.state === "pending" ? props.accent : props.muted }}>• </span>
+          {label()}
+        </text>
+      )}
+    </Show>
+  )
+}
diff --git a/packages/tui/src/feature-plugins/sidebar/footer.tsx b/packages/tui/src/feature-plugins/sidebar/footer.tsx
index 6b64d4193f..782d8f0141 100644
--- a/packages/tui/src/feature-plugins/sidebar/footer.tsx
+++ b/packages/tui/src/feature-plugins/sidebar/footer.tsx
@@ -3,6 +3,8 @@ import type { BuiltinTuiPlugin } from "../builtins"
 import { createMemo } from "solid-js"
 import { abbreviateHome } from "../../runtime"
 import { useTuiPaths } from "../../context/runtime"
+import { useEditorLabel } from "../../context/editor-label"
+import { editorContextFileLabel, EditorContextLabel } from "./editor-context-label"
 
 const id = "internal:sidebar-footer"
 
@@ -12,6 +14,14 @@ const id = "internal:sidebar-footer"
 function View(props: { api: TuiPluginApi; sessionID: string }) {
   const paths = useTuiPaths()
   const theme = () => props.api.theme.current
+  const editorLabel = useEditorLabel()
+  // The sidebar is a fixed 42 columns with 2 of padding a side; the bullet and
+  // its space take 2 more.
+  const editorFile = createMemo(() => {
+    const selection = editorLabel.selection()
+    if (!selection) return
+    return editorContextFileLabel({ selection, width: 36 })
+  })
   const path = createMemo(() => {
     const session = props.api.state.session.get(props.sessionID)
     const dir = session?.directory || props.api.state.path.directory || paths.cwd
@@ -27,6 +37,13 @@ function View(props: { api: TuiPluginApi; sessionID: string }) {
 
   return (
     <box gap={1}>
+      <EditorContextLabel
+        label={editorFile()}
+        state={editorLabel.state()}
+        text={theme().text}
+        muted={theme().textMuted}
+        accent={theme().secondary}
+      />
       <text>
         <span style={{ fg: theme().textMuted }}>{path().parent}/</span>
         <span style={{ fg: theme().text }}>{path().name}</span>
diff --git a/packages/tui/test/editor-context-label.test.ts b/packages/tui/test/editor-context-label.test.ts
new file mode 100644
index 0000000000..006942b09b
--- /dev/null
+++ b/packages/tui/test/editor-context-label.test.ts
@@ -0,0 +1,66 @@
+import { expect, test } from "bun:test"
+import type { EditorSelection } from "../src/context/editor"
+import { editorContextFileLabel } from "../src/feature-plugins/sidebar/editor-context-label"
+
+// A range is [startLine, endLine, endCharacter] — an endCharacter of 0 on a
+// single line is a bare caret, which carries no line suffix.
+function selection(filePath: string, ...ranges: [number, number, number][]): EditorSelection {
+  return {
+    filePath,
+    ranges: ranges.map(([start, end, character]) => ({
+      text: "",
+      selection: {
+        start: { line: start, character: 0 },
+        end: { line: end, character },
+      },
+    })),
+  }
+}
+
+test("labels a caret-only position by its basename alone", () => {
+  expect(editorContextFileLabel({ selection: selection("/repo/src/footer.tsx", [12, 12, 0]), width: 36 })).toBe(
+    "footer.tsx",
+  )
+})
+
+test("qualifies an index file with its directory", () => {
+  expect(editorContextFileLabel({ selection: selection("/repo/src/prompt/index.tsx", [12, 12, 0]), width: 36 })).toBe(
+    "prompt/index.tsx",
+  )
+})
+
+test("suffixes a single-line selection with its line", () => {
+  expect(editorContextFileLabel({ selection: selection("/repo/src/footer.tsx", [42, 42, 10]), width: 36 })).toBe(
+    "footer.tsx#42",
+  )
+})
+
+test("suffixes a multi-line selection with its range", () => {
+  expect(editorContextFileLabel({ selection: selection("/repo/src/footer.tsx", [42, 58, 4]), width: 36 })).toBe(
+    "footer.tsx#42-58",
+  )
+})
+
+test("counts the extra ranges beyond the first selected one", () => {
+  expect(
+    editorContextFileLabel({
+      selection: selection("/repo/src/footer.tsx", [42, 58, 4], [70, 71, 4], [90, 92, 4]),
+      width: 36,
+    }),
+  ).toBe("footer.tsx#42-58 +2")
+})
+
+test("prefers the first range that actually selects something", () => {
+  expect(
+    editorContextFileLabel({ selection: selection("/repo/src/footer.tsx", [12, 12, 0], [42, 58, 4]), width: 36 }),
+  ).toBe("footer.tsx#42-58 +1")
+})
+
+test("middle-truncates to the sidebar width", () => {
+  const label = editorContextFileLabel({
+    selection: selection("/repo/src/a-very-long-component-file-name-here.tsx", [42, 58, 4]),
+    width: 20,
+  })
+  expect(label.length).toBeLessThanOrEqual(20)
+  expect(label).toContain("#42-58")
+})
diff --git a/packages/tui/test/sidebar-footer-editor-label.test.tsx b/packages/tui/test/sidebar-footer-editor-label.test.tsx
new file mode 100644
index 0000000000..e7f7a87688
--- /dev/null
+++ b/packages/tui/test/sidebar-footer-editor-label.test.tsx
@@ -0,0 +1,43 @@
+import { expect, test } from "bun:test"
+import { RGBA } from "@opentui/core"
+import { testRender } from "@opentui/solid"
+import type { EditorLabelState } from "../src/context/editor"
+import { EditorContextLabel } from "../src/feature-plugins/sidebar/editor-context-label"
+
+const text = RGBA.fromHex("#ffffff")
+const muted = RGBA.fromHex("#808080")
+const accent = RGBA.fromHex("#00ff00")
+
+async function render(label: string | undefined, state: EditorLabelState) {
+  const app = await testRender(
+    () => (
+      <box width={38} height={3}>
+        <EditorContextLabel label={label} state={state} text={text} muted={muted} accent={accent} />
+        <text fg={text}>~/works/repos/codev-code</text>
+      </box>
+    ),
+    { width: 38, height: 3 },
+  )
+  try {
+    await app.renderOnce()
+    return app.captureCharFrame()
+  } finally {
+    app.renderer.destroy()
+  }
+}
+
+test("renders the bulleted label above the path while pending", async () => {
+  const frame = await render("footer.tsx#42-58", "pending")
+  expect(frame).toContain("• footer.tsx#42-58")
+  expect(frame.indexOf("footer.tsx")).toBeLessThan(frame.indexOf("~/works/repos/codev-code"))
+})
+
+test("still renders the label once the selection has been sent", async () => {
+  expect(await render("footer.tsx#42-58", "sent")).toContain("• footer.tsx#42-58")
+})
+
+test("renders nothing without a selection", async () => {
+  const frame = await render(undefined, "none")
+  expect(frame).not.toContain("•")
+  expect(frame).toContain("~/works/repos/codev-code")
+})