@mndrk/agx 2.0.32 → 2.0.34

package/cloud-runtime/standalone/components/chat-ui/ChatContainer.tsx

@@ -240,9 +240,20 @@ export function ChatContainer({
     activeThreadId ? { workspaceId: activeThreadId } : null,
     { messages, setMessages }
   );
-  const activeChatRuns = (chatRuns.length > 0 ? chatRuns : polledChatRuns).filter(
-    (run) => run.status === "queued" || run.status === "running"
-  );
+  const activeChatRuns = useMemo(() => {
+    const now = Date.now();
+    const byId = new Map(polledChatRuns.map((run) => [run.chatRunId, run]));
+
+    for (const run of chatRuns) {
+      if (!run.optimistic || byId.has(run.chatRunId)) continue;
+      if (now - (run.enqueuedAt ?? 0) > 5000) continue;
+      byId.set(run.chatRunId, run);
+    }
+
+    return Array.from(byId.values()).filter(
+      (run) => run.status === "queued" || run.status === "running"
+    );
+  }, [chatRuns, polledChatRuns]);
   const composerActivityStatus =
     polledActiveAgents.size > 0 || activeChatRuns.some((run) => run.status === "running")
       ? "working"
@@ -252,18 +263,26 @@ export function ChatContainer({
   const loading = composerActivityStatus !== "ready";
 
   useEffect(() => {
-    if (polledChatRuns.length === 0) return;
     setChatRuns((prev) => {
+      const now = Date.now();
       const byId = new Map(
         prev
           .filter((run) => typeof run.chatRunId === "string" && run.chatRunId.length > 0)
           .map((run) => [run.chatRunId, run])
       );
+
       for (const run of polledChatRuns) {
         if (!run?.chatRunId) continue;
         byId.set(run.chatRunId, run);
       }
-      return Array.from(byId.values()).sort((a, b) =>
+
+      const next = Array.from(byId.values()).filter((run) => {
+        if (!run.optimistic) return true;
+        if (polledChatRuns.some((polledRun) => polledRun.chatRunId === run.chatRunId)) return true;
+        return now - (run.enqueuedAt ?? 0) <= 5000;
+      });
+
+      return next.sort((a, b) =>
         String(a.chatRunId || "").localeCompare(String(b.chatRunId || ""))
       );
     });
@@ -309,6 +328,20 @@ export function ChatContainer({
     reorderAgents: reorderProjectAgents,
   } = useProjectsWithAgents();
   const { projects: projectList, updateProject } = useProjects();
+
+  // Projects scoped to the current thread
+  const threadProjects = useMemo(
+    () => activeThreadId ? projects.filter((project) => project.thread_ids?.includes(activeThreadId)) : projects,
+    [projects, activeThreadId]
+  );
+
+  // Derive project slug from route prop or thread association so messages sent
+  // from the root page still carry project context.
+  const effectiveProjectSlug = useMemo(
+    () => projectSlug || threadProjects[0]?.slug || undefined,
+    [projectSlug, threadProjects]
+  );
+
   const [participants, setParticipants] = useState<Participant[]>([]);
   const [participantsLoaded, setParticipantsLoaded] = useState(false);
   const [activeParticipantIds, setActiveParticipantIds] = useState<string[]>([]);
@@ -546,7 +579,7 @@ export function ChatContainer({
   const activeThreadTitle = useMemo(() => {
     if (!openThreadId) return "";
     const rootMsg = messages.find((m) => m.id === openThreadId);
-    if (!rootMsg) return "Thread";
+    if (!rootMsg) return "Discussion";
     const text = rootMsg.content.trim();
     return text.length > 60 ? text.slice(0, 60) + "..." : text;
   }, [openThreadId, messages]);
@@ -612,7 +645,7 @@ export function ChatContainer({
     setKnowledgeExtractionPending(true);
     try {
       const scopes: string[] = ["repo"];
-      if (projectSlug) scopes.push("project");
+      if (effectiveProjectSlug) scopes.push("project");
 
       const response = await fetch("/api/threads/knowledge", {
         method: "POST",
@@ -630,7 +663,7 @@ export function ChatContainer({
     } finally {
       setKnowledgeExtractionPending(false);
     }
-  }, [openThreadId, projectSlug]);
+  }, [openThreadId, effectiveProjectSlug]);
 
   useEffect(() => {
     if (!openThreadId) {
@@ -921,7 +954,7 @@ export function ChatContainer({
   }, [activeThreadId, messages, updateThreadMessages]);
 
   const handleThreadReply = useCallback(
-    (rootMessageId: string, content: string, maxRounds: number = 10, pinnedParticipantId?: string) => {
+    (rootMessageId: string, content: string, maxRounds: number = 10, pinnedParticipantId?: string, promptPrefix?: string) => {
       if (!activeThreadId) return;
       if (activeParticipants.length === 0) return;
       const selectedActiveIds = activeParticipants.map((participant) => participant.id);
@@ -936,10 +969,11 @@ export function ChatContainer({
         undefined,
         undefined,
         orderedActiveIds,
-        projectSlug
+        effectiveProjectSlug,
+        promptPrefix
       );
     },
-    [activeThreadId, sendMessage, activeParticipants, projectSlug]
+    [activeThreadId, sendMessage, activeParticipants, effectiveProjectSlug]
   );
 
 
@@ -1145,7 +1179,8 @@ export function ChatContainer({
       maxRounds: number,
       attachmentIds?: string[],
       attachmentMetas?: import("@/lib/types").Attachment[],
-      pinnedParticipantId?: string
+      pinnedParticipantId?: string,
+      promptPrefix?: string
     ) => {
       const searchMatch = prompt.match(/^\/search(?:\s+([\s\S]+))?$/i);
       if (searchMatch) {
@@ -1197,7 +1232,8 @@ export function ChatContainer({
           attachmentIds,
           attachmentMetas,
           orderedActiveIds,
-          projectSlug
+          effectiveProjectSlug,
+          promptPrefix
         );
         return;
       }
@@ -1212,7 +1248,8 @@ export function ChatContainer({
         attachmentIds,
         attachmentMetas,
         orderedActiveIds,
-        projectSlug
+        effectiveProjectSlug,
+        promptPrefix
       );
 
       // If ship mode was staged on the main composer, activate it for the new thread
@@ -1236,7 +1273,7 @@ export function ChatContainer({
       openThreadId,
       activeParticipants,
       sendMessage,
-      projectSlug,
+      effectiveProjectSlug,
     ]
   );
 
@@ -1422,9 +1459,54 @@ export function ChatContainer({
   );
 
   // Projects scoped to the current thread
-  const threadProjects = useMemo(
-    () => activeThreadId ? projects.filter((project) => project.thread_ids?.includes(activeThreadId)) : projects,
-    [projects, activeThreadId]
+  // Repos from the active project (first thread-scoped project, or matched by projectSlug)
+  const activeProjectRepos = useMemo(() => {
+    const match = effectiveProjectSlug
+      ? threadProjects.find((p) => p.slug === effectiveProjectSlug)
+      : threadProjects[0];
+    return match?.repos ?? [];
+  }, [threadProjects, effectiveProjectSlug]);
+
+  // ── Persisted repo selections per thread ──────────────────────────────────
+  const [selectedRepoIds, setSelectedRepoIds] = useState<Set<string>>(new Set());
+  const repoSelectionLoadedForRef = useRef<string | null>(null);
+
+  // Load saved selections when open discussion changes
+  useEffect(() => {
+    if (!openThreadId) {
+      setSelectedRepoIds(new Set());
+      repoSelectionLoadedForRef.current = null;
+      return;
+    }
+    if (repoSelectionLoadedForRef.current === openThreadId) return;
+    // Clear immediately so old discussion's selections don't bleed
+    setSelectedRepoIds(new Set());
+    repoSelectionLoadedForRef.current = openThreadId;
+    const rid = openThreadId;
+    fetch(`/api/thread-repos?rootMessageId=${encodeURIComponent(rid)}`)
+      .then((res) => res.json())
+      .then((data: { repoIds?: string[] }) => {
+        // Only apply if we're still on the same discussion
+        if (repoSelectionLoadedForRef.current !== rid) return;
+        if (data.repoIds && data.repoIds.length > 0) {
+          setSelectedRepoIds(new Set(data.repoIds));
+        }
+      })
+      .catch(() => {});
+  }, [openThreadId]);
+
+  const handleRepoSelectionChange = useCallback(
+    (next: Set<string>) => {
+      setSelectedRepoIds(next);
+      if (openThreadId) {
+        fetch("/api/thread-repos", {
+          method: "PUT",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ rootMessageId: openThreadId, repoIds: [...next] }),
+        }).catch(() => {});
+      }
+    },
+    [openThreadId]
   );
 
   const renderReplyComposer = useCallback(
@@ -1439,8 +1521,8 @@ export function ChatContainer({
 
       return (
         <Composer
-          onSend={(message, maxRounds, _attachmentIds, _attachments, pinnedParticipantId) =>
-            handleThreadReply(rootMessageId, message, maxRounds, pinnedParticipantId)
+          onSend={(message, maxRounds, _attachmentIds, _attachments, pinnedParticipantId, promptPrefix) =>
+            handleThreadReply(rootMessageId, message, maxRounds, pinnedParticipantId, promptPrefix)
           }
           onStop={() => handleStopThread(rootMessageId)}
           loading={threadActivityStatus !== "ready"}
@@ -1453,10 +1535,13 @@ export function ChatContainer({
           placeholder="Reply — @name to mention, /search, /summarize"
           autoMode={autoMode}
           onAutoModeChange={handleAutoModeChange}
+          repos={activeProjectRepos}
+          selectedRepoIds={selectedRepoIds}
+          onRepoSelectionChange={handleRepoSelectionChange}
         />
       );
     },
-    [handleThreadReply, handleStopThread, streaming, activeParticipants, threadProjects, projectMentions, slashCommands, messages, autoMode, handleAutoModeChange, activeProcesses, activeChatRuns]
+    [handleThreadReply, handleStopThread, streaming, activeParticipants, threadProjects, projectMentions, slashCommands, messages, autoMode, handleAutoModeChange, activeProcesses, activeChatRuns, activeProjectRepos, selectedRepoIds, handleRepoSelectionChange]
   );
 
   const toggleWorkspaceSidebar = useCallback(() => {
@@ -1580,7 +1665,9 @@ export function ChatContainer({
   );
 
   const mainToolbar = (
-    <div className="border-b border-[var(--app-shell-border)] bg-[var(--app-shell-surface)] px-4 py-2.5 backdrop-blur-xl md:px-6">
+    <div
+      className="desktop-titlebar border-b border-[var(--app-shell-border)] bg-[var(--app-shell-surface)] px-4 py-2.5 backdrop-blur-xl md:px-6"
+    >
       <div className="mx-auto flex max-w-5xl items-center gap-3">
         <div className="flex min-w-0 items-center flex-shrink-0">
           {showSidebar && !workspaceSidebarVisible && (
@@ -1657,36 +1744,36 @@ export function ChatContainer({
 
   return (
     <div className="flex h-screen bg-[var(--app-shell-bg)] text-[var(--foreground)]">
-      {showSidebar ? (
-        <WorkspaceSidebar
-          threads={threads}
-          participants={participants}
-          activeThreadId={activeThreadId}
-          isLoading={threadsLoading}
-          isRestoringActiveThread={isRestoringActiveThread}
-          isCreating={isCreating}
-          deletingThreadId={deletingThreadId}
-          renamingThreadId={renamingThreadId}
-          onSelectThread={selectThread}
-          onCreateThread={createThread}
-          onRenameThread={renameThread}
-          onDeleteThread={handleDeleteThread}
-          activeParticipantIds={activeParticipantIds}
-          onToggleParticipantActive={handleToggleParticipantActive}
-          visible={workspaceSidebarVisible}
-          onToggle={toggleWorkspaceSidebar}
-          projects={projects}
-          onCreateProject={createProject}
-          onUpdateProject={updateProject}
-          onDeleteProject={deleteProject}
-          onAddAgentToProject={addAgentToProject}
-          onRemoveAgentFromProject={removeAgentFromProject}
-          onReorderProjectAgents={reorderProjectAgents}
-          onUpdateParticipant={handleUpdate}
-          onSelectProject={handleSelectProject}
-        />
-      ) : null}
-      <div className="flex flex-col flex-1 min-w-0 relative">
+        {showSidebar ? (
+          <WorkspaceSidebar
+            threads={threads}
+            participants={participants}
+            activeThreadId={activeThreadId}
+            isLoading={threadsLoading}
+            isRestoringActiveThread={isRestoringActiveThread}
+            isCreating={isCreating}
+            deletingThreadId={deletingThreadId}
+            renamingThreadId={renamingThreadId}
+            onSelectThread={selectThread}
+            onCreateThread={createThread}
+            onRenameThread={renameThread}
+            onDeleteThread={handleDeleteThread}
+            activeParticipantIds={activeParticipantIds}
+            onToggleParticipantActive={handleToggleParticipantActive}
+            visible={workspaceSidebarVisible}
+            onToggle={toggleWorkspaceSidebar}
+            projects={projects}
+            onCreateProject={createProject}
+            onUpdateProject={updateProject}
+            onDeleteProject={deleteProject}
+            onAddAgentToProject={addAgentToProject}
+            onRemoveAgentFromProject={removeAgentFromProject}
+            onReorderProjectAgents={reorderProjectAgents}
+            onUpdateParticipant={handleUpdate}
+            onSelectProject={handleSelectProject}
+          />
+        ) : null}
+        <div className="flex flex-col flex-1 min-w-0 relative">
         {
           isRestoringActiveThread ? (
             <div className="flex-1 flex items-center justify-center px-4 text-sm text-[var(--muted-foreground)]">
@@ -1696,7 +1783,7 @@ export function ChatContainer({
             <div className="flex flex-1 min-h-0 bg-transparent relative">
               <div className="flex flex-col flex-1 min-w-0">
                 {openThreadId ? (
-                  <div className="border-b border-[var(--app-shell-border)] bg-[var(--app-shell-surface)] px-4 py-2.5 backdrop-blur-xl md:px-6 transition-colors duration-200 shrink-0">
+                  <div className="desktop-titlebar border-b border-[var(--app-shell-border)] bg-[var(--app-shell-surface)] px-4 py-2.5 backdrop-blur-xl md:px-6 transition-colors duration-200 shrink-0">
                     <div className="mx-auto flex max-w-5xl items-center gap-3 min-w-0">
                       <button
                         onClick={() => setOpenThreadId(null)}
@@ -1856,22 +1943,25 @@ export function ChatContainer({
                     onClearPendingThread={() => setPendingThreadInsert(null)}
                     autoMode={autoMode}
                     onAutoModeChange={handleAutoModeChange}
+                    repos={activeProjectRepos}
+                    selectedRepoIds={selectedRepoIds}
+                    onRepoSelectionChange={handleRepoSelectionChange}
                   />
                 )}
               </div>
             </div>
           )
         }
-      </div >
+      </div>
       {initialRootMessageId && (
         <LogPanel logs={logs} participants={participants} onClear={() => void clearLogs(activeThreadId)} open={logsOpen} onToggle={() => setLogsOpen(false)} />
       )}
       <ConfirmDialog
         isOpen={pendingDelete !== null}
-        title={pendingDelete?.type === "thread" ? "Delete Thread" : "Delete Message"}
+        title={pendingDelete?.type === "thread" ? "Delete Discussion" : "Delete Message"}
         message={
           pendingDelete?.type === "thread"
-            ? "This will permanently delete this thread and all of its replies. This action cannot be undone."
+            ? "This will permanently delete this discussion and all of its replies. This action cannot be undone."
             : "This will permanently delete this message. This action cannot be undone."
         }
         preview={pendingDelete?.preview}
@@ -1881,6 +1971,6 @@ export function ChatContainer({
         onConfirm={handleConfirmDelete}
         onCancel={handleCancelDelete}
       />
-    </div >
+    </div>
   );
 }