crewly 1.20.154 → 1.20.156

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';
@@ -26,6 +27,7 @@ import { ContextWindowMonitorService } from './context-window-monitor.service.js
 import { OAuthReloginMonitorService } from './oauth-relogin-monitor.service.js';
 import { SubAgentMessageQueue } from '../messaging/sub-agent-message-queue.service.js';
 import { InFlightTurnTracker } from '../restart/in-flight-turn-tracker.service.js';
+import { FreshTaskConversationService } from './fresh-task-conversation.service.js';
 import { RestartDrainService } from '../restart/restart-drain.service.js';
 import { AgentSuspendService } from './agent-suspend.service.js';
 import { PromptBuilderService, buildModuleConfigFromTeamMember, memberSkillsJson, } from '../ai/prompt-builder.service.js';
@@ -348,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
@@ -370,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) {
@@ -3635,6 +3638,9 @@ Loop until done, blocked, or explicitly reassigned:
         let releaseMutex;
         const currentDelivery = new Promise((r) => { releaseMutex = r; });
         this.sessionDeliveryMutex.set(sessionName, currentDelivery);
+        // No fresh-conversation / context-cap `/clear` may start while this
+        // message is on its way in (it would be wiped before it is read).
+        const endFreshDelivery = this.beginFreshDelivery(sessionName);
         if (previousDelivery) {
             this.logger.info('Waiting for in-flight delivery to complete before sending', {
                 sessionName,
@@ -3643,6 +3649,8 @@ Loop until done, blocked, or explicitly reassigned:
             await previousDelivery.catch(() => { });
         }
         try {
+            // A clear that was already running when this started finishes first.
+            await this.waitIfFreshClearing(sessionName);
             if (!message || typeof message !== 'string') {
                 return {
                     success: false,
@@ -3693,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;
@@ -3783,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', {
@@ -3947,12 +3967,42 @@ Loop until done, blocked, or explicitly reassigned:
             };
         }
         finally {
+            endFreshDelivery();
             releaseMutex();
             if (this.sessionDeliveryMutex.get(sessionName) === currentDelivery) {
                 this.sessionDeliveryMutex.delete(sessionName);
             }
         }
     }
+    /**
+     * Mark a delivery to a session with the fresh-conversation service so no
+     * `/clear` starts during it. Never throws.
+     *
+     * @param sessionName - Session being written to
+     * @returns Function ending the mark
+     */
+    beginFreshDelivery(sessionName) {
+        try {
+            return FreshTaskConversationService.getInstance().beginDelivery(sessionName);
+        }
+        catch {
+            return () => undefined;
+        }
+    }
+    /**
+     * Wait (bounded) for a running fresh-conversation / context-cap clear of
+     * the session. Never throws.
+     *
+     * @param sessionName - Session about to be written to
+     */
+    async waitIfFreshClearing(sessionName) {
+        try {
+            await FreshTaskConversationService.getInstance().waitIfClearing(sessionName);
+        }
+        catch {
+            // Best-effort: delivery proceeds regardless.
+        }
+    }
     /**
      * Wait for an agent session to be at a ready prompt before sending messages.
      *