fix: Adjust missing merge conflicts not caught before

This commit is contained in:
Johnny Amancio
2026-03-20 12:33:10 +01:00
parent a49820192d
commit 6e4c57f328
5 changed files with 5 additions and 9 deletions
+1 -1
View File
@@ -379,7 +379,7 @@ function App() {
dialog.replace(() => <DialogSessionList />)
},
},
...(Flag.OPENCODE_EXPERIMENTAL_WORKSPACES_TUI
...(Flag.KILO_EXPERIMENTAL_WORKSPACES_TUI
? [
{
title: "Manage workspaces",
@@ -103,7 +103,7 @@ export function Header() {
<Match when={session()?.parentID}>
<box flexDirection="column" gap={1}>
<box flexDirection={narrow() ? "column" : "row"} justifyContent="space-between" gap={narrow() ? 1 : 0}>
{Flag.OPENCODE_EXPERIMENTAL_WORKSPACES_TUI ? (
{Flag.KILO_EXPERIMENTAL_WORKSPACES_TUI ? (
<box flexDirection="column">
<text fg={theme.text}>
<b>Subagent session</b>
@@ -154,7 +154,7 @@ export function Header() {
</Match>
<Match when={true}>
<box flexDirection={narrow() ? "column" : "row"} justifyContent="space-between" gap={1}>
{Flag.OPENCODE_EXPERIMENTAL_WORKSPACES_TUI ? (
{Flag.KILO_EXPERIMENTAL_WORKSPACES_TUI ? (
<box flexDirection="column">
<Title session={session} />
<WorkspaceInfo workspace={workspace} />