Merge branch 'mobile-app' of github.com:PostHog/Array into mobile-app

Author: skoob13

apps/array/src/main/services/folders.ts

@@ -7,7 +7,7 @@ import type { RegisteredFolder } from "../../shared/types";
 import { generateId } from "../../shared/utils/id";
 import { createIpcHandler } from "../lib/ipcHandler";
 import { logger } from "../lib/logger";
-import { isGitRepository } from "./git";
+import { getRemoteUrl, isGitRepository, parseGitHubUrl } from "./git";
 import { getWorktreeLocation } from "./settingsStore";
 import { clearAllStoreData, foldersStore } from "./store";
 import { deleteWorktreeIfExists } from "./worktreeUtils";
@@ -25,8 +25,38 @@ function extractFolderName(folderPath: string): string {
   return path.basename(folderPath);
 }
 
+async function getRepositoryString(folderPath: string): Promise<string | undefined> {
+  try {
+    const remoteUrl = await getRemoteUrl(folderPath);
+    if (!remoteUrl) return undefined;
+
+    const parsed = parseGitHubUrl(remoteUrl);
+    if (!parsed) return undefined;
+
+    return `${parsed.organization}/${parsed.repository}`;
+  } catch {
+    return undefined;
+  }
+}
+
 async function getFolders(): Promise<RegisteredFolder[]> {
-  return foldersStore.get("folders", []);
+  const folders = foldersStore.get("folders", []);
+
+  let needsUpdate = false;
+  for (const folder of folders) {
+    if (!folder.repository) {
+      folder.repository = await getRepositoryString(folder.path);
+      if (folder.repository) {
+        needsUpdate = true;
+      }
+    }
+  }
+
+  if (needsUpdate) {
+    foldersStore.set("folders", folders);
+  }
+
+  return folders;
 }
 
 async function addFolder(folderPath: string): Promise<RegisteredFolder> {
@@ -35,16 +65,22 @@ async function addFolder(folderPath: string): Promise<RegisteredFolder> {
   const existing = folders.find((f) => f.path === folderPath);
   if (existing) {
     existing.lastAccessed = new Date().toISOString();
+    if (!existing.repository) {
+      existing.repository = await getRepositoryString(folderPath);
+    }
     foldersStore.set("folders", folders);
     return existing;
   }
 
+  const repository = await getRepositoryString(folderPath);
+
   const newFolder: RegisteredFolder = {
     id: generateFolderId(),
     path: folderPath,
     name: extractFolderName(folderPath),
     lastAccessed: new Date().toISOString(),
     createdAt: new Date().toISOString(),
+    repository,
   };
 
   folders.push(newFolder);

apps/array/src/renderer/features/sessions/components/VirtualizedList.tsx

@@ -136,6 +136,7 @@ export function VirtualizedList<T>({
           {virtualItems.map((virtualRow) => (
             <div
               key={virtualRow.key}
+              ref={virtualizer.measureElement}
               data-index={virtualRow.index}
               style={{
                 position: "absolute",

apps/array/src/renderer/features/sessions/stores/sessionStore.ts

@@ -445,6 +445,7 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
             events: [...state.sessions[session.taskRunId].events, userEvent],
             processedLineCount:
               (state.sessions[session.taskRunId].processedLineCount ?? 0) + 1,
+            isPromptPending: true,
           },
         },
       }));
@@ -482,6 +483,41 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
     const session = get().getSessionForTask(taskId);
     if (!session) return false;
 
+    if (session.isCloud) {
+      const authState = useAuthStore.getState();
+      const { client } = authState;
+      if (!client) {
+        log.error("API client not available for cloud cancel");
+        return false;
+      }
+
+      const cancelNotification: StoredLogEntry = {
+        type: "notification" as const,
+        timestamp: new Date().toISOString(),
+        direction: "client" as const,
+        notification: {
+          method: "session/cancel",
+          params: {
+            sessionId: session.taskRunId,
+          },
+        },
+      };
+
+      try {
+        await client.appendTaskRunLog(taskId, session.taskRunId, [
+          cancelNotification,
+        ]);
+        log.info("Sent cloud cancel request via S3", {
+          taskId,
+          runId: session.taskRunId,
+        });
+        return true;
+      } catch (error) {
+        log.error("Failed to send cloud cancel request", error);
+        return false;
+      }
+    }
+
     try {
       return await window.electronAPI.agentCancelPrompt(session.taskRunId);
     } catch (error) {
@@ -552,6 +588,8 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
         const processedCount = session.processedLineCount ?? 0;
         if (lines.length > processedCount) {
           const newLines = lines.slice(processedCount);
+          let receivedAgentMessage = false;
+
           for (const line of newLines) {
             try {
               const entry = JSON.parse(line);
@@ -581,19 +619,32 @@ export const useSessionStore = create<SessionStore>((set, get) => ({
                     .params as SessionNotification,
                 };
                 get()._handleEvent(taskRunId, sessionUpdateEvent);
+
+                // Check if this is an agent message - means agent is responding
+                const sessionUpdate =
+                  entry.notification?.params?.update?.sessionUpdate;
+                if (
+                  sessionUpdate === "agent_message_chunk" ||
+                  sessionUpdate === "agent_thought_chunk"
+                ) {
+                  receivedAgentMessage = true;
+                }
               }
             } catch {
               // Skip invalid JSON
             }
           }
 
-          // Update processed line count
+          // Update processed line count and clear pending state if agent responded
           set((state) => ({
             sessions: {
               ...state.sessions,
               [taskRunId]: {
                 ...state.sessions[taskRunId],
                 processedLineCount: lines.length,
+                isPromptPending: receivedAgentMessage
+                  ? false
+                  : state.sessions[taskRunId]?.isPromptPending ?? false,
               },
             },
           }));

apps/array/src/renderer/features/sidebar/components/SidebarMenu.tsx

@@ -6,7 +6,7 @@ import { useTasks } from "@features/tasks/hooks/useTasks";
 import { useTaskStore } from "@features/tasks/stores/taskStore";
 import { useMeQuery } from "@hooks/useMeQuery";
 import { useTaskContextMenu } from "@hooks/useTaskContextMenu";
-import { FolderIcon, FolderOpenIcon } from "@phosphor-icons/react";
+import { CloudIcon, FolderIcon, FolderOpenIcon } from "@phosphor-icons/react";
 import { Box, Flex } from "@radix-ui/themes";
 import { useRegisteredFoldersStore } from "@renderer/stores/registeredFoldersStore";
 import type { Task } from "@shared/types";
@@ -19,6 +19,7 @@ import { useTaskViewedStore } from "../stores/taskViewedStore";
 import { HomeItem } from "./items/HomeItem";
 import { NewTaskItem } from "./items/NewTaskItem";
 import { TaskItem } from "./items/TaskItem";
+import { SidebarSection } from "./SidebarSection";
 import { SortableFolderSection } from "./SortableFolderSection";
 
 function SidebarMenuComponent() {
@@ -226,6 +227,31 @@ function SidebarMenuComponent() {
               }
             </DragOverlay>
           </DragDropProvider>
+
+          {sidebarData.cloudRepos.map((cloudRepo) => (
+            <SidebarSection
+              key={cloudRepo.repository}
+              id={`cloud-${cloudRepo.repository}`}
+              label={cloudRepo.repoName}
+              icon={<CloudIcon size={14} weight="regular" />}
+              isExpanded={!collapsedSections.has(`cloud-${cloudRepo.repository}`)}
+              onToggle={() => toggleSection(`cloud-${cloudRepo.repository}`)}
+            >
+              {cloudRepo.tasks.map((task) => (
+                <TaskItem
+                  key={task.id}
+                  id={task.id}
+                  label={task.title}
+                  isActive={sidebarData.activeTaskId === task.id}
+                  lastActivityAt={task.lastActivityAt}
+                  isGenerating={task.isGenerating}
+                  isUnread={task.isUnread}
+                  onClick={() => handleTaskClick(task.id)}
+                  onContextMenu={(e) => handleTaskContextMenu(task.id, e)}
+                />
+              ))}
+            </SidebarSection>
+          ))}
         </Flex>
       </Box>
     </>