claudecode-omc 4.4.10 → 4.7.4

package/dist/tools/shared-memory-tools.js

@@ -0,0 +1,250 @@
+/**
+ * Shared Memory MCP Tools
+ *
+ * Provides tools for cross-session memory sync between agents
+ * in /team and /pipeline workflows. Agents can write, read, list,
+ * delete, and clean up shared key-value entries namespaced by
+ * session group or pipeline run.
+ *
+ * Storage: .omc/state/shared-memory/{namespace}/{key}.json
+ * Config gate: agents.sharedMemory.enabled in ~/.claude/.omc-config.json
+ *
+ * @see https://github.com/anthropics/oh-my-claudecode/issues/1119
+ */
+import { z } from 'zod';
+import { validateWorkingDirectory } from '../lib/worktree-paths.js';
+import { isSharedMemoryEnabled, writeEntry, readEntry, listEntries, deleteEntry, cleanupExpired, listNamespaces, } from '../lib/shared-memory.js';
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+const DISABLED_MSG = 'Shared memory is disabled. Set agents.sharedMemory.enabled = true in ~/.claude/.omc-config.json to enable.';
+function disabledResponse() {
+    return {
+        content: [{ type: 'text', text: DISABLED_MSG }],
+        isError: true,
+    };
+}
+function errorResponse(msg) {
+    return {
+        content: [{ type: 'text', text: msg }],
+        isError: true,
+    };
+}
+// ---------------------------------------------------------------------------
+// shared_memory_write
+// ---------------------------------------------------------------------------
+export const sharedMemoryWriteTool = {
+    name: 'shared_memory_write',
+    description: 'Write a key-value pair to shared memory for cross-agent handoffs. Namespace by session group or pipeline run. Supports optional TTL for auto-expiry.',
+    schema: {
+        key: z.string().min(1).max(128).describe('Key identifier (alphanumeric, hyphens, underscores, dots)'),
+        value: z.unknown().describe('JSON-serializable value to store'),
+        namespace: z.string().min(1).max(128).describe('Namespace for grouping (e.g., team name, pipeline run ID, session group)'),
+        ttl: z.number().int().min(1).max(604800).optional().describe('Time-to-live in seconds (max 7 days). Omit for no expiry.'),
+        workingDirectory: z.string().optional().describe('Working directory (defaults to cwd)'),
+    },
+    handler: async (args) => {
+        if (!isSharedMemoryEnabled())
+            return disabledResponse();
+        try {
+            const root = validateWorkingDirectory(args.workingDirectory);
+            const entry = writeEntry(args.namespace, args.key, args.value, args.ttl, root);
+            let text = `Successfully wrote to shared memory.\n\n- **Namespace:** ${entry.namespace}\n- **Key:** ${entry.key}\n- **Updated:** ${entry.updatedAt}`;
+            if (entry.ttl) {
+                text += `\n- **TTL:** ${entry.ttl}s\n- **Expires:** ${entry.expiresAt}`;
+            }
+            return { content: [{ type: 'text', text }] };
+        }
+        catch (error) {
+            return errorResponse(`Error writing shared memory: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    },
+};
+// ---------------------------------------------------------------------------
+// shared_memory_read
+// ---------------------------------------------------------------------------
+export const sharedMemoryReadTool = {
+    name: 'shared_memory_read',
+    description: 'Read a value from shared memory by key and namespace. Returns null if the key does not exist or has expired.',
+    schema: {
+        key: z.string().min(1).max(128).describe('Key to read'),
+        namespace: z.string().min(1).max(128).describe('Namespace to read from'),
+        workingDirectory: z.string().optional().describe('Working directory (defaults to cwd)'),
+    },
+    handler: async (args) => {
+        if (!isSharedMemoryEnabled())
+            return disabledResponse();
+        try {
+            const root = validateWorkingDirectory(args.workingDirectory);
+            const entry = readEntry(args.namespace, args.key, root);
+            if (!entry) {
+                return {
+                    content: [{
+                            type: 'text',
+                            text: `Key "${args.key}" not found in namespace "${args.namespace}" (or has expired).`,
+                        }],
+                };
+            }
+            const meta = [
+                `- **Namespace:** ${entry.namespace}`,
+                `- **Key:** ${entry.key}`,
+                `- **Created:** ${entry.createdAt}`,
+                `- **Updated:** ${entry.updatedAt}`,
+            ];
+            if (entry.expiresAt) {
+                meta.push(`- **Expires:** ${entry.expiresAt}`);
+            }
+            return {
+                content: [{
+                        type: 'text',
+                        text: `## Shared Memory Entry\n\n${meta.join('\n')}\n\n### Value\n\n\`\`\`json\n${JSON.stringify(entry.value, null, 2)}\n\`\`\``,
+                    }],
+            };
+        }
+        catch (error) {
+            return errorResponse(`Error reading shared memory: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    },
+};
+// ---------------------------------------------------------------------------
+// shared_memory_list
+// ---------------------------------------------------------------------------
+export const sharedMemoryListTool = {
+    name: 'shared_memory_list',
+    description: 'List keys in a shared memory namespace, or list all namespaces if no namespace is provided.',
+    schema: {
+        namespace: z.string().min(1).max(128).optional().describe('Namespace to list keys from. Omit to list all namespaces.'),
+        workingDirectory: z.string().optional().describe('Working directory (defaults to cwd)'),
+    },
+    handler: async (args) => {
+        if (!isSharedMemoryEnabled())
+            return disabledResponse();
+        try {
+            const root = validateWorkingDirectory(args.workingDirectory);
+            if (!args.namespace) {
+                // List all namespaces
+                const namespaces = listNamespaces(root);
+                if (namespaces.length === 0) {
+                    return {
+                        content: [{ type: 'text', text: 'No shared memory namespaces found.' }],
+                    };
+                }
+                return {
+                    content: [{
+                            type: 'text',
+                            text: `## Shared Memory Namespaces\n\n${namespaces.map(ns => `- ${ns}`).join('\n')}`,
+                        }],
+                };
+            }
+            // List keys in namespace
+            const items = listEntries(args.namespace, root);
+            if (items.length === 0) {
+                return {
+                    content: [{
+                            type: 'text',
+                            text: `No entries in namespace "${args.namespace}".`,
+                        }],
+                };
+            }
+            const lines = items.map(item => {
+                let line = `- **${item.key}** (updated: ${item.updatedAt})`;
+                if (item.expiresAt)
+                    line += ` [expires: ${item.expiresAt}]`;
+                return line;
+            });
+            return {
+                content: [{
+                        type: 'text',
+                        text: `## Shared Memory: ${args.namespace}\n\n${items.length} entries:\n\n${lines.join('\n')}`,
+                    }],
+            };
+        }
+        catch (error) {
+            return errorResponse(`Error listing shared memory: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    },
+};
+// ---------------------------------------------------------------------------
+// shared_memory_delete
+// ---------------------------------------------------------------------------
+export const sharedMemoryDeleteTool = {
+    name: 'shared_memory_delete',
+    description: 'Delete a key from shared memory.',
+    schema: {
+        key: z.string().min(1).max(128).describe('Key to delete'),
+        namespace: z.string().min(1).max(128).describe('Namespace to delete from'),
+        workingDirectory: z.string().optional().describe('Working directory (defaults to cwd)'),
+    },
+    handler: async (args) => {
+        if (!isSharedMemoryEnabled())
+            return disabledResponse();
+        try {
+            const root = validateWorkingDirectory(args.workingDirectory);
+            const deleted = deleteEntry(args.namespace, args.key, root);
+            if (!deleted) {
+                return {
+                    content: [{
+                            type: 'text',
+                            text: `Key "${args.key}" not found in namespace "${args.namespace}".`,
+                        }],
+                };
+            }
+            return {
+                content: [{
+                        type: 'text',
+                        text: `Deleted key "${args.key}" from namespace "${args.namespace}".`,
+                    }],
+            };
+        }
+        catch (error) {
+            return errorResponse(`Error deleting shared memory: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    },
+};
+// ---------------------------------------------------------------------------
+// shared_memory_cleanup
+// ---------------------------------------------------------------------------
+export const sharedMemoryCleanupTool = {
+    name: 'shared_memory_cleanup',
+    description: 'Remove expired entries from shared memory. Cleans a specific namespace or all namespaces.',
+    schema: {
+        namespace: z.string().min(1).max(128).optional().describe('Namespace to clean. Omit to clean all namespaces.'),
+        workingDirectory: z.string().optional().describe('Working directory (defaults to cwd)'),
+    },
+    handler: async (args) => {
+        if (!isSharedMemoryEnabled())
+            return disabledResponse();
+        try {
+            const root = validateWorkingDirectory(args.workingDirectory);
+            const result = cleanupExpired(args.namespace, root);
+            if (result.removed === 0) {
+                return {
+                    content: [{
+                            type: 'text',
+                            text: 'No expired entries found.',
+                        }],
+                };
+            }
+            return {
+                content: [{
+                        type: 'text',
+                        text: `## Cleanup Results\n\n- **Removed:** ${result.removed} expired entries\n- **Namespaces cleaned:** ${result.namespaces.join(', ')}`,
+                    }],
+            };
+        }
+        catch (error) {
+            return errorResponse(`Error cleaning shared memory: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    },
+};
+// ---------------------------------------------------------------------------
+// Export all tools
+// ---------------------------------------------------------------------------
+export const sharedMemoryTools = [
+    sharedMemoryWriteTool,
+    sharedMemoryReadTool,
+    sharedMemoryListTool,
+    sharedMemoryDeleteTool,
+    sharedMemoryCleanupTool,
+];
+//# sourceMappingURL=shared-memory-tools.js.map

package/dist/tools/shared-memory-tools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared-memory-tools.js","sourceRoot":"","sources":["../../src/tools/shared-memory-tools.ts"],"names":[],"mappings":"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"}

package/dist/tools/state-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state-tools.d.ts","sourceRoot":"","sources":["../../src/tools/state-tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"state-tools.d.ts","sourceRoot":"","sources":["../../src/tools/state-tools.ts"],"names":[],"mappings":"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"}

package/dist/tools/state-tools.js

@@ -8,14 +8,20 @@ import { z } from 'zod';
 import { existsSync, readFileSync, unlinkSync } from 'fs';
 import { resolveStatePath, ensureOmcDir, validateWorkingDirectory, resolveSessionStatePath, ensureSessionStateDir, listSessionIds, validateSessionId, } from '../lib/worktree-paths.js';
 import { atomicWriteJsonSync } from '../lib/atomic-write.js';
+import { validatePayload } from '../lib/payload-limits.js';
 import { isModeActive, getActiveModes, getAllModeStatuses, clearModeState, getStateFilePath, MODE_CONFIGS, getActiveSessionsForMode } from '../hooks/mode-registry/index.js';
-// ExecutionMode from mode-registry (8 modes - NO ralplan)
+// ExecutionMode from mode-registry (5 modes)
 const EXECUTION_MODES = [
-    'autopilot', 'ultrapilot', 'swarm', 'pipeline', 'team',
-    'ralph', 'ultrawork', 'ultraqa'
+    'autopilot', 'team', 'ralph', 'ultrawork', 'ultraqa'
 ];
-// Extended type for state tools - includes ralplan which has state but isn't in mode-registry
-const STATE_TOOL_MODES = [...EXECUTION_MODES, 'ralplan'];
+// Extended type for state tools - includes state-bearing modes outside mode-registry
+const STATE_TOOL_MODES = [
+    ...EXECUTION_MODES,
+    'ralplan',
+    'omc-teams',
+    'deep-interview'
+];
+const EXTRA_STATE_ONLY_MODES = ['ralplan', 'omc-teams', 'deep-interview'];
 const CANCEL_SIGNAL_TTL_MS = 30_000;
 /**
  * Get the state file path for any mode (including swarm and ralplan).
@@ -48,24 +54,6 @@ export const stateReadTool = {
         try {
             const root = validateWorkingDirectory(workingDirectory);
             const sessionId = session_id;
-            // Special handling for swarm (SQLite database - no session support)
-            if (mode === 'swarm') {
-                const statePath = getStatePath(mode, root);
-                if (!existsSync(statePath)) {
-                    return {
-                        content: [{
-                                type: 'text',
-                                text: `No state found for mode: swarm\nNote: Swarm uses SQLite (swarm.db), not JSON. Expected path: ${statePath}`
-                            }]
-                    };
-                }
-                return {
-                    content: [{
-                            type: 'text',
-                            text: `## State for swarm\n\nPath: ${statePath}\n\nNote: Swarm uses SQLite database. Use swarm-specific tools to query state.`
-                        }]
-                };
-            }
             // If session_id provided, read from session-scoped path
             if (sessionId) {
                 validateSessionId(sessionId);
@@ -168,12 +156,12 @@ export const stateWriteTool = {
         active: z.boolean().optional().describe('Whether the mode is currently active'),
         iteration: z.number().optional().describe('Current iteration number'),
         max_iterations: z.number().optional().describe('Maximum iterations allowed'),
-        current_phase: z.string().optional().describe('Current execution phase'),
-        task_description: z.string().optional().describe('Description of the task being executed'),
-        plan_path: z.string().optional().describe('Path to the plan file'),
-        started_at: z.string().optional().describe('ISO timestamp when the mode started'),
-        completed_at: z.string().optional().describe('ISO timestamp when the mode completed'),
-        error: z.string().optional().describe('Error message if the mode failed'),
+        current_phase: z.string().max(200).optional().describe('Current execution phase'),
+        task_description: z.string().max(2000).optional().describe('Description of the task being executed'),
+        plan_path: z.string().max(500).optional().describe('Path to the plan file'),
+        started_at: z.string().max(100).optional().describe('ISO timestamp when the mode started'),
+        completed_at: z.string().max(100).optional().describe('ISO timestamp when the mode completed'),
+        error: z.string().max(2000).optional().describe('Error message if the mode failed'),
         state: z.record(z.string(), z.unknown()).optional().describe('Additional custom state fields (merged with explicit parameters)'),
         workingDirectory: z.string().optional().describe('Working directory (defaults to cwd)'),
         session_id: z.string().optional().describe('Session ID for session-scoped state isolation. When provided, the tool operates only within that session. When omitted, the tool aggregates legacy state plus all session-scoped state (may include other sessions).'),
@@ -183,15 +171,18 @@ export const stateWriteTool = {
         try {
             const root = validateWorkingDirectory(workingDirectory);
             const sessionId = session_id;
-            // Swarm uses SQLite - cannot be written via this tool
-            if (mode === 'swarm') {
-                return {
-                    content: [{
-                            type: 'text',
-                            text: `Error: Swarm uses SQLite database (swarm.db), not JSON. Use swarm-specific APIs to modify state.`
-                        }],
-                    isError: true
-                };
+            // Validate custom state payload size if provided
+            if (state) {
+                const validation = validatePayload(state);
+                if (!validation.valid) {
+                    return {
+                        content: [{
+                                type: 'text',
+                                text: `Error: state payload rejected — ${validation.error}`
+                            }],
+                        isError: true
+                    };
+                }
             }
             // Determine state path based on session_id
             let statePath;
@@ -296,11 +287,30 @@ export const stateClearTool = {
                 });
                 if (MODE_CONFIGS[mode]) {
                     const success = clearModeState(mode, root, sessionId);
+                    // Ghost-legacy cleanup: after clearing session file, also remove
+                    // any legacy file at .omc/state/{mode}-state.json if it belongs
+                    // to this session (matching _meta.sessionId) or has no _meta block.
+                    let ghostCleaned = false;
+                    try {
+                        const legacyPath = getStateFilePath(root, mode);
+                        if (existsSync(legacyPath)) {
+                            const raw = JSON.parse(readFileSync(legacyPath, 'utf-8'));
+                            const meta = raw._meta;
+                            if (!meta || meta.sessionId === sessionId) {
+                                unlinkSync(legacyPath);
+                                ghostCleaned = true;
+                            }
+                        }
+                    }
+                    catch {
+                        // Best-effort ghost cleanup — ignore errors
+                    }
+                    const ghostNote = ghostCleaned ? ' (ghost legacy file also removed)' : '';
                     if (success) {
                         return {
                             content: [{
                                     type: 'text',
-                                    text: `Successfully cleared state for mode: ${mode} in session: ${sessionId}`
+                                    text: `Successfully cleared state for mode: ${mode} in session: ${sessionId}${ghostNote}`
                                 }]
                         };
                     }
@@ -308,7 +318,7 @@ export const stateClearTool = {
                         return {
                             content: [{
                                     type: 'text',
-                                    text: `Warning: Some files could not be removed for mode: ${mode} in session: ${sessionId}`
+                                    text: `Warning: Some files could not be removed for mode: ${mode} in session: ${sessionId}${ghostNote}`
                                 }]
                         };
                     }
@@ -317,21 +327,30 @@ export const stateClearTool = {
                 const statePath = resolveSessionStatePath(mode, sessionId, root);
                 if (existsSync(statePath)) {
                     unlinkSync(statePath);
-                    return {
-                        content: [{
-                                type: 'text',
-                                text: `Successfully cleared state for mode: ${mode} in session: ${sessionId}\nRemoved: ${statePath}`
-                            }]
-                    };
                 }
-                else {
-                    return {
-                        content: [{
-                                type: 'text',
-                                text: `No state found to clear for mode: ${mode} in session: ${sessionId}`
-                            }]
-                    };
+                // Ghost-legacy cleanup for non-registry modes
+                let ghostCleaned = false;
+                try {
+                    const legacyPath = resolveStatePath(mode, root);
+                    if (existsSync(legacyPath)) {
+                        const raw = JSON.parse(readFileSync(legacyPath, 'utf-8'));
+                        const meta = raw._meta;
+                        if (!meta || meta.sessionId === sessionId) {
+                            unlinkSync(legacyPath);
+                            ghostCleaned = true;
+                        }
+                    }
                 }
+                catch {
+                    // Best-effort ghost cleanup
+                }
+                const ghostNote = ghostCleaned ? ' (ghost legacy file also removed)' : '';
+                return {
+                    content: [{
+                            type: 'text',
+                            text: `Successfully cleared state for mode: ${mode} in session: ${sessionId}${ghostNote}`
+                        }]
+                };
             }
             // No session_id: clear from all locations (legacy + all sessions)
             let clearedCount = 0;
@@ -440,19 +459,20 @@ export const stateListActiveTool = {
                 validateSessionId(sessionId);
                 // Get active modes from registry for this session
                 const activeModes = [...getActiveModes(root, sessionId)];
-                // Also check ralplan for this session
-                try {
-                    const ralplanPath = resolveSessionStatePath('ralplan', sessionId, root);
-                    if (existsSync(ralplanPath)) {
-                        const content = readFileSync(ralplanPath, 'utf-8');
-                        const state = JSON.parse(content);
-                        if (state.active) {
-                            activeModes.push('ralplan');
+                for (const mode of EXTRA_STATE_ONLY_MODES) {
+                    try {
+                        const statePath = resolveSessionStatePath(mode, sessionId, root);
+                        if (existsSync(statePath)) {
+                            const content = readFileSync(statePath, 'utf-8');
+                            const state = JSON.parse(content);
+                            if (state.active) {
+                                activeModes.push(mode);
+                            }
                         }
                     }
-                }
-                catch {
-                    // Ignore parse errors
+                    catch {
+                        // Ignore parse errors
+                    }
                 }
                 if (activeModes.length === 0) {
                     return {
@@ -474,17 +494,19 @@ export const stateListActiveTool = {
             const modeSessionMap = new Map();
             // Check legacy paths
             const legacyActiveModes = [...getActiveModes(root)];
-            const ralplanPath = getStatePath('ralplan', root);
-            if (existsSync(ralplanPath)) {
-                try {
-                    const content = readFileSync(ralplanPath, 'utf-8');
-                    const state = JSON.parse(content);
-                    if (state.active) {
-                        legacyActiveModes.push('ralplan');
+            for (const mode of EXTRA_STATE_ONLY_MODES) {
+                const statePath = getStatePath(mode, root);
+                if (existsSync(statePath)) {
+                    try {
+                        const content = readFileSync(statePath, 'utf-8');
+                        const state = JSON.parse(content);
+                        if (state.active) {
+                            legacyActiveModes.push(mode);
+                        }
+                    }
+                    catch {
+                        // Ignore parse errors
                     }
-                }
-                catch {
-                    // Ignore parse errors
                 }
             }
             for (const mode of legacyActiveModes) {
@@ -497,19 +519,20 @@ export const stateListActiveTool = {
             const sessionIds = listSessionIds(root);
             for (const sid of sessionIds) {
                 const sessionActiveModes = [...getActiveModes(root, sid)];
-                // Also check ralplan for this session
-                try {
-                    const ralplanSessionPath = resolveSessionStatePath('ralplan', sid, root);
-                    if (existsSync(ralplanSessionPath)) {
-                        const content = readFileSync(ralplanSessionPath, 'utf-8');
-                        const state = JSON.parse(content);
-                        if (state.active) {
-                            sessionActiveModes.push('ralplan');
+                for (const mode of EXTRA_STATE_ONLY_MODES) {
+                    try {
+                        const statePath = resolveSessionStatePath(mode, sid, root);
+                        if (existsSync(statePath)) {
+                            const content = readFileSync(statePath, 'utf-8');
+                            const state = JSON.parse(content);
+                            if (state.active) {
+                                sessionActiveModes.push(mode);
+                            }
                         }
                     }
-                }
-                catch {
-                    // Ignore parse errors
+                    catch {
+                        // Ignore parse errors
+                    }
                 }
                 for (const mode of sessionActiveModes) {
                     if (!modeSessionMap.has(mode)) {
@@ -678,24 +701,26 @@ export const stateGetStatusTool = {
                     }
                 }
             }
-            // Also check ralplan (not in MODE_CONFIGS)
-            const ralplanPath = sessionId
-                ? resolveSessionStatePath('ralplan', sessionId, root)
-                : getStatePath('ralplan', root);
-            let ralplanActive = false;
-            if (existsSync(ralplanPath)) {
-                try {
-                    const content = readFileSync(ralplanPath, 'utf-8');
-                    const state = JSON.parse(content);
-                    ralplanActive = state.active === true;
-                }
-                catch {
-                    // Ignore parse errors
+            // Also check extra state-only modes (not in MODE_CONFIGS)
+            for (const mode of EXTRA_STATE_ONLY_MODES) {
+                const statePath = sessionId
+                    ? resolveSessionStatePath(mode, sessionId, root)
+                    : getStatePath(mode, root);
+                let active = false;
+                if (existsSync(statePath)) {
+                    try {
+                        const content = readFileSync(statePath, 'utf-8');
+                        const state = JSON.parse(content);
+                        active = state.active === true;
+                    }
+                    catch {
+                        // Ignore parse errors
+                    }
                 }
+                const icon = active ? '[ACTIVE]' : '[INACTIVE]';
+                lines.push(`${icon} **${mode}**: ${active ? 'Active' : 'Inactive'}`);
+                lines.push(`   Path: \`${statePath}\``);
             }
-            const ralplanIcon = ralplanActive ? '[ACTIVE]' : '[INACTIVE]';
-            lines.push(`${ralplanIcon} **ralplan**: ${ralplanActive ? 'Active' : 'Inactive'}`);
-            lines.push(`   Path: \`${ralplanPath}\``);
             return {
                 content: [{
                         type: 'text',