factory-factory 0.3.21 → 0.4.1

package/dist/src/backend/lib/topic-broadcaster.test.js

@@ -0,0 +1,126 @@
+import { describe, expect, it, vi } from 'vitest';
+import { WS_READY_STATE } from '../../backend/constants/websocket.js';
+import { TopicBroadcaster } from './topic-broadcaster.js';
+class MockWebSocket {
+    readyState = WS_READY_STATE.OPEN;
+    send = vi.fn();
+    asWebSocket() {
+        return this;
+    }
+}
+function createBroadcaster() {
+    return new TopicBroadcaster({ error: vi.fn() });
+}
+describe('TopicBroadcaster', () => {
+    describe('subscribe', () => {
+        it('tracks subscribers per topic', () => {
+            const broadcaster = createBroadcaster();
+            const ws = new MockWebSocket();
+            broadcaster.subscribe('topic-a', ws.asWebSocket());
+            expect(broadcaster.subscriberCount('topic-a')).toBe(1);
+            expect(broadcaster.subscriberCount('topic-b')).toBe(0);
+            expect(broadcaster.hasSubscribers('topic-a')).toBe(true);
+        });
+        it('removes the subscription when the disposer runs', () => {
+            const broadcaster = createBroadcaster();
+            const ws = new MockWebSocket();
+            const dispose = broadcaster.subscribe('topic-a', ws.asWebSocket());
+            dispose();
+            expect(broadcaster.subscriberCount('topic-a')).toBe(0);
+            expect(broadcaster.hasSubscribers('topic-a')).toBe(false);
+        });
+        it('fires onEmpty only when the last subscriber leaves', () => {
+            const broadcaster = createBroadcaster();
+            const onEmpty = vi.fn();
+            const ws1 = new MockWebSocket();
+            const ws2 = new MockWebSocket();
+            const dispose1 = broadcaster.subscribe('topic-a', ws1.asWebSocket(), onEmpty);
+            const dispose2 = broadcaster.subscribe('topic-a', ws2.asWebSocket(), onEmpty);
+            dispose1();
+            expect(onEmpty).not.toHaveBeenCalled();
+            dispose2();
+            expect(onEmpty).toHaveBeenCalledTimes(1);
+        });
+        it('is safe to dispose twice', () => {
+            const broadcaster = createBroadcaster();
+            const onEmpty = vi.fn();
+            const ws = new MockWebSocket();
+            const dispose = broadcaster.subscribe('topic-a', ws.asWebSocket(), onEmpty);
+            dispose();
+            dispose();
+            expect(onEmpty).toHaveBeenCalledTimes(1);
+        });
+        it('keeps distinct topics independent', () => {
+            const broadcaster = createBroadcaster();
+            const ws1 = new MockWebSocket();
+            const ws2 = new MockWebSocket();
+            broadcaster.subscribe('topic-a', ws1.asWebSocket());
+            broadcaster.subscribe('topic-b', ws2.asWebSocket());
+            broadcaster.broadcast('topic-a', { hello: 'a' });
+            expect(ws1.send).toHaveBeenCalledWith(JSON.stringify({ hello: 'a' }));
+            expect(ws2.send).not.toHaveBeenCalled();
+        });
+    });
+    describe('broadcast', () => {
+        it('sends the serialized payload to every subscriber of the topic', () => {
+            const broadcaster = createBroadcaster();
+            const ws1 = new MockWebSocket();
+            const ws2 = new MockWebSocket();
+            broadcaster.subscribe('topic-a', ws1.asWebSocket());
+            broadcaster.subscribe('topic-a', ws2.asWebSocket());
+            const sent = broadcaster.broadcast('topic-a', { type: 'test' });
+            expect(sent).toBe(2);
+            expect(ws1.send).toHaveBeenCalledWith(JSON.stringify({ type: 'test' }));
+            expect(ws2.send).toHaveBeenCalledWith(JSON.stringify({ type: 'test' }));
+        });
+        it('passes string payloads through without re-serializing', () => {
+            const broadcaster = createBroadcaster();
+            const ws = new MockWebSocket();
+            broadcaster.subscribe('topic-a', ws.asWebSocket());
+            broadcaster.broadcast('topic-a', 'raw-message');
+            expect(ws.send).toHaveBeenCalledWith('raw-message');
+        });
+        it('skips sockets that are not OPEN', () => {
+            const broadcaster = createBroadcaster();
+            const closed = new MockWebSocket();
+            closed.readyState = WS_READY_STATE.CLOSED;
+            const open = new MockWebSocket();
+            broadcaster.subscribe('topic-a', closed.asWebSocket());
+            broadcaster.subscribe('topic-a', open.asWebSocket());
+            const sent = broadcaster.broadcast('topic-a', { type: 'test' });
+            expect(sent).toBe(1);
+            expect(closed.send).not.toHaveBeenCalled();
+            expect(open.send).toHaveBeenCalled();
+        });
+        it('continues past a socket whose send throws', () => {
+            const logger = { error: vi.fn() };
+            const broadcaster = new TopicBroadcaster(logger);
+            const throwing = new MockWebSocket();
+            throwing.send.mockImplementation(() => {
+                throw new Error('socket closing');
+            });
+            const healthy = new MockWebSocket();
+            broadcaster.subscribe('topic-a', throwing.asWebSocket());
+            broadcaster.subscribe('topic-a', healthy.asWebSocket());
+            const sent = broadcaster.broadcast('topic-a', { type: 'test' });
+            expect(sent).toBe(1);
+            expect(healthy.send).toHaveBeenCalled();
+            expect(logger.error).toHaveBeenCalled();
+        });
+        it('returns 0 for a topic with no subscribers', () => {
+            const broadcaster = createBroadcaster();
+            expect(broadcaster.broadcast('missing', { type: 'test' })).toBe(0);
+        });
+    });
+    describe('subscribers', () => {
+        it('exposes a live view for per-socket fan-out decisions', () => {
+            const broadcaster = createBroadcaster();
+            const ws = new MockWebSocket();
+            broadcaster.subscribe('topic-a', ws.asWebSocket());
+            const view = broadcaster.subscribers('topic-a');
+            expect([...view]).toEqual([ws.asWebSocket()]);
+            expect([...broadcaster.subscribers('missing')]).toEqual([]);
+        });
+    });
+});
+//# sourceMappingURL=topic-broadcaster.test.js.map

package/dist/src/backend/lib/topic-broadcaster.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"topic-broadcaster.test.js","sourceRoot":"","sources":["../../../../src/backend/lib/topic-broadcaster.test.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/lib/websocket-send.d.ts

@@ -0,0 +1,12 @@
+import type { WebSocket } from 'ws';
+interface SendErrorLogger {
+    error(message: string, error: Error): void;
+}
+interface StreamSendLogger extends SendErrorLogger {
+    warn(message: string, data: Record<string, unknown>): void;
+}
+export declare const MAX_WEBSOCKET_STREAM_BUFFERED_BYTES: number;
+export declare function safeSend(ws: WebSocket, message: string, logger: SendErrorLogger, description?: string): boolean;
+export declare function sendStreamOutput(ws: WebSocket, message: string, logger: StreamSendLogger, description?: string): boolean;
+export {};
+//# sourceMappingURL=websocket-send.d.ts.map

package/dist/src/backend/lib/websocket-send.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-send.d.ts","sourceRoot":"","sources":["../../../../src/backend/lib/websocket-send.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAIpC,UAAU,eAAe;IACvB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;CAC5C;AAED,UAAU,gBAAiB,SAAQ,eAAe;IAChD,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5D;AAED,eAAO,MAAM,mCAAmC,QAAc,CAAC;AAS/D,wBAAgB,QAAQ,CACtB,EAAE,EAAE,SAAS,EACb,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,eAAe,EACvB,WAAW,SAAsB,GAChC,OAAO,CAWT;AAOD,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,SAAS,EACb,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,gBAAgB,EACxB,WAAW,SAA4B,GACtC,OAAO,CA6BT"}

package/dist/src/backend/lib/websocket-send.js

@@ -0,0 +1,46 @@
+import { WS_READY_STATE } from '../../backend/constants/websocket.js';
+import { toError } from './error-utils.js';
+export const MAX_WEBSOCKET_STREAM_BUFFERED_BYTES = 1024 * 1024;
+const congestedStreamSockets = new WeakSet();
+export function safeSend(ws, message, logger, description = 'WebSocket message') {
+    if (ws.readyState !== WS_READY_STATE.OPEN) {
+        return false;
+    }
+    try {
+        ws.send(message);
+        return true;
+    }
+    catch (error) {
+        logger.error(`Failed to send ${description}`, toError(error));
+        return false;
+    }
+}
+export function sendStreamOutput(ws, message, logger, description = 'WebSocket stream output') {
+    if (ws.readyState !== WS_READY_STATE.OPEN) {
+        return false;
+    }
+    if (ws.bufferedAmount + Buffer.byteLength(message) > MAX_WEBSOCKET_STREAM_BUFFERED_BYTES) {
+        if (!congestedStreamSockets.has(ws)) {
+            congestedStreamSockets.add(ws);
+            logger.warn(`Dropping ${description} because WebSocket send buffer is congested`, {
+                bufferedAmount: ws.bufferedAmount,
+                maxBufferedAmount: MAX_WEBSOCKET_STREAM_BUFFERED_BYTES,
+            });
+        }
+        return false;
+    }
+    congestedStreamSockets.delete(ws);
+    try {
+        ws.send(message, (error) => {
+            if (error) {
+                logger.error(`Failed to send ${description}`, toError(error));
+            }
+        });
+        return true;
+    }
+    catch (error) {
+        logger.error(`Failed to send ${description}`, toError(error));
+        return false;
+    }
+}
+//# sourceMappingURL=websocket-send.js.map

package/dist/src/backend/lib/websocket-send.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-send.js","sourceRoot":"","sources":["../../../../src/backend/lib/websocket-send.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAUxC,MAAM,CAAC,MAAM,mCAAmC,GAAG,IAAI,GAAG,IAAI,CAAC;AAE/D,MAAM,sBAAsB,GAAG,IAAI,OAAO,EAAa,CAAC;AAOxD,MAAM,UAAU,QAAQ,CACtB,EAAa,EACb,OAAe,EACf,MAAuB,EACvB,WAAW,GAAG,mBAAmB;IAEjC,IAAI,EAAE,CAAC,UAAU,KAAK,cAAc,CAAC,IAAI,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACH,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,kBAAkB,WAAW,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9D,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAOD,MAAM,UAAU,gBAAgB,CAC9B,EAAa,EACb,OAAe,EACf,MAAwB,EACxB,WAAW,GAAG,yBAAyB;IAEvC,IAAI,EAAE,CAAC,UAAU,KAAK,cAAc,CAAC,IAAI,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,EAAE,CAAC,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,mCAAmC,EAAE,CAAC;QACzF,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACpC,sBAAsB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,YAAY,WAAW,6CAA6C,EAAE;gBAChF,cAAc,EAAE,EAAE,CAAC,cAAc;gBACjC,iBAAiB,EAAE,mCAAmC;aACvD,CAAC,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAElC,IAAI,CAAC;QACH,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YACzB,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,CAAC,kBAAkB,WAAW,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;YAChE,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,kBAAkB,WAAW,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9D,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}

package/dist/src/backend/lib/websocket-send.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=websocket-send.test.d.ts.map

package/dist/src/backend/lib/websocket-send.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-send.test.d.ts","sourceRoot":"","sources":["../../../../src/backend/lib/websocket-send.test.ts"],"names":[],"mappings":""}

package/dist/src/backend/lib/websocket-send.test.js

@@ -0,0 +1,103 @@
+import { describe, expect, it, vi } from 'vitest';
+import { WS_READY_STATE } from '../../backend/constants/websocket.js';
+import { MAX_WEBSOCKET_STREAM_BUFFERED_BYTES, safeSend, sendStreamOutput } from './websocket-send.js';
+function createMockWs(readyState = WS_READY_STATE.OPEN, bufferedAmount = 0) {
+    return {
+        readyState,
+        bufferedAmount,
+        send: vi.fn(),
+    };
+}
+function createMockLogger() {
+    return { error: vi.fn(), warn: vi.fn() };
+}
+describe('safeSend', () => {
+    it('sends the message when the socket is OPEN and returns true', () => {
+        const ws = createMockWs();
+        const logger = createMockLogger();
+        const result = safeSend(ws, 'hello', logger);
+        expect(result).toBe(true);
+        expect(ws.send).toHaveBeenCalledWith('hello');
+        expect(logger.error).not.toHaveBeenCalled();
+    });
+    it('does not send when the socket is not OPEN and returns false', () => {
+        const ws = createMockWs(WS_READY_STATE.CLOSING);
+        const logger = createMockLogger();
+        const result = safeSend(ws, 'hello', logger);
+        expect(result).toBe(false);
+        expect(ws.send).not.toHaveBeenCalled();
+        expect(logger.error).not.toHaveBeenCalled();
+    });
+    it('catches a synchronous send error, logs it, and returns false', () => {
+        const ws = createMockWs();
+        ws.send.mockImplementation(() => {
+            throw new Error('socket closing');
+        });
+        const logger = createMockLogger();
+        const result = safeSend(ws, 'hello', logger, 'test message');
+        expect(result).toBe(false);
+        expect(logger.error).toHaveBeenCalledWith('Failed to send test message', expect.objectContaining({ message: 'socket closing' }));
+    });
+});
+describe('sendStreamOutput', () => {
+    it('sends stream output when the projected buffer is at the threshold', () => {
+        const message = 'output';
+        const ws = createMockWs(WS_READY_STATE.OPEN, MAX_WEBSOCKET_STREAM_BUFFERED_BYTES - Buffer.byteLength(message));
+        const logger = createMockLogger();
+        expect(sendStreamOutput(ws, message, logger, 'terminal output')).toBe(true);
+        expect(ws.send).toHaveBeenCalledWith(message, expect.any(Function));
+        expect(logger.warn).not.toHaveBeenCalled();
+    });
+    it('drops output when its UTF-8 bytes would push the buffer above the threshold', () => {
+        const message = 'éé';
+        const ws = createMockWs(WS_READY_STATE.OPEN, MAX_WEBSOCKET_STREAM_BUFFERED_BYTES - Buffer.byteLength(message) + 1);
+        const logger = createMockLogger();
+        expect(sendStreamOutput(ws, message, logger, 'log output')).toBe(false);
+        expect(ws.send).not.toHaveBeenCalled();
+    });
+    it('drops output and warns once while a socket remains congested', () => {
+        const ws = createMockWs(WS_READY_STATE.OPEN, MAX_WEBSOCKET_STREAM_BUFFERED_BYTES + 1);
+        const logger = createMockLogger();
+        expect(sendStreamOutput(ws, 'first', logger, 'log output')).toBe(false);
+        expect(sendStreamOutput(ws, 'second', logger, 'log output')).toBe(false);
+        expect(ws.send).not.toHaveBeenCalled();
+        expect(logger.warn).toHaveBeenCalledTimes(1);
+        expect(logger.warn).toHaveBeenCalledWith('Dropping log output because WebSocket send buffer is congested', {
+            bufferedAmount: MAX_WEBSOCKET_STREAM_BUFFERED_BYTES + 1,
+            maxBufferedAmount: MAX_WEBSOCKET_STREAM_BUFFERED_BYTES,
+        });
+    });
+    it('resumes output and allows a new warning after the socket drains', () => {
+        const ws = createMockWs(WS_READY_STATE.OPEN, MAX_WEBSOCKET_STREAM_BUFFERED_BYTES + 1);
+        const logger = createMockLogger();
+        sendStreamOutput(ws, 'dropped', logger);
+        ws.bufferedAmount = MAX_WEBSOCKET_STREAM_BUFFERED_BYTES - Buffer.byteLength('resumed');
+        expect(sendStreamOutput(ws, 'resumed', logger)).toBe(true);
+        ws.bufferedAmount = MAX_WEBSOCKET_STREAM_BUFFERED_BYTES + 1;
+        expect(sendStreamOutput(ws, 'dropped again', logger)).toBe(false);
+        expect(ws.send).toHaveBeenCalledWith('resumed', expect.any(Function));
+        expect(logger.warn).toHaveBeenCalledTimes(2);
+    });
+    it('logs asynchronous send callback errors', () => {
+        const ws = createMockWs();
+        ws.send.mockImplementation((_message, callback) => {
+            callback(new Error('write failed'));
+        });
+        const logger = createMockLogger();
+        expect(sendStreamOutput(ws, 'output', logger, 'terminal output')).toBe(true);
+        expect(logger.error).toHaveBeenCalledWith('Failed to send terminal output', expect.objectContaining({ message: 'write failed' }));
+    });
+    it('catches synchronous stream send errors and ignores closed sockets', () => {
+        const throwingWs = createMockWs();
+        throwingWs.send.mockImplementation(() => {
+            throw new Error('socket closing');
+        });
+        const logger = createMockLogger();
+        expect(sendStreamOutput(throwingWs, 'output', logger, 'terminal output')).toBe(false);
+        expect(logger.error).toHaveBeenCalledWith('Failed to send terminal output', expect.objectContaining({ message: 'socket closing' }));
+        const closedWs = createMockWs(WS_READY_STATE.CLOSED);
+        expect(sendStreamOutput(closedWs, 'output', logger)).toBe(false);
+        expect(closedWs.send).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=websocket-send.test.js.map

package/dist/src/backend/lib/websocket-send.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"websocket-send.test.js","sourceRoot":"","sources":["../../../../src/backend/lib/websocket-send.test.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/lib/workspace-derived-state.d.ts

@@ -1,3 +1,4 @@
+import type { RatchetDispatchOutcome } from '../../../prisma/generated/client.js';
 import type { CIStatus, KanbanColumn, PRState, RatchetState, RunScriptStatus, WorkspaceStatus } from '../../shared/core/index.js';
 import type { WorkspaceCiObservation, WorkspaceFlowPhase } from '../../shared/workspace-flow-state.js';
 import type { WorkspaceSidebarStatus } from '../../shared/workspace-sidebar-status.js';
@@ -19,15 +20,22 @@ export interface WorkspaceDerivedStateInput {
     sessionIsWorking: boolean;
     pendingRequestType: WorkspacePendingRequestType | null;
     hasSessionRuntimeError?: boolean;
+    ratchetDispatchOutcome: RatchetDispatchOutcome | null;
+    ratchetDispatchRetryCount: number;
     runScriptStatus: RunScriptStatus | null;
     flowState: WorkspaceDerivedFlowState;
 }
 export interface WorkspaceDerivedStateFns {
     computeKanbanColumn: (input: {
         lifecycle: WorkspaceStatus;
-        isWorking: boolean;
+        sessionIsWorking: boolean;
+        flowIsWorking: boolean;
         prState: PRState;
         ratchetState: RatchetState;
+        pendingRequestType: WorkspacePendingRequestType | null;
+        hasSessionRuntimeError: boolean;
+        ratchetDispatchOutcome: RatchetDispatchOutcome | null;
+        ratchetDispatchRetryCount: number;
     }) => KanbanColumn | null;
     deriveSidebarStatus: (input: {
         isWorking: boolean;

package/dist/src/backend/lib/workspace-derived-state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-derived-state.d.ts","sourceRoot":"","sources":["../../../../src/backend/lib/workspace-derived-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,eAAe,EACf,eAAe,EAChB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAChG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,qBAAqB,EAC3B,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,aAAa,EAAE,sBAAsB,CAAC;IACtC,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,0BAA0B,EAAE,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,eAAe,CAAC;IAC3B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,QAAQ,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,2BAA2B,GAAG,IAAI,CAAC;IACvD,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;IACxC,SAAS,EAAE,yBAAyB,CAAC;CACtC;AAED,MAAM,WAAW,wBAAwB;IACvC,mBAAmB,EAAE,CAAC,KAAK,EAAE;QAC3B,SAAS,EAAE,eAAe,CAAC;QAC3B,SAAS,EAAE,OAAO,CAAC;QACnB,OAAO,EAAE,OAAO,CAAC;QACjB,YAAY,EAAE,YAAY,CAAC;KAC5B,KAAK,YAAY,GAAG,IAAI,CAAC;IAC1B,mBAAmB,EAAE,CAAC,KAAK,EAAE;QAC3B,SAAS,EAAE,OAAO,CAAC;QACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;QACxB,UAAU,EAAE,QAAQ,GAAG,IAAI,CAAC;QAC5B,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;KACnC,KAAK,sBAAsB,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,sBAAsB,CAAC;IACtC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,SAAS,EAAE,kBAAkB,CAAC;IAC9B,aAAa,EAAE,sBAAsB,CAAC;IACtC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,YAAY,EAAE,qBAAqB,CAAC;CACrC;AAED,eAAO,MAAM,oCAAoC,EAAE,yBAMlD,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,0BAA0B,EACjC,GAAG,EAAE,wBAAwB,GAC5B,qBAAqB,CAmCvB"}
+{"version":3,"file":"workspace-derived-state.d.ts","sourceRoot":"","sources":["../../../../src/backend/lib/workspace-derived-state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,YAAY,EACZ,eAAe,EACf,eAAe,EAChB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AAChG,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,EAEL,KAAK,2BAA2B,EAChC,KAAK,qBAAqB,EAC3B,MAAM,kCAAkC,CAAC;AAE1C,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,kBAAkB,CAAC;IAC1B,aAAa,EAAE,sBAAsB,CAAC;IACtC,WAAW,EAAE,OAAO,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,0BAA0B,EAAE,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,eAAe,CAAC;IAC3B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,QAAQ,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,kBAAkB,EAAE,2BAA2B,GAAG,IAAI,CAAC;IACvD,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,sBAAsB,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACtD,yBAAyB,EAAE,MAAM,CAAC;IAClC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;IACxC,SAAS,EAAE,yBAAyB,CAAC;CACtC;AAED,MAAM,WAAW,wBAAwB;IACvC,mBAAmB,EAAE,CAAC,KAAK,EAAE;QAC3B,SAAS,EAAE,eAAe,CAAC;QAC3B,gBAAgB,EAAE,OAAO,CAAC;QAC1B,aAAa,EAAE,OAAO,CAAC;QACvB,OAAO,EAAE,OAAO,CAAC;QACjB,YAAY,EAAE,YAAY,CAAC;QAC3B,kBAAkB,EAAE,2BAA2B,GAAG,IAAI,CAAC;QACvD,sBAAsB,EAAE,OAAO,CAAC;QAChC,sBAAsB,EAAE,sBAAsB,GAAG,IAAI,CAAC;QACtD,yBAAyB,EAAE,MAAM,CAAC;KACnC,KAAK,YAAY,GAAG,IAAI,CAAC;IAC1B,mBAAmB,EAAE,CAAC,KAAK,EAAE;QAC3B,SAAS,EAAE,OAAO,CAAC;QACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QACrB,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;QACxB,UAAU,EAAE,QAAQ,GAAG,IAAI,CAAC;QAC5B,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;KACnC,KAAK,sBAAsB,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,sBAAsB,CAAC;IACtC,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,SAAS,EAAE,kBAAkB,CAAC;IAC9B,aAAa,EAAE,sBAAsB,CAAC;IACtC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,YAAY,EAAE,qBAAqB,CAAC;CACrC;AAED,eAAO,MAAM,oCAAoC,EAAE,yBAMlD,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,0BAA0B,EACjC,GAAG,EAAE,wBAAwB,GAC5B,qBAAqB,CAwCvB"}

package/dist/src/backend/lib/workspace-derived-state.js

@@ -19,9 +19,14 @@ export function assembleWorkspaceDerivedState(input, fns) {
         }),
         kanbanColumn: fns.computeKanbanColumn({
             lifecycle: input.lifecycle,
-            isWorking,
+            sessionIsWorking: input.sessionIsWorking,
+            flowIsWorking: input.flowState.isWorking,
             prState: input.prState,
             ratchetState: input.ratchetState,
+            pendingRequestType: input.pendingRequestType,
+            hasSessionRuntimeError: input.hasSessionRuntimeError ?? false,
+            ratchetDispatchOutcome: input.ratchetDispatchOutcome,
+            ratchetDispatchRetryCount: input.ratchetDispatchRetryCount,
         }),
         flowPhase: input.flowState.phase,
         ciObservation: input.flowState.ciObservation,

package/dist/src/backend/lib/workspace-derived-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-derived-state.js","sourceRoot":"","sources":["../../../../src/backend/lib/workspace-derived-state.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,2BAA2B,GAG5B,MAAM,kCAAkC,CAAC;AAkD1C,MAAM,CAAC,MAAM,oCAAoC,GAA8B;IAC7E,KAAK,EAAE,OAAO;IACd,aAAa,EAAE,gBAAgB;IAC/B,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;IAChB,0BAA0B,EAAE,KAAK;CAClC,CAAC;AAEF,MAAM,UAAU,6BAA6B,CAC3C,KAAiC,EACjC,GAA6B;IAE7B,MAAM,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC;IAEzC,OAAO;QACL,SAAS;QACT,aAAa,EAAE,GAAG,CAAC,mBAAmB,CAAC;YACrC,SAAS;YACT,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;SACjC,CAAC;QACF,YAAY,EAAE,GAAG,CAAC,mBAAmB,CAAC;YACpC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,SAAS;YACT,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,YAAY,EAAE,KAAK,CAAC,YAAY;SACjC,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK;QAChC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa;QAC5C,qBAAqB,EAAE,KAAK,CAAC,SAAS,CAAC,0BAA0B;QACjE,YAAY,EAAE,2BAA2B,CAAC;YACxC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,SAAS;YACT,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,sBAAsB,EAAE,KAAK,CAAC,sBAAsB;YACpD,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK;YAChC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa;YAC5C,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,eAAe,EAAE,KAAK,CAAC,eAAe;SACvC,CAAC;KACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"workspace-derived-state.js","sourceRoot":"","sources":["../../../../src/backend/lib/workspace-derived-state.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,2BAA2B,GAG5B,MAAM,kCAAkC,CAAC;AAyD1C,MAAM,CAAC,MAAM,oCAAoC,GAA8B;IAC7E,KAAK,EAAE,OAAO;IACd,aAAa,EAAE,gBAAgB;IAC/B,WAAW,EAAE,KAAK;IAClB,SAAS,EAAE,KAAK;IAChB,0BAA0B,EAAE,KAAK;CAClC,CAAC;AAEF,MAAM,UAAU,6BAA6B,CAC3C,KAAiC,EACjC,GAA6B;IAE7B,MAAM,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC;IAEzC,OAAO;QACL,SAAS;QACT,aAAa,EAAE,GAAG,CAAC,mBAAmB,CAAC;YACrC,SAAS;YACT,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;SACjC,CAAC;QACF,YAAY,EAAE,GAAG,CAAC,mBAAmB,CAAC;YACpC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,SAAS;YACxC,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,sBAAsB,EAAE,KAAK,CAAC,sBAAsB,IAAI,KAAK;YAC7D,sBAAsB,EAAE,KAAK,CAAC,sBAAsB;YACpD,yBAAyB,EAAE,KAAK,CAAC,yBAAyB;SAC3D,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK;QAChC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa;QAC5C,qBAAqB,EAAE,KAAK,CAAC,SAAS,CAAC,0BAA0B;QACjE,YAAY,EAAE,2BAA2B,CAAC;YACxC,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,cAAc,EAAE,KAAK,CAAC,cAAc;YACpC,SAAS;YACT,kBAAkB,EAAE,KAAK,CAAC,kBAAkB;YAC5C,sBAAsB,EAAE,KAAK,CAAC,sBAAsB;YACpD,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK;YAChC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa;YAC5C,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,eAAe,EAAE,KAAK,CAAC,eAAe;SACvC,CAAC;KACH,CAAC;AACJ,CAAC"}

package/dist/src/backend/lib/workspace-derived-state.test.js

@@ -3,7 +3,7 @@ import { KanbanColumn, PRState, RatchetState, WorkspaceStatus } from '../../shar
 import { assembleWorkspaceDerivedState, DEFAULT_WORKSPACE_DERIVED_FLOW_STATE, } from './workspace-derived-state.js';
 describe('assembleWorkspaceDerivedState', () => {
     it('uses live session activity, not PR flow activity, for workspace working state', () => {
-        const computeKanbanColumn = vi.fn(() => KanbanColumn.WAITING);
+        const computeKanbanColumn = vi.fn(() => KanbanColumn.WORKING);
         const deriveSidebarStatus = vi.fn(() => ({
             activityState: 'IDLE',
             ciState: 'NONE',
@@ -17,6 +17,8 @@ describe('assembleWorkspaceDerivedState', () => {
             hasHadSessions: true,
             sessionIsWorking: false,
             pendingRequestType: null,
+            ratchetDispatchOutcome: null,
+            ratchetDispatchRetryCount: 0,
             runScriptStatus: 'IDLE',
             flowState: {
                 ...DEFAULT_WORKSPACE_DERIVED_FLOW_STATE,
@@ -27,9 +29,11 @@ describe('assembleWorkspaceDerivedState', () => {
             deriveSidebarStatus,
         });
         expect(result.isWorking).toBe(false);
+        expect(result.kanbanColumn).toBe(KanbanColumn.WORKING);
         expect(computeKanbanColumn).toHaveBeenCalledWith(expect.objectContaining({
             lifecycle: WorkspaceStatus.READY,
-            isWorking: false,
+            sessionIsWorking: false,
+            flowIsWorking: true,
         }));
         expect(deriveSidebarStatus).toHaveBeenCalledWith(expect.objectContaining({
             isWorking: false,
@@ -46,6 +50,8 @@ describe('assembleWorkspaceDerivedState', () => {
             hasHadSessions: true,
             sessionIsWorking: false,
             pendingRequestType: null,
+            ratchetDispatchOutcome: null,
+            ratchetDispatchRetryCount: 0,
             runScriptStatus: 'IDLE',
             flowState: {
                 phase: 'CI_WAIT',
@@ -88,6 +94,8 @@ describe('assembleWorkspaceDerivedState', () => {
             hasHadSessions: true,
             sessionIsWorking: true,
             pendingRequestType: null,
+            ratchetDispatchOutcome: null,
+            ratchetDispatchRetryCount: 0,
             runScriptStatus: 'IDLE',
             flowState: DEFAULT_WORKSPACE_DERIVED_FLOW_STATE,
         }, {
@@ -95,7 +103,7 @@ describe('assembleWorkspaceDerivedState', () => {
             deriveSidebarStatus,
         });
         expect(result.isWorking).toBe(true);
-        expect(computeKanbanColumn).toHaveBeenCalledWith(expect.objectContaining({ isWorking: true }));
+        expect(computeKanbanColumn).toHaveBeenCalledWith(expect.objectContaining({ sessionIsWorking: true }));
         expect(deriveSidebarStatus).toHaveBeenCalledWith(expect.objectContaining({ isWorking: true }));
     });
 });

package/dist/src/backend/lib/workspace-derived-state.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-derived-state.test.js","sourceRoot":"","sources":["../../../../src/backend/lib/workspace-derived-state.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-derived-state.test.js","sourceRoot":"","sources":["../../../../src/backend/lib/workspace-derived-state.test.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/middleware/cors.middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cors.middleware.d.ts","sourceRoot":"","sources":["../../../../src/backend/middleware/cors.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAQxD,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,IACjD,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,IAAI,CAoB/D"}
+{"version":3,"file":"cors.middleware.d.ts","sourceRoot":"","sources":["../../../../src/backend/middleware/cors.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAUxD,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,IACjD,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,IAAI,CAoB/D"}

package/dist/src/backend/middleware/cors.middleware.js

@@ -1,12 +1,13 @@
+import { isOriginAllowed } from '../../backend/lib/request-trust.js';
 export function createCorsMiddleware(appContext) {
     return (req, res, next) => {
         const ALLOWED_ORIGINS = appContext.services.configService.getCorsConfig().allowedOrigins;
         const origin = req.headers.origin;
-        if (origin && ALLOWED_ORIGINS.includes(origin)) {
+        if (origin && isOriginAllowed(origin, ALLOWED_ORIGINS)) {
             res.header('Access-Control-Allow-Origin', origin);
         }
         res.header('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
-        res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, Authorization, X-Project-Id, X-Top-Level-Task-Id');
+        res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, Authorization');
         res.header('Access-Control-Allow-Credentials', 'true');
         if (req.method === 'OPTIONS') {
             res.sendStatus(200);

package/dist/src/backend/middleware/cors.middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"cors.middleware.js","sourceRoot":"","sources":["../../../../src/backend/middleware/cors.middleware.ts"],"names":[],"mappings":"AASA,MAAM,UAAU,oBAAoB,CAAC,UAAsB;IACzD,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAQ,EAAE;QAC/D,MAAM,eAAe,GAAG,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC,cAAc,CAAC;QAEzF,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;QAClC,IAAI,MAAM,IAAI,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/C,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;QACpD,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,8BAA8B,EAAE,iCAAiC,CAAC,CAAC;QAC9E,GAAG,CAAC,MAAM,CACR,8BAA8B,EAC9B,kGAAkG,CACnG,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAC;QAEvD,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC7B,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"cors.middleware.js","sourceRoot":"","sources":["../../../../src/backend/middleware/cors.middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAS9D,MAAM,UAAU,oBAAoB,CAAC,UAAsB;IACzD,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAQ,EAAE;QAC/D,MAAM,eAAe,GAAG,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC,cAAc,CAAC;QAEzF,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;QAClC,IAAI,MAAM,IAAI,eAAe,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,CAAC;YACvD,GAAG,CAAC,MAAM,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;QACpD,CAAC;QACD,GAAG,CAAC,MAAM,CAAC,8BAA8B,EAAE,iCAAiC,CAAC,CAAC;QAC9E,GAAG,CAAC,MAAM,CACR,8BAA8B,EAC9B,+DAA+D,CAChE,CAAC;QACF,GAAG,CAAC,MAAM,CAAC,kCAAkC,EAAE,MAAM,CAAC,CAAC;QAEvD,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC7B,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC"}

package/dist/src/backend/middleware/index.d.ts

@@ -1,4 +1,4 @@
 export { createCorsMiddleware } from './cors.middleware.js';
-export { createRequestLoggerMiddleware, requestLoggerMiddleware, } from './request-logger.middleware.js';
+export { createRequestLoggerMiddleware } from './request-logger.middleware.js';
 export { securityMiddleware } from './security.middleware.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/backend/middleware/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/backend/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,GACxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/backend/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/src/backend/middleware/index.js

@@ -1,4 +1,4 @@
 export { createCorsMiddleware } from './cors.middleware.js';
-export { createRequestLoggerMiddleware, requestLoggerMiddleware, } from './request-logger.middleware.js';
+export { createRequestLoggerMiddleware } from './request-logger.middleware.js';
 export { securityMiddleware } from './security.middleware.js';
 //# sourceMappingURL=index.js.map

package/dist/src/backend/middleware/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/backend/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,GACxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/backend/middleware/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/src/backend/middleware/middleware.test.js

@@ -114,6 +114,13 @@ describe('corsMiddleware', () => {
             corsMiddleware(mockReq, toResponse(mockRes), mockNext);
             expect(mockRes.headers['Access-Control-Allow-Origin']).toBe('http://localhost:3001');
         });
+        it('should set Access-Control-Allow-Origin for equivalent loopback origins', () => {
+            const mockReq = createMockReq({
+                headers: { origin: 'http://127.0.0.1:3000' },
+            });
+            corsMiddleware(mockReq, toResponse(mockRes), mockNext);
+            expect(mockRes.headers['Access-Control-Allow-Origin']).toBe('http://127.0.0.1:3000');
+        });
         it('should not set Access-Control-Allow-Origin for disallowed origins', () => {
             const mockReq = createMockReq({
                 headers: { origin: 'http://evil.com' },
@@ -146,6 +153,16 @@ describe('corsMiddleware', () => {
             corsMiddleware(mockReq, toResponse(mockRes), mockNext);
             expect(mockRes.headers['Access-Control-Allow-Origin']).toBeUndefined();
         });
+        it('should allow equivalent loopback origins when custom config uses localhost', () => {
+            mockGetCorsConfig.mockReturnValue({
+                allowedOrigins: ['http://localhost:4000'],
+            });
+            const mockReq = createMockReq({
+                headers: { origin: 'http://127.0.0.1:4000' },
+            });
+            corsMiddleware(mockReq, toResponse(mockRes), mockNext);
+            expect(mockRes.headers['Access-Control-Allow-Origin']).toBe('http://127.0.0.1:4000');
+        });
     });
     describe('CORS headers', () => {
         it('should set Access-Control-Allow-Methods header', () => {
@@ -156,7 +173,7 @@ describe('corsMiddleware', () => {
         it('should set Access-Control-Allow-Headers header', () => {
             const mockReq = createMockReq();
             corsMiddleware(mockReq, toResponse(mockRes), mockNext);
-            expect(mockRes.headers['Access-Control-Allow-Headers']).toBe('Origin, X-Requested-With, Content-Type, Accept, Authorization, X-Project-Id, X-Top-Level-Task-Id');
+            expect(mockRes.headers['Access-Control-Allow-Headers']).toBe('Origin, X-Requested-With, Content-Type, Accept, Authorization');
         });
         it('should set Access-Control-Allow-Credentials header to true', () => {
             const mockReq = createMockReq();