@troykelly/openclaw-projects 0.0.16 → 0.0.20

package/dist/register-openclaw.js

@@ -9,7 +9,7 @@
  */
 import { ZodError } from 'zod';
 import { createApiClient } from './api-client.js';
-import { redactConfig, resolveConfigSecretsSync, validateRawConfig } from './config.js';
+import { redactConfig, resolveConfigSecretsSync, resolveNamespaceConfig, validateRawConfig } from './config.js';
 import { extractContext, getUserScopeKey } from './context.js';
 import { createOAuthGatewayMethods, registerOAuthGatewayRpcMethods } from './gateway/oauth-rpc-methods.js';
 import { createGatewayMethods, registerGatewayRpcMethods } from './gateway/rpc-methods.js';
@@ -40,6 +40,37 @@ function toAgentToolResult(result) {
         content: [{ type: 'text', text: `Error: ${errorText}` }],
     };
 }
+/** Namespace property for store/create tools (Issue #1428) */
+const namespaceProperty = {
+    type: 'string',
+    description: 'Target namespace for this operation. Defaults to the agent\'s configured namespace.',
+    pattern: '^[a-z0-9][a-z0-9._-]*$',
+    maxLength: 63,
+};
+/** Namespaces property for query/list tools (Issue #1428) */
+const namespacesProperty = {
+    type: 'array',
+    description: 'Namespaces to search. Defaults to the agent\'s configured recall namespaces.',
+    items: {
+        type: 'string',
+        pattern: '^[a-z0-9][a-z0-9._-]*$',
+        maxLength: 63,
+    },
+};
+/** Add namespace param to a store/create tool schema (Issue #1428) */
+function withNamespace(schema) {
+    return {
+        ...schema,
+        properties: { ...schema.properties, namespace: namespaceProperty },
+    };
+}
+/** Add namespaces param to a query/list tool schema (Issue #1428) */
+function withNamespaces(schema) {
+    return {
+        ...schema,
+        properties: { ...schema.properties, namespaces: namespacesProperty },
+    };
+}
 /**
  * Memory recall tool JSON Schema
  */
@@ -186,7 +217,7 @@ const memoryStoreSchema = {
 const memoryForgetSchema = {
     type: 'object',
     properties: {
-        memoryId: {
+        memory_id: {
             type: 'string',
             description: 'ID of the memory to forget',
             format: 'uuid',
@@ -224,13 +255,13 @@ const projectListSchema = {
 const projectGetSchema = {
     type: 'object',
     properties: {
-        projectId: {
+        project_id: {
             type: 'string',
             description: 'Project ID to retrieve',
             format: 'uuid',
         },
     },
-    required: ['projectId'],
+    required: ['project_id'],
 };
 /**
  * Project create tool JSON Schema
@@ -264,7 +295,7 @@ const projectCreateSchema = {
 const todoListSchema = {
     type: 'object',
     properties: {
-        projectId: {
+        project_id: {
             type: 'string',
             description: 'Filter by project ID',
             format: 'uuid',
@@ -305,7 +336,7 @@ const todoCreateSchema = {
             description: 'Todo description',
             maxLength: 5000,
         },
-        projectId: {
+        project_id: {
             type: 'string',
             description: 'Project to add the todo to',
             format: 'uuid',
@@ -455,13 +486,13 @@ const contactSearchSchema = {
 const contactGetSchema = {
     type: 'object',
     properties: {
-        contactId: {
+        contact_id: {
             type: 'string',
             description: 'Contact ID to retrieve',
             format: 'uuid',
         },
     },
-    required: ['contactId'],
+    required: ['contact_id'],
 };
 /**
  * Contact create tool JSON Schema
@@ -509,7 +540,7 @@ const smsSendSchema = {
             minLength: 1,
             maxLength: 1600,
         },
-        idempotencyKey: {
+        idempotency_key: {
             type: 'string',
             description: 'Optional key to prevent duplicate sends',
         },
@@ -538,15 +569,15 @@ const emailSendSchema = {
             description: 'Plain text email body',
             minLength: 1,
         },
-        htmlBody: {
+        html_body: {
             type: 'string',
             description: 'Optional HTML email body',
         },
-        threadId: {
+        thread_id: {
             type: 'string',
             description: 'Optional thread ID for replies',
         },
-        idempotencyKey: {
+        idempotency_key: {
             type: 'string',
             description: 'Optional unique key to prevent duplicate sends',
         },
@@ -570,7 +601,7 @@ const messageSearchSchema = {
             enum: ['sms', 'email', 'all'],
             default: 'all',
         },
-        contactId: {
+        contact_id: {
             type: 'string',
             description: 'Filter by contact ID',
             format: 'uuid',
@@ -582,7 +613,7 @@ const messageSearchSchema = {
             maximum: 100,
             default: 10,
         },
-        includeThread: {
+        include_thread: {
             type: 'boolean',
             description: 'Include full thread context',
             default: false,
@@ -601,7 +632,7 @@ const threadListSchema = {
             description: 'Filter by channel type',
             enum: ['sms', 'email'],
         },
-        contactId: {
+        contact_id: {
             type: 'string',
             description: 'Filter by contact ID',
             format: 'uuid',
@@ -621,11 +652,11 @@ const threadListSchema = {
 const threadGetSchema = {
     type: 'object',
     properties: {
-        threadId: {
+        thread_id: {
             type: 'string',
             description: 'Thread ID to retrieve',
         },
-        messageLimit: {
+        message_limit: {
             type: 'integer',
             description: 'Maximum messages to return',
             minimum: 1,
@@ -633,7 +664,7 @@ const threadGetSchema = {
             default: 50,
         },
     },
-    required: ['threadId'],
+    required: ['thread_id'],
 };
 /**
  * Relationship set tool JSON Schema
@@ -693,25 +724,25 @@ const relationshipQuerySchema = {
 const fileShareSchema = {
     type: 'object',
     properties: {
-        fileId: {
+        file_id: {
             type: 'string',
             description: 'The file ID to create a share link for',
             format: 'uuid',
         },
-        expiresIn: {
+        expires_in: {
             type: 'integer',
             description: 'Link expiry time in seconds (default: 3600, max: 604800)',
             minimum: 60,
             maximum: 604800,
             default: 3600,
         },
-        maxDownloads: {
+        max_downloads: {
             type: 'integer',
             description: 'Optional maximum number of downloads',
             minimum: 1,
         },
     },
-    required: ['fileId'],
+    required: ['file_id'],
 };
 /**
  * Skill store put tool JSON Schema
@@ -1110,11 +1141,126 @@ const linksRemoveSchema = {
     },
     required: ['source_type', 'source_id', 'target_type', 'target_ref'],
 };
+// Prompt template tool schemas (Epic #1497, Issue #1499)
+const promptTemplateListSchema = {
+    type: 'object',
+    properties: {
+        channel_type: { type: 'string', description: 'Filter by channel type: sms, email, ha_observation, general', enum: ['sms', 'email', 'ha_observation', 'general'] },
+        limit: { type: 'number', description: 'Max results to return (default 20)', minimum: 1, maximum: 100 },
+        offset: { type: 'number', description: 'Pagination offset (default 0)', minimum: 0 },
+    },
+    required: [],
+};
+const promptTemplateGetSchema = {
+    type: 'object',
+    properties: {
+        id: { type: 'string', description: 'ID of the prompt template to retrieve' },
+    },
+    required: ['id'],
+};
+const promptTemplateCreateSchema = {
+    type: 'object',
+    properties: {
+        label: { type: 'string', description: 'Human-readable name for the template', minLength: 1 },
+        content: { type: 'string', description: 'The prompt text', minLength: 1 },
+        channel_type: { type: 'string', description: 'Channel type: sms, email, ha_observation, general', enum: ['sms', 'email', 'ha_observation', 'general'] },
+        is_default: { type: 'boolean', description: 'Whether this is the default template for its channel type' },
+    },
+    required: ['label', 'content', 'channel_type'],
+};
+const promptTemplateUpdateSchema = {
+    type: 'object',
+    properties: {
+        id: { type: 'string', description: 'ID of the prompt template to update' },
+        label: { type: 'string', description: 'New label' },
+        content: { type: 'string', description: 'New prompt text' },
+        channel_type: { type: 'string', description: 'New channel type', enum: ['sms', 'email', 'ha_observation', 'general'] },
+        is_default: { type: 'boolean', description: 'Set as default for channel type' },
+    },
+    required: ['id'],
+};
+const promptTemplateDeleteSchema = {
+    type: 'object',
+    properties: {
+        id: { type: 'string', description: 'ID of the prompt template to delete (soft-delete)' },
+    },
+    required: ['id'],
+};
+// ── Inbound Destination schemas (Issue #1500) ──────────────
+const inboundDestinationListSchema = {
+    type: 'object',
+    properties: {
+        channel_type: { type: 'string', description: 'Filter by channel type (sms, email)' },
+        search: { type: 'string', description: 'Search by address or display name' },
+        limit: { type: 'number', description: 'Max results (default 50, max 100)' },
+        offset: { type: 'number', description: 'Offset for pagination' },
+    },
+};
+const inboundDestinationGetSchema = {
+    type: 'object',
+    properties: {
+        id: { type: 'string', description: 'ID of the inbound destination' },
+    },
+    required: ['id'],
+};
+const inboundDestinationUpdateSchema = {
+    type: 'object',
+    properties: {
+        id: { type: 'string', description: 'ID of the inbound destination to update' },
+        display_name: { type: 'string', description: 'Human-readable display name' },
+        agent_id: { type: 'string', description: 'Agent ID for routing (null to clear)' },
+        prompt_template_id: { type: 'string', description: 'Prompt template ID for routing (null to clear)' },
+        context_id: { type: 'string', description: 'Context ID for routing (null to clear)' },
+    },
+    required: ['id'],
+};
+// ── Channel Default schemas (Issue #1501) ──────────────────
+const channelDefaultListSchema = {
+    type: 'object',
+    properties: {},
+};
+const channelDefaultGetSchema = {
+    type: 'object',
+    properties: {
+        channel_type: { type: 'string', description: 'Channel type: sms, email, or ha_observation' },
+    },
+    required: ['channel_type'],
+};
+const channelDefaultSetSchema = {
+    type: 'object',
+    properties: {
+        channel_type: { type: 'string', description: 'Channel type: sms, email, or ha_observation' },
+        agent_id: { type: 'string', description: 'Agent ID for this channel type' },
+        prompt_template_id: { type: 'string', description: 'Prompt template ID (optional)' },
+        context_id: { type: 'string', description: 'Context ID (optional)' },
+    },
+    required: ['channel_type', 'agent_id'],
+};
 /**
  * Create tool execution handlers
  */
 function createToolHandlers(state) {
-    const { config, logger, apiClient, userId } = state;
+    const { config, logger, apiClient, user_id, resolvedNamespace } = state;
+    /**
+     * Get the effective namespace for a store/create operation.
+     * Uses explicit tool param if provided, otherwise falls back to config default.
+     */
+    function getStoreNamespace(params) {
+        const ns = params.namespace;
+        if (typeof ns === 'string' && ns.length > 0)
+            return ns;
+        return resolvedNamespace.default;
+    }
+    /**
+     * Get the effective namespaces for a query/list operation.
+     * Uses explicit tool param if provided, otherwise falls back to config recall list.
+     */
+    function getRecallNamespaces(params) {
+        const ns = params.namespaces;
+        if (Array.isArray(ns) && ns.length > 0)
+            return ns;
+        return resolvedNamespace.recall;
+    }
     return {
         async memory_recall(params) {
             const { query, limit = config.maxRecallMemories, category, tags, relationship_id, location, location_radius_km, location_weight, } = params;
@@ -1128,7 +1274,11 @@ function createToolHandlers(state) {
                     queryParams.set('tags', tags.join(','));
                 if (relationship_id)
                     queryParams.set('relationship_id', relationship_id);
-                const response = await apiClient.get(`/api/memories/search?${queryParams}`, { userId });
+                // Namespace scoping (Issue #1428)
+                const ns = getRecallNamespaces(params);
+                if (ns.length > 0)
+                    queryParams.set('namespaces', ns.join(','));
+                const response = await apiClient.get(`/api/memories/search?${queryParams}`, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1167,7 +1317,7 @@ function createToolHandlers(state) {
                     success: true,
                     data: {
                         content,
-                        details: { count: memories.length, memories, userId },
+                        details: { count: memories.length, memories, user_id },
                     },
                 };
             }
@@ -1190,6 +1340,7 @@ function createToolHandlers(state) {
                     content: memoryText,
                     memory_type: category === 'entity' ? 'reference' : category === 'other' ? 'note' : category,
                     importance,
+                    namespace: getStoreNamespace(params), // Issue #1428
                 };
                 if (tags && tags.length > 0)
                     payload.tags = tags;
@@ -1203,8 +1354,8 @@ function createToolHandlers(state) {
                         const geocoded = await reverseGeocode(location.lat, location.lng, config.nominatimUrl);
                         if (geocoded) {
                             payload.address = geocoded.address;
-                            if (!location.place_label && geocoded.placeLabel) {
-                                payload.place_label = geocoded.placeLabel;
+                            if (!location.place_label && geocoded.place_label) {
+                                payload.place_label = geocoded.place_label;
                             }
                         }
                     }
@@ -1213,7 +1364,7 @@ function createToolHandlers(state) {
                     if (location.place_label)
                         payload.place_label = location.place_label;
                 }
-                const response = await apiClient.post('/api/memories/unified', payload, { userId });
+                const response = await apiClient.post('/api/memories/unified', payload, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1231,22 +1382,26 @@ function createToolHandlers(state) {
             }
         },
         async memory_forget(params) {
-            const { memoryId, query } = params;
+            const { memory_id, query } = params;
             try {
-                if (memoryId) {
-                    const response = await apiClient.delete(`/api/memories/${memoryId}`, { userId });
+                if (memory_id) {
+                    const response = await apiClient.delete(`/api/memories/${memory_id}`, { user_id });
                     if (!response.success) {
                         return { success: false, error: response.error.message };
                     }
                     return {
                         success: true,
-                        data: { content: `Memory ${memoryId} forgotten successfully` },
+                        data: { content: `Memory ${memory_id} forgotten successfully` },
                     };
                 }
                 if (query) {
                     // Match OpenClaw gateway memory_forget behavior:
                     // Search → single high-confidence match auto-deletes, multiple returns candidates.
-                    const searchResponse = await apiClient.get(`/api/memories/search?q=${encodeURIComponent(query)}&limit=5`, { userId });
+                    const forgetQp = new URLSearchParams({ q: query, limit: '5' });
+                    const forgetNs = getRecallNamespaces(params);
+                    if (forgetNs.length > 0)
+                        forgetQp.set('namespaces', forgetNs.join(','));
+                    const searchResponse = await apiClient.get(`/api/memories/search?${forgetQp}`, { user_id });
                     if (!searchResponse.success) {
                         return { success: false, error: searchResponse.error.message };
                     }
@@ -1259,7 +1414,7 @@ function createToolHandlers(state) {
                     }
                     // Single high-confidence match → auto-delete
                     if (matches.length === 1 && (matches[0].similarity ?? 0) > 0.9) {
-                        const delResponse = await apiClient.delete(`/api/memories/${matches[0].id}`, { userId });
+                        const delResponse = await apiClient.delete(`/api/memories/${matches[0].id}`, { user_id });
                         if (!delResponse.success) {
                             return { success: false, error: delResponse.error.message };
                         }
@@ -1276,12 +1431,12 @@ function createToolHandlers(state) {
                     return {
                         success: true,
                         data: {
-                            content: `Found ${matches.length} candidates. Specify memoryId:\n${list}`,
+                            content: `Found ${matches.length} candidates. Specify memory_id:\n${list}`,
                             details: { action: 'candidates', candidates: matches.map((m) => ({ id: m.id, content: m.content, similarity: m.similarity })) },
                         },
                     };
                 }
-                return { success: false, error: 'Either memoryId or query is required' };
+                return { success: false, error: 'Either memory_id or query is required' };
             }
             catch (error) {
                 logger.error('memory_forget failed', { error });
@@ -1294,8 +1449,12 @@ function createToolHandlers(state) {
                 const queryParams = new URLSearchParams({ item_type: 'project', limit: String(limit) });
                 if (status !== 'all')
                     queryParams.set('status', status);
-                queryParams.set('user_email', userId); // Issue #1172: scope by user
-                const response = await apiClient.get(`/api/work-items?${queryParams}`, { userId });
+                queryParams.set('user_email', user_id); // Issue #1172: scope by user
+                // Namespace scoping (Issue #1428)
+                const projListNs = getRecallNamespaces(params);
+                if (projListNs.length > 0)
+                    queryParams.set('namespaces', projListNs.join(','));
+                const response = await apiClient.get(`/api/work-items?${queryParams}`, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1312,9 +1471,9 @@ function createToolHandlers(state) {
             }
         },
         async project_get(params) {
-            const { projectId } = params;
+            const { project_id } = params;
             try {
-                const response = await apiClient.get(`/api/work-items/${projectId}?user_email=${encodeURIComponent(userId)}`, { userId });
+                const response = await apiClient.get(`/api/work-items/${project_id}?user_email=${encodeURIComponent(user_id)}`, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1335,7 +1494,7 @@ function createToolHandlers(state) {
         async project_create(params) {
             const { name, description, status = 'active', } = params;
             try {
-                const response = await apiClient.post('/api/work-items', { title: name, description, item_type: 'project', status, user_email: userId }, { userId });
+                const response = await apiClient.post('/api/work-items', { title: name, description, item_type: 'project', status, user_email: user_id, namespace: getStoreNamespace(params) }, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1353,20 +1512,24 @@ function createToolHandlers(state) {
             }
         },
         async todo_list(params) {
-            const { projectId, completed, limit = 50, offset = 0, } = params;
+            const { project_id, completed, limit = 50, offset = 0, } = params;
             try {
                 const queryParams = new URLSearchParams({
                     item_type: 'task',
                     limit: String(limit),
                     offset: String(offset),
-                    user_email: userId, // Issue #1172: scope by user
+                    user_email: user_id, // Issue #1172: scope by user
                 });
-                if (projectId)
-                    queryParams.set('parent_work_item_id', projectId);
+                if (project_id)
+                    queryParams.set('parent_work_item_id', project_id);
                 if (completed !== undefined) {
                     queryParams.set('status', completed ? 'completed' : 'active');
                 }
-                const response = await apiClient.get(`/api/work-items?${queryParams}`, { userId });
+                // Namespace scoping (Issue #1428)
+                const todoListNs = getRecallNamespaces(params);
+                if (todoListNs.length > 0)
+                    queryParams.set('namespaces', todoListNs.join(','));
+                const response = await apiClient.get(`/api/work-items?${queryParams}`, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1396,14 +1559,14 @@ function createToolHandlers(state) {
             }
         },
         async todo_create(params) {
-            const { title, description, projectId, priority = 'medium', dueDate, } = params;
+            const { title, description, project_id, priority = 'medium', dueDate, } = params;
             try {
-                const body = { title, description, item_type: 'task', priority, user_email: userId };
-                if (projectId)
-                    body.parent_work_item_id = projectId;
+                const body = { title, description, item_type: 'task', priority, user_email: user_id, namespace: getStoreNamespace(params) };
+                if (project_id)
+                    body.parent_work_item_id = project_id;
                 if (dueDate)
                     body.not_after = dueDate;
-                const response = await apiClient.post('/api/work-items', body, { userId });
+                const response = await apiClient.post('/api/work-items', body, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1423,7 +1586,7 @@ function createToolHandlers(state) {
         async todo_complete(params) {
             const { todoId } = params;
             try {
-                const response = await apiClient.patch(`/api/work-items/${todoId}/status?user_email=${encodeURIComponent(userId)}`, { status: 'completed' }, { userId });
+                const response = await apiClient.patch(`/api/work-items/${todoId}/status?user_email=${encodeURIComponent(user_id)}`, { status: 'completed' }, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1450,9 +1613,13 @@ function createToolHandlers(state) {
                     types: 'work_item',
                     limit: String(fetchLimit),
                     semantic: 'true',
-                    user_email: userId, // Issue #1216: scope results to current user
+                    user_email: user_id, // Issue #1216: scope results to current user
                 });
-                const response = await apiClient.get(`/api/search?${queryParams}`, { userId });
+                // Namespace scoping (Issue #1428)
+                const todoSearchNs = getRecallNamespaces(params);
+                if (todoSearchNs.length > 0)
+                    queryParams.set('namespaces', todoSearchNs.join(','));
+                const response = await apiClient.get(`/api/search?${queryParams}`, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1470,7 +1637,7 @@ function createToolHandlers(state) {
                         success: true,
                         data: {
                             content: 'No matching work items found.',
-                            details: { count: 0, results: [], searchType: response.data.search_type },
+                            details: { count: 0, results: [], search_type: response.data.search_type },
                         },
                     };
                 }
@@ -1496,7 +1663,7 @@ function createToolHandlers(state) {
                                 kind: r.metadata?.kind,
                                 status: r.metadata?.status,
                             })),
-                            searchType: response.data.search_type,
+                            search_type: response.data.search_type,
                         },
                     },
                 };
@@ -1507,25 +1674,28 @@ function createToolHandlers(state) {
             }
         },
         async project_search(params) {
-            const tool = createProjectSearchTool({ client: apiClient, logger, config, userId });
+            const tool = createProjectSearchTool({ client: apiClient, logger, config, user_id });
             return tool.execute(params);
         },
         async context_search(params) {
-            const tool = createContextSearchTool({ client: apiClient, logger, config, userId });
+            const tool = createContextSearchTool({ client: apiClient, logger, config, user_id });
             return tool.execute(params);
         },
         async contact_search(params) {
             const { query, limit = 10 } = params;
             try {
-                const queryParams = new URLSearchParams({ search: query, limit: String(limit), user_email: userId });
+                const queryParams = new URLSearchParams({ search: query, limit: String(limit), user_email: user_id });
+                const contactSearchNs = getRecallNamespaces(params);
+                if (contactSearchNs.length > 0)
+                    queryParams.set('namespaces', contactSearchNs.join(','));
                 const response = await apiClient.get(`/api/contacts?${queryParams}`, {
-                    userId,
+                    user_id,
                 });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
                 const contacts = response.data.contacts ?? [];
-                const content = contacts.length > 0 ? contacts.map((c) => `- ${c.displayName}${c.email ? ` (${c.email})` : ''}`).join('\n') : 'No contacts found.';
+                const content = contacts.length > 0 ? contacts.map((c) => `- ${c.display_name}${c.email ? ` (${c.email})` : ''}`).join('\n') : 'No contacts found.';
                 return {
                     success: true,
                     data: { content, details: { count: contacts.length, contacts } },
@@ -1537,9 +1707,9 @@ function createToolHandlers(state) {
             }
         },
         async contact_get(params) {
-            const { contactId } = params;
+            const { contact_id } = params;
             try {
-                const response = await apiClient.get(`/api/contacts/${contactId}?user_email=${encodeURIComponent(userId)}`, { userId });
+                const response = await apiClient.get(`/api/contacts/${contact_id}?user_email=${encodeURIComponent(user_id)}`, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1564,8 +1734,8 @@ function createToolHandlers(state) {
         async contact_create(params) {
             const { name, notes } = params;
             try {
-                // API requires displayName, not name. Email/phone are stored as separate contact_endpoint records.
-                const response = await apiClient.post('/api/contacts', { displayName: name, notes, user_email: userId }, { userId });
+                // API requires display_name, not name. Email/phone are stored as separate contact_endpoint records.
+                const response = await apiClient.post('/api/contacts', { display_name: name, notes, user_email: user_id, namespace: getStoreNamespace(params) }, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1583,7 +1753,7 @@ function createToolHandlers(state) {
             }
         },
         async sms_send(params) {
-            const { to, body, idempotencyKey } = params;
+            const { to, body, idempotency_key } = params;
             // Check Twilio configuration
             if (!config.twilioAccountSid || !config.twilioAuthToken || !config.twilioPhoneNumber) {
                 return {
@@ -1613,15 +1783,15 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('sms_send invoked', {
-                userId,
+                user_id,
                 bodyLength: body.length,
-                hasIdempotencyKey: !!idempotencyKey,
+                hasIdempotencyKey: !!idempotency_key,
             });
             try {
-                const response = await apiClient.post('/api/twilio/sms/send', { to, body, idempotencyKey }, { userId });
+                const response = await apiClient.post('/api/twilio/sms/send', { to, body, idempotency_key }, { user_id });
                 if (!response.success) {
                     logger.error('sms_send API error', {
-                        userId,
+                        user_id,
                         status: response.error.status,
                         code: response.error.code,
                     });
@@ -1630,23 +1800,23 @@ function createToolHandlers(state) {
                         error: response.error.message || 'Failed to send SMS',
                     };
                 }
-                const { messageId, threadId, status } = response.data;
+                const { message_id, thread_id, status } = response.data;
                 logger.debug('sms_send completed', {
-                    userId,
-                    messageId,
+                    user_id,
+                    message_id,
                     status,
                 });
                 return {
                     success: true,
                     data: {
-                        content: `SMS sent successfully (ID: ${messageId}, Status: ${status})`,
-                        details: { messageId, threadId, status, userId },
+                        content: `SMS sent successfully (ID: ${message_id}, Status: ${status})`,
+                        details: { message_id, thread_id, status, user_id },
                     },
                 };
             }
             catch (error) {
                 logger.error('sms_send failed', {
-                    userId,
+                    user_id,
                     error: error instanceof Error ? error.message : String(error),
                 });
                 // Sanitize error message (remove phone numbers for privacy)
@@ -1661,7 +1831,7 @@ function createToolHandlers(state) {
             }
         },
         async email_send(params) {
-            const { to, subject, body, htmlBody, threadId, idempotencyKey } = params;
+            const { to, subject, body, html_body, thread_id, idempotency_key } = params;
             // Validate email format
             const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
             if (!emailRegex.test(to)) {
@@ -1691,18 +1861,18 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('email_send invoked', {
-                userId,
+                user_id,
                 subjectLength: subject.length,
                 bodyLength: body.length,
-                hasHtmlBody: !!htmlBody,
-                hasThreadId: !!threadId,
-                hasIdempotencyKey: !!idempotencyKey,
+                hasHtmlBody: !!html_body,
+                hasThreadId: !!thread_id,
+                hasIdempotencyKey: !!idempotency_key,
             });
             try {
-                const response = await apiClient.post('/api/postmark/email/send', { to, subject, body, htmlBody, threadId, idempotencyKey }, { userId });
+                const response = await apiClient.post('/api/postmark/email/send', { to, subject, body, html_body, thread_id, idempotency_key }, { user_id });
                 if (!response.success) {
                     logger.error('email_send API error', {
-                        userId,
+                        user_id,
                         status: response.error.status,
                         code: response.error.code,
                     });
@@ -1711,23 +1881,23 @@ function createToolHandlers(state) {
                         error: response.error.message || 'Failed to send email',
                     };
                 }
-                const { messageId, threadId: responseThreadId, status } = response.data;
+                const { message_id, thread_id: responseThreadId, status } = response.data;
                 logger.debug('email_send completed', {
-                    userId,
-                    messageId,
+                    user_id,
+                    message_id,
                     status,
                 });
                 return {
                     success: true,
                     data: {
-                        content: `Email sent successfully (ID: ${messageId}, Status: ${status})`,
-                        details: { messageId, threadId: responseThreadId, status, userId },
+                        content: `Email sent successfully (ID: ${message_id}, Status: ${status})`,
+                        details: { message_id, thread_id: responseThreadId, status, user_id },
                     },
                 };
             }
             catch (error) {
                 logger.error('email_send failed', {
-                    userId,
+                    user_id,
                     error: error instanceof Error ? error.message : String(error),
                 });
                 // Sanitize error message (remove email addresses for privacy)
@@ -1742,7 +1912,7 @@ function createToolHandlers(state) {
             }
         },
         async message_search(params) {
-            const { query, channel = 'all', contactId, limit = 10, includeThread = false, } = params;
+            const { query, channel = 'all', contact_id, limit = 10, include_thread = false, } = params;
             // Validate query
             if (!query || query.length === 0) {
                 return {
@@ -1751,12 +1921,12 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('message_search invoked', {
-                userId,
+                user_id,
                 queryLength: query.length,
                 channel,
-                hasContactId: !!contactId,
+                hasContactId: !!contact_id,
                 limit,
-                includeThread,
+                include_thread,
             });
             try {
                 // Build query parameters
@@ -1767,17 +1937,17 @@ function createToolHandlers(state) {
                 if (channel !== 'all') {
                     queryParams.set('channel', channel);
                 }
-                if (contactId) {
-                    queryParams.set('contactId', contactId);
+                if (contact_id) {
+                    queryParams.set('contact_id', contact_id);
                 }
-                if (includeThread) {
-                    queryParams.set('includeThread', 'true');
+                if (include_thread) {
+                    queryParams.set('include_thread', 'true');
                 }
                 // Unified search API: returns { results: [{ type, id, title, snippet, score, metadata }], total }
-                const response = await apiClient.get(`/api/search?${queryParams}`, { userId });
+                const response = await apiClient.get(`/api/search?${queryParams}`, { user_id });
                 if (!response.success) {
                     logger.error('message_search API error', {
-                        userId,
+                        user_id,
                         status: response.error.status,
                         code: response.error.code,
                     });
@@ -1793,12 +1963,12 @@ function createToolHandlers(state) {
                     body: r.snippet,
                     direction: r.metadata?.direction || 'inbound',
                     channel: r.metadata?.channel || 'unknown',
-                    contactName: r.metadata?.contactName,
+                    contact_name: r.metadata?.contact_name,
                     timestamp: r.metadata?.received_at || '',
                     similarity: r.score,
                 }));
                 logger.debug('message_search completed', {
-                    userId,
+                    user_id,
                     resultCount: messages.length,
                     total,
                 });
@@ -1813,11 +1983,11 @@ function createToolHandlers(state) {
                             promptGuardUrl: config.promptGuardUrl,
                         });
                         if (detection.detected) {
-                            const logDecision = injectionLogLimiter.shouldLog(userId);
+                            const logDecision = injectionLogLimiter.shouldLog(user_id);
                             if (logDecision.log) {
                                 logger.warn(logDecision.summary ? 'injection detection log summary for previous window' : 'potential prompt injection detected in message_search result', {
-                                    userId,
-                                    messageId: m.id,
+                                    user_id,
+                                    message_id: m.id,
                                     patterns: detection.patterns,
                                     source: detection.source,
                                     ...(logDecision.suppressed > 0 && { suppressedCount: logDecision.suppressed }),
@@ -1834,18 +2004,18 @@ function createToolHandlers(state) {
                     ? messages
                         .map((m) => {
                         const prefix = m.direction === 'inbound' ? '←' : '→';
-                        const contact = sanitizeMetadataField(m.contactName || 'Unknown', nonce);
+                        const contact = sanitizeMetadataField(m.contact_name || 'Unknown', nonce);
                         const safeChannel = sanitizeMetadataField(m.channel, nonce);
                         const similarity = `(${Math.round(m.similarity * 100)}%)`;
                         const rawBody = m.body || '';
                         const truncatedBody = rawBody.substring(0, 100) + (rawBody.length > 100 ? '...' : '');
-                        const bodyText = sanitizeMessageForContext(truncatedBody, {
+                        const body_text = sanitizeMessageForContext(truncatedBody, {
                             direction: m.direction,
                             channel: m.channel,
-                            sender: m.contactName || 'Unknown',
+                            sender: m.contact_name || 'Unknown',
                             nonce,
                         });
-                        return `${prefix} [${safeChannel}] ${contact} ${similarity}: ${bodyText}`;
+                        return `${prefix} [${safeChannel}] ${contact} ${similarity}: ${body_text}`;
                     })
                         .join('\n')
                     : 'No messages found matching your query.';
@@ -1853,13 +2023,13 @@ function createToolHandlers(state) {
                     success: true,
                     data: {
                         content,
-                        details: { messages, total, userId },
+                        details: { messages, total, user_id },
                     },
                 };
             }
             catch (error) {
                 logger.error('message_search failed', {
-                    userId,
+                    user_id,
                     error: error instanceof Error ? error.message : String(error),
                 });
                 return {
@@ -1869,11 +2039,11 @@ function createToolHandlers(state) {
             }
         },
         async thread_list(params) {
-            const { channel, contactId, limit = 20, } = params;
+            const { channel, contact_id, limit = 20, } = params;
             logger.info('thread_list invoked', {
-                userId,
+                user_id,
                 channel,
-                hasContactId: !!contactId,
+                hasContactId: !!contact_id,
                 limit,
             });
             try {
@@ -1884,13 +2054,13 @@ function createToolHandlers(state) {
                 if (channel) {
                     queryParams.set('channel', channel);
                 }
-                if (contactId) {
-                    queryParams.set('contactId', contactId);
+                if (contact_id) {
+                    queryParams.set('contact_id', contact_id);
                 }
-                const response = await apiClient.get(`/api/search?${queryParams}`, { userId });
+                const response = await apiClient.get(`/api/search?${queryParams}`, { user_id });
                 if (!response.success) {
                     logger.error('thread_list API error', {
-                        userId,
+                        user_id,
                         status: response.error.status,
                         code: response.error.code,
                     });
@@ -1903,7 +2073,7 @@ function createToolHandlers(state) {
                 const results = response.data.results ?? response.data.threads ?? [];
                 const total = response.data.total ?? results.length;
                 logger.debug('thread_list completed', {
-                    userId,
+                    user_id,
                     threadCount: results.length,
                     total,
                 });
@@ -1917,9 +2087,9 @@ function createToolHandlers(state) {
                         // Handle both thread and search result formats
                         if ('channel' in r) {
                             const t = r;
-                            const safeContact = sanitizeMetadataField(t.contactName || t.endpointValue || 'Unknown', threadListNonce);
+                            const safeContact = sanitizeMetadataField(t.contact_name || t.endpoint_value || 'Unknown', threadListNonce);
                             const safeChannel = sanitizeMetadataField(t.channel, threadListNonce);
-                            const msgCount = t.messageCount ? `${t.messageCount} message${t.messageCount !== 1 ? 's' : ''}` : '';
+                            const msgCount = t.message_count ? `${t.message_count} message${t.message_count !== 1 ? 's' : ''}` : '';
                             return `[${safeChannel}] ${safeContact}${msgCount ? ` - ${msgCount}` : ''}`;
                         }
                         const safeTitle = r.title ? sanitizeMetadataField(r.title, threadListNonce) : '';
@@ -1932,13 +2102,13 @@ function createToolHandlers(state) {
                     success: true,
                     data: {
                         content,
-                        details: { threads: results, total, userId },
+                        details: { threads: results, total, user_id },
                     },
                 };
             }
             catch (error) {
                 logger.error('thread_list failed', {
-                    userId,
+                    user_id,
                     error: error instanceof Error ? error.message : String(error),
                 });
                 return {
@@ -1948,27 +2118,27 @@ function createToolHandlers(state) {
             }
         },
         async thread_get(params) {
-            const { threadId, messageLimit = 50 } = params;
-            // Validate threadId
-            if (!threadId || threadId.length === 0) {
+            const { thread_id, message_limit = 50 } = params;
+            // Validate thread_id
+            if (!thread_id || thread_id.length === 0) {
                 return {
                     success: false,
-                    error: 'threadId: Thread ID is required',
+                    error: 'thread_id: Thread ID is required',
                 };
             }
             logger.info('thread_get invoked', {
-                userId,
-                threadId,
-                messageLimit,
+                user_id,
+                thread_id,
+                message_limit,
             });
             try {
                 const queryParams = new URLSearchParams();
-                queryParams.set('limit', String(messageLimit));
-                const response = await apiClient.get(`/api/threads/${threadId}/history?${queryParams}`, { userId });
+                queryParams.set('limit', String(message_limit));
+                const response = await apiClient.get(`/api/threads/${thread_id}/history?${queryParams}`, { user_id });
                 if (!response.success) {
                     logger.error('thread_get API error', {
-                        userId,
-                        threadId,
+                        user_id,
+                        thread_id,
                         status: response.error.status,
                         code: response.error.code,
                     });
@@ -1979,13 +2149,13 @@ function createToolHandlers(state) {
                 }
                 const { thread, messages } = response.data;
                 logger.debug('thread_get completed', {
-                    userId,
-                    threadId,
-                    messageCount: messages.length,
+                    user_id,
+                    thread_id,
+                    message_count: messages.length,
                 });
                 // Generate a per-invocation nonce for boundary markers (#1255)
                 const { nonce: threadGetNonce } = createBoundaryMarkers();
-                const contact = sanitizeMetadataField(thread.contactName || thread.endpointValue || 'Unknown', threadGetNonce);
+                const contact = sanitizeMetadataField(thread.contact_name || thread.endpoint_value || 'Unknown', threadGetNonce);
                 const safeChannel = sanitizeMetadataField(thread.channel, threadGetNonce);
                 const header = `Thread with ${contact} [${safeChannel}]`;
                 // Detect and log potential injection patterns in inbound messages
@@ -1996,12 +2166,12 @@ function createToolHandlers(state) {
                             promptGuardUrl: config.promptGuardUrl,
                         });
                         if (detection.detected) {
-                            const logDecision = injectionLogLimiter.shouldLog(userId);
+                            const logDecision = injectionLogLimiter.shouldLog(user_id);
                             if (logDecision.log) {
                                 logger.warn(logDecision.summary ? 'injection detection log summary for previous window' : 'potential prompt injection detected in thread_get result', {
-                                    userId,
-                                    threadId,
-                                    messageId: m.id,
+                                    user_id,
+                                    thread_id,
+                                    message_id: m.id,
                                     patterns: detection.patterns,
                                     source: detection.source,
                                     ...(logDecision.suppressed > 0 && { suppressedCount: logDecision.suppressed }),
@@ -2014,7 +2184,7 @@ function createToolHandlers(state) {
                     ? messages
                         .map((m) => {
                         const prefix = m.direction === 'inbound' ? '←' : '→';
-                        const timestamp = new Date(m.createdAt).toLocaleString();
+                        const timestamp = new Date(m.created_at).toLocaleString();
                         const body = sanitizeMessageForContext(m.body || '', {
                             direction: m.direction,
                             channel: thread.channel,
@@ -2030,14 +2200,14 @@ function createToolHandlers(state) {
                     success: true,
                     data: {
                         content,
-                        details: { thread, messages, userId },
+                        details: { thread, messages, user_id },
                     },
                 };
             }
             catch (error) {
                 logger.error('thread_get failed', {
-                    userId,
-                    threadId,
+                    user_id,
+                    thread_id,
                     error: error instanceof Error ? error.message : String(error),
                 });
                 return {
@@ -2055,7 +2225,7 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('relationship_set invoked', {
-                userId,
+                user_id,
                 contactALength: contact_a.length,
                 contactBLength: contact_b.length,
                 relationshipLength: relationship.length,
@@ -2066,30 +2236,31 @@ function createToolHandlers(state) {
                     contact_a,
                     contact_b,
                     relationship_type: relationship,
-                    user_email: userId, // Issue #1172: scope by user
+                    user_email: user_id, // Issue #1172: scope by user
+                    namespace: getStoreNamespace(params), // Issue #1428
                 };
                 if (notes) {
                     body.notes = notes;
                 }
-                const response = await apiClient.post('/api/relationships/set', body, { userId });
+                const response = await apiClient.post('/api/relationships/set', body, { user_id });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
-                const { relationship: rel, contactA, contactB, relationshipType, created } = response.data;
+                const { relationship: rel, contact_a: respA, contact_b: respB, relationship_type, created } = response.data;
                 const content = created
-                    ? `Recorded: ${contactA.displayName} [${relationshipType.label}] ${contactB.displayName}`
-                    : `Relationship already exists: ${contactA.displayName} [${relationshipType.label}] ${contactB.displayName}`;
+                    ? `Recorded: ${respA.display_name} [${relationship_type.label}] ${respB.display_name}`
+                    : `Relationship already exists: ${respA.display_name} [${relationship_type.label}] ${respB.display_name}`;
                 return {
                     success: true,
                     data: {
                         content,
                         details: {
-                            relationshipId: rel.id,
+                            relationship_id: rel.id,
                             created,
-                            contactA,
-                            contactB,
-                            relationshipType,
-                            userId,
+                            contact_a: respA,
+                            contact_b: respB,
+                            relationship_type,
+                            user_id,
                         },
                     },
                 };
@@ -2108,21 +2279,21 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('relationship_query invoked', {
-                userId,
+                user_id,
                 contactLength: contact.length,
                 hasTypeFilter: !!type_filter,
             });
             try {
                 // Resolve contact to a UUID — accept UUID directly or search by name
                 const uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-                let contactId;
+                let contact_id;
                 if (uuidRegex.test(contact)) {
-                    contactId = contact;
+                    contact_id = contact;
                 }
                 else {
                     // Search for contact by name (Issue #1172: scope by user_email)
-                    const searchParams = new URLSearchParams({ search: contact, limit: '1', user_email: userId });
-                    const searchResponse = await apiClient.get(`/api/contacts?${searchParams}`, { userId });
+                    const searchParams = new URLSearchParams({ search: contact, limit: '1', user_email: user_id });
+                    const searchResponse = await apiClient.get(`/api/contacts?${searchParams}`, { user_id });
                     if (!searchResponse.success) {
                         return { success: false, error: searchResponse.error.message };
                     }
@@ -2130,43 +2301,43 @@ function createToolHandlers(state) {
                     if (contacts.length === 0) {
                         return { success: false, error: 'Contact not found.' };
                     }
-                    contactId = contacts[0].id;
+                    contact_id = contacts[0].id;
                 }
-                // Use graph traversal endpoint which returns relatedContacts
-                const response = await apiClient.get(`/api/contacts/${contactId}/relationships?user_email=${encodeURIComponent(userId)}`, { userId });
+                // Use graph traversal endpoint which returns related_contacts
+                const response = await apiClient.get(`/api/contacts/${contact_id}/relationships?user_email=${encodeURIComponent(user_id)}`, { user_id });
                 if (!response.success) {
                     if (response.error.code === 'NOT_FOUND') {
                         return { success: false, error: 'Contact not found.' };
                     }
                     return { success: false, error: response.error.message };
                 }
-                let { relatedContacts } = response.data;
-                const { contactName } = response.data;
+                let { related_contacts } = response.data;
+                const { contact_name } = response.data;
                 // Apply type_filter client-side if provided
-                if (type_filter && relatedContacts.length > 0) {
+                if (type_filter && related_contacts.length > 0) {
                     const filterLower = type_filter.toLowerCase();
-                    relatedContacts = relatedContacts.filter((rel) => rel.relationshipTypeName.toLowerCase().includes(filterLower) || rel.relationshipTypeLabel.toLowerCase().includes(filterLower));
+                    related_contacts = related_contacts.filter((rel) => rel.relationship_type_name.toLowerCase().includes(filterLower) || rel.relationship_type_label.toLowerCase().includes(filterLower));
                 }
-                if (relatedContacts.length === 0) {
+                if (related_contacts.length === 0) {
                     return {
                         success: true,
                         data: {
-                            content: `No relationships found for ${contactName}.`,
-                            details: { contactId, contactName, relatedContacts: [], userId },
+                            content: `No relationships found for ${contact_name}.`,
+                            details: { contact_id, contact_name, related_contacts: [], user_id },
                         },
                     };
                 }
-                const lines = [`Relationships for ${contactName}:`];
-                for (const rel of relatedContacts) {
-                    const kindTag = rel.contactKind !== 'person' ? ` [${rel.contactKind}]` : '';
+                const lines = [`Relationships for ${contact_name}:`];
+                for (const rel of related_contacts) {
+                    const kindTag = rel.contact_kind !== 'person' ? ` [${rel.contact_kind}]` : '';
                     const notesTag = rel.notes ? ` -- ${rel.notes}` : '';
-                    lines.push(`- ${rel.relationshipTypeLabel}: ${rel.contactName}${kindTag}${notesTag}`);
+                    lines.push(`- ${rel.relationship_type_label}: ${rel.contact_name}${kindTag}${notesTag}`);
                 }
                 return {
                     success: true,
                     data: {
                         content: lines.join('\n'),
-                        details: { contactId, contactName, relatedContacts, userId },
+                        details: { contact_id, contact_name, related_contacts, user_id },
                     },
                 };
             }
@@ -2176,36 +2347,36 @@ function createToolHandlers(state) {
             }
         },
         async file_share(params) {
-            const { fileId, expiresIn = 3600, maxDownloads, } = params;
+            const { file_id: fileId, expires_in: expiresIn = 3600, max_downloads: maxDownloads, } = params;
             if (!fileId) {
                 return {
                     success: false,
-                    error: 'fileId is required',
+                    error: 'file_id is required',
                 };
             }
-            // Validate expiresIn range
+            // Validate expires_in range
             if (expiresIn < 60 || expiresIn > 604800) {
                 return {
                     success: false,
-                    error: 'expiresIn must be between 60 and 604800 seconds (1 minute to 7 days)',
+                    error: 'expires_in must be between 60 and 604800 seconds (1 minute to 7 days)',
                 };
             }
             logger.info('file_share invoked', {
-                userId,
-                fileId,
-                expiresIn,
-                maxDownloads,
+                user_id,
+                file_id: fileId,
+                expires_in: expiresIn,
+                max_downloads: maxDownloads,
             });
             try {
-                const body = { expiresIn };
+                const body = { expires_in: expiresIn };
                 if (maxDownloads !== undefined) {
-                    body.maxDownloads = maxDownloads;
+                    body.max_downloads = maxDownloads;
                 }
-                const response = await apiClient.post(`/api/files/${fileId}/share`, body, { userId });
+                const response = await apiClient.post(`/api/files/${fileId}/share`, body, { user_id });
                 if (!response.success) {
                     logger.error('file_share API error', {
-                        userId,
-                        fileId,
+                        user_id,
+                        file_id: fileId,
                         status: response.error.status,
                         code: response.error.code,
                     });
@@ -2214,12 +2385,12 @@ function createToolHandlers(state) {
                         error: response.error.message || 'Failed to create share link',
                     };
                 }
-                const { url, shareToken, expiresAt, filename, contentType, sizeBytes } = response.data;
+                const { url, share_token, expires_at, filename, content_type, size_bytes } = response.data;
                 logger.debug('file_share completed', {
-                    userId,
-                    fileId,
-                    shareToken,
-                    expiresAt,
+                    user_id,
+                    file_id: fileId,
+                    share_token,
+                    expires_at,
                 });
                 // Format file size
                 const formatSize = (bytes) => {
@@ -2242,7 +2413,7 @@ function createToolHandlers(state) {
                     return `${Math.floor(seconds / 86400)} days`;
                 };
                 const expiryText = formatDuration(expiresIn);
-                const sizeText = formatSize(sizeBytes);
+                const sizeText = formatSize(size_bytes);
                 const downloadLimit = maxDownloads ? ` (max ${maxDownloads} downloads)` : '';
                 return {
                     success: true,
@@ -2250,21 +2421,21 @@ function createToolHandlers(state) {
                         content: `Share link created for "${filename}" (${sizeText}). ` + `Valid for ${expiryText}${downloadLimit}.\n\nURL: ${url}`,
                         details: {
                             url,
-                            shareToken,
-                            expiresAt,
-                            expiresIn,
+                            share_token,
+                            expires_at,
+                            expires_in: expiresIn,
                             filename,
-                            contentType,
-                            sizeBytes,
-                            userId,
+                            content_type,
+                            size_bytes,
+                            user_id,
                         },
                     },
                 };
             }
             catch (error) {
                 logger.error('file_share failed', {
-                    userId,
-                    fileId,
+                    user_id,
+                    file_id: fileId,
                     error: error instanceof Error ? error.message : String(error),
                 });
                 return {
@@ -2276,7 +2447,7 @@ function createToolHandlers(state) {
         // Skill store tools: delegate to tool modules for Zod validation,
         // credential detection, text sanitization, and error sanitization (Issue #824)
         ...(() => {
-            const toolOptions = { client: apiClient, logger, config, userId };
+            const toolOptions = { client: apiClient, logger, config, user_id };
             const putTool = createSkillStorePutTool(toolOptions);
             const getTool = createSkillStoreGetTool(toolOptions);
             const listTool = createSkillStoreListTool(toolOptions);
@@ -2296,7 +2467,7 @@ function createToolHandlers(state) {
         })(),
         // Entity link tools: delegate to tool modules (Issue #1220)
         ...(() => {
-            const toolOptions = { client: apiClient, logger, config, userId };
+            const toolOptions = { client: apiClient, logger, config, user_id };
             const setTool = createLinksSetTool(toolOptions);
             const queryTool = createLinksQueryTool(toolOptions);
             const removeTool = createLinksRemoveTool(toolOptions);
@@ -2306,6 +2477,203 @@ function createToolHandlers(state) {
                 links_remove: (params) => removeTool.execute(params),
             };
         })(),
+        // Prompt template tools (Epic #1497, Issue #1499)
+        async prompt_template_list(params) {
+            const { channel_type, limit = 20, offset = 0 } = params;
+            try {
+                const queryParams = new URLSearchParams({ limit: String(limit), offset: String(offset) });
+                if (channel_type)
+                    queryParams.set('channel_type', channel_type);
+                const response = await apiClient.get(`/api/prompt-templates?${queryParams.toString()}`, { user_id });
+                if (!response.success) {
+                    return { success: false, error: response.error.message || 'Failed to list prompt templates' };
+                }
+                const items = response.data.items ?? [];
+                const content = items.length === 0
+                    ? 'No prompt templates found.'
+                    : items.map((t) => `- **${t.label}** [${t.channel_type}]${t.is_default ? ' (default)' : ''}`).join('\n');
+                return { success: true, data: { content, details: { items, total: response.data.total ?? items.length } } };
+            }
+            catch (error) {
+                logger.error('prompt_template_list failed', { error });
+                return { success: false, error: 'Failed to list prompt templates' };
+            }
+        },
+        async prompt_template_get(params) {
+            const { id } = params;
+            try {
+                const response = await apiClient.get(`/api/prompt-templates/${id}`, { user_id });
+                if (!response.success) {
+                    return { success: false, error: response.error.message || 'Prompt template not found' };
+                }
+                const t = response.data;
+                return { success: true, data: { content: `**${t.label}** [${t.channel_type}]${t.is_default ? ' (default)' : ''}\n\n${t.content}`, details: t } };
+            }
+            catch (error) {
+                logger.error('prompt_template_get failed', { error });
+                return { success: false, error: 'Failed to get prompt template' };
+            }
+        },
+        async prompt_template_create(params) {
+            const { label, content, channel_type, is_default } = params;
+            try {
+                const response = await apiClient.post('/api/prompt-templates', { label, content, channel_type, is_default }, { user_id });
+                if (!response.success) {
+                    return { success: false, error: response.error.message || 'Failed to create prompt template' };
+                }
+                return { success: true, data: { content: `Created prompt template "${response.data.label}" (${response.data.id})`, details: response.data } };
+            }
+            catch (error) {
+                logger.error('prompt_template_create failed', { error });
+                return { success: false, error: 'Failed to create prompt template' };
+            }
+        },
+        async prompt_template_update(params) {
+            const { id, ...updates } = params;
+            try {
+                const response = await apiClient.put(`/api/prompt-templates/${id}`, updates, { user_id });
+                if (!response.success) {
+                    return { success: false, error: response.error.message || 'Failed to update prompt template' };
+                }
+                return { success: true, data: { content: `Updated prompt template "${response.data.label}"`, details: response.data } };
+            }
+            catch (error) {
+                logger.error('prompt_template_update failed', { error });
+                return { success: false, error: 'Failed to update prompt template' };
+            }
+        },
+        async prompt_template_delete(params) {
+            const { id } = params;
+            try {
+                const response = await apiClient.delete(`/api/prompt-templates/${id}`, { user_id });
+                if (!response.success) {
+                    return { success: false, error: response.error.message || 'Failed to delete prompt template' };
+                }
+                return { success: true, data: { content: `Deleted prompt template ${id}`, details: { id } } };
+            }
+            catch (error) {
+                logger.error('prompt_template_delete failed', { error });
+                return { success: false, error: 'Failed to delete prompt template' };
+            }
+        },
+        // ── Inbound Destination tools (Issue #1500) ──────────────
+        async inbound_destination_list(params) {
+            const { channel_type, search, limit, offset } = params;
+            try {
+                const queryParams = new URLSearchParams();
+                if (channel_type)
+                    queryParams.set('channel_type', channel_type);
+                if (search)
+                    queryParams.set('search', search);
+                if (limit !== undefined)
+                    queryParams.set('limit', String(limit));
+                if (offset !== undefined)
+                    queryParams.set('offset', String(offset));
+                const response = await apiClient.get(`/api/inbound-destinations?${queryParams.toString()}`, { user_id });
+                if (!response.success) {
+                    return { success: false, error: response.error.message || 'Failed to list inbound destinations' };
+                }
+                const items = response.data.items ?? [];
+                const content = items.length === 0
+                    ? 'No inbound destinations found.'
+                    : items.map((d) => `- **${d.address}** [${d.channel_type}]${d.display_name ? ` — ${d.display_name}` : ''}${d.agent_id ? ` (agent: ${d.agent_id})` : ''}`).join('\n');
+                return { success: true, data: { content, details: { items, total: response.data.total ?? items.length } } };
+            }
+            catch (error) {
+                logger.error('inbound_destination_list failed', { error });
+                return { success: false, error: 'Failed to list inbound destinations' };
+            }
+        },
+        async inbound_destination_get(params) {
+            const { id } = params;
+            try {
+                const response = await apiClient.get(`/api/inbound-destinations/${id}`, { user_id });
+                if (!response.success) {
+                    return { success: false, error: response.error.message || 'Inbound destination not found' };
+                }
+                const d = response.data;
+                const lines = [`**${d.address}** [${d.channel_type}]`];
+                if (d.display_name)
+                    lines.push(`Display: ${d.display_name}`);
+                if (d.agent_id)
+                    lines.push(`Agent: ${d.agent_id}`);
+                if (d.prompt_template_id)
+                    lines.push(`Prompt Template: ${d.prompt_template_id}`);
+                if (d.context_id)
+                    lines.push(`Context: ${d.context_id}`);
+                return { success: true, data: { content: lines.join('\n'), details: d } };
+            }
+            catch (error) {
+                logger.error('inbound_destination_get failed', { error });
+                return { success: false, error: 'Failed to get inbound destination' };
+            }
+        },
+        async inbound_destination_update(params) {
+            const { id, ...updates } = params;
+            try {
+                const response = await apiClient.put(`/api/inbound-destinations/${id}`, updates, { user_id });
+                if (!response.success) {
+                    return { success: false, error: response.error.message || 'Failed to update inbound destination' };
+                }
+                return { success: true, data: { content: `Updated inbound destination "${response.data.address}"`, details: response.data } };
+            }
+            catch (error) {
+                logger.error('inbound_destination_update failed', { error });
+                return { success: false, error: 'Failed to update inbound destination' };
+            }
+        },
+        // ── Channel Default tools (Issue #1501) ──────────────────
+        async channel_default_list() {
+            try {
+                const response = await apiClient.get('/api/channel-defaults', { user_id });
+                if (!response.success) {
+                    return { success: false, error: response.error.message || 'Failed to list channel defaults' };
+                }
+                const items = Array.isArray(response.data) ? response.data : [];
+                const content = items.length === 0
+                    ? 'No channel defaults configured.'
+                    : items.map((d) => `- **${d.channel_type}**: agent=${d.agent_id}${d.prompt_template_id ? ` prompt=${d.prompt_template_id}` : ''}`).join('\n');
+                return { success: true, data: { content, details: { items } } };
+            }
+            catch (error) {
+                logger.error('channel_default_list failed', { error });
+                return { success: false, error: 'Failed to list channel defaults' };
+            }
+        },
+        async channel_default_get(params) {
+            const { channel_type } = params;
+            try {
+                const response = await apiClient.get(`/api/channel-defaults/${channel_type}`, { user_id });
+                if (!response.success) {
+                    return { success: false, error: response.error.message || 'Channel default not found' };
+                }
+                const d = response.data;
+                const lines = [`**${d.channel_type}** → agent: ${d.agent_id}`];
+                if (d.prompt_template_id)
+                    lines.push(`Prompt Template: ${d.prompt_template_id}`);
+                if (d.context_id)
+                    lines.push(`Context: ${d.context_id}`);
+                return { success: true, data: { content: lines.join('\n'), details: d } };
+            }
+            catch (error) {
+                logger.error('channel_default_get failed', { error });
+                return { success: false, error: 'Failed to get channel default' };
+            }
+        },
+        async channel_default_set(params) {
+            const { channel_type, agent_id, prompt_template_id, context_id } = params;
+            try {
+                const response = await apiClient.put(`/api/channel-defaults/${channel_type}`, { agent_id, prompt_template_id, context_id }, { user_id });
+                if (!response.success) {
+                    return { success: false, error: response.error.message || 'Failed to set channel default' };
+                }
+                return { success: true, data: { content: `Set ${channel_type} default → agent: ${response.data.agent_id}`, details: response.data } };
+            }
+            catch (error) {
+                logger.error('channel_default_set failed', { error });
+                return { success: false, error: 'Failed to set channel default' };
+            }
+        },
     };
 }
 /**
@@ -2349,12 +2717,21 @@ export const registerOpenClaw = (api) => {
     const apiClient = createApiClient({ config, logger });
     // Extract context and user ID
     const context = extractContext(api.runtime);
-    const userId = getUserScopeKey({
+    const user_id = getUserScopeKey({
         agentId: context.agent.agentId,
         sessionKey: context.session.sessionId,
-    }, config.userScoping);
+    }, 
+    // Backward compat: use userScoping if provided, otherwise default to 'agent'
+    config.userScoping ?? 'agent');
+    // Resolve namespace config (Issue #1428)
+    const resolvedNamespace = resolveNamespaceConfig(config.namespace, context.agent.agentId);
+    logger.info('Namespace config resolved', {
+        agentId: context.agent.agentId,
+        defaultNamespace: resolvedNamespace.default,
+        recallNamespaces: resolvedNamespace.recall,
+    });
     // Store plugin state
-    const state = { config, logger, apiClient, userId };
+    const state = { config, logger, apiClient, user_id, resolvedNamespace };
     // Create tool handlers
     const handlers = createToolHandlers(state);
     // Register all 30 tools with correct OpenClaw Gateway execute signature
@@ -2363,7 +2740,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'memory_recall',
             description: 'Search through long-term memories. Use when you need context about user preferences, past decisions, or previously discussed topics.',
-            parameters: memoryRecallSchema,
+            parameters: withNamespaces(memoryRecallSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.memory_recall(params);
                 return toAgentToolResult(result);
@@ -2372,7 +2749,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'memory_store',
             description: 'Store a new memory for future reference. Use when the user shares important preferences, facts, or decisions.',
-            parameters: memoryStoreSchema,
+            parameters: withNamespace(memoryStoreSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.memory_store(params);
                 return toAgentToolResult(result);
@@ -2381,7 +2758,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'memory_forget',
             description: 'Remove a memory by ID or search query. Use when information is outdated or the user requests deletion.',
-            parameters: memoryForgetSchema,
+            parameters: withNamespaces(memoryForgetSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.memory_forget(params);
                 return toAgentToolResult(result);
@@ -2390,7 +2767,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'project_list',
             description: 'List projects for the user. Use to see what projects exist or filter by status.',
-            parameters: projectListSchema,
+            parameters: withNamespaces(projectListSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.project_list(params);
                 return toAgentToolResult(result);
@@ -2399,7 +2776,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'project_get',
             description: 'Get details about a specific project. Use when you need full project information.',
-            parameters: projectGetSchema,
+            parameters: withNamespaces(projectGetSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.project_get(params);
                 return toAgentToolResult(result);
@@ -2408,7 +2785,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'project_create',
             description: 'Create a new project. Use when the user wants to start tracking a new initiative.',
-            parameters: projectCreateSchema,
+            parameters: withNamespace(projectCreateSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.project_create(params);
                 return toAgentToolResult(result);
@@ -2417,7 +2794,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'todo_list',
             description: 'List todos, optionally filtered by project or status. Use to see pending tasks.',
-            parameters: todoListSchema,
+            parameters: withNamespaces(todoListSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.todo_list(params);
                 return toAgentToolResult(result);
@@ -2426,7 +2803,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'todo_create',
             description: 'Create a new todo item. Use when the user wants to track a task.',
-            parameters: todoCreateSchema,
+            parameters: withNamespace(todoCreateSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.todo_create(params);
                 return toAgentToolResult(result);
@@ -2435,7 +2812,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'todo_complete',
             description: 'Mark a todo as complete. Use when a task is done.',
-            parameters: todoCompleteSchema,
+            parameters: withNamespaces(todoCompleteSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.todo_complete(params);
                 return toAgentToolResult(result);
@@ -2444,7 +2821,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'todo_search',
             description: 'Search todos and work items by natural language query. Uses semantic and text search to find relevant items. Optionally filter by kind or status.',
-            parameters: todoSearchSchema,
+            parameters: withNamespaces(todoSearchSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.todo_search(params);
                 return toAgentToolResult(result);
@@ -2453,7 +2830,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'project_search',
             description: 'Search projects by natural language query. Uses semantic and text search to find relevant projects. Optionally filter by status (active, completed, archived).',
-            parameters: projectSearchSchema,
+            parameters: withNamespaces(projectSearchSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.project_search(params);
                 return toAgentToolResult(result);
@@ -2462,7 +2839,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'context_search',
             description: 'Search across memories, todos, projects, and messages simultaneously. Use when you need broad context about a topic, person, or project. Returns a blended ranked list from all entity types. Optionally filter by entity_types to narrow the search.',
-            parameters: contextSearchSchema,
+            parameters: withNamespaces(contextSearchSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.context_search(params);
                 return toAgentToolResult(result);
@@ -2471,7 +2848,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'contact_search',
             description: 'Search contacts by name, email, or other fields. Use to find people.',
-            parameters: contactSearchSchema,
+            parameters: withNamespaces(contactSearchSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.contact_search(params);
                 return toAgentToolResult(result);
@@ -2480,7 +2857,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'contact_get',
             description: 'Get details about a specific contact. Use when you need full contact information.',
-            parameters: contactGetSchema,
+            parameters: withNamespaces(contactGetSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.contact_get(params);
                 return toAgentToolResult(result);
@@ -2489,7 +2866,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'contact_create',
             description: 'Create a new contact. Use when the user mentions someone new to track.',
-            parameters: contactCreateSchema,
+            parameters: withNamespace(contactCreateSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.contact_create(params);
                 return toAgentToolResult(result);
@@ -2516,7 +2893,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'message_search',
             description: 'Search message history semantically. Use when you need to find past conversations, messages about specific topics, or communications with contacts. Supports filtering by channel (SMS/email) and contact.',
-            parameters: messageSearchSchema,
+            parameters: withNamespaces(messageSearchSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.message_search(params);
                 return toAgentToolResult(result);
@@ -2525,7 +2902,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'thread_list',
             description: 'List message threads (conversations). Use to see recent conversations with contacts. Can filter by channel (SMS/email) or contact.',
-            parameters: threadListSchema,
+            parameters: withNamespaces(threadListSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.thread_list(params);
                 return toAgentToolResult(result);
@@ -2534,7 +2911,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'thread_get',
             description: 'Get a thread with its message history. Use to view the full conversation in a thread.',
-            parameters: threadGetSchema,
+            parameters: withNamespaces(threadGetSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.thread_get(params);
                 return toAgentToolResult(result);
@@ -2543,7 +2920,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'relationship_set',
             description: "Record a relationship between two people, groups, or organisations. Examples: 'Troy is Alex\\'s partner', 'Sam is a member of The Kelly Household', 'Troy works for Acme Corp'. The system handles directionality and type matching automatically.",
-            parameters: relationshipSetSchema,
+            parameters: withNamespace(relationshipSetSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.relationship_set(params);
                 return toAgentToolResult(result);
@@ -2552,7 +2929,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'relationship_query',
             description: "Query a contact's relationships. Returns all relationships including family, partners, group memberships, professional connections, etc. Handles directional relationships automatically.",
-            parameters: relationshipQuerySchema,
+            parameters: withNamespaces(relationshipQuerySchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.relationship_query(params);
                 return toAgentToolResult(result);
@@ -2633,7 +3010,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'links_set',
             description: 'Create a link between two entities (memory, todo, project, contact, GitHub issue, or URL). Links are bidirectional and can be traversed from either end. Use to connect related items for cross-reference and context discovery.',
-            parameters: linksSetSchema,
+            parameters: withNamespace(linksSetSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.links_set(params);
                 return toAgentToolResult(result);
@@ -2642,7 +3019,7 @@ export const registerOpenClaw = (api) => {
         {
             name: 'links_query',
             description: 'Query all links for an entity (memory, todo, project, or contact). Returns connected entities including other items, GitHub issues, and URLs. Optionally filter by link target types.',
-            parameters: linksQuerySchema,
+            parameters: withNamespaces(linksQuerySchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.links_query(params);
                 return toAgentToolResult(result);
@@ -2651,12 +3028,114 @@ export const registerOpenClaw = (api) => {
         {
             name: 'links_remove',
             description: 'Remove a link between two entities. Deletes both directions of the link. Use when a connection is no longer relevant or was created in error.',
-            parameters: linksRemoveSchema,
+            parameters: withNamespaces(linksRemoveSchema),
             execute: async (_toolCallId, params, _signal, _onUpdate) => {
                 const result = await handlers.links_remove(params);
                 return toAgentToolResult(result);
             },
         },
+        // Prompt template tools (Epic #1497, Issue #1499)
+        {
+            name: 'prompt_template_list',
+            description: 'List prompt templates used for inbound message triage. Filter by channel type (sms, email, ha_observation, general).',
+            parameters: promptTemplateListSchema,
+            execute: async (_toolCallId, params, _signal, _onUpdate) => {
+                const result = await handlers.prompt_template_list(params);
+                return toAgentToolResult(result);
+            },
+        },
+        {
+            name: 'prompt_template_get',
+            description: 'Get a prompt template by ID. Returns the full template including prompt content.',
+            parameters: promptTemplateGetSchema,
+            execute: async (_toolCallId, params, _signal, _onUpdate) => {
+                const result = await handlers.prompt_template_get(params);
+                return toAgentToolResult(result);
+            },
+        },
+        {
+            name: 'prompt_template_create',
+            description: 'Create a new prompt template for inbound message triage. Requires agentadmin access.',
+            parameters: promptTemplateCreateSchema,
+            execute: async (_toolCallId, params, _signal, _onUpdate) => {
+                const result = await handlers.prompt_template_create(params);
+                return toAgentToolResult(result);
+            },
+        },
+        {
+            name: 'prompt_template_update',
+            description: 'Update an existing prompt template. Can change label, content, channel type, or set as default.',
+            parameters: promptTemplateUpdateSchema,
+            execute: async (_toolCallId, params, _signal, _onUpdate) => {
+                const result = await handlers.prompt_template_update(params);
+                return toAgentToolResult(result);
+            },
+        },
+        {
+            name: 'prompt_template_delete',
+            description: 'Soft-delete a prompt template (sets is_active to false). Template can still be viewed but will not be used for routing.',
+            parameters: promptTemplateDeleteSchema,
+            execute: async (_toolCallId, params, _signal, _onUpdate) => {
+                const result = await handlers.prompt_template_delete(params);
+                return toAgentToolResult(result);
+            },
+        },
+        // ── Inbound Destination tools (Issue #1500) ──────────────
+        {
+            name: 'inbound_destination_list',
+            description: 'List discovered inbound destinations (phone numbers and email addresses). Auto-created when messages arrive.',
+            parameters: inboundDestinationListSchema,
+            execute: async (_toolCallId, params, _signal, _onUpdate) => {
+                const result = await handlers.inbound_destination_list(params);
+                return toAgentToolResult(result);
+            },
+        },
+        {
+            name: 'inbound_destination_get',
+            description: 'Get an inbound destination by ID. Returns routing config (agent, prompt template, context).',
+            parameters: inboundDestinationGetSchema,
+            execute: async (_toolCallId, params, _signal, _onUpdate) => {
+                const result = await handlers.inbound_destination_get(params);
+                return toAgentToolResult(result);
+            },
+        },
+        {
+            name: 'inbound_destination_update',
+            description: 'Update routing overrides for an inbound destination. Set agent, prompt template, or context for routing.',
+            parameters: inboundDestinationUpdateSchema,
+            execute: async (_toolCallId, params, _signal, _onUpdate) => {
+                const result = await handlers.inbound_destination_update(params);
+                return toAgentToolResult(result);
+            },
+        },
+        // ── Channel Default tools (Issue #1501) ──────────────────
+        {
+            name: 'channel_default_list',
+            description: 'List all channel defaults (per-channel routing config). Shows which agent handles each channel type.',
+            parameters: channelDefaultListSchema,
+            execute: async (_toolCallId, params, _signal, _onUpdate) => {
+                const result = await handlers.channel_default_list();
+                return toAgentToolResult(result);
+            },
+        },
+        {
+            name: 'channel_default_get',
+            description: 'Get the default routing config for a specific channel type (sms, email, ha_observation).',
+            parameters: channelDefaultGetSchema,
+            execute: async (_toolCallId, params, _signal, _onUpdate) => {
+                const result = await handlers.channel_default_get(params);
+                return toAgentToolResult(result);
+            },
+        },
+        {
+            name: 'channel_default_set',
+            description: 'Set or update the default routing config for a channel type. Requires agentadmin access.',
+            parameters: channelDefaultSetSchema,
+            execute: async (_toolCallId, params, _signal, _onUpdate) => {
+                const result = await handlers.channel_default_set(params);
+                return toAgentToolResult(result);
+            },
+        },
     ];
     for (const tool of tools) {
         api.registerTool(tool);
@@ -2674,7 +3153,7 @@ export const registerOpenClaw = (api) => {
             client: apiClient,
             logger,
             config,
-            userId,
+            user_id,
             timeoutMs: HOOK_TIMEOUT_MS,
         });
         /**
@@ -2719,7 +3198,7 @@ export const registerOpenClaw = (api) => {
             client: apiClient,
             logger,
             config,
-            userId,
+            user_id,
             timeoutMs: HOOK_TIMEOUT_MS * 2, // Allow more time for capture (10s)
         });
         /**
@@ -2728,7 +3207,7 @@ export const registerOpenClaw = (api) => {
          */
         const agentEndHandler = async (event, _ctx) => {
             logger.debug('Auto-capture hook triggered', {
-                messageCount: event.messages?.length ?? 0,
+                message_count: event.messages?.length ?? 0,
                 success: event.success,
             });
             try {
@@ -2775,8 +3254,8 @@ export const registerOpenClaw = (api) => {
          */
         const messageReceivedHandler = async (event, _ctx) => {
             // Skip if no thread ID (nothing to link to)
-            if (!event.threadId) {
-                logger.debug('Auto-link skipped: no threadId in message_received event');
+            if (!event.thread_id) {
+                logger.debug('Auto-link skipped: no thread_id in message_received event');
                 return;
             }
             // Skip if no content and no sender info (nothing to match on)
@@ -2788,9 +3267,9 @@ export const registerOpenClaw = (api) => {
                 await autoLinkInboundMessage({
                     client: apiClient,
                     logger,
-                    userId,
+                    user_id,
                     message: {
-                        threadId: event.threadId,
+                        thread_id: event.thread_id,
                         senderEmail: event.senderEmail ?? (event.sender?.includes('@') ? event.sender : undefined),
                         senderPhone: event.senderPhone ?? (event.sender && !event.sender.includes('@') ? event.sender : undefined),
                         content: event.content ?? '',
@@ -2815,14 +3294,14 @@ export const registerOpenClaw = (api) => {
     const gatewayMethods = createGatewayMethods({
         logger,
         apiClient,
-        userId,
+        user_id,
     });
     registerGatewayRpcMethods(api, gatewayMethods);
     // Register OAuth Gateway RPC methods (Issue #1054)
     const oauthGatewayMethods = createOAuthGatewayMethods({
         logger,
         apiClient,
-        userId,
+        user_id,
     });
     registerOAuthGatewayRpcMethods(api, oauthGatewayMethods);
     // Register background notification service (Issue #325)
@@ -2843,7 +3322,7 @@ export const registerOpenClaw = (api) => {
     const notificationService = createNotificationService({
         logger,
         apiClient,
-        userId,
+        user_id,
         events: eventEmitter,
         config: {
             enabled: config.autoRecall, // Only enable if auto-recall is enabled
@@ -2858,7 +3337,7 @@ export const registerOpenClaw = (api) => {
             .description('Show plugin status and statistics')
             .action(async () => {
             try {
-                const response = await apiClient.get('/api/health', { userId });
+                const response = await apiClient.get('/api/health', { user_id });
                 if (response.success) {
                     console.log('Plugin Status: Connected');
                 }
@@ -2892,7 +3371,7 @@ export const registerOpenClaw = (api) => {
     logger.info('OpenClaw Projects plugin registered', {
         agentId: context.agent.agentId,
         sessionId: context.session.sessionId,
-        userId,
+        user_id,
         toolCount: tools.length,
         config: redactConfig(config),
     });
@@ -2901,27 +3380,27 @@ export const registerOpenClaw = (api) => {
 export default registerOpenClaw;
 /** Export JSON Schemas for external use */
 export const schemas = {
-    memoryRecall: memoryRecallSchema,
-    memoryStore: memoryStoreSchema,
-    memoryForget: memoryForgetSchema,
-    projectList: projectListSchema,
-    projectGet: projectGetSchema,
-    projectCreate: projectCreateSchema,
-    todoList: todoListSchema,
-    todoCreate: todoCreateSchema,
-    todoComplete: todoCompleteSchema,
-    todoSearch: todoSearchSchema,
-    projectSearch: projectSearchSchema,
-    contactSearch: contactSearchSchema,
-    contactGet: contactGetSchema,
-    contactCreate: contactCreateSchema,
+    memoryRecall: withNamespaces(memoryRecallSchema),
+    memoryStore: withNamespace(memoryStoreSchema),
+    memoryForget: withNamespaces(memoryForgetSchema),
+    projectList: withNamespaces(projectListSchema),
+    projectGet: withNamespaces(projectGetSchema),
+    projectCreate: withNamespace(projectCreateSchema),
+    todoList: withNamespaces(todoListSchema),
+    todoCreate: withNamespace(todoCreateSchema),
+    todoComplete: withNamespaces(todoCompleteSchema),
+    todoSearch: withNamespaces(todoSearchSchema),
+    projectSearch: withNamespaces(projectSearchSchema),
+    contactSearch: withNamespaces(contactSearchSchema),
+    contactGet: withNamespaces(contactGetSchema),
+    contactCreate: withNamespace(contactCreateSchema),
     smsSend: smsSendSchema,
     emailSend: emailSendSchema,
-    messageSearch: messageSearchSchema,
-    threadList: threadListSchema,
-    threadGet: threadGetSchema,
-    relationshipSet: relationshipSetSchema,
-    relationshipQuery: relationshipQuerySchema,
+    messageSearch: withNamespaces(messageSearchSchema),
+    threadList: withNamespaces(threadListSchema),
+    threadGet: withNamespaces(threadGetSchema),
+    relationshipSet: withNamespace(relationshipSetSchema),
+    relationshipQuery: withNamespaces(relationshipQuerySchema),
     fileShare: fileShareSchema,
     skillStorePut: skillStorePutSchema,
     skillStoreGet: skillStoreGetSchema,