omoclaw 3.1.1 → 3.2.1

package/dist/index.js

@@ -995,6 +995,7 @@ function handleSessionStatusEvent(event, dedup, state, timers, webhookFn, notify
 
 // src/handlers/user-events.ts
 var PROMPT_PREVIEW_MAX = 200;
+var PROMPT_FLUSH_DELAY_MS = 2000;
 function shortSessionID3(sessionID) {
   return sessionID.slice(0, 12);
 }
@@ -1007,86 +1008,43 @@ function asObject3(value) {
 function asString(value) {
   return typeof value === "string" ? value : "";
 }
-function collectContentText(value, output) {
-  if (typeof value === "string") {
-    output.push(value);
-    return;
-  }
-  if (Array.isArray(value)) {
-    for (const item of value) {
-      collectContentText(item, output);
-    }
-    return;
-  }
-  const record = asObject3(value);
-  if (!record) {
-    return;
-  }
-  if (typeof record.text === "string") {
-    output.push(record.text);
-  }
-  if (typeof record.content === "string") {
-    output.push(record.content);
-  } else if (Array.isArray(record.content)) {
-    collectContentText(record.content, output);
-  }
-}
-function collectPartsText(value, output) {
-  if (!Array.isArray(value)) {
-    return;
-  }
-  for (const item of value) {
-    const part = asObject3(item);
-    if (!part) {
-      continue;
-    }
-    const partType = asString(part.type);
-    if (partType === "text" && typeof part.text === "string") {
-      output.push(part.text);
-      continue;
-    }
-    if (typeof part.text === "string") {
-      output.push(part.text);
-    }
-    if (typeof part.content === "string") {
-      output.push(part.content);
-    } else if (Array.isArray(part.content)) {
-      collectContentText(part.content, output);
-    }
-  }
-}
 function normalizePreviewText(input) {
   return input.replace(/\s+/g, " ").trim();
 }
-function extractPromptPreview(info) {
-  const candidates = [];
-  const summary = asObject3(info.summary);
-  if (summary) {
-    if (typeof summary.title === "string") {
-      candidates.push(summary.title);
-    }
-    if (typeof summary.body === "string") {
-      candidates.push(summary.body);
-    }
-  }
-  if (typeof info.text === "string") {
-    candidates.push(info.text);
+var seenMessageIDs = new Set;
+var SEEN_MAX = 5000;
+var pendingPrompts = new Map;
+function evictOldestSeen() {
+  if (seenMessageIDs.size <= SEEN_MAX)
+    return;
+  const first = seenMessageIDs.values().next().value;
+  if (first !== undefined)
+    seenMessageIDs.delete(first);
+}
+function flushPendingPrompt(messageID, notify, debugLog) {
+  const pending = pendingPrompts.get(messageID);
+  if (!pending)
+    return;
+  clearTimeout(pending.timer);
+  pendingPrompts.delete(messageID);
+  seenMessageIDs.add(messageID);
+  evictOldestSeen();
+  const preview = normalizePreviewText(pending.text).slice(0, PROMPT_PREVIEW_MAX);
+  if (!preview) {
+    debugLog?.(`User prompt SKIPPED (no text after flush): session=${shortSessionID3(pending.sessionID)} msg=${messageID}`);
+    return;
   }
-  collectContentText(info.content, candidates);
-  collectPartsText(info.parts, candidates);
-  const merged = normalizePreviewText(candidates.join(" "));
-  return merged.slice(0, PROMPT_PREVIEW_MAX);
+  debugLog?.(`User prompt FLUSHED: session=${shortSessionID3(pending.sessionID)} msg=${messageID} text="${preview.slice(0, 60)}..."`);
+  notify("user-prompt", `[OpenCode] User prompt submitted (${shortSessionID3(pending.sessionID)}): ${preview}`, pending.agent, { promptText: preview });
 }
 function handleUserEvent(event, dedup, state, notify, debugLog) {
   if (event.type === "session.created" || event.type === "session.updated") {
     const info2 = asObject3(event.properties.info);
-    if (!info2) {
+    if (!info2)
       return;
-    }
     const sessionID2 = asString(info2.id);
-    if (!sessionID2) {
+    if (!sessionID2)
       return;
-    }
     const parentID = asString(info2.parentID);
     if (parentID) {
       state.setParentID(sessionID2, parentID);
@@ -1096,61 +1054,94 @@ function handleUserEvent(event, dedup, state, notify, debugLog) {
   }
   if (event.type === "tui.command.execute") {
     const command = event.properties.command;
-    if (command !== "session.interrupt") {
+    if (command !== "session.interrupt")
       return;
-    }
-    const dedupKey2 = "user-interrupt:tui-command";
-    if (!dedup.shouldSend(dedupKey2)) {
+    const dedupKey = "user-interrupt:tui-command";
+    if (!dedup.shouldSend(dedupKey))
       return;
-    }
     notify("user-interrupt", "[OpenCode] User interrupt requested");
     return;
   }
   if (event.type === "session.error") {
     const sessionID2 = event.properties.sessionID;
-    const errorName = event.properties.error?.name;
-    if (!sessionID2 || errorName !== "MessageAbortedError") {
+    const errorObj = event.properties.error;
+    if (!sessionID2 || errorObj?.name !== "MessageAbortedError")
       return;
-    }
-    const dedupKey2 = `user-interrupt:session-error:${sessionID2}`;
-    if (!dedup.shouldSend(dedupKey2)) {
+    const dedupKey = `user-interrupt:session-error:${sessionID2}`;
+    if (!dedup.shouldSend(dedupKey))
       return;
-    }
     notify("user-interrupt", `[OpenCode] User interrupt (${shortSessionID3(sessionID2)})`, state.getAgent(sessionID2));
     return;
   }
-  if (event.type !== "message.updated") {
+  if (event.type === "message.part.updated") {
+    const part = asObject3(event.properties.part);
+    if (!part)
+      return;
+    const messageID2 = asString(part.messageID);
+    if (!messageID2)
+      return;
+    const pending = pendingPrompts.get(messageID2);
+    if (!pending)
+      return;
+    if (asString(part.type) !== "text")
+      return;
+    if (part.synthetic === true) {
+      debugLog?.(`User prompt part SKIPPED (synthetic): msg=${messageID2}`);
+      seenMessageIDs.add(messageID2);
+      evictOldestSeen();
+      clearTimeout(pending.timer);
+      pendingPrompts.delete(messageID2);
+      return;
+    }
+    const partText = asString(part.text);
+    if (!partText)
+      return;
+    const trimmed = partText.trimStart();
+    if (trimmed.startsWith("<system-reminder>") || trimmed.startsWith("<system")) {
+      debugLog?.(`User prompt part SKIPPED (system-injected): msg=${messageID2} text="${trimmed.slice(0, 60)}"`);
+      seenMessageIDs.add(messageID2);
+      evictOldestSeen();
+      clearTimeout(pending.timer);
+      pendingPrompts.delete(messageID2);
+      return;
+    }
+    pending.text += (pending.text ? " " : "") + partText;
+    flushPendingPrompt(messageID2, notify, debugLog);
     return;
   }
+  if (event.type !== "message.updated")
+    return;
   const info = asObject3(event.properties.info);
-  if (!info) {
+  if (!info)
     return;
-  }
-  if (asString(info.role) !== "user") {
+  if (asString(info.role) !== "user")
     return;
-  }
   const sessionID = asString(info.sessionID);
-  if (!sessionID) {
+  if (!sessionID)
     return;
-  }
-  if (state.hasParentID(sessionID)) {
-    debugLog?.(`User prompt SKIPPED (sub-agent): session=${shortSessionID3(sessionID)} parent=${state.getState(sessionID)?.parentID ?? "?"}`);
+  const messageID = asString(info.id);
+  if (!messageID)
     return;
-  }
-  const promptPreview = extractPromptPreview(info);
-  if (!promptPreview) {
-    debugLog?.(`User prompt SKIPPED (empty preview): session=${shortSessionID3(sessionID)}`);
+  if (seenMessageIDs.has(messageID))
     return;
-  }
-  const messageID = asString(info.id);
-  const dedupKey = messageID ? `user-prompt:message:${messageID}` : `user-prompt:session:${sessionID}`;
-  if (!dedup.shouldSend(dedupKey)) {
-    debugLog?.(`User prompt SKIPPED (dedup): session=${shortSessionID3(sessionID)} key=${dedupKey}`);
+  if (pendingPrompts.has(messageID))
+    return;
+  if (state.hasParentID(sessionID)) {
+    debugLog?.(`User prompt SKIPPED (sub-agent): session=${shortSessionID3(sessionID)} msg=${messageID}`);
+    seenMessageIDs.add(messageID);
+    evictOldestSeen();
     return;
   }
-  debugLog?.(`User prompt DETECTED: session=${shortSessionID3(sessionID)} preview="${promptPreview.slice(0, 60)}..."`);
-  notify("user-prompt", `[OpenCode] User prompt submitted (${shortSessionID3(sessionID)}): ${promptPreview}`, state.getAgent(sessionID), {
-    promptText: promptPreview
+  debugLog?.(`User prompt PENDING: session=${shortSessionID3(sessionID)} msg=${messageID} (waiting for text parts)`);
+  const timer = setTimeout(() => {
+    flushPendingPrompt(messageID, notify, debugLog);
+  }, PROMPT_FLUSH_DELAY_MS);
+  pendingPrompts.set(messageID, {
+    sessionID,
+    messageID,
+    agent: state.getAgent(sessionID),
+    text: "",
+    timer
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omoclaw",
-  "version": "3.1.1",
+  "version": "3.2.1",
   "description": "OpenCode session monitor plugin — native event-driven webhook notifications for session state changes",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",