ohbaby-cli 0.1.1 → 0.1.3

package/dist/cli/commands/terminal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/terminal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA4B,aAAa,EAAE,MAAM,OAAO,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEtE,UAAU,YAAa,SAAQ,gBAAgB;IAC7C,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAkCD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,iBAAiB,GACzB,aAAa,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAmF/C"}
+{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/terminal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA4B,aAAa,EAAE,MAAM,OAAO,CAAC;AACrE,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEtE,UAAU,YAAa,SAAQ,gBAAgB;IAC7C,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAkCD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,iBAAiB,GACzB,aAAa,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAoF/C"}

package/dist/cli/commands/types.d.ts

@@ -52,6 +52,7 @@ export interface CliCommandRuntime {
     readonly readDaemonStatus: () => Promise<CliDaemonState | undefined>;
     readonly readStdin: () => Promise<string>;
     readonly renderTerminalUi: (options: {
+        readonly clearOnStart?: boolean;
         readonly client: CoreAPI;
         readonly subscribeEvents: (handler: UiEventHandler) => UiUnsubscribe;
     }) => TerminalUiLifecycle;

package/dist/cli/commands/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/types.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -3582,7 +3582,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": {
@@ -3712,7 +3711,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;
       }
@@ -3766,6 +3771,13 @@ function applyTuiEvent(state, event) {
   }
   return state;
 }
+function selectedSessionIdFromCommandAction(action) {
+  if (action?.kind !== "session.selected" || !isRecord2(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,
@@ -4545,6 +4557,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
 }) {
@@ -4553,6 +4566,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(
@@ -4564,6 +4579,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
@@ -4846,11 +4865,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();
       }
@@ -4858,12 +4890,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",
@@ -5044,6 +5078,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);
 }
@@ -5202,6 +5247,7 @@ function renderTerminalUi(options) {
     /* @__PURE__ */ jsx(
       OhbabyTerminalApp,
       {
+        clearOnStart: options.clearOnStart,
         client: options.client,
         subscribeEvents: options.subscribeEvents
       }