@dashup/connector 0.1.10 → 0.1.11

package/dist/index.js

@@ -2728,6 +2728,7 @@ var PROTOCOL_VERSION = 1;
 var MAX_ENVELOPE_BYTES = 8 * 1024 * 1024;
 var HISTORY_PAGE_ITEMS = 30;
 var HISTORY_TEXT_CHARS = 4e3;
+var HISTORY_TOOL_CHARS = 500;
 var HISTORY_PAGE_BYTES = 256 * 1024;
 var HISTORY_BATCH_ITEMS = 50;
 var HISTORY_BATCH_BYTES = HISTORY_PAGE_BYTES;
@@ -4045,7 +4046,7 @@ import * as ui from "@clack/prompts";
 import { z } from "zod";
 
 // package.json
-var version = "0.1.10";
+var version = "0.1.11";
 
 // src/pair.ts
 var Invitation = z.object({
@@ -4390,7 +4391,6 @@ function prose(id, role, content) {
   const files2 = attachments(id, content);
   return value2 || files2.length ? [{ id, role, text: value2, ...files2.length ? { attachments: files2 } : {} }] : [];
 }
-var SUMMARY_LIMIT = 200;
 var SUMMARY_FIELDS = [
   "command",
   "cmd",
@@ -4412,8 +4412,12 @@ function describe(input) {
   );
   const value2 = typeof input === "string" ? input : named2 ?? (fields && Object.keys(fields).length ? JSON.stringify(fields) : "");
   const paths = [...value2.matchAll(PATCH_FILE)].map((match) => match[2]).join(", ");
-  const first = value2.split("\n").find((line) => line.trim());
-  return (paths || first?.trim())?.slice(0, SUMMARY_LIMIT);
+  return (paths || value2.trim()).slice(0, HISTORY_TOOL_CHARS) || void 0;
+}
+function said(input, summary) {
+  const value2 = object(input)?.description;
+  const line = typeof value2 === "string" ? value2.trim().split("\n")[0] : "";
+  return line && line !== summary ? line.slice(0, HISTORY_TOOL_CHARS) : void 0;
 }
 function elapsed(start, end) {
   const ms = instant(end) - instant(start);
@@ -4429,18 +4433,22 @@ function added(path, content) {
   ].join("\n");
 }
 var binary = (diff) => diff.slice(0, 8e3).includes("\0");
-function step(id, name, input, result) {
+function step(id, name, input, result, started) {
   const summary = describe(input);
+  const label = said(input, summary);
+  const at = instant(started);
   const diff = result?.status === "ok" && result.diff && !binary(result.diff) ? result.diff : void 0;
   return {
     id,
     role: "tool",
     text: diff || result?.text || "",
     tool: {
-      name: typeof name === "string" && name ? name.slice(0, SUMMARY_LIMIT) : "Tool",
+      name: typeof name === "string" && name ? name.slice(0, HISTORY_TOOL_CHARS) : "Tool",
+      ...label ? { label } : {},
       ...summary ? { summary } : {},
       ...result?.status ? { status: result.status } : {},
       ...result?.status && result.ms !== void 0 ? { ms: result.ms } : {},
+      ...!result?.status && Number.isFinite(at) ? { at: new Date(at).toISOString() } : {},
       ...diff ? { diff: true } : {}
     },
     ...result?.attachments?.length ? { attachments: result.attachments } : {}
@@ -4511,7 +4519,8 @@ function claudeConversation(conversation, rows) {
               ms: elapsed(row.timestamp, result.row.timestamp),
               diff: claudeChange(object(result.row.toolUseResult)),
               attachments: attachments(call, result.part.content)
-            }
+            },
+            row.timestamp
           )
         ];
       })
@@ -4600,7 +4609,8 @@ function codexMessages(path) {
           ms: elapsed(row.timestamp, output.timestamp),
           diff: patch && applyPatch(patch),
           attachments: attachments(call, output.payload.output)
-        }
+        },
+        row.timestamp
       )
     ];
   });
@@ -4699,7 +4709,8 @@ function openCodeParts(id, role, parts2) {
           ms: elapsed(state.time?.start, state.time?.end),
           diff: openCodeChange(state),
           attachments: attachments(key, state.attachments)
-        }
+        },
+        state.time?.start
       )
     ];
   });
@@ -5060,6 +5071,7 @@ var Discovery = class {
         read: true,
         send: Boolean(session.send),
         stop: Boolean(session.stop),
+        now: Boolean(session.now),
         approve: Boolean(session.approve)
       }
     });
@@ -16172,12 +16184,13 @@ var ID = /^[a-f0-9]{64}$/;
 var ROLES = new Set(MESSAGE_ROLES);
 var ROUTING_FIELDS = ["pairing", "sender", "recipient", "project", "thread"];
 var MIME = /^[\w.+-]{1,64}\/[\w.+-]{1,64}$/;
-var TOOL_TEXT = 500;
 function validAttachment(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2) && typeof value2.id === "string" && ID.test(value2.id) && typeof value2.mime === "string" && MIME.test(value2.mime) && Number.isSafeInteger(value2.bytes) && value2.bytes >= 0 && (value2.name === void 0 || typeof value2.name === "string" && value2.name.length <= ATTACHMENT_NAME_CHARS);
 }
 function validTool(value2) {
-  return typeof value2 === "object" && value2 !== null && !Array.isArray(value2) && typeof value2.name === "string" && value2.name.length <= TOOL_TEXT && (value2.summary === void 0 || typeof value2.summary === "string" && value2.summary.length <= TOOL_TEXT) && (value2.status === void 0 || value2.status === "ok" || value2.status === "error") && (value2.ms === void 0 || Number.isSafeInteger(value2.ms) && value2.ms >= 0) && (value2.diff === void 0 || typeof value2.diff === "boolean");
+  return typeof value2 === "object" && value2 !== null && !Array.isArray(value2) && typeof value2.name === "string" && value2.name.length <= HISTORY_TOOL_CHARS && [value2.label, value2.summary].every(
+    (text3) => text3 === void 0 || typeof text3 === "string" && text3.length <= HISTORY_TOOL_CHARS
+  ) && (value2.at === void 0 || typeof value2.at === "string" && !Number.isNaN(Date.parse(value2.at))) && (value2.status === void 0 || value2.status === "ok" || value2.status === "error") && (value2.ms === void 0 || Number.isSafeInteger(value2.ms) && value2.ms >= 0) && (value2.diff === void 0 || typeof value2.diff === "boolean");
 }
 function validMessage(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2) && typeof value2.id === "string" && ID.test(value2.id) && ROLES.has(value2.role) && typeof value2.text === "string" && value2.text.length <= HISTORY_TEXT_CHARS && Number.isSafeInteger(value2.part) && Number.isSafeInteger(value2.parts) && value2.part >= 0 && value2.parts > value2.part && (value2.tool === void 0 || value2.part === 0 && validTool(value2.tool)) && (value2.full === void 0 || value2.part === 0 && validAttachment(value2.full)) && (value2.attachments === void 0 || value2.part === 0 && Array.isArray(value2.attachments) && value2.attachments.length <= HISTORY_ATTACHMENTS && value2.attachments.every(validAttachment));
@@ -16494,6 +16507,8 @@ var Client = class {
   pending = /* @__PURE__ */ new Map();
   approvals = /* @__PURE__ */ new Map();
   requests = /* @__PURE__ */ new Map();
+  // The reply each thread is writing, as far as it has streamed, and the item it belongs to.
+  typing = /* @__PURE__ */ new Map();
   async connect() {
     if (this.socket?.readyState === WebSocket2.OPEN) return;
     if (this.connecting) return this.connecting;
@@ -16528,13 +16543,20 @@ var Client = class {
           return;
         }
         if (typeof message.method !== "string") return;
+        const params = message.params;
+        if (message.method === "item/agentMessage/delta" && typeof params?.threadId === "string" && typeof params.delta === "string") {
+          const known = this.typing.get(params.threadId);
+          this.typing.set(params.threadId, {
+            item: params.itemId,
+            text: (known && known.item === params.itemId ? known.text : "") + params.delta
+          });
+        }
         if (message.method === "serverRequest/resolved") {
           for (const [id, pending] of this.approvals)
             if (pending.requestId === message.params?.requestId) this.approvals.delete(id);
         }
         if ((message.method === "item/commandExecution/requestApproval" || message.method === "item/fileChange/requestApproval") && (typeof message.id === "string" || typeof message.id === "number") && typeof message.params?.threadId === "string") {
           const id = randomUUID2();
-          const params = message.params;
           this.approvals.set(id, {
             requestId: message.id,
             threadId: params.threadId,
@@ -16644,6 +16666,7 @@ var Client = class {
           updatedAt: new Date(Number(thread.updatedAt ?? 0) * 1e3).toISOString(),
           status: approvals.length ? "attention" : status(thread),
           messages: messages2(thread),
+          typing: this.typing.get(id)?.text,
           approvals,
           // An interrupt for a finished turn is never answered, so the active turn is read first.
           stop: this.controls ? (requestId) => this.once(requestId, async () => {
@@ -16851,12 +16874,21 @@ var Session = class {
   turn;
   // Messages written to this turn's process that Claude Code has not finished answering.
   open = 0;
+  // The text Claude Code is writing, as far as it has streamed.
+  typing = "";
   approvals = /* @__PURE__ */ new Map();
   requests = /* @__PURE__ */ new Map();
   write(value2) {
     this.turn?.stdin.write(`${JSON.stringify(value2)}
 `);
   }
+  interrupt() {
+    this.write({
+      type: "control_request",
+      request_id: randomUUID3(),
+      request: { subtype: "interrupt" }
+    });
+  }
   once(id, action) {
     const known = this.requests.get(id);
     if (known) return known;
@@ -16866,13 +16898,16 @@ var Session = class {
     this.requests.set(id, result);
     return result;
   }
-  // Resolves once Claude Code takes the message, or says why it could not start.
-  say(text3) {
+  // Resolves once Claude Code takes the message, or says why it could not start. `now` stops the
+  // turn under way, so Claude Code takes the message at once.
+  say(text3, now = false) {
     this.messages.push({ id: randomUUID3(), role: "user", text: text3 });
+    this.typing = "";
     this.status = "working";
     this.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     const message = { type: "user", message: { role: "user", content: text3 } };
     if (this.turn) {
+      if (now) this.interrupt();
       this.open++;
       this.write(message);
       this.changed();
@@ -16887,6 +16922,7 @@ var Session = class {
         "--output-format",
         "stream-json",
         "--verbose",
+        "--include-partial-messages",
         "--permission-prompt-tool",
         "stdio",
         ...this.saved ? ["--resume", this.id] : ["--session-id", this.id]
@@ -16944,6 +16980,14 @@ var Session = class {
       this.status = "attention";
     } else if (message.type === "result") {
       if (--this.open <= 0) this.turn?.stdin.end();
+    } else if (message.type === "stream_event" && !message.parent_tool_use_id) {
+      const event = message.event;
+      if (event?.type === "content_block_start") this.typing = "";
+      else if (event?.type === "content_block_delta" && event.delta?.type === "text_delta")
+        this.typing += String(event.delta.text ?? "");
+      else return false;
+      this.changed();
+      return false;
     } else return false;
     this.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     this.changed();
@@ -16958,15 +17002,13 @@ var Session = class {
       updatedAt: this.updatedAt,
       status: this.status,
       messages: [...this.messages],
+      typing: this.typing,
       approvals: [...this.approvals.values()].map((pending) => pending.approval),
-      send: (requestId, text3) => this.once(requestId, () => this.say(text3)),
+      send: (requestId, text3, now) => this.once(requestId, () => this.say(text3, now)),
+      now: true,
       stop: this.turn ? (requestId) => this.once(requestId, async () => {
         if (!this.turn) throw new Error("Nothing is running in this Claude Code session");
-        this.write({
-          type: "control_request",
-          request_id: randomUUID3(),
-          request: { subtype: "interrupt" }
-        });
+        this.interrupt();
       }) : void 0,
       approve: this.approvals.size ? (requestId, approvalId, choice) => this.once(requestId, async () => {
         const pending = this.approvals.get(approvalId);
@@ -17044,6 +17086,7 @@ import { join as join5 } from "node:path";
 import { connect as connect2 } from "node:net";
 import { watch as watch2 } from "node:fs";
 import { lstat, readdir as readdir2, readFile as readFile2 } from "node:fs/promises";
+var STOP = "Stop here, and wait for my next message.";
 var PEER_PROTOCOL = 1;
 var MAX_SESSIONS2 = 100;
 var REQUEST_MS2 = 4e3;
@@ -17073,7 +17116,7 @@ async function registrations() {
   );
   return found.flat();
 }
-async function post(session, path, text3) {
+async function post(session, path, text3, priority) {
   const file = await lstat(path);
   if (!file.isSocket() || process.getuid && file.uid !== process.getuid())
     throw new Error("Claude Code inbox is not owned by this user");
@@ -17081,7 +17124,7 @@ async function post(session, path, text3) {
   const line = JSON.stringify({
     type: "user",
     session_id: session.sessionId,
-    priority: "next",
+    priority,
     message: { role: "user", content: `<${ENVELOPE} from-name="Dashup">
 ${body2}
 </${ENVELOPE}>` }
@@ -17114,7 +17157,9 @@ var Claude = class {
         status: STATUS[session.status ?? ""] ?? "unknown",
         messages: [],
         approvals: [],
-        send: path ? (requestId, text3) => this.once(requestId, () => post(session, path, text3)) : void 0
+        send: path ? (requestId, text3, now) => this.once(requestId, () => post(session, path, text3, now ? "now" : "next")) : void 0,
+        stop: path ? (requestId) => this.once(requestId, () => post(session, path, STOP, "now")) : void 0,
+        now: Boolean(path)
       };
     });
   }
@@ -18655,7 +18700,7 @@ var NativeQueue = class {
 // src/connector.ts
 var EPHEMERAL_TTL_MS = 6e4;
 var HOME_RECENT = 20;
-var FOLLOW_MS = 5 * 6e4;
+var FOLLOW_MS = 2 * 6e4;
 var RESCAN_MS = 1e3;
 var Command = z2.object({
   type: z2.literal("command"),
@@ -18665,7 +18710,12 @@ var Command = z2.object({
   action: z2.discriminatedUnion("kind", [
     z2.object({ kind: z2.literal("projects.refresh") }).strict(),
     z2.object({ kind: z2.literal("thread.read") }).strict(),
-    z2.object({ kind: z2.literal("thread.send"), text: z2.string().min(1).max(1e5) }).strict(),
+    z2.object({ kind: z2.literal("thread.follow") }).strict(),
+    z2.object({
+      kind: z2.literal("thread.send"),
+      text: z2.string().min(1).max(1e5),
+      now: z2.boolean().optional()
+    }).strict(),
     z2.object({ kind: z2.literal("thread.queue"), text: z2.string().min(1).max(1e5) }).strict(),
     z2.object({ kind: z2.literal("thread.stop") }).strict(),
     z2.object({ kind: z2.literal("approval.respond"), approvalId: z2.string(), choice: z2.string() }).strict(),
@@ -19059,6 +19109,27 @@ var Connector = class {
     for (const pair of this.activePairs()) await this.listProjects(pair);
     await this.publishQueueReceipts();
   }
+  // Publishes a conversation for the phone, which then gets what changes in it.
+  async read(pair, project, thread) {
+    const messages5 = this.discovery.read(thread, this.attached(thread)?.messages);
+    const history = await publishHistory(this.config, pair, project.id, thread, messages5);
+    this.follows.set(`${pair.id}:${thread.id}`, {
+      pair,
+      project: project.id,
+      thread: thread.id,
+      until: Date.now() + FOLLOW_MS,
+      copy: copy(messages5),
+      updatedAt: thread.updatedAt,
+      typing: ""
+    });
+    return this.thread(pair, project, thread, history);
+  }
+  // The reply an agent this computer runs is still writing, until the conversation holds it.
+  typing(thread, messages5) {
+    const typing = this.discovery.locations.get(thread.id)?.live?.typing ?? "";
+    const last = messages5.filter((message) => message.role === "assistant").at(-1);
+    return typing && !last?.text.startsWith(typing) ? typing : "";
+  }
   // A phone reading a conversation gets its messages as they change, before anything that says the
   // conversation changed, so it never asks for a copy it already has.
   async stream() {
@@ -19067,18 +19138,19 @@ var Connector = class {
       let messages5;
       try {
         if (thread && follow.until > Date.now() && activePair(this.config, follow.pair))
-          messages5 = changes(
-            follow.copy,
-            this.discovery.read(thread, this.attached(thread)?.messages)
-          );
+          messages5 = this.discovery.read(thread, this.attached(thread)?.messages);
       } catch {
       }
       if (!thread || !messages5) {
         this.follows.delete(key);
         continue;
       }
-      if (!messages5.length && thread.updatedAt === follow.updatedAt) continue;
+      const changed = changes(follow.copy, messages5);
+      const typing = this.typing(thread, messages5);
+      if (!changed.length && thread.updatedAt === follow.updatedAt && typing === follow.typing)
+        continue;
       follow.updatedAt = thread.updatedAt;
+      follow.typing = typing;
       await this.send(follow.pair, {
         type: "thread-tail",
         projectId: follow.project,
@@ -19088,8 +19160,9 @@ var Connector = class {
           this.config.pairs[follow.pair.id].key,
           follow.project,
           follow.thread,
-          messages5
-        )
+          changed
+        ),
+        ...typing ? { typing } : {}
       });
     }
   }
@@ -19164,6 +19237,7 @@ var Connector = class {
         throw new Error("Command expired. Try again while this computer is online.");
       const outcome = await this.command(pair, content);
       delete this.config.unconfirmed[content.requestId];
+      if (content.action.kind === "thread.follow") return;
       if (outcome && "state" in outcome) {
         queue = outcome;
         await this.queueResult(pair, content.requestId, content.projectId, queue);
@@ -19177,6 +19251,7 @@ var Connector = class {
       );
     } catch (error) {
       delete this.config.unconfirmed[content.requestId];
+      if (content.action.kind === "thread.follow") return;
       if (queue) {
         await this.queueResult(pair, content.requestId, content.projectId, queue);
         return;
@@ -19309,19 +19384,15 @@ var Connector = class {
     if (!project) throw new Error("Project is no longer open on this computer");
     const thread = project.threads.find((item) => item.id === command2.threadId);
     switch (command2.action.kind) {
-      case "thread.read": {
+      case "thread.read":
         if (!thread) throw new Error("Thread not found");
-        const messages5 = this.discovery.read(thread, this.attached(thread)?.messages);
-        const history = await publishHistory(this.config, pair, project.id, thread, messages5);
-        this.follows.set(`${pair.id}:${thread.id}`, {
-          pair,
-          project: project.id,
-          thread: thread.id,
-          until: Date.now() + FOLLOW_MS,
-          copy: copy(messages5),
-          updatedAt: thread.updatedAt
-        });
-        return this.thread(pair, project, thread, history);
+        return this.read(pair, project, thread);
+      case "thread.follow": {
+        if (!thread) throw new Error("Thread not found");
+        const follow = this.follows.get(`${pair.id}:${thread.id}`);
+        if (!follow) return this.read(pair, project, thread);
+        follow.until = Date.now() + FOLLOW_MS;
+        return;
       }
       case "attachment.read": {
         if (!thread) throw new Error("Thread not found");
@@ -19341,7 +19412,8 @@ var Connector = class {
             "This session has no live reply connection. Use the existing agent on your computer."
           );
         const location2 = this.discovery.locations.get(thread.id);
-        if (location2?.live?.send) return location2.live.send(command2.requestId, command2.action.text);
+        if (location2?.live?.send)
+          return location2.live.send(command2.requestId, command2.action.text, command2.action.now);
         const agent = this.attached(thread);
         const saved = thread.agent;
         if (!agent && location2?.history && saved && saved.harness !== "other") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dashup/connector",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "type": "module",
   "bin": {
     "dashup": "dist/index.js"
@@ -29,11 +29,11 @@
     "tsup": "^8.5.1",
     "tsx": "^4.22.4",
     "typescript": "^5.9.3",
+    "@dashup/models": "0.1.0",
     "@dashup/typescript-config": "0.0.0",
-    "@dashup/protocol": "0.1.0",
     "@parcae/lynx": "0.1.0",
     "@parcae/sdk": "0.8.1",
-    "@dashup/models": "0.1.0"
+    "@dashup/protocol": "0.1.0"
   },
   "scripts": {
     "dashup": "tsx src/index.ts",