@flutchai/flutch-sdk 0.1.23 → 0.1.25

package/dist/index.d.cts

@@ -635,7 +635,6 @@ declare class CallbackStore {
     private readonly redis;
     private readonly isProduction;
     constructor(redis: Redis);
-    private generateToken;
     issue(entry: CallbackEntry): Promise<string>;
     getAndLock(token: string): Promise<CallbackRecord | null>;
     private getAndLockAtomic;
@@ -1125,6 +1124,7 @@ interface ChannelState {
     contentChain: IContentBlock[];
     currentBlock: IContentBlock | null;
     pendingToolBlocks: IContentBlock[];
+    toolBlocksByRunId: Map<string, IContentBlock>;
 }
 interface StreamAccumulator {
     channels: Map<StreamChannel, ChannelState>;

package/dist/index.d.ts

@@ -635,7 +635,6 @@ declare class CallbackStore {
     private readonly redis;
     private readonly isProduction;
     constructor(redis: Redis);
-    private generateToken;
     issue(entry: CallbackEntry): Promise<string>;
     getAndLock(token: string): Promise<CallbackRecord | null>;
     private getAndLockAtomic;
@@ -1125,6 +1124,7 @@ interface ChannelState {
     contentChain: IContentBlock[];
     currentBlock: IContentBlock | null;
     pendingToolBlocks: IContentBlock[];
+    toolBlocksByRunId: Map<string, IContentBlock>;
 }
 interface StreamAccumulator {
     channels: Map<StreamChannel, ChannelState>;

package/dist/index.js

@@ -4,7 +4,7 @@ import { ApiOperation, ApiResponse, ApiTags, ApiParam, DocumentBuilder, SwaggerM
 import * as fs from 'fs';
 import * as path2 from 'path';
 import * as os from 'os';
-import { randomBytes, createHash, randomUUID } from 'crypto';
+import { createHash, randomUUID, randomBytes } from 'crypto';
 import { Registry, collectDefaultMetrics, Counter, Histogram, Gauge } from 'prom-client';
 import { NestFactory, MetadataScanner, ModuleRef, DiscoveryModule } from '@nestjs/core';
 import * as net from 'net';
@@ -1216,28 +1216,54 @@ var init_versioned_graph_service = __esm({
     ], VersionedGraphService);
   }
 });
+function generateCallbackToken(graphType) {
+  return `cb::${graphType}::${randomBytes(8).toString("base64url")}`;
+}
+function createCallbackRecord(entry, token, now) {
+  return {
+    ...entry,
+    token,
+    status: "pending",
+    createdAt: now,
+    retries: 0
+  };
+}
+function resolveCallbackTTL(entry) {
+  return entry.metadata?.ttlSec ?? 600;
+}
+function parseCallbackRecord(data) {
+  try {
+    return JSON.parse(data);
+  } catch {
+    return null;
+  }
+}
+function markAsFailed(record, error) {
+  return {
+    ...record,
+    status: "failed",
+    retries: (record.retries || 0) + 1,
+    lastError: error
+  };
+}
+function markAsPending(record) {
+  return { ...record, status: "pending" };
+}
+
+// src/callbacks/callback-store.ts
 var CallbackStore = class {
   constructor(redis) {
     this.redis = redis;
     this.isProduction = process.env.NODE_ENV === "production";
   }
   isProduction;
-  generateToken(graphType) {
-    return `cb::${graphType}::${randomBytes(8).toString("base64url")}`;
-  }
   /**
    * Issues a new callback token and persists its payload.
    */
   async issue(entry) {
-    const token = this.generateToken(entry.graphType);
-    const record = {
-      ...entry,
-      token,
-      status: "pending",
-      createdAt: Date.now(),
-      retries: 0
-    };
-    const ttl = entry.metadata?.ttlSec ?? 600;
+    const token = generateCallbackToken(entry.graphType);
+    const record = createCallbackRecord(entry, token, Date.now());
+    const ttl = resolveCallbackTTL(entry);
     await this.redis.setex(`callback:${token}`, ttl, JSON.stringify(record));
     return token;
   }
@@ -1252,7 +1278,9 @@ var CallbackStore = class {
     }
   }
   /**
-   * Production version with Lua script for atomicity
+   * Production version: uses Redis Lua scripting for atomic get-and-lock.
+   * NOTE: redis.eval() here executes a Lua script on the Redis server,
+   * NOT JavaScript eval(). This is the standard ioredis API for Lua scripting.
    */
   async getAndLockAtomic(token) {
     const script = `
@@ -1276,18 +1304,17 @@ var CallbackStore = class {
     if (!data) {
       return null;
     }
-    try {
-      const record = JSON.parse(data);
-      if (record.status !== "pending") {
-        return null;
-      }
-      record.status = "processing";
-      await this.redis.set(key, JSON.stringify(record));
-      return record;
-    } catch (error) {
-      console.error("Failed to parse callback record:", error);
+    const record = parseCallbackRecord(data);
+    if (!record) {
+      console.error("Failed to parse callback record");
+      return null;
+    }
+    if (record.status !== "pending") {
       return null;
     }
+    record.status = "processing";
+    await this.redis.set(key, JSON.stringify(record));
+    return record;
   }
   /**
    * Finalizes callback processing by removing token.
@@ -1306,7 +1333,8 @@ var CallbackStore = class {
     }
   }
   /**
-   * Production version with Lua script for atomicity
+   * Production version: uses Redis Lua scripting for atomic fail.
+   * NOTE: redis.eval() here executes a Lua script on the Redis server.
    */
   async failAtomic(token, error) {
     const script = `
@@ -1331,17 +1359,14 @@ var CallbackStore = class {
     if (!data) {
       return null;
     }
-    try {
-      const record = JSON.parse(data);
-      record.status = "failed";
-      record.retries = (record.retries || 0) + 1;
-      record.lastError = error;
-      await this.redis.set(key, JSON.stringify(record));
-      return record;
-    } catch (parseError) {
-      console.error("Failed to parse callback record:", parseError);
+    const record = parseCallbackRecord(data);
+    if (!record) {
+      console.error("Failed to parse callback record");
       return null;
     }
+    const updated = markAsFailed(record, error);
+    await this.redis.set(key, JSON.stringify(updated));
+    return updated;
   }
   /**
    * Reset callback status to pending for retry.
@@ -1354,7 +1379,8 @@ var CallbackStore = class {
     }
   }
   /**
-   * Production version with Lua script for atomicity
+   * Production version: uses Redis Lua scripting for atomic retry.
+   * NOTE: redis.eval() here executes a Lua script on the Redis server.
    */
   async retryAtomic(token) {
     const script = `
@@ -1377,15 +1403,14 @@ var CallbackStore = class {
     if (!data) {
       return null;
     }
-    try {
-      const record = JSON.parse(data);
-      record.status = "pending";
-      await this.redis.set(key, JSON.stringify(record));
-      return record;
-    } catch (parseError) {
-      console.error("Failed to parse callback record:", parseError);
+    const record = parseCallbackRecord(data);
+    if (!record) {
+      console.error("Failed to parse callback record");
       return null;
     }
+    const updated = markAsPending(record);
+    await this.redis.set(key, JSON.stringify(updated));
+    return updated;
   }
 };
 
@@ -3037,6 +3062,38 @@ CallbackController = __decorateClass([
 
 // src/graph/abstract-graph.builder.ts
 init_agent_ui();
+
+// src/graph/graph.logic.ts
+function isValidSemver(version) {
+  return /^\d+\.\d+\.\d+$/.test(version);
+}
+function parseCallbackToken(token) {
+  const parts = token.split("_");
+  if (parts.length < 4 || parts[0] !== "cb") {
+    return null;
+  }
+  const graphName = parts[1];
+  const handler = parts[2];
+  const graphType = `${graphName}::1.0.0`;
+  return { graphType, handler };
+}
+function decodeCallbackParams(token) {
+  const parts = token.split("_");
+  if (parts.length < 4) {
+    return {};
+  }
+  try {
+    const encodedParams = parts.slice(3).join("_");
+    const decodedParams = Buffer.from(encodedParams, "base64url").toString(
+      "utf8"
+    );
+    return JSON.parse(decodedParams);
+  } catch {
+    return {};
+  }
+}
+
+// src/graph/abstract-graph.builder.ts
 var _AbstractGraphBuilder = class _AbstractGraphBuilder {
   logger = new Logger(_AbstractGraphBuilder.name);
   callbackRegistry;
@@ -3245,8 +3302,7 @@ var _AbstractGraphBuilder = class _AbstractGraphBuilder {
    * Version validation
    */
   validateVersion() {
-    const versionRegex = /^\d+\.\d+\.\d+$/;
-    if (!versionRegex.test(this.version)) {
+    if (!isValidSemver(this.version)) {
       throw new Error(
         `Invalid version format: ${this.version}. Expected format: X.Y.Z`
       );
@@ -3596,36 +3652,21 @@ var UniversalGraphService = class {
    * Expected format: cb_{graphName}_{handler}_{encodedParams}
    */
   parseCallbackToken(token) {
-    const parts = token.split("_");
-    if (parts.length < 4 || parts[0] !== "cb") {
+    const result = parseCallbackToken(token);
+    if (!result) {
       throw new Error(`Invalid callback token format: ${token}`);
     }
-    const graphName = parts[1];
-    const handler = parts[2];
-    const graphType = `${graphName}::1.0.0`;
-    return { graphType, handler };
+    return result;
   }
   /**
    * Extract parameters from callback token
    */
   parseCallbackParams(token) {
-    const parts = token.split("_");
-    if (parts.length < 4) {
-      return {};
-    }
-    try {
-      const encodedParams = parts.slice(3).join("_");
-      const decodedParams = Buffer.from(encodedParams, "base64url").toString(
-        "utf8"
-      );
-      return JSON.parse(decodedParams);
-    } catch (error) {
-      this.logger.warn(
-        `Failed to parse callback params from token: ${token}`,
-        error
-      );
-      return {};
+    const result = decodeCallbackParams(token);
+    if (Object.keys(result).length === 0 && token.split("_").length >= 4) {
+      this.logger.warn(`Failed to parse callback params from token: ${token}`);
     }
+    return result;
   }
   /**
    * Call a graph endpoint
@@ -4421,11 +4462,21 @@ var EventProcessor = class {
       channels: /* @__PURE__ */ new Map([
         [
           "text" /* TEXT */,
-          { contentChain: [], currentBlock: null, pendingToolBlocks: [] }
+          {
+            contentChain: [],
+            currentBlock: null,
+            pendingToolBlocks: [],
+            toolBlocksByRunId: /* @__PURE__ */ new Map()
+          }
         ],
         [
           "processing" /* PROCESSING */,
-          { contentChain: [], currentBlock: null, pendingToolBlocks: [] }
+          {
+            contentChain: [],
+            currentBlock: null,
+            pendingToolBlocks: [],
+            toolBlocksByRunId: /* @__PURE__ */ new Map()
+          }
         ]
       ]),
       attachments: [],
@@ -4598,11 +4649,20 @@ var EventProcessor = class {
       return;
     }
     if (event.event === "on_tool_start") {
+      const channel = event.metadata?.stream_channel ?? "text" /* TEXT */;
+      const state = acc.channels.get(channel);
+      if (state && event.run_id) {
+        const idx = state.pendingToolBlocks.findIndex(
+          (b) => b.name === event.name
+        );
+        if (idx !== -1) {
+          const block = state.pendingToolBlocks.splice(idx, 1)[0];
+          state.toolBlocksByRunId.set(event.run_id, block);
+        }
+      }
       this.logger.log("\u{1F527} Tool execution started", {
         toolName: event.name,
-        input: event.data?.input,
-        runId: event.run_id,
-        metadata: event.metadata
+        runId: event.run_id
       });
       return;
     }
@@ -4610,7 +4670,13 @@ var EventProcessor = class {
       const channel = event.metadata?.stream_channel ?? "text" /* TEXT */;
       const state = acc.channels.get(channel);
       if (!state) return;
-      const toolBlock = state.pendingToolBlocks.shift();
+      let toolBlock;
+      if (event.run_id && state.toolBlocksByRunId.has(event.run_id)) {
+        toolBlock = state.toolBlocksByRunId.get(event.run_id);
+        state.toolBlocksByRunId.delete(event.run_id);
+      } else {
+        toolBlock = state.pendingToolBlocks.shift();
+      }
       if (toolBlock && toolBlock.type === "tool_use") {
         const output = event.data?.output;
         const outputString = typeof output === "string" ? output : JSON.stringify(output, null, 2);
@@ -4624,26 +4690,26 @@ var EventProcessor = class {
           },
           onPartial
         );
-        this.logger.log("\u2705 Tool execution completed", {
+        this.logger.log("\u2705 Tool completed", {
           toolName: event.name,
           toolBlockId: toolBlock.id,
-          outputPreview: outputString.substring(0, 200) + (outputString.length > 200 ? "..." : ""),
           runId: event.run_id
         });
       } else {
-        this.logger.warn(
-          "\u26A0\uFE0F on_tool_end received but no pending tool block found",
-          {
-            toolName: event.name,
-            runId: event.run_id,
-            pendingCount: state.pendingToolBlocks.length
-          }
-        );
+        this.logger.warn("\u26A0\uFE0F on_tool_end: no matching tool block", {
+          toolName: event.name,
+          runId: event.run_id
+        });
       }
       return;
     }
     if (event.event === "on_tool_error") {
-      this.logger.error("\u274C Tool execution failed", {
+      const channel = event.metadata?.stream_channel ?? "text" /* TEXT */;
+      const state = acc.channels.get(channel);
+      if (state && event.run_id) {
+        state.toolBlocksByRunId.delete(event.run_id);
+      }
+      this.logger.error("\u274C Tool failed", {
         toolName: event.name,
         error: event.data?.error,
         runId: event.run_id
@@ -4691,6 +4757,13 @@ var EventProcessor = class {
   getResult(acc) {
     const allChains = [];
     for (const [channel, state] of acc.channels.entries()) {
+      if (state.pendingToolBlocks.length > 0 || state.toolBlocksByRunId.size > 0) {
+        this.logger.warn("\u26A0\uFE0F Orphaned tool blocks detected at finalization", {
+          channel,
+          pendingCount: state.pendingToolBlocks.length,
+          mappedCount: state.toolBlocksByRunId.size
+        });
+      }
       if (state.currentBlock) {
         state.contentChain.push(state.currentBlock);
       }
@@ -5923,6 +5996,24 @@ var ChatFeature = /* @__PURE__ */ ((ChatFeature2) => {
   ChatFeature2["JSON_MODE"] = "json_mode";
   return ChatFeature2;
 })(ChatFeature || {});
+function isReasoningModel(modelName) {
+  return modelName.includes("gpt-5") || modelName.includes("gpt-o1") || modelName.includes("gpt-o2") || modelName.includes("gpt-o3") || modelName.includes("gpt-o4") || /^gpt-(5|6|7|8|9)/.test(modelName) || /^gpt-o[1-4]/.test(modelName);
+}
+function hashToolsConfig(toolsConfig) {
+  const sorted = toolsConfig.map((t) => `${t.toolName}:${t.enabled}:${JSON.stringify(t.config || {})}`).sort().join("|");
+  return createHash("md5").update(sorted).digest("hex").slice(0, 16);
+}
+function generateModelCacheKey(modelId, temperature, maxTokens, toolsConfig) {
+  const parts = [
+    modelId,
+    temperature ?? "default",
+    maxTokens ?? "default"
+  ];
+  if (toolsConfig && toolsConfig.length > 0) {
+    parts.push(hashToolsConfig(toolsConfig));
+  }
+  return parts.join(":");
+}
 var VoyageAIRerank = class extends BaseDocumentCompressor {
   apiKey;
   model;
@@ -6218,8 +6309,7 @@ var ModelInitializer = class _ModelInitializer {
    * Uses MD5 hash to create short, unique identifier
    */
   hashToolsConfig(toolsConfig) {
-    const sorted = toolsConfig.map((t) => `${t.toolName}:${t.enabled}:${JSON.stringify(t.config || {})}`).sort().join("|");
-    return createHash("md5").update(sorted).digest("hex").slice(0, 16);
+    return hashToolsConfig(toolsConfig);
   }
   /**
    * Generate cache key from ModelByIdConfig
@@ -6227,16 +6317,12 @@ var ModelInitializer = class _ModelInitializer {
    * Example: "model123:0.7:4096" or "model123:0.7:4096:a1b2c3d4e5f6g7h8"
    */
   generateModelCacheKey(config) {
-    const parts = [
+    return generateModelCacheKey(
       config.modelId,
-      config.temperature ?? "default",
-      config.maxTokens ?? "default"
-    ];
-    if (config.toolsConfig && config.toolsConfig.length > 0) {
-      const toolsHash = this.hashToolsConfig(config.toolsConfig);
-      parts.push(toolsHash);
-    }
-    return parts.join(":");
+      config.temperature,
+      config.maxTokens,
+      config.toolsConfig
+    );
   }
   /**
    * TEMPORARY SOLUTION for compatibility with new OpenAI models
@@ -6253,20 +6339,10 @@ var ModelInitializer = class _ModelInitializer {
    * @returns true if model requires maxCompletionTokens and temperature = 1
    */
   requiresMaxCompletionTokens(modelName) {
-    const requiresNew = modelName.includes("gpt-5") || modelName.includes("gpt-o1") || modelName.includes("gpt-o2") || modelName.includes("gpt-o3") || modelName.includes("gpt-o4") || // Add other patterns as new models are released
-    /^gpt-(5|6|7|8|9)/.test(modelName) || /^gpt-o[1-4]/.test(modelName);
+    const requiresNew = isReasoningModel(modelName);
     this.logger.debug(`Checking token parameter for model "${modelName}"`, {
       modelName,
-      requiresMaxCompletionTokens: requiresNew,
-      checks: {
-        includesGpt5: modelName.includes("gpt-5"),
-        includesO1: modelName.includes("gpt-o1"),
-        includesO2: modelName.includes("gpt-o2"),
-        includesO3: modelName.includes("gpt-o3"),
-        includesO4: modelName.includes("gpt-o4"),
-        regexGpt5Plus: /^gpt-(5|6|7|8|9)/.test(modelName),
-        regexO1to4: /^gpt-o[1-4]/.test(modelName)
-      }
+      requiresMaxCompletionTokens: requiresNew
     });
     return requiresNew;
   }