@jigs.design/ai-sdk 0.3.2 → 0.3.4

package/dist/model.d.ts

@@ -4,18 +4,22 @@ import { Instructions, LanguageModel, streamText } from "ai";
 /** `streamText` settings that apply to every call, such as `temperature`. */
 export type ModelSettings = Omit<Parameters<typeof streamText>[0], "abortSignal" | "instructions" | "messages" | "model" | "prompt" | "system">;
 /**
- * `system` as instructions whose first part, `prefix`, a provider may cache:
- * two system messages, the first marked as a cache breakpoint for providers
- * that need one (Anthropic). Providers that cache a repeated prefix on their
- * own (OpenAI, DeepSeek, Google) read the two as one. Without a prefix that
- * `system` starts with, `system` alone.
+ * `system` as instructions a provider may cache: two system messages, its
+ * first part `prefix` and the rest, each marked as a cache breakpoint for
+ * providers that need one (Anthropic). The first mark keeps the prefix
+ * cached when the rest changes; the second caches the rest too while it
+ * does not, as it does not for a host whose procedures and instructions
+ * are fixed, so a turn reads the whole prompt from the cache. Two of
+ * Anthropic's four breakpoints. Providers that cache a repeated prefix on
+ * their own (OpenAI, DeepSeek, Google) read the two as one. Without a
+ * prefix that `system` starts with, `system` alone.
  */
 export declare function cachedInstructions(system: string, prefix: string): Instructions;
 /**
  * A `model` for `withModel` from an AI SDK model: document-mode
  * sessions and chat repairs stream through `streamText`, and token usage
- * reaches `onTurn`. The prompt's stable start is marked for the provider's
- * cache (`cachedInstructions`).
+ * reaches `onTurn`. The prompt's stable start and its end are marked for
+ * the provider's cache (`cachedInstructions`).
  */
 export declare function aiSdkModel(model: LanguageModel, settings?: ModelSettings): ModelFunction<unknown, unknown>;
 //#endregion

package/dist/model.js

@@ -1,28 +1,32 @@
 import { streamText } from "ai";
 //#region src/model.ts
+/** A system message marked as an Anthropic cache breakpoint. */
+const cachedMessage = (content) => ({
+	content,
+	providerOptions: { anthropic: { cacheControl: { type: "ephemeral" } } },
+	role: "system"
+});
 /**
-* `system` as instructions whose first part, `prefix`, a provider may cache:
-* two system messages, the first marked as a cache breakpoint for providers
-* that need one (Anthropic). Providers that cache a repeated prefix on their
-* own (OpenAI, DeepSeek, Google) read the two as one. Without a prefix that
-* `system` starts with, `system` alone.
+* `system` as instructions a provider may cache: two system messages, its
+* first part `prefix` and the rest, each marked as a cache breakpoint for
+* providers that need one (Anthropic). The first mark keeps the prefix
+* cached when the rest changes; the second caches the rest too while it
+* does not, as it does not for a host whose procedures and instructions
+* are fixed, so a turn reads the whole prompt from the cache. Two of
+* Anthropic's four breakpoints. Providers that cache a repeated prefix on
+* their own (OpenAI, DeepSeek, Google) read the two as one. Without a
+* prefix that `system` starts with, `system` alone.
 */
 function cachedInstructions(system, prefix) {
 	if (prefix === "" || !system.startsWith(prefix)) return system;
-	return [{
-		content: prefix,
-		providerOptions: { anthropic: { cacheControl: { type: "ephemeral" } } },
-		role: "system"
-	}, {
-		content: system.slice(prefix.length),
-		role: "system"
-	}];
+	const rest = system.slice(prefix.length);
+	return rest === "" ? [cachedMessage(prefix)] : [cachedMessage(prefix), cachedMessage(rest)];
 }
 /**
 * A `model` for `withModel` from an AI SDK model: document-mode
 * sessions and chat repairs stream through `streamText`, and token usage
-* reaches `onTurn`. The prompt's stable start is marked for the provider's
-* cache (`cachedInstructions`).
+* reaches `onTurn`. The prompt's stable start and its end are marked for
+* the provider's cache (`cachedInstructions`).
 */
 function aiSdkModel(model, settings = {}) {
 	return async function* (request) {

package/dist/tool-data.d.ts

@@ -37,7 +37,9 @@ export interface ToolDataOptions {
  * reply that wrote it; else its previous version's value; else the latest
  * value earlier in the conversation. A failed or refused call in that reply
  * removes the tool's entry, so the block shows its empty state rather than
- * an older result. A tool called twice in one step leaves the last result.
+ * an older result. Each call is also under its number among that tool's
+ * calls in the latest reply that called it, `searchFlights#2` for the
+ * second, so blocks of a reply that called a tool twice read one each.
  * While a block's results are the same, it gets the same object, so the view
  * does not compare them again.
  */

package/dist/tool-data.js

@@ -76,13 +76,20 @@ function toolValue(part) {
 	values.set(part, value ?? null);
 	return value;
 }
-/** What a finished tool part does to a snapshot: sets its tool's value, or removes it. */
-function apply(snapshot, part, value) {
-	const name = toolNameOf(part) ?? "";
-	if (value === void 0) snapshot.delete(name);
-	else snapshot.set(name, {
-		id: `${part.toolCallId}:${part.state}`,
-		value
+/**
+* What a settled call does to a snapshot: sets or removes its tool's
+* latest value and that of its numbered key, `name#n`. The first to settle
+* of a message's calls of a tool drops the numbered keys an earlier reply
+* left, so `name#n` is always the latest reply's.
+*/
+function apply(snapshot, call) {
+	if (call.first) {
+		for (const key of snapshot.keys()) if (key.startsWith(`${call.name}#`)) snapshot.delete(key);
+	}
+	for (const key of [call.name, `${call.name}#${call.ordinal}`]) if (call.value === void 0) snapshot.delete(key);
+	else snapshot.set(key, {
+		id: `${call.part.toolCallId}:${call.part.state}`,
+		value: call.value
 	});
 }
 /** Whether a part settles its tool's value: a final output, an error or a refusal. */
@@ -118,7 +125,9 @@ const DEFAULT_VALUE = {};
 * reply that wrote it; else its previous version's value; else the latest
 * value earlier in the conversation. A failed or refused call in that reply
 * removes the tool's entry, so the block shows its empty state rather than
-* an older result. A tool called twice in one step leaves the last result.
+* an older result. Each call is also under its number among that tool's
+* calls in the latest reply that called it, `searchFlights#2` for the
+* second, so blocks of a reply that called a tool twice read one each.
 * While a block's results are the same, it gets the same object, so the view
 * does not compare them again.
 */
@@ -134,21 +143,26 @@ function toolData(messages, options = {}) {
 		const before = new Map(conversation);
 		/** The settled tool calls of this message so far, in order. */
 		const settled = [];
+		/** The calls of each tool in this message so far, settled or not. */
+		const counts = /* @__PURE__ */ new Map();
 		for (const part of message.parts) {
 			if (isToolPart(part)) {
-				if (settles(part)) {
-					const value = valueOf === void 0 ? toolValue(part) : valueOf(toolNameOf(part) ?? "", part);
-					settled.push({
-						part,
-						value
-					});
-				}
+				const name = toolNameOf(part) ?? "";
+				const ordinal = (counts.get(name) ?? 0) + 1;
+				counts.set(name, ordinal);
+				if (settles(part)) settled.push({
+					first: !settled.some((call) => call.name === name),
+					name,
+					ordinal,
+					part,
+					value: valueOf === void 0 ? toolValue(part) : valueOf(name, part)
+				});
 				continue;
 			}
 			if (!isBlockPart(part)) continue;
 			const block = part.data;
 			const snapshot = new Map(versions.get(block.name) ?? before);
-			for (const entry of settled) apply(snapshot, entry.part, entry.value);
+			for (const call of settled) apply(snapshot, call);
 			versions.set(block.name, snapshot);
 			if (block.toolKeys === void 0) continue;
 			const projected = project(snapshot, block.toolKeys);
@@ -164,7 +178,7 @@ function toolData(messages, options = {}) {
 			});
 			result.set(block.key, data);
 		}
-		for (const entry of settled) apply(conversation, entry.part, entry.value);
+		for (const call of settled) apply(conversation, call);
 	}
 	return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jigs.design/ai-sdk",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Jigs on the AI SDK: a model function for createJigsServer, and chat mode for useChat.",
   "license": "MIT",
   "repository": {
@@ -29,8 +29,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@jigs.design/protocol": "0.3.2",
-    "@jigs.design/server": "0.3.2"
+    "@jigs.design/protocol": "0.3.4",
+    "@jigs.design/server": "0.3.4"
   },
   "peerDependencies": {
     "ai": "^7.0.0",
@@ -40,7 +40,7 @@
     "@ai-sdk/provider": "4.0.27",
     "ai": "7.0.140",
     "zod": "4.6.7",
-    "@jigs.design/catalog": "0.3.2",
-    "@jigs.design/host": "0.3.2"
+    "@jigs.design/catalog": "0.3.4",
+    "@jigs.design/host": "0.3.4"
   }
 }