-@@ -365,7 +346,7 @@ export function AgentSessionPanel({ rootSession, subagents, selectedSessionId, r
+@@ -365,7 +343,7 @@ export function AgentSessionPanel({ rootSession, subagents, selectedSessionId, r
aria-label={t("agentSwitcher.search")}
style={{
width: "100%", height: 32, padding: "0 10px",
@@ -12673,15 +12701,15 @@ index 8d51f3c..61fcf9e 100644
}}
/>
diff --git a/components/AgentsConfig.tsx b/components/AgentsConfig.tsx
-index 861a1c6..efd7e87 100644
+index 861a1c6..a0b4c72 100644
--- a/components/AgentsConfig.tsx
+++ b/components/AgentsConfig.tsx
@@ -38,6 +38,9 @@ import {
} from "./SettingsUi";
import { ModelSelector } from "./ModelSelector";
import { projectTrustReloadKey } from "./settings-ui-helpers";
-+import { CarbonIcon } from "./CarbonIcon";
-+import * as Carbon from "./carbon/icons";
++import { LucideIcon } from "./LucideIcon";
++import * as Lucide from "./lucide/icons";
+import { NativeSelect } from "./ui/select";
const TOOL_OPTIONS = ["read", "bash", "edit", "write", "grep", "find", "ls"];
@@ -12738,7 +12766,7 @@ index 861a1c6..efd7e87 100644
-
-+
@@ -21190,7 +21174,7 @@ index ef7a23f..acb7e72 100644
-
-+
-+
-+
)}
@@ -21038,7 +21022,7 @@ index ef7a23f..acb7e72 100644
- ? {translate("workspace.getStarted")}
@@ -15181,15 +15209,15 @@ index c2e7080..9d4e9da 100644
+ assert.equal(frames.length, 0);
+});
diff --git a/components/BranchNavigator.tsx b/components/BranchNavigator.tsx
-index 0f8186b..ef6cc22 100644
+index 0f8186b..420eb4c 100644
--- a/components/BranchNavigator.tsx
+++ b/components/BranchNavigator.tsx
@@ -3,6 +3,8 @@
import { useState, useCallback, useMemo, useRef, useEffect } from "react";
import type { BranchPreview, SessionEntry, SessionTreeNode } from "@/lib/types";
import { useI18n } from "@/hooks/useI18n";
-+import { CarbonIcon } from "./CarbonIcon";
-+import * as Carbon from "./carbon/icons";
++import { LucideIcon } from "./LucideIcon";
++import * as Lucide from "./lucide/icons";
interface Props {
tree: SessionTreeNode[];
@@ -15216,14 +15244,14 @@ index 0f8186b..ef6cc22 100644
- , "color" | "children"> {
-+ icon: CarbonIconData;
-+ /** Rendered width and height in px. */
-+ size?: number;
-+ /** Fill; the current text colour when unset. */
-+ color?: string;
-+ label?: string;
-+ className?: string;
-+ style?: CSSProperties;
-+}
-+
-+export function CarbonIcon({ icon, size = 16, color, label, className, style, ...rest }: CarbonIconProps) {
-+ return (
-+
-+ );
-+}
diff --git a/components/ChangesPane.test.mjs b/components/ChangesPane.test.mjs
new file mode 100644
index 0000000..5ed7bb3
@@ -16170,7 +16154,7 @@ index 0000000..5ed7bb3
+});
diff --git a/components/ChangesPane.tsx b/components/ChangesPane.tsx
new file mode 100644
-index 0000000..05fa3d7
+index 0000000..911db8c
--- /dev/null
+++ b/components/ChangesPane.tsx
@@ -0,0 +1,421 @@
@@ -16189,8 +16173,8 @@ index 0000000..05fa3d7
+import { useI18n } from "@/hooks/useI18n";
+import { useTheme } from "@/hooks/useTheme";
+import type { GitFileDiffResponse, GitFileStatus, GitStatusResponse } from "@/lib/git-types";
-+import { CarbonIcon } from "./CarbonIcon";
-+import * as Carbon from "./carbon/icons";
++import { LucideIcon } from "./LucideIcon";
++import * as Lucide from "./lucide/icons";
+import { getFileIcon } from "./FileIcons";
+import { RENDER, UNSAFE_CSS, VIRTUAL_METRICS, codePool, hashText, keyboardExpanders } from "./highlighting";
+import { Tip } from "./ui/tooltip";
@@ -16471,7 +16455,7 @@ index 0000000..05fa3d7
+ const { comment } = data;
+ return (
+
+
+
+
@@ -16520,7 +16504,7 @@ index 0000000..05fa3d7
+ disabled={commentCount === 0}
+ onClick={send}
+ >
-+
@@ -16880,7 +16864,7 @@ index 9189877..29ac1b6 100644
+ assert.match(plain, /<\/span>/);
});
diff --git a/components/ChatInput.tsx b/components/ChatInput.tsx
-index 9a0a1b7..d23c41b 100644
+index 9a0a1b7..018c5b6 100644
--- a/components/ChatInput.tsx
+++ b/components/ChatInput.tsx
@@ -1,8 +1,9 @@
@@ -16907,8 +16891,8 @@ index 9a0a1b7..d23c41b 100644
+import { ContextMeter } from "./ContextMeter";
+import { ComposerModelMenu } from "./ComposerModelMenu";
+import { ComposerModeMenu } from "./ComposerModeMenu";
-+import { CarbonIcon } from "./CarbonIcon";
-+import * as Carbon from "./carbon/icons";
++import { LucideIcon } from "./LucideIcon";
++import * as Lucide from "./lucide/icons";
export { filterModelOptions } from "./ModelSelector";
@@ -17068,11 +17052,11 @@ index 9a0a1b7..d23c41b 100644
+// One icon column in the list, as the reference's: each command shows what it is,
+// with the "+" menu's icons (commands, connectors, skills) and a page for a prompt.
-+const SLASH_SOURCE_ICONS: Record = {
-+ builtin: Carbon.Terminal,
-+ extension: Carbon.Plug,
-+ prompt: Carbon.Document,
-+ skill: Carbon.Layers,
++const SLASH_SOURCE_ICONS: Record = {
++ builtin: Lucide.Terminal,
++ extension: Lucide.Plug,
++ prompt: Lucide.File,
++ skill: Lucide.Layers,
+};
+
const SLASH_SOURCE_ORDER: Record = {
@@ -17106,7 +17090,7 @@ index 9a0a1b7..d23c41b 100644
-
+
+ 0 || undefined}>
-+
+
+
-+
-+
)}
@@ -20944,7 +20928,7 @@ index ef7a23f..acb7e72 100644
{t("chat.askInNewChat")}
diff --git a/components/BrowserPane.tsx b/components/BrowserPane.tsx
new file mode 100644
-index 0000000..26533b4
+index 0000000..5b49eb8
--- /dev/null
+++ b/components/BrowserPane.tsx
@@ -0,0 +1,809 @@
@@ -15285,8 +15313,8 @@ index 0000000..26533b4
+} from "@/lib/browser/types";
+import { BROWSER_VIEWPORT_LIMITS } from "@/lib/browser/types";
+import { PREVIEW_LOAD_TIMEOUT_MS, previewProblemOf, type PreviewProblem } from "@/lib/browser/preview-check";
-+import { CarbonIcon } from "./CarbonIcon";
-+import * as Carbon from "./carbon/icons";
++import { LucideIcon } from "./LucideIcon";
++import * as Lucide from "./lucide/icons";
+import { MenuItem, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuRoot, MenuSection, MenuSeparator, MenuSubmenu, MenuTrigger } from "./ui/menu";
+import { Tip } from "./ui/tooltip";
+import { shortcutLabel } from "@/lib/shortcuts";
@@ -15762,7 +15790,7 @@ index 0000000..26533b4
+ if (state && !state.available) {
+ return (
+
+ ))}
@@ -15928,22 +15956,22 @@ index 0000000..26533b4
+
+ {preview && (
+
-+
@@ -15774,12 +15802,12 @@ index 0000000..26533b4
+
+
+
+
+
+
+
+
@@ -15790,7 +15818,7 @@ index 0000000..26533b4
+ disabled={!ready}
+ onClick={() => void act({ action: activeTab?.loading ? "stop" : "reload" })}
+ >
-+
+
@@ -15912,7 +15940,7 @@ index 0000000..26533b4
+ void act({ action: "close_tab", tabId: tab.id });
+ }}
+ >
-+
-+
+
+
+
+
-+
+
+
+
+
@@ -15969,7 +15997,7 @@ index 0000000..26533b4
+ />}
+ {previewProblem && (
+
-+
+ ) : (
+
-+
+ );
+}
-diff --git a/components/CarbonIcon.tsx b/components/CarbonIcon.tsx
-new file mode 100644
-index 0000000..00d78bd
---- /dev/null
-+++ b/components/CarbonIcon.tsx
-@@ -0,0 +1,38 @@
-+import { createElement, type CSSProperties, type SVGProps } from "react";
-+import type { CarbonIconData } from "./carbon/icons";
-+
-+/**
-+ * An IBM Carbon icon (components/carbon/icons.ts, generated by the design
-+ * system's design/carbon-icons.mjs), filled with `color` or the current text
-+ * colour. Decorative by default (`aria-hidden`); pass `label` when the icon is
-+ * the only thing that says what it means. The pi mark is not an icon: it is
-+ * PiLogo.
-+ */
-+export interface CarbonIconProps extends Omit
-+
+
+
+
@@ -16510,7 +16494,7 @@ index 0000000..05fa3d7
+
+ {comment.text}
+ {title}
{body}
@@ -17514,7 +17498,7 @@ index 9a0a1b7..d23c41b 100644
+ if (listMode === "history") {
+ return [{
+ key: "history",
-+ items: inputHistory.map((item, index) => ({ key: `${index}:${item}`, icon:
-+
+
+
@@ -18143,7 +18127,7 @@ index 9a0a1b7..d23c41b 100644
+ 
+
+
+
+ ))}
@@ -18689,32 +18673,32 @@ index 9a0a1b7..d23c41b 100644
+
-+
)}
@@ -17884,7 +17868,7 @@ index 9a0a1b7..d23c41b 100644
+ {onRecallQueue && (
+