crewly 1.20.134 → 1.20.136

package/dist/backend/backend/src/services/agent/agent-registration.service.d.ts

@@ -1,6 +1,7 @@
 import { CrewlyAgentExternalRuntimeService } from './crewly-agent/crewly-agent-external-runtime.service.js';
 import { StorageService } from '../core/storage.service.js';
 import { CREWLY_CONSTANTS, RuntimeType } from '../../constants.js';
+import { type RegistrationFlowCancelReason } from './registration-flow-registry.js';
 export interface OrchestratorConfig {
     sessionName: string;
     projectPath: string;
@@ -55,7 +56,7 @@ export declare class AgentRegistrationService {
     private projectRoot;
     private promptCache;
     private sessionCreationLocks;
-    private registrationAbortControllers;
+    private registrationFlows;
     private stuckMessageDetectorTimer;
     private tuiSessionRegistry;
     private sentMessageTracker;
@@ -87,11 +88,43 @@ export declare class AgentRegistrationService {
     }): void;
     /**
      * Cancel a pending registration prompt for a session.
-     * Called by RuntimeExitMonitorService when a runtime exit is detected.
+     * Called by RuntimeExitMonitorService when a runtime exit is detected, and
+     * before every kill of the session's PTY.
      *
      * @param sessionName - The session whose registration to cancel
+     * @param reason - Why the flow is cancelled (defaults to a runtime exit)
      */
-    cancelPendingRegistration(sessionName: string): void;
+    cancelPendingRegistration(sessionName: string, reason?: RegistrationFlowCancelReason): void;
+    /**
+     * The PTY currently registered under a session name, used as the identity
+     * a registration flow is bound to. Undefined when there is none (or the
+     * session helper is not initialised yet).
+     *
+     * @param sessionName - Session name
+     * @returns The live session object, compared by reference
+     */
+    private currentPtySession;
+    /**
+     * Whether a registration flow must stop writing to its session: its
+     * signal was aborted, a newer flow took over, or the session's PTY was
+     * killed/replaced since the flow started. Checked before every send.
+     *
+     * @param sessionName - Session the flow writes to
+     * @param abortSignal - The flow's signal (undefined = unguarded caller)
+     * @returns True when the caller must not send anything
+     */
+    private isFlowCancelled;
+    /**
+     * Whether a session is already up or being brought up: a creation is in
+     * flight, a PTY exists under the name, or an in-process runtime runs it.
+     * The boot restore uses this to leave alone an agent another launcher
+     * (reconciler wake, team start) already started this boot, instead of
+     * killing it and resuming the same conversation a second time.
+     *
+     * @param sessionName - Session name
+     * @returns True when the session is live or launching
+     */
+    isSessionLiveOrLaunching(sessionName: string): Promise<boolean>;
     /**
      * Get or create the session helper with lazy initialization
      */
@@ -257,13 +290,16 @@ export declare class AgentRegistrationService {
      */
     private noteResumedLaunch;
     /**
-     * Kickoff text for a resumed (non-Claude) runtime: the backend restarted,
-     * so its registration is gone even though the conversation remembers
-     * doing it. Tell it plainly and hand it the command.
+     * Kickoff text for a resumed runtime conversation (any runtime): the
+     * backend restarted, so its registration is gone even though the
+     * conversation remembers doing it. Tell it plainly that this is the same
+     * conversation, hand it the exact register-self command its prompt uses
+     * (orchestrator skill for the orchestrator), and tell it to carry on.
      *
      * @param sessionName - The session
      * @param role - Its role
-     * @param promptFilePath - The init prompt, for a context refresh if needed
+     * @param promptFilePath - The init prompt, for a context refresh; omitted
+     *   for Claude Code, whose prompt is loaded as its agent definition
      * @returns The message to type into the runtime
      */
     private resumedKickoff;

package/dist/backend/backend/src/services/agent/agent-registration.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-registration.service.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/agent/agent-registration.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-registration.service.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/agent/agent-registration.service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,iCAAiC,EAAE,MAAM,yDAAyD,CAAC;AAK5G,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EACN,gBAAgB,EAMhB,WAAW,EAUX,MAAM,oBAAoB,CAAC;AAyD5B,OAAO,EAA4B,KAAK,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAkB9G,MAAM,WAAW,kBAAkB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,KAAK;aACnB,QAAQ,EAAE,OAAO;gBAAjB,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM;CAc/D;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,IAAI,MAAM,CAQzF;AAED;;;;;;;;;GASG;AACH;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED,qBAAa,wBAAwB;IACpC,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,cAAc,CAAqC;IAC3D,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,WAAW,CAAS;IAG5B,OAAO,CAAC,WAAW,CAA6B;IAGhD,OAAO,CAAC,oBAAoB,CAAgI;IAK5J,OAAO,CAAC,iBAAiB,CAA0C;IAGnE,OAAO,CAAC,yBAAyB,CAA+C;IAGhF,OAAO,CAAC,kBAAkB,CAAkC;IAI5D,OAAO,CAAC,kBAAkB,CAKpB;IAKN,OAAO,CAAC,oBAAoB,CAAoC;IAIhE,OAAO,CAAC,mBAAmB,CAAuD;IAIlF,OAAO,CAAC,iBAAiB,CAAwD;IAEjF,0EAA0E;IAC1E,OAAO,CAAC,gBAAgB,CAA+E;IAEvG,qFAAqF;IACrF,OAAO,CAAC,eAAe,CAAmK;IAK1L,OAAO,CAAC,MAAM,KAAK,wBAAwB,GAE1C;gBAGA,kBAAkB,EAAE,OAAO,EAAE,+CAA+C;IAC5E,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,cAAc,EAAE,cAAc;IAyB/B;;;;OAIG;IACH,mBAAmB,CAAC,SAAS,EAAE;QAAE,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;KAAE,GAAG,IAAI;IAIpG;;;;OAIG;IACH,kBAAkB,CAAC,QAAQ,EAAE;QAAE,SAAS,CAAC,KAAK,EAAE,OAAO,gCAAgC,EAAE,uBAAuB,GAAG,OAAO,gCAAgC,EAAE,iBAAiB,CAAA;KAAE,GAAG,IAAI;IAItL;;;;;;;OAOG;IACH,yBAAyB,CACxB,WAAW,EAAE,MAAM,EACnB,MAAM,GAAE,4BAA+C,GACrD,IAAI;IAMP;;;;;;;OAOG;IACH,OAAO,CAAC,iBAAiB;IASzB;;;;;;;;OAQG;IACH,OAAO,CAAC,eAAe;IAQvB;;;;;;;;;OASG;IACG,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUrE;;OAEG;YACW,gBAAgB;IA2B9B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAW5B;;;;;;;;;OASG;YACW,yBAAyB;IA+BvC;;;;;;;;;;OAUG;IACH,OAAO,CAAC,4BAA4B;IAsDpC;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,OAAO,CAAC,6BAA6B;IA0KrC;;OAEG;IACH,OAAO,CAAC,eAAe;IAwBvB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,iBAAiB;IAUzB;;;;;;;;;OASG;YACW,mBAAmB;IA2DjC;;;;;;OAMG;YACW,iBAAiB;IAgB/B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;;;;;OAMG;IACH,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,iCAAiC,GAAG,SAAS;IAIvF;;;;;;;;OAQG;IACH,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO;IAKtD;;;;;;;;;;OAUG;YACW,mBAAmB;IA0DjC;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,6BAA6B;IA+CrC;;;;;;;;;;OAUG;IACH;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IAKzB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,+BAA+B;IAoCvC;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAIxB;;;;;;OAMG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;YACW,qBAAqB;IAkBnC;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAOrC;IAEH;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAgB;IAEzD,sEAAsE;IACtE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAExD;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6B;IAC7D,8FAA8F;IAC9F,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAuD;IAExF;;;;;;;;;;OAUG;YACW,0BAA0B;IAqCxC;;;OAGG;YACW,oBAAoB;IAuBlC;;;OAGG;IACG,+BAA+B,CACpC,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,MAAM,EACpB,OAAO,GAAE,MAAoD,EAC7D,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,GAAE,WAAuC,EACpD,YAAY,CAAC,EAAE,MAAM,EAAE,EACvB,wBAAwB,CAAC,EAAE,MAAM,EAAE,GACjC,OAAO,CAAC;QACV,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,gEAAgE;QAChE,SAAS,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IAqGF;;;OAGG;YACW,qBAAqB;IA8CnC;;;OAGG;YACW,mBAAmB;IAqJjC;;;;;;;;;;;OAWG;YACW,uBAAuB;IAmDrC;;;;;;;;;;;;;OAaG;YACW,0BAA0B;IA6DxC;;;;OAIG;YACW,2BAA2B;IA8DzC;;;;;;;;;;;;;OAaG;YACW,wBAAwB;IA0DtC;;;;;;;OAOG;IACH,OAAO,CAAC,0BAA0B;IAMlC;;;;;;;;;;;OAWG;YACW,uBAAuB;IAiDrC;;;OAGG;YACW,iBAAiB;IAkP/B;;;;;;;;;OASG;YACW,oBAAoB;IA0DlC;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,0BAA0B;IAqDlC;;OAEG;IACH;;;;;;;OAOG;YACW,uBAAuB;YASvB,sBAAsB;IAsapC;;;;;;;;;;;OAWG;YACW,eAAe;IAsC7B;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;OAEG;YACW,mBAAmB;IA8BjC;;OAEG;YACW,sBAAsB;IAiCpC;;;;OAIG;YACW,mCAAmC;IAgJjD;;OAEG;YACW,uBAAuB;IA8BrC;;;;;;;;;OASG;IACG,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IA8B/C;;OAEG;YACW,yBAAyB;IAyBvC;;;;;;;;;;;;;;;;;;;OAmBG;IACH,OAAO,CAAC,qBAAqB;IAY7B;;;;;;;;;;;;;;;;;;OAkBG;YACW,iBAAiB;IAmB/B;;;;OAIG;IACG,kBAAkB,CAAC,MAAM,EAAE;QAChC,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB;;;;WAIG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;WAKG;QACH,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;KACpC,GAAG,OAAO,CAAC;QACX,OAAO,EAAE,OAAO,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,gEAAgE;QAChE,SAAS,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IA8DF;;;;OAIG;YACW,uBAAuB;IAonBrC;;;;;OAKG;IACG,qBAAqB,CAC1B,WAAW,EAAE,MAAM,EACnB,IAAI,GAAE,MAAkB,GACtB,OAAO,CAAC;QACV,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IA0FF;;;;;;;OAOG;YACW,mBAAmB;IAYjC;;;;;;;;;;;;;;;;;;;;;OAqBG;IACG,kBAAkB,CACvB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,WAAW,GACvB,OAAO,CAAC;QACV,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC;IAqVF;;;;;;;;;;;OAWG;IACG,iBAAiB,CACtB,WAAW,EAAE,MAAM,EACnB,SAAS,GAAE,MAAqD,EAChE,WAAW,CAAC,EAAE,WAAW,GACvB,OAAO,CAAC,OAAO,CAAC;IAmHnB;;;;;;;;;OASG;YACW,oBAAoB;IA0zBlC;;;;;;;;;;OAUG;YACW,sBAAsB;IAmDpC;;;;;;;;;;;;;;;;OAgBG;IACH,OAAO,CAAC,sBAAsB;IAyD9B;;;;;;;OAOG;YACW,sBAAsB;IA2BpC;;;;;;;;;;OAUG;IACH,yBAAyB,IAAI,IAAI;IAsBjC;;OAEG;IACH,wBAAwB,IAAI,IAAI;IAQhC;;;;;;;;OAQG;YACW,oBAAoB;IAqKlC;;;;;OAKG;IACH,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAK/C;;;;;;;OAOG;IACH,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI;IAuB5D;;;;;;;;OAQG;IACH;;;;;;;;;;;;;;;OAeG;YACW,qBAAqB;IAiBnC,OAAO,CAAC,gBAAgB;IAkDxB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,mBAAmB;IA0B3B;;;;;;;;;OASG;YACW,qBAAqB;IA+BnC;;;;;OAKG;IACG,cAAc,CACnB,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,GACT,OAAO,CAAC;QACV,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IAyCF;;;;;;OAMG;IACG,gBAAgB,CACrB,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,MAAM,EACb,OAAO,GAAE,MAAa,GACpB,OAAO,CAAC;QACV,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,CAAC,EAAE;YACN,KAAK,EAAE;gBACN,WAAW,EAAE,MAAM,CAAC;gBACpB,IAAI,CAAC,EAAE,MAAM,CAAC;gBACd,OAAO,EAAE,OAAO,CAAC;gBACjB,MAAM,EAAE,CAAC,OAAO,gBAAgB,CAAC,cAAc,CAAC,CAAC,MAAM,OAAO,gBAAgB,CAAC,cAAc,CAAC,CAAC;aAC/F,CAAC;YACF,SAAS,EAAE,MAAM,CAAC;SAClB,CAAC;QACF,KAAK,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IAuCF;;;;;;;;;;;;;OAaG;YACW,kBAAkB;IAkMhC;;;;;;;;;OASG;IACG,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,SAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAW3E"}

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

@@ -35,6 +35,8 @@ import { synthesizeSlackConversationId } from '../chat-v2/legacy-dto.utils.js';
 import { isRuntimeStartupBlockedError } from './runtime-startup-blocked.error.js';
 import { buildHandoverSummary, claudeTranscriptPath, conversationExists, lastTurnContextTokens, orcFreshContextTokens, planRuntimeSessionFlags, waitForCodexSessionId, } from './runtime-session-recovery.js';
 import { getLocalApiBaseUrl } from '../../utils/local-api-url.utils.js';
+import { RegistrationFlowRegistry } from './registration-flow-registry.js';
+import { buildResumedKickoff } from './resumed-kickoff.js';
 /**
  * Whether a file exists (readable).
  *
@@ -122,8 +124,10 @@ export class AgentRegistrationService {
     promptCache = new Map();
     // Session creation locks to prevent concurrent createAgentSession calls for the same session
     sessionCreationLocks = new Map();
-    // AbortControllers for pending registration prompts (keyed by session name)
-    registrationAbortControllers = new Map();
+    // The one live registration/kickoff flow per session, bound to the PTY it
+    // was started for. An orphaned flow (its PTY killed and replaced under the
+    // same name) must never type into the replacement (2026-09-25).
+    registrationFlows = new RegistrationFlowRegistry();
     // Background stuck-message detector timer
     stuckMessageDetectorTimer = null;
     // Track TUI sessions for the stuck-message detector (sessionName → runtimeType)
@@ -187,16 +191,70 @@ export class AgentRegistrationService {
     }
     /**
      * Cancel a pending registration prompt for a session.
-     * Called by RuntimeExitMonitorService when a runtime exit is detected.
+     * Called by RuntimeExitMonitorService when a runtime exit is detected, and
+     * before every kill of the session's PTY.
      *
      * @param sessionName - The session whose registration to cancel
+     * @param reason - Why the flow is cancelled (defaults to a runtime exit)
      */
-    cancelPendingRegistration(sessionName) {
-        const controller = this.registrationAbortControllers.get(sessionName);
-        if (controller) {
-            controller.abort();
-            this.registrationAbortControllers.delete(sessionName);
-            this.logger.info('Cancelled pending registration', { sessionName });
+    cancelPendingRegistration(sessionName, reason = 'runtime-exited') {
+        if (this.registrationFlows.cancel(sessionName, reason)) {
+            this.logger.info('Cancelled pending registration', { sessionName, reason });
+        }
+    }
+    /**
+     * The PTY currently registered under a session name, used as the identity
+     * a registration flow is bound to. Undefined when there is none (or the
+     * session helper is not initialised yet).
+     *
+     * @param sessionName - Session name
+     * @returns The live session object, compared by reference
+     */
+    currentPtySession(sessionName) {
+        try {
+            const helper = this._sessionHelper;
+            return typeof helper?.getSession === 'function' ? helper.getSession(sessionName) ?? undefined : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    /**
+     * Whether a registration flow must stop writing to its session: its
+     * signal was aborted, a newer flow took over, or the session's PTY was
+     * killed/replaced since the flow started. Checked before every send.
+     *
+     * @param sessionName - Session the flow writes to
+     * @param abortSignal - The flow's signal (undefined = unguarded caller)
+     * @returns True when the caller must not send anything
+     */
+    isFlowCancelled(sessionName, abortSignal) {
+        const cancelled = this.registrationFlows.isCancelled(abortSignal, this.currentPtySession(sessionName));
+        if (cancelled && abortSignal && abortSignal.reason === 'session-replaced') {
+            this.logger.info('Registration flow orphaned — its PTY was replaced; sending nothing', { sessionName });
+        }
+        return cancelled;
+    }
+    /**
+     * Whether a session is already up or being brought up: a creation is in
+     * flight, a PTY exists under the name, or an in-process runtime runs it.
+     * The boot restore uses this to leave alone an agent another launcher
+     * (reconciler wake, team start) already started this boot, instead of
+     * killing it and resuming the same conversation a second time.
+     *
+     * @param sessionName - Session name
+     * @returns True when the session is live or launching
+     */
+    async isSessionLiveOrLaunching(sessionName) {
+        if (this.sessionCreationLocks.has(sessionName))
+            return true;
+        if (this.inProcessRuntimes.has(sessionName))
+            return true;
+        try {
+            return (await this.getSessionHelper()).sessionExists(sessionName);
+        }
+        catch {
+            return false;
         }
     }
     /**
@@ -818,21 +876,20 @@ export class AgentRegistrationService {
             this.resumedSessions.delete(sessionName);
     }
     /**
-     * Kickoff text for a resumed (non-Claude) runtime: the backend restarted,
-     * so its registration is gone even though the conversation remembers
-     * doing it. Tell it plainly and hand it the command.
+     * Kickoff text for a resumed runtime conversation (any runtime): the
+     * backend restarted, so its registration is gone even though the
+     * conversation remembers doing it. Tell it plainly that this is the same
+     * conversation, hand it the exact register-self command its prompt uses
+     * (orchestrator skill for the orchestrator), and tell it to carry on.
      *
      * @param sessionName - The session
      * @param role - Its role
-     * @param promptFilePath - The init prompt, for a context refresh if needed
+     * @param promptFilePath - The init prompt, for a context refresh; omitted
+     *   for Claude Code, whose prompt is loaded as its agent definition
      * @returns The message to type into the runtime
      */
     resumedKickoff(sessionName, role, promptFilePath) {
-        const skillsPath = path.join(this.projectRoot, 'config', 'skills', 'agent');
-        return (`Crewly restarted and your registration was reset (you are "${sessionName}", role ${role}). ` +
-            `Even if you registered earlier in this conversation, run this now: ` +
-            `bash ${skillsPath}/core/register-self/execute.sh '{"sessionName":"${sessionName}","role":"${role}"}' ` +
-            `— then re-read ${promptFilePath} only if you have lost your context, and continue where you left off.`);
+        return buildResumedKickoff({ projectRoot: this.projectRoot, sessionName, role, promptFilePath });
     }
     recordRuntimeSessionAfterLaunch(sessionName, runtimeType, cwd, launchedAtMs, plan) {
         if (runtimeType !== RUNTIME_TYPES.CODEX_CLI || plan.resumeSessionId || !cwd)
@@ -1393,12 +1450,18 @@ export class AgentRegistrationService {
      * runtime exits before registration completes.
      */
     async sendRegistrationPromptAsync(sessionName, role, memberId, runtimeType = RUNTIME_TYPES.CLAUDE_CODE) {
-        // Create AbortController for this registration
-        const controller = new AbortController();
-        this.registrationAbortControllers.set(sessionName, controller);
+        // One live flow per session, bound to the PTY that exists right now
+        // (the helper is initialised: the caller just created the PTY with it).
+        // Starting it aborts any older flow for the same name.
+        const { flow, superseded } = this.registrationFlows.begin(sessionName, this.currentPtySession(sessionName));
+        if (superseded) {
+            this.logger.info('Superseded an older registration flow for this session', { sessionName, generation: flow.generation });
+        }
+        const signal = flow.signal;
+        const cancelled = () => this.isFlowCancelled(sessionName, signal);
         try {
             this.logger.info('Loading registration prompt', { sessionName, role, runtimeType });
-            if (controller.signal.aborted)
+            if (cancelled())
                 return;
             const prompt = await this.loadRegistrationPrompt(role, sessionName, memberId, runtimeType);
             this.logger.info('Registration prompt loaded, sending to agent', {
@@ -1409,12 +1472,12 @@ export class AgentRegistrationService {
             // while the TUI is still booting — with Codex the instruction landed
             // ~2 s after spawn, during `model: loading`, and was swallowed while
             // every log line still said "sent successfully" (server-install finding 3).
-            if (controller.signal.aborted)
+            if (cancelled())
                 return;
-            await this.waitForRuntimeInputReady(sessionName, runtimeType, controller.signal);
-            if (controller.signal.aborted)
+            await this.waitForRuntimeInputReady(sessionName, runtimeType, signal);
+            if (cancelled())
                 return;
-            const sent = await this.sendPromptRobustly(sessionName, prompt, runtimeType, controller.signal);
+            const sent = await this.sendPromptRobustly(sessionName, prompt, runtimeType, signal);
             if (sent) {
                 this.logger.info('Registration prompt sent successfully', { sessionName, role });
             }
@@ -1424,11 +1487,11 @@ export class AgentRegistrationService {
             // Make a silent non-registration loud, and re-deliver once. Previously a
             // swallowed instruction left the agent at `started` / readyAt null forever
             // with no log line saying so.
-            await this.redeliverIfUnregistered(sessionName, role, prompt, runtimeType, controller.signal);
+            await this.redeliverIfUnregistered(sessionName, role, prompt, runtimeType, signal);
         }
         catch (error) {
-            if (controller.signal.aborted) {
-                this.logger.info('Registration prompt cancelled (runtime exited)', { sessionName });
+            if (cancelled()) {
+                this.logger.info('Registration prompt cancelled', { sessionName, reason: String(signal.reason) });
                 return;
             }
             this.logger.warn('Failed to send registration prompt asynchronously', {
@@ -1438,7 +1501,7 @@ export class AgentRegistrationService {
             });
         }
         finally {
-            this.registrationAbortControllers.delete(sessionName);
+            this.registrationFlows.end(flow);
         }
     }
     /**
@@ -1465,7 +1528,7 @@ export class AgentRegistrationService {
         const pollMs = this.testAwareInterval(REGISTRATION_DELIVERY_CONSTANTS.RUNTIME_INPUT_READY_POLL_MS);
         const startedAt = Date.now();
         let polls = 0;
-        while (!abortSignal?.aborted) {
+        while (!this.isFlowCancelled(sessionName, abortSignal)) {
             let screen = '';
             try {
                 screen = sessionHelper.capturePane(sessionName);
@@ -1535,7 +1598,7 @@ export class AgentRegistrationService {
         for (let redelivery = 0; redelivery <= REGISTRATION_DELIVERY_CONSTANTS.MAX_REDELIVERIES; redelivery++) {
             const startedAt = Date.now();
             while (Date.now() - startedAt < timeout) {
-                if (abortSignal.aborted)
+                if (this.isFlowCancelled(sessionName, abortSignal))
                     return;
                 if (await this.checkAgentRegistration(sessionName, role)) {
                     this.logger.info('Agent registration confirmed after prompt delivery', {
@@ -1545,7 +1608,7 @@ export class AgentRegistrationService {
                 }
                 await delay(checkInterval);
             }
-            if (abortSignal.aborted)
+            if (this.isFlowCancelled(sessionName, abortSignal))
                 return;
             if (redelivery >= REGISTRATION_DELIVERY_CONSTANTS.MAX_REDELIVERIES) {
                 this.logger.error('Agent never registered after registration prompt delivery', {
@@ -1563,7 +1626,7 @@ export class AgentRegistrationService {
                 sessionName, role, runtimeType, timeoutMs: timeout,
             });
             await this.waitForRuntimeInputReady(sessionName, runtimeType, abortSignal);
-            if (abortSignal.aborted)
+            if (this.isFlowCancelled(sessionName, abortSignal))
                 return;
             const resent = await this.sendPromptRobustly(sessionName, prompt, runtimeType, abortSignal);
             this.logger.info('registration re-delivered', { sessionName, role, runtimeType, resent });
@@ -1578,6 +1641,7 @@ export class AgentRegistrationService {
         // for the old incarnation must not outlive it, or it false-declares the
         // replacement PTY dead before startMonitoring() below replaces it.
         RuntimeExitMonitorService.getInstance().stopMonitoring(sessionName);
+        this.cancelPendingRegistration(sessionName, 'session-killed');
         await (await this.getSessionHelper()).killSession(sessionName);
         // Wait for cleanup
         await delay(1000);
@@ -2716,10 +2780,12 @@ Loop until done, blocked, or explicitly reassigned:
                 error,
             };
         }
-        // If another creation is in progress for this session, wait for it
+        // Single-flight per session name. A second caller while a creation is
+        // in flight joins it (same result, one PTY, one kickoff flow) — team
+        // start, reconciler wake and activateAgentBySession all land here.
         const existingLock = this.sessionCreationLocks.get(config.sessionName);
-        if (existingLock) {
-            this.logger.info('Waiting for existing session creation to complete', { sessionName: config.sessionName });
+        if (existingLock && !config.forceRecreate) {
+            this.logger.info('Joining in-flight session creation (single-flight)', { sessionName: config.sessionName });
             try {
                 return await existingLock;
             }
@@ -2728,8 +2794,18 @@ Loop until done, blocked, or explicitly reassigned:
                 this.logger.info('Previous session creation failed, proceeding with new attempt', { sessionName: config.sessionName });
             }
         }
-        // Create and store the lock promise
-        const creationPromise = this._createAgentSessionImpl(config);
+        // forceRecreate does not join: it waits for the in-flight creation to
+        // settle, then kills that session (aborting its registration flow) and
+        // builds its own. Chaining through the lock — set synchronously below —
+        // keeps it single-flight: later callers join the forceRecreate run, and
+        // two creations for one name never run at the same time.
+        const predecessor = existingLock && config.forceRecreate ? existingLock : undefined;
+        if (predecessor) {
+            this.logger.info('forceRecreate queued behind in-flight session creation', { sessionName: config.sessionName });
+        }
+        const creationPromise = predecessor
+            ? predecessor.catch(() => undefined).then(() => this._createAgentSessionImpl(config))
+            : this._createAgentSessionImpl(config);
         this.sessionCreationLocks.set(config.sessionName, creationPromise);
         try {
             const result = await creationPromise;
@@ -2867,6 +2943,11 @@ Loop until done, blocked, or explicitly reassigned:
                     // judges the seconds-old replacement PTY (no runtime child yet)
                     // dead and force-kills it — Step 1 then fails and Step 2 runs.
                     RuntimeExitMonitorService.getInstance().stopMonitoring(sessionName);
+                    // The killed incarnation's registration flow must die with it:
+                    // stopMonitoring above means no exit callback will cancel it, and
+                    // left alive it would find the replacement PTY by name and type
+                    // a second kickoff into it (2026-09-25 startup-prompt loop).
+                    this.cancelPendingRegistration(sessionName, 'session-killed');
                     const runtimeService = this.createRuntimeService(runtimeType);
                     runtimeService.clearDetectionCache(sessionName);
                     await (await this.getSessionHelper()).killSession(sessionName);
@@ -2880,6 +2961,20 @@ Loop until done, blocked, or explicitly reassigned:
                 }
             }
             else {
+                // A registration flow for this session is still running (e.g. the
+                // boot restore is waiting for the resumed runtime): it will deliver
+                // the kickoff. Sending a second one from here gave Sam two
+                // "Crewly restarted" messages 80 s apart (2026-09-25, 1.20.135).
+                if (this.registrationFlows.has(sessionName)) {
+                    this.logger.info('Session is already registering — joining the running flow, no second kickoff', {
+                        sessionName,
+                    });
+                    return {
+                        success: true,
+                        sessionName,
+                        message: 'Agent session is already starting; registration in progress',
+                    };
+                }
                 this.logger.info('Session already exists, attempting intelligent recovery instead of killing', {
                     sessionName,
                 });
@@ -2969,6 +3064,7 @@ Loop until done, blocked, or explicitly reassigned:
                 this.logger.warn('All recovery attempts failed, falling back to session recreation', {
                     sessionName,
                 });
+                this.cancelPendingRegistration(sessionName, 'session-killed');
                 await (await this.getSessionHelper()).killSession(sessionName);
                 await delay(1000); // Wait for cleanup
             }
@@ -3232,6 +3328,9 @@ Loop until done, blocked, or explicitly reassigned:
             this.logger.info('Terminating agent session (unified approach)', { sessionName, role });
             // Stop runtime exit monitoring before killing the session
             RuntimeExitMonitorService.getInstance().stopMonitoring(sessionName);
+            // ...and with it the session's pending registration flow, which no
+            // exit callback will cancel now.
+            this.cancelPendingRegistration(sessionName, 'session-killed');
             // Stop OAuth relogin monitoring before killing the session
             OAuthReloginMonitorService.getInstance().stopMonitoring(sessionName);
             // Stop context window monitoring before killing the session
@@ -5218,13 +5317,19 @@ Loop until done, blocked, or explicitly reassigned:
         const handover = this.pendingHandovers.get(sessionName);
         if (handover)
             this.pendingHandovers.delete(sessionName);
-        const messageToSend = isClaudeCode
-            ? 'Begin your work now. Follow the step-by-step instructions in your agent definition EXACTLY — start with Step 1, then Step 2, then Step 3 (register-self). Do NOT skip or reorder steps. Registration is required before the system will deliver messages to you.' +
-                (handover
-                    ? ` This is a fresh conversation: your previous one had grown to ${handover.tokens} tokens and was closed. After registering, read ${handover.path} once — it holds the end of what was said before.`
-                    : '')
-            : resumedRole
-                ? this.resumedKickoff(sessionName, resumedRole, promptFilePath)
+        // A resumed conversation (Claude `--resume`, Codex `resume`) already went
+        // through its startup steps; the full kickoff would read as a restart
+        // from scratch (2026-09-25). It gets the short "register again, then
+        // carry on" message instead — for every runtime. A genuinely fresh
+        // conversation (new session, or the orc handover case, which is never
+        // marked resumed) keeps the full kickoff.
+        const messageToSend = resumedRole
+            ? this.resumedKickoff(sessionName, resumedRole, isClaudeCode ? undefined : promptFilePath)
+            : isClaudeCode
+                ? 'Begin your work now. Follow the step-by-step instructions in your agent definition EXACTLY — start with Step 1, then Step 2, then Step 3 (register-self). Do NOT skip or reorder steps. Registration is required before the system will deliver messages to you.' +
+                    (handover
+                        ? ` This is a fresh conversation: your previous one had grown to ${handover.tokens} tokens and was closed. After registering, read ${handover.path} once — it holds the end of what was said before.`
+                        : '')
                 : `Read the file at ${promptFilePath} and follow all instructions in it.`;
         // Note: kickoff message is intentionally imperative for reliable agent bootstrapping.
         // The --agent flag (Claude Code) loads the prompt as trusted system context, so this
@@ -5241,7 +5346,7 @@ Loop until done, blocked, or explicitly reassigned:
         const maxAttempts = 1;
         for (let attempt = 1; attempt <= maxAttempts; attempt++) {
             // Check abort before each attempt
-            if (abortSignal?.aborted) {
+            if (this.isFlowCancelled(sessionName, abortSignal)) {
                 this.logger.info('Prompt delivery aborted (runtime exited)', { sessionName, attempt });
                 return false;
             }
@@ -5254,7 +5359,7 @@ Loop until done, blocked, or explicitly reassigned:
                     deliveryMethod: isClaudeCode ? 'system-prompt-kickoff' : 'file-read',
                 });
                 // Check abort before sending to terminal
-                if (abortSignal?.aborted) {
+                if (this.isFlowCancelled(sessionName, abortSignal)) {
                     this.logger.info('Prompt delivery aborted before send (runtime exited)', { sessionName });
                     return false;
                 }
@@ -5285,7 +5390,7 @@ Loop until done, blocked, or explicitly reassigned:
                     }
                 }
                 // Check abort right before writing instruction to terminal
-                if (abortSignal?.aborted) {
+                if (this.isFlowCancelled(sessionName, abortSignal)) {
                     this.logger.info('Prompt delivery aborted before instruction send (runtime exited)', { sessionName });
                     return false;
                 }
@@ -5299,7 +5404,7 @@ Loop until done, blocked, or explicitly reassigned:
                 if (isClaudeCode) {
                     for (let i = 0; i < 24; i++) {
                         await delay(1000);
-                        if (abortSignal?.aborted)
+                        if (this.isFlowCancelled(sessionName, abortSignal))
                             return false;
                         const currentOutput = sessionHelper.capturePane(sessionName);
                         // Processing indicators (spinners) = definitive success
@@ -5324,10 +5429,12 @@ Loop until done, blocked, or explicitly reassigned:
                     // can be dropped). A missing agent costs far more than a duplicate kickoff
                     // (idempotent: it just re-reads the prompt file), so resend ONCE and re-poll.
                     this.logger.warn('Kickoff unconfirmed after 24s — resending once', { sessionName, runtimeType });
+                    if (this.isFlowCancelled(sessionName, abortSignal))
+                        return false;
                     await sessionHelper.sendMessage(sessionName, messageToSend);
                     for (let j = 0; j < 12; j++) {
                         await delay(1000);
-                        if (abortSignal?.aborted)
+                        if (this.isFlowCancelled(sessionName, abortSignal))
                             return false;
                         const out2 = sessionHelper.capturePane(sessionName);
                         if (containsSpinnerOrWorkingIndicator(out2) || !this.isClaudeAtPrompt(out2, RUNTIME_TYPES.CLAUDE_CODE)) {