@popcraft/cli 0.34.0 → 0.34.1

package/dist/popcraft.mjs

@@ -1196,7 +1196,7 @@ function operations(spec = openapi) {
 }
 async function call(target2, method, path, opts = {}) {
   const qs = new URLSearchParams(opts.query ?? {}).toString();
-  const headers = { "user-agent": `popcraft-cli/${"0.34.0"}`, ...opts.headers };
+  const headers = { "user-agent": `popcraft-cli/${"0.34.1"}`, ...opts.headers };
   if (target2.token) headers.authorization = `Bearer ${target2.token}`;
   if (opts.contentType) headers["content-type"] = opts.contentType;
   try {
@@ -310353,7 +310353,6 @@ function downloadBlob(blob, filename) {
 }
 var init_download = __esm({
   "lib/io/download.ts"() {
-    "use strict";
   }
 });
 
@@ -310573,7 +310572,6 @@ function creditLine(c2) {
 var MAX_PHOTO_PAGE, MAX_PHOTO_QUERY, UUID, isPhotoId, photoImagePath;
 var init_stock = __esm({
   "lib/photos/stock.ts"() {
-    "use strict";
     MAX_PHOTO_PAGE = 12;
     MAX_PHOTO_QUERY = 200;
     UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -316498,7 +316496,7 @@ async function renderDocument(doc2, nodeIds, options) {
       if (frame2) doc2 = { ...doc2, nodes: bakeMotion3(doc2.nodes, frame2.id, options.at) };
     }
   }
-  return selectionReferenceImages2(doc2, [...nodeIds], { maxEdge: options?.maxEdge, max: 8, format: "WEBP", ...options?.bands ? { bands: options.bands } : {} });
+  return selectionReferenceImages2(doc2, [...nodeIds], { maxEdge: options?.maxEdge, max: 8, format: "JPG", ...options?.bands ? { bands: options.bands } : {} });
 }
 function generateCapability(ctx2) {
   return async (prompt2, options = {}) => {
@@ -326484,7 +326482,7 @@ var init_package = __esm({
   "packages/runtime/package.json"() {
     package_default = {
       name: "@popcraft/runtime",
-      version: "0.34.0",
+      version: "0.34.1",
       description: "What code exported from PopCraft shares: the meaning of expressions (operators and functions) and, as it grows, the parts of a design's behaviour that are common code rather than generated React.",
       license: "MIT",
       homepage: "https://popcraft.app/docs/exporting/nextjs",
@@ -351150,7 +351148,6 @@ function exportsOf(source3) {
 var CODE_LIMITS, packageOf;
 var init_source2 = __esm({
   "lib/code/source.ts"() {
-    "use strict";
     CODE_LIMITS = { modules: 100, sourceLength: 2e5, packages: 12 };
     packageOf = (spec) => spec.split("/").slice(0, spec.startsWith("@") ? 2 : 1).join("/");
   }
@@ -351193,7 +351190,6 @@ function compileModule(module2) {
 var import_sucrase, BUILT_IN, memo4;
 var init_compile2 = __esm({
   "lib/code/compile.ts"() {
-    "use strict";
     import_sucrase = __toESM(require_dist2());
     init_source2();
     init_source2();
@@ -363367,27 +363363,35 @@ async function authHeaders2() {
   };
 }
 async function streamChat(opts, handlers = {}, signal) {
+  const body = JSON.stringify({
+    model: opts.model,
+    messages: opts.messages,
+    stream: true,
+    max_tokens: opts.maxTokens ?? (opts.tools?.length ? 16384 : 4096),
+    ...opts.temperature !== void 0 ? { temperature: opts.temperature } : {},
+    ...opts.tools?.length ? { tools: opts.tools, tool_choice: opts.toolChoice ?? "auto" } : {}
+  });
+  if (body.length > MAX_REQUEST_BYTES) {
+    throw new StreamError(
+      `This message is too large to send (${(body.length / 1e6).toFixed(1)} MB with its images). Attach fewer or smaller images.`,
+      "too_large",
+      413
+    );
+  }
   const res = await fetch(`${HYPERY_GATEWAY_URL}/api/v1/chat/completions`, {
     method: "POST",
     headers: await authHeaders2(),
     signal,
-    body: JSON.stringify({
-      model: opts.model,
-      messages: opts.messages,
-      stream: true,
-      max_tokens: opts.maxTokens ?? (opts.tools?.length ? 16384 : 4096),
-      ...opts.temperature !== void 0 ? { temperature: opts.temperature } : {},
-      ...opts.tools?.length ? { tools: opts.tools, tool_choice: opts.toolChoice ?? "auto" } : {}
-    })
+    body
   }).catch((err2) => {
     if (err2.name === "AbortError") throw err2;
     throw new StreamError("Could not reach Hypery. Check your connection.", "network", 0);
   });
   if (!res.ok || !res.body) {
-    const body = await res.text().catch(() => "");
-    let payload = body;
+    const body2 = await res.text().catch(() => "");
+    let payload = body2;
     try {
-      payload = JSON.parse(body);
+      payload = JSON.parse(body2);
     } catch {
     }
     throw new StreamError(streamErrorMessage(payload, `The AI request failed (${res.status}).`), errorCodeFor(res.status, payload), res.status);
@@ -363436,7 +363440,7 @@ function errorCodeFor(status3, payload) {
   if (status3 === 429) return "ai_rate_limited";
   return "ai_upstream";
 }
-var IDLE_TIMEOUT_MS;
+var IDLE_TIMEOUT_MS, MAX_REQUEST_BYTES;
 var init_gateway = __esm({
   "lib/agent/gateway.ts"() {
     "use strict";
@@ -363446,6 +363450,7 @@ var init_gateway = __esm({
     init_shared();
     init_stream_parse();
     IDLE_TIMEOUT_MS = 18e4;
+    MAX_REQUEST_BYTES = 44e5;
   }
 });
 
@@ -363477,6 +363482,28 @@ function pruneOldImages(messages, keep = KEEP_IMAGE_TURNS) {
     messages[i2] = { ...m, content: `${text} [${images === 1 ? "image" : `${images} images`} omitted: superseded by a later render \u2014 render again if you need to look.]`.trim() };
   }
 }
+function fitImagesToBudget(messages, budget) {
+  if (sizeOf2(messages) <= budget) return;
+  const renderTurns = messages.map((m, i2) => ({ m, i: i2 })).filter(({ m }) => m.role === "user" && Array.isArray(m.content) && m.content[0]?.type === "text" && !!m.content[0].text?.startsWith(RENDER_TURN_PREFIX)).map(({ i: i2 }) => i2);
+  for (const i2 of renderTurns) {
+    if (sizeOf2(messages) <= budget) return;
+    const m = messages[i2];
+    if (!Array.isArray(m.content)) continue;
+    const parts = [...m.content];
+    let dropped = 0;
+    for (let j = parts.length - 1; j >= 0 && sizeOf2(messages) > budget; j--) {
+      if (parts[j].type !== "image_url") continue;
+      parts.splice(j, 1);
+      dropped++;
+      messages[i2] = { ...m, content: [...parts] };
+    }
+    if (dropped) {
+      const note2 = `[${dropped === 1 ? "1 image" : `${dropped} images`} omitted to keep the request under the size limit \u2014 look at fewer layers at once, or pass a smaller maxEdge.]`;
+      const rest = messages[i2].content;
+      messages[i2] = { ...m, content: rest.some((p2) => p2.type === "image_url") ? [...rest, { type: "text", text: note2 }] : `${rest.flatMap((p2) => p2.type === "text" ? [p2.text] : []).join(" ")} ${note2}`.trim() };
+    }
+  }
+}
 async function runAgentLoop(opts) {
   const maxRounds = opts.maxRounds ?? DEFAULT_MAX_ROUNDS;
   const maxResultChars = opts.maxResultChars ?? 8e3;
@@ -363488,6 +363515,7 @@ async function runAgentLoop(opts) {
     if (opts.stopped?.()) return { messages, text, rounds, exhausted: false, stopped: true };
     for (const note2 of opts.drainNotifications?.() ?? []) messages.push({ role: "user", content: note2 });
     pruneOldImages(messages);
+    fitImagesToBudget(messages, MAX_REQUEST_BYTES - JSON.stringify(specs).length - REQUEST_MARGIN_BYTES);
     opts.hooks?.onAssistantStart?.(rounds);
     const turn = await opts.callModel(messages, specs, {
       onTextDelta: opts.hooks?.onTextDelta,
@@ -363546,14 +363574,17 @@ async function runAgentLoop(opts) {
   messages.push({ role: "assistant", content: final.text });
   return { messages, text: final.text, rounds, exhausted: true, stopped: false };
 }
-var DEFAULT_MAX_ROUNDS, DEFAULT_MAX_PARALLEL, KEEP_IMAGE_TURNS, RENDER_TURN_PREFIX;
+var DEFAULT_MAX_ROUNDS, DEFAULT_MAX_PARALLEL, KEEP_IMAGE_TURNS, RENDER_TURN_PREFIX, REQUEST_MARGIN_BYTES, sizeOf2;
 var init_loop = __esm({
   "lib/agent/loop.ts"() {
     "use strict";
+    init_gateway();
     DEFAULT_MAX_ROUNDS = 12;
     DEFAULT_MAX_PARALLEL = 4;
     KEEP_IMAGE_TURNS = 2;
     RENDER_TURN_PREFIX = "Result of ";
+    REQUEST_MARGIN_BYTES = 64e3;
+    sizeOf2 = (messages) => JSON.stringify(messages).length;
   }
 });
 
@@ -409896,7 +409927,7 @@ init_resources();
 init_desktop();
 init_hypery();
 import { createInterface } from "node:readline";
-var VERSION2 = "0.34.0";
+var VERSION2 = "0.34.1";
 var HELP = `popcraft ${VERSION2} \u2014 the PopCraft command line
 
 Files (headless, on .popcraft files):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@popcraft/cli",
-  "version": "0.34.0",
+  "version": "0.34.1",
   "description": "The PopCraft command line: edit .popcraft files headlessly, call the REST API, publish to the marketplace and manage the desktop app's local plugins, themes, fonts, skills and agents.",
   "license": "MIT",
   "homepage": "https://popcraft.app/docs/api/cli",
@@ -34,7 +34,7 @@
     "esbuild": "0.28.2"
   },
   "dependencies": {
-    "@popcraft/kit": "0.34.0"
+    "@popcraft/kit": "0.34.1"
   },
   "scripts": {
     "build": "node build.mjs",