@agent-native/core 0.80.4 → 0.80.6

package/corpus/core/src/brand-kit/fig/index.ts

@@ -1,10 +1,4 @@
 import type { BrandKitData, BrandKitDefaults } from "../types.js";
-import { decodeFig } from "./decode.js";
-import { extractDesignSystemFromFig } from "./extract-design-system.js";
-
-export * from "./decode.js";
-export * from "./extract-design-system.js";
-export * from "./fig-to-html.js";
 
 export interface FigBrandKitPreview {
   gradients: string[];
@@ -25,6 +19,12 @@ export interface FigBrandKitExtraction {
 
 export const MAX_FIG_THUMBNAIL_BYTES = 512 * 1024;
 
+function unsupportedFigImport(): never {
+  throw new Error(
+    "Local .fig design-system extraction has moved to Builder indexing. Connect Builder and use the design system indexing flow instead.",
+  );
+}
+
 export function looksLikeFigFile(data: Uint8Array): boolean {
   const isZip =
     data[0] === 0x50 &&
@@ -42,39 +42,19 @@ export function figThumbnailDataUrl(thumbnail: Buffer | null): string | null {
 }
 
 export function extractFigBrandKit(
-  input: Buffer | Uint8Array,
+  _input: Buffer | Uint8Array,
 ): FigBrandKitExtraction {
-  const decoded = decodeFig(Buffer.from(input));
-  if (!decoded.document) {
-    throw new Error(
-      "Decoded the file but found no document. It may be a partial or corrupt export.",
-    );
-  }
+  return unsupportedFigImport();
+}
 
-  const extracted = extractDesignSystemFromFig(decoded.document);
-  const {
-    customInstructions,
-    gradients,
-    palette,
-    namedColors,
-    nodeCount,
-    ...data
-  } = extracted;
+export function decodeFig(_input: Buffer | Uint8Array): never {
+  return unsupportedFigImport();
+}
 
-  const thumbnailDataUrl = figThumbnailDataUrl(decoded.thumbnail);
+export function extractDesignSystemFromFig(_document: unknown): never {
+  return unsupportedFigImport();
+}
 
-  return {
-    format: decoded.format,
-    version: decoded.version ?? null,
-    data,
-    customInstructions: customInstructions ?? "",
-    preview: {
-      gradients: gradients ?? [],
-      palette: palette ?? [],
-      namedColors: namedColors ?? {},
-      thumbnailDataUrl,
-      nodeCount: nodeCount ?? 0,
-      imageCount: decoded.images.length,
-    },
-  };
+export function figToHtml(_node: unknown): never {
+  return unsupportedFigImport();
 }

package/corpus/core/src/cli/create.ts

@@ -1054,6 +1054,7 @@ function postProcessStandalone(
       sections.overrides = {
         '"@assistant-ui/store"': '">=0.2.9 <0.2.14"',
         '"@assistant-ui/tap"': '"^0.5.14"',
+        nf3: '"0.3.17"',
       };
     }
     let updated = mergeWorkspaceYamlSections(existing, sections);

package/corpus/core/src/cli/index.ts

@@ -927,7 +927,7 @@ Usage:
                                 reinstalling app skills/connectors.
   agent-native app-skill <cmd>  Install, launch, or package app-backed skills.
                                 cmds: ensure | launch | pack
-  agent-native skills add assets|content|design-exploration|visual-plan|visual-recap|context-xray
+  agent-native skills add assets|content|design-exploration|visual-edit|visual-plan|visual-recap|context-xray
                                 Install the skill instructions, register the MCP
                                 connector, AND authenticate it in one step.
                                 --no-connect skips auth (run 'connect' later);

package/corpus/core/src/cli/mcp-config-writers.ts

@@ -392,8 +392,124 @@ function codexMcpHeader(name: string): string {
   return `[mcp_servers.${tomlQuote(name)}]`;
 }
 
-function legacyCodexMcpHeader(name: string): string | null {
-  return /^[A-Za-z0-9_-]+$/.test(name) ? `[mcp_servers.${name}]` : null;
+/**
+ * Parse a TOML table-header line such as `[mcp_servers."plan".http_headers]`
+ * or `[mcp_servers.plan] # local note` into its decoded dotted-key components
+ * (`["mcp_servers", "plan", "http_headers"]`). Returns `null` when the line is
+ * not a single `[table]` header — blank lines, key/value pairs, comments,
+ * invalid trailing content, and `[[array-of-tables]]` headers all return `null`,
+ * so the result doubles as a reliable "is this line a table boundary?" check.
+ *
+ * Handles bare keys (`A-Za-z0-9_-`) and quoted keys (basic `"..."` with `\`
+ * escapes, and literal `'...'`), tolerating whitespace around the dot
+ * separators per the TOML spec. Quoted-key escape handling mirrors the inverse
+ * of `tomlQuote` (`\"` → `"`, `\\` → `\`).
+ */
+function parseTomlTableHeader(line: string): string[] | null {
+  const trimmed = line.trim();
+  if (trimmed.length < 2 || trimmed[0] !== "[") return null;
+  // `[[array-of-tables]]` is a different construct — leave it untouched.
+  if (trimmed[1] === "[") return null;
+
+  let quote: '"' | "'" | null = null;
+  let escaped = false;
+  let closeIndex = -1;
+  for (let i = 1; i < trimmed.length; i++) {
+    const ch = trimmed[i];
+    if (quote === '"') {
+      if (escaped) {
+        escaped = false;
+        continue;
+      }
+      if (ch === "\\") {
+        escaped = true;
+        continue;
+      }
+      if (ch === '"') quote = null;
+      continue;
+    }
+    if (quote === "'") {
+      if (ch === "'") quote = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      continue;
+    }
+    if (ch === "]") {
+      closeIndex = i;
+      break;
+    }
+  }
+  if (closeIndex < 0) return null;
+  const trailing = trimmed.slice(closeIndex + 1).trim();
+  if (trailing && !trailing.startsWith("#")) return null;
+
+  const inner = trimmed.slice(1, closeIndex);
+  const keys: string[] = [];
+  const isWs = (c: string) => c === " " || c === "\t";
+  const isBare = (c: string) => /[A-Za-z0-9_-]/.test(c);
+  let i = 0;
+  let expectKey = true;
+  while (i < inner.length) {
+    while (i < inner.length && isWs(inner[i])) i++;
+    if (i >= inner.length) break;
+    const ch = inner[i];
+    if (ch === ".") {
+      if (expectKey) return null; // leading or doubled dot
+      expectKey = true;
+      i++;
+      continue;
+    }
+    if (!expectKey) return null; // two keys with no dot between them
+    if (ch === '"' || ch === "'") {
+      const quote = ch;
+      i++;
+      let key = "";
+      while (i < inner.length && inner[i] !== quote) {
+        if (quote === '"' && inner[i] === "\\" && i + 1 < inner.length) {
+          const next = inner[i + 1];
+          key += next === '"' ? '"' : next === "\\" ? "\\" : `\\${next}`;
+          i += 2;
+          continue;
+        }
+        key += inner[i];
+        i++;
+      }
+      if (i >= inner.length) return null; // unterminated quote
+      i++; // consume the closing quote
+      keys.push(key);
+      expectKey = false;
+    } else if (isBare(ch)) {
+      let key = "";
+      while (i < inner.length && isBare(inner[i])) {
+        key += inner[i];
+        i++;
+      }
+      keys.push(key);
+      expectKey = false;
+    } else {
+      return null; // unexpected character — not a table header
+    }
+  }
+  if (expectKey) return null; // empty header or trailing dot
+  return keys.length ? keys : null;
+}
+
+/**
+ * The MCP server name a TOML table header belongs to, or `undefined` when the
+ * header is not under `[mcp_servers.*]`. The server's own table
+ * (`[mcp_servers.<name>]`) AND every sub-table of it
+ * (`[mcp_servers.<name>.http_headers]`, `[mcp_servers.<name>.env]`, …) resolve
+ * to the same `<name>`, so callers can treat a server and all its sub-tables as
+ * one removable unit. This is what prevents a re-install from orphaning a stale
+ * `[mcp_servers.<name>.http_headers]` sub-table that would then collide with the
+ * freshly written inline `http_headers` (a TOML duplicate-key error).
+ */
+function codexServerNameOfHeader(line: string): string | undefined {
+  const keys = parseTomlTableHeader(line);
+  if (!keys || keys.length < 2 || keys[0] !== "mcp_servers") return undefined;
+  return keys[1];
 }
 
 /** Build a `[mcp_servers.<name>]` block for an HTTP-type MCP server. */
@@ -439,11 +555,16 @@ export function buildCodexLocalBlock(
 }
 
 /**
- * Replace (or append) the `[mcp_servers.<name>]` block in a TOML file
- * without disturbing other content. A block is the header line plus every
- * following line until the next top-level `[` table header or EOF. Pass
- * `block === null` to remove the block. Identical algorithm to `mcp.ts`'s
- * `writeCodexBlock` so the two never diverge.
+ * Replace (or append) the entire `[mcp_servers.<name>]` footprint in a TOML
+ * file without disturbing other content. The footprint is the server's own
+ * table AND every sub-table of it (`[mcp_servers.<name>.http_headers]`,
+ * `[mcp_servers.<name>.env]`, …), each spanning its header line plus every
+ * following line until the next table header or EOF. Removing the whole
+ * footprint — wherever the pieces sit in the file — is what keeps a re-install
+ * from leaving a stale sub-table that collides with the freshly written inline
+ * block (a TOML duplicate-key error). Matches both the canonical quoted header
+ * and the legacy bare header. Pass `block === null` to remove the footprint.
+ * Identical algorithm to `mcp.ts`'s `writeCodexBlock` so the two never diverge.
  */
 export function writeCodexBlock(
   file: string,
@@ -457,22 +578,18 @@ export function writeCodexBlock(
     content = "";
   }
 
-  const headers = new Set(
-    [codexMcpHeader(name), legacyCodexMcpHeader(name)].filter(
-      Boolean,
-    ) as string[],
-  );
   const lines = content.split(/\r?\n/);
   const out: string[] = [];
   let i = 0;
   let removed = false;
   while (i < lines.length) {
     const line = lines[i];
-    if (headers.has(line.trim())) {
-      // Skip this block entirely (header + body until next table header).
+    if (codexServerNameOfHeader(line) === name) {
+      // Skip this table and its body (until the next table header), covering
+      // the server table itself and any of its sub-tables.
       removed = true;
       i++;
-      while (i < lines.length && !/^\s*\[/.test(lines[i])) i++;
+      while (i < lines.length && parseTomlTableHeader(lines[i]) === null) i++;
       continue;
     }
     out.push(line);
@@ -496,12 +613,9 @@ export function writeCodexBlock(
 export function codexHasBlock(file: string, name: string): boolean {
   try {
     const content = fs.readFileSync(file, "utf-8");
-    const headers = new Set(
-      [codexMcpHeader(name), legacyCodexMcpHeader(name)].filter(
-        Boolean,
-      ) as string[],
-    );
-    return content.split(/\r?\n/).some((line) => headers.has(line.trim()));
+    return content
+      .split(/\r?\n/)
+      .some((line) => codexServerNameOfHeader(line) === name);
   } catch {
     return false;
   }
@@ -620,8 +734,11 @@ export function removeJsonSameUrlDuplicates(
 
 /**
  * After writing the canonical `keepName` Codex block, remove any OTHER
- * `[mcp_servers.*]` blocks in the same TOML file whose `url =` line
- * normalises to the same value as `mcpUrl`. Returns removed entry names.
+ * `[mcp_servers.*]` servers in the same TOML file whose `url =` line normalises
+ * to the same value as `mcpUrl`. A server's entire footprint is removed — its
+ * own table AND any sub-tables (`.http_headers`, `.env`, …), even when they are
+ * not contiguous — so cleanup never leaves an orphaned sub-table behind.
+ * Returns removed entry names in first-seen order.
  */
 export function removeCodexSameUrlDuplicates(
   file: string,
@@ -638,52 +755,71 @@ export function removeCodexSameUrlDuplicates(
   if (!targetCanonical) return [];
 
   const lines = content.split(/\r?\n/);
-  const out: string[] = [];
-  const removed: string[] = [];
+
+  // Pass 1: map each server name to the canonical URL declared on its own
+  // table, preserving first-seen order. Sub-tables don't carry the URL, so they
+  // only register the name.
+  const serverUrls = new Map<string, string | undefined>();
   let i = 0;
   while (i < lines.length) {
-    const line = lines[i];
-    const trimmed = line.trim();
-    const quoted = trimmed.match(/^\[mcp_servers\."((?:\\.|[^"])*)"\]$/);
-    const bare = trimmed.match(/^\[mcp_servers\.([A-Za-z0-9_-]+)\]$/);
-    const serverName = quoted
-      ? quoted[1].replace(/\\"/g, '"').replace(/\\\\/g, "\\")
-      : bare?.[1];
-    if (serverName !== undefined && serverName !== keepName) {
-      // Collect the block
-      const block: string[] = [line];
+    const keys = parseTomlTableHeader(lines[i]);
+    const name =
+      keys && keys.length >= 2 && keys[0] === "mcp_servers"
+        ? keys[1]
+        : undefined;
+    if (name === undefined) {
       i++;
-      while (i < lines.length && !/^\s*\[/.test(lines[i])) {
-        block.push(lines[i]);
-        i++;
-      }
-      // Check url in block
-      const urlMatch = block
+      continue;
+    }
+    const isServerTable = keys!.length === 2;
+    const body: string[] = [];
+    i++;
+    while (i < lines.length && parseTomlTableHeader(lines[i]) === null) {
+      body.push(lines[i]);
+      i++;
+    }
+    if (isServerTable) {
+      const urlMatch = body
         .join("\n")
         .match(/^\s*url\s*=\s*"((?:\\.|[^"])*)"/m);
       const blockUrl = urlMatch
         ? urlMatch[1].replace(/\\"/g, '"').replace(/\\\\/g, "\\")
         : undefined;
-      if (canonicalUrl(blockUrl) === targetCanonical) {
-        removed.push(serverName);
-        // Skip this block (don't push to out)
-        continue;
-      }
-      // Not a duplicate — keep it
-      for (const l of block) out.push(l);
+      serverUrls.set(name, canonicalUrl(blockUrl));
+    } else if (!serverUrls.has(name)) {
+      serverUrls.set(name, undefined);
+    }
+  }
+
+  const removeSet = new Set<string>();
+  for (const [name, canonical] of serverUrls) {
+    if (name !== keepName && canonical && canonical === targetCanonical) {
+      removeSet.add(name);
+    }
+  }
+  if (removeSet.size === 0) return [];
+
+  // Pass 2: rebuild, dropping every table/sub-table belonging to a removed
+  // server.
+  const out: string[] = [];
+  i = 0;
+  while (i < lines.length) {
+    const name = codexServerNameOfHeader(lines[i]);
+    if (name !== undefined && removeSet.has(name)) {
+      i++;
+      while (i < lines.length && parseTomlTableHeader(lines[i]) === null) i++;
       continue;
     }
-    out.push(line);
+    out.push(lines[i]);
     i++;
   }
 
-  if (removed.length === 0) return [];
   const next = out
     .join("\n")
     .replace(/\n{3,}/g, "\n\n")
     .replace(/\n*$/, "\n");
   writeFileAtomic(file, next);
-  return removed;
+  return [...removeSet];
 }
 
 /**

package/corpus/core/src/cli/skills.ts

@@ -398,8 +398,8 @@ iframe-backed screens on the infinite canvas.
 - Each screen is a URL-backed iframe, not copied HTML.
 - Each screen keeps URL metadata: \`connectionId\`, \`routeId\`, \`path\`,
   \`url\`, \`bridgeUrl\`, title, and viewport size.
-- Start in Design's screen overview mode. In overview, screens are static like
-  Figma frames; full-screen focus is for scrolling and app interaction.
+- Start in Design's screen overview mode. In overview, screens are static
+  design frames; full-screen focus is for scrolling and app interaction.
 - Alt-drag duplicates a screen. For localhost screens, duplication copies the
   iframe frame and URL metadata; change the copy's path/query for a new state.
 - Flow visualization is multiple URL states: \`/checkout?step=shipping\`,
@@ -466,6 +466,21 @@ route from the latest localhost manifest.
 pnpm action navigate --view editor --designId "<design-id>" --editorView overview
 \`\`\`
 
+## Open The Design Surface
+
+- Use the \`link\`, \`deepLink\`, or MCP App embed returned by Design actions so
+  the user sees the canvas. In Codex Desktop or VS Code, prefer opening that
+  Design URL in the available preview/webview panel; otherwise surface the
+  "Open design" link.
+- If the user is working in VS Code, the Agent Native extension can open the
+  same URL via
+  \`vscode://builder.agent-native/open?url=<encoded-design-url>\`. Its
+  \`Agent Native: Open Design Canvas\` command also starts the local bridge and
+  opens hosted Design in the VS Code side panel.
+- After \`add-localhost-screens\`, confirm the Design editor is in overview mode
+  with the requested URL-backed frames visible. Do not stop at "screens added"
+  when the user asked to inspect or edit visually.
+
 ## Editing URLs
 
 Keep localhost screens as URL files plus \`screenMetadata[fileId]\`. Do not
@@ -930,7 +945,7 @@ and move any frame whose label, connector, or annotation crosses another frame.
 When in doubt, use larger values — the canvas auto-zooms to fit everything.
 
 **Canvas annotations are designer notes on the artboard.** When a top canvas is
-present, sprinkle Figma-style notes near the frames they explain: a short
+present, sprinkle design-review notes near the frames they explain: a short
 heading, supporting text, and bullets — plain text layers, never bordered or
 shadowed cards, and never a box around a frame. The renderer spaces notes away
 from frames, so place each note by the frame it describes. Use an arrow only to

package/corpus/core/src/client/AssistantChat.tsx

@@ -1191,9 +1191,19 @@ const AssistantChatInner = forwardRef<
       setComposerContextItems((previous) => {
         const next = updater(previous);
         composerContextItemsRef.current = next;
-        publishComposerContextItems(next);
         return next;
       });
+      // Publish outside the setState updater. `publishComposerContextItems`
+      // mutates the module-level context store and synchronously dispatches a
+      // window event, which would re-enter React (notifying
+      // `useSyncExternalStore` subscribers like `useAgentChatContext`) while the
+      // updater runs during the render phase. React 19 then throws "Cannot
+      // update a component while rendering a different component". Queueing a
+      // microtask runs the publish after the commit; it reads the freshly
+      // updated `composerContextItemsRef`, not React state.
+      queueMicrotask(() => {
+        publishComposerContextItems(composerContextItemsRef.current);
+      });
     },
     [publishComposerContextItems],
   );

package/corpus/core/src/client/agent-chat.ts

@@ -188,6 +188,7 @@ let agentChatContextState: AgentChatContextState = {
   updatedAt: 0,
 };
 const agentChatContextListeners = new Set<() => void>();
+let agentChatContextNotifyQueued = false;
 
 /**
  * Listen for chatRunning messages from the frame (postMessage)
@@ -345,7 +346,17 @@ function withReplacedAgentChatContextItem(
 }
 
 function notifyAgentChatContextListeners(): void {
-  for (const listener of agentChatContextListeners) listener();
+  if (agentChatContextNotifyQueued) return;
+  agentChatContextNotifyQueued = true;
+  const notify = () => {
+    agentChatContextNotifyQueued = false;
+    for (const listener of Array.from(agentChatContextListeners)) listener();
+  };
+  if (typeof queueMicrotask === "function") {
+    queueMicrotask(notify);
+  } else {
+    setTimeout(notify, 0);
+  }
 }
 
 function persistAgentChatContextState(state: AgentChatContextState): void {

package/corpus/core/src/client/composer/PromptComposer.tsx

@@ -30,7 +30,12 @@ import {
 
 import type { ReasoningEffort } from "../../shared/reasoning-effort.js";
 import { AssistantUiStaleIndexErrorBoundary } from "../assistant-ui-recovery.js";
+import { BuilderSetupCard } from "../chat/run-recovery.js";
 import { TooltipProvider } from "../components/ui/tooltip.js";
+import {
+  fetchAgentEngineConfiguredState,
+  useAgentEngineConfigured,
+} from "../use-agent-engine-configured.js";
 import { useChatModels, type EngineModelGroup } from "../use-chat-models.js";
 import { cn } from "../utils.js";
 import { AgentComposerFrame } from "./AgentComposerFrame.js";
@@ -57,6 +62,7 @@ import type {
 } from "./types.js";
 
 const MAX_INLINE_TEXT_FILE_CHARS = 60_000;
+const SUBMIT_ENGINE_STATUS_TIMEOUT_MS = 1000;
 
 /**
  * Files the user attached via the "+" button in PromptComposer. The host owns
@@ -498,6 +504,41 @@ function PromptComposerInner({
   const handleEffortChange = showModelSelector
     ? (onEffortChange ?? models.onEffortChange)
     : undefined;
+  const agentEngineConfigured = useAgentEngineConfigured(
+    resolvedModelStatusChecksEnabled,
+  );
+  const missingApiKey = agentEngineConfigured.missing;
+  const [missingKeyBouncePulse, setMissingKeyBouncePulse] = useState(0);
+  const bounceMissingKeySetup = useCallback(() => {
+    setMissingKeyBouncePulse((pulse) => pulse + 1);
+    if (typeof window !== "undefined") {
+      window.dispatchEvent(new Event("agent-chat:missing-api-key"));
+    }
+  }, []);
+  const handleBuilderConnected = useCallback(() => {
+    if (typeof window !== "undefined") {
+      window.dispatchEvent(new Event("agent-engine:configured-changed"));
+    }
+  }, []);
+  const ensureAgentEngineReadyForSubmit = useCallback(async () => {
+    if (!resolvedModelStatusChecksEnabled) return true;
+    const state =
+      agentEngineConfigured.state === "missing"
+        ? "missing"
+        : await fetchAgentEngineConfiguredState(
+            resolvedModelStatusChecksEnabled,
+            {
+              timeoutMs: SUBMIT_ENGINE_STATUS_TIMEOUT_MS,
+            },
+          );
+    if (state !== "missing") return true;
+    bounceMissingKeySetup();
+    return false;
+  }, [
+    agentEngineConfigured.state,
+    bounceMissingKeySetup,
+    resolvedModelStatusChecksEnabled,
+  ]);
 
   useEffect(() => {
     if (!autoFocus) return;
@@ -539,48 +580,66 @@ function PromptComposerInner({
   );
 
   return (
-    <AgentComposerFrame
-      className={cn("text-start", className)}
-      rootClassName={rootClassName}
-      style={style}
-      rootStyle={rootStyle}
-      layoutVariant={layoutVariant}
-    >
-      <PromptAttachmentStrip />
-      <TiptapComposer
-        focusRef={handleRef}
-        disabled={disabled}
-        placeholder={placeholder}
-        initialText={initialText}
-        initialTextKey={initialTextKey}
-        onSubmit={handleSubmit}
-        clearOnSubmit={!preserveDraftOnSubmit}
-        plusMenuMode={
-          plusMenuMode ?? (attachmentsEnabled ? "upload-only" : "hidden")
-        }
-        attachButton={attachButton}
-        modeControl={modeControl}
-        toolbarSlot={toolbarSlot}
-        actionButton={actionButton}
-        extraActionButton={extraActionButton}
+    <>
+      {missingApiKey ? (
+        <BuilderSetupCard
+          onConnected={handleBuilderConnected}
+          bouncePulse={missingKeyBouncePulse}
+          fullWidth
+          layout="sidebar"
+        />
+      ) : null}
+      <AgentComposerFrame
+        className={cn(
+          "text-start",
+          missingApiKey && "cursor-pointer",
+          className,
+        )}
+        rootClassName={rootClassName}
+        style={style}
+        rootStyle={rootStyle}
         layoutVariant={layoutVariant}
-        slashCommands={slashCommands}
-        slashSkills={slashSkills}
-        includeDefaultSlashCommands={includeDefaultSlashCommands}
-        includeDefaultSlashSkills={includeDefaultSlashSkills}
-        onSlashCommand={onSlashCommand}
-        voiceEnabled={voiceEnabled}
-        onTextChange={onTextChange}
-        draftScope={draftScope}
-        selectedModel={composerModel}
-        selectedEffort={composerEffort}
-        availableModels={composerModelGroups}
-        onModelChange={handleModelChange}
-        onEffortChange={handleEffortChange}
-        providerConnectStatusEnabled={resolvedModelStatusChecksEnabled}
-        onConnectProvider={onConnectProvider}
-      />
-    </AgentComposerFrame>
+        onClick={missingApiKey ? bounceMissingKeySetup : undefined}
+      >
+        <PromptAttachmentStrip />
+        <TiptapComposer
+          focusRef={handleRef}
+          disabled={disabled || missingApiKey}
+          placeholder={
+            missingApiKey ? "Connect AI above to continue..." : placeholder
+          }
+          initialText={initialText}
+          initialTextKey={initialTextKey}
+          onSubmit={handleSubmit}
+          onBeforeSubmit={ensureAgentEngineReadyForSubmit}
+          clearOnSubmit={!preserveDraftOnSubmit}
+          plusMenuMode={
+            plusMenuMode ?? (attachmentsEnabled ? "upload-only" : "hidden")
+          }
+          attachButton={attachButton}
+          modeControl={modeControl}
+          toolbarSlot={toolbarSlot}
+          actionButton={actionButton}
+          extraActionButton={extraActionButton}
+          layoutVariant={layoutVariant}
+          slashCommands={slashCommands}
+          slashSkills={slashSkills}
+          includeDefaultSlashCommands={includeDefaultSlashCommands}
+          includeDefaultSlashSkills={includeDefaultSlashSkills}
+          onSlashCommand={onSlashCommand}
+          voiceEnabled={voiceEnabled}
+          onTextChange={onTextChange}
+          draftScope={draftScope}
+          selectedModel={composerModel}
+          selectedEffort={composerEffort}
+          availableModels={composerModelGroups}
+          onModelChange={handleModelChange}
+          onEffortChange={handleEffortChange}
+          providerConnectStatusEnabled={resolvedModelStatusChecksEnabled}
+          onConnectProvider={onConnectProvider}
+        />
+      </AgentComposerFrame>
+    </>
   );
 }
 

package/corpus/core/src/client/org/OrgSwitcher.tsx

@@ -368,7 +368,7 @@ export function OrgSwitcher({
       <PopoverPrimitive.Trigger asChild>
         <button
           type="button"
-          className={`flex w-full items-center gap-2 rounded-md border border-border/50 px-2.5 py-1.5 text-xs font-medium text-muted-foreground hover:bg-accent/50 hover:text-foreground focus:outline-none focus-visible:ring-2 focus-visible:ring-ring cursor-pointer ${className ?? ""}`}
+          className={`flex w-full items-center gap-2 rounded-md border border-border/70 px-2.5 py-1.5 text-xs font-medium text-muted-foreground hover:bg-accent/50 hover:text-foreground focus:outline-none focus-visible:ring-2 focus-visible:ring-ring cursor-pointer ${className ?? ""}`}
         >
           <ButtonIcon className="h-3.5 w-3.5 shrink-0" />
           <span className="truncate flex-1 text-start">{buttonLabel}</span>