ponzu 1.58.1 → 1.59.1

package/dist/index.js

@@ -33134,24 +33134,29 @@ var converseTools = [
       resolve: boolean2().optional()
     },
     async handler(args, ctx) {
-      const { design } = await resolveFile(ctx, args.file, [args.thread]);
+      const { key, design } = await resolveFile(ctx, args.file, [args.thread]);
       const t = design.doc.threads.find((x) => x.id === args.thread);
       if (!t)
         throw new ToolError(`No thread ${args.thread}.`);
+      const resolve = args.resolve && !ctx.ws.writing?.(key, t.id);
       const message = {
         id: newId("m"),
         author: ctx.caller.author,
         text: args.text,
         createdAt: Date.now()
       };
-      apply(design, args.resolve ? {
+      apply(design, resolve ? {
         op: "batch",
         ops: [
           { op: "thread.message", id: t.id, message },
           { op: "thread.update", id: t.id, status: "resolved" }
         ]
       } : { op: "thread.message", id: t.id, message }, ctx);
-      return { text: `Replied${args.resolve ? " and resolved" : ""}.` };
+      if (args.resolve && !resolve)
+        return {
+          text: "Replied, and left it open: the person is writing a reply in this thread. Their reply comes through wait_for_activity."
+        };
+      return { text: `Replied${resolve ? " and resolved" : ""}.` };
     }
   }),
   tool({
@@ -33161,9 +33166,11 @@ var converseTools = [
     description: "Resolve or reopen a thread without replying. Resolve a comment once you've done what it asked; that hides its pin from the canvas, and the change speaks for itself.",
     input: { file: fileArg, thread: string2(), status: _enum(["open", "resolved"]) },
     async handler(args, ctx) {
-      const { design } = await resolveFile(ctx, args.file, [args.thread]);
+      const { key, design } = await resolveFile(ctx, args.file, [args.thread]);
       if (!design.doc.threads.some((t) => t.id === args.thread))
         throw new ToolError(`No thread ${args.thread}.`);
+      if (args.status === "resolved" && ctx.ws.writing?.(key, args.thread))
+        throw new ToolError(`The person is writing a reply in thread ${args.thread}, so it stays open. Their reply comes through wait_for_activity; resolve it once you've done what it asks.`, "person_writing");
       apply(design, { op: "thread.update", id: args.thread, status: args.status }, ctx);
       return { text: `Thread ${args.thread} is ${args.status}.` };
     }
@@ -33312,7 +33319,7 @@ Watching doesn't cut you off from chat. A message the person types reaches you a
    Batch comments that touch the same artboard.
 3. say what you're doing: set_status with a few words ("adding the autumn drop") and the artboards you're about to touch. The person sees a yuzu ring round the artboard and rain in its header, and your status when they hover the rain.
 4. do + check: edit, screenshot, fix lint. Variations go next to the original, never over it.
-5. close: for a change you made, set_comment_status resolved. That hides the pin; the canvas already shows the change, so don't reply.
+5. close: for a change you made, set_comment_status resolved. That hides the pin; the canvas already shows the change, so don't reply. While the person is writing a reply in a thread it can't be resolved: leave it, and their reply comes in on a later wait.
 6. Go back to 1 with the new cursor. Waiting again clears your working indicator. Keep watching until the person says stop or you're interrupted.
 
 Reply only when the person needs to read something:
@@ -43549,6 +43556,7 @@ class LocalWorkspace {
   assetOrigin;
   opensIn;
   mac;
+  writers = new Map;
   entries = new Map;
   opening = new Map;
   focusListeners = new Set;
@@ -43569,6 +43577,18 @@ class LocalWorkspace {
   get(key) {
     return this.entries.get(key)?.design;
   }
+  setWriting(canvas, key, threads) {
+    if (threads.length)
+      this.writers.set(canvas, { key, threads: new Set(threads) });
+    else
+      this.writers.delete(canvas);
+  }
+  writing(key, thread) {
+    for (const w of this.writers.values())
+      if (w.key === key && w.threads.has(thread))
+        return true;
+    return false;
+  }
   focus(key, artboard) {
     for (const l of this.focusListeners)
       l(key, artboard);
@@ -46464,6 +46484,7 @@ function serve(ws, opts = {}) {
         return;
       }
       sockets.delete(s);
+      ws.setWriting(s, s.data.key, []);
       s.data.relay?.upstream?.close();
     },
     message(s, raw) {
@@ -46509,6 +46530,8 @@ function serve(ws, opts = {}) {
           send(s, { t: "ack", req: msg.req });
         } else if (msg.t === "theme" && (msg.theme === "light" || msg.theme === "dark")) {
           ws.theme = msg.theme;
+        } else if (msg.t === "writing" && Array.isArray(msg.threads)) {
+          ws.setWriting(s, s.data.key, msg.threads.filter((t) => typeof t === "string"));
         }
       } catch (err) {
         const req = "req" in msg ? msg.req : undefined;
@@ -46837,7 +46860,7 @@ function remoteUpdater(endpoint, token) {
 // apps/cli/package.json
 var package_default = {
   name: "ponzu",
-  version: "1.58.1",
+  version: "1.59.1",
   description: "An open-source design canvas your coding agent drives with HTML and CSS.",
   type: "module",
   license: "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ponzu",
-  "version": "1.58.1",
+  "version": "1.59.1",
   "description": "An open-source design canvas your coding agent drives with HTML and CSS.",
   "license": "MIT",
   "type": "module",