omoclaw 3.0.2 → 3.1.0

package/dist/batch-queue.d.ts

@@ -9,14 +9,22 @@ export interface BatchFlushPayload {
     count: number;
     summary: string;
 }
+export interface DoneRealtimeContext {
+    promptHistory: string[];
+    batchSummary: string;
+}
 type BatchFlushHandler = (payload: BatchFlushPayload) => void;
 export declare class BatchQueue {
     private readonly maxAgeMs;
     private readonly onFlush;
     private readonly entries;
+    private readonly userPromptHistory;
     private maxAgeTimer;
     constructor(maxAgeMs: number, onFlush: BatchFlushHandler);
     enqueue(entry: BatchQueueEntry): void;
+    recordUserPrompt(text: string): void;
+    getDoneRealtimeContext(): DoneRealtimeContext;
+    clearDoneRealtimeState(): void;
     flush(reason: BatchFlushReason): BatchFlushPayload | undefined;
     size(): number;
     dispose(): void;

package/dist/handlers/user-events.d.ts

@@ -3,7 +3,9 @@ import type { MonitorEventType } from "../config";
 import type { DedupEngine } from "../dedup";
 import type { SessionStateTracker } from "../state";
 interface UserEventNotifier {
-    (eventType: MonitorEventType, text: string, agentName?: string): void;
+    (eventType: MonitorEventType, text: string, agentName?: string, options?: {
+        promptText?: string;
+    }): void;
 }
 export declare function handleUserEvent(event: Event, dedup: DedupEngine, state: SessionStateTracker, notify: UserEventNotifier): void;
 export {};

package/dist/index.js

@@ -5,6 +5,7 @@ import os3 from "os";
 import path5 from "path";
 
 // src/batch-queue.ts
+var USER_PROMPT_HISTORY_LIMIT = 5;
 function formatCounts(counts) {
   return [...counts.entries()].sort(([left], [right]) => left.localeCompare(right)).map(([name, count]) => `${name} \xD7${count}`).join(", ");
 }
@@ -12,11 +13,36 @@ function normalizedAgentName(agentName) {
   const trimmed = agentName?.trim();
   return trimmed ? trimmed : "unknown-agent";
 }
+function summarizeEntries(entries, includeCompletedSuffix) {
+  const doneByAgent = new Map;
+  const byEventType = new Map;
+  for (const entry of entries) {
+    if (entry.eventType === "done") {
+      const agent = normalizedAgentName(entry.agentName);
+      doneByAgent.set(agent, (doneByAgent.get(agent) ?? 0) + 1);
+      continue;
+    }
+    byEventType.set(entry.eventType, (byEventType.get(entry.eventType) ?? 0) + 1);
+  }
+  const segments = [];
+  if (doneByAgent.size > 0) {
+    const doneSummary = formatCounts(doneByAgent);
+    segments.push(includeCompletedSuffix ? `${doneSummary} completed` : doneSummary);
+  }
+  for (const [eventType, count] of [...byEventType.entries()].sort(([left], [right]) => left.localeCompare(right))) {
+    segments.push(`${eventType} \xD7${count}`);
+  }
+  return segments.join(", ");
+}
+function normalizePromptText(text) {
+  return text.replace(/\s+/g, " ").trim();
+}
 
 class BatchQueue {
   maxAgeMs;
   onFlush;
   entries = [];
+  userPromptHistory = [];
   maxAgeTimer;
   constructor(maxAgeMs, onFlush) {
     this.maxAgeMs = maxAgeMs;
@@ -31,33 +57,39 @@ class BatchQueue {
       this.maxAgeTimer.unref?.();
     }
   }
+  recordUserPrompt(text) {
+    const normalized = normalizePromptText(text);
+    if (!normalized) {
+      return;
+    }
+    this.userPromptHistory.push(normalized);
+    if (this.userPromptHistory.length > USER_PROMPT_HISTORY_LIMIT) {
+      const deleteCount = this.userPromptHistory.length - USER_PROMPT_HISTORY_LIMIT;
+      this.userPromptHistory.splice(0, deleteCount);
+    }
+  }
+  getDoneRealtimeContext() {
+    return {
+      promptHistory: [...this.userPromptHistory],
+      batchSummary: summarizeEntries(this.entries, false)
+    };
+  }
+  clearDoneRealtimeState() {
+    this.entries.length = 0;
+    this.userPromptHistory.length = 0;
+    this.clearTimer();
+  }
   flush(reason) {
     if (this.entries.length === 0) {
       return;
     }
     const drained = this.entries.splice(0, this.entries.length);
     this.clearTimer();
-    const doneByAgent = new Map;
-    const byEventType = new Map;
-    for (const entry of drained) {
-      if (entry.eventType === "done") {
-        const agent = normalizedAgentName(entry.agentName);
-        doneByAgent.set(agent, (doneByAgent.get(agent) ?? 0) + 1);
-        continue;
-      }
-      byEventType.set(entry.eventType, (byEventType.get(entry.eventType) ?? 0) + 1);
-    }
-    const segments = [];
-    if (doneByAgent.size > 0) {
-      segments.push(`${formatCounts(doneByAgent)} completed`);
-    }
-    for (const [eventType, count] of [...byEventType.entries()].sort(([left], [right]) => left.localeCompare(right))) {
-      segments.push(`${eventType} \xD7${count}`);
-    }
+    const summaryBody = summarizeEntries(drained, true);
     const payload = {
       reason,
       count: drained.length,
-      summary: `[batch] ${segments.join(", ")}`
+      summary: summaryBody ? `[batch] ${summaryBody}` : "[batch]"
     };
     this.onFlush(payload);
     return payload;
@@ -68,6 +100,7 @@ class BatchQueue {
   dispose() {
     this.clearTimer();
     this.entries.length = 0;
+    this.userPromptHistory.length = 0;
   }
   clearTimer() {
     if (!this.maxAgeTimer) {
@@ -974,113 +1007,80 @@ 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;
+function normalizePreviewText(input) {
+  return input.replace(/\s+/g, " ").trim();
+}
+
+class PromptBuffer {
+  buffer = "";
+  append(text) {
+    this.buffer += text;
   }
-  if (typeof record.text === "string") {
-    output.push(record.text);
+  clear() {
+    this.buffer = "";
   }
-  if (typeof record.content === "string") {
-    output.push(record.content);
-  } else if (Array.isArray(record.content)) {
-    collectContentText(record.content, output);
+  flush() {
+    const text = normalizePreviewText(this.buffer);
+    this.buffer = "";
+    return text.slice(0, PROMPT_PREVIEW_MAX);
   }
 }
-function collectPartsText(value, output) {
-  if (!Array.isArray(value)) {
+var promptBuffer = new PromptBuffer;
+function handleUserEvent(event, dedup, state, notify) {
+  if (event.type === "session.created" || event.type === "session.updated") {
+    const info = asObject3(event.properties.info);
+    if (!info)
+      return;
+    const sessionID = asString(info.id);
+    if (!sessionID)
+      return;
+    const parentID = asString(info.parentID);
+    state.setParentID(sessionID, parentID || undefined);
     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 (event.type === "tui.prompt.append") {
+    const text = event.properties.text;
+    if (typeof text === "string") {
+      promptBuffer.append(text);
     }
-    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 = [];
-  collectContentText(info.content, candidates);
-  collectPartsText(info.parts, candidates);
-  const merged = normalizePreviewText(candidates.join(" "));
-  if (!merged) {
-    return "[empty]";
+    return;
   }
-  return merged.slice(0, PROMPT_PREVIEW_MAX);
-}
-function handleUserEvent(event, dedup, state, notify) {
   if (event.type === "tui.command.execute") {
     const command = event.properties.command;
-    if (command !== "session.interrupt") {
+    if (command === "session.interrupt") {
+      const dedupKey = "user-interrupt:tui-command";
+      if (!dedup.shouldSend(dedupKey))
+        return;
+      notify("user-interrupt", "[OpenCode] User interrupt requested");
       return;
     }
-    const dedupKey2 = "user-interrupt:tui-command";
-    if (!dedup.shouldSend(dedupKey2)) {
+    if (command === "prompt.clear") {
+      promptBuffer.clear();
+      return;
+    }
+    if (command === "prompt.submit") {
+      const preview = promptBuffer.flush();
+      if (!preview)
+        return;
+      const dedupKey = `user-prompt:submit:${Date.now()}`;
+      if (!dedup.shouldSend(dedupKey))
+        return;
+      notify("user-prompt", `[OpenCode] User prompt submitted: ${preview}`, undefined, { promptText: preview });
       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 sessionID = event.properties.sessionID;
+    const errorObj = event.properties.error;
+    if (!sessionID || errorObj?.name !== "MessageAbortedError")
       return;
-    }
-    const dedupKey2 = `user-interrupt:session-error:${sessionID2}`;
-    if (!dedup.shouldSend(dedupKey2)) {
+    const dedupKey = `user-interrupt:session-error:${sessionID}`;
+    if (!dedup.shouldSend(dedupKey))
       return;
-    }
-    notify("user-interrupt", `[OpenCode] User interrupt (${shortSessionID3(sessionID2)})`, state.getAgent(sessionID2));
-    return;
-  }
-  if (event.type !== "message.updated") {
-    return;
-  }
-  const info = asObject3(event.properties.info);
-  if (!info) {
+    notify("user-interrupt", `[OpenCode] User interrupt (${shortSessionID3(sessionID)})`, state.getAgent(sessionID));
     return;
   }
-  if (asString(info?.role) !== "user") {
-    return;
-  }
-  const sessionID = asString(info?.sessionID);
-  if (!sessionID) {
-    return;
-  }
-  const messageID = asString(info?.id);
-  const dedupKey = messageID ? `user-prompt:message:${messageID}` : `user-prompt:session:${sessionID}`;
-  if (!dedup.shouldSend(dedupKey)) {
-    return;
-  }
-  notify("user-prompt", `[OpenCode] User prompt submitted (${shortSessionID3(sessionID)}): ${extractPromptPreview(info)}`, state.getAgent(sessionID));
 }
 
 // src/project-config.ts
@@ -1432,6 +1432,7 @@ class SessionStateTracker {
       this.states.set(sessionID, {
         status: newStatus,
         agent: undefined,
+        parentID: undefined,
         busySince: newStatus === "busy" ? now : undefined,
         lastTransition: now
       });
@@ -1471,6 +1472,7 @@ class SessionStateTracker {
       this.states.set(sessionID, {
         status: "unknown",
         agent: agentName,
+        parentID: undefined,
         busySince: undefined,
         lastTransition: Date.now()
       });
@@ -1487,6 +1489,23 @@ class SessionStateTracker {
   getState(sessionID) {
     return this.states.get(sessionID);
   }
+  setParentID(sessionID, parentID) {
+    const existing = this.states.get(sessionID);
+    if (existing) {
+      existing.parentID = parentID;
+      return;
+    }
+    this.states.set(sessionID, {
+      status: "unknown",
+      agent: undefined,
+      parentID,
+      busySince: undefined,
+      lastTransition: Date.now()
+    });
+  }
+  hasParentID(sessionID) {
+    return Boolean(this.states.get(sessionID)?.parentID);
+  }
   getAgentHistory(sessionID) {
     return [...this.agentHistory.get(sessionID) ?? []];
   }
@@ -1499,6 +1518,7 @@ class SessionStateTracker {
     this.states.set(sessionID, {
       status: "busy",
       agent: undefined,
+      parentID: undefined,
       busySince: time,
       lastTransition: Date.now()
     });
@@ -1674,6 +1694,20 @@ function buildPrefix(config) {
   const project = path5.basename(process.cwd());
   return `[OpenCode@${host}:${project}]`;
 }
+function quotePrompt(text) {
+  return `"${text.replace(/"/g, "\\\"")}"`;
+}
+function appendDoneRealtimeContext(baseText, context) {
+  const lines = [baseText];
+  if (context.promptHistory.length > 0) {
+    lines.push(`- Prompts: ${context.promptHistory.map(quotePrompt).join(" -> ")}`);
+  }
+  if (context.batchSummary) {
+    lines.push(`- Batch: ${context.batchSummary}`);
+  }
+  return lines.join(`
+`);
+}
 var SessionMonitorPlugin = async (ctx) => {
   const config = loadConfig();
   const projectConfig = loadProjectConfig();
@@ -1733,7 +1767,10 @@ var SessionMonitorPlugin = async (ctx) => {
   const batchQueue = new BatchQueue(config.batch.maxAgeMs, (payload) => {
     sendBatchSummary(payload.summary, payload.reason, payload.count);
   });
-  const notifyByPolicy = (eventType, text, agentName) => {
+  const notifyByPolicy = (eventType, text, agentName, options) => {
+    if (eventType === "user-prompt" && options?.promptText) {
+      batchQueue.recordUserPrompt(options.promptText);
+    }
     if (runtimeControl.isPaused()) {
       debugLog?.(`Suppressed event=${eventType} paused=true`);
       return;
@@ -1751,10 +1788,14 @@ var SessionMonitorPlugin = async (ctx) => {
       debugLog?.(`Queued batch event=${eventType} agent=${agentName ?? ""}`);
       return;
     }
-    sendRealtimeWebhook(text, eventType);
     if (eventType === "done") {
-      batchQueue.flush("done-realtime");
+      const doneContext = batchQueue.getDoneRealtimeContext();
+      const doneText = appendDoneRealtimeContext(text, doneContext);
+      sendRealtimeWebhook(doneText, eventType);
+      batchQueue.clearDoneRealtimeState();
+      return;
     }
+    sendRealtimeWebhook(text, eventType);
   };
   const timers = new TimerManager(config, sendRealtimeWebhook);
   const flushBatchNow = () => {

package/dist/state.d.ts

@@ -2,6 +2,7 @@ type SessionStatus = "idle" | "busy" | "retry" | "error" | "unknown";
 interface SessionState {
     status: SessionStatus;
     agent: string | undefined;
+    parentID: string | undefined;
     busySince: number | undefined;
     lastTransition: number;
 }
@@ -17,6 +18,8 @@ export declare class SessionStateTracker {
     setAgent(sessionID: string, agentName: string): void;
     getAgent(sessionID: string): string | undefined;
     getState(sessionID: string): SessionState | undefined;
+    setParentID(sessionID: string, parentID: string | undefined): void;
+    hasParentID(sessionID: string): boolean;
     getAgentHistory(sessionID: string): string[];
     setBusySince(sessionID: string, time: number): void;
     clearSession(sessionID: string): void;

package/package.json

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