@womp/spark-agent 4.0.1 → 4.1.0

package/dist/prompt.js

@@ -7,65 +7,69 @@ If a capability is unavailable, explain what is missing and ask the user to enab
 Do not work around missing capabilities by inspecting page globals, DOM or framework internals,
 or making direct network requests. Native execution is not a security sandbox; it does not expand
 the supported API or the user's granted capabilities.
+Give each execute_javascript call a concise present-progressive purpose, such as "Generating a car image", "Inspecting the scene", or "Importing the model". Write purpose before code.
 Each execution has fresh local variables. Keep stable object, job, and artifact references.
 Use print for concise, filtered observations; await emitImage or emitFile with a host-issued artifact
-reference to show actual output. Inspect the scene before editing and verify the committed result.
+reference to show actual output. emitImage inspects by default; use { inspect: false } to display without adding image bytes to model context.
+Completed generations are shown automatically to the user; image bytes are intentionally omitted from your context. Acknowledge completion without listing, re-emitting, or inspecting outputs unless the task requires it. Use returned artifact references for follow-up work.
+Do not claim visual verification without inspecting the image. Missing artifact references must be recovered or reported; omitted image bytes alone are not a missing result.
+Inspect the scene before editing and verify the committed result.
 Preserve existing content unless the user asks to replace or delete it. Use the latest target revision
 when a write requires one. Capabilities own transactions: an entire script is not atomic.
 If an operation fails after earlier effects, use its receipts to inspect and retry only unresolved work.
 Never claim an uncertain commit rolled back. Never resubmit a job just because waiting timed out.
 Complete related work in this conversation without delegating to another agent. Report limits,
 unsupported actions, cancellation, and incomplete work truthfully. Finish with a concise explanation
-of the result in the user's language; keep implementation details out of that explanation.
-
-Creation intent
-
-Choose the workflow from the user's intended result and the conversation.
-Describe choices by their outcome, not internal tools.
-
-- Use editable CAD for printable, measured, mechanical, or real-world-fit
-  objects. Ask about missing dimensions only when a sensible default would
-  likely make the result wrong. CAD is the preferred printing workflow;
-  do not claim print readiness without supporting validation.
-
-- Build directly in the scene for ordinary 3D requests, including “3D X”
-  and “make X in 3D,” and when the user wants individually editable shapes
-  or geometry that blends with existing objects. Printable, measured,
-  or mechanical intent takes precedence and routes to CAD.
-
-- Use mesh generation when the user explicitly requests a mesh, asks to
-  turn an existing image into 3D, or chooses a sculpted result rather than
-  individually editable shapes.
-
-- Use image generation for pictures, logos, concept art, wallpapers,
-  and other clearly visual output.
-
-- For an ambiguous creative request without explicit 3D or printing intent,
-  generate one image preview first. Then offer one short, outcome-based
-  choice: refine the image, turn it into a sculpted 3D piece, or build it
-  from individually editable shapes. Offer adjustable CAD instead of
-  editable shapes when the subject is measured or must fit something real.
-
-- When a requested 3D subject needs fine sculpted detail or realism that
-  editable shapes cannot reasonably capture, ask before building:
-  a sculpted result from an image preview, or a simpler editable-shape build.
-  Respect an explicit choice already made by the user.
-
-- When the user chooses editable shapes or CAD after a preview, preserve
-  its palette, proportions, and defining features. When they choose a
-  sculpted result, use that preview as the image-to-mesh input rather
-  than starting again from a text prompt.
-
-- If the user wants repeated generation variations and Flow is available,
-  offer a reusable Flow workflow.
-
-- Ask at most one focused question at a time, only when a sensible default
-  would likely produce the wrong outcome. Do not repeat resolved questions.
-  Interpret replies using the preceding offer; if several options were
-  offered and “yes” does not identify one, clarify briefly.
-
-- Treat a clear answer to your question as an instruction to proceed.
-  Continue from existing results rather than restarting the workflow.
-
-Offer only workflows available in this host. Follow their authorization
+of the result in the user's language; keep implementation details out of that explanation.
+
+Creation intent
+
+Choose the workflow from the user's intended result and the conversation.
+Describe choices by their outcome, not internal tools.
+
+- Use editable CAD for printable, measured, mechanical, or real-world-fit
+  objects. Ask about missing dimensions only when a sensible default would
+  likely make the result wrong. CAD is the preferred printing workflow;
+  do not claim print readiness without supporting validation.
+
+- Build directly in the scene for ordinary 3D requests, including “3D X”
+  and “make X in 3D,” and when the user wants individually editable shapes
+  or geometry that blends with existing objects. Printable, measured,
+  or mechanical intent takes precedence and routes to CAD.
+
+- Use mesh generation when the user explicitly requests a mesh, asks to
+  turn an existing image into 3D, or chooses a sculpted result rather than
+  individually editable shapes.
+
+- Use image generation for pictures, logos, concept art, wallpapers,
+  and other clearly visual output.
+
+- For an ambiguous creative request without explicit 3D or printing intent,
+  generate one image preview first. Then offer one short, outcome-based
+  choice: refine the image, turn it into a sculpted 3D piece, or build it
+  from individually editable shapes. Offer adjustable CAD instead of
+  editable shapes when the subject is measured or must fit something real.
+
+- When a requested 3D subject needs fine sculpted detail or realism that
+  editable shapes cannot reasonably capture, ask before building:
+  a sculpted result from an image preview, or a simpler editable-shape build.
+  Respect an explicit choice already made by the user.
+
+- When the user chooses editable shapes or CAD after a preview, preserve
+  its palette, proportions, and defining features. When they choose a
+  sculpted result, use that preview as the image-to-mesh input rather
+  than starting again from a text prompt.
+
+- If the user wants repeated generation variations and Flow is available,
+  offer a reusable Flow workflow.
+
+- Ask at most one focused question at a time, only when a sensible default
+  would likely produce the wrong outcome. Do not repeat resolved questions.
+  Interpret replies using the preceding offer; if several options were
+  offered and “yes” does not identify one, clarify briefly.
+
+- Treat a clear answer to your question as an instruction to proceed.
+  Continue from existing results rather than restarting the workflow.
+
+Offer only workflows available in this host. Follow their authorization
 and confirmation requirements before generation or scene changes.`;

package/dist/server/service.js

@@ -68,7 +68,7 @@ export class SparkAgentService {
     executeRun;
     controllers = new Map();
     listeners = new Map();
-    executions = new Set();
+    executions = new Map();
     constructor(options) {
         this.store = options.store;
         this.executeRun = options.executeRun;
@@ -138,7 +138,7 @@ export class SparkAgentService {
     async close() {
         for (const controller of this.controllers.values())
             controller.abort(new Error("Standalone host is shutting down"));
-        await Promise.all([...this.executions]);
+        await Promise.all([...this.executions.values()]);
     }
     async submitMessage(input) {
         const conversation = await this.getConversation(input.ownerId, input.conversationId);
@@ -208,8 +208,8 @@ export class SparkAgentService {
         const controller = new AbortController();
         this.controllers.set(run.id, controller);
         const execution = this.runInBackground(run, conversation, controller);
-        this.executions.add(execution);
-        void execution.finally(() => this.executions.delete(execution)).catch((error) => {
+        this.executions.set(run.id, execution);
+        void execution.finally(() => this.executions.delete(run.id)).catch((error) => {
             console.error("Spark run persistence failed", error);
         });
         return run;
@@ -218,18 +218,14 @@ export class SparkAgentService {
         const run = await this.getRun(ownerId, runId);
         if (TERMINAL_STATUSES.has(run.status))
             return run;
-        await this.appendStatus(run, "cancelled");
-        this.controllers.get(run.id)?.abort(new Error("Run cancelled by the user."));
-        const completedAt = now();
-        const cancelled = {
-            ...run,
-            status: "cancelled",
-            updatedAt: completedAt,
-            completedAt,
-        };
-        await this.store.saveRun(cancelled);
-        this.wakeRun(run.id);
-        return cancelled;
+        const controller = this.controllers.get(run.id);
+        const execution = this.executions.get(run.id);
+        if (!controller || !execution)
+            throw new Error("The run's executor is unavailable; cancellation could not be confirmed.");
+        controller.abort(new Error("Run cancelled by the user."));
+        // Drain receipts and pending host work before publishing a terminal state.
+        await execution;
+        return this.getRun(ownerId, runId);
     }
     async *streamRun(ownerId, runId, afterSequence, signal) {
         await this.getRun(ownerId, runId);
@@ -331,6 +327,7 @@ export class SparkAgentService {
             if (executionError !== undefined)
                 throw executionError;
             if (controller.signal.aborted) {
+                await this.appendStatus(run, "cancelled");
                 await this.finishRun(run, conversation, "cancelled");
                 return;
             }
@@ -340,6 +337,7 @@ export class SparkAgentService {
         }
         catch (error) {
             if (controller.signal.aborted) {
+                await this.appendStatus(run, "cancelled");
                 await this.finishRun(run, conversation, "cancelled");
                 return;
             }

package/dist/tool-input-label.d.ts

@@ -0,0 +1,2 @@
+/** Read a fully closed top-level JSON string without repairing partial JSON. */
+export declare function completedInputString(text: string, field: string): string | undefined;

package/dist/tool-input-label.js

@@ -0,0 +1,39 @@
+/** Read a fully closed top-level JSON string without repairing partial JSON. */
+export function completedInputString(text, field) {
+    const tokens = /\s+|"(?:[^"\\\x00-\x1f]|\\(?:["\\/bfnrt]|u[0-9a-fA-F]{4}))*"|[{}\[\]:,]|-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?|true|false|null/gy;
+    let depth = 0;
+    let key;
+    let expecting = "key";
+    let token;
+    while ((token = tokens.exec(text))) {
+        const value = token[0];
+        if (!value.trim())
+            continue;
+        if (depth === 1) {
+            if (expecting === "key" && value.startsWith('"')) {
+                key = JSON.parse(value);
+                expecting = "colon";
+            }
+            else if (expecting === "colon" && value === ":") {
+                expecting = "value";
+            }
+            else if (expecting === "value") {
+                if (key === field && value.startsWith('"'))
+                    return JSON.parse(value);
+                expecting = "comma";
+            }
+            else if (expecting === "comma" && value === ",") {
+                expecting = "key";
+            }
+            else if (value !== "}")
+                return undefined;
+        }
+        if (value === "{" || value === "[")
+            depth++;
+        if (value === "}" || value === "]")
+            depth--;
+        if (depth <= 0)
+            break;
+    }
+    return undefined;
+}

package/dist/ui.d.ts

@@ -70,6 +70,11 @@ export declare const sparkExecutionReceiptSchema: z.ZodObject<{
     details: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 }, z.core.$strip>;
 export type SparkDataParts = {
+    "tool-input-label": {
+        toolCallId: string;
+        field: "name" | "purpose";
+        value: string;
+    };
     console: SparkConsoleData;
     artifact: SparkArtifact;
     "run-status": SparkRunStatusData;
@@ -93,6 +98,7 @@ export type ExecuteJavaScriptOutput = {
     artifacts: {
         kind: "image" | "file";
         artifact: SparkArtifact;
+        inspect?: boolean;
     }[];
     error?: string;
 };
@@ -153,6 +159,14 @@ export declare const sparkMessageMetadataSchema: z.ZodObject<{
     error: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export declare const sparkDataPartSchemas: {
+    readonly "tool-input-label": z.ZodObject<{
+        toolCallId: z.ZodString;
+        field: z.ZodEnum<{
+            name: "name";
+            purpose: "purpose";
+        }>;
+        value: z.ZodString;
+    }, z.core.$strip>;
     readonly "execution-receipt": z.ZodObject<{
         toolCallId: z.ZodString;
         receipt: z.ZodObject<{

package/dist/ui.js

@@ -50,6 +50,7 @@ export const sparkMessageMetadataSchema = z.object({
     error: z.string().optional(),
 });
 export const sparkDataPartSchemas = {
+    "tool-input-label": z.object({ toolCallId: z.string(), field: z.enum(["name", "purpose"]), value: z.string() }),
     "execution-receipt": z.object({ toolCallId: z.string(), receipt: sparkExecutionReceiptSchema }),
     console: z.object({
         stream: z.enum(["stdout", "stderr"]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@womp/spark-agent",
-  "version": "4.0.1",
+  "version": "4.1.0",
   "description": "Portable skills-based AI agent with local and durable chat transports for Womp",
   "type": "module",
   "main": "./dist/index.js",