@cofy-x/dsh-console 0.1.0-alpha.13 → 0.1.0-alpha.14

package/dist/{chunk-QOXF5JRJ.js → chunk-B4XSNHMA.js}

@@ -67,7 +67,7 @@ import {
   unescapePath,
   writeToStderr,
   writeToStdout
-} from "./chunk-3WB6AZUB.js";
+} from "./chunk-GNENCGXA.js";
 
 // src/dsh/index.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
@@ -2377,7 +2377,7 @@ function setWindowTitle(title, settings) {
     const windowTitle = computeTerminalTitle({
       streamingState: "idle" /* Idle */,
       isConfirming: false,
-      isSilentWorking: false,
+      isSilentWorking: true,
       folderName: title,
       useDynamicTitle: settings.merged.ui.dynamicWindowTitle
     });
@@ -2437,13 +2437,13 @@ function computeTerminalTitle({
 
 // src/ui/app-container.tsx
 import {
-  useMemo as useMemo40,
-  useState as useState56,
-  useCallback as useCallback50,
-  useEffect as useEffect55,
+  useMemo as useMemo42,
+  useState as useState59,
+  useCallback as useCallback51,
+  useEffect as useEffect56,
   useRef as useRef34,
   useLayoutEffect as useLayoutEffect5,
-  useSyncExternalStore as useSyncExternalStore6
+  useSyncExternalStore as useSyncExternalStore8
 } from "react";
 import { measureElement as measureElement3, useApp } from "ink";
 
@@ -4195,7 +4195,7 @@ var ErrorMessage = ({ text }) => {
 };
 
 // src/ui/components/messages/tool-group-message.tsx
-import { useCallback as useCallback7, useMemo as useMemo5, useState as useState7 } from "react";
+import { useCallback as useCallback7, useMemo as useMemo5, useState as useState8 } from "react";
 import { Box as Box19, Text as Text19 } from "ink";
 
 // src/ui/components/messages/tool-message.tsx
@@ -5182,7 +5182,8 @@ import {
   useCallback as useCallback5,
   useContext as useContext6,
   useEffect as useEffect8,
-  useRef as useRef4
+  useRef as useRef4,
+  useState as useState7
 } from "react";
 
 // src/ui/hooks/terminal/use-focus.ts
@@ -5193,7 +5194,7 @@ var DISABLE_FOCUS_REPORTING = "\x1B[?1004l";
 var FOCUS_IN = "\x1B[I";
 var FOCUS_OUT = "\x1B[O";
 var useFocus = () => {
-  const { stdin } = useStdin();
+  const { internal_eventEmitter } = useStdin();
   const { stdout } = useStdout();
   const [isFocused, setIsFocused] = useState6(true);
   useEffect7(() => {
@@ -5208,12 +5209,12 @@ var useFocus = () => {
       }
     };
     stdout?.write(ENABLE_FOCUS_REPORTING);
-    stdin?.on("data", handleData);
+    internal_eventEmitter.on("input", handleData);
     return () => {
       stdout?.write(DISABLE_FOCUS_REPORTING);
-      stdin?.removeListener("data", handleData);
+      internal_eventEmitter.removeListener("input", handleData);
     };
-  }, [stdin, stdout]);
+  }, [internal_eventEmitter, stdout]);
   useKeypress(
     (_) => {
       if (!isFocused) {
@@ -5712,7 +5713,9 @@ function KeypressProvider({
   config,
   debugKeystrokeLogging
 }) {
-  const { stdin, setRawMode } = useStdin2();
+  const { stdin, setRawMode, internal_eventEmitter } = useStdin2();
+  const [isStdinReady, setIsStdinReady] = useState7(false);
+  const [inputSubscriberCount, setInputSubscriberCount] = useState7(0);
   const subscribers = useRef4(/* @__PURE__ */ new Set()).current;
   const subscribe = useCallback5(
     (handler) => subscribers.add(handler),
@@ -5722,6 +5725,12 @@ function KeypressProvider({
     (handler) => subscribers.delete(handler),
     [subscribers]
   );
+  const registerInputSubscriber = useCallback5(() => {
+    setInputSubscriberCount((count) => count + 1);
+    return () => {
+      setInputSubscriberCount((count) => Math.max(0, count - 1));
+    };
+  }, []);
   const broadcast = useCallback5(
     (key) => {
       if (debugKeystrokeLogging) {
@@ -5737,11 +5746,7 @@ function KeypressProvider({
     [debugKeystrokeLogging, subscribers]
   );
   useEffect8(() => {
-    const wasRaw = stdin.isRaw;
-    if (wasRaw === false) {
-      setRawMode(true);
-    }
-    process.stdin.setEncoding("utf8");
+    setRawMode(true);
     let processor = nonKeyboardEventFilter(broadcast);
     if (!terminalCapabilityManager.isKittyProtocolEnabled()) {
       processor = bufferFastReturn(processor);
@@ -5760,35 +5765,56 @@ function KeypressProvider({
         forward(data);
       };
     }
-    stdin.on("data", dataListener);
+    internal_eventEmitter.on("input", dataListener);
+    setIsStdinReady(true);
     return () => {
-      stdin.removeListener("data", dataListener);
-      if (wasRaw === false) {
-        setRawMode(false);
-      }
+      setIsStdinReady(false);
+      internal_eventEmitter.removeListener("input", dataListener);
+      setRawMode(false);
     };
   }, [
     stdin,
     setRawMode,
+    internal_eventEmitter,
     config,
     debugKeystrokeLogging,
     broadcast
   ]);
-  return /* @__PURE__ */ jsx23(KeypressContext.Provider, { value: { subscribe, unsubscribe }, children });
+  return /* @__PURE__ */ jsx23(
+    KeypressContext.Provider,
+    {
+      value: {
+        isReady: isStdinReady && inputSubscriberCount > 0,
+        registerInputSubscriber,
+        subscribe,
+        unsubscribe
+      },
+      children
+    }
+  );
 }
 
 // src/ui/hooks/input/use-keypress.ts
-function useKeypress(onKeypress, { isActive }) {
-  const { subscribe, unsubscribe } = useKeypressContext();
+function useKeypress(onKeypress, { isActive, isInput = false }) {
+  const { registerInputSubscriber, subscribe, unsubscribe } = useKeypressContext();
   useEffect9(() => {
     if (!isActive) {
       return;
     }
     subscribe(onKeypress);
+    const unregisterInputSubscriber = isInput ? registerInputSubscriber() : void 0;
     return () => {
       unsubscribe(onKeypress);
+      unregisterInputSubscriber?.();
     };
-  }, [isActive, onKeypress, subscribe, unsubscribe]);
+  }, [
+    isActive,
+    isInput,
+    onKeypress,
+    registerInputSubscriber,
+    subscribe,
+    unsubscribe
+  ]);
 }
 
 // src/terminal/keys.ts
@@ -6217,7 +6243,7 @@ var ToolGroupMessage = ({
   );
   const config = useConfig();
   const visibleToolCalls = useMemo5(() => toolCalls.filter((t) => t.status !== "Pending" /* Pending */), [toolCalls]);
-  const [expandedCallIds, setExpandedCallIds] = useState7(
+  const [expandedCallIds, setExpandedCallIds] = useState8(
     () => /* @__PURE__ */ new Set()
   );
   const resultWidth = Math.max(1, terminalWidth - 4);
@@ -6402,7 +6428,7 @@ import { Box as Box25 } from "ink";
 import { Box as Box21, Text as Text21 } from "ink";
 
 // src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "d287de5";
+var GIT_COMMIT_INFO = "2d435aa";
 
 // src/ui/components/dialogs/about-box.tsx
 import { jsx as jsx28, jsxs as jsxs21 } from "react/jsx-runtime";
@@ -6474,7 +6500,7 @@ import {
   useContext as useContext8,
   useEffect as useEffect10,
   useMemo as useMemo6,
-  useState as useState8
+  useState as useState9
 } from "react";
 import { jsx as jsx30 } from "react/jsx-runtime";
 var SessionStatsContext = createContext7(
@@ -6482,7 +6508,7 @@ var SessionStatsContext = createContext7(
 );
 var SessionStatsProvider = ({ children, conversationRuntime }) => {
   const initial = conversationRuntime.getSessionStats();
-  const [stats, setStats] = useState8({
+  const [stats, setStats] = useState9({
     ...initial,
     sessionStartTime: /* @__PURE__ */ new Date(),
     promptCount: 0
@@ -6587,9 +6613,9 @@ var computeSessionStats = (metrics) => {
 };
 
 // src/ui/hooks/terminal/use-terminal-size.ts
-import { useEffect as useEffect11, useState as useState9 } from "react";
+import { useEffect as useEffect11, useState as useState10 } from "react";
 function useTerminalSize() {
-  const [size, setSize] = useState9({
+  const [size, setSize] = useState10({
     columns: process.stdout.columns || 60,
     rows: process.stdout.rows || 20
   });
@@ -7044,7 +7070,7 @@ import { Box as Box66 } from "ink";
 
 // src/ui/components/indicators/notifications.tsx
 import { Box as Box27, Text as Text26, useIsScreenReaderEnabled as useIsScreenReaderEnabled3 } from "ink";
-import { useEffect as useEffect12, useState as useState10 } from "react";
+import { useEffect as useEffect12, useState as useState11 } from "react";
 
 // src/ui/contexts/app-context.tsx
 import { createContext as createContext8, useContext as useContext9 } from "react";
@@ -7127,7 +7153,7 @@ var Notifications = () => {
   const isScreenReaderEnabled = useIsScreenReaderEnabled3();
   const showStartupWarnings = startupWarnings.length > 0;
   const showInitError = initError && streamingState !== "responding" /* Responding */;
-  const [hasSeenScreenReaderNudge] = useState10(
+  const [hasSeenScreenReaderNudge] = useState11(
     () => persistentState.get("hasSeenScreenReaderNudge") ?? false
   );
   const showScreenReaderNudge = isScreenReaderEnabled && hasSeenScreenReaderNudge === false;
@@ -7215,7 +7241,7 @@ var compactDshLogo = `\u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2
 var tinyDshLogo = "DSH CONSOLE";
 
 // src/ui/hooks/visual/use-snow-fall.ts
-import { useState as useState11, useEffect as useEffect13, useMemo as useMemo8 } from "react";
+import { useState as useState12, useEffect as useEffect13, useMemo as useMemo8 } from "react";
 var SNOW_CHARS = ["*", ".", "\xB7", "+"];
 var FRAME_RATE = 150;
 var addHolidayTrees = (art) => {
@@ -7257,7 +7283,7 @@ var useSnowfall = (displayTitle, terminalWidth) => {
   );
   const displayTitleWidth = getAsciiArtWidth(displayTitle);
   const containsAnsi = displayTitle.includes("\x1B");
-  const [showSnow, setShowSnow] = useState11(true);
+  const [showSnow, setShowSnow] = useState12(true);
   useEffect13(() => {
     setShowSnow(true);
     const timer = setTimeout(() => {
@@ -7272,7 +7298,7 @@ var useSnowfall = (displayTitle, terminalWidth) => {
     }
     return displayTitle;
   }, [displayTitle, showAnimation]);
-  const [snowflakes, setSnowflakes] = useState11([]);
+  const [snowflakes, setSnowflakes] = useState12([]);
   const lines = displayArt.split("\n");
   const height = lines.length;
   const width = getAsciiArtWidth(displayArt);
@@ -7324,13 +7350,13 @@ import { useRef as useRef6 } from "react";
 
 // src/ui/hooks/use-mouse-hover.ts
 import { getBoundingBox as getBoundingBox2 } from "ink";
-import { useCallback as useCallback9, useLayoutEffect as useLayoutEffect3, useRef as useRef5, useState as useState12 } from "react";
+import { useCallback as useCallback9, useLayoutEffect as useLayoutEffect3, useRef as useRef5, useState as useState13 } from "react";
 function useMouseHover(ref, {
   isActive = true,
   priority = MOUSE_EVENT_PRIORITY.interactive,
   onHoverChange
 } = {}) {
-  const [hovered, setHovered] = useState12(false);
+  const [hovered, setHovered] = useState13(false);
   const hoveredRef = useRef5(false);
   const onHoverChangeRef = useRef5(onHoverChange);
   onHoverChangeRef.current = onHoverChange;
@@ -7442,7 +7468,7 @@ var VerticalHeader = ({
 };
 
 // src/ui/components/layout/horizontal-header.tsx
-import { useCallback as useCallback10, useMemo as useMemo9, useState as useState13 } from "react";
+import { useCallback as useCallback10, useMemo as useMemo9, useState as useState14 } from "react";
 import { Box as Box32, Text as Text30 } from "ink";
 
 // src/ui/components/layout/resources/quotes.ts
@@ -7592,7 +7618,7 @@ var HorizontalHeader = ({
     () => Math.floor(Math.random() * QUOTES.length),
     []
   );
-  const [quoteRevision, setQuoteRevision] = useState13(0);
+  const [quoteRevision, setQuoteRevision] = useState14(0);
   const randomQuote = QUOTES[(initialQuoteIndex + quoteRevision) % QUOTES.length];
   const handleShufflePokemon = useCallback10(() => {
     setQuoteRevision((revision) => revision + 1);
@@ -7761,7 +7787,7 @@ var Header = ({
 };
 
 // src/ui/components/layout/app-header.tsx
-import { useCallback as useCallback11, useEffect as useEffect14, useMemo as useMemo11, useRef as useRef7, useState as useState14 } from "react";
+import { useCallback as useCallback11, useEffect as useEffect14, useMemo as useMemo11, useRef as useRef7, useState as useState15 } from "react";
 import { jsx as jsx45 } from "react/jsx-runtime";
 var AppHeader = ({
   version,
@@ -7775,7 +7801,7 @@ var AppHeader = ({
   const artResourcesPath = settings.merged.ui.header.artResourcesPath;
   const customAsciiArtPath = settings.merged.ui.header.customAsciiArtPath;
   const pokemonNumber = config.getPokemonNumber();
-  const [artRevision, setArtRevision] = useState14(0);
+  const [artRevision, setArtRevision] = useState15(0);
   const previousHeaderArtIdRef = useRef7(void 0);
   const customAsciiArt = useMemo11(() => {
     if (pokemonNumber === void 0 && customAsciiArtPath) {
@@ -7829,7 +7855,7 @@ var AppHeader = ({
 
 // src/ui/components/shared/virtualized-list.tsx
 import {
-  useState as useState15,
+  useState as useState16,
   useRef as useRef9,
   useLayoutEffect as useLayoutEffect4,
   forwardRef,
@@ -7883,7 +7909,7 @@ function VirtualizedList(props, ref) {
   useEffect16(() => {
     dataRef.current = data;
   }, [data]);
-  const [scrollAnchor, setScrollAnchor] = useState15(() => {
+  const [scrollAnchor, setScrollAnchor] = useState16(() => {
     const scrollToEnd = initialScrollIndex === SCROLL_TO_ITEM_END || typeof initialScrollIndex === "number" && initialScrollIndex >= data.length - 1 && initialScrollOffsetInIndex === SCROLL_TO_ITEM_END;
     if (scrollToEnd) {
       return {
@@ -7899,14 +7925,14 @@ function VirtualizedList(props, ref) {
     }
     return { index: 0, offset: 0 };
   });
-  const [isStickingToBottom, setIsStickingToBottom] = useState15(() => {
+  const [isStickingToBottom, setIsStickingToBottom] = useState16(() => {
     const scrollToEnd = initialScrollIndex === SCROLL_TO_ITEM_END || typeof initialScrollIndex === "number" && initialScrollIndex >= data.length - 1 && initialScrollOffsetInIndex === SCROLL_TO_ITEM_END;
     return scrollToEnd;
   });
   const containerRef = useRef9(null);
-  const [containerHeight, setContainerHeight] = useState15(0);
+  const [containerHeight, setContainerHeight] = useState16(0);
   const itemRefs = useRef9([]);
-  const [heights, setHeights] = useState15([]);
+  const [heights, setHeights] = useState16([]);
   const isInitialScrollSet = useRef9(false);
   const { totalHeight, offsets } = useMemo12(() => {
     const offsets2 = [0];
@@ -8224,7 +8250,7 @@ import {
   useEffect as useEffect18,
   useMemo as useMemo13,
   useRef as useRef10,
-  useState as useState16
+  useState as useState17
 } from "react";
 import { getBoundingBox as getBoundingBox3 } from "ink";
 
@@ -8271,7 +8297,7 @@ var findScrollableCandidates = (mouseEvent, scrollables) => {
 var ScrollProvider = ({
   children
 }) => {
-  const [scrollables, setScrollables] = useState16(
+  const [scrollables, setScrollables] = useState17(
     /* @__PURE__ */ new Map()
   );
   const register = useCallback14((entry) => {
@@ -8474,7 +8500,7 @@ var useScrollable = (entry, isActive) => {
   if (!context) {
     throw new Error("useScrollable must be used within a ScrollProvider");
   }
-  const [id] = useState16(() => `scrollable-${nextId++}`);
+  const [id] = useState17(() => `scrollable-${nextId++}`);
   useEffect18(() => {
     if (isActive) {
       context.register({ ...entry, id });
@@ -8490,9 +8516,9 @@ var useScrollable = (entry, isActive) => {
 import { Box as Box37 } from "ink";
 
 // src/ui/hooks/visual/use-animated-scrollbar.ts
-import { useState as useState17, useEffect as useEffect19, useRef as useRef11, useCallback as useCallback15 } from "react";
+import { useState as useState18, useEffect as useEffect19, useRef as useRef11, useCallback as useCallback15 } from "react";
 function useAnimatedScrollbar(isFocused, scrollBy) {
-  const [scrollbarColor, setScrollbarColor] = useState17(theme.ui.dark);
+  const [scrollbarColor, setScrollbarColor] = useState18(theme.ui.dark);
   const colorRef = useRef11(scrollbarColor);
   colorRef.current = scrollbarColor;
   const animationFrame = useRef11(null);
@@ -9151,7 +9177,7 @@ import "react";
 import { Text as Text33 } from "ink";
 
 // src/ui/components/shared/base-selection-list.tsx
-import { useEffect as useEffect22, useState as useState18 } from "react";
+import { useEffect as useEffect22, useState as useState19 } from "react";
 import { Text as Text32, Box as Box39 } from "ink";
 
 // src/ui/hooks/input/use-selection-list.ts
@@ -9472,7 +9498,7 @@ function BaseSelectionList({
     wrapAround,
     focusKey
   });
-  const [scrollOffset, setScrollOffset] = useState18(0);
+  const [scrollOffset, setScrollOffset] = useState19(0);
   useEffect22(() => {
     const newScrollOffset = Math.max(
       0,
@@ -9639,7 +9665,7 @@ var ConsentPrompt = (props) => {
 };
 
 // src/ui/components/dialogs/theme-dialog.tsx
-import { useCallback as useCallback19, useState as useState19 } from "react";
+import { useCallback as useCallback19, useState as useState20 } from "react";
 import { Box as Box41, Text as Text34 } from "ink";
 import { jsx as jsx53, jsxs as jsxs37 } from "react/jsx-runtime";
 function generateThemeItem(name2, typeDisplay, themeType, themeBackground, terminalBackgroundColor, terminalThemeType) {
@@ -9667,7 +9693,7 @@ function ThemeDialog({
   const isAlternateBuffer = useAlternateBuffer();
   const { refreshStatic } = useUIActions();
   const { terminalBackgroundColor } = useUIState();
-  const [highlightedThemeName, setHighlightedThemeName] = useState19(
+  const [highlightedThemeName, setHighlightedThemeName] = useState20(
     () => {
       if (settings.merged.ui.theme) {
         return settings.merged.ui.theme;
@@ -9876,7 +9902,7 @@ def fibonacci(n):
 }
 
 // src/ui/components/dialogs/settings-dialog.tsx
-import { useState as useState23, useEffect as useEffect26, useMemo as useMemo17, useCallback as useCallback24 } from "react";
+import { useState as useState24, useEffect as useEffect26, useMemo as useMemo17, useCallback as useCallback24 } from "react";
 import { Text as Text37 } from "ink";
 import { AsyncFzf } from "fzf";
 
@@ -10033,7 +10059,7 @@ import {
   useCallback as useCallback20,
   useContext as useContext11,
   useEffect as useEffect23,
-  useState as useState20
+  useState as useState21
 } from "react";
 import { jsx as jsx54 } from "react/jsx-runtime";
 var VimModeContext = createContext10(void 0);
@@ -10042,8 +10068,8 @@ var VimModeProvider = ({
   settings
 }) => {
   const initialVimEnabled = settings.merged.general.vimMode;
-  const [vimEnabled, setVimEnabled] = useState20(initialVimEnabled);
-  const [vimMode, setVimMode] = useState20(
+  const [vimEnabled, setVimEnabled] = useState21(initialVimEnabled);
+  const [vimMode, setVimMode] = useState21(
     initialVimEnabled ? "NORMAL" : "INSERT"
   );
   useEffect23(() => {
@@ -10083,7 +10109,7 @@ import { spawnSync } from "node:child_process";
 import fs7 from "node:fs";
 import os2 from "node:os";
 import pathMod from "node:path";
-import { useState as useState21, useCallback as useCallback21, useEffect as useEffect24, useMemo as useMemo16, useReducer as useReducer2 } from "react";
+import { useState as useState22, useCallback as useCallback21, useEffect as useEffect24, useMemo as useMemo16, useReducer as useReducer2 } from "react";
 
 // src/terminal/clipboard/parser.ts
 var PATH_PREFIX_PATTERN = /^([/~.]|[a-zA-Z]:|\\\\)/;
@@ -12670,7 +12696,7 @@ function useTextBuffer({
     transformedToLogicalMaps,
     visualToTransformedMap
   } = visualLayout;
-  const [scrollRowState, setScrollRowState] = useState21(0);
+  const [scrollRowState, setScrollRowState] = useState22(0);
   useEffect24(() => {
     if (onChange) {
       onChange(text);
@@ -13329,7 +13355,7 @@ function useTextBuffer({
 }
 
 // src/ui/components/shared/base-settings-dialog.tsx
-import React14, { useCallback as useCallback23, useEffect as useEffect25, useState as useState22 } from "react";
+import React14, { useCallback as useCallback23, useEffect as useEffect25, useState as useState23 } from "react";
 import { Box as Box43, Text as Text36 } from "ink";
 import chalk2 from "chalk";
 
@@ -13427,15 +13453,15 @@ function BaseSettingsDialog({
   onKeyPress,
   footerContent
 }) {
-  const [activeIndex, setActiveIndex] = useState22(0);
-  const [scrollOffset, setScrollOffset] = useState22(0);
-  const [focusSection, setFocusSection] = useState22(
+  const [activeIndex, setActiveIndex] = useState23(0);
+  const [scrollOffset, setScrollOffset] = useState23(0);
+  const [focusSection, setFocusSection] = useState23(
     "settings"
   );
-  const [editingKey, setEditingKey] = useState22(null);
-  const [editBuffer, setEditBuffer] = useState22("");
-  const [editCursorPos, setEditCursorPos] = useState22(0);
-  const [cursorVisible, setCursorVisible] = useState22(true);
+  const [editingKey, setEditingKey] = useState23(null);
+  const [editBuffer, setEditBuffer] = useState23("");
+  const [editCursorPos, setEditCursorPos] = useState23(0);
+  const [cursorVisible, setCursorVisible] = useState23(true);
   useEffect25(() => {
     if (activeIndex >= items.length) {
       setActiveIndex(Math.max(0, items.length - 1));
@@ -13798,9 +13824,9 @@ function SettingsDialog({
 }) {
   const { vimEnabled, toggleVimEnabled } = useVimMode();
   const selectedScope = "User" /* User */;
-  const [showRestartPrompt, setShowRestartPrompt] = useState23(false);
-  const [searchQuery, setSearchQuery] = useState23("");
-  const [filteredKeys, setFilteredKeys] = useState23(
+  const [showRestartPrompt, setShowRestartPrompt] = useState24(false);
+  const [searchQuery, setSearchQuery] = useState24("");
+  const [filteredKeys, setFilteredKeys] = useState24(
     () => getDialogSettingKeys()
   );
   const { fzfInstance, searchMap } = useMemo17(() => {
@@ -13841,13 +13867,13 @@ function SettingsDialog({
       active = false;
     };
   }, [searchQuery, fzfInstance, searchMap]);
-  const [pendingSettings, setPendingSettings] = useState23(
+  const [pendingSettings, setPendingSettings] = useState24(
     () => (
       // Deep clone to avoid mutation
       structuredClone(settings.forScope(selectedScope).settings)
     )
   );
-  const [modifiedSettings, setModifiedSettings] = useState23(
+  const [modifiedSettings, setModifiedSettings] = useState24(
     /* @__PURE__ */ new Set()
   );
   const maxLabelOrDescriptionWidth = useMemo17(() => {
@@ -14351,7 +14377,7 @@ var DialogManager = ({ terminalWidth }) => {
 };
 
 // src/ui/components/input/composer.tsx
-import { useState as useState34 } from "react";
+import { useState as useState35 } from "react";
 import { Box as Box60, useIsScreenReaderEnabled as useIsScreenReaderEnabled4 } from "ink";
 
 // src/ui/components/indicators/loading-indicator.tsx
@@ -14570,7 +14596,7 @@ var RawMarkdownIndicator = () => {
 
 // src/ui/components/input/input-prompt.tsx
 import clipboardy2 from "clipboardy";
-import { useCallback as useCallback32, useEffect as useEffect33, useState as useState31, useRef as useRef18, useMemo as useMemo22 } from "react";
+import { useCallback as useCallback32, useEffect as useEffect33, useState as useState32, useRef as useRef18, useMemo as useMemo22 } from "react";
 import { Box as Box51, Text as Text46, useStdout as useStdout2 } from "ink";
 
 // src/ui/components/input/suggestions-display.tsx
@@ -14718,6 +14744,14 @@ var Colors = {
 // src/ui/components/input/suggestions-display.tsx
 import { jsx as jsx65, jsxs as jsxs47 } from "react/jsx-runtime";
 var MAX_SUGGESTIONS_TO_SHOW = 8;
+function commandSource(commandKind) {
+  switch (commandKind) {
+    case "skill" /* SKILL */:
+      return { label: "[skill]", color: theme.command.skill };
+    default:
+      return void 0;
+  }
+}
 function SuggestionsDisplay({
   suggestions,
   activeIndex,
@@ -14752,6 +14786,7 @@ function SuggestionsDisplay({
       const isActive = originalIndex === activeIndex;
       const isExpanded = originalIndex === expandedIndex;
       const textColor = isActive ? theme.text.accent : theme.text.secondary;
+      const source = mode === "slash" ? commandSource(suggestion.commandKind) : void 0;
       const isLong = suggestion.value.length >= MAX_WIDTH;
       const labelElement = /* @__PURE__ */ jsx65(
         ExpandableText,
@@ -14771,7 +14806,13 @@ function SuggestionsDisplay({
             children: /* @__PURE__ */ jsx65(Box50, { children: labelElement })
           }
         ),
-        suggestion.description && /* @__PURE__ */ jsx65(Box50, { flexGrow: 1, paddingLeft: 3, children: /* @__PURE__ */ jsx65(Text45, { color: textColor, wrap: "truncate", children: sanitizeForDisplay(suggestion.description, 100) }) }),
+        suggestion.description && /* @__PURE__ */ jsx65(Box50, { flexGrow: 1, paddingLeft: 3, children: /* @__PURE__ */ jsxs47(Text45, { color: textColor, wrap: "truncate", children: [
+          source && /* @__PURE__ */ jsxs47(Text45, { color: source.color, children: [
+            source.label,
+            " "
+          ] }),
+          sanitizeForDisplay(suggestion.description, 100)
+        ] }) }),
         isActive && isLong && /* @__PURE__ */ jsx65(Box50, { width: 3, flexShrink: 0, children: /* @__PURE__ */ jsx65(Text45, { color: Colors.Gray, children: isExpanded ? " \u2190 " : " \u2192 " }) })
       ] }, `${suggestion.value}-${originalIndex}`);
     }),
@@ -14787,7 +14828,7 @@ function SuggestionsDisplay({
 }
 
 // src/ui/hooks/input/use-input-history.ts
-import { useState as useState24, useCallback as useCallback26 } from "react";
+import { useState as useState25, useCallback as useCallback26 } from "react";
 function useInputHistory({
   userMessages,
   onSubmit,
@@ -14795,8 +14836,8 @@ function useInputHistory({
   currentQuery,
   onChange
 }) {
-  const [historyIndex, setHistoryIndex] = useState24(-1);
-  const [originalQueryBeforeNav, setOriginalQueryBeforeNav] = useState24("");
+  const [historyIndex, setHistoryIndex] = useState25(-1);
+  const [originalQueryBeforeNav, setOriginalQueryBeforeNav] = useState25("");
   const resetHistoryNav = useCallback26(() => {
     setHistoryIndex(-1);
     setOriginalQueryBeforeNav("");
@@ -14872,7 +14913,7 @@ import chalk3 from "chalk";
 import stringWidth3 from "string-width";
 
 // src/ui/hooks/input/use-shell-history.ts
-import { useState as useState25, useEffect as useEffect27, useCallback as useCallback27 } from "react";
+import { useState as useState26, useEffect as useEffect27, useCallback as useCallback27 } from "react";
 import * as fs8 from "node:fs/promises";
 import * as path9 from "node:path";
 var MAX_HISTORY_LENGTH = 100;
@@ -14913,9 +14954,9 @@ async function writeHistoryFile(filePath, history) {
   }
 }
 function useShellHistory(projectRoot, storage) {
-  const [history, setHistory] = useState25([]);
-  const [historyIndex, setHistoryIndex] = useState25(-1);
-  const [historyFilePath, setHistoryFilePath] = useState25(null);
+  const [history, setHistory] = useState26([]);
+  const [historyIndex, setHistoryIndex] = useState26(-1);
+  const [historyFilePath, setHistoryFilePath] = useState26(null);
   useEffect27(() => {
     async function loadHistory() {
       const filePath = await getHistoryFilePath(projectRoot, storage);
@@ -14969,17 +15010,17 @@ function useShellHistory(projectRoot, storage) {
 }
 
 // src/ui/hooks/completion/use-reverse-search-completion.tsx
-import { useState as useState27, useEffect as useEffect28, useMemo as useMemo18, useCallback as useCallback29, useRef as useRef15 } from "react";
+import { useState as useState28, useEffect as useEffect28, useMemo as useMemo18, useCallback as useCallback29, useRef as useRef15 } from "react";
 
 // src/ui/hooks/completion/use-completion.ts
-import { useState as useState26, useCallback as useCallback28 } from "react";
+import { useState as useState27, useCallback as useCallback28 } from "react";
 function useCompletion() {
-  const [suggestions, setSuggestions] = useState26([]);
-  const [activeSuggestionIndex, setActiveSuggestionIndex] = useState26(-1);
-  const [visibleStartIndex, setVisibleStartIndex] = useState26(0);
-  const [showSuggestions, setShowSuggestions] = useState26(false);
-  const [isLoadingSuggestions, setIsLoadingSuggestions] = useState26(false);
-  const [isPerfectMatch, setIsPerfectMatch] = useState26(false);
+  const [suggestions, setSuggestions] = useState27([]);
+  const [activeSuggestionIndex, setActiveSuggestionIndex] = useState27(-1);
+  const [visibleStartIndex, setVisibleStartIndex] = useState27(0);
+  const [showSuggestions, setShowSuggestions] = useState27(false);
+  const [isLoadingSuggestions, setIsLoadingSuggestions] = useState27(false);
+  const [isPerfectMatch, setIsPerfectMatch] = useState27(false);
   const resetCompletionState = useCallback28(() => {
     setSuggestions([]);
     setActiveSuggestionIndex(-1);
@@ -15042,7 +15083,7 @@ function useCompletion() {
 
 // src/ui/hooks/completion/use-reverse-search-completion.tsx
 function useDebouncedValue(value, delay = 200) {
-  const [debounced, setDebounced] = useState27(value);
+  const [debounced, setDebounced] = useState28(value);
   useEffect28(() => {
     const handle = setTimeout(() => setDebounced(value), delay);
     return () => clearTimeout(handle);
@@ -15326,7 +15367,7 @@ function useAtCompletion(props) {
 }
 
 // src/ui/hooks/completion/use-slash-completion.ts
-import { useState as useState28, useEffect as useEffect30, useMemo as useMemo19 } from "react";
+import { useState as useState29, useEffect as useEffect30, useMemo as useMemo19 } from "react";
 import { AsyncFzf as AsyncFzf2 } from "fzf";
 function logErrorSafely(error, context) {
   if (error instanceof Error) {
@@ -15412,8 +15453,8 @@ function useCommandParser(query, slashCommands) {
   }, [query, slashCommands]);
 }
 function useCommandSuggestions(query, parserResult, commandContext, getFzfForCommands, getPrefixSuggestions) {
-  const [suggestions, setSuggestions] = useState28([]);
-  const [isLoading, setIsLoading] = useState28(false);
+  const [suggestions, setSuggestions] = useState29([]);
+  const [isLoading, setIsLoading] = useState29(false);
   useEffect30(() => {
     const abortController = new AbortController();
     const { signal } = abortController;
@@ -15424,6 +15465,9 @@ function useCommandSuggestions(query, parserResult, commandContext, getFzfForCom
       partial,
       currentLevel
     } = parserResult;
+    setIsLoading(
+      isArgumentCompletion && leafCommand?.completion !== void 0 && leafCommand.showCompletionLoading !== false
+    );
     if (isArgumentCompletion) {
       const fetchAndSetSuggestions = async () => {
         if (signal.aborted) return;
@@ -15433,10 +15477,6 @@ function useCommandSuggestions(query, parserResult, commandContext, getFzfForCom
           );
           return;
         }
-        const showLoading = leafCommand.showCompletionLoading !== false;
-        if (showLoading) {
-          setIsLoading(true);
-        }
         try {
           const rawParts = [...commandPathParts];
           if (partial) rawParts.push(partial);
@@ -15454,10 +15494,14 @@ function useCommandSuggestions(query, parserResult, commandContext, getFzfForCom
             argString
           ) || [];
           if (!signal.aborted) {
-            const finalSuggestions = results.map((s) => ({
-              label: s,
-              value: s
-            }));
+            const finalSuggestions = results.map((result) => {
+              const item = typeof result === "string" ? { value: result } : result;
+              return {
+                label: item.value,
+                value: item.value,
+                ...item.description === void 0 ? {} : { description: item.description }
+              };
+            });
             setSuggestions(finalSuggestions);
             setIsLoading(false);
           }
@@ -15474,6 +15518,31 @@ function useCommandSuggestions(query, parserResult, commandContext, getFzfForCom
     }
     const commandsToSearch = currentLevel || [];
     if (commandsToSearch.length > 0) {
+      let lastPublishedCommands;
+      const publishSuggestions = (potentialSuggestions) => {
+        if (signal.aborted) return;
+        const sortedSuggestions = [...potentialSuggestions].sort((a, b) => {
+          const aIsExact = matchesCommand(a, partial);
+          const bIsExact = matchesCommand(b, partial);
+          if (aIsExact && !bIsExact) return -1;
+          if (!aIsExact && bIsExact) return 1;
+          return 0;
+        });
+        if (lastPublishedCommands?.length === sortedSuggestions.length && lastPublishedCommands.every(
+          (command, index) => command === sortedSuggestions[index]
+        )) {
+          return;
+        }
+        lastPublishedCommands = sortedSuggestions;
+        setSuggestions(
+          sortedSuggestions.map((cmd) => ({
+            label: cmd.name,
+            value: cmd.name,
+            description: cmd.description,
+            commandKind: cmd.kind
+          }))
+        );
+      };
       const performFuzzySearch = async () => {
         if (signal.aborted) return;
         let potentialSuggestions;
@@ -15482,6 +15551,11 @@ function useCommandSuggestions(query, parserResult, commandContext, getFzfForCom
             (cmd) => cmd.description && !cmd.hidden
           );
         } else {
+          const prefixSuggestions = getPrefixSuggestions(
+            commandsToSearch,
+            partial
+          );
+          publishSuggestions(prefixSuggestions);
           const fzfInstance = getFzfForCommands(commandsToSearch);
           if (fzfInstance) {
             try {
@@ -15496,38 +15570,14 @@ function useCommandSuggestions(query, parserResult, commandContext, getFzfForCom
               });
               potentialSuggestions = Array.from(uniqueCommands);
             } catch (error) {
-              logErrorSafely(
-                error,
-                "Fuzzy search - falling back to prefix matching"
-              );
-              potentialSuggestions = getPrefixSuggestions(
-                commandsToSearch,
-                partial
-              );
+              logErrorSafely(error, "Fuzzy command search");
+              return;
             }
           } else {
-            potentialSuggestions = getPrefixSuggestions(
-              commandsToSearch,
-              partial
-            );
+            potentialSuggestions = prefixSuggestions;
           }
         }
-        if (!signal.aborted) {
-          const sortedSuggestions = [...potentialSuggestions].sort((a, b) => {
-            const aIsExact = matchesCommand(a, partial);
-            const bIsExact = matchesCommand(b, partial);
-            if (aIsExact && !bIsExact) return -1;
-            if (!aIsExact && bIsExact) return 1;
-            return 0;
-          });
-          const finalSuggestions = sortedSuggestions.map((cmd) => ({
-            label: cmd.name,
-            value: cmd.name,
-            description: cmd.description,
-            commandKind: cmd.kind
-          }));
-          setSuggestions(finalSuggestions);
-        }
+        publishSuggestions(potentialSuggestions);
       };
       performFuzzySearch().catch((error) => {
         logErrorSafely(error, "Unexpected fuzzy search error");
@@ -15609,8 +15659,8 @@ function useSlashCompletion(props) {
     setIsLoadingSuggestions,
     setIsPerfectMatch
   } = props;
-  const [completionStart, setCompletionStart] = useState28(-1);
-  const [completionEnd, setCompletionEnd] = useState28(-1);
+  const [completionStart, setCompletionStart] = useState29(-1);
+  const [completionEnd, setCompletionEnd] = useState29(-1);
   const fzfInstanceCache = useMemo19(
     () => /* @__PURE__ */ new WeakMap(),
     []
@@ -15720,7 +15770,7 @@ function useSlashCompletion(props) {
 }
 
 // src/ui/hooks/completion/use-prompt-completion.ts
-import { useState as useState29, useCallback as useCallback30, useRef as useRef17, useEffect as useEffect31, useMemo as useMemo20 } from "react";
+import { useState as useState30, useCallback as useCallback30, useRef as useRef17, useEffect as useEffect31, useMemo as useMemo20 } from "react";
 var PROMPT_COMPLETION_MIN_LENGTH = 5;
 var PROMPT_COMPLETION_DEBOUNCE_MS = 250;
 function usePromptCompletion({
@@ -15728,10 +15778,10 @@ function usePromptCompletion({
   completePrompt,
   enabled
 }) {
-  const [ghostText, setGhostText] = useState29("");
-  const [isLoadingGhostText, setIsLoadingGhostText] = useState29(false);
+  const [ghostText, setGhostText] = useState30("");
+  const [isLoadingGhostText, setIsLoadingGhostText] = useState30(false);
   const abortControllerRef = useRef17(null);
-  const [justSelectedSuggestion, setJustSelectedSuggestion] = useState29(false);
+  const [justSelectedSuggestion, setJustSelectedSuggestion] = useState30(false);
   const lastSelectedTextRef = useRef17("");
   const lastRequestedTextRef = useRef17("");
   const isPromptCompletionEnabled = enabled && completePrompt !== void 0;
@@ -16185,9 +16235,9 @@ function parseSegmentsFromTokens(tokens, sliceStart, sliceEnd) {
 }
 
 // src/ui/hooks/terminal/use-kitty-keyboard-protocol.ts
-import { useState as useState30 } from "react";
+import { useState as useState31 } from "react";
 function useKittyKeyboardProtocol() {
-  const [status] = useState30({
+  const [status] = useState31({
     enabled: terminalCapabilityManager.isKittyProtocolEnabled(),
     checking: false
   });
@@ -16299,21 +16349,21 @@ var InputPrompt = ({
   const isShellFocused = useShellFocusState();
   const { setEmbeddedShellFocused } = useUIActions();
   const { terminalWidth, activePtyId, terminalBackgroundColor } = useUIState();
-  const [justNavigatedHistory, setJustNavigatedHistory] = useState31(false);
+  const [justNavigatedHistory, setJustNavigatedHistory] = useState32(false);
   const escPressCount = useRef18(0);
-  const [showEscapePrompt, setShowEscapePrompt] = useState31(false);
+  const [showEscapePrompt, setShowEscapePrompt] = useState32(false);
   const escapeTimerRef = useRef18(null);
-  const [recentUnsafePasteTime, setRecentUnsafePasteTime] = useState31(null);
+  const [recentUnsafePasteTime, setRecentUnsafePasteTime] = useState32(null);
   const pasteTimeoutRef = useRef18(null);
   const innerBoxRef = useRef18(null);
-  const [reverseSearchActive, setReverseSearchActive] = useState31(false);
-  const [commandSearchActive, setCommandSearchActive] = useState31(false);
-  const [textBeforeReverseSearch, setTextBeforeReverseSearch] = useState31("");
-  const [cursorPosition, setCursorPosition] = useState31([
+  const [reverseSearchActive, setReverseSearchActive] = useState32(false);
+  const [commandSearchActive, setCommandSearchActive] = useState32(false);
+  const [textBeforeReverseSearch, setTextBeforeReverseSearch] = useState32("");
+  const [cursorPosition, setCursorPosition] = useState32([
     0,
     0
   ]);
-  const [expandedSuggestionIndex, setExpandedSuggestionIndex] = useState31(-1);
+  const [expandedSuggestionIndex, setExpandedSuggestionIndex] = useState32(-1);
   const shellHistory = useShellHistory(config.getProjectRoot());
   const shellHistoryData = shellHistory.history;
   const completion = useCommandCompletion(
@@ -16904,7 +16954,10 @@ var InputPrompt = ({
       onTogglePlanMode
     ]
   );
-  useKeypress(handleInput, { isActive: !isEmbeddedShellFocused });
+  useKeypress(handleInput, {
+    isActive: !isEmbeddedShellFocused,
+    isInput: true
+  });
   const linesToRender = buffer.viewportVisualLines;
   const [cursorVisualRowAbsolute, cursorVisualColAbsolute] = buffer.visualCursor;
   const scrollVisualRow = buffer.visualScrollRow;
@@ -17253,13 +17306,13 @@ var ConsoleSummaryDisplay = ({
 };
 
 // src/ui/components/stats/memory-usage-display.tsx
-import { useEffect as useEffect34, useState as useState32 } from "react";
+import { useEffect as useEffect34, useState as useState33 } from "react";
 import { Box as Box53, Text as Text48 } from "ink";
 import process5 from "node:process";
 import { jsx as jsx68, jsxs as jsxs50 } from "react/jsx-runtime";
 var MemoryUsageDisplay = () => {
-  const [memoryUsage, setMemoryUsage] = useState32("");
-  const [memoryUsageColor, setMemoryUsageColor] = useState32(
+  const [memoryUsage, setMemoryUsage] = useState33("");
+  const [memoryUsageColor, setMemoryUsageColor] = useState33(
     theme.text.secondary
   );
   useEffect34(() => {
@@ -17282,7 +17335,7 @@ var MemoryUsageDisplay = () => {
 
 // src/ui/components/stats/debug-profiler.tsx
 import { Text as Text49 } from "ink";
-import { useEffect as useEffect35, useState as useState33 } from "react";
+import { useEffect as useEffect35, useState as useState34 } from "react";
 import { FixedDeque } from "mnemonist";
 import { Fragment as Fragment14, jsx as jsx69, jsxs as jsxs51 } from "react/jsx-runtime";
 var MIN_TIME_FROM_ACTION_TO_BE_IDLE = 500;
@@ -17383,7 +17436,7 @@ var profiler = {
 };
 var DebugProfiler = ({ compact = false }) => {
   const { showDebugProfiler, constrainHeight } = useUIState();
-  const [forceRefresh, setForceRefresh] = useState33(0);
+  const [forceRefresh, setForceRefresh] = useState34(0);
   useEffect35(() => {
     profiler.profilersActive++;
     const stdin = process.stdin;
@@ -17879,7 +17932,7 @@ var Composer = ({ isFocused = true }) => {
   const terminalWidth = process.stdout.columns;
   const isNarrow = isNarrowWidth(terminalWidth);
   const debugConsoleMaxHeight = Math.floor(Math.max(terminalWidth * 0.2, 5));
-  const [, setSuggestionsVisible] = useState34(false);
+  const [, setSuggestionsVisible] = useState35(false);
   const isAlternateBuffer = useAlternateBuffer();
   const suggestionsPosition = isAlternateBuffer ? "above" : "below";
   return /* @__PURE__ */ jsxs58(
@@ -19398,9 +19451,9 @@ var App = () => {
 import process8 from "node:process";
 
 // src/ui/hooks/session/use-history-manager.ts
-import { useState as useState35, useRef as useRef20, useCallback as useCallback35, useMemo as useMemo30 } from "react";
+import { useState as useState36, useRef as useRef20, useCallback as useCallback35, useMemo as useMemo30 } from "react";
 function useHistory() {
-  const [history, setHistory] = useState35([]);
+  const [history, setHistory] = useState36([]);
   const messageIdCounterRef = useRef20(0);
   const getNextMessageId = useCallback35((baseTimestamp) => {
     messageIdCounterRef.current += 1;
@@ -19457,7 +19510,7 @@ function useHistory() {
 }
 
 // src/ui/hooks/commands/use-slash-command-processor.ts
-import { useCallback as useCallback40, useMemo as useMemo38, useEffect as useEffect44, useRef as useRef25, useState as useState44 } from "react";
+import { useCallback as useCallback41, useMemo as useMemo40, useEffect as useEffect45, useRef as useRef25, useState as useState47 } from "react";
 
 // src/services/command-service.ts
 var CommandService = class _CommandService {
@@ -19579,7 +19632,7 @@ function loadChangelog() {
 }
 
 // src/ui/components/dialogs/changelog-dialog.tsx
-import { useMemo as useMemo31, useState as useState36 } from "react";
+import { useMemo as useMemo31, useState as useState37 } from "react";
 import { Box as Box70, Text as Text65 } from "ink";
 import stringWidth4 from "string-width";
 
@@ -19686,7 +19739,7 @@ function ChangelogDialog({
     [content, contentWidth]
   );
   const maxOffset = Math.max(0, lines.length - viewportHeight);
-  const [offset, setOffset] = useState36(0);
+  const [offset, setOffset] = useState37(0);
   const visibleOffset = Math.min(offset, maxOffset);
   useKeypress(
     (key) => {
@@ -19879,11 +19932,11 @@ var vimCommand = {
 import React19 from "react";
 
 // src/ui/components/dialogs/model-dialog.tsx
-import { useCallback as useCallback36, useEffect as useEffect39, useMemo as useMemo32, useRef as useRef22, useState as useState38 } from "react";
+import { useCallback as useCallback36, useEffect as useEffect39, useMemo as useMemo32, useRef as useRef22, useState as useState39 } from "react";
 import { Box as Box72, Text as Text67 } from "ink";
 
 // src/ui/components/dialogs/provider-setup-dialog.tsx
-import { useEffect as useEffect38, useRef as useRef21, useState as useState37 } from "react";
+import { useEffect as useEffect38, useRef as useRef21, useState as useState38 } from "react";
 import { Box as Box71, Text as Text66 } from "ink";
 import { jsx as jsx94, jsxs as jsxs68 } from "react/jsx-runtime";
 function ProviderSetupDialog({
@@ -19894,10 +19947,10 @@ function ProviderSetupDialog({
   onConfigured
 }) {
   useSensitiveInputProtection();
-  const [view, setView] = useState37();
-  const [secret, setSecret] = useState37("");
-  const [saving, setSaving] = useState37(false);
-  const [error, setError] = useState37();
+  const [view, setView] = useState38();
+  const [secret, setSecret] = useState38("");
+  const [saving, setSaving] = useState38(false);
+  const [error, setError] = useState38();
   const mountedRef = useRef21(true);
   const saveControllerRef = useRef21(void 0);
   useEffect38(() => {
@@ -20083,17 +20136,17 @@ function ModelDialog({
   onSwitched,
   providerSetupRuntime
 }) {
-  const [models, setModels] = useState38([]);
-  const [highlighted, setHighlighted] = useState38(
+  const [models, setModels] = useState39([]);
+  const [highlighted, setHighlighted] = useState39(
     runtime.getSnapshot().current
   );
-  const [pending, setPending] = useState38();
-  const [loading, setLoading] = useState38(true);
-  const [switching, setSwitching] = useState38(false);
-  const [checkingProvider, setCheckingProvider] = useState38(false);
-  const [error, setError] = useState38();
-  const [setupSelection, setSetupSelection] = useState38();
-  const [reasoningSelection, setReasoningSelection] = useState38();
+  const [pending, setPending] = useState39();
+  const [loading, setLoading] = useState39(true);
+  const [switching, setSwitching] = useState39(false);
+  const [checkingProvider, setCheckingProvider] = useState39(false);
+  const [error, setError] = useState39();
+  const [setupSelection, setSetupSelection] = useState39();
+  const [reasoningSelection, setReasoningSelection] = useState39();
   const providerCheckRef = useRef22(void 0);
   useEffect39(() => {
     const controller = new AbortController();
@@ -20480,7 +20533,7 @@ var modelCommand = {
 import React20 from "react";
 
 // src/ui/components/dialogs/provider-dialog.tsx
-import { useEffect as useEffect40, useMemo as useMemo33, useState as useState39 } from "react";
+import { useEffect as useEffect40, useMemo as useMemo33, useState as useState40 } from "react";
 import { Box as Box73, Text as Text68 } from "ink";
 import { Fragment as Fragment22, jsx as jsx96, jsxs as jsxs70 } from "react/jsx-runtime";
 function statusLabel(status) {
@@ -20523,11 +20576,11 @@ function ProviderDialog({
   initialProvider,
   onClose
 }) {
-  const [providers, setProviders] = useState39([]);
-  const [highlighted, setHighlighted] = useState39();
-  const [editing, setEditing] = useState39();
-  const [loading, setLoading] = useState39(true);
-  const [error, setError] = useState39();
+  const [providers, setProviders] = useState40([]);
+  const [highlighted, setHighlighted] = useState40();
+  const [editing, setEditing] = useState40();
+  const [loading, setLoading] = useState40(true);
+  const [error, setError] = useState40();
   useEffect40(() => {
     const controller = new AbortController();
     void runtime.listProviders(controller.signal).then((available) => {
@@ -20715,7 +20768,7 @@ var providerCommand = {
 import React21 from "react";
 
 // src/ui/components/dialogs/session-dialog.tsx
-import { useCallback as useCallback37, useEffect as useEffect41, useMemo as useMemo34, useRef as useRef23, useState as useState40 } from "react";
+import { useCallback as useCallback37, useEffect as useEffect41, useMemo as useMemo34, useRef as useRef23, useState as useState41 } from "react";
 import { Box as Box74, Text as Text69 } from "ink";
 import { Fragment as Fragment23, jsx as jsx97, jsxs as jsxs71 } from "react/jsx-runtime";
 function shortId(id) {
@@ -20729,12 +20782,12 @@ function SessionDialog({
   runtime,
   onClose
 }) {
-  const [sessions, setSessions] = useState40([]);
-  const [highlighted, setHighlighted] = useState40();
-  const [pending, setPending] = useState40();
-  const [loading, setLoading] = useState40(true);
-  const [switching, setSwitching] = useState40(false);
-  const [error, setError] = useState40();
+  const [sessions, setSessions] = useState41([]);
+  const [highlighted, setHighlighted] = useState41();
+  const [pending, setPending] = useState41();
+  const [loading, setLoading] = useState41(true);
+  const [switching, setSwitching] = useState41(false);
+  const [error, setError] = useState41();
   const switchingRef = useRef23(false);
   const titleRequestsRef = useRef23(/* @__PURE__ */ new Map());
   const resolveTitles = useCallback37(
@@ -21028,7 +21081,7 @@ var statsCommand = {
 import React22 from "react";
 
 // src/ui/components/dialogs/tools-dialog.tsx
-import { useEffect as useEffect42, useMemo as useMemo35, useState as useState41, useSyncExternalStore as useSyncExternalStore3 } from "react";
+import { useEffect as useEffect42, useMemo as useMemo35, useState as useState42, useSyncExternalStore as useSyncExternalStore3 } from "react";
 import { Box as Box76, Text as Text71 } from "ink";
 
 // src/ui/components/shared/descriptive-radio-button-select.tsx
@@ -21078,7 +21131,7 @@ function ToolsDialog({
     runtime.getSnapshot,
     runtime.getSnapshot
   );
-  const [selectedName, setSelectedName] = useState41(snapshot.tools[0]?.name);
+  const [selectedName, setSelectedName] = useState42(snapshot.tools[0]?.name);
   const selected = snapshot.tools.find((tool) => tool.name === selectedName) ?? snapshot.tools[0];
   useEffect42(() => {
     if (selected?.name !== selectedName) setSelectedName(selected?.name);
@@ -21189,7 +21242,7 @@ var toolsCommand = {
 import React23 from "react";
 
 // src/ui/components/dialogs/permission-dialog.tsx
-import { useCallback as useCallback38, useMemo as useMemo36, useState as useState42, useSyncExternalStore as useSyncExternalStore4 } from "react";
+import { useCallback as useCallback38, useMemo as useMemo36, useState as useState43, useSyncExternalStore as useSyncExternalStore4 } from "react";
 import { Box as Box77, Text as Text72 } from "ink";
 import { Fragment as Fragment25, jsx as jsx100, jsxs as jsxs74 } from "react/jsx-runtime";
 function PermissionDialog({
@@ -21202,9 +21255,9 @@ function PermissionDialog({
     runtime.getSnapshot,
     runtime.getSnapshot
   );
-  const [highlighted, setHighlighted] = useState42();
-  const [pending, setPending] = useState42();
-  const [error, setError] = useState42();
+  const [highlighted, setHighlighted] = useState43();
+  const [pending, setPending] = useState43();
+  const [error, setError] = useState43();
   const selected = highlighted ?? snapshot.options.find((option) => option.value === snapshot.currentValue) ?? snapshot.options[0];
   const items = useMemo36(
     () => snapshot.options.map((option) => ({
@@ -21485,7 +21538,7 @@ import {
   useEffect as useEffect43,
   useMemo as useMemo37,
   useRef as useRef24,
-  useState as useState43,
+  useState as useState44,
   useSyncExternalStore as useSyncExternalStore5
 } from "react";
 import { Box as Box78, Text as Text73 } from "ink";
@@ -21586,11 +21639,11 @@ function AgentsDialog({ runtime, onClose }) {
     runtime.getSnapshot,
     runtime.getSnapshot
   );
-  const [selectedId, setSelectedId] = useState43(snapshot.items[0]?.id);
-  const [transcript, setTranscript] = useState43();
-  const [transcriptSessionId, setTranscriptSessionId] = useState43();
-  const [opening, setOpening] = useState43(false);
-  const [openError, setOpenError] = useState43();
+  const [selectedId, setSelectedId] = useState44(snapshot.items[0]?.id);
+  const [transcript, setTranscript] = useState44();
+  const [transcriptSessionId, setTranscriptSessionId] = useState44();
+  const [opening, setOpening] = useState44(false);
+  const [openError, setOpenError] = useState44();
   const openController = useRef24(void 0);
   const openingRef = useRef24(false);
   const transcriptRef = useRef24(void 0);
@@ -21890,6 +21943,330 @@ var agentsCommand = {
   }
 };
 
+// src/ui/commands/preset-command.ts
+import React25 from "react";
+
+// src/ui/components/dialogs/agent-preset-dialog.tsx
+import { useCallback as useCallback40, useMemo as useMemo38, useState as useState45, useSyncExternalStore as useSyncExternalStore6 } from "react";
+import { Box as Box79, Text as Text74 } from "ink";
+import { Fragment as Fragment27, jsx as jsx102, jsxs as jsxs76 } from "react/jsx-runtime";
+function AgentPresetDialog({
+  runtime,
+  onClose,
+  onSwitched
+}) {
+  const snapshot = useSyncExternalStore6(
+    runtime.subscribe,
+    runtime.getSnapshot,
+    runtime.getSnapshot
+  );
+  const [highlighted, setHighlighted] = useState45();
+  const [error, setError] = useState45();
+  const selected = highlighted ?? snapshot.options.find((item) => item.id === snapshot.currentId) ?? snapshot.options[0];
+  const items = useMemo38(
+    () => snapshot.options.map((option) => ({
+      key: option.id,
+      value: option,
+      label: option.name
+    })),
+    [snapshot.options]
+  );
+  const initialIndex = Math.max(
+    0,
+    snapshot.options.findIndex((option) => option.id === snapshot.currentId)
+  );
+  const selectPreset = useCallback40(
+    async (option) => {
+      setError(void 0);
+      if (option.broken !== void 0) {
+        setError(`This preset is unavailable: ${option.broken}`);
+        return;
+      }
+      if (option.id === snapshot.currentId) {
+        onClose();
+        return;
+      }
+      try {
+        onSwitched(await runtime.select(option.id));
+      } catch (cause) {
+        setError(cause instanceof Error ? cause.message : String(cause));
+      }
+    },
+    [onClose, onSwitched, runtime, snapshot.currentId]
+  );
+  useKeypress(
+    (key) => {
+      if (key.name === "escape" && !snapshot.busy) onClose();
+    },
+    { isActive: true }
+  );
+  return /* @__PURE__ */ jsxs76(
+    Box79,
+    {
+      borderStyle: "round",
+      borderColor: theme.border.default,
+      flexDirection: "column",
+      paddingX: 1,
+      paddingY: 1,
+      width: "100%",
+      children: [
+        /* @__PURE__ */ jsxs76(Box79, { justifyContent: "space-between", children: [
+          /* @__PURE__ */ jsx102(Text74, { bold: true, color: theme.text.primary, children: "Select DSH Agent Preset" }),
+          /* @__PURE__ */ jsx102(DialogCloseAction, { onClose, isActive: !snapshot.busy })
+        ] }),
+        (error ?? snapshot.error) && /* @__PURE__ */ jsx102(Box79, { marginTop: 1, children: /* @__PURE__ */ jsx102(Text74, { color: theme.status.error, children: error ?? snapshot.error }) }),
+        snapshot.options.length === 0 ? /* @__PURE__ */ jsx102(Box79, { marginTop: 1, children: /* @__PURE__ */ jsx102(Text74, { color: theme.text.secondary, children: "No Agent presets are available." }) }) : /* @__PURE__ */ jsxs76(Box79, { flexDirection: "row", marginTop: 1, children: [
+          /* @__PURE__ */ jsx102(Box79, { width: "50%", paddingRight: 2, flexDirection: "column", children: /* @__PURE__ */ jsx102(
+            RadioButtonSelect,
+            {
+              items,
+              initialIndex,
+              onHighlight: setHighlighted,
+              onSelect: (option) => void selectPreset(option),
+              isFocused: !snapshot.busy,
+              showNumbers: false,
+              renderItem: (item, { titleColor }) => /* @__PURE__ */ jsxs76(
+                Text74,
+                {
+                  color: item.value.broken === void 0 ? titleColor : theme.text.secondary,
+                  wrap: "truncate",
+                  children: [
+                    item.value.name,
+                    item.value.id === snapshot.currentId && /* @__PURE__ */ jsx102(Text74, { color: theme.text.accent, children: " Current" }),
+                    item.value.isDefault && /* @__PURE__ */ jsx102(Text74, { color: theme.text.secondary, children: " Default" })
+                  ]
+                }
+              )
+            },
+            items.map((item) => item.key).join("|")
+          ) }),
+          /* @__PURE__ */ jsx102(Box79, { width: "50%", paddingLeft: 2, flexDirection: "column", children: selected && /* @__PURE__ */ jsxs76(Fragment27, { children: [
+            /* @__PURE__ */ jsx102(Text74, { bold: true, color: theme.text.accent, children: selected.name }),
+            /* @__PURE__ */ jsxs76(Text74, { color: theme.text.secondary, children: [
+              selected.id,
+              " \xB7 ",
+              selected.trust
+            ] }),
+            /* @__PURE__ */ jsx102(Box79, { marginTop: 1, children: /* @__PURE__ */ jsx102(Text74, { wrap: "wrap", children: selected.description ?? "No description is available for this preset." }) }),
+            selected.broken && /* @__PURE__ */ jsx102(Box79, { marginTop: 1, children: /* @__PURE__ */ jsx102(Text74, { color: theme.status.warning, children: selected.broken }) }),
+            snapshot.busy && /* @__PURE__ */ jsx102(Box79, { marginTop: 1, children: /* @__PURE__ */ jsx102(Text74, { color: theme.text.accent, children: "Applying preset..." }) })
+          ] }) })
+        ] }),
+        /* @__PURE__ */ jsx102(Box79, { marginTop: 1, children: /* @__PURE__ */ jsx102(Text74, { color: theme.text.secondary, children: "A preset can change only before the current Session starts." }) })
+      ]
+    }
+  );
+}
+
+// src/ui/commands/preset-command.ts
+var switchedMessage2 = (name2, id) => `Agent preset changed to ${name2} (${id}).`;
+var completionDescription = (option, currentId) => {
+  const status = [
+    ...option.id === currentId ? ["Current"] : [],
+    ...option.isDefault ? ["Default"] : []
+  ].join(", ");
+  const details = [
+    ...option.name === option.id ? [] : [option.name],
+    ...status === "" ? [] : [status],
+    ...option.description === void 0 ? [] : [option.description]
+  ];
+  return details.length === 0 ? void 0 : details.join(" | ");
+};
+var presetCommand = {
+  name: "preset",
+  description: "Show or change the current DSH Agent preset",
+  inputHint: "[preset]",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  action: async (context, args) => {
+    if (context.services.sideConversation?.getWorkspaceSnapshot().sideSessionId !== void 0) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "Close the Side conversation before changing the Main Agent preset. Use /side, then Ctrl+C."
+      };
+    }
+    const runtime = context.services.agentPreset;
+    if (runtime === void 0) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "DSH Agent presets are unavailable."
+      };
+    }
+    await runtime.prepare(context.invocation.signal);
+    const value = args.trim();
+    if (value === "") {
+      return {
+        type: "custom_dialog",
+        component: React25.createElement(AgentPresetDialog, {
+          runtime,
+          onClose: context.ui.removeComponent,
+          onSwitched: (selection) => {
+            context.ui.addItem({
+              type: "info" /* INFO */,
+              text: switchedMessage2(selection.name, selection.id)
+            });
+            context.ui.removeComponent();
+          }
+        })
+      };
+    }
+    if (/\s/.test(value)) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "Usage: /preset [preset]"
+      };
+    }
+    const option = await runtime.select(value, context.invocation.signal);
+    return {
+      type: "message",
+      messageType: "info",
+      content: switchedMessage2(option.name, option.id)
+    };
+  },
+  completion: async (context, partialArg) => {
+    const runtime = context.services.agentPreset;
+    if (runtime === void 0) return [];
+    await runtime.prepare();
+    const prefix = partialArg.trimStart();
+    const snapshot = runtime.getSnapshot();
+    return snapshot.options.filter(
+      (option) => option.broken === void 0 && option.id.startsWith(prefix)
+    ).map((option) => {
+      const description = completionDescription(option, snapshot.currentId);
+      return {
+        value: option.id,
+        ...description === void 0 ? {} : { description }
+      };
+    });
+  }
+};
+
+// src/ui/commands/skills-command.ts
+import React26 from "react";
+
+// src/ui/components/dialogs/skills-dialog.tsx
+import { useEffect as useEffect44, useMemo as useMemo39, useState as useState46, useSyncExternalStore as useSyncExternalStore7 } from "react";
+import { Box as Box80, Text as Text75 } from "ink";
+import { Fragment as Fragment28, jsx as jsx103, jsxs as jsxs77 } from "react/jsx-runtime";
+function summary2(value) {
+  const line = value.replace(/\s+/g, " ").trim();
+  return line.length > 90 ? `${line.slice(0, 89)}...` : line;
+}
+function SkillsDialog({
+  runtime,
+  onClose
+}) {
+  const snapshot = useSyncExternalStore7(
+    runtime.subscribe,
+    runtime.getSnapshot,
+    runtime.getSnapshot
+  );
+  const [selectedName, setSelectedName] = useState46(snapshot.skills[0]?.name);
+  const selected = snapshot.skills.find((skill) => skill.name === selectedName) ?? snapshot.skills[0];
+  useEffect44(() => {
+    if (selected?.name !== selectedName) setSelectedName(selected?.name);
+  }, [selected?.name, selectedName]);
+  useKeypress(
+    (key) => {
+      if (key.name === "escape") onClose();
+    },
+    { isActive: true }
+  );
+  const items = useMemo39(
+    () => snapshot.skills.map((skill) => ({
+      key: skill.name,
+      value: skill.name,
+      title: `/${skill.name}`,
+      description: summary2(skill.description)
+    })),
+    [snapshot.skills]
+  );
+  return /* @__PURE__ */ jsxs77(
+    Box80,
+    {
+      borderStyle: "round",
+      borderColor: theme.border.default,
+      flexDirection: "column",
+      paddingX: 1,
+      paddingY: 1,
+      width: "100%",
+      children: [
+        /* @__PURE__ */ jsxs77(Box80, { justifyContent: "space-between", children: [
+          /* @__PURE__ */ jsxs77(Text75, { bold: true, color: theme.text.primary, children: [
+            "DSH Skills (",
+            snapshot.skills.length,
+            ")"
+          ] }),
+          /* @__PURE__ */ jsx103(DialogCloseAction, { onClose })
+        ] }),
+        snapshot.error && /* @__PURE__ */ jsx103(Box80, { marginTop: 1, children: /* @__PURE__ */ jsx103(Text75, { color: theme.status.error, children: snapshot.error }) }),
+        snapshot.skills.length === 0 ? /* @__PURE__ */ jsx103(Box80, { marginTop: 1, children: /* @__PURE__ */ jsx103(Text75, { color: theme.text.secondary, children: "No user-invocable Skills are visible to the current Agent." }) }) : /* @__PURE__ */ jsxs77(Box80, { flexDirection: "row", marginTop: 1, children: [
+          /* @__PURE__ */ jsx103(Box80, { width: "55%", paddingRight: 2, flexDirection: "column", children: /* @__PURE__ */ jsx103(
+            DescriptiveRadioButtonSelect,
+            {
+              items,
+              onHighlight: setSelectedName,
+              onSelect: setSelectedName,
+              showNumbers: false,
+              showScrollArrows: true,
+              maxItemsToShow: 10
+            }
+          ) }),
+          /* @__PURE__ */ jsx103(Box80, { width: "45%", paddingLeft: 2, flexDirection: "column", children: selected && /* @__PURE__ */ jsxs77(Fragment28, { children: [
+            /* @__PURE__ */ jsxs77(Text75, { bold: true, color: theme.text.accent, children: [
+              "/",
+              selected.name
+            ] }),
+            !selected.modelInvocable && /* @__PURE__ */ jsx103(Text75, { color: theme.status.warning, children: "User invocation only" }),
+            /* @__PURE__ */ jsx103(Box80, { marginTop: 1, children: /* @__PURE__ */ jsx103(Text75, { wrap: "wrap", children: selected.description }) }),
+            selected.whenToUse && /* @__PURE__ */ jsxs77(Box80, { marginTop: 1, flexDirection: "column", children: [
+              /* @__PURE__ */ jsx103(Text75, { bold: true, color: theme.text.primary, children: "When to use" }),
+              /* @__PURE__ */ jsx103(Text75, { wrap: "wrap", children: selected.whenToUse })
+            ] })
+          ] }) })
+        ] }),
+        snapshot.skills.length > 0 && /* @__PURE__ */ jsx103(Box80, { marginTop: 1, children: /* @__PURE__ */ jsx103(Text75, { color: theme.text.secondary, children: "Type /name to invoke a Skill through DSH." }) })
+      ]
+    }
+  );
+}
+
+// src/ui/commands/skills-command.ts
+var skillsCommand = {
+  name: "skills",
+  description: "Inspect Skills visible to the current DSH Agent",
+  kind: "built-in" /* BUILT_IN */,
+  autoExecute: true,
+  action: async (context, args) => {
+    if (args.trim().length > 0) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "Usage: /skills"
+      };
+    }
+    const runtime = context.services.skillCatalog;
+    if (runtime === void 0) {
+      return {
+        type: "message",
+        messageType: "error",
+        content: "DSH Skill catalog is unavailable."
+      };
+    }
+    await runtime.prepare(context.invocation.signal);
+    return {
+      type: "custom_dialog",
+      component: React26.createElement(SkillsDialog, {
+        runtime,
+        onClose: context.ui.removeComponent
+      })
+    };
+  }
+};
+
 // src/services/builtin-command-loader.ts
 var BuiltinCommandLoader = class {
   constructor(enableProfiler = false) {
@@ -21913,6 +22290,8 @@ var BuiltinCommandLoader = class {
       changelogCommand,
       statsCommand,
       toolsCommand,
+      skillsCommand,
+      presetCommand,
       agentsCommand,
       btwCommand,
       mainCommand,
@@ -21957,6 +22336,7 @@ var DshCommandLoader = class {
           const invocation = context.invocation;
           const result = await this.runtime.execute(
             invocation.raw,
+            invocation.attachments ?? [],
             invocation.signal
           );
           if (result.text === void 0) return;
@@ -21971,19 +22351,39 @@ 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, sideConversation, subagentCatalog) => {
-  const session = useSessionStats();
-  const [commands, setCommands] = useState44(
-    void 0
+// src/services/skill-command-loader.ts
+var SkillCommandLoader = class {
+  constructor(runtime) {
+    this.runtime = runtime;
+  }
+  loadCommands(signal) {
+    signal.throwIfAborted();
+    return Promise.resolve(
+      this.runtime.getSnapshot().skills.map((skill) => ({
+        name: skill.name,
+        description: skill.description,
+        inputHint: "[request]",
+        kind: "skill" /* SKILL */,
+        autoExecute: false,
+        recordInvocation: false
+      }))
+    );
+  }
+};
+
+// 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, sideConversation, subagentCatalog, agentPreset, skillCatalog) => {
+  const session = useSessionStats();
+  const [commands, setCommands] = useState47(
+    void 0
   );
-  const [reloadTrigger, setReloadTrigger] = useState44(0);
+  const [reloadTrigger, setReloadTrigger] = useState47(0);
   const commandAbortRef = useRef25(void 0);
-  const reloadCommands = useCallback40(() => {
+  const reloadCommands = useCallback41(() => {
     setReloadTrigger((v) => v + 1);
   }, []);
-  const [confirmationRequest, setConfirmationRequest] = useState44(null);
-  const commandContext = useMemo38(
+  const [confirmationRequest, setConfirmationRequest] = useState47(null);
+  const commandContext = useMemo40(
     () => ({
       services: {
         modelSelection,
@@ -21992,7 +22392,9 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
         sessionManagement,
         toolCatalog,
         sideConversation,
-        subagentCatalog
+        subagentCatalog,
+        agentPreset,
+        skillCatalog
       },
       ui: {
         addItem,
@@ -22023,6 +22425,8 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
       toolCatalog,
       sideConversation,
       subagentCatalog,
+      agentPreset,
+      skillCatalog,
       loadHistory,
       addItem,
       clearItems,
@@ -22033,10 +22437,11 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
       setCustomDialog
     ]
   );
-  useEffect44(() => {
+  useEffect45(() => {
     const controller = new AbortController();
     (async () => {
       const loaders = [
+        ...skillCatalog === void 0 ? [] : [new SkillCommandLoader(skillCatalog)],
         ...dshCommands === void 0 ? [] : [new DshCommandLoader(dshCommands)],
         new BuiltinCommandLoader(enableProfiler)
       ];
@@ -22049,14 +22454,18 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
     return () => {
       controller.abort();
     };
-  }, [dshCommands, enableProfiler, reloadTrigger]);
-  useEffect44(
+  }, [dshCommands, enableProfiler, reloadTrigger, skillCatalog]);
+  useEffect45(
     () => dshCommands?.subscribe(reloadCommands),
     [dshCommands, reloadCommands]
   );
-  useEffect44(() => () => commandAbortRef.current?.abort(), []);
-  const handleSlashCommand = useCallback40(
-    async (rawQuery, overwriteConfirmed, addToHistory = true) => {
+  useEffect45(
+    () => skillCatalog?.subscribe(reloadCommands),
+    [skillCatalog, reloadCommands]
+  );
+  useEffect45(() => () => commandAbortRef.current?.abort(), []);
+  const handleSlashCommand = useCallback41(
+    async (rawQuery, overwriteConfirmed, addToHistory = true, attachments = []) => {
       if (!commands) {
         return false;
       }
@@ -22064,19 +22473,32 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
       if (!trimmed.startsWith("/") && !trimmed.startsWith("?")) {
         return false;
       }
+      const { commandToExecute, args } = parseSlashCommand(trimmed, commands);
+      if (commandToExecute?.kind === "skill" /* SKILL */) return false;
       setIsProcessing(true);
       const commandController = new AbortController();
       commandAbortRef.current?.abort();
       commandAbortRef.current = commandController;
-      const { commandToExecute, args } = parseSlashCommand(trimmed, commands);
-      if (addToHistory && commandToExecute?.recordInvocation !== false) {
-        const userMessageTimestamp = Date.now();
-        addItem(
-          { type: "user" /* USER */, text: trimmed },
-          userMessageTimestamp
-        );
-      }
       try {
+        if (attachments.length > 0 && commandToExecute?.kind === "built-in" /* BUILT_IN */) {
+          throw new Error(
+            `/${commandToExecute.name} does not accept image attachments.`
+          );
+        }
+        if (commandToExecute === void 0 && skillCatalog !== void 0) {
+          await skillCatalog.prepare(commandController.signal);
+          const name2 = /^\/([^\s]+)/.exec(trimmed)?.[1];
+          const dshOwnsName = dshCommands?.getSnapshot().commands.some((command) => command.name === name2);
+          const skillOwnsName = skillCatalog.getSnapshot().skills.some((skill) => skill.name === name2);
+          if (!dshOwnsName && skillOwnsName) return false;
+        }
+        if (addToHistory && commandToExecute?.recordInvocation !== false) {
+          const userMessageTimestamp = Date.now();
+          addItem(
+            { type: "user" /* USER */, text: trimmed },
+            userMessageTimestamp
+          );
+        }
         if (commandToExecute) {
           if (commandToExecute.action) {
             const fullCommandContext = {
@@ -22085,7 +22507,8 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
                 raw: trimmed,
                 name: commandToExecute.name,
                 args,
-                signal: commandController.signal
+                signal: commandController.signal,
+                attachments
               },
               overwriteConfirmed
             };
@@ -22150,7 +22573,8 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
                   return await handleSlashCommand(
                     result.originalInvocation.raw,
                     true,
-                    false
+                    false,
+                    attachments
                   );
                 }
                 case "custom_dialog": {
@@ -22176,6 +22600,7 @@ ${commandToExecute.subCommands.map((sc) => `  - ${sc.name}: ${sc.description ||
         if (dshCommands !== void 0) {
           const result = await dshCommands.execute(
             trimmed,
+            attachments,
             commandController.signal
           );
           if (result.text !== void 0) {
@@ -22195,6 +22620,7 @@ ${commandToExecute.subCommands.map((sc) => `  - ${sc.name}: ${sc.description ||
         );
         return { type: "handled" };
       } catch (e) {
+        if (commandController.signal.aborted) return { type: "handled" };
         addItem(
           {
             type: "error" /* ERROR */,
@@ -22216,6 +22642,7 @@ ${commandToExecute.subCommands.map((sc) => `  - ${sc.name}: ${sc.description ||
       commands,
       commandContext,
       dshCommands,
+      skillCatalog,
       setIsProcessing,
       setConfirmationRequest,
       setCustomDialog
@@ -22237,13 +22664,13 @@ import * as fs12 from "node:fs";
 import { basename as basename3, join as join6 } from "node:path";
 
 // src/ui/hooks/commands/use-settings-command.ts
-import { useState as useState45, useCallback as useCallback41 } from "react";
+import { useState as useState48, useCallback as useCallback42 } from "react";
 function useSettingsCommand() {
-  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = useState45(false);
-  const openSettingsDialog = useCallback41(() => {
+  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = useState48(false);
+  const openSettingsDialog = useCallback42(() => {
     setIsSettingsDialogOpen(true);
   }, []);
-  const closeSettingsDialog = useCallback41(() => {
+  const closeSettingsDialog = useCallback42(() => {
     setIsSettingsDialogOpen(false);
   }, []);
   return {
@@ -22254,11 +22681,11 @@ function useSettingsCommand() {
 }
 
 // src/ui/hooks/commands/use-theme-command.ts
-import { useState as useState46, useCallback as useCallback42 } from "react";
+import { useState as useState49, useCallback as useCallback43 } from "react";
 import process6 from "node:process";
 var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError) => {
-  const [isThemeDialogOpen, setIsThemeDialogOpen] = useState46(!!initialThemeError);
-  const openThemeDialog = useCallback42(() => {
+  const [isThemeDialogOpen, setIsThemeDialogOpen] = useState49(!!initialThemeError);
+  const openThemeDialog = useCallback43(() => {
     if (process6.env["NO_COLOR"]) {
       addItem(
         {
@@ -22271,7 +22698,7 @@ var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError
     }
     setIsThemeDialogOpen(true);
   }, [addItem]);
-  const applyTheme = useCallback42(
+  const applyTheme = useCallback43(
     (themeName) => {
       if (!themeManager.setActiveTheme(themeName)) {
         setIsThemeDialogOpen(true);
@@ -22282,17 +22709,17 @@ var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError
     },
     [setThemeError]
   );
-  const handleThemeHighlight = useCallback42(
+  const handleThemeHighlight = useCallback43(
     (themeName) => {
       applyTheme(themeName);
     },
     [applyTheme]
   );
-  const closeThemeDialog = useCallback42(() => {
+  const closeThemeDialog = useCallback43(() => {
     applyTheme(loadedSettings.merged.ui.theme);
     setIsThemeDialogOpen(false);
   }, [applyTheme, loadedSettings]);
-  const handleThemeSelect = useCallback42(
+  const handleThemeSelect = useCallback43(
     (themeName, scope) => {
       try {
         const mergedCustomThemes = {
@@ -22328,7 +22755,7 @@ var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError
 };
 
 // src/ui/hooks/input/use-vim.ts
-import { useCallback as useCallback43, useReducer as useReducer5, useEffect as useEffect45, useRef as useRef26 } from "react";
+import { useCallback as useCallback44, useReducer as useReducer5, useEffect as useEffect46, useRef as useRef26 } from "react";
 var DIGIT_MULTIPLIER = 10;
 var DEFAULT_COUNT = 1;
 var DIGIT_1_TO_9 = /^[1-9]$/;
@@ -22394,21 +22821,21 @@ function useVim(buffer, onSubmit) {
   const { vimEnabled, vimMode, setVimMode } = useVimMode();
   const [state, dispatch] = useReducer5(vimReducer, initialVimState);
   const lastEscapeTimestampRef = useRef26(0);
-  useEffect45(() => {
+  useEffect46(() => {
     dispatch({ type: "SET_MODE", mode: vimMode });
   }, [vimMode]);
-  const updateMode = useCallback43(
+  const updateMode = useCallback44(
     (mode) => {
       setVimMode(mode);
       dispatch({ type: "SET_MODE", mode });
     },
     [setVimMode]
   );
-  const getCurrentCount = useCallback43(
+  const getCurrentCount = useCallback44(
     () => state.count || DEFAULT_COUNT,
     [state.count]
   );
-  const checkDoubleEscape = useCallback43(() => {
+  const checkDoubleEscape = useCallback44(() => {
     const now = Date.now();
     const lastEscape = lastEscapeTimestampRef.current;
     lastEscapeTimestampRef.current = now;
@@ -22418,7 +22845,7 @@ function useVim(buffer, onSubmit) {
     }
     return false;
   }, []);
-  const executeCommand = useCallback43(
+  const executeCommand = useCallback44(
     (cmdType, count) => {
       switch (cmdType) {
         case CMD_TYPES.DELETE_WORD_FORWARD: {
@@ -22494,7 +22921,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, updateMode]
   );
-  const handleInsertModeInput = useCallback43(
+  const handleInsertModeInput = useCallback44(
     (normalizedKey) => {
       if (keyMatchers["basic.cancel" /* ESCAPE */](normalizedKey)) {
         checkDoubleEscape();
@@ -22526,7 +22953,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, dispatch, updateMode, onSubmit, checkDoubleEscape]
   );
-  const normalizeKey = useCallback43(
+  const normalizeKey = useCallback44(
     (key) => ({
       name: key.name || "",
       sequence: key.sequence || "",
@@ -22538,7 +22965,7 @@ function useVim(buffer, onSubmit) {
     }),
     []
   );
-  const handleChangeMovement = useCallback43(
+  const handleChangeMovement = useCallback44(
     (movement) => {
       const count = getCurrentCount();
       dispatch({ type: "CLEAR_COUNT" });
@@ -22559,7 +22986,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, dispatch, buffer, updateMode]
   );
-  const handleOperatorMotion = useCallback43(
+  const handleOperatorMotion = useCallback44(
     (operator, motion) => {
       const count = getCurrentCount();
       const commandMap = {
@@ -22586,7 +23013,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, executeCommand, dispatch]
   );
-  const handleInput = useCallback43(
+  const handleInput = useCallback44(
     (key) => {
       if (!vimEnabled) {
         return false;
@@ -22893,13 +23320,13 @@ function useVim(buffer, onSubmit) {
 }
 
 // src/ui/hooks/session/use-git-branch-name.ts
-import { useState as useState47, useEffect as useEffect46, useCallback as useCallback44 } from "react";
+import { useState as useState50, useEffect as useEffect47, useCallback as useCallback45 } from "react";
 import fs9 from "node:fs";
 import fsPromises2 from "node:fs/promises";
 import path11 from "node:path";
 function useGitBranchName(cwd) {
-  const [branchName, setBranchName] = useState47(void 0);
-  const fetchBranchName = useCallback44(async () => {
+  const [branchName, setBranchName] = useState50(void 0);
+  const fetchBranchName = useCallback45(async () => {
     try {
       const { stdout } = await spawnAsync(
         "git",
@@ -22921,7 +23348,7 @@ function useGitBranchName(cwd) {
       setBranchName(void 0);
     }
   }, [cwd, setBranchName]);
-  useEffect46(() => {
+  useEffect47(() => {
     fetchBranchName();
     const gitLogsHeadPath = path11.join(cwd, ".git", "logs", "HEAD");
     let watcher;
@@ -22948,7 +23375,7 @@ function useGitBranchName(cwd) {
 }
 
 // src/ui/hooks/settings/use-editor-settings.ts
-import { useState as useState48, useCallback as useCallback45 } from "react";
+import { useState as useState51, useCallback as useCallback46 } from "react";
 
 // src/config/setting-paths.ts
 var SettingPaths = {
@@ -22959,11 +23386,11 @@ var SettingPaths = {
 
 // src/ui/hooks/settings/use-editor-settings.ts
 var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
-  const [isEditorDialogOpen, setIsEditorDialogOpen] = useState48(false);
-  const openEditorDialog = useCallback45(() => {
+  const [isEditorDialogOpen, setIsEditorDialogOpen] = useState51(false);
+  const openEditorDialog = useCallback46(() => {
     setIsEditorDialogOpen(true);
   }, []);
-  const handleEditorSelect = useCallback45(
+  const handleEditorSelect = useCallback46(
     (editorType, scope) => {
       if (editorType && !checkHasEditorType(editorType)) {
         return;
@@ -22989,7 +23416,7 @@ var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
     },
     [loadedSettings, setEditorError, addItem]
   );
-  const exitEditorDialog = useCallback45(() => {
+  const exitEditorDialog = useCallback46(() => {
     setIsEditorDialogOpen(false);
   }, []);
   return {
@@ -23001,12 +23428,12 @@ var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
 };
 
 // src/ui/hooks/terminal/use-memory-monitor.ts
-import { useEffect as useEffect47 } from "react";
+import { useEffect as useEffect48 } from "react";
 import process7 from "node:process";
 var MEMORY_WARNING_THRESHOLD = 7 * 1024 * 1024 * 1024;
 var MEMORY_CHECK_INTERVAL = 60 * 1e3;
 var useMemoryMonitor = ({ addItem }) => {
-  useEffect47(() => {
+  useEffect48(() => {
     const intervalId = setInterval(() => {
       const usage = process7.memoryUsage().rss;
       if (usage > MEMORY_WARNING_THRESHOLD) {
@@ -23026,8 +23453,8 @@ var useMemoryMonitor = ({ addItem }) => {
 
 // src/ui/hooks/visual/use-console-messages.ts
 import {
-  useCallback as useCallback46,
-  useEffect as useEffect48,
+  useCallback as useCallback47,
+  useEffect as useEffect49,
   useReducer as useReducer6,
   useRef as useRef27,
   useTransition
@@ -23060,7 +23487,7 @@ function useConsoleMessages() {
   const messageQueueRef = useRef27([]);
   const timeoutRef = useRef27(null);
   const [, startTransition] = useTransition();
-  const processQueue = useCallback46(() => {
+  const processQueue = useCallback47(() => {
     if (messageQueueRef.current.length > 0) {
       const messagesToProcess = messageQueueRef.current;
       messageQueueRef.current = [];
@@ -23070,7 +23497,7 @@ function useConsoleMessages() {
     }
     timeoutRef.current = null;
   }, []);
-  const handleNewMessage = useCallback46(
+  const handleNewMessage = useCallback47(
     (message) => {
       messageQueueRef.current.push(message);
       if (!timeoutRef.current) {
@@ -23079,7 +23506,7 @@ function useConsoleMessages() {
     },
     [processQueue]
   );
-  useEffect48(() => {
+  useEffect49(() => {
     const handleConsoleLog = (payload) => {
       handleNewMessage({
         type: payload.type,
@@ -23098,7 +23525,7 @@ function useConsoleMessages() {
       coreEvents.off(CoreEvent.Output, handleOutput);
     };
   }, [handleNewMessage]);
-  const clearConsoleMessages = useCallback46(() => {
+  const clearConsoleMessages = useCallback47(() => {
     if (timeoutRef.current) {
       clearTimeout(timeoutRef.current);
       timeoutRef.current = null;
@@ -23108,7 +23535,7 @@ function useConsoleMessages() {
       dispatch({ type: "CLEAR" });
     });
   }, []);
-  useEffect48(
+  useEffect49(
     () => () => {
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
@@ -23120,13 +23547,13 @@ function useConsoleMessages() {
 }
 
 // src/ui/hooks/visual/use-timer.ts
-import { useState as useState49, useEffect as useEffect49, useRef as useRef28 } from "react";
+import { useState as useState52, useEffect as useEffect50, useRef as useRef28 } from "react";
 var useTimer = (isActive, resetKey) => {
-  const [elapsedTime, setElapsedTime] = useState49(0);
+  const [elapsedTime, setElapsedTime] = useState52(0);
   const timerRef = useRef28(null);
   const prevResetKeyRef = useRef28(resetKey);
   const prevIsActiveRef = useRef28(isActive);
-  useEffect49(() => {
+  useEffect50(() => {
     let shouldResetTime = false;
     if (prevResetKeyRef.current !== resetKey) {
       shouldResetTime = true;
@@ -23163,7 +23590,7 @@ var useTimer = (isActive, resetKey) => {
 };
 
 // src/ui/hooks/visual/use-phrase-cycler.ts
-import { useState as useState50, useEffect as useEffect50, useRef as useRef29 } from "react";
+import { useState as useState53, useEffect as useEffect51, useRef as useRef29 } from "react";
 
 // src/ui/components/indicators/loading-phrases.ts
 var WITTY_LOADING_PHRASES = [
@@ -23305,12 +23732,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] = useState50(
+  const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState53(
     loadingPhrases[0]
   );
   const phraseIntervalRef = useRef29(null);
   const hasShownFirstRequestTipRef = useRef29(false);
-  useEffect50(() => {
+  useEffect51(() => {
     if (phraseIntervalRef.current) {
       clearInterval(phraseIntervalRef.current);
       phraseIntervalRef.current = null;
@@ -23355,13 +23782,13 @@ var usePhraseCycler = (isActive, shouldShowFocusHint, customPhrases) => {
 };
 
 // src/ui/hooks/visual/use-loading-indicator.ts
-import { useState as useState51, useEffect as useEffect51, useRef as useRef30 } from "react";
+import { useState as useState54, useEffect as useEffect52, useRef as useRef30 } from "react";
 var useLoadingIndicator = ({
   streamingState,
   shouldShowFocusHint,
   customWittyPhrases
 }) => {
-  const [timerResetKey, setTimerResetKey] = useState51(0);
+  const [timerResetKey, setTimerResetKey] = useState54(0);
   const isTimerActive = streamingState === "responding" /* Responding */;
   const elapsedTimeFromTimer = useTimer(isTimerActive, timerResetKey);
   const isPhraseCyclingActive = streamingState === "responding" /* Responding */;
@@ -23371,7 +23798,7 @@ var useLoadingIndicator = ({
     customWittyPhrases
   );
   const prevStreamingStateRef = useRef30(null);
-  useEffect51(() => {
+  useEffect52(() => {
     if (streamingState === "idle" /* Idle */ && prevStreamingStateRef.current === "responding" /* Responding */) {
       setTimerResetKey((prevKey) => prevKey + 1);
     }
@@ -23384,18 +23811,18 @@ var useLoadingIndicator = ({
 };
 
 // src/ui/hooks/session/use-message-queue.ts
-import { useCallback as useCallback47, useEffect as useEffect52, useMemo as useMemo39, useState as useState52 } from "react";
+import { useCallback as useCallback48, useEffect as useEffect53, useMemo as useMemo41, useState as useState55 } from "react";
 function useMessageQueue({
   queueKey,
   streamingState,
   submitQuery
 }) {
-  const [queuedMessages, setQueuedMessages] = useState52([]);
-  const messageQueue = useMemo39(
+  const [queuedMessages, setQueuedMessages] = useState55([]);
+  const messageQueue = useMemo41(
     () => queuedMessages.filter((entry) => entry.key === queueKey).map((entry) => entry.message),
     [queueKey, queuedMessages]
   );
-  const addMessage = useCallback47((message) => {
+  const addMessage = useCallback48((message) => {
     const trimmedMessage = message.trim();
     if (trimmedMessage.length > 0) {
       setQueuedMessages((previous) => [
@@ -23404,16 +23831,16 @@ function useMessageQueue({
       ]);
     }
   }, [queueKey]);
-  const clearQueue = useCallback47(() => {
+  const clearQueue = useCallback48(() => {
     setQueuedMessages(
       (previous) => previous.filter((entry) => entry.key !== queueKey)
     );
   }, [queueKey]);
-  const getQueuedMessagesText = useCallback47(() => {
+  const getQueuedMessagesText = useCallback48(() => {
     if (messageQueue.length === 0) return "";
     return messageQueue.join("\n\n");
   }, [messageQueue]);
-  const popAllMessages = useCallback47(() => {
+  const popAllMessages = useCallback48(() => {
     if (messageQueue.length === 0) {
       return void 0;
     }
@@ -23423,7 +23850,7 @@ function useMessageQueue({
     );
     return allMessages;
   }, [messageQueue, queueKey]);
-  useEffect52(() => {
+  useEffect53(() => {
     if (streamingState === "idle" /* Idle */ && messageQueue.length > 0) {
       const combinedMessage = messageQueue.join("\n\n");
       setQueuedMessages(
@@ -23442,16 +23869,16 @@ function useMessageQueue({
 }
 
 // src/ui/hooks/input/use-input-history-store.ts
-import { useCallback as useCallback48, useRef as useRef31, useState as useState53 } from "react";
+import { useCallback as useCallback49, useRef as useRef31, useState as useState56 } from "react";
 function deduplicateConsecutive(messages) {
   return messages.filter(
     (message, index) => index === 0 || message !== messages[index - 1]
   );
 }
 function useInputHistoryStore() {
-  const [inputHistory, setInputHistory] = useState53([]);
+  const [inputHistory, setInputHistory] = useState56([]);
   const initializationStarted = useRef31(false);
-  const initializeFromHistory = useCallback48(
+  const initializeFromHistory = useCallback49(
     async (history) => {
       if (initializationStarted.current) return;
       initializationStarted.current = true;
@@ -23472,7 +23899,7 @@ function useInputHistoryStore() {
     },
     []
   );
-  const addInput = useCallback48(
+  const addInput = useCallback49(
     (input) => {
       const trimmedInput = input.trim();
       if (!trimmedInput) return;
@@ -23572,12 +23999,12 @@ var PromptHistoryStore = class {
 };
 
 // src/ui/hooks/ai/use-turn-activity-monitor.ts
-import { useState as useState54, useEffect as useEffect53, useRef as useRef32 } from "react";
+import { useState as useState57, useEffect as useEffect54, useRef as useRef32 } from "react";
 var useTurnActivityMonitor = (streamingState, activePtyId) => {
-  const [operationStartTime, setOperationStartTime] = useState54(0);
+  const [operationStartTime, setOperationStartTime] = useState57(0);
   const prevPtyIdRef = useRef32(void 0);
   const prevStreamingStateRef = useRef32(void 0);
-  useEffect53(() => {
+  useEffect54(() => {
     const isNowResponding = streamingState === "responding" /* Responding */;
     const wasResponding = prevStreamingStateRef.current === "responding" /* Responding */;
     const ptyChanged = activePtyId !== prevPtyIdRef.current;
@@ -23636,7 +24063,7 @@ var useShellInactivityStatus = ({
 };
 
 // src/ui/hooks/input/use-local-shell-command.ts
-import { useCallback as useCallback49, useEffect as useEffect54, useRef as useRef33, useState as useState55 } from "react";
+import { useCallback as useCallback50, useEffect as useEffect55, useRef as useRef33, useState as useState58 } from "react";
 import crypto2 from "node:crypto";
 import fs11 from "node:fs";
 import os3 from "node:os";
@@ -23655,18 +24082,18 @@ function useLocalShellCommand({
 }) {
   const controllerRef = useRef33(void 0);
   const mountedRef = useRef33(true);
-  const [isExecuting, setIsExecuting] = useState55(false);
-  const [activePtyId, setActivePtyId] = useState55(void 0);
-  const [lastOutputTime, setLastOutputTime] = useState55(0);
-  const cancel = useCallback49(() => controllerRef.current?.abort(), []);
-  useEffect54(() => {
+  const [isExecuting, setIsExecuting] = useState58(false);
+  const [activePtyId, setActivePtyId] = useState58(void 0);
+  const [lastOutputTime, setLastOutputTime] = useState58(0);
+  const cancel = useCallback50(() => controllerRef.current?.abort(), []);
+  useEffect55(() => {
     mountedRef.current = true;
     return () => {
       mountedRef.current = false;
       controllerRef.current?.abort();
     };
   }, []);
-  const execute = useCallback49(
+  const execute = useCallback50(
     (rawCommand) => {
       const command = rawCommand.trim();
       if (command.length === 0 || controllerRef.current !== void 0) {
@@ -23865,7 +24292,7 @@ ${output}`;
 }
 
 // src/ui/app-container.tsx
-import { jsx as jsx102 } from "react/jsx-runtime";
+import { jsx as jsx104 } from "react/jsx-runtime";
 var SHELL_WIDTH_FRACTION = 0.89;
 var SHELL_HEIGHT_PADDING = 10;
 var noopExternalStoreSubscribe = () => () => {
@@ -23885,6 +24312,7 @@ var EMPTY_SUBAGENT_CATALOG_SNAPSHOT = {
 };
 var emptySubagentCatalogSnapshot = () => EMPTY_SUBAGENT_CATALOG_SNAPSHOT;
 var AppContainer = (props) => {
+  const { isReady: isKeypressReady } = useKeypressContext();
   const {
     config,
     initializationResult,
@@ -23900,38 +24328,40 @@ var AppContainer = (props) => {
     permissionSelectionRuntime,
     interactionModeRuntime,
     toolCatalogRuntime,
+    agentPresetRuntime,
+    skillCatalogRuntime,
     sideConversationRuntime,
     subagentCatalogRuntime
   } = props;
   const historyManager = useHistory();
-  const conversationSnapshot = useSyncExternalStore6(
+  const conversationSnapshot = useSyncExternalStore8(
     conversationRuntime.subscribe,
     conversationRuntime.getSnapshot,
     conversationRuntime.getSnapshot
   );
-  const sideConversationSnapshot = useSyncExternalStore6(
+  const sideConversationSnapshot = useSyncExternalStore8(
     sideConversationRuntime?.subscribeWorkspace ?? noopExternalStoreSubscribe,
     sideConversationRuntime?.getWorkspaceSnapshot ?? emptySideConversationSnapshot,
     sideConversationRuntime?.getWorkspaceSnapshot ?? emptySideConversationSnapshot
   );
-  const subagentCatalogSnapshot = useSyncExternalStore6(
+  const subagentCatalogSnapshot = useSyncExternalStore8(
     subagentCatalogRuntime?.subscribe ?? noopExternalStoreSubscribe,
     subagentCatalogRuntime?.getSnapshot ?? emptySubagentCatalogSnapshot,
     subagentCatalogRuntime?.getSnapshot ?? emptySubagentCatalogSnapshot
   );
-  const approvalSnapshot = useSyncExternalStore6(
+  const approvalSnapshot = useSyncExternalStore8(
     approvalRuntime.subscribe,
     approvalRuntime.getSnapshot,
     approvalRuntime.getSnapshot
   );
   const pendingApproval = approvalSnapshot.pending[0];
-  const userQuestionSnapshot = useSyncExternalStore6(
+  const userQuestionSnapshot = useSyncExternalStore8(
     userQuestionRuntime.subscribe,
     userQuestionRuntime.getSnapshot,
     userQuestionRuntime.getSnapshot
   );
   const pendingUserQuestion = userQuestionSnapshot.pending[0];
-  const interactionModeSnapshot = useSyncExternalStore6(
+  const interactionModeSnapshot = useSyncExternalStore8(
     interactionModeRuntime.subscribe,
     interactionModeRuntime.getSnapshot,
     interactionModeRuntime.getSnapshot
@@ -23939,15 +24369,15 @@ var AppContainer = (props) => {
   const conversationHistoryIds = useRef34(/* @__PURE__ */ new Map());
   const conversationHistoryTexts = useRef34(/* @__PURE__ */ new Map());
   const conversationSessionId = conversationRuntime.getSessionStats().sessionId;
-  const [projectedSessionId, setProjectedSessionId] = useState56(
+  const [projectedSessionId, setProjectedSessionId] = useState59(
     conversationSessionId
   );
   const promptInputAbortRef = useRef34(void 0);
-  const [promptInputPreparing, setPromptInputPreparing] = useState56(false);
+  const [promptInputPreparing, setPromptInputPreparing] = useState59(false);
   const addConversationHistoryItem = historyManager.addItem;
   const updateConversationHistoryItem = historyManager.updateItem;
   const clearConversationHistory = historyManager.clearItems;
-  useEffect55(() => {
+  useEffect56(() => {
     if (projectedSessionId !== conversationSessionId) {
       conversationHistoryIds.current.clear();
       conversationHistoryTexts.current.clear();
@@ -23992,32 +24422,32 @@ var AppContainer = (props) => {
   useMemoryMonitor(historyManager);
   const settings = useSettings();
   const isAlternateBuffer = useAlternateBuffer();
-  const [debugMessage, setDebugMessage] = useState56("");
-  const [quittingMessages, setQuittingMessages] = useState56(null);
-  const [themeError, setThemeError] = useState56(
+  const [debugMessage, setDebugMessage] = useState59("");
+  const [quittingMessages, setQuittingMessages] = useState59(null);
+  const [themeError, setThemeError] = useState59(
     initializationResult.themeError
   );
-  const [isProcessing, setIsProcessing] = useState56(false);
-  const [embeddedShellFocused, setEmbeddedShellFocused] = useState56(false);
+  const [isProcessing, setIsProcessing] = useState59(false);
+  const [embeddedShellFocused, setEmbeddedShellFocused] = useState59(false);
   const enableProfiler = config.getDebugMode() || process8.env["NODE_ENV"] === "development";
-  const [showDebugProfiler, setShowDebugProfiler] = useState56(enableProfiler);
-  const [customDialog, setCustomDialog] = useState56(
+  const [showDebugProfiler, setShowDebugProfiler] = useState59(enableProfiler);
+  const [customDialog, setCustomDialog] = useState59(
     null
   );
-  const [copyModeEnabled, setCopyModeEnabled] = useState56(false);
-  const [pendingRestorePrompt, setPendingRestorePrompt] = useState56(false);
-  const [shellModeActive, setShellModeActive] = useState56(false);
-  const [pendingShellHistoryItem, setPendingShellHistoryItem] = useState56(null);
-  const [historyRemountKey, setHistoryRemountKey] = useState56(0);
-  const [settingsNonce, setSettingsNonce] = useState56(0);
-  const [queueErrorMessage, setQueueErrorMessage] = useState56(
+  const [copyModeEnabled, setCopyModeEnabled] = useState59(false);
+  const [pendingRestorePrompt, setPendingRestorePrompt] = useState59(false);
+  const [shellModeActive, setShellModeActive] = useState59(false);
+  const [pendingShellHistoryItem, setPendingShellHistoryItem] = useState59(null);
+  const [historyRemountKey, setHistoryRemountKey] = useState59(0);
+  const [settingsNonce, setSettingsNonce] = useState59(0);
+  const [queueErrorMessage, setQueueErrorMessage] = useState59(
     null
   );
-  const toggleDebugProfiler = useCallback50(
+  const toggleDebugProfiler = useCallback51(
     () => setShowDebugProfiler((visible) => !visible),
     []
   );
-  const togglePlanMode = useCallback50(
+  const togglePlanMode = useCallback51(
     (active) => {
       void interactionModeRuntime.togglePlan(void 0, active).catch((error) => {
         setQueueErrorMessage(getErrorMessage(error));
@@ -24025,10 +24455,10 @@ var AppContainer = (props) => {
     },
     [interactionModeRuntime]
   );
-  const [modelSelectionSnapshot, setModelSelectionSnapshot] = useState56(
+  const [modelSelectionSnapshot, setModelSelectionSnapshot] = useState59(
     () => modelSelectionRuntime?.getSnapshot()
   );
-  useEffect55(
+  useEffect56(
     () => modelSelectionRuntime?.subscribe(
       () => setModelSelectionSnapshot(modelSelectionRuntime.getSnapshot())
     ),
@@ -24036,13 +24466,13 @@ var AppContainer = (props) => {
   );
   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(
+  const providerSetupSnapshot = useSyncExternalStore8(
     providerSetupRuntime?.subscribe ?? noopExternalStoreSubscribe,
     providerSetupRuntime?.getSnapshot ?? emptyProviderSetupSnapshot,
     providerSetupRuntime?.getSnapshot ?? emptyProviderSetupSnapshot
   );
-  const [providerSetupDismissed, setProviderSetupDismissed] = useState56(false);
-  const promptHistory = useMemo40(
+  const [providerSetupDismissed, setProviderSetupDismissed] = useState59(false);
+  const promptHistory = useMemo42(
     () => new PromptHistoryStore(
       join6(config.storage.getProjectTempDir(), "prompt_history.json")
     ),
@@ -24059,12 +24489,12 @@ var AppContainer = (props) => {
   const rootUiRef = useRef34(null);
   const lastTitleRef = useRef34(null);
   const staticExtraHeight = 3;
-  useEffect55(() => {
+  useEffect56(() => {
     void (async () => {
       startupProfiler.flush();
     })();
   }, []);
-  useEffect55(() => {
+  useEffect56(() => {
     const handleSettingsChanged = () => {
       setSettingsNonce((prev) => prev + 1);
     };
@@ -24075,19 +24505,19 @@ var AppContainer = (props) => {
   }, []);
   const { consoleMessages, clearConsoleMessages: clearConsoleMessagesState } = useConsoleMessages();
   const mainAreaWidth = calculateMainAreaWidth(terminalWidth, settings);
-  const { inputWidth, suggestionsWidth } = useMemo40(() => {
+  const { inputWidth, suggestionsWidth } = useMemo42(() => {
     const { inputWidth: inputWidth2, suggestionsWidth: suggestionsWidth2 } = calculatePromptWidths(mainAreaWidth);
     return { inputWidth: inputWidth2, suggestionsWidth: suggestionsWidth2 };
   }, [mainAreaWidth]);
   const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
-  const isValidPath = useCallback50((filePath) => {
+  const isValidPath = useCallback51((filePath) => {
     try {
       return fs12.existsSync(filePath) && fs12.statSync(filePath).isFile();
     } catch (_e) {
       return false;
     }
   }, []);
-  const getPreferredEditor = useCallback50(
+  const getPreferredEditor = useCallback51(
     () => settings.merged.general.preferredEditor,
     [settings.merged.general.preferredEditor]
   );
@@ -24100,16 +24530,16 @@ var AppContainer = (props) => {
     shellModeActive,
     getPreferredEditor
   });
-  useEffect55(() => {
+  useEffect56(() => {
     initializeFromHistory(promptHistory);
   }, [initializeFromHistory, promptHistory]);
-  const refreshStatic = useCallback50(() => {
+  const refreshStatic = useCallback51(() => {
     if (!isAlternateBuffer) {
       stdout.write(ansiEscapes.clearTerminal);
     }
     setHistoryRemountKey((prev) => prev + 1);
   }, [setHistoryRemountKey, isAlternateBuffer, stdout]);
-  const handleEditorClose = useCallback50(() => {
+  const handleEditorClose = useCallback51(() => {
     if (shouldEnterAlternateScreen(isAlternateBuffer, config.getScreenReader())) {
       enterAlternateScreen();
       resumeMouseEvents();
@@ -24119,7 +24549,7 @@ var AppContainer = (props) => {
     terminalCapabilityManager.enableSupportedModes();
     refreshStatic();
   }, [refreshStatic, isAlternateBuffer, app, config]);
-  useEffect55(() => {
+  useEffect56(() => {
     coreEvents.on(CoreEvent.ExternalEditorClosed, handleEditorClose);
     return () => {
       coreEvents.off(CoreEvent.ExternalEditorClosed, handleEditorClose);
@@ -24137,7 +24567,7 @@ var AppContainer = (props) => {
     historyManager.addItem,
     initializationResult.themeError
   );
-  const [editorError, setEditorError] = useState56(null);
+  const [editorError, setEditorError] = useState59(null);
   const {
     isEditorDialogOpen,
     openEditorDialog,
@@ -24146,7 +24576,7 @@ var AppContainer = (props) => {
   } = useEditorSettings(settings, setEditorError, historyManager.addItem);
   const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } = useSettingsCommand();
   const { toggleVimEnabled } = useVimMode();
-  const slashCommandActions = useMemo40(
+  const slashCommandActions = useMemo42(
     () => ({
       openThemeDialog,
       openEditorDialog,
@@ -24193,10 +24623,12 @@ var AppContainer = (props) => {
     enableProfiler,
     providerSetupRuntime,
     sideConversationRuntime,
-    subagentCatalogRuntime
+    subagentCatalogRuntime,
+    agentPresetRuntime,
+    skillCatalogRuntime
   );
   const commandPreparationRef = useRef34(void 0);
-  useEffect55(() => {
+  useEffect56(() => {
     if (!isSlashCommand(buffer.text.trim()) || commandPreparationRef.current !== void 0) {
       return;
     }
@@ -24212,12 +24644,12 @@ var AppContainer = (props) => {
       }
     });
   }, [buffer.text, commandRuntime]);
-  useEffect55(() => () => commandPreparationRef.current?.abort(), []);
+  useEffect56(() => () => commandPreparationRef.current?.abort(), []);
   const cancelHandlerRef = useRef34(
     () => {
     }
   );
-  useEffect55(() => {
+  useEffect56(() => {
     if (pendingRestorePrompt) {
       const lastHistoryUserMsg = historyManager.history.findLast(
         (h) => h.type === "user"
@@ -24230,7 +24662,7 @@ var AppContainer = (props) => {
     }
   }, [pendingRestorePrompt, inputHistory, historyManager.history]);
   const initError = initializationResult.initError;
-  const todos = useMemo40(
+  const todos = useMemo42(
     () => ({
       todos: conversationSnapshot.todos.map((todo) => ({
         description: todo.content,
@@ -24255,12 +24687,8 @@ var AppContainer = (props) => {
     terminalHeight
   });
   const streamingState = conversationSnapshot.busy || promptInputPreparing || localShellExecuting || isProcessing ? "responding" /* Responding */ : "idle" /* Idle */;
-  const submitQuery = useCallback50(
+  const submitQuery = useCallback51(
     (query) => {
-      if (isSlashCommand(query.trim())) {
-        void handleSlashCommand(query);
-        return;
-      }
       promptInputAbortRef.current?.abort();
       const controller = new AbortController();
       promptInputAbortRef.current = controller;
@@ -24276,12 +24704,33 @@ var AppContainer = (props) => {
         content: [{ type: "text", text: query }],
         displayContent: [{ type: "text", text: query }]
       });
-      void prepared.then(
-        (input) => conversationRuntime.submit({
+      void prepared.then(async (input) => {
+        if (isSlashCommand(query.trim())) {
+          const line = input.displayContent.filter((part) => part.type === "text").map((part) => part.text).join("");
+          const attachments = input.content.filter((part) => part.type === "image-source").map((part) => ({
+            sourceKind: part.source.kind,
+            path: part.source.path,
+            mediaType: part.declaredMediaType,
+            name: part.displayName
+          }));
+          if (attachments.length > 0 && commandRuntime.attachmentPolicy?.(line) === false) {
+            throw new Error(
+              `The DSH command in ${line.trim()} does not accept image attachments.`
+            );
+          }
+          const handled = await handleSlashCommand(
+            line,
+            void 0,
+            true,
+            attachments
+          );
+          if (handled !== false) return;
+        }
+        await conversationRuntime.submit({
           ...input,
           signal: controller.signal
-        })
-      ).catch((error) => {
+        });
+      }).catch((error) => {
         buffer.setText(query);
         if (!(error instanceof Error && error.name === "AbortError")) {
           debugLogger.debug(
@@ -24305,23 +24754,24 @@ var AppContainer = (props) => {
       config,
       promptInputRuntime,
       handleSlashCommand,
+      commandRuntime,
       buffer
     ]
   );
-  const cancelOngoingRequest = useCallback50(() => {
+  const cancelOngoingRequest = useCallback51(() => {
     cancelCommand();
     cancelLocalShell();
     promptInputAbortRef.current?.abort();
     conversationRuntime.cancel();
   }, [cancelCommand, cancelLocalShell, conversationRuntime]);
-  useEffect55(
+  useEffect56(
     () => () => {
       promptInputAbortRef.current?.abort();
     },
     []
   );
   const lastOutputTimeRef = useRef34(0);
-  useEffect55(() => {
+  useEffect56(() => {
     lastOutputTimeRef.current = lastOutputTime;
   }, [lastOutputTime]);
   const { shouldShowFocusHint, inactivityStatus } = useShellInactivityStatus({
@@ -24344,7 +24794,7 @@ var AppContainer = (props) => {
     streamingState,
     submitQuery
   });
-  cancelHandlerRef.current = useCallback50(
+  cancelHandlerRef.current = useCallback51(
     (shouldRestorePrompt = true) => {
       const lastUserMessage = inputHistory.at(-1);
       let textToSet = shouldRestorePrompt ? lastUserMessage || "" : "";
@@ -24361,7 +24811,7 @@ ${queuedText}` : queuedText;
     },
     [buffer, inputHistory, getQueuedMessagesText, clearQueue]
   );
-  const handleFinalSubmit = useCallback50(
+  const handleFinalSubmit = useCallback51(
     (submittedValue) => {
       if (shellModeActive) {
         executeLocalShell(submittedValue);
@@ -24396,14 +24846,14 @@ ${queuedText}` : queuedText;
       streamingState
     ]
   );
-  const handleClearScreen = useCallback50(() => {
+  const handleClearScreen = useCallback51(() => {
     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] = useState56(0);
+  const [controlsHeight, setControlsHeight] = useState59(0);
   useLayoutEffect5(() => {
     if (mainControlsRef.current) {
       const fullFooterMeasurement = measureElement3(mainControlsRef.current);
@@ -24427,18 +24877,18 @@ ${queuedText}` : queuedText;
     sanitizationConfig: config.sanitizationConfig
   });
   const isFocused = useFocus();
-  const initialPrompt = useMemo40(
+  const initialPrompt = useMemo42(
     () => props.initialPrompt ?? config.getQuestion(),
     [config, props.initialPrompt]
   );
   const initialPromptSubmitted = useRef34(false);
   const providerSetupRequired = providerSetupSnapshot?.current.status === "missing";
-  useEffect55(() => {
+  useEffect56(() => {
     if (!providerSetupRuntime || !providerSetupRequired || providerSetupDismissed || customDialog) {
       return;
     }
     setCustomDialog(
-      /* @__PURE__ */ jsx102(
+      /* @__PURE__ */ jsx104(
         ProviderSetupDialog,
         {
           runtime: providerSetupRuntime,
@@ -24465,7 +24915,7 @@ ${queuedText}` : queuedText;
     providerSetupRuntime,
     providerSetupSnapshot
   ]);
-  useEffect55(() => {
+  useEffect56(() => {
     if (activePtyId) {
       try {
         ShellExecutionService.resizePty(
@@ -24483,7 +24933,7 @@ ${queuedText}` : queuedText;
       }
     }
   }, [terminalWidth, availableTerminalHeight, activePtyId]);
-  useEffect55(() => {
+  useEffect56(() => {
     if (initialPrompt && !initialPromptSubmitted.current && !isThemeDialogOpen && !isEditorDialogOpen && !providerSetupRequired && !customDialog && conversationRuntime) {
       handleFinalSubmit(initialPrompt);
       initialPromptSubmitted.current = true;
@@ -24497,20 +24947,20 @@ ${queuedText}` : queuedText;
     customDialog,
     conversationRuntime
   ]);
-  const [showErrorDetails, setShowErrorDetails] = useState56(false);
-  const [showFullTodos, setShowFullTodos] = useState56(false);
-  const [renderMarkdown, setRenderMarkdown] = useState56(true);
-  const [ctrlCPressCount, setCtrlCPressCount] = useState56(0);
+  const [showErrorDetails, setShowErrorDetails] = useState59(false);
+  const [showFullTodos, setShowFullTodos] = useState59(false);
+  const [renderMarkdown, setRenderMarkdown] = useState59(true);
+  const [ctrlCPressCount, setCtrlCPressCount] = useState59(0);
   const ctrlCTimerRef = useRef34(null);
-  const [ctrlDPressCount, setCtrlDPressCount] = useState56(0);
+  const [ctrlDPressCount, setCtrlDPressCount] = useState59(0);
   const ctrlDTimerRef = useRef34(null);
-  const [constrainHeight, setConstrainHeight] = useState56(true);
-  const [showEscapePrompt, setShowEscapePrompt] = useState56(false);
-  const [warningMessage, setWarningMessage] = useState56(null);
+  const [constrainHeight, setConstrainHeight] = useState59(true);
+  const [showEscapePrompt, setShowEscapePrompt] = useState59(false);
+  const [warningMessage, setWarningMessage] = useState59(null);
   const isInitialMount = useRef34(true);
   const warningTimeoutRef = useRef34(null);
   const tabFocusTimeoutRef = useRef34(null);
-  const handleWarning = useCallback50((message) => {
+  const handleWarning = useCallback51((message) => {
     setWarningMessage(message);
     if (warningTimeoutRef.current) {
       clearTimeout(warningTimeoutRef.current);
@@ -24519,7 +24969,7 @@ ${queuedText}` : queuedText;
       setWarningMessage(null);
     }, WARNING_PROMPT_DURATION_MS);
   }, []);
-  useEffect55(() => {
+  useEffect56(() => {
     const handleSelectionWarning = () => {
       handleWarning("Press Ctrl-S to enter selection mode to copy text.");
     };
@@ -24539,7 +24989,7 @@ ${queuedText}` : queuedText;
       }
     };
   }, [handleWarning]);
-  useEffect55(() => {
+  useEffect56(() => {
     if (queueErrorMessage) {
       const timer = setTimeout(() => {
         setQueueErrorMessage(null);
@@ -24548,7 +24998,7 @@ ${queuedText}` : queuedText;
     }
     return void 0;
   }, [queueErrorMessage, setQueueErrorMessage]);
-  useEffect55(() => {
+  useEffect56(() => {
     if (isInitialMount.current) {
       isInitialMount.current = false;
       return;
@@ -24560,7 +25010,7 @@ ${queuedText}` : queuedText;
       clearTimeout(handler);
     };
   }, [terminalWidth, refreshStatic]);
-  useEffect55(() => {
+  useEffect56(() => {
     const openDebugConsole = () => {
       setShowErrorDetails(true);
       setConstrainHeight(false);
@@ -24570,7 +25020,7 @@ ${queuedText}` : queuedText;
       appEvents.off("open-debug-console" /* OpenDebugConsole */, openDebugConsole);
     };
   }, [config]);
-  useEffect55(() => {
+  useEffect56(() => {
     if (ctrlCTimerRef.current) {
       clearTimeout(ctrlCTimerRef.current);
       ctrlCTimerRef.current = null;
@@ -24584,7 +25034,7 @@ ${queuedText}` : queuedText;
       }, WARNING_PROMPT_DURATION_MS);
     }
   }, [ctrlCPressCount, config, setCtrlCPressCount, handleSlashCommand]);
-  useEffect55(() => {
+  useEffect56(() => {
     if (ctrlDTimerRef.current) {
       clearTimeout(ctrlDTimerRef.current);
       ctrlCTimerRef.current = null;
@@ -24598,7 +25048,7 @@ ${queuedText}` : queuedText;
       }, WARNING_PROMPT_DURATION_MS);
     }
   }, [ctrlDPressCount, config, setCtrlDPressCount, handleSlashCommand]);
-  const handleEscapePromptChange = useCallback50((showPrompt) => {
+  const handleEscapePromptChange = useCallback51((showPrompt) => {
     setShowEscapePrompt(showPrompt);
   }, []);
   const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator({
@@ -24606,7 +25056,7 @@ ${queuedText}` : queuedText;
     shouldShowFocusHint,
     customWittyPhrases: settings.merged.ui.customWittyPhrases
   });
-  const handleGlobalKeypress = useCallback50(
+  const handleGlobalKeypress = useCallback51(
     (key) => {
       if (copyModeEnabled) {
         setCopyModeEnabled(false);
@@ -24735,12 +25185,12 @@ ${queuedText}` : queuedText;
     ]
   );
   useKeypress(handleGlobalKeypress, { isActive: true });
-  useEffect55(() => {
+  useEffect56(() => {
     if (settings.merged.ui.hideWindowTitle) return;
     const paddedTitle = computeTerminalTitle({
       streamingState,
       isConfirming: pendingApproval !== void 0 || !!confirmationRequest || shouldShowActionRequiredTitle,
-      isSilentWorking: shouldShowSilentWorkingTitle,
+      isSilentWorking: !isKeypressReady || slashCommands === void 0 || shouldShowSilentWorkingTitle,
       folderName: basename3(config.getTargetDir()),
       useDynamicTitle: settings.merged.ui.dynamicWindowTitle
     });
@@ -24754,12 +25204,14 @@ ${queuedText}` : queuedText;
     pendingApproval,
     shouldShowActionRequiredTitle,
     shouldShowSilentWorkingTitle,
+    slashCommands,
+    isKeypressReady,
     settings.merged.ui.dynamicWindowTitle,
     settings.merged.ui.hideWindowTitle,
     config,
     stdout
   ]);
-  useEffect55(() => {
+  useEffect56(() => {
     const handleUserFeedback = (payload) => {
       let type;
       switch (payload.severity) {
@@ -24797,23 +25249,23 @@ ${queuedText}` : queuedText;
       coreEvents.off(CoreEvent.UserFeedback, handleUserFeedback);
     };
   }, [historyManager]);
-  const filteredConsoleMessages = useMemo40(() => {
+  const filteredConsoleMessages = useMemo42(() => {
     if (config.getDebugMode()) {
       return consoleMessages;
     }
     return consoleMessages.filter((msg) => msg.type !== "debug");
   }, [consoleMessages, config]);
-  const errorCount = useMemo40(
+  const errorCount = useMemo42(
     () => 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 = useMemo40(
+  const pendingHistoryItems = useMemo42(
     () => pendingShellHistoryItem ? [pendingShellHistoryItem] : [],
     [pendingShellHistoryItem]
   );
-  const uiState = useMemo40(
+  const uiState = useMemo42(
     () => ({
       history: historyManager.history,
       isThemeDialogOpen,
@@ -24943,7 +25395,7 @@ ${queuedText}` : queuedText;
       subagentCatalogSnapshot
     ]
   );
-  const uiActions = useMemo40(
+  const uiActions = useMemo42(
     () => ({
       handleThemeSelect,
       closeThemeDialog,
@@ -24987,22 +25439,22 @@ ${queuedText}` : queuedText;
       setEmbeddedShellFocused
     ]
   );
-  return /* @__PURE__ */ jsx102(UIStateContext.Provider, { value: uiState, children: /* @__PURE__ */ jsx102(UIActionsContext.Provider, { value: uiActions, children: /* @__PURE__ */ jsx102(ConfigContext.Provider, { value: config, children: /* @__PURE__ */ jsx102(
+  return /* @__PURE__ */ jsx104(UIStateContext.Provider, { value: uiState, children: /* @__PURE__ */ jsx104(UIActionsContext.Provider, { value: uiActions, children: /* @__PURE__ */ jsx104(ConfigContext.Provider, { value: config, children: /* @__PURE__ */ jsx104(
     AppContext.Provider,
     {
       value: {
         version: props.version,
         startupWarnings: props.startupWarnings || []
       },
-      children: /* @__PURE__ */ jsx102(ApprovalRuntimeProvider, { runtime: approvalRuntime, children: /* @__PURE__ */ jsx102(UserQuestionRuntimeProvider, { runtime: userQuestionRuntime, children: /* @__PURE__ */ jsx102(ShellFocusContext.Provider, { value: isFocused, children: /* @__PURE__ */ jsx102(App, {}) }) }) })
+      children: /* @__PURE__ */ jsx104(ApprovalRuntimeProvider, { runtime: approvalRuntime, children: /* @__PURE__ */ jsx104(UserQuestionRuntimeProvider, { runtime: userQuestionRuntime, children: /* @__PURE__ */ jsx104(ShellFocusContext.Provider, { value: isFocused, children: /* @__PURE__ */ jsx104(App, {}) }) }) })
     }
   ) }) }) });
 };
 
 // src/ui/root.tsx
-import React25 from "react";
+import React27 from "react";
 import { render } from "ink";
-import { jsx as jsx103 } from "react/jsx-runtime";
+import { jsx as jsx105 } from "react/jsx-runtime";
 var SLOW_RENDER_MS = 200;
 function validateDnsResolutionOrder(order) {
   const defaultValue = "ipv4first";
@@ -25034,7 +25486,7 @@ ${reason.stack}` : ""}`;
     }
   });
 }
-async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), initializationResult, conversationRuntime, approvalRuntime, userQuestionRuntime, commandRuntime, permissionSelectionRuntime, interactionModeRuntime, toolCatalogRuntime, promptCompletionRuntime, promptInputRuntime, modelSelectionRuntime, sessionManagementRuntime, initialPrompt, providerSetupRuntime, sideConversationRuntime, subagentCatalogRuntime) {
+async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), initializationResult, conversationRuntime, approvalRuntime, userQuestionRuntime, commandRuntime, permissionSelectionRuntime, interactionModeRuntime, toolCatalogRuntime, agentPresetRuntime, skillCatalogRuntime, promptCompletionRuntime, promptInputRuntime, modelSelectionRuntime, sessionManagementRuntime, initialPrompt, providerSetupRuntime, sideConversationRuntime, subagentCatalogRuntime) {
   const useAlternateBuffer2 = shouldEnterAlternateScreen(
     isAlternateBufferEnabled(settings),
     config.getScreenReader()
@@ -25044,17 +25496,17 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
   const version = await getVersion();
   const AppWrapper = () => {
     useKittyKeyboardProtocol();
-    return /* @__PURE__ */ jsx103(SettingsContext.Provider, { value: settings, children: /* @__PURE__ */ jsx103(
+    return /* @__PURE__ */ jsx105(SettingsContext.Provider, { value: settings, children: /* @__PURE__ */ jsx105(
       KeypressProvider,
       {
         config,
         debugKeystrokeLogging: settings.merged.general.debugKeystrokeLogging,
-        children: /* @__PURE__ */ jsx103(
+        children: /* @__PURE__ */ jsx105(
           MouseProvider,
           {
             mouseEventsEnabled,
             debugKeystrokeLogging: settings.merged.general.debugKeystrokeLogging,
-            children: /* @__PURE__ */ jsx103(ScrollProvider, { children: /* @__PURE__ */ jsx103(SessionStatsProvider, { conversationRuntime, children: /* @__PURE__ */ jsx103(VimModeProvider, { settings, children: /* @__PURE__ */ jsx103(
+            children: /* @__PURE__ */ jsx105(ScrollProvider, { children: /* @__PURE__ */ jsx105(SessionStatsProvider, { conversationRuntime, children: /* @__PURE__ */ jsx105(VimModeProvider, { settings, children: /* @__PURE__ */ jsx105(
               AppContainer,
               {
                 config,
@@ -25073,6 +25525,8 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
                 permissionSelectionRuntime,
                 interactionModeRuntime,
                 toolCatalogRuntime,
+                agentPresetRuntime,
+                skillCatalogRuntime,
                 sideConversationRuntime,
                 subagentCatalogRuntime,
                 initialPrompt
@@ -25085,7 +25539,7 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
   };
   const { stdout: inkStdout, stderr: inkStderr } = createWorkingStdio();
   const instance = render(
-    process.env["DEBUG"] ? /* @__PURE__ */ jsx103(React25.StrictMode, { children: /* @__PURE__ */ jsx103(AppWrapper, {}) }) : /* @__PURE__ */ jsx103(AppWrapper, {}),
+    process.env["DEBUG"] ? /* @__PURE__ */ jsx105(React27.StrictMode, { children: /* @__PURE__ */ jsx105(AppWrapper, {}) }) : /* @__PURE__ */ jsx105(AppWrapper, {}),
     {
       stdout: inkStdout,
       stderr: inkStderr,
@@ -25188,6 +25642,8 @@ async function main(options) {
       options.permissionSelectionRuntime,
       options.interactionModeRuntime,
       options.toolCatalogRuntime,
+      options.agentPresetRuntime,
+      options.skillCatalogRuntime,
       options.promptCompletionRuntime,
       options.promptInputRuntime,
       options.modelSelectionRuntime,
@@ -26584,11 +27040,11 @@ var DshToolPresentationAdapter = class {
           description: "Todo update failed"
         };
       }
-      const summary2 = todoSummary(args);
-      if (summary2 !== void 0) {
+      const summary3 = todoSummary(args);
+      if (summary3 !== void 0) {
         return {
           kind: "compact",
-          label: summary2.total === 0 ? "Todo list cleared" : summary2.completed === summary2.total ? `Todo completed | ${String(summary2.completed)}/${String(summary2.total)}` : `Todo | ${String(summary2.completed)} completed | ${String(summary2.inProgress)} active | ${String(summary2.pending)} pending`
+          label: summary3.total === 0 ? "Todo list cleared" : summary3.completed === summary3.total ? `Todo completed | ${String(summary3.completed)}/${String(summary3.total)}` : `Todo | ${String(summary3.completed)} completed | ${String(summary3.inProgress)} active | ${String(summary3.pending)} pending`
         };
       }
     }
@@ -27224,6 +27680,7 @@ var DshUserQuestionRuntime = class {
 };
 
 // src/dsh/command-runtime.ts
+import { promises as fs15 } from "node:fs";
 var DshCommandRuntimeAdapter = class {
   constructor(commands, activeAgent, subscribe, ensureActiveAgent) {
     this.commands = commands;
@@ -27253,7 +27710,7 @@ var DshCommandRuntimeAdapter = class {
     this.preparing = preparing;
     return preparing;
   }
-  async execute(line, signal) {
+  async execute(line, attachments, signal) {
     await this.prepare(signal);
     signal.throwIfAborted();
     const agent = this.activeAgent();
@@ -27263,15 +27720,37 @@ var DshCommandRuntimeAdapter = class {
         text: "Unable to prepare the active conversation for DSH commands."
       };
     }
-    const execution = await this.commands.execute(agent, line, [], signal);
+    const submittedAttachments = await Promise.all(
+      attachments.map(async (attachment) => ({
+        type: "image",
+        mediaType: attachment.mediaType,
+        data: Buffer.from(
+          await fs15.readFile(attachment.path, { signal })
+        ).toString("base64"),
+        name: attachment.name
+      }))
+    );
+    signal.throwIfAborted();
+    const execution = await this.commands.execute(
+      agent,
+      line,
+      submittedAttachments,
+      signal
+    );
     if (execution === void 0) {
       return { kind: "error", text: `Unknown DSH command: ${line.trim()}` };
     }
     return {
       kind: execution.result.kind,
-      ...execution.result.text === void 0 ? {} : { text: execution.result.text }
+      ...execution.result.text === void 0 ? {} : { text: execution.result.text },
+      ...execution.result.kind === "success" && execution.result.sourceEventSeq !== void 0 ? { sourceEventSeq: execution.result.sourceEventSeq } : {}
     };
   }
+  attachmentPolicy(line) {
+    const match = /^\/([^\s]+)/.exec(line.trim());
+    if (match === null) return void 0;
+    return this.snapshot.commands.find((command) => command.name === match[1])?.acceptsAttachments;
+  }
   activeAgentChanged() {
     this.refresh();
   }
@@ -27289,6 +27768,7 @@ var DshCommandRuntimeAdapter = class {
           (command) => Object.freeze({
             name: command.name,
             description: command.description,
+            acceptsAttachments: command.input?.attachments === true,
             ...command.input === void 0 ? {} : { inputHint: command.input.hint }
           })
         )
@@ -27380,7 +27860,8 @@ var DshPermissionSelectionRuntime = class {
     this.snapshot = this.readSnapshot(false);
     this.offProjection = projections.onChanged((session, key) => {
       const agent = this.activeAgent();
-      if (agent === void 0 || session !== agent.session || key !== "permissions") return;
+      if (agent === void 0 || session !== agent.session || key !== "permissions")
+        return;
       this.refresh();
     });
   }
@@ -27400,16 +27881,24 @@ var DshPermissionSelectionRuntime = class {
     if (!this.snapshot.available) {
       throw new Error("DSH permission presets are unavailable.");
     }
-    const option = this.snapshot.options.find((candidate) => candidate.value === value);
+    const option = this.snapshot.options.find(
+      (candidate) => candidate.value === value
+    );
     if (!option) throw new Error(`Unknown permission preset: ${value}`);
     if (this.snapshot.currentValue === value) return option;
     this.snapshot = Object.freeze({ ...this.snapshot, busy: true });
     this.emit();
     try {
-      const result = await this.commands.execute(`/permission ${value}`, signal ?? new AbortController().signal);
+      const result = await this.commands.execute(
+        `/permission ${value}`,
+        [],
+        signal ?? new AbortController().signal
+      );
       signal?.throwIfAborted();
       if (result.kind === "error") {
-        throw new Error(result.text ?? `Unable to switch permission preset to ${value}.`);
+        throw new Error(
+          result.text ?? `Unable to switch permission preset to ${value}.`
+        );
       }
       this.snapshot = this.readSnapshot(false);
       if (this.snapshot.currentValue !== value) {
@@ -27433,11 +27922,19 @@ var DshPermissionSelectionRuntime = class {
   readSnapshot(busy) {
     const agent = this.activeAgent();
     if (agent === void 0) {
-      return Object.freeze({ available: false, options: Object.freeze([]), busy });
+      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 });
+      return Object.freeze({
+        available: false,
+        options: Object.freeze([]),
+        busy
+      });
     }
     return Object.freeze({
       available: true,
@@ -27499,6 +27996,7 @@ var DshPlanSelectionRuntime = class {
     try {
       const result = await this.commands.execute(
         active ? "/plan" : "/plan off",
+        [],
         signal ?? new AbortController().signal
       );
       signal?.throwIfAborted();
@@ -28054,10 +28552,311 @@ var DshSubagentCatalogRuntime = class {
   }
 };
 
+// src/dsh/wait-for-shared-promise.ts
+function waitForSharedPromise(promise, signal) {
+  signal?.throwIfAborted();
+  if (signal === void 0) return promise;
+  return new Promise((resolve, reject) => {
+    const cleanup = () => signal.removeEventListener("abort", onAbort);
+    const onAbort = () => {
+      cleanup();
+      reject(
+        signal.reason ?? new DOMException("This operation was aborted", "AbortError")
+      );
+    };
+    signal.addEventListener("abort", onAbort, { once: true });
+    if (signal.aborted) {
+      onAbort();
+      return;
+    }
+    promise.then(
+      (value) => {
+        cleanup();
+        resolve(value);
+      },
+      (error) => {
+        cleanup();
+        reject(error);
+      }
+    );
+  });
+}
+
+// src/dsh/agent-preset-runtime.ts
+var EMPTY_OPTIONS = Object.freeze([]);
+var DshAgentPresetRuntime = class {
+  constructor(presets, projections, activeAgent, pendingPresetId, selectPendingPreset, onSelected) {
+    this.presets = presets;
+    this.projections = projections;
+    this.activeAgent = activeAgent;
+    this.pendingPresetId = pendingPresetId;
+    this.selectPendingPreset = selectPendingPreset;
+    this.onSelected = onSelected;
+    this.snapshot = Object.freeze({
+      status: "idle",
+      currentId: this.currentId(),
+      options: EMPTY_OPTIONS,
+      busy: false
+    });
+    this.offProjection = projections.onChanged((session, key) => {
+      const agent = this.activeAgent();
+      if (agent === void 0 || session !== agent.session || key !== "agentPreset")
+        return;
+      this.refreshCurrent();
+    });
+  }
+  listeners = /* @__PURE__ */ new Set();
+  snapshot;
+  loading;
+  offProjection;
+  getSnapshot = () => this.snapshot;
+  subscribe = (listener) => {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  };
+  async prepare(signal) {
+    signal?.throwIfAborted();
+    if (this.snapshot.status === "ready") return;
+    let loading = this.loading;
+    if (loading === void 0) {
+      loading = this.load().finally(() => {
+        if (this.loading === loading) this.loading = void 0;
+      });
+      this.loading = loading;
+    }
+    return waitForSharedPromise(loading, signal);
+  }
+  async select(id, signal) {
+    await this.prepare(signal);
+    signal?.throwIfAborted();
+    const option = this.snapshot.options.find(
+      (candidate) => candidate.id === id
+    );
+    if (option === void 0) throw new Error(`Unknown Agent preset: ${id}`);
+    if (option.broken !== void 0) {
+      throw new Error(`Agent preset ${id} is unavailable: ${option.broken}`);
+    }
+    if (this.snapshot.currentId === id) return option;
+    if (this.snapshot.busy) {
+      throw new Error("Another Agent preset change is already in progress.");
+    }
+    const agent = this.activeAgent();
+    if (agent === void 0) {
+      this.selectPendingPreset(id);
+      this.refreshCurrent();
+      if (this.snapshot.currentId !== id) {
+        throw new Error(`DSH did not select Agent preset ${id}.`);
+      }
+      this.onSelected();
+      return option;
+    }
+    this.snapshot = Object.freeze({ ...this.snapshot, busy: true });
+    this.emit();
+    try {
+      await this.presets.select(agent, id);
+      this.refreshCurrent();
+      if (this.snapshot.currentId !== id) {
+        throw new Error(`DSH did not activate Agent preset ${id}.`);
+      }
+      this.onSelected();
+      return option;
+    } finally {
+      this.snapshot = Object.freeze({ ...this.snapshot, busy: false });
+      this.emit();
+    }
+  }
+  activeAgentChanged() {
+    this.refreshCurrent();
+  }
+  dispose() {
+    this.offProjection();
+    this.listeners.clear();
+  }
+  async load() {
+    this.snapshot = Object.freeze({
+      ...this.snapshot,
+      status: "loading",
+      error: void 0
+    });
+    this.emit();
+    try {
+      const options = (await this.presets.list()).map(
+        (preset) => Object.freeze({
+          id: preset.id,
+          name: preset.name ?? preset.id,
+          ...preset.description === void 0 ? {} : { description: preset.description },
+          trust: preset.trust,
+          isDefault: preset.id === this.presets.defaultId,
+          ...preset.broken === void 0 ? {} : { broken: preset.broken }
+        })
+      );
+      this.snapshot = Object.freeze({
+        status: "ready",
+        currentId: this.currentId(),
+        options: Object.freeze(options),
+        busy: this.snapshot.busy
+      });
+      this.emit();
+    } catch (error) {
+      this.snapshot = Object.freeze({
+        ...this.snapshot,
+        status: "error",
+        error: error instanceof Error ? error.message : String(error)
+      });
+      this.emit();
+      throw error;
+    }
+  }
+  currentId() {
+    const agent = this.activeAgent();
+    if (agent === void 0)
+      return this.pendingPresetId() ?? this.presets.defaultId;
+    return this.projections.snapshot(agent.session).values.agentPreset ?? this.presets.defaultId;
+  }
+  refreshCurrent() {
+    this.snapshot = Object.freeze({
+      ...this.snapshot,
+      currentId: this.currentId()
+    });
+    this.emit();
+  }
+  emit() {
+    for (const listener of this.listeners) listener();
+  }
+};
+
+// src/dsh/skill-catalog-runtime.ts
+import { isUserInvocable } from "@deepseek-ai/dsh-skill";
+var EMPTY_SKILLS = Object.freeze([]);
+var DshSkillCatalogRuntime = class {
+  constructor(skills, presets, activeAgent, ensureActiveAgent, subscribe) {
+    this.skills = skills;
+    this.presets = presets;
+    this.activeAgent = activeAgent;
+    this.ensureActiveAgent = ensureActiveAgent;
+    this.off = subscribe(() => this.invalidate(true));
+  }
+  listeners = /* @__PURE__ */ new Set();
+  snapshot = Object.freeze({
+    status: "idle",
+    skills: EMPTY_SKILLS
+  });
+  loading;
+  controller;
+  off;
+  generation = 0;
+  disposed = false;
+  getSnapshot = () => this.snapshot;
+  subscribe = (listener) => {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  };
+  async prepare(signal) {
+    if (this.disposed) return;
+    while (this.snapshot.status !== "ready") {
+      if (this.disposed) return;
+      signal?.throwIfAborted();
+      const agent = this.activeAgent() ?? await this.ensureActiveAgent(signal ?? new AbortController().signal);
+      signal?.throwIfAborted();
+      let loading = this.loading;
+      if (loading === void 0) {
+        const controller = new AbortController();
+        const generation = this.generation;
+        this.controller = controller;
+        loading = Promise.resolve().then(() => this.load(agent, controller.signal, generation)).finally(() => {
+          if (this.loading === loading) this.loading = void 0;
+          if (this.controller === controller) this.controller = void 0;
+        });
+        this.loading = loading;
+      }
+      await waitForSharedPromise(loading, signal);
+    }
+  }
+  activeAgentChanged() {
+    this.invalidate(false);
+    if (this.activeAgent() !== void 0) void this.prepare().catch(() => {
+    });
+  }
+  dispose() {
+    if (this.disposed) return;
+    this.disposed = true;
+    this.generation += 1;
+    const controller = this.controller;
+    this.controller = void 0;
+    this.loading = void 0;
+    controller?.abort();
+    this.off();
+    this.listeners.clear();
+  }
+  invalidate(reload) {
+    if (this.disposed) return;
+    this.generation += 1;
+    const controller = this.controller;
+    this.controller = void 0;
+    this.loading = void 0;
+    controller?.abort();
+    this.snapshot = Object.freeze({ status: "idle", skills: EMPTY_SKILLS });
+    this.emit();
+    if (reload && this.activeAgent() !== void 0) {
+      void this.prepare().catch(() => {
+      });
+    }
+  }
+  async load(agent, signal, generation) {
+    if (this.disposed || signal.aborted || generation !== this.generation)
+      return;
+    this.snapshot = Object.freeze({
+      status: "loading",
+      skills: this.snapshot.skills
+    });
+    this.emit();
+    try {
+      const registry = this.presets.serviceFor(agent, "skills") ?? this.skills;
+      if (registry === void 0) {
+        throw new Error("No DSH Skill registry is available.");
+      }
+      const summaries = await registry.list({
+        cwd: agent.session.header.cwd,
+        scope: agent,
+        signal
+      });
+      signal.throwIfAborted();
+      if (this.disposed || generation !== this.generation) return;
+      const skills = summaries.filter(isUserInvocable).map(
+        (skill) => Object.freeze({
+          name: skill.name,
+          description: skill.description,
+          ...skill.whenToUse === void 0 ? {} : { whenToUse: skill.whenToUse },
+          modelInvocable: skill.invocation.modelInvocable
+        })
+      );
+      this.snapshot = Object.freeze({
+        status: "ready",
+        skills: Object.freeze(skills)
+      });
+      this.emit();
+    } catch (error) {
+      if (this.disposed || signal.aborted || generation !== this.generation)
+        return;
+      this.snapshot = Object.freeze({
+        status: "error",
+        skills: this.snapshot.skills,
+        error: error instanceof Error ? error.message : String(error)
+      });
+      this.emit();
+      throw error;
+    }
+  }
+  emit() {
+    for (const listener of this.listeners) listener();
+  }
+};
+
 // src/dsh/index.ts
 var name = "dsh-console-runner";
 var inject = [
   "agentDefaultModel",
+  "agentPresets",
   "agents",
   "sessions",
   "sessionQuery",
@@ -28070,6 +28869,7 @@ var inject = [
   "sessionProjections",
   "credentials",
   "settings",
+  "skills",
   "subagents"
 ];
 var Config2 = z2.object({
@@ -28109,7 +28909,9 @@ async function start(ctx, config) {
   const appExit = ctx.get("appExit");
   const credentials = ctx.get("credentials");
   const settings = ctx.get("settings");
+  const skills = ctx.get("skills");
   const subagents = ctx.get("subagents");
+  const agentPresets = ctx.get("agentPresets");
   if (!attachments)
     throw new Error("dsh-console requires the DSH attachment service");
   if (!sessionQuery)
@@ -28128,11 +28930,14 @@ async function start(ctx, config) {
     throw new Error("dsh-console requires the DSH settings service");
   if (!subagents)
     throw new Error("dsh-console requires the DSH subagent service");
+  if (!agentPresets)
+    throw new Error("dsh-console requires the DSH Agent preset service");
   if (!agents || !defaultModel || !sessions || !tools || !llm || !appExit)
     return;
   const selection = defaultModel.currentSelection();
   let activeSelection = selection;
   let sideSelection;
+  let pendingPresetId;
   const workspaceRef = {};
   const runtimeListeners = /* @__PURE__ */ new Set();
   const notifyRuntime = () => {
@@ -28159,12 +28964,20 @@ async function start(ctx, config) {
       model: selected.model,
       ...selected.reasoningEffort === void 0 ? {} : { reasoningEffort: selected.reasoningEffort }
     };
-    const setup = (agentCtx) => {
+    const preset = options.resumeSessionId === void 0 && options.inheritPresetFrom === void 0 ? await agentPresets.resolve(options.presetId) : void 0;
+    const inheritedPresetId = options.inheritPresetFrom === void 0 ? void 0 : sessionProjections.snapshot(options.inheritPresetFrom.session).values.agentPreset ?? void 0;
+    const setup = async (agentCtx, agent) => {
       const ref = {
         current: selected,
         assembled: void 0
       };
       installModelSelection2(agentCtx, ref);
+      if (options.inheritPresetFrom !== void 0) {
+        agentPresets.composeFrom(agentCtx, options.inheritPresetFrom.ctx);
+      } else {
+        const presetId = options.resumeSessionId === void 0 ? preset?.id : sessionProjections.snapshot(agent.session).values.agentPreset ?? void 0;
+        await agentPresets.mount(agentCtx, presetId);
+      }
       if (options.restrictTools) agentCtx.tools.restrict({ allow: [] });
     };
     const handle = options.resumeSessionId === void 0 ? await agents.create({
@@ -28172,7 +28985,8 @@ async function start(ctx, config) {
       meta: {
         cwd: process.cwd(),
         ...options.parentSession === void 0 ? {} : { parentSession: options.parentSession },
-        ...options.seed === void 0 ? {} : { seedLength: options.seed.length }
+        ...options.seed === void 0 ? {} : { seedLength: options.seed.length },
+        ...(preset?.id ?? inheritedPresetId) === void 0 ? {} : { agentPreset: preset?.id ?? inheritedPresetId }
       },
       ...options.seed === void 0 ? {} : { seed: options.seed },
       agentOptions,
@@ -28311,6 +29125,30 @@ async function start(ctx, config) {
     currentInteractiveAgent,
     (listener) => ctx.on("tools/change", listener)
   );
+  const skillCatalogRuntime = new DshSkillCatalogRuntime(
+    skills,
+    agentPresets,
+    currentInteractiveAgent,
+    async (signal) => (await materializeActiveConversation(signal)).handle.agent,
+    (listener) => ctx.on("skills/change", listener)
+  );
+  const agentPresetRuntime = new DshAgentPresetRuntime(
+    agentPresets,
+    sessionProjections,
+    mainAgent,
+    () => pendingPresetId,
+    (id) => {
+      pendingPresetId = id;
+    },
+    () => {
+      commandRuntime.activeAgentChanged();
+      permissionSelectionRuntime.activeAgentChanged();
+      planSelectionRuntime.activeAgentChanged();
+      toolCatalogRuntime.activeAgentChanged();
+      skillCatalogRuntime.activeAgentChanged();
+      notifyRuntime();
+    }
+  );
   const subagentCatalogRuntime = new DshSubagentCatalogRuntime(
     subagents,
     () => mainAgent()?.session.id,
@@ -28347,6 +29185,7 @@ async function start(ctx, config) {
     try {
       const next = options.resumeSessionId === void 0 ? await createPendingConversation(selected, options.signal) : await createActiveConversation(selected, options);
       const previous = active;
+      const nextPendingPresetId = next.kind === "pending" && previous.kind === "pending" ? pendingPresetId : void 0;
       if (previous.kind === "materialized") {
         try {
           const flushed = await sessions.flush(previous.handle.agent.session);
@@ -28370,12 +29209,15 @@ async function start(ctx, config) {
       previous.offProjector();
       if (previous.kind === "materialized") previous.offSession();
       active = next;
+      pendingPresetId = nextPendingPresetId;
       activeSelection = selected;
       await providerSetupRuntime.refreshCurrent();
       commandRuntime.activeAgentChanged();
       permissionSelectionRuntime.activeAgentChanged();
       planSelectionRuntime.activeAgentChanged();
       toolCatalogRuntime.activeAgentChanged();
+      agentPresetRuntime.activeAgentChanged();
+      skillCatalogRuntime.activeAgentChanged();
       subagentCatalogRuntime.activeAgentChanged();
       notifyRuntime();
       if (previous.kind === "materialized") {
@@ -28442,6 +29284,8 @@ async function start(ctx, config) {
       Promise.resolve(permissionSelectionRuntime.dispose()),
       Promise.resolve(planSelectionRuntime.dispose()),
       Promise.resolve(toolCatalogRuntime.dispose()),
+      Promise.resolve(agentPresetRuntime.dispose()),
+      Promise.resolve(skillCatalogRuntime.dispose()),
       Promise.resolve(subagentCatalogRuntime.dispose())
     ]);
   };
@@ -28454,14 +29298,20 @@ async function start(ctx, config) {
     const previous = active;
     let next;
     try {
-      next = await createActiveConversation(activeSelection, { signal });
+      next = await createActiveConversation(activeSelection, {
+        signal,
+        presetId: pendingPresetId
+      });
       signal.throwIfAborted();
       previous.offProjector();
       active = next;
+      pendingPresetId = void 0;
       commandRuntime.activeAgentChanged();
       permissionSelectionRuntime.activeAgentChanged();
       planSelectionRuntime.activeAgentChanged();
       toolCatalogRuntime.activeAgentChanged();
+      agentPresetRuntime.activeAgentChanged();
+      skillCatalogRuntime.activeAgentChanged();
       subagentCatalogRuntime.activeAgentChanged();
       notifyRuntime();
       return next;
@@ -28574,7 +29424,8 @@ async function start(ctx, config) {
         parentSession: parent.session.id,
         seed,
         restrictTools: true,
-        publishRuntimeEvents: false
+        publishRuntimeEvents: false,
+        inheritPresetFrom: parent
       });
       sideSelection = selected;
       visibleSideAgent = side.handle.agent;
@@ -28641,6 +29492,8 @@ async function start(ctx, config) {
     permissionSelectionRuntime.activeAgentChanged();
     planSelectionRuntime.activeAgentChanged();
     toolCatalogRuntime.activeAgentChanged();
+    agentPresetRuntime.activeAgentChanged();
+    skillCatalogRuntime.activeAgentChanged();
   });
   ctx.effect(() => cleanup, "dsh-console: terminal");
   const startupResumeSessionId = config.resumeSessionId?.trim();
@@ -28667,6 +29520,8 @@ async function start(ctx, config) {
     permissionSelectionRuntime,
     interactionModeRuntime,
     toolCatalogRuntime,
+    agentPresetRuntime,
+    skillCatalogRuntime,
     subagentCatalogRuntime,
     sideConversationRuntime: conversationWorkspace,
     initialPrompt: config.prompt?.trim(),