@happycastle/oh-my-openclaw 0.21.1 → 0.21.3

package/dist/hooks/subagent-tracker.js

@@ -1,6 +1,6 @@
 import { LOG_PREFIX } from '../constants.js';
 import { trackSubagentSpawn, clearSubagentTracking, getCallerSessionKey, getTrackedSubagents } from '../services/webhook-bridge.js';
-import { callHooksAgent } from '../utils/webhook-client.js';
+import { callHooksWake } from '../utils/webhook-client.js';
 import { getConfig } from '../utils/config.js';
 const SPAWN_TOOL_NAME = 'sessions_spawn';
 function extractSpawnResult(content) {
@@ -105,17 +105,15 @@ export function registerSubagentTracker(api) {
             const wakeMessage = requesterSessionKey
                 ? `[System] Sub-agent completed (runId=${runId}, requester=${requesterSessionKey}). Process the result and continue pending work.`
                 : `[System] Sub-agent completed (runId=${runId}). Process the result and continue pending work.`;
-            const targetSession = requesterSessionKey ?? callerSession;
-            const result = await callHooksAgent(wakeMessage, { gateway_url: config.gateway_url, hooks_token: config.hooks_token }, {
-                name: 'OmOC-SubagentComplete',
-                deliver: false,
-                ...(targetSession ? { sessionKey: targetSession } : {}),
-            }, api.logger);
+            // Use /hooks/wake to directly inject system event into the main session
+            // and trigger an immediate heartbeat. /hooks/agent creates a NEW isolated
+            // session which is not what we want — we need the main agent to wake up.
+            const result = await callHooksWake(wakeMessage, { gateway_url: config.gateway_url, hooks_token: config.hooks_token }, api.logger);
             if (result.ok) {
-                api.logger.info(`${LOG_PREFIX} Agent turn triggered from subagent_ended: runId=${runId}`);
+                api.logger.info(`${LOG_PREFIX} Wake triggered from subagent_ended: runId=${runId}`);
             }
             else {
-                api.logger.warn(`${LOG_PREFIX} Agent turn from subagent_ended failed: ${result.error ?? `status ${result.status}`}`);
+                api.logger.warn(`${LOG_PREFIX} Wake from subagent_ended failed: ${result.error ?? `status ${result.status}`}`);
             }
         }
     }, { priority: 120 });
@@ -132,19 +130,15 @@ export function registerSubagentTracker(api) {
         const callerSession = getCallerSessionKey(matchedRunId);
         clearSubagentTracking(matchedRunId);
         api.logger.info(`${LOG_PREFIX} Sub-agent announce detected: runId=${matchedRunId} (callerSession=${callerSession ?? 'unknown'})`);
-        // Send wake to ensure the main agent processes the announce and continues work
+        // Use /hooks/wake to directly inject into main session and trigger heartbeat
         const config = getConfig(api);
         if (config.webhook_bridge_enabled && config.gateway_url && config.hooks_token) {
-            void callHooksAgent(`[System] Sub-agent completed (runId=${matchedRunId}). Process the announce result and continue any pending work.`, { gateway_url: config.gateway_url, hooks_token: config.hooks_token }, {
-                name: 'OmOC-SubagentAnnounce',
-                deliver: false,
-                ...(callerSession ? { sessionKey: callerSession } : {}),
-            }, api.logger).then((result) => {
+            void callHooksWake(`[System] Sub-agent completed (runId=${matchedRunId}). Process the announce result and continue any pending work.`, { gateway_url: config.gateway_url, hooks_token: config.hooks_token }, api.logger).then((result) => {
                 if (result.ok) {
-                    api.logger.info(`${LOG_PREFIX} Agent turn triggered after sub-agent announce: runId=${matchedRunId}`);
+                    api.logger.info(`${LOG_PREFIX} Wake triggered after sub-agent announce: runId=${matchedRunId}`);
                 }
                 else {
-                    api.logger.warn(`${LOG_PREFIX} Agent turn after announce failed: ${result.error ?? `status ${result.status}`}`);
+                    api.logger.warn(`${LOG_PREFIX} Wake after announce failed: ${result.error ?? `status ${result.status}`}`);
                 }
             });
         }

package/dist/hooks/todo-reminder.js

@@ -1,5 +1,6 @@
 import { TOOL_PREFIX, LOG_PREFIX } from '../constants.js';
 import { getIncompleteTodos, resetStore } from '../tools/todo/store.js';
+import { setCurrentSessionKey } from '../tools/todo/session-key.js';
 import { getConfig } from '../utils/config.js';
 import { callHooksWake } from '../utils/webhook-client.js';
 const TODO_TOOL_NAMES = new Set([
@@ -89,12 +90,14 @@ export function registerSessionCleanup(api) {
         const sessionKey = ctx.sessionKey ?? ctx.sessionId ?? event.sessionId;
         if (!sessionKey)
             return;
+        setCurrentSessionKey(sessionKey);
         clearSession(sessionKey, api, 'new session');
     }, { priority: 190 });
     api.on('session_end', async (event, ctx) => {
         const sessionKey = ctx.sessionId ?? event.sessionId;
         if (!sessionKey)
             return;
+        setCurrentSessionKey(undefined);
         clearSession(sessionKey, api, 'session_end');
     }, { priority: 50 });
 }

package/dist/tools/todo/session-key.d.ts

@@ -1 +1,4 @@
+export declare function setCurrentSessionKey(key: string | undefined): void;
+export declare function getCurrentSessionKey(): string | undefined;
 export declare function extractSessionKey(options?: unknown): string | undefined;
+export declare function resolveSessionKey(options?: unknown): string | undefined;

package/dist/tools/todo/session-key.js

@@ -1,3 +1,11 @@
+// Module-level state to capture session key from session_start hook
+let currentSessionKey;
+export function setCurrentSessionKey(key) {
+    currentSessionKey = key;
+}
+export function getCurrentSessionKey() {
+    return currentSessionKey;
+}
 export function extractSessionKey(options) {
     if (typeof options === 'object' && options !== null) {
         const opts = options;
@@ -8,3 +16,11 @@ export function extractSessionKey(options) {
     }
     return undefined;
 }
+export function resolveSessionKey(options) {
+    // First try extracting from options (for future OpenClaw API changes)
+    const extracted = extractSessionKey(options);
+    if (extracted !== undefined)
+        return extracted;
+    // Fall back to captured session key from session_start hook
+    return getCurrentSessionKey();
+}

package/dist/tools/todo/todo-create.js

@@ -2,7 +2,7 @@ import { Type } from '@sinclair/typebox';
 import { toolResponse, toolError } from '../../utils/helpers.js';
 import { TOOL_PREFIX } from '../../constants.js';
 import { createTodo } from './store.js';
-import { extractSessionKey } from './session-key.js';
+import { resolveSessionKey } from './session-key.js';
 const TodoCreateParamsSchema = Type.Object({
     content: Type.String({ description: 'What needs to be done' }),
     priority: Type.Optional(Type.Unsafe({
@@ -27,7 +27,7 @@ export function registerTodoCreateTool(api) {
             const content = params.content?.trim();
             if (!content)
                 return toolError('content is required');
-            const sessionKey = extractSessionKey(options);
+            const sessionKey = resolveSessionKey(options);
             const item = createTodo(content, params.priority, params.status, sessionKey);
             return toolResponse(JSON.stringify({ todo: item }, null, 2));
         },

package/dist/tools/todo/todo-list.js

@@ -2,7 +2,7 @@ import { Type } from '@sinclair/typebox';
 import { toolResponse } from '../../utils/helpers.js';
 import { TOOL_PREFIX } from '../../constants.js';
 import { listTodos } from './store.js';
-import { extractSessionKey } from './session-key.js';
+import { resolveSessionKey } from './session-key.js';
 const TodoListParamsSchema = Type.Object({
     status: Type.Optional(Type.Unsafe({
         type: 'string',
@@ -18,7 +18,7 @@ export function registerTodoListTool(api) {
         parameters: TodoListParamsSchema,
         optional: true,
         execute: async (_callId, params, options) => {
-            const sessionKey = extractSessionKey(options);
+            const sessionKey = resolveSessionKey(options);
             const items = listTodos(params.status, sessionKey);
             return toolResponse(JSON.stringify({ todos: items, count: items.length }, null, 2));
         },

package/dist/tools/todo/todo-update.js

@@ -2,7 +2,7 @@ import { Type } from '@sinclair/typebox';
 import { toolResponse, toolError } from '../../utils/helpers.js';
 import { TOOL_PREFIX } from '../../constants.js';
 import { updateTodo } from './store.js';
-import { extractSessionKey } from './session-key.js';
+import { resolveSessionKey } from './session-key.js';
 const TodoUpdateParamsSchema = Type.Object({
     id: Type.String({ description: 'Todo ID (e.g. todo-1)' }),
     status: Type.Optional(Type.Unsafe({
@@ -31,7 +31,7 @@ export function registerTodoUpdateTool(api) {
             if (!params.status && !params.priority && !params.content) {
                 return toolError('At least one of status, priority, or content must be provided');
             }
-            const sessionKey = extractSessionKey(options);
+            const sessionKey = resolveSessionKey(options);
             const updated = updateTodo(id, {
                 status: params.status,
                 priority: params.priority,

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "oh-my-openclaw",
   "name": "Oh-My-OpenClaw",
   "description": "Multi-agent orchestration plugin — 11 agents, category-based model routing, todo enforcer, ralph loop, agent setup CLI, and custom tools",
-  "version": "0.21.1",
+  "version": "0.21.3",
   "skills": [
     "skills"
   ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@happycastle/oh-my-openclaw",
-  "version": "0.21.1",
+  "version": "0.21.3",
   "description": "Oh-My-OpenClaw plugin — multi-agent orchestration, todo enforcer, ralph loop, and custom tools for OpenClaw",
   "type": "module",
   "main": "dist/index.js",