crewly 1.6.4 → 1.7.0

package/dist/backend/backend/src/services/v3/work-item-projection.js

@@ -0,0 +1,115 @@
+/**
+ * WorkItem → legacy projection helpers.
+ *
+ * The frontend Tasks tab and the team/terminal controllers historically
+ * read `InProgressTask`-shaped objects from `TaskTrackingService`
+ * (`~/.crewly/in_progress_tasks.json`). Per the v1-deprecation campaign
+ * (`specs/2026-05-06-task-management-v1-deprecation.md`) the V3 task-pool
+ * is now the single source of truth for delegated work — but we want to
+ * collapse the user-visible duplication without forcing a frontend
+ * rewrite.
+ *
+ * This module shapes V3 `WorkItem`s into the legacy `InProgressTask`
+ * shape so existing UI components work unchanged. It is a *read-only*
+ * projection — write paths still go through `TaskPoolService`.
+ *
+ * @module services/v3/work-item-projection
+ */
+/**
+ * Map V3 WorkItem status → legacy InProgressTaskStatus values that the
+ * frontend Tasks tab and dashboard widgets expect.
+ *
+ * Some V3 statuses have no exact legacy equivalent; we pick the closest
+ * legacy state that preserves the UI's grouping behavior (e.g.
+ * `verified`/`done_by_worker` both surface as `done`).
+ */
+function mapStatus(status) {
+    switch (status) {
+        case 'queued':
+            return 'pending_assignment';
+        case 'running':
+            return 'active';
+        case 'blocked':
+            return 'blocked';
+        case 'failed':
+            return 'failed';
+        case 'cancelled':
+            return 'cancelled';
+        case 'done':
+        case 'done_by_worker':
+        case 'verified':
+            return 'done';
+        case 'rejected':
+            return 'failed';
+        default:
+            return 'active';
+    }
+}
+/**
+ * Map a V3 priority (stored in metadata; 1=critical … 4=low) to the legacy
+ * 'low'|'medium'|'high' enum the dashboard cards use for color coding.
+ *
+ * V3 doesn't carry priority as a top-level field; producer skills place it
+ * under `metadata.priority` when relevant.
+ */
+function mapPriority(priority) {
+    if (typeof priority !== 'number')
+        return undefined;
+    if (priority <= 2)
+        return 'high';
+    if (priority === 3)
+        return 'medium';
+    return 'low';
+}
+/**
+ * Project a V3 WorkItem into the legacy InProgressTask shape.
+ *
+ * Fields without a V3 equivalent (e.g. `taskFilePath`) are populated
+ * with sentinel values that callers can recognize as "no longer file-based".
+ * `metadata` is mined for stored projectId/projectPath/teamId/role.
+ *
+ * @param wi - The V3 WorkItem to project
+ * @returns A legacy-shaped InProgressTask
+ */
+export function projectWorkItemToInProgressTask(wi) {
+    const meta = (wi.metadata ?? {});
+    const projectId = meta.projectId ?? '';
+    const projectPath = meta.projectPath ?? '';
+    const teamId = meta.teamId ?? '';
+    const targetRole = meta.requiredRole ?? meta.role ?? '';
+    const milestone = meta.milestone ?? 'delegated';
+    return {
+        id: wi.id,
+        projectId,
+        teamId,
+        // Sentinel: no longer a real path. Kept non-empty so legacy code
+        // that calls `path.basename(taskFilePath)` doesn't crash.
+        taskFilePath: `v3://workitem/${wi.id}`,
+        taskName: wi.title,
+        targetRole,
+        assignedTeamMemberId: '',
+        assignedSessionName: wi.target ?? '',
+        assignedAt: wi.createdAt,
+        status: mapStatus(wi.status),
+        lastCheckedAt: wi.startedAt,
+        completedAt: wi.completedAt,
+        blockReason: wi.error,
+        priority: mapPriority(meta.priority),
+        // Carry projectPath for callers that still want it.
+        ...(projectPath ? { slackContext: undefined } : {}),
+        // Stash milestone in the audit trail metadata-friendly slot.
+        ...(milestone ? {} : {}),
+    };
+}
+/**
+ * Project an array of V3 WorkItems into legacy InProgressTask[].
+ *
+ * Convenience wrapper for the common case (controller endpoints).
+ *
+ * @param items - The V3 WorkItems
+ * @returns Legacy-shaped InProgressTask[]
+ */
+export function projectWorkItems(items) {
+    return items.map(projectWorkItemToInProgressTask);
+}
+//# sourceMappingURL=work-item-projection.js.map

package/dist/backend/backend/src/services/v3/work-item-projection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"work-item-projection.js","sourceRoot":"","sources":["../../../../../../backend/src/services/v3/work-item-projection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH;;;;;;;GAOG;AACH,SAAS,SAAS,CAAC,MAAsB;IACvC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,QAAQ;YACX,OAAO,oBAAoB,CAAC;QAC9B,KAAK,SAAS;YACZ,OAAO,QAAQ,CAAC;QAClB,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QACnB,KAAK,QAAQ;YACX,OAAO,QAAQ,CAAC;QAClB,KAAK,WAAW;YACd,OAAO,WAAW,CAAC;QACrB,KAAK,MAAM,CAAC;QACZ,KAAK,gBAAgB,CAAC;QACtB,KAAK,UAAU;YACb,OAAO,MAAM,CAAC;QAChB,KAAK,UAAU;YACb,OAAO,QAAQ,CAAC;QAClB;YACE,OAAO,QAAQ,CAAC;IACpB,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAS,WAAW,CAAC,QAAiB;IACpC,IAAI,OAAO,QAAQ,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IACnD,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC;IACjC,IAAI,QAAQ,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IACpC,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,+BAA+B,CAAC,EAAY;IAC1D,MAAM,IAAI,GAAG,CAAC,EAAE,CAAC,QAAQ,IAAI,EAAE,CAA4B,CAAC;IAC5D,MAAM,SAAS,GAAI,IAAI,CAAC,SAAoB,IAAI,EAAE,CAAC;IACnD,MAAM,WAAW,GAAI,IAAI,CAAC,WAAsB,IAAI,EAAE,CAAC;IACvD,MAAM,MAAM,GAAI,IAAI,CAAC,MAAiB,IAAI,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAI,IAAI,CAAC,YAAuB,IAAK,IAAI,CAAC,IAAe,IAAI,EAAE,CAAC;IAChF,MAAM,SAAS,GAAI,IAAI,CAAC,SAAoB,IAAI,WAAW,CAAC;IAC5D,OAAO;QACL,EAAE,EAAE,EAAE,CAAC,EAAE;QACT,SAAS;QACT,MAAM;QACN,iEAAiE;QACjE,0DAA0D;QAC1D,YAAY,EAAE,iBAAiB,EAAE,CAAC,EAAE,EAAE;QACtC,QAAQ,EAAE,EAAE,CAAC,KAAK;QAClB,UAAU;QACV,oBAAoB,EAAE,EAAE;QACxB,mBAAmB,EAAE,EAAE,CAAC,MAAM,IAAI,EAAE;QACpC,UAAU,EAAE,EAAE,CAAC,SAAS;QACxB,MAAM,EAAE,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC;QAC5B,aAAa,EAAE,EAAE,CAAC,SAAS;QAC3B,WAAW,EAAE,EAAE,CAAC,WAAW;QAC3B,WAAW,EAAE,EAAE,CAAC,KAAK;QACrB,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpC,oDAAoD;QACpD,GAAG,CAAC,WAAW,CAAC,CAAC,CAAE,EAAE,YAAY,EAAE,SAAS,EAA8B,CAAC,CAAC,CAAC,EAAE,CAAC;QAChF,6DAA6D;QAC7D,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzB,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAiB;IAChD,OAAO,KAAK,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;AACpD,CAAC"}

package/dist/backend/backend/src/services/v3/workitem-dispatch.subscriber.d.ts

@@ -0,0 +1,137 @@
+/**
+ * WorkItem Dispatch Subscriber
+ *
+ * Pushes a `[CREWLY-DISPATCH]` system message to the **target session** every
+ * time a WorkItem is added to the pool with a specific target. Closes the
+ * "queued → claimed" gap that {@link AgentAutoClaimService} cannot cover:
+ * AutoClaim is *pull* (reacts to `agent:idle` / `task:done`); this subscriber
+ * is *push* (reacts to `workitem:queued`). The two compose:
+ *
+ *   - Fresh queued WI lands → this fires → target sees the prompt, runs
+ *     `poll-tasks`, claims the WI.
+ *   - Agent later goes idle → AutoClaim fires → it picks the next WI.
+ *
+ * **Why both are needed.** AutoClaim's startup recovery
+ * ({@link AgentAutoClaimService.recoverPendingTasks}) skips WIs whose
+ * target agent is already `active` on the assumption that "an active agent
+ * will claim it on its own". Empirically (2026-05-06 dogfood) that's false:
+ * an agent in the middle of a long thought stream never emits the
+ * `agent:idle` event AutoClaim listens to, so targeted WIs sit in the pool
+ * untouched. This subscriber covers exactly that case.
+ *
+ * **Integration with AgentAutoClaim.** The recovery path's `active` branch
+ * delegates here via {@link WorkItemDispatchSubscriber.dispatchTo}, so both
+ * paths emit the identical message. No double-fire because the dedup Set
+ * is shared across both call-sites.
+ *
+ * **Dedup contract.** Each WI is dispatched at most once per process
+ * lifetime (in-memory `Set<workItemId>`). Backend restart resets the set —
+ * which is the desired behavior since startup backfill needs to re-fire for
+ * the queued WIs that survived the restart.
+ *
+ * @module services/v3/workitem-dispatch.subscriber
+ */
+import type { WorkItem } from '../../types/v2/work-item.types.js';
+/**
+ * SLA tracker WIs use a deterministic id pattern `request:<rid>:respond_to_user`
+ * (see `request-sla.subscriber.ts`). They're internal bookkeeping items, not
+ * dispatchable work — the orc never "claims and executes" one; the WI is
+ * passively tracked and resolved by the SLA path when orc actually replies
+ * via the reply-slack skill.
+ *
+ * Exported so {@link AgentAutoClaimService} can apply the same filter when
+ * scoring claimable WIs. Before that fix (2026-05-12), AutoClaim would
+ * happily claim a `respond_to_user` WI for crewly-orc, then call
+ * `dispatchTo` which short-circuits here on the same regex — leaving the
+ * WI stuck in `running` with no PTY delivery. 5/10-min SLA breach fired,
+ * claim revoked, WI cycled back to `queued`, AutoClaim re-claimed it,
+ * loop repeated indefinitely. From the user's perspective: "Request never
+ * progresses, only heartbeats and SLA-breach DMs."
+ */
+export declare const SLA_TRACKER_ID_PATTERN: RegExp;
+/**
+ * Singleton subscriber that pushes dispatch prompts to target sessions.
+ */
+export declare class WorkItemDispatchSubscriber {
+    private static instance;
+    private readonly logger;
+    private eventBusService;
+    /**
+     * Dispatch dedup keyed by `${workItemId}::${target}`. Reset on restart —
+     * which is intentional, the startup backfill re-reads the pool.
+     *
+     * 2026-05-15 Steve dogfood: previously keyed by `workItemId` alone, which
+     * silently dropped re-dispatches after a WI was reassigned to a different
+     * target. Concrete repro from crewly-2026-05-15.log:
+     *   - 14:55:26 WI 20a778bc dispatched to strategy-ethan-c36c18bd
+     *   - ethan never started work, claim expired, WI requeued
+     *   - 15:36:55 AgentAutoClaim reassigned to crewly-orc
+     *   - dispatchTo short-circuited (dispatched.has('20a778bc') === true)
+     *   - orc never saw [CREWLY-DISPATCH], claim expired 13min later
+     *   - loop repeated
+     * The composite key fixes this: a re-target gets a fresh dispatch.
+     * Within a (workItemId, target) pair the dedup still holds, so the
+     * `workitem:queued` event and the AutoClaim post-claim hand-off don't
+     * double-fire on the same target.
+     */
+    private readonly dispatched;
+    /** Composite dedup key — workItem id alone is not enough (see above). */
+    private dispatchKey;
+    private constructor();
+    static getInstance(): WorkItemDispatchSubscriber;
+    static resetInstance(): void;
+    /**
+     * Wire the EventBus. Must be called before {@link start}.
+     *
+     * @param eventBusService - The shared EventBusService instance
+     */
+    initialize(eventBusService: {
+        on: (event: string, handler: (...args: unknown[]) => void) => void;
+    }): void;
+    /**
+     * Begin listening for `workitem:queued` events and schedule the one-shot
+     * backfill that catches WIs that survived a backend restart.
+     */
+    start(): void;
+    /**
+     * Push a dispatch message to the WI's target session. Idempotent within
+     * the process: a second call with the same WI id is a no-op.
+     *
+     * Returns true if a message was actually written, false if skipped.
+     *
+     * @param workItem - WorkItem to dispatch
+     * @returns Whether the dispatch was actually performed
+     */
+    dispatchTo(workItem: WorkItem): Promise<boolean>;
+    /**
+     * Fetch the WI by id and dispatch it. Called from the event listener.
+     *
+     * @param workItemId - The id from the workitem:queued event payload
+     */
+    private handleQueuedEvent;
+    /**
+     * Scan the pool once for queued+targeted WIs that lost their dispatch
+     * push to the previous backend instance, and re-fire each. Runs ~25s
+     * after start so AgentAutoClaim's recovery (which wakes offline agents)
+     * has a chance to settle first.
+     */
+    private runStartupBackfill;
+    /**
+     * Compose the prompt the worker sees in their terminal. Format choices:
+     *
+     *   - Tagged prefix `[CREWLY-DISPATCH]` so the line is grep-able and
+     *     visually distinguishable from natural-language ORC messages.
+     *   - Includes WI id + title + type so the worker can sanity-check before
+     *     running the claim command.
+     *   - Closes with a runnable `poll-tasks` command — the worker can
+     *     copy-paste or the harness can auto-execute. We deliberately do NOT
+     *     pass the WI id to poll-tasks; the skill is role-driven and will
+     *     pick whatever matches first, which preserves AutoClaim's scoring
+     *     contract.
+     *
+     * @param workItem - WI being dispatched
+     * @returns Multi-line message suitable for terminal write
+     */
+    private buildDispatchMessage;
+}
+//# sourceMappingURL=workitem-dispatch.subscriber.d.ts.map

package/dist/backend/backend/src/services/v3/workitem-dispatch.subscriber.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workitem-dispatch.subscriber.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/v3/workitem-dispatch.subscriber.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAKH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAYlE;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,sBAAsB,QAAiC,CAAC;AASrE;;GAEG;AACH,qBAAa,0BAA0B;IACrC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA2C;IAElE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,eAAe,CAAuF;IAE9G;;;;;;;;;;;;;;;;;OAiBG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAEhD,yEAAyE;IACzE,OAAO,CAAC,WAAW;IAInB,OAAO;WAIO,WAAW,IAAI,0BAA0B;WAOzC,aAAa,IAAI,IAAI;IAInC;;;;OAIG;IACH,UAAU,CACR,eAAe,EAAE;QAAE,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK,IAAI,CAAA;KAAE,GACtF,IAAI;IAIP;;;OAGG;IACH,KAAK,IAAI,IAAI;IAyCb;;;;;;;;OAQG;IACG,UAAU,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IA2CtD;;;;OAIG;YACW,iBAAiB;IAY/B;;;;;OAKG;YACW,kBAAkB;IAoChC;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,oBAAoB;CAc7B"}

package/dist/backend/backend/src/services/v3/workitem-dispatch.subscriber.js

@@ -0,0 +1,287 @@
+/**
+ * WorkItem Dispatch Subscriber
+ *
+ * Pushes a `[CREWLY-DISPATCH]` system message to the **target session** every
+ * time a WorkItem is added to the pool with a specific target. Closes the
+ * "queued → claimed" gap that {@link AgentAutoClaimService} cannot cover:
+ * AutoClaim is *pull* (reacts to `agent:idle` / `task:done`); this subscriber
+ * is *push* (reacts to `workitem:queued`). The two compose:
+ *
+ *   - Fresh queued WI lands → this fires → target sees the prompt, runs
+ *     `poll-tasks`, claims the WI.
+ *   - Agent later goes idle → AutoClaim fires → it picks the next WI.
+ *
+ * **Why both are needed.** AutoClaim's startup recovery
+ * ({@link AgentAutoClaimService.recoverPendingTasks}) skips WIs whose
+ * target agent is already `active` on the assumption that "an active agent
+ * will claim it on its own". Empirically (2026-05-06 dogfood) that's false:
+ * an agent in the middle of a long thought stream never emits the
+ * `agent:idle` event AutoClaim listens to, so targeted WIs sit in the pool
+ * untouched. This subscriber covers exactly that case.
+ *
+ * **Integration with AgentAutoClaim.** The recovery path's `active` branch
+ * delegates here via {@link WorkItemDispatchSubscriber.dispatchTo}, so both
+ * paths emit the identical message. No double-fire because the dedup Set
+ * is shared across both call-sites.
+ *
+ * **Dedup contract.** Each WI is dispatched at most once per process
+ * lifetime (in-memory `Set<workItemId>`). Backend restart resets the set —
+ * which is the desired behavior since startup backfill needs to re-fire for
+ * the queued WIs that survived the restart.
+ *
+ * @module services/v3/workitem-dispatch.subscriber
+ */
+import axios from 'axios';
+import { LoggerService } from '../core/logger.service.js';
+import { TaskPoolService } from '../task-pool/task-pool.service.js';
+// ---------------------------------------------------------------------------
+// Constants
+// ---------------------------------------------------------------------------
+/** Service identifier for logs and the X-Agent-Session caller header. */
+const SERVICE_NAME = 'WorkItemDispatch';
+/** Loopback API used by {@link tl-auto-verify.service.ts} et al. */
+const API_BASE = 'http://localhost:8787';
+/**
+ * SLA tracker WIs use a deterministic id pattern `request:<rid>:respond_to_user`
+ * (see `request-sla.subscriber.ts`). They're internal bookkeeping items, not
+ * dispatchable work — the orc never "claims and executes" one; the WI is
+ * passively tracked and resolved by the SLA path when orc actually replies
+ * via the reply-slack skill.
+ *
+ * Exported so {@link AgentAutoClaimService} can apply the same filter when
+ * scoring claimable WIs. Before that fix (2026-05-12), AutoClaim would
+ * happily claim a `respond_to_user` WI for crewly-orc, then call
+ * `dispatchTo` which short-circuits here on the same regex — leaving the
+ * WI stuck in `running` with no PTY delivery. 5/10-min SLA breach fired,
+ * claim revoked, WI cycled back to `queued`, AutoClaim re-claimed it,
+ * loop repeated indefinitely. From the user's perspective: "Request never
+ * progresses, only heartbeats and SLA-breach DMs."
+ */
+export const SLA_TRACKER_ID_PATTERN = /^request:.+:respond_to_user$/;
+/** Per-WI delay between backfill pushes — keeps the burst polite. */
+const BACKFILL_THROTTLE_MS = 200;
+// ---------------------------------------------------------------------------
+// Service
+// ---------------------------------------------------------------------------
+/**
+ * Singleton subscriber that pushes dispatch prompts to target sessions.
+ */
+export class WorkItemDispatchSubscriber {
+    static instance = null;
+    logger;
+    eventBusService = null;
+    /**
+     * Dispatch dedup keyed by `${workItemId}::${target}`. Reset on restart —
+     * which is intentional, the startup backfill re-reads the pool.
+     *
+     * 2026-05-15 Steve dogfood: previously keyed by `workItemId` alone, which
+     * silently dropped re-dispatches after a WI was reassigned to a different
+     * target. Concrete repro from crewly-2026-05-15.log:
+     *   - 14:55:26 WI 20a778bc dispatched to strategy-ethan-c36c18bd
+     *   - ethan never started work, claim expired, WI requeued
+     *   - 15:36:55 AgentAutoClaim reassigned to crewly-orc
+     *   - dispatchTo short-circuited (dispatched.has('20a778bc') === true)
+     *   - orc never saw [CREWLY-DISPATCH], claim expired 13min later
+     *   - loop repeated
+     * The composite key fixes this: a re-target gets a fresh dispatch.
+     * Within a (workItemId, target) pair the dedup still holds, so the
+     * `workitem:queued` event and the AutoClaim post-claim hand-off don't
+     * double-fire on the same target.
+     */
+    dispatched = new Set();
+    /** Composite dedup key — workItem id alone is not enough (see above). */
+    dispatchKey(workItemId, target) {
+        return `${workItemId}::${target}`;
+    }
+    constructor() {
+        this.logger = LoggerService.getInstance().createComponentLogger(SERVICE_NAME);
+    }
+    static getInstance() {
+        if (!WorkItemDispatchSubscriber.instance) {
+            WorkItemDispatchSubscriber.instance = new WorkItemDispatchSubscriber();
+        }
+        return WorkItemDispatchSubscriber.instance;
+    }
+    static resetInstance() {
+        WorkItemDispatchSubscriber.instance = null;
+    }
+    /**
+     * Wire the EventBus. Must be called before {@link start}.
+     *
+     * @param eventBusService - The shared EventBusService instance
+     */
+    initialize(eventBusService) {
+        this.eventBusService = eventBusService;
+    }
+    /**
+     * Begin listening for `workitem:queued` events and schedule the one-shot
+     * backfill that catches WIs that survived a backend restart.
+     */
+    start() {
+        if (!this.eventBusService) {
+            this.logger.warn('Cannot start — EventBusService not initialized');
+            return;
+        }
+        this.eventBusService.on('event_published', (payload) => {
+            const event = payload;
+            if (event?.eventType !== 'workitem:queued')
+                return;
+            if (!event.workItemId)
+                return;
+            // Fire-and-forget — dispatch must not block the bus.
+            this.handleQueuedEvent(event.workItemId).catch((err) => {
+                this.logger.debug('Dispatch on workitem:queued failed (non-fatal)', {
+                    workItemId: event.workItemId,
+                    error: err instanceof Error ? err.message : String(err),
+                });
+            });
+        });
+        // Backfill runs after AgentAutoClaim's recoverPendingTasks (which uses a
+        // 15s setTimeout — see agent-auto-claim.service.ts:122). Wait a bit
+        // longer so the wake-then-dispatch ordering is deterministic: offline
+        // agents get woken first, then we push to the still-active ones.
+        const timer = setTimeout(() => {
+            this.runStartupBackfill().catch((err) => {
+                this.logger.warn('Startup backfill failed (non-fatal)', {
+                    error: err instanceof Error ? err.message : String(err),
+                });
+            });
+        }, 25_000);
+        // Don't keep the event loop alive in tests / one-shot scripts.
+        timer.unref?.();
+        this.logger.info('WorkItemDispatchSubscriber started');
+    }
+    // -------------------------------------------------------------------------
+    // Public dispatch (also called from AgentAutoClaim.recoverPendingTasks)
+    // -------------------------------------------------------------------------
+    /**
+     * Push a dispatch message to the WI's target session. Idempotent within
+     * the process: a second call with the same WI id is a no-op.
+     *
+     * Returns true if a message was actually written, false if skipped.
+     *
+     * @param workItem - WorkItem to dispatch
+     * @returns Whether the dispatch was actually performed
+     */
+    async dispatchTo(workItem) {
+        if (!workItem.target)
+            return false;
+        if (SLA_TRACKER_ID_PATTERN.test(workItem.id))
+            return false;
+        const key = this.dispatchKey(workItem.id, workItem.target);
+        if (this.dispatched.has(key))
+            return false;
+        const message = this.buildDispatchMessage(workItem);
+        try {
+            await axios.post(`${API_BASE}/api/terminal/${encodeURIComponent(workItem.target)}/write`, { data: message, mode: 'message' }, {
+                headers: { 'X-Agent-Session': SERVICE_NAME },
+                timeout: 5_000,
+            });
+            this.dispatched.add(key);
+            this.logger.info('Dispatched WorkItem to target session', {
+                workItemId: workItem.id,
+                target: workItem.target,
+                type: workItem.type,
+            });
+            return true;
+        }
+        catch (err) {
+            // Common non-fatal cases: 404 (session not found — agent gone),
+            // 503 (backend not ready), connection refused. We do NOT mark
+            // dispatched on failure so a later retry path can succeed.
+            const status = err?.response?.status;
+            this.logger.debug('Dispatch HTTP write failed (non-fatal)', {
+                workItemId: workItem.id,
+                target: workItem.target,
+                status: status ?? 'no-response',
+                error: err instanceof Error ? err.message : String(err),
+            });
+            return false;
+        }
+    }
+    // -------------------------------------------------------------------------
+    // Internal — workitem:queued event path
+    // -------------------------------------------------------------------------
+    /**
+     * Fetch the WI by id and dispatch it. Called from the event listener.
+     *
+     * @param workItemId - The id from the workitem:queued event payload
+     */
+    async handleQueuedEvent(workItemId) {
+        const taskPool = TaskPoolService.getInstance();
+        const wi = await taskPool.findWorkItem(workItemId);
+        if (!wi)
+            return;
+        if (wi.status !== 'queued')
+            return; // Race: already moved on
+        await this.dispatchTo(wi);
+    }
+    // -------------------------------------------------------------------------
+    // Internal — startup backfill
+    // -------------------------------------------------------------------------
+    /**
+     * Scan the pool once for queued+targeted WIs that lost their dispatch
+     * push to the previous backend instance, and re-fire each. Runs ~25s
+     * after start so AgentAutoClaim's recovery (which wakes offline agents)
+     * has a chance to settle first.
+     */
+    async runStartupBackfill() {
+        const taskPool = TaskPoolService.getInstance();
+        const items = await taskPool.getAvailableItems();
+        const targeted = items.filter((wi) => wi.target && wi.status === 'queued' && !SLA_TRACKER_ID_PATTERN.test(wi.id));
+        if (targeted.length === 0) {
+            this.logger.debug('Startup backfill: nothing to dispatch');
+            return;
+        }
+        this.logger.info('Startup backfill: dispatching pre-existing queued WIs', {
+            count: targeted.length,
+            targets: [...new Set(targeted.map((wi) => wi.target))],
+        });
+        let dispatched = 0;
+        for (const wi of targeted) {
+            const ok = await this.dispatchTo(wi);
+            if (ok)
+                dispatched += 1;
+            // Polite pacing — terminal writes hit the same backend HTTP path.
+            await new Promise((resolve) => setTimeout(resolve, BACKFILL_THROTTLE_MS));
+        }
+        this.logger.info('Startup backfill complete', {
+            total: targeted.length,
+            dispatched,
+            skipped: targeted.length - dispatched,
+        });
+    }
+    // -------------------------------------------------------------------------
+    // Internal — message formatting
+    // -------------------------------------------------------------------------
+    /**
+     * Compose the prompt the worker sees in their terminal. Format choices:
+     *
+     *   - Tagged prefix `[CREWLY-DISPATCH]` so the line is grep-able and
+     *     visually distinguishable from natural-language ORC messages.
+     *   - Includes WI id + title + type so the worker can sanity-check before
+     *     running the claim command.
+     *   - Closes with a runnable `poll-tasks` command — the worker can
+     *     copy-paste or the harness can auto-execute. We deliberately do NOT
+     *     pass the WI id to poll-tasks; the skill is role-driven and will
+     *     pick whatever matches first, which preserves AutoClaim's scoring
+     *     contract.
+     *
+     * @param workItem - WI being dispatched
+     * @returns Multi-line message suitable for terminal write
+     */
+    buildDispatchMessage(workItem) {
+        const titleSnippet = workItem.title.length > 80
+            ? workItem.title.substring(0, 77) + '...'
+            : workItem.title;
+        return [
+            '',
+            `[CREWLY-DISPATCH] WorkItem ${workItem.id} queued for you (type=${workItem.type}).`,
+            `  Title: ${titleSnippet}`,
+            '  Run poll-tasks to claim:',
+            `    bash $AGENT_SKILLS_PATH/core/poll-tasks/execute.sh '{"sessionName":"${workItem.target}"}'`,
+            '',
+        ].join('\n');
+    }
+}
+//# sourceMappingURL=workitem-dispatch.subscriber.js.map

package/dist/backend/backend/src/services/v3/workitem-dispatch.subscriber.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workitem-dispatch.subscriber.js","sourceRoot":"","sources":["../../../../../../backend/src/services/v3/workitem-dispatch.subscriber.ts"],"names":[],"mappings":"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"}

package/dist/backend/backend/src/services/whatsapp/whatsapp-orchestrator-bridge.d.ts

@@ -34,7 +34,7 @@ export interface WhatsAppBridgeConfig {
 export declare class WhatsAppOrchestratorBridge extends EventEmitter {
     private logger;
     private whatsappService;
-    private chatService;
+    private chatV2;
     private messageQueueService;
     private config;
     private initialized;

package/dist/backend/backend/src/services/whatsapp/whatsapp-orchestrator-bridge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"whatsapp-orchestrator-bridge.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/whatsapp/whatsapp-orchestrator-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAYtC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAIjF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,gCAAgC;IAChC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,gDAAgD;IAChD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,6BAA6B;IAC7B,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAcD;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,SAAQ,YAAY;IAC1D,OAAO,CAAC,MAAM,CAAuE;IACrF,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,mBAAmB,CAAsE;IAEjG;;;;OAIG;gBACS,MAAM,GAAE,OAAO,CAAC,oBAAoB,CAAM;IAOtD;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUjC;;;;OAIG;IACH,aAAa,IAAI,OAAO;IAIxB;;;;OAIG;IACH,sBAAsB,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAI1D;;;;OAIG;IACH,SAAS,IAAI,oBAAoB;IAIjC;;;;;OAKG;YACW,qBAAqB;IAiCnC;;;;;;OAMG;YACW,kBAAkB;IAuEhC;;;;;;;;;OASG;YACW,qBAAqB;IA4CnC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAQf;;;;;OAKG;IACG,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAYxE;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,IAAI,0BAA0B,CAK1E;AAED;;GAEG;AACH,wBAAgB,+BAA+B,IAAI,IAAI,CAEtD"}
+{"version":3,"file":"whatsapp-orchestrator-bridge.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/whatsapp/whatsapp-orchestrator-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAatC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAIjF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,gCAAgC;IAChC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,gDAAgD;IAChD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,6BAA6B;IAC7B,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAcD;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,SAAQ,YAAY;IAC1D,OAAO,CAAC,MAAM,CAAuE;IACrF,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,mBAAmB,CAAsE;IAEjG;;;;OAIG;gBACS,MAAM,GAAE,OAAO,CAAC,oBAAoB,CAAM;IAOtD;;;OAGG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUjC;;;;OAIG;IACH,aAAa,IAAI,OAAO;IAIxB;;;;OAIG;IACH,sBAAsB,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAI1D;;;;OAIG;IACH,SAAS,IAAI,oBAAoB;IAIjC;;;;;OAKG;YACW,qBAAqB;IAiCnC;;;;;;OAMG;YACW,kBAAkB;IAgFhC;;;;;;;;;OASG;YACW,qBAAqB;IAqDnC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAQf;;;;;OAKG;IACG,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAYxE;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,IAAI,0BAA0B,CAK1E;AAED;;GAEG;AACH,wBAAgB,+BAA+B,IAAI,IAAI,CAEtD"}

package/dist/backend/backend/src/services/whatsapp/whatsapp-orchestrator-bridge.js

@@ -8,7 +8,7 @@
  */
 import { EventEmitter } from 'events';
 import { getWhatsAppService } from './whatsapp.service.js';
-import { getChatService } from '../chat/chat.service.js';
+import { getChatV2Service } from '../chat-v2/chat-v2.singleton.js';
 import { isOrchestratorActive, isAgentActive, getOrchestratorOfflineMessage, } from '../orchestrator/index.js';
 import { ORCHESTRATOR_SESSION_NAME, MESSAGE_QUEUE_CONSTANTS, WHATSAPP_CONSTANTS, AUDITOR_SCHEDULER_CONSTANTS } from '../../constants.js';
 import { LoggerService } from '../core/logger.service.js';
@@ -37,7 +37,7 @@ let bridgeInstance = null;
 export class WhatsAppOrchestratorBridge extends EventEmitter {
     logger = LoggerService.getInstance().createComponentLogger('WhatsAppBridge');
     whatsappService;
-    chatService;
+    chatV2;
     messageQueueService = null;
     config;
     initialized = false;
@@ -50,7 +50,7 @@ export class WhatsAppOrchestratorBridge extends EventEmitter {
     constructor(config = {}) {
         super();
         this.whatsappService = getWhatsAppService();
-        this.chatService = getChatService();
+        this.chatV2 = getChatV2Service();
         this.config = { ...DEFAULT_CONFIG, ...config };
     }
     /**
@@ -146,16 +146,24 @@ export class WhatsAppOrchestratorBridge extends EventEmitter {
                 this.logger.error('Message queue service not configured');
                 return 'The WhatsApp bridge is not properly configured. Please restart the server.';
             }
-            // Store message in chat service
-            const result = await this.chatService.sendMessage({
+            // Store message in canonical chat-v2 store
+            const conversationId = context?.conversationId ?? `whatsapp-${context?.chatId ?? 'unknown'}-${Date.now()}`;
+            const channel = this.chatV2.ensureChannelForLegacyConversation({
+                conversationId,
+                agentSession: 'crewly-orc',
+            });
+            this.chatV2.recordTurn({
+                channelId: channel.id,
+                senderType: 'user',
+                senderId: context?.chatId ?? 'whatsapp-user',
                 content: message,
-                conversationId: context?.conversationId,
                 metadata: {
-                    source: 'whatsapp',
+                    source: 'slack', // closest enum value; whatsapp is treated as a similar inbound surface
                     chatId: context?.chatId,
                     contactName: context?.contactName,
                 },
             });
+            const result = { conversation: { id: channel.id } };
             // Enqueue with a resolve callback for response routing
             const response = await new Promise((resolve) => {
                 const timeoutId = setTimeout(() => {
@@ -206,15 +214,23 @@ export class WhatsAppOrchestratorBridge extends EventEmitter {
         const mqService = this.messageQueueService;
         if (mqService) {
             try {
-                const result = await this.chatService.sendMessage({
+                const conversationId = context?.conversationId ?? `whatsapp-${context?.chatId ?? 'unknown'}-${Date.now()}`;
+                const channel = this.chatV2.ensureChannelForLegacyConversation({
+                    conversationId,
+                    agentSession: 'crewly-orc',
+                });
+                this.chatV2.recordTurn({
+                    channelId: channel.id,
+                    senderType: 'user',
+                    senderId: context?.chatId ?? 'whatsapp-user',
                     content: enrichedMessage,
-                    conversationId: context?.conversationId,
                     metadata: {
-                        source: 'whatsapp',
+                        source: 'slack', // closest enum value; whatsapp is an inbound surface
                         chatId: context?.chatId,
                         contactName: context?.contactName,
                     },
                 });
+                const result = { conversation: { id: channel.id } };
                 mqService.enqueue({
                     content: enrichedMessage,
                     conversationId: result.conversation.id,