@elevasis/ui 2.60.0 → 2.60.1

package/dist/features/public-agent-chat/index.js

@@ -462,6 +462,9 @@ function PublicAgentChatFrame({
     }
   );
 }
+function mergeIntakeMetadata(metadata, intakeValues) {
+  return Object.keys(intakeValues).length > 0 ? { ...intakeValues, ...metadata } : metadata;
+}
 function PublicAgentChat({
   apiUrl,
   slug,
@@ -528,7 +531,7 @@ function PublicAgentChat({
   }, [apiUrl, slug, renderIntro]);
   const pendingFirstMessageRef = useRef(null);
   const authorize = useCallback(
-    async (code) => {
+    async (code, onSuccessStatus = "ready") => {
       if (!grant) return;
       try {
         setError(null);
@@ -545,7 +548,7 @@ function PublicAgentChat({
           }
         );
         setCapabilityToken(authorization.capabilityToken);
-        setStatus("ready");
+        setStatus(onSuccessStatus);
       } catch (requestError) {
         setError(requestError instanceof Error ? requestError.message : "Unable to start agent chat");
         setStatus(grant.requiresCode ? "code-required" : "error");
@@ -555,6 +558,7 @@ function PublicAgentChat({
   );
   const createSession = useCallback(
     async (boundCapabilityToken) => {
+      const mergedMetadata = mergeIntakeMetadata(metadata, intakeValues);
       const createdSession = await fetchJson(
         `${apiUrl}/api/public/agent-chat/${encodeURIComponent(slug)}/sessions`,
         {
@@ -562,7 +566,7 @@ function PublicAgentChat({
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify({
             capabilityToken: boundCapabilityToken,
-            ...metadata ? { metadata } : {}
+            ...mergedMetadata ? { metadata: mergedMetadata } : {}
           })
         }
       );
@@ -571,7 +575,7 @@ function PublicAgentChat({
       onSessionReady?.(createdSession);
       return createdSession;
     },
-    [apiUrl, slug, metadata, onSessionReady]
+    [apiUrl, slug, metadata, intakeValues, onSessionReady]
   );
   const startSession = useCallback(
     async (code) => {
@@ -591,7 +595,7 @@ function PublicAgentChat({
           }
         );
         setCapabilityToken(authorization.capabilityToken);
-        const mergedMetadata = Object.keys(intakeValues).length > 0 ? { ...intakeValues, ...metadata } : metadata;
+        const mergedMetadata = mergeIntakeMetadata(metadata, intakeValues);
         const createdSession = await fetchJson(
           `${apiUrl}/api/public/agent-chat/${encodeURIComponent(slug)}/sessions`,
           {
@@ -614,6 +618,21 @@ function PublicAgentChat({
     },
     [apiUrl, grant, intakeValues, metadata, onSessionReady, slug, visitorId]
   );
+  const beginSession = useCallback(async () => {
+    if (capabilityToken) {
+      try {
+        setError(null);
+        setStatus("authorizing");
+        await createSession(capabilityToken);
+        setStatus("ready");
+      } catch (requestError) {
+        setError(requestError instanceof Error ? requestError.message : "Unable to start agent chat");
+        setStatus(grant?.requiresCode ? "code-required" : "error");
+      }
+      return;
+    }
+    await startSession();
+  }, [capabilityToken, createSession, startSession, grant]);
   useEffect(() => {
     if (!grant || grant.requiresCode || renderIntro || hasIntroContent(grant) || resolveCaptureFields(grant).length > 0 || autoStartedRef.current) {
       return;
@@ -699,7 +718,9 @@ function PublicAgentChat({
               {
                 onSubmit: (event) => {
                   event.preventDefault();
-                  void startSession(accessCode);
+                  if (!grant) return;
+                  const next = renderIntro || hasIntroContent(grant) || resolveCaptureFields(grant).length > 0 ? "intro" : "ready";
+                  void authorize(accessCode, next);
                 },
                 children: /* @__PURE__ */ jsxs(Stack, { children: [
                   /* @__PURE__ */ jsxs(Group, { gap: "xs", children: [
@@ -731,7 +752,7 @@ function PublicAgentChat({
     if (renderIntro) {
       const ctx = {
         start: () => {
-          void startSession();
+          void beginSession();
         },
         starting: status === "authorizing",
         title: displayTitle,
@@ -799,7 +820,7 @@ function PublicAgentChat({
                 Button,
                 {
                   onClick: () => {
-                    void startSession();
+                    void beginSession();
                   },
                   leftSection: /* @__PURE__ */ jsx(IconSend, { size: 16 }),
                   children: ctaLabel

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elevasis/ui",
-  "version": "2.60.0",
+  "version": "2.60.1",
   "description": "UI components and platform-aware hooks for building custom frontends on the Elevasis platform",
   "type": "module",
   "license": "MIT",
@@ -274,11 +274,11 @@
     "typescript": "5.9.2",
     "vite": "^7.0.0",
     "vitest": "^3.2.4",
+    "@elevasis/sdk": "1.36.5",
     "@repo/core": "0.52.0",
-    "@repo/elevasis-core": "1.0.0",
     "@repo/typescript-config": "0.0.0",
-    "@repo/eslint-config": "0.0.0",
-    "@elevasis/sdk": "1.36.5"
+    "@repo/elevasis-core": "1.0.0",
+    "@repo/eslint-config": "0.0.0"
   },
   "dependencies": {
     "@dagrejs/dagre": "^1.1.4",