coder
diff --git a/‎src/browser/components/AuthTokenModal/AuthTokenModal.tsx‎
Lines changed: 3 additions & 4 deletions b/‎src/browser/components/AuthTokenModal/AuthTokenModal.tsx‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎src/browser/components/sidebarItemLayout.ts‎
Lines changed: 4 additions & 3 deletions b/‎src/browser/components/sidebarItemLayout.ts‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎src/browser/features/Messages/MarkdownComponents.tsx‎
Lines changed: 2 additions & 3 deletions b/‎src/browser/features/Messages/MarkdownComponents.tsx‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎src/browser/features/Tools/Shared/HighlightedCode.tsx‎
Lines changed: 2 additions & 2 deletions b/‎src/browser/features/Tools/Shared/HighlightedCode.tsx‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/browser/utils/agentSkills/inlineSkillReferences.ts‎
Lines changed: 2 additions & 2 deletions b/‎src/browser/utils/agentSkills/inlineSkillReferences.ts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/browser/utils/agentSkills/inlineSkillSuggestions.ts‎
Lines changed: 2 additions & 2 deletions b/‎src/browser/utils/agentSkills/inlineSkillSuggestions.ts‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/browser/utils/fileRead.ts‎
Lines changed: 7 additions & 7 deletions b/‎src/browser/utils/fileRead.ts‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎src/browser/utils/highlighting/highlightDiffChunk.ts‎
Lines changed: 2 additions & 6 deletions b/‎src/browser/utils/highlighting/highlightDiffChunk.ts‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎src/browser/utils/highlighting/shiki-shared.ts‎
Lines changed: 11 additions & 0 deletions b/‎src/browser/utils/highlighting/shiki-shared.ts‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/browser/utils/messages/messageUtils.ts‎
Lines changed: 1 addition & 1 deletion b/‎src/browser/utils/messages/messageUtils.ts‎
Lines changed: 1 addition & 1 deletion
@@ -11,6 +11,7 @@ import {
 import { Button } from "@/browser/components/Button/Button";
 import { getBrowserBackendBaseUrl } from "@/browser/utils/backendBaseUrl";
 import { getErrorMessage } from "@/common/utils/errors";
+import { isAbortError } from "@/browser/utils/isAbortError";
 
 interface AuthTokenModalProps {
   isOpen: boolean;
@@ -136,8 +137,7 @@ export function AuthTokenModal(props: AuthTokenModalProps) {
           return;
         }
 
-        const isAbortError = error instanceof DOMException && error.name === "AbortError";
-        if (!isAbortError) {
+        if (!isAbortError(error)) {
           setGithubDeviceFlowEnabled(false);
           setGithubOptionsLoading(false);
         }
@@ -218,8 +218,7 @@ export function AuthTokenModal(props: AuthTokenModalProps) {
         clearStoredAuthToken();
         props.onSessionAuthenticated?.();
       } catch (error) {
-        const isAbortError = error instanceof DOMException && error.name === "AbortError";
-        if (isAbortError) {
+        if (isAbortError(error)) {
           return;
         }
 
 
@@ -5,7 +5,6 @@ const SIDEBAR_DEPTH_INDENT_PX = 8;
 export const SIDEBAR_LEADING_SLOT_SIZE_PX = 16;
 const SIDEBAR_LEADING_SLOT_CENTER_OFFSET_PX = SIDEBAR_LEADING_SLOT_SIZE_PX / 2;
 const TASK_GROUP_MEMBER_DEPTH_OFFSET = 1.5;
-const TASK_GROUP_MEMBER_PARENT_RAIL_OFFSET_PX = SIDEBAR_LEADING_SLOT_CENTER_OFFSET_PX;
 const TASK_GROUP_MEMBER_ANCESTOR_RAIL_OFFSET_PX = 6;
 
 export function getSidebarItemPaddingLeft(depth?: number): number {
@@ -28,8 +27,10 @@ export function getSidebarLeadingSlotCenterX(depth: number): number {
 export function getSubAgentParentRailX(depth: number, layout: SubAgentConnectorLayout): number {
   if (layout === "task-group-member") {
     // Group members keep their shared rail in the task-group column instead of
-    // snapping to the nested workspace slot center.
-    return getSidebarItemPaddingLeft(depth) + TASK_GROUP_MEMBER_PARENT_RAIL_OFFSET_PX;
+    // snapping to the nested workspace slot center. Their half-step depth
+    // offset already places this column under the task-group icon, so the
+    // rail x reduces to the leading-slot center at the member's own depth.
+    return getSidebarLeadingSlotCenterX(depth);
   }
 
   // Regular sub-agents branch from the parent row's leading status slot center,
 
@@ -4,7 +4,7 @@ import { Play } from "lucide-react";
 import { Mermaid } from "./Mermaid";
 import { useOptionalMessageListContext } from "./MessageListContext";
 import { highlightCode } from "@/browser/utils/highlighting/highlightWorkerClient";
-import { extractShikiLines } from "@/browser/utils/highlighting/shiki-shared";
+import { extractShikiLines, isLightThemeMode } from "@/browser/utils/highlighting/shiki-shared";
 import { useTheme } from "@/browser/contexts/ThemeContext";
 import { CopyButton } from "@/browser/components/CopyButton/CopyButton";
 import { resolveBrowserLocalhostProxyTemplate } from "@/browser/utils/browserLocalhostProxyTemplate";
@@ -163,8 +163,7 @@ const CodeBlock: React.FC<CodeBlockProps> = ({ code, language, highlightLanguage
 
   const shikiLanguage = highlightLanguage ?? language;
   const { theme: themeMode } = useTheme();
-  const isLight = themeMode === "light" || themeMode.endsWith("-light");
-  const theme = isLight ? "light" : "dark";
+  const theme = isLightThemeMode(themeMode) ? "light" : "dark";
 
   // Split code into lines, removing trailing empty line
   const plainLines = code
 
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from "react";
 import { highlightCode } from "@/browser/utils/highlighting/highlightWorkerClient";
-import { extractShikiLines } from "@/browser/utils/highlighting/shiki-shared";
+import { extractShikiLines, isLightThemeMode } from "@/browser/utils/highlighting/shiki-shared";
 import { useTheme } from "@/browser/contexts/ThemeContext";
 import { cn } from "@/common/lib/utils";
 
@@ -33,7 +33,7 @@ export const HighlightedCode: React.FC<HighlightedCodeProps> = ({
 }) => {
   const [highlighted, setHighlighted] = useState<HighlightedLines | null>(null);
   const { theme: themeMode } = useTheme();
-  const theme = themeMode === "light" || themeMode.endsWith("-light") ? "light" : "dark";
+  const theme = isLightThemeMode(themeMode) ? "light" : "dark";
 
   const plainLines = code.split("\n").filter((line, i, arr) => i < arr.length - 1 || line !== "");
 
 
@@ -14,7 +14,7 @@ export interface InlineSkillCandidate {
 }
 
 /** Active candidate when the cursor is inside a `$partial` token (used by autocomplete). */
-export interface InlineSkillCursorMatch {
+interface InlineSkillCursorMatch {
   partial: string;
   startIndex: number;
   endIndex: number;
@@ -335,7 +335,7 @@ export function findInlineSkillReferenceAtCursor(
   };
 }
 
-export interface InlineSkillResolveOptions {
+interface InlineSkillResolveOptions {
   candidates: InlineSkillCandidate[];
   agentSkillDescriptors: AgentSkillDescriptor[];
   api: APIClient | null;
 
@@ -1,14 +1,14 @@
 import type { SlashSuggestion } from "@/browser/utils/slashCommands/types";
 import type { AgentSkillDescriptor } from "@/common/types/agentSkill";
 
-export interface InlineSkillSuggestionContext {
+interface InlineSkillSuggestionContext {
   /** The token typed after `$`. Empty string is allowed (just typed `$`). */
   partial: string;
   /** Already-loaded descriptors for current discovery target. */
   descriptors: AgentSkillDescriptor[];
 }
 
-export interface InlineSkillSuggestionRefreshContext {
+interface InlineSkillSuggestionRefreshContext {
   inputChanged: boolean;
   previousPartial: string | null;
   partial: string;
 
@@ -3,7 +3,7 @@
  */
 
 /** Maximum file size for reading into the UI (10MB). */
-export const MAX_FILE_SIZE = 10 * 1024 * 1024;
+const MAX_FILE_SIZE = 10 * 1024 * 1024;
 
 /** Exit code for "file too large". */
 export const EXIT_CODE_TOO_LARGE = 42;
@@ -19,12 +19,12 @@ const IMAGE_MAGIC_BYTES: Array<{ bytes: number[]; mime: string }> = [
 ];
 
 /** Escapes a path for safe use in shell commands. */
-export function shellEscape(s: string): string {
+function shellEscape(s: string): string {
   return "'" + s.replaceAll("'", "'\"'\"'") + "'";
 }
 
 /** Decode a base64 string to bytes. */
-export function base64ToUint8Array(base64: string): Uint8Array {
+function base64ToUint8Array(base64: string): Uint8Array {
   const binaryString = atob(base64);
   const bytes = new Uint8Array(binaryString.length);
   for (let i = 0; i < binaryString.length; i++) {
@@ -34,7 +34,7 @@ export function base64ToUint8Array(base64: string): Uint8Array {
 }
 
 /** Detect image type from magic bytes. */
-export function detectImageType(buffer: Uint8Array): string | undefined {
+function detectImageType(buffer: Uint8Array): string | undefined {
   for (const { bytes, mime } of IMAGE_MAGIC_BYTES) {
     if (buffer.length < bytes.length) continue;
 
@@ -68,7 +68,7 @@ export function detectImageType(buffer: Uint8Array): string | undefined {
 }
 
 /** Check if file is an SVG by looking for XML/SVG markers in content. */
-export function detectSvg(buffer: Uint8Array): boolean {
+function detectSvg(buffer: Uint8Array): boolean {
   const sampleSize = Math.min(buffer.length, 1024);
   const decoder = new TextDecoder("utf-8", { fatal: true });
   try {
@@ -80,7 +80,7 @@ export function detectSvg(buffer: Uint8Array): boolean {
 }
 
 /** Check if buffer contains binary content. */
-export function detectBinary(buffer: Uint8Array): boolean {
+function detectBinary(buffer: Uint8Array): boolean {
   const sampleSize = Math.min(buffer.length, 8192);
 
   for (let i = 0; i < sampleSize; i++) {
@@ -106,7 +106,7 @@ base64 < ${file}`;
 }
 
 /** Parse the read file script output (size on first line, base64 on remaining lines). */
-export function parseReadFileOutput(output: string): { size: number; base64: string } {
+function parseReadFileOutput(output: string): { size: number; base64: string } {
   const firstNewline = output.indexOf("\n");
 
   if (firstNewline === -1) {
 
@@ -1,4 +1,5 @@
 import { highlightCode } from "./highlightWorkerClient";
+import { isLightThemeMode } from "./shiki-shared";
 import type { DiffChunk } from "./diffChunking";
 
 /**
@@ -29,11 +30,6 @@ export interface HighlightedLine {
 
 import type { ThemeMode } from "@/browser/contexts/ThemeContext";
 
-/** Map theme mode to Shiki theme (light/dark only) */
-function isLightTheme(theme: ThemeMode): boolean {
-  return theme === "light" || theme.endsWith("-light");
-}
-
 export interface HighlightedChunk {
   type: DiffChunk["type"];
   lines: HighlightedLine[];
@@ -72,7 +68,7 @@ export async function highlightDiffChunk(
   }
 
   const code = chunk.lines.join("\n");
-  const workerTheme = isLightTheme(themeMode) ? "light" : "dark";
+  const workerTheme = isLightThemeMode(themeMode) ? "light" : "dark";
 
   try {
     // Highlight via worker (cached, off main thread)
 
@@ -7,6 +7,17 @@
 export const SHIKI_DARK_THEME = "min-dark";
 export const SHIKI_LIGHT_THEME = "min-light";
 
+/**
+ * Whether a theme-mode string maps to the light Shiki theme.
+ *
+ * Accepts both base modes (`"light"`/`"dark"`) and namespaced variants
+ * (e.g. `"flexoki-light"`), keeping the variant suffix convention as the
+ * single source of truth for the light/dark mapping.
+ */
+export function isLightThemeMode(themeMode: string): boolean {
+  return themeMode === "light" || themeMode.endsWith("-light");
+}
+
 /**
  * Map language names to Shiki-compatible language IDs
  * Handles special cases where detected language differs from Shiki's name
 
@@ -32,7 +32,7 @@ export function getEditableUserMessageText(
 /**
  * Type guard to check if a message is a bash_output tool call with valid args
  */
-export function isBashOutputTool(
+function isBashOutputTool(
   msg: DisplayedMessage
 ): msg is DisplayedMessage & { type: "tool"; toolName: "bash_output"; args: BashOutputToolArgs } {
   if (msg.type !== "tool" || msg.toolName !== "bash_output") {