@cofy-x/dsh-console 0.1.0-alpha.16 → 0.1.0-alpha.18

package/dist/{chunk-LAJHJSL2.js → chunk-DVH3TTUQ.js}

@@ -78,7 +78,6 @@ import {
 import { z as zod } from "zod";
 import { createUserMessage as createUserMessage2 } from "@deepseek-ai/dsh-llm";
 import {
-  SessionLogOffset as SessionLogOffset2,
   SessionId as SessionId5
 } from "@deepseek-ai/dsh-session";
 
@@ -2449,8 +2448,8 @@ import {
   useMemo as useMemo43,
   useState as useState63,
   useCallback as useCallback51,
-  useEffect as useEffect59,
-  useRef as useRef36,
+  useEffect as useEffect60,
+  useRef as useRef37,
   useLayoutEffect as useLayoutEffect5,
   useSyncExternalStore as useSyncExternalStore10
 } from "react";
@@ -6427,7 +6426,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 = "7a7aa5f";
+var GIT_COMMIT_INFO = "5944608";
 
 // src/ui/components/dialogs/about-box.tsx
 import { jsx as jsx28, jsxs as jsxs21 } from "react/jsx-runtime";
@@ -19712,7 +19711,7 @@ function useHistory() {
 }
 
 // src/ui/hooks/commands/use-slash-command-processor.ts
-import { useCallback as useCallback41, useMemo as useMemo41, useEffect as useEffect48, useRef as useRef27, useState as useState51 } from "react";
+import { useCallback as useCallback41, useMemo as useMemo41, useEffect as useEffect49, useRef as useRef28, useState as useState51 } from "react";
 
 // src/services/command-service.ts
 var CommandService = class _CommandService {
@@ -22515,7 +22514,14 @@ var agentsCommand = {
 import React25 from "react";
 
 // src/ui/components/dialogs/agent-preset-dialog.tsx
-import { useCallback as useCallback40, useMemo as useMemo39, useState as useState47, useSyncExternalStore as useSyncExternalStore6 } from "react";
+import {
+  useCallback as useCallback40,
+  useEffect as useEffect45,
+  useMemo as useMemo39,
+  useRef as useRef26,
+  useState as useState47,
+  useSyncExternalStore as useSyncExternalStore6
+} from "react";
 import { Box as Box82, Text as Text77 } from "ink";
 import { Fragment as Fragment28, jsx as jsx105, jsxs as jsxs79 } from "react/jsx-runtime";
 function AgentPresetDialog({
@@ -22530,7 +22536,18 @@ function AgentPresetDialog({
   );
   const [highlighted, setHighlighted] = useState47();
   const [error, setError] = useState47();
-  const selected = highlighted ?? snapshot.options.find((item) => item.id === snapshot.currentId) ?? snapshot.options[0];
+  const selectionController = useRef26(void 0);
+  useEffect45(
+    () => () => {
+      selectionController.current?.abort();
+    },
+    [runtime]
+  );
+  const close = useCallback40(() => {
+    selectionController.current?.abort();
+    onClose();
+  }, [onClose]);
+  const selected = snapshot.options.find((item) => item.id === highlighted?.id) ?? snapshot.options.find((item) => item.id === snapshot.currentId) ?? snapshot.options[0];
   const items = useMemo39(
     () => snapshot.options.map((option) => ({
       key: option.id,
@@ -22545,26 +22562,29 @@ function AgentPresetDialog({
   );
   const selectPreset = useCallback40(
     async (option) => {
+      if (selectionController.current !== void 0 || snapshot.busy) return;
+      const controller = new AbortController();
+      selectionController.current = controller;
       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));
+        const selection = await runtime.select(option.id, controller.signal);
+        if (controller.signal.aborted) return;
+        if (selection.id === snapshot.currentId) close();
+        else onSwitched(selection);
       } catch (cause) {
+        if (controller.signal.aborted) return;
         setError(cause instanceof Error ? cause.message : String(cause));
+      } finally {
+        if (selectionController.current === controller) {
+          selectionController.current = void 0;
+        }
       }
     },
-    [onClose, onSwitched, runtime, snapshot.currentId]
+    [close, onSwitched, runtime, snapshot.currentId, snapshot.busy]
   );
   useKeypress(
     (key) => {
-      if (key.name === "escape" && !snapshot.busy) onClose();
+      if (key.name === "escape" && !snapshot.busy) close();
     },
     { isActive: true }
   );
@@ -22580,10 +22600,10 @@ function AgentPresetDialog({
       children: [
         /* @__PURE__ */ jsxs79(Box82, { justifyContent: "space-between", children: [
           /* @__PURE__ */ jsx105(Text77, { bold: true, color: theme.text.primary, children: "Select DSH Agent Preset" }),
-          /* @__PURE__ */ jsx105(DialogCloseAction, { onClose, isActive: !snapshot.busy })
+          /* @__PURE__ */ jsx105(DialogCloseAction, { onClose: close, isActive: !snapshot.busy })
         ] }),
         (error ?? snapshot.error) && /* @__PURE__ */ jsx105(Box82, { marginTop: 1, children: /* @__PURE__ */ jsx105(Text77, { color: theme.status.error, children: error ?? snapshot.error }) }),
-        snapshot.options.length === 0 ? /* @__PURE__ */ jsx105(Box82, { marginTop: 1, children: /* @__PURE__ */ jsx105(Text77, { color: theme.text.secondary, children: "No Agent presets are available." }) }) : /* @__PURE__ */ jsxs79(Box82, { flexDirection: "row", marginTop: 1, children: [
+        !snapshot.modeSelectionEnabled ? /* @__PURE__ */ jsx105(Box82, { marginTop: 1, children: /* @__PURE__ */ jsx105(Text77, { color: theme.text.secondary, children: "Agent preset selection is disabled by the DSH host." }) }) : snapshot.options.length === 0 ? /* @__PURE__ */ jsx105(Box82, { marginTop: 1, children: /* @__PURE__ */ jsx105(Text77, { color: theme.text.secondary, children: "No Agent presets are available." }) }) : /* @__PURE__ */ jsxs79(Box82, { flexDirection: "row", marginTop: 1, children: [
           /* @__PURE__ */ jsx105(Box82, { width: "50%", paddingRight: 2, flexDirection: "column", children: /* @__PURE__ */ jsx105(
             RadioButtonSelect,
             {
@@ -22591,7 +22611,7 @@ function AgentPresetDialog({
               initialIndex,
               onHighlight: setHighlighted,
               onSelect: (option) => void selectPreset(option),
-              isFocused: !snapshot.busy,
+              isFocused: !snapshot.busy && snapshot.status === "ready",
               showNumbers: false,
               renderItem: (item, { titleColor }) => /* @__PURE__ */ jsxs79(
                 Text77,
@@ -22610,11 +22630,7 @@ function AgentPresetDialog({
           ) }),
           /* @__PURE__ */ jsx105(Box82, { width: "50%", paddingLeft: 2, flexDirection: "column", children: selected && /* @__PURE__ */ jsxs79(Fragment28, { children: [
             /* @__PURE__ */ jsx105(Text77, { bold: true, color: theme.text.accent, children: selected.name }),
-            /* @__PURE__ */ jsxs79(Text77, { color: theme.text.secondary, children: [
-              selected.id,
-              " \xB7 ",
-              selected.trust
-            ] }),
+            /* @__PURE__ */ jsx105(Text77, { color: theme.text.secondary, children: selected.id }),
             /* @__PURE__ */ jsx105(Box82, { marginTop: 1, children: /* @__PURE__ */ jsx105(Text77, { wrap: "wrap", children: selected.description ?? "No description is available for this preset." }) }),
             selected.broken && /* @__PURE__ */ jsx105(Box82, { marginTop: 1, children: /* @__PURE__ */ jsx105(Text77, { color: theme.status.warning, children: selected.broken }) }),
             snapshot.busy && /* @__PURE__ */ jsx105(Box82, { marginTop: 1, children: /* @__PURE__ */ jsx105(Text77, { color: theme.text.accent, children: "Applying preset..." }) })
@@ -22724,7 +22740,7 @@ var presetCommand = {
 import React26 from "react";
 
 // src/ui/components/dialogs/skills-dialog.tsx
-import { useEffect as useEffect45, useMemo as useMemo40, useState as useState48, useSyncExternalStore as useSyncExternalStore7 } from "react";
+import { useEffect as useEffect46, useMemo as useMemo40, useState as useState48, useSyncExternalStore as useSyncExternalStore7 } from "react";
 import { Box as Box83, Text as Text78 } from "ink";
 import { Fragment as Fragment29, jsx as jsx106, jsxs as jsxs80 } from "react/jsx-runtime";
 function summary2(value) {
@@ -22742,7 +22758,7 @@ function SkillsDialog({
   );
   const [selectedName, setSelectedName] = useState48(snapshot.skills[0]?.name);
   const selected = snapshot.skills.find((skill) => skill.name === selectedName) ?? snapshot.skills[0];
-  useEffect45(() => {
+  useEffect46(() => {
     if (selected?.name !== selectedName) setSelectedName(selected?.name);
   }, [selected?.name, selectedName]);
   useKeypress(
@@ -22847,7 +22863,7 @@ var skillsCommand = {
 import React27 from "react";
 
 // src/ui/components/dialogs/jobs-dialog.tsx
-import { useEffect as useEffect46, useState as useState49, useSyncExternalStore as useSyncExternalStore8 } from "react";
+import { useEffect as useEffect47, useState as useState49, useSyncExternalStore as useSyncExternalStore8 } from "react";
 import { Text as Text79 } from "ink";
 import { Fragment as Fragment30, jsx as jsx107, jsxs as jsxs81 } from "react/jsx-runtime";
 function JobsDialog({
@@ -22863,11 +22879,11 @@ function JobsDialog({
   const [pending, setPending] = useState49();
   const [error, setError] = useState49();
   const [now, setNow] = useState49(Date.now);
-  useEffect46(() => {
+  useEffect47(() => {
     const timer = setInterval(() => setNow(Date.now()), 1e3);
     return () => clearInterval(timer);
   }, []);
-  useEffect46(() => {
+  useEffect47(() => {
     setSelectedId(void 0);
     setPending(void 0);
     setError(void 0);
@@ -22971,7 +22987,7 @@ function JobsDialog({
 }
 
 // src/ui/components/dialogs/goal-dialog.tsx
-import { useEffect as useEffect47, useRef as useRef26, useState as useState50, useSyncExternalStore as useSyncExternalStore9 } from "react";
+import { useEffect as useEffect48, useRef as useRef27, useState as useState50, useSyncExternalStore as useSyncExternalStore9 } from "react";
 import { Box as Box84, Text as Text80 } from "ink";
 import { Fragment as Fragment31, jsx as jsx108, jsxs as jsxs82 } from "react/jsx-runtime";
 function GoalDialog({
@@ -22991,9 +23007,9 @@ function GoalDialog({
   );
   const [pending, setPending] = useState50();
   const [error, setError] = useState50();
-  const controller = useRef26(void 0);
-  const mounted = useRef26(true);
-  useEffect47(() => {
+  const controller = useRef27(void 0);
+  const mounted = useRef27(true);
+  useEffect48(() => {
     mounted.current = true;
     return () => {
       mounted.current = false;
@@ -23319,7 +23335,7 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
     void 0
   );
   const [reloadTrigger, setReloadTrigger] = useState51(0);
-  const commandAbortRef = useRef27(void 0);
+  const commandAbortRef = useRef28(void 0);
   const reloadCommands = useCallback41(() => {
     setReloadTrigger((v) => v + 1);
   }, []);
@@ -23380,7 +23396,7 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
       setCustomDialog
     ]
   );
-  useEffect48(() => {
+  useEffect49(() => {
     const controller = new AbortController();
     (async () => {
       const loaders = [
@@ -23398,15 +23414,15 @@ var useSlashCommandProcessor = (addItem, clearItems, loadHistory, refreshStatic,
       controller.abort();
     };
   }, [dshCommands, enableProfiler, reloadTrigger, skillCatalog]);
-  useEffect48(
+  useEffect49(
     () => dshCommands?.subscribe(reloadCommands),
     [dshCommands, reloadCommands]
   );
-  useEffect48(
+  useEffect49(
     () => skillCatalog?.subscribe(reloadCommands),
     [skillCatalog, reloadCommands]
   );
-  useEffect48(() => () => commandAbortRef.current?.abort(), []);
+  useEffect49(() => () => commandAbortRef.current?.abort(), []);
   const handleSlashCommand = useCallback41(
     async (rawQuery, overwriteConfirmed, addToHistory = true, attachments = []) => {
       if (!commands) {
@@ -23698,7 +23714,7 @@ var useThemeCommand = (loadedSettings, setThemeError, addItem, initialThemeError
 };
 
 // src/ui/hooks/input/use-vim.ts
-import { useCallback as useCallback44, useReducer as useReducer5, useEffect as useEffect49, useRef as useRef28 } from "react";
+import { useCallback as useCallback44, useReducer as useReducer5, useEffect as useEffect50, useRef as useRef29 } from "react";
 var DIGIT_MULTIPLIER = 10;
 var DEFAULT_COUNT = 1;
 var DIGIT_1_TO_9 = /^[1-9]$/;
@@ -23763,8 +23779,8 @@ var vimReducer = (state, action) => {
 function useVim(buffer, onSubmit) {
   const { vimEnabled, vimMode, setVimMode } = useVimMode();
   const [state, dispatch] = useReducer5(vimReducer, initialVimState);
-  const lastEscapeTimestampRef = useRef28(0);
-  useEffect49(() => {
+  const lastEscapeTimestampRef = useRef29(0);
+  useEffect50(() => {
     dispatch({ type: "SET_MODE", mode: vimMode });
   }, [vimMode]);
   const updateMode = useCallback44(
@@ -24263,7 +24279,7 @@ function useVim(buffer, onSubmit) {
 }
 
 // src/ui/hooks/session/use-git-branch-name.ts
-import { useState as useState54, useEffect as useEffect50, useCallback as useCallback45 } from "react";
+import { useState as useState54, useEffect as useEffect51, useCallback as useCallback45 } from "react";
 import fs9 from "node:fs";
 import fsPromises2 from "node:fs/promises";
 import path11 from "node:path";
@@ -24291,7 +24307,7 @@ function useGitBranchName(cwd) {
       setBranchName(void 0);
     }
   }, [cwd, setBranchName]);
-  useEffect50(() => {
+  useEffect51(() => {
     fetchBranchName();
     const gitLogsHeadPath = path11.join(cwd, ".git", "logs", "HEAD");
     let watcher;
@@ -24371,12 +24387,12 @@ var useEditorSettings = (loadedSettings, setEditorError, addItem) => {
 };
 
 // src/ui/hooks/terminal/use-memory-monitor.ts
-import { useEffect as useEffect51 } from "react";
+import { useEffect as useEffect52 } from "react";
 import process7 from "node:process";
 var MEMORY_WARNING_THRESHOLD = 7 * 1024 * 1024 * 1024;
 var MEMORY_CHECK_INTERVAL = 60 * 1e3;
 var useMemoryMonitor = ({ addItem }) => {
-  useEffect51(() => {
+  useEffect52(() => {
     const intervalId = setInterval(() => {
       const usage = process7.memoryUsage().rss;
       if (usage > MEMORY_WARNING_THRESHOLD) {
@@ -24397,9 +24413,9 @@ var useMemoryMonitor = ({ addItem }) => {
 // src/ui/hooks/visual/use-console-messages.ts
 import {
   useCallback as useCallback47,
-  useEffect as useEffect52,
+  useEffect as useEffect53,
   useReducer as useReducer6,
-  useRef as useRef29,
+  useRef as useRef30,
   useTransition
 } from "react";
 function consoleMessagesReducer(state, action) {
@@ -24427,8 +24443,8 @@ function consoleMessagesReducer(state, action) {
 }
 function useConsoleMessages() {
   const [consoleMessages, dispatch] = useReducer6(consoleMessagesReducer, []);
-  const messageQueueRef = useRef29([]);
-  const timeoutRef = useRef29(null);
+  const messageQueueRef = useRef30([]);
+  const timeoutRef = useRef30(null);
   const [, startTransition] = useTransition();
   const processQueue = useCallback47(() => {
     if (messageQueueRef.current.length > 0) {
@@ -24449,7 +24465,7 @@ function useConsoleMessages() {
     },
     [processQueue]
   );
-  useEffect52(() => {
+  useEffect53(() => {
     const handleConsoleLog = (payload) => {
       handleNewMessage({
         type: payload.type,
@@ -24478,7 +24494,7 @@ function useConsoleMessages() {
       dispatch({ type: "CLEAR" });
     });
   }, []);
-  useEffect52(
+  useEffect53(
     () => () => {
       if (timeoutRef.current) {
         clearTimeout(timeoutRef.current);
@@ -24490,13 +24506,13 @@ function useConsoleMessages() {
 }
 
 // src/ui/hooks/visual/use-timer.ts
-import { useState as useState56, useEffect as useEffect53, useRef as useRef30 } from "react";
+import { useState as useState56, useEffect as useEffect54, useRef as useRef31 } from "react";
 var useTimer = (isActive, resetKey) => {
   const [elapsedTime, setElapsedTime] = useState56(0);
-  const timerRef = useRef30(null);
-  const prevResetKeyRef = useRef30(resetKey);
-  const prevIsActiveRef = useRef30(isActive);
-  useEffect53(() => {
+  const timerRef = useRef31(null);
+  const prevResetKeyRef = useRef31(resetKey);
+  const prevIsActiveRef = useRef31(isActive);
+  useEffect54(() => {
     let shouldResetTime = false;
     if (prevResetKeyRef.current !== resetKey) {
       shouldResetTime = true;
@@ -24533,7 +24549,7 @@ var useTimer = (isActive, resetKey) => {
 };
 
 // src/ui/hooks/visual/use-phrase-cycler.ts
-import { useState as useState57, useEffect as useEffect54, useRef as useRef31 } from "react";
+import { useState as useState57, useEffect as useEffect55, useRef as useRef32 } from "react";
 
 // src/ui/components/indicators/loading-phrases.ts
 var WITTY_LOADING_PHRASES = [
@@ -24678,9 +24694,9 @@ var usePhraseCycler = (isActive, shouldShowFocusHint, customPhrases) => {
   const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState57(
     loadingPhrases[0]
   );
-  const phraseIntervalRef = useRef31(null);
-  const hasShownFirstRequestTipRef = useRef31(false);
-  useEffect54(() => {
+  const phraseIntervalRef = useRef32(null);
+  const hasShownFirstRequestTipRef = useRef32(false);
+  useEffect55(() => {
     if (phraseIntervalRef.current) {
       clearInterval(phraseIntervalRef.current);
       phraseIntervalRef.current = null;
@@ -24725,7 +24741,7 @@ var usePhraseCycler = (isActive, shouldShowFocusHint, customPhrases) => {
 };
 
 // src/ui/hooks/visual/use-loading-indicator.ts
-import { useState as useState58, useEffect as useEffect55, useRef as useRef32 } from "react";
+import { useState as useState58, useEffect as useEffect56, useRef as useRef33 } from "react";
 var useLoadingIndicator = ({
   streamingState,
   shouldShowFocusHint,
@@ -24740,8 +24756,8 @@ var useLoadingIndicator = ({
     shouldShowFocusHint,
     customWittyPhrases
   );
-  const prevStreamingStateRef = useRef32(null);
-  useEffect55(() => {
+  const prevStreamingStateRef = useRef33(null);
+  useEffect56(() => {
     if (streamingState === "idle" /* Idle */ && prevStreamingStateRef.current === "responding" /* Responding */) {
       setTimerResetKey((prevKey) => prevKey + 1);
     }
@@ -24754,7 +24770,7 @@ var useLoadingIndicator = ({
 };
 
 // src/ui/hooks/session/use-message-queue.ts
-import { useCallback as useCallback48, useEffect as useEffect56, useMemo as useMemo42, useState as useState59 } from "react";
+import { useCallback as useCallback48, useEffect as useEffect57, useMemo as useMemo42, useState as useState59 } from "react";
 function useMessageQueue({
   queueKey,
   streamingState,
@@ -24793,7 +24809,7 @@ function useMessageQueue({
     );
     return allMessages;
   }, [messageQueue, queueKey]);
-  useEffect56(() => {
+  useEffect57(() => {
     if (streamingState === "idle" /* Idle */ && messageQueue.length > 0) {
       const combinedMessage = messageQueue.join("\n\n");
       setQueuedMessages(
@@ -24812,7 +24828,7 @@ function useMessageQueue({
 }
 
 // src/ui/hooks/input/use-input-history-store.ts
-import { useCallback as useCallback49, useRef as useRef33, useState as useState60 } from "react";
+import { useCallback as useCallback49, useRef as useRef34, useState as useState60 } from "react";
 function deduplicateConsecutive(messages) {
   return messages.filter(
     (message, index) => index === 0 || message !== messages[index - 1]
@@ -24820,7 +24836,7 @@ function deduplicateConsecutive(messages) {
 }
 function useInputHistoryStore() {
   const [inputHistory, setInputHistory] = useState60([]);
-  const initializationStarted = useRef33(false);
+  const initializationStarted = useRef34(false);
   const initializeFromHistory = useCallback49(
     async (history) => {
       if (initializationStarted.current) return;
@@ -24942,12 +24958,12 @@ var PromptHistoryStore = class {
 };
 
 // src/ui/hooks/ai/use-turn-activity-monitor.ts
-import { useState as useState61, useEffect as useEffect57, useRef as useRef34 } from "react";
+import { useState as useState61, useEffect as useEffect58, useRef as useRef35 } from "react";
 var useTurnActivityMonitor = (streamingState, activePtyId) => {
   const [operationStartTime, setOperationStartTime] = useState61(0);
-  const prevPtyIdRef = useRef34(void 0);
-  const prevStreamingStateRef = useRef34(void 0);
-  useEffect57(() => {
+  const prevPtyIdRef = useRef35(void 0);
+  const prevStreamingStateRef = useRef35(void 0);
+  useEffect58(() => {
     const isNowResponding = streamingState === "responding" /* Responding */;
     const wasResponding = prevStreamingStateRef.current === "responding" /* Responding */;
     const ptyChanged = activePtyId !== prevPtyIdRef.current;
@@ -25006,7 +25022,7 @@ var useShellInactivityStatus = ({
 };
 
 // src/ui/hooks/input/use-local-shell-command.ts
-import { useCallback as useCallback50, useEffect as useEffect58, useRef as useRef35, useState as useState62 } from "react";
+import { useCallback as useCallback50, useEffect as useEffect59, useRef as useRef36, useState as useState62 } from "react";
 import crypto2 from "node:crypto";
 import fs11 from "node:fs";
 import os3 from "node:os";
@@ -25023,13 +25039,13 @@ function useLocalShellCommand({
   terminalWidth,
   terminalHeight
 }) {
-  const controllerRef = useRef35(void 0);
-  const mountedRef = useRef35(true);
+  const controllerRef = useRef36(void 0);
+  const mountedRef = useRef36(true);
   const [isExecuting, setIsExecuting] = useState62(false);
   const [activePtyId, setActivePtyId] = useState62(void 0);
   const [lastOutputTime, setLastOutputTime] = useState62(0);
   const cancel = useCallback50(() => controllerRef.current?.abort(), []);
-  useEffect58(() => {
+  useEffect59(() => {
     mountedRef.current = true;
     return () => {
       mountedRef.current = false;
@@ -25315,18 +25331,18 @@ var AppContainer = (props) => {
     interactionModeRuntime.getSnapshot,
     interactionModeRuntime.getSnapshot
   );
-  const conversationHistoryIds = useRef36(/* @__PURE__ */ new Map());
-  const conversationHistoryTexts = useRef36(/* @__PURE__ */ new Map());
+  const conversationHistoryIds = useRef37(/* @__PURE__ */ new Map());
+  const conversationHistoryTexts = useRef37(/* @__PURE__ */ new Map());
   const conversationSessionId = conversationRuntime.getSessionStats().sessionId;
   const [projectedSessionId, setProjectedSessionId] = useState63(
     conversationSessionId
   );
-  const promptInputAbortRef = useRef36(void 0);
+  const promptInputAbortRef = useRef37(void 0);
   const [promptInputPreparing, setPromptInputPreparing] = useState63(false);
   const addConversationHistoryItem = historyManager.addItem;
   const updateConversationHistoryItem = historyManager.updateItem;
   const clearConversationHistory = historyManager.clearItems;
-  useEffect59(() => {
+  useEffect60(() => {
     if (projectedSessionId !== conversationSessionId) {
       conversationHistoryIds.current.clear();
       conversationHistoryTexts.current.clear();
@@ -25407,7 +25423,7 @@ var AppContainer = (props) => {
   const [modelSelectionSnapshot, setModelSelectionSnapshot] = useState63(
     () => modelSelectionRuntime?.getSnapshot()
   );
-  useEffect59(
+  useEffect60(
     () => modelSelectionRuntime?.subscribe(
       () => setModelSelectionSnapshot(modelSelectionRuntime.getSnapshot())
     ),
@@ -25434,16 +25450,16 @@ var AppContainer = (props) => {
   const app = useApp();
   const { stats: sessionStats } = useSessionStats();
   const branchName = useGitBranchName(config.getTargetDir());
-  const mainControlsRef = useRef36(null);
-  const rootUiRef = useRef36(null);
-  const lastTitleRef = useRef36(null);
+  const mainControlsRef = useRef37(null);
+  const rootUiRef = useRef37(null);
+  const lastTitleRef = useRef37(null);
   const staticExtraHeight = 3;
-  useEffect59(() => {
+  useEffect60(() => {
     void (async () => {
       startupProfiler.flush();
     })();
   }, []);
-  useEffect59(() => {
+  useEffect60(() => {
     const handleSettingsChanged = () => {
       setSettingsNonce((prev) => prev + 1);
     };
@@ -25479,7 +25495,7 @@ var AppContainer = (props) => {
     shellModeActive,
     getPreferredEditor
   });
-  useEffect59(() => {
+  useEffect60(() => {
     initializeFromHistory(promptHistory);
   }, [initializeFromHistory, promptHistory]);
   const refreshStatic = useCallback51(() => {
@@ -25498,7 +25514,7 @@ var AppContainer = (props) => {
     terminalCapabilityManager.enableSupportedModes();
     refreshStatic();
   }, [refreshStatic, isAlternateBuffer, app, config]);
-  useEffect59(() => {
+  useEffect60(() => {
     coreEvents.on(CoreEvent.ExternalEditorClosed, handleEditorClose);
     return () => {
       coreEvents.off(CoreEvent.ExternalEditorClosed, handleEditorClose);
@@ -25577,8 +25593,8 @@ var AppContainer = (props) => {
     skillCatalogRuntime,
     agentActivityRuntime
   );
-  const commandPreparationRef = useRef36(void 0);
-  useEffect59(() => {
+  const commandPreparationRef = useRef37(void 0);
+  useEffect60(() => {
     if (!isSlashCommand(buffer.text.trim()) || commandPreparationRef.current !== void 0) {
       return;
     }
@@ -25594,12 +25610,12 @@ var AppContainer = (props) => {
       }
     });
   }, [buffer.text, commandRuntime]);
-  useEffect59(() => () => commandPreparationRef.current?.abort(), []);
-  const cancelHandlerRef = useRef36(
+  useEffect60(() => () => commandPreparationRef.current?.abort(), []);
+  const cancelHandlerRef = useRef37(
     () => {
     }
   );
-  useEffect59(() => {
+  useEffect60(() => {
     if (pendingRestorePrompt) {
       const lastHistoryUserMsg = historyManager.history.findLast(
         (h) => h.type === "user"
@@ -25714,14 +25730,14 @@ var AppContainer = (props) => {
     promptInputAbortRef.current?.abort();
     conversationRuntime.cancel();
   }, [cancelCommand, cancelLocalShell, conversationRuntime]);
-  useEffect59(
+  useEffect60(
     () => () => {
       promptInputAbortRef.current?.abort();
     },
     []
   );
-  const lastOutputTimeRef = useRef36(0);
-  useEffect59(() => {
+  const lastOutputTimeRef = useRef37(0);
+  useEffect60(() => {
     lastOutputTimeRef.current = lastOutputTime;
   }, [lastOutputTime]);
   const { shouldShowFocusHint, inactivityStatus } = useShellInactivityStatus({
@@ -25831,9 +25847,9 @@ ${queuedText}` : queuedText;
     () => props.initialPrompt ?? config.getQuestion(),
     [config, props.initialPrompt]
   );
-  const initialPromptSubmitted = useRef36(false);
+  const initialPromptSubmitted = useRef37(false);
   const providerSetupRequired = providerSetupSnapshot?.current.status === "missing";
-  useEffect59(() => {
+  useEffect60(() => {
     if (!providerSetupRuntime || !providerSetupRequired || providerSetupDismissed || customDialog) {
       return;
     }
@@ -25865,7 +25881,7 @@ ${queuedText}` : queuedText;
     providerSetupRuntime,
     providerSetupSnapshot
   ]);
-  useEffect59(() => {
+  useEffect60(() => {
     if (activePtyId) {
       try {
         ShellExecutionService.resizePty(
@@ -25883,7 +25899,7 @@ ${queuedText}` : queuedText;
       }
     }
   }, [terminalWidth, availableTerminalHeight, activePtyId]);
-  useEffect59(() => {
+  useEffect60(() => {
     if (initialPrompt && !initialPromptSubmitted.current && !isThemeDialogOpen && !isEditorDialogOpen && !providerSetupRequired && !customDialog && conversationRuntime) {
       handleFinalSubmit(initialPrompt);
       initialPromptSubmitted.current = true;
@@ -25901,15 +25917,15 @@ ${queuedText}` : queuedText;
   const [showFullTodos, setShowFullTodos] = useState63(false);
   const [renderMarkdown, setRenderMarkdown] = useState63(true);
   const [ctrlCPressCount, setCtrlCPressCount] = useState63(0);
-  const ctrlCTimerRef = useRef36(null);
+  const ctrlCTimerRef = useRef37(null);
   const [ctrlDPressCount, setCtrlDPressCount] = useState63(0);
-  const ctrlDTimerRef = useRef36(null);
+  const ctrlDTimerRef = useRef37(null);
   const [constrainHeight, setConstrainHeight] = useState63(true);
   const [showEscapePrompt, setShowEscapePrompt] = useState63(false);
   const [warningMessage, setWarningMessage] = useState63(null);
-  const isInitialMount = useRef36(true);
-  const warningTimeoutRef = useRef36(null);
-  const tabFocusTimeoutRef = useRef36(null);
+  const isInitialMount = useRef37(true);
+  const warningTimeoutRef = useRef37(null);
+  const tabFocusTimeoutRef = useRef37(null);
   const handleWarning = useCallback51((message) => {
     setWarningMessage(message);
     if (warningTimeoutRef.current) {
@@ -25919,7 +25935,7 @@ ${queuedText}` : queuedText;
       setWarningMessage(null);
     }, WARNING_PROMPT_DURATION_MS);
   }, []);
-  useEffect59(() => {
+  useEffect60(() => {
     const handleSelectionWarning = () => {
       handleWarning("Press Ctrl-S to enter selection mode to copy text.");
     };
@@ -25939,7 +25955,7 @@ ${queuedText}` : queuedText;
       }
     };
   }, [handleWarning]);
-  useEffect59(() => {
+  useEffect60(() => {
     if (queueErrorMessage) {
       const timer = setTimeout(() => {
         setQueueErrorMessage(null);
@@ -25948,7 +25964,7 @@ ${queuedText}` : queuedText;
     }
     return void 0;
   }, [queueErrorMessage, setQueueErrorMessage]);
-  useEffect59(() => {
+  useEffect60(() => {
     if (isInitialMount.current) {
       isInitialMount.current = false;
       return;
@@ -25960,7 +25976,7 @@ ${queuedText}` : queuedText;
       clearTimeout(handler);
     };
   }, [terminalWidth, refreshStatic]);
-  useEffect59(() => {
+  useEffect60(() => {
     const openDebugConsole = () => {
       setShowErrorDetails(true);
       setConstrainHeight(false);
@@ -25970,7 +25986,7 @@ ${queuedText}` : queuedText;
       appEvents.off("open-debug-console" /* OpenDebugConsole */, openDebugConsole);
     };
   }, [config]);
-  useEffect59(() => {
+  useEffect60(() => {
     if (ctrlCTimerRef.current) {
       clearTimeout(ctrlCTimerRef.current);
       ctrlCTimerRef.current = null;
@@ -25984,7 +26000,7 @@ ${queuedText}` : queuedText;
       }, WARNING_PROMPT_DURATION_MS);
     }
   }, [ctrlCPressCount, config, setCtrlCPressCount, handleSlashCommand]);
-  useEffect59(() => {
+  useEffect60(() => {
     if (ctrlDTimerRef.current) {
       clearTimeout(ctrlDTimerRef.current);
       ctrlCTimerRef.current = null;
@@ -26135,7 +26151,7 @@ ${queuedText}` : queuedText;
     ]
   );
   useKeypress(handleGlobalKeypress, { isActive: true });
-  useEffect59(() => {
+  useEffect60(() => {
     if (settings.merged.ui.hideWindowTitle) return;
     const paddedTitle = computeTerminalTitle({
       streamingState,
@@ -26161,7 +26177,7 @@ ${queuedText}` : queuedText;
     config,
     stdout
   ]);
-  useEffect59(() => {
+  useEffect60(() => {
     const handleUserFeedback = (payload) => {
       let type;
       switch (payload.severity) {
@@ -26677,12 +26693,6 @@ function projectDshContentBlock(block) {
         name: block.name,
         arguments: block.arguments
       };
-    case "tool-result":
-      return {
-        type: "extension",
-        blockType: block.type,
-        payload: block
-      };
     default: {
       const extension = block;
       return {
@@ -27022,20 +27032,18 @@ var DshSessionProjector = class {
     }
     if (event.type === "tool/result") {
       if (this.cancelledTurns.has(event.data.turn)) return;
-      const callId = String(event.data.message.source.callId);
+      const callId = String(event.data.message.toolCallId);
       const id = `tool-${callId}`;
-      const resultBlock = event.data.message.content.find(
-        (block) => block.type === "tool-result"
-      );
-      const failed = resultBlock?.isError === true || event.data.error !== void 0;
+      const message = event.data.message;
+      const failed = message.isError === true || event.data.error !== void 0;
       const result = {
-        content: projectDshContent(resultBlock?.content ?? []),
+        content: projectDshContent(message.content),
         isError: failed,
         ...event.data.error === void 0 ? {} : { error: event.data.error },
         ...event.data.meta === void 0 ? {} : { meta: event.data.meta }
       };
       const existingMessage = this.snapshot.messages.find(
-        (message) => message.id === id && message.role === "tool"
+        (message2) => message2.id === id && message2.role === "tool"
       );
       const toolName = this.toolNames.get(callId) ?? "tool";
       const tool = this.metrics.tools.byName[toolName] ??= createInitialToolCallStats();
@@ -27051,7 +27059,7 @@ var DshSessionProjector = class {
         toolName,
         existingMessage?.arguments ?? "",
         {
-          content: resultBlock?.content ?? [],
+          content: [...message.content],
           isError: failed,
           ...event.data.meta === void 0 ? {} : { meta: event.data.meta }
         }
@@ -29546,6 +29554,11 @@ function waitForSharedPromise(promise, signal) {
 
 // src/dsh/agent-preset-runtime.ts
 var EMPTY_OPTIONS = Object.freeze([]);
+async function resolveNewSessionPreset(presets, requestedId) {
+  if (requestedId === void 0) return presets.resolve();
+  const roster = await presets.remoteExportList();
+  return presets.resolve(roster.modeSelectionEnabled ? requestedId : void 0);
+}
 var DshAgentPresetRuntime = class {
   constructor(presets, projections, activeAgent, pendingPresetId, selectPendingPreset, onSelected) {
     this.presets = presets;
@@ -29579,7 +29592,6 @@ var DshAgentPresetRuntime = class {
   };
   async prepare(signal) {
     signal?.throwIfAborted();
-    if (this.snapshot.status === "ready") return;
     let loading = this.loading;
     if (loading === void 0) {
       loading = this.load().finally(() => {
@@ -29590,8 +29602,12 @@ var DshAgentPresetRuntime = class {
     return waitForSharedPromise(loading, signal);
   }
   async select(id, signal) {
+    const agent = this.activeAgent();
     await this.prepare(signal);
     signal?.throwIfAborted();
+    if (this.activeAgent() !== agent) {
+      throw new Error("The active Session changed. Reopen Agent presets.");
+    }
     if (!this.snapshot.modeSelectionEnabled) {
       throw new Error("Agent preset selection is disabled by the DSH host.");
     }
@@ -29606,7 +29622,6 @@ var DshAgentPresetRuntime = class {
     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();
@@ -29652,15 +29667,14 @@ var DshAgentPresetRuntime = class {
           id: preset.id,
           name: preset.name ?? preset.id,
           ...preset.description === void 0 ? {} : { description: preset.description },
-          trust: preset.trust,
-          isDefault: preset.id === this.presets.defaultId,
+          isDefault: preset.isDefault,
           ...preset.broken === void 0 ? {} : { broken: preset.broken }
         })
       );
       this.snapshot = Object.freeze({
         status: "ready",
         modeSelectionEnabled: roster.modeSelectionEnabled,
-        currentId: this.currentId(),
+        currentId: this.currentId(roster.modeSelectionEnabled),
         options: Object.freeze(options),
         busy: this.snapshot.busy
       });
@@ -29669,16 +29683,17 @@ var DshAgentPresetRuntime = class {
       this.snapshot = Object.freeze({
         ...this.snapshot,
         status: "error",
+        modeSelectionEnabled: false,
         error: error instanceof Error ? error.message : String(error)
       });
       this.emit();
       throw error;
     }
   }
-  currentId() {
+  currentId(modeSelectionEnabled = this.snapshot?.modeSelectionEnabled) {
     const agent = this.activeAgent();
     if (agent === void 0)
-      return this.pendingPresetId() ?? this.presets.defaultId;
+      return (modeSelectionEnabled === false ? void 0 : this.pendingPresetId()) ?? this.presets.defaultId;
     return this.projections.snapshot(agent.session).values.agentPreset ?? this.presets.defaultId;
   }
   refreshCurrent() {
@@ -29830,8 +29845,11 @@ var DshAgentActivityRuntime = class {
     this.activeAgent = activeAgent;
     this.ensureAgent = ensureAgent;
     this.isSwitching = isSwitching;
-    const offJobs = jobs.onJobsChanged((owner) => {
-      if (owner === this.activeAgent()) this.refresh();
+    const offJobs = jobs.events.subscribe({ owners: "all" }, (event) => {
+      if (event.type === "output") return;
+      const agent = this.activeAgent();
+      if (agent !== void 0 && event.job.owner === agent.session.id)
+        this.refresh();
     });
     const offSession = subscribeSession((session, event) => {
       if (session === this.activeAgent()?.session && event.type.startsWith("goal/"))
@@ -29867,10 +29885,14 @@ var DshAgentActivityRuntime = class {
         "The active Session changed. Reopen Jobs before stopping work."
       );
     }
-    const job = this.jobs.get(JobId(jobId), agent);
-    if (String(job.ownerSession) !== sessionId)
+    const job = this.jobs.get(JobId(jobId), agent.session.id);
+    if (String(job.owner) !== sessionId)
       throw new Error("This job belongs to another Session.");
-    this.jobs.kill(job.id, agent, "Stopped by the user in DSH Console.");
+    this.jobs.kill(
+      job.id,
+      agent.session.id,
+      "Stopped by the user in DSH Console."
+    );
     this.refresh();
   }
   async changeGoal(expected, action, signal) {
@@ -29943,13 +29965,13 @@ var DshAgentActivityRuntime = class {
       this.snapshot = {
         sessionId,
         busy: this.changing,
-        jobs: agent === void 0 ? [] : this.jobs.list(agent).filter((job) => job.ownerSession === agent.session.id).map((job) => ({
+        jobs: agent === void 0 ? [] : this.jobs.list(agent.session.id).filter((job) => job.owner === agent.session.id).map((job) => ({
           id: String(job.id),
           kind: String(job.kind),
           label: job.label,
           sessionId: String(agent.session.id),
           status: job.status,
-          detail: job.detail,
+          detail: job.progress ?? job.detail,
           startedAt: job.startedAt,
           finishedAt: job.finishedAt
         })),
@@ -30340,7 +30362,7 @@ async function start(ctx, config) {
       model: selected.model,
       ...selected.reasoningEffort === void 0 ? {} : { reasoningEffort: selected.reasoningEffort }
     };
-    const preset = options.resumeSessionId === void 0 && options.inheritPresetFrom === void 0 ? await agentPresets.resolve(options.presetId) : void 0;
+    const preset = options.resumeSessionId === void 0 && options.inheritPresetFrom === void 0 ? await resolveNewSessionPreset(agentPresets, 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 = {
@@ -30356,19 +30378,18 @@ async function start(ctx, config) {
       }
       if (options.restrictTools) agentCtx.tools.restrict({ allow: [] });
     };
+    const fork = options.seed === void 0 ? void 0 : forkSeedOptions(options.seed);
     const handle = options.resumeSessionId === void 0 ? await agents.create({
       sessionId: options.sessionId ?? SessionId5(`dsh-console-${randomUUID3()}`),
       meta: {
         cwd: process.cwd(),
         ...options.parentSession === void 0 ? {} : { parentSession: options.parentSession },
-        ...options.seed === void 0 ? {} : forkSeedOptions(options.seed).meta,
+        ...fork?.meta,
         ...(preset?.id ?? inheritedPresetId) === void 0 ? {} : { agentPreset: preset?.id ?? inheritedPresetId }
       },
-      ...options.seed === void 0 ? {} : {
-        seed: options.seed,
-        ..."inheritedEventCount" in forkSeedOptions(options.seed) ? {
-          inheritedEventCount: forkSeedOptions(options.seed).inheritedEventCount
-        } : {}
+      ...fork === void 0 ? {} : {
+        seed: fork.seed,
+        inheritedEventCount: fork.inheritedEventCount
       },
       agentOptions,
       setup,
@@ -30687,10 +30708,7 @@ async function start(ctx, config) {
         );
         return records.map((record) => {
           const live = sessions.get(record.header.id);
-          const projection = live === void 0 ? record.header.isSeeded ? void 0 : sessionProjectionCache.cachedSnapshot(
-            record.header,
-            SessionLogOffset2(0)
-          ) : sessionProjections.cachedSnapshot(live);
+          const projection = live === void 0 ? sessionProjectionCache.cachedSnapshot(record.header) : sessionProjections.cachedSnapshot(live);
           const metadata = projection?.values.sessionListMetadata;
           const title = projection?.values.title;
           return {