@clinebot/core 0.0.11 → 0.0.13

package/src/session/unified-session-persistence-service.ts

@@ -27,7 +27,7 @@ import {
 import type {
 	CreateRootSessionWithArtifactsInput,
 	RootSessionArtifacts,
-	SessionRowShape,
+	SessionRow,
 	UpsertSubagentInput,
 } from "./session-service";
 
@@ -44,29 +44,6 @@ const SpawnAgentInputSchema = z
 
 // ── Metadata helpers ──────────────────────────────────────────────────
 
-function stringifyMetadata(
-	metadata: Record<string, unknown> | null | undefined,
-): string | null {
-	if (!metadata || Object.keys(metadata).length === 0) return null;
-	return JSON.stringify(metadata);
-}
-
-function parseMetadataJson(
-	raw: string | null | undefined,
-): Record<string, unknown> | undefined {
-	const trimmed = raw?.trim();
-	if (!trimmed) return undefined;
-	try {
-		const parsed = JSON.parse(trimmed) as unknown;
-		if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-			return parsed as Record<string, unknown>;
-		}
-	} catch {
-		// Ignore malformed metadata payloads.
-	}
-	return undefined;
-}
-
 function normalizeTitle(title?: string | null): string | undefined {
 	const trimmed = title?.trim();
 	return trimmed ? trimmed.slice(0, MAX_TITLE_LENGTH) : undefined;
@@ -129,7 +106,7 @@ export interface PersistedSessionUpdateInput {
 	endedAt?: string | null;
 	exitCode?: number | null;
 	prompt?: string | null;
-	metadataJson?: string | null;
+	metadata?: Record<string, unknown> | null;
 	title?: string | null;
 	parentSessionId?: string | null;
 	parentAgentId?: string | null;
@@ -140,13 +117,13 @@ export interface PersistedSessionUpdateInput {
 
 export interface SessionPersistenceAdapter {
 	ensureSessionsDir(): string;
-	upsertSession(row: SessionRowShape): Promise<void>;
-	getSession(sessionId: string): Promise<SessionRowShape | undefined>;
+	upsertSession(row: SessionRow): Promise<void>;
+	getSession(sessionId: string): Promise<SessionRow | undefined>;
 	listSessions(options: {
 		limit: number;
 		parentSessionId?: string;
 		status?: string;
-	}): Promise<SessionRowShape[]>;
+	}): Promise<SessionRow[]>;
 	updateSession(
 		input: PersistedSessionUpdateInput,
 	): Promise<{ updated: boolean; statusLock: number }>;
@@ -167,9 +144,15 @@ export interface SessionPersistenceAdapter {
 
 export class UnifiedSessionPersistenceService {
 	private readonly teamTaskSessionsByAgent = new Map<string, string[]>();
+	private readonly teamTaskLastHeartbeatBySession = new Map<string, number>();
+	private readonly teamTaskLastProgressLineBySession = new Map<
+		string,
+		string
+	>();
 	protected readonly artifacts: SessionArtifacts;
 	private static readonly STALE_REASON = "failed_external_process_exit";
 	private static readonly STALE_SOURCE = "stale_session_reconciler";
+	private static readonly TEAM_HEARTBEAT_LOG_INTERVAL_MS = 30_000;
 
 	constructor(private readonly adapter: SessionPersistenceAdapter) {
 		this.artifacts = new SessionArtifacts(() => this.ensureSessionsDir());
@@ -215,7 +198,7 @@ export class UnifiedSessionPersistenceService {
 	}
 
 	private buildManifestFromRow(
-		row: SessionRowShape,
+		row: SessionRow,
 		overrides?: {
 			status?: SessionStatus;
 			endedAt?: string | null;
@@ -225,25 +208,25 @@ export class UnifiedSessionPersistenceService {
 	): SessionManifest {
 		return SessionManifestSchema.parse({
 			version: 1,
-			session_id: row.session_id,
+			session_id: row.sessionId,
 			source: row.source,
 			pid: row.pid,
-			started_at: row.started_at,
-			ended_at: overrides?.endedAt ?? row.ended_at ?? undefined,
-			exit_code: overrides?.exitCode ?? row.exit_code ?? undefined,
+			started_at: row.startedAt,
+			ended_at: overrides?.endedAt ?? row.endedAt ?? undefined,
+			exit_code: overrides?.exitCode ?? row.exitCode ?? undefined,
 			status: overrides?.status ?? row.status,
-			interactive: row.interactive === 1,
+			interactive: row.interactive,
 			provider: row.provider,
 			model: row.model,
 			cwd: row.cwd,
-			workspace_root: row.workspace_root,
-			team_name: row.team_name ?? undefined,
-			enable_tools: row.enable_tools === 1,
-			enable_spawn: row.enable_spawn === 1,
-			enable_teams: row.enable_teams === 1,
+			workspace_root: row.workspaceRoot,
+			team_name: row.teamName ?? undefined,
+			enable_tools: row.enableTools,
+			enable_spawn: row.enableSpawn,
+			enable_teams: row.enableTeams,
 			prompt: row.prompt ?? undefined,
-			metadata: overrides?.metadata ?? parseMetadataJson(row.metadata_json),
-			messages_path: row.messages_path ?? undefined,
+			metadata: overrides?.metadata ?? row.metadata ?? undefined,
+			messages_path: row.messagesPath ?? undefined,
 		});
 	}
 
@@ -251,7 +234,7 @@ export class UnifiedSessionPersistenceService {
 
 	private async resolveArtifactPath(
 		sessionId: string,
-		kind: "transcript_path" | "hook_path" | "messages_path",
+		kind: "transcriptPath" | "hookPath" | "messagesPath",
 		fallback: (id: string) => string,
 	): Promise<string> {
 		const row = await this.adapter.getSession(sessionId);
@@ -317,34 +300,34 @@ export class UnifiedSessionPersistenceService {
 		});
 
 		await this.adapter.upsertSession({
-			session_id: sessionId,
+			sessionId,
 			source: input.source,
 			pid: input.pid,
-			started_at: startedAt,
-			ended_at: null,
-			exit_code: null,
+			startedAt,
+			endedAt: null,
+			exitCode: null,
 			status: "running",
-			status_lock: 0,
-			interactive: input.interactive ? 1 : 0,
+			statusLock: 0,
+			interactive: input.interactive,
 			provider: input.provider,
 			model: input.model,
 			cwd: input.cwd,
-			workspace_root: input.workspaceRoot,
-			team_name: input.teamName ?? null,
-			enable_tools: input.enableTools ? 1 : 0,
-			enable_spawn: input.enableSpawn ? 1 : 0,
-			enable_teams: input.enableTeams ? 1 : 0,
-			parent_session_id: null,
-			parent_agent_id: null,
-			agent_id: null,
-			conversation_id: null,
-			is_subagent: 0,
+			workspaceRoot: input.workspaceRoot,
+			teamName: input.teamName ?? null,
+			enableTools: input.enableTools,
+			enableSpawn: input.enableSpawn,
+			enableTeams: input.enableTeams,
+			parentSessionId: null,
+			parentAgentId: null,
+			agentId: null,
+			conversationId: null,
+			isSubagent: false,
 			prompt: manifest.prompt ?? null,
-			metadata_json: stringifyMetadata(sanitizeMetadata(manifest.metadata)),
-			transcript_path: transcriptPath,
-			hook_path: hookPath,
-			messages_path: messagesPath,
-			updated_at: nowIso(),
+			metadata: sanitizeMetadata(manifest.metadata),
+			transcriptPath,
+			hookPath,
+			messagesPath,
+			updatedAt: nowIso(),
 		});
 
 		writeEmptyMessagesFile(messagesPath, startedAt);
@@ -361,8 +344,7 @@ export class UnifiedSessionPersistenceService {
 	): Promise<{ updated: boolean; endedAt?: string }> {
 		for (let attempt = 0; attempt < OCC_MAX_RETRIES; attempt++) {
 			const row = await this.adapter.getSession(sessionId);
-			if (!row || typeof row.status_lock !== "number")
-				return { updated: false };
+			if (!row) return { updated: false };
 
 			const endedAt = nowIso();
 			const changed = await this.adapter.updateSession({
@@ -370,7 +352,7 @@ export class UnifiedSessionPersistenceService {
 				status,
 				endedAt,
 				exitCode: typeof exitCode === "number" ? exitCode : null,
-				expectedStatusLock: row.status_lock,
+				expectedStatusLock: row.statusLock,
 			});
 			if (changed.updated) {
 				if (status === "cancelled") {
@@ -390,10 +372,9 @@ export class UnifiedSessionPersistenceService {
 	}): Promise<{ updated: boolean }> {
 		for (let attempt = 0; attempt < OCC_MAX_RETRIES; attempt++) {
 			const row = await this.adapter.getSession(input.sessionId);
-			if (!row || typeof row.status_lock !== "number")
-				return { updated: false };
+			if (!row) return { updated: false };
 
-			const existingMeta = parseMetadataJson(row.metadata_json);
+			const existingMeta = row.metadata ?? undefined;
 			const baseMeta =
 				input.metadata !== undefined
 					? (sanitizeMetadata(input.metadata) ?? {})
@@ -425,11 +406,13 @@ export class UnifiedSessionPersistenceService {
 			const changed = await this.adapter.updateSession({
 				sessionId: input.sessionId,
 				prompt: input.prompt,
-				metadataJson: hasMetadataChange
-					? stringifyMetadata(baseMeta)
+				metadata: hasMetadataChange
+					? Object.keys(baseMeta).length > 0
+						? baseMeta
+						: null
 					: undefined,
 				title: nextTitle,
-				expectedStatusLock: row.status_lock,
+				expectedStatusLock: row.statusLock,
 			});
 			if (!changed.updated) continue;
 
@@ -476,7 +459,7 @@ export class UnifiedSessionPersistenceService {
 	// ── Subagent sessions ─────────────────────────────────────────────
 
 	private buildSubsessionRow(
-		root: SessionRowShape,
+		root: SessionRow,
 		opts: {
 			sessionId: string;
 			parentSessionId: string;
@@ -489,38 +472,36 @@ export class UnifiedSessionPersistenceService {
 			hookPath: string;
 			messagesPath: string;
 		},
-	): SessionRowShape {
+	): SessionRow {
 		return {
-			session_id: opts.sessionId,
+			sessionId: opts.sessionId,
 			source: SUBSESSION_SOURCE,
 			pid: process.ppid,
-			started_at: opts.startedAt,
-			ended_at: null,
-			exit_code: null,
+			startedAt: opts.startedAt,
+			endedAt: null,
+			exitCode: null,
 			status: "running",
-			status_lock: 0,
-			interactive: 0,
+			statusLock: 0,
+			interactive: false,
 			provider: root.provider,
 			model: root.model,
 			cwd: root.cwd,
-			workspace_root: root.workspace_root,
-			team_name: root.team_name ?? null,
-			enable_tools: root.enable_tools,
-			enable_spawn: root.enable_spawn,
-			enable_teams: root.enable_teams,
-			parent_session_id: opts.parentSessionId,
-			parent_agent_id: opts.parentAgentId,
-			agent_id: opts.agentId,
-			conversation_id: opts.conversationId ?? null,
-			is_subagent: 1,
+			workspaceRoot: root.workspaceRoot,
+			teamName: root.teamName ?? null,
+			enableTools: root.enableTools,
+			enableSpawn: root.enableSpawn,
+			enableTeams: root.enableTeams,
+			parentSessionId: opts.parentSessionId,
+			parentAgentId: opts.parentAgentId,
+			agentId: opts.agentId,
+			conversationId: opts.conversationId ?? null,
+			isSubagent: true,
 			prompt: opts.prompt,
-			metadata_json: stringifyMetadata(
-				resolveMetadataWithTitle({ prompt: opts.prompt }),
-			),
-			transcript_path: opts.transcriptPath,
-			hook_path: opts.hookPath,
-			messages_path: opts.messagesPath,
-			updated_at: opts.startedAt,
+			metadata: resolveMetadataWithTitle({ prompt: opts.prompt }),
+			transcriptPath: opts.transcriptPath,
+			hookPath: opts.hookPath,
+			messagesPath: opts.messagesPath,
+			updatedAt: opts.startedAt,
 		};
 	}
 
@@ -576,13 +557,11 @@ export class UnifiedSessionPersistenceService {
 			agentId: input.agentId,
 			conversationId: input.conversationId,
 			prompt: existing.prompt ?? prompt ?? null,
-			metadataJson: stringifyMetadata(
-				resolveMetadataWithTitle({
-					metadata: parseMetadataJson(existing.metadata_json),
-					prompt: existing.prompt ?? prompt ?? null,
-				}),
-			),
-			expectedStatusLock: existing.status_lock,
+			metadata: resolveMetadataWithTitle({
+				metadata: existing.metadata ?? undefined,
+				prompt: existing.prompt ?? prompt ?? null,
+			}),
+			expectedStatusLock: existing.statusLock,
 		});
 		return sessionId;
 	}
@@ -616,7 +595,7 @@ export class UnifiedSessionPersistenceService {
 	): Promise<void> {
 		const path = await this.resolveArtifactPath(
 			subSessionId,
-			"hook_path",
+			"hookPath",
 			(id) => this.artifacts.sessionHookPath(id),
 		);
 		appendFileSync(
@@ -633,7 +612,7 @@ export class UnifiedSessionPersistenceService {
 		if (!line.trim()) return;
 		const path = await this.resolveArtifactPath(
 			subSessionId,
-			"transcript_path",
+			"transcriptPath",
 			(id) => this.artifacts.sessionTranscriptPath(id),
 		);
 		appendFileSync(path, `${line}\n`, "utf8");
@@ -646,7 +625,7 @@ export class UnifiedSessionPersistenceService {
 	): Promise<void> {
 		const path = await this.resolveArtifactPath(
 			sessionId,
-			"messages_path",
+			"messagesPath",
 			(id) => this.artifacts.sessionMessagesPath(id),
 		);
 		const payload: {
@@ -676,7 +655,7 @@ export class UnifiedSessionPersistenceService {
 		status: SessionStatus,
 	): Promise<void> {
 		const row = await this.adapter.getSession(subSessionId);
-		if (!row || typeof row.status_lock !== "number") return;
+		if (!row) return;
 
 		const endedAt = status === "running" ? null : nowIso();
 		const exitCode = status === "running" ? null : status === "failed" ? 1 : 0;
@@ -685,7 +664,7 @@ export class UnifiedSessionPersistenceService {
 			status,
 			endedAt,
 			exitCode,
-			expectedStatusLock: row.status_lock,
+			expectedStatusLock: row.statusLock,
 		});
 	}
 
@@ -700,7 +679,7 @@ export class UnifiedSessionPersistenceService {
 			status: "running",
 		});
 		for (const row of rows) {
-			await this.applySubagentStatusBySessionId(row.session_id, status);
+			await this.applySubagentStatusBySessionId(row.sessionId, status);
 		}
 	}
 
@@ -763,6 +742,45 @@ export class UnifiedSessionPersistenceService {
 			summary ?? `[done] ${status}`,
 		);
 		await this.applySubagentStatusBySessionId(sessionId, status);
+		this.teamTaskLastHeartbeatBySession.delete(sessionId);
+		this.teamTaskLastProgressLineBySession.delete(sessionId);
+	}
+
+	async onTeamTaskProgress(
+		rootSessionId: string,
+		agentId: string,
+		progress: string,
+		options?: { kind?: "heartbeat" | "progress" | "text" },
+	): Promise<void> {
+		const key = this.teamTaskQueueKey(rootSessionId, agentId);
+		const sessionId = this.teamTaskSessionsByAgent.get(key)?.[0];
+		if (!sessionId) return;
+
+		const trimmed = progress.trim();
+		if (!trimmed) return;
+
+		const kind = options?.kind ?? "progress";
+		if (kind === "heartbeat") {
+			const now = Date.now();
+			const last = this.teamTaskLastHeartbeatBySession.get(sessionId) ?? 0;
+			if (
+				now - last <
+				UnifiedSessionPersistenceService.TEAM_HEARTBEAT_LOG_INTERVAL_MS
+			) {
+				return;
+			}
+			this.teamTaskLastHeartbeatBySession.set(sessionId, now);
+		}
+
+		const line =
+			kind === "heartbeat"
+				? "[progress] heartbeat"
+				: kind === "text"
+					? `[progress] text: ${trimmed}`
+					: `[progress] ${trimmed}`;
+		if (this.teamTaskLastProgressLineBySession.get(sessionId) === line) return;
+		this.teamTaskLastProgressLineBySession.set(sessionId, line);
+		await this.appendSubagentTranscriptLine(sessionId, line);
 	}
 
 	// ── SubAgent lifecycle ────────────────────────────────────────────
@@ -833,20 +851,20 @@ export class UnifiedSessionPersistenceService {
 	}
 
 	private async reconcileDeadRunningSession(
-		row: SessionRowShape,
-	): Promise<SessionRowShape | undefined> {
+		row: SessionRow,
+	): Promise<SessionRow | undefined> {
 		if (row.status !== "running" || this.isPidAlive(row.pid)) return row;
 
 		const detectedAt = nowIso();
 		const reason = UnifiedSessionPersistenceService.STALE_REASON;
 
 		for (let attempt = 0; attempt < OCC_MAX_RETRIES; attempt++) {
-			const latest = await this.adapter.getSession(row.session_id);
+			const latest = await this.adapter.getSession(row.sessionId);
 			if (!latest) return undefined;
 			if (latest.status !== "running") return latest;
 
 			const nextMetadata = {
-				...(parseMetadataJson(latest.metadata_json) ?? {}),
+				...(latest.metadata ?? {}),
 				terminal_marker: reason,
 				terminal_marker_at: detectedAt,
 				terminal_marker_pid: latest.pid,
@@ -854,16 +872,16 @@ export class UnifiedSessionPersistenceService {
 			};
 
 			const changed = await this.adapter.updateSession({
-				sessionId: latest.session_id,
+				sessionId: latest.sessionId,
 				status: "failed",
 				endedAt: detectedAt,
 				exitCode: 1,
-				metadataJson: stringifyMetadata(nextMetadata),
-				expectedStatusLock: latest.status_lock,
+				metadata: nextMetadata,
+				expectedStatusLock: latest.statusLock,
 			});
 			if (!changed.updated) continue;
 
-			await this.applyStatusToRunningChildSessions(latest.session_id, "failed");
+			await this.applyStatusToRunningChildSessions(latest.sessionId, "failed");
 
 			const manifest = this.buildManifestFromRow(latest, {
 				status: "failed",
@@ -871,24 +889,24 @@ export class UnifiedSessionPersistenceService {
 				exitCode: 1,
 				metadata: nextMetadata,
 			});
-			const { path: manifestPath } = this.readManifestFile(latest.session_id);
+			const { path: manifestPath } = this.readManifestFile(latest.sessionId);
 			this.writeManifestFile(manifestPath, manifest);
 
 			// Write termination markers to hook + transcript files
 			appendFileSync(
-				latest.hook_path,
+				latest.hookPath,
 				`${JSON.stringify({
 					ts: detectedAt,
 					hookName: "session_shutdown",
 					reason,
-					sessionId: latest.session_id,
+					sessionId: latest.sessionId,
 					pid: latest.pid,
 					source: UnifiedSessionPersistenceService.STALE_SOURCE,
 				})}\n`,
 				"utf8",
 			);
 			appendFileSync(
-				latest.transcript_path,
+				latest.transcriptPath,
 				`[shutdown] ${reason} (pid=${latest.pid})\n`,
 				"utf8",
 			);
@@ -896,27 +914,27 @@ export class UnifiedSessionPersistenceService {
 			return {
 				...latest,
 				status: "failed",
-				ended_at: detectedAt,
-				exit_code: 1,
-				metadata_json: stringifyMetadata(nextMetadata),
-				status_lock: changed.statusLock,
-				updated_at: detectedAt,
+				endedAt: detectedAt,
+				exitCode: 1,
+				metadata: nextMetadata,
+				statusLock: changed.statusLock,
+				updatedAt: detectedAt,
 			};
 		}
-		return await this.adapter.getSession(row.session_id);
+		return await this.adapter.getSession(row.sessionId);
 	}
 
 	// ── List / reconcile / delete ─────────────────────────────────────
 
-	async listSessions(limit = 200): Promise<SessionRowShape[]> {
+	async listSessions(limit = 200): Promise<SessionRow[]> {
 		const requestedLimit = Math.max(1, Math.floor(limit));
 		const scanLimit = Math.min(requestedLimit * 5, 2000);
 		await this.reconcileDeadSessions(scanLimit);
 
 		const rows = await this.adapter.listSessions({ limit: scanLimit });
 		return rows.slice(0, requestedLimit).map((row) => {
-			const meta = sanitizeMetadata(parseMetadataJson(row.metadata_json));
-			const { manifest } = this.readManifestFile(row.session_id);
+			const meta = sanitizeMetadata(row.metadata ?? undefined);
+			const { manifest } = this.readManifestFile(row.sessionId);
 			const manifestTitle = normalizeTitle(
 				typeof manifest?.metadata?.title === "string"
 					? (manifest.metadata.title as string)
@@ -925,7 +943,7 @@ export class UnifiedSessionPersistenceService {
 			const resolved = manifestTitle
 				? { ...(meta ?? {}), title: manifestTitle }
 				: meta;
-			return { ...row, metadata_json: stringifyMetadata(resolved) };
+			return { ...row, metadata: resolved };
 		});
 	}
 
@@ -951,26 +969,26 @@ export class UnifiedSessionPersistenceService {
 
 		await this.adapter.deleteSession(id, false);
 
-		if (!row.is_subagent) {
+		if (!row.isSubagent) {
 			const children = await this.adapter.listSessions({
 				limit: 2000,
 				parentSessionId: id,
 			});
 			await this.adapter.deleteSession(id, true);
 			for (const child of children) {
-				unlinkIfExists(child.transcript_path);
-				unlinkIfExists(child.hook_path);
-				unlinkIfExists(child.messages_path);
+				unlinkIfExists(child.transcriptPath);
+				unlinkIfExists(child.hookPath);
+				unlinkIfExists(child.messagesPath);
 				unlinkIfExists(
-					this.artifacts.sessionManifestPath(child.session_id, false),
+					this.artifacts.sessionManifestPath(child.sessionId, false),
 				);
-				this.artifacts.removeSessionDirIfEmpty(child.session_id);
+				this.artifacts.removeSessionDirIfEmpty(child.sessionId);
 			}
 		}
 
-		unlinkIfExists(row.transcript_path);
-		unlinkIfExists(row.hook_path);
-		unlinkIfExists(row.messages_path);
+		unlinkIfExists(row.transcriptPath);
+		unlinkIfExists(row.hookPath);
+		unlinkIfExists(row.messagesPath);
 		unlinkIfExists(this.artifacts.sessionManifestPath(id, false));
 		this.artifacts.removeSessionDirIfEmpty(id);
 		return { deleted: true };

package/src/session/utils/helpers.ts

@@ -2,8 +2,7 @@ import type { AgentConfig, AgentEvent, AgentResult } from "@clinebot/agents";
 import type { LlmsProviders } from "@clinebot/llms";
 import type { SessionSource } from "../../types/common";
 import type { SessionRecord } from "../../types/sessions";
-import { nowIso } from "../session-artifacts";
-import type { SessionRowShape } from "../session-service";
+import type { SessionRow } from "../session-service";
 import type { StoredMessageWithMetadata } from "./types";
 
 const WORKSPACE_CONFIGURATION_MARKER = "# Workspace Configuration";
@@ -107,52 +106,34 @@ export function withLatestAssistantTurnMetadata(
 	return next;
 }
 
-export function toSessionRecord(row: SessionRowShape): SessionRecord {
-	const metadata =
-		typeof row.metadata_json === "string" && row.metadata_json.trim().length > 0
-			? (() => {
-					try {
-						const parsed = JSON.parse(row.metadata_json) as unknown;
-						if (
-							parsed &&
-							typeof parsed === "object" &&
-							!Array.isArray(parsed)
-						) {
-							return parsed as Record<string, unknown>;
-						}
-					} catch {
-						// Ignore malformed metadata payloads.
-					}
-					return undefined;
-				})()
-			: undefined;
+export function toSessionRecord(row: SessionRow): SessionRecord {
 	return {
-		sessionId: row.session_id,
+		sessionId: row.sessionId,
 		source: row.source as SessionSource,
 		pid: row.pid,
-		startedAt: row.started_at,
-		endedAt: row.ended_at ?? null,
-		exitCode: row.exit_code ?? null,
+		startedAt: row.startedAt,
+		endedAt: row.endedAt ?? null,
+		exitCode: row.exitCode ?? null,
 		status: row.status,
-		interactive: row.interactive === 1,
+		interactive: row.interactive,
 		provider: row.provider,
 		model: row.model,
 		cwd: row.cwd,
-		workspaceRoot: row.workspace_root,
-		teamName: row.team_name ?? undefined,
-		enableTools: row.enable_tools === 1,
-		enableSpawn: row.enable_spawn === 1,
-		enableTeams: row.enable_teams === 1,
-		parentSessionId: row.parent_session_id ?? undefined,
-		parentAgentId: row.parent_agent_id ?? undefined,
-		agentId: row.agent_id ?? undefined,
-		conversationId: row.conversation_id ?? undefined,
-		isSubagent: row.is_subagent === 1,
+		workspaceRoot: row.workspaceRoot,
+		teamName: row.teamName ?? undefined,
+		enableTools: row.enableTools,
+		enableSpawn: row.enableSpawn,
+		enableTeams: row.enableTeams,
+		parentSessionId: row.parentSessionId ?? undefined,
+		parentAgentId: row.parentAgentId ?? undefined,
+		agentId: row.agentId ?? undefined,
+		conversationId: row.conversationId ?? undefined,
+		isSubagent: row.isSubagent,
 		prompt: row.prompt ?? undefined,
-		metadata,
-		transcriptPath: row.transcript_path,
-		hookPath: row.hook_path,
-		messagesPath: row.messages_path ?? undefined,
-		updatedAt: row.updated_at ?? nowIso(),
+		metadata: row.metadata ?? undefined,
+		transcriptPath: row.transcriptPath,
+		hookPath: row.hookPath,
+		messagesPath: row.messagesPath ?? undefined,
+		updatedAt: row.updatedAt,
 	};
 }

package/src/session/utils/types.ts

@@ -22,10 +22,20 @@ export type ActiveSession = {
 	activeTeamRunIds: Set<string>;
 	pendingTeamRunUpdates: TeamRunUpdate[];
 	teamRunWaiters: Array<() => void>;
+	pendingPrompts: PendingPrompt[];
+	drainingPendingPrompts: boolean;
 	pluginSandboxShutdown?: () => Promise<void>;
 	turnUsageBaseline?: SessionAccumulatedUsage;
 };
 
+export type PendingPrompt = {
+	id: string;
+	prompt: string;
+	delivery: "queue" | "steer";
+	userImages?: string[];
+	userFiles?: string[];
+};
+
 export type TeamRunUpdate = {
 	runId: string;
 	agentId: string;