@troykelly/openclaw-projects 0.0.25 → 0.0.29

package/dist/register-openclaw.js

@@ -10,7 +10,7 @@
 import { ZodError } from 'zod';
 import { createApiClient } from './api-client.js';
 import { redactConfig, resolveConfigSecretsSync, resolveNamespaceConfig, validateRawConfig } from './config.js';
-import { extractContext, getUserScopeKey } from './context.js';
+import { extractContext, getUserScopeKey, resolveAgentId } from './context.js';
 import { createOAuthGatewayMethods, registerOAuthGatewayRpcMethods } from './gateway/oauth-rpc-methods.js';
 import { createGatewayMethods, registerGatewayRpcMethods } from './gateway/rpc-methods.js';
 import { createAutoCaptureHook, createGraphAwareRecallHook } from './hooks.js';
@@ -1449,7 +1449,7 @@ export async function refreshNamespacesAsync(state) {
         return;
     state.refreshInFlight = true;
     try {
-        const response = await state.apiClient.get('/api/namespaces', { user_id: state.user_id, user_email: state.user_email });
+        const response = await state.apiClient.get('/api/namespaces', { user_id: state.agentId, user_email: state.agentEmail });
         if (!response.success) {
             state.logger.warn('Namespace discovery failed, keeping cached list', { error: response.error.message });
             // Do NOT update timestamp on failure — let the next check retry sooner
@@ -1487,18 +1487,20 @@ export async function refreshNamespacesAsync(state) {
  * Create tool execution handlers
  */
 function createToolHandlers(state) {
-    const { config, logger, apiClient, user_id, user_email, resolvedNamespace } = state;
-    /** Build RequestOptions with user_id and user_email for identity resolution (#1567) */
-    const reqOpts = () => ({ user_id, user_email });
-    /**
-     * Get the effective namespace for a store/create operation.
-     * Uses explicit tool param if provided, otherwise falls back to config default.
-     */
+    const { config, logger, apiClient } = state;
+    // Issue #1644: Read user_id from mutable state on every call.
+    const getAgentId = () => state.agentId;
+    /** Read user_id from mutable state on every call (Issue #1644) */
+    const reqOpts = () => ({
+        user_id: state.agentId,
+        user_email: state.agentEmail,
+    });
+    /** Read namespace from mutable state on every call (Issue #1644) */
     function getStoreNamespace(params) {
         const ns = params.namespace;
         if (typeof ns === 'string' && ns.length > 0)
             return ns;
-        return resolvedNamespace.default;
+        return state.resolvedNamespace.default;
     }
     /**
      * Get the effective namespaces for a query/list operation.
@@ -1514,7 +1516,7 @@ function createToolHandlers(state) {
         if (interval > 0 && !state.hasStaticRecall && Date.now() - state.lastNamespaceRefreshMs > interval) {
             refreshNamespacesAsync(state);
         }
-        return resolvedNamespace.recall;
+        return state.resolvedNamespace.recall;
     }
     return {
         async memory_recall(params) {
@@ -1572,7 +1574,7 @@ function createToolHandlers(state) {
                     success: true,
                     data: {
                         content,
-                        details: { count: memories.length, memories, user_id },
+                        details: { count: memories.length, memories, user_id: state.agentId },
                     },
                 };
             }
@@ -1704,7 +1706,7 @@ function createToolHandlers(state) {
                 const queryParams = new URLSearchParams({ item_type: 'project', limit: String(limit) });
                 if (status !== 'all')
                     queryParams.set('status', status);
-                queryParams.set('user_email', user_id); // Issue #1172: scope by user
+                queryParams.set('user_email', state.agentId); // Issue #1172: scope by user
                 // Namespace scoping (Issue #1428)
                 const projListNs = getRecallNamespaces(params);
                 if (projListNs.length > 0)
@@ -1728,7 +1730,7 @@ function createToolHandlers(state) {
         async project_get(params) {
             const { project_id } = params;
             try {
-                const response = await apiClient.get(`/api/work-items/${project_id}?user_email=${encodeURIComponent(user_id)}`, reqOpts());
+                const response = await apiClient.get(`/api/work-items/${project_id}?user_email=${encodeURIComponent(state.agentId)}`, reqOpts());
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1749,7 +1751,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: user_id, namespace: getStoreNamespace(params) }, reqOpts());
+                const response = await apiClient.post('/api/work-items', { title: name, description, item_type: 'project', status, user_email: state.agentId, namespace: getStoreNamespace(params) }, reqOpts());
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1773,7 +1775,7 @@ function createToolHandlers(state) {
                     item_type: 'task',
                     limit: String(limit),
                     offset: String(offset),
-                    user_email: user_id, // Issue #1172: scope by user
+                    user_email: state.agentId, // Issue #1172: scope by user
                 });
                 if (project_id)
                     queryParams.set('parent_work_item_id', project_id);
@@ -1816,7 +1818,7 @@ function createToolHandlers(state) {
         async todo_create(params) {
             const { title, description, project_id, priority = 'medium', dueDate, } = params;
             try {
-                const body = { title, description, item_type: 'task', priority, user_email: user_id, namespace: getStoreNamespace(params) };
+                const body = { title, description, item_type: 'task', priority, user_email: state.agentId, namespace: getStoreNamespace(params) };
                 if (project_id)
                     body.parent_work_item_id = project_id;
                 if (dueDate)
@@ -1841,7 +1843,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(user_id)}`, { status: 'completed' }, reqOpts());
+                const response = await apiClient.patch(`/api/work-items/${todoId}/status?user_email=${encodeURIComponent(state.agentId)}`, { status: 'completed' }, reqOpts());
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1868,7 +1870,7 @@ function createToolHandlers(state) {
                     types: 'work_item',
                     limit: String(fetchLimit),
                     semantic: 'true',
-                    user_email: user_id, // Issue #1216: scope results to current user
+                    user_email: state.agentId, // Issue #1216: scope results to current user
                 });
                 // Namespace scoping (Issue #1428)
                 const todoSearchNs = getRecallNamespaces(params);
@@ -1929,22 +1931,22 @@ function createToolHandlers(state) {
             }
         },
         async project_search(params) {
-            const tool = createProjectSearchTool({ client: apiClient, logger, config, user_id });
+            const tool = createProjectSearchTool({ client: apiClient, logger, config, user_id: getAgentId() });
             return tool.execute(params);
         },
         async context_search(params) {
-            const tool = createContextSearchTool({ client: apiClient, logger, config, user_id });
+            const tool = createContextSearchTool({ client: apiClient, logger, config, user_id: getAgentId() });
             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: user_id });
+                const queryParams = new URLSearchParams({ search: query, limit: String(limit), user_email: state.agentId });
                 const contactSearchNs = getRecallNamespaces(params);
                 if (contactSearchNs.length > 0)
                     queryParams.set('namespaces', contactSearchNs.join(','));
                 const response = await apiClient.get(`/api/contacts?${queryParams}`, {
-                    user_id,
+                    user_id: state.agentId,
                 });
                 if (!response.success) {
                     return { success: false, error: response.error.message };
@@ -1964,7 +1966,7 @@ function createToolHandlers(state) {
         async contact_get(params) {
             const { contact_id } = params;
             try {
-                const response = await apiClient.get(`/api/contacts/${contact_id}?user_email=${encodeURIComponent(user_id)}`, reqOpts());
+                const response = await apiClient.get(`/api/contacts/${contact_id}?user_email=${encodeURIComponent(state.agentId)}`, reqOpts());
                 if (!response.success) {
                     return { success: false, error: response.error.message };
                 }
@@ -1995,7 +1997,7 @@ function createToolHandlers(state) {
             }
             try {
                 const body = {
-                    user_email: user_id,
+                    user_email: state.agentId,
                     namespace: getStoreNamespace(params),
                     notes,
                     contact_kind: contact_kind ?? 'person',
@@ -2206,7 +2208,7 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('sms_send invoked', {
-                user_id,
+                user_id: state.agentId,
                 bodyLength: body.length,
                 hasIdempotencyKey: !!idempotency_key,
             });
@@ -2214,7 +2216,7 @@ function createToolHandlers(state) {
                 const response = await apiClient.post('/api/twilio/sms/send', { to, body, idempotency_key }, reqOpts());
                 if (!response.success) {
                     logger.error('sms_send API error', {
-                        user_id,
+                        user_id: state.agentId,
                         status: response.error.status,
                         code: response.error.code,
                     });
@@ -2225,7 +2227,7 @@ function createToolHandlers(state) {
                 }
                 const { message_id, thread_id, status } = response.data;
                 logger.debug('sms_send completed', {
-                    user_id,
+                    user_id: state.agentId,
                     message_id,
                     status,
                 });
@@ -2233,13 +2235,13 @@ function createToolHandlers(state) {
                     success: true,
                     data: {
                         content: `SMS sent successfully (ID: ${message_id}, Status: ${status})`,
-                        details: { message_id, thread_id, status, user_id },
+                        details: { message_id, thread_id, status, user_id: state.agentId },
                     },
                 };
             }
             catch (error) {
                 logger.error('sms_send failed', {
-                    user_id,
+                    user_id: state.agentId,
                     error: error instanceof Error ? error.message : String(error),
                 });
                 // Sanitize error message (remove phone numbers for privacy)
@@ -2284,7 +2286,7 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('email_send invoked', {
-                user_id,
+                user_id: state.agentId,
                 subjectLength: subject.length,
                 bodyLength: body.length,
                 hasHtmlBody: !!html_body,
@@ -2295,7 +2297,7 @@ function createToolHandlers(state) {
                 const response = await apiClient.post('/api/postmark/email/send', { to, subject, body, html_body, thread_id, idempotency_key }, reqOpts());
                 if (!response.success) {
                     logger.error('email_send API error', {
-                        user_id,
+                        user_id: state.agentId,
                         status: response.error.status,
                         code: response.error.code,
                     });
@@ -2306,7 +2308,7 @@ function createToolHandlers(state) {
                 }
                 const { message_id, thread_id: responseThreadId, status } = response.data;
                 logger.debug('email_send completed', {
-                    user_id,
+                    user_id: state.agentId,
                     message_id,
                     status,
                 });
@@ -2314,13 +2316,13 @@ function createToolHandlers(state) {
                     success: true,
                     data: {
                         content: `Email sent successfully (ID: ${message_id}, Status: ${status})`,
-                        details: { message_id, thread_id: responseThreadId, status, user_id },
+                        details: { message_id, thread_id: responseThreadId, status, user_id: state.agentId },
                     },
                 };
             }
             catch (error) {
                 logger.error('email_send failed', {
-                    user_id,
+                    user_id: state.agentId,
                     error: error instanceof Error ? error.message : String(error),
                 });
                 // Sanitize error message (remove email addresses for privacy)
@@ -2344,7 +2346,7 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('message_search invoked', {
-                user_id,
+                user_id: state.agentId,
                 queryLength: query.length,
                 channel,
                 hasContactId: !!contact_id,
@@ -2370,7 +2372,7 @@ function createToolHandlers(state) {
                 const response = await apiClient.get(`/api/search?${queryParams}`, reqOpts());
                 if (!response.success) {
                     logger.error('message_search API error', {
-                        user_id,
+                        user_id: state.agentId,
                         status: response.error.status,
                         code: response.error.code,
                     });
@@ -2391,7 +2393,7 @@ function createToolHandlers(state) {
                     similarity: r.score,
                 }));
                 logger.debug('message_search completed', {
-                    user_id,
+                    user_id: state.agentId,
                     resultCount: messages.length,
                     total,
                 });
@@ -2406,10 +2408,10 @@ function createToolHandlers(state) {
                             promptGuardUrl: config.promptGuardUrl,
                         });
                         if (detection.detected) {
-                            const logDecision = injectionLogLimiter.shouldLog(user_id);
+                            const logDecision = injectionLogLimiter.shouldLog(state.agentId);
                             if (logDecision.log) {
                                 logger.warn(logDecision.summary ? 'injection detection log summary for previous window' : 'potential prompt injection detected in message_search result', {
-                                    user_id,
+                                    user_id: state.agentId,
                                     message_id: m.id,
                                     patterns: detection.patterns,
                                     source: detection.source,
@@ -2446,13 +2448,13 @@ function createToolHandlers(state) {
                     success: true,
                     data: {
                         content,
-                        details: { messages, total, user_id },
+                        details: { messages, total, user_id: state.agentId },
                     },
                 };
             }
             catch (error) {
                 logger.error('message_search failed', {
-                    user_id,
+                    user_id: state.agentId,
                     error: error instanceof Error ? error.message : String(error),
                 });
                 return {
@@ -2464,7 +2466,7 @@ function createToolHandlers(state) {
         async thread_list(params) {
             const { channel, contact_id, limit = 20, } = params;
             logger.info('thread_list invoked', {
-                user_id,
+                user_id: state.agentId,
                 channel,
                 hasContactId: !!contact_id,
                 limit,
@@ -2483,7 +2485,7 @@ function createToolHandlers(state) {
                 const response = await apiClient.get(`/api/search?${queryParams}`, reqOpts());
                 if (!response.success) {
                     logger.error('thread_list API error', {
-                        user_id,
+                        user_id: state.agentId,
                         status: response.error.status,
                         code: response.error.code,
                     });
@@ -2496,7 +2498,7 @@ function createToolHandlers(state) {
                 const results = response.data.results ?? response.data.threads ?? [];
                 const total = response.data.total ?? results.length;
                 logger.debug('thread_list completed', {
-                    user_id,
+                    user_id: state.agentId,
                     threadCount: results.length,
                     total,
                 });
@@ -2525,13 +2527,13 @@ function createToolHandlers(state) {
                     success: true,
                     data: {
                         content,
-                        details: { threads: results, total, user_id },
+                        details: { threads: results, total, user_id: state.agentId },
                     },
                 };
             }
             catch (error) {
                 logger.error('thread_list failed', {
-                    user_id,
+                    user_id: state.agentId,
                     error: error instanceof Error ? error.message : String(error),
                 });
                 return {
@@ -2550,7 +2552,7 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('thread_get invoked', {
-                user_id,
+                user_id: state.agentId,
                 thread_id,
                 message_limit,
             });
@@ -2560,7 +2562,7 @@ function createToolHandlers(state) {
                 const response = await apiClient.get(`/api/threads/${thread_id}/history?${queryParams}`, reqOpts());
                 if (!response.success) {
                     logger.error('thread_get API error', {
-                        user_id,
+                        user_id: state.agentId,
                         thread_id,
                         status: response.error.status,
                         code: response.error.code,
@@ -2572,7 +2574,7 @@ function createToolHandlers(state) {
                 }
                 const { thread, messages } = response.data;
                 logger.debug('thread_get completed', {
-                    user_id,
+                    user_id: state.agentId,
                     thread_id,
                     message_count: messages.length,
                 });
@@ -2589,10 +2591,10 @@ function createToolHandlers(state) {
                             promptGuardUrl: config.promptGuardUrl,
                         });
                         if (detection.detected) {
-                            const logDecision = injectionLogLimiter.shouldLog(user_id);
+                            const logDecision = injectionLogLimiter.shouldLog(state.agentId);
                             if (logDecision.log) {
                                 logger.warn(logDecision.summary ? 'injection detection log summary for previous window' : 'potential prompt injection detected in thread_get result', {
-                                    user_id,
+                                    user_id: state.agentId,
                                     thread_id,
                                     message_id: m.id,
                                     patterns: detection.patterns,
@@ -2623,13 +2625,13 @@ function createToolHandlers(state) {
                     success: true,
                     data: {
                         content,
-                        details: { thread, messages, user_id },
+                        details: { thread, messages, user_id: state.agentId },
                     },
                 };
             }
             catch (error) {
                 logger.error('thread_get failed', {
-                    user_id,
+                    user_id: state.agentId,
                     thread_id,
                     error: error instanceof Error ? error.message : String(error),
                 });
@@ -2648,7 +2650,7 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('relationship_set invoked', {
-                user_id,
+                user_id: state.agentId,
                 contactALength: contact_a.length,
                 contactBLength: contact_b.length,
                 relationshipLength: relationship.length,
@@ -2659,7 +2661,7 @@ function createToolHandlers(state) {
                     contact_a,
                     contact_b,
                     relationship_type: relationship,
-                    user_email: user_id, // Issue #1172: scope by user
+                    user_email: state.agentId, // Issue #1172: scope by user
                     namespace: getStoreNamespace(params), // Issue #1428
                 };
                 if (notes) {
@@ -2683,7 +2685,7 @@ function createToolHandlers(state) {
                             contact_a: respA,
                             contact_b: respB,
                             relationship_type,
-                            user_id,
+                            user_id: state.agentId,
                         },
                     },
                 };
@@ -2702,7 +2704,7 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('relationship_query invoked', {
-                user_id,
+                user_id: state.agentId,
                 contactLength: contact.length,
                 hasTypeFilter: !!type_filter,
             });
@@ -2715,7 +2717,7 @@ function createToolHandlers(state) {
                 }
                 else {
                     // Search for contact by name (Issue #1172: scope by user_email)
-                    const searchParams = new URLSearchParams({ search: contact, limit: '1', user_email: user_id });
+                    const searchParams = new URLSearchParams({ search: contact, limit: '1', user_email: state.agentId });
                     const searchResponse = await apiClient.get(`/api/contacts?${searchParams}`, reqOpts());
                     if (!searchResponse.success) {
                         return { success: false, error: searchResponse.error.message };
@@ -2727,7 +2729,7 @@ function createToolHandlers(state) {
                     contact_id = contacts[0].id;
                 }
                 // Use graph traversal endpoint which returns related_contacts
-                const response = await apiClient.get(`/api/contacts/${contact_id}/relationships?user_email=${encodeURIComponent(user_id)}`, reqOpts());
+                const response = await apiClient.get(`/api/contacts/${contact_id}/relationships?user_email=${encodeURIComponent(state.agentId)}`, reqOpts());
                 if (!response.success) {
                     if (response.error.code === 'NOT_FOUND') {
                         return { success: false, error: 'Contact not found.' };
@@ -2746,7 +2748,7 @@ function createToolHandlers(state) {
                         success: true,
                         data: {
                             content: `No relationships found for ${contact_name}.`,
-                            details: { contact_id, contact_name, related_contacts: [], user_id },
+                            details: { contact_id, contact_name, related_contacts: [], user_id: state.agentId },
                         },
                     };
                 }
@@ -2760,7 +2762,7 @@ function createToolHandlers(state) {
                     success: true,
                     data: {
                         content: lines.join('\n'),
-                        details: { contact_id, contact_name, related_contacts, user_id },
+                        details: { contact_id, contact_name, related_contacts, user_id: state.agentId },
                     },
                 };
             }
@@ -2785,7 +2787,7 @@ function createToolHandlers(state) {
                 };
             }
             logger.info('file_share invoked', {
-                user_id,
+                user_id: state.agentId,
                 file_id: fileId,
                 expires_in: expiresIn,
                 max_downloads: maxDownloads,
@@ -2798,7 +2800,7 @@ function createToolHandlers(state) {
                 const response = await apiClient.post(`/api/files/${fileId}/share`, body, reqOpts());
                 if (!response.success) {
                     logger.error('file_share API error', {
-                        user_id,
+                        user_id: state.agentId,
                         file_id: fileId,
                         status: response.error.status,
                         code: response.error.code,
@@ -2810,7 +2812,7 @@ function createToolHandlers(state) {
                 }
                 const { url, share_token, expires_at, filename, content_type, size_bytes } = response.data;
                 logger.debug('file_share completed', {
-                    user_id,
+                    user_id: state.agentId,
                     file_id: fileId,
                     share_token,
                     expires_at,
@@ -2850,14 +2852,14 @@ function createToolHandlers(state) {
                             filename,
                             content_type,
                             size_bytes,
-                            user_id,
+                            user_id: state.agentId,
                         },
                     },
                 };
             }
             catch (error) {
                 logger.error('file_share failed', {
-                    user_id,
+                    user_id: state.agentId,
                     file_id: fileId,
                     error: error instanceof Error ? error.message : String(error),
                 });
@@ -2869,8 +2871,12 @@ function createToolHandlers(state) {
         },
         // Skill store tools: delegate to tool modules for Zod validation,
         // credential detection, text sanitization, and error sanitization (Issue #824)
+        // NOTE: These tools capture user_id at creation time. When state.agentId is updated
+        // by hook context (Issue #1644), skill store tools will use the registration-time value.
+        // This is acceptable because skill store operations are scoped by API key, not user_id.
+        // A follow-up issue should refactor tool modules to accept getter functions.
         ...(() => {
-            const toolOptions = { client: apiClient, logger, config, user_id };
+            const toolOptions = { client: apiClient, logger, config, user_id: getAgentId() };
             const putTool = createSkillStorePutTool(toolOptions);
             const getTool = createSkillStoreGetTool(toolOptions);
             const listTool = createSkillStoreListTool(toolOptions);
@@ -2890,7 +2896,8 @@ function createToolHandlers(state) {
         })(),
         // Entity link tools: delegate to tool modules (Issue #1220)
         ...(() => {
-            const toolOptions = { client: apiClient, logger, config, user_id };
+            const toolOptions = { client: apiClient, logger, config, user_id: getAgentId() };
+            // NOTE: Same caveat as skill store tools above (Issue #1644).
             const setTool = createLinksSetTool(toolOptions);
             const queryTool = createLinksQueryTool(toolOptions);
             const removeTool = createLinksRemoveTool(toolOptions);
@@ -3253,7 +3260,7 @@ export const registerOpenClaw = (api) => {
     // user_setting.email. The email is needed for FK-constrained operations.
     const user_email = context.user?.email;
     // Store plugin state
-    const state = { config, logger, apiClient, user_id, user_email, resolvedNamespace, hasStaticRecall, lastNamespaceRefreshMs: 0, refreshInFlight: false };
+    const state = { config, logger, apiClient, agentId: user_id, agentEmail: user_email, resolvedNamespace, hasStaticRecall, lastNamespaceRefreshMs: 0, refreshInFlight: false };
     // Create tool handlers
     const handlers = createToolHandlers(state);
     // Register all 30 tools with correct OpenClaw Gateway execute signature
@@ -3766,7 +3773,7 @@ export const registerOpenClaw = (api) => {
             client: apiClient,
             logger,
             config,
-            user_id,
+            getAgentId: () => state.agentId,
             timeoutMs: HOOK_TIMEOUT_MS,
         });
         /**
@@ -3774,7 +3781,29 @@ export const registerOpenClaw = (api) => {
          * performs semantic memory search, and returns { prependContext } to inject
          * relevant memories into the conversation.
          */
-        const beforeAgentStartHandler = async (event, _ctx) => {
+        const beforeAgentStartHandler = async (event, ctx) => {
+            // Issue #1655: Detect concurrent session conflict
+            if (state.activeSessionKey && ctx.sessionKey && state.activeSessionKey !== ctx.sessionKey) {
+                logger.warn('Concurrent session detected — agent identity may be stale', {
+                    previousSession: state.activeSessionKey,
+                    newSession: ctx.sessionKey,
+                    previousAgentId: state.agentId,
+                });
+            }
+            state.activeSessionKey = ctx.sessionKey;
+            // Issue #1644: resolve agent ID from hook context and update state
+            const resolvedId = resolveAgentId(ctx, config.agentId, state.agentId);
+            if (resolvedId !== state.agentId) {
+                const previousId = state.agentId;
+                state.agentId = resolvedId;
+                state.resolvedNamespace = resolveNamespaceConfig(config.namespace, resolvedId);
+                logger.info('Agent ID resolved from hook context', {
+                    previousId,
+                    resolvedId,
+                    defaultNamespace: state.resolvedNamespace.default,
+                    recallNamespaces: state.resolvedNamespace.recall,
+                });
+            }
             logger.debug('Auto-recall hook triggered', {
                 promptLength: event.prompt?.length ?? 0,
             });
@@ -3811,14 +3840,24 @@ export const registerOpenClaw = (api) => {
             client: apiClient,
             logger,
             config,
-            user_id,
+            getAgentId: () => state.agentId,
             timeoutMs: HOOK_TIMEOUT_MS * 2, // Allow more time for capture (10s)
         });
         /**
          * agent_end handler: Extracts messages from the completed conversation,
          * filters sensitive content, and posts to the capture API for memory storage.
          */
-        const agentEndHandler = async (event, _ctx) => {
+        const agentEndHandler = async (event, ctx) => {
+            // Issue #1644: ensure agent ID is resolved even if before_agent_start didn't fire
+            const resolvedId = resolveAgentId(ctx, config.agentId, state.agentId);
+            if (resolvedId !== state.agentId) {
+                state.agentId = resolvedId;
+                state.resolvedNamespace = resolveNamespaceConfig(config.namespace, resolvedId);
+                logger.info('Agent ID resolved from agent_end context', {
+                    resolvedId,
+                    defaultNamespace: state.resolvedNamespace.default,
+                });
+            }
             logger.debug('Auto-capture hook triggered', {
                 message_count: event.messages?.length ?? 0,
                 success: event.success,
@@ -3843,6 +3882,8 @@ export const registerOpenClaw = (api) => {
                     error: error instanceof Error ? error.message : String(error),
                 });
             }
+            // Issue #1655: Clear session key after agent ends
+            state.activeSessionKey = undefined;
         };
         if (typeof api.on === 'function') {
             // Modern registration: api.on('agent_end', handler)
@@ -3880,7 +3921,7 @@ export const registerOpenClaw = (api) => {
                 await autoLinkInboundMessage({
                     client: apiClient,
                     logger,
-                    user_id,
+                    getAgentId: () => state.agentId,
                     message: {
                         thread_id: event.thread_id,
                         senderEmail: event.senderEmail ?? (event.sender?.includes('@') ? event.sender : undefined),
@@ -3907,14 +3948,14 @@ export const registerOpenClaw = (api) => {
     const gatewayMethods = createGatewayMethods({
         logger,
         apiClient,
-        user_id,
+        getAgentId: () => state.agentId,
     });
     registerGatewayRpcMethods(api, gatewayMethods);
     // Register OAuth Gateway RPC methods (Issue #1054)
     const oauthGatewayMethods = createOAuthGatewayMethods({
         logger,
         apiClient,
-        user_id,
+        getAgentId: () => state.agentId,
     });
     registerOAuthGatewayRpcMethods(api, oauthGatewayMethods);
     // Register background notification service (Issue #325)
@@ -3935,7 +3976,7 @@ export const registerOpenClaw = (api) => {
     const notificationService = createNotificationService({
         logger,
         apiClient,
-        user_id,
+        getAgentId: () => state.agentId,
         events: eventEmitter,
         config: {
             enabled: config.autoRecall, // Only enable if auto-recall is enabled
@@ -3950,7 +3991,7 @@ export const registerOpenClaw = (api) => {
             .description('Show plugin status and statistics')
             .action(async () => {
             try {
-                const response = await apiClient.get('/api/health', { user_id, user_email });
+                const response = await apiClient.get('/api/health', { user_id: state.agentId, user_email: state.agentEmail });
                 if (response.success) {
                     console.log('Plugin Status: Connected');
                 }
@@ -3981,10 +4022,15 @@ export const registerOpenClaw = (api) => {
             }
         });
     });
+    // Issue #1644: warn if agent ID is "unknown" at registration (will be resolved from hook context later)
+    if (context.agent.agentId === 'unknown' && !config.agentId) {
+        logger.warn('Agent ID not available at registration time — will resolve from hook context. ' +
+            'Set config.agentId for explicit override. (Issue #1644)');
+    }
     logger.info('OpenClaw Projects plugin registered', {
         agentId: context.agent.agentId,
         sessionId: context.session.sessionId,
-        user_id,
+        user_id: state.agentId,
         toolCount: tools.length,
         config: redactConfig(config),
     });