refactor: Session management refactor (#810)

🧹 🧹 🧹 🧹 🧹 🧹 🧹 🧹 🧹 🧹 

- Process queued messages after turn completes - send all as one prompt (like claude code)
- Refactor session management into service, the store now only holds state and thin actions
- Removes legacy isCloud stuff, many other small improvements

SOLID ✅

Author: charlesvien

apps/twig/src/main/services/posthog-analytics.ts

@@ -24,10 +24,7 @@ export function initializePostHog() {
 }
 
 export function withTeamContext<T>(fn: () => T): T {
-  if (!posthogClient) {
-    return fn();
-  }
-  return posthogClient.withContext({ properties: { team: "twig" } }, fn);
+  return fn();
 }
 
 export function setCurrentUserId(userId: string | null) {

apps/twig/src/renderer/di/container.ts

@@ -1,9 +1,9 @@
 import "reflect-metadata";
+import { TaskService } from "@features/task-detail/service/service";
 import type { TrpcRouter } from "@main/trpc/router.js";
 import { trpcVanilla } from "@renderer/trpc";
 import type { TRPCClient } from "@trpc/client";
 import { Container } from "inversify";
-import { TaskService } from "../services/task/service";
 import { RENDERER_TOKENS } from "./tokens";
 
 /**

apps/twig/src/renderer/features/auth/stores/authStore.ts

@@ -1,4 +1,5 @@
 import { PostHogAPIClient } from "@api/posthogClient";
+import { resetSessionService } from "@features/sessions/service/service";
 import { identifyUser, resetUser, track } from "@renderer/lib/analytics";
 import { electronStorage } from "@renderer/lib/electronStorage";
 import { logger } from "@renderer/lib/logger";
@@ -701,6 +702,9 @@ export const useAuthStore = create<AuthState>()(
           track(ANALYTICS_EVENTS.USER_LOGGED_OUT);
           resetUser();
 
+          // Clean up session service subscriptions before clearing auth state
+          resetSessionService();
+
           trpcVanilla.analytics.resetUser.mutate();
 
           if (refreshTimeoutId) {

apps/twig/src/renderer/features/message-editor/components/MessageEditor.tsx

@@ -60,7 +60,6 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
     const taskId = context?.taskId;
     const disabled = context?.disabled ?? false;
     const isLoading = context?.isLoading ?? false;
-    const isCloud = context?.isCloud ?? false;
     const repoPath = context?.repoPath;
     const isDisabled = disabled || !isOnline;
 
@@ -83,7 +82,6 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
       placeholder,
       disabled: isDisabled,
       isLoading,
-      isCloud,
       autoFocus,
       context: { taskId, repoPath },
       onSubmit,

apps/twig/src/renderer/features/message-editor/stores/draftStore.ts

@@ -13,7 +13,6 @@ export interface EditorContext {
   repoPath: string | null | undefined;
   disabled: boolean;
   isLoading: boolean;
-  isCloud: boolean;
 }
 
 interface DraftState {
@@ -81,15 +80,13 @@ export const useDraftStore = create<DraftStore>()(
             repoPath: context.repoPath ?? existing?.repoPath,
             disabled: context.disabled ?? existing?.disabled ?? false,
             isLoading: context.isLoading ?? existing?.isLoading ?? false,
-            isCloud: context.isCloud ?? existing?.isCloud ?? false,
           };
           if (
             existing?.sessionId === newContext.sessionId &&
             existing?.taskId === newContext.taskId &&
             existing?.repoPath === newContext.repoPath &&
             existing?.disabled === newContext.disabled &&
-            existing?.isLoading === newContext.isLoading &&
-            existing?.isCloud === newContext.isCloud
+            existing?.isLoading === newContext.isLoading
           ) {
             return;
           }

apps/twig/src/renderer/features/message-editor/tiptap/useTiptapEditor.ts

@@ -1,4 +1,4 @@
-import { getSessionActions } from "@features/sessions/stores/sessionStore";
+import { sessionStoreSetters } from "@features/sessions/stores/sessionStore";
 import { trpcVanilla } from "@renderer/trpc/client";
 import { toast } from "@renderer/utils/toast";
 import { useSettingsStore } from "@stores/settingsStore";
@@ -16,7 +16,6 @@ export interface UseTiptapEditorOptions {
   placeholder?: string;
   disabled?: boolean;
   isLoading?: boolean;
-  isCloud?: boolean;
   autoFocus?: boolean;
   context?: DraftContext;
   capabilities?: {
@@ -43,7 +42,6 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
     placeholder = "",
     disabled = false,
     isLoading = false,
-    isCloud = false,
     autoFocus = false,
     context,
     capabilities = {},
@@ -153,7 +151,7 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
 
             if (event.key === "ArrowUp" && (isEmpty || isAtStart)) {
               const queuedContent =
-                getSessionActions().popQueuedMessagesAsText(taskId);
+                sessionStoreSetters.dequeueMessagesAsText(taskId);
               if (queuedContent !== null && queuedContent !== undefined) {
                 event.preventDefault();
                 view.dispatch(
@@ -351,10 +349,6 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
     const text = editor.getText().trim();
 
     if (text.startsWith("!")) {
-      if (isCloud) {
-        toast.error("Bash mode is not supported in cloud sessions");
-        return;
-      }
       // Bash mode requires immediate execution, can't be queued
       if (isLoading) {
         toast.error("Cannot run shell commands while agent is generating");
@@ -372,7 +366,7 @@ export function useTiptapEditor(options: UseTiptapEditorOptions) {
       prevBashModeRef.current = false;
       draft.clearDraft();
     }
-  }, [editor, disabled, isLoading, isCloud, draft, clearOnSubmit]);
+  }, [editor, disabled, isLoading, draft, clearOnSubmit]);
 
   submitRef.current = submit;
 

apps/twig/src/renderer/features/sessions/components/ConversationView.tsx

@@ -5,7 +5,6 @@ import type {
 import {
   usePendingPermissionsForTask,
   useQueuedMessagesForTask,
-  useSessionActions,
 } from "@features/sessions/stores/sessionStore";
 import { useSessionViewActions } from "@features/sessions/stores/sessionViewStore";
 import type { SessionUpdate, ToolCall } from "@features/sessions/types";
@@ -61,7 +60,6 @@ interface ConversationViewProps {
   isPromptPending: boolean;
   promptStartedAt?: number | null;
   repoPath?: string | null;
-  isCloud?: boolean;
   taskId?: string;
 }
 
@@ -73,7 +71,6 @@ export function ConversationView({
   isPromptPending,
   promptStartedAt,
   repoPath,
-  isCloud = false,
   taskId,
 }: ConversationViewProps) {
   const scrollRef = useRef<HTMLDivElement>(null);
@@ -84,7 +81,6 @@ export function ConversationView({
   const pendingPermissionsCount = pendingPermissions.size;
 
   const queuedMessages = useQueuedMessagesForTask(taskId);
-  const { removeQueuedMessage } = useSessionActions();
   const { saveScrollPosition, getScrollPosition } = useSessionViewActions();
 
   const prevItemsLengthRef = useRef(0);
@@ -160,22 +156,13 @@ export function ConversationView({
           <div className="flex flex-col gap-3">
             {items.map((item) =>
               item.type === "turn" ? (
-                <TurnView
-                  key={item.id}
-                  turn={item}
-                  repoPath={repoPath}
-                  isCloud={isCloud}
-                />
+                <TurnView key={item.id} turn={item} repoPath={repoPath} />
               ) : (
                 <UserShellExecuteView key={item.id} item={item} />
               ),
             )}
             {queuedMessages.map((msg) => (
-              <QueuedMessageView
-                key={msg.id}
-                message={msg}
-                onRemove={() => taskId && removeQueuedMessage(taskId, msg.id)}
-              />
+              <QueuedMessageView key={msg.id} message={msg} />
             ))}
           </div>
           <SessionFooter
@@ -205,7 +192,6 @@ export function ConversationView({
 interface TurnViewProps {
   turn: Turn;
   repoPath?: string | null;
-  isCloud?: boolean;
 }
 
 function getInterruptMessage(reason?: string): string {
@@ -217,11 +203,7 @@ function getInterruptMessage(reason?: string): string {
   }
 }
 
-const TurnView = memo(function TurnView({
-  turn,
-  repoPath,
-  isCloud = false,
-}: TurnViewProps) {
+const TurnView = memo(function TurnView({ turn, repoPath }: TurnViewProps) {
   const wasCancelled = turn.stopReason === "cancelled";
   const gitAction = parseGitActionMessage(turn.userContent);
   const showGitResult =
@@ -271,7 +253,6 @@ const TurnView = memo(function TurnView({
           actionType={gitAction.actionType}
           repoPath={repoPath}
           turnId={turn.id}
-          isCloud={isCloud}
         />
       )}
       {wasCancelled && (

apps/twig/src/renderer/features/sessions/components/GitActionResult.tsx

@@ -13,50 +13,33 @@ interface GitActionResultProps {
   actionType: GitActionType;
   repoPath: string;
   turnId: string;
-  isCloud?: boolean;
 }
 
 export function GitActionResult({
   actionType,
   repoPath,
   turnId,
-  isCloud = false,
 }: GitActionResultProps) {
-  const canQueryGit = !isCloud && !!repoPath;
-
   const { data: commitInfo } = useQuery({
     queryKey: ["git-latest-commit", repoPath, turnId],
     queryFn: () =>
       trpcVanilla.git.getLatestCommit.query({ directoryPath: repoPath }),
-    enabled: canQueryGit,
+    enabled: !!repoPath,
     staleTime: 0,
   });
 
   const { data: repoInfo } = useQuery({
     queryKey: ["git-repo-info", repoPath, turnId],
     queryFn: () =>
       trpcVanilla.git.getGitRepoInfo.query({ directoryPath: repoPath }),
-    enabled: canQueryGit,
+    enabled: !!repoPath,
     staleTime: 30000,
   });
 
   const handleOpenUrl = (url: string) => {
     trpcVanilla.os.openExternal.mutate({ url });
   };
 
-  if (isCloud) {
-    return (
-      <Box className="mt-3 rounded-lg border border-green-6 bg-green-2 p-3">
-        <Flex align="center" gap="2">
-          <CheckCircle size={16} weight="fill" className="text-green-9" />
-          <Text size="2" weight="medium" className="text-green-11">
-            {getCompletionLabel(actionType)}
-          </Text>
-        </Flex>
-      </Box>
-    );
-  }
-
   const showCommit = commitInfo != null;
   const showPrLink = repoInfo?.compareUrl != null;
 

apps/twig/src/renderer/features/sessions/components/ModelSelector.tsx

@@ -1,10 +1,10 @@
 import type { SessionConfigSelectGroup } from "@agentclientprotocol/sdk";
 import { Select, Text } from "@radix-ui/themes";
 import { Fragment, useMemo } from "react";
+import { getSessionService } from "../service/service";
 import {
   flattenSelectOptions,
   useModelConfigOptionForTask,
-  useSessionActions,
   useSessionForTask,
 } from "../stores/sessionStore";
 
@@ -21,7 +21,6 @@ export function ModelSelector({
   onModelChange,
   adapter: _adapter,
 }: ModelSelectorProps) {
-  const { setSessionConfigOption } = useSessionActions();
   const session = useSessionForTask(taskId);
   const modelOption = useModelConfigOptionForTask(taskId);
 
@@ -39,8 +38,8 @@ export function ModelSelector({
   const handleChange = (value: string) => {
     onModelChange?.(value);
 
-    if (taskId && session?.status === "connected" && !session.isCloud) {
-      setSessionConfigOption(taskId, modelOption.id, value);
+    if (taskId && session?.status === "connected") {
+      getSessionService().setSessionConfigOption(taskId, modelOption.id, value);
     }
   };
 

apps/twig/src/renderer/features/sessions/components/ReasoningLevelSelector.tsx

@@ -1,7 +1,7 @@
 import { Select, Text } from "@radix-ui/themes";
+import { getSessionService } from "../service/service";
 import {
   flattenSelectOptions,
-  useSessionActions,
   useSessionForTask,
   useThoughtLevelConfigOptionForTask,
 } from "../stores/sessionStore";
@@ -15,7 +15,6 @@ export function ReasoningLevelSelector({
   taskId,
   disabled,
 }: ReasoningLevelSelectorProps) {
-  const { setSessionConfigOption } = useSessionActions();
   const session = useSessionForTask(taskId);
   const thoughtOption = useThoughtLevelConfigOptionForTask(taskId);
 
@@ -30,8 +29,12 @@ export function ReasoningLevelSelector({
     options.find((opt) => opt.value === activeLevel)?.name ?? activeLevel;
 
   const handleChange = (value: string) => {
-    if (taskId && session?.status === "connected" && !session.isCloud) {
-      setSessionConfigOption(taskId, thoughtOption.id, value);
+    if (taskId && session?.status === "connected") {
+      getSessionService().setSessionConfigOption(
+        taskId,
+        thoughtOption.id,
+        value,
+      );
     }
   };