conductor-oss 0.2.18 → 0.2.20

package/web/.next/standalone/packages/web/src/components/layout/TopBar.tsx

@@ -2,32 +2,30 @@
 
 import { memo } from "react";
 import { Settings } from "lucide-react";
-import type { DashboardSession } from "@/lib/types";
 
 interface TopBarProps {
-  session: DashboardSession | null;
-  fallbackTitle?: string;
+  title?: string;
   onOpenPreferences?: () => void;
 }
 
-export const TopBar = memo(function TopBar({ session, fallbackTitle, onOpenPreferences }: TopBarProps) {
-  const title = session?.summary ?? fallbackTitle ?? "Create Workspace";
-
+export const TopBar = memo(function TopBar({ title, onOpenPreferences }: TopBarProps) {
   return (
-    <header className="flex h-[36px] items-center border-b border-[var(--vk-border)] bg-[var(--vk-bg-panel)] px-2 text-[11px] text-[var(--vk-text-muted)] sm:h-[33px]">
+    <header className="flex h-12 items-center border-b border-[var(--vk-border)] bg-[var(--vk-bg-panel)] px-4 text-[13px] text-[var(--vk-text-muted)] sm:h-14 sm:px-5 sm:text-[14px]">
       <div className="min-w-0 flex-1 text-center">
-        <span className="block truncate">{title}</span>
+        <span className="block truncate font-medium tracking-[0.01em] text-[var(--vk-text-normal)]">
+          {title ?? "All Projects"}
+        </span>
       </div>
       {onOpenPreferences ? (
         <div className="ml-1 flex shrink-0">
           <button
             type="button"
             onClick={onOpenPreferences}
-            className="inline-flex h-6 w-6 items-center justify-center rounded-[4px] text-[var(--vk-text-muted)] hover:bg-[var(--vk-bg-hover)] hover:text-[var(--vk-text-normal)]"
+            className="inline-flex h-8 w-8 items-center justify-center rounded-[6px] text-[var(--vk-text-muted)] hover:bg-[var(--vk-bg-hover)] hover:text-[var(--vk-text-normal)]"
             aria-label="Open preferences"
             title="Preferences"
           >
-            <Settings className="h-3.5 w-3.5" />
+            <Settings className="h-4 w-4" />
           </button>
         </div>
       ) : null}

package/web/.next/standalone/packages/web/src/features/dashboard/DashboardClient.tsx

@@ -75,6 +75,8 @@ const EXECUTOR_ORDER = [
   "ccr",
 ];
 
+const DEFAULT_AGENT = "claude-code";
+
 const EXECUTOR_LABELS: Record<string, string> = {
   codex: "Codex",
   gemini: "Gemini",
@@ -928,6 +930,17 @@ export default function DashboardClient() {
     () => projects.find((project) => project.id === selectedProjectId) ?? null,
     [projects, selectedProjectId],
   );
+  const topBarTitle = useMemo(() => {
+    if (selectedSession) {
+      return [selectedSession.projectId, selectedSession.branch].filter(Boolean).join(" \u00b7 ");
+    }
+
+    if (selectedProject) {
+      return [selectedProject.id, selectedProject.defaultBranch || "main"].filter(Boolean).join(" \u00b7 ");
+    }
+
+    return "All Projects";
+  }, [selectedProject, selectedSession]);
 
   const agentOptions = useMemo(() => {
     const safeAgents = Array.isArray(agents)
@@ -950,7 +963,7 @@ export default function DashboardClient() {
       opts.add(selectedAgent);
     }
     if (opts.size === 0) {
-      opts.add(preferences?.codingAgent || "qwen-code");
+      opts.add(preferences?.codingAgent || DEFAULT_AGENT);
     }
     return [...opts];
   }, [agents, preferences?.codingAgent, projects, selectedAgent]);
@@ -1017,12 +1030,12 @@ export default function DashboardClient() {
           throw new Error(data?.error ?? `Failed to load preferences: ${res.status}`);
         }
         if (cancelled) return;
-        const normalized = normalizePreferences(data?.preferences, "qwen-code");
+        const normalized = normalizePreferences(data?.preferences, DEFAULT_AGENT);
         setPreferences(normalized);
         setPreferencesError(null);
       } catch (err) {
         if (cancelled) return;
-        setPreferences(normalizePreferences(null, "qwen-code"));
+        setPreferences(normalizePreferences(null, DEFAULT_AGENT));
         setPreferencesError(err instanceof Error ? err.message : "Failed to load preferences");
       } finally {
         if (!cancelled) {
@@ -1063,17 +1076,17 @@ export default function DashboardClient() {
   useEffect(() => {
     if (agentOptions.length === 0) return;
     if (!selectedAgent || !agentOptions.includes(selectedAgent)) {
-      const fallbackAgent = preferences?.codingAgent || "qwen-code";
+      const fallbackAgent = preferences?.codingAgent || DEFAULT_AGENT;
       setSelectedAgent(
         agentOptions.includes(fallbackAgent)
           ? fallbackAgent
-          : agentOptions[0] ?? "qwen-code",
+          : agentOptions[0] ?? DEFAULT_AGENT,
       );
     }
   }, [agentOptions, preferences?.codingAgent, selectedAgent]);
 
   useEffect(() => {
-    const effectiveAgent = selectedAgent || selectedProject?.agent || preferences?.codingAgent || "qwen-code";
+    const effectiveAgent = selectedAgent || selectedProject?.agent || preferences?.codingAgent || DEFAULT_AGENT;
     const preferredModel = selectedProject && normalizeAgentName(selectedProject.agent) === normalizeAgentName(effectiveAgent)
       ? selectedProject.agentModel
       : null;
@@ -1110,7 +1123,7 @@ export default function DashboardClient() {
       if (!res.ok) {
         throw new Error(data?.error ?? `Failed to save preferences: ${res.status}`);
       }
-      const normalized = normalizePreferences(data?.preferences, next.codingAgent || "qwen-code");
+      const normalized = normalizePreferences(data?.preferences, next.codingAgent || DEFAULT_AGENT);
       setPreferences(normalized);
       setSelectedAgent(normalized.codingAgent);
       if (options?.closeDialog !== false) {
@@ -1165,7 +1178,7 @@ export default function DashboardClient() {
       return;
     }
 
-    const effectiveAgent = selectedAgent || "qwen-code";
+    const effectiveAgent = selectedAgent || DEFAULT_AGENT;
     const selectedAgentState = agentStatesByName[normalizeAgentName(effectiveAgent)] ?? null;
     if (selectedAgentState && !selectedAgentState.ready) {
       setCreateError(
@@ -1300,14 +1313,18 @@ export default function DashboardClient() {
   }, [refreshConfig, syncSidebarForViewport]);
 
   const onboardingRequired = !preferencesLoading && !!preferences && !preferences.onboardingAcknowledged;
-  const resolvedPreferences = preferences ?? normalizePreferences(null, selectedAgent || "qwen-code");
-  const resolvedCodingAgent = selectedAgent || resolvedPreferences.codingAgent || "qwen-code";
+  const resolvedPreferences = preferences ?? normalizePreferences(null, selectedAgent || DEFAULT_AGENT);
+  const resolvedCodingAgent = selectedAgent || resolvedPreferences.codingAgent || DEFAULT_AGENT;
 
   const handleSelectProject = useCallback((projectId: string | null) => {
     setSelectedProjectId(projectId);
     setSelectedSessionId(null);
+    const nextAgent = projectId
+      ? projects.find((project) => project.id === projectId)?.agent
+      : preferences?.codingAgent;
+    setSelectedAgent(nextAgent || DEFAULT_AGENT);
     closeSidebarOnMobile();
-  }, [closeSidebarOnMobile]);
+  }, [closeSidebarOnMobile, preferences?.codingAgent, projects]);
 
   const handleSelectSession = useCallback((id: string) => {
     setSelectedSessionId(id);
@@ -1459,8 +1476,7 @@ export default function DashboardClient() {
         sidebar={sidebarContent}
       >
         <TopBar
-          session={selectedSession}
-          fallbackTitle={selectedProjectId ?? "All Projects"}
+          title={topBarTitle}
           onOpenPreferences={handleOpenPreferences}
         />
 
@@ -1583,7 +1599,7 @@ function NewWorkspaceDialog({
   const orderedAgentOptions = useMemo(() => {
     const opts = [...new Set(agentOptions)];
     if (opts.length === 0) {
-      opts.push(defaultAgent || "qwen-code");
+      opts.push(defaultAgent || DEFAULT_AGENT);
     }
 
     const rankMap = new Map(EXECUTOR_ORDER.map((name, index) => [name, index]));
@@ -1597,7 +1613,7 @@ function NewWorkspaceDialog({
 
   useEffect(() => {
     if (!orderedAgentOptions.includes(agent)) {
-      setAgent(orderedAgentOptions[0] ?? "qwen-code");
+      setAgent(orderedAgentOptions[0] ?? DEFAULT_AGENT);
     }
   }, [agent, orderedAgentOptions]);
 
@@ -3349,7 +3365,7 @@ function SettingsDialog({
       opts.add(codingAgent);
     }
     if (opts.size === 0) {
-      opts.add("qwen-code");
+      opts.add(DEFAULT_AGENT);
     }
     const rankMap = new Map(EXECUTOR_ORDER.map((name, index) => [name, index]));
     return [...opts].sort((left, right) => {

package/web/.next/standalone/packages/web/src/features/sessions/SessionPageClient.tsx

@@ -30,6 +30,17 @@ export default function SessionPageClient() {
     () => dashboardSessions.find((session) => session.id === params.id) ?? null,
     [dashboardSessions, params.id],
   );
+  const topBarTitle = useMemo(() => {
+    if (selectedSession) {
+      return [selectedSession.projectId, selectedSession.branch].filter(Boolean).join(" \u00b7 ");
+    }
+
+    if (selectedProjectId) {
+      return selectedProjectId;
+    }
+
+    return "Session";
+  }, [selectedProjectId, selectedSession]);
 
   useEffect(() => {
     if (selectedSession?.projectId) {
@@ -114,8 +125,7 @@ export default function SessionPageClient() {
       }
     >
       <TopBar
-        session={selectedSession}
-        fallbackTitle={selectedSession?.projectId ?? "Session"}
+        title={topBarTitle}
       />
       <div className="min-h-0 flex-1 overflow-hidden">
         <SessionDetail sessionId={params.id} />

package/web/.next/standalone/packages/web/src/proxy.ts

@@ -14,6 +14,7 @@ const clerkConfigured = Boolean(
 
 const backendUrl = process.env.CONDUCTOR_BACKEND_URL?.trim() || "";
 const RUST_API_PREFIXES = [
+  "/api/agents",
   "/api/config",
   "/api/preferences",
   "/api/access",