ohbaby-cli 0.1.1 → 0.1.3

package/dist/bin.js

@@ -69,8 +69,8 @@ function createRunCommand(runtime) {
 // src/cli/commands/serve.ts
 function normalizePort(port, runtime) {
   const value = port ?? 4096;
-  if (!Number.isInteger(value) || value <= 0 || value > 65535) {
-    runtime.failUsage("--port must be a TCP port between 1 and 65535");
+  if (!Number.isInteger(value) || value < 0 || value > 65535) {
+    runtime.failUsage("--port must be a TCP port between 0 and 65535");
   }
   return value;
 }
@@ -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,8 @@ function OhbabyTerminalApp({
   const catalogRequestSequenceRef = useRef(0);
   const contextRefreshSequenceRef = useRef(0);
   const contextNoticeSequenceRef = useRef(0);
+  const snapshotRefreshSequenceRef = useRef(0);
+  const didClearOnStartRef = useRef(false);
   const disposedRef = useRef(false);
   const [screenGeneration, setScreenGeneration] = useState(0);
   const [commandPanel, setCommandPanel] = useState(
@@ -4897,6 +4913,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
@@ -5179,11 +5199,24 @@ function OhbabyTerminalApp({
         return;
       }
       eventDispatcher.dispatch(tuiEvent);
-      if (isNewSessionSelectionEvent(tuiEvent)) {
+      const isNewSessionSelection = isNewSessionSelectionEvent(tuiEvent);
+      if (isNewSessionSelection) {
+        snapshotRefreshSequenceRef.current += 1;
         writeStdout(NEW_SESSION_CLEAR_SEQUENCE);
         setScreenGeneration((current) => current + 1);
         setActiveCommandPanel(null);
       }
+      const selectedExistingSessionId = selectedExistingSessionIdFromEvent(tuiEvent);
+      if (selectedExistingSessionId !== void 0) {
+        const requestSequence2 = snapshotRefreshSequenceRef.current + 1;
+        snapshotRefreshSequenceRef.current = requestSequence2;
+        void client.getSnapshot().then((snapshot) => {
+          if (disposedRef.current || requestSequence2 !== snapshotRefreshSequenceRef.current || snapshot.activeSessionId !== selectedExistingSessionId) {
+            return;
+          }
+          store.replaceSnapshot(snapshot);
+        }).catch(() => void 0);
+      }
       if (tuiEvent.type === "command.result.delivered" && tuiEvent.action?.kind === "app.exit") {
         exit();
       }
@@ -5191,12 +5224,14 @@ function OhbabyTerminalApp({
         void loadCatalog().catch(() => void 0);
       }
     });
+    const requestSequence = snapshotRefreshSequenceRef.current + 1;
+    snapshotRefreshSequenceRef.current = requestSequence;
     void client.getSnapshot().then((snapshot) => {
-      if (!disposedRef.current) {
+      if (!disposedRef.current && requestSequence === snapshotRefreshSequenceRef.current) {
         store.replaceSnapshot(snapshot);
       }
     }).catch((caught) => {
-      if (!disposedRef.current) {
+      if (!disposedRef.current && requestSequence === snapshotRefreshSequenceRef.current) {
         store.dispatch({
           status: {
             kind: "error",
@@ -5377,6 +5412,17 @@ function isNewSessionSelectionEvent(tuiEvent) {
   const data = tuiEvent.action.data;
   return isStringRecord(data) && data.source === "new";
 }
+function selectedExistingSessionIdFromEvent(tuiEvent) {
+  if (tuiEvent.type !== "command.result.delivered" || tuiEvent.action?.kind !== "session.selected") {
+    return void 0;
+  }
+  const data = tuiEvent.action.data;
+  if (!isStringRecord(data) || data.source === "new") {
+    return void 0;
+  }
+  const choiceId = data.choiceId;
+  return typeof choiceId === "string" && choiceId.length > 0 ? choiceId : void 0;
+}
 function isStringRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -5535,6 +5581,7 @@ function renderTerminalUi(options) {
     /* @__PURE__ */ jsx(
       OhbabyTerminalApp,
       {
+        clearOnStart: options.clearOnStart,
         client: options.client,
         subscribeEvents: options.subscribeEvents
       }