@distri/core 0.2.5 → 0.2.8

package/dist/index.mjs

@@ -121,7 +121,7 @@ function isDistriEvent(event) {
   return "type" in event && "data" in event;
 }
 
-// ../../../node_modules/.pnpm/@a2a-js+sdk@https+++codeload.github.com+v3g42+a2a-js+tar.gz+51444c9/node_modules/@a2a-js/sdk/dist/chunk-CUGIRVQB.js
+// ../../node_modules/.pnpm/@a2a-js+sdk@https+++codeload.github.com+v3g42+a2a-js+tar.gz+51444c9/node_modules/@a2a-js/sdk/dist/chunk-CUGIRVQB.js
 var A2AClient = class {
   /**
    * Constructs an A2AClient instance.
@@ -860,21 +860,29 @@ var _DistriClient = class _DistriClient {
     this.tokenRefreshSkewMs = config.tokenRefreshSkewMs ?? 6e4;
     this.onTokenRefresh = config.onTokenRefresh;
     this.config = {
-      baseUrl: config.baseUrl.replace(/\/$/, ""),
+      baseUrl: config.baseUrl?.replace(/\/$/, "") || DEFAULT_BASE_URL,
       apiVersion: config.apiVersion || "v1",
-      timeout: config.timeout || 3e4,
-      retryAttempts: config.retryAttempts || 3,
-      retryDelay: config.retryDelay || 1e3,
-      debug: config.debug || false,
+      timeout: config.timeout ?? 3e4,
+      retryAttempts: config.retryAttempts ?? 3,
+      retryDelay: config.retryDelay ?? 1e3,
+      debug: config.debug ?? false,
       headers,
-      interceptor: config.interceptor || ((init) => Promise.resolve(init))
+      interceptor: config.interceptor ?? (async (init) => Promise.resolve(init)),
+      onTokenRefresh: config.onTokenRefresh,
+      clientId: config.clientId
     };
-    this.debug("DistriClient initialized with config:", {
-      baseUrl: this.config.baseUrl,
-      hasAccessToken: !!this.accessToken,
-      hasRefreshToken: !!this.refreshToken,
-      timeout: this.config.timeout
-    });
+  }
+  /**
+   * Get the configured client ID.
+   */
+  get clientId() {
+    return this.config.clientId;
+  }
+  /**
+   * Set the client ID for embed token issuance.
+   */
+  set clientId(value) {
+    this.config.clientId = value;
   }
   /**
    * Create a client with default cloud configuration.
@@ -907,7 +915,7 @@ var _DistriClient = class _DistriClient {
     if (expiry) {
       body.expiry = typeof expiry === "string" ? expiry : expiry.toISOString();
     }
-    const resp = await this.fetch(`/session/${encodeURIComponent(sessionId)}/values`, {
+    const resp = await this.fetch(`/sessions/${encodeURIComponent(sessionId)}/values`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -924,7 +932,7 @@ var _DistriClient = class _DistriClient {
    * Session store: get a single value
    */
   async getSessionValue(sessionId, key) {
-    const resp = await this.fetch(`/session/${encodeURIComponent(sessionId)}/values/${encodeURIComponent(key)}`, {
+    const resp = await this.fetch(`/sessions/${encodeURIComponent(sessionId)}/values/${encodeURIComponent(key)}`, {
       method: "GET",
       headers: {
         ...this.config.headers
@@ -941,7 +949,7 @@ var _DistriClient = class _DistriClient {
    * Session store: get all values in a session
    */
   async getSessionValues(sessionId) {
-    const resp = await this.fetch(`/session/${encodeURIComponent(sessionId)}/values`, {
+    const resp = await this.fetch(`/sessions/${encodeURIComponent(sessionId)}/values`, {
       method: "GET",
       headers: {
         ...this.config.headers
@@ -958,7 +966,7 @@ var _DistriClient = class _DistriClient {
    * Session store: delete a single key
    */
   async deleteSessionValue(sessionId, key) {
-    const resp = await this.fetch(`/session/${encodeURIComponent(sessionId)}/values/${encodeURIComponent(key)}`, {
+    const resp = await this.fetch(`/sessions/${encodeURIComponent(sessionId)}/values/${encodeURIComponent(key)}`, {
       method: "DELETE",
       headers: {
         ...this.config.headers
@@ -973,7 +981,7 @@ var _DistriClient = class _DistriClient {
    * Session store: clear all keys in a session
    */
   async clearSession(sessionId) {
-    const resp = await this.fetch(`/session/${encodeURIComponent(sessionId)}`, {
+    const resp = await this.fetch(`/sessions/${encodeURIComponent(sessionId)}`, {
       method: "DELETE",
       headers: {
         ...this.config.headers
@@ -984,30 +992,6 @@ var _DistriClient = class _DistriClient {
       throw new ApiError(errorData.error || "Failed to clear session", resp.status);
     }
   }
-  /**
-   * Set additional user message parts for the next agent iteration.
-   * These parts will be appended to the user message in the prompt.
-   * @param sessionId - The thread/session ID
-   * @param parts - Array of DistriPart objects to append to user message
-   */
-  async setAdditionalUserParts(sessionId, parts) {
-    await this.setSessionValue(sessionId, _DistriClient.ADDITIONAL_PARTS_KEY, parts);
-  }
-  /**
-   * Get the current additional user message parts.
-   * @param sessionId - The thread/session ID
-   * @returns Array of DistriPart objects or null if not set
-   */
-  async getAdditionalUserParts(sessionId) {
-    return this.getSessionValue(sessionId, _DistriClient.ADDITIONAL_PARTS_KEY);
-  }
-  /**
-   * Clear/delete the additional user message parts.
-   * @param sessionId - The thread/session ID
-   */
-  async clearAdditionalUserParts(sessionId) {
-    await this.deleteSessionValue(sessionId, _DistriClient.ADDITIONAL_PARTS_KEY);
-  }
   /**
    * Issue an access token + refresh token for temporary authentication.
    * Requires an existing authenticated session (bearer token).
@@ -1037,7 +1021,7 @@ var _DistriClient = class _DistriClient {
     if (!tokens?.access_token || !tokens?.refresh_token || typeof tokens?.expires_at !== "number") {
       throw new ApiError("Invalid token response", response.status);
     }
-    this.applyTokens(tokens.access_token, tokens.refresh_token, false);
+    this.applyTokens(tokens.access_token, tokens.refresh_token);
     return tokens;
   }
   /**
@@ -1050,13 +1034,18 @@ var _DistriClient = class _DistriClient {
    * Update the access/refresh tokens in memory.
    */
   setTokens(tokens) {
-    if (tokens.accessToken !== void 0) {
-      this.accessToken = tokens.accessToken;
-    }
-    if (tokens.refreshToken !== void 0) {
+    this.accessToken = tokens.accessToken;
+    if (tokens.refreshToken) {
       this.refreshToken = tokens.refreshToken;
     }
   }
+  /**
+   * Reset all authentication tokens.
+   */
+  resetTokens() {
+    this.accessToken = void 0;
+    this.refreshToken = void 0;
+  }
   /**
    * Start streaming speech-to-text transcription via WebSocket
    */
@@ -1472,15 +1461,17 @@ var _DistriClient = class _DistriClient {
   get baseUrl() {
     return this.config.baseUrl;
   }
-  applyTokens(accessToken, refreshToken, notify) {
+  applyTokens(accessToken, refreshToken) {
     this.accessToken = accessToken;
-    this.refreshToken = refreshToken;
-    if (notify && this.onTokenRefresh) {
-      this.onTokenRefresh({ accessToken, refreshToken });
+    if (refreshToken) {
+      this.refreshToken = refreshToken;
     }
   }
+  /**
+   * Ensure access token is valid, refreshing if necessary
+   */
   async ensureAccessToken() {
-    if (!this.refreshToken) {
+    if (!this.refreshToken && !this.onTokenRefresh) {
       return;
     }
     if (!this.accessToken || this.isTokenExpiring(this.accessToken)) {
@@ -1492,7 +1483,7 @@ var _DistriClient = class _DistriClient {
     }
   }
   async refreshTokens() {
-    if (!this.refreshToken) {
+    if (!this.refreshToken && !this.onTokenRefresh) {
       return;
     }
     if (!this.refreshPromise) {
@@ -1503,6 +1494,17 @@ var _DistriClient = class _DistriClient {
     return this.refreshPromise;
   }
   async performTokenRefresh() {
+    if (this.onTokenRefresh) {
+      this.accessToken = void 0;
+      const newToken = await this.onTokenRefresh();
+      if (newToken) {
+        this.applyTokens(newToken);
+        return;
+      }
+    }
+    if (!this.refreshToken) {
+      return;
+    }
     const response = await this.fetchAbsolute(
       `${this.config.baseUrl}/token`,
       {
@@ -1526,7 +1528,7 @@ var _DistriClient = class _DistriClient {
     if (!tokens?.access_token || !tokens?.refresh_token) {
       throw new ApiError("Invalid token response", response.status);
     }
-    this.applyTokens(tokens.access_token, tokens.refresh_token, true);
+    this.applyTokens(tokens.access_token, tokens.refresh_token);
   }
   isTokenExpiring(token) {
     const expiresAt = this.getTokenExpiry(token);
@@ -1621,7 +1623,7 @@ var _DistriClient = class _DistriClient {
           headers
         });
         clearTimeout(timeoutId);
-        if (!skipAuth && retryOnAuth && response.status === 401 && this.refreshToken) {
+        if (!skipAuth && retryOnAuth && response.status === 401 && (this.refreshToken || this.onTokenRefresh)) {
           const refreshed = await this.refreshTokens().then(() => true).catch(() => false);
           if (refreshed) {
             return this.fetchAbsolute(url, initialInit, { skipAuth, retryOnAuth: false });
@@ -1639,7 +1641,8 @@ var _DistriClient = class _DistriClient {
     throw lastError;
   }
   /**
-   * Enhanced fetch with retry logic
+   * Enhanced fetch with retry logic and auth headers.
+   * Exposed publicly for extensions like DistriHomeClient.
    */
   async fetch(input, initialInit) {
     const url = `${this.config.baseUrl}${input}`;
@@ -1712,13 +1715,6 @@ var _DistriClient = class _DistriClient {
   }
 };
 // ============================================================
-// Additional User Message Parts API
-// ============================================================
-// These methods allow external tools to append parts (text, images)
-// to the user message in the next agent iteration.
-// The parts are stored under the key "__additional_user_parts".
-_DistriClient.ADDITIONAL_PARTS_KEY = "__additional_user_parts";
-// ============================================================
 // Token API
 // ============================================================
 // Issue access + refresh tokens for temporary authentication (e.g., frontend use)
@@ -1783,7 +1779,7 @@ var Agent = class _Agent {
     return this.agentDefinition.description;
   }
   get agentType() {
-    return this.agentDefinition.agent_type ?? this.agentDefinition.agentType;
+    return this.agentDefinition.agent_type;
   }
   get iconUrl() {
     return this.agentDefinition.icon_url;
@@ -1820,7 +1816,7 @@ var Agent = class _Agent {
     const enhancedParams = this.enhanceParamsWithTools(params, tools);
     const a2aStream = this.client.sendMessageStream(this.agentDefinition.id, enhancedParams);
     const self = this;
-    return (async function* () {
+    return async function* () {
       for await (const event of a2aStream) {
         const converted = decodeA2AStreamEvent(event);
         if (converted && converted.type === "inline_hook_requested") {
@@ -1841,7 +1837,7 @@ var Agent = class _Agent {
           yield converted;
         }
       }
-    })();
+    }();
   }
   /**
    * Validate that required external tools are registered before invoking.
@@ -1933,12 +1929,13 @@ var Agent = class _Agent {
    */
   static async create(agentIdOrDef, client) {
     const agentDefinition = typeof agentIdOrDef === "string" ? await client.getAgent(agentIdOrDef) : agentIdOrDef;
+    const tools = agentDefinition?.resolved_tools || [];
     console.log("\u{1F916} Agent definition loaded:", {
       id: agentDefinition.id,
       name: agentDefinition.name,
-      tools: agentDefinition.tools?.map((t) => ({
+      tools: tools.map((t) => ({
         name: t.name,
-        type: t.type || "function"
+        type: "function"
       })) || [],
       toolCount: agentDefinition.tools?.length || 0
     });