@koda-sl/baker-bridge 0.118.0-dev.fc1af4da8 → 0.118.0

package/dist/hono/connection-input.d.ts

@@ -12,11 +12,12 @@ export declare const CONNECTION_INPUT_TOOL_NAME = "mcp__baker_ui__request_connec
  * backend: a platform live in one and missing from another is a door that
  * looks open from one side only.
  */
-export declare const CONNECTION_PLATFORMS: readonly ["google-ads", "linkedin", "meta", "google-analytics", "google-search-console", "google-tag-manager", "x-ads", "hubspot", "google-drive", "highlevel", "pipedrive", "calendly", "savvycal"];
+export declare const CONNECTION_PLATFORMS: readonly ["google-ads", "linkedin", "meta", "google-analytics", "google-search-console", "google-tag-manager", "x-ads", "hubspot", "google-drive", "highlevel", "pipedrive", "calendly", "savvycal", "chatgpt-ads"];
 export type ConnectionPlatform = (typeof CONNECTION_PLATFORMS)[number];
-declare const connectionRequestShape: z.ZodObject<{
+declare const connectionRequestShape: z.ZodUnion<readonly [z.ZodObject<{
     platform: z.ZodEnum<{
         calendly: "calendly";
+        "chatgpt-ads": "chatgpt-ads";
         "google-ads": "google-ads";
         "google-analytics": "google-analytics";
         "google-drive": "google-drive";
@@ -32,11 +33,33 @@ declare const connectionRequestShape: z.ZodObject<{
     }>;
     reason: z.ZodString;
     choose: z.ZodOptional<z.ZodLiteral<"media-folder">>;
-}, z.core.$strip>;
+}, z.core.$strip>, z.ZodObject<{
+    app: z.ZodString;
+    reason: z.ZodString;
+}, z.core.$strip>, z.ZodObject<{
+    server: z.ZodObject<{
+        name: z.ZodString;
+        url: z.ZodString;
+        auth: z.ZodOptional<z.ZodEnum<{
+            key: "key";
+            none: "none";
+            "sign-in": "sign-in";
+        }>>;
+        keyHeader: z.ZodOptional<z.ZodString>;
+        scope: z.ZodOptional<z.ZodEnum<{
+            company: "company";
+            org: "org";
+            user: "user";
+            user_org: "user_org";
+        }>>;
+    }, z.core.$strip>;
+    reason: z.ZodString;
+}, z.core.$strip>]>;
 export declare const connectionInputToolShape: {
-    connections: z.ZodArray<z.ZodObject<{
+    connections: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
         platform: z.ZodEnum<{
             calendly: "calendly";
+            "chatgpt-ads": "chatgpt-ads";
             "google-ads": "google-ads";
             "google-analytics": "google-analytics";
             "google-drive": "google-drive";
@@ -52,13 +75,35 @@ export declare const connectionInputToolShape: {
         }>;
         reason: z.ZodString;
         choose: z.ZodOptional<z.ZodLiteral<"media-folder">>;
-    }, z.core.$strip>>;
+    }, z.core.$strip>, z.ZodObject<{
+        app: z.ZodString;
+        reason: z.ZodString;
+    }, z.core.$strip>, z.ZodObject<{
+        server: z.ZodObject<{
+            name: z.ZodString;
+            url: z.ZodString;
+            auth: z.ZodOptional<z.ZodEnum<{
+                key: "key";
+                none: "none";
+                "sign-in": "sign-in";
+            }>>;
+            keyHeader: z.ZodOptional<z.ZodString>;
+            scope: z.ZodOptional<z.ZodEnum<{
+                company: "company";
+                org: "org";
+                user: "user";
+                user_org: "user_org";
+            }>>;
+        }, z.core.$strip>;
+        reason: z.ZodString;
+    }, z.core.$strip>]>>;
     resolution: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodUnknown>>>;
 };
-export declare const connectionInputResultSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
+export declare const connectionInputResultSchema: z.ZodUnion<readonly [z.ZodObject<{
     status: z.ZodLiteral<"connected">;
     platform: z.ZodEnum<{
         calendly: "calendly";
+        "chatgpt-ads": "chatgpt-ads";
         "google-ads": "google-ads";
         "google-analytics": "google-analytics";
         "google-drive": "google-drive";
@@ -80,6 +125,7 @@ export declare const connectionInputResultSchema: z.ZodDiscriminatedUnion<[z.Zod
     status: z.ZodLiteral<"declined">;
     platform: z.ZodEnum<{
         calendly: "calendly";
+        "chatgpt-ads": "chatgpt-ads";
         "google-ads": "google-ads";
         "google-analytics": "google-analytics";
         "google-drive": "google-drive";
@@ -94,13 +140,43 @@ export declare const connectionInputResultSchema: z.ZodDiscriminatedUnion<[z.Zod
         "x-ads": "x-ads";
     }>;
     reason: z.ZodOptional<z.ZodString>;
-}, z.core.$strip>], "status">;
+}, z.core.$strip>, z.ZodObject<{
+    status: z.ZodLiteral<"connected">;
+    app: z.ZodString;
+    scope: z.ZodEnum<{
+        company: "company";
+        org: "org";
+        user: "user";
+        user_org: "user_org";
+    }>;
+    accountLabel: z.ZodOptional<z.ZodString>;
+    readOnly: z.ZodOptional<z.ZodBoolean>;
+}, z.core.$strip>, z.ZodObject<{
+    status: z.ZodLiteral<"declined">;
+    app: z.ZodString;
+    reason: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>, z.ZodObject<{
+    status: z.ZodLiteral<"connected">;
+    server: z.ZodString;
+    scope: z.ZodEnum<{
+        company: "company";
+        org: "org";
+        user: "user";
+        user_org: "user_org";
+    }>;
+    problem: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>, z.ZodObject<{
+    status: z.ZodLiteral<"declined">;
+    server: z.ZodString;
+    reason: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>]>;
 export type ConnectionInputResult = z.infer<typeof connectionInputResultSchema>;
 export declare const connectionInputResolutionSchema: z.ZodObject<{
-    results: z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
+    results: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
         status: z.ZodLiteral<"connected">;
         platform: z.ZodEnum<{
             calendly: "calendly";
+            "chatgpt-ads": "chatgpt-ads";
             "google-ads": "google-ads";
             "google-analytics": "google-analytics";
             "google-drive": "google-drive";
@@ -122,6 +198,7 @@ export declare const connectionInputResolutionSchema: z.ZodObject<{
         status: z.ZodLiteral<"declined">;
         platform: z.ZodEnum<{
             calendly: "calendly";
+            "chatgpt-ads": "chatgpt-ads";
             "google-ads": "google-ads";
             "google-analytics": "google-analytics";
             "google-drive": "google-drive";
@@ -136,9 +213,52 @@ export declare const connectionInputResolutionSchema: z.ZodObject<{
             "x-ads": "x-ads";
         }>;
         reason: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>], "status">>;
+    }, z.core.$strip>, z.ZodObject<{
+        status: z.ZodLiteral<"connected">;
+        app: z.ZodString;
+        scope: z.ZodEnum<{
+            company: "company";
+            org: "org";
+            user: "user";
+            user_org: "user_org";
+        }>;
+        accountLabel: z.ZodOptional<z.ZodString>;
+        readOnly: z.ZodOptional<z.ZodBoolean>;
+    }, z.core.$strip>, z.ZodObject<{
+        status: z.ZodLiteral<"declined">;
+        app: z.ZodString;
+        reason: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>, z.ZodObject<{
+        status: z.ZodLiteral<"connected">;
+        server: z.ZodString;
+        scope: z.ZodEnum<{
+            company: "company";
+            org: "org";
+            user: "user";
+            user_org: "user_org";
+        }>;
+        problem: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>, z.ZodObject<{
+        status: z.ZodLiteral<"declined">;
+        server: z.ZodString;
+        reason: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>]>>;
 }, z.core.$strip>;
 export type ConnectionInputResolution = z.infer<typeof connectionInputResolutionSchema>;
+/**
+ * Whether the user connected something that brings MCP tools — an app or a
+ * server. Only then is the turn's server set reloaded: a platform is read with
+ * `baker` commands and adds no tool, and reloading for nothing would rewrite
+ * the tool list, and the prompt cache with it.
+ */
+export declare function toolsConnected(resolution: ConnectionInputResolution): boolean;
+/**
+ * What the user connected that the reloaded server set does not carry, by the
+ * name the agent knows it by. An app arrives inside its scope's managed server
+ * (`composio_<scope>`), which is absent when the company has managed apps
+ * switched off or the session for them could not be made.
+ */
+export declare function connectedButNotLoaded(resolution: ConnectionInputResolution, loaded: readonly string[]): string[];
 /** Parse-at-boundary for the resolution posted to `POST /connection-input-decision`. */
 export declare function parseConnectionInputResolution(value: unknown): ConnectionInputResolution | null;
 export type ConnectionInputRequest = z.infer<typeof connectionRequestShape>;
@@ -146,13 +266,15 @@ export type ConnectionInputRequest = z.infer<typeof connectionRequestShape>;
  * `canUseTool` sees the RAW model input — MCP validation hasn't run yet — so the
  * requests are normalized here before anything downstream trusts them. Unknown
  * platforms (TikTok Ads, a hallucinated id) are dropped rather than shown as a
- * dead tab.
+ * dead tab. The dashboard applies the same rules (`connectionRequestsFromToolInput`)
+ * because it resolves tabs by index into this list.
  */
 export declare function normalizeConnectionInputToolInput(input: unknown): ConnectionInputRequest[];
 export declare function createConnectionInputTool(): import("@anthropic-ai/claude-agent-sdk").SdkMcpToolDefinition<{
-    connections: z.ZodArray<z.ZodObject<{
+    connections: z.ZodArray<z.ZodUnion<readonly [z.ZodObject<{
         platform: z.ZodEnum<{
             calendly: "calendly";
+            "chatgpt-ads": "chatgpt-ads";
             "google-ads": "google-ads";
             "google-analytics": "google-analytics";
             "google-drive": "google-drive";
@@ -168,7 +290,28 @@ export declare function createConnectionInputTool(): import("@anthropic-ai/claud
         }>;
         reason: z.ZodString;
         choose: z.ZodOptional<z.ZodLiteral<"media-folder">>;
-    }, z.core.$strip>>;
+    }, z.core.$strip>, z.ZodObject<{
+        app: z.ZodString;
+        reason: z.ZodString;
+    }, z.core.$strip>, z.ZodObject<{
+        server: z.ZodObject<{
+            name: z.ZodString;
+            url: z.ZodString;
+            auth: z.ZodOptional<z.ZodEnum<{
+                key: "key";
+                none: "none";
+                "sign-in": "sign-in";
+            }>>;
+            keyHeader: z.ZodOptional<z.ZodString>;
+            scope: z.ZodOptional<z.ZodEnum<{
+                company: "company";
+                org: "org";
+                user: "user";
+                user_org: "user_org";
+            }>>;
+        }, z.core.$strip>;
+        reason: z.ZodString;
+    }, z.core.$strip>]>>;
     resolution: z.ZodOptional<z.ZodObject<{}, z.core.$catchall<z.ZodUnknown>>>;
 }>;
 export {};

package/dist/hono/connection-input.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection-input.d.ts","sourceRoot":"","sources":["../../src/hono/connection-input.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,0BAA0B,sCAAsC,CAAC;AAE9E;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,YAC/B,YAAY,EACZ,UAAU,EACV,MAAM,EACN,kBAAkB,EAClB,uBAAuB,EACvB,oBAAoB,EACpB,OAAO,EACP,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,UAAU,EACV,UAAU,CACF,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvE,QAAA,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;iBAW1B,CAAC;AAEH,eAAO,MAAM,wBAAwB;IACnC,WAAW;;;;;;;;;;;;;;;;;;;IAKX,UAAU;CAKX,CAAC;AAIF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAkBtC,CAAC;AACH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAEhF,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAA8D,CAAC;AAC3G,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,+BAA+B,CAAC,CAAC;AAExF,wFAAwF;AACxF,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,yBAAyB,GAAG,IAAI,CAG/F;AAED,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAE5E;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,OAAO,GAAG,sBAAsB,EAAE,CAmB1F;AAUD,wBAAgB,yBAAyB;;;;;;;;;;;;;;;;;;;;;GAUxC"}
+{"version":3,"file":"connection-input.d.ts","sourceRoot":"","sources":["../../src/hono/connection-input.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,0BAA0B,sCAAsC,CAAC;AAE9E;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,oBAAoB,YAC/B,YAAY,EACZ,UAAU,EACV,MAAM,EACN,kBAAkB,EAClB,uBAAuB,EACvB,oBAAoB,EACpB,OAAO,EACP,SAAS,EACT,cAAc,EACd,WAAW,EACX,WAAW,EACX,UAAU,EACV,UAAU,EACV,aAAa,CACL,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AA8DvE,QAAA,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAuE,CAAC;AAEpG,eAAO,MAAM,wBAAwB;IACnC,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAKX,UAAU;CAKX,CAAC;AAIF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAkCtC,CAAC;AACH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,2BAA2B,CAAC,CAAC;AAEhF,eAAO,MAAM,+BAA+B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAA8D,CAAC;AAC3G,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,+BAA+B,CAAC,CAAC;AAExF;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,yBAAyB,GAAG,OAAO,CAE7E;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,yBAAyB,EAAE,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAOhH;AAED,wFAAwF;AACxF,wBAAgB,8BAA8B,CAAC,KAAK,EAAE,OAAO,GAAG,yBAAyB,GAAG,IAAI,CAG/F;AAED,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAwB5E;;;;;;GAMG;AACH,wBAAgB,iCAAiC,CAAC,KAAK,EAAE,OAAO,GAAG,sBAAsB,EAAE,CAoB1F;AAcD,wBAAgB,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAYxC"}

package/dist/hono/connection-input.js

@@ -6,6 +6,11 @@
  * Console, Tag Manager), where they also pick which accounts it may read, or a
  * tool (HubSpot, Google Drive, GoHighLevel, Pipedrive, Calendly, SavvyCal),
  * where connecting is the whole answer — without the user leaving the chat.
+ * It also adds tools: a remote MCP server the user described (`{ server }`,
+ * filled in from their instructions) or, when the vendor has none, a managed
+ * app from the catalog (`{ app }`). Those load into the running query once the
+ * card resolves (`BridgeJobExecutor.reloadMcpServers`), so the agent can call
+ * them in the same turn.
  *
  * Nothing confidential passes through the model: the bridge parks the turn in
  * `canUseTool`, the dashboard runs the OAuth popup and writes the selection onto
@@ -18,6 +23,7 @@
  */
 import { tool } from "@anthropic-ai/claude-agent-sdk";
 import { z } from "zod";
+import { answeredInTheCard } from "./blocking-card.js";
 import { toToolInputArray } from "./tool-input.js";
 export const CONNECTION_INPUT_TOOL_NAME = "mcp__baker_ui__request_connection";
 /**
@@ -46,8 +52,9 @@ export const CONNECTION_PLATFORMS = [
     "pipedrive",
     "calendly",
     "savvycal",
+    "chatgpt-ads",
 ];
-const connectionRequestShape = z.object({
+const platformRequestShape = z.object({
     platform: z.enum(CONNECTION_PLATFORMS).describe("Which platform the user needs to connect"),
     reason: z
         .string()
@@ -57,12 +64,50 @@ const connectionRequestShape = z.object({
         .optional()
         .describe("Google Drive only: the user picks a folder whose images and videos Baker imports into the libraries (a media source). Set it whenever the user wants a Drive folder's photos or videos in Baker."),
 });
+/** Who reaches a connected app or server — mirrors the custom-MCP scope model. */
+const REACH = ["user", "user_org", "company", "org"];
+const serverShape = z.object({
+    name: z
+        .string()
+        .min(1)
+        .describe("Short lowercase slug for the server, e.g. `acme` — its tools become mcp__<name>__*"),
+    url: z.string().min(1).describe("The FULL https endpoint, usually ending in /mcp — never just the domain"),
+    auth: z
+        .enum(["none", "key", "sign-in"])
+        .optional()
+        .describe("How it signs in, from the vendor's instructions: `none` (public), `key` (a required API key sent in a header — the user types it into the card, never into the chat; a key the docs call optional is `none`), `sign-in` (the server runs its own sign-in popup). Omit when unsure: the card tries a sign-in and falls back to nothing."),
+    keyHeader: z
+        .string()
+        .min(1)
+        .optional()
+        .describe("`key` only: the header the key goes in, e.g. `Authorization` or `X-API-Key`"),
+    scope: z
+        .enum(REACH)
+        .optional()
+        .describe("Who reaches it: `company` (everyone in this company — the default), `user` (only the person asking, here), `user_org` (only them, in every company of the organization), `org` (everyone in every company — admins only). The user can change it in the card."),
+});
+const appRequestShape = z.object({
+    app: z
+        .string()
+        .min(1)
+        .describe("A managed app's slug from `baker mcp catalog --search <name>` — the fallback when the vendor has no MCP server"),
+    reason: z
+        .string()
+        .describe("One short sentence, in the user's terms, saying what you'll be able to do once it's connected"),
+});
+const serverRequestShape = z.object({
+    server: serverShape,
+    reason: z
+        .string()
+        .describe("One short sentence, in the user's terms, saying what you'll be able to do once it's connected"),
+});
+const connectionRequestShape = z.union([platformRequestShape, appRequestShape, serverRequestShape]);
 export const connectionInputToolShape = {
     connections: z
         .array(connectionRequestShape)
         .min(1)
         .max(5)
-        .describe("Platforms to ask for; each becomes a tab the user resolves in one form"),
+        .describe("Platforms, apps and servers to ask for; each becomes a tab the user resolves in one form"),
     resolution: z
         .object({})
         .catchall(z.unknown())
@@ -70,7 +115,7 @@ export const connectionInputToolShape = {
         .describe("Internal — injected by the bridge after the user resolves the form. Never set this yourself."),
 };
 // --- Redacted resolution echoed back to the model ---
-export const connectionInputResultSchema = z.discriminatedUnion("status", [
+export const connectionInputResultSchema = z.union([
     z.object({
         status: z.literal("connected"),
         platform: z.enum(CONNECTION_PLATFORMS),
@@ -88,18 +133,84 @@ export const connectionInputResultSchema = z.discriminatedUnion("status", [
         platform: z.enum(CONNECTION_PLATFORMS),
         reason: z.string().optional(),
     }),
+    z.object({
+        status: z.literal("connected"),
+        app: z.string(),
+        scope: z.enum(REACH),
+        accountLabel: z.string().optional(),
+        readOnly: z.boolean().optional(),
+    }),
+    z.object({ status: z.literal("declined"), app: z.string(), reason: z.string().optional() }),
+    z.object({
+        status: z.literal("connected"),
+        server: z.string(),
+        scope: z.enum(REACH),
+        /** What a person has to fix before its tools answer — the address, the sign-in or the key. */
+        problem: z.string().optional(),
+    }),
+    z.object({ status: z.literal("declined"), server: z.string(), reason: z.string().optional() }),
 ]);
 export const connectionInputResolutionSchema = z.object({ results: z.array(connectionInputResultSchema) });
+/**
+ * Whether the user connected something that brings MCP tools — an app or a
+ * server. Only then is the turn's server set reloaded: a platform is read with
+ * `baker` commands and adds no tool, and reloading for nothing would rewrite
+ * the tool list, and the prompt cache with it.
+ */
+export function toolsConnected(resolution) {
+    return resolution.results.some((result) => result.status === "connected" && ("app" in result || "server" in result));
+}
+/**
+ * What the user connected that the reloaded server set does not carry, by the
+ * name the agent knows it by. An app arrives inside its scope's managed server
+ * (`composio_<scope>`), which is absent when the company has managed apps
+ * switched off or the session for them could not be made.
+ */
+export function connectedButNotLoaded(resolution, loaded) {
+    return resolution.results.flatMap((result) => {
+        if (result.status !== "connected")
+            return [];
+        if ("app" in result)
+            return loaded.includes(`composio_${result.scope}`) ? [] : [result.app];
+        if ("server" in result)
+            return loaded.includes(result.server) ? [] : [result.server];
+        return [];
+    });
+}
 /** Parse-at-boundary for the resolution posted to `POST /connection-input-decision`. */
 export function parseConnectionInputResolution(value) {
     const parsed = connectionInputResolutionSchema.safeParse(value);
     return parsed.success ? parsed.data : null;
 }
+/** The tab's identity, for collapsing the same ask made twice. */
+function requestKey(request) {
+    if ("app" in request)
+        return `app:${request.app}`;
+    if ("server" in request)
+        return `server:${request.server.name}`;
+    return `platform:${request.platform}`;
+}
+/** Drop what a request's own kind does not use, so the card never asks for it. */
+function trimRequest(request) {
+    if ("server" in request) {
+        const { keyHeader, ...server } = request.server;
+        // A key header only means something on a server that signs in with a key.
+        const keepHeader = keyHeader && (server.auth === undefined || server.auth === "key");
+        return { ...request, server: keepHeader ? { ...server, keyHeader } : server };
+    }
+    if ("app" in request)
+        return request;
+    // Choosing a folder is a Google Drive thing; on any other platform it would
+    // ask the dashboard for a picker that does not exist.
+    const { choose, ...platform } = request;
+    return choose && platform.platform === "google-drive" ? { ...platform, choose } : platform;
+}
 /**
  * `canUseTool` sees the RAW model input — MCP validation hasn't run yet — so the
  * requests are normalized here before anything downstream trusts them. Unknown
  * platforms (TikTok Ads, a hallucinated id) are dropped rather than shown as a
- * dead tab.
+ * dead tab. The dashboard applies the same rules (`connectionRequestsFromToolInput`)
+ * because it resolves tabs by index into this list.
  */
 export function normalizeConnectionInputToolInput(input) {
     if (typeof input !== "object" || input === null) {
@@ -110,28 +221,33 @@ export function normalizeConnectionInputToolInput(input) {
     const requests = [];
     for (const entry of raw) {
         const parsed = connectionRequestShape.safeParse(entry);
-        if (!parsed.success || seen.has(parsed.data.platform)) {
+        if (!parsed.success) {
+            continue;
+        }
+        const key = requestKey(parsed.data);
+        if (seen.has(key)) {
             continue;
         }
-        seen.add(parsed.data.platform);
-        // Choosing a folder is a Google Drive thing; on any other platform it would
-        // ask the dashboard for a picker that does not exist.
-        const { choose, ...request } = parsed.data;
-        requests.push(choose && request.platform === "google-drive" ? { ...request, choose } : request);
+        seen.add(key);
+        requests.push(trimRequest(parsed.data));
     }
     return requests;
 }
 const CONNECTION_INPUT_TOOL_DESCRIPTION = [
-    "Ask the user to connect — or reconnect — one of Baker's connections, inside the chat: an ad or data platform (Google Ads, LinkedIn Ads, Meta Ads, X Ads, Google Analytics 4, Google Search Console, Google Tag Manager), where they also pick which accounts Baker may read, or a tool (HubSpot, Google Drive, GoHighLevel, Pipedrive, Calendly, SavvyCal). BLOCKS until they resolve it in the dashboard.",
-    "Use it the moment a command tells you a platform isn't connected, OR that it is connected but does not allow what you asked (a `request_connection` fix, `HUBSPOT_RECONNECT_REQUIRED`, a read-only connection) — the card shows Reconnect when the connection exists. Never tell the user to go to Settings instead. Each entry in `connections` becomes a tab, so ask for everything the task needs in ONE call.",
+    "Ask the user to connect — or reconnect — something inside the chat. BLOCKS until they resolve it in the dashboard. Three kinds of entry, mixed freely in one call:",
+    "(1) `{ platform }` — one of Baker's connections: an ad or data platform (Google Ads, LinkedIn Ads, Meta Ads, X Ads, Google Analytics 4, Google Search Console, Google Tag Manager), where they also pick which accounts Baker may read; ChatGPT Ads (`chatgpt-ads`), where they paste its API key into the card; or a tool (HubSpot, Google Drive, GoHighLevel, Pipedrive, Calendly, SavvyCal). ALWAYS first for these: Baker's own connection wins even when the vendor publishes an MCP server or the user names one — never ask for one of them as (2) or (3).",
+    "(2) `{ server: { name, url, auth, keyHeader, scope } }` — a remote MCP server. Use it whenever the user gives you an MCP server's address or setup instructions, or asks for any tool that is not connected: always try the vendor's real server FIRST. No address given? Find it yourself before asking the user anything — WebSearch '<vendor> MCP server', WebFetch the vendor's own docs, and take the official remote https endpoint and how it signs in from there. Official = on the vendor's own domain or in the vendor's own docs; never a server someone else hosts (a GitHub project, a directory listing) unless the user named it — with no official one, use (3). Fill in everything you know from their instructions — the card opens with it filled in and the user only confirms, types a key if there is one, or signs in. Never ask for a key in the chat.",
+    "(3) `{ app }` — the FALLBACK when the vendor has no MCP server: a managed app from `baker mcp catalog --search <name>`, which the user signs in to from the card.",
+    "Use it the moment a command tells you a platform isn't connected, OR that it is connected but does not allow what you asked (a `request_connection` fix, `HUBSPOT_RECONNECT_REQUIRED`, a read-only connection) — the card shows Reconnect when the connection exists. Never tell the user to go to Settings or the Integrations page instead. Each entry becomes a tab, so ask for everything the task needs in ONE call.",
     "`reason` is shown to the user: say what connecting unlocks in their terms ('so I can see which campaigns are actually converting', 'so I can count a contact becoming a customer'), never in technical terms.",
     'When the user wants a Google Drive folder\'s photos or videos in Baker, ask for `google-drive` with `choose: "media-folder"`: the card lets them pick the folder, Baker imports it as a media source (weekly by default), and the result carries its `mediaSourceKey` for `baker media-sources`. The import runs in the background — tell the user the library is filling, never that it is ready. A Drive folder is never added by link.',
-    "A declined tab is not an error — carry on with what you can do without it and say what stays unavailable. A connected result may list `cannotRead`: things the connection still does not allow — do not promise those. Results name only the account and what was selected; no credentials ever reach you.",
+    "A connected app or server's tools load straight after the card resolves, in this same turn, when the result says `toolsReady: true` — call them right away (a server's tools are mcp__<name>__*, an app's ride mcp__composio_*). A server result with `problem` will not answer until a person fixes what it names; relay it plainly. `toolsReady: false` means they arrive with the user's next message — unless the app or server is named in `failedToLoad`: it did not load, so say plainly it isn't working yet and never promise it for later.",
+    "A declined tab is not an error — carry on with what you can do without it and say what stays unavailable. A declined key server: the key goes into the card, never the chat — offer to open the card again. A connected result may list `cannotRead`: things the connection still does not allow — do not promise those. Results name only the account and what was selected; no credentials ever reach you.",
 ].join(" ");
 export function createConnectionInputTool() {
-    return tool("request_connection", CONNECTION_INPUT_TOOL_DESCRIPTION, connectionInputToolShape, (args) => {
+    return answeredInTheCard(tool("request_connection", CONNECTION_INPUT_TOOL_DESCRIPTION, connectionInputToolShape, (args) => {
         const resolution = args.resolution ?? { results: [] };
         return Promise.resolve({ content: [{ type: "text", text: JSON.stringify(resolution) }] });
-    });
+    }));
 }
 //# sourceMappingURL=connection-input.js.map

package/dist/hono/connection-input.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection-input.js","sourceRoot":"","sources":["../../src/hono/connection-input.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection-input.js","sourceRoot":"","sources":["../../src/hono/connection-input.ts"],"names":[],"mappings":"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"}

package/dist/hono/connection-input.test.js

@@ -1,6 +1,6 @@
 import { readFile } from "node:fs/promises";
 import { describe, expect, it } from "vitest";
-import { CONNECTION_PLATFORMS, normalizeConnectionInputToolInput, parseConnectionInputResolution, } from "./connection-input.js";
+import { CONNECTION_PLATFORMS, normalizeConnectionInputToolInput, parseConnectionInputResolution, toolsConnected, } from "./connection-input.js";
 describe("normalizeConnectionInputToolInput", () => {
     it("keeps well-formed requests in the order the agent asked for them", () => {
         expect(normalizeConnectionInputToolInput({
@@ -22,6 +22,11 @@ describe("normalizeConnectionInputToolInput", () => {
             ],
         })).toEqual([{ platform: "linkedin", reason: "so I can read your LinkedIn campaigns" }]);
     });
+    it("keeps ChatGPT Ads, which the user connects by pasting its key into the card", () => {
+        expect(normalizeConnectionInputToolInput({
+            connections: [{ platform: "chatgpt-ads", reason: "so I can read your ads" }],
+        })).toEqual([{ platform: "chatgpt-ads", reason: "so I can read your ads" }]);
+    });
     it("collapses a platform the agent asked for twice into one tab", () => {
         const requests = normalizeConnectionInputToolInput({
             connections: [
@@ -54,6 +59,66 @@ describe("normalizeConnectionInputToolInput", () => {
         expect(normalizeConnectionInputToolInput(null)).toEqual([]);
     });
 });
+describe("normalizeConnectionInputToolInput — apps and servers", () => {
+    it("keeps a server the user described, filled in as far as the agent knows it", () => {
+        expect(normalizeConnectionInputToolInput({
+            connections: [
+                {
+                    server: { name: "acme", url: "https://acme.dev/mcp", auth: "key", keyHeader: "X-Api-Key", scope: "user" },
+                    reason: "so I can read your Acme orders",
+                },
+            ],
+        })).toEqual([
+            {
+                server: { name: "acme", url: "https://acme.dev/mcp", auth: "key", keyHeader: "X-Api-Key", scope: "user" },
+                reason: "so I can read your Acme orders",
+            },
+        ]);
+    });
+    it("keeps an app from the catalog next to a platform", () => {
+        expect(normalizeConnectionInputToolInput({
+            connections: [
+                { app: "notion", reason: "so I can read your briefs" },
+                { platform: "hubspot", reason: "so I can count a deal won" },
+            ],
+        })).toEqual([
+            { app: "notion", reason: "so I can read your briefs" },
+            { platform: "hubspot", reason: "so I can count a deal won" },
+        ]);
+    });
+    it("drops a key header on a server that signs in without one, so the card never asks for a key it will not use", () => {
+        expect(normalizeConnectionInputToolInput({
+            connections: [
+                { server: { name: "acme", url: "https://acme.dev/mcp", auth: "none", keyHeader: "X" }, reason: "r" },
+            ],
+        })).toEqual([{ server: { name: "acme", url: "https://acme.dev/mcp", auth: "none" }, reason: "r" }]);
+    });
+    it("collapses the same app or server asked for twice into one tab", () => {
+        const requests = normalizeConnectionInputToolInput({
+            connections: [
+                { app: "notion", reason: "first" },
+                { app: "notion", reason: "second" },
+                { server: { name: "acme", url: "https://acme.dev/mcp" }, reason: "first" },
+                { server: { name: "acme", url: "https://acme.dev/mcp" }, reason: "second" },
+            ],
+        });
+        expect(requests.map((request) => request.reason)).toEqual(["first", "first"]);
+    });
+});
+describe("toolsConnected", () => {
+    it("is true when an app or a server came through, which is when the turn's tools must be reloaded", () => {
+        expect(toolsConnected({ results: [{ status: "connected", server: "acme", scope: "company" }] })).toBe(true);
+        expect(toolsConnected({ results: [{ status: "connected", app: "notion", scope: "user" }] })).toBe(true);
+    });
+    it("is false for a platform or a skipped tab, so the tool list — and the prompt cache — stay untouched", () => {
+        expect(toolsConnected({
+            results: [
+                { status: "connected", platform: "hubspot", selected: [] },
+                { status: "declined", server: "acme" },
+            ],
+        })).toBe(false);
+    });
+});
 describe("parseConnectionInputResolution", () => {
     it("accepts a connected result carrying only the account and what was selected", () => {
         expect(parseConnectionInputResolution({
@@ -85,15 +150,19 @@ describe("parseConnectionInputResolution", () => {
 describe("CONNECTION_PLATFORMS", () => {
     it("matches the platforms the backend will accept — every connection Baker has", async () => {
         // Three lists gate one door — this schema, the backend's
-        // `connectionPlatformValidator` (every `OAUTH_PROVIDER_TYPES` entry), and
-        // the dashboard's `comingSoon`. Meta was live in the backend for months
-        // while this list still refused it, so the agent could not ask for the one
-        // platform it could already read.
+        // `CONNECTION_PLATFORMS` (every `OAUTH_PROVIDER_TYPES` entry plus the
+        // key-pasted ChatGPT Ads), and the dashboard's `comingSoon`. Meta was live
+        // in the backend for months while this list still refused it, so the agent
+        // could not ask for the one platform it could already read.
         const validators = await readFile(new URL("../../../backend/convex/lib/validators.ts", import.meta.url), "utf8");
-        expect(validators).toMatch(/export const connectionPlatformValidator = oauthProviderTypeValidator;/);
-        const block = validators.match(/export const OAUTH_PROVIDER_TYPES = \[([\s\S]*?)\] as const;/);
-        expect(block).not.toBeNull();
-        const backendPlatforms = [...block[1].matchAll(/"([^"]+)"/g)].map((m) => m[1]);
+        const quoted = (block) => {
+            expect(block).not.toBeNull();
+            return [...block[1].matchAll(/"([^"]+)"/g)].map((m) => m[1]);
+        };
+        const backendPlatforms = [
+            ...quoted(validators.match(/export const OAUTH_PROVIDER_TYPES = \[([\s\S]*?)\] as const;/)),
+            ...quoted(validators.match(/export const CONNECTION_PLATFORMS = \[\.\.\.OAUTH_PROVIDER_TYPES,([\s\S]*?)\] as const;/)),
+        ];
         expect([...CONNECTION_PLATFORMS].sort()).toEqual(backendPlatforms.sort());
     });
     it("offers HubSpot and the other tools, so the agent never sends the user to Settings for one", () => {