omoclaw 3.2.2 → 3.2.4

package/README.md

@@ -25,36 +25,12 @@ Create a configuration file at `~/.config/opencode/opencode-monitor.json`:
 {
   "webhook": {
     "url": "http://your-webhook-endpoint/hooks/wake",
-    "token": "your-bearer-token",
-    "channelType": "discord",
-    "chatType": "channel",
-    "agentId": "main",
-    "channel": "",
-    "sessionKey": ""
+    "token": "your-bearer-token"
   },
-  "hostLabel": "",
   "staleTimeoutMs": 900000,
   "permissionReminderMs": 120000,
   "dedupTtlMs": 30000,
   "idleConfirmDelayMs": 1500,
-  "batch": {
-    "maxAgeMs": 600000
-  },
-  "events": {
-    "done": {
-      "default": "realtime",
-      "agents": {
-        "explore": "batch",
-        "oracle": "batch",
-        "librarian": "off"
-      }
-    },
-    "error": { "default": "realtime", "agents": {} },
-    "permission": { "default": "realtime", "agents": {} },
-    "question": { "default": "realtime", "agents": {} },
-    "user-interrupt": { "default": "realtime", "agents": {} },
-    "user-prompt": { "default": "off", "agents": {} }
-  },
   "debug": false,
   "enabled": true
 }
@@ -64,13 +40,10 @@ Create a configuration file at `~/.config/opencode/opencode-monitor.json`:
 
 - **webhook.url**: The endpoint where notifications will be sent.
 - **webhook.token**: Bearer token for authentication.
-- **hostLabel**: Optional host label used in notification prefix.
 - **staleTimeoutMs**: Timeout for busy sessions (default: 15 minutes).
 - **permissionReminderMs**: Interval to re-notify when waiting for permissions (default: 2 minutes).
 - **dedupTtlMs**: Time window for deduplicating similar notifications (default: 30 seconds).
 - **idleConfirmDelayMs**: Delay before confirming an idle state.
-- **batch.maxAgeMs**: Auto-flush age for batch queue (default: 10 minutes).
-- **events**: Event-level default modes and per-agent overrides (`off | realtime | batch`).
 - **debug**: Enable file logging to `/tmp/opencode-monitor-debug.log`.
 - **enabled**: Toggle the plugin on or off.
 
@@ -82,41 +55,6 @@ Create a configuration file at `~/.config/opencode/opencode-monitor.json`:
 - Stale session detection (default: 15 minutes)
 - Deduplication to prevent webhook spam
 - Completion notification with full agent chain
-- Runtime event control: `off | realtime | batch` per event and per agent
-- Batch queue with flush on realtime done event and max-age auto flush
-- `/wake` command support with runtime-only updates
-- Local control HTTP server (`127.0.0.1`, bearer auth, dynamic port file)
-
-## Runtime Control
-
-### `/wake` slash command
-
-`omoclaw` creates `.opencode/commands/wake.md` automatically at startup.
-
-Usage:
-
-- `/wake`
-- `/wake on`
-- `/wake off`
-- `/wake <event> <mode>`
-- `/wake <event> <agent> <mode>`
-
-All `/wake` changes are runtime-only (in-memory) and are not persisted.
-
-### HTTP control API
-
-- Bind address: `127.0.0.1`
-- Port: auto-assigned (`port: 0`)
-- Port discovery file: `/tmp/omoclaw-<pid>.port`
-- Auth: `Authorization: Bearer <webhook.token>`
-
-Endpoints:
-
-- `GET /status`
-- `POST /config` (runtime partial patch)
-- `POST /pause`
-- `POST /resume`
-- `POST /flush`
 
 ## Webhook Payload Format
 
@@ -130,19 +68,10 @@ The plugin sends a POST request to the configured URL.
 ```json
 {
   "text": "[OpenCode] ...",
-  "mode": "now",
-  "metadata": {
-    "correlationId": "..."
-  }
+  "mode": "now"
 }
 ```
 
-Batch flush sends the same envelope with additional metadata:
-
-- `metadata.batch = true`
-- `metadata.batchReason = "done-realtime" | "max-age" | "manual"`
-- `metadata.batchCount = <number>`
-
 ## License
 
 MIT

package/dist/index.js

@@ -1087,10 +1087,6 @@ function handleUserEvent(event, dedup, state, notify, debugLog) {
       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);
@@ -1224,16 +1220,15 @@ function resolveSessionRouting(config, projectConfig) {
   if (config.webhook.sessionKey) {
     const parsed = parseSessionKey(config.webhook.sessionKey);
     return {
-      sessionKey: config.webhook.sessionKey,
+      sessionKey: "",
       source: "config",
       agentId: parsed.agentId || config.webhook.agentId,
       channelId: parsed.channelId || config.webhook.channel
     };
   }
-  const derivedSessionKey = buildSessionKeyFromConfig(config);
-  if (derivedSessionKey) {
+  if (buildSessionKeyFromConfig(config)) {
     return {
-      sessionKey: derivedSessionKey,
+      sessionKey: "",
       source: "derived",
       agentId: config.webhook.agentId,
       channelId: config.webhook.channel
@@ -1705,7 +1700,11 @@ function buildCorrelationId(text, provided) {
 function sendWebhook(config, text, options = {}) {
   const { webhook } = config;
   const envSessionKey = process.env.OPENCLAW_SESSION_KEY?.trim();
-  const sessionKey = envSessionKey || options.sessionKey?.trim() || resolveFallbackSessionKey(config);
+  const sessionKey = envSessionKey || options.sessionKey?.trim() || "";
+  if (!sessionKey) {
+    wlog(`Skipping /hooks/wake (no explicit sessionKey, eventType: ${options.eventType ?? "unknown"})`);
+    return;
+  }
   const correlationId = buildCorrelationId(text, options.correlationId);
   const eventType = options.eventType?.trim();
   const body = {
@@ -1714,15 +1713,13 @@ function sendWebhook(config, text, options = {}) {
     metadata: {
       correlationId,
       ...options.metadata ?? {}
-    }
+    },
+    sessionKey
   };
-  if (sessionKey) {
-    body.sessionKey = sessionKey;
-  }
   if (eventType) {
     body.eventType = eventType;
   }
-  wlog(`Sending /hooks/wake to ${webhook.url} (session: ${sessionKey || "main"}, correlationId: ${correlationId}): ${text}`);
+  wlog(`Sending /hooks/wake to ${webhook.url} (session: ${sessionKey}, correlationId: ${correlationId}): ${text}`);
   fetch(webhook.url, {
     method: "POST",
     headers: {
@@ -1777,7 +1774,7 @@ var SessionMonitorPlugin = async (ctx) => {
   const projectConfig = loadProjectConfig();
   const sessionRouting = resolveSessionRouting(config, projectConfig);
   const prefix = buildPrefix(config);
-  const wakeCommandPath = ensureWakeCommandFile(ctx.worktree || process.cwd());
+  const wakeCommandPath = ensureWakeCommandFile((ctx.worktree && ctx.worktree !== "/") ? ctx.worktree : (process.env.HOME || process.cwd()));
   const debugLog = config.debug ? (msg) => {
     const line = `[${new Date().toISOString()}] ${msg}
 `;
@@ -1793,6 +1790,11 @@ var SessionMonitorPlugin = async (ctx) => {
     debugLog?.("Plugin disabled, exiting.");
     return {};
   }
+  const hasExplicitRouting = sessionRouting.source === "env";
+  if (!hasExplicitRouting || !sessionRouting.sessionKey) {
+    debugLog?.(`No explicit session routing (source=${sessionRouting.source}); monitor will not send webhooks.`);
+    return {};
+  }
   const registry = new Registry({ debugLog });
   registry.start({
     hostLabel: config.hostLabel || os3.hostname(),

package/package.json

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

package/dist/batch-queue.d.ts

@@ -1,33 +0,0 @@
-import type { MonitorEventType } from "./config";
-export type BatchFlushReason = "done-realtime" | "max-age" | "manual";
-export interface BatchQueueEntry {
-    eventType: MonitorEventType;
-    agentName?: string;
-}
-export interface BatchFlushPayload {
-    reason: BatchFlushReason;
-    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;
-    private clearTimer;
-}
-export {};

package/dist/config.d.ts

@@ -1,41 +0,0 @@
-export type EventMode = "off" | "realtime" | "batch";
-export type MonitorEventType = "done" | "error" | "permission" | "question" | "user-interrupt" | "user-prompt";
-export interface MonitorEventRule {
-    default: EventMode;
-    agents: Record<string, EventMode>;
-}
-export interface MonitorBatchConfig {
-    maxAgeMs: number;
-}
-export type MonitorEventConfig = Record<MonitorEventType, MonitorEventRule>;
-export interface MonitorConfig {
-    webhook: {
-        url: string;
-        token: string;
-        /** Gateway auth token for /v1/responses API (may differ from hooks token) */
-        gatewayToken: string;
-        /** Use /hooks/agent instead of /hooks/wake for targeted delivery */
-        useAgent: boolean;
-        /** Channel/chat ID to deliver notifications to */
-        channel: string;
-        /** Delivery channel type (discord, telegram, slack, etc.) */
-        channelType: string;
-        /** Chat type within channel (channel, dm, groupdm, private, etc.) */
-        chatType: string;
-        /** Agent ID for session key generation */
-        agentId: string;
-        /** Full session key override — if set, channelType/channel/chatType/agentId are ignored */
-        sessionKey: string;
-    };
-    /** Label to identify the host machine (e.g. "MainPC", "32w2"). Auto-detected from hostname if omitted. */
-    hostLabel: string;
-    staleTimeoutMs: number;
-    permissionReminderMs: number;
-    dedupTtlMs: number;
-    idleConfirmDelayMs: number;
-    debug: boolean;
-    enabled: boolean;
-    events: MonitorEventConfig;
-    batch: MonitorBatchConfig;
-}
-export declare function loadConfig(): MonitorConfig;

package/dist/control-http.d.ts

@@ -1,15 +0,0 @@
-import type { BatchFlushPayload } from "./batch-queue";
-import type { RuntimeControl } from "./runtime-control";
-export interface ControlHttpOptions {
-    runtimeControl: RuntimeControl;
-    bearerToken: string;
-    getBatchSize: () => number;
-    flushBatch: () => BatchFlushPayload | undefined;
-    debugLog?: (msg: string) => void;
-}
-export interface ControlHttpServer {
-    port: number;
-    portFilePath: string;
-    stop: () => Promise<void>;
-}
-export declare function startControlHttpServer(options: ControlHttpOptions): Promise<ControlHttpServer>;

package/dist/control-slash.d.ts

@@ -1,10 +0,0 @@
-import type { Part } from "@opencode-ai/sdk";
-import { RuntimeControl } from "./runtime-control";
-export declare function ensureWakeCommandFile(worktree: string): string;
-export declare function handleWakeCommandBefore(input: {
-    command: string;
-    sessionID: string;
-    arguments: string;
-}, output: {
-    parts: Part[];
-}, runtimeControl: RuntimeControl, getBatchSize: () => number): boolean;

package/dist/dedup.d.ts

@@ -1,6 +0,0 @@
-export declare class DedupEngine {
-    private readonly ttlMs;
-    private readonly seen;
-    constructor(ttlMs: number);
-    shouldSend(key: string): boolean;
-}

package/dist/event-policy.d.ts

@@ -1,6 +0,0 @@
-import type { EventMode, MonitorEventConfig, MonitorEventType } from "./config";
-export declare class EventPolicyEngine {
-    private readonly rules;
-    constructor(rules: MonitorEventConfig);
-    resolveMode(eventType: MonitorEventType, agentName?: string): EventMode;
-}

package/dist/handlers/agent.d.ts

@@ -1,3 +0,0 @@
-import type { Event } from "@opencode-ai/sdk";
-import type { SessionStateTracker } from "../state";
-export declare function handleAgentEvent(event: Event, state: SessionStateTracker): void;

package/dist/handlers/permission.d.ts

@@ -1,10 +0,0 @@
-import type { Event } from "@opencode-ai/sdk";
-import type { MonitorEventType } from "../config";
-import type { DedupEngine } from "../dedup";
-import type { SessionStateTracker } from "../state";
-import type { TimerManager } from "../timers";
-interface PolicyNotifier {
-    (eventType: MonitorEventType, text: string, agentName?: string): void;
-}
-export declare function handlePermissionEvent(event: Event, dedup: DedupEngine, timers: TimerManager, state: SessionStateTracker, notify: PolicyNotifier): void;
-export {};

package/dist/handlers/question.d.ts

@@ -1,15 +0,0 @@
-import type { OpencodeClient } from "@opencode-ai/sdk/v2/client";
-import type { MonitorEventType } from "../config";
-import type { DedupEngine } from "../dedup";
-import type { SessionStateTracker } from "../state";
-import type { TimerManager } from "../timers";
-interface PolicyNotifier {
-    (eventType: MonitorEventType, text: string, agentName?: string): void;
-}
-export declare function handleQuestionEvent(event: {
-    type: string;
-    properties: unknown;
-}, dedup: DedupEngine, timers: TimerManager, state: SessionStateTracker, notify: PolicyNotifier): void;
-export declare function replyToQuestion(client: OpencodeClient, requestID: string, answers: string[][]): Promise<boolean>;
-export declare function rejectQuestion(client: OpencodeClient, requestID: string): Promise<boolean>;
-export {};

package/dist/handlers/session-status.d.ts

@@ -1,10 +0,0 @@
-import type { Event } from "@opencode-ai/sdk";
-import type { MonitorEventType } from "../config";
-import type { DedupEngine } from "../dedup";
-import type { SessionStateTracker } from "../state";
-import type { TimerManager } from "../timers";
-interface PolicyNotifier {
-    (eventType: MonitorEventType, text: string, agentName?: string): void;
-}
-export declare function handleSessionStatusEvent(event: Event, dedup: DedupEngine, state: SessionStateTracker, timers: TimerManager, webhookFn: (text: string) => void, notify: PolicyNotifier, debugLog?: (msg: string) => void): void;
-export {};

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

@@ -1,12 +0,0 @@
-import type { Event } from "@opencode-ai/sdk";
-import type { MonitorEventType } from "../config";
-import type { DedupEngine } from "../dedup";
-import type { SessionStateTracker } from "../state";
-interface UserEventNotifier {
-    (eventType: MonitorEventType, text: string, agentName?: string, options?: {
-        promptText?: string;
-    }): void;
-}
-type DebugLogger = ((msg: string) => void) | undefined;
-export declare function handleUserEvent(event: Event, dedup: DedupEngine, state: SessionStateTracker, notify: UserEventNotifier, debugLog?: DebugLogger): void;
-export {};

package/dist/project-config.d.ts

@@ -1,13 +0,0 @@
-import type { MonitorConfig } from "./config";
-export interface ProjectConfig {
-    sessionKey: string;
-    tmuxSession: string;
-}
-export interface SessionRouting {
-    sessionKey: string;
-    source: "env" | "project" | "config" | "derived" | "none";
-    agentId: string;
-    channelId: string;
-}
-export declare function loadProjectConfig(cwd?: string): ProjectConfig;
-export declare function resolveSessionRouting(config: MonitorConfig, projectConfig: ProjectConfig): SessionRouting;

package/dist/registry.d.ts

@@ -1,57 +0,0 @@
-export declare const REGISTRY_FILE_PATH: string;
-export interface RegistryEntry {
-    instanceId: string;
-    hostname: string;
-    hostLabel: string;
-    pid: number;
-    startedAt: string;
-    leaseExpiresAt: string;
-    project: string;
-    projectId: string;
-    workspaceRoot: string;
-    tmuxSession: string;
-    openclawSessionKey: string;
-    agentId: string;
-    channelId: string;
-}
-export interface RegistryStartInput {
-    hostLabel: string;
-    tmuxSession: string;
-    openclawSessionKey: string;
-    agentId: string;
-    channelId: string;
-}
-export interface RegistryOptions {
-    workspaceRoot?: string;
-    ttlMs?: number;
-    heartbeatMs?: number;
-    debugLog?: (msg: string) => void;
-}
-export declare class Registry {
-    private readonly instanceId;
-    private readonly hostname;
-    private readonly workspaceRoot;
-    private readonly project;
-    private readonly projectId;
-    private readonly ttlMs;
-    private readonly heartbeatMs;
-    private readonly debugLog;
-    private heartbeatTimer;
-    private hooksInstalled;
-    private entryTemplate;
-    private readonly stopOnProcessExit;
-    constructor(options?: RegistryOptions);
-    start(input: RegistryStartInput): void;
-    stop(): void;
-    readSessions(): RegistryEntry[];
-    private startHeartbeat;
-    private installProcessHooks;
-    private upsert;
-    private remove;
-    private updateSessions;
-    private readAndGc;
-    private readRegistryFile;
-    private writeRegistryFile;
-    private ensureRegistryDir;
-    private isPidAlive;
-}

package/dist/runtime-control.d.ts

@@ -1,33 +0,0 @@
-import type { EventMode, MonitorEventConfig, MonitorEventType } from "./config";
-declare const EVENT_TYPES: readonly MonitorEventType[];
-interface EventPatchInput {
-    default?: EventMode;
-    agents?: Record<string, EventMode | null>;
-}
-export interface RuntimePatchInput {
-    paused?: boolean;
-    events?: Partial<Record<MonitorEventType, EventPatchInput>>;
-}
-export interface RuntimePatchResult {
-    ok: boolean;
-    errors: string[];
-}
-declare function isEventType(value: string): value is MonitorEventType;
-declare function isEventMode(value: unknown): value is EventMode;
-export declare class RuntimeControl {
-    private paused;
-    private readonly rules;
-    private readonly policy;
-    constructor(baseRules: MonitorEventConfig);
-    isPaused(): boolean;
-    setPaused(next: boolean): void;
-    pause(): void;
-    resume(): void;
-    getRules(): MonitorEventConfig;
-    resolveMode(eventType: MonitorEventType, agentName?: string): EventMode;
-    setEventDefault(eventType: MonitorEventType, mode: EventMode): void;
-    setEventAgentMode(eventType: MonitorEventType, agentName: string, mode: EventMode): void;
-    removeEventAgentMode(eventType: MonitorEventType, agentName: string): void;
-    applyPatch(input: unknown): RuntimePatchResult;
-}
-export { EVENT_TYPES, isEventMode, isEventType };

package/dist/state.d.ts

@@ -1,27 +0,0 @@
-type SessionStatus = "idle" | "busy" | "retry" | "error" | "unknown";
-interface SessionState {
-    status: SessionStatus;
-    agent: string | undefined;
-    parentID: string | undefined;
-    busySince: number | undefined;
-    lastTransition: number;
-}
-interface TransitionResult {
-    changed: boolean;
-    prev: SessionStatus;
-    current: SessionStatus;
-}
-export declare class SessionStateTracker {
-    private readonly states;
-    private readonly agentHistory;
-    transition(sessionID: string, newStatus: SessionStatus): TransitionResult;
-    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;
-}
-export type { SessionStatus };

package/dist/timers.d.ts

@@ -1,16 +0,0 @@
-import type { MonitorConfig } from "./config";
-export declare class TimerManager {
-    private readonly config;
-    private readonly webhookFn;
-    private readonly staleTimers;
-    private readonly permissionTimers;
-    private readonly questionTimers;
-    constructor(config: MonitorConfig, webhookFn: (text: string) => void);
-    startStaleTimer(sessionID: string): void;
-    clearStaleTimer(sessionID: string): void;
-    startPermissionReminder(permissionID: string, title: string, sessionID: string): void;
-    clearPermissionReminder(permissionID: string): void;
-    startQuestionReminder(questionID: string, header: string, sessionID: string): void;
-    clearQuestionReminder(questionID: string): void;
-    clearSession(sessionID: string): void;
-}

package/dist/webhook.d.ts

@@ -1,15 +0,0 @@
-import type { MonitorConfig } from "./config";
-import type { BatchFlushReason } from "./batch-queue";
-interface SendWebhookOptions {
-    sessionKey?: string;
-    correlationId?: string;
-    metadata?: Record<string, unknown>;
-    eventType?: string;
-}
-interface SendBatchWebhookOptions extends SendWebhookOptions {
-    reason: BatchFlushReason;
-    count: number;
-}
-export declare function sendWebhook(config: MonitorConfig, text: string, options?: SendWebhookOptions): void;
-export declare function sendBatchWebhook(config: MonitorConfig, text: string, options: SendBatchWebhookOptions): void;
-export {};