@happycastle/oh-my-openclaw 0.20.0 → 0.21.0

package/dist/commands/todo-commands.d.ts

@@ -0,0 +1,2 @@
+import { OmocPluginApi } from '../types.js';
+export declare function registerTodoCommands(api: OmocPluginApi): void;

package/dist/commands/todo-commands.js

@@ -0,0 +1,57 @@
+import { _sessions } from '../tools/todo/store.js';
+const STATUS_EMOJI = {
+    pending: '⏳',
+    in_progress: '🔄',
+    completed: '✅',
+    cancelled: '❌',
+};
+function formatTodoList(todos) {
+    if (todos.length === 0) {
+        return '📋 No todos found.';
+    }
+    const lines = ['# 📋 Todo List\n'];
+    // Status summary
+    const statusOrder = ['in_progress', 'pending', 'completed', 'cancelled'];
+    const counts = {};
+    for (const todo of todos) {
+        counts[todo.status] = (counts[todo.status] ?? 0) + 1;
+    }
+    const summaryParts = [];
+    for (const status of statusOrder) {
+        const count = counts[status];
+        if (count && count > 0) {
+            summaryParts.push(`${STATUS_EMOJI[status]} ${status}: ${count}`);
+        }
+    }
+    lines.push(summaryParts.join(' | '));
+    lines.push('');
+    // List each todo
+    for (const todo of todos) {
+        const emoji = STATUS_EMOJI[todo.status] ?? '❓';
+        const priority = todo.priority !== 'medium' ? ` [${todo.priority}]` : '';
+        lines.push(`${emoji}${priority} **${todo.id}**: ${todo.content}`);
+    }
+    return lines.join('\n');
+}
+/**
+ * Collect todos from ALL session stores.
+ * Command handlers don't receive session context, so we aggregate
+ * across every store to give the user a complete view.
+ */
+function collectAllTodos() {
+    const all = [];
+    for (const store of _sessions.values()) {
+        all.push(...store.todos);
+    }
+    return all;
+}
+export function registerTodoCommands(api) {
+    api.registerCommand({
+        name: 'todos',
+        description: 'Show current todo list (auto-reply, no AI invocation)',
+        handler: () => {
+            const todos = collectAllTodos();
+            return { text: formatTodoList(todos) };
+        },
+    });
+}

package/dist/hooks/subagent-tracker.js

@@ -105,7 +105,8 @@ 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 result = await callHooksWake(wakeMessage, { gateway_url: config.gateway_url, hooks_token: config.hooks_token }, api.logger);
+            const targetSession = requesterSessionKey ?? callerSession;
+            const result = await callHooksWake(wakeMessage, { gateway_url: config.gateway_url, hooks_token: config.hooks_token }, api.logger, targetSession ? { sessionKey: targetSession } : undefined);
             if (result.ok) {
                 api.logger.info(`${LOG_PREFIX} Wake sent from subagent_ended: runId=${runId}`);
             }
@@ -130,7 +131,7 @@ export function registerSubagentTracker(api) {
         // Send wake to ensure the main agent processes the announce and continues work
         const config = getConfig(api);
         if (config.webhook_bridge_enabled && config.gateway_url && config.hooks_token) {
-            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) => {
+            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, callerSession ? { sessionKey: callerSession } : undefined).then((result) => {
                 if (result.ok) {
                     api.logger.info(`${LOG_PREFIX} Wake sent after sub-agent announce: runId=${matchedRunId}`);
                 }

package/dist/hooks/todo-reminder.js

@@ -63,7 +63,12 @@ export function registerAgentEndReminder(api) {
             }
             const config = getConfig(api);
             if (config.webhook_bridge_enabled && config.hooks_token) {
-                callHooksWake(`⚠️ Agent ended with ${incomplete.length} incomplete todo(s). Resume work.`, { gateway_url: config.gateway_url, hooks_token: config.hooks_token }, api.logger).catch(() => { });
+                if (!sessionKey) {
+                    api.logger.warn(`${LOG_PREFIX} No sessionKey available for wake after agent_end — skipping to avoid new session creation`);
+                }
+                else {
+                    callHooksWake(`⚠️ Agent ended with ${incomplete.length} incomplete todo(s). Resume work.`, { gateway_url: config.gateway_url, hooks_token: config.hooks_token }, api.logger, { sessionKey }).catch(() => { });
+                }
             }
             api.logger.warn(`${LOG_PREFIX} Agent ended with ${incomplete.length} incomplete todo(s)`);
         }

package/dist/index.js

@@ -17,6 +17,7 @@ import { registerWebSearchTool } from './tools/web-search.js';
 import { registerRalphCommands } from './commands/ralph-commands.js';
 import { registerStatusCommands } from './commands/status-commands.js';
 import { registerPersonaCommands } from './commands/persona-commands.js';
+import { registerTodoCommands } from './commands/todo-commands.js';
 import { registerContextInjector } from './hooks/context-injector.js';
 import { registerGuardrailInjector } from './hooks/guardrail-injector.js';
 import { registerSessionSync } from './hooks/session-sync.js';
@@ -181,6 +182,11 @@ export default function register(api) {
         registry.commands.push('omoc_health', 'omoc_config');
         api.logger.info(`[${PLUGIN_ID}] Status commands registered (omoc_health, omoc_config)`);
     });
+    safeRegister(api, 'todo-commands', 'command', () => {
+        registerTodoCommands(api);
+        registry.commands.push('todos');
+        api.logger.info(`[${PLUGIN_ID}] Todo commands registered (/todos)`);
+    });
     initPersonaState(api);
     safeRegister(api, 'persona-commands', 'command', () => {
         registerPersonaCommands(api);

package/dist/services/webhook-bridge.js

@@ -84,17 +84,36 @@ async function checkStaleSubagents(api) {
     }
     if (stale.length === 0)
         return;
-    const details = stale
-        .map((s) => `  - runId=${s.runId} task="${s.task.substring(0, 80)}" (${Math.round((now - s.spawnedAt) / 60000)}m ago)`)
-        .join('\n');
-    const message = `[OmOC Sub-agent Alert] ${stale.length} sub-agent(s) may have completed without announce:\n${details}\n\n` +
-        `Check sub-agent status with \`/subagents list\` or \`/subagents info <id>\`. ` +
-        `If completed, collect results and proceed. If still running, wait.`;
-    const result = await callHooksWake(message, webhookConfig, api.logger);
-    if (result.ok) {
-        api.logger.info(`${LOG_PREFIX} Stale sub-agent alert sent via hooks/wake (${stale.length} stale)`);
-        for (const s of stale) {
-            trackedSubagents.delete(s.runId);
+    // Group stale entries by callerSessionKey and send separate wakes per group
+    const grouped = new Map();
+    for (const s of stale) {
+        const key = s.callerSessionKey ?? '__default__';
+        const group = grouped.get(key) ?? [];
+        group.push(s);
+        grouped.set(key, group);
+    }
+    for (const [sessionKey, entries] of grouped) {
+        const details = entries
+            .map((s) => `  - runId=${s.runId} task="${s.task.substring(0, 80)}" (${Math.round((now - s.spawnedAt) / 60000)}m ago)`)
+            .join('\n');
+        const message = `[OmOC Sub-agent Alert] ${entries.length} sub-agent(s) may have completed without announce:\n${details}\n\n` +
+            `Check sub-agent status with \`/subagents list\` or \`/subagents info <id>\`. ` +
+            `If completed, collect results and proceed. If still running, wait.`;
+        const targetSession = sessionKey !== '__default__' ? sessionKey : undefined;
+        if (!targetSession) {
+            api.logger.warn(`${LOG_PREFIX} No sessionKey available for stale sub-agent alert (${entries.length} stale) — cleaning up without wake to avoid new session creation`);
+            // Still clean up tracking to prevent infinite reprocessing
+            for (const s of entries) {
+                trackedSubagents.delete(s.runId);
+            }
+            continue;
+        }
+        const result = await callHooksWake(message, webhookConfig, api.logger, { sessionKey: targetSession });
+        if (result.ok) {
+            api.logger.info(`${LOG_PREFIX} Stale sub-agent alert sent via hooks/wake (${entries.length} stale, target=${targetSession})`);
+            for (const s of entries) {
+                trackedSubagents.delete(s.runId);
+            }
         }
     }
 }

package/dist/tools/task-delegation.js

@@ -34,7 +34,7 @@ const DelegateParamsSchema = Type.Object({
     skills: Type.Optional(Type.Array(Type.String(), { description: 'Skill names to load' })),
     background: Type.Optional(Type.Boolean({ description: 'Run in background (default: false)', default: false })),
 });
-function getModelForCategory(category, api) {
+function getRecommendedModelForCategory(category, api) {
     const config = getConfig(api);
     const override = config.model_routing?.[category];
     if (override?.model) {
@@ -59,7 +59,7 @@ export function registerDelegateTool(api) {
                 return toolError(`Invalid category: ${params.category}. Valid: ${validCategories.join(', ')}`);
             }
             const category = params.category;
-            const { model, alternatives } = getModelForCategory(category, api);
+            const { model, alternatives } = getRecommendedModelForCategory(category, api);
             const agentId = params.agent_id || DEFAULT_CATEGORY_AGENTS[category];
             api.logger.info(`${LOG_PREFIX} Delegating task:`, { category, model, agentId });
             const instruction = [
@@ -68,12 +68,12 @@ export function registerDelegateTool(api) {
                 '⚡ NOW CALL sessions_spawn with these parameters:',
                 `  task: "${params.task_description}"`,
                 `  mode: "run"`,
-                `  model: "${model}"`,
                 `  agentId: "${agentId}"`,
-                alternatives?.length ? `  fallback_models: ${JSON.stringify(alternatives)}` : '',
-                alternatives?.length ? `  If "${model}" is unavailable, try: ${alternatives.join(', ')}` : '',
+                `  # recommended model (do NOT pass to sessions_spawn): ${model}`,
+                alternatives?.length ? `  Recommended fallback models (informational only): ${alternatives.join(', ')}` : '',
                 params.background ? '  (background execution — results will arrive via push notification)' : '',
                 '',
+                'Do NOT set sessions_spawn model unless explicitly asked by user.',
                 'Do NOT just return this metadata. Actually call sessions_spawn NOW.',
                 '',
                 '⚠️ AFTER the subagent completes:',

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

@@ -39,7 +39,12 @@ export function registerTodoUpdateTool(api) {
             }, sessionKey);
             if (!updated)
                 return toolResponse(JSON.stringify({ error: 'todo_not_found', id }));
-            return toolResponse(JSON.stringify({ todo: updated }, null, 2));
+            // Include completion notice when status changes to completed
+            const result = { todo: updated };
+            if (params.status === 'completed') {
+                result.notice = `✅ Todo ${updated.id} completed: ${updated.content}`;
+            }
+            return toolResponse(JSON.stringify(result, null, 2));
         },
     });
 }

package/dist/utils/webhook-client.d.ts

@@ -8,6 +8,10 @@ export interface HooksAgentOptions {
     sessionKey?: string;
     deliver?: boolean;
 }
+export interface HooksWakeOptions {
+    /** Target a specific session instead of creating a new one */
+    sessionKey?: string;
+}
 export interface WebhookResult {
     ok: boolean;
     status?: number;
@@ -15,7 +19,7 @@ export interface WebhookResult {
 }
 export declare function callHooksWake(text: string, config: WebhookConfig, logger?: {
     warn: (...args: unknown[]) => void;
-}): Promise<WebhookResult>;
+}, options?: HooksWakeOptions): Promise<WebhookResult>;
 export declare function callHooksAgent(message: string, config: WebhookConfig, options?: HooksAgentOptions, logger?: {
     warn: (...args: unknown[]) => void;
 }): Promise<WebhookResult>;

package/dist/utils/webhook-client.js

@@ -1,16 +1,20 @@
 import { LOG_PREFIX } from '../constants.js';
-export async function callHooksWake(text, config, logger) {
+export async function callHooksWake(text, config, logger, options) {
     if (!config.hooks_token) {
         return { ok: false, error: 'hooks_token not configured' };
     }
     try {
+        const payload = { text, mode: 'now' };
+        if (options?.sessionKey) {
+            payload.sessionKey = options.sessionKey;
+        }
         const res = await fetch(`${config.gateway_url}/hooks/wake`, {
             method: 'POST',
             headers: {
                 'Authorization': `Bearer ${config.hooks_token}`,
                 'Content-Type': 'application/json',
             },
-            body: JSON.stringify({ text, mode: 'now' }),
+            body: JSON.stringify(payload),
         });
         return { ok: res.ok, status: res.status };
     }

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.20.0",
+  "version": "0.21.0",
   "skills": [
     "skills"
   ],

package/package.json

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