@skydiveai/pi-server 0.1.0-beta.1738 → 0.1.0-beta.2448

package/dist/index.mjs

@@ -259,7 +259,7 @@ function parseShellEnv(request) {
 		const env = {};
 		for (const [k, v] of Object.entries(parsed)) if (typeof v === "string") env[k] = v;
 		return Object.keys(env).length > 0 ? env : null;
-	} catch {
+	} catch (_err) {
 		return null;
 	}
 }
@@ -283,12 +283,12 @@ function createSSEResponse(handler) {
 		write(chunk) {
 			try {
 				controller.enqueue(encoder.encode(chunk));
-			} catch {}
+			} catch (_err) {}
 		},
 		close() {
 			try {
 				controller.close();
-			} catch {}
+			} catch (_err) {}
 		}
 	};
 	const keepalive = setInterval(() => {
@@ -298,13 +298,13 @@ function createSSEResponse(handler) {
 		clearInterval(keepalive);
 		try {
 			controller.close();
-		} catch {}
+		} catch (_err) {}
 	}, (err) => {
 		logger.error({ err }, "SSE handler crashed — stream closed without response");
 		clearInterval(keepalive);
 		try {
 			controller.close();
-		} catch {}
+		} catch (_err) {}
 	});
 	return new Response(stream, {
 		status: 200,
@@ -470,7 +470,10 @@ async function extractParts(parts, log) {
 		}
 		if (part.url != null && part.mediaType?.startsWith("image/")) {
 			try {
-				images.push(await fetchImageAsBase64({ url: part.url }));
+				images.push(await fetchImageAsBase64({
+					url: part.url,
+					userAgent: null
+				}));
 			} catch (err) {
 				log.warn({
 					event: "a2a_image_fetch_failed",
@@ -999,7 +1002,10 @@ async function extractContent$1(content, log) {
 				data: src.data
 			});
 			else if (src?.type === "url" && src.url) try {
-				images.push(await fetchImageAsBase64({ url: src.url }));
+				images.push(await fetchImageAsBase64({
+					url: src.url,
+					userAgent: null
+				}));
 			} catch (err) {
 				log.warn({
 					event: "image_fetch_failed",
@@ -1088,7 +1094,7 @@ async function handleMessages(request, ctx, registry) {
 	let parsed;
 	try {
 		parsed = JSON.parse(await request.text());
-	} catch {
+	} catch (_err) {
 		return jsonError(400, "invalid json");
 	}
 	const { messages, stream = false, model: modelInput, system, x_model: modelSpecInput } = parsed ?? {};
@@ -1111,7 +1117,7 @@ async function handleMessages(request, ctx, registry) {
 	const baseSystemPrompt = extractSystemPrompt(system);
 	const { sessionId } = parseSessionId(request);
 	const shellEnv = parseShellEnv(request);
-	const { session, sessionManager: sm } = await ctx.createSession({
+	const { session } = await ctx.createSession({
 		cwd: ctx.cwd,
 		sessionId,
 		perRequestApiKeys: withSpecApiKey(resolvePerRequestApiKeys(request), modelSpec),
@@ -1134,7 +1140,6 @@ async function handleMessages(request, ctx, registry) {
 	if (stream) {
 		const response = runStream$2({
 			session,
-			sm,
 			prompt,
 			images,
 			id,
@@ -1150,7 +1155,6 @@ async function handleMessages(request, ctx, registry) {
 	}
 	const response = await runBlocking$2({
 		session,
-		sm,
 		prompt,
 		images,
 		id,
@@ -1164,7 +1168,7 @@ async function handleMessages(request, ctx, registry) {
 	if (traceId) response.headers.set("x-trace-id", traceId);
 	return response;
 }
-function runStream$2({ session, sm, prompt, images, id, sessionId, modelName, log, postPrompt, registry }) {
+function runStream$2({ session, prompt, images, id, sessionId, modelName, log, postPrompt, registry }) {
 	return createSSEResponse(async (writer) => {
 		let contentBlockIndex = 0;
 		let textBlockOpen = false;
@@ -1322,7 +1326,7 @@ function runStream$2({ session, sm, prompt, images, id, sessionId, modelName, lo
 		sseEvent(writer, "message_stop", { type: "message_stop" });
 	});
 }
-async function runBlocking$2({ session, sm, prompt, images, id, sessionId, modelName, log, postPrompt, registry }) {
+async function runBlocking$2({ session, prompt, images, id, sessionId, modelName, log, postPrompt, registry }) {
 	let text = "";
 	const toolUseBlocks = [];
 	const tcByContentIdx = /* @__PURE__ */ new Map();
@@ -1373,7 +1377,7 @@ async function runBlocking$2({ session, sm, prompt, images, id, sessionId, model
 	}
 	for (const block of toolUseBlocks) if (block.type === "tool_use" && typeof block.input === "string") try {
 		block.input = JSON.parse(block.input);
-	} catch {
+	} catch (_err) {
 		block.input = {};
 	}
 	const content = [];
@@ -1464,13 +1468,34 @@ const nestedProxyEnvelopeSchema = z.object({
 	blockReason: z.enum(BILLING_BLOCK_REASONS),
 	message: z.string()
 }).strict();
+/**
+* pi-ai's openai-compatible providers (openrouter, xai, groq, deepseek, …) can
+* NOT fold a proxy's non-2xx body into `error.message`, so `formatProviderError`
+* (@earendil-works/pi-ai utils/error-body) composes the display string as
+* `"<status>: <body>"` or, with a provider label, `"<prefix> (<status>): <body>"`.
+* The billing gate's 402 body therefore reaches us wrapped, e.g.
+* `"402: {\"error\":{...},\"blockReason\":\"insufficient_balance\",\"message\":...}"`
+* or `"OpenRouter (402): {...}"`. Neither the bare `JSON.parse` nor the `"402 "`
+* (space) strip below recognizes that, so a real billing block from an
+* openrouter-routed model degrades to the generic model-provider error. Peel a
+* single leading `"<status>: "` / `"<prefix> (<status>): "` wrapper off the
+* front so the recovered body flows through the existing shape checks. Returns
+* the message unchanged when no wrapper is present.
+*/
+function unwrapOpenAICompatStatusPrefix(message) {
+	const withPrefix = message.match(/^.+ \(\d{3}\): ([\s\S]+)$/);
+	if (withPrefix?.[1] !== void 0) return withPrefix[1];
+	const bare = message.match(/^\d{3}: ([\s\S]+)$/);
+	if (bare?.[1] !== void 0) return bare[1];
+	return message;
+}
 function parsePrefixedSignal(message) {
 	const normalized = message.startsWith("402 ") ? message.slice(4) : message;
 	if (!normalized.startsWith(BILLING_BLOCKED_PROVIDER_SIGNAL_PREFIX)) return null;
 	try {
 		const parsed = payloadSchema.safeParse(JSON.parse(normalized.slice(26)));
 		return parsed.success ? parsed.data : null;
-	} catch {
+	} catch (_err) {
 		return null;
 	}
 }
@@ -1480,16 +1505,17 @@ function parsePrefixedSignal(message) {
 * proxy response as JSON, so that outer shape is validated separately.
 */
 function parseBillingBlockedProviderSignal(message) {
-	const direct = parsePrefixedSignal(message);
+	const unwrapped = unwrapOpenAICompatStatusPrefix(message);
+	const direct = parsePrefixedSignal(unwrapped);
 	if (direct) return direct;
 	try {
-		const envelope = nestedProxyEnvelopeSchema.safeParse(JSON.parse(message));
+		const envelope = nestedProxyEnvelopeSchema.safeParse(JSON.parse(unwrapped));
 		if (!envelope.success) return null;
 		const nested = parsePrefixedSignal(envelope.data.error.message);
 		const topLevel = parsePrefixedSignal(envelope.data.message);
 		if (!nested || nested.blockReason !== envelope.data.blockReason || envelope.data.message !== nested.message && (!topLevel || topLevel.blockReason !== nested.blockReason || topLevel.message !== nested.message)) return null;
 		return nested;
-	} catch {
+	} catch (_err) {
 		return null;
 	}
 }
@@ -1678,7 +1704,7 @@ async function loadHistoryIntoSession({ sm, messages, upToIdxExclusive, modelNam
 				let args = {};
 				try {
 					args = tc.function.arguments ? JSON.parse(tc.function.arguments) : {};
-				} catch {
+				} catch (_err) {
 					args = { _raw: tc.function.arguments };
 				}
 				contentArr.push({
@@ -1720,6 +1746,15 @@ async function loadHistoryIntoSession({ sm, messages, upToIdxExclusive, modelNam
 		}
 	}
 }
+/**
+* Each pi/session message carries the real wall-clock `timestamp` the
+* provider stamped when it produced that message (see @earendil-works/pi-ai
+* Message). Forward it verbatim as `x_created_at` (epoch ms) on the OAI
+* trailer message so the consumer (anyone-messaging completeRun) can stamp
+* each persisted segment at its true emit time and interleave a mid-run steer
+* by createdAt — instead of positionally reconstructing per-turn times, which
+* drifts on parallel tool calls and provider-split replies.
+*/
 function messageTimestampMs(m) {
 	const ts = m?.timestamp;
 	return typeof ts === "number" && Number.isFinite(ts) ? ts : null;
@@ -1781,7 +1816,7 @@ async function handleChatCompletions(request, ctx, registry, pendingSteerIds) {
 	let parsed;
 	try {
 		parsed = JSON.parse(await request.text());
-	} catch {
+	} catch (_err) {
 		return jsonError(400, "invalid json");
 	}
 	const { messages, stream = false, model: modelInput, thinkingLevel: thinkingInput, context_window: contextWindowInput, x_model: modelSpecInput } = parsed ?? {};
@@ -1793,7 +1828,7 @@ async function handleChatCompletions(request, ctx, registry, pendingSteerIds) {
 	}
 	if (lastUserIdx < 0) return jsonError(400, "no user message in history");
 	const lastUser = messages[lastUserIdx];
-	const reqUA = request.headers.get("user-agent") ?? void 0;
+	const reqUA = request.headers.get("user-agent") ?? null;
 	const { text: prompt, images } = await extractContent(lastUser.content, {
 		userAgent: reqUA,
 		log
@@ -1824,7 +1859,7 @@ async function handleChatCompletions(request, ctx, registry, pendingSteerIds) {
 	const sessionId = parsedSession.source === "header" ? parsedSession.sessionId : `chatcmpl-${parsedSession.sessionId}`;
 	const shellEnv = parseShellEnv(request);
 	const sessionSetupStart = performance.now();
-	const [{ session, sessionManager: sm }, customTools] = await Promise.all([ctx.createSession({
+	const [{ session, sessionManager: sm }] = await Promise.all([ctx.createSession({
 		cwd: ctx.cwd,
 		sessionId,
 		perRequestApiKeys: withSpecApiKey(resolvePerRequestApiKeys(request), modelSpec),
@@ -1936,7 +1971,7 @@ function runStream$1({ session, sm, prompt, images, sessionId, created, reqStart
 		};
 		const ensureRole = () => {
 			if (roleEmitted) return;
-			sendChunk({ role: "assistant" });
+			sendChunk({ role: "assistant" }, null);
 			roleEmitted = true;
 		};
 		let _evCount = 0;
@@ -1960,7 +1995,7 @@ function runStream$1({ session, sm, prompt, images, sessionId, created, reqStart
 					steering,
 					follow_up: followUp,
 					...consumedIds.length > 0 ? { consumed_steer_ids: consumedIds } : {}
-				} });
+				} }, null);
 				return;
 			}
 			_evCount++;
@@ -1983,7 +2018,7 @@ function runStream$1({ session, sm, prompt, images, sessionId, created, reqStart
 				...ev.type === "message_start" || ev.type === "message_end" ? { messageJson: JSON.stringify(ev.message).slice(0, 500) } : {}
 			}, "harness session event");
 			if (ev.type === "tool_execution_start") {
-				sendChunk({ x_tool_execution_start: { tool_call_id: String(ev.toolCallId ?? "") } });
+				sendChunk({ x_tool_execution_start: { tool_call_id: String(ev.toolCallId ?? "") } }, null);
 				return;
 			}
 			if (ev.type === "tool_execution_end") {
@@ -1992,7 +2027,7 @@ function runStream$1({ session, sm, prompt, images, sessionId, created, reqStart
 					tool_call_id: String(ev.toolCallId ?? ""),
 					content: text,
 					...ev.isError ? { is_error: true } : {}
-				} });
+				} }, null);
 				return;
 			}
 			if (ev.type === "agent_end") {
@@ -2004,11 +2039,11 @@ function runStream$1({ session, sm, prompt, images, sessionId, created, reqStart
 			const t = inner?.type;
 			if (t === "text_delta") {
 				ensureRole();
-				sendChunk({ content: inner.delta ?? "" });
+				sendChunk({ content: inner.delta ?? "" }, null);
 				return;
 			}
 			if (t === "thinking_delta") {
-				sendChunk({ x_thinking_delta: inner.delta ?? "" });
+				sendChunk({ x_thinking_delta: inner.delta ?? "" }, null);
 				return;
 			}
 			if (t === "toolcall_start") {
@@ -2026,7 +2061,7 @@ function runStream$1({ session, sm, prompt, images, sessionId, created, reqStart
 						name: tc?.name ?? "",
 						arguments: ""
 					}
-				}] });
+				}] }, null);
 				return;
 			}
 			if (t === "toolcall_delta") {
@@ -2035,7 +2070,7 @@ function runStream$1({ session, sm, prompt, images, sessionId, created, reqStart
 				sendChunk({ tool_calls: [{
 					index: openaiIdx,
 					function: { arguments: inner.delta ?? "" }
-				}] });
+				}] }, null);
 			}
 		});
 		try {
@@ -2301,7 +2336,6 @@ const steerRequestSchema = z.object({
 	mode: z.enum(["steer", "follow-up"]).default("steer"),
 	text: z.string().optional()
 }).refine((v) => v.content !== void 0 || v.text !== void 0, { message: "content or text is required" });
-z.string().uuid();
 async function handleSteer(request, sessionId, registry, pendingSteerIds) {
 	const { log } = requestLogger(request);
 	const session = registry.get(sessionId);
@@ -2309,14 +2343,14 @@ async function handleSteer(request, sessionId, registry, pendingSteerIds) {
 	let body;
 	try {
 		body = JSON.parse(await request.text());
-	} catch {
+	} catch (_err) {
 		return jsonError(400, "invalid json");
 	}
 	const parsed = steerRequestSchema.safeParse(body);
 	if (!parsed.success) return jsonError(400, parsed.error.message);
 	const { mode } = parsed.data;
 	const { text, images } = await extractContent(parsed.data.content ?? parsed.data.text ?? "", {
-		userAgent: request.headers.get("user-agent") ?? void 0,
+		userAgent: request.headers.get("user-agent") ?? null,
 		log
 	});
 	if (!text && images.length === 0) return jsonError(400, "steer has no content");
@@ -2469,7 +2503,10 @@ async function extractImagesFromContent(content, log) {
 	for (const part of content) if (part?.type === "input_image") {
 		const url = part.image_url ?? part.url;
 		if (typeof url === "string" && /^https?:\/\//i.test(url)) try {
-			images.push(await fetchImageAsBase64({ url }));
+			images.push(await fetchImageAsBase64({
+				url,
+				userAgent: null
+			}));
 		} catch (err) {
 			log.warn({
 				event: "image_fetch_failed",
@@ -2490,7 +2527,7 @@ async function handleResponses(request, ctx, registry) {
 	let parsed;
 	try {
 		parsed = JSON.parse(await request.text());
-	} catch {
+	} catch (_err) {
 		return jsonError(400, "invalid json");
 	}
 	const { input, stream = false, model: modelInput, instructions, x_model: modelSpecInput } = parsed ?? {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skydiveai/pi-server",
-  "version": "0.1.0-beta.1738",
+  "version": "0.1.0-beta.2448",
   "homepage": "https://skydive.com",
   "license": "MIT",
   "author": "Create, Inc.",
@@ -16,12 +16,6 @@
     }
   },
   "publishConfig": {
-    "exports": {
-      ".": {
-        "types": "./dist/index.d.mts",
-        "default": "./dist/index.mjs"
-      }
-    },
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },