@cofy-x/dsh-console 0.1.0-alpha.4 → 0.1.0-alpha.5

package/dist/{chunk-ZO6HZW3P.js → chunk-6BGDBP2N.js}

@@ -1,3 +1,7 @@
+import {
+  POKEMON_NUMBER_ENV,
+  resolvePokemonNumber
+} from "./chunk-WTD7XY24.js";
 import {
   CoreEvent,
   DEFAULT_FILE_FILTERING_OPTIONS,
@@ -71,7 +75,7 @@ import {
 } from "@deepseek-ai/dsh-agent";
 import { createUserMessage as createUserMessage2 } from "@deepseek-ai/dsh-llm";
 import {
-  SessionId as SessionId3
+  SessionId as SessionId4
 } from "@deepseek-ai/dsh-session";
 
 // src/utils/exit-codes.ts
@@ -208,6 +212,7 @@ function isLoadableSettingScope(scope) {
 }
 
 // src/config/settings-schema.ts
+var EMPTY_CUSTOM_THEMES = {};
 var SETTINGS_SCHEMA = {
   general: {
     type: "object",
@@ -279,7 +284,7 @@ var SETTINGS_SCHEMA = {
         label: "Custom Themes",
         category: "UI",
         requiresRestart: false,
-        default: {},
+        default: EMPTY_CUSTOM_THEMES,
         description: "Custom theme definitions.",
         showInDialog: false,
         additionalProperties: {
@@ -1464,10 +1469,6 @@ function loadEnvironment(settings) {
   }
 }
 function loadSettings(workspaceDir = process.cwd()) {
-  let systemSettings = {};
-  let systemDefaultSettings = {};
-  let userSettings = {};
-  let workspaceSettings = {};
   const settingsErrors = [];
   const systemSettingsPath = getSystemSettingsPath();
   const systemDefaultsPath = getSystemDefaultsPath();
@@ -1535,10 +1536,10 @@ function loadSettings(workspaceDir = process.cwd()) {
   );
   const userOriginalSettings = structuredClone(userResult.settings);
   const workspaceOriginalSettings = structuredClone(workspaceResult.settings);
-  systemSettings = resolveEnvVarsInObject(systemResult.settings);
-  systemDefaultSettings = resolveEnvVarsInObject(systemDefaultsResult.settings);
-  userSettings = resolveEnvVarsInObject(userResult.settings);
-  workspaceSettings = resolveEnvVarsInObject(workspaceResult.settings);
+  const systemSettings = resolveEnvVarsInObject(systemResult.settings);
+  const systemDefaultSettings = resolveEnvVarsInObject(systemDefaultsResult.settings);
+  const userSettings = resolveEnvVarsInObject(userResult.settings);
+  const workspaceSettings = resolveEnvVarsInObject(workspaceResult.settings);
   const isTrusted = true;
   const tempMergedSettings = mergeSettings(
     systemSettings,
@@ -1610,6 +1611,100 @@ function saveSettings(settingsFile) {
 // src/config/cli-args.ts
 import yargs from "yargs/yargs";
 import { hideBin } from "yargs/helpers";
+
+// src/utils/header-loader.ts
+import fs3 from "node:fs";
+import path2 from "node:path";
+var packageRoot = findPackageRoot(import.meta.url);
+var builtResources = path2.join(
+  packageRoot,
+  "dist/ui/components/layout/resources"
+);
+var sourceResources = path2.join(
+  packageRoot,
+  "src/ui/components/layout/resources"
+);
+var PokemonHeaderArtNotFoundError = class extends Error {
+  constructor(pokemonNumber) {
+    super(`Bundled Pokemon #${pokemonNumber} is not available.`);
+    this.name = "PokemonHeaderArtNotFoundError";
+  }
+};
+function resolveResourcesDir(resourceType, customPath) {
+  if (resourceType === "custom") {
+    if (!customPath) {
+      return null;
+    }
+    return path2.resolve(process.cwd(), customPath);
+  }
+  if (resourceType === "pokemon" && customPath) {
+    return path2.resolve(process.cwd(), customPath);
+  }
+  const builtResourceDir = path2.join(builtResources, resourceType);
+  return fs3.existsSync(builtResourceDir) ? builtResourceDir : path2.join(sourceResources, resourceType);
+}
+function loadHeaderArt(resourceType = "pokemon", customPath, pokemonNumber) {
+  try {
+    const resourcesDir = resolveResourcesDir(resourceType, customPath);
+    if (!resourcesDir) {
+      if (pokemonNumber !== void 0) {
+        throw new PokemonHeaderArtNotFoundError(pokemonNumber);
+      }
+      debugLogger.warn("Custom header art requires an art resources path.");
+      return null;
+    }
+    if (!fs3.existsSync(resourcesDir)) {
+      if (pokemonNumber !== void 0) {
+        throw new PokemonHeaderArtNotFoundError(pokemonNumber);
+      }
+      debugLogger.warn(`Header art resources path not found: ${resourcesDir}`);
+      return null;
+    }
+    const files = fs3.readdirSync(resourcesDir).filter((file) => file.endsWith(".txt")).sort();
+    if (files.length === 0) {
+      if (pokemonNumber !== void 0) {
+        throw new PokemonHeaderArtNotFoundError(pokemonNumber);
+      }
+      return null;
+    }
+    const selectedFile = pokemonNumber === void 0 ? files[Math.floor(Math.random() * files.length)] : files.find((file) => {
+      const match = /^(\d+)(?:-|\.txt$)/.exec(file);
+      return match?.[1] !== void 0 && Number(match[1]) === pokemonNumber;
+    });
+    if (!selectedFile) {
+      if (pokemonNumber !== void 0) {
+        throw new PokemonHeaderArtNotFoundError(pokemonNumber);
+      }
+      return null;
+    }
+    const filePath = path2.join(resourcesDir, selectedFile);
+    const content = fs3.readFileSync(filePath, "utf-8");
+    const id = selectedFile.replace(".txt", "");
+    return {
+      id,
+      art: content
+    };
+  } catch (error) {
+    if (error instanceof PokemonHeaderArtNotFoundError) throw error;
+    debugLogger.warn("Error loading header art:", error);
+    return null;
+  }
+}
+function loadCustomAsciiArt(filePath) {
+  try {
+    const resolvedPath = path2.resolve(process.cwd(), filePath);
+    if (!fs3.existsSync(resolvedPath)) {
+      debugLogger.warn(`Custom ASCII art file not found: ${resolvedPath}`);
+      return void 0;
+    }
+    return fs3.readFileSync(resolvedPath, "utf-8");
+  } catch (error) {
+    debugLogger.warn("Error loading custom ASCII art:", error);
+    return void 0;
+  }
+}
+
+// src/config/cli-args.ts
 async function parseArguments(settings, args = hideBin(process.argv)) {
   const startupMessages = [];
   const yargsInstance = yargs(args).locale("en").scriptName("dsh-console").usage(
@@ -1619,6 +1714,10 @@ async function parseArguments(settings, args = hideBin(process.argv)) {
     type: "boolean",
     description: "Enable DSH Console diagnostics",
     default: false
+  }).option("pokemon", {
+    type: "string",
+    nargs: 1,
+    description: "Use a bundled Pokemon number for this launch"
   }).command(
     "$0 [query..]",
     "Launch DSH Console",
@@ -1657,6 +1756,14 @@ async function parseArguments(settings, args = hideBin(process.argv)) {
   let result;
   try {
     result = await yargsInstance.parse();
+    const pokemonNumber = resolvePokemonNumber(
+      result["pokemon"],
+      process.env[POKEMON_NUMBER_ENV]
+    );
+    if (pokemonNumber !== void 0) {
+      loadHeaderArt("pokemon", void 0, pokemonNumber);
+      result["pokemon"] = pokemonNumber;
+    }
   } catch (e) {
     const msg = e instanceof Error ? e.message : String(e);
     debugLogger.error(msg);
@@ -1727,7 +1834,7 @@ var ConsolePatcher = class {
 };
 
 // src/config/config.ts
-import path2 from "node:path";
+import path3 from "node:path";
 var DEFAULT_SHELL_TERMINAL_WIDTH = 80;
 var DEFAULT_SHELL_TERMINAL_HEIGHT = 24;
 var Config = class {
@@ -1736,6 +1843,7 @@ var Config = class {
   targetDir;
   debugMode;
   question;
+  pokemonNumber;
   // Environment sanitization
   allowedEnvironmentVariables;
   blockedEnvironmentVariables;
@@ -1756,9 +1864,10 @@ var Config = class {
   // Storage
   storage;
   constructor(params) {
-    this.targetDir = path2.resolve(params.targetDir);
+    this.targetDir = path3.resolve(params.targetDir);
     this.debugMode = params.debugMode;
     this.question = params.question;
+    this.pokemonNumber = params.pokemonNumber;
     this.allowedEnvironmentVariables = params.allowedEnvironmentVariables ?? [];
     this.blockedEnvironmentVariables = params.blockedEnvironmentVariables ?? [];
     this.enableEnvironmentVariableRedaction = params.enableEnvironmentVariableRedaction ?? true;
@@ -1815,6 +1924,9 @@ var Config = class {
   getQuestion() {
     return this.question;
   }
+  getPokemonNumber() {
+    return this.pokemonNumber;
+  }
   get sanitizationConfig() {
     return {
       allowedEnvironmentVariables: this.allowedEnvironmentVariables,
@@ -1887,6 +1999,7 @@ async function loadCliConfig(settings, argv, options = {}) {
     targetDir: cwd,
     debugMode,
     question,
+    pokemonNumber: argv.pokemon,
     blockedEnvironmentVariables: settings.security?.environmentVariableRedaction?.blocked,
     enableEnvironmentVariableRedaction: settings.security?.environmentVariableRedaction?.enabled,
     accessibility: {
@@ -1924,7 +2037,7 @@ var useAlternateBuffer = () => {
 };
 
 // src/terminal/capabilities.ts
-import * as fs3 from "node:fs";
+import * as fs4 from "node:fs";
 var TerminalCapabilityManager = class _TerminalCapabilityManager {
   static instance;
   static KITTY_QUERY = "\x1B[?u";
@@ -2078,7 +2191,7 @@ var TerminalCapabilityManager = class _TerminalCapabilityManager {
       };
       process.stdin.on("data", onData);
       try {
-        fs3.writeSync(
+        fs4.writeSync(
           process.stdout.fd,
           _TerminalCapabilityManager.KITTY_QUERY + _TerminalCapabilityManager.OSC_11_QUERY + _TerminalCapabilityManager.TERMINAL_NAME_QUERY + _TerminalCapabilityManager.MODIFY_OTHER_KEYS_QUERY + _TerminalCapabilityManager.DEVICE_ATTRIBUTES_QUERY
         );
@@ -2168,21 +2281,21 @@ async function setupTerminalAndTheme(config, settings) {
 }
 
 // src/bootstrap/startup-warnings.ts
-import * as fs4 from "node:fs/promises";
+import * as fs5 from "node:fs/promises";
 import os from "node:os";
 import process2 from "node:process";
-import path3, { join as pathJoin } from "node:path";
+import path4, { join as pathJoin } from "node:path";
 var WARNINGS_FILE_PATH = pathJoin(
   os.tmpdir(),
   "dsh-console-warnings.txt"
 );
 async function getStoredStartupWarnings() {
   try {
-    await fs4.access(WARNINGS_FILE_PATH);
-    const warningsContent = await fs4.readFile(WARNINGS_FILE_PATH, "utf-8");
+    await fs5.access(WARNINGS_FILE_PATH);
+    const warningsContent = await fs5.readFile(WARNINGS_FILE_PATH, "utf-8");
     const warnings = warningsContent.split("\n").filter((line) => line.trim() !== "");
     try {
-      await fs4.unlink(WARNINGS_FILE_PATH);
+      await fs5.unlink(WARNINGS_FILE_PATH);
     } catch {
       warnings.push("Warning: Could not delete temporary warnings file.");
     }
@@ -2202,8 +2315,8 @@ var homeDirectoryCheck = {
     }
     try {
       const [workspaceRealPath, homeRealPath] = await Promise.all([
-        fs4.realpath(workspaceRoot),
-        fs4.realpath(homedir())
+        fs5.realpath(workspaceRoot),
+        fs5.realpath(homedir())
       ]);
       if (workspaceRealPath === homeRealPath) {
         return "Warning you are running DSH Console in your home directory.\nThis warning can be disabled in /settings";
@@ -2218,9 +2331,9 @@ var rootDirectoryCheck = {
   id: "root-directory",
   check: async (workspaceRoot, _settings) => {
     try {
-      const workspaceRealPath = await fs4.realpath(workspaceRoot);
+      const workspaceRealPath = await fs5.realpath(workspaceRoot);
       const errorMessage = "Warning: You are running DSH Console in the root directory. Your entire folder structure will be used for context. It is strongly recommended to run in a project-specific directory.";
-      if (path3.dirname(workspaceRealPath) === workspaceRealPath) {
+      if (path4.dirname(workspaceRealPath) === workspaceRealPath) {
         return errorMessage;
       }
       return null;
@@ -2248,7 +2361,7 @@ async function getStartupWarnings(settings, workspaceRoot = process2.cwd()) {
 }
 
 // src/ui/root.tsx
-import { basename as basename3 } from "node:path";
+import { basename as basename4 } from "node:path";
 
 // src/ui/types.ts
 import "react";
@@ -2319,13 +2432,13 @@ function computeTerminalTitle({
 
 // src/ui/app-container.tsx
 import {
-  useMemo as useMemo34,
-  useState as useState53,
-  useCallback as useCallback45,
-  useEffect as useEffect54,
-  useRef as useRef30,
+  useMemo as useMemo36,
+  useState as useState54,
+  useCallback as useCallback46,
+  useEffect as useEffect55,
+  useRef as useRef31,
   useLayoutEffect as useLayoutEffect3,
-  useSyncExternalStore as useSyncExternalStore5
+  useSyncExternalStore as useSyncExternalStore6
 } from "react";
 import { measureElement as measureElement3, useApp } from "ink";
 
@@ -3214,7 +3327,7 @@ var MarkdownDisplayInternal = ({
     } else if (headerMatch) {
       const level = headerMatch[1].length;
       const headerText = headerMatch[2];
-      let headerNode = null;
+      let headerNode;
       switch (level) {
         case 1:
           headerNode = /* @__PURE__ */ jsx9(Text8, { bold: true, color: theme.text.link, children: /* @__PURE__ */ jsx9(RenderInline, { text: headerText, defaultColor: theme.text.link }) });
@@ -4210,8 +4323,8 @@ var renderDiffContent = (parsedLines, filename, tabWidth = DEFAULT_TAB_WIDTH, av
         );
       }
       const lineKey = `diff-line-${index}`;
-      let gutterNumStr = "";
-      let prefixSymbol = " ";
+      let gutterNumStr;
+      let prefixSymbol;
       switch (line.type) {
         case "add":
           gutterNumStr = (line.newLine ?? "").toString();
@@ -5190,7 +5303,7 @@ function* emitKeys(keypressHandler) {
     let alt = false;
     let ctrl = false;
     let cmd = false;
-    let code = void 0;
+    let code;
     let insertable = false;
     if (ch === ESC) {
       escaped = true;
@@ -5323,8 +5436,8 @@ function* emitKeys(keypressHandler) {
         name2 = "undefined";
         if ((ctrl || cmd || alt) && (code.endsWith("u") || code.endsWith("~"))) {
           const codeNumber = parseInt(code.slice(1, -1), 10);
-          if (codeNumber >= "a".charCodeAt(0) && codeNumber <= "z".charCodeAt(0)) {
-            name2 = String.fromCharCode(codeNumber);
+          if (codeNumber >= 32 && codeNumber <= 126) {
+            name2 = String.fromCharCode(codeNumber).toLowerCase();
           }
         }
       }
@@ -5486,6 +5599,9 @@ function useKeypress(onKeypress, { isActive }) {
 }
 
 // src/terminal/keys.ts
+function isConversationSwitchKey(key) {
+  return key.sequence === "" || key.ctrl && (key.name === "/" || key.name === "_");
+}
 function keyToAnsi(key) {
   if (key.ctrl) {
     if (key.name >= "a" && key.name <= "z") {
@@ -6039,7 +6155,7 @@ import { Box as Box25 } from "ink";
 import { Box as Box21, Text as Text20 } from "ink";
 
 // src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "1318436";
+var GIT_COMMIT_INFO = "7fa332d";
 
 // src/ui/components/dialogs/about-box.tsx
 import { jsx as jsx27, jsxs as jsxs21 } from "react/jsx-runtime";
@@ -6680,18 +6796,18 @@ var useAppContext = () => {
 };
 
 // src/ui/components/indicators/notifications.tsx
-import path5 from "node:path";
+import path6 from "node:path";
 
 // src/ui/state/persistent.ts
-import * as fs5 from "node:fs";
-import * as path4 from "node:path";
+import * as fs6 from "node:fs";
+import * as path5 from "node:path";
 var STATE_FILENAME = "state.json";
 var PersistentState = class {
   cache = null;
   filePath = null;
   getPath() {
     if (!this.filePath) {
-      this.filePath = path4.join(
+      this.filePath = path5.join(
         Storage.getGlobalDshConsoleDir(),
         STATE_FILENAME
       );
@@ -6704,8 +6820,8 @@ var PersistentState = class {
     }
     try {
       const filePath = this.getPath();
-      if (fs5.existsSync(filePath)) {
-        const content = fs5.readFileSync(filePath, "utf-8");
+      if (fs6.existsSync(filePath)) {
+        const content = fs6.readFileSync(filePath, "utf-8");
         this.cache = JSON.parse(content);
       } else {
         this.cache = {};
@@ -6720,11 +6836,11 @@ var PersistentState = class {
     if (!this.cache) return;
     try {
       const filePath = this.getPath();
-      const dir = path4.dirname(filePath);
-      if (!fs5.existsSync(dir)) {
-        fs5.mkdirSync(dir, { recursive: true });
+      const dir = path5.dirname(filePath);
+      if (!fs6.existsSync(dir)) {
+        fs6.mkdirSync(dir, { recursive: true });
       }
-      fs5.writeFileSync(filePath, JSON.stringify(this.cache, null, 2));
+      fs6.writeFileSync(filePath, JSON.stringify(this.cache, null, 2));
     } catch (error) {
       debugLogger.warn("Failed to save persistent state:", error);
     }
@@ -6742,7 +6858,7 @@ var persistentState = new PersistentState();
 
 // src/ui/components/indicators/notifications.tsx
 import { Fragment as Fragment8, jsx as jsx36, jsxs as jsxs26 } from "react/jsx-runtime";
-var settingsPath = path5.join(homedir(), DSH_CONSOLE_DIR, "settings.json");
+var settingsPath = path6.join(homedir(), DSH_CONSOLE_DIR, "settings.json");
 var Notifications = () => {
   const { startupWarnings } = useAppContext();
   const { initError, streamingState } = useUIState();
@@ -7273,76 +7389,6 @@ var Header = ({
   return /* @__PURE__ */ jsx41(HorizontalHeader, { version, art: headerArt.art });
 };
 
-// src/utils/header-loader.ts
-import fs6 from "node:fs";
-import path6 from "node:path";
-var packageRoot = findPackageRoot(import.meta.url);
-var builtResources = path6.join(
-  packageRoot,
-  "dist/ui/components/layout/resources"
-);
-var sourceResources = path6.join(
-  packageRoot,
-  "src/ui/components/layout/resources"
-);
-function resolveResourcesDir(resourceType, customPath) {
-  if (resourceType === "custom") {
-    if (!customPath) {
-      return null;
-    }
-    return path6.resolve(process.cwd(), customPath);
-  }
-  if (resourceType === "pokemon" && customPath) {
-    return path6.resolve(process.cwd(), customPath);
-  }
-  const builtResourceDir = path6.join(builtResources, resourceType);
-  return fs6.existsSync(builtResourceDir) ? builtResourceDir : path6.join(sourceResources, resourceType);
-}
-function loadHeaderArt(resourceType = "pokemon", customPath) {
-  try {
-    const resourcesDir = resolveResourcesDir(resourceType, customPath);
-    if (!resourcesDir) {
-      debugLogger.warn("Custom header art requires an art resources path.");
-      return null;
-    }
-    if (!fs6.existsSync(resourcesDir)) {
-      debugLogger.warn(`Header art resources path not found: ${resourcesDir}`);
-      return null;
-    }
-    const files = fs6.readdirSync(resourcesDir).filter((file) => file.endsWith(".txt")).sort();
-    if (files.length === 0) {
-      return null;
-    }
-    const selectedFile = files[Math.floor(Math.random() * files.length)];
-    if (!selectedFile) {
-      return null;
-    }
-    const filePath = path6.join(resourcesDir, selectedFile);
-    const content = fs6.readFileSync(filePath, "utf-8");
-    const id = selectedFile.replace(".txt", "");
-    return {
-      id,
-      art: content
-    };
-  } catch (error) {
-    debugLogger.warn("Error loading header art:", error);
-    return null;
-  }
-}
-function loadCustomAsciiArt(filePath) {
-  try {
-    const resolvedPath = path6.resolve(process.cwd(), filePath);
-    if (!fs6.existsSync(resolvedPath)) {
-      debugLogger.warn(`Custom ASCII art file not found: ${resolvedPath}`);
-      return void 0;
-    }
-    return fs6.readFileSync(resolvedPath, "utf-8");
-  } catch (error) {
-    debugLogger.warn("Error loading custom ASCII art:", error);
-    return void 0;
-  }
-}
-
 // src/ui/components/layout/app-header.tsx
 import { useMemo as useMemo9 } from "react";
 import { jsx as jsx42 } from "react/jsx-runtime";
@@ -7354,18 +7400,22 @@ var AppHeader = ({ version }) => {
   const artResourceType = settings.merged.ui.header.artResourceType ?? "pokemon";
   const artResourcesPath = settings.merged.ui.header.artResourcesPath;
   const customAsciiArtPath = settings.merged.ui.header.customAsciiArtPath;
+  const pokemonNumber = config.getPokemonNumber();
   const customAsciiArt = useMemo9(() => {
-    if (customAsciiArtPath) {
+    if (pokemonNumber === void 0 && customAsciiArtPath) {
       return loadCustomAsciiArt(customAsciiArtPath);
     }
     return void 0;
-  }, [customAsciiArtPath]);
+  }, [customAsciiArtPath, pokemonNumber]);
   const headerArt = useMemo9(() => {
     if (customAsciiArt) {
       return null;
     }
+    if (pokemonNumber !== void 0) {
+      return loadHeaderArt("pokemon", void 0, pokemonNumber);
+    }
     return loadHeaderArt(artResourceType, artResourcesPath);
-  }, [artResourceType, artResourcesPath, customAsciiArt]);
+  }, [artResourceType, artResourcesPath, customAsciiArt, pokemonNumber]);
   if (config.getScreenReader()) {
     return null;
   }
@@ -7915,7 +7965,7 @@ var ScrollProvider = ({
         const hitTop = isTop ? absoluteThumbTop : absoluteThumbTop - 1;
         const hitBottom = isBottom ? absoluteThumbBottom : absoluteThumbBottom + 1;
         const isThumbClick = mouseEvent.row >= hitTop && mouseEvent.row < hitBottom;
-        let offset = 0;
+        let offset;
         const relativeMouseY = mouseEvent.row - y;
         if (isThumbClick) {
           offset = relativeMouseY - currentThumbY;
@@ -9780,11 +9830,9 @@ function getUserLinuxClipboardTool() {
   if (linuxClipboardTool !== null) {
     return linuxClipboardTool;
   }
-  let toolName = null;
   const displayServer = process.env["XDG_SESSION_TYPE"];
-  if (displayServer === "wayland") toolName = "wl-paste";
-  else if (displayServer === "x11") toolName = "xclip";
-  else return null;
+  const toolName = displayServer === "wayland" ? "wl-paste" : displayServer === "x11" ? "xclip" : null;
+  if (toolName === null) return null;
   try {
     execSync(`command -v ${toolName}`, { stdio: "ignore" });
     linuxClipboardTool = toolName;
@@ -10340,8 +10388,8 @@ function calculateInitialCursorPosition(initialLines, offset) {
   return [0, 0];
 }
 function offsetToLogicalPos(text, offset) {
-  let row = 0;
-  let col = 0;
+  let row;
+  let col;
   let currentOffset = 0;
   if (offset === 0) return [0, 0];
   const lines = text.split("\n");
@@ -11752,7 +11800,7 @@ function textBufferReducerLogic(state, action, options = {}) {
         case "wordLeft": {
           if (cursorCol === 0 && cursorRow === 0) return state;
           let newCursorRow = cursorRow;
-          let newCursorCol = cursorCol;
+          let newCursorCol;
           if (cursorCol === 0) {
             newCursorRow--;
             newCursorCol = cpLen(lines[newCursorRow] ?? "");
@@ -11773,7 +11821,7 @@ function textBufferReducerLogic(state, action, options = {}) {
             return state;
           }
           let newCursorRow = cursorRow;
-          let newCursorCol = cursorCol;
+          let newCursorCol;
           const lineLen = cpLen(lineContent);
           if (cursorCol >= lineLen) {
             newCursorRow++;
@@ -13176,7 +13224,7 @@ function BaseSettingsDialog({
           return;
         }
         let ch = key.sequence;
-        let isValidChar = false;
+        let isValidChar;
         if (type === "number") {
           isValidChar = /[0-9\-+.]/.test(ch);
         } else {
@@ -14393,7 +14441,7 @@ var _ExpandableText = ({
   }
   const matchLength = userInput.length;
   let before = "";
-  let match = "";
+  let match;
   let after = "";
   if (isExpanded || label.length <= maxWidth) {
     before = label.slice(0, matchedIndex);
@@ -14595,7 +14643,7 @@ function useInputHistory({
   const navigateUp = useCallback23(() => {
     if (!isActive) return false;
     if (userMessages.length === 0) return false;
-    let nextIndex = historyIndex;
+    let nextIndex;
     if (historyIndex === -1) {
       setOriginalQueryBeforeNav(currentQuery);
       nextIndex = 0;
@@ -15257,7 +15305,7 @@ function useCommandSuggestions(query, parserResult, commandContext, getFzfForCom
     if (commandsToSearch.length > 0) {
       const performFuzzySearch = async () => {
         if (signal.aborted) return;
-        let potentialSuggestions = [];
+        let potentialSuggestions;
         if (partial === "") {
           potentialSuggestions = commandsToSearch.filter(
             (cmd) => cmd.description && !cmd.hidden
@@ -15983,6 +16031,39 @@ import { createContext as createContext11, useContext as useContext12 } from "re
 var ShellFocusContext = createContext11(true);
 var useShellFocusState = () => useContext12(ShellFocusContext);
 
+// src/ui/commands/parser.ts
+var parseSlashCommand = (query, commands) => {
+  const trimmed = query.trim();
+  const parts = trimmed.substring(1).trim().split(/\s+/);
+  const commandPath = parts.filter((p) => p);
+  let currentCommands = commands;
+  let commandToExecute;
+  let pathIndex = 0;
+  const canonicalPath = [];
+  for (const part of commandPath) {
+    let foundCommand = currentCommands.find((cmd) => cmd.name === part);
+    if (!foundCommand) {
+      foundCommand = currentCommands.find(
+        (cmd) => cmd.altNames?.includes(part)
+      );
+    }
+    if (foundCommand) {
+      commandToExecute = foundCommand;
+      canonicalPath.push(foundCommand.name);
+      pathIndex++;
+      if (foundCommand.subCommands) {
+        currentCommands = foundCommand.subCommands;
+      } else {
+        break;
+      }
+    } else {
+      break;
+    }
+  }
+  const args = parts.slice(pathIndex).join(" ");
+  return { commandToExecute, args, canonicalPath };
+};
+
 // src/ui/components/input/input-prompt.tsx
 import { Fragment as Fragment12, jsx as jsx64, jsxs as jsxs48 } from "react/jsx-runtime";
 function isTerminalPasteTrusted(kittyProtocolSupported) {
@@ -16125,8 +16206,10 @@ var InputPrompt = ({
     (submittedValue) => {
       const trimmedMessage = submittedValue.trim();
       const isSlash = isSlashCommand(trimmedMessage);
+      const command = isSlash ? parseSlashCommand(trimmedMessage, slashCommands).commandToExecute : void 0;
+      const canRunWhileBusy = command?.allowWhileBusy === true;
       const isShell = shellModeActive;
-      if ((isSlash || isShell) && streamingState === "responding" /* Responding */) {
+      if ((isShell || isSlash && !canRunWhileBusy) && streamingState === "responding" /* Responding */) {
         setQueueErrorMessage(
           `${isShell ? "Shell" : "Slash"} commands cannot be queued`
         );
@@ -16136,6 +16219,7 @@ var InputPrompt = ({
     },
     [
       handleSubmitAndClear,
+      slashCommands,
       shellModeActive,
       streamingState,
       setQueueErrorMessage
@@ -16587,6 +16671,9 @@ var InputPrompt = ({
         }
         return;
       }
+      if (isConversationSwitchKey(key)) {
+        return;
+      }
       buffer.handleInput(key);
       if (completion.promptCompletion.text && key.sequence && key.sequence.length === 1 && !key.alt && !key.ctrl && !key.cmd) {
         completion.promptCompletion.clear();
@@ -16643,7 +16730,7 @@ var InputPrompt = ({
     const remainingWidth = Math.max(0, inputWidth - usedWidth);
     const ghostTextLinesRaw = ghostSuffix.split("\n");
     const firstLineRaw = ghostTextLinesRaw.shift() || "";
-    let inlineGhost2 = "";
+    let inlineGhost2;
     let remainingFirstLine = "";
     if (stringWidth3(firstLineRaw) <= remainingWidth) {
       inlineGhost2 = firstLineRaw;
@@ -16940,6 +17027,7 @@ var InputPrompt = ({
 };
 
 // src/ui/components/layout/footer.tsx
+import { basename as basename2 } from "node:path";
 import { Box as Box54, Text as Text49 } from "ink";
 
 // src/ui/components/layout/console-summary-display.tsx
@@ -16995,7 +17083,7 @@ var MemoryUsageDisplay = () => {
 import { Text as Text47 } from "ink";
 import { useEffect as useEffect35, useState as useState32 } from "react";
 import { FixedDeque } from "mnemonist";
-import { jsx as jsx67, jsxs as jsxs51 } from "react/jsx-runtime";
+import { Fragment as Fragment13, jsx as jsx67, jsxs as jsxs51 } from "react/jsx-runtime";
 var MIN_TIME_FROM_ACTION_TO_BE_IDLE = 500;
 var ACTION_TIMESTAMP_CAPACITY = 2048;
 var FRAME_TIMESTAMP_CAPACITY = 2048;
@@ -17147,12 +17235,14 @@ var DebugProfiler = ({ compact = false }) => {
   }
   if (compact) {
     return /* @__PURE__ */ jsxs51(Text47, { color: theme.status.warning, wrap: "truncate-end", children: [
-      "R:",
+      "R",
       profiler.numFrames,
-      " I:",
+      " I",
       /* @__PURE__ */ jsx67(Text47, { color: theme.status.error, children: profiler.totalIdleFrames }),
-      " F:",
-      /* @__PURE__ */ jsx67(Text47, { color: theme.status.error, children: profiler.totalFlickerFrames })
+      profiler.totalFlickerFrames > 0 && /* @__PURE__ */ jsxs51(Fragment13, { children: [
+        " F",
+        /* @__PURE__ */ jsx67(Text47, { color: theme.status.error, children: profiler.totalFlickerFrames })
+      ] })
     ] }, forceRefresh);
   }
   return /* @__PURE__ */ jsxs51(Text47, { color: theme.status.warning, wrap: "truncate-end", children: [
@@ -17227,14 +17317,26 @@ var Footer = () => {
     nightly: uiState.nightly,
     terminalWidth: uiState.terminalWidth
   };
-  const showMemoryUsage = config.getDebugMode() || settings.merged.ui.showMemoryUsage;
+  const isNarrow = terminalWidth < 120;
+  const isCompact = terminalWidth < 160;
+  const showMemoryUsage = !isCompact && (config.getDebugMode() || settings.merged.ui.showMemoryUsage);
   const hideCWD = settings.merged.ui.footer.hideCWD;
   const hideModelInfo = settings.merged.ui.footer.hideModelInfo;
   const pathLength = Math.max(20, Math.floor(terminalWidth * 0.25));
-  const displayPath = shortenPath(tildeifyPath(targetDir), pathLength);
-  const justifyContent = hideCWD && hideModelInfo ? "center" : "space-between";
+  const displayPath = isCompact ? basename2(targetDir) || targetDir : shortenPath(tildeifyPath(targetDir), pathLength);
   const displayVimMode = vimEnabled ? vimMode : void 0;
-  const showRenderDiagnostics = debugMode || isDevelopment;
+  const sideConversation = uiState.sideConversation ?? {
+    activeSurface: "main",
+    mainBusy: false,
+    sideBusy: false
+  };
+  const showRenderDiagnostics = (debugMode || isDevelopment) && (!isNarrow || sideConversation.activeSurface !== "side");
+  const showCwd = !hideCWD;
+  const showLeft = Boolean(
+    displayVimMode || showCwd || debugMode && isNarrow
+  );
+  const justifyContent = hideModelInfo ? showLeft ? "flex-start" : "center" : showLeft ? "space-between" : "flex-end";
+  const displayModel = isCompact ? model.split("/").at(-1) ?? model : model;
   return /* @__PURE__ */ jsxs53(
     Box54,
     {
@@ -17244,28 +17346,29 @@ var Footer = () => {
       alignItems: "center",
       paddingX: 1,
       children: [
-        (displayVimMode || !hideCWD) && /* @__PURE__ */ jsxs53(Box54, { children: [
+        (displayVimMode || showCwd || debugMode && isNarrow) && /* @__PURE__ */ jsxs53(Box54, { flexShrink: 1, children: [
           displayVimMode && /* @__PURE__ */ jsxs53(Text49, { color: theme.text.secondary, children: [
             "[",
             displayVimMode,
             "] "
           ] }),
-          !hideCWD && (nightly ? /* @__PURE__ */ jsxs53(ThemedGradient, { children: [
+          showCwd && (nightly ? /* @__PURE__ */ jsxs53(ThemedGradient, { children: [
             displayPath,
-            branchName && /* @__PURE__ */ jsxs53(Text49, { children: [
+            branchName && !isNarrow && /* @__PURE__ */ jsxs53(Text49, { children: [
               " (",
               branchName,
               "*)"
             ] })
           ] }) : /* @__PURE__ */ jsxs53(Text49, { color: theme.text.link, children: [
             displayPath,
-            branchName && /* @__PURE__ */ jsxs53(Text49, { color: theme.text.secondary, children: [
+            branchName && !isNarrow && /* @__PURE__ */ jsxs53(Text49, { color: theme.text.secondary, children: [
               " (",
               branchName,
               "*)"
             ] })
           ] })),
-          debugMode && /* @__PURE__ */ jsx69(Text49, { color: theme.status.error, children: " " + (debugMessage || "--debug") })
+          debugMode && !isNarrow && /* @__PURE__ */ jsx69(Text49, { color: theme.status.error, children: " " + (debugMessage || "--debug") }),
+          debugMode && isNarrow && /* @__PURE__ */ jsx69(Text49, { color: theme.status.error, children: showCwd ? " --debug" : "--debug" })
         ] }),
         showRenderDiagnostics && /* @__PURE__ */ jsx69(
           Box54,
@@ -17274,12 +17377,30 @@ var Footer = () => {
             flexShrink: 1,
             justifyContent: "center",
             marginX: terminalWidth >= 120 ? 1 : 0,
-            children: /* @__PURE__ */ jsx69(DebugProfiler, { compact: terminalWidth < 120 })
+            children: /* @__PURE__ */ jsx69(DebugProfiler, { compact: isCompact })
           }
         ),
-        !hideModelInfo && /* @__PURE__ */ jsxs53(Box54, { alignItems: "center", justifyContent: "flex-end", children: [
-          /* @__PURE__ */ jsxs53(Box54, { alignItems: "center", justifyContent: "flex-end", children: [
-            /* @__PURE__ */ jsx69(Text49, { color: theme.text.accent, children: model }),
+        !hideModelInfo && /* @__PURE__ */ jsxs53(Box54, { alignItems: "center", justifyContent: "flex-end", flexShrink: 1, children: [
+          (uiState.subagentCatalog?.runningCount ?? 0) > 0 && /* @__PURE__ */ jsxs53(Box54, { flexShrink: 0, children: [
+            /* @__PURE__ */ jsx69(Text49, { color: theme.status.success, children: isCompact ? `A${uiState.subagentCatalog?.runningCount}` : `${uiState.subagentCatalog?.runningCount} agent${uiState.subagentCatalog?.runningCount === 1 ? "" : "s"} working` }),
+            /* @__PURE__ */ jsx69(Text49, { color: theme.text.secondary, children: " | " })
+          ] }),
+          sideConversation.activeSurface === "side" && /* @__PURE__ */ jsxs53(Box54, { flexShrink: 1, children: [
+            /* @__PURE__ */ jsx69(Text49, { color: theme.text.accent, children: "Side" }),
+            /* @__PURE__ */ jsx69(Text49, { color: theme.text.secondary, children: " \xB7 Main " }),
+            /* @__PURE__ */ jsx69(
+              Text49,
+              {
+                color: sideConversation.mainBusy ? theme.status.warning : theme.status.success,
+                children: sideConversation.mainBusy ? "working" : "idle"
+              }
+            ),
+            /* @__PURE__ */ jsx69(Text49, { color: theme.text.secondary, children: " \xB7 " }),
+            /* @__PURE__ */ jsx69(Text49, { color: theme.text.accent, wrap: "truncate-end", children: isCompact ? "Ctrl+/" : "Ctrl+/ switch" }),
+            /* @__PURE__ */ jsx69(Text49, { color: theme.text.secondary, children: " | " })
+          ] }),
+          /* @__PURE__ */ jsxs53(Box54, { alignItems: "center", justifyContent: "flex-end", flexShrink: 1, children: [
+            /* @__PURE__ */ jsx69(Text49, { color: theme.text.accent, wrap: "truncate-end", children: displayModel }),
             uiState.currentReasoningEffort && /* @__PURE__ */ jsxs53(Text49, { color: theme.text.link, children: [
               " ",
               uiState.currentReasoningEffort
@@ -17289,7 +17410,7 @@ var Footer = () => {
               {
                 promptTokens: uiState.sessionStats.lastPromptTokenCount,
                 contextWindow: uiState.sessionStats.contextWindow,
-                compact: terminalWidth < 100
+                compact: isCompact
               }
             ),
             showMemoryUsage && /* @__PURE__ */ jsx69(MemoryUsageDisplay, {})
@@ -17343,33 +17464,42 @@ var CommandInitDisplay = ({
 import { Box as Box57, Text as Text52 } from "ink";
 import { useMemo as useMemo21 } from "react";
 import { jsx as jsx72, jsxs as jsxs56 } from "react/jsx-runtime";
-var TodoTitleDisplay = ({ todos }) => {
+var TodoTitleDisplay = ({ todos, isWorking, compact = false }) => {
   const score = useMemo21(() => {
     let total = 0;
     let completed = 0;
+    let unfinished = 0;
     for (const todo of todos.todos) {
       if (todo.status !== "cancelled") {
         total += 1;
         if (todo.status === "completed") {
           completed += 1;
+        } else {
+          unfinished += 1;
         }
       }
     }
-    return `${completed}/${total} completed`;
-  }, [todos]);
+    const idleRemainder = !isWorking && unfinished > 0 ? ` \xB7 ${unfinished} unfinished` : "";
+    const completion = compact ? `${completed}/${total}` : `${completed}/${total} completed`;
+    return `${completion}${idleRemainder}`;
+  }, [compact, isWorking, todos]);
   return /* @__PURE__ */ jsxs56(Box57, { flexDirection: "row", columnGap: 2, height: 1, children: [
     /* @__PURE__ */ jsx72(Text52, { color: theme.text.primary, bold: true, "aria-label": "Todo list", children: "Todo" }),
-    /* @__PURE__ */ jsxs56(Text52, { color: theme.text.secondary, children: [
+    /* @__PURE__ */ jsxs56(Text52, { color: theme.text.secondary, wrap: "truncate", children: [
       score,
-      " (ctrl+t to toggle)"
+      " ",
+      compact ? "(ctrl+t)" : "(ctrl+t to toggle)"
     ] })
   ] });
 };
-var TodoStatusDisplay = ({ status }) => {
+var TodoStatusDisplay = ({ status, isWorking }) => {
   switch (status) {
     case "completed":
       return /* @__PURE__ */ jsx72(Text52, { color: theme.status.success, "aria-label": "Completed", children: "\u2713" });
     case "in_progress":
+      if (!isWorking) {
+        return /* @__PURE__ */ jsx72(Text52, { color: theme.text.secondary, "aria-label": "Unfinished", children: "\u25CB" });
+      }
       return /* @__PURE__ */ jsx72(Text52, { color: theme.text.accent, "aria-label": "In Progress", children: "\xBB" });
     case "pending":
       return /* @__PURE__ */ jsx72(Text52, { color: theme.text.secondary, "aria-label": "Pending", children: "\u2610" });
@@ -17378,11 +17508,11 @@ var TodoStatusDisplay = ({ status }) => {
       return /* @__PURE__ */ jsx72(Text52, { color: theme.status.error, "aria-label": "Cancelled", children: "\u2717" });
   }
 };
-var TodoItemDisplay = ({ todo, wrap, role: ariaRole }) => {
+var TodoItemDisplay = ({ todo, wrap, role: ariaRole, isWorking }) => {
   const textColor = (() => {
     switch (todo.status) {
       case "in_progress":
-        return theme.text.accent;
+        return isWorking ? theme.text.accent : theme.text.primary;
       case "completed":
       case "cancelled":
         return theme.text.secondary;
@@ -17392,13 +17522,14 @@ var TodoItemDisplay = ({ todo, wrap, role: ariaRole }) => {
   })();
   const strikethrough = todo.status === "cancelled";
   return /* @__PURE__ */ jsxs56(Box57, { flexDirection: "row", columnGap: 1, "aria-role": ariaRole, children: [
-    /* @__PURE__ */ jsx72(TodoStatusDisplay, { status: todo.status }),
+    /* @__PURE__ */ jsx72(TodoStatusDisplay, { status: todo.status, isWorking }),
     /* @__PURE__ */ jsx72(Box57, { flexShrink: 1, children: /* @__PURE__ */ jsx72(Text52, { color: textColor, wrap, strikethrough, children: todo.description }) })
   ] });
 };
 var TodoTray = () => {
   const uiState = useUIState();
   const todos = uiState.todos ?? null;
+  const isWorking = uiState.streamingState === "responding" /* Responding */;
   const inProgress = useMemo21(() => {
     if (todos === null) {
       return null;
@@ -17425,16 +17556,31 @@ var TodoTray = () => {
       paddingLeft: 1,
       paddingRight: 1,
       children: uiState.showFullTodos ? /* @__PURE__ */ jsxs56(Box57, { flexDirection: "column", rowGap: 1, children: [
-        /* @__PURE__ */ jsx72(TodoTitleDisplay, { todos }),
-        /* @__PURE__ */ jsx72(TodoListDisplay, { todos })
+        /* @__PURE__ */ jsx72(TodoTitleDisplay, { todos, isWorking }),
+        /* @__PURE__ */ jsx72(TodoListDisplay, { todos, isWorking })
       ] }) : /* @__PURE__ */ jsxs56(Box57, { flexDirection: "row", columnGap: 1, height: 1, children: [
-        /* @__PURE__ */ jsx72(Box57, { flexShrink: 0, flexGrow: 0, children: /* @__PURE__ */ jsx72(TodoTitleDisplay, { todos }) }),
-        inProgress && /* @__PURE__ */ jsx72(Box57, { flexShrink: 1, flexGrow: 1, children: /* @__PURE__ */ jsx72(TodoItemDisplay, { todo: inProgress, wrap: "truncate" }) })
+        /* @__PURE__ */ jsx72(Box57, { flexShrink: 1, flexGrow: 0, children: /* @__PURE__ */ jsx72(TodoTitleDisplay, { todos, isWorking, compact: true }) }),
+        inProgress && /* @__PURE__ */ jsx72(Box57, { flexShrink: 1, flexGrow: 1, children: /* @__PURE__ */ jsx72(
+          TodoItemDisplay,
+          {
+            todo: inProgress,
+            wrap: "truncate",
+            isWorking
+          }
+        ) })
       ] })
     }
   );
 };
-var TodoListDisplay = ({ todos }) => /* @__PURE__ */ jsx72(Box57, { flexDirection: "column", "aria-role": "list", children: todos.todos.map((todo, index) => /* @__PURE__ */ jsx72(TodoItemDisplay, { todo, role: "listitem" }, index)) });
+var TodoListDisplay = ({ todos, isWorking }) => /* @__PURE__ */ jsx72(Box57, { flexDirection: "column", "aria-role": "list", children: todos.todos.map((todo, index) => /* @__PURE__ */ jsx72(
+  TodoItemDisplay,
+  {
+    todo,
+    role: "listitem",
+    isWorking
+  },
+  index
+)) });
 
 // src/ui/components/layout/status-display.tsx
 import { Text as Text53 } from "ink";
@@ -17560,10 +17706,10 @@ var Composer = ({ isFocused = true }) => {
 
 // src/ui/components/dialogs/exit-warning.tsx
 import { Box as Box59, Text as Text54 } from "ink";
-import { Fragment as Fragment13, jsx as jsx75, jsxs as jsxs58 } from "react/jsx-runtime";
+import { Fragment as Fragment14, jsx as jsx75, jsxs as jsxs58 } from "react/jsx-runtime";
 var ExitWarning = () => {
   const uiState = useUIState();
-  return /* @__PURE__ */ jsxs58(Fragment13, { children: [
+  return /* @__PURE__ */ jsxs58(Fragment14, { children: [
     uiState.dialogsVisible && uiState.ctrlCPressedOnce && /* @__PURE__ */ jsx75(Box59, { marginTop: 1, children: /* @__PURE__ */ jsx75(Text54, { color: theme.status.warning, children: "Press Ctrl+C again to exit." }) }),
     uiState.dialogsVisible && uiState.ctrlDPressedOnce && /* @__PURE__ */ jsx75(Box59, { marginTop: 1, children: /* @__PURE__ */ jsx75(Text54, { color: theme.status.warning, children: "Press Ctrl+D again to exit." }) })
   ] });
@@ -18706,7 +18852,7 @@ var CopyModeWarning = () => {
 };
 
 // src/ui/components/layout/default-app-layout.tsx
-import { Fragment as Fragment14, jsx as jsx85, jsxs as jsxs64 } from "react/jsx-runtime";
+import { Fragment as Fragment15, jsx as jsx85, jsxs as jsxs64 } from "react/jsx-runtime";
 var DefaultAppLayout = () => {
   const uiState = useUIState();
   const isAlternateBuffer = useAlternateBuffer();
@@ -18740,7 +18886,7 @@ var DefaultAppLayout = () => {
             children: [
               /* @__PURE__ */ jsx85(Notifications, {}),
               /* @__PURE__ */ jsx85(CopyModeWarning, {}),
-              pendingApproval !== void 0 ? /* @__PURE__ */ jsxs64(Fragment14, { children: [
+              pendingApproval !== void 0 ? /* @__PURE__ */ jsxs64(Fragment15, { children: [
                 /* @__PURE__ */ jsx85(
                   ToolConfirmationQueue,
                   {
@@ -18899,7 +19045,7 @@ function useHistory() {
 }
 
 // src/ui/hooks/commands/use-slash-command-processor.ts
-import { useCallback as useCallback35, useMemo as useMemo33, useEffect as useEffect43, useRef as useRef21, useState as useState41 } from "react";
+import { useCallback as useCallback36, useMemo as useMemo34, useEffect as useEffect44, useRef as useRef22, useState as useState42 } from "react";
 
 // src/services/command-service.ts
 var CommandService = class _CommandService {
@@ -19276,7 +19422,7 @@ function ProviderSetupDialog({
 }
 
 // src/ui/components/dialogs/model-dialog.tsx
-import { Fragment as Fragment15, jsx as jsx89, jsxs as jsxs67 } from "react/jsx-runtime";
+import { Fragment as Fragment16, jsx as jsx89, jsxs as jsxs67 } from "react/jsx-runtime";
 function capabilityLabel(model) {
   return model.inputModalities.includes("image") ? "Text + Vision" : "Text";
 }
@@ -19572,7 +19718,7 @@ function ModelDialog({
             },
             items.map((item) => item.key).join("|")
           ) }),
-          /* @__PURE__ */ jsx89(Box69, { width: "45%", paddingLeft: 2, flexDirection: "column", children: pending ? /* @__PURE__ */ jsxs67(Fragment15, { children: [
+          /* @__PURE__ */ jsx89(Box69, { width: "45%", paddingLeft: 2, flexDirection: "column", children: pending ? /* @__PURE__ */ jsxs67(Fragment16, { children: [
             /* @__PURE__ */ jsx89(Text62, { bold: true, color: theme.status.warning, children: "Start a new Session?" }),
             /* @__PURE__ */ jsxs67(Box69, { marginTop: 1, flexDirection: "column", children: [
               /* @__PURE__ */ jsxs67(Text62, { children: [
@@ -19597,7 +19743,7 @@ function ModelDialog({
                 showNumbers: false
               }
             ) })
-          ] }) : /* @__PURE__ */ jsxs67(Fragment15, { children: [
+          ] }) : /* @__PURE__ */ jsxs67(Fragment16, { children: [
             /* @__PURE__ */ jsx89(Text62, { bold: true, color: theme.text.primary, children: highlighted.name }),
             /* @__PURE__ */ jsxs67(Box69, { marginTop: 1, flexDirection: "column", children: [
               /* @__PURE__ */ jsx89(Text62, { color: theme.text.secondary, children: "Provider" }),
@@ -19633,6 +19779,13 @@ var modelCommand = {
         content: "Usage: /model"
       };
     }
+    if (context.services.sideConversation?.getWorkspaceSnapshot().sideSessionId !== void 0) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "Close the Side conversation before changing the Main model. Use /side, then Ctrl+C."
+      };
+    }
     const runtime = context.services.modelSelection;
     if (!runtime) {
       return { type: "message", messageType: "error", content: "DSH model selection is unavailable." };
@@ -19661,7 +19814,7 @@ import React17 from "react";
 // src/ui/components/dialogs/provider-dialog.tsx
 import { useEffect as useEffect40, useMemo as useMemo29, useState as useState37 } from "react";
 import { Box as Box70, Text as Text63 } from "ink";
-import { Fragment as Fragment16, jsx as jsx90, jsxs as jsxs68 } from "react/jsx-runtime";
+import { Fragment as Fragment17, jsx as jsx90, jsxs as jsxs68 } from "react/jsx-runtime";
 function statusLabel(status) {
   switch (status) {
     case "configured":
@@ -19819,11 +19972,11 @@ function ProviderDialog({
               /* @__PURE__ */ jsx90(Text63, { children: highlighted.provider }),
               /* @__PURE__ */ jsx90(Text63, { color: theme.text.secondary, children: "Status" }),
               /* @__PURE__ */ jsx90(Text63, { color: statusColor(highlighted.status), children: statusLabel(highlighted.status) }),
-              highlighted.credentialLabel && /* @__PURE__ */ jsxs68(Fragment16, { children: [
+              highlighted.credentialLabel && /* @__PURE__ */ jsxs68(Fragment17, { children: [
                 /* @__PURE__ */ jsx90(Text63, { color: theme.text.secondary, children: "Credential" }),
                 /* @__PURE__ */ jsx90(Text63, { children: highlighted.credentialLabel })
               ] }),
-              highlighted.source && /* @__PURE__ */ jsxs68(Fragment16, { children: [
+              highlighted.source && /* @__PURE__ */ jsxs68(Fragment17, { children: [
                 /* @__PURE__ */ jsx90(Text63, { color: theme.text.secondary, children: "Source" }),
                 /* @__PURE__ */ jsx90(Text63, { children: highlighted.source })
               ] }),
@@ -19832,7 +19985,7 @@ function ProviderDialog({
             ] })
           ] })
         ] }),
-        providers.length > 0 && highlighted && /* @__PURE__ */ jsx90(Box70, { marginTop: 1, children: highlighted.writable && highlighted.status !== "unsupported" ? /* @__PURE__ */ jsxs68(Fragment16, { children: [
+        providers.length > 0 && highlighted && /* @__PURE__ */ jsx90(Box70, { marginTop: 1, children: highlighted.writable && highlighted.status !== "unsupported" ? /* @__PURE__ */ jsxs68(Fragment17, { children: [
           /* @__PURE__ */ jsx90(Text63, { bold: true, color: theme.text.accent, children: "Enter" }),
           /* @__PURE__ */ jsxs68(Text63, { color: theme.text.primary, children: [
             " ",
@@ -19896,7 +20049,7 @@ import React18 from "react";
 // src/ui/components/dialogs/session-dialog.tsx
 import { useCallback as useCallback33, useEffect as useEffect41, useMemo as useMemo30, useRef as useRef20, useState as useState38 } from "react";
 import { Box as Box71, Text as Text64 } from "ink";
-import { Fragment as Fragment17, jsx as jsx91, jsxs as jsxs69 } from "react/jsx-runtime";
+import { Fragment as Fragment18, jsx as jsx91, jsxs as jsxs69 } from "react/jsx-runtime";
 function shortId(id) {
   const start2 = id.startsWith("dsh-console-") ? "dsh-console-".length : 0;
   return id.slice(start2, start2 + 12);
@@ -19912,24 +20065,64 @@ function SessionDialog({ runtime, onClose }) {
   const [switching, setSwitching] = useState38(false);
   const [error, setError] = useState38();
   const switchingRef = useRef20(false);
+  const titleRequestsRef = useRef20(/* @__PURE__ */ new Map());
+  const resolveTitles = useCallback33((candidates) => {
+    const sessionsToResolve = candidates.filter((session) => !session.title && !titleRequestsRef.current.has(session.id));
+    if (sessionsToResolve.length === 0) return;
+    const controller = new AbortController();
+    for (const session of sessionsToResolve) {
+      titleRequestsRef.current.set(session.id, controller);
+    }
+    void runtime.resolveSessionTitles(
+      sessionsToResolve.map((session) => session.id),
+      controller.signal
+    ).then((titles) => {
+      if (controller.signal.aborted || titles.length === 0) return;
+      const titleById = new Map(titles.map(({ id, title }) => [id, title]));
+      const withResolvedTitle = (item) => {
+        const title = titleById.get(item.id);
+        return title === void 0 ? item : { ...item, title };
+      };
+      setSessions((current) => current.map(withResolvedTitle));
+      setHighlighted((current) => current ? withResolvedTitle(current) : current);
+      setPending((current) => current ? withResolvedTitle(current) : current);
+    }).catch(() => {
+    }).finally(() => {
+      for (const session of sessionsToResolve) {
+        if (titleRequestsRef.current.get(session.id) === controller) {
+          titleRequestsRef.current.delete(session.id);
+        }
+      }
+    });
+  }, [runtime]);
   useEffect41(() => {
     const controller = new AbortController();
+    const titleRequests = titleRequestsRef.current;
     void runtime.listSessions(controller.signal).then((listed) => {
       setSessions(listed);
       setHighlighted(listed.find((session) => session.current) ?? listed[0]);
+      resolveTitles(listed.slice(0, 12));
     }).catch((cause) => {
       if (!controller.signal.aborted) setError(cause instanceof Error ? cause.message : String(cause));
     }).finally(() => {
       if (!controller.signal.aborted) setLoading(false);
     });
-    return () => controller.abort();
-  }, [runtime]);
+    return () => {
+      controller.abort();
+      for (const titleController of titleRequests.values()) titleController.abort();
+      titleRequests.clear();
+    };
+  }, [resolveTitles, runtime]);
   const items = useMemo30(() => sessions.map((session) => ({
     key: session.id,
     value: session,
     label: sessionLabel(session)
   })), [sessions]);
   const initialIndex = Math.max(0, sessions.findIndex((session) => session.current));
+  const highlight = useCallback33((session) => {
+    setHighlighted(session);
+    resolveTitles([session]);
+  }, [resolveTitles]);
   const resume = useCallback33(async (session) => {
     if (switchingRef.current) return;
     switchingRef.current = true;
@@ -19975,7 +20168,7 @@ function SessionDialog({ runtime, onClose }) {
         {
           items,
           initialIndex,
-          onHighlight: setHighlighted,
+          onHighlight: highlight,
           onSelect: select,
           isFocused: !pending && !switching,
           showScrollArrows: true,
@@ -19987,7 +20180,7 @@ function SessionDialog({ runtime, onClose }) {
           ] })
         }
       ) }),
-      /* @__PURE__ */ jsx91(Box71, { width: "45%", paddingLeft: 2, flexDirection: "column", children: pending ? /* @__PURE__ */ jsxs69(Fragment17, { children: [
+      /* @__PURE__ */ jsx91(Box71, { width: "45%", paddingLeft: 2, flexDirection: "column", children: pending ? /* @__PURE__ */ jsxs69(Fragment18, { children: [
         /* @__PURE__ */ jsx91(Text64, { bold: true, color: theme.status.warning, children: "Resume this Session?" }),
         /* @__PURE__ */ jsxs69(Box71, { marginTop: 1, flexDirection: "column", children: [
           /* @__PURE__ */ jsx91(Text64, { children: sessionLabel(pending) }),
@@ -20005,12 +20198,12 @@ function SessionDialog({ runtime, onClose }) {
             showNumbers: false
           }
         ) })
-      ] }) : highlighted ? /* @__PURE__ */ jsxs69(Fragment17, { children: [
+      ] }) : highlighted ? /* @__PURE__ */ jsxs69(Fragment18, { children: [
         /* @__PURE__ */ jsx91(Text64, { bold: true, children: sessionLabel(highlighted) }),
         /* @__PURE__ */ jsxs69(Box71, { marginTop: 1, flexDirection: "column", children: [
           /* @__PURE__ */ jsx91(Text64, { color: theme.text.secondary, children: "Created" }),
           /* @__PURE__ */ jsx91(Text64, { children: new Date(highlighted.createdAt).toLocaleString() }),
-          !highlighted.resumable && highlighted.resumeUnavailableReason && /* @__PURE__ */ jsxs69(Fragment17, { children: [
+          !highlighted.resumable && highlighted.resumeUnavailableReason && /* @__PURE__ */ jsxs69(Fragment18, { children: [
             /* @__PURE__ */ jsx91(Text64, { color: theme.text.secondary, children: "Resume status" }),
             /* @__PURE__ */ jsx91(Text64, { color: theme.status.warning, children: highlighted.resumeUnavailableReason })
           ] }),
@@ -20027,6 +20220,13 @@ function SessionDialog({ runtime, onClose }) {
 function unavailable() {
   return { type: "message", messageType: "error", content: "DSH Session management is unavailable." };
 }
+function requireStableMain(context) {
+  return context.services.sideConversation?.getWorkspaceSnapshot().sideSessionId !== void 0 ? {
+    type: "message",
+    messageType: "error",
+    content: "Close the Side conversation before managing Main Sessions. Use /side, then Ctrl+C."
+  } : void 0;
+}
 function openDialog(context) {
   const runtime = context.services.sessionManagement;
   if (!runtime) return unavailable();
@@ -20044,6 +20244,8 @@ var newCommand = {
   kind: "built-in" /* BUILT_IN */,
   autoExecute: true,
   action: async (context, args) => {
+    const mainRequired = requireStableMain(context);
+    if (mainRequired) return mainRequired;
     if (args.trim() !== "") return { type: "message", messageType: "error", content: "Usage: /new" };
     const runtime = context.services.sessionManagement;
     if (!runtime) return unavailable();
@@ -20065,7 +20267,11 @@ var sessionsCommand = {
   description: "Browse dsh-console Sessions in this workspace",
   kind: "built-in" /* BUILT_IN */,
   autoExecute: true,
-  action: async (context, args) => args.trim() === "" ? openDialog(context) : { type: "message", messageType: "error", content: "Usage: /sessions" }
+  action: async (context, args) => {
+    const mainRequired = requireStableMain(context);
+    if (mainRequired) return mainRequired;
+    return args.trim() === "" ? openDialog(context) : { type: "message", messageType: "error", content: "Usage: /sessions" };
+  }
 };
 var resumeCommand = {
   name: "resume",
@@ -20073,6 +20279,8 @@ var resumeCommand = {
   kind: "built-in" /* BUILT_IN */,
   autoExecute: true,
   action: async (context, args) => {
+    const mainRequired = requireStableMain(context);
+    if (mainRequired) return mainRequired;
     const runtime = context.services.sessionManagement;
     if (!runtime) return unavailable();
     const sessionId = args.trim();
@@ -20146,7 +20354,7 @@ function DescriptiveRadioButtonSelect({
 }
 
 // src/ui/components/dialogs/tools-dialog.tsx
-import { Fragment as Fragment18, jsx as jsx93, jsxs as jsxs71 } from "react/jsx-runtime";
+import { Fragment as Fragment19, jsx as jsx93, jsxs as jsxs71 } from "react/jsx-runtime";
 function summary(description) {
   const line = description.replace(/\s+/g, " ").trim();
   return line.length > 90 ? `${line.slice(0, 89)}...` : line;
@@ -20207,7 +20415,7 @@ function ToolsDialog({ runtime, onClose }) {
               maxItemsToShow: 10
             }
           ) }),
-          /* @__PURE__ */ jsx93(Box73, { width: "45%", paddingLeft: 2, flexDirection: "column", children: selected && /* @__PURE__ */ jsxs71(Fragment18, { children: [
+          /* @__PURE__ */ jsx93(Box73, { width: "45%", paddingLeft: 2, flexDirection: "column", children: selected && /* @__PURE__ */ jsxs71(Fragment19, { children: [
             /* @__PURE__ */ jsx93(Text66, { bold: true, color: theme.text.accent, children: selected.name }),
             /* @__PURE__ */ jsx93(Box73, { marginTop: 1, children: /* @__PURE__ */ jsx93(Text66, { wrap: "wrap", children: selected.description }) }),
             /* @__PURE__ */ jsxs71(Box73, { marginTop: 1, flexDirection: "column", children: [
@@ -20270,7 +20478,7 @@ import React20 from "react";
 // src/ui/components/dialogs/permission-dialog.tsx
 import { useCallback as useCallback34, useMemo as useMemo32, useState as useState40, useSyncExternalStore as useSyncExternalStore4 } from "react";
 import { Box as Box74, Text as Text67 } from "ink";
-import { Fragment as Fragment19, jsx as jsx94, jsxs as jsxs72 } from "react/jsx-runtime";
+import { Fragment as Fragment20, jsx as jsx94, jsxs as jsxs72 } from "react/jsx-runtime";
 function PermissionDialog({
   runtime,
   onClose,
@@ -20364,7 +20572,7 @@ function PermissionDialog({
             },
             items.map((item) => item.key).join("|")
           ) }),
-          /* @__PURE__ */ jsx94(Box74, { width: "50%", paddingLeft: 2, flexDirection: "column", children: pending ? /* @__PURE__ */ jsxs72(Fragment19, { children: [
+          /* @__PURE__ */ jsx94(Box74, { width: "50%", paddingLeft: 2, flexDirection: "column", children: pending ? /* @__PURE__ */ jsxs72(Fragment20, { children: [
             /* @__PURE__ */ jsx94(Text67, { bold: true, color: theme.status.warning, children: "Enable Full access?" }),
             /* @__PURE__ */ jsx94(Box74, { marginTop: 1, children: /* @__PURE__ */ jsx94(Text67, { children: "This allows commands to run without workspace sandbox restrictions or approval prompts." }) }),
             /* @__PURE__ */ jsx94(Box74, { marginTop: 1, children: /* @__PURE__ */ jsx94(
@@ -20382,7 +20590,7 @@ function PermissionDialog({
                 showNumbers: false
               }
             ) })
-          ] }) : selected ? /* @__PURE__ */ jsxs72(Fragment19, { children: [
+          ] }) : selected ? /* @__PURE__ */ jsxs72(Fragment20, { children: [
             /* @__PURE__ */ jsx94(Text67, { bold: true, color: theme.text.primary, children: selected.name }),
             /* @__PURE__ */ jsx94(Text67, { color: theme.text.secondary, children: selected.value }),
             /* @__PURE__ */ jsx94(Box74, { marginTop: 1, children: /* @__PURE__ */ jsx94(Text67, { children: selected.description ?? "No description is available for this preset." }) }),
@@ -20478,82 +20686,525 @@ var profilerCommand = {
   action: (context) => context.ui.toggleDebugProfiler()
 };
 
-// src/services/builtin-command-loader.ts
-var BuiltinCommandLoader = class {
-  constructor(enableProfiler = false) {
-    this.enableProfiler = enableProfiler;
-  }
-  isFirstLoad = true;
-  /**
-   * Gathers all raw built-in command definitions, injects dependencies where
-   * needed (e.g., config) and filters out any that are not available.
-   *
-   * @param _signal An AbortSignal (unused for this synchronous loader).
-   * @returns A promise that resolves to an array of `SlashCommand` objects.
-   */
-  async loadCommands(_signal) {
-    const startTime = performance.now();
-    const isInitialLoad = this.isFirstLoad;
-    this.isFirstLoad = false;
-    const commands = [
-      helpCommand,
-      aboutCommand,
-      statsCommand,
-      toolsCommand,
-      ...this.enableProfiler ? [profilerCommand] : [],
-      quitCommand,
-      themeCommand,
-      settingsCommand,
-      vimCommand,
-      modelCommand,
-      providerCommand,
-      permissionCommand,
-      newCommand,
-      sessionsCommand,
-      resumeCommand
-    ];
-    const duration = (performance.now() - startTime).toFixed(2);
-    const logMessage = `[BuiltinCommandLoader] ${isInitialLoad ? "Loaded" : "Reloaded"} ${commands.length} commands in ${duration}ms`;
-    if (isInitialLoad) {
-      debugLogger.log(logMessage);
-    } else {
-      debugLogger.debug(logMessage);
+// src/ui/commands/btw-command.ts
+var btwCommand = {
+  name: "btw",
+  description: "Ask an ephemeral side question without interrupting the main Agent",
+  inputHint: "<question>",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: false,
+  recordInvocation: false,
+  allowWhileBusy: true,
+  action: async (context, args) => {
+    const question = args.trim();
+    const runtime = context.services.sideConversation;
+    if (!runtime) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "DSH Side conversations are unavailable."
+      };
     }
-    return commands;
-  }
-};
-
-// src/ui/commands/parser.ts
-var parseSlashCommand = (query, commands) => {
-  const trimmed = query.trim();
-  const parts = trimmed.substring(1).trim().split(/\s+/);
-  const commandPath = parts.filter((p) => p);
-  let currentCommands = commands;
-  let commandToExecute;
-  let pathIndex = 0;
-  const canonicalPath = [];
-  for (const part of commandPath) {
-    let foundCommand = currentCommands.find((cmd) => cmd.name === part);
-    if (!foundCommand) {
-      foundCommand = currentCommands.find(
-        (cmd) => cmd.altNames?.includes(part)
-      );
+    if (!question && runtime.getWorkspaceSnapshot().sideSessionId === void 0) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "Usage: /btw <question>"
+      };
     }
-    if (foundCommand) {
-      commandToExecute = foundCommand;
-      canonicalPath.push(foundCommand.name);
-      pathIndex++;
-      if (foundCommand.subCommands) {
-        currentCommands = foundCommand.subCommands;
-      } else {
-        break;
+    await runtime.open(question || void 0, context.invocation.signal);
+    return void 0;
+  }
+};
+var mainCommand = {
+  name: "main",
+  description: "Switch to the main conversation",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  recordInvocation: false,
+  allowWhileBusy: true,
+  action: (context, args) => {
+    if (args.trim()) return { type: "message", messageType: "error", content: "Usage: /main" };
+    const runtime = context.services.sideConversation;
+    if (!runtime) return { type: "message", messageType: "error", content: "DSH Side conversations are unavailable." };
+    runtime.switchToMain();
+    return void 0;
+  }
+};
+var sideCommand = {
+  name: "side",
+  description: "Switch to the active Side conversation",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  recordInvocation: false,
+  allowWhileBusy: true,
+  action: (context, args) => {
+    if (args.trim()) return { type: "message", messageType: "error", content: "Usage: /side" };
+    const runtime = context.services.sideConversation;
+    if (!runtime) return { type: "message", messageType: "error", content: "DSH Side conversations are unavailable." };
+    runtime.switchToSide();
+    return void 0;
+  }
+};
+
+// src/ui/commands/agents-command.ts
+import React21 from "react";
+
+// src/ui/components/dialogs/agents-dialog.tsx
+import {
+  useCallback as useCallback35,
+  useEffect as useEffect43,
+  useMemo as useMemo33,
+  useRef as useRef21,
+  useState as useState41,
+  useSyncExternalStore as useSyncExternalStore5
+} from "react";
+import { Box as Box75, Text as Text68 } from "ink";
+
+// src/ui/conversation-history-projector.ts
+function projectedToolCallIds(messages) {
+  return new Set(
+    messages.flatMap(
+      (message) => message.role === "tool" ? [message.callId] : []
+    )
+  );
+}
+function conversationMessageToHistoryItem(message, visibleToolCallIds) {
+  const assistantContent = message.role === "assistant" ? message.content.filter(
+    (block) => block.type !== "tool-call" || !visibleToolCallIds.has(block.id)
+  ) : void 0;
+  if (message.role === "assistant" && assistantContent?.length === 0 && message.interrupted !== true) {
+    return void 0;
+  }
+  if (message.role === "tool") {
+    return {
+      type: "tool_group",
+      tools: [
+        {
+          callId: message.callId,
+          name: message.presentation?.kind === "card" ? message.presentation.title ?? message.name : message.name,
+          description: message.presentation?.kind === "compact" ? "" : message.presentation?.description ?? message.arguments,
+          resultDisplay: message.presentation?.kind === "compact" ? void 0 : message.presentation?.resultDisplay ?? (message.result === void 0 ? void 0 : {
+            type: "dsh-content",
+            content: message.result.content,
+            ...message.result.error === void 0 ? {} : { error: message.result.error }
+          }),
+          ...message.presentation?.kind === "compact" ? {
+            presentation: {
+              kind: "compact",
+              label: message.presentation.label
+            }
+          } : {},
+          status: message.status === "executing" ? "Executing" /* Executing */ : message.status === "success" ? "Success" /* Success */ : "Error" /* Error */
+        }
+      ]
+    };
+  }
+  if (message.role === "assistant") {
+    return {
+      type: "dsh_assistant",
+      content: assistantContent ?? message.content,
+      interrupted: message.interrupted === true
+    };
+  }
+  if (message.role === "user") {
+    return {
+      type: "dsh_user",
+      content: message.displayContent ?? message.content
+    };
+  }
+  return {
+    type: message.status === "cancelled" ? "warning" /* WARNING */ : "error" /* ERROR */,
+    text: conversationMessageText(message)
+  };
+}
+function conversationMessageFingerprint(message, item) {
+  if (message.role === "tool") {
+    return JSON.stringify([
+      message.status,
+      message.result,
+      message.presentation
+    ]);
+  }
+  if (message.role === "assistant" && item.type === "dsh_assistant") {
+    return JSON.stringify([item.content, item.interrupted]);
+  }
+  if (message.role === "user") {
+    return JSON.stringify(message.displayContent ?? message.content);
+  }
+  return conversationMessageText(message);
+}
+
+// src/ui/components/dialogs/agents-dialog.tsx
+import { Fragment as Fragment21, jsx as jsx95, jsxs as jsxs73 } from "react/jsx-runtime";
+function shortId2(id) {
+  return id.slice(-8);
+}
+function itemTitle(item) {
+  const branch = item.depth > 1 ? `${"  ".repeat(item.depth - 1)}- ` : "";
+  return `${branch}${item.kind === "agent" ? item.label : `Unavailable ${shortId2(item.id)}`}`;
+}
+function itemDescription(item) {
+  if (item.kind === "diagnostic") return `diagnostic \xB7 ${item.reason}`;
+  return `${item.activity} \xB7 ${item.mode}`;
+}
+function AgentsDialog({ runtime, onClose }) {
+  const snapshot = useSyncExternalStore5(
+    runtime.subscribe,
+    runtime.getSnapshot,
+    runtime.getSnapshot
+  );
+  const [selectedId, setSelectedId] = useState41(snapshot.items[0]?.id);
+  const [transcript, setTranscript] = useState41();
+  const [transcriptSessionId, setTranscriptSessionId] = useState41();
+  const [opening, setOpening] = useState41(false);
+  const [openError, setOpenError] = useState41();
+  const openController = useRef21(void 0);
+  const openingRef = useRef21(false);
+  const transcriptRef = useRef21(void 0);
+  const selected = snapshot.items.find((item) => item.id === selectedId) ?? snapshot.items[0];
+  useEffect43(() => {
+    const controller = new AbortController();
+    void runtime.refresh(controller.signal);
+    return () => controller.abort();
+  }, [runtime]);
+  useEffect43(
+    () => () => {
+      openController.current?.abort();
+      transcriptRef.current?.dispose();
+      transcriptRef.current = void 0;
+    },
+    []
+  );
+  useEffect43(() => {
+    if (selected?.id !== selectedId) setSelectedId(selected?.id);
+  }, [selected?.id, selectedId]);
+  useKeypress(
+    (key) => {
+      if (transcript !== void 0) return;
+      if (key.name === "escape") onClose();
+      if (key.name === "r") void runtime.refresh();
+    },
+    { isActive: true }
+  );
+  const openTranscript = useCallback35(
+    async (sessionId) => {
+      const item = snapshot.items.find(
+        (candidate) => candidate.id === sessionId && candidate.kind === "agent"
+      );
+      if (item === void 0 || openingRef.current) return;
+      openingRef.current = true;
+      openController.current?.abort();
+      const controller = new AbortController();
+      openController.current = controller;
+      setOpening(true);
+      setOpenError(void 0);
+      try {
+        const next = await runtime.openTranscript(sessionId, controller.signal);
+        if (controller.signal.aborted) {
+          next.dispose();
+          return;
+        }
+        transcriptRef.current?.dispose();
+        transcriptRef.current = next;
+        setTranscriptSessionId(sessionId);
+        setTranscript(next);
+      } catch (error) {
+        if (!controller.signal.aborted) {
+          setOpenError(
+            error instanceof Error ? error.message : "Unable to open the subagent transcript."
+          );
+        }
+      } finally {
+        if (openController.current === controller) {
+          openController.current = void 0;
+          openingRef.current = false;
+          if (!controller.signal.aborted) setOpening(false);
+        }
+      }
+    },
+    [runtime, snapshot.items]
+  );
+  const closeTranscript = useCallback35(() => {
+    openController.current?.abort();
+    openController.current = void 0;
+    openingRef.current = false;
+    transcriptRef.current?.dispose();
+    transcriptRef.current = void 0;
+    setTranscript(void 0);
+    setTranscriptSessionId(void 0);
+    setOpenError(void 0);
+  }, []);
+  const items = useMemo33(
+    () => snapshot.items.map((item) => ({
+      key: item.id,
+      value: item.id,
+      title: itemTitle(item),
+      description: itemDescription(item)
+    })),
+    [snapshot.items]
+  );
+  if (transcript !== void 0 && transcriptSessionId !== void 0) {
+    const item = snapshot.items.find(
+      (candidate) => candidate.id === transcriptSessionId
+    );
+    return /* @__PURE__ */ jsx95(
+      AgentTranscriptView,
+      {
+        runtime: transcript,
+        item,
+        onBack: closeTranscript
       }
+    );
+  }
+  return /* @__PURE__ */ jsxs73(
+    Box75,
+    {
+      borderStyle: "round",
+      borderColor: theme.border.default,
+      flexDirection: "column",
+      paddingX: 1,
+      paddingY: 1,
+      width: "100%",
+      children: [
+        /* @__PURE__ */ jsxs73(Box75, { justifyContent: "space-between", children: [
+          /* @__PURE__ */ jsxs73(Text68, { bold: true, color: theme.text.primary, children: [
+            "DSH Agents (",
+            snapshot.items.length,
+            ")"
+          ] }),
+          /* @__PURE__ */ jsx95(Text68, { color: theme.text.secondary, children: "R refresh \xB7 Esc close" })
+        ] }),
+        snapshot.status === "loading" && snapshot.items.length === 0 ? /* @__PURE__ */ jsx95(Box75, { marginTop: 1, children: /* @__PURE__ */ jsx95(Text68, { color: theme.text.secondary, children: "Loading delegated Agents..." }) }) : snapshot.status === "error" && snapshot.items.length === 0 ? /* @__PURE__ */ jsx95(Box75, { marginTop: 1, children: /* @__PURE__ */ jsx95(Text68, { color: theme.status.error, children: snapshot.error }) }) : snapshot.items.length === 0 ? /* @__PURE__ */ jsx95(Box75, { marginTop: 1, children: /* @__PURE__ */ jsx95(Text68, { color: theme.text.secondary, children: "The Main Agent has not delegated any subagents in this Session." }) }) : /* @__PURE__ */ jsxs73(Box75, { flexDirection: "row", marginTop: 1, children: [
+          /* @__PURE__ */ jsx95(Box75, { width: "55%", paddingRight: 2, flexDirection: "column", children: /* @__PURE__ */ jsx95(
+            DescriptiveRadioButtonSelect,
+            {
+              items,
+              onHighlight: setSelectedId,
+              onSelect: (sessionId) => void openTranscript(sessionId),
+              showNumbers: false,
+              showScrollArrows: true,
+              maxItemsToShow: 10
+            }
+          ) }),
+          /* @__PURE__ */ jsx95(Box75, { width: "45%", paddingLeft: 2, flexDirection: "column", children: selected?.kind === "agent" ? /* @__PURE__ */ jsxs73(Fragment21, { children: [
+            /* @__PURE__ */ jsx95(Text68, { bold: true, color: theme.text.accent, children: selected.label }),
+            /* @__PURE__ */ jsxs73(Box75, { marginTop: 1, flexDirection: "column", children: [
+              /* @__PURE__ */ jsxs73(Text68, { color: theme.text.secondary, children: [
+                "Status",
+                " ",
+                /* @__PURE__ */ jsx95(
+                  Text68,
+                  {
+                    color: selected.activity === "running" ? theme.status.success : theme.text.primary,
+                    children: selected.activity
+                  }
+                )
+              ] }),
+              /* @__PURE__ */ jsxs73(Text68, { color: theme.text.secondary, children: [
+                "Mode ",
+                /* @__PURE__ */ jsx95(Text68, { color: theme.text.primary, children: selected.mode })
+              ] }),
+              /* @__PURE__ */ jsxs73(Text68, { color: theme.text.secondary, children: [
+                "Depth ",
+                /* @__PURE__ */ jsx95(Text68, { color: theme.text.primary, children: selected.depth })
+              ] }),
+              /* @__PURE__ */ jsxs73(Text68, { color: theme.text.secondary, children: [
+                "Session ",
+                /* @__PURE__ */ jsx95(Text68, { color: theme.text.primary, children: shortId2(selected.id) })
+              ] })
+            ] })
+          ] }) : selected ? /* @__PURE__ */ jsxs73(Fragment21, { children: [
+            /* @__PURE__ */ jsx95(Text68, { bold: true, color: theme.status.warning, children: "Unavailable Agent" }),
+            /* @__PURE__ */ jsxs73(Box75, { marginTop: 1, flexDirection: "column", children: [
+              /* @__PURE__ */ jsxs73(Text68, { color: theme.text.secondary, children: [
+                "Reason ",
+                /* @__PURE__ */ jsx95(Text68, { color: theme.text.primary, children: selected.reason })
+              ] }),
+              /* @__PURE__ */ jsxs73(Text68, { color: theme.text.secondary, children: [
+                "Session ",
+                /* @__PURE__ */ jsx95(Text68, { color: theme.text.primary, children: shortId2(selected.id) })
+              ] })
+            ] })
+          ] }) : null })
+        ] }),
+        (opening || openError !== void 0) && /* @__PURE__ */ jsx95(Box75, { marginTop: 1, children: /* @__PURE__ */ jsx95(Text68, { color: openError === void 0 ? theme.text.secondary : theme.status.error, children: openError ?? "Opening canonical Agent history..." }) }),
+        snapshot.items.length > 0 && /* @__PURE__ */ jsx95(Box75, { marginTop: 1, children: /* @__PURE__ */ jsx95(Text68, { color: theme.text.secondary, children: "Enter opens read-only history. Agent conversations remain DSH-owned." }) })
+      ]
+    }
+  );
+}
+function AgentTranscriptView({
+  runtime,
+  item,
+  onBack
+}) {
+  const uiState = useUIState();
+  const snapshot = useSyncExternalStore5(
+    runtime.subscribe,
+    runtime.getSnapshot,
+    runtime.getSnapshot
+  );
+  const listRef = useRef21(null);
+  const history = useMemo33(() => transcriptItems(snapshot.messages), [snapshot.messages]);
+  const completed = snapshot.todos.filter((todo) => todo.status === "completed").length;
+  useEffect43(() => {
+    listRef.current?.scrollToEnd();
+  }, [history.length]);
+  useKeypress(
+    (key) => {
+      if (key.name === "escape") onBack();
+    },
+    { isActive: true }
+  );
+  const width = Math.max(40, uiState.terminalWidth - 4);
+  const height = Math.max(8, uiState.terminalHeight - 6);
+  const label = item?.kind === "agent" ? item.label : shortId2(item?.id ?? "agent");
+  return /* @__PURE__ */ jsxs73(
+    Box75,
+    {
+      borderStyle: "round",
+      borderColor: theme.border.default,
+      flexDirection: "column",
+      paddingX: 1,
+      height,
+      width: "100%",
+      children: [
+        /* @__PURE__ */ jsxs73(Box75, { justifyContent: "space-between", children: [
+          /* @__PURE__ */ jsxs73(Box75, { children: [
+            /* @__PURE__ */ jsx95(Text68, { bold: true, color: theme.text.primary, children: label }),
+            item?.kind === "agent" && /* @__PURE__ */ jsxs73(Text68, { color: theme.text.secondary, children: [
+              " ",
+              "\xB7 ",
+              item.mode,
+              " \xB7",
+              " ",
+              /* @__PURE__ */ jsx95(Text68, { color: item.activity === "running" ? theme.status.success : theme.text.secondary, children: item.activity })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsx95(Text68, { color: theme.text.secondary, children: "Read only \xB7 Esc back" })
+        ] }),
+        snapshot.todos.length > 0 && /* @__PURE__ */ jsx95(Box75, { marginTop: 1, children: /* @__PURE__ */ jsxs73(Text68, { color: theme.text.secondary, children: [
+          "Todo ",
+          completed,
+          "/",
+          snapshot.todos.length,
+          " completed"
+        ] }) }),
+        /* @__PURE__ */ jsx95(Box75, { flexGrow: 1, marginTop: 1, overflow: "hidden", children: history.length === 0 ? /* @__PURE__ */ jsx95(Text68, { color: theme.text.secondary, children: "This Agent has no conversation events yet." }) : /* @__PURE__ */ jsx95(
+          ScrollableListWithForwardRef,
+          {
+            ref: listRef,
+            data: history,
+            hasFocus: true,
+            width: "100%",
+            keyExtractor: (entry) => entry.key,
+            estimatedItemHeight: () => 3,
+            initialScrollIndex: history.length - 1,
+            renderItem: ({ item: entry, index }) => /* @__PURE__ */ jsx95(
+              HistoryItemDisplay,
+              {
+                item: { ...entry.item, id: index },
+                terminalWidth: width,
+                isPending: snapshot.busy && index === history.length - 1,
+                isFocused: false
+              }
+            )
+          }
+        ) })
+      ]
+    }
+  );
+}
+function transcriptItems(messages) {
+  const toolCallIds = projectedToolCallIds(messages);
+  return messages.flatMap((message) => {
+    const item = conversationMessageToHistoryItem(message, toolCallIds);
+    return item === void 0 ? [] : [{ key: message.id, item }];
+  });
+}
+
+// src/ui/commands/agents-command.ts
+var agentsCommand = {
+  name: "agents",
+  description: "Inspect subagents delegated by the Main Agent",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  recordInvocation: false,
+  allowWhileBusy: true,
+  action: (context, args) => {
+    if (args.trim().length > 0) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "Usage: /agents"
+      };
+    }
+    const runtime = context.services.subagentCatalog;
+    if (!runtime) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "DSH Agent catalog is unavailable."
+      };
+    }
+    return {
+      type: "custom_dialog",
+      component: React21.createElement(AgentsDialog, {
+        runtime,
+        onClose: context.ui.removeComponent
+      })
+    };
+  }
+};
+
+// src/services/builtin-command-loader.ts
+var BuiltinCommandLoader = class {
+  constructor(enableProfiler = false) {
+    this.enableProfiler = enableProfiler;
+  }
+  isFirstLoad = true;
+  /**
+   * Gathers all raw built-in command definitions, injects dependencies where
+   * needed (e.g., config) and filters out any that are not available.
+   *
+   * @param _signal An AbortSignal (unused for this synchronous loader).
+   * @returns A promise that resolves to an array of `SlashCommand` objects.
+   */
+  async loadCommands(_signal) {
+    const startTime = performance.now();
+    const isInitialLoad = this.isFirstLoad;
+    this.isFirstLoad = false;
+    const commands = [
+      helpCommand,
+      aboutCommand,
+      statsCommand,
+      toolsCommand,
+      agentsCommand,
+      btwCommand,
+      mainCommand,
+      sideCommand,
+      ...this.enableProfiler ? [profilerCommand] : [],
+      quitCommand,
+      themeCommand,
+      settingsCommand,
+      vimCommand,
+      modelCommand,
+      providerCommand,
+      permissionCommand,
+      newCommand,
+      sessionsCommand,
+      resumeCommand
+    ];
+    const duration = (performance.now() - startTime).toFixed(2);
+    const logMessage = `[BuiltinCommandLoader] ${isInitialLoad ? "Loaded" : "Reloaded"} ${commands.length} commands in ${duration}ms`;
+    if (isInitialLoad) {
+      debugLogger.log(logMessage);
     } else {
-      break;
+      debugLogger.debug(logMessage);
     }
+    return commands;
   }
-  const args = parts.slice(pathIndex).join(" ");
-  return { commandToExecute, args, canonicalPath };
 };
 
 // src/services/dsh-command-loader.ts
@@ -20589,25 +21240,27 @@ var DshCommandLoader = class {
 };
 
 // src/ui/hooks/commands/use-slash-command-processor.ts
-var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic, toggleVimEnabled, setIsProcessing, actions, setCustomDialog, modelSelection, permissionSelection, sessionManagement, toolCatalog, dshCommands, enableProfiler = false, providerSetup) => {
+var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic, toggleVimEnabled, setIsProcessing, actions, setCustomDialog, modelSelection, permissionSelection, sessionManagement, toolCatalog, dshCommands, enableProfiler = false, providerSetup, sideConversation, subagentCatalog) => {
   const session = useSessionStats();
-  const [commands, setCommands] = useState41(
+  const [commands, setCommands] = useState42(
     void 0
   );
-  const [reloadTrigger, setReloadTrigger] = useState41(0);
-  const commandAbortRef = useRef21(void 0);
-  const reloadCommands = useCallback35(() => {
+  const [reloadTrigger, setReloadTrigger] = useState42(0);
+  const commandAbortRef = useRef22(void 0);
+  const reloadCommands = useCallback36(() => {
     setReloadTrigger((v) => v + 1);
   }, []);
-  const [confirmationRequest, setConfirmationRequest] = useState41(null);
-  const commandContext = useMemo33(
+  const [confirmationRequest, setConfirmationRequest] = useState42(null);
+  const commandContext = useMemo34(
     () => ({
       services: {
         modelSelection,
         providerSetup,
         permissionSelection,
         sessionManagement,
-        toolCatalog
+        toolCatalog,
+        sideConversation,
+        subagentCatalog
       },
       ui: {
         addItem,
@@ -20636,6 +21289,8 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
       permissionSelection,
       sessionManagement,
       toolCatalog,
+      sideConversation,
+      subagentCatalog,
       loadHistory,
       addItem,
       clearItems,
@@ -20646,7 +21301,7 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
       setCustomDialog
     ]
   );
-  useEffect43(() => {
+  useEffect44(() => {
     const controller = new AbortController();
     (async () => {
       const loaders = [
@@ -20660,15 +21315,15 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
       controller.abort();
     };
   }, [dshCommands, enableProfiler, reloadTrigger]);
-  useEffect43(
+  useEffect44(
     () => dshCommands?.subscribe(reloadCommands),
     [dshCommands, reloadCommands]
   );
-  useEffect43(
+  useEffect44(
     () => () => commandAbortRef.current?.abort(),
     []
   );
-  const handleSlashCommand = useCallback35(
+  const handleSlashCommand = useCallback36(
     async (rawQuery, overwriteConfirmed, addToHistory = true) => {
       if (!commands) {
         return false;
@@ -20681,14 +21336,14 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
       const commandController = new AbortController();
       commandAbortRef.current?.abort();
       commandAbortRef.current = commandController;
-      if (addToHistory) {
+      const { commandToExecute, args } = parseSlashCommand(trimmed, commands);
+      if (addToHistory && commandToExecute?.recordInvocation !== false) {
         const userMessageTimestamp = Date.now();
         addItem(
           { type: "user" /* USER */, text: trimmed },
           userMessageTimestamp
         );
       }
-      const { commandToExecute, args } = parseSlashCommand(trimmed, commands);
       try {
         if (commandToExecute) {
           if (commandToExecute.action) {
@@ -20830,16 +21485,16 @@ ${commandToExecute.subCommands.map((sc) => `  - ${sc.name}: ${sc.description ||
 import { useStdout as useStdout4, useStdin as useStdin4 } from "ink";
 import ansiEscapes from "ansi-escapes";
 import * as fs12 from "node:fs";
-import { basename as basename2, join as join5 } from "node:path";
+import { basename as basename3, join as join5 } from "node:path";
 
 // src/ui/hooks/commands/use-settings-command.ts
-import { useState as useState42, useCallback as useCallback36 } from "react";
+import { useState as useState43, useCallback as useCallback37 } from "react";
 function useSettingsCommand() {
-  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = useState42(false);
-  const openSettingsDialog = useCallback36(() => {
+  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = useState43(false);
+  const openSettingsDialog = useCallback37(() => {
     setIsSettingsDialogOpen(true);
   }, []);
-  const closeSettingsDialog = useCallback36(() => {
+  const closeSettingsDialog = useCallback37(() => {
     setIsSettingsDialogOpen(false);
   }, []);
   return {
@@ -20850,11 +21505,11 @@ function useSettingsCommand() {
 }
 
 // src/ui/hooks/commands/use-theme-command.ts
-import { useState as useState43, useCallback as useCallback37 } from "react";
+import { useState as useState44, useCallback as useCallback38 } from "react";
 import process6 from "node:process";
 var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError) => {
-  const [isThemeDialogOpen, setIsThemeDialogOpen] = useState43(!!initialThemeError);
-  const openThemeDialog = useCallback37(() => {
+  const [isThemeDialogOpen, setIsThemeDialogOpen] = useState44(!!initialThemeError);
+  const openThemeDialog = useCallback38(() => {
     if (process6.env["NO_COLOR"]) {
       addItem(
         {
@@ -20867,7 +21522,7 @@ var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError
     }
     setIsThemeDialogOpen(true);
   }, [addItem]);
-  const applyTheme = useCallback37(
+  const applyTheme = useCallback38(
     (themeName) => {
       if (!themeManager.setActiveTheme(themeName)) {
         setIsThemeDialogOpen(true);
@@ -20878,17 +21533,17 @@ var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError
     },
     [setThemeError]
   );
-  const handleThemeHighlight = useCallback37(
+  const handleThemeHighlight = useCallback38(
     (themeName) => {
       applyTheme(themeName);
     },
     [applyTheme]
   );
-  const closeThemeDialog = useCallback37(() => {
+  const closeThemeDialog = useCallback38(() => {
     applyTheme(loadedSettings.merged.ui.theme);
     setIsThemeDialogOpen(false);
   }, [applyTheme, loadedSettings]);
-  const handleThemeSelect = useCallback37(
+  const handleThemeSelect = useCallback38(
     (themeName, scope) => {
       try {
         const mergedCustomThemes = {
@@ -20924,7 +21579,7 @@ var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError
 };
 
 // src/ui/hooks/input/use-vim.ts
-import { useCallback as useCallback38, useReducer as useReducer5, useEffect as useEffect44, useRef as useRef22 } from "react";
+import { useCallback as useCallback39, useReducer as useReducer5, useEffect as useEffect45, useRef as useRef23 } from "react";
 var DIGIT_MULTIPLIER = 10;
 var DEFAULT_COUNT = 1;
 var DIGIT_1_TO_9 = /^[1-9]$/;
@@ -20989,22 +21644,22 @@ var vimReducer = (state, action) => {
 function useVim(buffer, onSubmit) {
   const { vimEnabled, vimMode, setVimMode } = useVimMode();
   const [state, dispatch] = useReducer5(vimReducer, initialVimState);
-  const lastEscapeTimestampRef = useRef22(0);
-  useEffect44(() => {
+  const lastEscapeTimestampRef = useRef23(0);
+  useEffect45(() => {
     dispatch({ type: "SET_MODE", mode: vimMode });
   }, [vimMode]);
-  const updateMode = useCallback38(
+  const updateMode = useCallback39(
     (mode) => {
       setVimMode(mode);
       dispatch({ type: "SET_MODE", mode });
     },
     [setVimMode]
   );
-  const getCurrentCount = useCallback38(
+  const getCurrentCount = useCallback39(
     () => state.count || DEFAULT_COUNT,
     [state.count]
   );
-  const checkDoubleEscape = useCallback38(() => {
+  const checkDoubleEscape = useCallback39(() => {
     const now = Date.now();
     const lastEscape = lastEscapeTimestampRef.current;
     lastEscapeTimestampRef.current = now;
@@ -21014,7 +21669,7 @@ function useVim(buffer, onSubmit) {
     }
     return false;
   }, []);
-  const executeCommand = useCallback38(
+  const executeCommand = useCallback39(
     (cmdType, count) => {
       switch (cmdType) {
         case CMD_TYPES.DELETE_WORD_FORWARD: {
@@ -21090,7 +21745,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, updateMode]
   );
-  const handleInsertModeInput = useCallback38(
+  const handleInsertModeInput = useCallback39(
     (normalizedKey) => {
       if (keyMatchers["basic.cancel" /* ESCAPE */](normalizedKey)) {
         checkDoubleEscape();
@@ -21122,7 +21777,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, dispatch, updateMode, onSubmit, checkDoubleEscape]
   );
-  const normalizeKey = useCallback38(
+  const normalizeKey = useCallback39(
     (key) => ({
       name: key.name || "",
       sequence: key.sequence || "",
@@ -21134,7 +21789,7 @@ function useVim(buffer, onSubmit) {
     }),
     []
   );
-  const handleChangeMovement = useCallback38(
+  const handleChangeMovement = useCallback39(
     (movement) => {
       const count = getCurrentCount();
       dispatch({ type: "CLEAR_COUNT" });
@@ -21155,7 +21810,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, dispatch, buffer, updateMode]
   );
-  const handleOperatorMotion = useCallback38(
+  const handleOperatorMotion = useCallback39(
     (operator, motion) => {
       const count = getCurrentCount();
       const commandMap = {
@@ -21182,7 +21837,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, executeCommand, dispatch]
   );
-  const handleInput = useCallback38(
+  const handleInput = useCallback39(
     (key) => {
       if (!vimEnabled) {
         return false;
@@ -21489,13 +22144,13 @@ function useVim(buffer, onSubmit) {
 }
 
 // src/ui/hooks/session/use-git-branch-name.ts
-import { useState as useState44, useEffect as useEffect45, useCallback as useCallback39 } from "react";
+import { useState as useState45, useEffect as useEffect46, useCallback as useCallback40 } from "react";
 import fs9 from "node:fs";
 import fsPromises2 from "node:fs/promises";
 import path11 from "node:path";
 function useGitBranchName(cwd) {
-  const [branchName, setBranchName] = useState44(void 0);
-  const fetchBranchName = useCallback39(async () => {
+  const [branchName, setBranchName] = useState45(void 0);
+  const fetchBranchName = useCallback40(async () => {
     try {
       const { stdout } = await spawnAsync(
         "git",
@@ -21517,15 +22172,15 @@ function useGitBranchName(cwd) {
       setBranchName(void 0);
     }
   }, [cwd, setBranchName]);
-  useEffect45(() => {
+  useEffect46(() => {
     fetchBranchName();
     const gitLogsHeadPath = path11.join(cwd, ".git", "logs", "HEAD");
     let watcher;
-    let cancelled = false;
+    let cancelled2 = false;
     const setupWatcher = async () => {
       try {
         await fsPromises2.access(gitLogsHeadPath, fs9.constants.F_OK);
-        if (cancelled) return;
+        if (cancelled2) return;
         watcher = fs9.watch(gitLogsHeadPath, (eventType) => {
           if (eventType === "change" || eventType === "rename") {
             fetchBranchName();
@@ -21536,7 +22191,7 @@ function useGitBranchName(cwd) {
     };
     setupWatcher();
     return () => {
-      cancelled = true;
+      cancelled2 = true;
       watcher?.close();
     };
   }, [cwd, fetchBranchName]);
@@ -21544,7 +22199,7 @@ function useGitBranchName(cwd) {
 }
 
 // src/ui/hooks/settings/use-editor-settings.ts
-import { useState as useState45, useCallback as useCallback40 } from "react";
+import { useState as useState46, useCallback as useCallback41 } from "react";
 
 // src/config/setting-paths.ts
 var SettingPaths = {
@@ -21555,11 +22210,11 @@ var SettingPaths = {
 
 // src/ui/hooks/settings/use-editor-settings.ts
 var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
-  const [isEditorDialogOpen, setIsEditorDialogOpen] = useState45(false);
-  const openEditorDialog = useCallback40(() => {
+  const [isEditorDialogOpen, setIsEditorDialogOpen] = useState46(false);
+  const openEditorDialog = useCallback41(() => {
     setIsEditorDialogOpen(true);
   }, []);
-  const handleEditorSelect = useCallback40(
+  const handleEditorSelect = useCallback41(
     (editorType, scope) => {
       if (editorType && !checkHasEditorType(editorType)) {
         return;
@@ -21585,7 +22240,7 @@ var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
     },
     [loadedSettings, setEditorError, addItem]
   );
-  const exitEditorDialog = useCallback40(() => {
+  const exitEditorDialog = useCallback41(() => {
     setIsEditorDialogOpen(false);
   }, []);
   return {
@@ -21597,12 +22252,12 @@ var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
 };
 
 // src/ui/hooks/terminal/use-memory-monitor.ts
-import { useEffect as useEffect46 } from "react";
+import { useEffect as useEffect47 } from "react";
 import process7 from "node:process";
 var MEMORY_WARNING_THRESHOLD = 7 * 1024 * 1024 * 1024;
 var MEMORY_CHECK_INTERVAL = 60 * 1e3;
 var useMemoryMonitor = ({ addItem }) => {
-  useEffect46(() => {
+  useEffect47(() => {
     const intervalId = setInterval(() => {
       const usage = process7.memoryUsage().rss;
       if (usage > MEMORY_WARNING_THRESHOLD) {
@@ -21622,10 +22277,10 @@ var useMemoryMonitor = ({ addItem }) => {
 
 // src/ui/hooks/visual/use-console-messages.ts
 import {
-  useCallback as useCallback41,
-  useEffect as useEffect47,
+  useCallback as useCallback42,
+  useEffect as useEffect48,
   useReducer as useReducer6,
-  useRef as useRef23,
+  useRef as useRef24,
   useTransition
 } from "react";
 function consoleMessagesReducer(state, action) {
@@ -21653,10 +22308,10 @@ function consoleMessagesReducer(state, action) {
 }
 function useConsoleMessages() {
   const [consoleMessages, dispatch] = useReducer6(consoleMessagesReducer, []);
-  const messageQueueRef = useRef23([]);
-  const timeoutRef = useRef23(null);
+  const messageQueueRef = useRef24([]);
+  const timeoutRef = useRef24(null);
   const [, startTransition] = useTransition();
-  const processQueue = useCallback41(() => {
+  const processQueue = useCallback42(() => {
     if (messageQueueRef.current.length > 0) {
       const messagesToProcess = messageQueueRef.current;
       messageQueueRef.current = [];
@@ -21666,7 +22321,7 @@ function useConsoleMessages() {
     }
     timeoutRef.current = null;
   }, []);
-  const handleNewMessage = useCallback41(
+  const handleNewMessage = useCallback42(
     (message) => {
       messageQueueRef.current.push(message);
       if (!timeoutRef.current) {
@@ -21675,7 +22330,7 @@ function useConsoleMessages() {
     },
     [processQueue]
   );
-  useEffect47(() => {
+  useEffect48(() => {
     const handleConsoleLog = (payload) => {
       handleNewMessage({
         type: payload.type,
@@ -21694,7 +22349,7 @@ function useConsoleMessages() {
       coreEvents.off(CoreEvent.Output, handleOutput);
     };
   }, [handleNewMessage]);
-  const clearConsoleMessages = useCallback41(() => {
+  const clearConsoleMessages = useCallback42(() => {
     if (timeoutRef.current) {
       clearTimeout(timeoutRef.current);
       timeoutRef.current = null;
@@ -21704,7 +22359,7 @@ function useConsoleMessages() {
       dispatch({ type: "CLEAR" });
     });
   }, []);
-  useEffect47(
+  useEffect48(
     () => () => {
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
@@ -21716,13 +22371,13 @@ function useConsoleMessages() {
 }
 
 // src/ui/hooks/visual/use-timer.ts
-import { useState as useState46, useEffect as useEffect48, useRef as useRef24 } from "react";
+import { useState as useState47, useEffect as useEffect49, useRef as useRef25 } from "react";
 var useTimer = (isActive, resetKey) => {
-  const [elapsedTime, setElapsedTime] = useState46(0);
-  const timerRef = useRef24(null);
-  const prevResetKeyRef = useRef24(resetKey);
-  const prevIsActiveRef = useRef24(isActive);
-  useEffect48(() => {
+  const [elapsedTime, setElapsedTime] = useState47(0);
+  const timerRef = useRef25(null);
+  const prevResetKeyRef = useRef25(resetKey);
+  const prevIsActiveRef = useRef25(isActive);
+  useEffect49(() => {
     let shouldResetTime = false;
     if (prevResetKeyRef.current !== resetKey) {
       shouldResetTime = true;
@@ -21759,7 +22414,7 @@ var useTimer = (isActive, resetKey) => {
 };
 
 // src/ui/hooks/visual/use-phrase-cycler.ts
-import { useState as useState47, useEffect as useEffect49, useRef as useRef25 } from "react";
+import { useState as useState48, useEffect as useEffect50, useRef as useRef26 } from "react";
 
 // src/ui/components/indicators/loading-phrases.ts
 var WITTY_LOADING_PHRASES = [
@@ -21902,12 +22557,12 @@ var PHRASE_CHANGE_INTERVAL_MS = 15e3;
 var INTERACTIVE_SHELL_WAITING_PHRASE = "Interactive shell awaiting input... press tab to focus shell";
 var usePhraseCycler = (isActive, shouldShowFocusHint, customPhrases) => {
   const loadingPhrases = customPhrases && customPhrases.length > 0 ? customPhrases : WITTY_LOADING_PHRASES;
-  const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState47(
+  const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState48(
     loadingPhrases[0]
   );
-  const phraseIntervalRef = useRef25(null);
-  const hasShownFirstRequestTipRef = useRef25(false);
-  useEffect49(() => {
+  const phraseIntervalRef = useRef26(null);
+  const hasShownFirstRequestTipRef = useRef26(false);
+  useEffect50(() => {
     if (phraseIntervalRef.current) {
       clearInterval(phraseIntervalRef.current);
       phraseIntervalRef.current = null;
@@ -21952,13 +22607,13 @@ var usePhraseCycler = (isActive, shouldShowFocusHint, customPhrases) => {
 };
 
 // src/ui/hooks/visual/use-loading-indicator.ts
-import { useState as useState48, useEffect as useEffect50, useRef as useRef26 } from "react";
+import { useState as useState49, useEffect as useEffect51, useRef as useRef27 } from "react";
 var useLoadingIndicator = ({
   streamingState,
   shouldShowFocusHint,
   customWittyPhrases
 }) => {
-  const [timerResetKey, setTimerResetKey] = useState48(0);
+  const [timerResetKey, setTimerResetKey] = useState49(0);
   const isTimerActive = streamingState === "responding" /* Responding */;
   const elapsedTimeFromTimer = useTimer(isTimerActive, timerResetKey);
   const isPhraseCyclingActive = streamingState === "responding" /* Responding */;
@@ -21967,8 +22622,8 @@ var useLoadingIndicator = ({
     shouldShowFocusHint,
     customWittyPhrases
   );
-  const prevStreamingStateRef = useRef26(null);
-  useEffect50(() => {
+  const prevStreamingStateRef = useRef27(null);
+  useEffect51(() => {
     if (streamingState === "idle" /* Idle */ && prevStreamingStateRef.current === "responding" /* Responding */) {
       setTimerResetKey((prevKey) => prevKey + 1);
     }
@@ -21981,40 +22636,54 @@ var useLoadingIndicator = ({
 };
 
 // src/ui/hooks/session/use-message-queue.ts
-import { useCallback as useCallback42, useEffect as useEffect51, useState as useState49 } from "react";
+import { useCallback as useCallback43, useEffect as useEffect52, useMemo as useMemo35, useState as useState50 } from "react";
 function useMessageQueue({
+  queueKey,
   streamingState,
   submitQuery
 }) {
-  const [messageQueue, setMessageQueue] = useState49([]);
-  const addMessage = useCallback42((message) => {
+  const [queuedMessages, setQueuedMessages] = useState50([]);
+  const messageQueue = useMemo35(
+    () => queuedMessages.filter((entry) => entry.key === queueKey).map((entry) => entry.message),
+    [queueKey, queuedMessages]
+  );
+  const addMessage = useCallback43((message) => {
     const trimmedMessage = message.trim();
     if (trimmedMessage.length > 0) {
-      setMessageQueue((prev) => [...prev, trimmedMessage]);
+      setQueuedMessages((previous) => [
+        ...previous,
+        { key: queueKey, message: trimmedMessage }
+      ]);
     }
-  }, []);
-  const clearQueue = useCallback42(() => {
-    setMessageQueue([]);
-  }, []);
-  const getQueuedMessagesText = useCallback42(() => {
+  }, [queueKey]);
+  const clearQueue = useCallback43(() => {
+    setQueuedMessages(
+      (previous) => previous.filter((entry) => entry.key !== queueKey)
+    );
+  }, [queueKey]);
+  const getQueuedMessagesText = useCallback43(() => {
     if (messageQueue.length === 0) return "";
     return messageQueue.join("\n\n");
   }, [messageQueue]);
-  const popAllMessages = useCallback42(() => {
+  const popAllMessages = useCallback43(() => {
     if (messageQueue.length === 0) {
       return void 0;
     }
     const allMessages = messageQueue.join("\n\n");
-    setMessageQueue([]);
+    setQueuedMessages(
+      (previous) => previous.filter((entry) => entry.key !== queueKey)
+    );
     return allMessages;
-  }, [messageQueue]);
-  useEffect51(() => {
+  }, [messageQueue, queueKey]);
+  useEffect52(() => {
     if (streamingState === "idle" /* Idle */ && messageQueue.length > 0) {
       const combinedMessage = messageQueue.join("\n\n");
-      setMessageQueue([]);
+      setQueuedMessages(
+        (previous) => previous.filter((entry) => entry.key !== queueKey)
+      );
       submitQuery(combinedMessage);
     }
-  }, [streamingState, messageQueue, submitQuery]);
+  }, [streamingState, messageQueue, queueKey, submitQuery]);
   return {
     messageQueue,
     addMessage,
@@ -22025,16 +22694,16 @@ function useMessageQueue({
 }
 
 // src/ui/hooks/input/use-input-history-store.ts
-import { useCallback as useCallback43, useRef as useRef27, useState as useState50 } from "react";
+import { useCallback as useCallback44, useRef as useRef28, useState as useState51 } from "react";
 function deduplicateConsecutive(messages) {
   return messages.filter(
     (message, index) => index === 0 || message !== messages[index - 1]
   );
 }
 function useInputHistoryStore() {
-  const [inputHistory, setInputHistory] = useState50([]);
-  const initializationStarted = useRef27(false);
-  const initializeFromHistory = useCallback43(
+  const [inputHistory, setInputHistory] = useState51([]);
+  const initializationStarted = useRef28(false);
+  const initializeFromHistory = useCallback44(
     async (history) => {
       if (initializationStarted.current) return;
       initializationStarted.current = true;
@@ -22055,7 +22724,7 @@ function useInputHistoryStore() {
     },
     []
   );
-  const addInput = useCallback43(
+  const addInput = useCallback44(
     (input) => {
       const trimmedInput = input.trim();
       if (!trimmedInput) return;
@@ -22155,12 +22824,12 @@ var PromptHistoryStore = class {
 };
 
 // src/ui/hooks/ai/use-turn-activity-monitor.ts
-import { useState as useState51, useEffect as useEffect52, useRef as useRef28 } from "react";
+import { useState as useState52, useEffect as useEffect53, useRef as useRef29 } from "react";
 var useTurnActivityMonitor = (streamingState, activePtyId) => {
-  const [operationStartTime, setOperationStartTime] = useState51(0);
-  const prevPtyIdRef = useRef28(void 0);
-  const prevStreamingStateRef = useRef28(void 0);
-  useEffect52(() => {
+  const [operationStartTime, setOperationStartTime] = useState52(0);
+  const prevPtyIdRef = useRef29(void 0);
+  const prevStreamingStateRef = useRef29(void 0);
+  useEffect53(() => {
     const isNowResponding = streamingState === "responding" /* Responding */;
     const wasResponding = prevStreamingStateRef.current === "responding" /* Responding */;
     const ptyChanged = activePtyId !== prevPtyIdRef.current;
@@ -22219,7 +22888,7 @@ var useShellInactivityStatus = ({
 };
 
 // src/ui/hooks/input/use-local-shell-command.ts
-import { useCallback as useCallback44, useEffect as useEffect53, useRef as useRef29, useState as useState52 } from "react";
+import { useCallback as useCallback45, useEffect as useEffect54, useRef as useRef30, useState as useState53 } from "react";
 import crypto2 from "node:crypto";
 import fs11 from "node:fs";
 import os3 from "node:os";
@@ -22236,20 +22905,20 @@ function useLocalShellCommand({
   terminalWidth,
   terminalHeight
 }) {
-  const controllerRef = useRef29(void 0);
-  const mountedRef = useRef29(true);
-  const [isExecuting, setIsExecuting] = useState52(false);
-  const [activePtyId, setActivePtyId] = useState52(void 0);
-  const [lastOutputTime, setLastOutputTime] = useState52(0);
-  const cancel = useCallback44(() => controllerRef.current?.abort(), []);
-  useEffect53(() => {
+  const controllerRef = useRef30(void 0);
+  const mountedRef = useRef30(true);
+  const [isExecuting, setIsExecuting] = useState53(false);
+  const [activePtyId, setActivePtyId] = useState53(void 0);
+  const [lastOutputTime, setLastOutputTime] = useState53(0);
+  const cancel = useCallback45(() => controllerRef.current?.abort(), []);
+  useEffect54(() => {
     mountedRef.current = true;
     return () => {
       mountedRef.current = false;
       controllerRef.current?.abort();
     };
   }, []);
-  const execute = useCallback44(
+  const execute = useCallback45(
     (rawCommand) => {
       const command = rawCommand.trim();
       if (command.length === 0 || controllerRef.current !== void 0) {
@@ -22446,12 +23115,25 @@ ${output}`;
 }
 
 // src/ui/app-container.tsx
-import { jsx as jsx95 } from "react/jsx-runtime";
+import { jsx as jsx96 } from "react/jsx-runtime";
 var SHELL_WIDTH_FRACTION = 0.89;
 var SHELL_HEIGHT_PADDING = 10;
 var noopExternalStoreSubscribe = () => () => {
 };
 var emptyProviderSetupSnapshot = () => void 0;
+var EMPTY_SIDE_CONVERSATION_SNAPSHOT = {
+  activeSurface: "main",
+  mainBusy: false,
+  sideBusy: false
+};
+var emptySideConversationSnapshot = () => EMPTY_SIDE_CONVERSATION_SNAPSHOT;
+var EMPTY_SUBAGENT_CATALOG_SNAPSHOT = {
+  rootSessionId: "",
+  status: "idle",
+  items: [],
+  runningCount: 0
+};
+var emptySubagentCatalogSnapshot = () => EMPTY_SUBAGENT_CATALOG_SNAPSHOT;
 var AppContainer = (props) => {
   const {
     config,
@@ -22466,38 +23148,50 @@ var AppContainer = (props) => {
     userQuestionRuntime,
     commandRuntime,
     permissionSelectionRuntime,
-    toolCatalogRuntime
+    toolCatalogRuntime,
+    sideConversationRuntime,
+    subagentCatalogRuntime
   } = props;
   const historyManager = useHistory();
-  const conversationSnapshot = useSyncExternalStore5(
+  const conversationSnapshot = useSyncExternalStore6(
     conversationRuntime.subscribe,
     conversationRuntime.getSnapshot,
     conversationRuntime.getSnapshot
   );
-  const approvalSnapshot = useSyncExternalStore5(
+  const sideConversationSnapshot = useSyncExternalStore6(
+    sideConversationRuntime?.subscribeWorkspace ?? noopExternalStoreSubscribe,
+    sideConversationRuntime?.getWorkspaceSnapshot ?? emptySideConversationSnapshot,
+    sideConversationRuntime?.getWorkspaceSnapshot ?? emptySideConversationSnapshot
+  );
+  const subagentCatalogSnapshot = useSyncExternalStore6(
+    subagentCatalogRuntime?.subscribe ?? noopExternalStoreSubscribe,
+    subagentCatalogRuntime?.getSnapshot ?? emptySubagentCatalogSnapshot,
+    subagentCatalogRuntime?.getSnapshot ?? emptySubagentCatalogSnapshot
+  );
+  const approvalSnapshot = useSyncExternalStore6(
     approvalRuntime.subscribe,
     approvalRuntime.getSnapshot,
     approvalRuntime.getSnapshot
   );
   const pendingApproval = approvalSnapshot.pending[0];
-  const userQuestionSnapshot = useSyncExternalStore5(
+  const userQuestionSnapshot = useSyncExternalStore6(
     userQuestionRuntime.subscribe,
     userQuestionRuntime.getSnapshot,
     userQuestionRuntime.getSnapshot
   );
   const pendingUserQuestion = userQuestionSnapshot.pending[0];
-  const conversationHistoryIds = useRef30(/* @__PURE__ */ new Map());
-  const conversationHistoryTexts = useRef30(/* @__PURE__ */ new Map());
+  const conversationHistoryIds = useRef31(/* @__PURE__ */ new Map());
+  const conversationHistoryTexts = useRef31(/* @__PURE__ */ new Map());
   const conversationSessionId = conversationRuntime.getSessionStats().sessionId;
-  const [projectedSessionId, setProjectedSessionId] = useState53(
+  const [projectedSessionId, setProjectedSessionId] = useState54(
     conversationSessionId
   );
-  const promptInputAbortRef = useRef30(void 0);
-  const [promptInputPreparing, setPromptInputPreparing] = useState53(false);
+  const promptInputAbortRef = useRef31(void 0);
+  const [promptInputPreparing, setPromptInputPreparing] = useState54(false);
   const addConversationHistoryItem = historyManager.addItem;
   const updateConversationHistoryItem = historyManager.updateItem;
   const clearConversationHistory = historyManager.clearItems;
-  useEffect54(() => {
+  useEffect55(() => {
     if (projectedSessionId !== conversationSessionId) {
       conversationHistoryIds.current.clear();
       conversationHistoryTexts.current.clear();
@@ -22508,57 +23202,17 @@ var AppContainer = (props) => {
     const visibleHistoryIds = new Set(
       historyManager.history.map((item) => item.id)
     );
-    const projectedToolCallIds = new Set(
-      conversationSnapshot.messages.flatMap(
-        (message) => message.role === "tool" ? [message.callId] : []
-      )
+    const visibleToolCallIds = projectedToolCallIds(
+      conversationSnapshot.messages
     );
     for (const message of conversationSnapshot.messages) {
       const historyId = conversationHistoryIds.current.get(message.id);
-      const assistantContent = message.role === "assistant" ? message.content.filter(
-        (block) => block.type !== "tool-call" || !projectedToolCallIds.has(block.id)
-      ) : void 0;
-      if (message.role === "assistant" && assistantContent?.length === 0 && message.interrupted !== true) {
-        continue;
-      }
-      const messageText = message.role === "tool" ? void 0 : conversationMessageText(message);
-      const item = message.role === "tool" ? {
-        type: "tool_group",
-        tools: [
-          {
-            callId: message.callId,
-            name: message.presentation?.kind === "card" ? message.presentation.title ?? message.name : message.name,
-            description: message.presentation?.kind === "compact" ? "" : message.presentation?.description ?? message.arguments,
-            resultDisplay: message.presentation?.kind === "compact" ? void 0 : message.presentation?.resultDisplay ?? (message.result === void 0 ? void 0 : {
-              type: "dsh-content",
-              content: message.result.content,
-              ...message.result.error === void 0 ? {} : { error: message.result.error }
-            }),
-            ...message.presentation?.kind === "compact" ? {
-              presentation: {
-                kind: "compact",
-                label: message.presentation.label
-              }
-            } : {},
-            status: message.status === "executing" ? "Executing" /* Executing */ : message.status === "success" ? "Success" /* Success */ : "Error" /* Error */
-          }
-        ]
-      } : message.role === "assistant" ? {
-        type: "dsh_assistant",
-        content: assistantContent ?? message.content,
-        interrupted: message.interrupted === true
-      } : message.role === "user" ? {
-        type: "dsh_user",
-        content: message.displayContent ?? message.content
-      } : {
-        type: message.status === "cancelled" ? "warning" /* WARNING */ : "error" /* ERROR */,
-        text: messageText ?? ""
-      };
-      const fingerprint = message.role === "tool" ? JSON.stringify([
-        message.status,
-        message.result,
-        message.presentation
-      ]) : message.role === "assistant" ? JSON.stringify([assistantContent, message.interrupted]) : message.role === "user" ? JSON.stringify(message.displayContent ?? message.content) : messageText ?? "";
+      const item = conversationMessageToHistoryItem(
+        message,
+        visibleToolCallIds
+      );
+      if (item === void 0) continue;
+      const fingerprint = conversationMessageFingerprint(message, item);
       if (historyId === void 0 || !visibleHistoryIds.has(historyId)) {
         const nextHistoryId = addConversationHistoryItem(item);
         conversationHistoryIds.current.set(message.id, nextHistoryId);
@@ -22582,49 +23236,49 @@ var AppContainer = (props) => {
   useMemoryMonitor(historyManager);
   const settings = useSettings();
   const isAlternateBuffer = useAlternateBuffer();
-  const [debugMessage, setDebugMessage] = useState53("");
-  const [quittingMessages, setQuittingMessages] = useState53(null);
-  const [themeError, setThemeError] = useState53(
+  const [debugMessage, setDebugMessage] = useState54("");
+  const [quittingMessages, setQuittingMessages] = useState54(null);
+  const [themeError, setThemeError] = useState54(
     initializationResult.themeError
   );
-  const [isProcessing, setIsProcessing] = useState53(false);
-  const [embeddedShellFocused, setEmbeddedShellFocused] = useState53(false);
+  const [isProcessing, setIsProcessing] = useState54(false);
+  const [embeddedShellFocused, setEmbeddedShellFocused] = useState54(false);
   const enableProfiler = config.getDebugMode() || process8.env["NODE_ENV"] === "development";
-  const [showDebugProfiler, setShowDebugProfiler] = useState53(enableProfiler);
-  const [customDialog, setCustomDialog] = useState53(
+  const [showDebugProfiler, setShowDebugProfiler] = useState54(enableProfiler);
+  const [customDialog, setCustomDialog] = useState54(
     null
   );
-  const [copyModeEnabled, setCopyModeEnabled] = useState53(false);
-  const [pendingRestorePrompt, setPendingRestorePrompt] = useState53(false);
-  const [shellModeActive, setShellModeActive] = useState53(false);
-  const [pendingShellHistoryItem, setPendingShellHistoryItem] = useState53(null);
-  const [historyRemountKey, setHistoryRemountKey] = useState53(0);
-  const [settingsNonce, setSettingsNonce] = useState53(0);
-  const [queueErrorMessage, setQueueErrorMessage] = useState53(
+  const [copyModeEnabled, setCopyModeEnabled] = useState54(false);
+  const [pendingRestorePrompt, setPendingRestorePrompt] = useState54(false);
+  const [shellModeActive, setShellModeActive] = useState54(false);
+  const [pendingShellHistoryItem, setPendingShellHistoryItem] = useState54(null);
+  const [historyRemountKey, setHistoryRemountKey] = useState54(0);
+  const [settingsNonce, setSettingsNonce] = useState54(0);
+  const [queueErrorMessage, setQueueErrorMessage] = useState54(
     null
   );
-  const toggleDebugProfiler = useCallback45(
+  const toggleDebugProfiler = useCallback46(
     () => setShowDebugProfiler((visible) => !visible),
     []
   );
-  const [modelSelectionSnapshot, setModelSelectionSnapshot] = useState53(
+  const [modelSelectionSnapshot, setModelSelectionSnapshot] = useState54(
     () => modelSelectionRuntime?.getSnapshot()
   );
-  useEffect54(
+  useEffect55(
     () => modelSelectionRuntime?.subscribe(
       () => setModelSelectionSnapshot(modelSelectionRuntime.getSnapshot())
     ),
     [modelSelectionRuntime]
   );
-  const currentModel = modelSelectionSnapshot ? modelSelectionLabel(modelSelectionSnapshot.current) : "DSH default";
-  const currentReasoningEffort = modelSelectionSnapshot ? modelReasoningEffortLabel(modelSelectionSnapshot.current) : void 0;
-  const providerSetupSnapshot = useSyncExternalStore5(
+  const currentModel = sideConversationSnapshot.activeSurface === "side" && sideConversationSnapshot.sideModelLabel ? sideConversationSnapshot.sideModelLabel : modelSelectionSnapshot ? modelSelectionLabel(modelSelectionSnapshot.current) : "DSH default";
+  const currentReasoningEffort = sideConversationSnapshot.activeSurface === "side" ? sideConversationSnapshot.sideReasoningEffortLabel : modelSelectionSnapshot ? modelReasoningEffortLabel(modelSelectionSnapshot.current) : void 0;
+  const providerSetupSnapshot = useSyncExternalStore6(
     providerSetupRuntime?.subscribe ?? noopExternalStoreSubscribe,
     providerSetupRuntime?.getSnapshot ?? emptyProviderSetupSnapshot,
     providerSetupRuntime?.getSnapshot ?? emptyProviderSetupSnapshot
   );
-  const [providerSetupDismissed, setProviderSetupDismissed] = useState53(false);
-  const promptHistory = useMemo34(
+  const [providerSetupDismissed, setProviderSetupDismissed] = useState54(false);
+  const promptHistory = useMemo36(
     () => new PromptHistoryStore(
       join5(config.storage.getProjectTempDir(), "prompt_history.json")
     ),
@@ -22637,11 +23291,11 @@ var AppContainer = (props) => {
   const app = useApp();
   const { stats: sessionStats } = useSessionStats();
   const branchName = useGitBranchName(config.getTargetDir());
-  const mainControlsRef = useRef30(null);
-  const rootUiRef = useRef30(null);
-  const lastTitleRef = useRef30(null);
+  const mainControlsRef = useRef31(null);
+  const rootUiRef = useRef31(null);
+  const lastTitleRef = useRef31(null);
   const staticExtraHeight = 3;
-  useEffect54(() => {
+  useEffect55(() => {
     void (async () => {
       startupProfiler.flush();
     })();
@@ -22649,7 +23303,7 @@ var AppContainer = (props) => {
       disableMouseEvents();
     });
   }, [config]);
-  useEffect54(() => {
+  useEffect55(() => {
     const handleSettingsChanged = () => {
       setSettingsNonce((prev) => prev + 1);
     };
@@ -22660,19 +23314,19 @@ var AppContainer = (props) => {
   }, []);
   const { consoleMessages, clearConsoleMessages: clearConsoleMessagesState } = useConsoleMessages();
   const mainAreaWidth = calculateMainAreaWidth(terminalWidth, settings);
-  const { inputWidth, suggestionsWidth } = useMemo34(() => {
+  const { inputWidth, suggestionsWidth } = useMemo36(() => {
     const { inputWidth: inputWidth2, suggestionsWidth: suggestionsWidth2 } = calculatePromptWidths(mainAreaWidth);
     return { inputWidth: inputWidth2, suggestionsWidth: suggestionsWidth2 };
   }, [mainAreaWidth]);
   const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
-  const isValidPath = useCallback45((filePath) => {
+  const isValidPath = useCallback46((filePath) => {
     try {
       return fs12.existsSync(filePath) && fs12.statSync(filePath).isFile();
     } catch (_e) {
       return false;
     }
   }, []);
-  const getPreferredEditor = useCallback45(
+  const getPreferredEditor = useCallback46(
     () => settings.merged.general.preferredEditor,
     [settings.merged.general.preferredEditor]
   );
@@ -22685,16 +23339,16 @@ var AppContainer = (props) => {
     shellModeActive,
     getPreferredEditor
   });
-  useEffect54(() => {
+  useEffect55(() => {
     initializeFromHistory(promptHistory);
   }, [initializeFromHistory, promptHistory]);
-  const refreshStatic = useCallback45(() => {
+  const refreshStatic = useCallback46(() => {
     if (!isAlternateBuffer) {
       stdout.write(ansiEscapes.clearTerminal);
     }
     setHistoryRemountKey((prev) => prev + 1);
   }, [setHistoryRemountKey, isAlternateBuffer, stdout]);
-  const handleEditorClose = useCallback45(() => {
+  const handleEditorClose = useCallback46(() => {
     if (shouldEnterAlternateScreen(isAlternateBuffer, config.getScreenReader())) {
       enterAlternateScreen();
       enableMouseEvents();
@@ -22704,7 +23358,7 @@ var AppContainer = (props) => {
     terminalCapabilityManager.enableSupportedModes();
     refreshStatic();
   }, [refreshStatic, isAlternateBuffer, app, config]);
-  useEffect54(() => {
+  useEffect55(() => {
     coreEvents.on(CoreEvent.ExternalEditorClosed, handleEditorClose);
     return () => {
       coreEvents.off(CoreEvent.ExternalEditorClosed, handleEditorClose);
@@ -22722,7 +23376,7 @@ var AppContainer = (props) => {
     historyManager.addItem,
     initializationResult.themeError
   );
-  const [editorError, setEditorError] = useState53(null);
+  const [editorError, setEditorError] = useState54(null);
   const {
     isEditorDialogOpen,
     openEditorDialog,
@@ -22731,7 +23385,7 @@ var AppContainer = (props) => {
   } = useEditorSettings(settings, setEditorError, historyManager.addItem);
   const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } = useSettingsCommand();
   const { toggleVimEnabled } = useVimMode();
-  const slashCommandActions = useMemo34(
+  const slashCommandActions = useMemo36(
     () => ({
       openThemeDialog,
       openEditorDialog,
@@ -22776,13 +23430,15 @@ var AppContainer = (props) => {
     toolCatalogRuntime,
     commandRuntime,
     enableProfiler,
-    providerSetupRuntime
+    providerSetupRuntime,
+    sideConversationRuntime,
+    subagentCatalogRuntime
   );
-  const cancelHandlerRef = useRef30(
+  const cancelHandlerRef = useRef31(
     () => {
     }
   );
-  useEffect54(() => {
+  useEffect55(() => {
     if (pendingRestorePrompt) {
       const lastHistoryUserMsg = historyManager.history.findLast(
         (h) => h.type === "user"
@@ -22795,7 +23451,7 @@ var AppContainer = (props) => {
     }
   }, [pendingRestorePrompt, inputHistory, historyManager.history]);
   const initError = initializationResult.initError;
-  const todos = useMemo34(
+  const todos = useMemo36(
     () => ({
       todos: conversationSnapshot.todos.map((todo) => ({
         description: todo.content,
@@ -22820,7 +23476,7 @@ var AppContainer = (props) => {
     terminalHeight
   });
   const streamingState = conversationSnapshot.busy || promptInputPreparing || localShellExecuting || isProcessing ? "responding" /* Responding */ : "idle" /* Idle */;
-  const submitQuery = useCallback45(
+  const submitQuery = useCallback46(
     (query) => {
       if (isSlashCommand(query.trim())) {
         void handleSlashCommand(query);
@@ -22873,20 +23529,20 @@ var AppContainer = (props) => {
       buffer
     ]
   );
-  const cancelOngoingRequest = useCallback45(() => {
+  const cancelOngoingRequest = useCallback46(() => {
     cancelCommand();
     cancelLocalShell();
     promptInputAbortRef.current?.abort();
     conversationRuntime.cancel();
   }, [cancelCommand, cancelLocalShell, conversationRuntime]);
-  useEffect54(
+  useEffect55(
     () => () => {
       promptInputAbortRef.current?.abort();
     },
     []
   );
-  const lastOutputTimeRef = useRef30(0);
-  useEffect54(() => {
+  const lastOutputTimeRef = useRef31(0);
+  useEffect55(() => {
     lastOutputTimeRef.current = lastOutputTime;
   }, [lastOutputTime]);
   const { shouldShowFocusHint, inactivityStatus } = useShellInactivityStatus({
@@ -22905,10 +23561,11 @@ var AppContainer = (props) => {
     getQueuedMessagesText,
     popAllMessages
   } = useMessageQueue({
+    queueKey: conversationSessionId,
     streamingState,
     submitQuery
   });
-  cancelHandlerRef.current = useCallback45(
+  cancelHandlerRef.current = useCallback46(
     (shouldRestorePrompt = true) => {
       const lastUserMessage = inputHistory.at(-1);
       let textToSet = shouldRestorePrompt ? lastUserMessage || "" : "";
@@ -22923,14 +23580,9 @@ ${queuedText}` : queuedText;
         buffer.setText(textToSet);
       }
     },
-    [
-      buffer,
-      inputHistory,
-      getQueuedMessagesText,
-      clearQueue
-    ]
+    [buffer, inputHistory, getQueuedMessagesText, clearQueue]
   );
-  const handleFinalSubmit = useCallback45(
+  const handleFinalSubmit = useCallback46(
     (submittedValue) => {
       if (shellModeActive) {
         executeLocalShell(submittedValue);
@@ -22965,14 +23617,14 @@ ${queuedText}` : queuedText;
       streamingState
     ]
   );
-  const handleClearScreen = useCallback45(() => {
+  const handleClearScreen = useCallback46(() => {
     historyManager.clearItems();
     clearConsoleMessagesState();
     refreshStatic();
   }, [historyManager, clearConsoleMessagesState, refreshStatic]);
   const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
   const isInputActive = !initError && !isProcessing && pendingApproval === void 0 && pendingUserQuestion === void 0 && !!slashCommands && (streamingState === "idle" /* Idle */ || streamingState === "responding" /* Responding */);
-  const [controlsHeight, setControlsHeight] = useState53(0);
+  const [controlsHeight, setControlsHeight] = useState54(0);
   useLayoutEffect3(() => {
     if (mainControlsRef.current) {
       const fullFooterMeasurement = measureElement3(mainControlsRef.current);
@@ -22996,18 +23648,18 @@ ${queuedText}` : queuedText;
     sanitizationConfig: config.sanitizationConfig
   });
   const isFocused = useFocus();
-  const initialPrompt = useMemo34(
+  const initialPrompt = useMemo36(
     () => props.initialPrompt ?? config.getQuestion(),
     [config, props.initialPrompt]
   );
-  const initialPromptSubmitted = useRef30(false);
+  const initialPromptSubmitted = useRef31(false);
   const providerSetupRequired = providerSetupSnapshot?.current.status === "missing";
-  useEffect54(() => {
+  useEffect55(() => {
     if (!providerSetupRuntime || !providerSetupRequired || providerSetupDismissed || customDialog) {
       return;
     }
     setCustomDialog(
-      /* @__PURE__ */ jsx95(
+      /* @__PURE__ */ jsx96(
         ProviderSetupDialog,
         {
           runtime: providerSetupRuntime,
@@ -23034,7 +23686,7 @@ ${queuedText}` : queuedText;
     providerSetupRuntime,
     providerSetupSnapshot
   ]);
-  useEffect54(() => {
+  useEffect55(() => {
     if (activePtyId) {
       try {
         ShellExecutionService.resizePty(
@@ -23052,7 +23704,7 @@ ${queuedText}` : queuedText;
       }
     }
   }, [terminalWidth, availableTerminalHeight, activePtyId]);
-  useEffect54(() => {
+  useEffect55(() => {
     if (initialPrompt && !initialPromptSubmitted.current && !isThemeDialogOpen && !isEditorDialogOpen && !providerSetupRequired && !customDialog && conversationRuntime) {
       handleFinalSubmit(initialPrompt);
       initialPromptSubmitted.current = true;
@@ -23066,20 +23718,20 @@ ${queuedText}` : queuedText;
     customDialog,
     conversationRuntime
   ]);
-  const [showErrorDetails, setShowErrorDetails] = useState53(false);
-  const [showFullTodos, setShowFullTodos] = useState53(false);
-  const [renderMarkdown, setRenderMarkdown] = useState53(true);
-  const [ctrlCPressCount, setCtrlCPressCount] = useState53(0);
-  const ctrlCTimerRef = useRef30(null);
-  const [ctrlDPressCount, setCtrlDPressCount] = useState53(0);
-  const ctrlDTimerRef = useRef30(null);
-  const [constrainHeight, setConstrainHeight] = useState53(true);
-  const [showEscapePrompt, setShowEscapePrompt] = useState53(false);
-  const [warningMessage, setWarningMessage] = useState53(null);
-  const isInitialMount = useRef30(true);
-  const warningTimeoutRef = useRef30(null);
-  const tabFocusTimeoutRef = useRef30(null);
-  const handleWarning = useCallback45((message) => {
+  const [showErrorDetails, setShowErrorDetails] = useState54(false);
+  const [showFullTodos, setShowFullTodos] = useState54(false);
+  const [renderMarkdown, setRenderMarkdown] = useState54(true);
+  const [ctrlCPressCount, setCtrlCPressCount] = useState54(0);
+  const ctrlCTimerRef = useRef31(null);
+  const [ctrlDPressCount, setCtrlDPressCount] = useState54(0);
+  const ctrlDTimerRef = useRef31(null);
+  const [constrainHeight, setConstrainHeight] = useState54(true);
+  const [showEscapePrompt, setShowEscapePrompt] = useState54(false);
+  const [warningMessage, setWarningMessage] = useState54(null);
+  const isInitialMount = useRef31(true);
+  const warningTimeoutRef = useRef31(null);
+  const tabFocusTimeoutRef = useRef31(null);
+  const handleWarning = useCallback46((message) => {
     setWarningMessage(message);
     if (warningTimeoutRef.current) {
       clearTimeout(warningTimeoutRef.current);
@@ -23088,7 +23740,7 @@ ${queuedText}` : queuedText;
       setWarningMessage(null);
     }, WARNING_PROMPT_DURATION_MS);
   }, []);
-  useEffect54(() => {
+  useEffect55(() => {
     const handleSelectionWarning = () => {
       handleWarning("Press Ctrl-S to enter selection mode to copy text.");
     };
@@ -23108,7 +23760,7 @@ ${queuedText}` : queuedText;
       }
     };
   }, [handleWarning]);
-  useEffect54(() => {
+  useEffect55(() => {
     if (queueErrorMessage) {
       const timer = setTimeout(() => {
         setQueueErrorMessage(null);
@@ -23117,7 +23769,7 @@ ${queuedText}` : queuedText;
     }
     return void 0;
   }, [queueErrorMessage, setQueueErrorMessage]);
-  useEffect54(() => {
+  useEffect55(() => {
     if (isInitialMount.current) {
       isInitialMount.current = false;
       return;
@@ -23129,7 +23781,7 @@ ${queuedText}` : queuedText;
       clearTimeout(handler);
     };
   }, [terminalWidth, refreshStatic]);
-  useEffect54(() => {
+  useEffect55(() => {
     const openDebugConsole = () => {
       setShowErrorDetails(true);
       setConstrainHeight(false);
@@ -23139,7 +23791,7 @@ ${queuedText}` : queuedText;
       appEvents.off("open-debug-console" /* OpenDebugConsole */, openDebugConsole);
     };
   }, [config]);
-  useEffect54(() => {
+  useEffect55(() => {
     if (ctrlCTimerRef.current) {
       clearTimeout(ctrlCTimerRef.current);
       ctrlCTimerRef.current = null;
@@ -23153,7 +23805,7 @@ ${queuedText}` : queuedText;
       }, WARNING_PROMPT_DURATION_MS);
     }
   }, [ctrlCPressCount, config, setCtrlCPressCount, handleSlashCommand]);
-  useEffect54(() => {
+  useEffect55(() => {
     if (ctrlDTimerRef.current) {
       clearTimeout(ctrlDTimerRef.current);
       ctrlCTimerRef.current = null;
@@ -23167,7 +23819,7 @@ ${queuedText}` : queuedText;
       }, WARNING_PROMPT_DURATION_MS);
     }
   }, [ctrlDPressCount, config, setCtrlDPressCount, handleSlashCommand]);
-  const handleEscapePromptChange = useCallback45((showPrompt) => {
+  const handleEscapePromptChange = useCallback46((showPrompt) => {
     setShowEscapePrompt(showPrompt);
   }, []);
   const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator({
@@ -23175,13 +23827,21 @@ ${queuedText}` : queuedText;
     shouldShowFocusHint,
     customWittyPhrases: settings.merged.ui.customWittyPhrases
   });
-  const handleGlobalKeypress = useCallback45(
+  const handleGlobalKeypress = useCallback46(
     (key) => {
       if (copyModeEnabled) {
         setCopyModeEnabled(false);
         enableMouseEvents();
         return;
       }
+      if (sideConversationRuntime && !customDialog && pendingApproval === void 0 && pendingUserQuestion === void 0 && isConversationSwitchKey(key)) {
+        if (sideConversationSnapshot.activeSurface === "side") {
+          sideConversationRuntime.switchToMain();
+        } else if (sideConversationSnapshot.sideSessionId !== void 0) {
+          sideConversationRuntime.switchToSide();
+        }
+        return;
+      }
       if (isAlternateBuffer && keyMatchers["app.toggleCopyMode" /* TOGGLE_COPY_MODE */](key)) {
         setCopyModeEnabled(true);
         disableMouseEvents();
@@ -23200,6 +23860,12 @@ ${queuedText}` : queuedText;
           return;
         }
         if (conversationRuntime) {
+          if (sideConversationRuntime && sideConversationSnapshot.activeSurface === "side" && !conversationSnapshot.busy && !promptInputPreparing && !localShellExecuting && !isProcessing) {
+            if (buffer.text.length > 0) return;
+            clearQueue();
+            void sideConversationRuntime.closeSide();
+            return;
+          }
           if (promptInputPreparing || localShellExecuting || isProcessing || conversationSnapshot.busy) {
             cancelOngoingRequest();
           } else {
@@ -23283,17 +23949,20 @@ ${queuedText}` : queuedText;
       setCopyModeEnabled,
       copyModeEnabled,
       isAlternateBuffer,
-      handleWarning
+      handleWarning,
+      clearQueue,
+      sideConversationRuntime,
+      sideConversationSnapshot
     ]
   );
   useKeypress(handleGlobalKeypress, { isActive: true });
-  useEffect54(() => {
+  useEffect55(() => {
     if (settings.merged.ui.hideWindowTitle) return;
     const paddedTitle = computeTerminalTitle({
       streamingState,
       isConfirming: pendingApproval !== void 0 || !!confirmationRequest || shouldShowActionRequiredTitle,
       isSilentWorking: shouldShowSilentWorkingTitle,
-      folderName: basename2(config.getTargetDir()),
+      folderName: basename3(config.getTargetDir()),
       useDynamicTitle: settings.merged.ui.dynamicWindowTitle
     });
     if (lastTitleRef.current !== paddedTitle) {
@@ -23311,7 +23980,7 @@ ${queuedText}` : queuedText;
     config,
     stdout
   ]);
-  useEffect54(() => {
+  useEffect55(() => {
     const handleUserFeedback = (payload) => {
       let type;
       switch (payload.severity) {
@@ -23349,23 +24018,23 @@ ${queuedText}` : queuedText;
       coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
     };
   }, [historyManager]);
-  const filteredConsoleMessages = useMemo34(() => {
+  const filteredConsoleMessages = useMemo36(() => {
     if (config.getDebugMode()) {
       return consoleMessages;
     }
     return consoleMessages.filter((msg) => msg.type !== "debug");
   }, [consoleMessages, config]);
-  const errorCount = useMemo34(
+  const errorCount = useMemo36(
     () => filteredConsoleMessages.filter((msg) => msg.type === "error").reduce((total, msg) => total + msg.count, 0),
     [filteredConsoleMessages]
   );
   const nightly = props.version.includes("nightly");
   const dialogsVisible = pendingUserQuestion !== void 0 || !!confirmationRequest || !!customDialog || isThemeDialogOpen || isSettingsDialogOpen || isEditorDialogOpen;
-  const pendingHistoryItems = useMemo34(
+  const pendingHistoryItems = useMemo36(
     () => pendingShellHistoryItem ? [pendingShellHistoryItem] : [],
     [pendingShellHistoryItem]
   );
-  const uiState = useMemo34(
+  const uiState = useMemo36(
     () => ({
       history: historyManager.history,
       isThemeDialogOpen,
@@ -23425,7 +24094,9 @@ ${queuedText}` : queuedText;
       copyModeEnabled,
       warningMessage,
       terminalBackgroundColor: config.getTerminalBackground(),
-      settingsNonce
+      settingsNonce,
+      sideConversation: sideConversationSnapshot,
+      subagentCatalog: subagentCatalogSnapshot
     }),
     [
       isThemeDialogOpen,
@@ -23486,10 +24157,12 @@ ${queuedText}` : queuedText;
       copyModeEnabled,
       warningMessage,
       config,
-      settingsNonce
+      settingsNonce,
+      sideConversationSnapshot,
+      subagentCatalogSnapshot
     ]
   );
-  const uiActions = useMemo34(
+  const uiActions = useMemo36(
     () => ({
       handleThemeSelect,
       closeThemeDialog,
@@ -23531,22 +24204,22 @@ ${queuedText}` : queuedText;
       setEmbeddedShellFocused
     ]
   );
-  return /* @__PURE__ */ jsx95(UIStateContext.Provider, { value: uiState, children: /* @__PURE__ */ jsx95(UIActionsContext.Provider, { value: uiActions, children: /* @__PURE__ */ jsx95(ConfigContext.Provider, { value: config, children: /* @__PURE__ */ jsx95(
+  return /* @__PURE__ */ jsx96(UIStateContext.Provider, { value: uiState, children: /* @__PURE__ */ jsx96(UIActionsContext.Provider, { value: uiActions, children: /* @__PURE__ */ jsx96(ConfigContext.Provider, { value: config, children: /* @__PURE__ */ jsx96(
     AppContext.Provider,
     {
       value: {
         version: props.version,
         startupWarnings: props.startupWarnings || []
       },
-      children: /* @__PURE__ */ jsx95(ApprovalRuntimeProvider, { runtime: approvalRuntime, children: /* @__PURE__ */ jsx95(UserQuestionRuntimeProvider, { runtime: userQuestionRuntime, children: /* @__PURE__ */ jsx95(ShellFocusContext.Provider, { value: isFocused, children: /* @__PURE__ */ jsx95(App, {}) }) }) })
+      children: /* @__PURE__ */ jsx96(ApprovalRuntimeProvider, { runtime: approvalRuntime, children: /* @__PURE__ */ jsx96(UserQuestionRuntimeProvider, { runtime: userQuestionRuntime, children: /* @__PURE__ */ jsx96(ShellFocusContext.Provider, { value: isFocused, children: /* @__PURE__ */ jsx96(App, {}) }) }) })
     }
   ) }) }) });
 };
 
 // src/ui/root.tsx
-import React21 from "react";
+import React22 from "react";
 import { render } from "ink";
-import { jsx as jsx96 } from "react/jsx-runtime";
+import { jsx as jsx97 } from "react/jsx-runtime";
 var SLOW_RENDER_MS = 200;
 function validateDnsResolutionOrder(order) {
   const defaultValue = "ipv4first";
@@ -23578,7 +24251,7 @@ ${reason.stack}` : ""}`;
     }
   });
 }
-async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), initializationResult, conversationRuntime, approvalRuntime, userQuestionRuntime, commandRuntime, permissionSelectionRuntime, toolCatalogRuntime, promptCompletionRuntime, promptInputRuntime, modelSelectionRuntime, sessionManagementRuntime, initialPrompt, providerSetupRuntime) {
+async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), initializationResult, conversationRuntime, approvalRuntime, userQuestionRuntime, commandRuntime, permissionSelectionRuntime, toolCatalogRuntime, promptCompletionRuntime, promptInputRuntime, modelSelectionRuntime, sessionManagementRuntime, initialPrompt, providerSetupRuntime, sideConversationRuntime, subagentCatalogRuntime) {
   const useAlternateBuffer2 = shouldEnterAlternateScreen(
     isAlternateBufferEnabled(settings),
     config.getScreenReader()
@@ -23590,21 +24263,21 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
       disableMouseEvents();
     });
   }
-  setWindowTitle(basename3(workspaceRoot), settings);
+  setWindowTitle(basename4(workspaceRoot), settings);
   const version = await getVersion();
   const AppWrapper = () => {
     useKittyKeyboardProtocol();
-    return /* @__PURE__ */ jsx96(SettingsContext.Provider, { value: settings, children: /* @__PURE__ */ jsx96(
+    return /* @__PURE__ */ jsx97(SettingsContext.Provider, { value: settings, children: /* @__PURE__ */ jsx97(
       KeypressProvider,
       {
         config,
         debugKeystrokeLogging: settings.merged.general.debugKeystrokeLogging,
-        children: /* @__PURE__ */ jsx96(
+        children: /* @__PURE__ */ jsx97(
           MouseProvider,
           {
             mouseEventsEnabled,
             debugKeystrokeLogging: settings.merged.general.debugKeystrokeLogging,
-            children: /* @__PURE__ */ jsx96(ScrollProvider, { children: /* @__PURE__ */ jsx96(SessionStatsProvider, { conversationRuntime, children: /* @__PURE__ */ jsx96(VimModeProvider, { settings, children: /* @__PURE__ */ jsx96(
+            children: /* @__PURE__ */ jsx97(ScrollProvider, { children: /* @__PURE__ */ jsx97(SessionStatsProvider, { conversationRuntime, children: /* @__PURE__ */ jsx97(VimModeProvider, { settings, children: /* @__PURE__ */ jsx97(
               AppContainer,
               {
                 config,
@@ -23622,6 +24295,8 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
                 commandRuntime,
                 permissionSelectionRuntime,
                 toolCatalogRuntime,
+                sideConversationRuntime,
+                subagentCatalogRuntime,
                 initialPrompt
               }
             ) }) }) })
@@ -23632,7 +24307,7 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
   };
   const { stdout: inkStdout, stderr: inkStderr } = createWorkingStdio();
   const instance = render(
-    process.env["DEBUG"] ? /* @__PURE__ */ jsx96(React21.StrictMode, { children: /* @__PURE__ */ jsx96(AppWrapper, {}) }) : /* @__PURE__ */ jsx96(AppWrapper, {}),
+    process.env["DEBUG"] ? /* @__PURE__ */ jsx97(React22.StrictMode, { children: /* @__PURE__ */ jsx97(AppWrapper, {}) }) : /* @__PURE__ */ jsx97(AppWrapper, {}),
     {
       stdout: inkStdout,
       stderr: inkStderr,
@@ -23738,7 +24413,9 @@ async function main(options) {
       options.modelSelectionRuntime,
       options.sessionManagementRuntime,
       options.initialPrompt,
-      options.providerSetupRuntime
+      options.providerSetupRuntime,
+      options.sideConversationRuntime,
+      options.subagentCatalogRuntime
     );
   }
 }
@@ -24266,6 +24943,167 @@ var DshPromptCompletionRuntime = class {
   }
 };
 
+// src/dsh/side-conversation.ts
+var SIDE_SESSION_PREFIX = "dsh-console-side-";
+function completedTurnSeed(events) {
+  for (let index = events.length - 1; index >= 0; index -= 1) {
+    if (events[index].type === "turn/end") return events.slice(0, index + 1);
+  }
+  return [];
+}
+function pendingUserText(events, seedLength) {
+  for (let index = events.length - 1; index >= seedLength; index -= 1) {
+    const event = events[index];
+    if (event.type !== "user/message") continue;
+    return event.data.content.flatMap((block) => block.type === "text" ? [block.text] : []).join("").trim();
+  }
+  return "";
+}
+function firstSidePrompt(question, pendingRequest) {
+  return [
+    "You are a Side conversation branching from the main conversation context above.",
+    "Help with the side discussion without continuing or modifying the main task.",
+    "No tools are available in this Side conversation.",
+    ...pendingRequest ? ["The main Agent is currently working on this request:", pendingRequest] : [],
+    "Side question:",
+    question
+  ].join("\n\n");
+}
+
+// src/ui/conversation-workspace-runtime.ts
+var ConversationWorkspaceRuntime = class {
+  constructor(main2, createSide) {
+    this.main = main2;
+    this.createSide = createSide;
+    this.offMain = main2.subscribe(this.notify);
+    this.workspaceSnapshot = this.createWorkspaceSnapshot();
+  }
+  listeners = /* @__PURE__ */ new Set();
+  surfaceListeners = /* @__PURE__ */ new Set();
+  offMain;
+  side;
+  offSide;
+  activeSurface = "main";
+  opening;
+  closing;
+  workspaceSnapshot;
+  getSnapshot = () => this.current().getSnapshot();
+  getSessionStats = () => this.current().getSessionStats();
+  subscribe = (listener) => {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  };
+  submit = (submission) => this.current().submit(submission);
+  cancel = () => this.current().cancel();
+  exit = () => this.main.exit();
+  getWorkspaceSnapshot = () => this.workspaceSnapshot;
+  subscribeWorkspace = this.subscribe;
+  subscribeSurface = (listener) => {
+    this.surfaceListeners.add(listener);
+    return () => this.surfaceListeners.delete(listener);
+  };
+  open = async (question, signal) => {
+    const normalized = question?.trim();
+    let createdSide = false;
+    if (this.closing) await this.closing;
+    if (this.opening) throw new Error("A Side conversation is already opening.");
+    if (this.side?.getSnapshot().busy && normalized) {
+      this.switchToSide();
+      throw new Error("The Side Agent is already working.");
+    }
+    if (!this.side) {
+      const operation = this.createSide(signal).then(async (side) => {
+        if (signal.aborted) {
+          await side.dispose();
+          signal.throwIfAborted();
+        }
+        this.side = side;
+        createdSide = true;
+        this.offSide = side.subscribe(this.notify);
+        this.activeSurface = "side";
+        this.notifySurface();
+      });
+      this.opening = operation;
+      try {
+        await operation;
+      } finally {
+        if (this.opening === operation) this.opening = void 0;
+      }
+    } else {
+      this.switchToSide();
+    }
+    if (normalized) {
+      try {
+        await this.side?.submit({
+          content: [{ type: "text", text: normalized }],
+          displayContent: [{ type: "text", text: normalized }],
+          signal
+        });
+      } catch (error) {
+        if (createdSide) await this.closeSide();
+        throw error;
+      }
+    }
+  };
+  switchToMain = () => {
+    if (this.activeSurface === "main") return;
+    this.activeSurface = "main";
+    this.notifySurface();
+  };
+  switchToSide = () => {
+    if (!this.side) throw new Error("No Side conversation is open. Use /btw <question> first.");
+    if (this.activeSurface === "side") return;
+    this.activeSurface = "side";
+    this.notifySurface();
+  };
+  closeSide = async () => {
+    if (this.closing) return this.closing;
+    const side = this.side;
+    if (!side) return;
+    this.activeSurface = "main";
+    this.side = void 0;
+    this.offSide?.();
+    this.offSide = void 0;
+    this.notifySurface();
+    const operation = side.dispose().finally(() => {
+      if (this.closing === operation) this.closing = void 0;
+    });
+    this.closing = operation;
+    await operation;
+  };
+  dispose = async () => {
+    await this.closeSide();
+    this.offMain();
+    this.listeners.clear();
+    this.surfaceListeners.clear();
+  };
+  current() {
+    return this.activeSurface === "side" && this.side ? this.side : this.main;
+  }
+  createWorkspaceSnapshot() {
+    return {
+      activeSurface: this.activeSurface,
+      mainBusy: this.main.getSnapshot().busy,
+      sideBusy: this.side?.getSnapshot().busy ?? false,
+      ...this.side === void 0 ? {} : {
+        sideSessionId: this.side.getSessionStats().sessionId,
+        sideModelLabel: this.side.modelLabel,
+        ...this.side.reasoningEffortLabel === void 0 ? {} : {
+          sideReasoningEffortLabel: this.side.reasoningEffortLabel
+        }
+      }
+    };
+  }
+  notify = () => {
+    this.workspaceSnapshot = this.createWorkspaceSnapshot();
+    for (const listener of this.listeners) listener();
+  };
+  notifySurface = () => {
+    this.notify();
+    for (const listener of this.surfaceListeners) listener();
+  };
+};
+
 // src/dsh/prompt-input-runtime.ts
 import { promises as fs13 } from "node:fs";
 import path14 from "node:path";
@@ -24878,9 +25716,9 @@ var DshModelSelectionRuntime = class _DshModelSelectionRuntime {
 import { foldRequestHeader, SessionId as SessionId2 } from "@deepseek-ai/dsh-session";
 var SESSION_PREFIX = "dsh-console-";
 var COMPLETION_PREFIX = "dsh-console-completion-";
-var SESSION_OBSERVATION_BATCH_SIZE = 8;
+var SIDE_PREFIX = "dsh-console-side-";
 function isConsoleSession(id) {
-  return id.startsWith(SESSION_PREFIX) && !id.startsWith(COMPLETION_PREFIX);
+  return id.startsWith(SESSION_PREFIX) && !id.startsWith(COMPLETION_PREFIX) && !id.startsWith(SIDE_PREFIX);
 }
 function hasConversationEvents(events) {
   return events.some(
@@ -24911,62 +25749,23 @@ var DshSessionManagementRuntime = class {
       { kind: "parent", values: [null] }
     ], signal);
     signal?.throwIfAborted();
-    const candidates = records.filter((record) => {
+    return records.filter((record) => {
       const id = String(record.header.id);
       return isConsoleSession(id) && (record.persisted || id === this.snapshot.currentSessionId);
-    });
-    const observations = [];
-    for (let offset = 0; offset < candidates.length; offset += SESSION_OBSERVATION_BATCH_SIZE) {
-      signal?.throwIfAborted();
-      const batch = candidates.slice(offset, offset + SESSION_OBSERVATION_BATCH_SIZE);
-      observations.push(...await Promise.all(batch.map(async (record) => {
-        if (!record.persisted) {
-          return { record, hasConversation: false, resumable: false };
-        }
-        try {
-          const events = await this.query.listEvents(record.header.id);
-          return {
-            record,
-            hasConversation: hasConversationEvents(events),
-            resumable: events.some((event) => event.type === "request/header")
-          };
-        } catch {
-          return {
-            record,
-            hasConversation: true,
-            resumable: false,
-            resumeUnavailableReason: "Session log could not be read."
-          };
-        }
-      })));
-    }
-    signal?.throwIfAborted();
-    const visible = observations.filter(
-      ({ record, hasConversation, resumable }) => String(record.header.id) === this.snapshot.currentSessionId || hasConversation || resumable
-    );
-    const titles = await this.query.readTitleSnapshots(
-      visible.map(({ record }) => record.header.id),
-      signal
-    );
-    signal?.throwIfAborted();
-    const titleById = /* @__PURE__ */ new Map();
-    for (const result of titles) {
-      if (result.status === "fulfilled" && result.value.title !== void 0) {
-        titleById.set(String(result.sessionId), result.value.title.title);
-      }
-    }
-    return visible.map(({ record, resumable, ...observation }) => ({
+    }).map((record) => ({
       id: String(record.header.id),
-      ...titleById.has(String(record.header.id)) ? { title: titleById.get(String(record.header.id)) } : {},
       createdAt: record.header.createdAt,
       current: String(record.header.id) === this.snapshot.currentSessionId,
       persisted: record.persisted,
-      resumable,
-      ...!resumable && record.persisted ? {
-        resumeUnavailableReason: "resumeUnavailableReason" in observation ? observation.resumeUnavailableReason : "Missing model route."
-      } : {}
+      resumable: record.persisted
     }));
   }
+  async resolveSessionTitles(sessionIds, signal) {
+    if (sessionIds.length === 0) return [];
+    const results = await this.query.readTitleSnapshots(sessionIds.map(SessionId2), signal);
+    signal?.throwIfAborted();
+    return results.flatMap((result) => result.status === "fulfilled" && result.value.title ? [{ id: String(result.sessionId), title: result.value.title.title }] : []);
+  }
   async createNew(signal) {
     this.beginSwitch();
     try {
@@ -25277,8 +26076,15 @@ var DshCommandRuntimeAdapter = class {
     return () => this.listeners.delete(listener);
   };
   async execute(line, signal) {
+    const agent = this.activeAgent();
+    if (agent === void 0) {
+      return {
+        kind: "error",
+        text: "Start a conversation before using DSH commands."
+      };
+    }
     const execution = await this.commands.execute(
-      this.activeAgent(),
+      agent,
       line,
       [],
       signal
@@ -25299,9 +26105,11 @@ var DshCommandRuntimeAdapter = class {
     this.listeners.clear();
   }
   readSnapshot() {
+    const agent = this.activeAgent();
+    if (agent === void 0) return Object.freeze({ commands: Object.freeze([]) });
     return Object.freeze({
       commands: Object.freeze(
-        this.commands.list(this.activeAgent()).map(
+        this.commands.list(agent).map(
           (command) => Object.freeze({
             name: command.name,
             description: command.description,
@@ -25373,7 +26181,9 @@ var DshToolCatalogRuntime = class {
     this.listeners.clear();
   }
   readSnapshot() {
-    const schemas = this.tools.schemas(this.activeAgent());
+    const agent = this.activeAgent();
+    if (agent === void 0) return Object.freeze({ tools: Object.freeze([]) });
+    const schemas = this.tools.schemas(agent);
     const catalog = schemas.map(projectTool).sort((left, right) => left.name.localeCompare(right.name));
     return Object.freeze({ tools: Object.freeze(catalog) });
   }
@@ -25393,7 +26203,8 @@ var DshPermissionSelectionRuntime = class {
     this.activeAgent = activeAgent;
     this.snapshot = this.readSnapshot(false);
     this.offProjection = projections.onChanged((session, key) => {
-      if (session !== this.activeAgent().session || key !== "permissions") return;
+      const agent = this.activeAgent();
+      if (agent === void 0 || session !== agent.session || key !== "permissions") return;
       this.refresh();
     });
   }
@@ -25444,9 +26255,11 @@ var DshPermissionSelectionRuntime = class {
     this.listeners.clear();
   }
   readSnapshot(busy) {
-    const selection = this.projections.snapshot(
-      this.activeAgent().session
-    ).values.permissions;
+    const agent = this.activeAgent();
+    if (agent === void 0) {
+      return Object.freeze({ available: false, options: Object.freeze([]), busy });
+    }
+    const selection = this.projections.snapshot(agent.session).values.permissions;
     if (!selection) {
       return Object.freeze({ available: false, options: Object.freeze([]), busy });
     }
@@ -25644,6 +26457,211 @@ var DshProviderSetupRuntime = class _DshProviderSetupRuntime {
   }
 };
 
+// src/dsh/subagent-catalog-runtime.ts
+import { SessionId as SessionId3 } from "@deepseek-ai/dsh-session";
+
+// src/dsh/subagent-transcript-runtime.ts
+function cancelled() {
+  return new DOMException("Subagent transcript loading was cancelled.", "AbortError");
+}
+var DshSubagentTranscriptRuntime = class _DshSubagentTranscriptRuntime {
+  constructor(projector, off) {
+    this.projector = projector;
+    this.off = off;
+  }
+  static async create(query, sessionId, presenter, subscribeToSession, signal) {
+    signal?.throwIfAborted();
+    const projector = new DshSessionProjector(
+      String(sessionId),
+      "subagent",
+      presenter
+    );
+    const buffered = [];
+    let replaying = true;
+    const off = subscribeToSession(sessionId, (event) => {
+      if (replaying) buffered.push(event);
+      else projector.project(event);
+    });
+    try {
+      const log = await query.readSession(sessionId);
+      if (signal?.aborted) throw cancelled();
+      projector.replay(log.events);
+      const replayedSeq = log.events.at(-1)?.seq ?? -1;
+      for (const event of buffered) {
+        if (event.seq > replayedSeq) projector.project(event);
+      }
+      replaying = false;
+      return new _DshSubagentTranscriptRuntime(projector, off);
+    } catch (error) {
+      off();
+      throw error;
+    }
+  }
+  disposed = false;
+  getSnapshot = () => this.projector.getSnapshot();
+  subscribe = (listener) => this.projector.subscribe(listener);
+  dispose() {
+    if (this.disposed) return;
+    this.disposed = true;
+    this.off();
+  }
+};
+
+// src/dsh/subagent-catalog-runtime.ts
+function fallbackLabel(id) {
+  return `Agent ${String(id).slice(-8)}`;
+}
+function projectEntry(entry) {
+  if (entry.kind === "diagnostic") {
+    return Object.freeze({
+      kind: "diagnostic",
+      id: String(entry.id),
+      parentId: String(entry.parentId),
+      depth: entry.depth,
+      reason: entry.reason
+    });
+  }
+  return Object.freeze({
+    kind: "agent",
+    id: String(entry.id),
+    parentId: String(entry.parentId),
+    depth: entry.depth,
+    label: entry.label?.trim() || fallbackLabel(entry.id),
+    mode: entry.mode,
+    activity: entry.activity,
+    hasChildren: entry.hasChildren
+  });
+}
+function isAbort(error, signal) {
+  return signal?.aborted === true || error instanceof Error && error.name === "AbortError";
+}
+var DshSubagentCatalogRuntime = class {
+  constructor(subagents, rootSessionId, subscribeToChanges, query, presenter, subscribeToSession) {
+    this.subagents = subagents;
+    this.rootSessionId = rootSessionId;
+    this.query = query;
+    this.presenter = presenter;
+    this.subscribeToSession = subscribeToSession;
+    this.snapshot = Object.freeze({
+      rootSessionId: String(rootSessionId() ?? ""),
+      status: "idle",
+      items: Object.freeze([]),
+      runningCount: 0
+    });
+    this.off = subscribeToChanges(() => this.queueRefresh());
+    this.queueRefresh();
+  }
+  listeners = /* @__PURE__ */ new Set();
+  snapshot;
+  off;
+  generation = 0;
+  refreshQueued = false;
+  disposed = false;
+  refreshController;
+  getSnapshot = () => this.snapshot;
+  subscribe = (listener) => {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  };
+  async openTranscript(sessionId, signal) {
+    const item = this.snapshot.items.find(
+      (candidate) => candidate.id === sessionId && candidate.kind === "agent"
+    );
+    if (item === void 0) {
+      throw new Error("The selected subagent is no longer available.");
+    }
+    return DshSubagentTranscriptRuntime.create(
+      this.query,
+      SessionId3(sessionId),
+      this.presenter,
+      this.subscribeToSession,
+      signal
+    );
+  }
+  async refresh(signal) {
+    if (this.disposed || signal?.aborted) return;
+    this.refreshController?.abort();
+    const controller = new AbortController();
+    this.refreshController = controller;
+    const refreshSignal = signal === void 0 ? controller.signal : AbortSignal.any([signal, controller.signal]);
+    const generation = ++this.generation;
+    const rootSessionId = this.rootSessionId();
+    if (rootSessionId === void 0) {
+      this.publish({
+        rootSessionId: "",
+        status: "idle",
+        items: Object.freeze([]),
+        runningCount: 0
+      });
+      return;
+    }
+    this.publish({
+      ...this.snapshot,
+      rootSessionId: String(rootSessionId),
+      status: "loading",
+      error: void 0
+    });
+    try {
+      const entries = await this.subagents.listDescendants(rootSessionId, refreshSignal);
+      if (this.disposed || refreshSignal.aborted || generation !== this.generation) return;
+      const items = Object.freeze(entries.map(projectEntry));
+      this.publish({
+        rootSessionId: String(rootSessionId),
+        status: "ready",
+        items,
+        runningCount: items.filter(
+          (item) => item.kind === "agent" && item.activity === "running"
+        ).length
+      });
+    } catch (error) {
+      if (this.disposed || generation !== this.generation || isAbort(error, refreshSignal)) return;
+      debugLogger.debug(`Unable to list DSH subagents: ${String(error)}`);
+      this.publish({
+        ...this.snapshot,
+        rootSessionId: String(rootSessionId),
+        status: "error",
+        error: "Unable to load the Agent catalog."
+      });
+    } finally {
+      if (this.refreshController === controller) this.refreshController = void 0;
+    }
+  }
+  activeAgentChanged() {
+    this.refreshController?.abort();
+    this.refreshController = void 0;
+    this.generation += 1;
+    this.publish({
+      rootSessionId: String(this.rootSessionId() ?? ""),
+      status: "idle",
+      items: Object.freeze([]),
+      runningCount: 0
+    });
+    this.queueRefresh();
+  }
+  dispose() {
+    if (this.disposed) return;
+    this.disposed = true;
+    this.refreshController?.abort();
+    this.refreshController = void 0;
+    this.generation += 1;
+    this.off();
+    this.listeners.clear();
+  }
+  queueRefresh() {
+    if (this.disposed || this.refreshQueued) return;
+    this.refreshQueued = true;
+    queueMicrotask(() => {
+      this.refreshQueued = false;
+      if (this.disposed) return;
+      void this.refresh();
+    });
+  }
+  publish(snapshot) {
+    this.snapshot = Object.freeze(snapshot);
+    for (const listener of this.listeners) listener();
+  }
+};
+
 // src/dsh/index.ts
 var name = "dsh-console-runner";
 var inject = [
@@ -25659,11 +26677,13 @@ var inject = [
   "commands",
   "sessionProjections",
   "credentials",
-  "settings"
+  "settings",
+  "subagents"
 ];
 var Config2 = z2.object({
   prompt: z2.string(),
-  debug: z2.boolean().default(false)
+  debug: z2.boolean().default(false),
+  pokemon: z2.number()
 });
 var CLEANUP_TIMEOUT_MS = 1500;
 var FORCE_EXIT_TIMEOUT_MS = 2500;
@@ -25686,6 +26706,7 @@ async function start(ctx, config) {
   const appExit = ctx.get("appExit");
   const credentials = ctx.get("credentials");
   const settings = ctx.get("settings");
+  const subagents = ctx.get("subagents");
   if (!attachments)
     throw new Error("dsh-console requires the DSH attachment service");
   if (!sessionQuery)
@@ -25702,10 +26723,14 @@ async function start(ctx, config) {
     throw new Error("dsh-console requires the DSH credentials service");
   if (!settings)
     throw new Error("dsh-console requires the DSH settings service");
+  if (!subagents)
+    throw new Error("dsh-console requires the DSH subagent service");
   if (!agents || !defaultModel || !sessions || !tools || !llm || !appExit)
     return;
   const selection = defaultModel.currentSelection();
   let activeSelection = selection;
+  let sideSelection;
+  const workspaceRef = {};
   const runtimeListeners = /* @__PURE__ */ new Set();
   const notifyRuntime = () => {
     for (const listener of runtimeListeners) listener();
@@ -25715,7 +26740,7 @@ async function start(ctx, config) {
       createAgent: (options) => agents.create(options),
       onSessionEvent: (listener) => ctx.on("session/event", listener)
     },
-    () => activeSelection
+    () => workspaceRef.current?.getWorkspaceSnapshot().activeSurface === "side" ? sideSelection ?? activeSelection : activeSelection
   );
   const promptInputRuntime = new WorkspacePromptInputRuntime();
   const attachmentInput = new DshAttachmentInputAdapter(attachments);
@@ -25737,10 +26762,16 @@ async function start(ctx, config) {
         assembled: void 0
       };
       installModelSelection2(agentCtx, ref);
+      if (options.restrictTools) agentCtx.tools.restrict({ allow: [] });
     };
     const handle = options.resumeSessionId === void 0 ? await agents.create({
-      sessionId: SessionId3(`dsh-console-${randomUUID3()}`),
-      meta: { cwd: process.cwd() },
+      sessionId: options.sessionId ?? SessionId4(`dsh-console-${randomUUID3()}`),
+      meta: {
+        cwd: process.cwd(),
+        ...options.parentSession === void 0 ? {} : { parentSession: options.parentSession },
+        ...options.seed === void 0 ? {} : { seedLength: options.seed.length }
+      },
+      ...options.seed === void 0 ? {} : { seed: options.seed },
       agentOptions,
       setup,
       ...options.signal === void 0 ? {} : { signal: options.signal }
@@ -25774,8 +26805,15 @@ async function start(ctx, config) {
           }
         }
       );
-      const offProjector = projector.subscribe(notifyRuntime);
-      return { handle, projector, offSession, offProjector };
+      const offProjector = options.publishRuntimeEvents === false ? () => {
+      } : projector.subscribe(notifyRuntime);
+      return {
+        kind: "materialized",
+        handle,
+        projector,
+        offSession,
+        offProjector
+      };
     } catch (error) {
       offSession?.();
       try {
@@ -25788,7 +26826,29 @@ async function start(ctx, config) {
       throw error;
     }
   };
-  let active = await createActiveConversation(selection);
+  const createPendingConversation = async (selected, signal) => {
+    const modelInfo = await llm.resolveModelInfo(
+      selected.provider,
+      selected.model,
+      signal
+    );
+    signal?.throwIfAborted();
+    const projector = new DshSessionProjector(
+      `dsh-console-pending-${randomUUID3()}`,
+      String(selected.model),
+      new DshToolPresentationAdapter(tools),
+      modelInfo.context?.contextWindow
+    );
+    return {
+      kind: "pending",
+      projector,
+      offProjector: projector.subscribe(notifyRuntime)
+    };
+  };
+  let active = await createPendingConversation(selection);
+  let visibleSideAgent;
+  const mainAgent = () => active.kind === "materialized" ? active.handle.agent : void 0;
+  const currentInteractiveAgent = () => workspaceRef.current?.getWorkspaceSnapshot().activeSurface === "side" && visibleSideAgent ? visibleSideAgent : mainAgent();
   const providerSetupRuntime = await DshProviderSetupRuntime.create(
     credentials,
     settings,
@@ -25797,27 +26857,48 @@ async function start(ctx, config) {
   );
   const approvalRuntime = new DshApprovalRuntime(
     (listener) => ctx.on("approval/request", listener),
-    (agent) => agent === active.handle.agent
+    (agent) => agent === mainAgent()
   );
   const userQuestionRuntime = new DshUserQuestionRuntime(
     userQuestions,
-    (agent) => agent === active.handle.agent
+    (agent) => agent === mainAgent()
   );
   const commandRuntime = new DshCommandRuntimeAdapter(
     commands,
-    () => active.handle.agent,
+    currentInteractiveAgent,
     (listener) => ctx.on("commands/change", listener)
   );
   const permissionSelectionRuntime = new DshPermissionSelectionRuntime(
     sessionProjections,
     commandRuntime,
-    () => active.handle.agent
+    currentInteractiveAgent
   );
   const toolCatalogRuntime = new DshToolCatalogRuntime(
     tools,
-    () => active.handle.agent,
+    currentInteractiveAgent,
     (listener) => ctx.on("tools/change", listener)
   );
+  const subagentCatalogRuntime = new DshSubagentCatalogRuntime(
+    subagents,
+    () => mainAgent()?.session.id,
+    (listener) => {
+      const offStart = ctx.on("subagent/start", () => listener());
+      const offEnd = ctx.on("subagent/end", () => listener());
+      const offDescriptor = ctx.on("session/event", (_session, event) => {
+        if (event.type === "subagent/descriptor") listener();
+      });
+      return () => {
+        offStart();
+        offEnd();
+        offDescriptor();
+      };
+    },
+    sessionQuery,
+    new DshToolPresentationAdapter(tools),
+    (sessionId, listener) => ctx.on("session/event", (session, event) => {
+      if (session.id === sessionId) listener(event);
+    })
+  );
   let switchingConversation = false;
   const isConversationBusy = () => switchingConversation || active.projector.getSnapshot().busy || approvalRuntime.getSnapshot().pending.length > 0 || userQuestionRuntime.getSnapshot().pending.length > 0 || permissionSelectionRuntime.getSnapshot().busy;
   const switchActiveConversation = async (selected, options = {}) => {
@@ -25831,39 +26912,46 @@ async function start(ctx, config) {
     }
     switchingConversation = true;
     try {
-      const next = await createActiveConversation(selected, options);
+      const next = options.resumeSessionId === void 0 ? await createPendingConversation(selected, options.signal) : await createActiveConversation(selected, options);
       const previous = active;
-      try {
-        const flushed = await sessions.flush(previous.handle.agent.session);
-        if (!flushed)
-          throw new Error("DSH Session persistence is unavailable.");
-      } catch (error) {
-        next.offSession();
-        next.offProjector();
+      if (previous.kind === "materialized") {
         try {
-          await next.handle.dispose();
-        } catch (disposeError) {
-          debugLogger.debug(
-            `Unable to dispose an uncommitted DSH Agent candidate: ${String(disposeError)}`
-          );
+          const flushed = await sessions.flush(previous.handle.agent.session);
+          if (!flushed)
+            throw new Error("DSH Session persistence is unavailable.");
+        } catch (error) {
+          next.offProjector();
+          if (next.kind === "materialized") {
+            next.offSession();
+            try {
+              await next.handle.dispose();
+            } catch (disposeError) {
+              debugLogger.debug(
+                `Unable to dispose an uncommitted DSH Agent candidate: ${String(disposeError)}`
+              );
+            }
+          }
+          throw error;
         }
-        throw error;
       }
-      previous.offSession();
       previous.offProjector();
+      if (previous.kind === "materialized") previous.offSession();
       active = next;
       activeSelection = selected;
       await providerSetupRuntime.refreshCurrent();
       commandRuntime.activeAgentChanged();
       permissionSelectionRuntime.activeAgentChanged();
       toolCatalogRuntime.activeAgentChanged();
+      subagentCatalogRuntime.activeAgentChanged();
       notifyRuntime();
-      try {
-        await previous.handle.dispose();
-      } catch (error) {
-        debugLogger.debug(
-          `Unable to dispose the previous DSH Agent: ${String(error)}`
-        );
+      if (previous.kind === "materialized") {
+        try {
+          await previous.handle.dispose();
+        } catch (error) {
+          debugLogger.debug(
+            `Unable to dispose the previous DSH Agent: ${String(error)}`
+          );
+        }
       }
     } finally {
       switchingConversation = false;
@@ -25879,19 +26967,19 @@ async function start(ctx, config) {
     sessionQuery,
     llm,
     process.cwd(),
-    String(active.handle.agent.session.id),
+    active.projector.getSessionStats().sessionId,
     {
       currentSelection: () => modelSelectionRuntime.getSnapshot().current,
       createFresh: async (selected, signal) => {
         await switchActiveConversation(selected, { signal });
-        return String(active.handle.agent.session.id);
+        return active.projector.getSessionStats().sessionId;
       },
       resume: async (sessionId, selected, signal) => {
         await switchActiveConversation(selected, {
           resumeSessionId: sessionId,
           signal
         });
-        return String(active.handle.agent.session.id);
+        return active.projector.getSessionStats().sessionId;
       },
       adoptCurrentModel: (selected) => modelSelectionRuntime.adoptCurrent(selected),
       hasConversation: () => active.projector.getSnapshot().messages.length > 0,
@@ -25900,37 +26988,74 @@ async function start(ctx, config) {
   );
   let disposed = false;
   let exiting = false;
+  let offWorkspaceSurface = () => {
+  };
   const cleanup = async () => {
     if (disposed) return;
     disposed = true;
-    active.offSession();
+    offWorkspaceSurface();
     active.offProjector();
+    if (active.kind === "materialized") active.offSession();
     await Promise.all([
-      active.handle.dispose(),
+      active.kind === "materialized" ? active.handle.dispose() : Promise.resolve(),
       promptCompletionRuntime.dispose(),
+      workspaceRef.current?.dispose(),
       promptInputRuntime.dispose(),
       Promise.resolve(approvalRuntime.dispose()),
       Promise.resolve(userQuestionRuntime.dispose()),
       Promise.resolve(commandRuntime.dispose()),
       Promise.resolve(permissionSelectionRuntime.dispose()),
-      Promise.resolve(toolCatalogRuntime.dispose())
+      Promise.resolve(toolCatalogRuntime.dispose()),
+      Promise.resolve(subagentCatalogRuntime.dispose())
     ]);
   };
-  const submit = async ({
-    content,
-    displayContent,
-    signal
-  }) => {
-    const conversation = active;
-    if (conversation.projector.getSnapshot().busy) return;
+  const materializeActiveConversation = async (signal) => {
+    if (active.kind === "materialized") return active;
+    if (switchingConversation) {
+      throw new Error("Another Agent change is already in progress.");
+    }
+    switchingConversation = true;
+    const previous = active;
+    let next;
+    try {
+      next = await createActiveConversation(activeSelection, { signal });
+      signal.throwIfAborted();
+      previous.offProjector();
+      active = next;
+      commandRuntime.activeAgentChanged();
+      permissionSelectionRuntime.activeAgentChanged();
+      toolCatalogRuntime.activeAgentChanged();
+      subagentCatalogRuntime.activeAgentChanged();
+      notifyRuntime();
+      return next;
+    } catch (error) {
+      if (next !== void 0 && active !== next) {
+        next.offSession();
+        next.offProjector();
+        await next.handle.dispose().catch((disposeError) => {
+          debugLogger.debug(
+            `Unable to dispose an aborted DSH Agent candidate: ${String(disposeError)}`
+          );
+        });
+      }
+      throw error;
+    } finally {
+      switchingConversation = false;
+    }
+  };
+  const prepareSubmission = async ({ content, displayContent, signal }, allowImages) => {
     if (content.some((part) => part.type === "image-source")) {
+      if (!allowImages) {
+        throw new Error(
+          "Side conversations currently support text input only."
+        );
+      }
       await modelSelectionRuntime.assertCurrentSupportsImages(signal);
     }
-    const ingested = await attachmentInput.ingest(
-      content,
-      displayContent,
-      signal
-    );
+    return attachmentInput.ingest(content, displayContent, signal);
+  };
+  const submitToConversation = async (conversation, ingested, signal) => {
+    if (conversation.projector.getSnapshot().busy) return;
     signal.throwIfAborted();
     conversation.projector.addUser(
       projectDshContent(ingested.content),
@@ -25970,23 +27095,114 @@ async function start(ctx, config) {
     });
     void Promise.race([runExitCleanup(), cleanupTimeout]).then(cleanup).finally(() => appExit(0));
   };
-  const conversationRuntime = {
+  const mainConversationRuntime = {
     getSnapshot: () => active.projector.getSnapshot(),
     getSessionStats: () => active.projector.getSessionStats(),
     subscribe: (listener) => {
       runtimeListeners.add(listener);
       return () => runtimeListeners.delete(listener);
     },
-    submit,
+    submit: async (submission) => {
+      const ingested = await prepareSubmission(submission, true);
+      const conversation = await materializeActiveConversation(submission.signal);
+      await submitToConversation(conversation, ingested, submission.signal);
+    },
     cancel: () => {
-      active.handle.agent.cancel({ kind: "user" });
-      active.projector.cancel();
+      if (active.kind === "materialized") {
+        active.handle.agent.cancel({ kind: "user" });
+        active.projector.cancel();
+      }
     },
     exit
   };
+  const conversationWorkspace = new ConversationWorkspaceRuntime(
+    mainConversationRuntime,
+    async (signal) => {
+      if (active.kind !== "materialized") {
+        throw new Error("Start the main conversation before opening a Side conversation.");
+      }
+      const parent = active.handle.agent;
+      const parentEvents = parent.session.events;
+      const seed = completedTurnSeed(parentEvents);
+      const pendingRequest = pendingUserText(parentEvents, seed.length);
+      const selected = activeSelection;
+      const selectedView = modelSelectionRuntime.getSnapshot().current;
+      const side = await createActiveConversation(selected, {
+        signal,
+        sessionId: SessionId4(`${SIDE_SESSION_PREFIX}${randomUUID3()}`),
+        parentSession: parent.session.id,
+        seed,
+        restrictTools: true,
+        publishRuntimeEvents: false
+      });
+      sideSelection = selected;
+      visibleSideAgent = side.handle.agent;
+      let firstSubmission = true;
+      let sideDisposed = false;
+      const handle = {
+        parentSessionId: String(parent.session.id),
+        modelLabel: modelSelectionLabel(selectedView),
+        ...modelReasoningEffortLabel(selectedView) === void 0 ? {} : {
+          reasoningEffortLabel: modelReasoningEffortLabel(selectedView)
+        },
+        getSnapshot: side.projector.getSnapshot,
+        getSessionStats: side.projector.getSessionStats,
+        subscribe: side.projector.subscribe,
+        submit: async (submission) => {
+          let prefixedFirstText = false;
+          const prepared = firstSubmission ? {
+            ...submission,
+            content: submission.content.map((part) => {
+              if (prefixedFirstText || part.type !== "text") return part;
+              prefixedFirstText = true;
+              return {
+                ...part,
+                text: firstSidePrompt(part.text, pendingRequest)
+              };
+            })
+          } : submission;
+          const ingested = await prepareSubmission(prepared, false);
+          await submitToConversation(side, ingested, prepared.signal);
+          firstSubmission = false;
+        },
+        cancel: () => {
+          side.handle.agent.cancel({ kind: "user" });
+          side.projector.cancel();
+        },
+        exit: () => {
+        },
+        dispose: async () => {
+          if (sideDisposed) return;
+          sideDisposed = true;
+          if (side.projector.getSnapshot().busy) {
+            side.handle.agent.cancel({ kind: "user" });
+            await side.handle.agent.whenIdle();
+          }
+          await sessions.flush(side.handle.agent.session).catch((error) => {
+            debugLogger.debug(
+              `Unable to flush Side Session: ${String(error)}`
+            );
+          });
+          side.offSession();
+          side.offProjector();
+          await side.handle.dispose();
+          if (visibleSideAgent === side.handle.agent)
+            visibleSideAgent = void 0;
+          if (sideSelection === selected) sideSelection = void 0;
+        }
+      };
+      return handle;
+    }
+  );
+  workspaceRef.current = conversationWorkspace;
+  offWorkspaceSurface = conversationWorkspace.subscribeSurface(() => {
+    commandRuntime.activeAgentChanged();
+    permissionSelectionRuntime.activeAgentChanged();
+    toolCatalogRuntime.activeAgentChanged();
+  });
   ctx.effect(() => cleanup, "dsh-console: terminal");
   await main({
-    conversationRuntime,
+    conversationRuntime: conversationWorkspace,
     promptCompletionRuntime,
     promptInputRuntime,
     modelSelectionRuntime,
@@ -25997,8 +27213,13 @@ async function start(ctx, config) {
     commandRuntime,
     permissionSelectionRuntime,
     toolCatalogRuntime,
+    subagentCatalogRuntime,
+    sideConversationRuntime: conversationWorkspace,
     initialPrompt: config.prompt?.trim(),
-    argv: config.debug ? ["--debug"] : []
+    argv: [
+      ...config.debug ? ["--debug"] : [],
+      ...config.pokemon === void 0 ? [] : ["--pokemon", String(config.pokemon)]
+    ]
   });
 }
 function apply(ctx, config) {