@cartanova/qgrid-ai-sdk 2.4.1 → 2.4.2

package/dist/index.js

@@ -3,7 +3,7 @@ const QGRID_PROVIDER_NAME = "qgrid";
 const THREAD_COORD_TTL_MS = 10 * 6e4;
 const TEXT_STREAM_ID_PREFIX = "text";
 const TOP_LEVEL_SCHEMA_WARNING = "OpenAI structured output requires \"object\". Falling back to client-side parsing.";
-const PENDING_TOOL_RESULTS_WARNING = "[qgrid] pending tool results not found in prompt, clearing client run state";
+const PENDING_TOOL_RESULTS_WARNING = "[qgrid] tool results did not match any pending qgrid run; sending request without runContext";
 //#endregion
 //#region src/utils.ts
 async function createRun(serverUrl, body) {
@@ -659,7 +659,39 @@ function qgrid(modelId, config) {
 	const serverUrl = config?.serverUrl ?? process.env.QGRID_URL ?? "http://localhost:44900";
 	const effort = config?.defaultEffort ?? "low";
 	const projectName = config?.projectName ?? process.env.QGRID_PROJECT_NAME;
-	let clientRun = null;
+	const clientRuns = /* @__PURE__ */ new Map();
+	let anonymousClientRunId = 0;
+	function clientRunKey(runContext) {
+		if (runContext.requestLogId !== void 0) return `request:${runContext.requestLogId}`;
+		if (runContext.threadCoord) {
+			const { workerId, epoch, threadId } = runContext.threadCoord;
+			return `thread:${workerId}:${epoch}:${threadId}`;
+		}
+		anonymousClientRunId++;
+		return `anonymous:${anonymousClientRunId}`;
+	}
+	function rememberClientRun(runContext, toolCallIds) {
+		if (toolCallIds.length === 0) return;
+		clientRuns.set(clientRunKey(runContext), {
+			runContext,
+			pendingToolCallIds: new Set(toolCallIds)
+		});
+	}
+	function matchClientRun(messages) {
+		const toolResults = extractToolResultsFromHistory(messages);
+		if (toolResults.length === 0) return null;
+		const resultIds = new Set(toolResults.map((r) => r.callId));
+		for (const [key, run] of clientRuns) if (run.pendingToolCallIds.size > 0 && [...run.pendingToolCallIds].every((id) => resultIds.has(id))) return {
+			key,
+			runContext: run.runContext,
+			toolResultsPayload: toolResults.filter((r) => run.pendingToolCallIds.has(r.callId)).map((r) => ({
+				toolCallId: r.callId,
+				output: r.result
+			}))
+		};
+		if (clientRuns.size > 0) console.warn(PENDING_TOOL_RESULTS_WARNING);
+		return null;
+	}
 	return {
 		specificationVersion: "v3",
 		provider: QGRID_PROVIDER_NAME,
@@ -687,20 +719,11 @@ function qgrid(modelId, config) {
 			let runContext;
 			let toolResultsPayload;
 			let logMode;
-			if (clientRun) {
-				const toolResults = extractToolResultsFromHistory(options.prompt);
-				const resultIds = new Set(toolResults.map((r) => r.callId));
-				if (clientRun.pendingToolCallIds.size > 0 && [...clientRun.pendingToolCallIds].every((id) => resultIds.has(id))) {
-					runContext = clientRun.runContext;
-					toolResultsPayload = toolResults.filter((r) => clientRun.pendingToolCallIds.has(r.callId)).map((r) => ({
-						toolCallId: r.callId,
-						output: r.result
-					}));
-					logMode = "run";
-				} else {
-					console.warn(PENDING_TOOL_RESULTS_WARNING);
-					clientRun = null;
-				}
+			const matchedClientRun = matchClientRun(options.prompt);
+			if (matchedClientRun) {
+				runContext = matchedClientRun.runContext;
+				toolResultsPayload = matchedClientRun.toolResultsPayload;
+				logMode = "run";
 			}
 			const storedCoord = reuseSessionKey ? getThreadCoord(reuseSessionKey) : void 0;
 			if (!runContext && storedCoord) runContext = { threadCoord: storedCoord };
@@ -765,11 +788,8 @@ function qgrid(modelId, config) {
 				text: data.text
 			});
 			if (imageGeneration && !content.some((c) => c.type === "file")) throw new Error("qgrid: imageGeneration was requested but the response contained no image — the server may be an older version that does not support image generation.");
-			if (data.runContext && finishReason.unified === "tool-calls") clientRun = {
-				runContext: data.runContext,
-				pendingToolCallIds: new Set(content.filter((c) => c.type === "tool-call").map((c) => c.toolCallId))
-			};
-			else clientRun = null;
+			if (matchedClientRun) clientRuns.delete(matchedClientRun.key);
+			if (data.runContext && finishReason.unified === "tool-calls") rememberClientRun(data.runContext, content.filter((c) => c.type === "tool-call").map((c) => c.toolCallId));
 			if (reuseSessionKey && data.runContext?.threadCoord) setThreadCoord(reuseSessionKey, data.runContext.threadCoord);
 			return {
 				content,
@@ -803,20 +823,11 @@ function qgrid(modelId, config) {
 			let runContext;
 			let toolResultsPayload;
 			let logMode;
-			if (clientRun) {
-				const toolResults = extractToolResultsFromHistory(options.prompt);
-				const resultIds = new Set(toolResults.map((r) => r.callId));
-				if (clientRun.pendingToolCallIds.size > 0 && [...clientRun.pendingToolCallIds].every((id) => resultIds.has(id))) {
-					runContext = clientRun.runContext;
-					toolResultsPayload = toolResults.filter((r) => clientRun.pendingToolCallIds.has(r.callId)).map((r) => ({
-						toolCallId: r.callId,
-						output: r.result
-					}));
-					logMode = "run";
-				} else {
-					console.warn(PENDING_TOOL_RESULTS_WARNING);
-					clientRun = null;
-				}
+			const matchedClientRun = matchClientRun(options.prompt);
+			if (matchedClientRun) {
+				runContext = matchedClientRun.runContext;
+				toolResultsPayload = matchedClientRun.toolResultsPayload;
+				logMode = "run";
 			}
 			const storedCoord = reuseSessionKey ? getThreadCoord(reuseSessionKey) : void 0;
 			if (!runContext && storedCoord) runContext = { threadCoord: storedCoord };
@@ -883,11 +894,8 @@ function qgrid(modelId, config) {
 							textStarted = false;
 						}
 						const done = event.data;
-						if (done.runContext && done.finishReason === "tool-calls") clientRun = {
-							runContext: done.runContext,
-							pendingToolCallIds: new Set((done.content ?? []).filter((c) => c.type === "tool-call").map((c) => c.toolCallId))
-						};
-						else clientRun = null;
+						if (matchedClientRun) clientRuns.delete(matchedClientRun.key);
+						if (done.runContext && done.finishReason === "tool-calls") rememberClientRun(done.runContext, (done.content ?? []).filter((c) => c.type === "tool-call").map((c) => c.toolCallId));
 						if (reuseSessionKey && done.runContext?.threadCoord) setThreadCoord(reuseSessionKey, done.runContext.threadCoord);
 						if (done.content) {
 							for (const item of done.content) if (item.type === "text" && !deltaTextEmitted) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartanova/qgrid-ai-sdk",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "AI SDK LanguageModelV3 provider for qgrid",
   "repository": {
     "type": "git",