npm - dorkos - Versions diffs - 0.17.0 → 0.17.2 - Mend

dorkos 0.17.0 → 0.17.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/client/index.html CHANGED Viewed

@@ -15,7 +15,7 @@
         if (dark) document.documentElement.classList.add('dark');
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-KNXnL08A.js"></script>
+    <script type="module" crossorigin src="/assets/index-BktypfRN.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-1b_G52ou.css">
   </head>
   <body>

package/dist/server/index.js CHANGED Viewed

@@ -68656,6 +68656,9 @@ var init_test_mode_runtime = __esm({
       async getSessionETag(_projectDir, _id) {
         return null;
       }
+      async getLastMessageIds(_sessionId) {
+        return null;
+      }
       async readFromOffset(_projectDir, _id, _offset) {
         return { content: "", newOffset: 0 };
       }
@@ -68892,7 +68895,8 @@ var UpdateSessionRequestSchema = z.object({
 var SendMessageRequestSchema = z.object({
   content: z.string().min(1, "content is required"),
   cwd: z.string().optional(),
-  correlationId: z.string().uuid().optional()
+  correlationId: z.string().uuid().optional(),
+  clientMessageId: z.string().optional()
 }).openapi("SendMessageRequest");
 var ApprovalRequestSchema = z.object({
   toolCallId: z.string()
@@ -70868,20 +70872,27 @@ router.post("/:id/messages", async (req, res) => {
   initSSEStream(res);
   try {
     for await (const event of runtime.sendMessage(sessionId, content3, { cwd })) {
-      await sendSSEEvent(res, event);
       if (event.type === "done") {
         const actualInternalId = runtime.getInternalSessionId(sessionId);
+        const lookupId = actualInternalId ?? sessionId;
+        const lastMsgIds = await runtime.getLastMessageIds(lookupId);
+        const donePayload = {
+          ...event.data && typeof event.data === "object" ? event.data : {}
+        };
         if (actualInternalId && actualInternalId !== sessionId) {
           logger.debug("[POST /messages] session ID remapped", {
             sessionId,
             internalId: actualInternalId
           });
-          await sendSSEEvent(res, {
-            type: "done",
-            data: { sessionId: actualInternalId }
-          });
+          donePayload.sessionId = actualInternalId;
+        }
+        if (lastMsgIds) {
+          donePayload.messageIds = lastMsgIds;
         }
+        await sendSSEEvent(res, { type: "done", data: donePayload });
+        continue;
       }
+      await sendSSEEvent(res, event);
     }
   } catch (err) {
     logger.warn("[POST /messages] SSE stream error", {
@@ -71060,7 +71071,7 @@ var SERVER_VERSION = resolveVersion();
 var IS_DEV_BUILD = checkDevBuild(SERVER_VERSION);
 function resolveVersion() {
   if (env.DORKOS_VERSION_OVERRIDE) return env.DORKOS_VERSION_OVERRIDE;
-  if (true) return "0.17.0";
+  if (true) return "0.17.2";
   const pkgPath = path4.join(path4.dirname(fileURLToPath2(import.meta.url)), "../../package.json");
   return JSON.parse(readFileSync(pkgPath, "utf-8")).version;
 }
@@ -74395,6 +74406,24 @@ function parseTranscript(lines) {
           };
           parts.push(toolCallPart);
           toolCallPartMap.set(block.id, toolCallPart);
+        } else if (block.type === "error") {
+          parts.push({
+            type: "error",
+            message: block.message ?? "",
+            category: block.category ?? void 0,
+            details: block.details ?? void 0
+          });
+        } else if (block.type === "subagent") {
+          parts.push({
+            type: "subagent",
+            taskId: block.task_id ?? block.id ?? "",
+            description: block.description ?? "",
+            status: block.status ?? "running",
+            toolUses: block.tool_uses,
+            lastToolName: block.last_tool_name,
+            durationMs: block.duration_ms,
+            summary: block.summary
+          });
         }
       }
       if (parts.length === 0) continue;
@@ -74409,7 +74438,29 @@ function parseTranscript(lines) {
       });
     }
   }
-  return messages;
+  return mergeConsecutiveAssistantMessages(messages);
+}
+function mergeConsecutiveAssistantMessages(messages) {
+  const merged = [];
+  for (const msg of messages) {
+    const prev = merged[merged.length - 1];
+    if (prev && prev.role === "assistant" && msg.role === "assistant") {
+      prev.id = msg.id;
+      prev.parts = [...prev.parts ?? [], ...msg.parts ?? []];
+      if (msg.content) {
+        prev.content = prev.content ? prev.content + "\n" + msg.content : msg.content;
+      }
+      if (msg.toolCalls) {
+        prev.toolCalls = [...prev.toolCalls ?? [], ...msg.toolCalls];
+      }
+      if (msg.timestamp) prev.timestamp = msg.timestamp;
+    } else {
+      const copy = { ...msg };
+      if (copy.parts) copy.parts = [...copy.parts];
+      merged.push(copy);
+    }
+  }
+  return merged;
 }
 // ../../apps/server/src/services/runtimes/claude-code/task-reader.ts
@@ -78358,6 +78409,31 @@ var ClaudeCodeRuntime = class _ClaudeCodeRuntime {
   async getSessionETag(projectDir, sessionId) {
     return this.transcriptReader.getTranscriptETag(projectDir, sessionId);
   }
+  /** @inheritdoc */
+  async getLastMessageIds(sessionId) {
+    try {
+      const session = this.findSession(sessionId);
+      const projectDir = session?.cwd ?? this.cwd;
+      const messages = await this.transcriptReader.readTranscript(projectDir, sessionId);
+      if (!messages.length) return null;
+      let lastUser = null;
+      let lastAssistant = null;
+      for (let i2 = messages.length - 1; i2 >= 0; i2--) {
+        const m3 = messages[i2];
+        if (!lastAssistant && m3.role === "assistant") lastAssistant = m3.id;
+        if (!lastUser && m3.role === "user") lastUser = m3.id;
+        if (lastUser && lastAssistant) break;
+      }
+      if (!lastUser || !lastAssistant) return null;
+      return { user: lastUser, assistant: lastAssistant };
+    } catch (err) {
+      logger.warn("[getLastMessageIds] failed to read transcript", {
+        sessionId,
+        error: err instanceof Error ? err.message : String(err)
+      });
+      return null;
+    }
+  }
   /** Read new content from a session transcript starting at a byte offset. */
   async readFromOffset(projectDir, sessionId, offset) {
     return this.transcriptReader.readFromOffset(projectDir, sessionId, offset);
@@ -102565,6 +102641,26 @@ function clearCaches() {
   userNameCache.clear();
   channelNameCache.clear();
 }
+function removeQueuedReaction(client, channelId, messageTs, pendingReactions, wasQueued, logger3) {
+  if (!wasQueued)
+    return;
+  if (pendingReactions) {
+    const queue2 = pendingReactions.get(channelId);
+    if (queue2) {
+      const idx = queue2.indexOf(messageTs);
+      if (idx !== -1)
+        queue2.splice(idx, 1);
+      if (queue2.length === 0)
+        pendingReactions.delete(channelId);
+    }
+  }
+  void client.reactions.remove({ channel: channelId, name: "hourglass_flowing_sand", timestamp: messageTs }).catch((err) => {
+    const msg = err instanceof Error ? err.message : String(err);
+    if (!msg.includes("no_reaction")) {
+      logger3.warn(`inbound: failed to remove queued typing reaction from ${channelId}:${messageTs}: ${msg}`);
+    }
+  });
+}
 async function handleInboundMessage2(event, client, relay, botUserId, callbacks, logger3 = noopLogger, typingIndicator = "none", pendingReactions) {
   if (event.user === botUserId) {
     logger3.debug(`inbound skipped: echo (own user ${botUserId})`);
@@ -102585,6 +102681,30 @@ async function handleInboundMessage2(event, client, relay, botUserId, callbacks,
   const isGroup = isGroupChannel(event.channel);
   const subject = buildSubject2(event.channel, isGroup);
   const content3 = event.text.slice(0, MAX_CONTENT_LENGTH2);
+  let reactionQueued = false;
+  if (typingIndicator === "reaction") {
+    if (pendingReactions) {
+      const queue2 = pendingReactions.get(event.channel) ?? [];
+      queue2.push(event.ts);
+      pendingReactions.set(event.channel, queue2);
+      reactionQueued = true;
+    }
+    client.reactions.add({ channel: event.channel, name: "hourglass_flowing_sand", timestamp: event.ts }).then(() => {
+      logger3.debug(`inbound: added typing reaction to ${event.channel}:${event.ts}`);
+    }).catch((err) => {
+      if (pendingReactions) {
+        const queue2 = pendingReactions.get(event.channel);
+        if (queue2) {
+          const idx = queue2.indexOf(event.ts);
+          if (idx !== -1)
+            queue2.splice(idx, 1);
+          if (queue2.length === 0)
+            pendingReactions.delete(event.channel);
+        }
+      }
+      logger3.warn(`inbound: failed to add typing reaction to ${event.channel}:${event.ts}: ${err instanceof Error ? err.message : String(err)}`);
+    });
+  }
   const senderName = event.user ? await resolveUserName(client, event.user) : "unknown";
   const channelName = isGroup ? await resolveChannelName(client, event.channel) : void 0;
   const payload = {
@@ -102616,35 +102736,15 @@ async function handleInboundMessage2(event, client, relay, botUserId, callbacks,
       const reason = result2.rejected[0]?.reason ?? "unknown";
       callbacks.recordError(new Error(`Publish rejected: ${reason}`));
       logger3.warn(`inbound publish rejected for ${event.channel}: ${reason}`);
+      removeQueuedReaction(client, event.channel, event.ts, pendingReactions, reactionQueued, logger3);
       return;
     }
     callbacks.trackInbound();
     logger3.debug(`inbound from ${senderName} in ${event.channel}: "${content3.slice(0, 80)}${content3.length > 80 ? "\u2026" : ""}" (${content3.length} chars) \u2192 ${subject}`);
-    if (typingIndicator === "reaction") {
-      if (pendingReactions) {
-        const queue2 = pendingReactions.get(event.channel) ?? [];
-        queue2.push(event.ts);
-        pendingReactions.set(event.channel, queue2);
-      }
-      client.reactions.add({ channel: event.channel, name: "hourglass_flowing_sand", timestamp: event.ts }).then(() => {
-        logger3.debug(`inbound: added typing reaction to ${event.channel}:${event.ts}`);
-      }).catch((err) => {
-        if (pendingReactions) {
-          const queue2 = pendingReactions.get(event.channel);
-          if (queue2) {
-            const idx = queue2.indexOf(event.ts);
-            if (idx !== -1)
-              queue2.splice(idx, 1);
-            if (queue2.length === 0)
-              pendingReactions.delete(event.channel);
-          }
-        }
-        logger3.warn(`inbound: failed to add typing reaction to ${event.channel}:${event.ts}: ${err instanceof Error ? err.message : String(err)}`);
-      });
-    }
   } catch (err) {
     callbacks.recordError(err);
     logger3.warn(`inbound publish failed for ${event.channel}:`, err instanceof Error ? err.message : String(err));
+    removeQueuedReaction(client, event.channel, event.ts, pendingReactions, reactionQueued, logger3);
   }
 }
@@ -103038,6 +103138,9 @@ async function deliverMessage2(opts) {
   for (const [key, stream] of streamState) {
     if (startTime - stream.startedAt > STREAM_TTL_MS) {
       streamState.delete(key);
+      if (client) {
+        removePendingReaction(client, stream.channelId, opts.typingIndicator, pendingReactions, logger3);
+      }
       logger3.warn(`stream: reaped orphaned stream for ${key} (age: ${Math.round((startTime - stream.startedAt) / 1e3)}s)`);
     }
   }