@overdeck/desktop 0.49.1 → 0.50.0

package/server/{control-settings-5k6ixdFW.js → control-settings-Db0uXgVM.js}

@@ -1,9 +1,312 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { bn as loadProjectsConfigSync, fn as init_projects, on as getProjectSync } from "./config-yaml-BwOEANMr.js";
-import { _ as integer, a as EventBus, d as getOverdeckDatabaseSync, f as init_infra, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, v as init_drizzle_orm, x as eq } from "./infra-KTp9KV9u.js";
-import { n as init_issues, t as IssueId } from "./issues-CkvUoAnq.js";
+import { bn as loadProjectsConfigSync, fn as init_projects, li as init_errors, on as getProjectSync } from "./config-yaml-D60AnTIu.js";
+import { _ as integer, a as EventBus, d as getOverdeckDatabaseSync, f as init_infra, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, v as init_drizzle_orm, x as eq } from "./infra-CJRi_5Wu.js";
+import { n as init_issues, t as IssueId } from "./issues-RGHQUKhB.js";
+import { o as getPricingSync, s as init_cost } from "./cost-DTuIRE4y.js";
 import { Context, Effect, Layer, Schema } from "effect";
+import { existsSync, readFileSync } from "fs";
 import { HttpApiEndpoint, HttpApiGroup } from "effect/unstable/httpapi";
+//#region ../../lib/cost-parsers/ohmypi-parser.ts
+/**
+* oh-my-pi (omp) JSONL parser (PAN-1989). Forked from pi-parser.ts (PAN-636).
+*
+* omp sessions live at:
+*   ~/.omp/agent/sessions/<encoded-cwd>/<timestamp>_<session-id>.jsonl
+*
+* Format (omp v3 — same as Pi v3):
+*   - First line:  { type: "session", version: 3, id, timestamp, cwd }
+*   - Subsequent:  every entry has an opaque `id` and a `parentId`. parentId
+*                  is null for the first non-session entry.
+*   - The graph is a tree (omp supports forking/branching), not a list.
+*
+* To compute usage for the *active* branch we walk leaf -> root via parentId
+* from the latest leaf (max timestamp among entries that have no children).
+* omp assistant messages report per-call usage — input/output tokens are NOT
+* cumulative across the conversation — so summing along the active branch is
+* correct without subtracting pre-compaction input.
+*
+* SessionUsage shape comes from jsonl-parser.ts (the Claude Code parser); we
+* map into it unchanged so all upstream consumers keep working.
+*/
+function isMessage(entry) {
+	return entry.type === "message";
+}
+function isAssistantMessage(entry) {
+	return isMessage(entry) && entry.message?.role === "assistant";
+}
+function pricingProviderFor(provider, model) {
+	const lowerProvider = provider?.toLowerCase() ?? "";
+	const lowerModel = model.toLowerCase();
+	if (lowerProvider === "openai" || lowerProvider === "openai-codex" || lowerModel.includes("gpt")) return "openai";
+	if (lowerProvider === "google" || lowerModel.includes("gemini")) return "google";
+	if (lowerProvider === "anthropic" || lowerModel.includes("claude")) return "anthropic";
+	if (lowerProvider === "kimi" || lowerProvider === "minimax" || lowerProvider === "zai" || lowerProvider === "zhipu" || lowerProvider === "custom" || lowerModel.includes("kimi") || lowerModel.includes("minimax") || lowerModel.includes("glm")) return "custom";
+	return null;
+}
+function computeCostFromPricing(provider, model, usage) {
+	const pricingProvider = pricingProviderFor(provider, model);
+	if (!pricingProvider) return {
+		cost: 0,
+		reason: "unknown-provider"
+	};
+	const pricing = getPricingSync(pricingProvider, model);
+	if (!pricing) return {
+		cost: 0,
+		reason: "unpriced-model"
+	};
+	return { cost: usage.inputTokens / 1e3 * pricing.inputPer1k + usage.outputTokens / 1e3 * pricing.outputPer1k + (usage.cacheReadTokens ?? 0) / 1e3 * (pricing.cacheReadPer1k ?? 0) + (usage.cacheWriteTokens ?? 0) / 1e3 * (pricing.cacheWrite5mPer1k ?? 0) };
+}
+function tsMs(timestamp) {
+	if (!timestamp) return 0;
+	const t = Date.parse(timestamp);
+	return Number.isFinite(t) ? t : 0;
+}
+/**
+* Parse a Pi session JSONL file into a SessionUsage record.
+*
+* Returns null if the file does not exist, is empty, or is unparseable. Errors
+* during line parsing are tolerated (the line is skipped); we never throw.
+*/
+function parseOhmypiSessionSync(filePath) {
+	if (!existsSync(filePath)) return null;
+	const result = parseOhmypiSessionContent(readFileSync(filePath, "utf8"), filePath);
+	return result.ok ? result.usage : null;
+}
+function parseOhmypiSessionCostResultSync(filePath) {
+	if (!existsSync(filePath)) return {
+		ok: false,
+		reason: "unreadable"
+	};
+	try {
+		return parseOhmypiSessionContent(readFileSync(filePath, "utf8"), filePath);
+	} catch {
+		return {
+			ok: false,
+			reason: "unreadable"
+		};
+	}
+}
+/**
+* Parse Pi session JSONL content. Exposed for tests and callers that already
+* have the file content in memory.
+*/
+function parseOhmypiSessionContent(content, filePath = "<inline>") {
+	const lines = content.split("\n").filter((l) => l.trim().length > 0);
+	if (lines.length === 0) return {
+		ok: false,
+		reason: "empty"
+	};
+	let root = null;
+	const entriesById = /* @__PURE__ */ new Map();
+	const childrenOf = /* @__PURE__ */ new Map();
+	const unknownTypesSeen = /* @__PURE__ */ new Set();
+	for (const line of lines) {
+		let parsed;
+		try {
+			parsed = JSON.parse(line);
+		} catch {
+			continue;
+		}
+		if (!parsed || typeof parsed !== "object") continue;
+		const entry = parsed;
+		if (entry.type === "session") {
+			root = entry;
+			continue;
+		}
+		if (!entry.id) continue;
+		if (!KNOWN_TYPES.has(entry.type)) {
+			if (!unknownTypesSeen.has(entry.type)) {
+				unknownTypesSeen.add(entry.type);
+				console.debug(`[ohmypi-parser] unknown entry type "${entry.type}" in ${filePath} — ignoring`);
+			}
+		}
+		entriesById.set(entry.id, entry);
+		const list = childrenOf.get(entry.parentId ?? null);
+		if (list) list.push(entry.id);
+		else childrenOf.set(entry.parentId ?? null, [entry.id]);
+	}
+	if (!root) return {
+		ok: false,
+		reason: "missing-session-root"
+	};
+	if (entriesById.size === 0) return {
+		ok: true,
+		usage: emptyUsage(filePath, root)
+	};
+	const leaves = [];
+	for (const entry of entriesById.values()) {
+		const kids = childrenOf.get(entry.id);
+		if (!kids || kids.length === 0) leaves.push(entry);
+	}
+	if (leaves.length === 0) leaves.push(...entriesById.values());
+	let latestLeaf = leaves[0];
+	for (const leaf of leaves) if (tsMs(leaf.timestamp) > tsMs(latestLeaf.timestamp)) latestLeaf = leaf;
+	const branch = [];
+	const visited = /* @__PURE__ */ new Set();
+	let cursor = latestLeaf;
+	while (cursor) {
+		if (visited.has(cursor.id)) break;
+		visited.add(cursor.id);
+		branch.push(cursor);
+		if (!cursor.parentId) break;
+		cursor = entriesById.get(cursor.parentId);
+	}
+	branch.reverse();
+	const totals = {
+		inputTokens: 0,
+		outputTokens: 0,
+		cacheReadTokens: 0,
+		cacheWriteTokens: 0
+	};
+	let costV2 = 0;
+	let messageCount = 0;
+	let costRecomputedFromTokens = 0;
+	const modelBreakdown = {};
+	const usageEvents = [];
+	const unpricedModels = [];
+	const modelsInOrder = [];
+	let compactionCount = 0;
+	let firstTs = null;
+	let lastTs = null;
+	for (const entry of branch) {
+		if (entry.type === "compaction_start" || entry.type === "session_compact") compactionCount += 1;
+		if (!firstTs && entry.timestamp) firstTs = entry.timestamp;
+		if (entry.timestamp) lastTs = entry.timestamp;
+		if (!isAssistantMessage(entry)) continue;
+		const usage = entry.message.usage;
+		if (!usage) continue;
+		const model = entry.message.model || "unknown";
+		const provider = typeof entry.message.provider === "string" ? entry.message.provider : null;
+		const input = usage.input ?? 0;
+		const output = usage.output ?? 0;
+		const cacheRead = usage.cacheRead ?? 0;
+		const cacheWrite = usage.cacheWrite ?? 0;
+		const tokenUsage = {
+			inputTokens: input,
+			outputTokens: output,
+			cacheReadTokens: cacheRead,
+			cacheWriteTokens: cacheWrite
+		};
+		const hasInlineCost = usage.cost?.total !== void 0;
+		let cost = usage.cost?.total ?? 0;
+		let warning;
+		if (!hasInlineCost && input + output + cacheRead + cacheWrite > 0) {
+			const computed = computeCostFromPricing(provider, model, tokenUsage);
+			cost = computed.cost;
+			if (computed.reason) {
+				unpricedModels.push({
+					provider,
+					model,
+					reason: computed.reason
+				});
+				warning = [{
+					type: "unpriced-model",
+					provider,
+					model,
+					reason: computed.reason
+				}];
+			}
+		}
+		const localComputed = hasInlineCost ? (usage.cost?.input ?? 0) + (usage.cost?.output ?? 0) + (usage.cost?.cacheRead ?? 0) + (usage.cost?.cacheWrite ?? 0) : cost;
+		totals.inputTokens += input;
+		totals.outputTokens += output;
+		totals.cacheReadTokens = (totals.cacheReadTokens ?? 0) + cacheRead;
+		totals.cacheWriteTokens = (totals.cacheWriteTokens ?? 0) + cacheWrite;
+		costV2 += cost;
+		costRecomputedFromTokens += localComputed;
+		messageCount += 1;
+		if (!modelBreakdown[model]) {
+			modelBreakdown[model] = {
+				cost: 0,
+				inputTokens: 0,
+				outputTokens: 0,
+				messageCount: 0,
+				cacheReadTokens: 0,
+				cacheWriteTokens: 0
+			};
+			modelsInOrder.push(model);
+		}
+		const slot = modelBreakdown[model];
+		slot.cost += cost;
+		slot.inputTokens += input;
+		slot.outputTokens += output;
+		slot.messageCount += 1;
+		slot.cacheReadTokens = (slot.cacheReadTokens ?? 0) + cacheRead;
+		slot.cacheWriteTokens = (slot.cacheWriteTokens ?? 0) + cacheWrite;
+		usageEvents.push({
+			requestId: `ohmypi:${root.id}:${entry.id}`,
+			timestamp: entry.timestamp || root.timestamp,
+			sessionId: root.id,
+			sessionFile: filePath,
+			provider,
+			model,
+			input,
+			output,
+			cacheRead,
+			cacheWrite,
+			cost,
+			...warning ? { warnings: warning } : {}
+		});
+	}
+	if (Math.abs(costV2 - costRecomputedFromTokens) > 1e-9) console.debug(`[ohmypi-parser] inline cost vs sum-of-line-items delta=${(costV2 - costRecomputedFromTokens).toFixed(6)} in ${filePath}`);
+	if (compactionCount > 0) console.debug(`[ohmypi-parser] active branch in ${filePath} has ${compactionCount} compaction event(s) — usage summed per-message (no double-count)`);
+	const display = modelsInOrder.length === 0 ? "unknown" : modelsInOrder.length === 1 ? modelsInOrder[0] : modelsInOrder.join(" → ");
+	return {
+		ok: true,
+		usage: {
+			sessionId: root.id,
+			sessionFile: filePath,
+			startTime: firstTs ?? root.timestamp,
+			endTime: lastTs ?? root.timestamp,
+			model: display,
+			usage: totals,
+			cost: costV2,
+			cost_v2: costV2,
+			messageCount,
+			modelBreakdown
+		},
+		usageEvents,
+		unpricedModels
+	};
+}
+function emptyUsage(filePath, root) {
+	return {
+		sessionId: root.id,
+		sessionFile: filePath,
+		startTime: root.timestamp,
+		endTime: root.timestamp,
+		model: "unknown",
+		usage: {
+			inputTokens: 0,
+			outputTokens: 0,
+			cacheReadTokens: 0,
+			cacheWriteTokens: 0
+		},
+		cost: 0,
+		cost_v2: 0,
+		messageCount: 0,
+		modelBreakdown: {}
+	};
+}
+var KNOWN_TYPES;
+var init_ohmypi_parser = __esmMin((() => {
+	init_cost();
+	init_errors();
+	KNOWN_TYPES = new Set([
+		"session",
+		"message",
+		"model_change",
+		"thinking_level_change",
+		"compaction_start",
+		"compaction_end",
+		"session_before_compact",
+		"session_compact",
+		"session_before_switch",
+		"session_before_fork",
+		"session_start"
+	]);
+}));
+//#endregion
 //#region ../../lib/overdeck/control-settings.ts
 function mapProjectConfig(raw, key) {
 	return {
@@ -17,7 +320,7 @@ function overdeckDb() {
 }
 /** Read a raw app_settings value synchronously. Returns null if not set. */
 function getSetting(key) {
-	const row = overdeckDb().prepare("SELECT value FROM app_settings WHERE key = ?").get(key);
+	const row = getOverdeckDatabaseSync(void 0, { readOnly: true }).prepare("SELECT value FROM app_settings WHERE key = ?").get(key);
 	return row ? row.value : null;
 }
 /** Write a raw app_settings value synchronously. */
@@ -164,7 +467,7 @@ function setMergeTrainEnabled(enabled) {
 * Sync version of SettingsResolver.getFlywheelRuntime().activeRunId.
 */
 function getFlywheelActiveRunIdSync() {
-	return getOverdeckDatabaseSync().prepare(`SELECT value FROM app_settings WHERE key = 'flywheel.active_run_id'`).get()?.value ?? null;
+	return getOverdeckDatabaseSync(void 0, { readOnly: true }).prepare(`SELECT value FROM app_settings WHERE key = 'flywheel.active_run_id'`).get()?.value ?? null;
 }
 var appSettings, issuePolicy, FlywheelConfig, FlywheelConfigPatch, FlywheelRuntime, IssuePolicy, ProjectKey, ProjectConfig, ProjectNotFound, SettingsResolver, SettingsWriter, ConfigResolver, DEACON_GLOBAL_PAUSE_KEY, CLOISTER_SPAWNS_PAUSED_KEY, FLYWHEEL_GLOBAL_PAUSE_KEY, FLYWHEEL_ACTIVE_RUN_ID_KEY, FLYWHEEL_AUTO_PICKUP_BACKLOG_KEY, FLYWHEEL_REQUIRE_UAT_BEFORE_MERGE_KEY, FLYWHEEL_MERGE_TRAIN_ENABLED_KEY, MERGE_TRAIN_ENABLED_KEY, DASHBOARD_LAST_CLEAN_SHUTDOWN_AT_KEY, BOOT_RECONCILIATION_DECISION_KEY, BOOT_RECONCILIATION_PER_AGENT_KEY, BOOT_RECONCILIATION_DECIDED_AT_KEY, BOOT_RECONCILIATION_BOOT_ID_KEY, BOOT_RECONCILIATION_BOOT_STARTED_AT_KEY, BOOT_RECONCILIATION_GRACE_DEADLINE_KEY, BOOT_RECONCILIATION_GRACE_EXTENSIONS_KEY, BOOT_RECONCILIATION_DECISIONS;
 var init_control_settings = __esmMin((() => {
@@ -438,6 +741,6 @@ var init_control_settings = __esmMin((() => {
 	})).add(HttpApiEndpoint.get("listProjects", "/projects", { success: Schema.Array(ProjectConfig) }));
 }));
 //#endregion
-export { setFlywheelGloballyPaused as C, setSetting as D, setMergeTrainEnabled as E, stampBootReconciliation as O, setFlywheelAutoPickupBacklog as S, setLastCleanShutdownAt as T, setBootReconciliationGrace as _, getFlywheelActiveRunIdSync as a, setDeaconGloballyPausedSync as b, init_control_settings as c, isDeaconGloballyPausedSync as d, isFlywheelAutoPickupBacklog as f, setBootReconciliationDecision as g, isMergeTrainEnabled as h, getFlywheelActiveRunId as i, isCloisterSpawnsPausedSync as l, isFlywheelRequireUatBeforeMerge as m, FLYWHEEL_GLOBAL_PAUSE_KEY as n, getLastCleanShutdownAt as o, isFlywheelGloballyPaused as p, getBootReconciliationState as r, getSetting as s, FLYWHEEL_ACTIVE_RUN_ID_KEY as t, isDeaconGloballyPaused as u, setCloisterSpawnsPausedSync as v, setFlywheelRequireUatBeforeMerge as w, setFlywheelActiveRunId as x, setDeaconGloballyPaused as y };
+export { parseOhmypiSessionCostResultSync as A, setFlywheelGloballyPaused as C, setSetting as D, setMergeTrainEnabled as E, stampBootReconciliation as O, setFlywheelAutoPickupBacklog as S, setLastCleanShutdownAt as T, setBootReconciliationGrace as _, getFlywheelActiveRunIdSync as a, setDeaconGloballyPausedSync as b, init_control_settings as c, isDeaconGloballyPausedSync as d, isFlywheelAutoPickupBacklog as f, setBootReconciliationDecision as g, isMergeTrainEnabled as h, getFlywheelActiveRunId as i, parseOhmypiSessionSync as j, init_ohmypi_parser as k, isCloisterSpawnsPausedSync as l, isFlywheelRequireUatBeforeMerge as m, FLYWHEEL_GLOBAL_PAUSE_KEY as n, getLastCleanShutdownAt as o, isFlywheelGloballyPaused as p, getBootReconciliationState as r, getSetting as s, FLYWHEEL_ACTIVE_RUN_ID_KEY as t, isDeaconGloballyPaused as u, setCloisterSpawnsPausedSync as v, setFlywheelRequireUatBeforeMerge as w, setFlywheelActiveRunId as x, setDeaconGloballyPaused as y };
 
-//# sourceMappingURL=control-settings-5k6ixdFW.js.map
+//# sourceMappingURL=control-settings-Db0uXgVM.js.map

package/server/{conversation-compaction-CSpVpxN6.js → conversation-compaction-B-1KETG9.js}

@@ -1,11 +1,11 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { p as loadConfigSync, t as init_config_yaml } from "./config-yaml-BwOEANMr.js";
-import { a as init_event_store, n as getEventStore } from "./event-store-D7qcJXuZ.js";
-import { G as init_agents, jr as getAgentRuntimeBaseCommand, ti as getProviderExportsForModel } from "./agent-state-Bb3UUxQm.js";
-import { n as isBackgroundFeatureEnabled, t as init_features } from "./features-CGopJXdU.js";
-import { t as init_conversation_service, u as findLastCompactBoundary } from "./conversation-service-BteE4ELK.js";
-import { r as init_smart_compaction, t as generateSmartSummary } from "./smart-compaction-Dy0gw1VH.js";
-import { a as generateFallbackSummary, l as init_summary_fork } from "./summary-fork-CZ88rhVx.js";
+import { p as loadConfigSync, t as init_config_yaml } from "./config-yaml-D60AnTIu.js";
+import { a as init_event_store, n as getEventStore } from "./event-store-DTns2XZP.js";
+import { Br as getAgentRuntimeBaseCommand, q as init_agents, ui as getProviderExportsForModel } from "./agent-state-FABw8neJ.js";
+import { n as isBackgroundFeatureEnabled, t as init_features } from "./features-DXWwktJB.js";
+import { t as init_conversation_service, u as findLastCompactBoundary } from "./conversation-service-BxIOd5ay.js";
+import { r as init_smart_compaction, t as generateSmartSummary } from "./smart-compaction-D1CNGdZx.js";
+import { a as generateFallbackSummary, l as init_summary_fork } from "./summary-fork-DhhaFhxZ.js";
 import { dirname, join } from "node:path";
 import { Effect } from "effect";
 import { existsSync } from "node:fs";
@@ -179,4 +179,4 @@ var init_conversation_compaction = __esmMin((() => {
 //#endregion
 export { init_conversation_compaction as a, shouldInterceptManualCompact as c, getConversationCompactionSettings as i, compactConversationNative as n, isCompacting as o, estimateContextTokens as r, maybeCompactBeforeRespawn as s, buildCompactionRuntimeInfo as t };
 
-//# sourceMappingURL=conversation-compaction-CSpVpxN6.js.map
+//# sourceMappingURL=conversation-compaction-B-1KETG9.js.map

package/server/{conversation-compaction-Ciit9O6k.js → conversation-compaction-DzMXGRiJ.js}

@@ -1,3 +1,3 @@
-import { a as init_conversation_compaction, c as shouldInterceptManualCompact, i as getConversationCompactionSettings, n as compactConversationNative, o as isCompacting, r as estimateContextTokens, s as maybeCompactBeforeRespawn, t as buildCompactionRuntimeInfo } from "./conversation-compaction-CSpVpxN6.js";
+import { a as init_conversation_compaction, c as shouldInterceptManualCompact, i as getConversationCompactionSettings, n as compactConversationNative, o as isCompacting, r as estimateContextTokens, s as maybeCompactBeforeRespawn, t as buildCompactionRuntimeInfo } from "./conversation-compaction-B-1KETG9.js";
 init_conversation_compaction();
 export { buildCompactionRuntimeInfo, compactConversationNative, estimateContextTokens, getConversationCompactionSettings, isCompacting, maybeCompactBeforeRespawn, shouldInterceptManualCompact };

package/server/{conversation-service-BxrB5lUT.js → conversation-service-BL-asWPX.js}

@@ -1,3 +1,3 @@
-import { i as computeContextUsage, t as init_conversation_service, u as findLastCompactBoundary } from "./conversation-service-BteE4ELK.js";
+import { i as computeContextUsage, t as init_conversation_service, u as findLastCompactBoundary } from "./conversation-service-BxIOd5ay.js";
 init_conversation_service();
 export { computeContextUsage, findLastCompactBoundary };

package/server/{conversation-service-BteE4ELK.js → conversation-service-BxIOd5ay.js}

@@ -1,9 +1,9 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Dr as MODEL_CAPABILITIES, Fi as init_paths, Mr as init_model_capabilities, Pr as resolveModelIdSync } from "./config-yaml-BwOEANMr.js";
-import { s as getHarnessBehavior } from "./src-DudQNYVw.js";
-import { o as getPricingSync, s as init_cost, t as calculateCostSync } from "./cost-CQKI6OCu.js";
-import { i as parseCodexSessionSync, n as init_codex_parser, t as init_behavior } from "./behavior-Bitko0mD.js";
-import { r as summarizeKimiEntries, t as init_kimi_parser } from "./kimi-parser-Dmhy3UlR.js";
+import { Ir as resolveModelIdSync, Pr as init_model_capabilities, kr as MODEL_CAPABILITIES, zi as init_paths } from "./config-yaml-D60AnTIu.js";
+import { s as getHarnessBehavior } from "./src-CdwN6WY6.js";
+import { o as getPricingSync, s as init_cost, t as calculateCostSync } from "./cost-DTuIRE4y.js";
+import { i as parseCodexSessionSync, n as init_codex_parser, t as init_behavior } from "./behavior-DCg8CIWC.js";
+import { r as summarizeKimiEntries, t as init_kimi_parser } from "./kimi-parser-OcWwmOqF.js";
 import "node:path";
 import "node:os";
 import { open, readFile, stat, watch } from "node:fs/promises";
@@ -367,6 +367,7 @@ async function parseCodexConversationMessages(sessionFile) {
 	const toolCallsByCallId = /* @__PURE__ */ new Map();
 	let totalTokens = 0;
 	let sequence = 0;
+	let trailingAgentMessageAt;
 	for (const line of lines) {
 		let entry;
 		try {
@@ -384,6 +385,7 @@ async function parseCodexConversationMessages(sessionFile) {
 				const text = typeof payload.message === "string" ? payload.message.trim() : "";
 				if (!text) continue;
 				sequence += 1;
+				trailingAgentMessageAt = ptype === "agent_message" ? createdAt : void 0;
 				messages.push({
 					id: `codex-${ptype === "user_message" ? "user" : "agent"}-${sequence}`,
 					role: ptype === "user_message" ? "user" : "assistant",
@@ -401,6 +403,7 @@ async function parseCodexConversationMessages(sessionFile) {
 		}
 		if (entry.type === "response_item") {
 			if (ptype === "function_call" || ptype === "custom_tool_call") {
+				trailingAgentMessageAt = void 0;
 				const callId = typeof payload.call_id === "string" ? payload.call_id : "";
 				const name = typeof payload.name === "string" ? payload.name : "tool";
 				const args = typeof payload.arguments === "string" ? payload.arguments : payload.input != null ? JSON.stringify(payload.input) : "";
@@ -445,6 +448,7 @@ async function parseCodexConversationMessages(sessionFile) {
 		messages,
 		workLog,
 		byteOffset: fileStats.size,
+		lastTurnCompletedAt: trailingAgentMessageAt,
 		streaming,
 		totalCost,
 		totalTokens,
@@ -1927,7 +1931,17 @@ async function summarizeConversationActivity(sessionFile, options = {}) {
 		lastSequence: 0
 	});
 	const lastMsg = messages[messages.length - 1];
-	const isWorking = Date.now() - mtimeMs < WORKING_STALENESS_MS && !lastTurnCompletedAt && (streaming || pendingToolUse.size > 0 || messages.length === 0 || lastMsg?.role === "user" || lastMsg?.role === "assistant" && !lastMsg.completedAt);
+	const workingFileRecent = Date.now() - mtimeMs < WORKING_STALENESS_MS;
+	const lastWork = workLog[workLog.length - 1];
+	let workGapWorking = false;
+	if (lastWork) {
+		const workTs = Date.parse(lastWork.createdAt || "");
+		if (!Number.isNaN(workTs) && Date.now() - workTs < WORKING_STALENESS_MS) {
+			const msgTs = Date.parse(lastMsg?.completedAt || lastMsg?.createdAt || "");
+			workGapWorking = Number.isNaN(msgTs) || workTs >= msgTs;
+		}
+	}
+	const isWorking = workingFileRecent && !lastTurnCompletedAt && (streaming || pendingToolUse.size > 0 || messages.length === 0 || lastMsg?.role === "user" || lastMsg?.role === "assistant" && !lastMsg.completedAt || workGapWorking);
 	const fileRecent = Date.now() - mtimeMs < 3e4;
 	let currentTool = null;
 	if (fileRecent) {
@@ -2221,4 +2235,4 @@ var init_conversation_service = __esmMin((() => {
 //#endregion
 export { parseAcpConversationMessages as S, isOhmypiSessionFile as _, contextUsageFromParseResult as a, parseCodexConversationMessages as b, parseEntireConversation as c, init_kimi_conversation_parser as d, parseKimiConversationMessages as f, init_ohmypi_conversation_parser as g, parsePiConversationMessages as h, computeContextUsage as i, parseFromLastCompactBoundary as l, isPiSessionFile as m, gateSnapshotEmission as n, summarizeConversationActivity as o, init_pi_conversation_parser as p, watchConversation as r, parseConversationMessages as s, init_conversation_service as t, findLastCompactBoundary as u, parseOhmypiConversationMessages as v, init_acp_conversation_parser as x, init_codex_conversation_parser as y };
 
-//# sourceMappingURL=conversation-service-BteE4ELK.js.map
+//# sourceMappingURL=conversation-service-BxIOd5ay.js.map

package/server/conversations-CEMfwMt-.js

@@ -0,0 +1,3 @@
+import { A as init_conversations, P as listConversations } from "./conversations-nS6QgYpD.js";
+init_conversations();
+export { listConversations };

package/server/{conversations-DhwxsOru.js → conversations-nS6QgYpD.js}

@@ -1,8 +1,8 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Fi as init_paths, Pi as getOverdeckHome } from "./config-yaml-BwOEANMr.js";
-import { T as isNull, _ as integer, a as EventBus, b as and, d as getOverdeckDatabaseSync, f as init_infra, g as real, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, v as init_drizzle_orm, w as isNotNull, x as eq } from "./infra-KTp9KV9u.js";
-import { f as resolveWorkspaceForCwd, o as init_resolver } from "./resolver-CuAULbLs.js";
-import { a as init_event_store, n as getEventStore } from "./event-store-D7qcJXuZ.js";
+import { Ri as getOverdeckHome, zi as init_paths } from "./config-yaml-D60AnTIu.js";
+import { T as isNull, _ as integer, a as EventBus, b as and, d as getOverdeckDatabaseSync, f as init_infra, g as real, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, v as init_drizzle_orm, w as isNotNull, x as eq } from "./infra-CJRi_5Wu.js";
+import { f as resolveWorkspaceForCwd, o as init_resolver } from "./resolver-C2QKOf09.js";
+import { a as init_event_store, n as getEventStore } from "./event-store-DTns2XZP.js";
 import { join } from "node:path";
 import { Context, Effect, Layer, Schema, Stream } from "effect";
 import { readFileSync } from "node:fs";
@@ -993,7 +993,9 @@ function markConversationEnded(name) {
 	overdeckDb().prepare(`UPDATE conversations SET ended_at = ?, status = 'ended' WHERE name = ?`).run(Date.now(), name);
 }
 function markConversationRunning(name) {
-	overdeckDb().prepare(`UPDATE conversations SET status = 'active', ended_at = NULL WHERE name = ? AND status != 'active'`).run(name);
+	overdeckDb().prepare(`UPDATE conversations SET status = 'active', ended_at = NULL, spawn_error = NULL,
+      fork_error = CASE WHEN fork_status = 'failed' THEN NULL ELSE fork_error END,
+      fork_status = CASE WHEN fork_status = 'failed' THEN NULL ELSE fork_status END WHERE name = ? AND status != 'active'`).run(name);
 }
 function markConversationActive(name) {
 	overdeckDb().prepare(`UPDATE conversations SET archived_at = NULL WHERE name = ?`).run(name);
@@ -1073,6 +1075,9 @@ function backfillConversationModel(name, model) {
 function updateForkStatus(name, status, error) {
 	overdeckDb().prepare(`UPDATE conversations SET fork_status = ?, fork_error = ? WHERE name = ?`).run(status, error ?? null, name);
 }
+function clearConversationFailureState(name) {
+	overdeckDb().prepare(`UPDATE conversations SET fork_status = NULL, fork_error = NULL, spawn_error = NULL WHERE name = ?`).run(name);
+}
 function getStuckForks() {
 	return overdeckDb().prepare(`${LEGACY_CONVERSATION_SELECT} WHERE c.fork_status IS NOT NULL AND c.fork_status != 'failed' ORDER BY c.created_at ASC`).all().map(rowToLegacyConversation);
 }
@@ -1621,6 +1626,6 @@ var init_conversations = __esmMin((() => {
 	nullIfEmpty = (value) => value?.trim() || null;
 }));
 //#endregion
-export { updateConversationCost as $, isAgentConversationName as A, recordConversationHandoff as B, getConversationByTmuxSession as C, loadEmbeddings as Ct, importLegacyConversation as D, updateEnrichment as Dt, hasOtherActiveConversationOnTmuxSession as E, topKCosine as Et, markConversationActive as F, setConversationEffort as G, resolveLiveSessionId as H, markConversationEnded as I, setConversationProjectKey as J, setConversationHarness as K, markConversationRunning as L, listArchivedConversationsWithEnrichment as M, listConversations as N, incrementForkRetryCount as O, upsertDiscoveredSession as Ot, listFavoritedIds as P, unarchiveConversation as Q, normalizeHarness as R, getConversationByName as S, insertEmbedding as St, getStuckForks as T, searchFtsSessions as Tt, setClearedToConvId as U, removeFavorite as V, setConversationClaudeSessionId as W, setForkRequest as X, setFavorite as Y, setImportedConversationLinks as Z, canRefineTitle as _, getDiscoveredSessionByJsonlPath as _t, ConversationName as a, updateSpawnError as at, getConversationByClaudeSessionId as b, getEmbedding as bt, ConversationsResolver as c, aggregateDiscoveredSessionCostBy as ct, TitleSource as d, countFtsSessions as dt, updateConversationDeliveryMethod as et, Transcript as f, ensureDiscoveredSessionsSchema as ft, backfillConversationModel as g, getDiscoveredSessionById as gt, archiveConversation as h, findEnrichedSessionIdsMissingEmbedding as ht, ConversationId as i, updateLastAttached as it, listArchivedConversations as j, init_conversations as k, Harness as l, buildFilterSql as lt, TranscriptsWriter as m, findDiscoveredSessions as mt, BackingFile as n, updateConversationTitle as nt, ConversationNotFound as o, findConversationForCostSessionSync as ot, TranscriptsResolver as p, findDiscoveredSessionIds as pt, setConversationModel as q, Conversation as r, updateForkStatus as rt, ConversationWriter as s, aggregateDiscoveredSessionCost as st, AlreadyArchived as t, updateConversationForkFallbackReason as tt, NotArchived as u, countDiscoveredSessions as ut, canReplaceTitle as v, getDiscoveredSessionBySessionId as vt, getConversationLedgerCosts as w, markEnrichmentFailed as wt, getConversationById as x, init_discovered_sessions as xt, createConversation as y, getDiscoveredStats as yt, reactivateConversationForSpawn as z };
+export { unarchiveConversation as $, init_conversations as A, reactivateConversationForSpawn as B, getConversationByName as C, insertEmbedding as Ct, hasOtherActiveConversationOnTmuxSession as D, topKCosine as Dt, getStuckForks as E, searchFtsSessions as Et, listFavoritedIds as F, setConversationClaudeSessionId as G, removeFavorite as H, markConversationActive as I, setConversationModel as J, setConversationEffort as K, markConversationEnded as L, listArchivedConversations as M, listArchivedConversationsWithEnrichment as N, importLegacyConversation as O, updateEnrichment as Ot, listConversations as P, setImportedConversationLinks as Q, markConversationRunning as R, getConversationById as S, init_discovered_sessions as St, getConversationLedgerCosts as T, markEnrichmentFailed as Tt, resolveLiveSessionId as U, recordConversationHandoff as V, setClearedToConvId as W, setFavorite as X, setConversationProjectKey as Y, setForkRequest as Z, canRefineTitle as _, getDiscoveredSessionById as _t, ConversationName as a, updateLastAttached as at, createConversation as b, getDiscoveredStats as bt, ConversationsResolver as c, aggregateDiscoveredSessionCost as ct, TitleSource as d, countDiscoveredSessions as dt, updateConversationCost as et, Transcript as f, countFtsSessions as ft, backfillConversationModel as g, findEnrichedSessionIdsMissingEmbedding as gt, archiveConversation as h, findDiscoveredSessions as ht, ConversationId as i, updateForkStatus as it, isAgentConversationName as j, incrementForkRetryCount as k, upsertDiscoveredSession as kt, Harness as l, aggregateDiscoveredSessionCostBy as lt, TranscriptsWriter as m, findDiscoveredSessionIds as mt, BackingFile as n, updateConversationForkFallbackReason as nt, ConversationNotFound as o, updateSpawnError as ot, TranscriptsResolver as p, ensureDiscoveredSessionsSchema as pt, setConversationHarness as q, Conversation as r, updateConversationTitle as rt, ConversationWriter as s, findConversationForCostSessionSync as st, AlreadyArchived as t, updateConversationDeliveryMethod as tt, NotArchived as u, buildFilterSql as ut, canReplaceTitle as v, getDiscoveredSessionByJsonlPath as vt, getConversationByTmuxSession as w, loadEmbeddings as wt, getConversationByClaudeSessionId as x, getEmbedding as xt, clearConversationFailureState as y, getDiscoveredSessionBySessionId as yt, normalizeHarness as z };
 
-//# sourceMappingURL=conversations-DhwxsOru.js.map
+//# sourceMappingURL=conversations-nS6QgYpD.js.map