ohbaby-cli 0.1.0 → 0.1.2

package/README.md

@@ -6,10 +6,10 @@
 
 <p align="center">
   <a href="https://github.com/diverHansun/ohbaby-agent/actions/workflows/ci.yml"><img alt="CI" src="https://img.shields.io/github/actions/workflow/status/diverHansun/ohbaby-agent/ci.yml?style=flat-square&label=CI&logo=github"></a>
-  <a href="https://www.npmjs.com/package/ohbaby-cli"><img alt="npm" src="https://img.shields.io/npm/v/ohbaby-cli?style=flat-square&color=cb3837&logo=npm"></a>
-  <a href="https://github.com/diverHansun/ohbaby-agent/blob/main/LICENSE"><img alt="license" src="https://img.shields.io/badge/license-MIT-blue?style=flat-square"></a>
-  <img alt="node" src="https://img.shields.io/node/v/ohbaby-cli?style=flat-square&color=339933&logo=node.js">
-</p>
+  <a href="https://www.npmjs.com/package/ohbaby-cli"><img alt="npm" src="https://img.shields.io/npm/v/ohbaby-cli?style=flat-square&color=cb3837&logo=npm"></a>
+  <a href="https://github.com/diverHansun/ohbaby-agent/blob/main/LICENSE"><img alt="license" src="https://img.shields.io/badge/license-MIT-blue?style=flat-square"></a>
+  <img alt="node" src="https://img.shields.io/badge/node-%3E%3D24-339933?style=flat-square&logo=node.js">
+</p>
 
 <p align="center">
   <img src="https://raw.githubusercontent.com/diverHansun/ohbaby-agent/main/assets/images/dashboard.png" alt="ohbaby-agent CLI/TUI" width="760">

package/dist/bin.js

@@ -217,6 +217,7 @@ function createTerminalCommand(runtime) {
           await host.core.getSnapshot();
         }
         const instance = runtime.renderTerminalUi({
+          clearOnStart: resume === void 0 && args.continue !== true,
           client: host.core,
           subscribeEvents: (handler) => host.callbacks.subscribeEvents(handler)
         });
@@ -3915,7 +3916,6 @@ function applyTuiEvent(state, event) {
       );
     case "session.updated":
       return rebuildFromCollections(state, {
-        activeSessionId: state.activeSessionId ?? event.session.id,
         sessions: upsertById(state.sessions, event.session)
       });
     case "message.appended": {
@@ -4045,7 +4045,13 @@ function applyTuiEvent(state, event) {
       );
     }
     case "command.result.delivered": {
-      const next = clearCommandRuntime(state, event.commandRunId);
+      const selectedSessionId = selectedSessionIdFromCommandAction(event.action);
+      const next = selectedSessionId === void 0 ? clearCommandRuntime(state, event.commandRunId) : clearCommandRuntime(
+        rebuildFromCollections(state, {
+          activeSessionId: selectedSessionId
+        }),
+        event.commandRunId
+      );
       if (!event.output || !shouldDisplayCommandOutput(event.output)) {
         return next;
       }
@@ -4099,6 +4105,13 @@ function applyTuiEvent(state, event) {
   }
   return state;
 }
+function selectedSessionIdFromCommandAction(action) {
+  if (action?.kind !== "session.selected" || !isRecord3(action.data)) {
+    return void 0;
+  }
+  const choiceId = action.data.choiceId;
+  return typeof choiceId === "string" && choiceId.length > 0 ? choiceId : void 0;
+}
 function setCommandCatalog(state, catalog) {
   return {
     ...state,
@@ -4878,6 +4891,7 @@ var NEW_SESSION_CLEAR_SEQUENCE = "\x1B[2J\x1B[3J\x1B[H";
 var ESC_INTERRUPT_WINDOW_MS = 1500;
 var ESC_INTERRUPT_HINT = "Press Esc again to interrupt";
 function OhbabyTerminalApp({
+  clearOnStart = false,
   client,
   subscribeEvents
 }) {
@@ -4886,6 +4900,7 @@ function OhbabyTerminalApp({
   const catalogRequestSequenceRef = useRef(0);
   const contextRefreshSequenceRef = useRef(0);
   const contextNoticeSequenceRef = useRef(0);
+  const didClearOnStartRef = useRef(false);
   const disposedRef = useRef(false);
   const [screenGeneration, setScreenGeneration] = useState(0);
   const [commandPanel, setCommandPanel] = useState(
@@ -4897,6 +4912,10 @@ function OhbabyTerminalApp({
   const store = storeRef.current;
   const { exit } = useApp();
   const { write: writeStdout } = useStdout();
+  if (clearOnStart && !didClearOnStartRef.current) {
+    writeStdout(NEW_SESSION_CLEAR_SEQUENCE);
+    didClearOnStartRef.current = true;
+  }
   const activeSessionId = useTuiStoreSelector(
     store,
     (state) => state.activeSessionId
@@ -5535,6 +5554,7 @@ function renderTerminalUi(options) {
     /* @__PURE__ */ jsx(
       OhbabyTerminalApp,
       {
+        clearOnStart: options.clearOnStart,
         client: options.client,
         subscribeEvents: options.subscribeEvents
       }