npm - @straiffi/archon - Versions diffs - 1.11.5 → 1.11.7 - Mend

@straiffi/archon 1.11.5 → 1.11.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (175) hide show

package/dist/server/lib/runServices.js CHANGED Viewed

@@ -6,6 +6,9 @@ import { applyDetectedPreviewTarget, buildPreviewProxyUrl, createIdlePreviewStat
 import { deactivatePreviewProxyForProject, ensurePreviewProxyForProject } from './previewProxy.js';
 import { getExecutionShellCommand } from './shell.js';
 import { recordServiceRunPlacement } from './serviceRuns.js';
+import { appendServiceRunLog, flushServiceRunLog } from './serviceRunLogs.js';
+import { drainServiceRunLogs } from './runSessionLifecycle.js';
+let logGeneration = 0;
 export const resolveServiceCwd = (workspacePath, configuredCwd) => {
     if (!configuredCwd) {
         return workspacePath;
@@ -72,6 +75,40 @@ export const createRunServiceLauncher = ({ state, project, runConfig, cwd, execu
                 proc = spawnManagedProcess(service.cmd, serviceCwd, ['ignore', 'pipe', 'pipe'], state);
             }
             const child = proc;
+            const runLog = state.run_log;
+            const generation = runLog ? String(++logGeneration) : '';
+            let logClosed = false;
+            if (runLog) {
+                let resolveLogClose;
+                const closed = new Promise(resolve => { resolveLogClose = resolve; });
+                const finishLog = () => {
+                    if (logClosed) {
+                        return;
+                    }
+                    logClosed = true;
+                    flushServiceRunLog(runLog, id, 'stdout', generation);
+                    flushServiceRunLog(runLog, id, 'stderr', generation);
+                    state.pending_log_closes?.delete(closed);
+                    state.force_log_closes?.delete(closed);
+                    resolveLogClose();
+                };
+                state.pending_log_closes ??= new Set();
+                state.pending_log_closes.add(closed);
+                state.force_log_closes ??= new Map();
+                state.force_log_closes.set(closed, () => {
+                    finishLog();
+                    child.stdout?.destroy?.();
+                    child.stderr?.destroy?.();
+                });
+                state.log_close_by_process ??= new WeakMap();
+                state.log_close_by_process.set(child, closed);
+                child.once('close', () => {
+                    finishLog();
+                    if (!state.cancelled) {
+                        void state.settle_session?.().catch(error => console.error('[run] service finalization failed:', error));
+                    }
+                });
+            }
             session?.processes.set(id, child);
             const ownsProcess = () => isActive() && (!session || session.processes.get(id) === child);
             const ownsPreview = () => ownsProcess() && isPreviewService(service, state.preview_status);
@@ -118,14 +155,28 @@ export const createRunServiceLauncher = ({ state, project, runConfig, cwd, execu
                 })().catch(error => console.error('[run] preview detection failed:', error));
             };
             child.stdout?.on('data', (data) => {
+                if (runLog && !logClosed) {
+                    appendServiceRunLog(runLog, id, 'stdout', data, generation);
+                }
                 console.log(`[run:${logLabelPrefix}:${label}] ${data.toString().trimEnd()}`);
                 handleLogChunk(data);
             });
             child.stderr?.on('data', (data) => {
+                if (runLog && !logClosed) {
+                    appendServiceRunLog(runLog, id, 'stderr', data, generation);
+                }
                 console.error(`[run:${logLabelPrefix}:${label}] ${data.toString().trimEnd()}`);
                 handleLogChunk(data);
             });
             let finishing = false;
+            let logDrainStarted = false;
+            const drainExitedLog = () => {
+                if (logDrainStarted || !runLog || logClosed) {
+                    return;
+                }
+                logDrainStarted = true;
+                void drainServiceRunLogs(state, state.log_close_by_process?.get(child));
+            };
             const finishExitedProcess = (code, error) => {
                 if (finishing || (session && session.processes.get(id) !== child)) {
                     return;
@@ -168,9 +219,17 @@ export const createRunServiceLauncher = ({ state, project, runConfig, cwd, execu
                 const remove = () => { state.launch_promises?.delete(cleanup); };
                 void cleanup.then(remove, remove);
             };
-            child.on('exit', code => finishExitedProcess(code));
-            child.on('close', code => finishExitedProcess(code));
-            child.on('error', error => finishExitedProcess(null, error.message));
+            child.on('exit', code => {
+                drainExitedLog();
+                finishExitedProcess(code);
+            });
+            child.on('close', code => {
+                finishExitedProcess(code);
+            });
+            child.on('error', error => {
+                drainExitedLog();
+                finishExitedProcess(null, error.message);
+            });
             if (handle) {
                 const failure = await waitForExecutionPlacement(handle.placementFailure, 'Service placement verification');
                 if (!ownsProcess()) {
@@ -190,7 +249,7 @@ export const createRunServiceLauncher = ({ state, project, runConfig, cwd, execu
                     environmentId: execution?.environment?.id ?? null, environmentRevision: execution?.environment?.environment_revision ?? null, placement,
                 });
             }
-            if (status && ownsProcess()) {
+            if (status?.status === 'starting' && ownsProcess()) {
                 status.status = 'running';
             }
         }

package/dist/server/lib/runServices.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runServices.js","sourceRoot":"","sources":["../../../server/lib/runServices.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"runServices.js","sourceRoot":"","sources":["../../../server/lib/runServices.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/runSessionLifecycle.js CHANGED Viewed

@@ -1,5 +1,25 @@
 import { completeServiceRun, recordServiceRunFinalizationIntent, recordServiceRunReleaseFailure } from './serviceRuns.js';
 import { isProcessAlive, stopRunProcesses } from './runProcesses.js';
+const LOG_DRAIN_TIMEOUT_MS = 2000;
+export const drainServiceRunLogs = async (state, closed) => {
+    const pending = closed ? [closed] : [...(state.pending_log_closes ?? [])];
+    if (!pending.length) {
+        return;
+    }
+    let timer;
+    try {
+        await Promise.race([
+            Promise.all(pending),
+            new Promise(resolve => { timer = setTimeout(resolve, LOG_DRAIN_TIMEOUT_MS); }),
+        ]);
+    }
+    finally {
+        clearTimeout(timer);
+    }
+    for (const promise of pending) {
+        state.force_log_closes?.get(promise)?.();
+    }
+};
 export const finalizeDurableRun = (state, intendedStatus, intendedEventType, intendedMessage) => {
     if (state.durable_finalization) {
         return state.durable_finalization;
@@ -21,6 +41,7 @@ export const finalizeDurableRun = (state, intendedStatus, intendedEventType, int
             });
         }
         await stopRunProcesses(state);
+        await drainServiceRunLogs(state);
         if (!runId) {
             state.finalization_failed = false;
             delete state.active_run.cleanup_pending;
@@ -60,6 +81,10 @@ export const createHostSessionSettler = (state, isOwner, clear) => async () => {
         || session.processes.size || state.processes.some(isProcessAlive) || !isOwner()) {
         return;
     }
+    await drainServiceRunLogs(state);
+    if (state.launch_operations || session.pending.size || session.processes.size || state.processes.some(isProcessAlive) || !isOwner()) {
+        return;
+    }
     if (!state.finalization) {
         const status = session.services.some(service => service.status === 'failed') ? 'failed'
             : session.stop_requested ? 'cancelled' : 'completed';

package/dist/server/lib/runSessionLifecycle.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runSessionLifecycle.js","sourceRoot":"","sources":["../../../server/lib/runSessionLifecycle.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"runSessionLifecycle.js","sourceRoot":"","sources":["../../../server/lib/runSessionLifecycle.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/runtimePaths.js CHANGED Viewed

@@ -65,7 +65,10 @@ export const resolveArchonStageSnapshotDir = () => {
     }
     return join(tmpdir(), 'archon-ticket-stage-changes');
 };
-export const resolveOpencodeDbPathCandidates = () => {
+export const resolveOpencodeDbPathCandidates = ({ runtimeMajor = 1 } = {}) => {
+    if (runtimeMajor !== 1) {
+        return [];
+    }
     const configuredPath = process.env.OPENCODE_DB_PATH?.trim();
     if (configuredPath) {
         return [configuredPath];
@@ -89,9 +92,9 @@ export const resolveOpencodeDbPathCandidates = () => {
         join(homedir(), '.local', 'share', 'opencode', 'opencode.db'),
     ]);
 };
-export const resolveOpencodeDbPath = () => {
-    const candidates = resolveOpencodeDbPathCandidates();
-    return candidates.find(candidate => existsSync(candidate)) ?? candidates[0];
+export const resolveOpencodeDbPath = (options = {}) => {
+    const candidates = resolveOpencodeDbPathCandidates(options);
+    return candidates.find(candidate => existsSync(candidate)) ?? candidates[0] ?? null;
 };
 export const resolveOpencodeSkillRoots = ({ projectPath = null } = {}) => {
     return uniquePaths([

package/dist/server/lib/runtimePaths.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"runtimePaths.js","sourceRoot":"","sources":["../../../server/lib/runtimePaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAA;AACpC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;~~AAMpC~~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~~IAClD~~,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAA;IAC3D,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,CAAC,cAAc,CAAC,CAAA;IACzB,CAAC;IAED,MAAM,QAAQ,GAAG,mBAAmB,EAAE,CAAA;IAEtC,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAClC,OAAO,WAAW,CAAC;YACjB,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC;YACzC,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC;YACzC,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC;SAC9D,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,WAAW,CAAC;YACjB,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC;YACzC,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC;SAC1C,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,WAAW,CAAC;QACjB,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC;QACzC,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC;KAC9D,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,~~GAAG~~,EAAE;~~IACxC~~,MAAM,UAAU,GAAG,+BAA+B,~~EAAE~~,CAAA;~~IACpD~~,OAAO,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAA;~~AAC7E~~,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EAAE,WAAW,GAAG,IAAI,KAAyB,EAAE,EAAE,EAAE;IAC3F,OAAO,WAAW,CAAC;QACjB,IAAI,CAAC,qBAAqB,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC;QACnD,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC;QACpC,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,CAAC;QACpC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;QAC7D,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;QAC3D,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;KAC5D,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAE,EAAE;IACxD,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACjD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA"}
1	+ {"version":3,"file":"runtimePaths.js","sourceRoot":"","sources":["../../../server/lib/runtimePaths.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/serviceRunLogs.js ADDED Viewed

@@ -0,0 +1,180 @@
+import { StringDecoder } from 'node:string_decoder';
+const MAX_ENTRIES = 256;
+const TAIL_ENTRIES = 100;
+const MAX_LINE_LENGTH = 1024;
+const CHUNK_LENGTH = 4096;
+const MAX_NAME_LENGTH = 1024;
+const buffers = new Map();
+const copySource = (source) => {
+    if (source.kind === 'ticket') {
+        return { kind: 'ticket', ticket_id: source.ticket_id, ...(source.ticket_title !== undefined
+                ? { ticket_title: source.ticket_title.slice(0, MAX_NAME_LENGTH) } : {}) };
+    }
+    if (source.kind === 'bundle') {
+        return { kind: 'bundle', bundle_id: source.bundle_id, ...(source.bundle_name !== undefined
+                ? { bundle_name: source.bundle_name.slice(0, MAX_NAME_LENGTH) } : {}) };
+    }
+    return { kind: 'project' };
+};
+const isCurrent = (handle) => buffers.get(handle.projectId) === handle && !handle.stopped;
+const emit = (handle, serviceId, stream, text) => {
+    handle.entries.push({ sequence: ++handle.sequence, service_id: serviceId, stream, text });
+    if (handle.entries.length > MAX_ENTRIES) {
+        handle.entries.shift();
+    }
+};
+const consume = (handle, serviceId, stream, state, text) => {
+    for (const char of text) {
+        if (state.pendingCR) {
+            state.pendingCR = false;
+            if (char === '\n') {
+                if (!state.segmented) {
+                    emit(handle, serviceId, stream, '');
+                }
+                state.segmented = false;
+                continue;
+            }
+            state.partial = `\r${state.partial}`;
+        }
+        if (char === '\n') {
+            // CRLF is one newline even when the CR and LF arrive in different chunks.
+            const line = state.partial.endsWith('\r') ? state.partial.slice(0, -1) : state.partial;
+            if (line || !state.segmented) {
+                emit(handle, serviceId, stream, line);
+            }
+            state.partial = '';
+            state.segmented = false;
+        }
+        else {
+            if (state.partial.length + char.length > MAX_LINE_LENGTH) {
+                emit(handle, serviceId, stream, state.partial);
+                state.partial = '';
+                state.segmented = true;
+            }
+            state.partial += char;
+            if (state.partial.length >= MAX_LINE_LENGTH && !state.partial.endsWith('\r')) {
+                emit(handle, serviceId, stream, state.partial);
+                state.partial = '';
+                state.segmented = true;
+            }
+        }
+    }
+};
+const flushPartial = (handle, key, state) => {
+    if (state.partial) {
+        const [serviceId, stream] = key.split('\0');
+        const pendingCR = state.partial.endsWith('\r');
+        const text = pendingCR ? state.partial.slice(0, -1) : state.partial;
+        if (text) {
+            emit(handle, serviceId, stream, text);
+            state.segmented = true;
+        }
+        state.pendingCR = pendingCR;
+        state.partial = '';
+    }
+};
+export const startServiceRunLog = (projectId, runId, source, services, target) => {
+    const copiedServices = services.map(service => {
+        return { service_id: service.service_id, name: service.name.slice(0, MAX_NAME_LENGTH) };
+    });
+    const handle = {
+        projectId, runId, source: copySource(source), target: target ? { ...target } : null, services: copiedServices,
+        entries: [], sequence: 0, stopped: false, streams: new Map(),
+    };
+    buffers.delete(projectId);
+    buffers.set(projectId, handle);
+    return handle;
+};
+export const appendServiceRunLog = (handle, serviceId, stream, chunk, generation = '') => {
+    if (!isCurrent(handle) || !handle.services.some(service => service.service_id === serviceId) || !chunk.length) {
+        return;
+    }
+    const key = `${serviceId}\0${stream}\0${generation}`;
+    // Complete earlier fragments before recording output from another stream or launch.
+    for (const [otherKey, otherState] of handle.streams) {
+        if (otherKey !== key) {
+            flushPartial(handle, otherKey, otherState);
+        }
+    }
+    let state = handle.streams.get(key);
+    if (!state) {
+        state = { decoder: new StringDecoder('utf8'), partial: '', segmented: false, pendingCR: false };
+        handle.streams.set(key, state);
+    }
+    if (typeof chunk === 'string') {
+        consume(handle, serviceId, stream, state, state.decoder.end());
+        state.decoder = new StringDecoder('utf8');
+        for (let offset = 0; offset < chunk.length; offset += CHUNK_LENGTH) {
+            consume(handle, serviceId, stream, state, chunk.slice(offset, offset + CHUNK_LENGTH));
+        }
+    }
+    else {
+        for (let offset = 0; offset < chunk.length; offset += CHUNK_LENGTH) {
+            consume(handle, serviceId, stream, state, state.decoder.write(chunk.subarray(offset, offset + CHUNK_LENGTH)));
+        }
+    }
+};
+// Call on process close to release an unterminated line for this launch.
+export const flushServiceRunLog = (handle, serviceId, stream, generation = '') => {
+    if (!isCurrent(handle)) {
+        return;
+    }
+    const key = `${serviceId}\0${stream}\0${generation}`;
+    const state = handle.streams.get(key);
+    if (!state) {
+        return;
+    }
+    consume(handle, serviceId, stream, state, state.decoder.end());
+    if (state.pendingCR) {
+        emit(handle, serviceId, stream, '\r');
+        state.pendingCR = false;
+    }
+    if (state.partial.endsWith('\r')) {
+        emit(handle, serviceId, stream, state.partial);
+    }
+    else {
+        flushPartial(handle, key, state);
+    }
+    handle.streams.delete(key);
+};
+export const stopServiceRunLog = (handle) => {
+    if (!isCurrent(handle)) {
+        return;
+    }
+    for (const key of [...handle.streams.keys()]) {
+        const [serviceId, stream, generation] = key.split('\0');
+        flushServiceRunLog(handle, serviceId, stream, generation);
+    }
+    handle.stopped = true;
+};
+export const deleteProjectServiceRunLogs = (projectId) => {
+    buffers.delete(projectId);
+};
+export const getServiceRunLogs = (projectId, options = {}) => {
+    const handle = buffers.get(projectId);
+    if (!handle) {
+        return { run_id: null, source: null, target: null, services: [], entries: [], next_cursor: 0,
+            truncated: false, run_mismatch: options.runId !== undefined, mode: 'snapshot', stopped: true };
+    }
+    const runMismatch = options.runId !== undefined && options.runId !== handle.runId;
+    const first = handle.entries[0]?.sequence ?? handle.sequence + 1;
+    const invalidCursor = options.cursor !== undefined && (!Number.isSafeInteger(options.cursor)
+        || options.cursor < 0 || options.cursor > handle.sequence || options.cursor < first - 1);
+    const snapshot = runMismatch || options.cursor === undefined || invalidCursor;
+    const entries = snapshot
+        ? handle.entries.slice(-TAIL_ENTRIES)
+        : handle.entries.filter(entry => entry.sequence > options.cursor);
+    return {
+        run_id: handle.runId,
+        source: { ...handle.source },
+        target: handle.target ? { ...handle.target } : null,
+        services: handle.services.map(service => ({ ...service })),
+        entries: entries.map(entry => ({ ...entry })),
+        next_cursor: handle.sequence,
+        truncated: (snapshot && (entries[0]?.sequence ?? handle.sequence + 1) > 1) || Boolean(invalidCursor && !runMismatch),
+        run_mismatch: runMismatch,
+        mode: snapshot ? 'snapshot' : 'incremental',
+        stopped: handle.stopped,
+    };
+};
+//# sourceMappingURL=serviceRunLogs.js.map

package/dist/server/lib/serviceRunLogs.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"serviceRunLogs.js","sourceRoot":"","sources":["../../../server/lib/serviceRunLogs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AA2CnD,MAAM,WAAW,GAAG,GAAG,CAAA;AACvB,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,eAAe,GAAG,IAAI,CAAA;AAC5B,MAAM,YAAY,GAAG,IAAI,CAAA;AACzB,MAAM,eAAe,GAAG,IAAI,CAAA;AAC5B,MAAM,OAAO,GAAG,IAAI,GAAG,EAA+B,CAAA;AAEtD,MAAM,UAAU,GAAG,CAAC,MAAoB,EAAgB,EAAE;IACxD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,YAAY,KAAK,SAAS;gBACzF,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAA;IAC7E,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS;gBACxF,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAA;IAC3E,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;AAC5B,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,MAA2B,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAA;AAE9G,MAAM,IAAI,GAAG,CAAC,MAA2B,EAAE,SAAiB,EAAE,MAAoC,EAAE,IAAY,EAAE,EAAE;IAClH,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IACzF,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,WAAW,EAAE,CAAC;QACxC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;IACxB,CAAC;AACH,CAAC,CAAA;AAED,MAAM,OAAO,GAAG,CAAC,MAA2B,EAAE,SAAiB,EAAE,MAAoC,EAAE,KAAkB,EAAE,IAAY,EAAE,EAAE;IACzI,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACpB,KAAK,CAAC,SAAS,GAAG,KAAK,CAAA;YACvB,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;gBAClB,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;oBACrB,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;gBACrC,CAAC;gBACD,KAAK,CAAC,SAAS,GAAG,KAAK,CAAA;gBACvB,SAAQ;YACV,CAAC;YACD,KAAK,CAAC,OAAO,GAAG,KAAK,KAAK,CAAC,OAAO,EAAE,CAAA;QACtC,CAAC;QACD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAClB,0EAA0E;YAC1E,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAA;YACtF,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;gBAC7B,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YACvC,CAAC;YACD,KAAK,CAAC,OAAO,GAAG,EAAE,CAAA;YAClB,KAAK,CAAC,SAAS,GAAG,KAAK,CAAA;QACzB,CAAC;aAAM,CAAC;YACN,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,eAAe,EAAE,CAAC;gBACzD,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;gBAC9C,KAAK,CAAC,OAAO,GAAG,EAAE,CAAA;gBAClB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAA;YACxB,CAAC;YACD,KAAK,CAAC,OAAO,IAAI,IAAI,CAAA;YACrB,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,IAAI,eAAe,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7E,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;gBAC9C,KAAK,CAAC,OAAO,GAAG,EAAE,CAAA;gBAClB,KAAK,CAAC,SAAS,GAAG,IAAI,CAAA;YACxB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,MAA2B,EAAE,GAAW,EAAE,KAAkB,EAAE,EAAE;IACpF,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAA2C,CAAA;QACrF,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC9C,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAA;QACnE,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YACrC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAA;QACxB,CAAC;QACD,KAAK,CAAC,SAAS,GAAG,SAAS,CAAA;QAC3B,KAAK,CAAC,OAAO,GAAG,EAAE,CAAA;IACpB,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,SAAiB,EACjB,KAAa,EACb,MAAoB,EACpB,QAAyD,EACzD,MAA2B,EACN,EAAE;IACvB,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC5C,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,EAAE,CAAA;IACzF,CAAC,CAAC,CAAA;IACF,MAAM,MAAM,GAAwB;QAClC,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,cAAc;QAC7G,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE;KAC7D,CAAA;IACD,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACzB,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;IAC9B,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,MAA2B,EAC3B,SAAiB,EACjB,MAAoC,EACpC,KAAsB,EACtB,UAAU,GAAG,EAAE,EACT,EAAE;IACR,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAC9G,OAAM;IACR,CAAC;IACD,MAAM,GAAG,GAAG,GAAG,SAAS,KAAK,MAAM,KAAK,UAAU,EAAE,CAAA;IACpD,oFAAoF;IACpF,KAAK,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACpD,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;YACrB,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;QAC5C,CAAC;IACH,CAAC;IACD,IAAI,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACnC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG,EAAE,OAAO,EAAE,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAA;QAC/F,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAChC,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QAC9D,KAAK,CAAC,OAAO,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAA;QACzC,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,MAAM,IAAI,YAAY,EAAE,CAAC;YACnE,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAAC,CAAC,CAAA;QACvF,CAAC;IACH,CAAC;SAAM,CAAC;QACN,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,MAAM,IAAI,YAAY,EAAE,CAAC;YACnE,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,CAAA;QAC/G,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAED,yEAAyE;AACzE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,MAA2B,EAC3B,SAAiB,EACjB,MAAoC,EACpC,UAAU,GAAG,EAAE,EACT,EAAE;IACR,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,OAAM;IACR,CAAC;IACD,MAAM,GAAG,GAAG,GAAG,SAAS,KAAK,MAAM,KAAK,UAAU,EAAE,CAAA;IACpD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACrC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAM;IACR,CAAC;IACD,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IAC9D,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACrC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAA;IACzB,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACjC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAA;IAChD,CAAC;SAAM,CAAC;QACN,YAAY,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;IAClC,CAAC;IACD,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;AAC5B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAA2B,EAAQ,EAAE;IACrE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QACvB,OAAM;IACR,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QAC7C,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAmD,CAAA;QACzG,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;IAC3D,CAAC;IACD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAA;AACvB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,SAAiB,EAAQ,EAAE;IACrE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;AAC3B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,SAAiB,EACjB,UAAyD,EAAE,EACpC,EAAE;IACzB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IACrC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC;YAC1F,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAClG,CAAC;IACD,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAA;IACjF,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAA;IAChE,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC;WACvF,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,KAAK,GAAG,CAAC,CAAC,CAAA;IAC1F,MAAM,QAAQ,GAAG,WAAW,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,aAAa,CAAA;IAC7E,MAAM,OAAO,GAAG,QAAQ;QACtB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC;QACrC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAO,CAAC,CAAA;IACpE,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,KAAK;QACpB,MAAM,EAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE;QAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI;QACnD,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QAC1D,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;QAC7C,WAAW,EAAE,MAAM,CAAC,QAAQ;QAC5B,SAAS,EAAE,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,QAAQ,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,OAAO,CAAC,aAAa,IAAI,CAAC,WAAW,CAAC;QACpH,YAAY,EAAE,WAAW;QACzB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa;QAC3C,OAAO,EAAE,MAAM,CAAC,OAAO;KACxB,CAAA;AACH,CAAC,CAAA"}

package/dist/server/lib/sessionTargets.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { branchExistsLocally, getProjectBranch, resolveExistingWorktreePath } from './git.js';
+import { branchExistsLocally, getActiveRebaseBranch, getProjectBranch, resolveExistingWorktreePath } from './git.js';
 import { analyzeRepoPath, hasInitialCommit } from './projectRepos.js';
 import { getProjectActiveTarget, getProjectById } from './projects.js';
 import { getBundle, isProjectRootBundle } from './tickets.js';
@@ -72,7 +72,9 @@ export const resolveSessionTarget = (session, project) => {
                 cwd: null,
             };
         }
-        const worktreePath = resolveExistingWorktreePath(bundle.branch, resolvedProject);
+        const worktreePath = !session.target_is_explicit || bundle.branch === session.target_branch_snapshot
+            ? resolveExistingWorktreePath(bundle.branch, resolvedProject)
+            : null;
         if (!worktreePath) {
             return {
                 target_kind: 'bundle',
@@ -104,6 +106,21 @@ export const resolveSessionTarget = (session, project) => {
             cwd: null,
         };
     }
+    if (session.target_is_explicit && (repoAnalysis.hasInitialCommit ? !branch : branch !== null)) {
+        return {
+            target_kind: 'repo_root', target_bundle_id: null, target_available: false,
+            target_unavailable_reason: 'Project-root branch has changed.', branch, cwd: null,
+        };
+    }
+    if (session.target_is_explicit && branch) {
+        const current = getProjectBranch(resolvedProject, { includeDiffStats: false });
+        if ((current.status === 'ready' ? current.branch : getActiveRebaseBranch(resolvedProject.repo_path)) !== branch) {
+            return {
+                target_kind: 'repo_root', target_bundle_id: null, target_available: false,
+                target_unavailable_reason: 'Project-root branch has changed.', branch, cwd: null,
+            };
+        }
+    }
     if (!branch || !repoAnalysis.hasInitialCommit) {
         return {
             target_kind: 'repo_root',
@@ -138,6 +155,22 @@ export const doesSessionTargetMatchProjectTarget = (session, project) => {
     if (!resolvedProject) {
         return false;
     }
+    if (session.target_is_explicit) {
+        if (session.target_kind === 'bundle') {
+            const bundle = session.target_bundle_id ? getBundle(session.target_bundle_id, resolvedProject.id) : null;
+            return Boolean(bundle && !isProjectRootBundle(bundle) && bundle.branch === session.target_branch_snapshot);
+        }
+        const analysis = analyzeRepoPath(resolvedProject.repo_path);
+        if (analysis.kind !== 'git') {
+            return false;
+        }
+        if (!analysis.hasInitialCommit) {
+            return session.target_branch_snapshot === null;
+        }
+        const branchState = getProjectBranch(resolvedProject, { includeDiffStats: false });
+        return Boolean(session.target_branch_snapshot && (branchState.status === 'ready'
+            ? branchState.branch : getActiveRebaseBranch(resolvedProject.repo_path)) === session.target_branch_snapshot);
+    }
     const activeTarget = getProjectActiveTarget(resolvedProject);
     if (session.target_kind === 'bundle') {
         return activeTarget.kind === 'bundle' && Boolean(session.target_bundle_id) && activeTarget.bundle_id === session.target_bundle_id;

package/dist/server/lib/sessionTargets.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sessionTargets.js","sourceRoot":"","sources":["../../../server/lib/sessionTargets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;~~AAC7F~~,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AACtE,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAE7D,OAAO,EAAE,sBAAsB,EAAgC,MAAM,uBAAuB,CAAA;AAE5F,MAAM,4BAA4B,GAAG,cAAc,CAAA;~~AAgCnD~~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~~QAChF~~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"}
1	+ {"version":3,"file":"sessionTargets.js","sourceRoot":"","sources":["../../../server/lib/sessionTargets.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/specOperations.js CHANGED Viewed

@@ -19,7 +19,7 @@ import { formatAskQuestionContinuation, hasPendingAskQuestionSet, parseAskQuesti
 import { resolveInitialSessionTarget, resolveSessionTargetForExecution } from './sessionTargets.js';
 import { createExecutionProfileSelectionMetadata, executionProfileSelectionMetadata, validateExecutionProfileSelection } from './executionRunAuthority.js';
 import { resolveHelperContinuationModelConfig, resolveHelperModelConfig } from './agentModelConfig.js';
-import { ConversationResumeUnavailableError, resolveConversationResume, SPEC_RESUME_INSTRUCTION } from './conversationResume.js';
+import { ConversationResumeUnavailableError, resolveConversationResume, SPEC_RESUME_INSTRUCTION, } from './conversationResume.js';
 import { isAgentExecutable, isSupportedAgent } from './agentCatalog.js';
 const getPayloadValue = (payload, key) => {
     return payload?.[key];
@@ -264,7 +264,12 @@ export const resumeProjectSpecSessionResponse = ({ projectId, specSessionId, bro
     }
     let resume;
     try {
-        resume = resolveConversationResume({ projectId, sessionId: existing.id, sourceRunId, kind: 'spec' });
+        resume = resolveConversationResume({
+            projectId,
+            sessionId: existing.id,
+            sourceRunId,
+            kind: 'spec',
+        });
     }
     catch (error) {
         return {