Merge branch 'dev' into feat/cli-server-mode

Author: deepagent-ai

packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepagent-code/app",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "",
   "type": "module",
   "exports": {

packages/app/src/app.tsx

@@ -9,7 +9,7 @@ import { Font } from "@deepagent-code/ui/font"
 import { Splash } from "@deepagent-code/ui/logo"
 import { ThemeProvider } from "@deepagent-code/ui/theme/context"
 import { MetaProvider } from "@solidjs/meta"
-import { type BaseRouterProps, Navigate, Route, Router } from "@solidjs/router"
+import { type BaseRouterProps, Navigate, Route, Router, useLocation, useNavigate } from "@solidjs/router"
 import { QueryClient, QueryClientProvider } from "@tanstack/solid-query"
 import { Effect } from "effect"
 import {
@@ -45,7 +45,7 @@ import { PromptProvider } from "@/context/prompt"
 import { ServerConnection, ServerProvider, serverName, useServer } from "@/context/server"
 import { SettingsProvider } from "@/context/settings"
 import { TerminalProvider } from "@/context/terminal"
-import { TabsProvider } from "@/context/tabs"
+import { TabsProvider, useTabs } from "@/context/tabs"
 import { WslServersProvider } from "@/wsl/context"
 import DirectoryLayout from "@/pages/directory-layout"
 import Layout from "@/pages/layout"
@@ -143,6 +143,23 @@ function SessionProviders(props: ParentProps) {
 }
 
 function RouterRoot(props: ParentProps<{ appChildren?: JSX.Element }>) {
+  const tabs = useTabs()
+  const navigate = useNavigate()
+  const location = useLocation()
+
+  // On startup: as soon as persisted tabs are loaded (local disk, no HTTP calls),
+  // navigate to the last visited project's session list. This matches opencode's approach —
+  // use local/cached data to drive the first frame, let the server data fill in asynchronously.
+  // We navigate to /:dir/session (no specific session ID) so autoselecting can handle
+  // the final session selection independently without conflicting navigation.
+  createEffect(() => {
+    if (!tabs.ready()) return
+    if (location.pathname !== "/") return
+    const first = tabs.store[0]
+    if (!first) return
+    navigate(`/${first.dirBase64}/session`, { replace: true })
+  })
+
   return (
     <AppShellProviders>
       {/*<Suspense fallback={<Loading />}>*/}

packages/app/src/components/deepagent/oversight-dashboard.tsx

@@ -55,7 +55,16 @@ function MetricCard(props: { label: string; value: string; tone?: "ok" | "warn"
   )
 }
 
-export const OversightDashboard: Component = () => {
+// Phase 2: OversightDashboard now accepts a selected subagent session ID so takeover/rollback
+// automatically target the chosen session, and trace nodes can reverse-select a subagent.
+export type OversightDashboardProps = {
+  /** When provided, takeover and rollback default to this session ID. */
+  selectedSessionID?: string
+  /** Called when a trace node with a sessionID is clicked so the caller can select that subagent. */
+  onSessionSelect?: (sessionID: string) => void
+}
+
+export const OversightDashboard: Component<OversightDashboardProps> = (props) => {
   const sdk = useSDK()
   const language = useLanguage()
   const client = () => sdk.client as unknown as OversightClient
@@ -118,7 +127,9 @@ export const OversightDashboard: Component = () => {
     if (!reason) return
     setTakeoverBusy(true)
     setTakeoverNote(null)
-    const result = await recordHumanTakeover(client(), { reason })
+    // Phase 2: automatically pass the selected session ID when present.
+    const sessionID = props.selectedSessionID
+    const result = await recordHumanTakeover(client(), { reason, ...(sessionID ? { sessionID } : {}) })
     setTakeoverBusy(false)
     if (result.ok) {
       setTakeoverReason("")
@@ -133,21 +144,25 @@ export const OversightDashboard: Component = () => {
   }
 
   // ── §D2 rollback (P4.4) ─────────────────────────────────────────────────────────
-  const [rollbackSession, setRollbackSession] = createSignal("")
+  // Phase 2: rollback input is pre-seeded with the selected session ID. Users may override it.
   const [rollbackReason, setRollbackReason] = createSignal("")
   const [rollbackBusy, setRollbackBusy] = createSignal(false)
   const [rollbackNote, setRollbackNote] = createSignal<string | null>(null)
 
+  // The effective session ID for rollback: the input field overrides; falls back to selectedSessionID.
+  const [rollbackSessionOverride, setRollbackSessionOverride] = createSignal("")
+  const effectiveRollbackSession = () => rollbackSessionOverride() || props.selectedSessionID || ""
+
   const submitRollback = async () => {
-    const sessionID = rollbackSession().trim()
+    const sessionID = effectiveRollbackSession().trim()
     if (!sessionID) return
     const reason = rollbackReason().trim()
     setRollbackBusy(true)
     setRollbackNote(null)
     const result = await recordRollback(client(), { sessionID, ...(reason ? { reason } : {}) })
     setRollbackBusy(false)
     if (result.ok) {
-      setRollbackSession("")
+      setRollbackSessionOverride("")
       setRollbackReason("")
       setRollbackNote(
         result.record?.outcome === "noop"
@@ -328,6 +343,17 @@ export const OversightDashboard: Component = () => {
                             </div>
                           </Show>
                           <div class="text-11-regular text-text-weaker">{fmtTime(node.createdAt)}</div>
+                          {/* Phase 2: if this node is tied to a specific subagent session, offer
+                              a reverse-select link so the user can jump to that subagent row. */}
+                          <Show when={node.sessionID && props.onSessionSelect}>
+                            <button
+                              type="button"
+                              class="mt-0.5 text-11-regular text-text-link hover:underline"
+                              onClick={() => props.onSessionSelect!(node.sessionID!)}
+                            >
+                              {language.t("oversight.trace.selectAgent")}
+                            </button>
+                          </Show>
                         </div>
                       </div>
                     )}
@@ -372,11 +398,13 @@ export const OversightDashboard: Component = () => {
         <section>
           <h3 class="mb-1 text-13-medium text-text-strong">{language.t("oversight.rollback.title")}</h3>
           <p class="mb-2 text-11-regular text-text-weak">{language.t("oversight.rollback.description")}</p>
+          {/* Phase 2: when a subagent is selected the placeholder is replaced by the session ID.
+              Typing in this field overrides the pre-selected session. */}
           <input
             class="w-full rounded-md border border-border-weak-base bg-surface-base px-2 py-1.5 text-12-regular text-text-strong outline-none focus:ring-2 focus:ring-accent-base font-mono"
-            placeholder={language.t("oversight.rollback.sessionPlaceholder")}
-            value={rollbackSession()}
-            onInput={(e) => setRollbackSession(e.currentTarget.value)}
+            placeholder={props.selectedSessionID || language.t("oversight.rollback.sessionPlaceholder")}
+            value={rollbackSessionOverride()}
+            onInput={(e) => setRollbackSessionOverride(e.currentTarget.value)}
           />
           <textarea
             class="mt-2 w-full rounded-md border border-border-weak-base bg-surface-base px-2 py-1.5 text-12-regular text-text-strong outline-none resize-none focus:ring-2 focus:ring-accent-base"
@@ -391,7 +419,7 @@ export const OversightDashboard: Component = () => {
               size="small"
               icon="reset"
               onClick={submitRollback}
-              disabled={rollbackBusy() || !rollbackSession().trim()}
+              disabled={rollbackBusy() || !effectiveRollbackSession().trim()}
             >
               <Show when={rollbackBusy()}>
                 <Spinner />

packages/app/src/components/deepagent/oversight.api.ts

@@ -54,6 +54,9 @@ export type OversightTraceNode = {
   source: string
   causationID?: string
   createdAt: number
+  // Phase 2: trace nodes may carry the session that emitted them so the UI can reverse-select
+  // the subagent row when the user clicks a trace entry.
+  sessionID?: string
 }
 export type OversightTrace = { nodes: OversightTraceNode[] }
 
@@ -148,7 +151,7 @@ export type HumanTakeoverRecord = {
  */
 export const recordHumanTakeover = async (
   client: OversightClient,
-  input: { reason: string; scope?: string },
+  input: { reason: string; scope?: string; sessionID?: string },
 ): Promise<{ ok: true; record?: HumanTakeoverRecord } | { ok: false; unsupported: boolean; error: string }> => {
   try {
     const response = await client.client.request<HumanTakeoverRecord>({

packages/app/src/components/session/session-header.tsx

@@ -18,7 +18,7 @@ import { DOCK_PANEL_IDS, useLayout } from "@/context/layout"
 import { usePlatform } from "@/context/platform"
 import { useServer } from "@/context/server"
 import { useSync } from "@/context/sync"
-import { useTerminal } from "@/context/terminal"
+import { useTerminalHosts } from "@/context/terminal"
 import { focusTerminalById } from "@/pages/session/helpers"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { PANEL_VIEW_META } from "@/pages/session/panel-view-registry"
@@ -144,7 +144,7 @@ export function SessionHeader() {
   const platform = usePlatform()
   const language = useLanguage()
   const sync = useSync()
-  const terminal = useTerminal()
+  const terminalHosts = useTerminalHosts()
   const { params, view } = useSessionLayout()
 
   const projectDirectory = createMemo(() => decode64(params.dir) ?? "")
@@ -208,19 +208,18 @@ export function SessionHeader() {
     ]
   })
 
-  const terminalOpen = createMemo(() => {
-    const panel = view().panel
-    return panel.location("terminal") === "bottom"
-      ? panel.bottom.opened() && panel.bottom.activeView() === "terminal"
-      : view().rightPanel.mode() === "terminal"
-  })
+  // Phase 3: terminal toggle button in the header controls the **bottom** terminal only.
+  const terminalOpen = createMemo(() =>
+    view().panel.bottom.opened() && view().panel.bottom.activeView() === "terminal",
+  )
 
   const toggleTerminal = () => {
     view().panel.toggle("terminal")
-    const panel = view().panel
-    if (panel.location("terminal") === "side" && view().rightPanel.mode() !== "terminal") return
-    const id = terminal.active()
-    if (id) focusTerminalById(id)
+    // Focus the bottom terminal's active pane after opening.
+    if (terminalOpen()) {
+      const id = terminalHosts.bottom.active()
+      if (id) focusTerminalById(id)
+    }
   }
 
   const bottomPanelOpen = createMemo(() => view().panel.bottom.opened())

packages/app/src/context/layout.tsx

@@ -105,6 +105,8 @@ type SessionView = {
   // U3/U4/U7: added "worktree" (isolated worktree diff/merge), "subagents" (child-session list),
   // "browser" (isolated WebContentsView).
   // T3.2: the "menu" mode is gone — an always-on icon rail replaced the full-panel menu list.
+  // Phase 2: "oversight" removed as standalone panel; kept in union only for backward-compat
+  // migration — any stored "oversight" is silently mapped to "subagents" at read time.
   rightPanelMode?:
     | "review"
     | "files"
@@ -326,7 +328,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
       { ...target, migrate },
       createStore({
         sidebar: {
-          opened: false,
+          opened: true,
           width: DEFAULT_SIDEBAR_WIDTH,
           workspaces: {} as Record<string, boolean>,
           workspacesDefault: false,
@@ -731,19 +733,24 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
         },
       },
       dock: {
-        // Deprecated compatibility metadata. New UI must use view(session).panel;
-        // only locations and the shared Bottom Panel dimension remain global.
+        // Phase 3: terminal is now side-native in the right panel (independent host).
+        // dock.location("terminal") is forced to "bottom" to avoid stale stored "side"
+        // values making the bottom terminal unreachable. Move operations for terminal
+        // are intentionally no-ops; only debug-console and problems remain movable.
         location(id: DockPanelID): DockLocation {
+          if (id === "terminal") return "bottom"
           return store.dock?.location?.[id] ?? DOCK_DEFAULT_LOCATION[id]
         },
         setLocation(id: DockPanelID, location: DockLocation) {
+          if (id === "terminal") return // terminal location is now fixed
           if (!store.dock) {
             setStore("dock", { location: { [id]: location } as Record<DockPanelID, DockLocation> })
             return
           }
           setStore("dock", "location", id, location)
         },
         move(id: DockPanelID) {
+          if (id === "terminal") return // terminal is no longer movable
           const current = store.dock?.location?.[id] ?? DOCK_DEFAULT_LOCATION[id]
           const next: DockLocation = current === "bottom" ? "side" : "bottom"
           if (!store.dock) {
@@ -753,7 +760,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
           setStore("dock", "location", id, next)
         },
         bottomCount: createMemo(
-          () => DOCK_PANEL_IDS.filter((id) => (store.dock?.location?.[id] ?? DOCK_DEFAULT_LOCATION[id]) === "bottom").length,
+          () => DOCK_PANEL_IDS.filter((id) => (id === "terminal" ? true : (store.dock?.location?.[id] ?? DOCK_DEFAULT_LOCATION[id]) === "bottom")).length,
         ),
       },
       review: {
@@ -905,7 +912,13 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
         const key = createSessionKeyReader(sessionKey, ensureKey)
         const s = createMemo(() => store.sessionView[key()] ?? { scroll: {} })
         const reviewPanelOpened = createMemo(() => store.review?.panelOpened ?? true)
-        const rightPanelMode = createMemo(() => store.sessionView[key()]?.rightPanelMode)
+        const rightPanelMode = createMemo(() => {
+          const mode = store.sessionView[key()]?.rightPanelMode
+          // Phase 2 backward-compat: "oversight" was merged into "subagents". Any session that
+          // persisted "oversight" should silently open the unified subagents panel instead.
+          if (mode === "oversight") return "subagents" as SessionRightPanelMode
+          return mode
+        })
         const bottomPanel = createMemo(() => {
           const current = store.sessionView[key()]
           // One-way compatibility migration from the pre-panel global terminal flag.

packages/app/src/context/terminal.test.ts

@@ -339,6 +339,34 @@ describe("runtime terminal controller", () => {
     }
   })
 
+  test("collapses a split to its surviving pane when closing that pane's final terminal", async () => {
+    let sequence = 0
+    const harness = terminalHarness(async () => {
+      sequence += 1
+      return { data: { id: `pty-${sequence}`, title: `Terminal ${sequence}` } }
+    })
+    try {
+      await harness.session.new()
+      harness.session.setPaneBounds(harness.session.focusedPaneId(), { width: 1_000, height: 400 })
+      expect(await harness.session.split("horizontal")).toBeTrue()
+
+      const [first, second] = harness.session.all()
+      expect(first).toBeDefined()
+      expect(second).toBeDefined()
+      await harness.session.close(second!.id)
+
+      const root = harness.session.root()
+      expect(root.kind).toBe("leaf")
+      if (root.kind !== "leaf") throw new Error("expected split to collapse to a leaf")
+      expect(root.ptys).toEqual([first!.id])
+      expect(root.activeId).toBe(first!.id)
+      expect(harness.session.focusedPaneId()).toBe(root.id)
+      expect(harness.session.closeRequest()).toBe(0)
+    } finally {
+      harness.dispose()
+    }
+  })
+
   test("requests panel close only when the user closes the final tab", async () => {
     const harness = terminalHarness(async () => ({ data: { id: "pty-server-1", title: "Terminal 1" } }))
     try {