@within-7/minto 0.3.10 → 0.4.1

package/dist/screens/REPL.js

@@ -15,7 +15,7 @@ import {
   PermissionRequest
 } from "../components/permissions/PermissionRequest.js";
 import PromptInput from "../components/PromptInput.js";
-import { getSystemPrompt } from "../constants/prompts.js";
+import { getSystemPrompt } from "../constants/prompts/index.js";
 import { getContext } from "../context.js";
 import { getTotalCost, useCostSummary } from "../cost-tracker.js";
 import { useLogStartupTime } from "../hooks/useLogStartupTime.js";
@@ -26,7 +26,6 @@ import { useLogMessages, serializeMessageForLog } from "../hooks/useLogMessages.
 import { overwriteLog } from "../utils/log.js";
 import { PermissionProvider } from "../context/PermissionContext.js";
 import { useFullscreenExitCallback } from "../hooks/useTerminalSize.js";
-import { ModeIndicator } from "../components/ModeIndicator.js";
 import { TodoPanel } from "../components/TodoPanel.js";
 import { TurnCompletionIndicator } from "../components/TurnCompletionIndicator.js";
 import { getTodos, initTodoSession } from "../utils/todoStorage.js";
@@ -44,7 +43,16 @@ import {
   saveGlobalConfig,
   getVerboseLabel
 } from "../utils/config.js";
-import { getNextAvailableLogForkNumber } from "../utils/log.js";
+import { loadMessagesFromLog } from "../utils/conversationRecovery.js";
+import { useBackgroundShells } from "../hooks/useBackgroundShells.js";
+import { useDeferredLoading } from "../hooks/useDeferredLoading.js";
+import { useSessionTracking } from "../hooks/useSessionTracking.js";
+import { emitReminderEvent } from "../services/systemReminder.js";
+import {
+  getNextAvailableLogForkNumber,
+  loadLogList,
+  CACHE_PATHS
+} from "../utils/log.js";
 import {
   getErroredToolUseMessages,
   getInProgressToolUseIDs,
@@ -66,11 +74,6 @@ import { BinaryFeedback } from "../components/binary-feedback/BinaryFeedback.js"
 import { getMaxThinkingTokens } from "../utils/thinking.js";
 import { getOriginalCwd } from "../utils/state.js";
 import { handleHashCommand } from "../commands/terminalSetup.js";
-import { debug as debugLogger } from "../utils/debugLogger.js";
-import {
-  initializeHookManager
-} from "../utils/hookManager.js";
-import { loadAllPlugins } from "../utils/pluginLoader.js";
 import { randomUUID } from "crypto";
 import { getMessagesPath } from "../utils/log.js";
 import {
@@ -88,12 +91,10 @@ import { useAgentTranscripts } from "../hooks/useAgentTranscripts.js";
 import { GroupRenderer } from "../components/messages/GroupRenderer.js";
 import { SEMANTIC_COLORS } from "../constants/colors.js";
 import {
-  initSessionTracker,
   recordFirstPrompt,
   incrementMessageCount,
   incrementToolCallCount,
-  flushSessionStats,
-  endSession
+  flushSessionStats
 } from "../utils/sessionTracker.js";
 const RESUME_VISIBLE_MESSAGE_COUNT = Infinity;
 function REPL({
@@ -113,7 +114,9 @@ function REPL({
   initialUpdateVersion,
   initialUpdateCommands,
   fallbackMode = false,
-  isResumedConversation = false
+  isResumedConversation = false,
+  enableArchitect,
+  autoResume = false
 }) {
   const [verbose, setVerbose] = useState(
     verboseFromCLI === true ? true : false
@@ -155,8 +158,21 @@ function REPL({
   );
   const [binaryFeedbackContext, setBinaryFeedbackContext] = useState(null);
   const [askUserQuestionContext, setAskUserQuestionContext] = useState(null);
-  const updateAvailableVersion = initialUpdateVersion ?? null;
-  const updateCommands = initialUpdateCommands ?? null;
+  const {
+    commands: currentCommands,
+    tools: currentTools,
+    mcpClients: currentMcpClients,
+    updateVersion: updateAvailableVersion,
+    updateCommands,
+    startupItems
+  } = useDeferredLoading({
+    initialCommands: commands,
+    initialTools: tools,
+    initialMcpClients: mcpClients,
+    initialUpdateVersion,
+    initialUpdateCommands,
+    enableArchitect
+  });
   const [isTodoPanelVisible, setIsTodoPanelVisible] = useState(true);
   const [verboseToggleMessage, setVerboseToggleMessage] = useState(null);
   const turnStartTimeRef = useRef(null);
@@ -178,10 +194,12 @@ function REPL({
       turnStartTimeRef.current = null;
     }
   }, [isLoading]);
-  const [backgroundShells, setBackgroundShells] = useState(
-    []
-  );
-  const [showBackgroundPanel, setShowBackgroundPanel] = useState(false);
+  const {
+    shells: backgroundShells,
+    isPanelVisible: showBackgroundPanel,
+    setIsPanelVisible: setShowBackgroundPanel,
+    runningCount: backgroundShellRunningCount
+  } = useBackgroundShells();
   const prevUnresolvedRef = useRef(/* @__PURE__ */ new Set());
   const messageBatchBufferRef = useRef(null);
   if (messageBatchBufferRef.current === null) {
@@ -217,7 +235,6 @@ function REPL({
     []
   );
   const readFileTimestamps = useRef({});
-  const hookManagerRef = useRef(null);
   const { status: apiKeyStatus, reverify } = useApiKeyVerification();
   function onInterrupt() {
     if (!isLoading) {
@@ -276,10 +293,10 @@ function REPL({
         {
           abortController: newAbortController,
           options: {
-            commands,
+            commands: currentCommands,
             forkNumber,
             messageLogName,
-            tools,
+            tools: currentTools,
             verbose,
             maxThinkingTokens: 0
           },
@@ -313,10 +330,10 @@ function REPL({
           canUseTool,
           {
             options: {
-              commands,
+              commands: currentCommands,
               forkNumber,
               messageLogName,
-              tools,
+              tools: currentTools,
               verbose,
               safeMode,
               safetyMode,
@@ -402,10 +419,10 @@ function REPL({
         canUseTool,
         {
           options: {
-            commands,
+            commands: currentCommands,
             forkNumber,
             messageLogName,
-            tools,
+            tools: currentTools,
             verbose,
             safeMode,
             safetyMode,
@@ -501,45 +518,29 @@ function REPL({
   useLogMessages(messages, messageLogName, forkNumber);
   useLogStartupTime();
   useEffect(() => {
-    onInit();
+    if (!autoResume) return;
+    loadLogList(CACHE_PATHS.messages()).then(async (logs) => {
+      for (const log of logs) {
+        try {
+          const loaded = await loadMessagesFromLog(log.fullPath, tools);
+          if (loaded && loaded.length > 0) {
+            setMessages(loaded);
+            emitReminderEvent("session:continuation", {
+              messageCount: loaded.length
+            });
+            break;
+          }
+        } catch {
+          continue;
+        }
+      }
+    }).catch(() => {
+    });
   }, []);
   useEffect(() => {
-    try {
-      const plugins = loadAllPlugins();
-      const sessionId = randomUUID();
-      const transcriptPath = getMessagesPath(messageLogName, forkNumber, 0);
-      const hookManager = initializeHookManager(
-        sessionId,
-        transcriptPath,
-        plugins
-      );
-      hookManagerRef.current = hookManager;
-      initSessionTracker(getOriginalCwd());
-      hookManager.executeSessionStart().catch((err) => {
-        debugLogger.error("SessionStart hooks failed", { error: err });
-      });
-      return () => {
-        flushSessionStats();
-        endSession("other");
-        hookManager.executeSessionEnd("other").catch((err) => {
-          debugLogger.error("SessionEnd hooks failed", { error: err });
-        });
-      };
-    } catch (err) {
-      debugLogger.error("Failed to initialize hook manager", { error: err });
-    }
-  }, [messageLogName, forkNumber]);
-  useEffect(() => {
-    const manager = BackgroundShellManager.getInstance();
-    setBackgroundShells(manager.list());
-    const handleListChange = (shells) => {
-      setBackgroundShells(shells);
-    };
-    manager.on("listChange", handleListChange);
-    return () => {
-      manager.off("listChange", handleListChange);
-    };
+    onInit();
   }, []);
+  useSessionTracking(messageLogName, forkNumber);
   const normalizedMessages = useMemo(
     () => normalizeMessages(messages).filter(isNotEmptyMessage),
     [messages]
@@ -599,7 +600,7 @@ function REPL({
         jsx: /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", width: "100%", key: "logo" }, /* @__PURE__ */ React.createElement(
           Logo,
           {
-            mcpClients,
+            mcpClients: currentMcpClients,
             isDefaultModel,
             updateBannerVersion: updateAvailableVersion,
             updateBannerCommands: updateCommands
@@ -622,6 +623,9 @@ function REPL({
       if (!group && _.type === "progress") {
         group = getGroupForToolUse(_.toolUseID);
       }
+      if (!group && toolUseID) {
+        group = getGroupForToolUse(toolUseID);
+      }
       if (group && (group.type === "parallel-tasks" || group.type === "task")) {
         if (renderedGroupIds.has(group.id)) {
           continue;
@@ -688,7 +692,7 @@ function REPL({
           }
         }
       }
-      if (_.type === "progress" && "type" in _.content && _.content.type === "streaming" && !unresolvedToolUseIDs.has(_.toolUseID)) {
+      if (_.type === "progress" && !unresolvedToolUseIDs.has(_.toolUseID)) {
         continue;
       }
       const message = _.type === "progress" ? (
@@ -746,7 +750,7 @@ function REPL({
           message: _,
           messages: normalizedMessages,
           addMargin: true,
-          tools,
+          tools: currentTools,
           verbose,
           debug,
           erroredToolUseIDs,
@@ -786,7 +790,7 @@ function REPL({
   }, [
     forkNumber,
     normalizedMessages,
-    tools,
+    currentTools,
     verbose,
     debug,
     erroredToolUseIDs,
@@ -795,7 +799,7 @@ function REPL({
     toolUseConfirm,
     isMessageSelectorVisible,
     unresolvedToolUseIDs,
-    mcpClients,
+    currentMcpClients,
     isDefaultModel,
     isResumedConversation,
     // V1+ dependencies
@@ -830,8 +834,12 @@ function REPL({
   const handleToggleBackgroundPanel = useCallback(() => {
     setShowBackgroundPanel((prev) => !prev);
   }, []);
-  const handleModelChange = useCallback(() => {
+  const handleModelChange = useCallback(async () => {
+    setIsResizeClearing(true);
+    await new Promise((resolve) => setTimeout(resolve, 50));
+    await clearTerminal();
     setForkNumber((prev) => prev + 1);
+    setIsResizeClearing(false);
   }, []);
   const handleToggleVerbose = useCallback(async (newVerbose) => {
     const message = `${getVerboseLabel(newVerbose)} (Ctrl+O)`;
@@ -883,7 +891,7 @@ function REPL({
     PermissionProvider,
     {
       isBypassPermissionsModeAvailable: !safeMode,
-      children: /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(React.Fragment, { key: `mode-indicator-${forkNumber}` }, /* @__PURE__ */ React.createElement(ModeIndicator, null)), /* @__PURE__ */ React.createElement(React.Fragment, { key: `static-wrapper-${forkNumber}` }, /* @__PURE__ */ React.createElement(
+      children: /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(React.Fragment, { key: `static-wrapper-${forkNumber}` }, /* @__PURE__ */ React.createElement(
         Static,
         {
           items: staticItems,
@@ -907,7 +915,7 @@ function REPL({
             showTodoList: isTodoPanelVisible
           }
         ),
-        !isResizeClearing && !isLoading && !toolJSX && !toolUseConfirm && !binaryFeedbackContext && /* @__PURE__ */ React.createElement(
+        !isResizeClearing && !isLoading && !toolJSX && !toolUseConfirm && !binaryFeedbackContext && queuedPrompts.length === 0 && /* @__PURE__ */ React.createElement(
           TurnCompletionIndicator,
           {
             durationMs: lastTurnDurationMs,
@@ -926,7 +934,7 @@ function REPL({
             },
             verbose,
             normalizedMessages,
-            tools,
+            tools: currentTools,
             debug,
             erroredToolUseIDs,
             inProgressToolUseIDs,
@@ -978,10 +986,10 @@ function REPL({
         ), /* @__PURE__ */ React.createElement(
           PromptInput,
           {
-            commands,
+            commands: currentCommands,
             forkNumber,
             messageLogName,
-            tools,
+            tools: currentTools,
             isDisabled: apiKeyStatus === "invalid",
             isLoading,
             onQuery,
@@ -1020,7 +1028,8 @@ function REPL({
             },
             onInterrupt,
             isOverlayActive: !!(toolJSX && !toolJSX.shouldHidePromptInput),
-            unmount: unmountREPL
+            unmount: unmountREPL,
+            startupItems
           }
         ), toolJSX && !toolJSX.shouldHidePromptInput && toolJSX.jsx)
       ), isMessageSelectorVisible && /* @__PURE__ */ React.createElement(React.Fragment, { key: `message-selector-wrapper-${forkNumber}` }, /* @__PURE__ */ React.createElement(
@@ -1047,7 +1056,7 @@ function REPL({
             });
           },
           onEscape: () => setIsMessageSelectorVisible(false),
-          tools
+          tools: currentTools
         }
       )), /* @__PURE__ */ React.createElement(Newline, null))
     }