@distri/core 0.2.8 → 0.3.1

package/dist/index.mjs

@@ -860,29 +860,21 @@ var _DistriClient = class _DistriClient {
     this.tokenRefreshSkewMs = config.tokenRefreshSkewMs ?? 6e4;
     this.onTokenRefresh = config.onTokenRefresh;
     this.config = {
-      baseUrl: config.baseUrl?.replace(/\/$/, "") || DEFAULT_BASE_URL,
+      baseUrl: config.baseUrl.replace(/\/$/, ""),
       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 ?? (async (init) => Promise.resolve(init)),
-      onTokenRefresh: config.onTokenRefresh,
-      clientId: config.clientId
+      interceptor: config.interceptor || ((init) => Promise.resolve(init))
     };
-  }
-  /**
-   * 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;
+    this.debug("DistriClient initialized with config:", {
+      baseUrl: this.config.baseUrl,
+      hasAccessToken: !!this.accessToken,
+      hasRefreshToken: !!this.refreshToken,
+      timeout: this.config.timeout
+    });
   }
   /**
    * Create a client with default cloud configuration.
@@ -915,7 +907,7 @@ var _DistriClient = class _DistriClient {
     if (expiry) {
       body.expiry = typeof expiry === "string" ? expiry : expiry.toISOString();
     }
-    const resp = await this.fetch(`/sessions/${encodeURIComponent(sessionId)}/values`, {
+    const resp = await this.fetch(`/session/${encodeURIComponent(sessionId)}/values`, {
       method: "POST",
       headers: {
         "Content-Type": "application/json",
@@ -932,7 +924,7 @@ var _DistriClient = class _DistriClient {
    * Session store: get a single value
    */
   async getSessionValue(sessionId, key) {
-    const resp = await this.fetch(`/sessions/${encodeURIComponent(sessionId)}/values/${encodeURIComponent(key)}`, {
+    const resp = await this.fetch(`/session/${encodeURIComponent(sessionId)}/values/${encodeURIComponent(key)}`, {
       method: "GET",
       headers: {
         ...this.config.headers
@@ -949,7 +941,7 @@ var _DistriClient = class _DistriClient {
    * Session store: get all values in a session
    */
   async getSessionValues(sessionId) {
-    const resp = await this.fetch(`/sessions/${encodeURIComponent(sessionId)}/values`, {
+    const resp = await this.fetch(`/session/${encodeURIComponent(sessionId)}/values`, {
       method: "GET",
       headers: {
         ...this.config.headers
@@ -966,7 +958,7 @@ var _DistriClient = class _DistriClient {
    * Session store: delete a single key
    */
   async deleteSessionValue(sessionId, key) {
-    const resp = await this.fetch(`/sessions/${encodeURIComponent(sessionId)}/values/${encodeURIComponent(key)}`, {
+    const resp = await this.fetch(`/session/${encodeURIComponent(sessionId)}/values/${encodeURIComponent(key)}`, {
       method: "DELETE",
       headers: {
         ...this.config.headers
@@ -981,7 +973,7 @@ var _DistriClient = class _DistriClient {
    * Session store: clear all keys in a session
    */
   async clearSession(sessionId) {
-    const resp = await this.fetch(`/sessions/${encodeURIComponent(sessionId)}`, {
+    const resp = await this.fetch(`/session/${encodeURIComponent(sessionId)}`, {
       method: "DELETE",
       headers: {
         ...this.config.headers
@@ -992,6 +984,30 @@ 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).
@@ -1021,7 +1037,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);
+    this.applyTokens(tokens.access_token, tokens.refresh_token, false);
     return tokens;
   }
   /**
@@ -1034,18 +1050,13 @@ var _DistriClient = class _DistriClient {
    * Update the access/refresh tokens in memory.
    */
   setTokens(tokens) {
-    this.accessToken = tokens.accessToken;
-    if (tokens.refreshToken) {
+    if (tokens.accessToken !== void 0) {
+      this.accessToken = tokens.accessToken;
+    }
+    if (tokens.refreshToken !== void 0) {
       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
    */
@@ -1461,17 +1472,15 @@ var _DistriClient = class _DistriClient {
   get baseUrl() {
     return this.config.baseUrl;
   }
-  applyTokens(accessToken, refreshToken) {
+  applyTokens(accessToken, refreshToken, notify) {
     this.accessToken = accessToken;
-    if (refreshToken) {
-      this.refreshToken = refreshToken;
+    this.refreshToken = refreshToken;
+    if (notify && this.onTokenRefresh) {
+      this.onTokenRefresh({ accessToken, refreshToken });
     }
   }
-  /**
-   * Ensure access token is valid, refreshing if necessary
-   */
   async ensureAccessToken() {
-    if (!this.refreshToken && !this.onTokenRefresh) {
+    if (!this.refreshToken) {
       return;
     }
     if (!this.accessToken || this.isTokenExpiring(this.accessToken)) {
@@ -1483,7 +1492,7 @@ var _DistriClient = class _DistriClient {
     }
   }
   async refreshTokens() {
-    if (!this.refreshToken && !this.onTokenRefresh) {
+    if (!this.refreshToken) {
       return;
     }
     if (!this.refreshPromise) {
@@ -1494,17 +1503,6 @@ 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`,
       {
@@ -1528,7 +1526,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);
+    this.applyTokens(tokens.access_token, tokens.refresh_token, true);
   }
   isTokenExpiring(token) {
     const expiresAt = this.getTokenExpiry(token);
@@ -1623,7 +1621,7 @@ var _DistriClient = class _DistriClient {
           headers
         });
         clearTimeout(timeoutId);
-        if (!skipAuth && retryOnAuth && response.status === 401 && (this.refreshToken || this.onTokenRefresh)) {
+        if (!skipAuth && retryOnAuth && response.status === 401 && this.refreshToken) {
           const refreshed = await this.refreshTokens().then(() => true).catch(() => false);
           if (refreshed) {
             return this.fetchAbsolute(url, initialInit, { skipAuth, retryOnAuth: false });
@@ -1641,8 +1639,7 @@ var _DistriClient = class _DistriClient {
     throw lastError;
   }
   /**
-   * Enhanced fetch with retry logic and auth headers.
-   * Exposed publicly for extensions like DistriHomeClient.
+   * Enhanced fetch with retry logic
    */
   async fetch(input, initialInit) {
     const url = `${this.config.baseUrl}${input}`;
@@ -1715,6 +1712,13 @@ 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)
@@ -1740,25 +1744,6 @@ function uuidv4() {
 }
 
 // src/agent.ts
-var ExternalToolValidationError = class extends DistriError {
-  constructor(agentName, result) {
-    super(
-      result.message || "Missing required external tools for agent invocation.",
-      "EXTERNAL_TOOL_VALIDATION_ERROR",
-      {
-        agentName,
-        missingTools: result.missingTools,
-        requiredTools: result.requiredTools,
-        providedTools: result.providedTools
-      }
-    );
-    this.name = "ExternalToolValidationError";
-    this.agentName = agentName;
-    this.missingTools = result.missingTools;
-    this.requiredTools = result.requiredTools;
-    this.providedTools = result.providedTools;
-  }
-};
 var Agent = class _Agent {
   constructor(agentDefinition, client) {
     this.hookHandlers = /* @__PURE__ */ new Map();
@@ -1779,7 +1764,7 @@ var Agent = class _Agent {
     return this.agentDefinition.description;
   }
   get agentType() {
-    return this.agentDefinition.agent_type;
+    return this.agentDefinition.agent_type ?? this.agentDefinition.agentType;
   }
   get iconUrl() {
     return this.agentDefinition.icon_url;
@@ -1816,7 +1801,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") {
@@ -1837,38 +1822,12 @@ var Agent = class _Agent {
           yield converted;
         }
       }
-    }();
-  }
-  /**
-   * Validate that required external tools are registered before invoking.
-   */
-  validateExternalTools(tools = []) {
-    const requiredTools = this.getRequiredExternalTools();
-    const providedTools = tools.map((tool) => tool.name);
-    if (requiredTools.length === 0) {
-      return {
-        isValid: true,
-        requiredTools: [],
-        providedTools,
-        missingTools: []
-      };
-    }
-    const providedSet = new Set(providedTools);
-    const missingTools = requiredTools.filter((tool) => !providedSet.has(tool));
-    const isValid = missingTools.length === 0;
-    return {
-      isValid,
-      requiredTools,
-      providedTools,
-      missingTools,
-      message: isValid ? void 0 : this.formatExternalToolValidationMessage(requiredTools, missingTools)
-    };
+    })();
   }
   /**
    * Enhance message params with tool definitions
    */
   enhanceParamsWithTools(params, tools) {
-    this.assertExternalTools(tools);
     const metadata = {
       ...params.metadata,
       external_tools: tools?.map((tool) => ({
@@ -1883,36 +1842,6 @@ var Agent = class _Agent {
       metadata
     };
   }
-  assertExternalTools(tools) {
-    const result = this.validateExternalTools(tools ?? []);
-    if (!result.isValid) {
-      throw new ExternalToolValidationError(this.agentDefinition.name || this.agentDefinition.id, result);
-    }
-  }
-  getRequiredExternalTools() {
-    const toolConfig = this.resolveToolConfig();
-    if (!toolConfig?.external || !Array.isArray(toolConfig.external)) {
-      return [];
-    }
-    return toolConfig.external.filter((tool) => typeof tool === "string" && tool.trim().length > 0);
-  }
-  resolveToolConfig() {
-    const root = this.agentDefinition;
-    return this.extractToolConfig(root) || this.extractToolConfig(root?.agent) || this.extractToolConfig(root?.definition);
-  }
-  extractToolConfig(candidate) {
-    if (!candidate) return null;
-    const tools = candidate.tools;
-    if (!tools || Array.isArray(tools) || typeof tools !== "object") {
-      return null;
-    }
-    return tools;
-  }
-  formatExternalToolValidationMessage(requiredTools, missingTools) {
-    const requiredList = requiredTools.join(", ");
-    const missingList = missingTools.join(", ");
-    return `Agent has external tools that are not registered: ${missingList}. This is an embedded agent that can run within the parent application. Register DistriWidget for embedding the parent component. Required tools: ${requiredList}.`;
-  }
   /**
    * Register multiple hooks at once.
    */
@@ -1929,13 +1858,12 @@ 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: tools.map((t) => ({
+      tools: agentDefinition.tools?.map((t) => ({
         name: t.name,
-        type: "function"
+        type: t.type || "function"
       })) || [],
       toolCount: agentDefinition.tools?.length || 0
     });
@@ -1963,7 +1891,6 @@ export {
   DEFAULT_BASE_URL,
   DistriClient,
   DistriError,
-  ExternalToolValidationError,
   convertA2AMessageToDistri,
   convertA2APartToDistri,
   convertA2AStatusUpdateToDistri,