@softr/sdk 0.0.89-alpha.0 → 0.0.89-alpha.2

package/dist/agent/agent-fns.js

@@ -167,6 +167,49 @@ const decideAgentToolFn = createServerFn({ method: "POST" }).validator(z.object(
 	if (!res.ok) throw new Error(`Saving the answer failed: ${await describeFailure(res)}`);
 	return true;
 });
+const connectionSchema = z.object({
+	integration: z.string().min(1),
+	requestId: z.string().min(1)
+});
+function connectionUrl({ integration, requestId }, step) {
+	const { applicationId } = sessionConfig();
+	const provider = encodeURIComponent(integration.toLowerCase());
+	return `${`${softrApiUrl("SOFTR_DATASOURCE_API_URL")}/v1/datasource/applications/${applicationId}`}/integrations/${provider}/oauth/${step}?${new URLSearchParams({ requestId })}`;
+}
+/** The sign-in page to open in the popup. */
+const startAgentConnectionFn = createServerFn({ method: "POST" }).validator(connectionSchema).handler(async ({ data }) => {
+	const token = readSessionToken();
+	const res = await fetch(connectionUrl(data, "register"), {
+		method: "POST",
+		headers: {
+			...token ? { Authorization: `Bearer ${token}` } : {},
+			...refererHeader()
+		}
+	});
+	if (!res.ok) throw new Error(`Starting the connection failed: ${await describeFailure(res)}`);
+	return z.object({ url: z.string() }).parse(await res.json()).url;
+});
+/** Waits a while for the visitor to finish signing in. `false` when they haven't yet. */
+const awaitAgentConnectionFn = createServerFn({ method: "POST" }).validator(connectionSchema).handler(async ({ data }) => {
+	const res = await fetch(connectionUrl(data, "register-result"), { signal: getRequest().signal });
+	if (res.status === 503) return false;
+	if (!res.ok) throw new Error(`Connecting failed: ${await describeFailure(res)}`);
+	return true;
+});
+/** Tells the agent the account is connected. `false` when the chat is gone, see `loadAgentChatFn`. */
+const finishAgentConnectionFn = createServerFn({ method: "POST" }).validator(z.object({
+	agentId: z.string().min(1),
+	sessionId: z.string().min(1),
+	toolCallId: z.string().min(1)
+})).handler(async ({ data: { agentId,...completion } }) => {
+	const res = await agentsFetch(`${encodeURIComponent(agentId)}/integration-auth-completions`, {
+		method: "POST",
+		body: completion
+	});
+	if (CHAT_GONE.includes(res.status)) return false;
+	if (!res.ok) throw new Error(`Finishing the connection failed: ${await describeFailure(res)}`);
+	return true;
+});
 
 //#endregion
-export { agentChatFn, decideAgentToolFn, listAgentChatsFn, listAgents, loadAgentChatFn };
+export { agentChatFn, awaitAgentConnectionFn, decideAgentToolFn, finishAgentConnectionFn, listAgentChatsFn, listAgents, loadAgentChatFn, startAgentConnectionFn };

package/dist/agent/use-agent-chat.d.ts

@@ -10,9 +10,10 @@ type AgentToolCall = {
   input?: string;
   /**
    * `awaiting-approval` waits for `approve` or `reject`. `awaiting-connection`
-   * needs the visitor to connect `integration` first, which code apps can't do yet.
+   * waits for the visitor to `connect` their own `integration` account, and is
+   * `connecting` while they sign in.
    */
-  status: "running" | "done" | "failed" | "awaiting-approval" | "approved" | "rejected" | "awaiting-connection";
+  status: "running" | "done" | "failed" | "awaiting-approval" | "approved" | "rejected" | "awaiting-connection" | "connecting";
   error?: string;
   integration?: string;
   /** Why the agent calls it, in its own words. */
@@ -76,6 +77,8 @@ type AgentChat = {
   /** Lets a tool waiting for approval run, once, for this chat, or always for this visitor. */
   approve: (toolCallId: string, scope?: "ONCE" | "SESSION" | "USER") => void;
   reject: (toolCallId: string) => void;
+  /** Opens the sign-in for a tool's `integration` in a popup. Call it from a click, or the browser blocks the popup. */
+  connect: (toolCallId: string) => void;
 };
 type AgentChatOptions = {
   /**

package/dist/agent/use-agent-chat.js

@@ -1,6 +1,6 @@
 import { assert } from "../assertions.js";
 import { useCurrentUser } from "../auth/isomorphic.js";
-import { agentChatFn, decideAgentToolFn, listAgentChatsFn, loadAgentChatFn } from "./agent-fns.js";
+import { agentChatFn, awaitAgentConnectionFn, decideAgentToolFn, finishAgentConnectionFn, listAgentChatsFn, loadAgentChatFn, startAgentConnectionFn } from "./agent-fns.js";
 import { useCallback, useEffect, useRef, useState } from "react";
 
 //#region src/agent/use-agent-chat.ts
@@ -213,6 +213,54 @@ function useAgentChat(agentId, options = {}) {
 	]);
 	const approve = useCallback((toolCallId, scope = "ONCE") => decide(toolCallId, "APPROVE", scope), [decide]);
 	const reject = useCallback((toolCallId) => decide(toolCallId, "REJECT", "ONCE"), [decide]);
+	const connect = useCallback((toolCallId) => {
+		const sessionId = chatIdRef.current;
+		const tool = [...messages.flatMap((m) => m.blocks), ...liveRef.current ?? []].find((b) => b.type === "tool" && b.id === toolCallId);
+		if (sessionId === null || tool?.status !== "awaiting-connection" || !tool.integration) return;
+		const popup = window.open("", "softr-agent-connect", popupFeatures(500, 600));
+		if (!popup) {
+			setError(/* @__PURE__ */ new Error("Allow pop-ups for this site to connect your account."));
+			return;
+		}
+		setToolStatus(toolCallId, "connecting");
+		const connection = {
+			integration: tool.integration,
+			requestId: crypto.randomUUID()
+		};
+		const deadline = Date.now() + CONNECT_TIMEOUT_MS;
+		(async () => {
+			popup.location.href = await startAgentConnectionFn({ data: connection });
+			while (!await awaitAgentConnectionFn({ data: connection })) {
+				if (Date.now() > deadline) throw new Error("Connecting took too long. Try again.");
+				await new Promise((resolve) => setTimeout(resolve, CONNECT_RETRY_MS));
+			}
+			popup.close();
+			if (!await finishAgentConnectionFn({ data: {
+				agentId,
+				sessionId,
+				toolCallId
+			} })) {
+				reset(null);
+				setError(new Error(CHAT_GONE_MESSAGE));
+				return;
+			}
+			setToolStatus(toolCallId, "approved");
+			abortRef.current?.abort();
+			commitLive(liveRef.current);
+			stream("");
+		})().catch((err) => {
+			popup.close();
+			setToolStatus(toolCallId, "awaiting-connection");
+			setError(err instanceof Error ? err : new Error(String(err)));
+		});
+	}, [
+		agentId,
+		messages,
+		setToolStatus,
+		commitLive,
+		stream,
+		reset
+	]);
 	return {
 		messages: live === null ? messages : [...messages, {
 			id: "live",
@@ -229,9 +277,15 @@ function useAgentChat(agentId, options = {}) {
 		openChat,
 		listChats,
 		approve,
-		reject
+		reject,
+		connect
 	};
 }
+const CONNECT_TIMEOUT_MS = 5 * 6e4;
+const CONNECT_RETRY_MS = 3e3;
+function popupFeatures(width, height) {
+	return `width=${width},height=${height},left=${window.screenX + (window.innerWidth - width) / 2},top=${window.screenY + (window.innerHeight - height) / 2}`;
+}
 const TODO_TOOL = "TodoWrite";
 /** Its question shows as a question block, so the call itself is noise. */
 const QUESTION_TOOL = "AskUserQuestion";

package/dist/formatting.d.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import * as react0 from "react";
+import * as react2 from "react";
 import { ReactNode } from "react";
 
 //#region src/formatting.d.ts
@@ -94,7 +94,7 @@ declare function FormattingScope({
   /** A BCP 47 locale, such as `de-DE`. It drops the app's fixed date format inside the scope. */
   locale?: string;
   children?: ReactNode;
-}): react0.FunctionComponentElement<react0.ProviderProps<Scope>>;
+}): react2.FunctionComponentElement<react2.ProviderProps<Scope>>;
 /**
  * A date in the app's format, safe to render on the server. A timestamp whose
  * zone is not known yet renders `fallback` until the browser supplies it, so
@@ -115,6 +115,6 @@ declare function FormattedDate({
   time?: boolean;
   /** What renders while the visitor's zone is unknown. */
   fallback?: ReactNode;
-}): react0.FunctionComponentElement<react0.FragmentProps>;
+}): react2.FunctionComponentElement<react2.FragmentProps>;
 //#endregion
 export { DateOptions, DateParts, DateSeparator, DateValue, FixedDateFormat, FormattedDate, Formatting, FormattingScope, WeekDay, formatDate, formatDateTime, formatNumber, useFormatting };

package/dist/mcp.d.ts

@@ -1,5 +1,5 @@
 import { DatasourceAction } from "./action.js";
-import * as _tanstack_react_start6 from "@tanstack/react-start";
+import * as _tanstack_react_start0 from "@tanstack/react-start";
 
 //#region src/mcp.d.ts
 
@@ -31,6 +31,6 @@ type SoftrMcpOptions = {
  *   ],
  * }))
  */
-declare function softrMcpMiddleware(options?: SoftrMcpOptions): _tanstack_react_start6.RequestMiddlewareAfterServer<{}, undefined, undefined>;
+declare function softrMcpMiddleware(options?: SoftrMcpOptions): _tanstack_react_start0.RequestMiddlewareAfterServer<{}, undefined, undefined>;
 //#endregion
 export { softrMcpMiddleware };

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.0.89-alpha.0";
+var version = "0.0.89-alpha.2";
 
 //#endregion
 export { version };

package/dist/pwa.d.ts

@@ -1,4 +1,4 @@
-import * as react4 from "react";
+import * as react0 from "react";
 import "@tanstack/react-start";
 
 //#region src/pwa.d.ts
@@ -23,7 +23,7 @@ import "@tanstack/react-start";
  *   )
  * }
  */
-declare function SoftrPwaHead(): react4.FunctionComponentElement<react4.FragmentProps>;
+declare function SoftrPwaHead(): react0.FunctionComponentElement<react0.FragmentProps>;
 type PwaPlatform = "ios" | "android" | "desktop";
 type PwaInstall = {
   available: false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softr/sdk",
-  "version": "0.0.89-alpha.0",
+  "version": "0.0.89-alpha.2",
   "type": "module",
   "exports": {
     ".": { "types": "./dist/index.d.ts", "import": "./dist/index.js" },

package/skills/softr-sdk/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: core
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 # Softr SDK core

package/skills/softr-sdk/agent-chat/SKILL.md

@@ -10,7 +10,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 **Boundary.** `listAgents` and `useAgentChat` live on `@softr/sdk`. `listAgents` runs in a route loader, `useAgentChat` in a component. Neither needs a route, server function or registration of its own. It chats as the signed-in visitor, or anonymously when no one is signed in.
@@ -63,6 +63,7 @@ function AgentPanel({ agentId, ticket }: { agentId: string; ticket: Ticket | nul
 - `send(text)`, `stop()`, `newChat()`.
 - `listChats()` resolves to the visitor's past chats, `{ id, title }[]`, with `title` `null` until the agent names the chat. `openChat(id)` loads one. `chatId` is the open one, `null` for a new chat. The open chat is kept in the browser for each visitor, so the hook reopens it after a remount or a reload.
 - `approve(toolCallId, scope?)` and `reject(toolCallId)` answer a tool waiting for approval. `scope` is `ONCE` (default), `SESSION` for the rest of this chat, or `USER` for always.
+- `connect(toolCallId)` signs the visitor in to a tool's `integration` in a popup. Call it straight from the click, or the browser blocks the popup.
 
 ## Rendering a message
 
@@ -78,7 +79,7 @@ Each message has `role` (`user` or `assistant`) and `blocks`, in the order the a
 
 A `tool` with status `awaiting-approval` blocks the agent until the visitor answers. Show Approve and Reject buttons on it. The agent continues on its own after an approval.
 
-A `tool` with status `awaiting-connection` needs the visitor to connect the `integration` first. Code apps can't do that yet. Say which integration the agent needs, and that the builder has to connect it for this agent in Studio.
+A `tool` with status `awaiting-connection` needs the visitor's own `integration` account, such as their Gmail. Say "You need to connect to {integration} for this request. You'll only need to connect once.", with the name in readable case, and show a Connect button that calls `connect`. While it's `connecting`, show "Connecting…" and disable the button. The agent continues on its own once they're signed in. Any integration works the same way, so don't build one per integration.
 
 ## The chat panel
 
@@ -93,6 +94,8 @@ Classic Softr apps ship a chat panel. Visitors expect the same from yours:
 - A line under the input: "AI can make mistakes. Please double-check responses."
 - A question with one choice sends on click. One with `multiSelect` or several questions sends once all are answered. An answered question stays locked.
 - Approve offers the three scopes: once, for this chat, always for this agent.
+- A tool's `input` is JSON. Show it readable: one `Label: value` line per field, with line breaks kept, never the raw JSON. Leave out `thought`, `input`, `error` or the duration when it's empty.
+- A tool that needs the visitor's account shows a Connect button.
 
 ## Context
 

package/skills/softr-sdk/auth/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 **Boundary.** `auth` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build.

package/skills/softr-sdk/charts-and-metrics/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 **Boundary.** `ds` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler or a server-side route hook — importing it into a component fails the build. `defineQuery` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/current-user/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 # The current user

package/skills/softr-sdk/file-uploads/SKILL.md

@@ -7,7 +7,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 **Boundary.** `upload` lives on `@softr/sdk/server` and runs inside server functions. `useFileUpload` and `FileItem` live on `@softr/sdk` and run in components. `FileAttachment` comes from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/formatting/SKILL.md

@@ -8,7 +8,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 # Dates, times and numbers

package/skills/softr-sdk/integrations/SKILL.md

@@ -7,7 +7,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 **Boundary.** `integration` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build. `defineIntegration` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/mcp/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 **Boundary.** `softrMcpMiddleware` lives on `@softr/sdk` and is registered once, in `src/start.ts`. The actions you hand it are the same `defineQuery` / `defineMutation` values the app's own pages use — declared wherever they already live, not duplicated for MCP.

package/skills/softr-sdk/pwa/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 # Installing the app

package/skills/softr-sdk/record-mutations/SKILL.md

@@ -8,7 +8,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 **Boundary.** `ds` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build. `defineMutation` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/record-queries/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 **Boundary.** `ds` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler or a server-side route hook — importing it into a component fails the build. The same holds for any helper that calls `ds`: declare it inside the handler. A function at module level that calls `ds` keeps the server-only import in the browser bundle, and every page stops loading until it moves. `defineQuery` and every type come from `@softr/sdk` and can be imported anywhere.

package/skills/softr-sdk/region-visibility/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 **Boundary.** `Audience` and `defineVisibility` come from `@softr/sdk` and work anywhere.

package/skills/softr-sdk/routes-and-visibility/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 **Boundary.** `definePage`, `pageHead`, the access functions and the error predicates come from `@softr/sdk` and work anywhere.

package/skills/softr-sdk/workflows/SKILL.md

@@ -9,7 +9,7 @@ description: >-
 metadata:
   type: sub-skill
   library: softr-sdk
-  library_version: 0.0.89-alpha.0
+  library_version: 0.0.89-alpha.2
 ---
 
 **Boundary.** `workflow` lives on `@softr/sdk/server` and runs only inside a `createServerFn` handler — importing it into a component fails the build. `defineWorkflow` and every type come from `@softr/sdk` and can be imported anywhere.