crewly 1.20.155 → 1.20.157

package/dist/cli/backend/src/services/agent/agent-registration.service.js

@@ -11,7 +11,8 @@ import { RuntimeServiceFactory } from './runtime-service.factory.js';
 import { OrcReplyRouteService } from '../orc/orc-reply-route.service.js';
 import { registerInProcessRuntime, unregisterInProcessRuntime, } from './crewly-agent/in-process-runtime-registry.js';
 import { getCrewlyHomePath } from '../core/crewly-home.utils.js';
-import { CREWLY_CONSTANTS, ENV_CONSTANTS, AGENT_TIMEOUTS, ORCHESTRATOR_SESSION_NAME, ORCHESTRATOR_ROLE, RUNTIME_TYPES, SESSION_COMMAND_DELAYS, SESSION_RECREATION_CONSTANTS, EVENT_DELIVERY_CONSTANTS, TERMINAL_PATTERNS, GEMINI_SHELL_MODE_CONSTANTS, GEMINI_STUCK_CONNECTIVITY_PATTERN, GEMINI_ERROR_STATE_CONSTANTS, REGISTRATION_DELIVERY_CONSTANTS, ORC_CONVERSATION_CONSTANTS, } from '../../constants.js';
+import { CREWLY_CONSTANTS, ENV_CONSTANTS, AGENT_TIMEOUTS, ORCHESTRATOR_SESSION_NAME, ORCHESTRATOR_ROLE, RUNTIME_TYPES, SESSION_COMMAND_DELAYS, SESSION_RECREATION_CONSTANTS, EVENT_DELIVERY_CONSTANTS, TERMINAL_PATTERNS, GEMINI_SHELL_MODE_CONSTANTS, GEMINI_STUCK_CONNECTIVITY_PATTERN, GEMINI_ERROR_STATE_CONSTANTS, REGISTRATION_DELIVERY_CONSTANTS, ORC_CONVERSATION_CONSTANTS, SLACK_THREAD_KEY_CONSTANTS, } from '../../constants.js';
+import { extractSlackThreadKeys, formatSlackThreadKey } from '../slack/slack-thread-key.js';
 import { delay } from '../../utils/async.utils.js';
 import { buildRuntimeModelFlags } from '../../utils/runtime-model-flags.utils.js';
 import { effectiveMemberModelId } from '../../utils/member-default-model.utils.js';
@@ -349,8 +350,9 @@ export class AgentRegistrationService {
      * @param sessionName - Agent session that produced the response
      * @param text - Response text from the agent
      * @param conversationId - Chat conversation to route the response to
+     * @param slackThreadKey - Slack thread the delivered message came from, when it named exactly one
      */
-    routeInProcessResponseToChat(sessionName, text, conversationId) {
+    routeInProcessResponseToChat(sessionName, text, conversationId, slackThreadKey) {
         // LEGACY PATH — chatGateway.processNotifyMessage → ChatService
         // (JSON files in ~/.crewly/chat/). Kept until Phase 5 data
         // migration retires the JSON store; until then the legacy file
@@ -371,7 +373,7 @@ export class AgentRegistrationService {
             // then failed enum validation, so every in-process reply to a web
             // conversation was rejected with "unknown metadata.source" and
             // silently dropped after the agent had already done the work.
-            return chatGateway.processNotifyMessage(sessionName, text, conversationId);
+            return chatGateway.processNotifyMessage(sessionName, text, conversationId, slackThreadKey ? { [SLACK_THREAD_KEY_CONSTANTS.METADATA_KEY]: slackThreadKey } : undefined);
         })
             .then((chatMessage) => {
             if (chatMessage) {
@@ -3699,6 +3701,13 @@ Loop until done, blocked, or explicitly reassigned:
                 // Extract conversationId from [CHAT:xxx] or [GCHAT:xxx ...] prefix for response routing
                 const chatPrefixMatch = message.match(/^\[(?:G?CHAT):([^\]\s]+)[^\]]*\]\s*/);
                 const incomingConversationId = chatPrefixMatch?.[1];
+                // The Slack thread this delivery came from ([SLACK-THREAD:<key>]).
+                // The turn's text answers that thread, so the DM bridge posts it
+                // there rather than in whichever thread was written in last.
+                const incomingThreadKeys = extractSlackThreadKeys(message);
+                const incomingThreadKey = incomingThreadKeys.length === 1
+                    ? formatSlackThreadKey(incomingThreadKeys[0].slackChannelId, incomingThreadKeys[0].threadTs)
+                    : undefined;
                 // Extract Slack context from [SLACK:channelId:threadTs] marker if present (Bug 5).
                 // This allows crewly-agent to auto-fill reply_slack with the correct thread.
                 let slackMetadata;
@@ -3789,7 +3798,12 @@ Loop until done, blocked, or explicitly reassigned:
                         });
                     }
                     if (replyText && incomingConversationId && !agentAlreadyReplied) {
-                        this.routeInProcessResponseToChat(sessionName, replyText, incomingConversationId);
+                        if (incomingThreadKey) {
+                            this.routeInProcessResponseToChat(sessionName, replyText, incomingConversationId, incomingThreadKey);
+                        }
+                        else {
+                            this.routeInProcessResponseToChat(sessionName, replyText, incomingConversationId);
+                        }
                     }
                     else if (agentAlreadyReplied) {
                         this.logger.debug('Skipping chat routing — agent already replied via reply_slack', {