thaipass 0.1.2 → 0.1.4

package/dist/index.js

@@ -77,6 +77,7 @@ const ANY_MODELS = [...CHAT_MODELS, ...MEDIA_MODELS];
 z.enum(ANY_MODELS, { error: "unknown model, see GET /v1/models" });
 const current = {
 	origin: "https://de.aipass.net",
+	pricesUrl: "https://openrouter.ai/api/v1/models",
 	userAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/151.0.0.0 Safari/537.36"
 };
 const config = current;
@@ -651,6 +652,21 @@ const toolErrorSchema = (type) => z.object({
 	toolName: optionalText,
 	type: z.literal(type)
 });
+const SWITCH_DETAIL_LIMIT = 120;
+const namedModelSchema = z.object({
+	model: optionalText,
+	modelId: optionalText,
+	to: optionalText
+});
+/** The payload is undocumented, so an unnamed one is kept verbatim for the first production sample to show. */
+const switchDetailSchema = z.unknown().transform((data) => {
+	const named = namedModelSchema.safeParse(data);
+	if (named.success) {
+		const found = named.data.modelId ?? named.data.model ?? named.data.to;
+		if (found !== void 0 && found.length > 0) return found;
+	}
+	return JSON.stringify(data ?? null).slice(0, SWITCH_DETAIL_LIMIT);
+});
 const upstreamEventSchema = z.discriminatedUnion("type", [
 	z.object({
 		delta: z.string(),
@@ -660,6 +676,10 @@ const upstreamEventSchema = z.discriminatedUnion("type", [
 		delta: z.string(),
 		type: z.literal("reasoning-delta")
 	}),
+	z.object({
+		data: switchDetailSchema,
+		type: z.literal("data-model_switched")
+	}),
 	fileFrameSchema,
 	z.object({
 		finishReason: optionalText,
@@ -711,6 +731,12 @@ const parseAipassSSE = async function* parseAipassSSE(body, skips) {
 					text: event.delta
 				};
 				break;
+			case "data-model_switched":
+				yield {
+					detail: event.data,
+					kind: "switch"
+				};
+				break;
 			case "file":
 				yield {
 					file: toFileEvent(event),
@@ -724,12 +750,15 @@ const parseAipassSSE = async function* parseAipassSSE(body, skips) {
 				};
 				break;
 			case "tool-input-error":
-			case "tool-output-error":
+			case "tool-output-error": {
+				const tool = event.toolName ?? "a tool";
 				yield {
 					kind: "error",
-					message: `upstream failed on ${event.toolName ?? "a tool"}: ${event.errorText ?? "no detail"}`
+					message: `upstream failed on ${tool}: ${event.errorText ?? "no detail"}`,
+					tool
 				};
 				break;
+			}
 			default: yield {
 				kind: "error",
 				message: event.errorText ?? event.error ?? "upstream error"
@@ -815,9 +844,47 @@ const heldLength = (tail) => {
 	for (let length = longest; length > 0; length -= 1) if ("```tool_call\n".startsWith(tail.slice(-length))) return length;
 	return 0;
 };
+const UNFENCED_LIMIT = 4096;
+const objectEnd = (value, from) => {
+	let depth = 0;
+	let inString = false;
+	let escaped = false;
+	for (let index = from; index < value.length; index += 1) {
+		const char = value[index];
+		if (inString) {
+			if (escaped) escaped = false;
+			else if (char === "\\") escaped = true;
+			else if (char === "\"") inString = false;
+			continue;
+		}
+		if (char === "\"") inString = true;
+		else if (char === "{") depth += 1;
+		else if (char === "}") {
+			depth -= 1;
+			if (depth === 0) return index + 1;
+		}
+	}
+	return -1;
+};
 /**
 * Text is released as soon as it can no longer open a fence. A fence that
 * never closes, or holds no call to an offered tool, is released as text.
+*
+* A reply that opens with the call object and no fence is read as a call
+* anyway. Some models write the body the guide asks for and drop the fence
+* around it, and the reply then arrives as prose with `stop`: observed as
+* `{"name":"load_skill","input":{…}}I can begin once the load_skill tool
+* result is available.` The caller sees a finished answer that narrates a
+* call nobody ran, which is worse than an error, and the retry in
+* `reply.ts` cannot see it either, since that waits for a `tool-calls`
+* finish reason. Recovering it here serves a streaming caller too, which
+* cannot be retried at all.
+*
+* The rule is deliberately the narrowest one that covers what was observed:
+* the object must be the first thing in the reply, it must parse, and it
+* must name a tool the caller offered — the same bar a fenced block passes.
+* Prose that quotes a call later on is left alone, which matters when the
+* caller is reviewing code and may quote one on purpose.
 */
 const splitReply = (tools) => {
 	if (tools.length === 0) return {
@@ -827,6 +894,7 @@ const splitReply = (tools) => {
 	const names = new Set(tools.map((tool) => tool.name));
 	let buffer = "";
 	let inBlock = false;
+	let opening = true;
 	/** Ends the open block; `fence` is what closed it, nothing when the reply ran out first. */
 	const closeBlock = (json, fence) => {
 		inBlock = false;
@@ -836,9 +904,31 @@ const splitReply = (tools) => {
 			type: "call"
 		}] : text(`${FENCE_OPEN}${json}${fence}`);
 	};
+	const openingCall = (final) => {
+		const start = buffer.length - buffer.trimStart().length;
+		if (buffer[start] !== "{") return buffer.trim().length === 0 && !final ? "hold" : void 0;
+		const end = objectEnd(buffer, start);
+		if (end === -1) return !final && buffer.length - start < UNFENCED_LIMIT ? "hold" : void 0;
+		const call = parseCall(buffer.slice(start, end), names);
+		if (call === void 0) return;
+		buffer = buffer.slice(end);
+		return call;
+	};
 	const drain = (final) => {
 		const parts = [];
 		for (;;) {
+			if (opening && !inBlock) {
+				const found = openingCall(final);
+				if (found === "hold") return parts;
+				opening = false;
+				if (found !== void 0) {
+					parts.push({
+						call: found,
+						type: "call"
+					});
+					continue;
+				}
+			}
 			if (inBlock) {
 				const end = buffer.indexOf(FENCE_CLOSE);
 				if (end === -1) {
@@ -971,7 +1061,8 @@ const readReply = (options) => {
 		skips: {
 			count: 0,
 			types: /* @__PURE__ */ new Set()
-		}
+		},
+		switchedModel: void 0
 	};
 	const splitter = splitReply(tools);
 	const fromParts = function* fromParts(parts) {
@@ -1003,7 +1094,8 @@ const readReply = (options) => {
 					kind: "reasoning",
 					text: event.text
 				};
-			} else if (event.kind === "file") {
+			} else if (event.kind === "switch") tally.switchedModel = event.detail;
+			else if (event.kind === "file") {
 				const asset = await resolveAsset(cookie, event.file, signal);
 				if (asset) {
 					tally.files += 1;
@@ -1013,10 +1105,7 @@ const readReply = (options) => {
 					};
 				}
 			} else if (event.kind === "finish") tally.finishReason = event.reason;
-			else yield {
-				kind: "error",
-				message: event.message
-			};
+			else yield event;
 			yield* fromParts(splitter.flush());
 		}(),
 		tally

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thaipass",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "AI SDK provider for AI Pass, using your own session cookie.",
   "keywords": [
     "ai-sdk",
@@ -42,8 +42,7 @@
   },
   "devDependencies": {
     "@thaipass/core": "workspace:*",
-    "@thaipass/typescript-config": "workspace:*",
-    "@types/bun": "1.4.0",
+    "@types/bun": "1.4.1",
     "tsdown": "0.23.0",
     "typescript": "7.0.2"
   }