@noodleseed/assistant 1.13.0 → 1.15.0

package/dist/index.cjs

@@ -22191,7 +22191,7 @@ function mountAssistantApp(detail, actions, options = {}) {
         const current = options.getDetail?.() ?? detail;
         void bridge.sendSandboxResourceReady({
           html: current.html,
-          sandbox: "allow-scripts allow-forms",
+          sandbox: "allow-scripts",
           ...current.resourceMeta ?? {}
         });
       };
@@ -26817,7 +26817,7 @@ var AssistantChatStateStore = class {
         this.#writeText(event.data.delta);
         return;
       case "tool_proposed":
-        this.#writeConfirmation(event.data);
+        this.#writeStandaloneData(() => this.#writeConfirmation(event.data));
         return;
       case "interaction_proposed":
         this.#writeData("confirmation", event.data.id, {
@@ -26826,10 +26826,12 @@ var AssistantChatStateStore = class {
         });
         return;
       case "input_requested":
-        this.#writeData("input-request", event.data.id, {
-          ...event.data,
-          status: "pending"
-        });
+        this.#writeStandaloneData(
+          () => this.#writeData("input-request", event.data.id, {
+            ...event.data,
+            status: "pending"
+          })
+        );
         return;
       case "tool_completed":
         this.#writeData("tool-result", event.data.id, event.data);
@@ -26936,6 +26938,12 @@ var AssistantChatStateStore = class {
   #writeConfirmation(data) {
     this.#writeData("confirmation", data.id, { ...data, status: "pending" });
   }
+  #writeStandaloneData(write) {
+    const standalone = this.#operation === void 0;
+    if (standalone) this.#startOperation();
+    write();
+    if (standalone) this.#closeOperation("ready");
+  }
   #writeData(name21, id, data) {
     const operation = this.#operation;
     if (!operation || operation.closed) return;
@@ -27268,6 +27276,24 @@ function hasToJsonProperty(value) {
   return false;
 }
 
+// src/session-source.ts
+var NOODLE_CLOUD_URL = "https://cloud.noodleseed.dev";
+var PUBLIC_SESSION_PATH = "/v1/assistant/public-sessions";
+function resolveSessionSource(options) {
+  const { sessionEndpoint, embedId, serviceUrl } = options;
+  if (Boolean(embedId) === Boolean(sessionEndpoint)) {
+    throw new Error("pass either embedId or sessionEndpoint, not both and not neither");
+  }
+  if (embedId) {
+    const base = (serviceUrl ?? NOODLE_CLOUD_URL).replace(/\/+$/, "");
+    return { kind: "public", url: `${base}${PUBLIC_SESSION_PATH}`, embedId };
+  }
+  return { kind: "exchange", url: sessionEndpoint };
+}
+function sessionSourceKey(options) {
+  return `${options.embedId ?? ""}|${options.serviceUrl ?? ""}|${options.sessionEndpoint ?? ""}`;
+}
+
 // src/transport.ts
 var AssistantTransportError = class extends Error {
   code = "invalid_response";
@@ -27395,6 +27421,19 @@ function isAbortError2(error51) {
 }
 
 // src/client.ts
+async function refusalCode(response) {
+  try {
+    const body = await response.clone().json();
+    const code = body.code;
+    return typeof code === "string" ? code : void 0;
+  } catch {
+    return void 0;
+  }
+}
+var UNRETRYABLE_SERVICE_CODES = /* @__PURE__ */ new Set([
+  "daily_turn_budget_exhausted",
+  "daily_session_budget_exhausted"
+]);
 var AssistantClientError = class extends Error {
   detail;
   constructor(detail, message, options) {
@@ -27404,7 +27443,7 @@ var AssistantClientError = class extends Error {
   }
 };
 var DefaultAssistantClient = class {
-  #sessionEndpoint;
+  #source;
   #fetch;
   #listeners = /* @__PURE__ */ new Set();
   #chat = new AssistantChatStateStore();
@@ -27414,9 +27453,9 @@ var DefaultAssistantClient = class {
   #context;
   #modelContext;
   #active;
+  #pendingAppInteractions = /* @__PURE__ */ new Map();
   constructor(options) {
-    if (!options.sessionEndpoint) throw new Error("sessionEndpoint is required");
-    this.#sessionEndpoint = options.sessionEndpoint;
+    this.#source = resolveSessionSource(options);
     this.#fetch = options.fetch ?? ((input, init) => globalThis.fetch(input, init));
     this.#context = options.context ? { ...options.context } : void 0;
     this.#modelContext = options.modelContext ? copyAssistantModelContext(options.modelContext) : void 0;
@@ -27455,6 +27494,7 @@ var DefaultAssistantClient = class {
     }
     await this.#singleFlight(async (signal) => {
       await this.#runChatOperation(signal, async () => {
+        const pendingApp = this.#pendingAppInteractions.get(id);
         const session = this.#session;
         if (!session) {
           throw clientError("confirmation_expired", "assistant session is not active", false);
@@ -27474,32 +27514,67 @@ var DefaultAssistantClient = class {
           ...resolution.action === "accept" && resolution.content !== void 0 ? { content: resolution.content } : {}
         } : { id };
         this.#emit({ event: "interaction_started", data: { id, action: resolution.action } });
-        const response = await this.#request(
-          endpoint,
-          {
-            method: "POST",
-            headers: authorizedHeaders(session.token, "text/event-stream"),
-            body: JSON.stringify(body),
-            signal
-          },
-          "confirmation_failed"
-        );
-        if (response.status === 401) {
-          this.#session = void 0;
-          this.#emit({ event: "session_expired", data: {} });
-        }
-        if (!response.ok) {
-          const serverCode = await readStableErrorCode(response);
-          const expired = response.status === 401 || response.status === 409;
-          throw clientError(
-            serverCode ?? (expired ? "confirmation_expired" : "confirmation_failed"),
-            `Assistant interaction failed (${response.status})`,
-            false,
-            response.status
+        try {
+          const response = await this.#request(
+            endpoint,
+            {
+              method: "POST",
+              headers: authorizedHeaders(session.token, "text/event-stream"),
+              body: JSON.stringify(body),
+              signal
+            },
+            "confirmation_failed"
           );
+          if (response.status === 401) {
+            this.#session = void 0;
+            this.#emit({ event: "session_expired", data: {} });
+          }
+          if (!response.ok) {
+            const serverCode = await readStableErrorCode(response);
+            const expired = response.status === 401 || response.status === 409;
+            throw clientError(
+              serverCode ?? (expired ? "confirmation_expired" : "confirmation_failed"),
+              `Assistant interaction failed (${response.status})`,
+              false,
+              response.status
+            );
+          }
+          let completedResult;
+          let nextInteractionId;
+          await this.#consume(response, (event) => {
+            if (event.event === "tool_completed" && event.data.id === id) {
+              completedResult = event.data.result;
+            }
+            if ((event.event === "tool_proposed" || event.event === "input_requested") && event.data.id !== id) {
+              nextInteractionId = event.data.id;
+            }
+          });
+          this.#emit({ event: "interaction_completed", data: { id, action: resolution.action } });
+          if (pendingApp) {
+            this.#pendingAppInteractions.delete(id);
+            if (nextInteractionId) {
+              this.#pendingAppInteractions.set(nextInteractionId, pendingApp);
+            } else if (resolution.action !== "accept") {
+              pendingApp.resolve(appInteractionStopped(resolution.action));
+            } else if (completedResult !== void 0) {
+              pendingApp.resolve(appToolResult(completedResult));
+            } else {
+              pendingApp.reject(
+                clientError(
+                  "invalid_response",
+                  "Assistant app interaction completed without a tool result",
+                  false
+                )
+              );
+            }
+          }
+        } catch (error51) {
+          if (pendingApp && this.#pendingAppInteractions.get(id) === pendingApp) {
+            this.#pendingAppInteractions.delete(id);
+            pendingApp.reject(error51);
+          }
+          throw error51;
         }
-        await this.#consume(response);
-        this.#emit({ event: "interaction_completed", data: { id, action: resolution.action } });
       });
     });
   }
@@ -27540,12 +27615,29 @@ var DefaultAssistantClient = class {
         response.status
       );
     }
-    return response.json();
+    const value = await response.json();
+    const interaction = parseAppInteraction(value);
+    if (!interaction) return value;
+    return new Promise((resolve2, reject) => {
+      const id = interaction.data.id;
+      const replaced = this.#pendingAppInteractions.get(id);
+      if (replaced) {
+        replaced.reject(
+          clientError("invalid_response", "Assistant returned a duplicate app interaction", false)
+        );
+      }
+      this.#pendingAppInteractions.set(id, { resolve: resolve2, reject });
+      this.#emit(interaction);
+      void this.#chat.flush();
+    });
   }
   appSandboxUrl() {
     return this.#session?.endpoints.sandbox;
   }
   resetSession() {
+    this.#rejectPendingAppInteractions(
+      clientError("confirmation_expired", "assistant session is not active", false)
+    );
     this.#session = void 0;
     this.#emit({ event: "session_reset", data: {} });
   }
@@ -27579,11 +27671,14 @@ var DefaultAssistantClient = class {
       return;
     }
     if (!response.ok) {
+      const serviceCode = await refusalCode(response);
       throw clientError(
         "turn_failed",
         `Assistant turn failed (${response.status})`,
         false,
-        response.status
+        response.status,
+        void 0,
+        serviceCode
       );
     }
     await this.#consume(response);
@@ -27622,23 +27717,25 @@ var DefaultAssistantClient = class {
     }
   }
   async #createSession(signal) {
-    const response = await this.#request(
-      this.#sessionEndpoint,
-      {
-        method: "POST",
-        headers: { Accept: "application/json", "Content-Type": "application/json" },
-        body: JSON.stringify(this.#context ? { context: this.#context } : {}),
-        credentials: "same-origin",
-        signal
-      },
-      "session_failed"
-    );
+    const source = this.#source;
+    const response = await this.#requestSession(source, {
+      method: "POST",
+      headers: { Accept: "application/json", "Content-Type": "application/json" },
+      body: JSON.stringify(
+        source.kind === "public" ? { embedId: source.embedId } : this.#context ? { context: this.#context } : {}
+      ),
+      credentials: source.kind === "public" ? "omit" : "same-origin",
+      signal
+    });
     if (!response.ok) {
+      const serviceCode = await refusalCode(response);
       throw clientError(
         "session_failed",
         `Assistant session failed (${response.status})`,
-        true,
-        response.status
+        serviceCode === void 0 || !UNRETRYABLE_SERVICE_CODES.has(serviceCode),
+        response.status,
+        void 0,
+        serviceCode
       );
     }
     let value;
@@ -27666,12 +27763,13 @@ var DefaultAssistantClient = class {
     });
     return session;
   }
-  async #consume(response) {
+  async #consume(response, observe) {
     let streamError;
     try {
       await consumeAssistantEvents(response, (event) => {
         const clientEvent = toAssistantClientEvent(event);
         this.#emit(clientEvent);
+        observe?.(clientEvent);
         if (clientEvent.event !== "error" || typeof clientEvent.data.code !== "string") return;
         streamError = {
           code: clientEvent.data.code,
@@ -27694,6 +27792,34 @@ var DefaultAssistantClient = class {
       );
     }
   }
+  /**
+   * The mint, with the one failure a public page hits that an in-app embed cannot.
+   *
+   * A page that loads the embed script and then blocks `connect-src` fails here as a bare network
+   * rejection — no status, no body, nothing to read. "Assistant request failed" sends a developer
+   * hunting through their own code; naming the directive and the origin ends the search. The message
+   * covers a plain outage too, because from inside the browser the two are indistinguishable.
+   */
+  async #requestSession(source, init) {
+    try {
+      return await this.#fetch(source.url, init);
+    } catch (error51) {
+      if (init.signal?.aborted) throw error51;
+      if (source.kind !== "public") {
+        throw clientError("session_failed", "Assistant request failed", true, void 0, {
+          cause: error51
+        });
+      }
+      throw clientError(
+        "session_failed",
+        `Assistant could not reach ${new URL(source.url).origin}. If the page sets a Content-Security-Policy, allow that origin in connect-src (and in script-src and frame-src).`,
+        true,
+        void 0,
+        { cause: error51 },
+        "blocked_by_page"
+      );
+    }
+  }
   async #request(input, init, failureCode) {
     try {
       return await this.#fetch(input, init);
@@ -27740,6 +27866,10 @@ var DefaultAssistantClient = class {
       }
     }
   }
+  #rejectPendingAppInteractions(error51) {
+    for (const pending of this.#pendingAppInteractions.values()) pending.reject(error51);
+    this.#pendingAppInteractions.clear();
+  }
 };
 function createAssistantClient(options) {
   return new DefaultAssistantClient(options);
@@ -27751,6 +27881,30 @@ function authorizedHeaders(token, accept) {
     Accept: accept
   };
 }
+function parseAppInteraction(value) {
+  if (!isRecord4(value) || !isRecord4(value.interaction)) return void 0;
+  const event = value.interaction.event;
+  const data = value.interaction.data;
+  if (event !== "tool_proposed" && event !== "input_requested" || !isRecord4(data)) {
+    return void 0;
+  }
+  const parsed = toAssistantClientEvent({ event, data });
+  return parsed.event === "tool_proposed" || parsed.event === "input_requested" ? parsed : void 0;
+}
+function appToolResult(result) {
+  const text3 = typeof result === "string" ? result : JSON.stringify(result);
+  return result !== null && typeof result === "object" && !Array.isArray(result) ? {
+    content: [{ type: "text", text: text3 }],
+    structuredContent: result,
+    isError: false
+  } : { content: [{ type: "text", text: text3 }], isError: false };
+}
+function appInteractionStopped(action) {
+  return {
+    content: [{ type: "text", text: `interaction_${action}` }],
+    isError: true
+  };
+}
 function parseSession(value) {
   if (!isRecord4(value) || !isRecord4(value.endpoints)) {
     throw clientError("session_failed", "Assistant session response is invalid", true);
@@ -27787,9 +27941,14 @@ async function readStableErrorCode(response) {
   if (!isRecord4(value) || typeof value.code !== "string") return void 0;
   return /^[A-Za-z0-9_.-]{1,64}$/.test(value.code) ? value.code : void 0;
 }
-function clientError(code, message, retryable, status, options) {
+function clientError(code, message, retryable, status, options, serviceCode) {
   return new AssistantClientError(
-    { code, ...status === void 0 ? {} : { status }, retryable },
+    {
+      code,
+      ...status === void 0 ? {} : { status },
+      retryable,
+      ...serviceCode === void 0 ? {} : { serviceCode }
+    },
     message,
     options
   );
@@ -30966,7 +31125,6 @@ var AssistantElementEventController = class {
       return;
     }
     if (name21 === "tool_proposed" || name21 === "interaction_proposed") {
-      if (!this.#streamKind) return;
       this.#appendToolProposal(
         String(data.id ?? ""),
         String(data.tool ?? "action"),
@@ -30978,7 +31136,6 @@ var AssistantElementEventController = class {
       return;
     }
     if (name21 === "input_requested" && isRecord5(data.requestedSchema)) {
-      if (!this.#streamKind) return;
       this.#appendInputRequest(
         String(data.id ?? ""),
         String(data.message ?? "More information is required"),
@@ -31882,6 +32039,10 @@ var NoodleAssistantElement = class extends HTMLElementBase {
   #appearanceStyleSnapshot = /* @__PURE__ */ new Map();
   #scroll = new AssistantElementScrollController();
   sessionEndpoint = "";
+  /** Public mount: the non-secret embed id `noodle deploy` printed. Mutually exclusive with the above. */
+  embedId = "";
+  /** Only for a dev or self-hosted service; the published snippet needs no origin. */
+  serviceUrl = "";
   get appearance() {
     return this.#hostAppearance;
   }
@@ -31936,6 +32097,8 @@ var NoodleAssistantElement = class extends HTMLElementBase {
   connectedCallback() {
     if (!this.shadowRoot) this.attachShadow({ mode: "open" });
     if (!this.sessionEndpoint) this.sessionEndpoint = this.getAttribute("session-endpoint") ?? "";
+    if (!this.embedId) this.embedId = this.getAttribute("embed-id") ?? "";
+    if (!this.serviceUrl) this.serviceUrl = this.getAttribute("service-url") ?? "";
     this.#media = globalThis.matchMedia?.("(prefers-color-scheme: dark)");
     this.#media?.addEventListener("change", this.#handleSystemTheme);
     document.addEventListener("keydown", this.#handleDocumentKeydown);
@@ -32107,26 +32270,31 @@ var NoodleAssistantElement = class extends HTMLElementBase {
     }
   };
   #ensureClient() {
-    if (this.#client && this.#clientEndpoint === this.sessionEndpoint) return this.#client;
+    const key = sessionSourceKey(this);
+    if (this.#client && this.#clientEndpoint === key) return this.#client;
     this.#client?.abort();
     this.#unsubscribeClient?.();
     this.#sessionBootstrap = void 0;
-    const client = createAssistantClient({
-      sessionEndpoint: this.sessionEndpoint,
+    const behavior = {
       ...this.#context ? { context: this.#context } : {},
       clientContext: browserClientContext,
       ...this.#pageContext ? { pageContext: this.#pageContext } : {},
       ...this.#modelContext ? { modelContext: this.#modelContext } : {}
-    });
+    };
+    const client = this.embedId ? createAssistantClient({
+      embedId: this.embedId,
+      ...this.serviceUrl ? { serviceUrl: this.serviceUrl } : {},
+      ...behavior
+    }) : createAssistantClient({ sessionEndpoint: this.sessionEndpoint, ...behavior });
     this.#client = client;
-    this.#clientEndpoint = this.sessionEndpoint;
+    this.#clientEndpoint = key;
     this.#unsubscribeClient = client.subscribe((event) => {
       if (this.#client === client) this.#handleClientEvent(event);
     });
     return client;
   }
   #primeSession() {
-    if (!this.sessionEndpoint) return;
+    if (!this.sessionEndpoint && !this.embedId) return;
     const client = this.#ensureClient();
     const generation = this.#conversationGeneration;
     this.#setSessionState("loading");
@@ -32250,23 +32418,30 @@ var NoodleAssistantElement = class extends HTMLElementBase {
     }
     const detail = error51 instanceof AssistantClientError ? error51.detail : { code: fallbackCode, retryable: false };
     this.#appendRecoveryError(
-      detail.code === "session_expired" ? this.#appearance.labels.sessionExpired : this.#appearance.labels.unavailable
+      detail.code === "session_expired" ? this.#appearance.labels.sessionExpired : this.#appearance.labels.unavailable,
+      // A spent or switched-off daily budget offers no retry. Reconnecting cannot succeed, and every
+      // open tab trying is exactly the load the cap was set to refuse — so the button goes, not just
+      // the alarming words. A spent *session* keeps it: reconnect mints a fresh one, which is the fix.
+      detail.retryable !== false || detail.serviceCode === void 0
     );
     this.#dispatchError(detail);
   }
-  #appendRecoveryError(message) {
+  #appendRecoveryError(message, offerRetry = true) {
     if (!this.#messages) return;
     this.#messages.querySelector(".conversation-error")?.remove();
     const error51 = document.createElement("section");
     error51.className = "conversation-error";
-    error51.setAttribute("role", "alert");
+    error51.setAttribute("role", offerRetry ? "alert" : "status");
     const text3 = document.createElement("p");
     text3.textContent = message;
-    const retry = document.createElement("button");
-    retry.type = "button";
-    retry.textContent = this.#appearance.labels.reconnect;
-    retry.addEventListener("click", () => this.reconnect());
-    error51.append(text3, retry);
+    error51.append(text3);
+    if (offerRetry) {
+      const retry = document.createElement("button");
+      retry.type = "button";
+      retry.textContent = this.#appearance.labels.reconnect;
+      retry.addEventListener("click", () => this.reconnect());
+      error51.append(retry);
+    }
     this.#messages.append(error51);
     this.#revealLatest();
   }