conductor-oss 0.2.20 → 0.3.1

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

@@ -1,10 +1,11 @@
 "use client";
 
-import { memo, useMemo } from "react";
-import { Layers3, Plus } from "lucide-react";
+import { memo, useMemo, useState } from "react";
+import { Layers3, Plus, X } from "lucide-react";
 import { cn } from "@/lib/cn";
 import { getAttentionLevel, type DashboardSession } from "@/lib/types";
 import { Sidebar } from "@/components/layout/Sidebar";
+import { Button } from "@/components/ui/Button";
 
 interface ProjectItem {
   id: string;
@@ -16,6 +17,7 @@ interface WorkspaceSidebarPanelProps {
   projects: ProjectItem[];
   selectedProjectId: string | null;
   onSelectProject: (projectId: string | null) => void;
+  onUnlinkProject?: (projectId: string) => Promise<void>;
   sessions: DashboardSession[];
   selectedSessionId: string | null;
   onSelectSession: (sessionId: string) => void;
@@ -28,12 +30,16 @@ export const WorkspaceSidebarPanel = memo(function WorkspaceSidebarPanel({
   projects,
   selectedProjectId,
   onSelectProject,
+  onUnlinkProject,
   sessions,
   selectedSessionId,
   onSelectSession,
   onArchiveSession,
   onCreateWorkspace,
 }: WorkspaceSidebarPanelProps) {
+  const [unlinkingId, setUnlinkingId] = useState<string | null>(null);
+  const [confirmUnlinkProjectId, setConfirmUnlinkProjectId] = useState<string | null>(null);
+  const [unlinkError, setUnlinkError] = useState<string | null>(null);
   const sessionCountByProject = useMemo(() => {
     const counts = new Map<string, { total: number; active: number }>();
 
@@ -54,98 +60,207 @@ export const WorkspaceSidebarPanel = memo(function WorkspaceSidebarPanel({
     return sessions.filter((session) => session.status !== "archived" && getAttentionLevel(session) !== "done").length;
   }, [sessions]);
 
+  const confirmUnlinkProject = useMemo(
+    () => projects.find((project) => project.id === confirmUnlinkProjectId) ?? null,
+    [confirmUnlinkProjectId, projects],
+  );
+
+  async function handleConfirmUnlink(): Promise<void> {
+    if (!onUnlinkProject || !confirmUnlinkProjectId) return;
+    setUnlinkingId(confirmUnlinkProjectId);
+    setUnlinkError(null);
+    try {
+      await onUnlinkProject(confirmUnlinkProjectId);
+      setConfirmUnlinkProjectId(null);
+    } catch (err) {
+      setUnlinkError(err instanceof Error ? err.message : "Failed to unlink project.");
+    } finally {
+      setUnlinkingId(null);
+    }
+  }
+
   return (
-    <div className="flex h-full min-h-0 w-full flex-col bg-[var(--vk-bg-panel)]">
-      <section className="border-b border-[var(--vk-border)] px-4 py-4">
-        <div className="flex items-start gap-3">
-          <span className="inline-flex h-10 w-10 items-center justify-center rounded-[10px] border border-[var(--vk-border)] bg-[var(--vk-bg-main)] text-[var(--vk-text-normal)]">
-            <Layers3 className="h-4 w-4" />
-          </span>
-          <div className="min-w-0 flex-1">
-            <p className="truncate text-[15px] font-medium leading-[21px] text-[var(--vk-text-strong)]">
-              {orgLabel}
-            </p>
-            <p className="mt-1 text-[12px] text-[var(--vk-text-muted)]">
-              {projects.length} projects, {totalActiveSessions} active sessions
-            </p>
+    <>
+      <div className="flex h-full min-h-0 w-full flex-col bg-[var(--vk-bg-panel)]">
+        <section className="border-b border-[var(--vk-border)] px-4 py-4">
+          <div className="flex items-start gap-3">
+            <span className="inline-flex h-10 w-10 items-center justify-center rounded-[10px] border border-[var(--vk-border)] bg-[var(--vk-bg-main)] text-[var(--vk-text-normal)]">
+              <Layers3 className="h-4 w-4" />
+            </span>
+            <div className="min-w-0 flex-1">
+              <p className="truncate text-[15px] font-medium leading-[21px] text-[var(--vk-text-strong)]">
+                {orgLabel}
+              </p>
+              <p className="mt-1 text-[12px] text-[var(--vk-text-muted)]">
+                {projects.length} projects, {totalActiveSessions} active sessions
+              </p>
+            </div>
           </div>
-        </div>
 
-        <button
-          type="button"
-          onClick={onCreateWorkspace}
-          className="mt-3 inline-flex h-8 w-full items-center justify-center gap-1 rounded-[6px] border border-[var(--vk-border)] px-2 text-[12px] text-[var(--vk-text-normal)] hover:bg-[var(--vk-bg-hover)]"
-          aria-label="Add workspace"
-        >
-          <Plus className="h-3.5 w-3.5" />
-          <span>Add Workspace</span>
-        </button>
-      </section>
-
-      <section className="border-b border-[var(--vk-border)] pb-2 pt-1.5">
-        <div className="flex h-[28px] items-center px-3">
-          <p className="text-[11px] uppercase tracking-[0.08em] text-[var(--vk-text-muted)]">Projects</p>
-        </div>
-        <div className="max-h-[260px] overflow-y-auto px-2">
           <button
             type="button"
-            onClick={() => onSelectProject(null)}
-            className={cn(
-              "mb-1.5 flex w-full items-center gap-3 rounded-[6px] px-3 py-2.5 text-left text-[14px] leading-[21px]",
-              selectedProjectId === null
-                ? "bg-[var(--vk-bg-hover)] text-[var(--vk-text-normal)]"
-                : "text-[var(--vk-text-muted)] hover:bg-[var(--vk-bg-hover)]",
-            )}
+            onClick={onCreateWorkspace}
+            className="mt-3 inline-flex h-8 w-full items-center justify-center gap-1 rounded-[6px] border border-[var(--vk-border)] px-2 text-[12px] text-[var(--vk-text-normal)] hover:bg-[var(--vk-bg-hover)]"
+            aria-label="Add workspace"
           >
-            <span className="h-2.5 w-2.5 rounded-full bg-[var(--vk-text-muted)]" />
-            <span className="truncate">All projects</span>
-            <span className="ml-auto text-[11px] text-[var(--vk-text-muted)]">{sessions.length}</span>
+            <Plus className="h-3.5 w-3.5" />
+            <span>Add Workspace</span>
           </button>
+        </section>
+
+        <section className="border-b border-[var(--vk-border)] pb-2 pt-1.5">
+          <div className="flex h-[28px] items-center px-3">
+            <p className="text-[11px] uppercase tracking-[0.08em] text-[var(--vk-text-muted)]">Projects</p>
+          </div>
+          <div className="max-h-[260px] overflow-y-auto px-2">
+            <button
+              type="button"
+              onClick={() => onSelectProject(null)}
+              className={cn(
+                "mb-1.5 flex w-full items-center gap-3 rounded-[6px] px-3 py-2.5 text-left text-[14px] leading-[21px]",
+                selectedProjectId === null
+                  ? "bg-[var(--vk-bg-hover)] text-[var(--vk-text-normal)]"
+                  : "text-[var(--vk-text-muted)] hover:bg-[var(--vk-bg-hover)]",
+              )}
+            >
+              <span className="h-2.5 w-2.5 rounded-full bg-[var(--vk-text-muted)]" />
+              <span className="truncate">All projects</span>
+              <span className="ml-auto text-[11px] text-[var(--vk-text-muted)]">{projects.length}</span>
+            </button>
 
-          {projects.map((project) => {
-            const selected = selectedProjectId === project.id;
-            const counts = sessionCountByProject.get(project.id) ?? { total: 0, active: 0 };
-            return (
-              <button
-                key={project.id}
+            {projects.map((project) => {
+              const selected = selectedProjectId === project.id;
+              const counts = sessionCountByProject.get(project.id) ?? { total: 0, active: 0 };
+              const isUnlinking = unlinkingId === project.id;
+              return (
+                <div
+                  key={project.id}
+                  className={cn(
+                    "group relative mb-1.5 flex items-center rounded-[6px]",
+                    selected
+                      ? "bg-[var(--vk-bg-hover)]"
+                      : "hover:bg-[var(--vk-bg-hover)]",
+                  )}
+                >
+                  <button
+                    type="button"
+                    onClick={() => onSelectProject(project.id)}
+                    className={cn(
+                      "flex min-w-0 flex-1 items-center gap-3 px-3 py-2.5 text-left text-[14px] leading-[21px]",
+                      selected
+                        ? "text-[var(--vk-text-normal)]"
+                        : "text-[var(--vk-text-muted)]",
+                    )}
+                  >
+                    <span className="mt-1 h-2.5 w-2.5 shrink-0 rounded-full bg-[#3c83f6]" />
+                    <span className="min-w-0 flex-1">
+                      <span className="block truncate">{project.id}</span>
+                      {project.description ? (
+                        <span className="block truncate text-[11px] text-[var(--vk-text-muted)]">
+                          {project.description}
+                        </span>
+                      ) : null}
+                    </span>
+                    <span className="shrink-0 text-right">
+                      <span className="block text-[11px] text-[var(--vk-text-normal)]">{counts.active} active</span>
+                      <span className="block text-[10px] text-[var(--vk-text-muted)]">{counts.total} total</span>
+                    </span>
+                  </button>
+                  {onUnlinkProject && (
+                    <button
+                      type="button"
+                      disabled={isUnlinking}
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        setUnlinkError(null);
+                        setConfirmUnlinkProjectId(project.id);
+                      }}
+                      className="mr-2 hidden shrink-0 items-center justify-center rounded-[4px] p-1 text-[var(--vk-text-muted)] hover:bg-[var(--vk-red)]/10 hover:text-[var(--vk-red)] group-hover:inline-flex disabled:opacity-50"
+                      aria-label={`Unlink ${project.id}`}
+                      title="Unlink project"
+                    >
+                      <X className="h-3.5 w-3.5" />
+                    </button>
+                  )}
+                </div>
+              );
+            })}
+          </div>
+        </section>
+
+        <section className="flex min-h-0 flex-1 flex-col pt-1.5">
+          <Sidebar
+            sessions={sessions}
+            selectedId={selectedSessionId}
+            onSelect={onSelectSession}
+            onArchive={onArchiveSession}
+            onCreateWorkspace={onCreateWorkspace}
+            showHeader={false}
+          />
+        </section>
+      </div>
+
+      {confirmUnlinkProject && (
+        <div
+          className="fixed inset-0 z-[80] flex items-center justify-center bg-black/60 px-4"
+          onClick={() => {
+            if (unlinkingId) return;
+            setConfirmUnlinkProjectId(null);
+            setUnlinkError(null);
+          }}
+        >
+          <div
+            className="surface-card w-full max-w-md rounded-[var(--radius-lg)] border border-[var(--vk-border)] bg-[var(--vk-bg-panel)]"
+            onClick={(event) => event.stopPropagation()}
+            role="dialog"
+            aria-modal="true"
+            aria-labelledby="unlink-project-title"
+          >
+            <div className="border-b border-[var(--vk-border)] px-4 py-3">
+              <h2 id="unlink-project-title" className="text-[17px] font-medium text-[var(--vk-text-strong)]">
+                Unlink Project
+              </h2>
+              <p className="mt-1 text-[12px] text-[var(--vk-text-muted)]">
+                Remove <span className="font-medium text-[var(--vk-text-normal)]">{confirmUnlinkProject.id}</span> from this workspace configuration.
+              </p>
+            </div>
+
+            <div className="space-y-3 px-4 py-4">
+              <p className="text-[13px] leading-5 text-[var(--vk-text-normal)]">
+                This only removes the project from Conductor. Repository files on disk are not deleted.
+              </p>
+
+              {unlinkError ? (
+                <div className="rounded-[var(--radius-md)] border border-[var(--vk-red)]/35 bg-[color:color-mix(in_srgb,var(--vk-red)_12%,transparent)] px-3 py-2 text-[12px] text-[var(--vk-red)]">
+                  {unlinkError}
+                </div>
+              ) : null}
+            </div>
+
+            <div className="flex items-center justify-end gap-2 border-t border-[var(--vk-border)] px-4 py-3">
+              <Button
                 type="button"
-                onClick={() => onSelectProject(project.id)}
-                className={cn(
-                  "mb-1.5 flex w-full items-center gap-3 rounded-[6px] px-3 py-2.5 text-left text-[14px] leading-[21px]",
-                  selected
-                    ? "bg-[var(--vk-bg-hover)] text-[var(--vk-text-normal)]"
-                    : "text-[var(--vk-text-muted)] hover:bg-[var(--vk-bg-hover)]",
-                )}
+                variant="ghost"
+                onClick={() => {
+                  setConfirmUnlinkProjectId(null);
+                  setUnlinkError(null);
+                }}
+                disabled={unlinkingId !== null}
               >
-                <span className="mt-1 h-2.5 w-2.5 shrink-0 rounded-full bg-[#3c83f6]" />
-                <span className="min-w-0 flex-1">
-                  <span className="block truncate">{project.id}</span>
-                  {project.description ? (
-                    <span className="block truncate text-[11px] text-[var(--vk-text-muted)]">
-                      {project.description}
-                    </span>
-                  ) : null}
-                </span>
-                <span className="shrink-0 text-right">
-                  <span className="block text-[11px] text-[var(--vk-text-normal)]">{counts.active} active</span>
-                  <span className="block text-[10px] text-[var(--vk-text-muted)]">{counts.total} total</span>
-                </span>
-              </button>
-            );
-          })}
+                Cancel
+              </Button>
+              <Button
+                type="button"
+                variant="danger"
+                onClick={() => void handleConfirmUnlink()}
+                disabled={unlinkingId !== null}
+              >
+                {unlinkingId === confirmUnlinkProject.id ? "Unlinking..." : "Unlink Project"}
+              </Button>
+            </div>
+          </div>
         </div>
-      </section>
-
-      <section className="flex min-h-0 flex-1 flex-col pt-1.5">
-        <Sidebar
-          sessions={sessions}
-          selectedId={selectedSessionId}
-          onSelect={onSelectSession}
-          onArchive={onArchiveSession}
-          onCreateWorkspace={onCreateWorkspace}
-          showHeader={false}
-        />
-      </section>
-    </div>
+      )}
+    </>
   );
 });

package/web/.next/standalone/packages/web/src/components/sessions/ChatPanel.tsx

@@ -37,6 +37,7 @@ import { useAgents } from "@/hooks/useAgents";
 import { useSessionFeed } from "@/hooks/useSessionFeed";
 import type { NormalizedChatEntry } from "@/lib/chatFeed";
 import { normalizeAgentName } from "@/lib/agentUtils";
+import { getAvailableAgentModels, resolveAgentModelAccess } from "@conductor-oss/core/types";
 
 interface ChatPanelProps {
   sessionId: string;
@@ -128,6 +129,17 @@ function getModelOptions(
   const options = new Map<string, ModelOption>();
   const normalizedAgentName = normalizeAgentName(agentName);
 
+  const fallbackModels = getAvailableAgentModels(agentName, undefined);
+  for (const model of fallbackModels) {
+    const id = model.id.trim();
+    if (!id || options.has(id)) continue;
+    options.set(id, {
+      id,
+      label: model.label.trim() || id,
+      helper: "Built-in catalog",
+    });
+  }
+
   for (const agent of agents) {
     if (normalizedAgentName && normalizeAgentName(agent.name) !== normalizedAgentName) {
       continue;
@@ -284,6 +296,25 @@ const markdownComponents = {
       className={[props.className, "whitespace-pre-wrap"].filter(Boolean).join(" ")}
     />
   ),
+  pre: (props: ComponentProps<"pre">) => (
+    <pre
+      {...props}
+      className={[
+        props.className,
+        "max-w-full overflow-x-hidden whitespace-pre-wrap break-words rounded-[6px] border border-[#333] bg-[#1c1c1c] px-3 py-3 text-[12px] leading-[18px] [overflow-wrap:anywhere] sm:text-[13px] sm:leading-[20px]",
+      ].filter(Boolean).join(" ")}
+    />
+  ),
+  code: (props: ComponentProps<"code"> & { inline?: boolean }) => (
+    <code
+      {...props}
+      className={[
+        props.className,
+        "font-mono whitespace-pre-wrap break-all [overflow-wrap:anywhere]",
+        props.inline ? "rounded bg-[rgba(0,0,0,0.22)] px-1 py-[1px] text-[#f1f1f1]" : "",
+      ].filter(Boolean).join(" ")}
+    />
+  ),
 };
 
 function SetupScriptHint() {
@@ -738,7 +769,7 @@ function ParserStateBanner({
           <p className="whitespace-pre-wrap break-words text-[13px] leading-[20px]">{message}</p>
           {command ? (
             <p className="text-[12px] leading-[18px] text-[#c4c4c4]">
-              Run locally: <code className="rounded bg-[rgba(0,0,0,0.22)] px-1 py-[1px] text-[#f1f1f1]">{command}</code>
+              Run locally: <code className="rounded bg-[rgba(0,0,0,0.22)] px-1 py-[1px] whitespace-pre-wrap break-all text-[#f1f1f1] [overflow-wrap:anywhere]">{command}</code>
             </p>
           ) : null}
         </div>
@@ -843,12 +874,12 @@ function ToolEntry({ entry }: { entry: NormalizedChatEntry }) {
         {statusIndicator}
         <Icon className="mt-[2px] h-[14px] w-[14px] shrink-0 text-[var(--vk-text-muted)]" strokeWidth={1.7} />
         <div className="min-w-0 flex-1">
-          <div className="flex min-w-0 flex-wrap items-center gap-2">
-            <span className="shrink-0 text-[14px] font-medium leading-[21px] text-[#d0d0d0]">
+          <div className="flex min-w-0 flex-col items-start gap-1 sm:flex-row sm:flex-wrap sm:items-center sm:gap-2">
+            <span className="min-w-0 max-w-full break-words text-[13px] font-medium leading-[20px] text-[#d0d0d0] sm:text-[14px] sm:leading-[21px]">
               {toolTitle}
             </span>
             {inlineSummary ? (
-              <span className="min-w-0 max-w-full truncate rounded-[3px] bg-[rgba(255,255,255,0.06)] px-2 py-[2px] font-mono text-[12px] leading-[18px] text-[#a9a9a9]">
+              <span className="min-w-0 w-full whitespace-pre-wrap break-all rounded-[3px] bg-[rgba(255,255,255,0.06)] px-2 py-[2px] font-mono text-[11px] leading-[17px] text-[#a9a9a9] [overflow-wrap:anywhere] sm:w-auto sm:max-w-full sm:text-[12px] sm:leading-[18px]">
                 {inlineSummary}
               </span>
             ) : null}
@@ -945,7 +976,7 @@ function ToolGroup({
         <span>{countLabel}</span>
       </button>
       {expanded ? (
-        <div className="space-y-1 pl-5">
+        <div className="space-y-1 pl-3 sm:pl-5">
           {entries.map((entry) => (
             <ToolEntry key={entry.id} entry={entry} />
           ))}

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

@@ -4,7 +4,11 @@ import dynamic from "next/dynamic";
 import { type FormEvent, memo, useCallback, useEffect, useMemo, useState } from "react";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import {
+  getAvailableAgentModels,
+  getAvailableAgentReasoningEfforts,
   getAgentModelCatalog,
+  getDefaultAgentModel,
+  getDefaultAgentReasoningEffort,
   resolveAgentModelAccess,
   supportsAgentModelSelection,
   type AgentModelOption,
@@ -32,7 +36,6 @@ import {
   Hand,
   List,
   Loader2,
-  Paperclip,
   PlugZap,
   RefreshCcw,
   Search,
@@ -527,7 +530,17 @@ function getSelectableAgentModels(
   const runtimeCatalog = getRuntimeModelCatalog(agent, runtimeModelCatalogs);
   const access = resolveAgentModelAccess(agent, modelAccess);
   const scopedModels = getRuntimeCatalogModelsForAccess(runtimeCatalog, access);
-  return scopedModels.length > 0 ? scopedModels : getAllRuntimeCatalogModels(runtimeCatalog);
+  const staticModels = getAvailableAgentModels(agent, modelAccess);
+  const merged: AgentModelOption[] = [];
+  const seen = new Set<string>();
+
+  for (const model of [...scopedModels, ...staticModels, ...getAllRuntimeCatalogModels(runtimeCatalog)]) {
+    if (!model?.id || seen.has(model.id)) continue;
+    seen.add(model.id);
+    merged.push(model);
+  }
+
+  return merged;
 }
 
 function getSelectableAgentReasoningOptions(
@@ -538,7 +551,18 @@ function getSelectableAgentReasoningOptions(
 ): AgentReasoningOption[] {
   const runtimeCatalog = getRuntimeModelCatalog(agent, runtimeModelCatalogs);
   const access = resolveAgentModelAccess(agent, modelAccess);
-  return getRuntimeCatalogReasoningOptions(runtimeCatalog, model, access);
+  const runtimeOptions = getRuntimeCatalogReasoningOptions(runtimeCatalog, model, access);
+  const staticOptions = getAvailableAgentReasoningEfforts(agent, modelAccess);
+  const merged: AgentReasoningOption[] = [];
+  const seen = new Set<string>();
+
+  for (const option of [...runtimeOptions, ...staticOptions]) {
+    if (!option?.id || seen.has(option.id)) continue;
+    seen.add(option.id);
+    merged.push(option);
+  }
+
+  return merged;
 }
 
 function getSelectableDefaultAgentModel(
@@ -549,6 +573,7 @@ function getSelectableDefaultAgentModel(
   const runtimeCatalog = getRuntimeModelCatalog(agent, runtimeModelCatalogs);
   const access = resolveAgentModelAccess(agent, modelAccess);
   return getRuntimeCatalogDefaultModelForAccess(runtimeCatalog, access)
+    ?? getDefaultAgentModel(agent, modelAccess)
     ?? getAllRuntimeCatalogModels(runtimeCatalog)[0]?.id
     ?? "";
 }
@@ -561,7 +586,9 @@ function getSelectableDefaultReasoningEffort(
 ): string {
   const runtimeCatalog = getRuntimeModelCatalog(agent, runtimeModelCatalogs);
   const access = resolveAgentModelAccess(agent, modelAccess);
-  return getRuntimeCatalogDefaultReasoning(runtimeCatalog, model, access) ?? "";
+  return getRuntimeCatalogDefaultReasoning(runtimeCatalog, model, access)
+    ?? getDefaultAgentReasoningEffort(agent, modelAccess)
+    ?? "";
 }
 
 function getSelectableModelPlaceholder(
@@ -1065,14 +1092,6 @@ export default function DashboardClient() {
     }
   }, [preferences, preferencesLoading]);
 
-  useEffect(() => {
-    if (selectedAgent) return;
-    const fromProject = projects.find((p) => p.id === selectedProjectId)?.agent;
-    if (fromProject) {
-      setSelectedAgent(fromProject);
-    }
-  }, [projects, selectedAgent, selectedProjectId]);
-
   useEffect(() => {
     if (agentOptions.length === 0) return;
     if (!selectedAgent || !agentOptions.includes(selectedAgent)) {
@@ -1319,12 +1338,9 @@ export default function DashboardClient() {
   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);
+    setSelectedAgent(preferences?.codingAgent || DEFAULT_AGENT);
     closeSidebarOnMobile();
-  }, [closeSidebarOnMobile, preferences?.codingAgent, projects]);
+  }, [closeSidebarOnMobile, preferences?.codingAgent]);
 
   const handleSelectSession = useCallback((id: string) => {
     setSelectedSessionId(id);
@@ -1346,12 +1362,29 @@ export default function DashboardClient() {
     setPreferencesError(null);
   }, [onboardingRequired, preferencesSaving]);
 
+  const handleUnlinkProject = useCallback(async (projectId: string) => {
+    const encodedProjectId = encodeURIComponent(projectId);
+    let res = await fetch(`/api/repositories/${encodedProjectId}`, { method: "DELETE" });
+
+    // Fall back to the query-string endpoint for older servers that only expose DELETE /api/repositories?id=...
+    if (res.status === 404 || res.status === 405) {
+      res = await fetch(`/api/repositories?id=${encodedProjectId}`, { method: "DELETE" });
+    }
+
+    const data = (await res.json().catch(() => null)) as { ok?: boolean; error?: string } | null;
+    if (!res.ok) {
+      throw new Error(data?.error ?? `Failed to unlink project (${res.status})`);
+    }
+    await refreshConfig();
+  }, [refreshConfig]);
+
   const sidebarContent = useMemo(() => (
     <WorkspaceSidebarPanel
       orgLabel="conductor-oss"
       projects={projects}
       selectedProjectId={selectedProjectId}
       onSelectProject={handleSelectProject}
+      onUnlinkProject={handleUnlinkProject}
       sessions={dashboardSessions}
       selectedSessionId={selectedSessionId}
       onSelectSession={handleSelectSession}
@@ -1363,6 +1396,7 @@ export default function DashboardClient() {
     handleArchiveSession,
     handleSelectProject,
     handleSelectSession,
+    handleUnlinkProject,
     openWorkspaceDialog,
     projects,
     selectedProjectId,
@@ -1437,7 +1471,7 @@ export default function DashboardClient() {
     }
 
     return (
-      <div className="flex h-full min-h-0 flex-col">
+      <div className="min-h-0 flex-1 overflow-auto">
         <WorkspaceOverview
           projects={projects}
           sessions={dashboardSessions}
@@ -1449,10 +1483,6 @@ export default function DashboardClient() {
           onSelectSession={handleSelectSession}
           onShowView={setWorkspaceView}
         />
-
-        <div className="min-h-0 flex-1 overflow-hidden">
-          {workspaceMainPanel}
-        </div>
       </div>
     );
   }, [
@@ -2090,6 +2120,7 @@ function FolderPickerDialog({
   const [search, setSearch] = useState("");
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
+  const [browseLoading, setBrowseLoading] = useState(false);
 
   useEffect(() => {
     if (!open) return;
@@ -2154,12 +2185,35 @@ function FolderPickerDialog({
   const handleGoParent = () => {
     if (!currentPath) return;
     const normalized = currentPath.replace(/\\/g, "/");
+    // Handle Windows drive root (e.g. "C:/")
+    if (/^[A-Za-z]:\/?$/.test(currentPath)) return;
     if (normalized === "/") return;
     const parts = normalized.split("/").filter(Boolean);
-    const parent = parts.length > 1 ? `/${parts.slice(0, -1).join("/")}` : "/";
+    // Preserve Windows drive letter when going up
+    const driveMatch = currentPath.match(/^([A-Za-z]):[/\\]/);
+    const parent = driveMatch
+      ? parts.length > 1 ? `${driveMatch[1]}:/${parts.slice(1, -1).join("/")}` : `${driveMatch[1]}:/`
+      : parts.length > 1 ? `/${parts.slice(0, -1).join("/")}` : "/";
     void loadDirectory(parent);
   };
 
+  const handleNativeBrowse = async () => {
+    setBrowseLoading(true);
+    try {
+      const res = await fetch("/api/filesystem/pick-directory", { method: "POST" });
+      const data = (await res.json().catch(() => null)) as
+        | { path?: string; cancelled?: boolean; error?: string }
+        | null;
+      if (!data || data.cancelled || !data.path) return;
+      setManualPath(data.path);
+      void loadDirectory(data.path);
+    } catch {
+      // Native picker unavailable — user can still use manual path entry
+    } finally {
+      setBrowseLoading(false);
+    }
+  };
+
   if (!open) return null;
 
   return (
@@ -2216,6 +2270,15 @@ function FolderPickerDialog({
             >
               Up
             </button>
+            <button
+              type="button"
+              disabled={browseLoading}
+              onClick={() => { void handleNativeBrowse(); }}
+              className="inline-flex h-8 items-center gap-1 rounded-[4px] border border-[var(--vk-border)] px-2 text-[12px] text-[var(--vk-text-normal)] hover:bg-[var(--vk-bg-hover)] disabled:opacity-50"
+            >
+              {browseLoading ? <Loader2 className="h-3 w-3 animate-spin" /> : <FolderOpen className="h-3 w-3" />}
+              {browseLoading ? "Opening..." : "Browse"}
+            </button>
             <div className="truncate text-[12px] text-[var(--vk-text-muted)]">{currentPath || "Home"}</div>
           </div>
 
@@ -2812,10 +2875,6 @@ const CreateWorkspacePanel = memo(function CreateWorkspacePanel({
                     </DropdownMenu.Portal>
                   </DropdownMenu.Root>
 
-                  <div className="inline-flex h-[29px] w-[29px] items-center justify-center rounded-[3px] border border-[var(--vk-border)] bg-[var(--vk-bg-panel)] text-[var(--vk-text-normal)]">
-                    <ChevronsRight className="h-[15px] w-[15px]" />
-                  </div>
-
                   <DropdownMenu.Root>
                     <DropdownMenu.Trigger asChild>
                       <button
@@ -2846,15 +2905,6 @@ const CreateWorkspacePanel = memo(function CreateWorkspacePanel({
                     </DropdownMenu.Portal>
                   </DropdownMenu.Root>
 
-                  <button
-                    type="button"
-                    onClick={onOpenAddWorkspace}
-                    className="inline-flex h-[29px] w-[20px] items-center justify-center text-[var(--vk-text-muted)] hover:text-[var(--vk-text-normal)]"
-                    aria-label="Add workspace"
-                  >
-                    <Paperclip className="h-[18px] w-[18px]" />
-                  </button>
-
                   <DropdownMenu.Root>
                     <DropdownMenu.Trigger asChild>
                       <button