@nightkatana/kronosys-app 1.0.0-beta.17 → 1.0.0-beta.18

package/app/page.tsx

@@ -233,6 +233,16 @@ function DashboardHome() {
   const [tourOpen, setTourOpen] = useState(false);
   const [newSessionModalOpen, setNewSessionModalOpen] = useState(false);
   const pendingNewSessionFocusRef = useRef(false);
+  const pendingNewSessionAfterEndRef = useRef<{
+    sessionScope: unknown;
+    sessionStartAtIso: string | null;
+  } | null>(null);
+  const createNewSessionAndFocusRef = useRef<
+    (args: {
+      sessionScope: unknown;
+      sessionStartAtIso: string | null;
+    }) => Promise<void>
+  >(async () => {});
   const [gitBannerDismissed, setGitBannerDismissed] = useState(false);
   const [gitIdentitySetupModalOpen, setGitIdentitySetupModalOpen] =
     useState(false);
@@ -798,6 +808,7 @@ function DashboardHome() {
     setEndSessionReasonKind("");
     setEndSessionReasonNote("");
     setEndSessionTaskHandling("keep");
+    pendingNewSessionAfterEndRef.current = null;
   }, []);
 
   const confirmEndLiveSession = useCallback(async () => {
@@ -828,6 +839,11 @@ function DashboardHome() {
       ...(note.length > 0 ? { sessionEndReasonNote: note } : {}),
       ...(handling !== "keep" ? { taskHandling: handling } : {}),
     });
+    const pend = pendingNewSessionAfterEndRef.current;
+    pendingNewSessionAfterEndRef.current = null;
+    if (pend) {
+      await createNewSessionAndFocusRef.current(pend);
+    }
   }, [
     history,
     live?.sessionId,
@@ -1250,10 +1266,30 @@ function DashboardHome() {
   }, [focusTaskLauncherInput, live?.sessionId]);
 
   const createNewSessionAndFocus = useCallback(
-    async (sessionScope: unknown) => {
+    async (args: {
+      sessionScope: unknown;
+      sessionStartAtIso: string | null;
+    }) => {
       setNewSessionModalOpen(false);
+      const res = await post({
+        type: "newSession",
+        sessionScope: args.sessionScope,
+        ...(args.sessionStartAtIso
+          ? { sessionStartAt: args.sessionStartAtIso }
+          : {}),
+      });
+      const hid =
+        typeof res.result?.newHistorySessionId === "string"
+          ? res.result.newHistorySessionId.trim()
+          : "";
+      if (hid !== "") {
+        pendingNewSessionFocusRef.current = false;
+        await handleSelectSession(hid);
+        scrollToSessionInList(hid);
+        focusTaskLauncherInput();
+        return;
+      }
       pendingNewSessionFocusRef.current = true;
-      await post({ type: "newSession", sessionScope });
       if (sessionQueryMode) {
         router.replace(
           pathnameWithUpdatedSessionQuery(
@@ -1267,14 +1303,18 @@ function DashboardHome() {
     },
     [
       focusTaskLauncherInput,
+      handleSelectSession,
       pathname,
       post,
       router,
+      scrollToSessionInList,
       searchParams,
       sessionQueryMode,
     ],
   );
 
+  createNewSessionAndFocusRef.current = createNewSessionAndFocus;
+
   const openSessionInNewTab = useCallback(
     (sessionId: string) => {
       const url = `${
@@ -1813,8 +1853,23 @@ function DashboardHome() {
           lang={lang}
           t={dt}
           onCancel={() => setNewSessionModalOpen(false)}
-          onConfirm={(sessionScope) => {
-            void createNewSessionAndFocus(sessionScope);
+          onConfirm={(payload) => {
+            const liveSid =
+              typeof live?.sessionId === "string" ? live.sessionId.trim() : "";
+            const hasActiveLive = liveSid !== "" && live?.archived !== true;
+            if (!payload.sessionStartAtIso && hasActiveLive) {
+              pendingNewSessionAfterEndRef.current = {
+                sessionScope: payload.scope,
+                sessionStartAtIso: null,
+              };
+              setNewSessionModalOpen(false);
+              handleRequestEndLiveSession();
+              return;
+            }
+            void createNewSessionAndFocus({
+              sessionScope: payload.scope,
+              sessionStartAtIso: payload.sessionStartAtIso,
+            });
           }}
         />
         <GlobalPauseConfirmModal