From b430dbed0e68057de5322de7250b16d8ebac878d Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Fri, 11 Sep 2026 08:51:16 +0300
Subject: [PATCH 01/14] feat(core): support clearing and listing session
 archive state

- projector writes explicit null for time_archived/time_compacting so
  updates can clear them; drizzle .set() skips undefined fields
- session update payload accepts null for time.archived to unarchive
- listGlobal returns only archived rows when archived=true instead of
  dropping the filter entirely
---
 packages/core/src/session/projector.ts                       | 5 +++--
 .../src/server/routes/instance/httpapi/groups/session.ts     | 5 ++++-
 .../src/server/routes/instance/httpapi/handlers/session.ts   | 3 ++-
 packages/opencode/src/session/session.ts                     | 5 ++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/session/projector.ts b/packages/core/src/session/projector.ts
index 792067017d14..a06f62966db9 100644
--- a/packages/core/src/session/projector.ts
+++ b/packages/core/src/session/projector.ts
@@ -69,8 +69,9 @@ function sessionRow(info: SessionV1.SessionInfo): typeof SessionTable.$inferInse
     permission: info.permission ? [...info.permission] : undefined,
     time_created: info.time.created,
     time_updated: info.time.updated,
-    time_compacting: info.time.compacting,
-    time_archived: info.time.archived,
+    time_compacting: info.time.compacting ?? null,
+    // Explicit null so updates can clear the archive timestamp; drizzle skips undefined.
+    time_archived: info.time.archived ?? null,
   }
 }
 
diff --git a/packages/opencode/src/server/routes/instance/httpapi/groups/session.ts b/packages/opencode/src/server/routes/instance/httpapi/groups/session.ts
index 959a303dc964..8848fdb350da 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/groups/session.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/groups/session.ts
@@ -52,7 +52,10 @@ export const UpdatePayload = Schema.Struct({
   permission: Schema.optional(PermissionV1.Ruleset),
   time: Schema.optional(
     Schema.Struct({
-      archived: Schema.optional(Session.ArchivedTimestamp),
+      // null clears the archive timestamp (unarchive); a number sets it.
+      // Note: the OpenAPI emitter renders optional+nullable as plain number,
+      // so SDK callers pass null through a documented cast.
+      archived: Schema.optional(Schema.NullOr(Session.ArchivedTimestamp)),
     }),
   ),
 })
diff --git a/packages/opencode/src/server/routes/instance/httpapi/handlers/session.ts b/packages/opencode/src/server/routes/instance/httpapi/handlers/session.ts
index 662585020a64..f5636ac275ee 100644
--- a/packages/opencode/src/server/routes/instance/httpapi/handlers/session.ts
+++ b/packages/opencode/src/server/routes/instance/httpapi/handlers/session.ts
@@ -198,7 +198,8 @@ export const sessionHandlers = HttpApiBuilder.group(InstanceHttpApi, "session",
         })
       }
       if (ctx.payload.time?.archived !== undefined) {
-        yield* session.setArchived({ sessionID: ctx.params.sessionID, time: ctx.payload.time.archived })
+        // null unarchives; numbers archive.
+        yield* session.setArchived({ sessionID: ctx.params.sessionID, time: ctx.payload.time.archived ?? undefined })
       }
       return yield* requireSession(ctx.params.sessionID)
     })
diff --git a/packages/opencode/src/session/session.ts b/packages/opencode/src/session/session.ts
index a2a91cd47b5e..ce8e96da6bd7 100644
--- a/packages/opencode/src/session/session.ts
+++ b/packages/opencode/src/session/session.ts
@@ -19,6 +19,7 @@ import { eq } from "drizzle-orm"
 import { and } from "drizzle-orm"
 import { gte } from "drizzle-orm"
 import { isNull } from "drizzle-orm"
+import { isNotNull } from "drizzle-orm"
 import { desc } from "drizzle-orm"
 import { like } from "drizzle-orm"
 import { sql } from "drizzle-orm"
@@ -559,7 +560,9 @@ const layer: Layer.Layer<
       if (input?.start) conditions.push(gte(SessionTable.time_updated, input.start))
       if (input?.cursor) conditions.push(lt(SessionTable.time_updated, input.cursor))
       if (input?.search) conditions.push(like(SessionTable.title, `%${input.search}%`))
-      if (!input?.archived) conditions.push(isNull(SessionTable.time_archived))
+      // archived=true lists only archived sessions; default excludes them.
+      if (input?.archived === true) conditions.push(isNotNull(SessionTable.time_archived))
+      else conditions.push(isNull(SessionTable.time_archived))
 
       const query =
         conditions.length > 0

From 37dfc49b403e27791fe858bd78f44c35929b2bbc Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Fri, 11 Sep 2026 08:51:16 +0300
Subject: [PATCH 02/14] feat(app): add sidebar navigation mode with settle
 support

Settings > General gains a Navigation select (Tabs default, Sidebar)
that hides the titlebar tab strip on desktop widths and mounts a
navigation sidebar next to the session pane. The sidebar lists projects
with their active sessions, working indicators, unread badges, and
hover actions; sessions idle past a configurable window settle into an
expandable Settled section where they can be restored. Working, open,
and current sessions always stay visible.
---
 .../src/components/settings-v2/general.tsx    |  64 +-
 packages/app/src/components/titlebar.tsx      |  72 +-
 packages/app/src/context/language.tsx         |   1 +
 packages/app/src/context/settings.tsx         |  17 +
 packages/app/src/i18n/en.ts                   |  19 +
 packages/app/src/pages/layout-new.tsx         |  26 +-
 .../navigation-sidebar-visibility.test.ts     | 103 +++
 .../layout/navigation-sidebar-visibility.ts   |  86 +++
 .../src/pages/layout/navigation-sidebar.tsx   | 648 ++++++++++++++++++
 9 files changed, 998 insertions(+), 38 deletions(-)
 create mode 100644 packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
 create mode 100644 packages/app/src/pages/layout/navigation-sidebar-visibility.ts
 create mode 100644 packages/app/src/pages/layout/navigation-sidebar.tsx

diff --git a/packages/app/src/components/settings-v2/general.tsx b/packages/app/src/components/settings-v2/general.tsx
index b41da107ed6e..f7462cce0eae 100644
--- a/packages/app/src/components/settings-v2/general.tsx
+++ b/packages/app/src/components/settings-v2/general.tsx
@@ -8,7 +8,7 @@ import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
 import { useUpdaterAction } from "../updater-action"
-import { useSettings } from "@/context/settings"
+import { useSettings, type NavigationMode } from "@/context/settings"
 import { ExternalLink } from "../external-link"
 import { SettingsListV2 } from "./parts/list"
 import { SettingsRowV2 } from "./parts/row"
@@ -119,6 +119,61 @@ const ShellSetting: Component<{ controller: ShellSettingsController }> = (props)
   )
 }
 
+const navigationModeOptions: NavigationMode[] = ["tabs", "sidebar"]
+const sidebarSessionDayOptions = [0, 1, 3, 7, 30]
+
+const NavigationModeSetting: Component = () => {
+  const language = useLanguage()
+  const settings = useSettings()
+  return (
+    <SettingsRowV2
+      title={language.t("settings.general.row.navigation.title")}
+      description={language.t("settings.general.row.navigation.description")}
+    >
+      <SelectV2
+        appearance="inline"
+        data-action="settings-navigation-mode"
+        options={navigationModeOptions}
+        current={navigationModeOptions.find((option) => option === settings.general.navigationMode())}
+        placement="bottom-end"
+        gutter={6}
+        label={(option) =>
+          option === "tabs"
+            ? language.t("settings.general.row.navigation.tabs")
+            : language.t("settings.general.row.navigation.sidebar")
+        }
+        onSelect={(option) => option && settings.general.setNavigationMode(option)}
+      />
+    </SettingsRowV2>
+  )
+}
+
+const SidebarSessionDaysSetting: Component = () => {
+  const language = useLanguage()
+  const settings = useSettings()
+  return (
+    <SettingsRowV2
+      title={language.t("settings.general.row.sidebarSessions.title")}
+      description={language.t("settings.general.row.sidebarSessions.description")}
+    >
+      <SelectV2
+        appearance="inline"
+        data-action="settings-sidebar-session-days"
+        options={sidebarSessionDayOptions}
+        current={sidebarSessionDayOptions.find((option) => option === settings.general.sidebarSessionDays())}
+        placement="bottom-end"
+        gutter={6}
+        label={(option) =>
+          option
+            ? language.plural("settings.general.row.sidebarSessions.days", option)
+            : language.t("settings.general.row.sidebarSessions.always")
+        }
+        onSelect={(option) => option !== null && settings.general.setSidebarSessionDays(option)}
+      />
+    </SettingsRowV2>
+  )
+}
+
 const AppearanceSection: Component<{ controller: AppearanceSettingsController }> = (props) => {
   const language = useLanguage()
   return (
@@ -333,6 +388,13 @@ export const SettingsGeneralV2: Component<{
 
         <ShellSetting controller={shell} />
 
+        <Show when={settings.general.newLayoutDesigns()}>
+          <NavigationModeSetting />
+          <Show when={settings.general.navigationMode() === "sidebar"}>
+            <SidebarSessionDaysSetting />
+          </Show>
+        </Show>
+
         <SettingsRowV2
           title={language.t("settings.general.row.reasoningSummaries.title")}
           description={language.t("settings.general.row.reasoningSummaries.description")}
diff --git a/packages/app/src/components/titlebar.tsx b/packages/app/src/components/titlebar.tsx
index 15d963a13844..c97cdd70384f 100644
--- a/packages/app/src/components/titlebar.tsx
+++ b/packages/app/src/components/titlebar.tsx
@@ -72,6 +72,10 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
   const location = useLocation()
   const params = useParams()
   const useV2Titlebar = createMemo(() => settings.general.newLayoutDesigns())
+  // Sidebar navigation mode replaces the tab strip on desktop widths; mobile keeps tabs.
+  const sidebarNavigation = createMemo(
+    () => useV2Titlebar() && !mobile() && settings.general.navigationMode() === "sidebar",
+  )
   const mobile = createMediaQuery("(max-width: 767px)")
   const bottom = createMemo(() => useV2Titlebar() && mobile() && settings.general.mobileTitlebarPosition() === "bottom")
 
@@ -395,40 +399,42 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
                   />
                 </TooltipV2>
 
-                <TitlebarTabStrip
-                  tabs={tabsStore}
-                  currentTab={currentTab}
-                  forceTruncate={tabsAreOverflowing()}
-                  onOverflowChange={setTabsAreOverflowing}
-                  onNavigate={(tab, el) => {
-                    tabs.select(tab)
-                    el?.scrollIntoView({ behavior: "instant" })
-                  }}
-                  onClose={(tab) => {
-                    const index = tabsStore.findIndex((item) => tabKey(item) === tabKey(tab))
-                    if (index !== -1) tabsStoreActions.closeTab(index)
-                  }}
-                  onReorder={(keys) => tabsStoreActions.reorder(keys)}
-                />
-                <TooltipV2
-                  placement="bottom"
-                  value={
-                    <>
-                      {language.t("command.session.new")}
-                      <KeybindV2 keys={newTabTooltipKeybind(command)} variant="neutral" />
-                    </>
-                  }
-                >
-                  <IconButtonV2
-                    type="button"
-                    variant="ghost-muted"
-                    size="large"
-                    class="shrink-0"
-                    icon={<IconV2 name="plus" />}
-                    onClick={openNewTab}
-                    aria-label={language.t("command.session.new")}
+                <Show when={!sidebarNavigation()}>
+                  <TitlebarTabStrip
+                    tabs={tabsStore}
+                    currentTab={currentTab}
+                    forceTruncate={tabsAreOverflowing()}
+                    onOverflowChange={setTabsAreOverflowing}
+                    onNavigate={(tab, el) => {
+                      tabs.select(tab)
+                      el?.scrollIntoView({ behavior: "instant" })
+                    }}
+                    onClose={(tab) => {
+                      const index = tabsStore.findIndex((item) => tabKey(item) === tabKey(tab))
+                      if (index !== -1) tabsStoreActions.closeTab(index)
+                    }}
+                    onReorder={(keys) => tabsStoreActions.reorder(keys)}
                   />
-                </TooltipV2>
+                  <TooltipV2
+                    placement="bottom"
+                    value={
+                      <>
+                        {language.t("command.session.new")}
+                        <KeybindV2 keys={newTabTooltipKeybind(command)} variant="neutral" />
+                      </>
+                    }
+                  >
+                    <IconButtonV2
+                      type="button"
+                      variant="ghost-muted"
+                      size="large"
+                      class="shrink-0"
+                      icon={<IconV2 name="plus" />}
+                      onClick={openNewTab}
+                      aria-label={language.t("command.session.new")}
+                    />
+                  </TooltipV2>
+                </Show>
                 <div class="flex-1" />
                 <TitlebarV2Right state={v2RightState()} />
               </div>
diff --git a/packages/app/src/context/language.tsx b/packages/app/src/context/language.tsx
index e387391f68bf..41fc94bd8aae 100644
--- a/packages/app/src/context/language.tsx
+++ b/packages/app/src/context/language.tsx
@@ -33,6 +33,7 @@ type PluralKey =
   | "session.question.pending"
   | "session.followupDock.summary"
   | "session.revertDock.summary"
+  | "settings.general.row.sidebarSessions.days"
 type Source = { dict: Record<string, string> }
 
 function cookie(locale: Locale) {
diff --git a/packages/app/src/context/settings.tsx b/packages/app/src/context/settings.tsx
index 1a118b654479..ccf6423579b8 100644
--- a/packages/app/src/context/settings.tsx
+++ b/packages/app/src/context/settings.tsx
@@ -19,6 +19,8 @@ export interface SoundSettings {
   errors: string
 }
 
+export type NavigationMode = "tabs" | "sidebar"
+
 export interface Settings {
   general: {
     autoSave: boolean
@@ -34,6 +36,8 @@ export interface Settings {
     editToolPartsExpanded: boolean
     showCustomAgents: boolean
     mobileTitlebarPosition: "top" | "bottom"
+    navigationMode?: NavigationMode
+    sidebarSessionDays?: number
     newLayoutDesigns?: boolean
     layoutTransitionEligible?: boolean
     agentVisibilityInitialized?: boolean
@@ -195,6 +199,8 @@ const defaultSettings: Settings = {
     editToolPartsExpanded: false,
     showCustomAgents: false,
     mobileTitlebarPosition: "top",
+    navigationMode: "tabs",
+    sidebarSessionDays: 3,
   },
   appearance: {
     fontSize: 14,
@@ -428,6 +434,17 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
         setMobileTitlebarPosition(value: "top" | "bottom") {
           setStore("general", "mobileTitlebarPosition", value)
         },
+        navigationMode: withFallback(() => store.general?.navigationMode, defaultSettings.general.navigationMode),
+        setNavigationMode(value: NavigationMode) {
+          setStore("general", "navigationMode", value)
+        },
+        sidebarSessionDays: withFallback(
+          () => store.general?.sidebarSessionDays,
+          defaultSettings.general.sidebarSessionDays,
+        ),
+        setSidebarSessionDays(value: number) {
+          setStore("general", "sidebarSessionDays", value)
+        },
         newLayoutDesigns,
         setNewLayoutDesigns(value: boolean) {
           const next = oldInterfaceRetired() ? true : value
diff --git a/packages/app/src/i18n/en.ts b/packages/app/src/i18n/en.ts
index 62d4dc1ae6e9..ca38ee30c6db 100644
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -854,6 +854,15 @@ export const dict = {
   "sidebar.project.clearNotifications": "Clear notifications",
   "sidebar.empty.title": "No projects open",
   "sidebar.empty.description": "Open a project to get started",
+  "sidebar.navigation.label": "Navigation",
+  "sidebar.navigation.filter": "Filter projects and sessions",
+  "sidebar.navigation.noMatches": "No matching sessions",
+  "sidebar.navigation.projects": "Projects",
+  "sidebar.navigation.settle": "Settle session",
+  "sidebar.navigation.settled": "Settled",
+  "sidebar.navigation.settled.show": "Show settled sessions",
+  "sidebar.navigation.settled.empty": "No settled sessions",
+  "sidebar.navigation.settled.restore": "Restore session",
 
   "debugBar.ariaLabel": "Development performance diagnostics",
   "debugBar.na": "n/a",
@@ -907,6 +916,16 @@ export const dict = {
 
   "settings.general.row.language.title": "Language",
   "settings.general.row.language.description": "Change the display language for OpenCode",
+  "settings.general.row.navigation.title": "Navigation",
+  "settings.general.row.navigation.description": "Switch between session tabs in the title bar and a persistent sidebar",
+  "settings.general.row.navigation.tabs": "Tabs",
+  "settings.general.row.navigation.sidebar": "Sidebar",
+  "settings.general.row.sidebarSessions.title": "Settle sessions after",
+  "settings.general.row.sidebarSessions.description":
+    "Sessions idle for longer than this are hidden under Settled in the sidebar. Working and open sessions always stay visible.",
+  "settings.general.row.sidebarSessions.always": "Always show",
+  "settings.general.row.sidebarSessions.days.one": "{{count}} day",
+  "settings.general.row.sidebarSessions.days.other": "{{count}} days",
   "settings.general.row.shell.title": "Terminal shell",
   "settings.general.row.shell.description": "Shell used by the terminal and agent tools",
   "settings.general.row.shell.autoDefault": "Auto (Default)",
diff --git a/packages/app/src/pages/layout-new.tsx b/packages/app/src/pages/layout-new.tsx
index 6d76ca840178..c0a2512621ec 100644
--- a/packages/app/src/pages/layout-new.tsx
+++ b/packages/app/src/pages/layout-new.tsx
@@ -1,17 +1,28 @@
-import { createEffect, Suspense, type ParentProps } from "solid-js"
+import { createEffect, createMemo, lazy, Show, Suspense, type ParentProps } from "solid-js"
 import { createStore } from "solid-js/store"
+import { createMediaQuery } from "@solid-primitives/media"
 import { DebugBar } from "@/components/debug-bar"
 import { TabsInfoPopup } from "@/components/help-button"
 import { Titlebar, type TitlebarUpdate } from "@/components/titlebar"
 import { usePlatform } from "@/context/platform"
+import { useSettings } from "@/context/settings"
 import { setV2Toast, ToastRegion } from "@/utils/toast"
 
+const NavigationSidebar = lazy(() =>
+  import("@/pages/layout/navigation-sidebar").then((mod) => ({ default: mod.NavigationSidebar })),
+)
+
 export default function NewLayout(props: ParentProps) {
   const platform = usePlatform()
+  const settings = useSettings()
+  const mobile = createMediaQuery("(max-width: 767px)")
   const [state, setState] = createStore({ debugTools: true })
 
   createEffect(() => setV2Toast(true))
 
+  // Sidebar navigation mode replaces the titlebar tab strip on desktop widths.
+  const sidebarNavigation = createMemo(() => !mobile() && settings.general.navigationMode() === "sidebar")
+
   const update: TitlebarUpdate = {
     version: () => {
       const state = platform.updater?.state()
@@ -38,9 +49,16 @@ export default function NewLayout(props: ParentProps) {
             : undefined
         }
       />
-      <main class="flex-1 min-h-0 min-w-0 overflow-x-hidden flex flex-col items-start contain-strict">
-        <Suspense>{props.children}</Suspense>
-      </main>
+      <div class="flex-1 min-h-0 min-w-0 flex flex-row items-stretch overflow-hidden">
+        <Show when={sidebarNavigation()}>
+          <Suspense>
+            <NavigationSidebar />
+          </Suspense>
+        </Show>
+        <main class="flex-1 min-h-0 min-w-0 overflow-x-hidden flex flex-col items-start contain-strict">
+          <Suspense>{props.children}</Suspense>
+        </main>
+      </div>
       {import.meta.env.DEV && state.debugTools && <DebugBar inline />}
       <TabsInfoPopup />
       <ToastRegion v2 />
diff --git a/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts b/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
new file mode 100644
index 000000000000..2926dceca07d
--- /dev/null
+++ b/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
@@ -0,0 +1,103 @@
+import { describe, expect, test } from "bun:test"
+import { type Session } from "@opencode-ai/sdk/v2/client"
+import type { LocalProject } from "@/context/layout"
+import {
+  buildSidebarRecords,
+  groupSidebarRecords,
+  matchesSidebarFilter,
+  partitionSidebarRecords,
+  SIDEBAR_SESSION_DAY,
+} from "./navigation-sidebar-visibility"
+
+const session = (input: Partial<Session> & Pick<Session, "id" | "directory">) =>
+  ({
+    title: "",
+    version: "v2",
+    parentID: undefined,
+    messageCount: 0,
+    permissions: { session: {}, share: {} },
+    time: { created: 0, updated: 0, archived: undefined },
+    ...input,
+  }) as Session
+
+const project = (worktree: string): LocalProject =>
+  ({ worktree, expanded: false, id: worktree, name: worktree.split("/").pop() }) as LocalProject
+
+const DAY = SIDEBAR_SESSION_DAY
+const NOW = 100 * DAY
+
+describe("navigation sidebar visibility", () => {
+  test("buildSidebarRecords keeps only root sessions inside project directories", () => {
+    const projects = [project("/src/a"), project("/src/b")]
+    const records = buildSidebarRecords({
+      projects,
+      sessions: [
+        session({ id: "1", directory: "/src/a", time: { created: 10, updated: 20, archived: undefined } }),
+        session({ id: "2", directory: "/src/other" }),
+        session({ id: "3", directory: "/src/a", parentID: "1" }),
+        session({ id: "1", directory: "/src/a", time: { created: 10, updated: 30, archived: undefined } }),
+      ],
+    })
+    expect(records).toHaveLength(1)
+    expect(records[0]?.session.id).toBe("1")
+  })
+
+  test("groupSidebarRecords groups records by project worktree", () => {
+    const projects = [project("/src/a"), project("/src/b")]
+    const groups = groupSidebarRecords(
+      buildSidebarRecords({
+        projects,
+        sessions: [
+          session({ id: "1", directory: "/src/a", time: { created: 1, updated: 5, archived: undefined } }),
+          session({ id: "2", directory: "/src/b", time: { created: 1, updated: 9, archived: undefined } }),
+          session({ id: "3", directory: "/src/a", time: { created: 1, updated: 2, archived: undefined } }),
+        ],
+      }),
+    )
+    expect(groups.map((group) => group.key)).toEqual(["/src/b", "/src/a"])
+    expect(groups[0]?.records.map((record) => record.session.id)).toEqual(["2"])
+    expect(groups[1]?.records.map((record) => record.session.id)).toEqual(["1", "3"])
+  })
+
+  test("partitions by age while keeping pinned records visible", () => {
+    const fresh = session({ id: "fresh", directory: "/src/a", time: { created: NOW - DAY, updated: NOW - DAY, archived: undefined } })
+    const stale = session({ id: "stale", directory: "/src/a", time: { created: NOW - 10 * DAY, updated: NOW - 10 * DAY, archived: undefined } })
+    const staleWorking = session({ id: "working", directory: "/src/a", time: { created: NOW - 10 * DAY, updated: NOW - 10 * DAY, archived: undefined } })
+    const result = partitionSidebarRecords({
+      records: [
+        { session: fresh, project: project("/src/a"), name: "a" },
+        { session: stale, project: project("/src/a"), name: "a" },
+        { session: staleWorking, project: project("/src/a"), name: "a" },
+      ],
+      pinned: (record) => record.session.id === "working",
+      days: 3,
+      now: NOW,
+    })
+    expect(result.visible.map((record) => record.session.id)).toEqual(["fresh", "working"])
+    expect(result.hidden.map((record) => record.session.id)).toEqual(["stale"])
+  })
+
+  test("days of zero keeps every session visible", () => {
+    const ancient = session({ id: "ancient", directory: "/src/a", time: { created: 0, updated: 0, archived: undefined } })
+    const result = partitionSidebarRecords({
+      records: [{ session: ancient, project: project("/src/a"), name: "a" }],
+      pinned: () => false,
+      days: 0,
+      now: NOW,
+    })
+    expect(result.visible).toHaveLength(1)
+    expect(result.hidden).toHaveLength(0)
+  })
+
+  test("matchesSidebarFilter checks project name and session title", () => {
+    const record = {
+      session: session({ id: "1", directory: "/src/a", title: "Fix login bug" }),
+      project: project("/src/a"),
+      name: "Web App",
+    }
+    expect(matchesSidebarFilter(record, "")).toBe(true)
+    expect(matchesSidebarFilter(record, "web")).toBe(true)
+    expect(matchesSidebarFilter(record, "login")).toBe(true)
+    expect(matchesSidebarFilter(record, "missing")).toBe(false)
+  })
+})
diff --git a/packages/app/src/pages/layout/navigation-sidebar-visibility.ts b/packages/app/src/pages/layout/navigation-sidebar-visibility.ts
new file mode 100644
index 000000000000..0a5e4e4b8a49
--- /dev/null
+++ b/packages/app/src/pages/layout/navigation-sidebar-visibility.ts
@@ -0,0 +1,86 @@
+import type { Session } from "@opencode-ai/sdk/v2/client"
+import type { LocalProject } from "@/context/layout"
+import { compareSessionTime, displayName, projectForSession } from "@/pages/layout/helpers"
+import { pathKey } from "@/utils/path-key"
+
+export const SIDEBAR_SESSION_DAY = 86_400_000
+
+export type SidebarSessionRecord = {
+  session: Session
+  project: LocalProject
+  name: string
+}
+
+export type SidebarProjectGroup = {
+  key: string
+  project: LocalProject
+  name: string
+  records: SidebarSessionRecord[]
+}
+
+export function buildSidebarRecords(input: { sessions: Session[]; projects: LocalProject[] }) {
+  const projectByID = new Map(input.projects.flatMap((project) => (project.id ? [[project.id, project]] : [])))
+  const directories = new Set(
+    input.projects.flatMap((project) => [project.worktree, ...(project.sandboxes ?? [])]).map(pathKey),
+  )
+  const sessions = input.sessions
+    .filter((session) => directories.has(pathKey(session.directory)))
+    .filter((session) => !session.parentID)
+  const unique = [...new Map(sessions.map((session) => [session.id, session] as const)).values()].sort(
+    compareSessionTime,
+  )
+  return unique.flatMap((session): SidebarSessionRecord[] => {
+    const directory = pathKey(session.directory)
+    const project =
+      input.projects.find(
+        (item) => pathKey(item.worktree) === directory || item.sandboxes?.some((sandbox) => pathKey(sandbox) === directory),
+      ) ?? projectForSession(session, input.projects, projectByID)
+    if (!project) return []
+    return [{ session, project, name: displayName(project) }]
+  })
+}
+
+export function groupSidebarRecords(records: SidebarSessionRecord[]): SidebarProjectGroup[] {
+  return [
+    ...records
+      .reduce((groups, record) => {
+        const key = pathKey(record.project.worktree)
+        const group = groups.get(key)
+        if (group) group.records.push(record)
+        if (!group) groups.set(key, { key, project: record.project, name: record.name, records: [record] })
+        return groups
+      }, new Map<string, SidebarProjectGroup>())
+      .values(),
+  ]
+}
+
+export function sidebarSessionAge(session: Session, now: number) {
+  return Math.max(0, now - (session.time.updated || session.time.created))
+}
+
+/**
+ * Working, open and currently viewed sessions stay pinned regardless of age so the sidebar never
+ * hides a session the user is actively waiting on.
+ */
+export function partitionSidebarRecords(input: {
+  records: SidebarSessionRecord[]
+  pinned: (record: SidebarSessionRecord) => boolean
+  days: number
+  now: number
+}) {
+  const cutoff = input.days <= 0 ? Number.POSITIVE_INFINITY : input.days * SIDEBAR_SESSION_DAY
+  return input.records.reduce(
+    (groups, record) => {
+      const visible = input.pinned(record) || sidebarSessionAge(record.session, input.now) <= cutoff
+      groups[visible ? "visible" : "hidden"].push(record)
+      return groups
+    },
+    { visible: [] as SidebarSessionRecord[], hidden: [] as SidebarSessionRecord[] },
+  )
+}
+
+export function matchesSidebarFilter(record: SidebarSessionRecord, query: string) {
+  const needle = query.trim().toLowerCase()
+  if (!needle) return true
+  return record.name.toLowerCase().includes(needle) || (record.session.title ?? "").toLowerCase().includes(needle)
+}
diff --git a/packages/app/src/pages/layout/navigation-sidebar.tsx b/packages/app/src/pages/layout/navigation-sidebar.tsx
new file mode 100644
index 000000000000..c54a5ed59031
--- /dev/null
+++ b/packages/app/src/pages/layout/navigation-sidebar.tsx
@@ -0,0 +1,648 @@
+import { createMemo, createSignal, For, onCleanup, Show, startTransition } from "solid-js"
+import { createStore, produce } from "solid-js/store"
+import { useQuery } from "@tanstack/solid-query"
+import type { GlobalSession } from "@opencode-ai/sdk/v2/client"
+import { Binary } from "@opencode-ai/core/util/binary"
+import { ScrollView } from "@opencode-ai/ui/scroll-view"
+import { Spinner } from "@opencode-ai/ui/spinner"
+import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
+import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
+import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
+import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
+import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
+import {
+  loadHomeSessionIndex,
+  retainHomeSessions,
+  type HomeSessionEvents,
+} from "@/context/global-sync/home-session-index"
+import type { LocalProject } from "@/context/layout"
+import { useLayout } from "@/context/layout"
+import { useLanguage } from "@/context/language"
+import { ServerConnection } from "@/context/server"
+import { useSettings } from "@/context/settings"
+import { usePlatform } from "@/context/platform"
+import { sessionHasOpenTab, useTabs } from "@/context/tabs"
+import { createHomeController } from "@/pages/home/home-controller"
+import { createHomeProjectsController } from "@/pages/home/home-projects-controller"
+import { archiveHomeSession } from "@/pages/home-session-archive"
+import { shouldOpenSessionInBackground } from "@/pages/home-session-open"
+import { errorMessage } from "@/pages/layout/helpers"
+import {
+  buildSidebarRecords,
+  groupSidebarRecords,
+  matchesSidebarFilter,
+  partitionSidebarRecords,
+  type SidebarProjectGroup,
+  type SidebarSessionRecord,
+} from "@/pages/layout/navigation-sidebar-visibility"
+import { useSessionTabAvatarState } from "@/pages/layout/project-avatar-state"
+import { SessionTabAvatarView } from "@/pages/layout/session-tab-avatar"
+import { fileManagerApp } from "@/utils/file-manager"
+import { pathKey } from "@/utils/path-key"
+import { Persist, persisted } from "@/utils/persist"
+import { sessionTitle, withTimestampedFallback } from "@/utils/session-title"
+import { showToast } from "@/utils/toast"
+
+type SidebarProjectSection = SidebarProjectGroup & {
+  visible: SidebarSessionRecord[]
+  hidden: SidebarSessionRecord[]
+}
+
+const SESSION_LIMIT = 64
+const ARCHIVED_LIMIT = 100
+const AGE_TICK = 60_000
+const SECTION_LABEL = "px-3 pb-1 pt-3 text-v2-text-text-muted [font-weight:440]"
+const ROW =
+  "group/row relative flex h-7 min-w-0 w-full shrink-0 cursor-default items-center gap-2 rounded-[6px] bg-transparent px-1.5 text-start text-v2-text-text-muted [font-weight:440] transition-[background-color,color,box-shadow] duration-[120ms] ease-in-out hover:bg-v2-background-bg-layer-01 hover:text-v2-text-text-base data-[selected=true]:bg-v2-background-bg-layer-03 data-[selected=true]:text-v2-text-text-base data-[selected=true]:hover:bg-v2-background-bg-layer-03 focus-visible:bg-v2-background-bg-layer-01 focus-visible:text-v2-text-text-base focus-visible:outline-none focus-visible:[box-shadow:inset_0_0_0_0.5px_var(--v2-border-border-muted)]"
+const ROW_ACTIONS =
+  "hover-reveal absolute end-1 top-1/2 flex -translate-y-1/2 items-center gap-1 opacity-0 group-hover/row:opacity-100 focus-within:opacity-100 data-[menu=true]:opacity-100"
+
+function titleOf(session: { title?: string; parentID?: string; time: { created: number } }) {
+  return sessionTitle(session.title) ?? withTimestampedFallback(session)
+}
+
+function isBackgroundOpen(event: MouseEvent) {
+  return shouldOpenSessionInBackground({
+    button: event.button,
+    mac: typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform),
+    meta: event.metaKey,
+    ctrl: event.ctrlKey,
+    shift: event.shiftKey,
+    alt: event.altKey,
+  })
+}
+
+export function NavigationSidebar() {
+  const language = useLanguage()
+  const layout = useLayout()
+  const settings = useSettings()
+  const tabs = useTabs()
+  const home = createHomeController()
+  const projects = createHomeProjectsController(home)
+
+  const [filter, setFilter] = createSignal("")
+  const [now, setNow] = createSignal(Date.now())
+  const [state, setState] = persisted(
+    Persist.global("sidebar.navigation", ["sidebar.navigation.v1"]),
+    createStore({ collapsed: {} as Record<string, boolean>, settledOpen: false }),
+  )
+
+  const ticker = setInterval(() => setNow(Date.now()), AGE_TICK)
+  onCleanup(() => clearInterval(ticker))
+
+  const homeSessions = () => home.server.focusedSync().homeSessions
+
+  const sessionEvents = useQuery(() => ({
+    queryKey: homeSessions().eventsKey,
+    queryFn: async (): Promise<HomeSessionEvents> => ({ sequence: 0, entries: [] }),
+    initialData: { sequence: 0, entries: [] } satisfies HomeSessionEvents,
+    enabled: false,
+  }))
+
+  const sessionIndex = useQuery(() => ({
+    queryKey: homeSessions().indexKey,
+    enabled: !!home.server.focusedContext(),
+    queryFn: async ({ signal }) => {
+      const ctx = home.server.focusedContext()
+      if (!ctx) return { sessions: [], eventSequence: 0 }
+      const cache = homeSessions()
+      const eventSequence = cache.eventSequence()
+      const index = await loadHomeSessionIndex(
+        (input, options) => ctx.sdk.client.v2.session.list(input, options),
+        eventSequence,
+        signal,
+      )
+      cache.complete(eventSequence)
+      return index
+    },
+    retry: false,
+    staleTime: 30_000,
+    refetchOnMount: true,
+    refetchOnReconnect: true,
+  }))
+
+  const sessions = createMemo(() =>
+    retainHomeSessions(homeSessions().sessions(sessionIndex.data, sessionEvents.data), SESSION_LIMIT, now()),
+  )
+
+  const serverKey = createMemo(() => home.selection.value().server ?? ServerConnection.Key.make(""))
+  const route = createMemo(() => layout.route())
+  const currentSession = createMemo(() => {
+    const value = route()
+    return value.type === "session" ? value.sessionId : undefined
+  })
+  const working = (sessionID: string) => home.server.focusedSync().session.data.session_working(sessionID)
+
+  const groups = createMemo((): SidebarProjectSection[] => {
+    const records = buildSidebarRecords({ sessions: sessions(), projects: home.project.list() }).filter((record) =>
+      matchesSidebarFilter(record, filter()),
+    )
+    return groupSidebarRecords(records).map((group) => ({
+      ...group,
+      ...partitionSidebarRecords({
+        records: group.records,
+        pinned: (record) => isPinned(record),
+        days: settings.general.sidebarSessionDays() ?? 3,
+        now: now(),
+      }),
+    }))
+  })
+
+  const settled = createMemo(() => groups().flatMap((group) => group.hidden))
+  const visibleGroups = createMemo(() => groups().filter((group) => group.visible.length > 0))
+  const empty = createMemo(() => visibleGroups().length === 0 && settled().length === 0)
+
+  const archivedOpen = () => state.settledOpen
+  const archived = useQuery(() => ({
+    queryKey: ["sidebar", "settled", serverKey()],
+    enabled: archivedOpen() && !!home.server.focusedContext(),
+    queryFn: async ({ signal }): Promise<GlobalSession[]> => {
+      const ctx = home.server.focusedContext()
+      if (!ctx) return []
+      const response = await ctx.sdk.client.experimental.session.list(
+        { archived: true, roots: true, limit: ARCHIVED_LIMIT },
+        { signal },
+      )
+      return response.data ?? []
+    },
+    retry: false,
+    staleTime: 30_000,
+  }))
+
+  function isPinned(record: SidebarSessionRecord) {
+    if (record.session.id === currentSession()) return true
+    if (working(record.session.id)) return true
+    return sessionHasOpenTab(tabs.store, serverKey(), record.session)
+  }
+
+  function projectOf(session: { directory: string }) {
+    const directory = pathKey(session.directory)
+    return home.project.list().find((item) => pathKey(item.worktree) === directory)
+  }
+
+  function open(session: { id: string; directory: string }, project: LocalProject | undefined, event?: MouseEvent) {
+    const conn = home.server.focused()
+    const ctx = home.server.focusedContext()
+    if (!conn || !ctx) return
+    const directory = project?.worktree ?? session.directory
+    ctx.projects.open(directory)
+    if (event && isBackgroundOpen(event)) {
+      tabs.addSessionTab({ server: ServerConnection.key(conn), sessionId: session.id })
+      return
+    }
+    ctx.projects.touch(directory)
+    void startTransition(() => {
+      const tab = tabs.addSessionTab({ server: ServerConnection.key(conn), sessionId: session.id })
+      tabs.select(tab)
+    })
+  }
+
+  function requestFailed(cause: unknown) {
+    showToast({
+      title: language.t("common.requestFailed"),
+      description: errorMessage(cause, language.t("common.requestFailed")),
+    })
+  }
+
+  function settle(record: SidebarSessionRecord) {
+    void (async () => {
+      const conn = home.server.focused()
+      const ctx = home.server.focusedContext()
+      if (!conn || !ctx) return
+      if ((await ctx.sdk.protocol) !== "v1") return
+      const [, setStore] = ctx.sync.child(record.session.directory)
+      await archiveHomeSession({
+        server: ServerConnection.key(conn),
+        session: record.session,
+        archive: (sessionID) =>
+          ctx.sdk.client.session.update({
+            sessionID,
+            directory: record.session.directory,
+            time: { archived: Date.now() },
+          }),
+        remove: () => {
+          setStore(
+            produce((draft) => {
+              const match = Binary.search(draft.session, record.session.id, (item) => item.id)
+              if (match.found) draft.session.splice(match.index, 1)
+            }),
+          )
+          homeSessions().remove(record.session.id)
+        },
+        onError: requestFailed,
+      })
+    })()
+  }
+
+  function unsettle(session: GlobalSession) {
+    void (async () => {
+      const conn = home.server.focused()
+      const ctx = home.server.focusedContext()
+      if (!conn || !ctx) return
+      if ((await ctx.sdk.protocol) !== "v1") return
+      const result = await ctx.sdk.client.session
+        .update({
+          sessionID: session.id,
+          directory: session.directory,
+          // The server clears the archive timestamp on null; the generated type only models the
+          // positive case because the OpenAPI emitter drops nullable members of optional fields.
+          time: { archived: null as unknown as number },
+        })
+        .catch((cause) => {
+          requestFailed(cause)
+          return undefined
+        })
+      if (!result) return
+      void sessionIndex.refetch()
+      void archived.refetch()
+    })()
+  }
+
+  function closeTab(record: SidebarSessionRecord) {
+    tabs.removeSessionTab({ server: serverKey(), sessionId: record.session.id })
+  }
+
+  const canCreate = createMemo(() => !!home.project.newSession())
+  const connection = createMemo(() => home.server.focused())
+
+  return (
+    <aside
+      aria-label={language.t("sidebar.navigation.label")}
+      class="my-2 ms-2 flex w-[268px] shrink-0 flex-col overflow-hidden rounded-[10px] bg-v2-background-bg-base shadow-[var(--v2-elevation-raised)]"
+    >
+      <div class="flex shrink-0 flex-col gap-2 px-2 pt-2">
+        <div class="flex items-center gap-1">
+          <button
+            type="button"
+            data-action="sidebar-new-session"
+            disabled={!canCreate()}
+            onClick={() => home.project.openNewSession()}
+            class="flex h-7 min-w-0 flex-1 cursor-default items-center gap-2 rounded-[6px] bg-v2-background-bg-layer-01 px-2 text-start text-v2-text-text-base [font-weight:530] transition-[background-color,color] duration-[120ms] ease-in-out hover:bg-v2-background-bg-layer-02 focus-visible:outline-none focus-visible:[box-shadow:inset_0_0_0_0.5px_var(--v2-border-border-muted)] disabled:opacity-50"
+          >
+            <IconV2 name="edit" class="size-3.5 shrink-0 text-v2-icon-icon-muted" />
+            <span class="truncate">{language.t("command.session.new")}</span>
+          </button>
+          <TooltipV2 value={language.t("home.project.add")} placement="bottom-end">
+            <IconButtonV2
+              data-action="sidebar-add-project"
+              variant="ghost-muted"
+              size="small"
+              icon={<IconV2 name="folder-add-left" />}
+              aria-label={language.t("home.project.add")}
+              onClick={() => {
+                const conn = home.server.focused()
+                if (conn) projects.project.choose(conn)
+              }}
+            />
+          </TooltipV2>
+        </div>
+        <TextInputV2
+          value={filter()}
+          autocomplete="off"
+          spellcheck={false}
+          showClearButton={!!filter()}
+          clearLabel={language.t("common.close")}
+          onClearClick={() => setFilter("")}
+          placeholder={language.t("sidebar.navigation.filter")}
+          leadingIcon={<IconV2 name="magnifying-glass" />}
+          onInput={(event) => setFilter(event.currentTarget.value)}
+        />
+      </div>
+
+      <ScrollView class="min-h-0 flex-1">
+        <div class="flex flex-col gap-0.5 px-2 pb-2">
+          <Show when={sessionIndex.isLoading}>
+            <div class="flex items-center justify-center gap-2 py-6 text-v2-text-text-faint">
+              <Spinner class="size-3.5 shrink-0" />
+              <span class="text-xs">{language.t("common.loading")}</span>
+            </div>
+          </Show>
+
+          <Show when={!sessionIndex.isLoading && empty()}>
+            <div class="flex flex-col gap-1 px-3 py-6 text-center">
+              <span class="text-v2-text-text-base [font-weight:530]">
+                {language.t(
+                  filter() ? "sidebar.navigation.noMatches" : "sidebar.empty.title",
+                )}
+              </span>
+              <Show when={!filter()}>
+                <span class="text-xs text-v2-text-text-faint">{language.t("sidebar.empty.description")}</span>
+              </Show>
+            </div>
+          </Show>
+
+          <Show when={visibleGroups().length > 0}>
+            <div class={SECTION_LABEL}>{language.t("sidebar.navigation.projects")}</div>
+          </Show>
+
+          <For each={visibleGroups()}>
+            {(group) => (
+              <SidebarProject
+                group={group}
+                server={serverKey()}
+                collapsed={state.collapsed[group.key] === true}
+                current={currentSession()}
+                working={working}
+                unseen={() => {
+                  const conn = connection()
+                  if (!conn) return 0
+                  return projects.project.unseenCount(conn, group.project)
+                }}
+                canReveal={() => {
+                  const conn = connection()
+                  return !!conn && projects.project.canReveal(conn)
+                }}
+                onToggleCollapsed={() => setState("collapsed", group.key, (value) => !value)}
+                onOpen={open}
+                onSettle={settle}
+                onCloseTab={closeTab}
+                onNewSession={() => {
+                  const conn = connection()
+                  if (conn) home.project.openProjectNewSession(conn, group.project.worktree)
+                }}
+                onEdit={() => {
+                  const conn = connection()
+                  if (conn) projects.project.edit(conn, group.project)
+                }}
+                onReveal={() => {
+                  const conn = connection()
+                  if (conn) projects.project.reveal(conn, group.project)
+                }}
+                onClearNotifications={() => {
+                  const conn = connection()
+                  if (conn) projects.project.clearNotifications(conn, group.project)
+                }}
+                onClose={() => {
+                  const conn = connection()
+                  if (conn) projects.project.close(conn, group.project.worktree)
+                }}
+              />
+            )}
+          </For>
+
+          <div class={`${SECTION_LABEL} flex items-center justify-between gap-2`}>
+            <span>{language.t("sidebar.navigation.settled")}</span>
+            <Show when={settled().length > 0}>
+              <span class="text-v2-text-text-faint">{settled().length}</span>
+            </Show>
+          </div>
+
+          <button
+            type="button"
+            data-action="sidebar-settled-toggle"
+            aria-expanded={archivedOpen()}
+            onClick={() => setState("settledOpen", (value) => !value)}
+            class={ROW}
+          >
+            <IconV2
+              name="chevron-down"
+              class={`size-3 shrink-0 text-v2-icon-icon-muted transition-transform duration-[120ms] ${archivedOpen() ? "" : "-rotate-90"}`}
+            />
+            <IconV2 name="archive" class="size-3.5 shrink-0 text-v2-icon-icon-muted" />
+            <span class="min-w-0 flex-1 truncate">{language.t("sidebar.navigation.settled.show")}</span>
+          </button>
+
+          <Show when={archivedOpen()}>
+            <Show when={archived.isLoading}>
+              <div class="flex items-center justify-center py-3 text-v2-text-text-faint">
+                <Spinner class="size-3.5 shrink-0" />
+              </div>
+            </Show>
+            <Show when={!archived.isLoading && (archived.data ?? []).length === 0}>
+              <div class="px-3 py-2 text-xs text-v2-text-text-faint">{language.t("sidebar.navigation.settled.empty")}</div>
+            </Show>
+            <For each={archived.data ?? []}>
+              {(session) => (
+                <div class="flex min-w-0 items-center gap-1">
+                  <button
+                    type="button"
+                    data-action="sidebar-settled-session"
+                    onClick={(event) => open(session, projectOf(session), event)}
+                    class={`${ROW} min-w-0 flex-1`}
+                  >
+                    <span class="min-w-0 flex-1 truncate">{titleOf(session)}</span>
+                  </button>
+                  <div class="shrink-0">
+                    <TooltipV2 value={language.t("sidebar.navigation.settled.restore")} placement="top-end">
+                      <IconButtonV2
+                        data-action="sidebar-unsettle"
+                        variant="ghost-muted"
+                        size="small"
+                        icon={<IconV2 name="outline-reset" />}
+                        aria-label={language.t("sidebar.navigation.settled.restore")}
+                        onClick={() => unsettle(session)}
+                      />
+                    </TooltipV2>
+                  </div>
+                </div>
+              )}
+            </For>
+          </Show>
+        </div>
+      </ScrollView>
+
+      <div class="flex shrink-0 items-center justify-between gap-1 border-t border-v2-border-border-muted px-2 py-1.5">
+        <IconButtonV2
+          data-action="sidebar-settings"
+          variant="ghost-muted"
+          size="small"
+          icon={<IconV2 name="settings-gear" />}
+          aria-label={language.t("sidebar.settings")}
+          onClick={() => projects.utility.settings()}
+        />
+        <IconButtonV2
+          data-action="sidebar-help"
+          variant="ghost-muted"
+          size="small"
+          icon={<IconV2 name="help" />}
+          aria-label={language.t("sidebar.help")}
+          onClick={() => projects.utility.help()}
+        />
+      </div>
+    </aside>
+  )
+}
+
+function SidebarProject(props: {
+  group: SidebarProjectSection
+  server: ServerConnection.Key
+  collapsed: boolean
+  current: string | undefined
+  working: (sessionID: string) => boolean
+  unseen: () => number
+  canReveal: () => boolean
+  onToggleCollapsed: () => void
+  onOpen: (session: { id: string; directory: string }, project: LocalProject | undefined, event?: MouseEvent) => void
+  onSettle: (record: SidebarSessionRecord) => void
+  onCloseTab: (record: SidebarSessionRecord) => void
+  onNewSession: () => void
+  onEdit: () => void
+  onReveal: () => void
+  onClearNotifications: () => void
+  onClose: () => void
+}) {
+  const language = useLanguage()
+  const platform = usePlatform()
+  const [menuOpen, setMenuOpen] = createSignal(false)
+  const projectWorking = createMemo(() => props.group.visible.some((record) => props.working(record.session.id)))
+
+  return (
+    <div class="flex min-w-0 flex-col">
+      <div class="group/row relative flex min-w-0 items-center gap-0.5">
+        <button
+          type="button"
+          data-action="sidebar-project"
+          aria-expanded={!props.collapsed}
+          onClick={props.onToggleCollapsed}
+          class={`${ROW} min-w-0 flex-1`}
+        >
+          <IconV2
+            name="chevron-down"
+            class={`size-3 shrink-0 text-v2-icon-icon-muted transition-transform duration-[120ms] ${props.collapsed ? "-rotate-90" : ""}`}
+          />
+          <SessionTabAvatarView
+            project={props.group.project}
+            directory={props.group.project.worktree}
+            unread={props.unseen() > 0}
+            loading={projectWorking()}
+          />
+          <span class="min-w-0 flex-1 truncate [font-weight:530] text-v2-text-text-base">{props.group.name}</span>
+          <Show when={props.group.visible.length > 0}>
+            <span class="shrink-0 text-xs text-v2-text-text-faint">{props.group.visible.length}</span>
+          </Show>
+        </button>
+        <div class={ROW_ACTIONS} data-menu={menuOpen()}>
+          <TooltipV2 value={language.t("command.session.new")} placement="top-end">
+            <IconButtonV2
+              data-action="sidebar-project-new-session"
+              variant="ghost-muted"
+              size="small"
+              icon={<IconV2 name="edit" />}
+              aria-label={language.t("command.session.new")}
+              onClick={props.onNewSession}
+            />
+          </TooltipV2>
+          <MenuV2
+            gutter={6}
+            modal={false}
+            placement="bottom-end"
+            open={menuOpen()}
+            onOpenChange={(open) => setMenuOpen(open)}
+          >
+            <MenuV2.Trigger
+              as={IconButtonV2}
+              data-action="sidebar-project-menu"
+              variant="ghost-muted"
+              size="small"
+              icon={<IconV2 name="outline-dots" />}
+              aria-label={language.t("common.moreOptions")}
+            />
+            <MenuV2.Portal>
+              <MenuV2.Content>
+                <MenuV2.Item onSelect={props.onNewSession}>{language.t("command.session.new")}</MenuV2.Item>
+                <MenuV2.Item onSelect={props.onEdit}>{language.t("dialog.project.edit.title")}</MenuV2.Item>
+                <Show when={props.canReveal()}>
+                  <MenuV2.Item onSelect={props.onReveal}>
+                    {language.t(
+                      fileManagerApp(platform.platform === "desktop" ? (platform.os ?? "unknown") : "unknown")
+                        .actionLabel,
+                    )}
+                  </MenuV2.Item>
+                </Show>
+                <MenuV2.Item disabled={props.unseen() === 0} onSelect={props.onClearNotifications}>
+                  {language.t("sidebar.project.clearNotifications")}
+                </MenuV2.Item>
+                <MenuV2.Separator />
+                <MenuV2.Item onSelect={props.onClose}>{language.t("common.close")}</MenuV2.Item>
+              </MenuV2.Content>
+            </MenuV2.Portal>
+          </MenuV2>
+        </div>
+      </div>
+
+      <Show when={!props.collapsed}>
+        <div class="flex flex-col gap-0.5 pb-1 ps-3">
+          <For each={props.group.visible}>
+            {(record) => (
+              <SidebarSessionRow
+                record={record}
+                server={props.server}
+                current={record.session.id === props.current}
+                onOpen={props.onOpen}
+                onSettle={props.onSettle}
+                onCloseTab={props.onCloseTab}
+              />
+            )}
+          </For>
+        </div>
+      </Show>
+    </div>
+  )
+}
+
+function SidebarSessionRow(props: {
+  record: SidebarSessionRecord
+  server: ServerConnection.Key
+  current: boolean
+  onOpen: (session: { id: string; directory: string }, project: LocalProject | undefined, event?: MouseEvent) => void
+  onSettle: (record: SidebarSessionRecord) => void
+  onCloseTab: (record: SidebarSessionRecord) => void
+}) {
+  const language = useLanguage()
+  const tabs = useTabs()
+  const server = createMemo(() => props.server)
+  const directory = createMemo(() => props.record.session.directory)
+  const sessionID = createMemo(() => props.record.session.id)
+  const status = useSessionTabAvatarState(server, directory, sessionID)
+  const open = createMemo(() => sessionHasOpenTab(tabs.store, props.server, props.record.session))
+  const title = createMemo(() => titleOf(props.record.session))
+
+  return (
+    <div class="group/row relative flex min-w-0 items-center">
+      <button
+        type="button"
+        data-action="sidebar-session"
+        data-selected={props.current ? true : undefined}
+        aria-current={props.current ? "true" : undefined}
+        onClick={(event) => props.onOpen(props.record.session, props.record.project, event)}
+        class={`${ROW} min-w-0 flex-1`}
+      >
+        <Show when={open()}>
+          <span class="absolute start-0 top-1/2 h-3.5 w-[2px] -translate-y-1/2 rounded-full bg-v2-text-text-muted" />
+        </Show>
+        <SessionTabAvatarView
+          project={props.record.project}
+          directory={props.record.session.directory}
+          revealProjectOnHover
+          unread={status.unread()}
+          loading={status.loading()}
+        />
+        <span class="min-w-0 flex-1 truncate">{title()}</span>
+      </button>
+      <div class={ROW_ACTIONS}>
+        <TooltipV2 value={language.t("sidebar.navigation.settle")} placement="top-end">
+          <IconButtonV2
+            data-action="sidebar-session-settle"
+            variant="ghost-muted"
+            size="small"
+            icon={<IconV2 name="archive" />}
+            aria-label={language.t("sidebar.navigation.settle")}
+            onClick={() => props.onSettle(props.record)}
+          />
+        </TooltipV2>
+        <Show when={open()}>
+          <TooltipV2 value={language.t("command.tab.close")} placement="top-end">
+            <IconButtonV2
+              data-action="sidebar-session-close-tab"
+              variant="ghost-muted"
+              size="small"
+              icon={<IconV2 name="xmark-small" />}
+              aria-label={language.t("command.tab.close")}
+              onClick={() => props.onCloseTab(props.record)}
+            />
+          </TooltipV2>
+        </Show>
+      </div>
+    </div>
+  )
+}

From 9da54efba11d8cb60236f9ed189d017d5c64cd1f Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Fri, 11 Sep 2026 12:50:12 +0300
Subject: [PATCH 03/14] fix(app): propagate sidebar i18n keys to all locales

Reuses existing translated keys where semantics match and reduces the new
key set to eight placeholder-free strings, then adds them to all 61 app
locales so the i18n parity tests stay green. Also drops the plural family
in favour of numeric day labels and fixes the archived row onOpen arity.
---
 .../src/components/settings-v2/general.tsx    |  6 +--
 packages/app/src/context/language.tsx         |  1 -
 packages/app/src/i18n/am.ts                   |  8 ++++
 packages/app/src/i18n/ar.ts                   |  8 ++++
 packages/app/src/i18n/az.ts                   |  8 ++++
 packages/app/src/i18n/bg.ts                   |  8 ++++
 packages/app/src/i18n/bn.ts                   |  8 ++++
 packages/app/src/i18n/br.ts                   |  8 ++++
 packages/app/src/i18n/bs.ts                   |  8 ++++
 packages/app/src/i18n/ca.ts                   |  8 ++++
 packages/app/src/i18n/cs.ts                   |  8 ++++
 packages/app/src/i18n/da.ts                   |  8 ++++
 packages/app/src/i18n/de.ts                   |  8 ++++
 packages/app/src/i18n/dv.ts                   |  8 ++++
 packages/app/src/i18n/dz.ts                   |  8 ++++
 packages/app/src/i18n/el.ts                   |  8 ++++
 packages/app/src/i18n/en.ts                   | 21 +++------
 packages/app/src/i18n/es.ts                   |  8 ++++
 packages/app/src/i18n/et.ts                   |  8 ++++
 packages/app/src/i18n/fa.ts                   |  8 ++++
 packages/app/src/i18n/fi.ts                   |  8 ++++
 packages/app/src/i18n/fo.ts                   |  8 ++++
 packages/app/src/i18n/fr.ts                   |  8 ++++
 packages/app/src/i18n/hi.ts                   |  8 ++++
 packages/app/src/i18n/hr.ts                   |  8 ++++
 packages/app/src/i18n/hu.ts                   |  8 ++++
 packages/app/src/i18n/hy.ts                   |  8 ++++
 packages/app/src/i18n/id.ts                   |  8 ++++
 packages/app/src/i18n/is.ts                   |  8 ++++
 packages/app/src/i18n/it.ts                   |  8 ++++
 packages/app/src/i18n/ja.ts                   |  8 ++++
 packages/app/src/i18n/ka.ts                   |  8 ++++
 packages/app/src/i18n/km.ts                   |  8 ++++
 packages/app/src/i18n/ko.ts                   |  8 ++++
 packages/app/src/i18n/lo.ts                   |  8 ++++
 packages/app/src/i18n/lt.ts                   |  8 ++++
 packages/app/src/i18n/lv.ts                   |  8 ++++
 packages/app/src/i18n/mk.ts                   |  8 ++++
 packages/app/src/i18n/mn.ts                   |  8 ++++
 packages/app/src/i18n/ms.ts                   |  8 ++++
 packages/app/src/i18n/my.ts                   |  8 ++++
 packages/app/src/i18n/ne.ts                   |  8 ++++
 packages/app/src/i18n/nl.ts                   |  8 ++++
 packages/app/src/i18n/no.ts                   |  8 ++++
 packages/app/src/i18n/pa.ts                   |  8 ++++
 packages/app/src/i18n/pl.ts                   |  8 ++++
 packages/app/src/i18n/ro.ts                   |  8 ++++
 packages/app/src/i18n/ru.ts                   |  8 ++++
 packages/app/src/i18n/si.ts                   |  8 ++++
 packages/app/src/i18n/sk.ts                   |  8 ++++
 packages/app/src/i18n/sl.ts                   |  8 ++++
 packages/app/src/i18n/sq.ts                   |  8 ++++
 packages/app/src/i18n/sr.ts                   |  8 ++++
 packages/app/src/i18n/sv.ts                   |  8 ++++
 packages/app/src/i18n/tg.ts                   |  8 ++++
 packages/app/src/i18n/th.ts                   |  8 ++++
 packages/app/src/i18n/tk.ts                   |  8 ++++
 packages/app/src/i18n/tr.ts                   |  8 ++++
 packages/app/src/i18n/uk.ts                   |  8 ++++
 packages/app/src/i18n/ur.ts                   |  8 ++++
 packages/app/src/i18n/uz.ts                   |  8 ++++
 packages/app/src/i18n/vi.ts                   |  8 ++++
 packages/app/src/i18n/zh.ts                   |  8 ++++
 packages/app/src/i18n/zht.ts                  |  8 ++++
 .../src/pages/layout/navigation-sidebar.tsx   | 45 +++++++++++--------
 65 files changed, 521 insertions(+), 40 deletions(-)

diff --git a/packages/app/src/components/settings-v2/general.tsx b/packages/app/src/components/settings-v2/general.tsx
index f7462cce0eae..002279b61de9 100644
--- a/packages/app/src/components/settings-v2/general.tsx
+++ b/packages/app/src/components/settings-v2/general.tsx
@@ -127,7 +127,7 @@ const NavigationModeSetting: Component = () => {
   const settings = useSettings()
   return (
     <SettingsRowV2
-      title={language.t("settings.general.row.navigation.title")}
+      title={language.t("settings.shortcuts.group.navigation")}
       description={language.t("settings.general.row.navigation.description")}
     >
       <SelectV2
@@ -164,9 +164,7 @@ const SidebarSessionDaysSetting: Component = () => {
         placement="bottom-end"
         gutter={6}
         label={(option) =>
-          option
-            ? language.plural("settings.general.row.sidebarSessions.days", option)
-            : language.t("settings.general.row.sidebarSessions.always")
+          option ? String(option) : language.t("settings.general.row.sidebarSessions.always")
         }
         onSelect={(option) => option !== null && settings.general.setSidebarSessionDays(option)}
       />
diff --git a/packages/app/src/context/language.tsx b/packages/app/src/context/language.tsx
index 41fc94bd8aae..e387391f68bf 100644
--- a/packages/app/src/context/language.tsx
+++ b/packages/app/src/context/language.tsx
@@ -33,7 +33,6 @@ type PluralKey =
   | "session.question.pending"
   | "session.followupDock.summary"
   | "session.revertDock.summary"
-  | "settings.general.row.sidebarSessions.days"
 type Source = { dict: Record<string, string> }
 
 function cookie(locale: Locale) {
diff --git a/packages/app/src/i18n/am.ts b/packages/app/src/i18n/am.ts
index bda48350e532..9b3f939f5d5a 100644
--- a/packages/app/src/i18n/am.ts
+++ b/packages/app/src/i18n/am.ts
@@ -860,6 +860,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "ማሳወቂያዎችን አጽዳ",
   "sidebar.empty.title": "ምንም ክፍት ፕሮጀክቶች የሉም",
   "sidebar.empty.description": "ለመጀመር ፕሮጀክት ይክፈቱ",
+  "sidebar.archived": "በማህደር የተቀመጠ",
+  "sidebar.archived.restore": "ክፍለ ጊዜን መልስ",
   "debugBar.ariaLabel": "የልማት አፈጻጸም ምርመራዎች",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -906,6 +908,12 @@ export const dict = {
   "settings.general.section.display": "ማሳያ",
   "settings.general.row.language.title": "ቋንቋ",
   "settings.general.row.language.description": "የማሳያ ቋንቋውን ለOpenCode",
+  "settings.general.row.navigation.description": "በርዕስ አሞሌ ውስጥ ትሮችን ወይም ቋሚ የጎን አሞሌ ይጠቀሙ",
+  "settings.general.row.navigation.tabs": "ትሮች",
+  "settings.general.row.navigation.sidebar": "የጎን አሞሌ",
+  "settings.general.row.sidebarSessions.title": "የማይሰሩ ክፍለ ጊዜያትን አስቀምጥ",
+  "settings.general.row.sidebarSessions.description": "የማይሰሩ ክፍለ ጊዜያት ወደ በማህደር የተቀመጠ ይሄዳሉ። እየሰሩ ያሉ ክፍለ ጊዜያት ይታያሉ።",
+  "settings.general.row.sidebarSessions.always": "ሁልጊዜ አሳይ",
   "settings.general.row.shell.title": "ተርሚናል ሼል",
   "settings.general.row.shell.description": "ሼል በተርሚናል እና ወኪል መሳሪያዎች ጥቅም ላይ የዋለ",
   "settings.general.row.shell.autoDefault": "ራስ-ሰር (ነባሪ)",
diff --git a/packages/app/src/i18n/ar.ts b/packages/app/src/i18n/ar.ts
index 3f55b3084088..ddb9c7321716 100644
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -827,6 +827,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "مسح الإشعارات",
   "sidebar.empty.title": "لا توجد مشاريع مفتوحة",
   "sidebar.empty.description": "افتح مشروعًا للبدء",
+  "sidebar.archived": "المؤرشفة",
+  "sidebar.archived.restore": "استعادة الجلسة",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "سطح المكتب",
   "settings.section.server": "الخادم",
@@ -844,6 +846,12 @@ export const dict = {
   "settings.general.section.display": "العرض",
   "settings.general.row.language.title": "اللغة",
   "settings.general.row.language.description": "تغيير لغة العرض لـ OpenCode",
+  "settings.general.row.navigation.description": "استخدم علامات التبويب في شريط العنوان أو الشريط الجانبي الثابت",
+  "settings.general.row.navigation.tabs": "علامات التبويب",
+  "settings.general.row.navigation.sidebar": "الشريط الجانبي",
+  "settings.general.row.sidebarSessions.title": "أرشفة الجلسات الخاملة بعد",
+  "settings.general.row.sidebarSessions.description": "تنتقل الجلسات الخاملة إلى المؤرشفة. تبقى الجلسات النشطة ظاهرة.",
+  "settings.general.row.sidebarSessions.always": "الإظهار دائمًا",
   "settings.general.row.shell.title": "Shell المحطة الطرفية",
   "settings.general.row.shell.description":
     "اختر shell المستخدم في المحطة الطرفية. تُستخدم واجهات shell المتوافقة أيضًا في استدعاءات أدوات الوكيل.",
diff --git a/packages/app/src/i18n/az.ts b/packages/app/src/i18n/az.ts
index d818ae57fd6c..eb041d751a9a 100644
--- a/packages/app/src/i18n/az.ts
+++ b/packages/app/src/i18n/az.ts
@@ -886,6 +886,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Bildirişləri təmizlə",
   "sidebar.empty.title": "Heç bir layihə açılmayıb",
   "sidebar.empty.description": "Başlamaq üçün bir layihə açın",
+  "sidebar.archived": "Arxivlənib",
+  "sidebar.archived.restore": "Sessiyanı bərpa et",
   "debugBar.ariaLabel": "Tərtibatçı performans diaqnostikası",
   "debugBar.na": "yox",
   "debugBar.nav.label": "NAV",
@@ -934,6 +936,12 @@ export const dict = {
   "settings.general.section.display": "Ekran",
   "settings.general.row.language.title": "Dil",
   "settings.general.row.language.description": "OpenCode üçün ekran dilini dəyişdirin",
+  "settings.general.row.navigation.description": "Başlıq panelində tablar və ya daimi yan panel istifadə et",
+  "settings.general.row.navigation.tabs": "Tablar",
+  "settings.general.row.navigation.sidebar": "Yan panel",
+  "settings.general.row.sidebarSessions.title": "Boşda qalan sessiyaları arxivlə",
+  "settings.general.row.sidebarSessions.description": "Boşda qalan sessiyalar Arxivlənib bölməsinə keçir. İşləyən sessiyalar görünən qalır.",
+  "settings.general.row.sidebarSessions.always": "Həmişə göstər",
   "settings.general.row.shell.title": "Terminal qabığı",
   "settings.general.row.shell.description": "Terminal və agent alətləri tərəfindən istifadə edilən qabıq",
   "settings.general.row.shell.autoDefault": "Avtomatik (Standart)",
diff --git a/packages/app/src/i18n/bg.ts b/packages/app/src/i18n/bg.ts
index 7f63d1fa4b3e..a33132500978 100644
--- a/packages/app/src/i18n/bg.ts
+++ b/packages/app/src/i18n/bg.ts
@@ -882,6 +882,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Изчистване на известията",
   "sidebar.empty.title": "Няма отворени проекти",
   "sidebar.empty.description": "Отворете проект, за да започнете",
+  "sidebar.archived": "Архивирани",
+  "sidebar.archived.restore": "Възстанови сесия",
   "debugBar.ariaLabel": "Диагностика на ефективността на разработката",
   "debugBar.na": "няма",
   "debugBar.nav.label": "NAV",
@@ -931,6 +933,12 @@ export const dict = {
   "settings.general.section.display": "Дисплей",
   "settings.general.row.language.title": "език",
   "settings.general.row.language.description": "Променете езика на дисплея за OpenCode",
+  "settings.general.row.navigation.description": "Използвайте раздели в заглавната лента или постоянна странична лента",
+  "settings.general.row.navigation.tabs": "Раздели",
+  "settings.general.row.navigation.sidebar": "Странична лента",
+  "settings.general.row.sidebarSessions.title": "Архивирай неактивни сесии след",
+  "settings.general.row.sidebarSessions.description": "Неактивните сесии отиват в Архивирани. Активните сесии остават видими.",
+  "settings.general.row.sidebarSessions.always": "Винаги показвай",
   "settings.general.row.shell.title": "Терминал shell",
   "settings.general.row.shell.description": "Shell използвани от инструментите на терминала и агента",
   "settings.general.row.shell.autoDefault": "Автоматично (по подразбиране)",
diff --git a/packages/app/src/i18n/bn.ts b/packages/app/src/i18n/bn.ts
index 5f0698ab64f1..0410241cd3aa 100644
--- a/packages/app/src/i18n/bn.ts
+++ b/packages/app/src/i18n/bn.ts
@@ -876,6 +876,8 @@ export const dict: Record<string, string> = {
   "sidebar.project.clearNotifications": "বিজ্ঞপ্তিগুলি সাফ করুন",
   "sidebar.empty.title": "কোনো প্রকল্প খোলা নেই",
   "sidebar.empty.description": "শুরু করতে একটি প্রকল্প খুলুন",
+  "sidebar.archived": "আর্কাইভ করা",
+  "sidebar.archived.restore": "সেশন পুনরুদ্ধার করুন",
   "debugBar.ariaLabel": "উন্নয়ন কর্মক্ষমতা ডায়গনিস্টিক",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "এনএভি",
@@ -923,6 +925,12 @@ export const dict: Record<string, string> = {
   "settings.general.section.display": "প্রদর্শন",
   "settings.general.row.language.title": "ভাষা",
   "settings.general.row.language.description": "OpenCode-এর জন্য প্রদর্শনের ভাষা পরিবর্তন করুন",
+  "settings.general.row.navigation.description": "শিরোনাম বারে ট্যাব বা স্থায়ী সাইডবার ব্যবহার করুন",
+  "settings.general.row.navigation.tabs": "ট্যাব",
+  "settings.general.row.navigation.sidebar": "সাইডবার",
+  "settings.general.row.sidebarSessions.title": "নিষ্ক্রিয় সেশন আর্কাইভ করুন",
+  "settings.general.row.sidebarSessions.description": "নিষ্ক্রিয় সেশন আর্কাইভ করাতে চলে যায়। কর্মরত সেশন দৃশ্যমান থাকে।",
+  "settings.general.row.sidebarSessions.always": "সবসময় দেখান",
   "settings.general.row.shell.title": "টার্মিনাল শেল",
   "settings.general.row.shell.description": "টার্মিনাল এবং এজেন্ট সরঞ্জাম দ্বারা ব্যবহৃত শেল",
   "settings.general.row.shell.autoDefault": "স্বয়ংক্রিয় (ডিফল্ট)",
diff --git a/packages/app/src/i18n/br.ts b/packages/app/src/i18n/br.ts
index 09da845ccb53..ab2b89e40c86 100644
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -830,6 +830,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Limpar notificações",
   "sidebar.empty.title": "Nenhum projeto aberto",
   "sidebar.empty.description": "Abra um projeto para começar",
+  "sidebar.archived": "Archiuet",
+  "sidebar.archived.restore": "Adsevel ar sesion",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
   "settings.section.server": "Servidor",
@@ -847,6 +849,12 @@ export const dict = {
   "settings.general.section.display": "Tela",
   "settings.general.row.language.title": "Idioma",
   "settings.general.row.language.description": "Alterar o idioma de exibição do OpenCode",
+  "settings.general.row.navigation.description": "Implijit abadennoù er varenn ditl pe ur varrenn gostez padus",
+  "settings.general.row.navigation.tabs": "Abadennoù",
+  "settings.general.row.navigation.sidebar": "Barrenn gostez",
+  "settings.general.row.sidebarSessions.title": "Arc'hivañ ar sesionoù diseblant goude",
+  "settings.general.row.sidebarSessions.description": "Ar sesionoù diseblant a ya d'an arquiv. Ar sesionoù oberiant a chom gwelet.",
+  "settings.general.row.sidebarSessions.always": "Diskouez bepred",
   "settings.general.row.shell.title": "Shell do terminal",
   "settings.general.row.shell.description":
     "Escolha o shell usado no terminal. Os shells compatíveis também são usados nas chamadas de ferramentas do agente.",
diff --git a/packages/app/src/i18n/bs.ts b/packages/app/src/i18n/bs.ts
index feb41c651a87..3f58821407f9 100644
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -891,6 +891,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Očisti obavijesti",
   "sidebar.empty.title": "Nema otvorenih projekata",
   "sidebar.empty.description": "Otvori projekat za početak",
+  "sidebar.archived": "Arhivirano",
+  "sidebar.archived.restore": "Vrati sesiju",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -912,6 +914,12 @@ export const dict = {
 
   "settings.general.row.language.title": "Jezik",
   "settings.general.row.language.description": "Promijeni jezik prikaza u OpenCode-u",
+  "settings.general.row.navigation.description": "Koristite kartice u traci naslova ili stalnu bočnu traku",
+  "settings.general.row.navigation.tabs": "Kartice",
+  "settings.general.row.navigation.sidebar": "Bočna traka",
+  "settings.general.row.sidebarSessions.title": "Arhiviraj neaktivne sesije nakon",
+  "settings.general.row.sidebarSessions.description": "Neaktivne sesije idu u Arhivirano. Aktivne sesije ostaju vidljive.",
+  "settings.general.row.sidebarSessions.always": "Uvijek prikaži",
   "settings.general.row.shell.title": "Shell terminala",
   "settings.general.row.shell.description":
     "Odaberi shell koji se koristi za terminal. Kompatibilni shellovi koriste se i za pozive alata agenta.",
diff --git a/packages/app/src/i18n/ca.ts b/packages/app/src/i18n/ca.ts
index 21ad325607a6..359af691d3c4 100644
--- a/packages/app/src/i18n/ca.ts
+++ b/packages/app/src/i18n/ca.ts
@@ -886,6 +886,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Esborra les notificacions",
   "sidebar.empty.title": "No hi ha projectes oberts",
   "sidebar.empty.description": "Obriu un projecte per començar",
+  "sidebar.archived": "Arxivades",
+  "sidebar.archived.restore": "Restaura la sessió",
   "debugBar.ariaLabel": "Diagnòstic de rendiment del desenvolupament",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -934,6 +936,12 @@ export const dict = {
   "settings.general.section.display": "Mostra",
   "settings.general.row.language.title": "Llengua",
   "settings.general.row.language.description": "Canvia l'idioma de visualització per a OpenCode",
+  "settings.general.row.navigation.description": "Usa pestanyes a la barra de títol o una barra lateral persistent",
+  "settings.general.row.navigation.tabs": "Pestanyes",
+  "settings.general.row.navigation.sidebar": "Barra lateral",
+  "settings.general.row.sidebarSessions.title": "Arxiva les sessions inactives després de",
+  "settings.general.row.sidebarSessions.description": "Les sessions inactives van a Arxivades. Les sessions actives continuen visibles.",
+  "settings.general.row.sidebarSessions.always": "Mostra sempre",
   "settings.general.row.shell.title": "Carcassa terminal",
   "settings.general.row.shell.description": "Shell utilitzat pel terminal i les eines d'agent",
   "settings.general.row.shell.autoDefault": "Automàtic (per defecte)",
diff --git a/packages/app/src/i18n/cs.ts b/packages/app/src/i18n/cs.ts
index d79d4eb5a7f8..0a3ddc854800 100644
--- a/packages/app/src/i18n/cs.ts
+++ b/packages/app/src/i18n/cs.ts
@@ -882,6 +882,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Vymazat oznámení",
   "sidebar.empty.title": "Nejsou otevřeny žádné projekty",
   "sidebar.empty.description": "Chcete-li začít, otevřete projekt",
+  "sidebar.archived": "Archivované",
+  "sidebar.archived.restore": "Obnovit relaci",
   "debugBar.ariaLabel": "Diagnostika vývoje výkonnosti",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -930,6 +932,12 @@ export const dict = {
   "settings.general.section.display": "Displej",
   "settings.general.row.language.title": "Jazyk",
   "settings.general.row.language.description": "Změnit jazyk zobrazení pro OpenCode",
+  "settings.general.row.navigation.description": "Použijte karty na titulním panelu nebo trvalý postranní panel",
+  "settings.general.row.navigation.tabs": "Karty",
+  "settings.general.row.navigation.sidebar": "Postranní panel",
+  "settings.general.row.sidebarSessions.title": "Archivovat nečinné relace po",
+  "settings.general.row.sidebarSessions.description": "Nečinné relace se přesunou do Archivované. Aktivní relace zůstávají viditelné.",
+  "settings.general.row.sidebarSessions.always": "Vždy zobrazit",
   "settings.general.row.shell.title": "Shell terminálu",
   "settings.general.row.shell.description": "Shell používaný terminálem a nástroji agenta",
   "settings.general.row.shell.autoDefault": "Auto (výchozí)",
diff --git a/packages/app/src/i18n/da.ts b/packages/app/src/i18n/da.ts
index 87737b094240..6ba53be1143c 100644
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -768,6 +768,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Ryd notifikationer",
   "sidebar.empty.title": "Ingen åbne projekter",
   "sidebar.empty.description": "Åbn et projekt for at komme i gang",
+  "sidebar.archived": "Arkiveret",
+  "sidebar.archived.restore": "Gendan session",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
@@ -788,6 +790,12 @@ export const dict = {
 
   "settings.general.row.language.title": "Sprog",
   "settings.general.row.language.description": "Ændr visningssproget for OpenCode",
+  "settings.general.row.navigation.description": "Brug faner i titellinjen eller et fast sidepanel",
+  "settings.general.row.navigation.tabs": "Faner",
+  "settings.general.row.navigation.sidebar": "Sidepanel",
+  "settings.general.row.sidebarSessions.title": "Arkivér inaktive sessioner efter",
+  "settings.general.row.sidebarSessions.description": "Inaktive sessioner flyttes til Arkiveret. Aktive sessioner forbliver synlige.",
+  "settings.general.row.sidebarSessions.always": "Vis altid",
   "settings.general.row.shell.title": "Terminalshell",
   "settings.general.row.shell.description":
     "Vælg den shell, der bruges i din terminal. Kompatible shells bruges også til agentens værktøjskald.",
diff --git a/packages/app/src/i18n/de.ts b/packages/app/src/i18n/de.ts
index 00849598c5c5..641d004239d3 100644
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -721,6 +721,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Benachrichtigungen löschen",
   "sidebar.empty.title": "Keine Projekte geöffnet",
   "sidebar.empty.description": "Öffnen Sie ein Projekt, um loszulegen",
+  "sidebar.archived": "Archiviert",
+  "sidebar.archived.restore": "Sitzung wiederherstellen",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
   "settings.section.server": "Server",
@@ -738,6 +740,12 @@ export const dict = {
   "settings.general.section.display": "Anzeige",
   "settings.general.row.language.title": "Sprache",
   "settings.general.row.language.description": "Die Anzeigesprache für OpenCode ändern",
+  "settings.general.row.navigation.description": "Tabs in der Titelleiste oder eine dauerhafte Seitenleiste verwenden",
+  "settings.general.row.navigation.tabs": "Tabs",
+  "settings.general.row.navigation.sidebar": "Seitenleiste",
+  "settings.general.row.sidebarSessions.title": "Inaktive Sitzungen archivieren nach",
+  "settings.general.row.sidebarSessions.description": "Inaktive Sitzungen werden nach „Archiviert“ verschoben. Aktive Sitzungen bleiben sichtbar.",
+  "settings.general.row.sidebarSessions.always": "Immer anzeigen",
   "settings.general.row.shell.title": "Terminal-Shell",
   "settings.general.row.shell.description":
     "Wählen Sie die Shell für Ihr Terminal aus. Kompatible Shells werden auch für Tool-Aufrufe von Agenten verwendet.",
diff --git a/packages/app/src/i18n/dv.ts b/packages/app/src/i18n/dv.ts
index 27b5fea86999..5c010a424d0d 100644
--- a/packages/app/src/i18n/dv.ts
+++ b/packages/app/src/i18n/dv.ts
@@ -890,6 +890,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "ނޮޓިފިކޭޝަންތައް ސާފުކުރުން",
   "sidebar.empty.title": "އެއްވެސް މަޝްރޫއެއް ނުހުޅުވޭ",
   "sidebar.empty.description": "ފަށަން ޕްރޮޖެކްޓެއް ހުޅުވާށެވެ",
+  "sidebar.archived": "ގެންދެވިފައި",
+  "sidebar.archived.restore": "ސެޝަން އަލުން ގެންނާން",
   "debugBar.ariaLabel": "ޑިވެލޮޕްމަންޓް ޕާފޯމަންސް ޑައިގްނޯސްޓިކްސް",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV އެވެ",
@@ -939,6 +941,12 @@ export const dict = {
   "settings.general.section.display": "ޑިސްޕްލޭ",
   "settings.general.row.language.title": "ބަސް",
   "settings.general.row.language.description": "OpenCode އަށް ޑިސްޕްލޭ ލޭންގުއޭޖް ބަދަލުކުރުން",
+  "settings.general.row.navigation.description": "ސިރުސްތޮށުގައި ޓެބްތައް ނުވަތަ ސައިޑްބާރެއް ބޭނުން ކުރޭ",
+  "settings.general.row.navigation.tabs": "ޓެބްތައް",
+  "settings.general.row.navigation.sidebar": "ސައިޑްބާރް",
+  "settings.general.row.sidebarSessions.title": "ނުހަރަކާތްތެރި ސެޝަންތައް ގެންދަން",
+  "settings.general.row.sidebarSessions.description": "ނުހަރަކާތްތެރި ސެޝަންތައް ގެންދެވިފައި އަށް ބަދަލުވޭ. މަސައްކަތް ކުރަމުންދާ ސެޝަންތައް ފެންނާނެ.",
+  "settings.general.row.sidebarSessions.always": "އެންމެހާ ވަގުތު ދައްކާ",
   "settings.general.row.shell.title": "ޓާމިނަލް ޝެލް އެވެ",
   "settings.general.row.shell.description": "ޓާމިނަލް އާއި އޭޖެންޓް ޓޫލްސް އިން ބޭނުންކުރާ ޝެލް",
   "settings.general.row.shell.autoDefault": "އޮޓޯ (ޑިފޯލްޓް)",
diff --git a/packages/app/src/i18n/dz.ts b/packages/app/src/i18n/dz.ts
index 3b2ad46ca304..ba70de0bae0c 100644
--- a/packages/app/src/i18n/dz.ts
+++ b/packages/app/src/i18n/dz.ts
@@ -891,6 +891,8 @@ export const dict: Record<string, string> = {
   "sidebar.project.clearNotifications": "བརྡ་བསྐུལ་ཚུ་གསལ་བཟོ།",
   "sidebar.empty.title": "ལས་འགུལ་ཁ་ཕྱེ་མེད།",
   "sidebar.empty.description": "འགོ་བཙུགས་ནིའི་དོན་ལུ་ལས་འགུལ་ཅིག་ཁ་ཕྱེ།",
+  "sidebar.archived": "ཡིག་མཛོད་ནང་བཞག",
+  "sidebar.archived.restore": "ལཱ་ཡུན་སོར་ཆུད",
   "debugBar.ariaLabel": "གོང་འཕེལ་གྱི་ལས་དོན་བརྟག་དཔྱད།",
   "debugBar.na": "ན/ཨེ།",
   "debugBar.nav.label": "NAV",
@@ -940,6 +942,12 @@ export const dict: Record<string, string> = {
   "settings.general.section.display": "གསལ༌སྟོན",
   "settings.general.row.language.title": "སྐད༌ཡིག",
   "settings.general.row.language.description": "OpenCodeགི་དོན་ལུ་ བཀྲམ་སྟོན་སྐད་ཡིག་བསྒྱུར་བཅོས་འབད།",
+  "settings.general.row.navigation.description": "མགོ་བརྗོད་ནང་ མཆོང་ལྡེ་ ཡང་ན་ ཟུར་ཕྲེང་ ལག་ལེན་འཐབ།",
+  "settings.general.row.navigation.tabs": "མཆོང་ལྡེ།",
+  "settings.general.row.navigation.sidebar": "ཟུར་ཕྲེང་།",
+  "settings.general.row.sidebarSessions.title": "ལཱ་ཡུན་མ་འགུལ་བ་ ཡིག་མཛོད་ནང་བཞག",
+  "settings.general.row.sidebarSessions.description": "ལཱ་ཡུན་མ་འགུལ་བ་ ཡིག་མཛོད་ནང་འགྱོ། ལཱ་འབད་མི་ ལཱ་ཡུན་ མཐོང་ཚུགས།",
+  "settings.general.row.sidebarSessions.always": "ད་ལྟོ་རང་ སྟོན།",
   "settings.general.row.shell.title": "ཊར་མི་ནཱལ་ Shell",
   "settings.general.row.shell.description": "ཊར་མི་ནཱལ་དང་ལས་ཚབ་ལག་ཆས་ཚུ་གིས་ལག་ལེན་འཐབ་མི་ Shell",
   "settings.general.row.shell.autoDefault": "རང་བཞིན་ (སྔོན་སྒྲིག)",
diff --git a/packages/app/src/i18n/el.ts b/packages/app/src/i18n/el.ts
index 8f91b46af010..90f8409b51bf 100644
--- a/packages/app/src/i18n/el.ts
+++ b/packages/app/src/i18n/el.ts
@@ -885,6 +885,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Διαγραφή ειδοποιήσεων",
   "sidebar.empty.title": "Δεν υπάρχουν ανοιχτά έργα",
   "sidebar.empty.description": "Ανοίξτε ένα έργο για να ξεκινήσετε",
+  "sidebar.archived": "Αρχειοθετημένες",
+  "sidebar.archived.restore": "Επαναφορά συνεδρίας",
   "debugBar.ariaLabel": "Διαγνωστικά απόδοσης ανάπτυξης",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -935,6 +937,12 @@ export const dict = {
   "settings.general.section.display": "Εμφάνιση",
   "settings.general.row.language.title": "Γλώσσα",
   "settings.general.row.language.description": "Αλλαγή της γλώσσας εμφάνισης για το OpenCode",
+  "settings.general.row.navigation.description": "Χρησιμοποιήστε καρτέλες στη γραμμή τίτλου ή μια μόνιμη πλευρική γραμμή",
+  "settings.general.row.navigation.tabs": "Καρτέλες",
+  "settings.general.row.navigation.sidebar": "Πλευρική γραμμή",
+  "settings.general.row.sidebarSessions.title": "Αρχειοθέτηση αδρανών συνεδριών μετά από",
+  "settings.general.row.sidebarSessions.description": "Οι αδρανείς συνεδρίες μετακινούνται στις Αρχειοθετημένες. Οι ενεργές συνεδρίες παραμένουν ορατές.",
+  "settings.general.row.sidebarSessions.always": "Να εμφανίζονται πάντα",
   "settings.general.row.shell.title": "Τερματικό κέλυφος",
   "settings.general.row.shell.description": "Κέλυφος που χρησιμοποιείται από το τερματικό και τα εργαλεία του πράκτορα",
   "settings.general.row.shell.autoDefault": "Αυτόματο (Προεπιλογή)",
diff --git a/packages/app/src/i18n/en.ts b/packages/app/src/i18n/en.ts
index ca38ee30c6db..2b50834e1523 100644
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -854,15 +854,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Clear notifications",
   "sidebar.empty.title": "No projects open",
   "sidebar.empty.description": "Open a project to get started",
-  "sidebar.navigation.label": "Navigation",
-  "sidebar.navigation.filter": "Filter projects and sessions",
-  "sidebar.navigation.noMatches": "No matching sessions",
-  "sidebar.navigation.projects": "Projects",
-  "sidebar.navigation.settle": "Settle session",
-  "sidebar.navigation.settled": "Settled",
-  "sidebar.navigation.settled.show": "Show settled sessions",
-  "sidebar.navigation.settled.empty": "No settled sessions",
-  "sidebar.navigation.settled.restore": "Restore session",
+  "sidebar.archived": "Archived",
+  "sidebar.archived.restore": "Restore session",
 
   "debugBar.ariaLabel": "Development performance diagnostics",
   "debugBar.na": "n/a",
@@ -916,16 +909,12 @@ export const dict = {
 
   "settings.general.row.language.title": "Language",
   "settings.general.row.language.description": "Change the display language for OpenCode",
-  "settings.general.row.navigation.title": "Navigation",
-  "settings.general.row.navigation.description": "Switch between session tabs in the title bar and a persistent sidebar",
+  "settings.general.row.navigation.description": "Use title bar tabs or a persistent sidebar",
   "settings.general.row.navigation.tabs": "Tabs",
   "settings.general.row.navigation.sidebar": "Sidebar",
-  "settings.general.row.sidebarSessions.title": "Settle sessions after",
-  "settings.general.row.sidebarSessions.description":
-    "Sessions idle for longer than this are hidden under Settled in the sidebar. Working and open sessions always stay visible.",
+  "settings.general.row.sidebarSessions.title": "Archive idle sessions after",
+  "settings.general.row.sidebarSessions.description": "Idle sessions move to Archived. Working sessions stay visible.",
   "settings.general.row.sidebarSessions.always": "Always show",
-  "settings.general.row.sidebarSessions.days.one": "{{count}} day",
-  "settings.general.row.sidebarSessions.days.other": "{{count}} days",
   "settings.general.row.shell.title": "Terminal shell",
   "settings.general.row.shell.description": "Shell used by the terminal and agent tools",
   "settings.general.row.shell.autoDefault": "Auto (Default)",
diff --git a/packages/app/src/i18n/es.ts b/packages/app/src/i18n/es.ts
index 9e9ff2c36750..f66d8aee8950 100644
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -896,6 +896,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Borrar notificaciones",
   "sidebar.empty.title": "No hay proyectos abiertos",
   "sidebar.empty.description": "Abre un proyecto para empezar",
+  "sidebar.archived": "Archivadas",
+  "sidebar.archived.restore": "Restaurar sesión",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -917,6 +919,12 @@ export const dict = {
 
   "settings.general.row.language.title": "Idioma",
   "settings.general.row.language.description": "Cambiar el idioma de visualización para OpenCode",
+  "settings.general.row.navigation.description": "Usa pestañas en la barra de título o una barra lateral persistente",
+  "settings.general.row.navigation.tabs": "Pestañas",
+  "settings.general.row.navigation.sidebar": "Barra lateral",
+  "settings.general.row.sidebarSessions.title": "Archivar sesiones inactivas después de",
+  "settings.general.row.sidebarSessions.description": "Las sesiones inactivas pasan a Archivadas. Las sesiones activas siguen visibles.",
+  "settings.general.row.sidebarSessions.always": "Mostrar siempre",
   "settings.general.row.shell.title": "Shell del terminal",
   "settings.general.row.shell.description": "Shell que usan el terminal y las herramientas del agente",
   "settings.general.row.shell.autoDefault": "Automático (predeterminado)",
diff --git a/packages/app/src/i18n/et.ts b/packages/app/src/i18n/et.ts
index d78296675e3d..bc74ab728832 100644
--- a/packages/app/src/i18n/et.ts
+++ b/packages/app/src/i18n/et.ts
@@ -872,6 +872,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Tühjenda märguanded",
   "sidebar.empty.title": "Avatud projekte pole",
   "sidebar.empty.description": "Alustamiseks avage projekt",
+  "sidebar.archived": "Arhiveeritud",
+  "sidebar.archived.restore": "Taasta seanss",
   "debugBar.ariaLabel": "Arendustegevuse diagnostika",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -921,6 +923,12 @@ export const dict = {
   "settings.general.section.display": "Ekraan",
   "settings.general.row.language.title": "Keel",
   "settings.general.row.language.description": "Muutke OpenCode kuvakeelt",
+  "settings.general.row.navigation.description": "Kasuta tiitliriba vahekaarte või püsivat külgriba",
+  "settings.general.row.navigation.tabs": "Vahekaardid",
+  "settings.general.row.navigation.sidebar": "Külgriba",
+  "settings.general.row.sidebarSessions.title": "Arhiveeri passiivsed seansid pärast",
+  "settings.general.row.sidebarSessions.description": "Passiivsed seansid liiguvad kausta Arhiveeritud. Aktiivsed seansid jäävad nähtavale.",
+  "settings.general.row.sidebarSessions.always": "Kuva alati",
   "settings.general.row.shell.title": "Terminali shell",
   "settings.general.row.shell.description": "Terminali ja agenditööriistade kasutatav shell",
   "settings.general.row.shell.autoDefault": "Automaatne (vaikimisi)",
diff --git a/packages/app/src/i18n/fa.ts b/packages/app/src/i18n/fa.ts
index 0d3d721b5324..c72ccc1fd53f 100644
--- a/packages/app/src/i18n/fa.ts
+++ b/packages/app/src/i18n/fa.ts
@@ -875,6 +875,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "پرامپت ها را پاک کنید",
   "sidebar.empty.title": "هیچ پروژه ای باز نشده است",
   "sidebar.empty.description": "برای شروع یک پروژه باز کنید",
+  "sidebar.archived": "آرشیوشده",
+  "sidebar.archived.restore": "بازیابی جلسه",
   "debugBar.ariaLabel": "تشخیص عملکرد توسعه",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -922,6 +924,12 @@ export const dict = {
   "settings.general.section.display": "نمایش",
   "settings.general.row.language.title": "زبان",
   "settings.general.row.language.description": "زبان نمایش را برای OpenCode تغییر دهید",
+  "settings.general.row.navigation.description": "از برگه‌های نوار عنوان یا نوار کناری ثابت استفاده کنید",
+  "settings.general.row.navigation.tabs": "برگه‌ها",
+  "settings.general.row.navigation.sidebar": "نوار کناری",
+  "settings.general.row.sidebarSessions.title": "آرشیو کردن جلسات بیکار پس از",
+  "settings.general.row.sidebarSessions.description": "جلسات بیکار به آرشیوشده منتقل می‌شوند. جلسات در حال کار نمایان می‌مانند.",
+  "settings.general.row.sidebarSessions.always": "همیشه نمایش بده",
   "settings.general.row.shell.title": "پوسته ترمینال",
   "settings.general.row.shell.description": "پوسته مورد استفاده ترمینال و ابزار عامل",
   "settings.general.row.shell.autoDefault": "خودکار (پیش‌فرض)",
diff --git a/packages/app/src/i18n/fi.ts b/packages/app/src/i18n/fi.ts
index aa9c92574cff..684e7d4f6a2d 100644
--- a/packages/app/src/i18n/fi.ts
+++ b/packages/app/src/i18n/fi.ts
@@ -776,6 +776,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Tyhjennä ilmoitukset",
   "sidebar.empty.title": "Ei avoimia projekteja",
   "sidebar.empty.description": "Aloita avaamalla projekti",
+  "sidebar.archived": "Arkistoitu",
+  "sidebar.archived.restore": "Palauta istunto",
   "debugBar.ariaLabel": "Kehityksen suorituskyvyn diagnostiikka",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -824,6 +826,12 @@ export const dict = {
   "settings.general.section.display": "Näyttö",
   "settings.general.row.language.title": "Kieli",
   "settings.general.row.language.description": "Vaihda OpenCoden näyttökieli",
+  "settings.general.row.navigation.description": "Käytä välilehtiä otsikkopalkissa tai pysyvää sivupalkkia",
+  "settings.general.row.navigation.tabs": "Välilehdet",
+  "settings.general.row.navigation.sidebar": "Sivupalkki",
+  "settings.general.row.sidebarSessions.title": "Arkistoi käyttämättömät istunnot, kun",
+  "settings.general.row.sidebarSessions.description": "Käyttämättömät istunnot siirtyvät kohtaan Arkistoitu. Aktiiviset istunnot pysyvät näkyvissä.",
+  "settings.general.row.sidebarSessions.always": "Näytä aina",
   "settings.general.row.shell.title": "Terminaalin komentotulkki",
   "settings.general.row.shell.description": "Terminaalin ja agenttityökalujen käyttämä komentotulkki",
   "settings.general.row.shell.autoDefault": "Automaattinen (oletus)",
diff --git a/packages/app/src/i18n/fo.ts b/packages/app/src/i18n/fo.ts
index 4329a35b4247..4256ca89914c 100644
--- a/packages/app/src/i18n/fo.ts
+++ b/packages/app/src/i18n/fo.ts
@@ -877,6 +877,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Rudda fráboðanir",
   "sidebar.empty.title": "Ongar verkætlanir lata upp",
   "sidebar.empty.description": "Opna eina verkætlan fyri at koma í gongd",
+  "sidebar.archived": "Arkiverað",
+  "sidebar.archived.restore": "Endurstovna setan",
   "debugBar.ariaLabel": "Menningar avriksdiagnostikk",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -924,6 +926,12 @@ export const dict = {
   "settings.general.section.display": "Sýn",
   "settings.general.row.language.title": "Mál",
   "settings.general.row.language.description": "Broyt sýnismálið fyri OpenCode",
+  "settings.general.row.navigation.description": "Brúka flipar í heitinum ella eitt fast síðupanel",
+  "settings.general.row.navigation.tabs": "Flipar",
+  "settings.general.row.navigation.sidebar": "Síðupanel",
+  "settings.general.row.sidebarSessions.title": "Arkiverað óvirknar setanir eftir",
+  "settings.general.row.sidebarSessions.description": "Óvirknar setanir fara í Arkiverað. Virknar setanir síggjast framhaldandi.",
+  "settings.general.row.sidebarSessions.always": "Vís altíð",
   "settings.general.row.shell.title": "Terminal-shell",
   "settings.general.row.shell.description": "Shell, sum terminal- og agenttólini brúka",
   "settings.general.row.shell.autoDefault": "Sjálvvirkandi (Standard)",
diff --git a/packages/app/src/i18n/fr.ts b/packages/app/src/i18n/fr.ts
index 3c89860a4490..73909c87a858 100644
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -835,6 +835,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Effacer les notifications",
   "sidebar.empty.title": "Aucun projet ouvert",
   "sidebar.empty.description": "Ouvrez un projet pour commencer",
+  "sidebar.archived": "Archivées",
+  "sidebar.archived.restore": "Restaurer la session",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Application de bureau",
   "settings.section.server": "Serveur",
@@ -852,6 +854,12 @@ export const dict = {
   "settings.general.section.display": "Affichage",
   "settings.general.row.language.title": "Langue",
   "settings.general.row.language.description": "Changer la langue d'affichage pour OpenCode",
+  "settings.general.row.navigation.description": "Utiliser des onglets dans la barre de titre ou une barre latérale permanente",
+  "settings.general.row.navigation.tabs": "Onglets",
+  "settings.general.row.navigation.sidebar": "Barre latérale",
+  "settings.general.row.sidebarSessions.title": "Archiver les sessions inactives après",
+  "settings.general.row.sidebarSessions.description": "Les sessions inactives passent dans Archivées. Les sessions actives restent visibles.",
+  "settings.general.row.sidebarSessions.always": "Toujours afficher",
   "settings.general.row.shell.title": "Interpréteur de commandes du terminal",
   "settings.general.row.shell.description":
     "Choisissez le shell utilisé par votre terminal. Les shells compatibles sont également utilisés pour les appels d'outils de l'agent.",
diff --git a/packages/app/src/i18n/hi.ts b/packages/app/src/i18n/hi.ts
index 0aaf8e14dc6d..566004fa3918 100644
--- a/packages/app/src/i18n/hi.ts
+++ b/packages/app/src/i18n/hi.ts
@@ -886,6 +886,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "सूचनाएँ साफ़ करें",
   "sidebar.empty.title": "कोई प्रोजेक्ट खुला नहीं",
   "sidebar.empty.description": "आरंभ करने के लिए एक प्रोजेक्ट खोलें",
+  "sidebar.archived": "संग्रहित",
+  "sidebar.archived.restore": "सेशन बहाल करें",
   "debugBar.ariaLabel": "विकास प्रदर्शन निदान",
   "debugBar.na": "एन/ए",
   "debugBar.nav.label": "NAV",
@@ -933,6 +935,12 @@ export const dict = {
   "settings.general.section.display": "प्रदर्शन",
   "settings.general.row.language.title": "भाषा",
   "settings.general.row.language.description": "OpenCode के लिए प्रदर्शन भाषा बदलें",
+  "settings.general.row.navigation.description": "शीर्षक बार में टैब या स्थायी साइडबार का उपयोग करें",
+  "settings.general.row.navigation.tabs": "टैब",
+  "settings.general.row.navigation.sidebar": "साइडबार",
+  "settings.general.row.sidebarSessions.title": "निष्क्रिय सेशन संग्रहित करें",
+  "settings.general.row.sidebarSessions.description": "निष्क्रिय सेशन संग्रहित में चले जाते हैं। कार्यरत सेशन दिखाई देते रहते हैं।",
+  "settings.general.row.sidebarSessions.always": "हमेशा दिखाएं",
   "settings.general.row.shell.title": "टर्मिनल शेल",
   "settings.general.row.shell.description": "शेल का उपयोग टर्मिनल और एजेंट टूल द्वारा किया जाता है",
   "settings.general.row.shell.autoDefault": "स्वतः (डिफ़ॉल्ट)",
diff --git a/packages/app/src/i18n/hr.ts b/packages/app/src/i18n/hr.ts
index 2130c88ada2d..b6c4602e074c 100644
--- a/packages/app/src/i18n/hr.ts
+++ b/packages/app/src/i18n/hr.ts
@@ -885,6 +885,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Očistite obavijesti",
   "sidebar.empty.title": "Nema otvorenih projekata",
   "sidebar.empty.description": "Otvorite projekt da biste započeli",
+  "sidebar.archived": "Arhivirano",
+  "sidebar.archived.restore": "Vrati sesiju",
   "debugBar.ariaLabel": "Dijagnostika izvedbe razvoja",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -933,6 +935,12 @@ export const dict = {
   "settings.general.section.display": "Prikaz",
   "settings.general.row.language.title": "Jezik",
   "settings.general.row.language.description": "Promijenite jezik prikaza za OpenCode",
+  "settings.general.row.navigation.description": "Koristite kartice u naslovnoj traci ili trajnu bočnu traku",
+  "settings.general.row.navigation.tabs": "Kartice",
+  "settings.general.row.navigation.sidebar": "Bočna traka",
+  "settings.general.row.sidebarSessions.title": "Arhiviraj neaktivne sesije nakon",
+  "settings.general.row.sidebarSessions.description": "Neaktivne sesije idu u Arhivirano. Aktivne sesije ostaju vidljive.",
+  "settings.general.row.sidebarSessions.always": "Uvijek prikaži",
   "settings.general.row.shell.title": "Terminal školjka",
   "settings.general.row.shell.description": "Ljuska koju koriste alati terminala i agenta",
   "settings.general.row.shell.autoDefault": "Automatski (zadano)",
diff --git a/packages/app/src/i18n/hu.ts b/packages/app/src/i18n/hu.ts
index 664abf8ee4c0..6a0329f6638b 100644
--- a/packages/app/src/i18n/hu.ts
+++ b/packages/app/src/i18n/hu.ts
@@ -884,6 +884,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Értesítések törlése",
   "sidebar.empty.title": "Nincs nyitott projekt",
   "sidebar.empty.description": "A kezdéshez nyisson meg egy projektet",
+  "sidebar.archived": "Archiválva",
+  "sidebar.archived.restore": "Munkamenet visszaállítása",
   "debugBar.ariaLabel": "Fejlesztési teljesítmény diagnosztika",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -933,6 +935,12 @@ export const dict = {
   "settings.general.section.display": "Kijelző",
   "settings.general.row.language.title": "Nyelv",
   "settings.general.row.language.description": "Módosítsa a OpenCode kijelző nyelvét",
+  "settings.general.row.navigation.description": "Lapok a címsorban vagy rögzített oldalsáv",
+  "settings.general.row.navigation.tabs": "Lapok",
+  "settings.general.row.navigation.sidebar": "Oldalsáv",
+  "settings.general.row.sidebarSessions.title": "Inaktív munkamenetek archiválása ennyi idő után",
+  "settings.general.row.sidebarSessions.description": "Az inaktív munkamenetek az Archiválva részbe kerülnek. A futó munkamenetek láthatók maradnak.",
+  "settings.general.row.sidebarSessions.always": "Mindig látszódjon",
   "settings.general.row.shell.title": "Terminál shellje",
   "settings.general.row.shell.description": "A terminál és az ügynökeszközök által használt shell",
   "settings.general.row.shell.autoDefault": "Automatikus (alapértelmezett)",
diff --git a/packages/app/src/i18n/hy.ts b/packages/app/src/i18n/hy.ts
index 6eac43b5e6dd..3b0c430ecc46 100644
--- a/packages/app/src/i18n/hy.ts
+++ b/packages/app/src/i18n/hy.ts
@@ -883,6 +883,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Մաքրել ծանուցումները",
   "sidebar.empty.title": "Ոչ մի նախագիծ բաց",
   "sidebar.empty.description": "Բացեք նախագիծ՝ սկսելու համար",
+  "sidebar.archived": "Արխիվացված",
+  "sidebar.archived.restore": "Վերականգնել նիստը",
   "debugBar.ariaLabel": "Զարգացման կատարողականի ախտորոշում",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -932,6 +934,12 @@ export const dict = {
   "settings.general.section.display": "Ցուցադրել",
   "settings.general.row.language.title": "Լեզու",
   "settings.general.row.language.description": "Փոխել ցուցադրման լեզուն OpenCode",
+  "settings.general.row.navigation.description": "Օգտագործեք ներդիրներ վերնագրի տողում կամ մշտական կողային վահանակ",
+  "settings.general.row.navigation.tabs": "Ներդիրներ",
+  "settings.general.row.navigation.sidebar": "Կողային վահանակ",
+  "settings.general.row.sidebarSessions.title": "Արխիվացնել անգործուն նիստերը՝",
+  "settings.general.row.sidebarSessions.description": "Անգործուն նիստերը տեղափոխվում են Արխիվացված։ Աշխատող նիստերը մնում են տեսանելի։",
+  "settings.general.row.sidebarSessions.always": "Միշտ ցուցադրել",
   "settings.general.row.shell.title": "Տերմինալի Shell",
   "settings.general.row.shell.description": "Shell-ն օգտագործվում է տերմինալի և գործակալի գործիքների կողմից",
   "settings.general.row.shell.autoDefault": "Ավտոմատ (կանխադրված)",
diff --git a/packages/app/src/i18n/id.ts b/packages/app/src/i18n/id.ts
index 96dc3c7592e4..c37c02ddc2d7 100644
--- a/packages/app/src/i18n/id.ts
+++ b/packages/app/src/i18n/id.ts
@@ -953,6 +953,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Hapus notifikasi",
   "sidebar.empty.title": "Tidak ada proyek terbuka",
   "sidebar.empty.description": "Buka proyek untuk memulai",
+  "sidebar.archived": "Diarsipkan",
+  "sidebar.archived.restore": "Pulihkan sesi",
 
   "debugBar.ariaLabel": "Diagnostik kinerja pengembangan",
   "debugBar.na": "n/a",
@@ -1005,6 +1007,12 @@ export const dict = {
 
   "settings.general.row.language.title": "Bahasa",
   "settings.general.row.language.description": "Ubah bahasa tampilan untuk OpenCode",
+  "settings.general.row.navigation.description": "Gunakan tab di bilah judul atau bilah sisi tetap",
+  "settings.general.row.navigation.tabs": "Tab",
+  "settings.general.row.navigation.sidebar": "Bilah sisi",
+  "settings.general.row.sidebarSessions.title": "Arsipkan sesi tak aktif setelah",
+  "settings.general.row.sidebarSessions.description": "Sesi tak aktif dipindahkan ke Diarsipkan. Sesi yang bekerja tetap terlihat.",
+  "settings.general.row.sidebarSessions.always": "Selalu tampilkan",
   "settings.general.row.shell.title": "Shell terminal",
   "settings.general.row.shell.description": "Shell yang digunakan oleh terminal dan alat agen",
   "settings.general.row.shell.autoDefault": "Otomatis (Bawaan)",
diff --git a/packages/app/src/i18n/is.ts b/packages/app/src/i18n/is.ts
index a45ed9a40cb0..9fd4742d29d1 100644
--- a/packages/app/src/i18n/is.ts
+++ b/packages/app/src/i18n/is.ts
@@ -880,6 +880,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Hreinsaðu tilkynningar",
   "sidebar.empty.title": "Engin verkefni opin",
   "sidebar.empty.description": "Opnaðu verkefni til að byrja",
+  "sidebar.archived": "Geymt",
+  "sidebar.archived.restore": "Endurheimta setu",
   "debugBar.ariaLabel": "Þróunarárangursgreiningar",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -927,6 +929,12 @@ export const dict = {
   "settings.general.section.display": "Skjár",
   "settings.general.row.language.title": "Tungumál",
   "settings.general.row.language.description": "Breyttu skjátungumálinu fyrir OpenCode",
+  "settings.general.row.navigation.description": "Nota flipa í titilstiku eða varanlega hliðarstiku",
+  "settings.general.row.navigation.tabs": "Flipar",
+  "settings.general.row.navigation.sidebar": "Hliðarstika",
+  "settings.general.row.sidebarSessions.title": "Geyma óvirkar setur eftir",
+  "settings.general.row.sidebarSessions.description": "Óvirkar setur færast í Geymt. Virkar setur haldast sýnilegar.",
+  "settings.general.row.sidebarSessions.always": "Sýna alltaf",
   "settings.general.row.shell.title": "Skel skjáhermis",
   "settings.general.row.shell.description": "Skelin sem skjáhermirinn og verkfæri fulltrúans nota",
   "settings.general.row.shell.autoDefault": "Sjálfvirkt (sjálfgefið)",
diff --git a/packages/app/src/i18n/it.ts b/packages/app/src/i18n/it.ts
index a093e11485a3..cdc14e3faba7 100644
--- a/packages/app/src/i18n/it.ts
+++ b/packages/app/src/i18n/it.ts
@@ -796,6 +796,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Cancella notifiche",
   "sidebar.empty.title": "Nessun progetto aperto",
   "sidebar.empty.description": "Apri un progetto per iniziare",
+  "sidebar.archived": "Archiviate",
+  "sidebar.archived.restore": "Ripristina sessione",
   "debugBar.ariaLabel": "Diagnostica delle prestazioni di sviluppo",
   "debugBar.na": "n/d",
   "debugBar.nav.label": "NAV",
@@ -845,6 +847,12 @@ export const dict = {
   "settings.general.section.display": "Visualizzazione",
   "settings.general.row.language.title": "Lingua",
   "settings.general.row.language.description": "Cambia la lingua di visualizzazione per OpenCode",
+  "settings.general.row.navigation.description": "Usa schede nella barra del titolo o una barra laterale fissa",
+  "settings.general.row.navigation.tabs": "Schede",
+  "settings.general.row.navigation.sidebar": "Barra laterale",
+  "settings.general.row.sidebarSessions.title": "Archivia sessioni inattive dopo",
+  "settings.general.row.sidebarSessions.description": "Le sessioni inattive passano in Archiviate. Le sessioni attive restano visibili.",
+  "settings.general.row.sidebarSessions.always": "Mostra sempre",
   "settings.general.row.shell.title": "Shell del terminale",
   "settings.general.row.shell.description": "Shell utilizzata dal terminale e dagli strumenti dell'agente",
   "settings.general.row.shell.autoDefault": "Automatico (predefinito)",
diff --git a/packages/app/src/i18n/ja.ts b/packages/app/src/i18n/ja.ts
index b96e8b544b2b..23f7599bcd3b 100644
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -815,6 +815,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "通知をクリア",
   "sidebar.empty.title": "開いているプロジェクトはありません",
   "sidebar.empty.description": "プロジェクトを開いて始めましょう",
+  "sidebar.archived": "アーカイブ済み",
+  "sidebar.archived.restore": "セッションを復元",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "デスクトップ",
   "settings.section.server": "サーバー",
@@ -832,6 +834,12 @@ export const dict = {
   "settings.general.section.display": "ディスプレイ",
   "settings.general.row.language.title": "言語",
   "settings.general.row.language.description": "OpenCodeの表示言語を変更します",
+  "settings.general.row.navigation.description": "タイトルバーのタブまたは常時表示のサイドバーを使用します",
+  "settings.general.row.navigation.tabs": "タブ",
+  "settings.general.row.navigation.sidebar": "サイドバー",
+  "settings.general.row.sidebarSessions.title": "アーカイブするまでのアイドル時間",
+  "settings.general.row.sidebarSessions.description": "アーカイブ済みに移動します。作業中のセッションは表示されたままです。",
+  "settings.general.row.sidebarSessions.always": "常に表示",
   "settings.general.row.shell.title": "ターミナルシェル",
   "settings.general.row.shell.description":
     "ターミナルで使用するシェルを選択します。互換性のあるシェルはエージェントのツール呼び出しにも使用されます。",
diff --git a/packages/app/src/i18n/ka.ts b/packages/app/src/i18n/ka.ts
index be052930a2ec..4fa2d3bc01c4 100644
--- a/packages/app/src/i18n/ka.ts
+++ b/packages/app/src/i18n/ka.ts
@@ -876,6 +876,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "შეტყობინებების გასუფთავება",
   "sidebar.empty.title": "პროექტები არ არის გახსნილი",
   "sidebar.empty.description": "გახსენით პროექტი დასაწყებად",
+  "sidebar.archived": "დაარქივებული",
+  "sidebar.archived.restore": "სესიის აღდგენა",
   "debugBar.ariaLabel": "განვითარების შესრულების დიაგნოსტიკა",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -924,6 +926,12 @@ export const dict = {
   "settings.general.section.display": "ჩვენება",
   "settings.general.row.language.title": "ენა",
   "settings.general.row.language.description": "შეცვალეთ ჩვენების ენა OpenCode",
+  "settings.general.row.navigation.description": "გამოიყენეთ ჩანართები სათაურის ზოლში ან მუდმივი გვერდითი პანელი",
+  "settings.general.row.navigation.tabs": "ჩანართები",
+  "settings.general.row.navigation.sidebar": "გვერდითი პანელი",
+  "settings.general.row.sidebarSessions.title": "უქმი სესიების დაარქივება",
+  "settings.general.row.sidebarSessions.description": "უქმი სესიები გადაინაცვლებს დაარქივებულში. მოქმედი სესიები რჩება ხილული.",
+  "settings.general.row.sidebarSessions.always": "ყოველთვის ჩვენება",
   "settings.general.row.shell.title": "ტერმინალის გარსი",
   "settings.general.row.shell.description": "Shell გამოიყენება ტერმინალის და აგენტის ხელსაწყოების მიერ",
   "settings.general.row.shell.autoDefault": "ავტომატური (ნაგულისხმევი)",
diff --git a/packages/app/src/i18n/km.ts b/packages/app/src/i18n/km.ts
index 7f1b61fe3667..040374efa54b 100644
--- a/packages/app/src/i18n/km.ts
+++ b/packages/app/src/i18n/km.ts
@@ -873,6 +873,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "ជម្រះការជូនដំណឹង",
   "sidebar.empty.title": "គ្មានគម្រោងបើកទេ។",
   "sidebar.empty.description": "បើកគម្រោងដើម្បីចាប់ផ្តើម",
+  "sidebar.archived": "បានបណ្ណសារ",
+  "sidebar.archived.restore": "ស្តារសម័យ",
   "debugBar.ariaLabel": "ការវិនិច្ឆ័យដំណើរការអភិវឌ្ឍន៍",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -922,6 +924,12 @@ export const dict = {
   "settings.general.section.display": "បង្ហាញ",
   "settings.general.row.language.title": "ភាសា",
   "settings.general.row.language.description": "ប្តូរភាសាបង្ហាញសម្រាប់ OpenCode",
+  "settings.general.row.navigation.description": "ប្រើផ្ទាំងក្នុងរបារចំណងជើង ឬរបារចំហៀងអចិន្ត្រៃយ៍",
+  "settings.general.row.navigation.tabs": "ផ្ទាំង",
+  "settings.general.row.navigation.sidebar": "របារចំហៀង",
+  "settings.general.row.sidebarSessions.title": "បណ្ណសារសម័យដែលមិនដំណើរការបន្ទាប់ពី",
+  "settings.general.row.sidebarSessions.description": "សម័យដែលមិនដំណើរការត្រូវផ្លាស់ទៅ បានបណ្ណសារ។ សម័យដែលកំពុងដំណើរការនៅបង្ហាញ។",
+  "settings.general.row.sidebarSessions.always": "បង្ហាញជានិច្ច",
   "settings.general.row.shell.title": "សែលស្ថានីយ",
   "settings.general.row.shell.description": "សែលប្រើដោយឧបករណ៍ស្ថានីយ និងភ្នាក់ងារ",
   "settings.general.row.shell.autoDefault": "ស្វ័យប្រវត្តិ (លំនាំដើម)\nស្ថានីយ",
diff --git a/packages/app/src/i18n/ko.ts b/packages/app/src/i18n/ko.ts
index b96fb4c59471..e4812c006363 100644
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -592,6 +592,12 @@ export const dict = {
   "settings.general.section.display": "디스플레이",
   "settings.general.row.language.title": "언어",
   "settings.general.row.language.description": "OpenCode 표시 언어 변경",
+  "settings.general.row.navigation.description": "제목 표시줄 탭 또는 고정 사이드바 사용",
+  "settings.general.row.navigation.tabs": "탭",
+  "settings.general.row.navigation.sidebar": "사이드바",
+  "settings.general.row.sidebarSessions.title": "유휴 세션 보관 기준",
+  "settings.general.row.sidebarSessions.description": "유휴 세션은 보관됨으로 이동합니다. 작업 중인 세션은 계속 표시됩니다.",
+  "settings.general.row.sidebarSessions.always": "항상 표시",
   "settings.general.row.appearance.title": "모양",
   "settings.general.row.appearance.description": "기기에서 OpenCode가 보이는 방식 사용자 지정",
   "settings.general.row.colorScheme.title": "색상 테마",
@@ -1016,6 +1022,8 @@ export const dict = {
 
   "sidebar.empty.title": "열린 프로젝트 없음",
   "sidebar.empty.description": "프로젝트를 열어 시작하세요",
+  "sidebar.archived": "보관됨",
+  "sidebar.archived.restore": "세션 복원",
 
   "settings.general.section.advanced": "고급",
   "settings.general.row.shell.title": "터미널 셸",
diff --git a/packages/app/src/i18n/lo.ts b/packages/app/src/i18n/lo.ts
index acdc26df08aa..c6719dde88b9 100644
--- a/packages/app/src/i18n/lo.ts
+++ b/packages/app/src/i18n/lo.ts
@@ -871,6 +871,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "ລຶບການແຈ້ງເຕືອນ",
   "sidebar.empty.title": "ບໍ່ມີໂຄງການເປີດ",
   "sidebar.empty.description": "ເປີດໂຄງການເພື່ອເລີ່ມຕົ້ນ",
+  "sidebar.archived": "ຈັດເກັບແລ້ວ",
+  "sidebar.archived.restore": "ກູ້ຄືນເຊດຊັນ",
   "debugBar.ariaLabel": "ການວິນິດໄສປະສິດທິພາບການພັດທະນາ",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -919,6 +921,12 @@ export const dict = {
   "settings.general.section.display": "ຈໍສະແດງຜົນ",
   "settings.general.row.language.title": "ພາສາ",
   "settings.general.row.language.description": "ປ່ຽນພາສາສະແດງສໍາລັບ OpenCode",
+  "settings.general.row.navigation.description": "ໃຊ້ແຖບຢູ່ແຖບຫົວຂໍ້ ຫຼືແຖບດ້ານຂ້າງຖາວອນ",
+  "settings.general.row.navigation.tabs": "ແຖບ",
+  "settings.general.row.navigation.sidebar": "ແຖບດ້ານຂ້າງ",
+  "settings.general.row.sidebarSessions.title": "ຈັດເກັບເຊດຊັນທີ່ບໍ່ໃຊ້ງານຫຼັງຈາກ",
+  "settings.general.row.sidebarSessions.description": "ເຊດຊັນທີ່ບໍ່ໃຊ້ງານຈະຍ້າຍໄປ ຈັດເກັບແລ້ວ. ເຊດຊັນທີ່ກຳລັງເຮັດວຽກຍັງສະແດງຢູ່.",
+  "settings.general.row.sidebarSessions.always": "ສະແດງສະເໝີ",
   "settings.general.row.shell.title": "Shell ຂອງເທີມິນອນ",
   "settings.general.row.shell.description": "Shell ທີ່ໃຊ້ໂດຍເຄື່ອງໃຊ້ປາຍທາງ ແລະຕົວແທນ",
   "settings.general.row.shell.autoDefault": "ອັດຕະໂນມັດ (ຄ່າເລີ່ມຕົ້ນ)",
diff --git a/packages/app/src/i18n/lt.ts b/packages/app/src/i18n/lt.ts
index ba161eb31879..b226326622a3 100644
--- a/packages/app/src/i18n/lt.ts
+++ b/packages/app/src/i18n/lt.ts
@@ -890,6 +890,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Išvalyti pranešimus",
   "sidebar.empty.title": "Jokių atvirų projektų",
   "sidebar.empty.description": "Norėdami pradėti, atidarykite projektą",
+  "sidebar.archived": "Archyvuota",
+  "sidebar.archived.restore": "Atkurti seansą",
   "debugBar.ariaLabel": "Vystymosi veiklos diagnostika",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -939,6 +941,12 @@ export const dict = {
   "settings.general.section.display": "Ekranas",
   "settings.general.row.language.title": "Kalba",
   "settings.general.row.language.description": "Pakeiskite OpenCode ekrano kalbą",
+  "settings.general.row.navigation.description": "Naudoti skirtukus pavadinimo juostoje arba nuolatinę šoninę juostą",
+  "settings.general.row.navigation.tabs": "Skirtukai",
+  "settings.general.row.navigation.sidebar": "Šoninė juosta",
+  "settings.general.row.sidebarSessions.title": "Archyvuoti neveiklius seansus po",
+  "settings.general.row.sidebarSessions.description": "Neveiklūs seansai perkeliami į Archyvuota. Aktyvūs seansai lieka matomi.",
+  "settings.general.row.sidebarSessions.always": "Visada rodyti",
   "settings.general.row.shell.title": "Terminalo apvalkalas",
   "settings.general.row.shell.description": "Terminalo ir agento įrankių naudojamas apvalkalas",
   "settings.general.row.shell.autoDefault": "Automatinis (numatytasis)",
diff --git a/packages/app/src/i18n/lv.ts b/packages/app/src/i18n/lv.ts
index df4c5b2dcd91..cb0a1ef4b834 100644
--- a/packages/app/src/i18n/lv.ts
+++ b/packages/app/src/i18n/lv.ts
@@ -882,6 +882,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Notīrīt paziņojumus",
   "sidebar.empty.title": "Nav atvērts neviens projekts",
   "sidebar.empty.description": "Atveriet projektu, lai sāktu",
+  "sidebar.archived": "Arhivētas",
+  "sidebar.archived.restore": "Atjaunot sesiju",
   "debugBar.ariaLabel": "Izstrādes veiktspējas diagnostika",
   "debugBar.na": "nav",
   "debugBar.nav.label": "NAV",
@@ -930,6 +932,12 @@ export const dict = {
   "settings.general.section.display": "Displejs",
   "settings.general.row.language.title": "Valoda",
   "settings.general.row.language.description": "Mainīt OpenCode saskarnes valodu",
+  "settings.general.row.navigation.description": "Izmantot cilnes virsraksta joslā vai pastāvīgu sānjoslu",
+  "settings.general.row.navigation.tabs": "Cilnes",
+  "settings.general.row.navigation.sidebar": "Sānjosla",
+  "settings.general.row.sidebarSessions.title": "Arhivēt neaktīvas sesijas pēc",
+  "settings.general.row.sidebarSessions.description": "Neaktīvas sesijas tiek pārvietotas uz Arhivētas. Aktīvas sesijas paliek redzamas.",
+  "settings.general.row.sidebarSessions.always": "Rādīt vienmēr",
   "settings.general.row.shell.title": "Termināļa čaula",
   "settings.general.row.shell.description": "Čaula, ko izmanto terminālis un aģenta rīki",
   "settings.general.row.shell.autoDefault": "Automātiski (noklusējums)",
diff --git a/packages/app/src/i18n/mk.ts b/packages/app/src/i18n/mk.ts
index 01e60baa408b..8c7f3231ec1b 100644
--- a/packages/app/src/i18n/mk.ts
+++ b/packages/app/src/i18n/mk.ts
@@ -880,6 +880,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Исчистете ги известувањата",
   "sidebar.empty.title": "Нема отворени проекти",
   "sidebar.empty.description": "Отворете проект за да започнете",
+  "sidebar.archived": "Архивирани",
+  "sidebar.archived.restore": "Врати сесија",
   "debugBar.ariaLabel": "Дијагностика на перформансите на развојот",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -929,6 +931,12 @@ export const dict = {
   "settings.general.section.display": "Приказ",
   "settings.general.row.language.title": "Јазик",
   "settings.general.row.language.description": "Променете го јазикот на прикажување за OpenCode",
+  "settings.general.row.navigation.description": "Користете картички во насловната лента или постојана странична лента",
+  "settings.general.row.navigation.tabs": "Картички",
+  "settings.general.row.navigation.sidebar": "Странична лента",
+  "settings.general.row.sidebarSessions.title": "Архивирај неактивни сесии по",
+  "settings.general.row.sidebarSessions.description": "Неактивните сесии одат во Архивирани. Активните сесии остануваат видливи.",
+  "settings.general.row.sidebarSessions.always": "Секогаш прикажувај",
   "settings.general.row.shell.title": "Терминал shell",
   "settings.general.row.shell.description": "Школката ја користат алатките за терминал и агент",
   "settings.general.row.shell.autoDefault": "Автоматски (стандардно)",
diff --git a/packages/app/src/i18n/mn.ts b/packages/app/src/i18n/mn.ts
index 41c4fa085d1a..e2d7344b97d4 100644
--- a/packages/app/src/i18n/mn.ts
+++ b/packages/app/src/i18n/mn.ts
@@ -884,6 +884,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Мэдэгдлийг арилгах",
   "sidebar.empty.title": "Нээлттэй төсөл байхгүй",
   "sidebar.empty.description": "Эхлэхийн тулд төсөл нээнэ үү",
+  "sidebar.archived": "Архивласан",
+  "sidebar.archived.restore": "Сесс сэргээх",
   "debugBar.ariaLabel": "Хөгжлийн гүйцэтгэлийн оношлогоо",
   "debugBar.na": "үгүй",
   "debugBar.nav.label": "NAV",
@@ -932,6 +934,12 @@ export const dict = {
   "settings.general.section.display": "Дэлгэц",
   "settings.general.row.language.title": "Хэл",
   "settings.general.row.language.description": "OpenCode дэлгэцийн хэлийг өөрчлөх",
+  "settings.general.row.navigation.description": "Гарчгийн мөрөнд таб ашиглах эсвэл байнгын хажуу самбар",
+  "settings.general.row.navigation.tabs": "Табууд",
+  "settings.general.row.navigation.sidebar": "Хажуу самбар",
+  "settings.general.row.sidebarSessions.title": "Идэвхгүй сессийг архивлах хугацаа",
+  "settings.general.row.sidebarSessions.description": "Идэвхгүй сессүүд Архивласан руу шилжинэ. Ажиллаж буй сессүүд харагдсаар байна.",
+  "settings.general.row.sidebarSessions.always": "Үргэлж харуулах",
   "settings.general.row.shell.title": "Терминал shell",
   "settings.general.row.shell.description": "Shell нь терминал болон агентын хэрэгслүүдэд ашиглагддаг",
   "settings.general.row.shell.autoDefault": "Автомат (Өгөгдмөл)",
diff --git a/packages/app/src/i18n/ms.ts b/packages/app/src/i18n/ms.ts
index 2c3783d43b7d..3412fd548800 100644
--- a/packages/app/src/i18n/ms.ts
+++ b/packages/app/src/i18n/ms.ts
@@ -876,6 +876,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Kosongkan notifikasi",
   "sidebar.empty.title": "Tiada projek dibuka",
   "sidebar.empty.description": "Buka projek untuk bermula",
+  "sidebar.archived": "Diarkibkan",
+  "sidebar.archived.restore": "Pulihkan sesi",
   "debugBar.ariaLabel": "Diagnostik prestasi pembangunan",
   "debugBar.na": "tiada",
   "debugBar.nav.label": "NAV",
@@ -924,6 +926,12 @@ export const dict = {
   "settings.general.section.display": "Paparan",
   "settings.general.row.language.title": "Bahasa",
   "settings.general.row.language.description": "Tukar bahasa paparan untuk OpenCode",
+  "settings.general.row.navigation.description": "Guna tab pada bar tajuk atau bar sisi kekal",
+  "settings.general.row.navigation.tabs": "Tab",
+  "settings.general.row.navigation.sidebar": "Bar sisi",
+  "settings.general.row.sidebarSessions.title": "Arkibkan sesi tidak aktif selepas",
+  "settings.general.row.sidebarSessions.description": "Sesi tidak aktif dialihkan ke Diarkibkan. Sesi sedang berjalan kekal kelihatan.",
+  "settings.general.row.sidebarSessions.always": "Sentiasa tunjuk",
   "settings.general.row.shell.title": "Shell terminal",
   "settings.general.row.shell.description": "Shell yang digunakan oleh terminal dan alat ejen",
   "settings.general.row.shell.autoDefault": "Auto (Lalai)",
diff --git a/packages/app/src/i18n/my.ts b/packages/app/src/i18n/my.ts
index 6046f337ff06..a3e9bc33b1f6 100644
--- a/packages/app/src/i18n/my.ts
+++ b/packages/app/src/i18n/my.ts
@@ -886,6 +886,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "အကြောင်းကြားချက်များကို ရှင်းလင်းပါ။",
   "sidebar.empty.title": "မည်သည့်ပရောဂျက်မှ ဖွင့်ထားခြင်းမရှိပါ။",
   "sidebar.empty.description": "စတင်ရန် ပရောဂျက်တစ်ခုကို ဖွင့်ပါ။",
+  "sidebar.archived": "သိမ်းဆည်းပြီး",
+  "sidebar.archived.restore": "စက်ရှင် ပြန်လည်ရယူရန်",
   "debugBar.ariaLabel": "ဖွံ့ဖြိုးတိုးတက်မှု စွမ်းဆောင်ရည် အဖြေရှာခြင်း",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -937,6 +939,12 @@ export const dict = {
   "settings.general.section.display": "မျက်နှာပြင်",
   "settings.general.row.language.title": "ဘာသာစကား",
   "settings.general.row.language.description": "OpenCode အတွက် ဖော်ပြသည့် ဘာသာစကားကို ပြောင်းပါ။",
+  "settings.general.row.navigation.description": "ခေါင်းစီးတန်းတွင် တဘ်များ သို့မဟုတ် အမြဲတမ်း ဘေးတန်း သုံးပါ",
+  "settings.general.row.navigation.tabs": "တဘ်များ",
+  "settings.general.row.navigation.sidebar": "ဘေးတန်း",
+  "settings.general.row.sidebarSessions.title": "အသုံးမပြုသော စက်ရှင်များကို သိမ်းဆည်းရန်",
+  "settings.general.row.sidebarSessions.description": "အသုံးမပြုသော စက်ရှင်များသည် သိမ်းဆည်းပြီး သို့ ရွှေ့သွားသည်။ လုပ်ဆောင်နေသော စက်ရှင်များ မြင်ရဆဲဖြစ်သည်။",
+  "settings.general.row.sidebarSessions.always": "အမြဲပြသ",
   "settings.general.row.shell.title": "Terminal Shell",
   "settings.general.row.shell.description": "terminal နှင့် agent tools မှအသုံးပြုသော Shell",
   "settings.general.row.shell.autoDefault": "အလိုအလျောက် (ပုံသေ)",
diff --git a/packages/app/src/i18n/ne.ts b/packages/app/src/i18n/ne.ts
index cc60bff9f400..42e358cbb26a 100644
--- a/packages/app/src/i18n/ne.ts
+++ b/packages/app/src/i18n/ne.ts
@@ -877,6 +877,8 @@ export const dict: Record<string, string> = {
   "sidebar.project.clearNotifications": "सूचनाहरू खाली गर्नुहोस्",
   "sidebar.empty.title": "कुनै पनि आयोजना खुलेका छैनन्",
   "sidebar.empty.description": "सुरु गर्न एउटा परियोजना खोल्नुहोस्",
+  "sidebar.archived": "अभिलेखित",
+  "sidebar.archived.restore": "सत्र पुनर्स्थापना",
   "debugBar.ariaLabel": "विकास प्रदर्शन निदान",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -924,6 +926,12 @@ export const dict: Record<string, string> = {
   "settings.general.section.display": "प्रदर्शन",
   "settings.general.row.language.title": "भाषा",
   "settings.general.row.language.description": "OpenCode को लागि प्रदर्शन भाषा परिवर्तन गर्नुहोस्",
+  "settings.general.row.navigation.description": "शीर्षक पट्टीमा ट्याब वा स्थायी साइडबार प्रयोग गर्नुहोस्",
+  "settings.general.row.navigation.tabs": "ट्याबहरू",
+  "settings.general.row.navigation.sidebar": "साइडबार",
+  "settings.general.row.sidebarSessions.title": "निष्क्रिय सत्र अभिलेखन गर्ने समय",
+  "settings.general.row.sidebarSessions.description": "निष्क्रिय सत्र अभिलेखितमा सर्छन्। कार्यरत सत्र देखिरहन्छन्।",
+  "settings.general.row.sidebarSessions.always": "सधैँ देखाउनुहोस्",
   "settings.general.row.shell.title": "टर्मिनल शेल",
   "settings.general.row.shell.description": "टर्मिनल र एजेन्ट उपकरणहरू द्वारा प्रयोग गरिएको शेल",
   "settings.general.row.shell.autoDefault": "स्वतः (पूर्वनिर्धारित)",
diff --git a/packages/app/src/i18n/nl.ts b/packages/app/src/i18n/nl.ts
index 6fb1dc09f24b..be54bdeb5416 100644
--- a/packages/app/src/i18n/nl.ts
+++ b/packages/app/src/i18n/nl.ts
@@ -886,6 +886,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Meldingen wissen",
   "sidebar.empty.title": "Geen projecten geopend",
   "sidebar.empty.description": "Open een project om aan de slag te gaan",
+  "sidebar.archived": "Gearchiveerd",
+  "sidebar.archived.restore": "Sessie herstellen",
   "debugBar.ariaLabel": "Diagnostiek voor ontwikkelprestaties",
   "debugBar.na": "n.v.t.",
   "debugBar.nav.label": "NAV",
@@ -934,6 +936,12 @@ export const dict = {
   "settings.general.section.display": "Weergave",
   "settings.general.row.language.title": "Taal",
   "settings.general.row.language.description": "Wijzig de weergavetaal voor OpenCode",
+  "settings.general.row.navigation.description": "Gebruik tabbladen in de titelbalk of een vaste zijbalk",
+  "settings.general.row.navigation.tabs": "Tabbladen",
+  "settings.general.row.navigation.sidebar": "Zijbalk",
+  "settings.general.row.sidebarSessions.title": "Inactieve sessies archiveren na",
+  "settings.general.row.sidebarSessions.description": "Inactieve sessies gaan naar Gearchiveerd. Actieve sessies blijven zichtbaar.",
+  "settings.general.row.sidebarSessions.always": "Altijd tonen",
   "settings.general.row.shell.title": "Terminalshell",
   "settings.general.row.shell.description": "Shell gebruikt door de terminal- en agenttools",
   "settings.general.row.shell.autoDefault": "Automatisch (standaard)",
diff --git a/packages/app/src/i18n/no.ts b/packages/app/src/i18n/no.ts
index 11958029dc38..8605630ca656 100644
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -774,6 +774,12 @@ export const dict = {
 
   "settings.general.row.language.title": "Språk",
   "settings.general.row.language.description": "Endre visningsspråket for OpenCode",
+  "settings.general.row.navigation.description": "Bruk faner i tittellinjen eller et fast sidefelt",
+  "settings.general.row.navigation.tabs": "Faner",
+  "settings.general.row.navigation.sidebar": "Sidefelt",
+  "settings.general.row.sidebarSessions.title": "Arkiver inaktive sesjoner etter",
+  "settings.general.row.sidebarSessions.description": "Inaktive sesjoner flyttes til Arkivert. Aktive sesjoner forblir synlige.",
+  "settings.general.row.sidebarSessions.always": "Vis alltid",
   "settings.general.row.appearance.title": "Utseende",
   "settings.general.row.appearance.description": "Tilpass hvordan OpenCode ser ut på enheten din",
   "settings.general.row.colorScheme.title": "Fargevalg",
@@ -1229,6 +1235,8 @@ export const dict = {
 
   "sidebar.empty.title": "Ingen åpne prosjekter",
   "sidebar.empty.description": "Åpne et prosjekt for å komme i gang",
+  "sidebar.archived": "Arkivert",
+  "sidebar.archived.restore": "Gjenopprett sesjon",
 
   "settings.general.section.advanced": "Avansert",
   "settings.general.row.shell.title": "Terminalskall",
diff --git a/packages/app/src/i18n/pa.ts b/packages/app/src/i18n/pa.ts
index 6298581c0aab..f6058ccc596b 100644
--- a/packages/app/src/i18n/pa.ts
+++ b/packages/app/src/i18n/pa.ts
@@ -884,6 +884,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "نوٹیفکیشن صاف کرو",
   "sidebar.empty.title": "کوئی پروجیکٹ نئیں کھلیا",
   "sidebar.empty.description": "شروع کرن لئی کوئی پروجیکٹ کھولو",
+  "sidebar.archived": "ਆਰਕਾਈਵ ਕੀਤੇ",
+  "sidebar.archived.restore": "ਸ਼ੈਸ਼ਨ ਬਹਾਲ ਕਰੋ",
   "debugBar.ariaLabel": "ترقی دی کارکردگی دی تشخیص",
   "debugBar.na": "لاگو نئیں",
   "debugBar.nav.label": "NAV",
@@ -931,6 +933,12 @@ export const dict = {
   "settings.general.section.display": "ڈسپلے",
   "settings.general.row.language.title": "بولی",
   "settings.general.row.language.description": "OpenCode لئی ڈسپلے دی بولی بدلو",
+  "settings.general.row.navigation.description": "ਟਾਈਟਲ ਬਾਰ ਵਿੱਚ ਟੈਬਾਂ ਜਾਂ ਸਥਾਈ ਸਾਈਡਬਾਰ ਵਰਤੋ",
+  "settings.general.row.navigation.tabs": "ਟੈਬਾਂ",
+  "settings.general.row.navigation.sidebar": "ਸਾਈਡਬਾਰ",
+  "settings.general.row.sidebarSessions.title": "ਬੇਕਾਰ ਸ਼ੈਸ਼ਨ ਆਰਕਾਈਵ ਕਰੋ",
+  "settings.general.row.sidebarSessions.description": "ਬੇਕਾਰ ਸ਼ੈਸ਼ਨ ਆਰਕਾਈਵ ਕੀਤੇ ਵਿੱਚ ਚਲੇ ਜਾਂਦੇ ਹਨ। ਕੰਮ ਕਰ ਰਹੇ ਸ਼ੈਸ਼ਨ ਦਿਖਾਈ ਦਿੰਦੇ ਰਹਿੰਦੇ ਹਨ।",
+  "settings.general.row.sidebarSessions.always": "ਹਮੇਸ਼ਾ ਦਿਖਾਓ",
   "settings.general.row.shell.title": "شیل",
   "settings.general.row.shell.description": "Shell ٹرمینل تے ایجنٹ ٹولز دے ذریعہ استعمال کیتا جاندا اے",
   "settings.general.row.shell.autoDefault": "آٹو (پہلے توں طے شدہ)",
diff --git a/packages/app/src/i18n/pl.ts b/packages/app/src/i18n/pl.ts
index 9b3c927498d8..a2dd1669ce7a 100644
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -831,6 +831,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Wyczyść powiadomienia",
   "sidebar.empty.title": "Brak otwartych projektów",
   "sidebar.empty.description": "Otwórz projekt, aby rozpocząć",
+  "sidebar.archived": "Zarchiwizowane",
+  "sidebar.archived.restore": "Przywróć sesję",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Aplikacja komputerowa",
   "settings.section.server": "Serwer",
@@ -848,6 +850,12 @@ export const dict = {
   "settings.general.section.display": "Ekran",
   "settings.general.row.language.title": "Język",
   "settings.general.row.language.description": "Zmień język wyświetlania dla OpenCode",
+  "settings.general.row.navigation.description": "Używaj kart na pasku tytułu lub stałego paska bocznego",
+  "settings.general.row.navigation.tabs": "Karty",
+  "settings.general.row.navigation.sidebar": "Pasek boczny",
+  "settings.general.row.sidebarSessions.title": "Archiwizuj bezczynne sesje po",
+  "settings.general.row.sidebarSessions.description": "Bezczynne sesje trafiają do Zarchiwizowane. Aktywne sesje pozostają widoczne.",
+  "settings.general.row.sidebarSessions.always": "Zawsze pokazuj",
   "settings.general.row.shell.title": "Powłoka terminala",
   "settings.general.row.shell.description":
     "Wybierz powłokę używaną w terminalu. Zgodne powłoki są również używane przez wywołania narzędzi agenta.",
diff --git a/packages/app/src/i18n/ro.ts b/packages/app/src/i18n/ro.ts
index c84f9a4ee76e..29a0f59cad4b 100644
--- a/packages/app/src/i18n/ro.ts
+++ b/packages/app/src/i18n/ro.ts
@@ -881,6 +881,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Șterge notificările",
   "sidebar.empty.title": "Niciun proiect deschis",
   "sidebar.empty.description": "Deschide un proiect pentru a începe",
+  "sidebar.archived": "Arhivate",
+  "sidebar.archived.restore": "Restaurează sesiunea",
   "debugBar.ariaLabel": "Diagnosticare performanță dezvoltare",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -929,6 +931,12 @@ export const dict = {
   "settings.general.section.display": "Afișare",
   "settings.general.row.language.title": "Limbă",
   "settings.general.row.language.description": "Schimbă limba de afișare pentru OpenCode",
+  "settings.general.row.navigation.description": "Folosește file în bara de titlu sau o bară laterală permanentă",
+  "settings.general.row.navigation.tabs": "File",
+  "settings.general.row.navigation.sidebar": "Bară laterală",
+  "settings.general.row.sidebarSessions.title": "Arhivează sesiunile inactive după",
+  "settings.general.row.sidebarSessions.description": "Sesiunile inactive trec în Arhivate. Sesiunile active rămân vizibile.",
+  "settings.general.row.sidebarSessions.always": "Afișează mereu",
   "settings.general.row.shell.title": "Shell terminal",
   "settings.general.row.shell.description": "Shell folosit de terminal și instrumentele agentului",
   "settings.general.row.shell.autoDefault": "Auto (implicit)",
diff --git a/packages/app/src/i18n/ru.ts b/packages/app/src/i18n/ru.ts
index cf4fa8d8f4ca..4191622a9445 100644
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -894,6 +894,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Очистить уведомления",
   "sidebar.empty.title": "Нет открытых проектов",
   "sidebar.empty.description": "Откройте проект, чтобы начать",
+  "sidebar.archived": "Архивированные",
+  "sidebar.archived.restore": "Восстановить сессию",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Приложение",
@@ -914,6 +916,12 @@ export const dict = {
 
   "settings.general.row.language.title": "Язык",
   "settings.general.row.language.description": "Изменить язык отображения OpenCode",
+  "settings.general.row.navigation.description": "Вкладки в заголовке или постоянная боковая панель",
+  "settings.general.row.navigation.tabs": "Вкладки",
+  "settings.general.row.navigation.sidebar": "Боковая панель",
+  "settings.general.row.sidebarSessions.title": "Архивировать неактивные сессии через",
+  "settings.general.row.sidebarSessions.description": "Неактивные сессии перемещаются в «Архивированные». Активные сессии остаются видимыми.",
+  "settings.general.row.sidebarSessions.always": "Всегда показывать",
   "settings.general.row.shell.title": "Оболочка терминала",
   "settings.general.row.shell.description":
     "Выберите оболочку для терминала. Совместимые оболочки также используются агентом при вызове инструментов.",
diff --git a/packages/app/src/i18n/si.ts b/packages/app/src/i18n/si.ts
index 00ca188b1581..e712c3e52737 100644
--- a/packages/app/src/i18n/si.ts
+++ b/packages/app/src/i18n/si.ts
@@ -874,6 +874,8 @@ export const dict: Record<string, string> = {
   "sidebar.project.clearNotifications": "දැනුම්දීම් හිස් කරන්න",
   "sidebar.empty.title": "ව්‍යාපෘති විවෘත නැත",
   "sidebar.empty.description": "ආරම්භ කිරීමට ව්‍යාපෘතියක් විවෘත කරන්න",
+  "sidebar.archived": "සංරක්ෂිත",
+  "sidebar.archived.restore": "සැසිය යළි පිහිටුවන්න",
   "debugBar.ariaLabel": "සංවර්ධන කාර්ය සාධන රෝග විනිශ්චය",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -921,6 +923,12 @@ export const dict: Record<string, string> = {
   "settings.general.section.display": "ප්රදර්ශනය කරන්න",
   "settings.general.row.language.title": "භාෂාව",
   "settings.general.row.language.description": "OpenCode සඳහා සංදර්ශක භාෂාව වෙනස් කරන්න",
+  "settings.general.row.navigation.description": "මාතෘකා තීරුවේ ටැබ් හෝ ස්ථිර පැති තීරුව භාවිත කරන්න",
+  "settings.general.row.navigation.tabs": "ටැබ්",
+  "settings.general.row.navigation.sidebar": "පැති තීරුව",
+  "settings.general.row.sidebarSessions.title": "නිෂ්ක්‍රීය සැසි සංරක්ෂණය කරන්න",
+  "settings.general.row.sidebarSessions.description": "නිෂ්ක්‍රීය සැසි සංරක්ෂිත වෙත යයි. ක්‍රියාත්මක සැසි දිස්වේ.",
+  "settings.general.row.sidebarSessions.always": "සැමවිටම පෙන්වන්න",
   "settings.general.row.shell.title": "පර්යන්ත ෂෙල්",
   "settings.general.row.shell.description": "පර්යන්තය සහ නියෝජිත මෙවලම් භාවිතා කරන ෂෙල්",
   "settings.general.row.shell.autoDefault": "ස්වයංක්‍රීය (පෙරනිමි)",
diff --git a/packages/app/src/i18n/sk.ts b/packages/app/src/i18n/sk.ts
index 9992e06cc4af..2b7cec1c2d41 100644
--- a/packages/app/src/i18n/sk.ts
+++ b/packages/app/src/i18n/sk.ts
@@ -880,6 +880,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Vymazať oznámenia",
   "sidebar.empty.title": "Nie sú otvorené žiadne projekty",
   "sidebar.empty.description": "Otvorte projekt pre začiatok",
+  "sidebar.archived": "Archivované",
+  "sidebar.archived.restore": "Obnoviť reláciu",
   "debugBar.ariaLabel": "Diagnostika výkonu vývoja",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -928,6 +930,12 @@ export const dict = {
   "settings.general.section.display": "Zobrazenie",
   "settings.general.row.language.title": "Jazyk",
   "settings.general.row.language.description": "Zmeniť jazyk rozhrania pre OpenCode",
+  "settings.general.row.navigation.description": "Použiť karty na titulnom paneli alebo trvalý bočný panel",
+  "settings.general.row.navigation.tabs": "Karty",
+  "settings.general.row.navigation.sidebar": "Bočný panel",
+  "settings.general.row.sidebarSessions.title": "Archivovať nečinné relácie po",
+  "settings.general.row.sidebarSessions.description": "Nečinné relácie sa presunú do Archivované. Aktívne relácie zostávajú viditeľné.",
+  "settings.general.row.sidebarSessions.always": "Vždy zobraziť",
   "settings.general.row.shell.title": "Terminálový shell",
   "settings.general.row.shell.description": "Shell používaný terminálom a nástrojmi agenta",
   "settings.general.row.shell.autoDefault": "Automaticky (predvolené)",
diff --git a/packages/app/src/i18n/sl.ts b/packages/app/src/i18n/sl.ts
index 3c23fcd7f708..ff968a72cd47 100644
--- a/packages/app/src/i18n/sl.ts
+++ b/packages/app/src/i18n/sl.ts
@@ -881,6 +881,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Počisti obvestila",
   "sidebar.empty.title": "Ni odprtih projektov",
   "sidebar.empty.description": "Za začetek odprite projekt",
+  "sidebar.archived": "Arhivirano",
+  "sidebar.archived.restore": "Obnovi sejo",
   "debugBar.ariaLabel": "Diagnostika uspešnosti razvoja",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -929,6 +931,12 @@ export const dict = {
   "settings.general.section.display": "Zaslon",
   "settings.general.row.language.title": "Jezik",
   "settings.general.row.language.description": "Spremenite jezik prikaza za OpenCode",
+  "settings.general.row.navigation.description": "Uporabite zavihke v naslovni vrstici ali trajno stransko vrstico",
+  "settings.general.row.navigation.tabs": "Zavihki",
+  "settings.general.row.navigation.sidebar": "Stranska vrstica",
+  "settings.general.row.sidebarSessions.title": "Arhiviraj nedejavne seje po",
+  "settings.general.row.sidebarSessions.description": "Nedejavne seje se premaknejo v Arhivirano. Dejavnе seje ostanejo vidne.",
+  "settings.general.row.sidebarSessions.always": "Vedno prikaži",
   "settings.general.row.shell.title": "Končna lupina",
   "settings.general.row.shell.description": "Lupina, ki jo uporabljajo terminalska in agentska orodja",
   "settings.general.row.shell.autoDefault": "Samodejno (privzeto)",
diff --git a/packages/app/src/i18n/sq.ts b/packages/app/src/i18n/sq.ts
index ca94793ab0e6..e3cb45ae788e 100644
--- a/packages/app/src/i18n/sq.ts
+++ b/packages/app/src/i18n/sq.ts
@@ -879,6 +879,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Pastro njoftimet",
   "sidebar.empty.title": "Asnjë projekt i hapur",
   "sidebar.empty.description": "Hapni një projekt për të filluar",
+  "sidebar.archived": "Arkivuar",
+  "sidebar.archived.restore": "Rikthe sesionin",
   "debugBar.ariaLabel": "Diagnostifikimi i performancës së zhvillimit",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -928,6 +930,12 @@ export const dict = {
   "settings.general.section.display": "Ekrani",
   "settings.general.row.language.title": "Gjuha",
   "settings.general.row.language.description": "Ndryshoni gjuhën e ekranit për OpenCode",
+  "settings.general.row.navigation.description": "Përdor skeda në shiritin e titullit ose një shirit anësor të përhershëm",
+  "settings.general.row.navigation.tabs": "Skeda",
+  "settings.general.row.navigation.sidebar": "Shiriti anësor",
+  "settings.general.row.sidebarSessions.title": "Arkivo sesionet joaktive pas",
+  "settings.general.row.sidebarSessions.description": "Sesionet joaktive kalojnë te Arkivuar. Sesionet aktive mbeten të dukshme.",
+  "settings.general.row.sidebarSessions.always": "Shfaq gjithmonë",
   "settings.general.row.shell.title": "Predha e terminalit",
   "settings.general.row.shell.description": "Predha e përdorur nga terminali dhe mjetet e agjentit",
   "settings.general.row.shell.autoDefault": "Auto (e parazgjedhur)",
diff --git a/packages/app/src/i18n/sr.ts b/packages/app/src/i18n/sr.ts
index f059160087d8..e261f7f2edfd 100644
--- a/packages/app/src/i18n/sr.ts
+++ b/packages/app/src/i18n/sr.ts
@@ -880,6 +880,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Обришите обавештења",
   "sidebar.empty.title": "Нема отворених пројеката",
   "sidebar.empty.description": "Отворите пројекат да бисте започели",
+  "sidebar.archived": "Архивирано",
+  "sidebar.archived.restore": "Врати сесију",
   "debugBar.ariaLabel": "Дијагностика перформанси развоја",
   "debugBar.na": "н/а",
   "debugBar.nav.label": "NAV",
@@ -928,6 +930,12 @@ export const dict = {
   "settings.general.section.display": "Приказ",
   "settings.general.row.language.title": "Језик",
   "settings.general.row.language.description": "Промените језик приказа за OpenCode",
+  "settings.general.row.navigation.description": "Користите картице у насловној траци или трајну бочну траку",
+  "settings.general.row.navigation.tabs": "Картице",
+  "settings.general.row.navigation.sidebar": "Бочна трака",
+  "settings.general.row.sidebarSessions.title": "Архивирај неактивне сесије након",
+  "settings.general.row.sidebarSessions.description": "Неактивне сесије иду у Архивирано. Активне сесије остају видљиве.",
+  "settings.general.row.sidebarSessions.always": "Увек прикажи",
   "settings.general.row.shell.title": "Терминал shell",
   "settings.general.row.shell.description": "Shell који користе алати терминала и агента",
   "settings.general.row.shell.autoDefault": "аутоматски (подразумевано)",
diff --git a/packages/app/src/i18n/sv.ts b/packages/app/src/i18n/sv.ts
index 39b363c6b657..9d5198af1af2 100644
--- a/packages/app/src/i18n/sv.ts
+++ b/packages/app/src/i18n/sv.ts
@@ -881,6 +881,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Rensa aviseringar",
   "sidebar.empty.title": "Inga projekt öppna",
   "sidebar.empty.description": "Öppna ett projekt för att komma igång",
+  "sidebar.archived": "Arkiverad",
+  "sidebar.archived.restore": "Återställ session",
   "debugBar.ariaLabel": "Utvecklingsprestandadiagnostik",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -930,6 +932,12 @@ export const dict = {
   "settings.general.section.display": "Visning",
   "settings.general.row.language.title": "Språk",
   "settings.general.row.language.description": "Ändra visningsspråket för OpenCode",
+  "settings.general.row.navigation.description": "Använd flikar i namnlisten eller ett fast sidofält",
+  "settings.general.row.navigation.tabs": "Flikar",
+  "settings.general.row.navigation.sidebar": "Sidofält",
+  "settings.general.row.sidebarSessions.title": "Arkivera inaktiva sessioner efter",
+  "settings.general.row.sidebarSessions.description": "Inaktiva sessioner flyttas till Arkiverad. Aktiva sessioner förblir synliga.",
+  "settings.general.row.sidebarSessions.always": "Visa alltid",
   "settings.general.row.shell.title": "Terminalskal",
   "settings.general.row.shell.description": "Skal som används av terminalen och agentverktygen",
   "settings.general.row.shell.autoDefault": "Auto (standard)",
diff --git a/packages/app/src/i18n/tg.ts b/packages/app/src/i18n/tg.ts
index ffa08409f684..a048e3b47374 100644
--- a/packages/app/src/i18n/tg.ts
+++ b/packages/app/src/i18n/tg.ts
@@ -880,6 +880,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Огоҳиҳоро тоза кунед",
   "sidebar.empty.title": "Ягон лоиҳа кушода нест",
   "sidebar.empty.description": "Барои оғоз кардани лоиҳа лоиҳа кушоед",
+  "sidebar.archived": "Арxivшуда",
+  "sidebar.archived.restore": "Барқарор кардани сеанс",
   "debugBar.ariaLabel": "Ташхиси самаранокии рушд",
   "debugBar.na": "не",
   "debugBar.nav.label": "NAV",
@@ -928,6 +930,12 @@ export const dict = {
   "settings.general.section.display": "Намоиш",
   "settings.general.row.language.title": "Забон",
   "settings.general.row.language.description": "Забони намоишро барои OpenCode иваз кунед",
+  "settings.general.row.navigation.description": "Дар сарлавҳа варақаҳо ё панели паҳлуии доимӣ истифода баред",
+  "settings.general.row.navigation.tabs": "Варақаҳо",
+  "settings.general.row.navigation.sidebar": "Панели паҳлуӣ",
+  "settings.general.row.sidebarSessions.title": "Сеансҳои беҳаракатро архив кардан",
+  "settings.general.row.sidebarSessions.description": "Сеансҳои беҳаракат ба Арxivшуда мегузаранд. Сеансҳои фаъол намоён мемонанд.",
+  "settings.general.row.sidebarSessions.always": "Ҳамеша нишон додан",
   "settings.general.row.shell.title": "Терминал shell",
   "settings.general.row.shell.description": "Shell воситаи терминал ва агент истифода мешавад",
   "settings.general.row.shell.autoDefault": "Авто (Пешфарз)",
diff --git a/packages/app/src/i18n/th.ts b/packages/app/src/i18n/th.ts
index 1a0e9db72b1b..0736d8e17b94 100644
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -878,6 +878,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "ล้างการแจ้งเตือน",
   "sidebar.empty.title": "ไม่มีโปรเจกต์ที่เปิดอยู่",
   "sidebar.empty.description": "เปิดโปรเจกต์เพื่อเริ่มต้น",
+  "sidebar.archived": "จัดเก็บแล้ว",
+  "sidebar.archived.restore": "กู้คืนเซสชัน",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -899,6 +901,12 @@ export const dict = {
 
   "settings.general.row.language.title": "ภาษา",
   "settings.general.row.language.description": "เปลี่ยนภาษาที่แสดงสำหรับ OpenCode",
+  "settings.general.row.navigation.description": "ใช้แท็บในแถบชื่อเรื่องหรือแถบด้านข้างถาวร",
+  "settings.general.row.navigation.tabs": "แท็บ",
+  "settings.general.row.navigation.sidebar": "แถบด้านข้าง",
+  "settings.general.row.sidebarSessions.title": "จัดเก็บเซสชันที่ไม่ได้ใช้งานหลังจาก",
+  "settings.general.row.sidebarSessions.description": "เซสชันที่ไม่ได้ใช้งานจะถูกย้ายไปยังจัดเก็บแล้ว เซสชันที่กำลังทำงานยังแสดงอยู่",
+  "settings.general.row.sidebarSessions.always": "แสดงเสมอ",
   "settings.general.row.shell.title": "เชลล์เทอร์มินัล",
   "settings.general.row.shell.description":
     "เลือกเชลล์ที่จะใช้กับเทอร์มินัล เชลล์ที่เข้ากันได้จะใช้สำหรับการเรียกเครื่องมือของเอเจนต์ด้วย",
diff --git a/packages/app/src/i18n/tk.ts b/packages/app/src/i18n/tk.ts
index 2b144c6a26c7..c29397a4bc7a 100644
--- a/packages/app/src/i18n/tk.ts
+++ b/packages/app/src/i18n/tk.ts
@@ -877,6 +877,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Duýduryşlary arassalaň",
   "sidebar.empty.title": "Taslama açylmaýar",
   "sidebar.empty.description": "Başlamak üçin taslama açyň",
+  "sidebar.archived": "Arhiwlenen",
+  "sidebar.archived.restore": "Sessiýany dikelt",
   "debugBar.ariaLabel": "Ösüş öndürijiligini anyklaýyş",
   "debugBar.na": "n / a",
   "debugBar.nav.label": "NAV",
@@ -925,6 +927,12 @@ export const dict = {
   "settings.general.section.display": "Ekran",
   "settings.general.row.language.title": "Dil",
   "settings.general.row.language.description": "OpenCode üçin displeý dilini üýtgediň",
+  "settings.general.row.navigation.description": "Sözbaşy zolagynda goýmalar ýa-da hemişelik gapdal panel ulanyň",
+  "settings.general.row.navigation.tabs": "Goýmalar",
+  "settings.general.row.navigation.sidebar": "Gapdal panel",
+  "settings.general.row.sidebarSessions.title": "Işjeň däl sessiýalary arhiwle",
+  "settings.general.row.sidebarSessions.description": "Işjeň däl sessiýalar Arhiwlenen bölümine geçýär. Işleýän sessiýalar görünýär.",
+  "settings.general.row.sidebarSessions.always": "Elmydama görkez",
   "settings.general.row.shell.title": "Terminal shell-i",
   "settings.general.row.shell.description": "Terminal we agent gurallary tarapyndan ulanylýan shell",
   "settings.general.row.shell.autoDefault": "Awto (Bellenilen)",
diff --git a/packages/app/src/i18n/tr.ts b/packages/app/src/i18n/tr.ts
index 85623036e429..48dea3da1562 100644
--- a/packages/app/src/i18n/tr.ts
+++ b/packages/app/src/i18n/tr.ts
@@ -896,6 +896,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Bildirimleri temizle",
   "sidebar.empty.title": "Açık proje yok",
   "sidebar.empty.description": "Başlamak için bir proje açın",
+  "sidebar.archived": "Arşivlendi",
+  "sidebar.archived.restore": "Oturumu geri yükle",
 
   "app.name.desktop": "OpenCode Masaüstü",
 
@@ -917,6 +919,12 @@ export const dict = {
 
   "settings.general.row.language.title": "Dil",
   "settings.general.row.language.description": "OpenCode'un görünüm dilini değiştirin",
+  "settings.general.row.navigation.description": "Başlık çubuğunda sekmeler veya kalıcı bir kenar çubuğu kullan",
+  "settings.general.row.navigation.tabs": "Sekmeler",
+  "settings.general.row.navigation.sidebar": "Kenar çubuğu",
+  "settings.general.row.sidebarSessions.title": "Boşta oturumları şu süreden sonra arşivle",
+  "settings.general.row.sidebarSessions.description": "Boşta oturumlar Arşivlendi bölümüne taşınır. Çalışan oturumlar görünür kalır.",
+  "settings.general.row.sidebarSessions.always": "Her zaman göster",
   "settings.general.row.shell.title": "Terminal Kabuğu",
   "settings.general.row.shell.description":
     "Terminalinizde kullanılacak kabuğu seçin. Uyumlu kabuklar, ajan araç çağrılarında da kullanılır.",
diff --git a/packages/app/src/i18n/uk.ts b/packages/app/src/i18n/uk.ts
index 54732a87b7eb..6066c4a3de59 100644
--- a/packages/app/src/i18n/uk.ts
+++ b/packages/app/src/i18n/uk.ts
@@ -966,6 +966,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Очистити сповіщення",
   "sidebar.empty.title": "Немає відкритих проєктів",
   "sidebar.empty.description": "Відкрийте проєкт, щоб почати",
+  "sidebar.archived": "Архівовані",
+  "sidebar.archived.restore": "Відновити сесію",
 
   "debugBar.ariaLabel": "Діагностика продуктивності розробки",
   "debugBar.na": "н/д",
@@ -1019,6 +1021,12 @@ export const dict = {
 
   "settings.general.row.language.title": "Мова",
   "settings.general.row.language.description": "Змінити мову інтерфейсу OpenCode",
+  "settings.general.row.navigation.description": "Вкладки в заголовку або постійна бічна панель",
+  "settings.general.row.navigation.tabs": "Вкладки",
+  "settings.general.row.navigation.sidebar": "Бічна панель",
+  "settings.general.row.sidebarSessions.title": "Архівувати неактивні сесії через",
+  "settings.general.row.sidebarSessions.description": "Неактивні сесії переміщуються в «Архівовані». Активні сесії залишаються видимими.",
+  "settings.general.row.sidebarSessions.always": "Завжди показувати",
   "settings.general.row.shell.title": "Командна оболонка термінала",
   "settings.general.row.shell.description":
     "Виберіть оболонку для термінала. Сумісні оболонки також використовуються для викликів інструментів агента.",
diff --git a/packages/app/src/i18n/ur.ts b/packages/app/src/i18n/ur.ts
index 2ab69e7aec71..22f2536e7036 100644
--- a/packages/app/src/i18n/ur.ts
+++ b/packages/app/src/i18n/ur.ts
@@ -887,6 +887,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "اطلاعات کو صاف کریں۔",
   "sidebar.empty.title": "کوئی پروجیکٹ نہیں کھلا۔",
   "sidebar.empty.description": "شروع کرنے کے لیے ایک پروجیکٹ کھولیں۔",
+  "sidebar.archived": "آرکائیو شدہ",
+  "sidebar.archived.restore": "سیشن بحال کریں",
   "debugBar.ariaLabel": "ترقیاتی کارکردگی کی تشخیص",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -934,6 +936,12 @@ export const dict = {
   "settings.general.section.display": "ڈسپلے",
   "settings.general.row.language.title": "زبان",
   "settings.general.row.language.description": "OpenCode کے لیے ڈسپلے کی زبان تبدیل کریں۔",
+  "settings.general.row.navigation.description": "ٹائٹل بار میں ٹیبز یا مستقل سائیڈ بار استعمال کریں",
+  "settings.general.row.navigation.tabs": "ٹیبز",
+  "settings.general.row.navigation.sidebar": "سائیڈ بار",
+  "settings.general.row.sidebarSessions.title": "غیر فعال سیشن آرکائیو کریں",
+  "settings.general.row.sidebarSessions.description": "غیر فعال سیشن آرکائیو شدہ میں منتقل ہو جاتے ہیں۔ فعال سیشن نظر آتے رہتے ہیں۔",
+  "settings.general.row.sidebarSessions.always": "ہمیشہ دکھائیں",
   "settings.general.row.shell.title": "ٹرمینل شیل",
   "settings.general.row.shell.description": "ٹرمینل اور ایجنٹ ٹولز کے ذریعے استعمال ہونے والا شیل",
   "settings.general.row.shell.autoDefault": "خودکار (پہلے سے طے شدہ)",
diff --git a/packages/app/src/i18n/uz.ts b/packages/app/src/i18n/uz.ts
index 8cb7097fc07a..30ed6948778c 100644
--- a/packages/app/src/i18n/uz.ts
+++ b/packages/app/src/i18n/uz.ts
@@ -884,6 +884,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Bildirishnomalarni tozalash",
   "sidebar.empty.title": "Hech qanday loyiha ochiq emas",
   "sidebar.empty.description": "Boshlash uchun loyihani oching",
+  "sidebar.archived": "Arxivlangan",
+  "sidebar.archived.restore": "Sessiyani tiklash",
   "debugBar.ariaLabel": "Rivojlanish samaradorligi diagnostikasi",
   "debugBar.na": "yo'q",
   "debugBar.nav.label": "NAV",
@@ -932,6 +934,12 @@ export const dict = {
   "settings.general.section.display": "Displey",
   "settings.general.row.language.title": "Til",
   "settings.general.row.language.description": "OpenCode uchun ekran tilini o'zgartiring",
+  "settings.general.row.navigation.description": "Sarlavha panelida tablardan yoki doimiy yon paneldan foydalaning",
+  "settings.general.row.navigation.tabs": "Tablar",
+  "settings.general.row.navigation.sidebar": "Yon panel",
+  "settings.general.row.sidebarSessions.title": "Harakatsiz sessiyalarni arxivlash",
+  "settings.general.row.sidebarSessions.description": "Harakatsiz sessiyalar Arxivlangan bo'limiga o'tadi. Faol sessiyalar ko'rinib qoladi.",
+  "settings.general.row.sidebarSessions.always": "Har doim ko'rsatish",
   "settings.general.row.shell.title": "Terminal qobig'i",
   "settings.general.row.shell.description": "Terminal va agent vositalari tomonidan ishlatiladigan qobiq",
   "settings.general.row.shell.autoDefault": "Avtomatik (standart)",
diff --git a/packages/app/src/i18n/vi.ts b/packages/app/src/i18n/vi.ts
index 06fda4ce707c..54d24de4ba3e 100644
--- a/packages/app/src/i18n/vi.ts
+++ b/packages/app/src/i18n/vi.ts
@@ -888,6 +888,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "Xóa thông báo",
   "sidebar.empty.title": "Không có dự án nào mở",
   "sidebar.empty.description": "Mở một dự án để bắt đầu",
+  "sidebar.archived": "Đã lưu trữ",
+  "sidebar.archived.restore": "Khôi phục phiên",
   "debugBar.ariaLabel": "Chẩn đoán hiệu suất phát triển",
   "debugBar.na": "không có",
   "debugBar.nav.label": "NAV",
@@ -936,6 +938,12 @@ export const dict = {
   "settings.general.section.display": "Hiển thị",
   "settings.general.row.language.title": "Ngôn ngữ",
   "settings.general.row.language.description": "Thay đổi ngôn ngữ hiển thị cho OpenCode",
+  "settings.general.row.navigation.description": "Dùng thẻ trên thanh tiêu đề hoặc thanh bên cố định",
+  "settings.general.row.navigation.tabs": "Thẻ",
+  "settings.general.row.navigation.sidebar": "Thanh bên",
+  "settings.general.row.sidebarSessions.title": "Lưu trữ phiên không hoạt động sau",
+  "settings.general.row.sidebarSessions.description": "Phiên không hoạt động sẽ chuyển vào Đã lưu trữ. Phiên đang chạy vẫn hiển thị.",
+  "settings.general.row.sidebarSessions.always": "Luôn hiển thị",
   "settings.general.row.shell.title": "Shell terminal",
   "settings.general.row.shell.description": "Shell được terminal và các công cụ của tác nhân sử dụng",
   "settings.general.row.shell.autoDefault": "Tự động (Mặc định)",
diff --git a/packages/app/src/i18n/zh.ts b/packages/app/src/i18n/zh.ts
index b0ba0453479b..66dc73572783 100644
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -874,6 +874,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "清除通知",
   "sidebar.empty.title": "没有打开的项目",
   "sidebar.empty.description": "打开一个项目以开始使用",
+  "sidebar.archived": "已归档",
+  "sidebar.archived.restore": "恢复会话",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -896,6 +898,12 @@ export const dict = {
   "settings.general.section.display": "显示",
   "settings.general.row.language.title": "语言",
   "settings.general.row.language.description": "更改 OpenCode 的显示语言",
+  "settings.general.row.navigation.description": "在标题栏使用标签页，或使用常驻侧边栏",
+  "settings.general.row.navigation.tabs": "标签页",
+  "settings.general.row.navigation.sidebar": "侧边栏",
+  "settings.general.row.sidebarSessions.title": "闲置会话归档时间",
+  "settings.general.row.sidebarSessions.description": "闲置会话会移入已归档。正在工作的会话始终可见。",
+  "settings.general.row.sidebarSessions.always": "始终显示",
   "settings.general.row.shell.title": "终端 Shell",
   "settings.general.row.shell.description": "选择终端使用的 shell。兼容的 shell 也会用于智能体工具调用。",
   "settings.general.row.shell.autoDefault": "自动（默认）",
diff --git a/packages/app/src/i18n/zht.ts b/packages/app/src/i18n/zht.ts
index 6cc3d555289d..2c777bc254ee 100644
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -871,6 +871,8 @@ export const dict = {
   "sidebar.project.clearNotifications": "清除通知",
   "sidebar.empty.title": "未開啟任何專案",
   "sidebar.empty.description": "開啟專案以開始使用",
+  "sidebar.archived": "已封存",
+  "sidebar.archived.restore": "還原工作階段",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "桌面",
@@ -891,6 +893,12 @@ export const dict = {
 
   "settings.general.row.language.title": "語言",
   "settings.general.row.language.description": "變更 OpenCode 的顯示語言",
+  "settings.general.row.navigation.description": "在標題列使用分頁，或使用常駐側邊欄",
+  "settings.general.row.navigation.tabs": "分頁",
+  "settings.general.row.navigation.sidebar": "側邊欄",
+  "settings.general.row.sidebarSessions.title": "閒置工作階段封存時間",
+  "settings.general.row.sidebarSessions.description": "閒置工作階段會移至已封存。正在運作的工作階段會保持顯示。",
+  "settings.general.row.sidebarSessions.always": "一律顯示",
   "settings.general.row.shell.title": "終端機 Shell",
   "settings.general.row.shell.description": "選擇終端機使用的 Shell。相容的 Shell 也會用於代理程式工具呼叫。",
   "settings.general.row.shell.autoDefault": "自動（預設）",
diff --git a/packages/app/src/pages/layout/navigation-sidebar.tsx b/packages/app/src/pages/layout/navigation-sidebar.tsx
index c54a5ed59031..07e2d2a9ff5f 100644
--- a/packages/app/src/pages/layout/navigation-sidebar.tsx
+++ b/packages/app/src/pages/layout/navigation-sidebar.tsx
@@ -267,7 +267,7 @@ export function NavigationSidebar() {
 
   return (
     <aside
-      aria-label={language.t("sidebar.navigation.label")}
+      aria-label={language.t("settings.shortcuts.group.navigation")}
       class="my-2 ms-2 flex w-[268px] shrink-0 flex-col overflow-hidden rounded-[10px] bg-v2-background-bg-base shadow-[var(--v2-elevation-raised)]"
     >
       <div class="flex shrink-0 flex-col gap-2 px-2 pt-2">
@@ -303,7 +303,7 @@ export function NavigationSidebar() {
           showClearButton={!!filter()}
           clearLabel={language.t("common.close")}
           onClearClick={() => setFilter("")}
-          placeholder={language.t("sidebar.navigation.filter")}
+          placeholder={language.t("home.sessions.search.placeholder")}
           leadingIcon={<IconV2 name="magnifying-glass" />}
           onInput={(event) => setFilter(event.currentTarget.value)}
         />
@@ -321,9 +321,9 @@ export function NavigationSidebar() {
           <Show when={!sessionIndex.isLoading && empty()}>
             <div class="flex flex-col gap-1 px-3 py-6 text-center">
               <span class="text-v2-text-text-base [font-weight:530]">
-                {language.t(
-                  filter() ? "sidebar.navigation.noMatches" : "sidebar.empty.title",
-                )}
+                {filter()
+                  ? language.t("home.sessions.search.noResults", { query: filter() })
+                  : language.t("sidebar.empty.title")}
               </span>
               <Show when={!filter()}>
                 <span class="text-xs text-v2-text-text-faint">{language.t("sidebar.empty.description")}</span>
@@ -332,7 +332,7 @@ export function NavigationSidebar() {
           </Show>
 
           <Show when={visibleGroups().length > 0}>
-            <div class={SECTION_LABEL}>{language.t("sidebar.navigation.projects")}</div>
+            <div class={SECTION_LABEL}>{language.t("home.projects")}</div>
           </Show>
 
           <For each={visibleGroups()}>
@@ -380,12 +380,7 @@ export function NavigationSidebar() {
             )}
           </For>
 
-          <div class={`${SECTION_LABEL} flex items-center justify-between gap-2`}>
-            <span>{language.t("sidebar.navigation.settled")}</span>
-            <Show when={settled().length > 0}>
-              <span class="text-v2-text-text-faint">{settled().length}</span>
-            </Show>
-          </div>
+          <div class={SECTION_LABEL}>{language.t("sidebar.archived")}</div>
 
           <button
             type="button"
@@ -399,7 +394,7 @@ export function NavigationSidebar() {
               class={`size-3 shrink-0 text-v2-icon-icon-muted transition-transform duration-[120ms] ${archivedOpen() ? "" : "-rotate-90"}`}
             />
             <IconV2 name="archive" class="size-3.5 shrink-0 text-v2-icon-icon-muted" />
-            <span class="min-w-0 flex-1 truncate">{language.t("sidebar.navigation.settled.show")}</span>
+            <span class="min-w-0 flex-1 truncate">{language.t("sidebar.archived")}</span>
           </button>
 
           <Show when={archivedOpen()}>
@@ -408,9 +403,21 @@ export function NavigationSidebar() {
                 <Spinner class="size-3.5 shrink-0" />
               </div>
             </Show>
-            <Show when={!archived.isLoading && (archived.data ?? []).length === 0}>
-              <div class="px-3 py-2 text-xs text-v2-text-text-faint">{language.t("sidebar.navigation.settled.empty")}</div>
+            <Show when={!archived.isLoading && (archived.data ?? []).length === 0 && settled().length === 0}>
+              <div class="px-3 py-2 text-xs text-v2-text-text-faint">{language.t("sidebar.empty.description")}</div>
             </Show>
+            <For each={settled()}>
+              {(record) => (
+                <SidebarSessionRow
+                  record={record}
+                  server={serverKey()}
+                  current={currentSession() === record.session.id}
+                  onOpen={open}
+                  onSettle={() => settle(record)}
+                  onCloseTab={() => closeTab(record)}
+                />
+              )}
+            </For>
             <For each={archived.data ?? []}>
               {(session) => (
                 <div class="flex min-w-0 items-center gap-1">
@@ -423,13 +430,13 @@ export function NavigationSidebar() {
                     <span class="min-w-0 flex-1 truncate">{titleOf(session)}</span>
                   </button>
                   <div class="shrink-0">
-                    <TooltipV2 value={language.t("sidebar.navigation.settled.restore")} placement="top-end">
+                    <TooltipV2 value={language.t("sidebar.archived.restore")} placement="top-end">
                       <IconButtonV2
                         data-action="sidebar-unsettle"
                         variant="ghost-muted"
                         size="small"
                         icon={<IconV2 name="outline-reset" />}
-                        aria-label={language.t("sidebar.navigation.settled.restore")}
+                        aria-label={language.t("sidebar.archived.restore")}
                         onClick={() => unsettle(session)}
                       />
                     </TooltipV2>
@@ -620,13 +627,13 @@ function SidebarSessionRow(props: {
         <span class="min-w-0 flex-1 truncate">{title()}</span>
       </button>
       <div class={ROW_ACTIONS}>
-        <TooltipV2 value={language.t("sidebar.navigation.settle")} placement="top-end">
+        <TooltipV2 value={language.t("command.session.archive")} placement="top-end">
           <IconButtonV2
             data-action="sidebar-session-settle"
             variant="ghost-muted"
             size="small"
             icon={<IconV2 name="archive" />}
-            aria-label={language.t("sidebar.navigation.settle")}
+            aria-label={language.t("command.session.archive")}
             onClick={() => props.onSettle(props.record)}
           />
         </TooltipV2>

From b9c191d7343925da16ce2fcd6adafb77605d1eab Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Fri, 11 Sep 2026 13:17:28 +0300
Subject: [PATCH 04/14] fix(app): declare mobile media query before sidebar
 memo

The sidebar navigation memo in the titlebar referenced the mobile media
query before its const declaration, so the app crashed on launch with a
temporal dead zone ReferenceError.
---
 packages/app/src/components/titlebar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/app/src/components/titlebar.tsx b/packages/app/src/components/titlebar.tsx
index c97cdd70384f..77cd53bd5050 100644
--- a/packages/app/src/components/titlebar.tsx
+++ b/packages/app/src/components/titlebar.tsx
@@ -72,11 +72,11 @@ export function Titlebar(props: { update?: TitlebarUpdate; debugTools?: { visibl
   const location = useLocation()
   const params = useParams()
   const useV2Titlebar = createMemo(() => settings.general.newLayoutDesigns())
+  const mobile = createMediaQuery("(max-width: 767px)")
   // Sidebar navigation mode replaces the tab strip on desktop widths; mobile keeps tabs.
   const sidebarNavigation = createMemo(
     () => useV2Titlebar() && !mobile() && settings.general.navigationMode() === "sidebar",
   )
-  const mobile = createMediaQuery("(max-width: 767px)")
   const bottom = createMemo(() => useV2Titlebar() && mobile() && settings.general.mobileTitlebarPosition() === "bottom")
 
   const mac = createMemo(() => platform.platform === "desktop" && platform.os === "macos")

From f2354123744e8fa5858e6f3a06d052d40d1f0417 Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Fri, 11 Sep 2026 15:40:41 +0300
Subject: [PATCH 05/14] feat(app): refine sidebar threads with settle, pins and
 live status

---
 packages/app/src/i18n/am.ts                   |  14 +-
 packages/app/src/i18n/ar.ts                   |  14 +-
 packages/app/src/i18n/az.ts                   |  14 +-
 packages/app/src/i18n/bg.ts                   |  14 +-
 packages/app/src/i18n/bn.ts                   |  14 +-
 packages/app/src/i18n/br.ts                   |  14 +-
 packages/app/src/i18n/bs.ts                   |  14 +-
 packages/app/src/i18n/ca.ts                   |  14 +-
 packages/app/src/i18n/cs.ts                   |  14 +-
 packages/app/src/i18n/da.ts                   |  14 +-
 packages/app/src/i18n/de.ts                   |  14 +-
 packages/app/src/i18n/dv.ts                   |  14 +-
 packages/app/src/i18n/dz.ts                   |  14 +-
 packages/app/src/i18n/el.ts                   |  14 +-
 packages/app/src/i18n/en.ts                   |  14 +-
 packages/app/src/i18n/es.ts                   |  14 +-
 packages/app/src/i18n/et.ts                   |  14 +-
 packages/app/src/i18n/fa.ts                   |  14 +-
 packages/app/src/i18n/fi.ts                   |  14 +-
 packages/app/src/i18n/fo.ts                   |  14 +-
 packages/app/src/i18n/fr.ts                   |  14 +-
 packages/app/src/i18n/hi.ts                   |  14 +-
 packages/app/src/i18n/hr.ts                   |  14 +-
 packages/app/src/i18n/hu.ts                   |  14 +-
 packages/app/src/i18n/hy.ts                   |  14 +-
 packages/app/src/i18n/id.ts                   |  14 +-
 packages/app/src/i18n/is.ts                   |  14 +-
 packages/app/src/i18n/it.ts                   |  14 +-
 packages/app/src/i18n/ja.ts                   |  14 +-
 packages/app/src/i18n/ka.ts                   |  14 +-
 packages/app/src/i18n/km.ts                   |  14 +-
 packages/app/src/i18n/ko.ts                   |  14 +-
 packages/app/src/i18n/lo.ts                   |  14 +-
 packages/app/src/i18n/lt.ts                   |  14 +-
 packages/app/src/i18n/lv.ts                   |  14 +-
 packages/app/src/i18n/mk.ts                   |  14 +-
 packages/app/src/i18n/mn.ts                   |  14 +-
 packages/app/src/i18n/ms.ts                   |  14 +-
 packages/app/src/i18n/my.ts                   |  14 +-
 packages/app/src/i18n/ne.ts                   |  14 +-
 packages/app/src/i18n/nl.ts                   |  14 +-
 packages/app/src/i18n/no.ts                   |  14 +-
 packages/app/src/i18n/pa.ts                   |  14 +-
 packages/app/src/i18n/pl.ts                   |  14 +-
 packages/app/src/i18n/ro.ts                   |  14 +-
 packages/app/src/i18n/ru.ts                   |  14 +-
 packages/app/src/i18n/si.ts                   |  14 +-
 packages/app/src/i18n/sk.ts                   |  14 +-
 packages/app/src/i18n/sl.ts                   |  14 +-
 packages/app/src/i18n/sq.ts                   |  14 +-
 packages/app/src/i18n/sr.ts                   |  14 +-
 packages/app/src/i18n/sv.ts                   |  14 +-
 packages/app/src/i18n/tg.ts                   |  14 +-
 packages/app/src/i18n/th.ts                   |  14 +-
 packages/app/src/i18n/tk.ts                   |  14 +-
 packages/app/src/i18n/tr.ts                   |  14 +-
 packages/app/src/i18n/uk.ts                   |  14 +-
 packages/app/src/i18n/ur.ts                   |  14 +-
 packages/app/src/i18n/uz.ts                   |  14 +-
 packages/app/src/i18n/vi.ts                   |  14 +-
 packages/app/src/i18n/zh.ts                   |  14 +-
 packages/app/src/i18n/zht.ts                  |  14 +-
 .../src/pages/layout/navigation-sidebar.tsx   | 522 ++++++++++++++----
 packages/ui/src/v2/components/icon.tsx        |   4 +
 64 files changed, 1026 insertions(+), 368 deletions(-)

diff --git a/packages/app/src/i18n/am.ts b/packages/app/src/i18n/am.ts
index 9b3f939f5d5a..8191dfc2af9c 100644
--- a/packages/app/src/i18n/am.ts
+++ b/packages/app/src/i18n/am.ts
@@ -860,8 +860,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "ማሳወቂያዎችን አጽዳ",
   "sidebar.empty.title": "ምንም ክፍት ፕሮጀክቶች የሉም",
   "sidebar.empty.description": "ለመጀመር ፕሮጀክት ይክፈቱ",
-  "sidebar.archived": "በማህደር የተቀመጠ",
-  "sidebar.archived.restore": "ክፍለ ጊዜን መልስ",
+  "sidebar.settled": "የተረጉ",
+  "sidebar.settle": "ርን አጋ",
+  "sidebar.unsettle": "ርን መልስ",
+  "sidebar.thread.new": "አዲስ ክር",
+  "sidebar.thread.pin": "ክርን ሰካ",
+  "sidebar.thread.unpin": "ኪውን አውልቅ",
+  "sidebar.status.working": "በስራ ላይ",
+  "sidebar.status.done": "ተጠናቀቀ",
   "debugBar.ariaLabel": "የልማት አፈጻጸም ምርመራዎች",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -911,8 +917,8 @@ export const dict = {
   "settings.general.row.navigation.description": "በርዕስ አሞሌ ውስጥ ትሮችን ወይም ቋሚ የጎን አሞሌ ይጠቀሙ",
   "settings.general.row.navigation.tabs": "ትሮች",
   "settings.general.row.navigation.sidebar": "የጎን አሞሌ",
-  "settings.general.row.sidebarSessions.title": "የማይሰሩ ክፍለ ጊዜያትን አስቀምጥ",
-  "settings.general.row.sidebarSessions.description": "የማይሰሩ ክፍለ ጊዜያት ወደ በማህደር የተቀመጠ ይሄዳሉ። እየሰሩ ያሉ ክፍለ ጊዜያት ይታያሉ።",
+  "settings.general.row.sidebarSessions.title": "ንቁ ያልሆኑ ክሮችን የማረጋት ጊዜ",
+  "settings.general.row.sidebarSessions.description": "ንቁ ያልሆኑ ክሮች ወደ የተረጉ ሄዳ። በስራ ላይ ያሉ ክሮች ይታያሉ።",
   "settings.general.row.sidebarSessions.always": "ሁልጊዜ አሳይ",
   "settings.general.row.shell.title": "ተርሚናል ሼል",
   "settings.general.row.shell.description": "ሼል በተርሚናል እና ወኪል መሳሪያዎች ጥቅም ላይ የዋለ",
diff --git a/packages/app/src/i18n/ar.ts b/packages/app/src/i18n/ar.ts
index ddb9c7321716..05a862502760 100644
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -827,8 +827,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "مسح الإشعارات",
   "sidebar.empty.title": "لا توجد مشاريع مفتوحة",
   "sidebar.empty.description": "افتح مشروعًا للبدء",
-  "sidebar.archived": "المؤرشفة",
-  "sidebar.archived.restore": "استعادة الجلسة",
+  "sidebar.settled": "المنتهية",
+  "sidebar.settle": "إنهاء المحادثة",
+  "sidebar.unsettle": "إعادة المحادثة",
+  "sidebar.thread.new": "محادثة جديدة",
+  "sidebar.thread.pin": "تثبيت المحادثة",
+  "sidebar.thread.unpin": "إلغاء تثبيت المحادثة",
+  "sidebar.status.working": "يعمل",
+  "sidebar.status.done": "تم",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "سطح المكتب",
   "settings.section.server": "الخادم",
@@ -849,8 +855,8 @@ export const dict = {
   "settings.general.row.navigation.description": "استخدم علامات التبويب في شريط العنوان أو الشريط الجانبي الثابت",
   "settings.general.row.navigation.tabs": "علامات التبويب",
   "settings.general.row.navigation.sidebar": "الشريط الجانبي",
-  "settings.general.row.sidebarSessions.title": "أرشفة الجلسات الخاملة بعد",
-  "settings.general.row.sidebarSessions.description": "تنتقل الجلسات الخاملة إلى المؤرشفة. تبقى الجلسات النشطة ظاهرة.",
+  "settings.general.row.sidebarSessions.title": "إنهاء المحادثات الخاملة بعد",
+  "settings.general.row.sidebarSessions.description": "تنتقل المحادثات الخاملة إلى المنتهية. المحادثات العاملة تبقى ظاهرة.",
   "settings.general.row.sidebarSessions.always": "الإظهار دائمًا",
   "settings.general.row.shell.title": "Shell المحطة الطرفية",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/az.ts b/packages/app/src/i18n/az.ts
index eb041d751a9a..3123a141d29d 100644
--- a/packages/app/src/i18n/az.ts
+++ b/packages/app/src/i18n/az.ts
@@ -886,8 +886,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Bildirişləri təmizlə",
   "sidebar.empty.title": "Heç bir layihə açılmayıb",
   "sidebar.empty.description": "Başlamaq üçün bir layihə açın",
-  "sidebar.archived": "Arxivlənib",
-  "sidebar.archived.restore": "Sessiyanı bərpa et",
+  "sidebar.settled": "Bağlanan",
+  "sidebar.settle": "Mövzunu bağla",
+  "sidebar.unsettle": "Mövzunu yenidən aç",
+  "sidebar.thread.new": "Yeni mövzu",
+  "sidebar.thread.pin": "Mövzunu bərkid",
+  "sidebar.thread.unpin": "Bərkitməni ləğv et",
+  "sidebar.status.working": "İşləyir",
+  "sidebar.status.done": "Hazır",
   "debugBar.ariaLabel": "Tərtibatçı performans diaqnostikası",
   "debugBar.na": "yox",
   "debugBar.nav.label": "NAV",
@@ -939,8 +945,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Başlıq panelində tablar və ya daimi yan panel istifadə et",
   "settings.general.row.navigation.tabs": "Tablar",
   "settings.general.row.navigation.sidebar": "Yan panel",
-  "settings.general.row.sidebarSessions.title": "Boşda qalan sessiyaları arxivlə",
-  "settings.general.row.sidebarSessions.description": "Boşda qalan sessiyalar Arxivlənib bölməsinə keçir. İşləyən sessiyalar görünən qalır.",
+  "settings.general.row.sidebarSessions.title": "Boş mövzuları bağlama müddəti",
+  "settings.general.row.sidebarSessions.description": "Boş mövzular bağlananlara daşınır. İşləyən mövzular görünür qalır.",
   "settings.general.row.sidebarSessions.always": "Həmişə göstər",
   "settings.general.row.shell.title": "Terminal qabığı",
   "settings.general.row.shell.description": "Terminal və agent alətləri tərəfindən istifadə edilən qabıq",
diff --git a/packages/app/src/i18n/bg.ts b/packages/app/src/i18n/bg.ts
index a33132500978..5adf47d6985a 100644
--- a/packages/app/src/i18n/bg.ts
+++ b/packages/app/src/i18n/bg.ts
@@ -882,8 +882,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Изчистване на известията",
   "sidebar.empty.title": "Няма отворени проекти",
   "sidebar.empty.description": "Отворете проект, за да започнете",
-  "sidebar.archived": "Архивирани",
-  "sidebar.archived.restore": "Възстанови сесия",
+  "sidebar.settled": "Отложени",
+  "sidebar.settle": "Отложи нишка",
+  "sidebar.unsettle": "Върни нишка",
+  "sidebar.thread.new": "Нова нишка",
+  "sidebar.thread.pin": "Закачи нишка",
+  "sidebar.thread.unpin": "Откачи нишка",
+  "sidebar.status.working": "В процес",
+  "sidebar.status.done": "Готово",
   "debugBar.ariaLabel": "Диагностика на ефективността на разработката",
   "debugBar.na": "няма",
   "debugBar.nav.label": "NAV",
@@ -936,8 +942,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Използвайте раздели в заглавната лента или постоянна странична лента",
   "settings.general.row.navigation.tabs": "Раздели",
   "settings.general.row.navigation.sidebar": "Странична лента",
-  "settings.general.row.sidebarSessions.title": "Архивирай неактивни сесии след",
-  "settings.general.row.sidebarSessions.description": "Неактивните сесии отиват в Архивирани. Активните сесии остават видими.",
+  "settings.general.row.sidebarSessions.title": "Отложи неактивни нишки след",
+  "settings.general.row.sidebarSessions.description": "Неактивните нишки отиват в отложените. Активните нишки остават видими.",
   "settings.general.row.sidebarSessions.always": "Винаги показвай",
   "settings.general.row.shell.title": "Терминал shell",
   "settings.general.row.shell.description": "Shell използвани от инструментите на терминала и агента",
diff --git a/packages/app/src/i18n/bn.ts b/packages/app/src/i18n/bn.ts
index 0410241cd3aa..8a8f894e436f 100644
--- a/packages/app/src/i18n/bn.ts
+++ b/packages/app/src/i18n/bn.ts
@@ -876,8 +876,14 @@ export const dict: Record<string, string> = {
   "sidebar.project.clearNotifications": "বিজ্ঞপ্তিগুলি সাফ করুন",
   "sidebar.empty.title": "কোনো প্রকল্প খোলা নেই",
   "sidebar.empty.description": "শুরু করতে একটি প্রকল্প খুলুন",
-  "sidebar.archived": "আর্কাইভ করা",
-  "sidebar.archived.restore": "সেশন পুনরুদ্ধার করুন",
+  "sidebar.settled": "নিষ্পত্তি হওয়া",
+  "sidebar.settle": "থ্রেড নিষ্পত্তি করুন",
+  "sidebar.unsettle": "থ্রেড পুনরুদ্ধার করুন",
+  "sidebar.thread.new": "নতুন থ্রেড",
+  "sidebar.thread.pin": "থ্রেড পিন করুন",
+  "sidebar.thread.unpin": "পিন সরান",
+  "sidebar.status.working": "কাজ চলছে",
+  "sidebar.status.done": "সম্পন্ন",
   "debugBar.ariaLabel": "উন্নয়ন কর্মক্ষমতা ডায়গনিস্টিক",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "এনএভি",
@@ -928,8 +934,8 @@ export const dict: Record<string, string> = {
   "settings.general.row.navigation.description": "শিরোনাম বারে ট্যাব বা স্থায়ী সাইডবার ব্যবহার করুন",
   "settings.general.row.navigation.tabs": "ট্যাব",
   "settings.general.row.navigation.sidebar": "সাইডবার",
-  "settings.general.row.sidebarSessions.title": "নিষ্ক্রিয় সেশন আর্কাইভ করুন",
-  "settings.general.row.sidebarSessions.description": "নিষ্ক্রিয় সেশন আর্কাইভ করাতে চলে যায়। কর্মরত সেশন দৃশ্যমান থাকে।",
+  "settings.general.row.sidebarSessions.title": "নিষ্ক্রিয় থ্রেড নিষ্পত্তির সময়",
+  "settings.general.row.sidebarSessions.description": "নিষ্ক্রিয় থ্রেড নিষ্পত্তি হওয়াতে চলে যায়। কাজ চলমান থ্রেড দৃশ্যমান থাকে।",
   "settings.general.row.sidebarSessions.always": "সবসময় দেখান",
   "settings.general.row.shell.title": "টার্মিনাল শেল",
   "settings.general.row.shell.description": "টার্মিনাল এবং এজেন্ট সরঞ্জাম দ্বারা ব্যবহৃত শেল",
diff --git a/packages/app/src/i18n/br.ts b/packages/app/src/i18n/br.ts
index ab2b89e40c86..cbb829ffc281 100644
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -830,8 +830,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Limpar notificações",
   "sidebar.empty.title": "Nenhum projeto aberto",
   "sidebar.empty.description": "Abra um projeto para começar",
-  "sidebar.archived": "Archiuet",
-  "sidebar.archived.restore": "Adsevel ar sesion",
+  "sidebar.settled": "Reoliet",
+  "sidebar.settle": "Reoliañ an neudenn",
+  "sidebar.unsettle": "Adkrouiñ an neudenn",
+  "sidebar.thread.new": "Neudenn nevez",
+  "sidebar.thread.pin": "Spilhennañ an neudenn",
+  "sidebar.thread.unpin": "Dibilhennañ an neudenn",
+  "sidebar.status.working": "O labourat",
+  "sidebar.status.done": "Echu",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
   "settings.section.server": "Servidor",
@@ -852,8 +858,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Implijit abadennoù er varenn ditl pe ur varrenn gostez padus",
   "settings.general.row.navigation.tabs": "Abadennoù",
   "settings.general.row.navigation.sidebar": "Barrenn gostez",
-  "settings.general.row.sidebarSessions.title": "Arc'hivañ ar sesionoù diseblant goude",
-  "settings.general.row.sidebarSessions.description": "Ar sesionoù diseblant a ya d'an arquiv. Ar sesionoù oberiant a chom gwelet.",
+  "settings.general.row.sidebarSessions.title": "Reoliañ an neudennoù diober goude",
+  "settings.general.row.sidebarSessions.description": "An neudennoù diober a ya d'ar reoliet. An neudennoù o labourat a chom gwelus.",
   "settings.general.row.sidebarSessions.always": "Diskouez bepred",
   "settings.general.row.shell.title": "Shell do terminal",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/bs.ts b/packages/app/src/i18n/bs.ts
index 3f58821407f9..cb18883ead89 100644
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -891,8 +891,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Očisti obavijesti",
   "sidebar.empty.title": "Nema otvorenih projekata",
   "sidebar.empty.description": "Otvori projekat za početak",
-  "sidebar.archived": "Arhivirano",
-  "sidebar.archived.restore": "Vrati sesiju",
+  "sidebar.settled": "Odložene",
+  "sidebar.settle": "Odloži nit",
+  "sidebar.unsettle": "Vrati nit",
+  "sidebar.thread.new": "Nova nit",
+  "sidebar.thread.pin": "Prikvači nit",
+  "sidebar.thread.unpin": "Otkvači nit",
+  "sidebar.status.working": "U toku",
+  "sidebar.status.done": "Gotovo",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -917,8 +923,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Koristite kartice u traci naslova ili stalnu bočnu traku",
   "settings.general.row.navigation.tabs": "Kartice",
   "settings.general.row.navigation.sidebar": "Bočna traka",
-  "settings.general.row.sidebarSessions.title": "Arhiviraj neaktivne sesije nakon",
-  "settings.general.row.sidebarSessions.description": "Neaktivne sesije idu u Arhivirano. Aktivne sesije ostaju vidljive.",
+  "settings.general.row.sidebarSessions.title": "Odloži neaktivne niti nakon",
+  "settings.general.row.sidebarSessions.description": "Neaktivne niti prelaze u odložene. Aktivne niti ostaju vidljive.",
   "settings.general.row.sidebarSessions.always": "Uvijek prikaži",
   "settings.general.row.shell.title": "Shell terminala",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/ca.ts b/packages/app/src/i18n/ca.ts
index 359af691d3c4..1faaa0bccd2e 100644
--- a/packages/app/src/i18n/ca.ts
+++ b/packages/app/src/i18n/ca.ts
@@ -886,8 +886,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Esborra les notificacions",
   "sidebar.empty.title": "No hi ha projectes oberts",
   "sidebar.empty.description": "Obriu un projecte per començar",
-  "sidebar.archived": "Arxivades",
-  "sidebar.archived.restore": "Restaura la sessió",
+  "sidebar.settled": "Tancats",
+  "sidebar.settle": "Tanca el fil",
+  "sidebar.unsettle": "Reobre el fil",
+  "sidebar.thread.new": "Fil nou",
+  "sidebar.thread.pin": "Fixa el fil",
+  "sidebar.thread.unpin": "Desfixa el fil",
+  "sidebar.status.working": "Treballant",
+  "sidebar.status.done": "Fet",
   "debugBar.ariaLabel": "Diagnòstic de rendiment del desenvolupament",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -939,8 +945,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Usa pestanyes a la barra de títol o una barra lateral persistent",
   "settings.general.row.navigation.tabs": "Pestanyes",
   "settings.general.row.navigation.sidebar": "Barra lateral",
-  "settings.general.row.sidebarSessions.title": "Arxiva les sessions inactives després de",
-  "settings.general.row.sidebarSessions.description": "Les sessions inactives van a Arxivades. Les sessions actives continuen visibles.",
+  "settings.general.row.sidebarSessions.title": "Tanca els fils inactius després de",
+  "settings.general.row.sidebarSessions.description": "Els fils inactius passen a Tancats. Els fils actius continuen visibles.",
   "settings.general.row.sidebarSessions.always": "Mostra sempre",
   "settings.general.row.shell.title": "Carcassa terminal",
   "settings.general.row.shell.description": "Shell utilitzat pel terminal i les eines d'agent",
diff --git a/packages/app/src/i18n/cs.ts b/packages/app/src/i18n/cs.ts
index 0a3ddc854800..399e4ed0cff7 100644
--- a/packages/app/src/i18n/cs.ts
+++ b/packages/app/src/i18n/cs.ts
@@ -882,8 +882,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Vymazat oznámení",
   "sidebar.empty.title": "Nejsou otevřeny žádné projekty",
   "sidebar.empty.description": "Chcete-li začít, otevřete projekt",
-  "sidebar.archived": "Archivované",
-  "sidebar.archived.restore": "Obnovit relaci",
+  "sidebar.settled": "Odložené",
+  "sidebar.settle": "Odložit vlákno",
+  "sidebar.unsettle": "Vrátit vlákno",
+  "sidebar.thread.new": "Nové vlákno",
+  "sidebar.thread.pin": "Připnout vlákno",
+  "sidebar.thread.unpin": "Odepnout vlákno",
+  "sidebar.status.working": "Pracuje",
+  "sidebar.status.done": "Hotovo",
   "debugBar.ariaLabel": "Diagnostika vývoje výkonnosti",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -935,8 +941,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Použijte karty na titulním panelu nebo trvalý postranní panel",
   "settings.general.row.navigation.tabs": "Karty",
   "settings.general.row.navigation.sidebar": "Postranní panel",
-  "settings.general.row.sidebarSessions.title": "Archivovat nečinné relace po",
-  "settings.general.row.sidebarSessions.description": "Nečinné relace se přesunou do Archivované. Aktivní relace zůstávají viditelné.",
+  "settings.general.row.sidebarSessions.title": "Odložit nečinná vlákna po",
+  "settings.general.row.sidebarSessions.description": "Nečinná vlákna se přesunou do Odložené. Pracující vlákna zůstanou viditelná.",
   "settings.general.row.sidebarSessions.always": "Vždy zobrazit",
   "settings.general.row.shell.title": "Shell terminálu",
   "settings.general.row.shell.description": "Shell používaný terminálem a nástroji agenta",
diff --git a/packages/app/src/i18n/da.ts b/packages/app/src/i18n/da.ts
index 6ba53be1143c..a345ff06a657 100644
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -768,8 +768,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Ryd notifikationer",
   "sidebar.empty.title": "Ingen åbne projekter",
   "sidebar.empty.description": "Åbn et projekt for at komme i gang",
-  "sidebar.archived": "Arkiveret",
-  "sidebar.archived.restore": "Gendan session",
+  "sidebar.settled": "Afsluttede",
+  "sidebar.settle": "Afslut tråd",
+  "sidebar.unsettle": "Genåbn tråd",
+  "sidebar.thread.new": "Ny tråd",
+  "sidebar.thread.pin": "Fastgør tråd",
+  "sidebar.thread.unpin": "Frigør tråd",
+  "sidebar.status.working": "Arbejder",
+  "sidebar.status.done": "Færdig",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
@@ -793,8 +799,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Brug faner i titellinjen eller et fast sidepanel",
   "settings.general.row.navigation.tabs": "Faner",
   "settings.general.row.navigation.sidebar": "Sidepanel",
-  "settings.general.row.sidebarSessions.title": "Arkivér inaktive sessioner efter",
-  "settings.general.row.sidebarSessions.description": "Inaktive sessioner flyttes til Arkiveret. Aktive sessioner forbliver synlige.",
+  "settings.general.row.sidebarSessions.title": "Afslut inaktive tråde efter",
+  "settings.general.row.sidebarSessions.description": "Inaktive tråde flyttes til Afsluttede. Aktive tråde forbliver synlige.",
   "settings.general.row.sidebarSessions.always": "Vis altid",
   "settings.general.row.shell.title": "Terminalshell",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/de.ts b/packages/app/src/i18n/de.ts
index 641d004239d3..9e061722248f 100644
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -721,8 +721,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Benachrichtigungen löschen",
   "sidebar.empty.title": "Keine Projekte geöffnet",
   "sidebar.empty.description": "Öffnen Sie ein Projekt, um loszulegen",
-  "sidebar.archived": "Archiviert",
-  "sidebar.archived.restore": "Sitzung wiederherstellen",
+  "sidebar.settled": "Abgelegt",
+  "sidebar.settle": "Thread ablegen",
+  "sidebar.unsettle": "Thread wiederherstellen",
+  "sidebar.thread.new": "Neuer Thread",
+  "sidebar.thread.pin": "Thread anheften",
+  "sidebar.thread.unpin": "Thread loslösen",
+  "sidebar.status.working": "In Arbeit",
+  "sidebar.status.done": "Fertig",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
   "settings.section.server": "Server",
@@ -743,8 +749,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Tabs in der Titelleiste oder eine dauerhafte Seitenleiste verwenden",
   "settings.general.row.navigation.tabs": "Tabs",
   "settings.general.row.navigation.sidebar": "Seitenleiste",
-  "settings.general.row.sidebarSessions.title": "Inaktive Sitzungen archivieren nach",
-  "settings.general.row.sidebarSessions.description": "Inaktive Sitzungen werden nach „Archiviert“ verschoben. Aktive Sitzungen bleiben sichtbar.",
+  "settings.general.row.sidebarSessions.title": "Inaktive Threads ablegen nach",
+  "settings.general.row.sidebarSessions.description": "Inaktive Threads werden abgelegt. Aktive Threads bleiben sichtbar.",
   "settings.general.row.sidebarSessions.always": "Immer anzeigen",
   "settings.general.row.shell.title": "Terminal-Shell",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/dv.ts b/packages/app/src/i18n/dv.ts
index 5c010a424d0d..837b840bc761 100644
--- a/packages/app/src/i18n/dv.ts
+++ b/packages/app/src/i18n/dv.ts
@@ -890,8 +890,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "ނޮޓިފިކޭޝަންތައް ސާފުކުރުން",
   "sidebar.empty.title": "އެއްވެސް މަޝްރޫއެއް ނުހުޅުވޭ",
   "sidebar.empty.description": "ފަށަން ޕްރޮޖެކްޓެއް ހުޅުވާށެވެ",
-  "sidebar.archived": "ގެންދެވިފައި",
-  "sidebar.archived.restore": "ސެޝަން އަލުން ގެންނާން",
+  "sidebar.settled": "ނިންމައިފައިވާ",
+  "sidebar.settle": "ތްރެޑް ނިންމައިލާ",
+  "sidebar.unsettle": "ތްރެޑް އަލުން ފައުލާ",
+  "sidebar.thread.new": "އާ ތްރެޑް",
+  "sidebar.thread.pin": "ތްރެޑް ޕިން ކުރާ",
+  "sidebar.thread.unpin": "ޕިން ނަގާ",
+  "sidebar.status.working": "މަސައްކަތް ކުރަމުން",
+  "sidebar.status.done": "ނިމިއްޖެ",
   "debugBar.ariaLabel": "ޑިވެލޮޕްމަންޓް ޕާފޯމަންސް ޑައިގްނޯސްޓިކްސް",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV އެވެ",
@@ -944,8 +950,8 @@ export const dict = {
   "settings.general.row.navigation.description": "ސިރުސްތޮށުގައި ޓެބްތައް ނުވަތަ ސައިޑްބާރެއް ބޭނުން ކުރޭ",
   "settings.general.row.navigation.tabs": "ޓެބްތައް",
   "settings.general.row.navigation.sidebar": "ސައިޑްބާރް",
-  "settings.general.row.sidebarSessions.title": "ނުހަރަކާތްތެރި ސެޝަންތައް ގެންދަން",
-  "settings.general.row.sidebarSessions.description": "ނުހަރަކާތްތެރި ސެޝަންތައް ގެންދެވިފައި އަށް ބަދަލުވޭ. މަސައްކަތް ކުރަމުންދާ ސެޝަންތައް ފެންނާނެ.",
+  "settings.general.row.sidebarSessions.title": "ނިސްކްރިއ ތްރެޑްތައް ނިންމައިލުމަށް ފަހު",
+  "settings.general.row.sidebarSessions.description": "ނިސްކްރިއ ތްރެޑްތައް ނިންމައިފައިވާ އަށް ބަދަލުވޭ. މަސައްކަތް ކުރަމުންދާ ތްރެޑްތައް ފެންނަން ހުންނާނެ.",
   "settings.general.row.sidebarSessions.always": "އެންމެހާ ވަގުތު ދައްކާ",
   "settings.general.row.shell.title": "ޓާމިނަލް ޝެލް އެވެ",
   "settings.general.row.shell.description": "ޓާމިނަލް އާއި އޭޖެންޓް ޓޫލްސް އިން ބޭނުންކުރާ ޝެލް",
diff --git a/packages/app/src/i18n/dz.ts b/packages/app/src/i18n/dz.ts
index ba70de0bae0c..335385ffc016 100644
--- a/packages/app/src/i18n/dz.ts
+++ b/packages/app/src/i18n/dz.ts
@@ -891,8 +891,14 @@ export const dict: Record<string, string> = {
   "sidebar.project.clearNotifications": "བརྡ་བསྐུལ་ཚུ་གསལ་བཟོ།",
   "sidebar.empty.title": "ལས་འགུལ་ཁ་ཕྱེ་མེད།",
   "sidebar.empty.description": "འགོ་བཙུགས་ནིའི་དོན་ལུ་ལས་འགུལ་ཅིག་ཁ་ཕྱེ།",
-  "sidebar.archived": "ཡིག་མཛོད་ནང་བཞག",
-  "sidebar.archived.restore": "ལཱ་ཡུན་སོར་ཆུད",
+  "sidebar.settled": "བསྒུབས་ཟིན་པ།",
+  "sidebar.settle": "གླེང་མོལ་བསྒྲུབས།",
+  "sidebar.unsettle": "གླེང་མོ་སོར་ུད།",
+  "sidebar.thread.new": "གླེང་མོལ་གསརཔ།",
+  "sidebar.thread.pin": "གླེང་མོལ་བཀག་སྒྲིལ།",
+  "sidebar.thread.unpin": "བཀག་སྒྲིལ་བཏོན།",
+  "sidebar.status.working": "ལཱ་འབད་བཞིན།",
+  "sidebar.status.done": "འགྲུབ་ཅི།",
   "debugBar.ariaLabel": "གོང་འཕེལ་གྱི་ལས་དོན་བརྟག་དཔྱད།",
   "debugBar.na": "ན/ཨེ།",
   "debugBar.nav.label": "NAV",
@@ -945,8 +951,8 @@ export const dict: Record<string, string> = {
   "settings.general.row.navigation.description": "མགོ་བརྗོད་ནང་ མཆོང་ལྡེ་ ཡང་ན་ ཟུར་ཕྲེང་ ལག་ལེན་འཐབ།",
   "settings.general.row.navigation.tabs": "མཆོང་ལྡེ།",
   "settings.general.row.navigation.sidebar": "ཟུར་ཕྲེང་།",
-  "settings.general.row.sidebarSessions.title": "ལཱ་ཡུན་མ་འགུལ་བ་ ཡིག་མཛོད་ནང་བཞག",
-  "settings.general.row.sidebarSessions.description": "ལཱ་ཡུན་མ་འགུལ་བ་ ཡིག་མཛོད་ནང་འགྱོ། ལཱ་འབད་མི་ ལཱ་ཡུན་ མཐོང་ཚུགས།",
+  "settings.general.row.sidebarSessions.title": "་ལཱ་བའི་གླེང་མོལ་བསྒྲུབས་ཚེ།",
+  "settings.general.row.sidebarSessions.description": "མ་ཱ་བི་གེང་མོལ་བསྒྲུབས་ཟིན་རུ་སོང་། ལཱ་འབད་བཞིན་པ་སྟོན།",
   "settings.general.row.sidebarSessions.always": "ད་ལྟོ་རང་ སྟོན།",
   "settings.general.row.shell.title": "ཊར་མི་ནཱལ་ Shell",
   "settings.general.row.shell.description": "ཊར་མི་ནཱལ་དང་ལས་ཚབ་ལག་ཆས་ཚུ་གིས་ལག་ལེན་འཐབ་མི་ Shell",
diff --git a/packages/app/src/i18n/el.ts b/packages/app/src/i18n/el.ts
index 90f8409b51bf..2b9b31edb05e 100644
--- a/packages/app/src/i18n/el.ts
+++ b/packages/app/src/i18n/el.ts
@@ -885,8 +885,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Διαγραφή ειδοποιήσεων",
   "sidebar.empty.title": "Δεν υπάρχουν ανοιχτά έργα",
   "sidebar.empty.description": "Ανοίξτε ένα έργο για να ξεκινήσετε",
-  "sidebar.archived": "Αρχειοθετημένες",
-  "sidebar.archived.restore": "Επαναφορά συνεδρίας",
+  "sidebar.settled": "Τακτοποιημένες",
+  "sidebar.settle": "Τακτοποίηση νήματος",
+  "sidebar.unsettle": "Επαναφορά νήματος",
+  "sidebar.thread.new": "Νέο νήμα",
+  "sidebar.thread.pin": "Καρφίτσωμα νήματος",
+  "sidebar.thread.unpin": "Ξεκαρφίτσωμα νήματος",
+  "sidebar.status.working": "Σε εργασία",
+  "sidebar.status.done": "Ολοκληρώθηκε",
   "debugBar.ariaLabel": "Διαγνωστικά απόδοσης ανάπτυξης",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -940,8 +946,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Χρησιμοποιήστε καρτέλες στη γραμμή τίτλου ή μια μόνιμη πλευρική γραμμή",
   "settings.general.row.navigation.tabs": "Καρτέλες",
   "settings.general.row.navigation.sidebar": "Πλευρική γραμμή",
-  "settings.general.row.sidebarSessions.title": "Αρχειοθέτηση αδρανών συνεδριών μετά από",
-  "settings.general.row.sidebarSessions.description": "Οι αδρανείς συνεδρίες μετακινούνται στις Αρχειοθετημένες. Οι ενεργές συνεδρίες παραμένουν ορατές.",
+  "settings.general.row.sidebarSessions.title": "Τακτοποίηση αδρανών νημάτων μετά",
+  "settings.general.row.sidebarSessions.description": "Τα αδρανή νήματα μεταφέρονται στα τακτοποιημένα. Τα νήματα σε εργασία παραμένουν ορατά.",
   "settings.general.row.sidebarSessions.always": "Να εμφανίζονται πάντα",
   "settings.general.row.shell.title": "Τερματικό κέλυφος",
   "settings.general.row.shell.description": "Κέλυφος που χρησιμοποιείται από το τερματικό και τα εργαλεία του πράκτορα",
diff --git a/packages/app/src/i18n/en.ts b/packages/app/src/i18n/en.ts
index 2b50834e1523..0f0670ec38ea 100644
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -854,8 +854,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Clear notifications",
   "sidebar.empty.title": "No projects open",
   "sidebar.empty.description": "Open a project to get started",
-  "sidebar.archived": "Archived",
-  "sidebar.archived.restore": "Restore session",
+  "sidebar.settled": "Settled",
+  "sidebar.settle": "Settle thread",
+  "sidebar.unsettle": "Unsettle thread",
+  "sidebar.thread.new": "New thread",
+  "sidebar.thread.pin": "Pin thread",
+  "sidebar.thread.unpin": "Unpin thread",
+  "sidebar.status.working": "Working",
+  "sidebar.status.done": "Done",
 
   "debugBar.ariaLabel": "Development performance diagnostics",
   "debugBar.na": "n/a",
@@ -912,8 +918,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Use title bar tabs or a persistent sidebar",
   "settings.general.row.navigation.tabs": "Tabs",
   "settings.general.row.navigation.sidebar": "Sidebar",
-  "settings.general.row.sidebarSessions.title": "Archive idle sessions after",
-  "settings.general.row.sidebarSessions.description": "Idle sessions move to Archived. Working sessions stay visible.",
+  "settings.general.row.sidebarSessions.title": "Settle idle sessions after",
+  "settings.general.row.sidebarSessions.description": "Idle sessions move to Settled. Working sessions stay visible.",
   "settings.general.row.sidebarSessions.always": "Always show",
   "settings.general.row.shell.title": "Terminal shell",
   "settings.general.row.shell.description": "Shell used by the terminal and agent tools",
diff --git a/packages/app/src/i18n/es.ts b/packages/app/src/i18n/es.ts
index f66d8aee8950..d8c8eb430db2 100644
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -896,8 +896,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Borrar notificaciones",
   "sidebar.empty.title": "No hay proyectos abiertos",
   "sidebar.empty.description": "Abre un proyecto para empezar",
-  "sidebar.archived": "Archivadas",
-  "sidebar.archived.restore": "Restaurar sesión",
+  "sidebar.settled": "Finalizados",
+  "sidebar.settle": "Finalizar hilo",
+  "sidebar.unsettle": "Reactivar hilo",
+  "sidebar.thread.new": "Nuevo hilo",
+  "sidebar.thread.pin": "Fijar hilo",
+  "sidebar.thread.unpin": "Desfijar hilo",
+  "sidebar.status.working": "Trabajando",
+  "sidebar.status.done": "Listo",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -922,8 +928,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Usa pestañas en la barra de título o una barra lateral persistente",
   "settings.general.row.navigation.tabs": "Pestañas",
   "settings.general.row.navigation.sidebar": "Barra lateral",
-  "settings.general.row.sidebarSessions.title": "Archivar sesiones inactivas después de",
-  "settings.general.row.sidebarSessions.description": "Las sesiones inactivas pasan a Archivadas. Las sesiones activas siguen visibles.",
+  "settings.general.row.sidebarSessions.title": "Finalizar hilos inactivos después de",
+  "settings.general.row.sidebarSessions.description": "Los hilos inactivos pasan a Finalizados. Los hilos activos siguen visibles.",
   "settings.general.row.sidebarSessions.always": "Mostrar siempre",
   "settings.general.row.shell.title": "Shell del terminal",
   "settings.general.row.shell.description": "Shell que usan el terminal y las herramientas del agente",
diff --git a/packages/app/src/i18n/et.ts b/packages/app/src/i18n/et.ts
index bc74ab728832..6a346d2a43d4 100644
--- a/packages/app/src/i18n/et.ts
+++ b/packages/app/src/i18n/et.ts
@@ -872,8 +872,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Tühjenda märguanded",
   "sidebar.empty.title": "Avatud projekte pole",
   "sidebar.empty.description": "Alustamiseks avage projekt",
-  "sidebar.archived": "Arhiveeritud",
-  "sidebar.archived.restore": "Taasta seanss",
+  "sidebar.settled": "Paigutatud",
+  "sidebar.settle": "Paiguta lõim",
+  "sidebar.unsettle": "Taasta lõim",
+  "sidebar.thread.new": "Uus lõim",
+  "sidebar.thread.pin": "Kinnita lõim",
+  "sidebar.thread.unpin": "Eemalda kinnitus",
+  "sidebar.status.working": "Töötab",
+  "sidebar.status.done": "Valmis",
   "debugBar.ariaLabel": "Arendustegevuse diagnostika",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -926,8 +932,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Kasuta tiitliriba vahekaarte või püsivat külgriba",
   "settings.general.row.navigation.tabs": "Vahekaardid",
   "settings.general.row.navigation.sidebar": "Külgriba",
-  "settings.general.row.sidebarSessions.title": "Arhiveeri passiivsed seansid pärast",
-  "settings.general.row.sidebarSessions.description": "Passiivsed seansid liiguvad kausta Arhiveeritud. Aktiivsed seansid jäävad nähtavale.",
+  "settings.general.row.sidebarSessions.title": "Paiguta jõude lõimed pärast",
+  "settings.general.row.sidebarSessions.description": "Jõude lõimed liiguvad paigutatute hulka. Töötavad lõimed jäävad nähtavale.",
   "settings.general.row.sidebarSessions.always": "Kuva alati",
   "settings.general.row.shell.title": "Terminali shell",
   "settings.general.row.shell.description": "Terminali ja agenditööriistade kasutatav shell",
diff --git a/packages/app/src/i18n/fa.ts b/packages/app/src/i18n/fa.ts
index c72ccc1fd53f..b3d1a8729f63 100644
--- a/packages/app/src/i18n/fa.ts
+++ b/packages/app/src/i18n/fa.ts
@@ -875,8 +875,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "پرامپت ها را پاک کنید",
   "sidebar.empty.title": "هیچ پروژه ای باز نشده است",
   "sidebar.empty.description": "برای شروع یک پروژه باز کنید",
-  "sidebar.archived": "آرشیوشده",
-  "sidebar.archived.restore": "بازیابی جلسه",
+  "sidebar.settled": "سامان‌یافته",
+  "sidebar.settle": "سامان دادن رشته",
+  "sidebar.unsettle": "بازگرداندن رشته",
+  "sidebar.thread.new": "رشته جدید",
+  "sidebar.thread.pin": "سنجاق کردن رشته",
+  "sidebar.thread.unpin": "برداشتن سنجاق",
+  "sidebar.status.working": "در حال کار",
+  "sidebar.status.done": "انجام شد",
   "debugBar.ariaLabel": "تشخیص عملکرد توسعه",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -927,8 +933,8 @@ export const dict = {
   "settings.general.row.navigation.description": "از برگه‌های نوار عنوان یا نوار کناری ثابت استفاده کنید",
   "settings.general.row.navigation.tabs": "برگه‌ها",
   "settings.general.row.navigation.sidebar": "نوار کناری",
-  "settings.general.row.sidebarSessions.title": "آرشیو کردن جلسات بیکار پس از",
-  "settings.general.row.sidebarSessions.description": "جلسات بیکار به آرشیوشده منتقل می‌شوند. جلسات در حال کار نمایان می‌مانند.",
+  "settings.general.row.sidebarSessions.title": "سامان دادن رشته‌های غیرفعال پس از",
+  "settings.general.row.sidebarSessions.description": "رشته‌های غیرفعال به سامان‌یافته می‌روند. رشته‌های در حال کار نمایان می‌مانند.",
   "settings.general.row.sidebarSessions.always": "همیشه نمایش بده",
   "settings.general.row.shell.title": "پوسته ترمینال",
   "settings.general.row.shell.description": "پوسته مورد استفاده ترمینال و ابزار عامل",
diff --git a/packages/app/src/i18n/fi.ts b/packages/app/src/i18n/fi.ts
index 684e7d4f6a2d..38d41dbfc059 100644
--- a/packages/app/src/i18n/fi.ts
+++ b/packages/app/src/i18n/fi.ts
@@ -776,8 +776,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Tyhjennä ilmoitukset",
   "sidebar.empty.title": "Ei avoimia projekteja",
   "sidebar.empty.description": "Aloita avaamalla projekti",
-  "sidebar.archived": "Arkistoitu",
-  "sidebar.archived.restore": "Palauta istunto",
+  "sidebar.settled": "Suljetut",
+  "sidebar.settle": "Sulje ketju",
+  "sidebar.unsettle": "Palauta ketju",
+  "sidebar.thread.new": "Uusi ketju",
+  "sidebar.thread.pin": "Kiinnitä ketju",
+  "sidebar.thread.unpin": "Irrota ketju",
+  "sidebar.status.working": "Käynnissä",
+  "sidebar.status.done": "Valmis",
   "debugBar.ariaLabel": "Kehityksen suorituskyvyn diagnostiikka",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -829,8 +835,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Käytä välilehtiä otsikkopalkissa tai pysyvää sivupalkkia",
   "settings.general.row.navigation.tabs": "Välilehdet",
   "settings.general.row.navigation.sidebar": "Sivupalkki",
-  "settings.general.row.sidebarSessions.title": "Arkistoi käyttämättömät istunnot, kun",
-  "settings.general.row.sidebarSessions.description": "Käyttämättömät istunnot siirtyvät kohtaan Arkistoitu. Aktiiviset istunnot pysyvät näkyvissä.",
+  "settings.general.row.sidebarSessions.title": "Sulje joutilaat ketjut ajan jälkeen",
+  "settings.general.row.sidebarSessions.description": "Joutilaat ketjut siirtyvät Suljetut-osioon. Käynnissä olevat ketjut pysyvät näkyvissä.",
   "settings.general.row.sidebarSessions.always": "Näytä aina",
   "settings.general.row.shell.title": "Terminaalin komentotulkki",
   "settings.general.row.shell.description": "Terminaalin ja agenttityökalujen käyttämä komentotulkki",
diff --git a/packages/app/src/i18n/fo.ts b/packages/app/src/i18n/fo.ts
index 4256ca89914c..41ba5ed52587 100644
--- a/packages/app/src/i18n/fo.ts
+++ b/packages/app/src/i18n/fo.ts
@@ -877,8 +877,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Rudda fráboðanir",
   "sidebar.empty.title": "Ongar verkætlanir lata upp",
   "sidebar.empty.description": "Opna eina verkætlan fyri at koma í gongd",
-  "sidebar.archived": "Arkiverað",
-  "sidebar.archived.restore": "Endurstovna setan",
+  "sidebar.settled": "Avgreidd",
+  "sidebar.settle": "Avgreið tráð",
+  "sidebar.unsettle": "Enduropna tráð",
+  "sidebar.thread.new": "Nýggjur tráður",
+  "sidebar.thread.pin": "Festa tráð",
+  "sidebar.thread.unpin": "Losa tráð",
+  "sidebar.status.working": "Arbeiðir",
+  "sidebar.status.done": "Liðugt",
   "debugBar.ariaLabel": "Menningar avriksdiagnostikk",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -929,8 +935,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Brúka flipar í heitinum ella eitt fast síðupanel",
   "settings.general.row.navigation.tabs": "Flipar",
   "settings.general.row.navigation.sidebar": "Síðupanel",
-  "settings.general.row.sidebarSessions.title": "Arkiverað óvirknar setanir eftir",
-  "settings.general.row.sidebarSessions.description": "Óvirknar setanir fara í Arkiverað. Virknar setanir síggjast framhaldandi.",
+  "settings.general.row.sidebarSessions.title": "Avgreið óvirknar tráðir eftir",
+  "settings.general.row.sidebarSessions.description": "Óvirknir tráðir fara í avgreidd. Virknir tráðir haldast sjónligir.",
   "settings.general.row.sidebarSessions.always": "Vís altíð",
   "settings.general.row.shell.title": "Terminal-shell",
   "settings.general.row.shell.description": "Shell, sum terminal- og agenttólini brúka",
diff --git a/packages/app/src/i18n/fr.ts b/packages/app/src/i18n/fr.ts
index 73909c87a858..6842bb1eb25a 100644
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -835,8 +835,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Effacer les notifications",
   "sidebar.empty.title": "Aucun projet ouvert",
   "sidebar.empty.description": "Ouvrez un projet pour commencer",
-  "sidebar.archived": "Archivées",
-  "sidebar.archived.restore": "Restaurer la session",
+  "sidebar.settled": "Classés",
+  "sidebar.settle": "Classer le fil",
+  "sidebar.unsettle": "Rétablir le fil",
+  "sidebar.thread.new": "Nouveau fil",
+  "sidebar.thread.pin": "Épingler le fil",
+  "sidebar.thread.unpin": "Désépingler le fil",
+  "sidebar.status.working": "En cours",
+  "sidebar.status.done": "Terminé",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Application de bureau",
   "settings.section.server": "Serveur",
@@ -857,8 +863,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Utiliser des onglets dans la barre de titre ou une barre latérale permanente",
   "settings.general.row.navigation.tabs": "Onglets",
   "settings.general.row.navigation.sidebar": "Barre latérale",
-  "settings.general.row.sidebarSessions.title": "Archiver les sessions inactives après",
-  "settings.general.row.sidebarSessions.description": "Les sessions inactives passent dans Archivées. Les sessions actives restent visibles.",
+  "settings.general.row.sidebarSessions.title": "Classer les fils inactifs après",
+  "settings.general.row.sidebarSessions.description": "Les fils inactifs sont classés. Les fils en cours restent visibles.",
   "settings.general.row.sidebarSessions.always": "Toujours afficher",
   "settings.general.row.shell.title": "Interpréteur de commandes du terminal",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/hi.ts b/packages/app/src/i18n/hi.ts
index 566004fa3918..ca013c849601 100644
--- a/packages/app/src/i18n/hi.ts
+++ b/packages/app/src/i18n/hi.ts
@@ -886,8 +886,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "सूचनाएँ साफ़ करें",
   "sidebar.empty.title": "कोई प्रोजेक्ट खुला नहीं",
   "sidebar.empty.description": "आरंभ करने के लिए एक प्रोजेक्ट खोलें",
-  "sidebar.archived": "संग्रहित",
-  "sidebar.archived.restore": "सेशन बहाल करें",
+  "sidebar.settled": "निपटाए गए",
+  "sidebar.settle": "थ्रेड निपटाएँ",
+  "sidebar.unsettle": "थ्रेड पुनः सक्रिय करें",
+  "sidebar.thread.new": "नया थ्रेड",
+  "sidebar.thread.pin": "थ्रेड पिन करें",
+  "sidebar.thread.unpin": "पिन हटाएँ",
+  "sidebar.status.working": "कार्य में",
+  "sidebar.status.done": "पूर्ण",
   "debugBar.ariaLabel": "विकास प्रदर्शन निदान",
   "debugBar.na": "एन/ए",
   "debugBar.nav.label": "NAV",
@@ -938,8 +944,8 @@ export const dict = {
   "settings.general.row.navigation.description": "शीर्षक बार में टैब या स्थायी साइडबार का उपयोग करें",
   "settings.general.row.navigation.tabs": "टैब",
   "settings.general.row.navigation.sidebar": "साइडबार",
-  "settings.general.row.sidebarSessions.title": "निष्क्रिय सेशन संग्रहित करें",
-  "settings.general.row.sidebarSessions.description": "निष्क्रिय सेशन संग्रहित में चले जाते हैं। कार्यरत सेशन दिखाई देते रहते हैं।",
+  "settings.general.row.sidebarSessions.title": "निष्क्रिय थ्रेड निपटाने की अवधि",
+  "settings.general.row.sidebarSessions.description": "निष्क्रिय थ्रेड निपटाए गए में चले जाते हैं। सक्रिय थ्रेड दिखाई देते रहते हैं।",
   "settings.general.row.sidebarSessions.always": "हमेशा दिखाएं",
   "settings.general.row.shell.title": "टर्मिनल शेल",
   "settings.general.row.shell.description": "शेल का उपयोग टर्मिनल और एजेंट टूल द्वारा किया जाता है",
diff --git a/packages/app/src/i18n/hr.ts b/packages/app/src/i18n/hr.ts
index b6c4602e074c..a59881c42270 100644
--- a/packages/app/src/i18n/hr.ts
+++ b/packages/app/src/i18n/hr.ts
@@ -885,8 +885,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Očistite obavijesti",
   "sidebar.empty.title": "Nema otvorenih projekata",
   "sidebar.empty.description": "Otvorite projekt da biste započeli",
-  "sidebar.archived": "Arhivirano",
-  "sidebar.archived.restore": "Vrati sesiju",
+  "sidebar.settled": "Odložene",
+  "sidebar.settle": "Odloži nit",
+  "sidebar.unsettle": "Vrati nit",
+  "sidebar.thread.new": "Nova nit",
+  "sidebar.thread.pin": "Prikvači nit",
+  "sidebar.thread.unpin": "Otkvači nit",
+  "sidebar.status.working": "U tijeku",
+  "sidebar.status.done": "Gotovo",
   "debugBar.ariaLabel": "Dijagnostika izvedbe razvoja",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -938,8 +944,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Koristite kartice u naslovnoj traci ili trajnu bočnu traku",
   "settings.general.row.navigation.tabs": "Kartice",
   "settings.general.row.navigation.sidebar": "Bočna traka",
-  "settings.general.row.sidebarSessions.title": "Arhiviraj neaktivne sesije nakon",
-  "settings.general.row.sidebarSessions.description": "Neaktivne sesije idu u Arhivirano. Aktivne sesije ostaju vidljive.",
+  "settings.general.row.sidebarSessions.title": "Odloži neaktivne niti nakon",
+  "settings.general.row.sidebarSessions.description": "Neaktivne niti prelaze u odložene. Aktivne niti ostaju vidljive.",
   "settings.general.row.sidebarSessions.always": "Uvijek prikaži",
   "settings.general.row.shell.title": "Terminal školjka",
   "settings.general.row.shell.description": "Ljuska koju koriste alati terminala i agenta",
diff --git a/packages/app/src/i18n/hu.ts b/packages/app/src/i18n/hu.ts
index 6a0329f6638b..e3389bd1ece1 100644
--- a/packages/app/src/i18n/hu.ts
+++ b/packages/app/src/i18n/hu.ts
@@ -884,8 +884,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Értesítések törlése",
   "sidebar.empty.title": "Nincs nyitott projekt",
   "sidebar.empty.description": "A kezdéshez nyisson meg egy projektet",
-  "sidebar.archived": "Archiválva",
-  "sidebar.archived.restore": "Munkamenet visszaállítása",
+  "sidebar.settled": "Lezárt",
+  "sidebar.settle": "Szál lezárása",
+  "sidebar.unsettle": "Szál visszaállítása",
+  "sidebar.thread.new": "Új szál",
+  "sidebar.thread.pin": "Szál rögzítése",
+  "sidebar.thread.unpin": "Rögzítés feloldása",
+  "sidebar.status.working": "Dolgozik",
+  "sidebar.status.done": "Kész",
   "debugBar.ariaLabel": "Fejlesztési teljesítmény diagnosztika",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -938,8 +944,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Lapok a címsorban vagy rögzített oldalsáv",
   "settings.general.row.navigation.tabs": "Lapok",
   "settings.general.row.navigation.sidebar": "Oldalsáv",
-  "settings.general.row.sidebarSessions.title": "Inaktív munkamenetek archiválása ennyi idő után",
-  "settings.general.row.sidebarSessions.description": "Az inaktív munkamenetek az Archiválva részbe kerülnek. A futó munkamenetek láthatók maradnak.",
+  "settings.general.row.sidebarSessions.title": "Tétlen szálak lezárása ennyi idő után",
+  "settings.general.row.sidebarSessions.description": "A tétlen szálak a lezártak közé kerülnek. A dolgozó szálak láthatók maradnak.",
   "settings.general.row.sidebarSessions.always": "Mindig látszódjon",
   "settings.general.row.shell.title": "Terminál shellje",
   "settings.general.row.shell.description": "A terminál és az ügynökeszközök által használt shell",
diff --git a/packages/app/src/i18n/hy.ts b/packages/app/src/i18n/hy.ts
index 3b0c430ecc46..537c2c6cc98f 100644
--- a/packages/app/src/i18n/hy.ts
+++ b/packages/app/src/i18n/hy.ts
@@ -883,8 +883,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Մաքրել ծանուցումները",
   "sidebar.empty.title": "Ոչ մի նախագիծ բաց",
   "sidebar.empty.description": "Բացեք նախագիծ՝ սկսելու համար",
-  "sidebar.archived": "Արխիվացված",
-  "sidebar.archived.restore": "Վերականգնել նիստը",
+  "sidebar.settled": "Կարգավորված",
+  "sidebar.settle": "Թելը կարգավորել",
+  "sidebar.unsettle": "Թելը վերականգնել",
+  "sidebar.thread.new": "Նոր թել",
+  "sidebar.thread.pin": "Թելը գամել",
+  "sidebar.thread.unpin": "Գամը հանել",
+  "sidebar.status.working": "Աշխատում է",
+  "sidebar.status.done": "Պատրաստ է",
   "debugBar.ariaLabel": "Զարգացման կատարողականի ախտորոշում",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -937,8 +943,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Օգտագործեք ներդիրներ վերնագրի տողում կամ մշտական կողային վահանակ",
   "settings.general.row.navigation.tabs": "Ներդիրներ",
   "settings.general.row.navigation.sidebar": "Կողային վահանակ",
-  "settings.general.row.sidebarSessions.title": "Արխիվացնել անգործուն նիստերը՝",
-  "settings.general.row.sidebarSessions.description": "Անգործուն նիստերը տեղափոխվում են Արխիվացված։ Աշխատող նիստերը մնում են տեսանելի։",
+  "settings.general.row.sidebarSessions.title": "Ոչ ակտիվ թելերը կարգավորելու ժամկետ",
+  "settings.general.row.sidebarSessions.description": "Ոչ ակտիվ թելերը տեղափոխվում են կարգավորվածներ։ Աշխատող թելերը մնում են տեսանելի։",
   "settings.general.row.sidebarSessions.always": "Միշտ ցուցադրել",
   "settings.general.row.shell.title": "Տերմինալի Shell",
   "settings.general.row.shell.description": "Shell-ն օգտագործվում է տերմինալի և գործակալի գործիքների կողմից",
diff --git a/packages/app/src/i18n/id.ts b/packages/app/src/i18n/id.ts
index c37c02ddc2d7..67763cdda14d 100644
--- a/packages/app/src/i18n/id.ts
+++ b/packages/app/src/i18n/id.ts
@@ -953,8 +953,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Hapus notifikasi",
   "sidebar.empty.title": "Tidak ada proyek terbuka",
   "sidebar.empty.description": "Buka proyek untuk memulai",
-  "sidebar.archived": "Diarsipkan",
-  "sidebar.archived.restore": "Pulihkan sesi",
+  "sidebar.settled": "Diselesaikan",
+  "sidebar.settle": "Selesaikan thread",
+  "sidebar.unsettle": "Pulihkan thread",
+  "sidebar.thread.new": "Thread baru",
+  "sidebar.thread.pin": "Sematkan thread",
+  "sidebar.thread.unpin": "Lepaskan sematan",
+  "sidebar.status.working": "Sedang bekerja",
+  "sidebar.status.done": "Selesai",
 
   "debugBar.ariaLabel": "Diagnostik kinerja pengembangan",
   "debugBar.na": "n/a",
@@ -1010,8 +1016,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Gunakan tab di bilah judul atau bilah sisi tetap",
   "settings.general.row.navigation.tabs": "Tab",
   "settings.general.row.navigation.sidebar": "Bilah sisi",
-  "settings.general.row.sidebarSessions.title": "Arsipkan sesi tak aktif setelah",
-  "settings.general.row.sidebarSessions.description": "Sesi tak aktif dipindahkan ke Diarsipkan. Sesi yang bekerja tetap terlihat.",
+  "settings.general.row.sidebarSessions.title": "Selesaikan thread menganggur setelah",
+  "settings.general.row.sidebarSessions.description": "Thread menganggur pindah ke Diselesaikan. Thread yang bekerja tetap terlihat.",
   "settings.general.row.sidebarSessions.always": "Selalu tampilkan",
   "settings.general.row.shell.title": "Shell terminal",
   "settings.general.row.shell.description": "Shell yang digunakan oleh terminal dan alat agen",
diff --git a/packages/app/src/i18n/is.ts b/packages/app/src/i18n/is.ts
index 9fd4742d29d1..de63063596fe 100644
--- a/packages/app/src/i18n/is.ts
+++ b/packages/app/src/i18n/is.ts
@@ -880,8 +880,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Hreinsaðu tilkynningar",
   "sidebar.empty.title": "Engin verkefni opin",
   "sidebar.empty.description": "Opnaðu verkefni til að byrja",
-  "sidebar.archived": "Geymt",
-  "sidebar.archived.restore": "Endurheimta setu",
+  "sidebar.settled": "Frágengin",
+  "sidebar.settle": "Fráganga þráð",
+  "sidebar.unsettle": "Enduropna þráð",
+  "sidebar.thread.new": "Nýr þráður",
+  "sidebar.thread.pin": "Festa þráð",
+  "sidebar.thread.unpin": "Losa þráð",
+  "sidebar.status.working": "Í vinnslu",
+  "sidebar.status.done": "Lokið",
   "debugBar.ariaLabel": "Þróunarárangursgreiningar",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -932,8 +938,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Nota flipa í titilstiku eða varanlega hliðarstiku",
   "settings.general.row.navigation.tabs": "Flipar",
   "settings.general.row.navigation.sidebar": "Hliðarstika",
-  "settings.general.row.sidebarSessions.title": "Geyma óvirkar setur eftir",
-  "settings.general.row.sidebarSessions.description": "Óvirkar setur færast í Geymt. Virkar setur haldast sýnilegar.",
+  "settings.general.row.sidebarSessions.title": "Fráganga óvirkja þræði eftir",
+  "settings.general.row.sidebarSessions.description": "Óvirkir þræði fara í frágengin. Virkir þræði haldast sýnilegir.",
   "settings.general.row.sidebarSessions.always": "Sýna alltaf",
   "settings.general.row.shell.title": "Skel skjáhermis",
   "settings.general.row.shell.description": "Skelin sem skjáhermirinn og verkfæri fulltrúans nota",
diff --git a/packages/app/src/i18n/it.ts b/packages/app/src/i18n/it.ts
index cdc14e3faba7..2bb69f929ae4 100644
--- a/packages/app/src/i18n/it.ts
+++ b/packages/app/src/i18n/it.ts
@@ -796,8 +796,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Cancella notifiche",
   "sidebar.empty.title": "Nessun progetto aperto",
   "sidebar.empty.description": "Apri un progetto per iniziare",
-  "sidebar.archived": "Archiviate",
-  "sidebar.archived.restore": "Ripristina sessione",
+  "sidebar.settled": "Sistemati",
+  "sidebar.settle": "Sistema il thread",
+  "sidebar.unsettle": "Ripristina il thread",
+  "sidebar.thread.new": "Nuovo thread",
+  "sidebar.thread.pin": "Fissa il thread",
+  "sidebar.thread.unpin": "Rimuovi fissaggio",
+  "sidebar.status.working": "In lavorazione",
+  "sidebar.status.done": "Fatto",
   "debugBar.ariaLabel": "Diagnostica delle prestazioni di sviluppo",
   "debugBar.na": "n/d",
   "debugBar.nav.label": "NAV",
@@ -850,8 +856,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Usa schede nella barra del titolo o una barra laterale fissa",
   "settings.general.row.navigation.tabs": "Schede",
   "settings.general.row.navigation.sidebar": "Barra laterale",
-  "settings.general.row.sidebarSessions.title": "Archivia sessioni inattive dopo",
-  "settings.general.row.sidebarSessions.description": "Le sessioni inattive passano in Archiviate. Le sessioni attive restano visibili.",
+  "settings.general.row.sidebarSessions.title": "Sistema i thread inattivi dopo",
+  "settings.general.row.sidebarSessions.description": "I thread inattivi passano a Sistemati. I thread in lavorazione restano visibili.",
   "settings.general.row.sidebarSessions.always": "Mostra sempre",
   "settings.general.row.shell.title": "Shell del terminale",
   "settings.general.row.shell.description": "Shell utilizzata dal terminale e dagli strumenti dell'agente",
diff --git a/packages/app/src/i18n/ja.ts b/packages/app/src/i18n/ja.ts
index 23f7599bcd3b..eb1664510422 100644
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -815,8 +815,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "通知をクリア",
   "sidebar.empty.title": "開いているプロジェクトはありません",
   "sidebar.empty.description": "プロジェクトを開いて始めましょう",
-  "sidebar.archived": "アーカイブ済み",
-  "sidebar.archived.restore": "セッションを復元",
+  "sidebar.settled": "整理済み",
+  "sidebar.settle": "スレッドを整理",
+  "sidebar.unsettle": "スレッドを復元",
+  "sidebar.thread.new": "新しいスレッド",
+  "sidebar.thread.pin": "スレッドをピン留め",
+  "sidebar.thread.unpin": "ピン留めを解除",
+  "sidebar.status.working": "作業中",
+  "sidebar.status.done": "完了",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "デスクトップ",
   "settings.section.server": "サーバー",
@@ -837,8 +843,8 @@ export const dict = {
   "settings.general.row.navigation.description": "タイトルバーのタブまたは常時表示のサイドバーを使用します",
   "settings.general.row.navigation.tabs": "タブ",
   "settings.general.row.navigation.sidebar": "サイドバー",
-  "settings.general.row.sidebarSessions.title": "アーカイブするまでのアイドル時間",
-  "settings.general.row.sidebarSessions.description": "アーカイブ済みに移動します。作業中のセッションは表示されたままです。",
+  "settings.general.row.sidebarSessions.title": "無操作のスレッドを整理するまでの期間",
+  "settings.general.row.sidebarSessions.description": "無操作のスレッドは整理済みに移動します。作業中のスレッドは表示されたままです。",
   "settings.general.row.sidebarSessions.always": "常に表示",
   "settings.general.row.shell.title": "ターミナルシェル",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/ka.ts b/packages/app/src/i18n/ka.ts
index 4fa2d3bc01c4..a3a71900268f 100644
--- a/packages/app/src/i18n/ka.ts
+++ b/packages/app/src/i18n/ka.ts
@@ -876,8 +876,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "შეტყობინებების გასუფთავება",
   "sidebar.empty.title": "პროექტები არ არის გახსნილი",
   "sidebar.empty.description": "გახსენით პროექტი დასაწყებად",
-  "sidebar.archived": "დაარქივებული",
-  "sidebar.archived.restore": "სესიის აღდგენა",
+  "sidebar.settled": "მოწესრიგებული",
+  "sidebar.settle": "თემის მოწესრიგება",
+  "sidebar.unsettle": "თემის აღდგენა",
+  "sidebar.thread.new": "ახალი თემა",
+  "sidebar.thread.pin": "თემის მიმაგრება",
+  "sidebar.thread.unpin": "მიმაგრების მოხსნა",
+  "sidebar.status.working": "მუშაობს",
+  "sidebar.status.done": "შესრულდა",
   "debugBar.ariaLabel": "განვითარების შესრულების დიაგნოსტიკა",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -929,8 +935,8 @@ export const dict = {
   "settings.general.row.navigation.description": "გამოიყენეთ ჩანართები სათაურის ზოლში ან მუდმივი გვერდითი პანელი",
   "settings.general.row.navigation.tabs": "ჩანართები",
   "settings.general.row.navigation.sidebar": "გვერდითი პანელი",
-  "settings.general.row.sidebarSessions.title": "უქმი სესიების დაარქივება",
-  "settings.general.row.sidebarSessions.description": "უქმი სესიები გადაინაცვლებს დაარქივებულში. მოქმედი სესიები რჩება ხილული.",
+  "settings.general.row.sidebarSessions.title": "უმოქმედო თემების მოწესრიგების ვადა",
+  "settings.general.row.sidebarSessions.description": "უმოქმედო თემები გადადის მოწესრიგებულებში. მომუშავე თემები ხილული რჩება.",
   "settings.general.row.sidebarSessions.always": "ყოველთვის ჩვენება",
   "settings.general.row.shell.title": "ტერმინალის გარსი",
   "settings.general.row.shell.description": "Shell გამოიყენება ტერმინალის და აგენტის ხელსაწყოების მიერ",
diff --git a/packages/app/src/i18n/km.ts b/packages/app/src/i18n/km.ts
index 040374efa54b..8aa14d58e9bd 100644
--- a/packages/app/src/i18n/km.ts
+++ b/packages/app/src/i18n/km.ts
@@ -873,8 +873,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "ជម្រះការជូនដំណឹង",
   "sidebar.empty.title": "គ្មានគម្រោងបើកទេ។",
   "sidebar.empty.description": "បើកគម្រោងដើម្បីចាប់ផ្តើម",
-  "sidebar.archived": "បានបណ្ណសារ",
-  "sidebar.archived.restore": "ស្តារសម័យ",
+  "sidebar.settled": "បានសម្រាក",
+  "sidebar.settle": "សម្រាកសន្ទនា",
+  "sidebar.unsettle": "ដកការសម្រាកសន្ទនា",
+  "sidebar.thread.new": "សន្ទនាថ្មី",
+  "sidebar.thread.pin": "ខ្ទាស់សន្ទនា",
+  "sidebar.thread.unpin": "ដកខ្ទាស់សន្ទនា",
+  "sidebar.status.working": "កំពុងធ្វើការ",
+  "sidebar.status.done": "រួចរាល់",
   "debugBar.ariaLabel": "ការវិនិច្ឆ័យដំណើរការអភិវឌ្ឍន៍",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -927,8 +933,8 @@ export const dict = {
   "settings.general.row.navigation.description": "ប្រើផ្ទាំងក្នុងរបារចំណងជើង ឬរបារចំហៀងអចិន្ត្រៃយ៍",
   "settings.general.row.navigation.tabs": "ផ្ទាំង",
   "settings.general.row.navigation.sidebar": "របារចំហៀង",
-  "settings.general.row.sidebarSessions.title": "បណ្ណសារសម័យដែលមិនដំណើរការបន្ទាប់ពី",
-  "settings.general.row.sidebarSessions.description": "សម័យដែលមិនដំណើរការត្រូវផ្លាស់ទៅ បានបណ្ណសារ។ សម័យដែលកំពុងដំណើរការនៅបង្ហាញ។",
+  "settings.general.row.sidebarSessions.title": "សម្រាកសន្ទនាដែលស្ងាត់បន្ទាប់ពី",
+  "settings.general.row.sidebarSessions.description": "សន្ទនាដែលស្ងាត់នឹងផ្លាស់ទៅកន្លែងសម្រាក។ សន្ទនាដែលកំពុងធ្វើការនៅតែបង្ហាញ។",
   "settings.general.row.sidebarSessions.always": "បង្ហាញជានិច្ច",
   "settings.general.row.shell.title": "សែលស្ថានីយ",
   "settings.general.row.shell.description": "សែលប្រើដោយឧបករណ៍ស្ថានីយ និងភ្នាក់ងារ",
diff --git a/packages/app/src/i18n/ko.ts b/packages/app/src/i18n/ko.ts
index e4812c006363..ccff8e364a82 100644
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -595,8 +595,8 @@ export const dict = {
   "settings.general.row.navigation.description": "제목 표시줄 탭 또는 고정 사이드바 사용",
   "settings.general.row.navigation.tabs": "탭",
   "settings.general.row.navigation.sidebar": "사이드바",
-  "settings.general.row.sidebarSessions.title": "유휴 세션 보관 기준",
-  "settings.general.row.sidebarSessions.description": "유휴 세션은 보관됨으로 이동합니다. 작업 중인 세션은 계속 표시됩니다.",
+  "settings.general.row.sidebarSessions.title": "유휴 스레드 정리 기준 시간",
+  "settings.general.row.sidebarSessions.description": "유휴 스레드는 정리됨으로 이동합니다. 작업 중인 스레드는 계속 표시됩니다.",
   "settings.general.row.sidebarSessions.always": "항상 표시",
   "settings.general.row.appearance.title": "모양",
   "settings.general.row.appearance.description": "기기에서 OpenCode가 보이는 방식 사용자 지정",
@@ -1022,8 +1022,14 @@ export const dict = {
 
   "sidebar.empty.title": "열린 프로젝트 없음",
   "sidebar.empty.description": "프로젝트를 열어 시작하세요",
-  "sidebar.archived": "보관됨",
-  "sidebar.archived.restore": "세션 복원",
+  "sidebar.settled": "정리됨",
+  "sidebar.settle": "스레드 정리",
+  "sidebar.unsettle": "스레드 복원",
+  "sidebar.thread.new": "새 스레드",
+  "sidebar.thread.pin": "스레드 고정",
+  "sidebar.thread.unpin": "스레드 고정 해제",
+  "sidebar.status.working": "작업 중",
+  "sidebar.status.done": "완료",
 
   "settings.general.section.advanced": "고급",
   "settings.general.row.shell.title": "터미널 셸",
diff --git a/packages/app/src/i18n/lo.ts b/packages/app/src/i18n/lo.ts
index c6719dde88b9..02eab838a73b 100644
--- a/packages/app/src/i18n/lo.ts
+++ b/packages/app/src/i18n/lo.ts
@@ -871,8 +871,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "ລຶບການແຈ້ງເຕືອນ",
   "sidebar.empty.title": "ບໍ່ມີໂຄງການເປີດ",
   "sidebar.empty.description": "ເປີດໂຄງການເພື່ອເລີ່ມຕົ້ນ",
-  "sidebar.archived": "ຈັດເກັບແລ້ວ",
-  "sidebar.archived.restore": "ກູ້ຄືນເຊດຊັນ",
+  "sidebar.settled": "ທີ່ພັກໄວ້",
+  "sidebar.settle": "ພັກເຣັດ",
+  "sidebar.unsettle": "ຍົກເລີກການພັກເຣັດ",
+  "sidebar.thread.new": "ເຣັດໃໝ່",
+  "sidebar.thread.pin": "ປັກໝຸດເຣັດ",
+  "sidebar.thread.unpin": "ຍົກເລີກການປັກໝຸດ",
+  "sidebar.status.working": "ກຳລັງເຮັດວຽກ",
+  "sidebar.status.done": "ສຳເລັດ",
   "debugBar.ariaLabel": "ການວິນິດໄສປະສິດທິພາບການພັດທະນາ",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -924,8 +930,8 @@ export const dict = {
   "settings.general.row.navigation.description": "ໃຊ້ແຖບຢູ່ແຖບຫົວຂໍ້ ຫຼືແຖບດ້ານຂ້າງຖາວອນ",
   "settings.general.row.navigation.tabs": "ແຖບ",
   "settings.general.row.navigation.sidebar": "ແຖບດ້ານຂ້າງ",
-  "settings.general.row.sidebarSessions.title": "ຈັດເກັບເຊດຊັນທີ່ບໍ່ໃຊ້ງານຫຼັງຈາກ",
-  "settings.general.row.sidebarSessions.description": "ເຊດຊັນທີ່ບໍ່ໃຊ້ງານຈະຍ້າຍໄປ ຈັດເກັບແລ້ວ. ເຊດຊັນທີ່ກຳລັງເຮັດວຽກຍັງສະແດງຢູ່.",
+  "settings.general.row.sidebarSessions.title": "ພັກເຣັດທີ່ງຽບຫຼັງຈາກ",
+  "settings.general.row.sidebarSessions.description": "ເຣັດທີ່ງຽບຈະຍ້າຍໄປທີ່ພັກໄວ້. ເັດທີ່ກລັງເຮັດວຽກຍັງສະແດງຢູ່.",
   "settings.general.row.sidebarSessions.always": "ສະແດງສະເໝີ",
   "settings.general.row.shell.title": "Shell ຂອງເທີມິນອນ",
   "settings.general.row.shell.description": "Shell ທີ່ໃຊ້ໂດຍເຄື່ອງໃຊ້ປາຍທາງ ແລະຕົວແທນ",
diff --git a/packages/app/src/i18n/lt.ts b/packages/app/src/i18n/lt.ts
index b226326622a3..1988c32ac031 100644
--- a/packages/app/src/i18n/lt.ts
+++ b/packages/app/src/i18n/lt.ts
@@ -890,8 +890,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Išvalyti pranešimus",
   "sidebar.empty.title": "Jokių atvirų projektų",
   "sidebar.empty.description": "Norėdami pradėti, atidarykite projektą",
-  "sidebar.archived": "Archyvuota",
-  "sidebar.archived.restore": "Atkurti seansą",
+  "sidebar.settled": "Sutvarkytos",
+  "sidebar.settle": "Sutvarkyti giją",
+  "sidebar.unsettle": "Atkurti giją",
+  "sidebar.thread.new": "Nauja gija",
+  "sidebar.thread.pin": "Prisegti giją",
+  "sidebar.thread.unpin": "Atsegti giją",
+  "sidebar.status.working": "Veikia",
+  "sidebar.status.done": "Atlikta",
   "debugBar.ariaLabel": "Vystymosi veiklos diagnostika",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -944,8 +950,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Naudoti skirtukus pavadinimo juostoje arba nuolatinę šoninę juostą",
   "settings.general.row.navigation.tabs": "Skirtukai",
   "settings.general.row.navigation.sidebar": "Šoninė juosta",
-  "settings.general.row.sidebarSessions.title": "Archyvuoti neveiklius seansus po",
-  "settings.general.row.sidebarSessions.description": "Neveiklūs seansai perkeliami į Archyvuota. Aktyvūs seansai lieka matomi.",
+  "settings.general.row.sidebarSessions.title": "Sutvarkyti neveiklias gijas po",
+  "settings.general.row.sidebarSessions.description": "Neveiklios gijos perkeliamos į sutvarkytas. Veikiančios gijos lieka matomos.",
   "settings.general.row.sidebarSessions.always": "Visada rodyti",
   "settings.general.row.shell.title": "Terminalo apvalkalas",
   "settings.general.row.shell.description": "Terminalo ir agento įrankių naudojamas apvalkalas",
diff --git a/packages/app/src/i18n/lv.ts b/packages/app/src/i18n/lv.ts
index cb0a1ef4b834..0c8e8cae0e41 100644
--- a/packages/app/src/i18n/lv.ts
+++ b/packages/app/src/i18n/lv.ts
@@ -882,8 +882,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Notīrīt paziņojumus",
   "sidebar.empty.title": "Nav atvērts neviens projekts",
   "sidebar.empty.description": "Atveriet projektu, lai sāktu",
-  "sidebar.archived": "Arhivētas",
-  "sidebar.archived.restore": "Atjaunot sesiju",
+  "sidebar.settled": "Nokārtotās",
+  "sidebar.settle": "Nokārtot pavedienu",
+  "sidebar.unsettle": "Atjaunot pavedienu",
+  "sidebar.thread.new": "Jauns pavediens",
+  "sidebar.thread.pin": "Piespraust pavedienu",
+  "sidebar.thread.unpin": "Atspraust pavedienu",
+  "sidebar.status.working": "Strādā",
+  "sidebar.status.done": "Gatavs",
   "debugBar.ariaLabel": "Izstrādes veiktspējas diagnostika",
   "debugBar.na": "nav",
   "debugBar.nav.label": "NAV",
@@ -935,8 +941,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Izmantot cilnes virsraksta joslā vai pastāvīgu sānjoslu",
   "settings.general.row.navigation.tabs": "Cilnes",
   "settings.general.row.navigation.sidebar": "Sānjosla",
-  "settings.general.row.sidebarSessions.title": "Arhivēt neaktīvas sesijas pēc",
-  "settings.general.row.sidebarSessions.description": "Neaktīvas sesijas tiek pārvietotas uz Arhivētas. Aktīvas sesijas paliek redzamas.",
+  "settings.general.row.sidebarSessions.title": "Nokārtot neaktīvos pavedienus pēc",
+  "settings.general.row.sidebarSessions.description": "Neaktīvie pavedieni pāriet uz nokārtotajiem. Strādājošie pavedieni paliek redzami.",
   "settings.general.row.sidebarSessions.always": "Rādīt vienmēr",
   "settings.general.row.shell.title": "Termināļa čaula",
   "settings.general.row.shell.description": "Čaula, ko izmanto terminālis un aģenta rīki",
diff --git a/packages/app/src/i18n/mk.ts b/packages/app/src/i18n/mk.ts
index 8c7f3231ec1b..61912b716156 100644
--- a/packages/app/src/i18n/mk.ts
+++ b/packages/app/src/i18n/mk.ts
@@ -880,8 +880,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Исчистете ги известувањата",
   "sidebar.empty.title": "Нема отворени проекти",
   "sidebar.empty.description": "Отворете проект за да започнете",
-  "sidebar.archived": "Архивирани",
-  "sidebar.archived.restore": "Врати сесија",
+  "sidebar.settled": "Одложени",
+  "sidebar.settle": "Одложи нишка",
+  "sidebar.unsettle": "Врати нишка",
+  "sidebar.thread.new": "Нова нишка",
+  "sidebar.thread.pin": "Прикачи нишка",
+  "sidebar.thread.unpin": "Откачи нишка",
+  "sidebar.status.working": "Во тек",
+  "sidebar.status.done": "Готово",
   "debugBar.ariaLabel": "Дијагностика на перформансите на развојот",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -934,8 +940,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Користете картички во насловната лента или постојана странична лента",
   "settings.general.row.navigation.tabs": "Картички",
   "settings.general.row.navigation.sidebar": "Странична лента",
-  "settings.general.row.sidebarSessions.title": "Архивирај неактивни сесии по",
-  "settings.general.row.sidebarSessions.description": "Неактивните сесии одат во Архивирани. Активните сесии остануваат видливи.",
+  "settings.general.row.sidebarSessions.title": "Одложи неактивни нишки по",
+  "settings.general.row.sidebarSessions.description": "Неактивните нишки преминуваат во одложени. Активните нишки остануваат видливи.",
   "settings.general.row.sidebarSessions.always": "Секогаш прикажувај",
   "settings.general.row.shell.title": "Терминал shell",
   "settings.general.row.shell.description": "Школката ја користат алатките за терминал и агент",
diff --git a/packages/app/src/i18n/mn.ts b/packages/app/src/i18n/mn.ts
index e2d7344b97d4..314937f90926 100644
--- a/packages/app/src/i18n/mn.ts
+++ b/packages/app/src/i18n/mn.ts
@@ -884,8 +884,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Мэдэгдлийг арилгах",
   "sidebar.empty.title": "Нээлттэй төсөл байхгүй",
   "sidebar.empty.description": "Эхлэхийн тулд төсөл нээнэ үү",
-  "sidebar.archived": "Архивласан",
-  "sidebar.archived.restore": "Сесс сэргээх",
+  "sidebar.settled": "Намссан",
+  "sidebar.settle": "Хэлэлцүүлгийг намсаах",
+  "sidebar.unsettle": "Хэлэлцүүлгийг сэргээх",
+  "sidebar.thread.new": "Шинэ хэлэлцүүлэг",
+  "sidebar.thread.pin": "Хэлэлцүүлгийг зүүэх",
+  "sidebar.thread.unpin": "Зүүсийг авах",
+  "sidebar.status.working": "Ажиллаж байна",
+  "sidebar.status.done": "Дууссан",
   "debugBar.ariaLabel": "Хөгжлийн гүйцэтгэлийн оношлогоо",
   "debugBar.na": "үгүй",
   "debugBar.nav.label": "NAV",
@@ -937,8 +943,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Гарчгийн мөрөнд таб ашиглах эсвэл байнгын хажуу самбар",
   "settings.general.row.navigation.tabs": "Табууд",
   "settings.general.row.navigation.sidebar": "Хажуу самбар",
-  "settings.general.row.sidebarSessions.title": "Идэвхгүй сессийг архивлах хугацаа",
-  "settings.general.row.sidebarSessions.description": "Идэвхгүй сессүүд Архивласан руу шилжинэ. Ажиллаж буй сессүүд харагдсаар байна.",
+  "settings.general.row.sidebarSessions.title": "Идэвхгүй хэлэлцүүлгийг намсаах хугацаа",
+  "settings.general.row.sidebarSessions.description": "Идэвхгүй хэлэлцүүлэг намссан руу шилжинэ. Ажиллаж буй хэлэлцүүлэг харагдсаар байна.",
   "settings.general.row.sidebarSessions.always": "Үргэлж харуулах",
   "settings.general.row.shell.title": "Терминал shell",
   "settings.general.row.shell.description": "Shell нь терминал болон агентын хэрэгслүүдэд ашиглагддаг",
diff --git a/packages/app/src/i18n/ms.ts b/packages/app/src/i18n/ms.ts
index 3412fd548800..341dcfa8c38e 100644
--- a/packages/app/src/i18n/ms.ts
+++ b/packages/app/src/i18n/ms.ts
@@ -876,8 +876,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Kosongkan notifikasi",
   "sidebar.empty.title": "Tiada projek dibuka",
   "sidebar.empty.description": "Buka projek untuk bermula",
-  "sidebar.archived": "Diarkibkan",
-  "sidebar.archived.restore": "Pulihkan sesi",
+  "sidebar.settled": "Selesai",
+  "sidebar.settle": "Selesaikan bebenang",
+  "sidebar.unsettle": "Pulihkan bebenang",
+  "sidebar.thread.new": "Bebenang baharu",
+  "sidebar.thread.pin": "Sematkan bebenang",
+  "sidebar.thread.unpin": "Nyahsematkan bebenang",
+  "sidebar.status.working": "Sedang bekerja",
+  "sidebar.status.done": "Siap",
   "debugBar.ariaLabel": "Diagnostik prestasi pembangunan",
   "debugBar.na": "tiada",
   "debugBar.nav.label": "NAV",
@@ -929,8 +935,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Guna tab pada bar tajuk atau bar sisi kekal",
   "settings.general.row.navigation.tabs": "Tab",
   "settings.general.row.navigation.sidebar": "Bar sisi",
-  "settings.general.row.sidebarSessions.title": "Arkibkan sesi tidak aktif selepas",
-  "settings.general.row.sidebarSessions.description": "Sesi tidak aktif dialihkan ke Diarkibkan. Sesi sedang berjalan kekal kelihatan.",
+  "settings.general.row.sidebarSessions.title": "Selesaikan bebenang terbiar selepas",
+  "settings.general.row.sidebarSessions.description": "Bebenang terbiar berpindah ke Selesai. Bebenang yang bekerja kekal kelihatan.",
   "settings.general.row.sidebarSessions.always": "Sentiasa tunjuk",
   "settings.general.row.shell.title": "Shell terminal",
   "settings.general.row.shell.description": "Shell yang digunakan oleh terminal dan alat ejen",
diff --git a/packages/app/src/i18n/my.ts b/packages/app/src/i18n/my.ts
index a3e9bc33b1f6..aa9c82bcac5d 100644
--- a/packages/app/src/i18n/my.ts
+++ b/packages/app/src/i18n/my.ts
@@ -886,8 +886,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "အကြောင်းကြားချက်များကို ရှင်းလင်းပါ။",
   "sidebar.empty.title": "မည်သည့်ပရောဂျက်မှ ဖွင့်ထားခြင်းမရှိပါ။",
   "sidebar.empty.description": "စတင်ရန် ပရောဂျက်တစ်ခုကို ဖွင့်ပါ။",
-  "sidebar.archived": "သိမ်းဆည်းပြီး",
-  "sidebar.archived.restore": "စက်ရှင် ပြန်လည်ရယူရန်",
+  "sidebar.settled": "အနားယူထားသည်",
+  "sidebar.settle": "ဆွေးနွေးမှုကို အနားယူစေ",
+  "sidebar.unsettle": "အနားယူခြင်းကို ပယ်ဖျက်",
+  "sidebar.thread.new": "ဆွေးနွေးမှုအသစ်",
+  "sidebar.thread.pin": "ဆွေးနွေးမှုကို ပင်ထိုး",
+  "sidebar.thread.unpin": "ပင်ထိုးခြင်းကို ဖယ်ရှား",
+  "sidebar.status.working": "လုပ်ဆောင်နေသည်",
+  "sidebar.status.done": "ပြီးစီး",
   "debugBar.ariaLabel": "ဖွံ့ဖြိုးတိုးတက်မှု စွမ်းဆောင်ရည် အဖြေရှာခြင်း",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -942,8 +948,8 @@ export const dict = {
   "settings.general.row.navigation.description": "ခေါင်းစီးတန်းတွင် တဘ်များ သို့မဟုတ် အမြဲတမ်း ဘေးတန်း သုံးပါ",
   "settings.general.row.navigation.tabs": "တဘ်များ",
   "settings.general.row.navigation.sidebar": "ဘေးတန်း",
-  "settings.general.row.sidebarSessions.title": "အသုံးမပြုသော စက်ရှင်များကို သိမ်းဆည်းရန်",
-  "settings.general.row.sidebarSessions.description": "အသုံးမပြုသော စက်ရှင်များသည် သိမ်းဆည်းပြီး သို့ ရွှေ့သွားသည်။ လုပ်ဆောင်နေသော စက်ရှင်များ မြင်ရဆဲဖြစ်သည်။",
+  "settings.general.row.sidebarSessions.title": "အသုံးမပြုသော ဆွေးနွေးမှုများ အနားယူစေရန် အချိန်",
+  "settings.general.row.sidebarSessions.description": "အသုံးမပြုသော ဆွေးနွေးမှုများသည် အနားယူထားသည်ထဲသို့ ရွှေ့မည်။ လုပ်ဆောင်နေသော ဆွေးနွေးမှုများ ဆက်ပြနေမည်။",
   "settings.general.row.sidebarSessions.always": "အမြဲပြသ",
   "settings.general.row.shell.title": "Terminal Shell",
   "settings.general.row.shell.description": "terminal နှင့် agent tools မှအသုံးပြုသော Shell",
diff --git a/packages/app/src/i18n/ne.ts b/packages/app/src/i18n/ne.ts
index 42e358cbb26a..fdde12508b26 100644
--- a/packages/app/src/i18n/ne.ts
+++ b/packages/app/src/i18n/ne.ts
@@ -877,8 +877,14 @@ export const dict: Record<string, string> = {
   "sidebar.project.clearNotifications": "सूचनाहरू खाली गर्नुहोस्",
   "sidebar.empty.title": "कुनै पनि आयोजना खुलेका छैनन्",
   "sidebar.empty.description": "सुरु गर्न एउटा परियोजना खोल्नुहोस्",
-  "sidebar.archived": "अभिलेखित",
-  "sidebar.archived.restore": "सत्र पुनर्स्थापना",
+  "sidebar.settled": "टुंग्याइएका",
+  "sidebar.settle": "थ्रेड टुंग्याउनुहोस्",
+  "sidebar.unsettle": "थ्रेड पुनः खोल्नुहोस्",
+  "sidebar.thread.new": "नयाँ थ्रेड",
+  "sidebar.thread.pin": "थ्रेड पिन गर्नुहोस्",
+  "sidebar.thread.unpin": "पिन हटाउनुहोस्",
+  "sidebar.status.working": "काम हुँदै",
+  "sidebar.status.done": "सम्पन्न",
   "debugBar.ariaLabel": "विकास प्रदर्शन निदान",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -929,8 +935,8 @@ export const dict: Record<string, string> = {
   "settings.general.row.navigation.description": "शीर्षक पट्टीमा ट्याब वा स्थायी साइडबार प्रयोग गर्नुहोस्",
   "settings.general.row.navigation.tabs": "ट्याबहरू",
   "settings.general.row.navigation.sidebar": "साइडबार",
-  "settings.general.row.sidebarSessions.title": "निष्क्रिय सत्र अभिलेखन गर्ने समय",
-  "settings.general.row.sidebarSessions.description": "निष्क्रिय सत्र अभिलेखितमा सर्छन्। कार्यरत सत्र देखिरहन्छन्।",
+  "settings.general.row.sidebarSessions.title": "निष्क्रिय थ्रेड टुंग्याउने समय",
+  "settings.general.row.sidebarSessions.description": "निष्क्रिय थ्रेड टुंग्याइएका मा जान्छन्। काम भइरहेका थ्रेड देखि रहन्छन्।",
   "settings.general.row.sidebarSessions.always": "सधैँ देखाउनुहोस्",
   "settings.general.row.shell.title": "टर्मिनल शेल",
   "settings.general.row.shell.description": "टर्मिनल र एजेन्ट उपकरणहरू द्वारा प्रयोग गरिएको शेल",
diff --git a/packages/app/src/i18n/nl.ts b/packages/app/src/i18n/nl.ts
index be54bdeb5416..20dc70b9bf26 100644
--- a/packages/app/src/i18n/nl.ts
+++ b/packages/app/src/i18n/nl.ts
@@ -886,8 +886,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Meldingen wissen",
   "sidebar.empty.title": "Geen projecten geopend",
   "sidebar.empty.description": "Open een project om aan de slag te gaan",
-  "sidebar.archived": "Gearchiveerd",
-  "sidebar.archived.restore": "Sessie herstellen",
+  "sidebar.settled": "Afgerond",
+  "sidebar.settle": "Thread afronden",
+  "sidebar.unsettle": "Thread herstellen",
+  "sidebar.thread.new": "Nieuwe thread",
+  "sidebar.thread.pin": "Thread vastmaken",
+  "sidebar.thread.unpin": "Thread losmaken",
+  "sidebar.status.working": "Bezig",
+  "sidebar.status.done": "Klaar",
   "debugBar.ariaLabel": "Diagnostiek voor ontwikkelprestaties",
   "debugBar.na": "n.v.t.",
   "debugBar.nav.label": "NAV",
@@ -939,8 +945,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Gebruik tabbladen in de titelbalk of een vaste zijbalk",
   "settings.general.row.navigation.tabs": "Tabbladen",
   "settings.general.row.navigation.sidebar": "Zijbalk",
-  "settings.general.row.sidebarSessions.title": "Inactieve sessies archiveren na",
-  "settings.general.row.sidebarSessions.description": "Inactieve sessies gaan naar Gearchiveerd. Actieve sessies blijven zichtbaar.",
+  "settings.general.row.sidebarSessions.title": "Inactieve threads afronden na",
+  "settings.general.row.sidebarSessions.description": "Inactieve threads gaan naar Afgerond. Actieve threads blijven zichtbaar.",
   "settings.general.row.sidebarSessions.always": "Altijd tonen",
   "settings.general.row.shell.title": "Terminalshell",
   "settings.general.row.shell.description": "Shell gebruikt door de terminal- en agenttools",
diff --git a/packages/app/src/i18n/no.ts b/packages/app/src/i18n/no.ts
index 8605630ca656..ff79d5f1501e 100644
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -777,8 +777,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Bruk faner i tittellinjen eller et fast sidefelt",
   "settings.general.row.navigation.tabs": "Faner",
   "settings.general.row.navigation.sidebar": "Sidefelt",
-  "settings.general.row.sidebarSessions.title": "Arkiver inaktive sesjoner etter",
-  "settings.general.row.sidebarSessions.description": "Inaktive sesjoner flyttes til Arkivert. Aktive sesjoner forblir synlige.",
+  "settings.general.row.sidebarSessions.title": "Avslutt inaktive tråder etter",
+  "settings.general.row.sidebarSessions.description": "Inaktive tråder flyttes til Avsluttede. Aktive tråder forblir synlige.",
   "settings.general.row.sidebarSessions.always": "Vis alltid",
   "settings.general.row.appearance.title": "Utseende",
   "settings.general.row.appearance.description": "Tilpass hvordan OpenCode ser ut på enheten din",
@@ -1235,8 +1235,14 @@ export const dict = {
 
   "sidebar.empty.title": "Ingen åpne prosjekter",
   "sidebar.empty.description": "Åpne et prosjekt for å komme i gang",
-  "sidebar.archived": "Arkivert",
-  "sidebar.archived.restore": "Gjenopprett sesjon",
+  "sidebar.settled": "Avsluttede",
+  "sidebar.settle": "Avslutt tråd",
+  "sidebar.unsettle": "Gjenåpne tråd",
+  "sidebar.thread.new": "Ny tråd",
+  "sidebar.thread.pin": "Fest tråd",
+  "sidebar.thread.unpin": "Løsne tråd",
+  "sidebar.status.working": "Arbeider",
+  "sidebar.status.done": "Ferdig",
 
   "settings.general.section.advanced": "Avansert",
   "settings.general.row.shell.title": "Terminalskall",
diff --git a/packages/app/src/i18n/pa.ts b/packages/app/src/i18n/pa.ts
index f6058ccc596b..ff49bb196474 100644
--- a/packages/app/src/i18n/pa.ts
+++ b/packages/app/src/i18n/pa.ts
@@ -884,8 +884,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "نوٹیفکیشن صاف کرو",
   "sidebar.empty.title": "کوئی پروجیکٹ نئیں کھلیا",
   "sidebar.empty.description": "شروع کرن لئی کوئی پروجیکٹ کھولو",
-  "sidebar.archived": "ਆਰਕਾਈਵ ਕੀਤੇ",
-  "sidebar.archived.restore": "ਸ਼ੈਸ਼ਨ ਬਹਾਲ ਕਰੋ",
+  "sidebar.settled": "ਨਿਪਟਾਏ ਗਏ",
+  "sidebar.settle": "ਥਰੈਡ ਨਿਪਟਾਓ",
+  "sidebar.unsettle": "ਥਰੈਡ ਬਹਾਲ ਕਰੋ",
+  "sidebar.thread.new": "ਨਵਾਂ ਥਰੈਡ",
+  "sidebar.thread.pin": "ਥਰੈਡ ਪਿੰਨ ਕਰੋ",
+  "sidebar.thread.unpin": "ਪਿੰਨ ਹਟਾਓ",
+  "sidebar.status.working": "ਕੰਮ ਚੱਲ ਰਿਹਾ",
+  "sidebar.status.done": "ਮੁਕੰਮਲ",
   "debugBar.ariaLabel": "ترقی دی کارکردگی دی تشخیص",
   "debugBar.na": "لاگو نئیں",
   "debugBar.nav.label": "NAV",
@@ -936,8 +942,8 @@ export const dict = {
   "settings.general.row.navigation.description": "ਟਾਈਟਲ ਬਾਰ ਵਿੱਚ ਟੈਬਾਂ ਜਾਂ ਸਥਾਈ ਸਾਈਡਬਾਰ ਵਰਤੋ",
   "settings.general.row.navigation.tabs": "ਟੈਬਾਂ",
   "settings.general.row.navigation.sidebar": "ਸਾਈਡਬਾਰ",
-  "settings.general.row.sidebarSessions.title": "ਬੇਕਾਰ ਸ਼ੈਸ਼ਨ ਆਰਕਾਈਵ ਕਰੋ",
-  "settings.general.row.sidebarSessions.description": "ਬੇਕਾਰ ਸ਼ੈਸ਼ਨ ਆਰਕਾਈਵ ਕੀਤੇ ਵਿੱਚ ਚਲੇ ਜਾਂਦੇ ਹਨ। ਕੰਮ ਕਰ ਰਹੇ ਸ਼ੈਸ਼ਨ ਦਿਖਾਈ ਦਿੰਦੇ ਰਹਿੰਦੇ ਹਨ।",
+  "settings.general.row.sidebarSessions.title": "ਬੇਕਾਰ ਥਰੈਡ ਨਿਪਟਾਉਣ ਦਾ ਸਮਾਂ",
+  "settings.general.row.sidebarSessions.description": "ਬੇਕਾਰ ਥਰੈਡ ਨਿਪਟਾਏ ਗਏ ਵਿੱਚ ਚਲੇ ਜਾਂਦੇ ਹਨ। ਕੰਮ ਕਰਦੇ ਥਰੈਡ ਦਿਖਦੇ ਰਹਿੰਦੇ ਹਨ।",
   "settings.general.row.sidebarSessions.always": "ਹਮੇਸ਼ਾ ਦਿਖਾਓ",
   "settings.general.row.shell.title": "شیل",
   "settings.general.row.shell.description": "Shell ٹرمینل تے ایجنٹ ٹولز دے ذریعہ استعمال کیتا جاندا اے",
diff --git a/packages/app/src/i18n/pl.ts b/packages/app/src/i18n/pl.ts
index a2dd1669ce7a..6344b49e2cd7 100644
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -831,8 +831,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Wyczyść powiadomienia",
   "sidebar.empty.title": "Brak otwartych projektów",
   "sidebar.empty.description": "Otwórz projekt, aby rozpocząć",
-  "sidebar.archived": "Zarchiwizowane",
-  "sidebar.archived.restore": "Przywróć sesję",
+  "sidebar.settled": "Odłożone",
+  "sidebar.settle": "Odłóż wątek",
+  "sidebar.unsettle": "Przywróć wątek",
+  "sidebar.thread.new": "Nowy wątek",
+  "sidebar.thread.pin": "Przypnij wątek",
+  "sidebar.thread.unpin": "Odepnij wątek",
+  "sidebar.status.working": "W trakcie",
+  "sidebar.status.done": "Gotowe",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Aplikacja komputerowa",
   "settings.section.server": "Serwer",
@@ -853,8 +859,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Używaj kart na pasku tytułu lub stałego paska bocznego",
   "settings.general.row.navigation.tabs": "Karty",
   "settings.general.row.navigation.sidebar": "Pasek boczny",
-  "settings.general.row.sidebarSessions.title": "Archiwizuj bezczynne sesje po",
-  "settings.general.row.sidebarSessions.description": "Bezczynne sesje trafiają do Zarchiwizowane. Aktywne sesje pozostają widoczne.",
+  "settings.general.row.sidebarSessions.title": "Odkładaj nieaktywne wątki po",
+  "settings.general.row.sidebarSessions.description": "Nieaktywne wątki trafiają do odłożonych. Aktywne wątki pozostają widoczne.",
   "settings.general.row.sidebarSessions.always": "Zawsze pokazuj",
   "settings.general.row.shell.title": "Powłoka terminala",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/ro.ts b/packages/app/src/i18n/ro.ts
index 29a0f59cad4b..7e77b59755ba 100644
--- a/packages/app/src/i18n/ro.ts
+++ b/packages/app/src/i18n/ro.ts
@@ -881,8 +881,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Șterge notificările",
   "sidebar.empty.title": "Niciun proiect deschis",
   "sidebar.empty.description": "Deschide un proiect pentru a începe",
-  "sidebar.archived": "Arhivate",
-  "sidebar.archived.restore": "Restaurează sesiunea",
+  "sidebar.settled": "Încheiate",
+  "sidebar.settle": "Încheie firul",
+  "sidebar.unsettle": "Redeschide firul",
+  "sidebar.thread.new": "Fir nou",
+  "sidebar.thread.pin": "Fixează firul",
+  "sidebar.thread.unpin": "Anulează fixarea",
+  "sidebar.status.working": "Lucrează",
+  "sidebar.status.done": "Gata",
   "debugBar.ariaLabel": "Diagnosticare performanță dezvoltare",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -934,8 +940,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Folosește file în bara de titlu sau o bară laterală permanentă",
   "settings.general.row.navigation.tabs": "File",
   "settings.general.row.navigation.sidebar": "Bară laterală",
-  "settings.general.row.sidebarSessions.title": "Arhivează sesiunile inactive după",
-  "settings.general.row.sidebarSessions.description": "Sesiunile inactive trec în Arhivate. Sesiunile active rămân vizibile.",
+  "settings.general.row.sidebarSessions.title": "Încheie firele inactive după",
+  "settings.general.row.sidebarSessions.description": "Firele inactive trec la încheiate. Firele active rămân vizibile.",
   "settings.general.row.sidebarSessions.always": "Afișează mereu",
   "settings.general.row.shell.title": "Shell terminal",
   "settings.general.row.shell.description": "Shell folosit de terminal și instrumentele agentului",
diff --git a/packages/app/src/i18n/ru.ts b/packages/app/src/i18n/ru.ts
index 4191622a9445..a63139c619eb 100644
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -894,8 +894,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Очистить уведомления",
   "sidebar.empty.title": "Нет открытых проектов",
   "sidebar.empty.description": "Откройте проект, чтобы начать",
-  "sidebar.archived": "Архивированные",
-  "sidebar.archived.restore": "Восстановить сессию",
+  "sidebar.settled": "Отложенные",
+  "sidebar.settle": "Отложить тред",
+  "sidebar.unsettle": "Вернуть тред",
+  "sidebar.thread.new": "Новый тред",
+  "sidebar.thread.pin": "Закрепить тред",
+  "sidebar.thread.unpin": "Открепить тред",
+  "sidebar.status.working": "В работе",
+  "sidebar.status.done": "Готово",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Приложение",
@@ -919,8 +925,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Вкладки в заголовке или постоянная боковая панель",
   "settings.general.row.navigation.tabs": "Вкладки",
   "settings.general.row.navigation.sidebar": "Боковая панель",
-  "settings.general.row.sidebarSessions.title": "Архивировать неактивные сессии через",
-  "settings.general.row.sidebarSessions.description": "Неактивные сессии перемещаются в «Архивированные». Активные сессии остаются видимыми.",
+  "settings.general.row.sidebarSessions.title": "Откладывать неактивные треды через",
+  "settings.general.row.sidebarSessions.description": "Неактивные треды переносятся в отложенные. Активные треды остаются видимыми.",
   "settings.general.row.sidebarSessions.always": "Всегда показывать",
   "settings.general.row.shell.title": "Оболочка терминала",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/si.ts b/packages/app/src/i18n/si.ts
index e712c3e52737..8d4daa24d323 100644
--- a/packages/app/src/i18n/si.ts
+++ b/packages/app/src/i18n/si.ts
@@ -874,8 +874,14 @@ export const dict: Record<string, string> = {
   "sidebar.project.clearNotifications": "දැනුම්දීම් හිස් කරන්න",
   "sidebar.empty.title": "ව්‍යාපෘති විවෘත නැත",
   "sidebar.empty.description": "ආරම්භ කිරීමට ව්‍යාපෘතියක් විවෘත කරන්න",
-  "sidebar.archived": "සංරක්ෂිත",
-  "sidebar.archived.restore": "සැසිය යළි පිහිටුවන්න",
+  "sidebar.settled": "නිශ්චල කළ",
+  "sidebar.settle": "සාකච්ඡාව නිශ්චල කරන්න",
+  "sidebar.unsettle": "සාකච්ඡාව යළි සක්‍රිය කරන්න",
+  "sidebar.thread.new": "නව සාකච්ඡාව",
+  "sidebar.thread.pin": "සාකච්ඡාව අමුණන්න",
+  "sidebar.thread.unpin": "ඇමුණුම ඉවත් කරන්න",
+  "sidebar.status.working": "ක්‍රියාත්මකයි",
+  "sidebar.status.done": "අවසන්",
   "debugBar.ariaLabel": "සංවර්ධන කාර්ය සාධන රෝග විනිශ්චය",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -926,8 +932,8 @@ export const dict: Record<string, string> = {
   "settings.general.row.navigation.description": "මාතෘකා තීරුවේ ටැබ් හෝ ස්ථිර පැති තීරුව භාවිත කරන්න",
   "settings.general.row.navigation.tabs": "ටැබ්",
   "settings.general.row.navigation.sidebar": "පැති තීරුව",
-  "settings.general.row.sidebarSessions.title": "නිෂ්ක්‍රීය සැසි සංරක්ෂණය කරන්න",
-  "settings.general.row.sidebarSessions.description": "නිෂ්ක්‍රීය සැසි සංරක්ෂිත වෙත යයි. ක්‍රියාත්මක සැසි දිස්වේ.",
+  "settings.general.row.sidebarSessions.title": "අක්‍රිය සාකච්ඡා නිශ්චල කිරීමේ කාලය",
+  "settings.general.row.sidebarSessions.description": "අක්‍රිය සාකච්ඡා නිශ්චල කළ ඒවාට යයි. ක්‍රියාත්මක සාකච්ඡා දිස්වේ.",
   "settings.general.row.sidebarSessions.always": "සැමවිටම පෙන්වන්න",
   "settings.general.row.shell.title": "පර්යන්ත ෂෙල්",
   "settings.general.row.shell.description": "පර්යන්තය සහ නියෝජිත මෙවලම් භාවිතා කරන ෂෙල්",
diff --git a/packages/app/src/i18n/sk.ts b/packages/app/src/i18n/sk.ts
index 2b7cec1c2d41..4d72f1a1c33e 100644
--- a/packages/app/src/i18n/sk.ts
+++ b/packages/app/src/i18n/sk.ts
@@ -880,8 +880,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Vymazať oznámenia",
   "sidebar.empty.title": "Nie sú otvorené žiadne projekty",
   "sidebar.empty.description": "Otvorte projekt pre začiatok",
-  "sidebar.archived": "Archivované",
-  "sidebar.archived.restore": "Obnoviť reláciu",
+  "sidebar.settled": "Odložené",
+  "sidebar.settle": "Odložiť vlákno",
+  "sidebar.unsettle": "Vrátiť vlákno",
+  "sidebar.thread.new": "Nové vlákno",
+  "sidebar.thread.pin": "Pripnúť vlákno",
+  "sidebar.thread.unpin": "Odopnúť vlákno",
+  "sidebar.status.working": "Pracuje",
+  "sidebar.status.done": "Hotovo",
   "debugBar.ariaLabel": "Diagnostika výkonu vývoja",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -933,8 +939,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Použiť karty na titulnom paneli alebo trvalý bočný panel",
   "settings.general.row.navigation.tabs": "Karty",
   "settings.general.row.navigation.sidebar": "Bočný panel",
-  "settings.general.row.sidebarSessions.title": "Archivovať nečinné relácie po",
-  "settings.general.row.sidebarSessions.description": "Nečinné relácie sa presunú do Archivované. Aktívne relácie zostávajú viditeľné.",
+  "settings.general.row.sidebarSessions.title": "Odložiť nečinné vlákna po",
+  "settings.general.row.sidebarSessions.description": "Nečinné vlákna sa presunú do Odložené. Pracujúce vlákna zostanú viditeľné.",
   "settings.general.row.sidebarSessions.always": "Vždy zobraziť",
   "settings.general.row.shell.title": "Terminálový shell",
   "settings.general.row.shell.description": "Shell používaný terminálom a nástrojmi agenta",
diff --git a/packages/app/src/i18n/sl.ts b/packages/app/src/i18n/sl.ts
index ff968a72cd47..150d6f799445 100644
--- a/packages/app/src/i18n/sl.ts
+++ b/packages/app/src/i18n/sl.ts
@@ -881,8 +881,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Počisti obvestila",
   "sidebar.empty.title": "Ni odprtih projektov",
   "sidebar.empty.description": "Za začetek odprite projekt",
-  "sidebar.archived": "Arhivirano",
-  "sidebar.archived.restore": "Obnovi sejo",
+  "sidebar.settled": "Odložene",
+  "sidebar.settle": "Odloži nit",
+  "sidebar.unsettle": "Vrni nit",
+  "sidebar.thread.new": "Nova nit",
+  "sidebar.thread.pin": "Pripni nit",
+  "sidebar.thread.unpin": "Odpni nit",
+  "sidebar.status.working": "V teku",
+  "sidebar.status.done": "Končano",
   "debugBar.ariaLabel": "Diagnostika uspešnosti razvoja",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -934,8 +940,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Uporabite zavihke v naslovni vrstici ali trajno stransko vrstico",
   "settings.general.row.navigation.tabs": "Zavihki",
   "settings.general.row.navigation.sidebar": "Stranska vrstica",
-  "settings.general.row.sidebarSessions.title": "Arhiviraj nedejavne seje po",
-  "settings.general.row.sidebarSessions.description": "Nedejavne seje se premaknejo v Arhivirano. Dejavnе seje ostanejo vidne.",
+  "settings.general.row.sidebarSessions.title": "Odloži nedejavne niti po",
+  "settings.general.row.sidebarSessions.description": "Nedejavne niti se premaknejo med odložene. Dejavne niti ostanejo vidne.",
   "settings.general.row.sidebarSessions.always": "Vedno prikaži",
   "settings.general.row.shell.title": "Končna lupina",
   "settings.general.row.shell.description": "Lupina, ki jo uporabljajo terminalska in agentska orodja",
diff --git a/packages/app/src/i18n/sq.ts b/packages/app/src/i18n/sq.ts
index e3cb45ae788e..407fa380bb4d 100644
--- a/packages/app/src/i18n/sq.ts
+++ b/packages/app/src/i18n/sq.ts
@@ -879,8 +879,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Pastro njoftimet",
   "sidebar.empty.title": "Asnjë projekt i hapur",
   "sidebar.empty.description": "Hapni një projekt për të filluar",
-  "sidebar.archived": "Arkivuar",
-  "sidebar.archived.restore": "Rikthe sesionin",
+  "sidebar.settled": "Të mbyllura",
+  "sidebar.settle": "Mbyll rrjedhën",
+  "sidebar.unsettle": "Rihap rrjedhën",
+  "sidebar.thread.new": "Rrjedhë e re",
+  "sidebar.thread.pin": "Kapëse rrjedhën",
+  "sidebar.thread.unpin": "Hiq kapësen",
+  "sidebar.status.working": "Po punon",
+  "sidebar.status.done": "Përfundoi",
   "debugBar.ariaLabel": "Diagnostifikimi i performancës së zhvillimit",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -933,8 +939,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Përdor skeda në shiritin e titullit ose një shirit anësor të përhershëm",
   "settings.general.row.navigation.tabs": "Skeda",
   "settings.general.row.navigation.sidebar": "Shiriti anësor",
-  "settings.general.row.sidebarSessions.title": "Arkivo sesionet joaktive pas",
-  "settings.general.row.sidebarSessions.description": "Sesionet joaktive kalojnë te Arkivuar. Sesionet aktive mbeten të dukshme.",
+  "settings.general.row.sidebarSessions.title": "Mbyll rrjedhat joaktive pas",
+  "settings.general.row.sidebarSessions.description": "Rrjedhat joaktive kalojnë te të mbyllurat. Rrjedhat aktive mbeten të dukshme.",
   "settings.general.row.sidebarSessions.always": "Shfaq gjithmonë",
   "settings.general.row.shell.title": "Predha e terminalit",
   "settings.general.row.shell.description": "Predha e përdorur nga terminali dhe mjetet e agjentit",
diff --git a/packages/app/src/i18n/sr.ts b/packages/app/src/i18n/sr.ts
index e261f7f2edfd..e7bbcccaee5f 100644
--- a/packages/app/src/i18n/sr.ts
+++ b/packages/app/src/i18n/sr.ts
@@ -880,8 +880,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Обришите обавештења",
   "sidebar.empty.title": "Нема отворених пројеката",
   "sidebar.empty.description": "Отворите пројекат да бисте започели",
-  "sidebar.archived": "Архивирано",
-  "sidebar.archived.restore": "Врати сесију",
+  "sidebar.settled": "Одложене",
+  "sidebar.settle": "Одложи нит",
+  "sidebar.unsettle": "Врати нит",
+  "sidebar.thread.new": "Нова нит",
+  "sidebar.thread.pin": "Прикачи нит",
+  "sidebar.thread.unpin": "Откачи нит",
+  "sidebar.status.working": "У току",
+  "sidebar.status.done": "Готово",
   "debugBar.ariaLabel": "Дијагностика перформанси развоја",
   "debugBar.na": "н/а",
   "debugBar.nav.label": "NAV",
@@ -933,8 +939,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Користите картице у насловној траци или трајну бочну траку",
   "settings.general.row.navigation.tabs": "Картице",
   "settings.general.row.navigation.sidebar": "Бочна трака",
-  "settings.general.row.sidebarSessions.title": "Архивирај неактивне сесије након",
-  "settings.general.row.sidebarSessions.description": "Неактивне сесије иду у Архивирано. Активне сесије остају видљиве.",
+  "settings.general.row.sidebarSessions.title": "Одложи неактивне нити након",
+  "settings.general.row.sidebarSessions.description": "Неактивне нити прелазе у одложене. Активне нити остају видљиве.",
   "settings.general.row.sidebarSessions.always": "Увек прикажи",
   "settings.general.row.shell.title": "Терминал shell",
   "settings.general.row.shell.description": "Shell који користе алати терминала и агента",
diff --git a/packages/app/src/i18n/sv.ts b/packages/app/src/i18n/sv.ts
index 9d5198af1af2..7f5e4c6aacb5 100644
--- a/packages/app/src/i18n/sv.ts
+++ b/packages/app/src/i18n/sv.ts
@@ -881,8 +881,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Rensa aviseringar",
   "sidebar.empty.title": "Inga projekt öppna",
   "sidebar.empty.description": "Öppna ett projekt för att komma igång",
-  "sidebar.archived": "Arkiverad",
-  "sidebar.archived.restore": "Återställ session",
+  "sidebar.settled": "Avslutade",
+  "sidebar.settle": "Avsluta tråd",
+  "sidebar.unsettle": "Återaktivera tråd",
+  "sidebar.thread.new": "Ny tråd",
+  "sidebar.thread.pin": "Fäst tråd",
+  "sidebar.thread.unpin": "Lossa tråd",
+  "sidebar.status.working": "Arbetar",
+  "sidebar.status.done": "Klar",
   "debugBar.ariaLabel": "Utvecklingsprestandadiagnostik",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -935,8 +941,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Använd flikar i namnlisten eller ett fast sidofält",
   "settings.general.row.navigation.tabs": "Flikar",
   "settings.general.row.navigation.sidebar": "Sidofält",
-  "settings.general.row.sidebarSessions.title": "Arkivera inaktiva sessioner efter",
-  "settings.general.row.sidebarSessions.description": "Inaktiva sessioner flyttas till Arkiverad. Aktiva sessioner förblir synliga.",
+  "settings.general.row.sidebarSessions.title": "Avsluta inaktiva trådar efter",
+  "settings.general.row.sidebarSessions.description": "Inaktiva trådar flyttas till Avslutade. Aktiva trådar förblir synliga.",
   "settings.general.row.sidebarSessions.always": "Visa alltid",
   "settings.general.row.shell.title": "Terminalskal",
   "settings.general.row.shell.description": "Skal som används av terminalen och agentverktygen",
diff --git a/packages/app/src/i18n/tg.ts b/packages/app/src/i18n/tg.ts
index a048e3b47374..8fa02641947b 100644
--- a/packages/app/src/i18n/tg.ts
+++ b/packages/app/src/i18n/tg.ts
@@ -880,8 +880,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Огоҳиҳоро тоза кунед",
   "sidebar.empty.title": "Ягон лоиҳа кушода нест",
   "sidebar.empty.description": "Барои оғоз кардани лоиҳа лоиҳа кушоед",
-  "sidebar.archived": "Арxivшуда",
-  "sidebar.archived.restore": "Барқарор кардани сеанс",
+  "sidebar.settled": "Анҷомёфта",
+  "sidebar.settle": "Риштаро анҷом додан",
+  "sidebar.unsettle": "Риштаро барқарор кардан",
+  "sidebar.thread.new": "Риштаи нав",
+  "sidebar.thread.pin": "Риштаро маҳкам кардан",
+  "sidebar.thread.unpin": "Маҳкамро бекор кардан",
+  "sidebar.status.working": "Дар ҳоли кор",
+  "sidebar.status.done": "Тайёр",
   "debugBar.ariaLabel": "Ташхиси самаранокии рушд",
   "debugBar.na": "не",
   "debugBar.nav.label": "NAV",
@@ -933,8 +939,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Дар сарлавҳа варақаҳо ё панели паҳлуии доимӣ истифода баред",
   "settings.general.row.navigation.tabs": "Варақаҳо",
   "settings.general.row.navigation.sidebar": "Панели паҳлуӣ",
-  "settings.general.row.sidebarSessions.title": "Сеансҳои беҳаракатро архив кардан",
-  "settings.general.row.sidebarSessions.description": "Сеансҳои беҳаракат ба Арxivшуда мегузаранд. Сеансҳои фаъол намоён мемонанд.",
+  "settings.general.row.sidebarSessions.title": "Риштаҳои ғайрифаъолро анҷом додан пас аз",
+  "settings.general.row.sidebarSessions.description": "Риштаҳои ғайрифаъол ба анҷомёфта мегузаранд. Риштаҳои корӣ намоён мемонанд.",
   "settings.general.row.sidebarSessions.always": "Ҳамеша нишон додан",
   "settings.general.row.shell.title": "Терминал shell",
   "settings.general.row.shell.description": "Shell воситаи терминал ва агент истифода мешавад",
diff --git a/packages/app/src/i18n/th.ts b/packages/app/src/i18n/th.ts
index 0736d8e17b94..7fb3bdf11ffd 100644
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -878,8 +878,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "ล้างการแจ้งเตือน",
   "sidebar.empty.title": "ไม่มีโปรเจกต์ที่เปิดอยู่",
   "sidebar.empty.description": "เปิดโปรเจกต์เพื่อเริ่มต้น",
-  "sidebar.archived": "จัดเก็บแล้ว",
-  "sidebar.archived.restore": "กู้คืนเซสชัน",
+  "sidebar.settled": "ที่พักไว้",
+  "sidebar.settle": "พักเธรด",
+  "sidebar.unsettle": "ยกเลิกการพักเธรด",
+  "sidebar.thread.new": "เธรดใหม่",
+  "sidebar.thread.pin": "ปักหมุดเธรด",
+  "sidebar.thread.unpin": "ยกเลิกการปักหมุด",
+  "sidebar.status.working": "กำลังทำงาน",
+  "sidebar.status.done": "เสร็จ",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -904,8 +910,8 @@ export const dict = {
   "settings.general.row.navigation.description": "ใช้แท็บในแถบชื่อเรื่องหรือแถบด้านข้างถาวร",
   "settings.general.row.navigation.tabs": "แท็บ",
   "settings.general.row.navigation.sidebar": "แถบด้านข้าง",
-  "settings.general.row.sidebarSessions.title": "จัดเก็บเซสชันที่ไม่ได้ใช้งานหลังจาก",
-  "settings.general.row.sidebarSessions.description": "เซสชันที่ไม่ได้ใช้งานจะถูกย้ายไปยังจัดเก็บแล้ว เซสชันที่กำลังทำงานยังแสดงอยู่",
+  "settings.general.row.sidebarSessions.title": "พักเธรดที่เงียบหลังจาก",
+  "settings.general.row.sidebarSessions.description": "เธรดที่เงียบจะย้ายไปที่ที่พักไว้ เธรดที่กำลังทำงานยังแสดงอยู่",
   "settings.general.row.sidebarSessions.always": "แสดงเสมอ",
   "settings.general.row.shell.title": "เชลล์เทอร์มินัล",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/tk.ts b/packages/app/src/i18n/tk.ts
index c29397a4bc7a..777499a50294 100644
--- a/packages/app/src/i18n/tk.ts
+++ b/packages/app/src/i18n/tk.ts
@@ -877,8 +877,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Duýduryşlary arassalaň",
   "sidebar.empty.title": "Taslama açylmaýar",
   "sidebar.empty.description": "Başlamak üçin taslama açyň",
-  "sidebar.archived": "Arhiwlenen",
-  "sidebar.archived.restore": "Sessiýany dikelt",
+  "sidebar.settled": "Tamamlanan",
+  "sidebar.settle": "Temany tamamla",
+  "sidebar.unsettle": "Temany gaýtadan aç",
+  "sidebar.thread.new": "Täze tema",
+  "sidebar.thread.pin": "Temany berkit",
+  "sidebar.thread.unpin": "Berkitmeni aýyr",
+  "sidebar.status.working": "Işleýär",
+  "sidebar.status.done": "Taýýar",
   "debugBar.ariaLabel": "Ösüş öndürijiligini anyklaýyş",
   "debugBar.na": "n / a",
   "debugBar.nav.label": "NAV",
@@ -930,8 +936,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Sözbaşy zolagynda goýmalar ýa-da hemişelik gapdal panel ulanyň",
   "settings.general.row.navigation.tabs": "Goýmalar",
   "settings.general.row.navigation.sidebar": "Gapdal panel",
-  "settings.general.row.sidebarSessions.title": "Işjeň däl sessiýalary arhiwle",
-  "settings.general.row.sidebarSessions.description": "Işjeň däl sessiýalar Arhiwlenen bölümine geçýär. Işleýän sessiýalar görünýär.",
+  "settings.general.row.sidebarSessions.title": "Işjeň bolmadyk temalary tamamlama möhleti",
+  "settings.general.row.sidebarSessions.description": "Işjeň bolmadyk temalar tamamlananlara geçýär. Işleýän temalar görünýär.",
   "settings.general.row.sidebarSessions.always": "Elmydama görkez",
   "settings.general.row.shell.title": "Terminal shell-i",
   "settings.general.row.shell.description": "Terminal we agent gurallary tarapyndan ulanylýan shell",
diff --git a/packages/app/src/i18n/tr.ts b/packages/app/src/i18n/tr.ts
index 48dea3da1562..52a6a8749174 100644
--- a/packages/app/src/i18n/tr.ts
+++ b/packages/app/src/i18n/tr.ts
@@ -896,8 +896,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Bildirimleri temizle",
   "sidebar.empty.title": "Açık proje yok",
   "sidebar.empty.description": "Başlamak için bir proje açın",
-  "sidebar.archived": "Arşivlendi",
-  "sidebar.archived.restore": "Oturumu geri yükle",
+  "sidebar.settled": "Kapatılan",
+  "sidebar.settle": "Konuyu kapat",
+  "sidebar.unsettle": "Konuyu yeniden aç",
+  "sidebar.thread.new": "Yeni konu",
+  "sidebar.thread.pin": "Konuyu sabitle",
+  "sidebar.thread.unpin": "Sabitlemeyi kaldır",
+  "sidebar.status.working": "Çalışıyor",
+  "sidebar.status.done": "Bitti",
 
   "app.name.desktop": "OpenCode Masaüstü",
 
@@ -922,8 +928,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Başlık çubuğunda sekmeler veya kalıcı bir kenar çubuğu kullan",
   "settings.general.row.navigation.tabs": "Sekmeler",
   "settings.general.row.navigation.sidebar": "Kenar çubuğu",
-  "settings.general.row.sidebarSessions.title": "Boşta oturumları şu süreden sonra arşivle",
-  "settings.general.row.sidebarSessions.description": "Boşta oturumlar Arşivlendi bölümüne taşınır. Çalışan oturumlar görünür kalır.",
+  "settings.general.row.sidebarSessions.title": "Boştaki konuları kapatma süresi",
+  "settings.general.row.sidebarSessions.description": "Boştaki konular kapatılanlara taşınır. Çalışan konular görünür kalır.",
   "settings.general.row.sidebarSessions.always": "Her zaman göster",
   "settings.general.row.shell.title": "Terminal Kabuğu",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/uk.ts b/packages/app/src/i18n/uk.ts
index 6066c4a3de59..5c9a79dca523 100644
--- a/packages/app/src/i18n/uk.ts
+++ b/packages/app/src/i18n/uk.ts
@@ -966,8 +966,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Очистити сповіщення",
   "sidebar.empty.title": "Немає відкритих проєктів",
   "sidebar.empty.description": "Відкрийте проєкт, щоб почати",
-  "sidebar.archived": "Архівовані",
-  "sidebar.archived.restore": "Відновити сесію",
+  "sidebar.settled": "Відкладені",
+  "sidebar.settle": "Відкласти тред",
+  "sidebar.unsettle": "Повернути тред",
+  "sidebar.thread.new": "Новий тред",
+  "sidebar.thread.pin": "Закріпити тред",
+  "sidebar.thread.unpin": "Відкріпити тред",
+  "sidebar.status.working": "У роботі",
+  "sidebar.status.done": "Готово",
 
   "debugBar.ariaLabel": "Діагностика продуктивності розробки",
   "debugBar.na": "н/д",
@@ -1024,8 +1030,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Вкладки в заголовку або постійна бічна панель",
   "settings.general.row.navigation.tabs": "Вкладки",
   "settings.general.row.navigation.sidebar": "Бічна панель",
-  "settings.general.row.sidebarSessions.title": "Архівувати неактивні сесії через",
-  "settings.general.row.sidebarSessions.description": "Неактивні сесії переміщуються в «Архівовані». Активні сесії залишаються видимими.",
+  "settings.general.row.sidebarSessions.title": "Відкладати неактивні треди через",
+  "settings.general.row.sidebarSessions.description": "Неактивні треди переходять у відкладені. Активні треди залишаються видимими.",
   "settings.general.row.sidebarSessions.always": "Завжди показувати",
   "settings.general.row.shell.title": "Командна оболонка термінала",
   "settings.general.row.shell.description":
diff --git a/packages/app/src/i18n/ur.ts b/packages/app/src/i18n/ur.ts
index 22f2536e7036..25b1a5223fbc 100644
--- a/packages/app/src/i18n/ur.ts
+++ b/packages/app/src/i18n/ur.ts
@@ -887,8 +887,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "اطلاعات کو صاف کریں۔",
   "sidebar.empty.title": "کوئی پروجیکٹ نہیں کھلا۔",
   "sidebar.empty.description": "شروع کرنے کے لیے ایک پروجیکٹ کھولیں۔",
-  "sidebar.archived": "آرکائیو شدہ",
-  "sidebar.archived.restore": "سیشن بحال کریں",
+  "sidebar.settled": "طے شدہ",
+  "sidebar.settle": "تھریڈ طے کریں",
+  "sidebar.unsettle": "تھریڈ بحال کریں",
+  "sidebar.thread.new": "نیا تھریڈ",
+  "sidebar.thread.pin": "تھریڈ پن کریں",
+  "sidebar.thread.unpin": "پن ہٹائیں",
+  "sidebar.status.working": "کام جاری",
+  "sidebar.status.done": "مکمل",
   "debugBar.ariaLabel": "ترقیاتی کارکردگی کی تشخیص",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
@@ -939,8 +945,8 @@ export const dict = {
   "settings.general.row.navigation.description": "ٹائٹل بار میں ٹیبز یا مستقل سائیڈ بار استعمال کریں",
   "settings.general.row.navigation.tabs": "ٹیبز",
   "settings.general.row.navigation.sidebar": "سائیڈ بار",
-  "settings.general.row.sidebarSessions.title": "غیر فعال سیشن آرکائیو کریں",
-  "settings.general.row.sidebarSessions.description": "غیر فعال سیشن آرکائیو شدہ میں منتقل ہو جاتے ہیں۔ فعال سیشن نظر آتے رہتے ہیں۔",
+  "settings.general.row.sidebarSessions.title": "غیر فعال تھریڈز طے کرنے کی مدت",
+  "settings.general.row.sidebarSessions.description": "غیر فعال تھریڈز طے شدہ میں چلے جاتے ہیں۔ کام کرتے تھریڈز نظر آتے رہتے ہیں۔",
   "settings.general.row.sidebarSessions.always": "ہمیشہ دکھائیں",
   "settings.general.row.shell.title": "ٹرمینل شیل",
   "settings.general.row.shell.description": "ٹرمینل اور ایجنٹ ٹولز کے ذریعے استعمال ہونے والا شیل",
diff --git a/packages/app/src/i18n/uz.ts b/packages/app/src/i18n/uz.ts
index 30ed6948778c..1037872a6bf8 100644
--- a/packages/app/src/i18n/uz.ts
+++ b/packages/app/src/i18n/uz.ts
@@ -884,8 +884,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Bildirishnomalarni tozalash",
   "sidebar.empty.title": "Hech qanday loyiha ochiq emas",
   "sidebar.empty.description": "Boshlash uchun loyihani oching",
-  "sidebar.archived": "Arxivlangan",
-  "sidebar.archived.restore": "Sessiyani tiklash",
+  "sidebar.settled": "Yakunlangan",
+  "sidebar.settle": "Trevni yakunlash",
+  "sidebar.unsettle": "Trevni qayta ochish",
+  "sidebar.thread.new": "Yangi trev",
+  "sidebar.thread.pin": "Trevni mahkamlash",
+  "sidebar.thread.unpin": "Mahkamlashni bekor qilish",
+  "sidebar.status.working": "Ishlamoqda",
+  "sidebar.status.done": "Tayyor",
   "debugBar.ariaLabel": "Rivojlanish samaradorligi diagnostikasi",
   "debugBar.na": "yo'q",
   "debugBar.nav.label": "NAV",
@@ -937,8 +943,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Sarlavha panelida tablardan yoki doimiy yon paneldan foydalaning",
   "settings.general.row.navigation.tabs": "Tablar",
   "settings.general.row.navigation.sidebar": "Yon panel",
-  "settings.general.row.sidebarSessions.title": "Harakatsiz sessiyalarni arxivlash",
-  "settings.general.row.sidebarSessions.description": "Harakatsiz sessiyalar Arxivlangan bo'limiga o'tadi. Faol sessiyalar ko'rinib qoladi.",
+  "settings.general.row.sidebarSessions.title": "Bo'sh trevlarni yakunlash muddati",
+  "settings.general.row.sidebarSessions.description": "Bo'sh trevlar yakunlanganlarga ko'chadi. Ishlayotgan trevlar ko'rinib turadi.",
   "settings.general.row.sidebarSessions.always": "Har doim ko'rsatish",
   "settings.general.row.shell.title": "Terminal qobig'i",
   "settings.general.row.shell.description": "Terminal va agent vositalari tomonidan ishlatiladigan qobiq",
diff --git a/packages/app/src/i18n/vi.ts b/packages/app/src/i18n/vi.ts
index 54d24de4ba3e..7e6045978300 100644
--- a/packages/app/src/i18n/vi.ts
+++ b/packages/app/src/i18n/vi.ts
@@ -888,8 +888,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "Xóa thông báo",
   "sidebar.empty.title": "Không có dự án nào mở",
   "sidebar.empty.description": "Mở một dự án để bắt đầu",
-  "sidebar.archived": "Đã lưu trữ",
-  "sidebar.archived.restore": "Khôi phục phiên",
+  "sidebar.settled": "Đã xếp",
+  "sidebar.settle": "Xếp chuỗi",
+  "sidebar.unsettle": "Khôi phục chuỗi",
+  "sidebar.thread.new": "Chuỗi mới",
+  "sidebar.thread.pin": "Ghim chuỗi",
+  "sidebar.thread.unpin": "Bỏ ghim chuỗi",
+  "sidebar.status.working": "Đang làm",
+  "sidebar.status.done": "Xong",
   "debugBar.ariaLabel": "Chẩn đoán hiệu suất phát triển",
   "debugBar.na": "không có",
   "debugBar.nav.label": "NAV",
@@ -941,8 +947,8 @@ export const dict = {
   "settings.general.row.navigation.description": "Dùng thẻ trên thanh tiêu đề hoặc thanh bên cố định",
   "settings.general.row.navigation.tabs": "Thẻ",
   "settings.general.row.navigation.sidebar": "Thanh bên",
-  "settings.general.row.sidebarSessions.title": "Lưu trữ phiên không hoạt động sau",
-  "settings.general.row.sidebarSessions.description": "Phiên không hoạt động sẽ chuyển vào Đã lưu trữ. Phiên đang chạy vẫn hiển thị.",
+  "settings.general.row.sidebarSessions.title": "Xếp các chuỗi nhàn rỗi sau",
+  "settings.general.row.sidebarSessions.description": "Các chuỗi nhàn rỗi chuyển sang Đã xếp. Các chuỗi đang làm vẫn hiển thị.",
   "settings.general.row.sidebarSessions.always": "Luôn hiển thị",
   "settings.general.row.shell.title": "Shell terminal",
   "settings.general.row.shell.description": "Shell được terminal và các công cụ của tác nhân sử dụng",
diff --git a/packages/app/src/i18n/zh.ts b/packages/app/src/i18n/zh.ts
index 66dc73572783..334666097d64 100644
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -874,8 +874,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "清除通知",
   "sidebar.empty.title": "没有打开的项目",
   "sidebar.empty.description": "打开一个项目以开始使用",
-  "sidebar.archived": "已归档",
-  "sidebar.archived.restore": "恢复会话",
+  "sidebar.settled": "已搁置",
+  "sidebar.settle": "搁置话题",
+  "sidebar.unsettle": "恢复话题",
+  "sidebar.thread.new": "新建话题",
+  "sidebar.thread.pin": "固定话题",
+  "sidebar.thread.unpin": "取消固定",
+  "sidebar.status.working": "工作中",
+  "sidebar.status.done": "已完成",
 
   "app.name.desktop": "OpenCode Desktop",
 
@@ -901,8 +907,8 @@ export const dict = {
   "settings.general.row.navigation.description": "在标题栏使用标签页，或使用常驻侧边栏",
   "settings.general.row.navigation.tabs": "标签页",
   "settings.general.row.navigation.sidebar": "侧边栏",
-  "settings.general.row.sidebarSessions.title": "闲置会话归档时间",
-  "settings.general.row.sidebarSessions.description": "闲置会话会移入已归档。正在工作的会话始终可见。",
+  "settings.general.row.sidebarSessions.title": "闲置话题搁置时间",
+  "settings.general.row.sidebarSessions.description": "闲置话题会移入已搁置。工作中的话题保持显示。",
   "settings.general.row.sidebarSessions.always": "始终显示",
   "settings.general.row.shell.title": "终端 Shell",
   "settings.general.row.shell.description": "选择终端使用的 shell。兼容的 shell 也会用于智能体工具调用。",
diff --git a/packages/app/src/i18n/zht.ts b/packages/app/src/i18n/zht.ts
index 2c777bc254ee..8a617ce01b8f 100644
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -871,8 +871,14 @@ export const dict = {
   "sidebar.project.clearNotifications": "清除通知",
   "sidebar.empty.title": "未開啟任何專案",
   "sidebar.empty.description": "開啟專案以開始使用",
-  "sidebar.archived": "已封存",
-  "sidebar.archived.restore": "還原工作階段",
+  "sidebar.settled": "已擱置",
+  "sidebar.settle": "擱置話題",
+  "sidebar.unsettle": "還原話題",
+  "sidebar.thread.new": "新增話題",
+  "sidebar.thread.pin": "釘選話題",
+  "sidebar.thread.unpin": "取消釘選",
+  "sidebar.status.working": "工作中",
+  "sidebar.status.done": "已完成",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "桌面",
@@ -896,8 +902,8 @@ export const dict = {
   "settings.general.row.navigation.description": "在標題列使用分頁，或使用常駐側邊欄",
   "settings.general.row.navigation.tabs": "分頁",
   "settings.general.row.navigation.sidebar": "側邊欄",
-  "settings.general.row.sidebarSessions.title": "閒置工作階段封存時間",
-  "settings.general.row.sidebarSessions.description": "閒置工作階段會移至已封存。正在運作的工作階段會保持顯示。",
+  "settings.general.row.sidebarSessions.title": "閒置話題擱置時間",
+  "settings.general.row.sidebarSessions.description": "閒置話題會移入已擱置。工作中的話題保持顯示。",
   "settings.general.row.sidebarSessions.always": "一律顯示",
   "settings.general.row.shell.title": "終端機 Shell",
   "settings.general.row.shell.description": "選擇終端機使用的 Shell。相容的 Shell 也會用於代理程式工具呼叫。",
diff --git a/packages/app/src/pages/layout/navigation-sidebar.tsx b/packages/app/src/pages/layout/navigation-sidebar.tsx
index 07e2d2a9ff5f..81f9f83f6fa1 100644
--- a/packages/app/src/pages/layout/navigation-sidebar.tsx
+++ b/packages/app/src/pages/layout/navigation-sidebar.tsx
@@ -1,8 +1,10 @@
-import { createMemo, createSignal, For, onCleanup, Show, startTransition } from "solid-js"
+import { createEffect, createMemo, createSignal, For, onCleanup, Show, startTransition } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { useQuery } from "@tanstack/solid-query"
 import type { GlobalSession } from "@opencode-ai/sdk/v2/client"
 import { Binary } from "@opencode-ai/core/util/binary"
+import { SessionProgressIndicatorV2 } from "@opencode-ai/session-ui/v2/session-progress-indicator-v2"
+import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { ScrollView } from "@opencode-ai/ui/scroll-view"
 import { Spinner } from "@opencode-ai/ui/spinner"
 import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
@@ -21,12 +23,13 @@ import { useLanguage } from "@/context/language"
 import { ServerConnection } from "@/context/server"
 import { useSettings } from "@/context/settings"
 import { usePlatform } from "@/context/platform"
+import { useCommand } from "@/context/command"
 import { sessionHasOpenTab, useTabs } from "@/context/tabs"
 import { createHomeController } from "@/pages/home/home-controller"
 import { createHomeProjectsController } from "@/pages/home/home-projects-controller"
 import { archiveHomeSession } from "@/pages/home-session-archive"
 import { shouldOpenSessionInBackground } from "@/pages/home-session-open"
-import { errorMessage } from "@/pages/layout/helpers"
+import { displayName, errorMessage } from "@/pages/layout/helpers"
 import {
   buildSidebarRecords,
   groupSidebarRecords,
@@ -48,14 +51,25 @@ type SidebarProjectSection = SidebarProjectGroup & {
   hidden: SidebarSessionRecord[]
 }
 
+type SettledGroup = {
+  key: string
+  project: LocalProject
+  name: string
+  local: SidebarSessionRecord[]
+  archived: SidebarSessionRecord[]
+}
+
 const SESSION_LIMIT = 64
 const ARCHIVED_LIMIT = 100
 const AGE_TICK = 60_000
+const STATUS_TICK = 1_000
 const SECTION_LABEL = "px-3 pb-1 pt-3 text-v2-text-text-muted [font-weight:440]"
 const ROW =
   "group/row relative flex h-7 min-w-0 w-full shrink-0 cursor-default items-center gap-2 rounded-[6px] bg-transparent px-1.5 text-start text-v2-text-text-muted [font-weight:440] transition-[background-color,color,box-shadow] duration-[120ms] ease-in-out hover:bg-v2-background-bg-layer-01 hover:text-v2-text-text-base data-[selected=true]:bg-v2-background-bg-layer-03 data-[selected=true]:text-v2-text-text-base data-[selected=true]:hover:bg-v2-background-bg-layer-03 focus-visible:bg-v2-background-bg-layer-01 focus-visible:text-v2-text-text-base focus-visible:outline-none focus-visible:[box-shadow:inset_0_0_0_0.5px_var(--v2-border-border-muted)]"
 const ROW_ACTIONS =
   "hover-reveal absolute end-1 top-1/2 flex -translate-y-1/2 items-center gap-1 opacity-0 group-hover/row:opacity-100 focus-within:opacity-100 data-[menu=true]:opacity-100"
+// Reserve room for the hover-revealed row actions so long titles never sit under them.
+const TITLE = "min-w-0 flex-1 truncate transition-[padding-inline-end] duration-[120ms] ease-in-out"
 
 function titleOf(session: { title?: string; parentID?: string; time: { created: number } }) {
   return sessionTitle(session.title) ?? withTimestampedFallback(session)
@@ -77,15 +91,25 @@ export function NavigationSidebar() {
   const layout = useLayout()
   const settings = useSettings()
   const tabs = useTabs()
+  const command = useCommand()
   const home = createHomeController()
   const projects = createHomeProjectsController(home)
 
   const [filter, setFilter] = createSignal("")
   const [now, setNow] = createSignal(Date.now())
+  const [tick, setTick] = createSignal(Date.now())
   const [state, setState] = persisted(
     Persist.global("sidebar.navigation", ["sidebar.navigation.v1"]),
-    createStore({ collapsed: {} as Record<string, boolean>, settledOpen: false }),
+    createStore({
+      collapsed: {} as Record<string, boolean>,
+      settledOpen: false,
+      pins: {} as Record<string, boolean>,
+    }),
   )
+  const [status, setStatus] = createStore({
+    started: {} as Record<string, number>,
+    done: {} as Record<string, number>,
+  })
 
   const ticker = setInterval(() => setNow(Date.now()), AGE_TICK)
   onCleanup(() => clearInterval(ticker))
@@ -133,6 +157,50 @@ export function NavigationSidebar() {
   })
   const working = (sessionID: string) => home.server.focusedSync().session.data.session_working(sessionID)
 
+  const anyWorking = createMemo(() => sessions().some((session) => working(session.id)))
+  createEffect(() => {
+    if (!anyWorking()) return
+    const timer = setInterval(() => setTick(Date.now()), STATUS_TICK)
+    onCleanup(() => clearInterval(timer))
+  })
+
+  createEffect(() => {
+    for (const session of sessions()) {
+      const started = status.started[session.id]
+      if (working(session.id) && started === undefined) setStatus("started", session.id, Date.now())
+      if (!working(session.id) && started !== undefined)
+        setStatus(
+          produce((draft) => {
+            delete draft.started[session.id]
+            draft.done[session.id] = Date.now()
+          }),
+        )
+    }
+  })
+
+  createEffect(() => {
+    const current = currentSession()
+    if (!current || status.done[current] === undefined) return
+    setStatus(
+      produce((draft) => {
+        delete draft.done[current]
+      }),
+    )
+  })
+
+  // Open tabs whose session is missing from the index mean the cache lagged behind a promotion.
+  const [missingKey, setMissingKey] = createSignal("")
+  createEffect(() => {
+    const known = new Set(sessions().map((session) => session.id))
+    const missing = tabs.store
+      .flatMap((tab) => (tab.type === "session" && tab.server === serverKey() && !known.has(tab.sessionId) ? [tab.sessionId] : []))
+      .sort()
+      .join(",")
+    if (!missing || missing === missingKey()) return
+    setMissingKey(missing)
+    void sessionIndex.refetch()
+  })
+
   const groups = createMemo((): SidebarProjectSection[] => {
     const records = buildSidebarRecords({ sessions: sessions(), projects: home.project.list() }).filter((record) =>
       matchesSidebarFilter(record, filter()),
@@ -141,7 +209,7 @@ export function NavigationSidebar() {
       ...group,
       ...partitionSidebarRecords({
         records: group.records,
-        pinned: (record) => isPinned(record),
+        pinned: (record) => alwaysVisible(record),
         days: settings.general.sidebarSessionDays() ?? 3,
         now: now(),
       }),
@@ -169,7 +237,37 @@ export function NavigationSidebar() {
     staleTime: 30_000,
   }))
 
-  function isPinned(record: SidebarSessionRecord) {
+  const settledGroups = createMemo((): SettledGroup[] => {
+    const groups = new Map<string, SettledGroup>()
+    const push = (record: SidebarSessionRecord, kind: "local" | "archived") => {
+      const key = pathKey(record.project.worktree)
+      const group = groups.get(key) ?? { key, project: record.project, name: record.name, local: [], archived: [] }
+      group[kind].push(record)
+      groups.set(key, group)
+    }
+    settled().forEach((record) => push(record, "local"))
+    ;(archived.data ?? []).forEach((session) => push(archivedRecord(session), "archived"))
+    return [...groups.values()]
+  })
+  const settledCount = createMemo(() => settled().length + (archived.data ?? []).length)
+
+  function archivedRecord(session: GlobalSession): SidebarSessionRecord {
+    const project: LocalProject =
+      projectOf(session) ?? {
+        id: session.project?.id,
+        name: session.project?.name,
+        worktree: session.directory,
+        expanded: false,
+      }
+    return { session, project, name: displayName(project) }
+  }
+
+  function isPinned(sessionID: string) {
+    return state.pins[sessionID] === true
+  }
+
+  function alwaysVisible(record: SidebarSessionRecord) {
+    if (isPinned(record.session.id)) return true
     if (record.session.id === currentSession()) return true
     if (working(record.session.id)) return true
     return sessionHasOpenTab(tabs.store, serverKey(), record.session)
@@ -180,6 +278,10 @@ export function NavigationSidebar() {
     return home.project.list().find((item) => pathKey(item.worktree) === directory)
   }
 
+  function branchOf(directory: string) {
+    return home.server.focusedSync().child(directory)[0].vcs?.branch
+  }
+
   function open(session: { id: string; directory: string }, project: LocalProject | undefined, event?: MouseEvent) {
     const conn = home.server.focused()
     const ctx = home.server.focusedContext()
@@ -234,7 +336,7 @@ export function NavigationSidebar() {
     })()
   }
 
-  function unsettle(session: GlobalSession) {
+  function unsettle(session: { id: string; directory: string }) {
     void (async () => {
       const conn = home.server.focused()
       const ctx = home.server.focusedContext()
@@ -262,9 +364,36 @@ export function NavigationSidebar() {
     tabs.removeSessionTab({ server: serverKey(), sessionId: record.session.id })
   }
 
+  function togglePin(sessionID: string) {
+    setState("pins", sessionID, (value) => value !== true)
+  }
+
   const canCreate = createMemo(() => !!home.project.newSession())
   const connection = createMemo(() => home.server.focused())
 
+  function newThread() {
+    const conn = connection()
+    const current = currentSession()
+    const directory = current ? sessions().find((session) => session.id === current)?.directory : undefined
+    const target = directory ?? home.selection.value().directory
+    if (!conn || !target) {
+      home.project.openNewSession()
+      return
+    }
+    home.project.openProjectNewSession(conn, target)
+  }
+
+  command.register(() => [
+    {
+      id: "sidebar.thread.new",
+      title: language.t("sidebar.thread.new"),
+      category: language.t("command.category.session"),
+      keybind: "mod+shift+n",
+      disabled: !canCreate(),
+      onSelect: () => newThread(),
+    },
+  ])
+
   return (
     <aside
       aria-label={language.t("settings.shortcuts.group.navigation")}
@@ -276,11 +405,11 @@ export function NavigationSidebar() {
             type="button"
             data-action="sidebar-new-session"
             disabled={!canCreate()}
-            onClick={() => home.project.openNewSession()}
+            onClick={newThread}
             class="flex h-7 min-w-0 flex-1 cursor-default items-center gap-2 rounded-[6px] bg-v2-background-bg-layer-01 px-2 text-start text-v2-text-text-base [font-weight:530] transition-[background-color,color] duration-[120ms] ease-in-out hover:bg-v2-background-bg-layer-02 focus-visible:outline-none focus-visible:[box-shadow:inset_0_0_0_0.5px_var(--v2-border-border-muted)] disabled:opacity-50"
           >
             <IconV2 name="edit" class="size-3.5 shrink-0 text-v2-icon-icon-muted" />
-            <span class="truncate">{language.t("command.session.new")}</span>
+            <span class="truncate">{language.t("sidebar.thread.new")}</span>
           </button>
           <TooltipV2 value={language.t("home.project.add")} placement="bottom-end">
             <IconButtonV2
@@ -342,7 +471,12 @@ export function NavigationSidebar() {
                 server={serverKey()}
                 collapsed={state.collapsed[group.key] === true}
                 current={currentSession()}
+                pinned={isPinned}
+                started={(sessionID) => status.started[sessionID]}
+                done={(sessionID) => status.done[sessionID]}
                 working={working}
+                tick={() => tick()}
+                branch={branchOf}
                 unseen={() => {
                   const conn = connection()
                   if (!conn) return 0
@@ -355,6 +489,7 @@ export function NavigationSidebar() {
                 onToggleCollapsed={() => setState("collapsed", group.key, (value) => !value)}
                 onOpen={open}
                 onSettle={settle}
+                onTogglePin={togglePin}
                 onCloseTab={closeTab}
                 onNewSession={() => {
                   const conn = connection()
@@ -380,70 +515,83 @@ export function NavigationSidebar() {
             )}
           </For>
 
-          <div class={SECTION_LABEL}>{language.t("sidebar.archived")}</div>
-
-          <button
-            type="button"
-            data-action="sidebar-settled-toggle"
-            aria-expanded={archivedOpen()}
-            onClick={() => setState("settledOpen", (value) => !value)}
-            class={ROW}
-          >
-            <IconV2
-              name="chevron-down"
-              class={`size-3 shrink-0 text-v2-icon-icon-muted transition-transform duration-[120ms] ${archivedOpen() ? "" : "-rotate-90"}`}
-            />
-            <IconV2 name="archive" class="size-3.5 shrink-0 text-v2-icon-icon-muted" />
-            <span class="min-w-0 flex-1 truncate">{language.t("sidebar.archived")}</span>
-          </button>
+          <Show when={settledCount() > 0}>
+            <div class={SECTION_LABEL}>{language.t("sidebar.settled")}</div>
+
+            <button
+              type="button"
+              data-action="sidebar-settled-toggle"
+              aria-expanded={archivedOpen()}
+              onClick={() => setState("settledOpen", (value) => !value)}
+              class={ROW}
+            >
+              <IconV2
+                name="chevron-down"
+                class={`size-3 shrink-0 text-v2-icon-icon-muted transition-transform duration-[120ms] ${archivedOpen() ? "" : "-rotate-90"}`}
+              />
+              <IconV2 name="archive" class="size-3.5 shrink-0 text-v2-icon-icon-muted" />
+              <span class={`${TITLE} group-hover/row:pe-8`}>{language.t("sidebar.settled")}</span>
+              <span class="shrink-0 text-xs text-v2-text-text-faint transition-opacity duration-[120ms] group-hover/row:opacity-0">
+                {settledCount()}
+              </span>
+            </button>
 
-          <Show when={archivedOpen()}>
-            <Show when={archived.isLoading}>
-              <div class="flex items-center justify-center py-3 text-v2-text-text-faint">
-                <Spinner class="size-3.5 shrink-0" />
-              </div>
-            </Show>
-            <Show when={!archived.isLoading && (archived.data ?? []).length === 0 && settled().length === 0}>
-              <div class="px-3 py-2 text-xs text-v2-text-text-faint">{language.t("sidebar.empty.description")}</div>
-            </Show>
-            <For each={settled()}>
-              {(record) => (
-                <SidebarSessionRow
-                  record={record}
-                  server={serverKey()}
-                  current={currentSession() === record.session.id}
-                  onOpen={open}
-                  onSettle={() => settle(record)}
-                  onCloseTab={() => closeTab(record)}
-                />
-              )}
-            </For>
-            <For each={archived.data ?? []}>
-              {(session) => (
-                <div class="flex min-w-0 items-center gap-1">
-                  <button
-                    type="button"
-                    data-action="sidebar-settled-session"
-                    onClick={(event) => open(session, projectOf(session), event)}
-                    class={`${ROW} min-w-0 flex-1`}
-                  >
-                    <span class="min-w-0 flex-1 truncate">{titleOf(session)}</span>
-                  </button>
-                  <div class="shrink-0">
-                    <TooltipV2 value={language.t("sidebar.archived.restore")} placement="top-end">
-                      <IconButtonV2
-                        data-action="sidebar-unsettle"
-                        variant="ghost-muted"
-                        size="small"
-                        icon={<IconV2 name="outline-reset" />}
-                        aria-label={language.t("sidebar.archived.restore")}
-                        onClick={() => unsettle(session)}
+            <Show when={archivedOpen()}>
+              <Show when={archived.isLoading}>
+                <div class="flex items-center justify-center py-3 text-v2-text-text-faint">
+                  <Spinner class="size-3.5 shrink-0" />
+                </div>
+              </Show>
+              <Show when={!archived.isLoading && settledGroups().length === 0}>
+                <div class="px-3 py-2 text-xs text-v2-text-text-faint">{language.t("sidebar.empty.description")}</div>
+              </Show>
+              <For each={settledGroups()}>
+                {(group) => (
+                  <div class="flex min-w-0 flex-col">
+                    <div class="flex h-6 min-w-0 items-center gap-1.5 px-1.5">
+                      <SessionTabAvatarView
+                        project={group.project}
+                        directory={group.project.worktree}
+                        unread={false}
+                        loading={false}
                       />
-                    </TooltipV2>
+                      <span class="min-w-0 flex-1 truncate text-xs text-v2-text-text-faint">{group.name}</span>
+                    </div>
+                    <div class="flex flex-col gap-0.5 pb-1 ps-6">
+                      <For each={group.local}>
+                        {(record) => (
+                          <SidebarSessionRow
+                            record={record}
+                            server={serverKey()}
+                            current={currentSession() === record.session.id}
+                            settled
+                            pinned={isPinned(record.session.id)}
+                            tick={() => tick()}
+                            branch={branchOf}
+                            onOpen={open}
+                            onUnsettle={() => togglePin(record.session.id)}
+                          />
+                        )}
+                      </For>
+                      <For each={group.archived}>
+                        {(record) => (
+                          <SidebarSessionRow
+                            record={record}
+                            server={serverKey()}
+                            current={currentSession() === record.session.id}
+                            settled
+                            tick={() => tick()}
+                            branch={branchOf}
+                            onOpen={open}
+                            onUnsettle={() => unsettle(record.session)}
+                          />
+                        )}
+                      </For>
+                    </div>
                   </div>
-                </div>
-              )}
-            </For>
+                )}
+              </For>
+            </Show>
           </Show>
         </div>
       </ScrollView>
@@ -475,12 +623,18 @@ function SidebarProject(props: {
   server: ServerConnection.Key
   collapsed: boolean
   current: string | undefined
+  pinned: (sessionID: string) => boolean
+  started: (sessionID: string) => number | undefined
+  done: (sessionID: string) => number | undefined
   working: (sessionID: string) => boolean
+  tick: () => number
+  branch: (directory: string) => string | undefined
   unseen: () => number
   canReveal: () => boolean
   onToggleCollapsed: () => void
   onOpen: (session: { id: string; directory: string }, project: LocalProject | undefined, event?: MouseEvent) => void
   onSettle: (record: SidebarSessionRecord) => void
+  onTogglePin: (sessionID: string) => void
   onCloseTab: (record: SidebarSessionRecord) => void
   onNewSession: () => void
   onEdit: () => void
@@ -491,7 +645,6 @@ function SidebarProject(props: {
   const language = useLanguage()
   const platform = usePlatform()
   const [menuOpen, setMenuOpen] = createSignal(false)
-  const projectWorking = createMemo(() => props.group.visible.some((record) => props.working(record.session.id)))
 
   return (
     <div class="flex min-w-0 flex-col">
@@ -511,21 +664,25 @@ function SidebarProject(props: {
             project={props.group.project}
             directory={props.group.project.worktree}
             unread={props.unseen() > 0}
-            loading={projectWorking()}
+            loading={false}
           />
-          <span class="min-w-0 flex-1 truncate [font-weight:530] text-v2-text-text-base">{props.group.name}</span>
+          <span class={`${TITLE} [font-weight:530] text-v2-text-text-base group-hover/row:pe-14`}>
+            {props.group.name}
+          </span>
           <Show when={props.group.visible.length > 0}>
-            <span class="shrink-0 text-xs text-v2-text-text-faint">{props.group.visible.length}</span>
+            <span class="shrink-0 text-xs text-v2-text-text-faint transition-opacity duration-[120ms] group-hover/row:opacity-0">
+              {props.group.visible.length}
+            </span>
           </Show>
         </button>
         <div class={ROW_ACTIONS} data-menu={menuOpen()}>
-          <TooltipV2 value={language.t("command.session.new")} placement="top-end">
+          <TooltipV2 value={language.t("sidebar.thread.new")} placement="top-end">
             <IconButtonV2
               data-action="sidebar-project-new-session"
               variant="ghost-muted"
               size="small"
               icon={<IconV2 name="edit" />}
-              aria-label={language.t("command.session.new")}
+              aria-label={language.t("sidebar.thread.new")}
               onClick={props.onNewSession}
             />
           </TooltipV2>
@@ -546,7 +703,7 @@ function SidebarProject(props: {
             />
             <MenuV2.Portal>
               <MenuV2.Content>
-                <MenuV2.Item onSelect={props.onNewSession}>{language.t("command.session.new")}</MenuV2.Item>
+                <MenuV2.Item onSelect={props.onNewSession}>{language.t("sidebar.thread.new")}</MenuV2.Item>
                 <MenuV2.Item onSelect={props.onEdit}>{language.t("dialog.project.edit.title")}</MenuV2.Item>
                 <Show when={props.canReveal()}>
                   <MenuV2.Item onSelect={props.onReveal}>
@@ -568,15 +725,22 @@ function SidebarProject(props: {
       </div>
 
       <Show when={!props.collapsed}>
-        <div class="flex flex-col gap-0.5 pb-1 ps-3">
+        <div class="flex flex-col gap-0.5 pb-1 ps-6">
           <For each={props.group.visible}>
             {(record) => (
               <SidebarSessionRow
                 record={record}
                 server={props.server}
                 current={record.session.id === props.current}
+                pinned={props.pinned(record.session.id)}
+                started={() => props.started(record.session.id)}
+                done={() => props.done(record.session.id)}
+                working={() => props.working(record.session.id)}
+                tick={props.tick}
+                branch={props.branch}
                 onOpen={props.onOpen}
                 onSettle={props.onSettle}
+                onTogglePin={props.onTogglePin}
                 onCloseTab={props.onCloseTab}
               />
             )}
@@ -591,9 +755,18 @@ function SidebarSessionRow(props: {
   record: SidebarSessionRecord
   server: ServerConnection.Key
   current: boolean
+  settled?: boolean
+  pinned?: boolean
+  started?: () => number | undefined
+  done?: () => number | undefined
+  working?: () => boolean
+  tick: () => number
+  branch: (directory: string) => string | undefined
   onOpen: (session: { id: string; directory: string }, project: LocalProject | undefined, event?: MouseEvent) => void
-  onSettle: (record: SidebarSessionRecord) => void
-  onCloseTab: (record: SidebarSessionRecord) => void
+  onSettle?: (record: SidebarSessionRecord) => void
+  onTogglePin?: (sessionID: string) => void
+  onUnsettle?: () => void
+  onCloseTab?: (record: SidebarSessionRecord) => void
 }) {
   const language = useLanguage()
   const tabs = useTabs()
@@ -603,53 +776,162 @@ function SidebarSessionRow(props: {
   const status = useSessionTabAvatarState(server, directory, sessionID)
   const open = createMemo(() => sessionHasOpenTab(tabs.store, props.server, props.record.session))
   const title = createMemo(() => titleOf(props.record.session))
+  const live = createMemo(() => {
+    if (props.settled) return undefined
+    const started = props.started?.()
+    if (started !== undefined && props.working?.()) return { done: false, since: started }
+    const done = props.done?.()
+    if (done !== undefined) return { done: true, since: done }
+    return undefined
+  })
+
+  function elapsed(since: number) {
+    const seconds = Math.max(0, Math.round((props.tick() - since) / 1000))
+    if (seconds < 60) return `${seconds}s`
+    const minutes = Math.floor(seconds / 60)
+    if (minutes < 60) return `${minutes}m`
+    return `${Math.floor(minutes / 60)}h`
+  }
 
   return (
     <div class="group/row relative flex min-w-0 items-center">
-      <button
-        type="button"
-        data-action="sidebar-session"
-        data-selected={props.current ? true : undefined}
-        aria-current={props.current ? "true" : undefined}
-        onClick={(event) => props.onOpen(props.record.session, props.record.project, event)}
-        class={`${ROW} min-w-0 flex-1`}
-      >
-        <Show when={open()}>
-          <span class="absolute start-0 top-1/2 h-3.5 w-[2px] -translate-y-1/2 rounded-full bg-v2-text-text-muted" />
-        </Show>
-        <SessionTabAvatarView
-          project={props.record.project}
-          directory={props.record.session.directory}
-          revealProjectOnHover
-          unread={status.unread()}
-          loading={status.loading()}
-        />
-        <span class="min-w-0 flex-1 truncate">{title()}</span>
-      </button>
-      <div class={ROW_ACTIONS}>
-        <TooltipV2 value={language.t("command.session.archive")} placement="top-end">
-          <IconButtonV2
-            data-action="sidebar-session-settle"
-            variant="ghost-muted"
-            size="small"
-            icon={<IconV2 name="archive" />}
-            aria-label={language.t("command.session.archive")}
-            onClick={() => props.onSettle(props.record)}
+      <TooltipV2 value={<SessionInfo record={props.record} branch={() => props.branch(props.record.session.directory)} />} placement="right-start" gutter={10}>
+        <button
+          type="button"
+          data-action="sidebar-session"
+          data-selected={props.current ? true : undefined}
+          aria-current={props.current ? "true" : undefined}
+          onClick={(event) => props.onOpen(props.record.session, props.record.project, event)}
+          class={`${ROW} min-w-0 flex-1`}
+        >
+          <Show when={open()}>
+            <span class="absolute start-0 top-1/2 h-3.5 w-[2px] -translate-y-1/2 rounded-full bg-v2-text-text-muted" />
+          </Show>
+          <SessionTabAvatarView
+            project={props.record.project}
+            directory={props.record.session.directory}
+            revealProjectOnHover
+            unread={status.unread()}
+            loading={status.loading()}
           />
-        </TooltipV2>
-        <Show when={open()}>
-          <TooltipV2 value={language.t("command.tab.close")} placement="top-end">
-            <IconButtonV2
-              data-action="sidebar-session-close-tab"
-              variant="ghost-muted"
-              size="small"
-              icon={<IconV2 name="xmark-small" />}
-              aria-label={language.t("command.tab.close")}
-              onClick={() => props.onCloseTab(props.record)}
-            />
-          </TooltipV2>
+          <span class={`${TITLE} ${props.settled ? "group-hover/row:pe-8" : "group-hover/row:pe-20"}`}>{title()}</span>
+          <Show when={props.pinned}>
+            <IconV2 name="pin" class="size-3 shrink-0 text-v2-icon-icon-muted" />
+          </Show>
+          <Show when={live()}>
+            {(value) => (
+              <span class="flex shrink-0 items-center gap-1 transition-opacity duration-[120ms] group-hover/row:opacity-0">
+                <Show
+                  when={value().done}
+                  fallback={
+                    <>
+                      <SessionProgressIndicatorV2 class="size-3.5 shrink-0 text-v2-state-fg-info" />
+                      <span class="text-xs text-v2-state-fg-info">{language.t("sidebar.status.working")}</span>
+                      <span class="text-xs text-v2-state-fg-info">{elapsed(value().since)}</span>
+                    </>
+                  }
+                >
+                  <IconV2 name="check" class="size-3 shrink-0 text-v2-state-fg-success" />
+                  <span class="text-xs text-v2-state-fg-success">{language.t("sidebar.status.done")}</span>
+                </Show>
+              </span>
+            )}
+          </Show>
+        </button>
+      </TooltipV2>
+      <div class={ROW_ACTIONS}>
+        <Show when={!props.settled && props.onTogglePin}>
+          {(toggle) => (
+            <TooltipV2
+              value={language.t(props.pinned ? "sidebar.thread.unpin" : "sidebar.thread.pin")}
+              placement="top-end"
+            >
+              <IconButtonV2
+                data-action="sidebar-session-pin"
+                variant="ghost-muted"
+                size="small"
+                icon={<IconV2 name="pin" />}
+                aria-label={language.t(props.pinned ? "sidebar.thread.unpin" : "sidebar.thread.pin")}
+                onClick={() => toggle()(props.record.session.id)}
+              />
+            </TooltipV2>
+          )}
+        </Show>
+        <Show when={!props.settled && props.onSettle}>
+          {(settle) => (
+            <TooltipV2 value={language.t("sidebar.settle")} placement="top-end">
+              <IconButtonV2
+                data-action="sidebar-session-settle"
+                variant="ghost-muted"
+                size="small"
+                icon={<IconV2 name="archive" />}
+                aria-label={language.t("sidebar.settle")}
+                onClick={() => settle()(props.record)}
+              />
+            </TooltipV2>
+          )}
+        </Show>
+        <Show when={props.settled && props.onUnsettle}>
+          {(unsettle) => (
+            <TooltipV2 value={language.t("sidebar.unsettle")} placement="top-end">
+              <IconButtonV2
+                data-action="sidebar-session-unsettle"
+                variant="ghost-muted"
+                size="small"
+                icon={<IconV2 name="outline-reset" />}
+                aria-label={language.t("sidebar.unsettle")}
+                onClick={() => unsettle()}
+              />
+            </TooltipV2>
+          )}
+        </Show>
+        <Show when={!props.settled && open() && props.onCloseTab}>
+          {(close) => (
+            <TooltipV2 value={language.t("command.tab.close")} placement="top-end">
+              <IconButtonV2
+                data-action="sidebar-session-close-tab"
+                variant="ghost-muted"
+                size="small"
+                icon={<IconV2 name="xmark-small" />}
+                aria-label={language.t("command.tab.close")}
+                onClick={() => close()(props.record)}
+              />
+            </TooltipV2>
+          )}
         </Show>
       </div>
     </div>
   )
 }
+
+function SessionInfo(props: { record: SidebarSessionRecord; branch: () => string | undefined }) {
+  return (
+    <div class="flex w-56 flex-col gap-1.5 p-1">
+      <span class="truncate text-v2-text-text-base [font-weight:530]">{titleOf(props.record.session)}</span>
+      <div class="flex min-w-0 items-center gap-1.5 text-xs text-v2-text-text-muted">
+        <IconV2 name="folder" class="size-3 shrink-0 text-v2-icon-icon-muted" />
+        <span class="truncate">{props.record.name}</span>
+      </div>
+      <div class="flex min-w-0 items-center gap-1.5 text-xs text-v2-text-text-muted">
+        <IconV2 name="filetree" class="size-3 shrink-0 text-v2-icon-icon-muted" />
+        <span class="truncate">{props.record.session.directory}</span>
+      </div>
+      <Show when={props.branch()}>
+        {(branch) => (
+          <div class="flex min-w-0 items-center gap-1.5 text-xs text-v2-text-text-muted">
+            <IconV2 name="branch" class="size-3 shrink-0 text-v2-icon-icon-muted" />
+            <span class="truncate">{branch()}</span>
+          </div>
+        )}
+      </Show>
+      <Show when={props.record.session.model}>
+        {(model) => (
+          <div class="flex min-w-0 items-center gap-1.5 text-xs text-v2-text-text-muted">
+            <ProviderIcon id={model().providerID} class="size-3 shrink-0" />
+            <span class="truncate">{model().id}</span>
+          </div>
+        )}
+      </Show>
+    </div>
+  )
+}
diff --git a/packages/ui/src/v2/components/icon.tsx b/packages/ui/src/v2/components/icon.tsx
index b22d3140fe58..0046df8f1836 100644
--- a/packages/ui/src/v2/components/icon.tsx
+++ b/packages/ui/src/v2/components/icon.tsx
@@ -149,6 +149,10 @@ const icons = {
     viewBox: "0 0 16 16",
     body: `<path d="M13.1112 13.5555V14.0555H13.6112V13.5555H13.1112ZM2.889 13.5555H2.389L2.389 14.0555H2.889V13.5555ZM3.38901 5.55546L3.38901 5.05546L2.38901 5.05546L2.38901 5.55546L2.88901 5.55546L3.38901 5.55546ZM14.4446 2.44434H14.9446V1.94434L14.4446 1.94434L14.4446 2.44434ZM14.4446 5.55545L14.4446 6.05545L14.9446 6.05545V5.55545H14.4446ZM1.55566 5.55546L1.05566 5.55545L1.05566 6.05546L1.55566 6.05546L1.55566 5.55546ZM1.5557 2.44436L1.5557 1.94436L1.05571 1.94436L1.0557 2.44435L1.5557 2.44436ZM13.1112 5.55546H12.6112V13.5555H13.1112H13.6112V5.55546H13.1112ZM2.889 13.5555H3.389L3.38901 5.55546L2.88901 5.55546L2.38901 5.55546L2.389 13.5555H2.889ZM14.4446 2.44434H13.9446V5.55545H14.4446H14.9446V2.44434H14.4446ZM1.55566 5.55546L2.05566 5.55547L2.0557 2.44436L1.5557 2.44436L1.0557 2.44435L1.05566 5.55545L1.55566 5.55546ZM6.22234 8.22213V8.72213H9.7779V8.22213V7.72213H6.22234V8.22213ZM13.1112 13.5555V13.0555H2.889V13.5555V14.0555H13.1112V13.5555ZM1.5557 2.44436L1.5557 2.94436L14.4446 2.94434L14.4446 2.44434L14.4446 1.94434L1.5557 1.94436L1.5557 2.44436ZM14.4446 5.55545L14.4446 5.05545L1.55566 5.05546L1.55566 5.55546L1.55566 6.05546L14.4446 6.05545L14.4446 5.55545Z" fill="currentColor"/>`,
   },
+  pin: {
+    viewBox: "0 0 24 24",
+    body: `<path d="M12 17v5" stroke="currentColor" stroke-linecap="square"/><path d="M9 10.76a2 2 0 0 1-1.11 1.79l-1.78.9A2 2 0 0 0 5 15.24V16a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-.76a2 2 0 0 0-1.11-1.79l-1.78-.9A2 2 0 0 1 15 10.76V7a1 1 0 0 1 1-1 2 2 0 0 0 0-4H8a2 2 0 0 0 0 4 1 1 0 0 1 1 1z" fill="none" stroke="currentColor"/>`,
+  },
 }
 
 const spriteID = "opencode-v2-icon-sprite"

From 364e2964cdac435970a3e0bab13606654e094ba8 Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Fri, 11 Sep 2026 16:35:07 +0300
Subject: [PATCH 06/14] fix(app): align sidebar row geometry, settled groups
 and attention status

---
 packages/app/src/i18n/am.ts                   |   1 +
 packages/app/src/i18n/ar.ts                   |   1 +
 packages/app/src/i18n/az.ts                   |   1 +
 packages/app/src/i18n/bg.ts                   |   1 +
 packages/app/src/i18n/bn.ts                   |   1 +
 packages/app/src/i18n/br.ts                   |   1 +
 packages/app/src/i18n/bs.ts                   |   1 +
 packages/app/src/i18n/ca.ts                   |   1 +
 packages/app/src/i18n/cs.ts                   |   1 +
 packages/app/src/i18n/da.ts                   |   1 +
 packages/app/src/i18n/de.ts                   |   1 +
 packages/app/src/i18n/dv.ts                   |   1 +
 packages/app/src/i18n/dz.ts                   |   1 +
 packages/app/src/i18n/el.ts                   |   1 +
 packages/app/src/i18n/en.ts                   |   1 +
 packages/app/src/i18n/es.ts                   |   1 +
 packages/app/src/i18n/et.ts                   |   1 +
 packages/app/src/i18n/fa.ts                   |   1 +
 packages/app/src/i18n/fi.ts                   |   1 +
 packages/app/src/i18n/fo.ts                   |   1 +
 packages/app/src/i18n/fr.ts                   |   1 +
 packages/app/src/i18n/hi.ts                   |   1 +
 packages/app/src/i18n/hr.ts                   |   1 +
 packages/app/src/i18n/hu.ts                   |   1 +
 packages/app/src/i18n/hy.ts                   |   1 +
 packages/app/src/i18n/id.ts                   |   1 +
 packages/app/src/i18n/is.ts                   |   1 +
 packages/app/src/i18n/it.ts                   |   1 +
 packages/app/src/i18n/ja.ts                   |   1 +
 packages/app/src/i18n/ka.ts                   |   1 +
 packages/app/src/i18n/km.ts                   |   1 +
 packages/app/src/i18n/ko.ts                   |   1 +
 packages/app/src/i18n/lo.ts                   |   1 +
 packages/app/src/i18n/lt.ts                   |   1 +
 packages/app/src/i18n/lv.ts                   |   1 +
 packages/app/src/i18n/mk.ts                   |   1 +
 packages/app/src/i18n/mn.ts                   |   1 +
 packages/app/src/i18n/ms.ts                   |   1 +
 packages/app/src/i18n/my.ts                   |   1 +
 packages/app/src/i18n/ne.ts                   |   1 +
 packages/app/src/i18n/nl.ts                   |   1 +
 packages/app/src/i18n/no.ts                   |   1 +
 packages/app/src/i18n/pa.ts                   |   1 +
 packages/app/src/i18n/pl.ts                   |   1 +
 packages/app/src/i18n/ro.ts                   |   1 +
 packages/app/src/i18n/ru.ts                   |   1 +
 packages/app/src/i18n/si.ts                   |   1 +
 packages/app/src/i18n/sk.ts                   |   1 +
 packages/app/src/i18n/sl.ts                   |   1 +
 packages/app/src/i18n/sq.ts                   |   1 +
 packages/app/src/i18n/sr.ts                   |   1 +
 packages/app/src/i18n/sv.ts                   |   1 +
 packages/app/src/i18n/tg.ts                   |   1 +
 packages/app/src/i18n/th.ts                   |   1 +
 packages/app/src/i18n/tk.ts                   |   1 +
 packages/app/src/i18n/tr.ts                   |   1 +
 packages/app/src/i18n/uk.ts                   |   1 +
 packages/app/src/i18n/ur.ts                   |   1 +
 packages/app/src/i18n/uz.ts                   |   1 +
 packages/app/src/i18n/vi.ts                   |   1 +
 packages/app/src/i18n/zh.ts                   |   1 +
 packages/app/src/i18n/zht.ts                  |   1 +
 .../src/pages/layout/navigation-sidebar.tsx   | 275 ++++++++++--------
 .../src/pages/layout/project-avatar-state.ts  |   2 +-
 64 files changed, 222 insertions(+), 117 deletions(-)

diff --git a/packages/app/src/i18n/am.ts b/packages/app/src/i18n/am.ts
index 8191dfc2af9c..f4dfb541f9dc 100644
--- a/packages/app/src/i18n/am.ts
+++ b/packages/app/src/i18n/am.ts
@@ -868,6 +868,7 @@ export const dict = {
   "sidebar.thread.unpin": "ኪውን አውልቅ",
   "sidebar.status.working": "በስራ ላይ",
   "sidebar.status.done": "ተጠናቀቀ",
+  "sidebar.status.attention": "ግቤት ያስልጋል",
   "debugBar.ariaLabel": "የልማት አፈጻጸም ምርመራዎች",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/ar.ts b/packages/app/src/i18n/ar.ts
index 05a862502760..5a48a319b8d2 100644
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -835,6 +835,7 @@ export const dict = {
   "sidebar.thread.unpin": "إلغاء تثبيت المحادثة",
   "sidebar.status.working": "يعمل",
   "sidebar.status.done": "تم",
+  "sidebar.status.attention": "يحتاج إدخال",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "سطح المكتب",
   "settings.section.server": "الخادم",
diff --git a/packages/app/src/i18n/az.ts b/packages/app/src/i18n/az.ts
index 3123a141d29d..e2e6a311ae61 100644
--- a/packages/app/src/i18n/az.ts
+++ b/packages/app/src/i18n/az.ts
@@ -894,6 +894,7 @@ export const dict = {
   "sidebar.thread.unpin": "Bərkitməni ləğv et",
   "sidebar.status.working": "İşləyir",
   "sidebar.status.done": "Hazır",
+  "sidebar.status.attention": "Giriş lazımdır",
   "debugBar.ariaLabel": "Tərtibatçı performans diaqnostikası",
   "debugBar.na": "yox",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/bg.ts b/packages/app/src/i18n/bg.ts
index 5adf47d6985a..d41fac121af3 100644
--- a/packages/app/src/i18n/bg.ts
+++ b/packages/app/src/i18n/bg.ts
@@ -890,6 +890,7 @@ export const dict = {
   "sidebar.thread.unpin": "Откачи нишка",
   "sidebar.status.working": "В процес",
   "sidebar.status.done": "Готово",
+  "sidebar.status.attention": "Нужен е вход",
   "debugBar.ariaLabel": "Диагностика на ефективността на разработката",
   "debugBar.na": "няма",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/bn.ts b/packages/app/src/i18n/bn.ts
index 8a8f894e436f..23db30d134dc 100644
--- a/packages/app/src/i18n/bn.ts
+++ b/packages/app/src/i18n/bn.ts
@@ -884,6 +884,7 @@ export const dict: Record<string, string> = {
   "sidebar.thread.unpin": "পিন সরান",
   "sidebar.status.working": "কাজ চলছে",
   "sidebar.status.done": "সম্পন্ন",
+  "sidebar.status.attention": "ইনপুট প্রয়োজন",
   "debugBar.ariaLabel": "উন্নয়ন কর্মক্ষমতা ডায়গনিস্টিক",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "এনএভি",
diff --git a/packages/app/src/i18n/br.ts b/packages/app/src/i18n/br.ts
index cbb829ffc281..7eec488d1ab9 100644
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -838,6 +838,7 @@ export const dict = {
   "sidebar.thread.unpin": "Dibilhennañ an neudenn",
   "sidebar.status.working": "O labourat",
   "sidebar.status.done": "Echu",
+  "sidebar.status.attention": "Ezhomm moned",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
   "settings.section.server": "Servidor",
diff --git a/packages/app/src/i18n/bs.ts b/packages/app/src/i18n/bs.ts
index cb18883ead89..2a7cb67ffb4e 100644
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -899,6 +899,7 @@ export const dict = {
   "sidebar.thread.unpin": "Otkvači nit",
   "sidebar.status.working": "U toku",
   "sidebar.status.done": "Gotovo",
+  "sidebar.status.attention": "Potreban unos",
 
   "app.name.desktop": "OpenCode Desktop",
 
diff --git a/packages/app/src/i18n/ca.ts b/packages/app/src/i18n/ca.ts
index 1faaa0bccd2e..16c9f96f29d8 100644
--- a/packages/app/src/i18n/ca.ts
+++ b/packages/app/src/i18n/ca.ts
@@ -894,6 +894,7 @@ export const dict = {
   "sidebar.thread.unpin": "Desfixa el fil",
   "sidebar.status.working": "Treballant",
   "sidebar.status.done": "Fet",
+  "sidebar.status.attention": "Cal entrada",
   "debugBar.ariaLabel": "Diagnòstic de rendiment del desenvolupament",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/cs.ts b/packages/app/src/i18n/cs.ts
index 399e4ed0cff7..0c85f6ca9a84 100644
--- a/packages/app/src/i18n/cs.ts
+++ b/packages/app/src/i18n/cs.ts
@@ -890,6 +890,7 @@ export const dict = {
   "sidebar.thread.unpin": "Odepnout vlákno",
   "sidebar.status.working": "Pracuje",
   "sidebar.status.done": "Hotovo",
+  "sidebar.status.attention": "Vyžaduje vstup",
   "debugBar.ariaLabel": "Diagnostika vývoje výkonnosti",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/da.ts b/packages/app/src/i18n/da.ts
index a345ff06a657..278ae779aa1d 100644
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -776,6 +776,7 @@ export const dict = {
   "sidebar.thread.unpin": "Frigør tråd",
   "sidebar.status.working": "Arbejder",
   "sidebar.status.done": "Færdig",
+  "sidebar.status.attention": "Kræver input",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
diff --git a/packages/app/src/i18n/de.ts b/packages/app/src/i18n/de.ts
index 9e061722248f..06d26d040b74 100644
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -729,6 +729,7 @@ export const dict = {
   "sidebar.thread.unpin": "Thread loslösen",
   "sidebar.status.working": "In Arbeit",
   "sidebar.status.done": "Fertig",
+  "sidebar.status.attention": "Eingabe erforderlich",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Desktop",
   "settings.section.server": "Server",
diff --git a/packages/app/src/i18n/dv.ts b/packages/app/src/i18n/dv.ts
index 837b840bc761..73398393a7f9 100644
--- a/packages/app/src/i18n/dv.ts
+++ b/packages/app/src/i18n/dv.ts
@@ -898,6 +898,7 @@ export const dict = {
   "sidebar.thread.unpin": "ޕިން ނަގާ",
   "sidebar.status.working": "މަސައްކަތް ކުރަމުން",
   "sidebar.status.done": "ނިމިއްޖެ",
+  "sidebar.status.attention": "އިންޕުޓް ބޭނުން",
   "debugBar.ariaLabel": "ޑިވެލޮޕްމަންޓް ޕާފޯމަންސް ޑައިގްނޯސްޓިކްސް",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV އެވެ",
diff --git a/packages/app/src/i18n/dz.ts b/packages/app/src/i18n/dz.ts
index 335385ffc016..50c9d8d1a17c 100644
--- a/packages/app/src/i18n/dz.ts
+++ b/packages/app/src/i18n/dz.ts
@@ -899,6 +899,7 @@ export const dict: Record<string, string> = {
   "sidebar.thread.unpin": "བཀག་སྒྲིལ་བཏོན།",
   "sidebar.status.working": "ལཱ་འབད་བཞིན།",
   "sidebar.status.done": "འགྲུབ་ཅི།",
+  "sidebar.status.attention": "ནང་བྱུག་དགོས།",
   "debugBar.ariaLabel": "གོང་འཕེལ་གྱི་ལས་དོན་བརྟག་དཔྱད།",
   "debugBar.na": "ན/ཨེ།",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/el.ts b/packages/app/src/i18n/el.ts
index 2b9b31edb05e..5bd26e954efc 100644
--- a/packages/app/src/i18n/el.ts
+++ b/packages/app/src/i18n/el.ts
@@ -893,6 +893,7 @@ export const dict = {
   "sidebar.thread.unpin": "Ξεκαρφίτσωμα νήματος",
   "sidebar.status.working": "Σε εργασία",
   "sidebar.status.done": "Ολοκληρώθηκε",
+  "sidebar.status.attention": "Απαιτεί είσοδο",
   "debugBar.ariaLabel": "Διαγνωστικά απόδοσης ανάπτυξης",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/en.ts b/packages/app/src/i18n/en.ts
index 0f0670ec38ea..3714d1b696fb 100644
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -862,6 +862,7 @@ export const dict = {
   "sidebar.thread.unpin": "Unpin thread",
   "sidebar.status.working": "Working",
   "sidebar.status.done": "Done",
+  "sidebar.status.attention": "Needs input",
 
   "debugBar.ariaLabel": "Development performance diagnostics",
   "debugBar.na": "n/a",
diff --git a/packages/app/src/i18n/es.ts b/packages/app/src/i18n/es.ts
index d8c8eb430db2..b76bdd023fe5 100644
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -904,6 +904,7 @@ export const dict = {
   "sidebar.thread.unpin": "Desfijar hilo",
   "sidebar.status.working": "Trabajando",
   "sidebar.status.done": "Listo",
+  "sidebar.status.attention": "Requiere entrada",
 
   "app.name.desktop": "OpenCode Desktop",
 
diff --git a/packages/app/src/i18n/et.ts b/packages/app/src/i18n/et.ts
index 6a346d2a43d4..37dc9d2003d0 100644
--- a/packages/app/src/i18n/et.ts
+++ b/packages/app/src/i18n/et.ts
@@ -880,6 +880,7 @@ export const dict = {
   "sidebar.thread.unpin": "Eemalda kinnitus",
   "sidebar.status.working": "Töötab",
   "sidebar.status.done": "Valmis",
+  "sidebar.status.attention": "Vajab sisendit",
   "debugBar.ariaLabel": "Arendustegevuse diagnostika",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/fa.ts b/packages/app/src/i18n/fa.ts
index b3d1a8729f63..12ac08c5bdaa 100644
--- a/packages/app/src/i18n/fa.ts
+++ b/packages/app/src/i18n/fa.ts
@@ -883,6 +883,7 @@ export const dict = {
   "sidebar.thread.unpin": "برداشتن سنجاق",
   "sidebar.status.working": "در حال کار",
   "sidebar.status.done": "انجام شد",
+  "sidebar.status.attention": "ورودی لازم است",
   "debugBar.ariaLabel": "تشخیص عملکرد توسعه",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/fi.ts b/packages/app/src/i18n/fi.ts
index 38d41dbfc059..2941ac139866 100644
--- a/packages/app/src/i18n/fi.ts
+++ b/packages/app/src/i18n/fi.ts
@@ -784,6 +784,7 @@ export const dict = {
   "sidebar.thread.unpin": "Irrota ketju",
   "sidebar.status.working": "Käynnissä",
   "sidebar.status.done": "Valmis",
+  "sidebar.status.attention": "Tarvitsee syötteen",
   "debugBar.ariaLabel": "Kehityksen suorituskyvyn diagnostiikka",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/fo.ts b/packages/app/src/i18n/fo.ts
index 41ba5ed52587..49c653c6534d 100644
--- a/packages/app/src/i18n/fo.ts
+++ b/packages/app/src/i18n/fo.ts
@@ -885,6 +885,7 @@ export const dict = {
   "sidebar.thread.unpin": "Losa tráð",
   "sidebar.status.working": "Arbeiðir",
   "sidebar.status.done": "Liðugt",
+  "sidebar.status.attention": "Krevur inndata",
   "debugBar.ariaLabel": "Menningar avriksdiagnostikk",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/fr.ts b/packages/app/src/i18n/fr.ts
index 6842bb1eb25a..1c4a7d5de48b 100644
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -843,6 +843,7 @@ export const dict = {
   "sidebar.thread.unpin": "Désépingler le fil",
   "sidebar.status.working": "En cours",
   "sidebar.status.done": "Terminé",
+  "sidebar.status.attention": "Saisie requise",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Application de bureau",
   "settings.section.server": "Serveur",
diff --git a/packages/app/src/i18n/hi.ts b/packages/app/src/i18n/hi.ts
index ca013c849601..a67df43db66c 100644
--- a/packages/app/src/i18n/hi.ts
+++ b/packages/app/src/i18n/hi.ts
@@ -894,6 +894,7 @@ export const dict = {
   "sidebar.thread.unpin": "पिन हटाएँ",
   "sidebar.status.working": "कार्य में",
   "sidebar.status.done": "पूर्ण",
+  "sidebar.status.attention": "इनपुट आवश्यक",
   "debugBar.ariaLabel": "विकास प्रदर्शन निदान",
   "debugBar.na": "एन/ए",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/hr.ts b/packages/app/src/i18n/hr.ts
index a59881c42270..6e185bde7e58 100644
--- a/packages/app/src/i18n/hr.ts
+++ b/packages/app/src/i18n/hr.ts
@@ -893,6 +893,7 @@ export const dict = {
   "sidebar.thread.unpin": "Otkvači nit",
   "sidebar.status.working": "U tijeku",
   "sidebar.status.done": "Gotovo",
+  "sidebar.status.attention": "Potreban unos",
   "debugBar.ariaLabel": "Dijagnostika izvedbe razvoja",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/hu.ts b/packages/app/src/i18n/hu.ts
index e3389bd1ece1..343ccf1223ed 100644
--- a/packages/app/src/i18n/hu.ts
+++ b/packages/app/src/i18n/hu.ts
@@ -892,6 +892,7 @@ export const dict = {
   "sidebar.thread.unpin": "Rögzítés feloldása",
   "sidebar.status.working": "Dolgozik",
   "sidebar.status.done": "Kész",
+  "sidebar.status.attention": "Bemenet szükséges",
   "debugBar.ariaLabel": "Fejlesztési teljesítmény diagnosztika",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/hy.ts b/packages/app/src/i18n/hy.ts
index 537c2c6cc98f..1c2a2ca9e957 100644
--- a/packages/app/src/i18n/hy.ts
+++ b/packages/app/src/i18n/hy.ts
@@ -891,6 +891,7 @@ export const dict = {
   "sidebar.thread.unpin": "Գամը հանել",
   "sidebar.status.working": "Աշխատում է",
   "sidebar.status.done": "Պատրաստ է",
+  "sidebar.status.attention": "Պահանջում է ներածում",
   "debugBar.ariaLabel": "Զարգացման կատարողականի ախտորոշում",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/id.ts b/packages/app/src/i18n/id.ts
index 67763cdda14d..358b1a79867b 100644
--- a/packages/app/src/i18n/id.ts
+++ b/packages/app/src/i18n/id.ts
@@ -961,6 +961,7 @@ export const dict = {
   "sidebar.thread.unpin": "Lepaskan sematan",
   "sidebar.status.working": "Sedang bekerja",
   "sidebar.status.done": "Selesai",
+  "sidebar.status.attention": "Perlu masukan",
 
   "debugBar.ariaLabel": "Diagnostik kinerja pengembangan",
   "debugBar.na": "n/a",
diff --git a/packages/app/src/i18n/is.ts b/packages/app/src/i18n/is.ts
index de63063596fe..ff20fac92667 100644
--- a/packages/app/src/i18n/is.ts
+++ b/packages/app/src/i18n/is.ts
@@ -888,6 +888,7 @@ export const dict = {
   "sidebar.thread.unpin": "Losa þráð",
   "sidebar.status.working": "Í vinnslu",
   "sidebar.status.done": "Lokið",
+  "sidebar.status.attention": "Þarf inntak",
   "debugBar.ariaLabel": "Þróunarárangursgreiningar",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/it.ts b/packages/app/src/i18n/it.ts
index 2bb69f929ae4..c33696371eff 100644
--- a/packages/app/src/i18n/it.ts
+++ b/packages/app/src/i18n/it.ts
@@ -804,6 +804,7 @@ export const dict = {
   "sidebar.thread.unpin": "Rimuovi fissaggio",
   "sidebar.status.working": "In lavorazione",
   "sidebar.status.done": "Fatto",
+  "sidebar.status.attention": "Richiede input",
   "debugBar.ariaLabel": "Diagnostica delle prestazioni di sviluppo",
   "debugBar.na": "n/d",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/ja.ts b/packages/app/src/i18n/ja.ts
index eb1664510422..09516347df8b 100644
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -823,6 +823,7 @@ export const dict = {
   "sidebar.thread.unpin": "ピン留めを解除",
   "sidebar.status.working": "作業中",
   "sidebar.status.done": "完了",
+  "sidebar.status.attention": "入力が必要",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "デスクトップ",
   "settings.section.server": "サーバー",
diff --git a/packages/app/src/i18n/ka.ts b/packages/app/src/i18n/ka.ts
index a3a71900268f..d339d34e89ee 100644
--- a/packages/app/src/i18n/ka.ts
+++ b/packages/app/src/i18n/ka.ts
@@ -884,6 +884,7 @@ export const dict = {
   "sidebar.thread.unpin": "მიმაგრების მოხსნა",
   "sidebar.status.working": "მუშაობს",
   "sidebar.status.done": "შესრულდა",
+  "sidebar.status.attention": "საჭიროებს შეყვანას",
   "debugBar.ariaLabel": "განვითარების შესრულების დიაგნოსტიკა",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/km.ts b/packages/app/src/i18n/km.ts
index 8aa14d58e9bd..682a6d0a05cb 100644
--- a/packages/app/src/i18n/km.ts
+++ b/packages/app/src/i18n/km.ts
@@ -881,6 +881,7 @@ export const dict = {
   "sidebar.thread.unpin": "ដកខ្ទាស់សន្ទនា",
   "sidebar.status.working": "កំពុងធ្វើការ",
   "sidebar.status.done": "រួចរាល់",
+  "sidebar.status.attention": "ត្រូវការការបញ្ចូល",
   "debugBar.ariaLabel": "ការវិនិច្ឆ័យដំណើរការអភិវឌ្ឍន៍",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/ko.ts b/packages/app/src/i18n/ko.ts
index ccff8e364a82..c30733b20747 100644
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -1030,6 +1030,7 @@ export const dict = {
   "sidebar.thread.unpin": "스레드 고정 해제",
   "sidebar.status.working": "작업 중",
   "sidebar.status.done": "완료",
+  "sidebar.status.attention": "입력 필요",
 
   "settings.general.section.advanced": "고급",
   "settings.general.row.shell.title": "터미널 셸",
diff --git a/packages/app/src/i18n/lo.ts b/packages/app/src/i18n/lo.ts
index 02eab838a73b..a3fb1893da5d 100644
--- a/packages/app/src/i18n/lo.ts
+++ b/packages/app/src/i18n/lo.ts
@@ -879,6 +879,7 @@ export const dict = {
   "sidebar.thread.unpin": "ຍົກເລີກການປັກໝຸດ",
   "sidebar.status.working": "ກຳລັງເຮັດວຽກ",
   "sidebar.status.done": "ສຳເລັດ",
+  "sidebar.status.attention": "ຕ້ອງການຂໍ້ມູນປ້ອນ",
   "debugBar.ariaLabel": "ການວິນິດໄສປະສິດທິພາບການພັດທະນາ",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/lt.ts b/packages/app/src/i18n/lt.ts
index 1988c32ac031..dbd2a23bfa33 100644
--- a/packages/app/src/i18n/lt.ts
+++ b/packages/app/src/i18n/lt.ts
@@ -898,6 +898,7 @@ export const dict = {
   "sidebar.thread.unpin": "Atsegti giją",
   "sidebar.status.working": "Veikia",
   "sidebar.status.done": "Atlikta",
+  "sidebar.status.attention": "Reikia įvesties",
   "debugBar.ariaLabel": "Vystymosi veiklos diagnostika",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/lv.ts b/packages/app/src/i18n/lv.ts
index 0c8e8cae0e41..dc79c14b7071 100644
--- a/packages/app/src/i18n/lv.ts
+++ b/packages/app/src/i18n/lv.ts
@@ -890,6 +890,7 @@ export const dict = {
   "sidebar.thread.unpin": "Atspraust pavedienu",
   "sidebar.status.working": "Strādā",
   "sidebar.status.done": "Gatavs",
+  "sidebar.status.attention": "Nepieciešama ievade",
   "debugBar.ariaLabel": "Izstrādes veiktspējas diagnostika",
   "debugBar.na": "nav",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/mk.ts b/packages/app/src/i18n/mk.ts
index 61912b716156..9a504725138f 100644
--- a/packages/app/src/i18n/mk.ts
+++ b/packages/app/src/i18n/mk.ts
@@ -888,6 +888,7 @@ export const dict = {
   "sidebar.thread.unpin": "Откачи нишка",
   "sidebar.status.working": "Во тек",
   "sidebar.status.done": "Готово",
+  "sidebar.status.attention": "Потребен е внес",
   "debugBar.ariaLabel": "Дијагностика на перформансите на развојот",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/mn.ts b/packages/app/src/i18n/mn.ts
index 314937f90926..671cacf51bd5 100644
--- a/packages/app/src/i18n/mn.ts
+++ b/packages/app/src/i18n/mn.ts
@@ -892,6 +892,7 @@ export const dict = {
   "sidebar.thread.unpin": "Зүүсийг авах",
   "sidebar.status.working": "Ажиллаж байна",
   "sidebar.status.done": "Дууссан",
+  "sidebar.status.attention": "Оролт шаардлагатай",
   "debugBar.ariaLabel": "Хөгжлийн гүйцэтгэлийн оношлогоо",
   "debugBar.na": "үгүй",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/ms.ts b/packages/app/src/i18n/ms.ts
index 341dcfa8c38e..9e1e878896b4 100644
--- a/packages/app/src/i18n/ms.ts
+++ b/packages/app/src/i18n/ms.ts
@@ -884,6 +884,7 @@ export const dict = {
   "sidebar.thread.unpin": "Nyahsematkan bebenang",
   "sidebar.status.working": "Sedang bekerja",
   "sidebar.status.done": "Siap",
+  "sidebar.status.attention": "Perlu input",
   "debugBar.ariaLabel": "Diagnostik prestasi pembangunan",
   "debugBar.na": "tiada",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/my.ts b/packages/app/src/i18n/my.ts
index aa9c82bcac5d..acba84762967 100644
--- a/packages/app/src/i18n/my.ts
+++ b/packages/app/src/i18n/my.ts
@@ -894,6 +894,7 @@ export const dict = {
   "sidebar.thread.unpin": "ပင်ထိုးခြင်းကို ဖယ်ရှား",
   "sidebar.status.working": "လုပ်ဆောင်နေသည်",
   "sidebar.status.done": "ပြီးစီး",
+  "sidebar.status.attention": "အဝင်လိုအပ်သည်",
   "debugBar.ariaLabel": "ဖွံ့ဖြိုးတိုးတက်မှု စွမ်းဆောင်ရည် အဖြေရှာခြင်း",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/ne.ts b/packages/app/src/i18n/ne.ts
index fdde12508b26..5f106482334f 100644
--- a/packages/app/src/i18n/ne.ts
+++ b/packages/app/src/i18n/ne.ts
@@ -885,6 +885,7 @@ export const dict: Record<string, string> = {
   "sidebar.thread.unpin": "पिन हटाउनुहोस्",
   "sidebar.status.working": "काम हुँदै",
   "sidebar.status.done": "सम्पन्न",
+  "sidebar.status.attention": "इनपुट आवश्यक",
   "debugBar.ariaLabel": "विकास प्रदर्शन निदान",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/nl.ts b/packages/app/src/i18n/nl.ts
index 20dc70b9bf26..0eaca3ec4281 100644
--- a/packages/app/src/i18n/nl.ts
+++ b/packages/app/src/i18n/nl.ts
@@ -894,6 +894,7 @@ export const dict = {
   "sidebar.thread.unpin": "Thread losmaken",
   "sidebar.status.working": "Bezig",
   "sidebar.status.done": "Klaar",
+  "sidebar.status.attention": "Invoer nodig",
   "debugBar.ariaLabel": "Diagnostiek voor ontwikkelprestaties",
   "debugBar.na": "n.v.t.",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/no.ts b/packages/app/src/i18n/no.ts
index ff79d5f1501e..0a4830576ac3 100644
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -1243,6 +1243,7 @@ export const dict = {
   "sidebar.thread.unpin": "Løsne tråd",
   "sidebar.status.working": "Arbeider",
   "sidebar.status.done": "Ferdig",
+  "sidebar.status.attention": "Trenger inndata",
 
   "settings.general.section.advanced": "Avansert",
   "settings.general.row.shell.title": "Terminalskall",
diff --git a/packages/app/src/i18n/pa.ts b/packages/app/src/i18n/pa.ts
index ff49bb196474..41680bc32de5 100644
--- a/packages/app/src/i18n/pa.ts
+++ b/packages/app/src/i18n/pa.ts
@@ -892,6 +892,7 @@ export const dict = {
   "sidebar.thread.unpin": "ਪਿੰਨ ਹਟਾਓ",
   "sidebar.status.working": "ਕੰਮ ਚੱਲ ਰਿਹਾ",
   "sidebar.status.done": "ਮੁਕੰਮਲ",
+  "sidebar.status.attention": "ਇਨਪੁਟ ਚਾਹੀਦਾ",
   "debugBar.ariaLabel": "ترقی دی کارکردگی دی تشخیص",
   "debugBar.na": "لاگو نئیں",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/pl.ts b/packages/app/src/i18n/pl.ts
index 6344b49e2cd7..4180ef09552a 100644
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -839,6 +839,7 @@ export const dict = {
   "sidebar.thread.unpin": "Odepnij wątek",
   "sidebar.status.working": "W trakcie",
   "sidebar.status.done": "Gotowe",
+  "sidebar.status.attention": "Wymaga danych",
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Aplikacja komputerowa",
   "settings.section.server": "Serwer",
diff --git a/packages/app/src/i18n/ro.ts b/packages/app/src/i18n/ro.ts
index 7e77b59755ba..2ad3d49fa8b9 100644
--- a/packages/app/src/i18n/ro.ts
+++ b/packages/app/src/i18n/ro.ts
@@ -889,6 +889,7 @@ export const dict = {
   "sidebar.thread.unpin": "Anulează fixarea",
   "sidebar.status.working": "Lucrează",
   "sidebar.status.done": "Gata",
+  "sidebar.status.attention": "Necesită introducere",
   "debugBar.ariaLabel": "Diagnosticare performanță dezvoltare",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/ru.ts b/packages/app/src/i18n/ru.ts
index a63139c619eb..135b6be0bc0f 100644
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -902,6 +902,7 @@ export const dict = {
   "sidebar.thread.unpin": "Открепить тред",
   "sidebar.status.working": "В работе",
   "sidebar.status.done": "Готово",
+  "sidebar.status.attention": "Нужен ввод",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "Приложение",
diff --git a/packages/app/src/i18n/si.ts b/packages/app/src/i18n/si.ts
index 8d4daa24d323..434379b60894 100644
--- a/packages/app/src/i18n/si.ts
+++ b/packages/app/src/i18n/si.ts
@@ -882,6 +882,7 @@ export const dict: Record<string, string> = {
   "sidebar.thread.unpin": "ඇමුණුම ඉවත් කරන්න",
   "sidebar.status.working": "ක්‍රියාත්මකයි",
   "sidebar.status.done": "අවසන්",
+  "sidebar.status.attention": "ඇතුළත් කිරීමක් අවශ්‍යයි",
   "debugBar.ariaLabel": "සංවර්ධන කාර්ය සාධන රෝග විනිශ්චය",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/sk.ts b/packages/app/src/i18n/sk.ts
index 4d72f1a1c33e..b815225bab8e 100644
--- a/packages/app/src/i18n/sk.ts
+++ b/packages/app/src/i18n/sk.ts
@@ -888,6 +888,7 @@ export const dict = {
   "sidebar.thread.unpin": "Odopnúť vlákno",
   "sidebar.status.working": "Pracuje",
   "sidebar.status.done": "Hotovo",
+  "sidebar.status.attention": "Vyžaduje vstup",
   "debugBar.ariaLabel": "Diagnostika výkonu vývoja",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/sl.ts b/packages/app/src/i18n/sl.ts
index 150d6f799445..ebebba67007b 100644
--- a/packages/app/src/i18n/sl.ts
+++ b/packages/app/src/i18n/sl.ts
@@ -889,6 +889,7 @@ export const dict = {
   "sidebar.thread.unpin": "Odpni nit",
   "sidebar.status.working": "V teku",
   "sidebar.status.done": "Končano",
+  "sidebar.status.attention": "Potreben vnos",
   "debugBar.ariaLabel": "Diagnostika uspešnosti razvoja",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/sq.ts b/packages/app/src/i18n/sq.ts
index 407fa380bb4d..d1c9b6203ba8 100644
--- a/packages/app/src/i18n/sq.ts
+++ b/packages/app/src/i18n/sq.ts
@@ -887,6 +887,7 @@ export const dict = {
   "sidebar.thread.unpin": "Hiq kapësen",
   "sidebar.status.working": "Po punon",
   "sidebar.status.done": "Përfundoi",
+  "sidebar.status.attention": "Kërkon input",
   "debugBar.ariaLabel": "Diagnostifikimi i performancës së zhvillimit",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/sr.ts b/packages/app/src/i18n/sr.ts
index e7bbcccaee5f..1dd7a64b8a42 100644
--- a/packages/app/src/i18n/sr.ts
+++ b/packages/app/src/i18n/sr.ts
@@ -888,6 +888,7 @@ export const dict = {
   "sidebar.thread.unpin": "Откачи нит",
   "sidebar.status.working": "У току",
   "sidebar.status.done": "Готово",
+  "sidebar.status.attention": "Потребан унос",
   "debugBar.ariaLabel": "Дијагностика перформанси развоја",
   "debugBar.na": "н/а",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/sv.ts b/packages/app/src/i18n/sv.ts
index 7f5e4c6aacb5..7121eea22bfe 100644
--- a/packages/app/src/i18n/sv.ts
+++ b/packages/app/src/i18n/sv.ts
@@ -889,6 +889,7 @@ export const dict = {
   "sidebar.thread.unpin": "Lossa tråd",
   "sidebar.status.working": "Arbetar",
   "sidebar.status.done": "Klar",
+  "sidebar.status.attention": "Kräver indata",
   "debugBar.ariaLabel": "Utvecklingsprestandadiagnostik",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/tg.ts b/packages/app/src/i18n/tg.ts
index 8fa02641947b..c8aeb3b9e0bf 100644
--- a/packages/app/src/i18n/tg.ts
+++ b/packages/app/src/i18n/tg.ts
@@ -888,6 +888,7 @@ export const dict = {
   "sidebar.thread.unpin": "Маҳкамро бекор кардан",
   "sidebar.status.working": "Дар ҳоли кор",
   "sidebar.status.done": "Тайёр",
+  "sidebar.status.attention": "Ворид лозим",
   "debugBar.ariaLabel": "Ташхиси самаранокии рушд",
   "debugBar.na": "не",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/th.ts b/packages/app/src/i18n/th.ts
index 7fb3bdf11ffd..bed0c804ebe3 100644
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -886,6 +886,7 @@ export const dict = {
   "sidebar.thread.unpin": "ยกเลิกการปักหมุด",
   "sidebar.status.working": "กำลังทำงาน",
   "sidebar.status.done": "เสร็จ",
+  "sidebar.status.attention": "ต้องการข้อมูลป้อน",
 
   "app.name.desktop": "OpenCode Desktop",
 
diff --git a/packages/app/src/i18n/tk.ts b/packages/app/src/i18n/tk.ts
index 777499a50294..644cb92c49d1 100644
--- a/packages/app/src/i18n/tk.ts
+++ b/packages/app/src/i18n/tk.ts
@@ -885,6 +885,7 @@ export const dict = {
   "sidebar.thread.unpin": "Berkitmeni aýyr",
   "sidebar.status.working": "Işleýär",
   "sidebar.status.done": "Taýýar",
+  "sidebar.status.attention": "Giriş gerek",
   "debugBar.ariaLabel": "Ösüş öndürijiligini anyklaýyş",
   "debugBar.na": "n / a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/tr.ts b/packages/app/src/i18n/tr.ts
index 52a6a8749174..a81715678899 100644
--- a/packages/app/src/i18n/tr.ts
+++ b/packages/app/src/i18n/tr.ts
@@ -904,6 +904,7 @@ export const dict = {
   "sidebar.thread.unpin": "Sabitlemeyi kaldır",
   "sidebar.status.working": "Çalışıyor",
   "sidebar.status.done": "Bitti",
+  "sidebar.status.attention": "Girdi gerekiyor",
 
   "app.name.desktop": "OpenCode Masaüstü",
 
diff --git a/packages/app/src/i18n/uk.ts b/packages/app/src/i18n/uk.ts
index 5c9a79dca523..068fa3f0a192 100644
--- a/packages/app/src/i18n/uk.ts
+++ b/packages/app/src/i18n/uk.ts
@@ -974,6 +974,7 @@ export const dict = {
   "sidebar.thread.unpin": "Відкріпити тред",
   "sidebar.status.working": "У роботі",
   "sidebar.status.done": "Готово",
+  "sidebar.status.attention": "Потрібне введення",
 
   "debugBar.ariaLabel": "Діагностика продуктивності розробки",
   "debugBar.na": "н/д",
diff --git a/packages/app/src/i18n/ur.ts b/packages/app/src/i18n/ur.ts
index 25b1a5223fbc..de7f634897bb 100644
--- a/packages/app/src/i18n/ur.ts
+++ b/packages/app/src/i18n/ur.ts
@@ -895,6 +895,7 @@ export const dict = {
   "sidebar.thread.unpin": "پن ہٹائیں",
   "sidebar.status.working": "کام جاری",
   "sidebar.status.done": "مکمل",
+  "sidebar.status.attention": "ان پٹ درکار",
   "debugBar.ariaLabel": "ترقیاتی کارکردگی کی تشخیص",
   "debugBar.na": "n/a",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/uz.ts b/packages/app/src/i18n/uz.ts
index 1037872a6bf8..526e2bf9c43c 100644
--- a/packages/app/src/i18n/uz.ts
+++ b/packages/app/src/i18n/uz.ts
@@ -892,6 +892,7 @@ export const dict = {
   "sidebar.thread.unpin": "Mahkamlashni bekor qilish",
   "sidebar.status.working": "Ishlamoqda",
   "sidebar.status.done": "Tayyor",
+  "sidebar.status.attention": "Kiritish kerak",
   "debugBar.ariaLabel": "Rivojlanish samaradorligi diagnostikasi",
   "debugBar.na": "yo'q",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/vi.ts b/packages/app/src/i18n/vi.ts
index 7e6045978300..566513c4491e 100644
--- a/packages/app/src/i18n/vi.ts
+++ b/packages/app/src/i18n/vi.ts
@@ -896,6 +896,7 @@ export const dict = {
   "sidebar.thread.unpin": "Bỏ ghim chuỗi",
   "sidebar.status.working": "Đang làm",
   "sidebar.status.done": "Xong",
+  "sidebar.status.attention": "Cần nhập",
   "debugBar.ariaLabel": "Chẩn đoán hiệu suất phát triển",
   "debugBar.na": "không có",
   "debugBar.nav.label": "NAV",
diff --git a/packages/app/src/i18n/zh.ts b/packages/app/src/i18n/zh.ts
index 334666097d64..7e2ac5d30b90 100644
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -882,6 +882,7 @@ export const dict = {
   "sidebar.thread.unpin": "取消固定",
   "sidebar.status.working": "工作中",
   "sidebar.status.done": "已完成",
+  "sidebar.status.attention": "需要输入",
 
   "app.name.desktop": "OpenCode Desktop",
 
diff --git a/packages/app/src/i18n/zht.ts b/packages/app/src/i18n/zht.ts
index 8a617ce01b8f..2e789cfcd668 100644
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -879,6 +879,7 @@ export const dict = {
   "sidebar.thread.unpin": "取消釘選",
   "sidebar.status.working": "工作中",
   "sidebar.status.done": "已完成",
+  "sidebar.status.attention": "需要輸入",
 
   "app.name.desktop": "OpenCode Desktop",
   "settings.section.desktop": "桌面",
diff --git a/packages/app/src/pages/layout/navigation-sidebar.tsx b/packages/app/src/pages/layout/navigation-sidebar.tsx
index 81f9f83f6fa1..9c4d4bb7b21e 100644
--- a/packages/app/src/pages/layout/navigation-sidebar.tsx
+++ b/packages/app/src/pages/layout/navigation-sidebar.tsx
@@ -3,15 +3,14 @@ import { createStore, produce } from "solid-js/store"
 import { useQuery } from "@tanstack/solid-query"
 import type { GlobalSession } from "@opencode-ai/sdk/v2/client"
 import { Binary } from "@opencode-ai/core/util/binary"
-import { SessionProgressIndicatorV2 } from "@opencode-ai/session-ui/v2/session-progress-indicator-v2"
-import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
-import { ScrollView } from "@opencode-ai/ui/scroll-view"
 import { Spinner } from "@opencode-ai/ui/spinner"
+import { ScrollView } from "@opencode-ai/ui/scroll-view"
 import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
 import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
 import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
 import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
+import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import {
   loadHomeSessionIndex,
   retainHomeSessions,
@@ -66,10 +65,13 @@ const STATUS_TICK = 1_000
 const SECTION_LABEL = "px-3 pb-1 pt-3 text-v2-text-text-muted [font-weight:440]"
 const ROW =
   "group/row relative flex h-7 min-w-0 w-full shrink-0 cursor-default items-center gap-2 rounded-[6px] bg-transparent px-1.5 text-start text-v2-text-text-muted [font-weight:440] transition-[background-color,color,box-shadow] duration-[120ms] ease-in-out hover:bg-v2-background-bg-layer-01 hover:text-v2-text-text-base data-[selected=true]:bg-v2-background-bg-layer-03 data-[selected=true]:text-v2-text-text-base data-[selected=true]:hover:bg-v2-background-bg-layer-03 focus-visible:bg-v2-background-bg-layer-01 focus-visible:text-v2-text-text-base focus-visible:outline-none focus-visible:[box-shadow:inset_0_0_0_0.5px_var(--v2-border-border-muted)]"
+// Trailing padding reserves the hover action zone so titles never sit under the buttons and
+// rows keep identical geometry with or without hover.
+const ROW_SESSION = `${ROW} pe-20`
+const ROW_PROJECT = `${ROW} pe-14`
 const ROW_ACTIONS =
-  "hover-reveal absolute end-1 top-1/2 flex -translate-y-1/2 items-center gap-1 opacity-0 group-hover/row:opacity-100 focus-within:opacity-100 data-[menu=true]:opacity-100"
-// Reserve room for the hover-revealed row actions so long titles never sit under them.
-const TITLE = "min-w-0 flex-1 truncate transition-[padding-inline-end] duration-[120ms] ease-in-out"
+  "hover-reveal absolute end-1 top-1/2 flex -translate-y-1/2 items-center gap-0.5 rounded-[6px] bg-v2-background-bg-layer-02 p-0.5 opacity-0 shadow-[var(--v2-elevation-raised)] group-hover/row:opacity-100 focus-within:opacity-100 data-[menu=true]:opacity-100"
+const NAME = "flex min-w-0 flex-1 items-center gap-1.5"
 
 function titleOf(session: { title?: string; parentID?: string; time: { created: number } }) {
   return sessionTitle(session.title) ?? withTimestampedFallback(session)
@@ -102,7 +104,7 @@ export function NavigationSidebar() {
     Persist.global("sidebar.navigation", ["sidebar.navigation.v1"]),
     createStore({
       collapsed: {} as Record<string, boolean>,
-      settledOpen: false,
+      settledOpen: {} as Record<string, boolean>,
       pins: {} as Record<string, boolean>,
     }),
   )
@@ -193,7 +195,9 @@ export function NavigationSidebar() {
   createEffect(() => {
     const known = new Set(sessions().map((session) => session.id))
     const missing = tabs.store
-      .flatMap((tab) => (tab.type === "session" && tab.server === serverKey() && !known.has(tab.sessionId) ? [tab.sessionId] : []))
+      .flatMap((tab) =>
+        tab.type === "session" && tab.server === serverKey() && !known.has(tab.sessionId) ? [tab.sessionId] : [],
+      )
       .sort()
       .join(",")
     if (!missing || missing === missingKey()) return
@@ -220,10 +224,9 @@ export function NavigationSidebar() {
   const visibleGroups = createMemo(() => groups().filter((group) => group.visible.length > 0))
   const empty = createMemo(() => visibleGroups().length === 0 && settled().length === 0)
 
-  const archivedOpen = () => state.settledOpen
   const archived = useQuery(() => ({
     queryKey: ["sidebar", "settled", serverKey()],
-    enabled: archivedOpen() && !!home.server.focusedContext(),
+    enabled: !!home.server.focusedContext(),
     queryFn: async ({ signal }): Promise<GlobalSession[]> => {
       const ctx = home.server.focusedContext()
       if (!ctx) return []
@@ -234,7 +237,7 @@ export function NavigationSidebar() {
       return response.data ?? []
     },
     retry: false,
-    staleTime: 30_000,
+    staleTime: 300_000,
   }))
 
   const settledGroups = createMemo((): SettledGroup[] => {
@@ -426,6 +429,7 @@ export function NavigationSidebar() {
           </TooltipV2>
         </div>
         <TextInputV2
+          class="w-full min-w-0"
           value={filter()}
           autocomplete="off"
           spellcheck={false}
@@ -516,82 +520,27 @@ export function NavigationSidebar() {
           </For>
 
           <Show when={settledCount() > 0}>
-            <div class={SECTION_LABEL}>{language.t("sidebar.settled")}</div>
-
-            <button
-              type="button"
-              data-action="sidebar-settled-toggle"
-              aria-expanded={archivedOpen()}
-              onClick={() => setState("settledOpen", (value) => !value)}
-              class={ROW}
-            >
-              <IconV2
-                name="chevron-down"
-                class={`size-3 shrink-0 text-v2-icon-icon-muted transition-transform duration-[120ms] ${archivedOpen() ? "" : "-rotate-90"}`}
-              />
-              <IconV2 name="archive" class="size-3.5 shrink-0 text-v2-icon-icon-muted" />
-              <span class={`${TITLE} group-hover/row:pe-8`}>{language.t("sidebar.settled")}</span>
-              <span class="shrink-0 text-xs text-v2-text-text-faint transition-opacity duration-[120ms] group-hover/row:opacity-0">
-                {settledCount()}
-              </span>
-            </button>
-
-            <Show when={archivedOpen()}>
-              <Show when={archived.isLoading}>
-                <div class="flex items-center justify-center py-3 text-v2-text-text-faint">
-                  <Spinner class="size-3.5 shrink-0" />
-                </div>
-              </Show>
-              <Show when={!archived.isLoading && settledGroups().length === 0}>
-                <div class="px-3 py-2 text-xs text-v2-text-text-faint">{language.t("sidebar.empty.description")}</div>
-              </Show>
-              <For each={settledGroups()}>
-                {(group) => (
-                  <div class="flex min-w-0 flex-col">
-                    <div class="flex h-6 min-w-0 items-center gap-1.5 px-1.5">
-                      <SessionTabAvatarView
-                        project={group.project}
-                        directory={group.project.worktree}
-                        unread={false}
-                        loading={false}
-                      />
-                      <span class="min-w-0 flex-1 truncate text-xs text-v2-text-text-faint">{group.name}</span>
-                    </div>
-                    <div class="flex flex-col gap-0.5 pb-1 ps-6">
-                      <For each={group.local}>
-                        {(record) => (
-                          <SidebarSessionRow
-                            record={record}
-                            server={serverKey()}
-                            current={currentSession() === record.session.id}
-                            settled
-                            pinned={isPinned(record.session.id)}
-                            tick={() => tick()}
-                            branch={branchOf}
-                            onOpen={open}
-                            onUnsettle={() => togglePin(record.session.id)}
-                          />
-                        )}
-                      </For>
-                      <For each={group.archived}>
-                        {(record) => (
-                          <SidebarSessionRow
-                            record={record}
-                            server={serverKey()}
-                            current={currentSession() === record.session.id}
-                            settled
-                            tick={() => tick()}
-                            branch={branchOf}
-                            onOpen={open}
-                            onUnsettle={() => unsettle(record.session)}
-                          />
-                        )}
-                      </For>
-                    </div>
-                  </div>
-                )}
-              </For>
-            </Show>
+            <div class={`${SECTION_LABEL} flex items-center gap-1.5`}>
+              <span>{language.t("sidebar.settled")}</span>
+              <span class="text-xs text-v2-text-text-faint">{settledCount()}</span>
+            </div>
+            <For each={settledGroups()}>
+              {(group) => (
+                <SidebarSettledGroup
+                  group={group}
+                  server={serverKey()}
+                  open={state.settledOpen[group.key] === true}
+                  loading={archived.isLoading}
+                  current={currentSession()}
+                  tick={() => tick()}
+                  branch={branchOf}
+                  onToggle={() => setState("settledOpen", group.key, (value) => value !== true)}
+                  onOpen={open}
+                  onUnsettlePin={togglePin}
+                  onUnsettleArchive={unsettle}
+                />
+              )}
+            </For>
           </Show>
         </div>
       </ScrollView>
@@ -654,20 +603,20 @@ function SidebarProject(props: {
           data-action="sidebar-project"
           aria-expanded={!props.collapsed}
           onClick={props.onToggleCollapsed}
-          class={`${ROW} min-w-0 flex-1`}
+          class={`${ROW_PROJECT} min-w-0 flex-1`}
         >
-          <IconV2
-            name="chevron-down"
-            class={`size-3 shrink-0 text-v2-icon-icon-muted transition-transform duration-[120ms] ${props.collapsed ? "-rotate-90" : ""}`}
-          />
           <SessionTabAvatarView
             project={props.group.project}
             directory={props.group.project.worktree}
             unread={props.unseen() > 0}
             loading={false}
           />
-          <span class={`${TITLE} [font-weight:530] text-v2-text-text-base group-hover/row:pe-14`}>
-            {props.group.name}
+          <span class={NAME}>
+            <span class="min-w-0 truncate [font-weight:530] text-v2-text-text-base">{props.group.name}</span>
+            <IconV2
+              name="chevron-down"
+              class={`size-3 shrink-0 text-v2-icon-icon-muted transition-transform duration-[120ms] ${props.collapsed ? "-rotate-90" : ""}`}
+            />
           </span>
           <Show when={props.group.visible.length > 0}>
             <span class="shrink-0 text-xs text-v2-text-text-faint transition-opacity duration-[120ms] group-hover/row:opacity-0">
@@ -751,6 +700,81 @@ function SidebarProject(props: {
   )
 }
 
+function SidebarSettledGroup(props: {
+  group: SettledGroup
+  server: ServerConnection.Key
+  open: boolean
+  loading: boolean
+  current: string | undefined
+  tick: () => number
+  branch: (directory: string) => string | undefined
+  onToggle: () => void
+  onOpen: (session: { id: string; directory: string }, project: LocalProject | undefined, event?: MouseEvent) => void
+  onUnsettlePin: (sessionID: string) => void
+  onUnsettleArchive: (session: { id: string; directory: string }) => void
+}) {
+  const count = () => props.group.local.length + props.group.archived.length
+  return (
+    <div class="flex min-w-0 flex-col">
+      <button
+        type="button"
+        data-action="sidebar-settled-group"
+        aria-expanded={props.open}
+        onClick={props.onToggle}
+        class={`${ROW} min-w-0 flex-1`}
+      >
+        <SessionTabAvatarView
+          project={props.group.project}
+          directory={props.group.project.worktree}
+          unread={false}
+          loading={false}
+        />
+        <span class={NAME}>
+          <span class="min-w-0 truncate">{props.group.name}</span>
+          <IconV2
+            name="chevron-down"
+            class={`size-3 shrink-0 text-v2-icon-icon-muted transition-transform duration-[120ms] ${props.open ? "" : "-rotate-90"}`}
+          />
+        </span>
+        <span class="shrink-0 text-xs text-v2-text-text-faint">{count()}</span>
+      </button>
+      <Show when={props.open}>
+        <div class="flex flex-col gap-0.5 pb-1 ps-6">
+          <For each={props.group.local}>
+            {(record) => (
+              <SidebarSessionRow
+                record={record}
+                server={props.server}
+                current={record.session.id === props.current}
+                settled
+                pinned
+                tick={props.tick}
+                branch={props.branch}
+                onOpen={props.onOpen}
+                onUnsettle={() => props.onUnsettlePin(record.session.id)}
+              />
+            )}
+          </For>
+          <For each={props.group.archived}>
+            {(record) => (
+              <SidebarSessionRow
+                record={record}
+                server={props.server}
+                current={record.session.id === props.current}
+                settled
+                tick={props.tick}
+                branch={props.branch}
+                onOpen={props.onOpen}
+                onUnsettle={() => props.onUnsettleArchive(record.session)}
+              />
+            )}
+          </For>
+        </div>
+      </Show>
+    </div>
+  )
+}
+
 function SidebarSessionRow(props: {
   record: SidebarSessionRecord
   server: ServerConnection.Key
@@ -779,9 +803,11 @@ function SidebarSessionRow(props: {
   const live = createMemo(() => {
     if (props.settled) return undefined
     const started = props.started?.()
-    if (started !== undefined && props.working?.()) return { done: false, since: started }
+    if (started !== undefined && props.working?.())
+      return { kind: "working" as const, label: language.t("sidebar.status.working"), time: elapsed(started) }
+    if (status.attention()) return { kind: "attention" as const, label: language.t("sidebar.status.attention") }
     const done = props.done?.()
-    if (done !== undefined) return { done: true, since: done }
+    if (done !== undefined) return { kind: "done" as const, label: language.t("sidebar.status.done") }
     return undefined
   })
 
@@ -795,14 +821,19 @@ function SidebarSessionRow(props: {
 
   return (
     <div class="group/row relative flex min-w-0 items-center">
-      <TooltipV2 value={<SessionInfo record={props.record} branch={() => props.branch(props.record.session.directory)} />} placement="right-start" gutter={10}>
+      <TooltipV2
+        class="min-w-0 flex-1"
+        value={<SessionInfo record={props.record} branch={() => props.branch(props.record.session.directory)} />}
+        placement="right-start"
+        gutter={10}
+      >
         <button
           type="button"
           data-action="sidebar-session"
           data-selected={props.current ? true : undefined}
           aria-current={props.current ? "true" : undefined}
           onClick={(event) => props.onOpen(props.record.session, props.record.project, event)}
-          class={`${ROW} min-w-0 flex-1`}
+          class={`${props.settled ? ROW : ROW_SESSION} min-w-0 flex-1`}
         >
           <Show when={open()}>
             <span class="absolute start-0 top-1/2 h-3.5 w-[2px] -translate-y-1/2 rounded-full bg-v2-text-text-muted" />
@@ -814,29 +845,41 @@ function SidebarSessionRow(props: {
             unread={status.unread()}
             loading={status.loading()}
           />
-          <span class={`${TITLE} ${props.settled ? "group-hover/row:pe-8" : "group-hover/row:pe-20"}`}>{title()}</span>
-          <Show when={props.pinned}>
-            <IconV2 name="pin" class="size-3 shrink-0 text-v2-icon-icon-muted" />
-          </Show>
-          <Show when={live()}>
-            {(value) => (
-              <span class="flex shrink-0 items-center gap-1 transition-opacity duration-[120ms] group-hover/row:opacity-0">
+          <span class={NAME}>
+            <span class="min-w-0 truncate">{title()}</span>
+            <Show when={props.pinned}>
+              <IconV2 name="pin" class="size-3 shrink-0 text-v2-icon-icon-muted" />
+            </Show>
+            <Show when={live()}>
+              {(value) => (
                 <Show
-                  when={value().done}
+                  when={value().kind === "working"}
                   fallback={
-                    <>
-                      <SessionProgressIndicatorV2 class="size-3.5 shrink-0 text-v2-state-fg-info" />
-                      <span class="text-xs text-v2-state-fg-info">{language.t("sidebar.status.working")}</span>
-                      <span class="text-xs text-v2-state-fg-info">{elapsed(value().since)}</span>
-                    </>
+                    <Show
+                      when={value().kind === "attention"}
+                      fallback={
+                        <span class="flex shrink-0 items-center gap-1 text-v2-state-fg-success">
+                          <IconV2 name="check" class="size-3 shrink-0" />
+                          <span class="text-xs">{value().label}</span>
+                        </span>
+                      }
+                    >
+                      <span class="flex shrink-0 items-center gap-1 text-v2-state-fg-warning">
+                        <IconV2 name="status-active" class="size-3 shrink-0" />
+                        <span class="text-xs">{value().label}</span>
+                      </span>
+                    </Show>
                   }
                 >
-                  <IconV2 name="check" class="size-3 shrink-0 text-v2-state-fg-success" />
-                  <span class="text-xs text-v2-state-fg-success">{language.t("sidebar.status.done")}</span>
+                  <span class="flex shrink-0 items-center gap-1 text-v2-state-fg-info">
+                    <Spinner class="size-3 shrink-0" />
+                    <span class="text-xs">{value().label}</span>
+                    <span class="text-xs">{value().time}</span>
+                  </span>
                 </Show>
-              </span>
-            )}
-          </Show>
+              )}
+            </Show>
+          </span>
         </button>
       </TooltipV2>
       <div class={ROW_ACTIONS}>
diff --git a/packages/app/src/pages/layout/project-avatar-state.ts b/packages/app/src/pages/layout/project-avatar-state.ts
index 236f6bd40531..a85d62c06448 100644
--- a/packages/app/src/pages/layout/project-avatar-state.ts
+++ b/packages/app/src/pages/layout/project-avatar-state.ts
@@ -45,5 +45,5 @@ export function useSessionTabAvatarState(
     if (needsAttention()) return false
     return serverSync.session.data.session_working(sessionId())
   })
-  return { unread, loading }
+  return { unread, loading, attention: needsAttention }
 }

From 65d9a7f7156ad27733660f1e1a732fc1f8c8fbfd Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Fri, 11 Sep 2026 18:45:50 +0300
Subject: [PATCH 07/14] fix(app): sync sidebar live and add thread context
 menus

---
 .../src/pages/layout/navigation-sidebar.tsx   | 549 +++++++++++++-----
 .../ui/src/v2/components/text-input-v2.css    |   5 +
 .../ui/src/v2/components/text-input-v2.tsx    |   4 +
 3 files changed, 420 insertions(+), 138 deletions(-)

diff --git a/packages/app/src/pages/layout/navigation-sidebar.tsx b/packages/app/src/pages/layout/navigation-sidebar.tsx
index 9c4d4bb7b21e..6809fb21e29e 100644
--- a/packages/app/src/pages/layout/navigation-sidebar.tsx
+++ b/packages/app/src/pages/layout/navigation-sidebar.tsx
@@ -10,6 +10,9 @@ import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { MenuV2 } from "@opencode-ai/ui/v2/menu-v2"
 import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
 import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"
+import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
+import { DialogFooter, DialogHeader, DialogTitleGroup, DialogV2 } from "@opencode-ai/ui/v2/dialog-v2"
+import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import {
   loadHomeSessionIndex,
@@ -42,6 +45,11 @@ import { SessionTabAvatarView } from "@/pages/layout/session-tab-avatar"
 import { fileManagerApp } from "@/utils/file-manager"
 import { pathKey } from "@/utils/path-key"
 import { Persist, persisted } from "@/utils/persist"
+import {
+  downloadSessionExport,
+  fetchSessionExport,
+  sessionExportFilename,
+} from "@/utils/session-export"
 import { sessionTitle, withTimestampedFallback } from "@/utils/session-title"
 import { showToast } from "@/utils/toast"
 
@@ -58,6 +66,8 @@ type SettledGroup = {
   archived: SidebarSessionRecord[]
 }
 
+type SessionAction = (record: SidebarSessionRecord) => void
+
 const SESSION_LIMIT = 64
 const ARCHIVED_LIMIT = 100
 const AGE_TICK = 60_000
@@ -71,6 +81,7 @@ const ROW_SESSION = `${ROW} pe-20`
 const ROW_PROJECT = `${ROW} pe-14`
 const ROW_ACTIONS =
   "hover-reveal absolute end-1 top-1/2 flex -translate-y-1/2 items-center gap-0.5 rounded-[6px] bg-v2-background-bg-layer-02 p-0.5 opacity-0 shadow-[var(--v2-elevation-raised)] group-hover/row:opacity-100 focus-within:opacity-100 data-[menu=true]:opacity-100"
+const COUNT = "absolute end-2 top-1/2 -translate-y-1/2 text-xs text-v2-text-text-faint"
 const NAME = "flex min-w-0 flex-1 items-center gap-1.5"
 
 function titleOf(session: { title?: string; parentID?: string; time: { created: number } }) {
@@ -94,6 +105,7 @@ export function NavigationSidebar() {
   const settings = useSettings()
   const tabs = useTabs()
   const command = useCommand()
+  const dialog = useDialog()
   const home = createHomeController()
   const projects = createHomeProjectsController(home)
 
@@ -104,6 +116,7 @@ export function NavigationSidebar() {
     Persist.global("sidebar.navigation", ["sidebar.navigation.v1"]),
     createStore({
       collapsed: {} as Record<string, boolean>,
+      settled: false,
       settledOpen: {} as Record<string, boolean>,
       pins: {} as Record<string, boolean>,
     }),
@@ -147,9 +160,23 @@ export function NavigationSidebar() {
     refetchOnReconnect: true,
   }))
 
-  const sessions = createMemo(() =>
-    retainHomeSessions(homeSessions().sessions(sessionIndex.data, sessionEvents.data), SESSION_LIMIT, now()),
-  )
+  // The shared index cache only refreshes on mount; the per-directory sync stores are the live
+  // source of truth, so overlay them to pick up renames, settles and deletes immediately.
+  const sessions = createMemo(() => {
+    const sync = home.server.focusedSync()
+    const indexed = retainHomeSessions(
+      homeSessions().sessions(sessionIndex.data, sessionEvents.data),
+      SESSION_LIMIT,
+      now(),
+    )
+    return indexed.flatMap((session) => {
+      const [store] = sync.child(session.directory, { bootstrap: false })
+      if (store.status === "loading") return [session]
+      const match = Binary.search(store.session, session.id, (item) => item.id)
+      if (!match.found) return []
+      return [store.session[match.index]]
+    })
+  })
 
   const serverKey = createMemo(() => home.selection.value().server ?? ServerConnection.Key.make(""))
   const route = createMemo(() => layout.route())
@@ -226,7 +253,7 @@ export function NavigationSidebar() {
 
   const archived = useQuery(() => ({
     queryKey: ["sidebar", "settled", serverKey()],
-    enabled: !!home.server.focusedContext(),
+    enabled: state.settled && !!home.server.focusedContext(),
     queryFn: async ({ signal }): Promise<GlobalSession[]> => {
       const ctx = home.server.focusedContext()
       if (!ctx) return []
@@ -363,6 +390,120 @@ export function NavigationSidebar() {
     })()
   }
 
+  async function removeSession(record: SidebarSessionRecord) {
+    const conn = home.server.focused()
+    const ctx = home.server.focusedContext()
+    if (!conn || !ctx) return
+    const key = ServerConnection.key(conn)
+    const id = record.session.id
+    const directory = record.session.directory
+    const wasCurrent = currentSession() === id
+    const others = tabs.store.filter((tab) => tab.type === "session" && tab.sessionId !== id)
+    const result = await ctx.sdk.api.session
+      .remove({ sessionID: id })
+      .catch((cause) => {
+        showToast({
+          title: language.t("session.delete.failed.title"),
+          description: errorMessage(cause, language.t("session.delete.failed.title")),
+        })
+        return undefined
+      })
+    if (!result) return
+    const [, setStore] = ctx.sync.child(directory)
+    setStore(
+      produce((draft) => {
+        const match = Binary.search(draft.session, id, (item) => item.id)
+        if (match.found) draft.session.splice(match.index, 1)
+      }),
+    )
+    homeSessions().remove(id)
+    tabs.removeSessionTab({ server: key, sessionId: id })
+    if (wasCurrent && others.length === 0) void tabs.newDraft({ server: key, directory })
+  }
+
+  function confirmDelete(record: SidebarSessionRecord) {
+    dialog.show(() => (
+      <DialogDeleteSession name={titleOf(record.session)} onDelete={() => removeSession(record)} />
+    ))
+  }
+
+  function rename(record: SidebarSessionRecord, title: string) {
+    void (async () => {
+      const ctx = home.server.focusedContext()
+      if (!ctx) return
+      const result = await ctx.sdk.api.session
+        .rename({ sessionID: record.session.id, title })
+        .catch((cause) => {
+          requestFailed(cause)
+          return undefined
+        })
+      if (!result) return
+    })()
+  }
+
+  function confirmRename(record: SidebarSessionRecord) {
+    dialog.show(() => (
+      <DialogRenameSession initial={titleOf(record.session)} onConfirm={(title) => rename(record, title)} />
+    ))
+  }
+
+  const canShare = createMemo(() => home.server.focusedSync().data.config.share !== "disabled")
+
+  function share(record: SidebarSessionRecord) {
+    void (async () => {
+      const ctx = home.server.focusedContext()
+      if (!ctx) return
+      const [store] = ctx.sync.child(record.session.directory, { bootstrap: false })
+      const match = Binary.search(store.session, record.session.id, (item) => item.id)
+      const existing = match.found ? store.session[match.index].share?.url : undefined
+      const url =
+        existing ??
+        (await ctx.sdk.client.session
+          .share({ sessionID: record.session.id })
+          .then((response) => response.data?.share?.url)
+          .catch(() => undefined))
+      if (!url) {
+        showToast({
+          title: language.t("toast.session.share.failed.title"),
+          description: language.t("toast.session.share.failed.description"),
+        })
+        return
+      }
+      const copied = await navigator.clipboard.writeText(url).then(
+        () => true,
+        () => false,
+      )
+      showToast(
+        copied
+          ? {
+              title: language.t("toast.session.share.success.title"),
+              description: language.t("toast.session.share.success.description"),
+            }
+          : { title: language.t("toast.session.share.copyFailed.title") },
+      )
+    })()
+  }
+
+  function exportSession(record: SidebarSessionRecord) {
+    void (async () => {
+      const ctx = home.server.focusedContext()
+      if (!ctx) return
+      const data = await fetchSessionExport({ sessionID: record.session.id, client: ctx.sdk.client }).catch(
+        (cause) => {
+          requestFailed(cause)
+          return undefined
+        },
+      )
+      if (!data) return
+      const filename = sessionExportFilename(data.info)
+      downloadSessionExport(filename, data)
+      showToast({
+        title: language.t("toast.session.export.success.title"),
+        description: language.t("toast.session.export.success.description", { filename }),
+      })
+    })()
+  }
+
   function closeTab(record: SidebarSessionRecord) {
     tabs.removeSessionTab({ server: serverKey(), sessionId: record.session.id })
   }
@@ -397,6 +538,19 @@ export function NavigationSidebar() {
     },
   ])
 
+  const rowActions = {
+    onRename: confirmRename,
+    onShare: share,
+    onExport: exportSession,
+    onSettle: settle,
+    onUnsettleArchive: unsettle,
+    onUnsettlePin: togglePin,
+    onDelete: confirmDelete,
+    onCloseTab: closeTab,
+    onTogglePin: togglePin,
+    canShare,
+  }
+
   return (
     <aside
       aria-label={language.t("settings.shortcuts.group.navigation")}
@@ -429,7 +583,7 @@ export function NavigationSidebar() {
           </TooltipV2>
         </div>
         <TextInputV2
-          class="w-full min-w-0"
+          fluid
           value={filter()}
           autocomplete="off"
           spellcheck={false}
@@ -481,6 +635,7 @@ export function NavigationSidebar() {
                 working={working}
                 tick={() => tick()}
                 branch={branchOf}
+                actions={rowActions}
                 unseen={() => {
                   const conn = connection()
                   if (!conn) return 0
@@ -492,9 +647,6 @@ export function NavigationSidebar() {
                 }}
                 onToggleCollapsed={() => setState("collapsed", group.key, (value) => !value)}
                 onOpen={open}
-                onSettle={settle}
-                onTogglePin={togglePin}
-                onCloseTab={closeTab}
                 onNewSession={() => {
                   const conn = connection()
                   if (conn) home.project.openProjectNewSession(conn, group.project.worktree)
@@ -519,28 +671,46 @@ export function NavigationSidebar() {
             )}
           </For>
 
-          <Show when={settledCount() > 0}>
-            <div class={`${SECTION_LABEL} flex items-center gap-1.5`}>
-              <span>{language.t("sidebar.settled")}</span>
-              <span class="text-xs text-v2-text-text-faint">{settledCount()}</span>
-            </div>
-            <For each={settledGroups()}>
-              {(group) => (
-                <SidebarSettledGroup
-                  group={group}
-                  server={serverKey()}
-                  open={state.settledOpen[group.key] === true}
-                  loading={archived.isLoading}
-                  current={currentSession()}
-                  tick={() => tick()}
-                  branch={branchOf}
-                  onToggle={() => setState("settledOpen", group.key, (value) => value !== true)}
-                  onOpen={open}
-                  onUnsettlePin={togglePin}
-                  onUnsettleArchive={unsettle}
+          <Show when={settledCount() > 0 || state.settled}>
+            <button
+              type="button"
+              data-action="sidebar-settled-toggle"
+              aria-expanded={state.settled}
+              onClick={() => setState("settled", (value) => !value)}
+              class={`${ROW_PROJECT} min-w-0`}
+            >
+              <span class={NAME}>
+                <IconV2 name="archive" class="size-3.5 shrink-0 text-v2-icon-icon-muted" />
+                <span class="min-w-0 truncate">{language.t("sidebar.settled")}</span>
+                <IconV2
+                  name="chevron-down"
+                  class={`size-3 shrink-0 text-v2-icon-icon-muted transition-transform duration-[120ms] ${state.settled ? "" : "-rotate-90"}`}
                 />
-              )}
-            </For>
+              </span>
+              <span class={COUNT}>{settledCount()}</span>
+            </button>
+            <Show when={state.settled}>
+              <Show when={archived.isLoading}>
+                <div class="flex items-center justify-center py-3 text-v2-text-text-faint">
+                  <Spinner class="size-3.5 shrink-0" />
+                </div>
+              </Show>
+              <For each={settledGroups()}>
+                {(group) => (
+                  <SidebarSettledGroup
+                    group={group}
+                    server={serverKey()}
+                    open={state.settledOpen[group.key] === true}
+                    current={currentSession()}
+                    tick={() => tick()}
+                    branch={branchOf}
+                    actions={rowActions}
+                    onToggle={() => setState("settledOpen", group.key, (value) => value !== true)}
+                    onOpen={open}
+                  />
+                )}
+              </For>
+            </Show>
           </Show>
         </div>
       </ScrollView>
@@ -567,6 +737,19 @@ export function NavigationSidebar() {
   )
 }
 
+type SessionActions = {
+  onRename: SessionAction
+  onShare: SessionAction
+  onExport: SessionAction
+  onSettle: SessionAction
+  onUnsettleArchive: (session: { id: string; directory: string }) => void
+  onUnsettlePin: (sessionID: string) => void
+  onDelete: SessionAction
+  onCloseTab: SessionAction
+  onTogglePin: (sessionID: string) => void
+  canShare: () => boolean
+}
+
 function SidebarProject(props: {
   group: SidebarProjectSection
   server: ServerConnection.Key
@@ -578,13 +761,11 @@ function SidebarProject(props: {
   working: (sessionID: string) => boolean
   tick: () => number
   branch: (directory: string) => string | undefined
+  actions: SessionActions
   unseen: () => number
   canReveal: () => boolean
   onToggleCollapsed: () => void
   onOpen: (session: { id: string; directory: string }, project: LocalProject | undefined, event?: MouseEvent) => void
-  onSettle: (record: SidebarSessionRecord) => void
-  onTogglePin: (sessionID: string) => void
-  onCloseTab: (record: SidebarSessionRecord) => void
   onNewSession: () => void
   onEdit: () => void
   onReveal: () => void
@@ -619,7 +800,7 @@ function SidebarProject(props: {
             />
           </span>
           <Show when={props.group.visible.length > 0}>
-            <span class="shrink-0 text-xs text-v2-text-text-faint transition-opacity duration-[120ms] group-hover/row:opacity-0">
+            <span class={`${COUNT} transition-opacity duration-[120ms] group-hover/row:opacity-0`}>
               {props.group.visible.length}
             </span>
           </Show>
@@ -687,10 +868,8 @@ function SidebarProject(props: {
                 working={() => props.working(record.session.id)}
                 tick={props.tick}
                 branch={props.branch}
+                actions={props.actions}
                 onOpen={props.onOpen}
-                onSettle={props.onSettle}
-                onTogglePin={props.onTogglePin}
-                onCloseTab={props.onCloseTab}
               />
             )}
           </For>
@@ -704,14 +883,12 @@ function SidebarSettledGroup(props: {
   group: SettledGroup
   server: ServerConnection.Key
   open: boolean
-  loading: boolean
   current: string | undefined
   tick: () => number
   branch: (directory: string) => string | undefined
+  actions: SessionActions
   onToggle: () => void
   onOpen: (session: { id: string; directory: string }, project: LocalProject | undefined, event?: MouseEvent) => void
-  onUnsettlePin: (sessionID: string) => void
-  onUnsettleArchive: (session: { id: string; directory: string }) => void
 }) {
   const count = () => props.group.local.length + props.group.archived.length
   return (
@@ -721,7 +898,7 @@ function SidebarSettledGroup(props: {
         data-action="sidebar-settled-group"
         aria-expanded={props.open}
         onClick={props.onToggle}
-        class={`${ROW} min-w-0 flex-1`}
+        class={`${ROW_PROJECT} min-w-0`}
       >
         <SessionTabAvatarView
           project={props.group.project}
@@ -736,7 +913,7 @@ function SidebarSettledGroup(props: {
             class={`size-3 shrink-0 text-v2-icon-icon-muted transition-transform duration-[120ms] ${props.open ? "" : "-rotate-90"}`}
           />
         </span>
-        <span class="shrink-0 text-xs text-v2-text-text-faint">{count()}</span>
+        <span class={COUNT}>{count()}</span>
       </button>
       <Show when={props.open}>
         <div class="flex flex-col gap-0.5 pb-1 ps-6">
@@ -747,11 +924,10 @@ function SidebarSettledGroup(props: {
                 server={props.server}
                 current={record.session.id === props.current}
                 settled
-                pinned
                 tick={props.tick}
                 branch={props.branch}
+                actions={props.actions}
                 onOpen={props.onOpen}
-                onUnsettle={() => props.onUnsettlePin(record.session.id)}
               />
             )}
           </For>
@@ -762,10 +938,11 @@ function SidebarSettledGroup(props: {
                 server={props.server}
                 current={record.session.id === props.current}
                 settled
+                serverArchived
                 tick={props.tick}
                 branch={props.branch}
+                actions={props.actions}
                 onOpen={props.onOpen}
-                onUnsettle={() => props.onUnsettleArchive(record.session)}
               />
             )}
           </For>
@@ -780,20 +957,19 @@ function SidebarSessionRow(props: {
   server: ServerConnection.Key
   current: boolean
   settled?: boolean
+  serverArchived?: boolean
   pinned?: boolean
   started?: () => number | undefined
   done?: () => number | undefined
   working?: () => boolean
   tick: () => number
   branch: (directory: string) => string | undefined
+  actions: SessionActions
   onOpen: (session: { id: string; directory: string }, project: LocalProject | undefined, event?: MouseEvent) => void
-  onSettle?: (record: SidebarSessionRecord) => void
-  onTogglePin?: (sessionID: string) => void
-  onUnsettle?: () => void
-  onCloseTab?: (record: SidebarSessionRecord) => void
 }) {
   const language = useLanguage()
   const tabs = useTabs()
+  const [menuOpen, setMenuOpen] = createSignal(false)
   const server = createMemo(() => props.server)
   const directory = createMemo(() => props.record.session.directory)
   const sessionID = createMemo(() => props.record.session.id)
@@ -819,6 +995,38 @@ function SidebarSessionRow(props: {
     return `${Math.floor(minutes / 60)}h`
   }
 
+  const badge = () => (
+    <Show when={live()}>
+      {(value) => (
+        <Show
+          when={value().kind === "working"}
+          fallback={
+            <Show
+              when={value().kind === "attention"}
+              fallback={
+                <span class="flex shrink-0 items-center gap-1 text-v2-state-fg-success">
+                  <IconV2 name="check" class="size-3 shrink-0" />
+                  <span class="text-xs">{value().label}</span>
+                </span>
+              }
+            >
+              <span class="flex shrink-0 items-center gap-1 text-v2-state-fg-warning">
+                <IconV2 name="status-active" class="size-3 shrink-0" />
+                <span class="text-xs">{value().label}</span>
+              </span>
+            </Show>
+          }
+        >
+          <span class="flex shrink-0 items-center gap-1 text-v2-state-fg-info">
+            <Spinner class="size-3 shrink-0" />
+            <span class="text-xs">{value().label}</span>
+            <span class="text-xs">{value().time}</span>
+          </span>
+        </Show>
+      )}
+    </Show>
+  )
+
   return (
     <div class="group/row relative flex min-w-0 items-center">
       <TooltipV2
@@ -833,7 +1041,11 @@ function SidebarSessionRow(props: {
           data-selected={props.current ? true : undefined}
           aria-current={props.current ? "true" : undefined}
           onClick={(event) => props.onOpen(props.record.session, props.record.project, event)}
-          class={`${props.settled ? ROW : ROW_SESSION} min-w-0 flex-1`}
+          onContextMenu={(event) => {
+            event.preventDefault()
+            setMenuOpen(true)
+          }}
+          class={`${props.settled ? ROW_PROJECT : ROW_SESSION} min-w-0 flex-1`}
         >
           <Show when={open()}>
             <span class="absolute start-0 top-1/2 h-3.5 w-[2px] -translate-y-1/2 rounded-full bg-v2-text-text-muted" />
@@ -847,100 +1059,97 @@ function SidebarSessionRow(props: {
           />
           <span class={NAME}>
             <span class="min-w-0 truncate">{title()}</span>
-            <Show when={props.pinned}>
-              <IconV2 name="pin" class="size-3 shrink-0 text-v2-icon-icon-muted" />
-            </Show>
-            <Show when={live()}>
-              {(value) => (
-                <Show
-                  when={value().kind === "working"}
-                  fallback={
-                    <Show
-                      when={value().kind === "attention"}
-                      fallback={
-                        <span class="flex shrink-0 items-center gap-1 text-v2-state-fg-success">
-                          <IconV2 name="check" class="size-3 shrink-0" />
-                          <span class="text-xs">{value().label}</span>
-                        </span>
-                      }
-                    >
-                      <span class="flex shrink-0 items-center gap-1 text-v2-state-fg-warning">
-                        <IconV2 name="status-active" class="size-3 shrink-0" />
-                        <span class="text-xs">{value().label}</span>
-                      </span>
-                    </Show>
-                  }
-                >
-                  <span class="flex shrink-0 items-center gap-1 text-v2-state-fg-info">
-                    <Spinner class="size-3 shrink-0" />
-                    <span class="text-xs">{value().label}</span>
-                    <span class="text-xs">{value().time}</span>
-                  </span>
-                </Show>
-              )}
-            </Show>
           </span>
         </button>
       </TooltipV2>
-      <div class={ROW_ACTIONS}>
-        <Show when={!props.settled && props.onTogglePin}>
-          {(toggle) => (
-            <TooltipV2
-              value={language.t(props.pinned ? "sidebar.thread.unpin" : "sidebar.thread.pin")}
-              placement="top-end"
-            >
-              <IconButtonV2
-                data-action="sidebar-session-pin"
-                variant="ghost-muted"
-                size="small"
-                icon={<IconV2 name="pin" />}
-                aria-label={language.t(props.pinned ? "sidebar.thread.unpin" : "sidebar.thread.pin")}
-                onClick={() => toggle()(props.record.session.id)}
-              />
-            </TooltipV2>
-          )}
-        </Show>
-        <Show when={!props.settled && props.onSettle}>
-          {(settle) => (
-            <TooltipV2 value={language.t("sidebar.settle")} placement="top-end">
-              <IconButtonV2
-                data-action="sidebar-session-settle"
-                variant="ghost-muted"
-                size="small"
-                icon={<IconV2 name="archive" />}
-                aria-label={language.t("sidebar.settle")}
-                onClick={() => settle()(props.record)}
-              />
-            </TooltipV2>
-          )}
+      <Show when={!props.settled}>
+        <span class="pointer-events-none absolute end-1.5 top-1/2 flex -translate-y-1/2 items-center gap-1.5 transition-opacity duration-[120ms] group-hover/row:opacity-0">
+          <Show when={props.pinned}>
+            <IconV2 name="pin" class="size-3 shrink-0 text-v2-icon-icon-muted" />
+          </Show>
+          {badge()}
+        </span>
+      </Show>
+      <div class={ROW_ACTIONS} data-menu={menuOpen()}>
+        <Show when={!props.settled}>
+          <TooltipV2 value={language.t("sidebar.settle")} placement="top-end">
+            <IconButtonV2
+              data-action="sidebar-session-settle"
+              variant="ghost-muted"
+              size="small"
+              icon={<IconV2 name="archive" />}
+              aria-label={language.t("sidebar.settle")}
+              onClick={() => props.actions.onSettle(props.record)}
+            />
+          </TooltipV2>
         </Show>
-        <Show when={props.settled && props.onUnsettle}>
-          {(unsettle) => (
-            <TooltipV2 value={language.t("sidebar.unsettle")} placement="top-end">
-              <IconButtonV2
-                data-action="sidebar-session-unsettle"
-                variant="ghost-muted"
-                size="small"
-                icon={<IconV2 name="outline-reset" />}
-                aria-label={language.t("sidebar.unsettle")}
-                onClick={() => unsettle()}
-              />
-            </TooltipV2>
-          )}
+        <Show when={props.settled}>
+          <TooltipV2 value={language.t("sidebar.unsettle")} placement="top-end">
+            <IconButtonV2
+              data-action="sidebar-session-unsettle"
+              variant="ghost-muted"
+              size="small"
+              icon={<IconV2 name="outline-reset" />}
+              aria-label={language.t("sidebar.unsettle")}
+              onClick={() =>
+                props.serverArchived
+                  ? props.actions.onUnsettleArchive(props.record.session)
+                  : props.actions.onUnsettlePin(props.record.session.id)
+              }
+            />
+          </TooltipV2>
         </Show>
-        <Show when={!props.settled && open() && props.onCloseTab}>
-          {(close) => (
-            <TooltipV2 value={language.t("command.tab.close")} placement="top-end">
-              <IconButtonV2
-                data-action="sidebar-session-close-tab"
-                variant="ghost-muted"
-                size="small"
-                icon={<IconV2 name="xmark-small" />}
-                aria-label={language.t("command.tab.close")}
-                onClick={() => close()(props.record)}
-              />
-            </TooltipV2>
-          )}
+        <MenuV2
+          gutter={6}
+          modal={false}
+          placement="bottom-end"
+          open={menuOpen()}
+          onOpenChange={(open) => setMenuOpen(open)}
+        >
+          <MenuV2.Trigger
+            as={IconButtonV2}
+            data-action="sidebar-session-menu"
+            variant="ghost-muted"
+            size="small"
+            icon={<IconV2 name="outline-dots" />}
+            aria-label={language.t("common.moreOptions")}
+          />
+          <MenuV2.Portal>
+            <MenuV2.Content>
+              <MenuV2.Item onSelect={() => props.actions.onRename(props.record)}>
+                {language.t("common.rename")}
+              </MenuV2.Item>
+              <Show when={!props.settled && props.actions.canShare()}>
+                <MenuV2.Item onSelect={() => props.actions.onShare(props.record)}>
+                  {language.t("session.share.action.share")}
+                </MenuV2.Item>
+              </Show>
+              <MenuV2.Item onSelect={() => props.actions.onExport(props.record)}>
+                {language.t("common.export")}
+              </MenuV2.Item>
+              <Show when={!props.settled}>
+                <MenuV2.Item onSelect={() => props.actions.onTogglePin(props.record.session.id)}>
+                  {language.t(props.pinned ? "sidebar.thread.unpin" : "sidebar.thread.pin")}
+                </MenuV2.Item>
+              </Show>
+              <MenuV2.Separator />
+              <MenuV2.Item onSelect={() => props.actions.onDelete(props.record)}>
+                {language.t("common.delete")}
+              </MenuV2.Item>
+            </MenuV2.Content>
+          </MenuV2.Portal>
+        </MenuV2>
+        <Show when={!props.settled && open()}>
+          <TooltipV2 value={language.t("command.tab.close")} placement="top-end">
+            <IconButtonV2
+              data-action="sidebar-session-close-tab"
+              variant="ghost-muted"
+              size="small"
+              icon={<IconV2 name="xmark-small" />}
+              aria-label={language.t("command.tab.close")}
+              onClick={() => props.actions.onCloseTab(props.record)}
+            />
+          </TooltipV2>
         </Show>
       </div>
     </div>
@@ -978,3 +1187,67 @@ function SessionInfo(props: { record: SidebarSessionRecord; branch: () => string
     </div>
   )
 }
+
+function DialogRenameSession(props: { initial: string; onConfirm: (title: string) => void }) {
+  const language = useLanguage()
+  const dialog = useDialog()
+  const [value, setValue] = createSignal(props.initial)
+  const submit = () => {
+    const title = value().trim()
+    if (!title) return
+    props.onConfirm(title)
+    dialog.close()
+  }
+  return (
+    <DialogV2 fit>
+      <DialogHeader hideClose>
+        <DialogTitleGroup title={language.t("common.rename")} description={props.initial} />
+      </DialogHeader>
+      <div class="px-5 pb-4">
+        <TextInputV2
+          fluid
+          autofocus
+          value={value()}
+          onInput={(event) => setValue(event.currentTarget.value)}
+          onKeyDown={(event) => {
+            if (event.key === "Enter") submit()
+          }}
+        />
+      </div>
+      <DialogFooter>
+        <ButtonV2 variant="ghost" onClick={() => dialog.close()}>
+          {language.t("common.cancel")}
+        </ButtonV2>
+        <ButtonV2 onClick={submit}>{language.t("common.rename")}</ButtonV2>
+      </DialogFooter>
+    </DialogV2>
+  )
+}
+
+function DialogDeleteSession(props: { name: string; onDelete: () => Promise<unknown> }) {
+  const language = useLanguage()
+  const dialog = useDialog()
+  return (
+    <DialogV2 fit>
+      <DialogHeader hideClose>
+        <DialogTitleGroup
+          title={language.t("session.delete.title")}
+          description={language.t("session.delete.confirm", { name: props.name })}
+        />
+      </DialogHeader>
+      <DialogFooter>
+        <ButtonV2 variant="ghost" onClick={() => dialog.close()}>
+          {language.t("common.cancel")}
+        </ButtonV2>
+        <ButtonV2
+          variant="danger"
+          onClick={() => {
+            void props.onDelete().then(() => dialog.close())
+          }}
+        >
+          {language.t("session.delete.button")}
+        </ButtonV2>
+      </DialogFooter>
+    </DialogV2>
+  )
+}
diff --git a/packages/ui/src/v2/components/text-input-v2.css b/packages/ui/src/v2/components/text-input-v2.css
index d503830b4491..ebaf63798e20 100644
--- a/packages/ui/src/v2/components/text-input-v2.css
+++ b/packages/ui/src/v2/components/text-input-v2.css
@@ -27,6 +27,11 @@
   height: 32px;
 }
 
+[data-component="text-input-v2"][data-fluid="true"] {
+  width: 100%;
+  flex: 1 1 auto;
+}
+
 [data-component="text-input-v2"]:where(:hover):not([data-disabled], [data-invalid]):not(:focus-within) {
   background:
     linear-gradient(0deg, var(--v2-overlay-simple-overlay-hover), var(--v2-overlay-simple-overlay-hover)),
diff --git a/packages/ui/src/v2/components/text-input-v2.tsx b/packages/ui/src/v2/components/text-input-v2.tsx
index 8b1e748a3bf7..e30e8cc1094e 100644
--- a/packages/ui/src/v2/components/text-input-v2.tsx
+++ b/packages/ui/src/v2/components/text-input-v2.tsx
@@ -22,6 +22,8 @@ export interface TextInputV2Props extends Omit<ComponentProps<"input">, "type">
   invalid?: boolean
   /** `base` is 28px tall; `large` is 32px tall. */
   appearance?: "base" | "large"
+  /** Stretch to the parent width instead of the fixed 280px field width. */
+  fluid?: boolean
   type?: ComponentProps<"input">["type"]
 }
 
@@ -40,6 +42,7 @@ export function TextInputV2(props: TextInputV2Props) {
     "numeric",
     "invalid",
     "appearance",
+    "fluid",
     "disabled",
   ])
 
@@ -50,6 +53,7 @@ export function TextInputV2(props: TextInputV2Props) {
       data-invalid={local.invalid ? "" : undefined}
       data-numeric={local.numeric ? "" : undefined}
       data-appearance={local.appearance ?? "base"}
+      data-fluid={local.fluid ? "true" : undefined}
       data-leading-icon={local.leadingIcon ? "" : undefined}
       classList={{
         ...local.classList,

From 009c5f6e8e6be0dc39ac3bd693e0ca5c75454949 Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Fri, 11 Sep 2026 19:29:24 +0300
Subject: [PATCH 08/14] fix(app): prioritise input-needed status and sort
 pinned threads first

---
 .../src/pages/layout/navigation-sidebar.tsx   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/app/src/pages/layout/navigation-sidebar.tsx b/packages/app/src/pages/layout/navigation-sidebar.tsx
index 6809fb21e29e..4687dfb7bc5b 100644
--- a/packages/app/src/pages/layout/navigation-sidebar.tsx
+++ b/packages/app/src/pages/layout/navigation-sidebar.tsx
@@ -236,15 +236,22 @@ export function NavigationSidebar() {
     const records = buildSidebarRecords({ sessions: sessions(), projects: home.project.list() }).filter((record) =>
       matchesSidebarFilter(record, filter()),
     )
-    return groupSidebarRecords(records).map((group) => ({
-      ...group,
-      ...partitionSidebarRecords({
+    return groupSidebarRecords(records).map((group) => {
+      const parts = partitionSidebarRecords({
         records: group.records,
         pinned: (record) => alwaysVisible(record),
         days: settings.general.sidebarSessionDays() ?? 3,
         now: now(),
-      }),
-    }))
+      })
+      return {
+        ...group,
+        // Pinned threads stay at the top of their project regardless of recency.
+        visible: [...parts.visible].sort(
+          (a, b) => Number(isPinned(b.session.id)) - Number(isPinned(a.session.id)),
+        ),
+        hidden: parts.hidden,
+      }
+    })
   })
 
   const settled = createMemo(() => groups().flatMap((group) => group.hidden))
@@ -978,10 +985,11 @@ function SidebarSessionRow(props: {
   const title = createMemo(() => titleOf(props.record.session))
   const live = createMemo(() => {
     if (props.settled) return undefined
+    // A pending question or permission outranks the working timer so the user notices input is needed.
+    if (status.attention()) return { kind: "attention" as const, label: language.t("sidebar.status.attention") }
     const started = props.started?.()
     if (started !== undefined && props.working?.())
       return { kind: "working" as const, label: language.t("sidebar.status.working"), time: elapsed(started) }
-    if (status.attention()) return { kind: "attention" as const, label: language.t("sidebar.status.attention") }
     const done = props.done?.()
     if (done !== undefined) return { kind: "done" as const, label: language.t("sidebar.status.done") }
     return undefined

From 3e441303977e6bcdb23cf59f9d7181e6187774dc Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Fri, 11 Sep 2026 23:49:49 +0300
Subject: [PATCH 09/14] fix(app): open draft on add-project, stabilise row
 order, fade long titles

---
 .../navigation-sidebar-visibility.test.ts     |  4 +-
 .../layout/navigation-sidebar-visibility.ts   | 12 ++++-
 .../src/pages/layout/navigation-sidebar.tsx   | 51 +++++++++++++++----
 3 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts b/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
index 2926dceca07d..53688277a8b0 100644
--- a/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
+++ b/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
@@ -48,8 +48,8 @@ describe("navigation sidebar visibility", () => {
       buildSidebarRecords({
         projects,
         sessions: [
-          session({ id: "1", directory: "/src/a", time: { created: 1, updated: 5, archived: undefined } }),
-          session({ id: "2", directory: "/src/b", time: { created: 1, updated: 9, archived: undefined } }),
+          session({ id: "1", directory: "/src/a", time: { created: 2, updated: 5, archived: undefined } }),
+          session({ id: "2", directory: "/src/b", time: { created: 3, updated: 9, archived: undefined } }),
           session({ id: "3", directory: "/src/a", time: { created: 1, updated: 2, archived: undefined } }),
         ],
       }),
diff --git a/packages/app/src/pages/layout/navigation-sidebar-visibility.ts b/packages/app/src/pages/layout/navigation-sidebar-visibility.ts
index 0a5e4e4b8a49..4d05a930798f 100644
--- a/packages/app/src/pages/layout/navigation-sidebar-visibility.ts
+++ b/packages/app/src/pages/layout/navigation-sidebar-visibility.ts
@@ -1,6 +1,6 @@
 import type { Session } from "@opencode-ai/sdk/v2/client"
 import type { LocalProject } from "@/context/layout"
-import { compareSessionTime, displayName, projectForSession } from "@/pages/layout/helpers"
+import { displayName, projectForSession } from "@/pages/layout/helpers"
 import { pathKey } from "@/utils/path-key"
 
 export const SIDEBAR_SESSION_DAY = 86_400_000
@@ -18,6 +18,14 @@ export type SidebarProjectGroup = {
   records: SidebarSessionRecord[]
 }
 
+// Creation order keeps rows stable while threads stream; sorting by last activity would make
+// working threads trade places on every update.
+function compareSessionCreated(a: Session, b: Session) {
+  if (b.time.created !== a.time.created) return b.time.created - a.time.created
+  if (a.id === b.id) return 0
+  return a.id < b.id ? -1 : 1
+}
+
 export function buildSidebarRecords(input: { sessions: Session[]; projects: LocalProject[] }) {
   const projectByID = new Map(input.projects.flatMap((project) => (project.id ? [[project.id, project]] : [])))
   const directories = new Set(
@@ -27,7 +35,7 @@ export function buildSidebarRecords(input: { sessions: Session[]; projects: Loca
     .filter((session) => directories.has(pathKey(session.directory)))
     .filter((session) => !session.parentID)
   const unique = [...new Map(sessions.map((session) => [session.id, session] as const)).values()].sort(
-    compareSessionTime,
+    compareSessionCreated,
   )
   return unique.flatMap((session): SidebarSessionRecord[] => {
     const directory = pathKey(session.directory)
diff --git a/packages/app/src/pages/layout/navigation-sidebar.tsx b/packages/app/src/pages/layout/navigation-sidebar.tsx
index 4687dfb7bc5b..c8e58f23c1a8 100644
--- a/packages/app/src/pages/layout/navigation-sidebar.tsx
+++ b/packages/app/src/pages/layout/navigation-sidebar.tsx
@@ -26,12 +26,13 @@ import { ServerConnection } from "@/context/server"
 import { useSettings } from "@/context/settings"
 import { usePlatform } from "@/context/platform"
 import { useCommand } from "@/context/command"
+import { useDirectoryPicker } from "@/components/directory-picker"
 import { sessionHasOpenTab, useTabs } from "@/context/tabs"
 import { createHomeController } from "@/pages/home/home-controller"
 import { createHomeProjectsController } from "@/pages/home/home-projects-controller"
 import { archiveHomeSession } from "@/pages/home-session-archive"
 import { shouldOpenSessionInBackground } from "@/pages/home-session-open"
-import { displayName, errorMessage } from "@/pages/layout/helpers"
+import { displayName, errorMessage, homeProjectDirectories } from "@/pages/layout/helpers"
 import {
   buildSidebarRecords,
   groupSidebarRecords,
@@ -77,7 +78,7 @@ const ROW =
   "group/row relative flex h-7 min-w-0 w-full shrink-0 cursor-default items-center gap-2 rounded-[6px] bg-transparent px-1.5 text-start text-v2-text-text-muted [font-weight:440] transition-[background-color,color,box-shadow] duration-[120ms] ease-in-out hover:bg-v2-background-bg-layer-01 hover:text-v2-text-text-base data-[selected=true]:bg-v2-background-bg-layer-03 data-[selected=true]:text-v2-text-text-base data-[selected=true]:hover:bg-v2-background-bg-layer-03 focus-visible:bg-v2-background-bg-layer-01 focus-visible:text-v2-text-text-base focus-visible:outline-none focus-visible:[box-shadow:inset_0_0_0_0.5px_var(--v2-border-border-muted)]"
 // Trailing padding reserves the hover action zone so titles never sit under the buttons and
 // rows keep identical geometry with or without hover.
-const ROW_SESSION = `${ROW} pe-20`
+const ROW_SESSION = `${ROW} pe-24`
 const ROW_PROJECT = `${ROW} pe-14`
 const ROW_ACTIONS =
   "hover-reveal absolute end-1 top-1/2 flex -translate-y-1/2 items-center gap-0.5 rounded-[6px] bg-v2-background-bg-layer-02 p-0.5 opacity-0 shadow-[var(--v2-elevation-raised)] group-hover/row:opacity-100 focus-within:opacity-100 data-[menu=true]:opacity-100"
@@ -108,6 +109,7 @@ export function NavigationSidebar() {
   const dialog = useDialog()
   const home = createHomeController()
   const projects = createHomeProjectsController(home)
+  const pickDirectory = useDirectoryPicker()
 
   const [filter, setFilter] = createSignal("")
   const [now, setNow] = createSignal(Date.now())
@@ -236,7 +238,7 @@ export function NavigationSidebar() {
     const records = buildSidebarRecords({ sessions: sessions(), projects: home.project.list() }).filter((record) =>
       matchesSidebarFilter(record, filter()),
     )
-    return groupSidebarRecords(records).map((group) => {
+    const grouped = groupSidebarRecords(records).map((group) => {
       const parts = partitionSidebarRecords({
         records: group.records,
         pinned: (record) => alwaysVisible(record),
@@ -252,10 +254,22 @@ export function NavigationSidebar() {
         hidden: parts.hidden,
       }
     })
+    // Open projects without any visible thread yet (freshly added, everything settled) still
+    // deserve a row so adding a project gives immediate feedback in the sidebar.
+    const known = new Set(grouped.map((group) => group.key))
+    const opened = home.project.list().flatMap((project): SidebarProjectSection[] => {
+      const key = pathKey(project.worktree)
+      if (known.has(key)) return []
+      return [{ key, project, name: displayName(project), records: [], visible: [], hidden: [] }]
+    })
+    return [...grouped, ...opened]
   })
 
   const settled = createMemo(() => groups().flatMap((group) => group.hidden))
-  const visibleGroups = createMemo(() => groups().filter((group) => group.visible.length > 0))
+  const visibleGroups = createMemo(() => {
+    if (filter()) return groups().filter((group) => group.visible.length > 0)
+    return groups()
+  })
   const empty = createMemo(() => visibleGroups().length === 0 && settled().length === 0)
 
   const archived = useQuery(() => ({
@@ -534,6 +548,22 @@ export function NavigationSidebar() {
     home.project.openProjectNewSession(conn, target)
   }
 
+  function addProject() {
+    const conn = connection()
+    if (!conn || home.server.health(conn)?.healthy === false) return
+    pickDirectory({
+      server: conn,
+      title: language.t("command.project.open"),
+      multiple: true,
+      onSelect: (result) => {
+        const directories = homeProjectDirectories(result)
+        if (directories.length === 0) return
+        home.project.add(conn, directories)
+        home.project.openProjectNewSession(conn, directories[0])
+      },
+    })
+  }
+
   command.register(() => [
     {
       id: "sidebar.thread.new",
@@ -582,10 +612,7 @@ export function NavigationSidebar() {
               size="small"
               icon={<IconV2 name="folder-add-left" />}
               aria-label={language.t("home.project.add")}
-              onClick={() => {
-                const conn = home.server.focused()
-                if (conn) projects.project.choose(conn)
-              }}
+              onClick={addProject}
             />
           </TooltipV2>
         </div>
@@ -1003,6 +1030,12 @@ function SidebarSessionRow(props: {
     return `${Math.floor(minutes / 60)}h`
   }
 
+  // Fade the tail of long titles under the status badge instead of colliding with it.
+  const titleMask = createMemo(() => {
+    if (props.settled || (!live() && !props.pinned)) return ""
+    return "[mask-image:linear-gradient(to_right,black,black_calc(100%-24px),transparent)] group-hover/row:[mask-image:none]"
+  })
+
   const badge = () => (
     <Show when={live()}>
       {(value) => (
@@ -1066,7 +1099,7 @@ function SidebarSessionRow(props: {
             loading={status.loading()}
           />
           <span class={NAME}>
-            <span class="min-w-0 truncate">{title()}</span>
+            <span class={`min-w-0 truncate ${titleMask()}`}>{title()}</span>
           </span>
         </button>
       </TooltipV2>

From d0622aaf7500868b09ad1d8bef8831ca12290395 Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Sat, 12 Sep 2026 01:48:44 +0300
Subject: [PATCH 10/14] fix(app): prune restored tabs in sidebar mode and hide
 stale empty projects

---
 packages/app/src/context/tabs.tsx             | 22 +++++++++++++++++++
 .../src/pages/layout/navigation-sidebar.tsx   |  6 ++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/packages/app/src/context/tabs.tsx b/packages/app/src/context/tabs.tsx
index b6608e868112..10e0b97921df 100644
--- a/packages/app/src/context/tabs.tsx
+++ b/packages/app/src/context/tabs.tsx
@@ -3,6 +3,8 @@ import { createSimpleContext } from "@opencode-ai/ui/context"
 import { createStore, produce } from "solid-js/store"
 import { Persist, persisted, removePersisted, draftPersistedKeys } from "@/utils/persist"
 import { ServerConnection, useServer } from "./server"
+import { useSettings } from "./settings"
+import { createMediaQuery } from "@solid-primitives/media"
 import { createEffect, getOwner, onCleanup, startTransition } from "solid-js"
 import { useLocation, useNavigate, useParams } from "@solidjs/router"
 import { usePlatform } from "./platform"
@@ -73,6 +75,26 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
     const location = useLocation()
     const memory = createTabMemory(getOwner())
 
+    const settings = useSettings()
+    const mobile = createMediaQuery("(max-width: 767px)")
+    let pruned = false
+    createEffect(() => {
+      if (pruned || !ready()) return
+      pruned = true
+      // The tab-strip paradigm reopens and prefetches every persisted tab at startup; sidebar
+      // navigation only needs the tab you were actually on, so drop the rest once on launch.
+      if (settings.general.navigationMode() !== "sidebar" || mobile()) return
+      const sessionID = location.pathname.match(/\/session\/([^/]+)$/)?.[1]
+      const draftID = new URLSearchParams(location.search).get("draftId")
+      setStore((tabs) =>
+        tabs.filter(
+          (tab) =>
+            (tab.type === "session" && tab.sessionId === sessionID) ||
+            (tab.type === "draft" && tab.draftID === draftID),
+        ),
+      )
+    })
+
     const closing = new Set<string>()
     let recentWrite = 0
     let recentValue: string | undefined
diff --git a/packages/app/src/pages/layout/navigation-sidebar.tsx b/packages/app/src/pages/layout/navigation-sidebar.tsx
index c8e58f23c1a8..67c80e0e1c7b 100644
--- a/packages/app/src/pages/layout/navigation-sidebar.tsx
+++ b/packages/app/src/pages/layout/navigation-sidebar.tsx
@@ -127,6 +127,9 @@ export function NavigationSidebar() {
     started: {} as Record<string, number>,
     done: {} as Record<string, number>,
   })
+  // Projects added during this app session keep an empty row until their first thread exists;
+  // older projects whose threads are all settled stay out of the Projects section.
+  const [fresh, setFresh] = createStore<Record<string, boolean>>({})
 
   const ticker = setInterval(() => setNow(Date.now()), AGE_TICK)
   onCleanup(() => clearInterval(ticker))
@@ -259,7 +262,7 @@ export function NavigationSidebar() {
     const known = new Set(grouped.map((group) => group.key))
     const opened = home.project.list().flatMap((project): SidebarProjectSection[] => {
       const key = pathKey(project.worktree)
-      if (known.has(key)) return []
+      if (known.has(key) || fresh[key] !== true) return []
       return [{ key, project, name: displayName(project), records: [], visible: [], hidden: [] }]
     })
     return [...grouped, ...opened]
@@ -558,6 +561,7 @@ export function NavigationSidebar() {
       onSelect: (result) => {
         const directories = homeProjectDirectories(result)
         if (directories.length === 0) return
+        directories.forEach((directory) => setFresh(pathKey(directory), true))
         home.project.add(conn, directories)
         home.project.openProjectNewSession(conn, directories[0])
       },

From ca52c485bd9931b188c247b3dee5cb6044191b29 Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Sat, 12 Sep 2026 01:55:57 +0300
Subject: [PATCH 11/14] fix(app): keep sidebar row identity stable to stop
 portal ghosts and rebuilds

---
 .../src/pages/layout/navigation-sidebar.tsx   | 43 +++++++++++++------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/packages/app/src/pages/layout/navigation-sidebar.tsx b/packages/app/src/pages/layout/navigation-sidebar.tsx
index 67c80e0e1c7b..c0342a0d1dd8 100644
--- a/packages/app/src/pages/layout/navigation-sidebar.tsx
+++ b/packages/app/src/pages/layout/navigation-sidebar.tsx
@@ -1,5 +1,5 @@
 import { createEffect, createMemo, createSignal, For, onCleanup, Show, startTransition } from "solid-js"
-import { createStore, produce } from "solid-js/store"
+import { createStore, produce, reconcile } from "solid-js/store"
 import { useQuery } from "@tanstack/solid-query"
 import type { GlobalSession } from "@opencode-ai/sdk/v2/client"
 import { Binary } from "@opencode-ai/core/util/binary"
@@ -85,6 +85,10 @@ const ROW_ACTIONS =
 const COUNT = "absolute end-2 top-1/2 -translate-y-1/2 text-xs text-v2-text-text-faint"
 const NAME = "flex min-w-0 flex-1 items-center gap-1.5"
 
+function sectionKey(item: SettledGroup | SidebarProjectSection | SidebarSessionRecord) {
+  return "key" in item ? item.key : item.session.id
+}
+
 function titleOf(session: { title?: string; parentID?: string; time: { created: number } }) {
   return sessionTitle(session.title) ?? withTimestampedFallback(session)
 }
@@ -237,7 +241,7 @@ export function NavigationSidebar() {
     void sessionIndex.refetch()
   })
 
-  const groups = createMemo((): SidebarProjectSection[] => {
+  const computedSections = createMemo((): SidebarProjectSection[] => {
     const records = buildSidebarRecords({ sessions: sessions(), projects: home.project.list() }).filter((record) =>
       matchesSidebarFilter(record, filter()),
     )
@@ -257,8 +261,7 @@ export function NavigationSidebar() {
         hidden: parts.hidden,
       }
     })
-    // Open projects without any visible thread yet (freshly added, everything settled) still
-    // deserve a row so adding a project gives immediate feedback in the sidebar.
+    // Projects added during this session keep an empty row until their first thread exists.
     const known = new Set(grouped.map((group) => group.key))
     const opened = home.project.list().flatMap((project): SidebarProjectSection[] => {
       const key = pathKey(project.worktree)
@@ -268,10 +271,20 @@ export function NavigationSidebar() {
     return [...grouped, ...opened]
   })
 
-  const settled = createMemo(() => groups().flatMap((group) => group.hidden))
+  // reconcile keeps group/record object identity stable across recomputes so Solid's For does
+  // not destroy and recreate every row component on each streaming event (which orphaned open
+  // menu/tooltip portals and rebuilt the whole subtree constantly).
+  const [sections, setSections] = createStore<SidebarProjectSection[]>([])
+  createEffect(() => {
+    setSections(
+      reconcile(computedSections(), { key: sectionKey }),
+    )
+  })
+
+  const settled = createMemo(() => sections.flatMap((group) => group.hidden))
   const visibleGroups = createMemo(() => {
-    if (filter()) return groups().filter((group) => group.visible.length > 0)
-    return groups()
+    if (filter()) return sections.filter((group) => group.visible.length > 0)
+    return sections
   })
   const empty = createMemo(() => visibleGroups().length === 0 && settled().length === 0)
 
@@ -291,17 +304,21 @@ export function NavigationSidebar() {
     staleTime: 300_000,
   }))
 
-  const settledGroups = createMemo((): SettledGroup[] => {
-    const groups = new Map<string, SettledGroup>()
+  const computedSettledGroups = createMemo((): SettledGroup[] => {
+    const map = new Map<string, SettledGroup>()
     const push = (record: SidebarSessionRecord, kind: "local" | "archived") => {
       const key = pathKey(record.project.worktree)
-      const group = groups.get(key) ?? { key, project: record.project, name: record.name, local: [], archived: [] }
+      const group = map.get(key) ?? { key, project: record.project, name: record.name, local: [], archived: [] }
       group[kind].push(record)
-      groups.set(key, group)
+      map.set(key, group)
     }
     settled().forEach((record) => push(record, "local"))
     ;(archived.data ?? []).forEach((session) => push(archivedRecord(session), "archived"))
-    return [...groups.values()]
+    return [...map.values()]
+  })
+  const [settledGroups, setSettledGroups] = createStore<SettledGroup[]>([])
+  createEffect(() => {
+    setSettledGroups(reconcile(computedSettledGroups(), { key: sectionKey }))
   })
   const settledCount = createMemo(() => settled().length + (archived.data ?? []).length)
 
@@ -733,7 +750,7 @@ export function NavigationSidebar() {
                   <Spinner class="size-3.5 shrink-0" />
                 </div>
               </Show>
-              <For each={settledGroups()}>
+              <For each={settledGroups}>
                 {(group) => (
                   <SidebarSettledGroup
                     group={group}

From 55e095bfbc5f956cedcfc23f25b3ebd82eeb0a8f Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Sat, 12 Sep 2026 01:57:10 +0300
Subject: [PATCH 12/14] fix(app): drop status entries for sessions that left
 the index

---
 .../app/src/pages/layout/navigation-sidebar.tsx    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/app/src/pages/layout/navigation-sidebar.tsx b/packages/app/src/pages/layout/navigation-sidebar.tsx
index c0342a0d1dd8..942bbaffdd2a 100644
--- a/packages/app/src/pages/layout/navigation-sidebar.tsx
+++ b/packages/app/src/pages/layout/navigation-sidebar.tsx
@@ -226,6 +226,20 @@ export function NavigationSidebar() {
     )
   })
 
+  createEffect(() => {
+    const ids = new Set(sessions().map((session) => session.id))
+    const stale = [...Object.keys(status.started), ...Object.keys(status.done)].filter((id) => !ids.has(id))
+    if (stale.length === 0) return
+    setStatus(
+      produce((draft) => {
+        for (const id of stale) {
+          delete draft.started[id]
+          delete draft.done[id]
+        }
+      }),
+    )
+  })
+
   // Open tabs whose session is missing from the index mean the cache lagged behind a promotion.
   const [missingKey, setMissingKey] = createSignal("")
   createEffect(() => {

From 44c3cf37860aba1a15d33f62a4834507043bd744 Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Sat, 12 Sep 2026 02:15:20 +0300
Subject: [PATCH 13/14] fix(app): use string reconcile key for stable sidebar
 identity

---
 .../pages/layout/navigation-sidebar-visibility.test.ts |  6 +++---
 .../src/pages/layout/navigation-sidebar-visibility.ts  |  3 ++-
 packages/app/src/pages/layout/navigation-sidebar.tsx   | 10 +++-------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts b/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
index 53688277a8b0..5ea1fdd9d29e 100644
--- a/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
+++ b/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
@@ -65,9 +65,9 @@ describe("navigation sidebar visibility", () => {
     const staleWorking = session({ id: "working", directory: "/src/a", time: { created: NOW - 10 * DAY, updated: NOW - 10 * DAY, archived: undefined } })
     const result = partitionSidebarRecords({
       records: [
-        { session: fresh, project: project("/src/a"), name: "a" },
-        { session: stale, project: project("/src/a"), name: "a" },
-        { session: staleWorking, project: project("/src/a"), name: "a" },
+        { key: fresh.id, session: fresh, project: project("/src/a"), name: "a" },
+        { key: stale.id, session: stale, project: project("/src/a"), name: "a" },
+        { key: staleWorking.id, session: staleWorking, project: project("/src/a"), name: "a" },
       ],
       pinned: (record) => record.session.id === "working",
       days: 3,
diff --git a/packages/app/src/pages/layout/navigation-sidebar-visibility.ts b/packages/app/src/pages/layout/navigation-sidebar-visibility.ts
index 4d05a930798f..20da1e46227b 100644
--- a/packages/app/src/pages/layout/navigation-sidebar-visibility.ts
+++ b/packages/app/src/pages/layout/navigation-sidebar-visibility.ts
@@ -6,6 +6,7 @@ import { pathKey } from "@/utils/path-key"
 export const SIDEBAR_SESSION_DAY = 86_400_000
 
 export type SidebarSessionRecord = {
+  key: string
   session: Session
   project: LocalProject
   name: string
@@ -44,7 +45,7 @@ export function buildSidebarRecords(input: { sessions: Session[]; projects: Loca
         (item) => pathKey(item.worktree) === directory || item.sandboxes?.some((sandbox) => pathKey(sandbox) === directory),
       ) ?? projectForSession(session, input.projects, projectByID)
     if (!project) return []
-    return [{ session, project, name: displayName(project) }]
+    return [{ key: session.id, session, project, name: displayName(project) }]
   })
 }
 
diff --git a/packages/app/src/pages/layout/navigation-sidebar.tsx b/packages/app/src/pages/layout/navigation-sidebar.tsx
index 942bbaffdd2a..de56d95bdf72 100644
--- a/packages/app/src/pages/layout/navigation-sidebar.tsx
+++ b/packages/app/src/pages/layout/navigation-sidebar.tsx
@@ -85,10 +85,6 @@ const ROW_ACTIONS =
 const COUNT = "absolute end-2 top-1/2 -translate-y-1/2 text-xs text-v2-text-text-faint"
 const NAME = "flex min-w-0 flex-1 items-center gap-1.5"
 
-function sectionKey(item: SettledGroup | SidebarProjectSection | SidebarSessionRecord) {
-  return "key" in item ? item.key : item.session.id
-}
-
 function titleOf(session: { title?: string; parentID?: string; time: { created: number } }) {
   return sessionTitle(session.title) ?? withTimestampedFallback(session)
 }
@@ -291,7 +287,7 @@ export function NavigationSidebar() {
   const [sections, setSections] = createStore<SidebarProjectSection[]>([])
   createEffect(() => {
     setSections(
-      reconcile(computedSections(), { key: sectionKey }),
+      reconcile(computedSections(), { key: "key" }),
     )
   })
 
@@ -332,7 +328,7 @@ export function NavigationSidebar() {
   })
   const [settledGroups, setSettledGroups] = createStore<SettledGroup[]>([])
   createEffect(() => {
-    setSettledGroups(reconcile(computedSettledGroups(), { key: sectionKey }))
+    setSettledGroups(reconcile(computedSettledGroups(), { key: "key" }))
   })
   const settledCount = createMemo(() => settled().length + (archived.data ?? []).length)
 
@@ -344,7 +340,7 @@ export function NavigationSidebar() {
         worktree: session.directory,
         expanded: false,
       }
-    return { session, project, name: displayName(project) }
+    return { key: session.id, session, project, name: displayName(project) }
   }
 
   function isPinned(sessionID: string) {

From fb44e42d85ddffeec83ec332c18f2e79b74cd73d Mon Sep 17 00:00:00 2001
From: malek <malekqq1@gmail.con>
Date: Sat, 12 Sep 2026 02:24:19 +0300
Subject: [PATCH 14/14] fix(app): add reconcile keys to visibility test records

---
 .../src/pages/layout/navigation-sidebar-visibility.test.ts  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts b/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
index 5ea1fdd9d29e..0fc9415c2b6f 100644
--- a/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
+++ b/packages/app/src/pages/layout/navigation-sidebar-visibility.test.ts
@@ -80,7 +80,7 @@ describe("navigation sidebar visibility", () => {
   test("days of zero keeps every session visible", () => {
     const ancient = session({ id: "ancient", directory: "/src/a", time: { created: 0, updated: 0, archived: undefined } })
     const result = partitionSidebarRecords({
-      records: [{ session: ancient, project: project("/src/a"), name: "a" }],
+      records: [{ key: ancient.id, session: ancient, project: project("/src/a"), name: "a" }],
       pinned: () => false,
       days: 0,
       now: NOW,
@@ -90,8 +90,10 @@ describe("navigation sidebar visibility", () => {
   })
 
   test("matchesSidebarFilter checks project name and session title", () => {
+    const filtered = session({ id: "1", directory: "/src/a", title: "Fix login bug" })
     const record = {
-      session: session({ id: "1", directory: "/src/a", title: "Fix login bug" }),
+      key: filtered.id,
+      session: filtered,
       project: project("/src/a"),
       name: "Web App",
     }