@ai-matrx/coding-sessions 0.1.85 → 0.1.86

package/dist/react/index.d.cts

@@ -196,6 +196,8 @@ interface CodingSession {
     queued: string[];
     /** The AI Matrx agent loaded into every run of this session, when one was picked. */
     agent?: SessionAgent | null | undefined;
+    /** Codex must be told, in the next prompt, that an earlier agent no longer applies. */
+    agentRemovedDue?: boolean | undefined;
 }
 /**
  * One normalized transcript item — the same shape from Claude and Codex, from
@@ -309,6 +311,19 @@ interface SessionAgent {
         name: string;
         reason: string;
     }[];
+    /** The skills it carries (labels) and the tools it serves (names) — the agent's own set. */
+    skills?: string[] | undefined;
+    tools?: string[] | undefined;
+    /** The person's variable values, kept so "Update to vN" can reuse them. */
+    variables?: Record<string, JsonValue> | undefined;
+    /**
+     * The CLI must be TOLD in the next prompt (a delimited block): a Codex
+     * takeover or agent switch (Codex ignores developer_instructions on resume),
+     * or a Codex compaction that dropped the block. Cleared once delivered.
+     */
+    blockDue?: boolean | undefined;
+    /** When the block (or native instructions) last reached the CLI. */
+    deliveredAt?: string | null | undefined;
 }
 /** Whether this host can reach AI Matrx as a signed-in person. */
 interface AgentAccess {
@@ -339,12 +354,13 @@ interface AgentCatalogRpcResult {
     } | null;
     count?: number | null;
 }
-/** What the New session form needs about one agent. */
+/** What a picker needs about one agent — the LIGHT read (no skills, no tools). */
 interface AgentDetails {
     agentId: string;
     name: string;
     /** Variable declarations as authored (camelCase). */
     variables: Record<string, JsonValue>[];
+    /** Newest first. */
     versions: {
         id: string;
         versionNumber: number;
@@ -352,12 +368,15 @@ interface AgentDetails {
     }[];
     /** The version "Latest" resolves to right now. */
     latestVersionNumber: number | null;
+    latestVersionId: string | null;
 }
 interface TakeoverInput {
     provider: CodingProvider;
     providerSessionId: string;
     cwd: string;
     title?: string | undefined;
+    /** Continue the chat WITH an AI Matrx agent ("Continue with agent"). */
+    agent?: AgentSelection | null | undefined;
 }
 interface SendResult {
     session: CodingSession;
@@ -434,6 +453,12 @@ interface CodingSessionsApi {
     agentCatalogRpc(request: AgentCatalogRpcRequest): Promise<AgentCatalogRpcResult>;
     /** An agent's variables and saved versions, for the New session form. */
     agentDetails(agentId: string): Promise<AgentDetails>;
+    /**
+     * Load a different agent into a session from its next message on (or
+     * remove it, with `null`). Claude reads it every turn; Codex is told in the
+     * next prompt.
+     */
+    setAgent(sessionId: string, agent: AgentSelection | null): Promise<CodingSession>;
 }
 type RawTranscript = {
     available: true;
@@ -588,7 +613,7 @@ declare class CodingSessionsClient {
     transcript(sessionId: string): SessionTranscript;
     readPreview(provider: CodingProvider, providerSessionId: string, maxBytes?: number): Promise<PreviewState>;
     start(input: StartInput): Promise<SendResult>;
-    takeover(session: DiscoveredSession): Promise<CodingSession>;
+    takeover(session: DiscoveredSession, agent?: AgentSelection | null): Promise<CodingSession>;
     send(sessionId: string, prompt: string): Promise<SendResult>;
     stop(runId: string): Promise<RunRecord | null>;
 }

package/dist/react/index.d.ts

@@ -196,6 +196,8 @@ interface CodingSession {
     queued: string[];
     /** The AI Matrx agent loaded into every run of this session, when one was picked. */
     agent?: SessionAgent | null | undefined;
+    /** Codex must be told, in the next prompt, that an earlier agent no longer applies. */
+    agentRemovedDue?: boolean | undefined;
 }
 /**
  * One normalized transcript item — the same shape from Claude and Codex, from
@@ -309,6 +311,19 @@ interface SessionAgent {
         name: string;
         reason: string;
     }[];
+    /** The skills it carries (labels) and the tools it serves (names) — the agent's own set. */
+    skills?: string[] | undefined;
+    tools?: string[] | undefined;
+    /** The person's variable values, kept so "Update to vN" can reuse them. */
+    variables?: Record<string, JsonValue> | undefined;
+    /**
+     * The CLI must be TOLD in the next prompt (a delimited block): a Codex
+     * takeover or agent switch (Codex ignores developer_instructions on resume),
+     * or a Codex compaction that dropped the block. Cleared once delivered.
+     */
+    blockDue?: boolean | undefined;
+    /** When the block (or native instructions) last reached the CLI. */
+    deliveredAt?: string | null | undefined;
 }
 /** Whether this host can reach AI Matrx as a signed-in person. */
 interface AgentAccess {
@@ -339,12 +354,13 @@ interface AgentCatalogRpcResult {
     } | null;
     count?: number | null;
 }
-/** What the New session form needs about one agent. */
+/** What a picker needs about one agent — the LIGHT read (no skills, no tools). */
 interface AgentDetails {
     agentId: string;
     name: string;
     /** Variable declarations as authored (camelCase). */
     variables: Record<string, JsonValue>[];
+    /** Newest first. */
     versions: {
         id: string;
         versionNumber: number;
@@ -352,12 +368,15 @@ interface AgentDetails {
     }[];
     /** The version "Latest" resolves to right now. */
     latestVersionNumber: number | null;
+    latestVersionId: string | null;
 }
 interface TakeoverInput {
     provider: CodingProvider;
     providerSessionId: string;
     cwd: string;
     title?: string | undefined;
+    /** Continue the chat WITH an AI Matrx agent ("Continue with agent"). */
+    agent?: AgentSelection | null | undefined;
 }
 interface SendResult {
     session: CodingSession;
@@ -434,6 +453,12 @@ interface CodingSessionsApi {
     agentCatalogRpc(request: AgentCatalogRpcRequest): Promise<AgentCatalogRpcResult>;
     /** An agent's variables and saved versions, for the New session form. */
     agentDetails(agentId: string): Promise<AgentDetails>;
+    /**
+     * Load a different agent into a session from its next message on (or
+     * remove it, with `null`). Claude reads it every turn; Codex is told in the
+     * next prompt.
+     */
+    setAgent(sessionId: string, agent: AgentSelection | null): Promise<CodingSession>;
 }
 type RawTranscript = {
     available: true;
@@ -588,7 +613,7 @@ declare class CodingSessionsClient {
     transcript(sessionId: string): SessionTranscript;
     readPreview(provider: CodingProvider, providerSessionId: string, maxBytes?: number): Promise<PreviewState>;
     start(input: StartInput): Promise<SendResult>;
-    takeover(session: DiscoveredSession): Promise<CodingSession>;
+    takeover(session: DiscoveredSession, agent?: AgentSelection | null): Promise<CodingSession>;
     send(sessionId: string, prompt: string): Promise<SendResult>;
     stop(runId: string): Promise<RunRecord | null>;
 }

package/dist/react/index.js

@@ -17,15 +17,15 @@ import {
 import { createExternalThreadSource as createExternalThreadSource2 } from "@ai-matrx/chat/external-store";
 import {
   Button as Button3,
-  Dialog,
-  DropdownMenu as DropdownMenu2,
-  DropdownMenuContent as DropdownMenuContent2,
-  DropdownMenuTrigger as DropdownMenuTrigger2,
-  DialogContent,
+  Dialog as Dialog2,
+  DropdownMenu as DropdownMenu3,
+  DropdownMenuContent as DropdownMenuContent3,
+  DropdownMenuTrigger as DropdownMenuTrigger3,
+  DialogContent as DialogContent2,
   DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
+  DialogFooter as DialogFooter2,
+  DialogHeader as DialogHeader2,
+  DialogTitle as DialogTitle2,
   Input as Input2,
   Textarea as Textarea2,
   cn as cn5
@@ -909,6 +909,17 @@ import { AgentCatalogProvider, AgentListDropdown } from "@ai-matrx/agents/catalo
 import { humanizeContextKey } from "@ai-matrx/agents/context";
 import {
   Button,
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem as DropdownMenuItem2,
+  DropdownMenuLabel,
+  DropdownMenuSeparator as DropdownMenuSeparator2,
+  DropdownMenuTrigger,
   Input,
   Select,
   SelectContent,
@@ -1093,30 +1104,167 @@ var PART_LABEL = {
   skills: "Skills",
   tools: "Tools"
 };
-function AgentChip({ agent }) {
+function agentChipText(agent) {
   const parts = agent.loaded.map(
     (part) => part.part === "instructions" ? `${PART_LABEL.instructions} ${part.loaded === 1 ? "\u2713" : "\u2014"}` : `${PART_LABEL[part.part]} ${part.loaded}/${part.total}`
   );
-  const missing = agent.unavailable.slice(0, 6).map((u) => `${u.name}: ${u.reason}`);
-  const more = agent.unavailable.length > 6 ? [`+${agent.unavailable.length - 6} more`] : [];
-  const complete = agent.loaded.every((part) => part.loaded === part.total);
-  return /* @__PURE__ */ jsxs5(
-    "span",
-    {
-      className: cn3("cs-agent-chip", !complete && "cs-agent-chip--partial"),
-      title: missing.length ? [...missing, ...more].join("\n") : "Everything loaded",
-      "data-testid": "cs-agent-chip",
-      children: [
-        /* @__PURE__ */ jsxs5("span", { className: "font-medium text-foreground", children: [
-          agent.name,
-          agent.versionNumber !== null ? ` v${agent.versionNumber}` : ""
-        ] }),
-        " ",
-        "\xB7 ",
-        parts.join(" \xB7 ")
-      ]
+  return `${agent.name}${agent.versionNumber !== null ? ` v${agent.versionNumber}` : ""} \xB7 ${parts.join(" \xB7 ")}`;
+}
+function AgentMenu(props) {
+  const { agent } = props;
+  const show = useToastShow();
+  const [open, setOpen] = useState4(false);
+  const [choosing, setChoosing] = useState4(false);
+  const [latest, setLatest] = useState4(null);
+  const [access, setAccess] = useState4(null);
+  useEffect2(() => {
+    if (!open) return;
+    let alive = true;
+    void props.transport.call("agentAccess").then((next) => alive && setAccess(next)).catch(() => void 0);
+    if (agent) {
+      props.transport.call("agentDetails", agent.agentId).then((d) => {
+        if (alive && d.latestVersionId && d.latestVersionNumber !== null) setLatest({ id: d.latestVersionId, number: d.latestVersionNumber });
+      }).catch(() => void 0);
     }
-  );
+    return () => {
+      alive = false;
+    };
+  }, [open, agent, props.transport]);
+  const apply = async (selection, done) => {
+    try {
+      await props.transport.call("setAgent", props.sessionId, selection);
+      show(done);
+      props.onChange();
+    } catch (error) {
+      show(`That didn't change: ${error instanceof Error ? error.message : String(error)}`);
+    }
+  };
+  const behind = agent && latest && agent.versionNumber !== null && latest.number > agent.versionNumber ? latest : null;
+  const complete = agent ? agent.loaded.every((part) => part.loaded === part.total) : true;
+  const signedIn = access?.signedIn ?? false;
+  return /* @__PURE__ */ jsxs5(Fragment3, { children: [
+    /* @__PURE__ */ jsxs5(DropdownMenu, { open, onOpenChange: setOpen, children: [
+      /* @__PURE__ */ jsx5(DropdownMenuTrigger, { asChild: true, children: /* @__PURE__ */ jsxs5(
+        "button",
+        {
+          type: "button",
+          className: cn3("cs-agent-chip", agent ? "cs-agent-chip--set" : "cs-agent-chip--none", !complete && "cs-agent-chip--partial"),
+          "data-testid": "cs-agent-chip",
+          "aria-label": agent ? `AI Matrx agent: ${agent.name}` : "Add an AI Matrx agent",
+          children: [
+            agent ? agentChipText(agent) : "No agent",
+            behind ? /* @__PURE__ */ jsx5("span", { className: "cs-agent-chip-dot", "aria-label": "Update available" }) : null,
+            /* @__PURE__ */ jsx5(ChevronDownIcon, { size: 12, className: "ml-1 inline shrink-0" })
+          ]
+        }
+      ) }),
+      /* @__PURE__ */ jsxs5(DropdownMenuContent, { align: "end", className: "w-[320px]", children: [
+        agent ? /* @__PURE__ */ jsxs5(Fragment3, { children: [
+          /* @__PURE__ */ jsxs5(DropdownMenuLabel, { className: "truncate", children: [
+            agent.name,
+            agent.versionNumber !== null ? ` \xB7 v${agent.versionNumber}` : ""
+          ] }),
+          /* @__PURE__ */ jsxs5("div", { className: "cs-agent-parts", children: [
+            agent.blockDue ? /* @__PURE__ */ jsx5("p", { className: "text-[12px] text-muted-foreground", children: "Sent with your next message" }) : null,
+            /* @__PURE__ */ jsx5(AgentPartList, { title: "Skills", items: agent.skills ?? [] }),
+            /* @__PURE__ */ jsx5(AgentPartList, { title: "Tools", items: agent.tools ?? [] }),
+            agent.unavailable.length > 0 ? /* @__PURE__ */ jsx5(
+              AgentPartList,
+              {
+                title: "Not loaded",
+                items: agent.unavailable.map((u) => `${u.name} \u2014 ${u.reason}`)
+              }
+            ) : null
+          ] }),
+          /* @__PURE__ */ jsx5(DropdownMenuSeparator2, {})
+        ] }) : null,
+        signedIn ? /* @__PURE__ */ jsxs5(Fragment3, { children: [
+          behind && agent ? /* @__PURE__ */ jsxs5(
+            DropdownMenuItem2,
+            {
+              onSelect: () => void apply(
+                { agentId: agent.agentId, versionId: behind.id, variables: agent.variables ?? {} },
+                `The next message uses ${agent.name} v${behind.number}.`
+              ),
+              children: [
+                "Update to v",
+                behind.number
+              ]
+            }
+          ) : null,
+          /* @__PURE__ */ jsx5(DropdownMenuItem2, { onSelect: () => setChoosing(true), children: agent ? "Change agent\u2026" : "Choose agent\u2026" }),
+          agent ? /* @__PURE__ */ jsx5(DropdownMenuItem2, { onSelect: () => void apply(null, "The next message runs without an agent."), children: "Remove agent" }) : null
+        ] }) : access ? /* @__PURE__ */ jsx5("p", { className: "px-2 py-1.5 text-[12px] text-muted-foreground", children: SIGNED_OUT_AGENTS }) : null
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx5(
+      ChooseAgentDialog,
+      {
+        transport: props.transport,
+        open: choosing,
+        onOpenChange: setChoosing,
+        title: agent ? "Change agent" : "Choose an agent",
+        action: "Use this agent",
+        onConfirm: (selection) => apply(selection, "The next message uses the new agent.")
+      }
+    )
+  ] });
+}
+function AgentPartList({ title, items }) {
+  return /* @__PURE__ */ jsxs5("div", { children: [
+    /* @__PURE__ */ jsxs5("p", { className: "text-[11.5px] font-medium text-muted-foreground", children: [
+      title,
+      " \xB7 ",
+      items.length
+    ] }),
+    items.length > 0 ? /* @__PURE__ */ jsx5("ul", { className: "cs-agent-part-list", children: items.map((item) => /* @__PURE__ */ jsx5("li", { className: "truncate", title: item, children: item }, item)) }) : null
+  ] });
+}
+function ChooseAgentDialog(props) {
+  const [value, setValue] = useState4(null);
+  const [details, setDetails] = useState4(null);
+  const [missing, setMissing] = useState4(null);
+  const [busy, setBusy] = useState4(false);
+  useEffect2(() => {
+    if (props.open) {
+      setValue(null);
+      setMissing(null);
+    }
+  }, [props.open]);
+  const confirm = async () => {
+    if (!value) return;
+    const gap = missingRequiredVariable(details, value);
+    setMissing(gap);
+    if (gap) return;
+    setBusy(true);
+    try {
+      await props.onConfirm(value);
+      props.onOpenChange(false);
+    } finally {
+      setBusy(false);
+    }
+  };
+  return /* @__PURE__ */ jsx5(Dialog, { open: props.open, onOpenChange: props.onOpenChange, children: /* @__PURE__ */ jsxs5(DialogContent, { className: "max-w-[480px]", children: [
+    /* @__PURE__ */ jsx5(DialogHeader, { children: /* @__PURE__ */ jsx5(DialogTitle, { children: props.title }) }),
+    /* @__PURE__ */ jsx5(
+      AgentField,
+      {
+        transport: props.transport,
+        open: props.open,
+        value,
+        onChange: (next) => {
+          setValue(next);
+          setMissing(null);
+        },
+        missing,
+        onDetails: setDetails
+      }
+    ),
+    /* @__PURE__ */ jsxs5(DialogFooter, { children: [
+      /* @__PURE__ */ jsx5(Button, { type: "button", variant: "ghost", onClick: () => props.onOpenChange(false), children: "Cancel" }),
+      /* @__PURE__ */ jsx5(Button, { type: "button", disabled: !value || busy, onClick: () => void confirm(), children: props.action })
+    ] })
+  ] }) });
 }
 
 // src/react/sidebar.tsx
@@ -1126,14 +1274,14 @@ import {
   ContextMenu,
   ContextMenuContent,
   ContextMenuTrigger,
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem as DropdownMenuItem2,
-  DropdownMenuLabel,
+  DropdownMenu as DropdownMenu2,
+  DropdownMenuContent as DropdownMenuContent2,
+  DropdownMenuItem as DropdownMenuItem3,
+  DropdownMenuLabel as DropdownMenuLabel2,
   DropdownMenuRadioGroup,
   DropdownMenuRadioItem,
-  DropdownMenuSeparator as DropdownMenuSeparator2,
-  DropdownMenuTrigger,
+  DropdownMenuSeparator as DropdownMenuSeparator3,
+  DropdownMenuTrigger as DropdownMenuTrigger2,
   cn as cn4
 } from "@ai-matrx/design-system";
 import { Fragment as Fragment4, jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
@@ -1240,9 +1388,9 @@ function Row(props) {
           ] }),
           renaming ? null : /* @__PURE__ */ jsxs6("span", { className: "cs-row__actions", children: [
             props.takeover,
-            /* @__PURE__ */ jsxs6(DropdownMenu, { open: menuOpen, onOpenChange: setMenuOpen, children: [
-              /* @__PURE__ */ jsx6(DropdownMenuTrigger, { asChild: true, children: /* @__PURE__ */ jsx6("button", { type: "button", className: "cs-icon-button", "aria-label": `More for ${entry.title}`, title: "More", children: /* @__PURE__ */ jsx6(MoreIcon, { size: 15 }) }) }),
-              /* @__PURE__ */ jsx6(DropdownMenuContent, { align: "start", className: "w-60", onCloseAutoFocus: (e) => e.preventDefault(), children: /* @__PURE__ */ jsx6(ChatMenuItems, { entry, variant: "dropdown", onRename: () => setRenaming(true) }) })
+            /* @__PURE__ */ jsxs6(DropdownMenu2, { open: menuOpen, onOpenChange: setMenuOpen, children: [
+              /* @__PURE__ */ jsx6(DropdownMenuTrigger2, { asChild: true, children: /* @__PURE__ */ jsx6("button", { type: "button", className: "cs-icon-button", "aria-label": `More for ${entry.title}`, title: "More", children: /* @__PURE__ */ jsx6(MoreIcon, { size: 15 }) }) }),
+              /* @__PURE__ */ jsx6(DropdownMenuContent2, { align: "start", className: "w-60", onCloseAutoFocus: (e) => e.preventDefault(), children: /* @__PURE__ */ jsx6(ChatMenuItems, { entry, variant: "dropdown", onRename: () => setRenaming(true) }) })
             ] })
           ] })
         ]
@@ -1480,16 +1628,16 @@ function Sidebar(props) {
       SectionLabel,
       {
         action: /* @__PURE__ */ jsxs6("span", { className: "flex items-center gap-0.5", children: [
-          /* @__PURE__ */ jsxs6(DropdownMenu, { children: [
-            /* @__PURE__ */ jsx6(DropdownMenuTrigger, { asChild: true, children: /* @__PURE__ */ jsx6("button", { type: "button", className: "cs-icon-button cs-icon-button--text", "aria-label": "How to list your other chats", children: groupMode === "date" ? "By date" : "By folder" }) }),
-            /* @__PURE__ */ jsxs6(DropdownMenuContent, { align: "end", className: "w-52", children: [
-              /* @__PURE__ */ jsx6(DropdownMenuLabel, { children: "Group your other chats" }),
+          /* @__PURE__ */ jsxs6(DropdownMenu2, { children: [
+            /* @__PURE__ */ jsx6(DropdownMenuTrigger2, { asChild: true, children: /* @__PURE__ */ jsx6("button", { type: "button", className: "cs-icon-button cs-icon-button--text", "aria-label": "How to list your other chats", children: groupMode === "date" ? "By date" : "By folder" }) }),
+            /* @__PURE__ */ jsxs6(DropdownMenuContent2, { align: "end", className: "w-52", children: [
+              /* @__PURE__ */ jsx6(DropdownMenuLabel2, { children: "Group your other chats" }),
               /* @__PURE__ */ jsxs6(DropdownMenuRadioGroup, { value: groupMode, onValueChange: (v) => setMode(v), children: [
                 /* @__PURE__ */ jsx6(DropdownMenuRadioItem, { value: "date", children: "By date" }),
                 /* @__PURE__ */ jsx6(DropdownMenuRadioItem, { value: "folder", children: "By folder" })
               ] }),
-              /* @__PURE__ */ jsx6(DropdownMenuSeparator2, {}),
-              /* @__PURE__ */ jsx6(DropdownMenuItem2, { onSelect: () => setShowHidden((v) => !v), children: showHidden ? "Leave hidden chats out" : `Show hidden chats${hiddenCount ? ` (${hiddenCount})` : ""}` })
+              /* @__PURE__ */ jsx6(DropdownMenuSeparator3, {}),
+              /* @__PURE__ */ jsx6(DropdownMenuItem3, { onSelect: () => setShowHidden((v) => !v), children: showHidden ? "Leave hidden chats out" : `Show hidden chats${hiddenCount ? ` (${hiddenCount})` : ""}` })
             ] })
           ] }),
           /* @__PURE__ */ jsx6(
@@ -2138,12 +2286,13 @@ var CodingSessionsClient = class {
   start(input) {
     return this.transport.call("start", input);
   }
-  takeover(session) {
+  takeover(session, agent) {
     return this.transport.call("takeover", {
       provider: session.provider,
       providerSessionId: session.providerSessionId,
       cwd: session.cwd ?? "",
-      title: session.title
+      title: session.title,
+      ...agent ? { agent } : {}
     });
   }
   send(sessionId, prompt) {
@@ -2370,9 +2519,9 @@ function useSessionUsage(sessionId, lastRunKey) {
   return usage;
 }
 function HeaderMenu(props) {
-  return /* @__PURE__ */ jsxs7(DropdownMenu2, { children: [
-    /* @__PURE__ */ jsx7(DropdownMenuTrigger2, { asChild: true, children: /* @__PURE__ */ jsx7("button", { type: "button", className: "cs-icon-button", "aria-label": "More for this chat", title: "More", children: /* @__PURE__ */ jsx7(MoreIcon, { size: 16 }) }) }),
-    /* @__PURE__ */ jsx7(DropdownMenuContent2, { align: "end", className: "w-64", onCloseAutoFocus: (e) => e.preventDefault(), children: /* @__PURE__ */ jsx7(ChatMenuItems, { entry: props.entry, variant: "dropdown", onRename: props.onRename }) })
+  return /* @__PURE__ */ jsxs7(DropdownMenu3, { children: [
+    /* @__PURE__ */ jsx7(DropdownMenuTrigger3, { asChild: true, children: /* @__PURE__ */ jsx7("button", { type: "button", className: "cs-icon-button", "aria-label": "More for this chat", title: "More", children: /* @__PURE__ */ jsx7(MoreIcon, { size: 16 }) }) }),
+    /* @__PURE__ */ jsx7(DropdownMenuContent3, { align: "end", className: "w-64", onCloseAutoFocus: (e) => e.preventDefault(), children: /* @__PURE__ */ jsx7(ChatMenuItems, { entry: props.entry, variant: "dropdown", onRename: props.onRename }) })
   ] });
 }
 function HeaderTitle(props) {
@@ -2502,7 +2651,7 @@ function SessionView({ session, changesOpen, setChangesOpen }) {
             ] }) : null
           ] })
         ] }),
-        session.agent ? /* @__PURE__ */ jsx7(AgentChip, { agent: session.agent }) : null,
+        /* @__PURE__ */ jsx7(AgentMenu, { transport: client.transport, sessionId: session.id, agent: session.agent ?? null, onChange: () => void 0 }),
         /* @__PURE__ */ jsxs7(
           "button",
           {
@@ -2675,13 +2824,14 @@ function DiscoveredView(props) {
     if (elsewhere) setConfirming(true);
     else void takeover();
   };
-  const takeover = async () => {
+  const [choosingAgent, setChoosingAgent] = useState6(false);
+  const takeover = async (agent) => {
     if (!d) return;
     setConfirming(false);
     setBusy(true);
     setError(null);
     try {
-      const taken = await client.takeover(d);
+      const taken = await client.takeover(d, agent);
       props.onTakenOver(taken.id);
     } catch (e) {
       setError(e instanceof Error ? e.message : String(e));
@@ -2737,6 +2887,18 @@ function DiscoveredView(props) {
             ]
           }
         ) : null,
+        d?.cwd && !elsewhere ? /* @__PURE__ */ jsx7(Button3, { size: "sm", variant: "outline", onClick: () => setChoosingAgent(true), disabled: busy, children: "Continue with agent\u2026" }) : null,
+        /* @__PURE__ */ jsx7(
+          ChooseAgentDialog,
+          {
+            transport: client.transport,
+            open: choosingAgent,
+            onOpenChange: setChoosingAgent,
+            title: "Continue with an agent",
+            action: "Take over with this agent",
+            onConfirm: (agent) => takeover(agent)
+          }
+        ),
         d ? /* @__PURE__ */ jsx7(HeaderMenu, { entry, onRename: () => setRenaming(true) }) : null
       ] }),
       elsewhere ? /* @__PURE__ */ jsxs7("div", { role: "status", className: "flex items-start gap-2 border-b border-warning/40 bg-warning/10 px-5 py-2.5 text-[13px]", children: [
@@ -2746,9 +2908,9 @@ function DiscoveredView(props) {
           " Taking it over now would put two agents on the same chat, and they could overwrite each other's work. Finish or stop it there first if you can. This preview follows it as it runs."
         ] })
       ] }) : null,
-      /* @__PURE__ */ jsx7(Dialog, { open: confirming, onOpenChange: setConfirming, children: /* @__PURE__ */ jsxs7(DialogContent, { className: "max-w-[460px]", children: [
-        /* @__PURE__ */ jsxs7(DialogHeader, { children: [
-          /* @__PURE__ */ jsxs7(DialogTitle, { children: [
+      /* @__PURE__ */ jsx7(Dialog2, { open: confirming, onOpenChange: setConfirming, children: /* @__PURE__ */ jsxs7(DialogContent2, { className: "max-w-[460px]", children: [
+        /* @__PURE__ */ jsxs7(DialogHeader2, { children: [
+          /* @__PURE__ */ jsxs7(DialogTitle2, { children: [
             "This chat is running right now in ",
             PROVIDER_LABEL[props.provider]
           ] }),
@@ -2757,7 +2919,7 @@ function DiscoveredView(props) {
             " If you take it over, two agents will work in the same conversation at once and may overwrite each other's changes."
           ] })
         ] }),
-        /* @__PURE__ */ jsxs7(DialogFooter, { children: [
+        /* @__PURE__ */ jsxs7(DialogFooter2, { children: [
           /* @__PURE__ */ jsx7(Button3, { variant: "ghost", onClick: () => setConfirming(false), children: "Cancel" }),
           /* @__PURE__ */ jsx7(Button3, { variant: "destructive", onClick: () => void takeover(), children: "Take over anyway" })
         ] })
@@ -2937,9 +3099,9 @@ function NewSessionDialog(props) {
     if (field === "folder") delete next.createFolder;
     return next;
   });
-  return /* @__PURE__ */ jsx7(Dialog, { open: props.open, onOpenChange: props.onOpenChange, children: /* @__PURE__ */ jsxs7(DialogContent, { className: "max-w-[560px]", children: [
-    /* @__PURE__ */ jsxs7(DialogHeader, { children: [
-      /* @__PURE__ */ jsx7(DialogTitle, { children: "New coding session" }),
+  return /* @__PURE__ */ jsx7(Dialog2, { open: props.open, onOpenChange: props.onOpenChange, children: /* @__PURE__ */ jsxs7(DialogContent2, { className: "max-w-[560px]", children: [
+    /* @__PURE__ */ jsxs7(DialogHeader2, { children: [
+      /* @__PURE__ */ jsx7(DialogTitle2, { children: "New coding session" }),
       /* @__PURE__ */ jsxs7(DialogDescription, { children: [
         "Runs on your own ",
         provider === "claude" ? "Claude" : "ChatGPT",
@@ -3083,7 +3245,7 @@ function NewSessionDialog(props) {
             ] }),
             problem ? /* @__PURE__ */ jsx7(FieldError, { id: "cs-err-start", children: problem }) : null
           ] }),
-          /* @__PURE__ */ jsxs7(DialogFooter, { className: "pt-4", children: [
+          /* @__PURE__ */ jsxs7(DialogFooter2, { className: "pt-4", children: [
             /* @__PURE__ */ jsx7(Button3, { type: "button", variant: "ghost", onClick: () => props.onOpenChange(false), children: "Cancel" }),
             /* @__PURE__ */ jsxs7(Button3, { type: "submit", disabled: starting, className: "gap-1.5", children: [
               starting ? /* @__PURE__ */ jsx7(SpinnerIcon, { size: 14 }) : null,
@@ -3252,9 +3414,9 @@ var SHORTCUTS = [
   { keys: "\u2318/", what: "These shortcuts" }
 ];
 function ShortcutsDialog(props) {
-  return /* @__PURE__ */ jsx7(Dialog, { open: props.open, onOpenChange: props.onOpenChange, children: /* @__PURE__ */ jsxs7(DialogContent, { className: "max-w-[420px]", children: [
-    /* @__PURE__ */ jsxs7(DialogHeader, { children: [
-      /* @__PURE__ */ jsx7(DialogTitle, { children: "Keyboard shortcuts" }),
+  return /* @__PURE__ */ jsx7(Dialog2, { open: props.open, onOpenChange: props.onOpenChange, children: /* @__PURE__ */ jsxs7(DialogContent2, { className: "max-w-[420px]", children: [
+    /* @__PURE__ */ jsxs7(DialogHeader2, { children: [
+      /* @__PURE__ */ jsx7(DialogTitle2, { children: "Keyboard shortcuts" }),
       /* @__PURE__ */ jsx7(DialogDescription, { children: "Ctrl works in place of \u2318 on Windows and Linux." })
     ] }),
     /* @__PURE__ */ jsx7("dl", { className: "divide-y divide-border text-[13px]", children: SHORTCUTS.map((s) => /* @__PURE__ */ jsxs7("div", { className: "flex items-center justify-between gap-4 py-2", children: [