@clinebot/core 0.0.28 → 0.0.30

package/src/session/{unified-session-persistence-service.ts → persistence-service.ts}

@@ -4,15 +4,13 @@ import {
 	readFileSync,
 	writeFileSync,
 } from "node:fs";
-import type {
-	HookEventPayload,
-	SubAgentEndContext,
-	SubAgentStartContext,
-} from "@clinebot/agents";
-import type * as LlmsProviders from "@clinebot/llms/providers";
-import { normalizeUserInput, resolveRootSessionId } from "@clinebot/shared";
+import type * as LlmsProviders from "@clinebot/llms";
+import type { AgentResult } from "@clinebot/shared";
+import { resolveRootSessionId } from "@clinebot/shared";
 import { nanoid } from "nanoid";
 import { z } from "zod";
+import type { HookEventPayload } from "../hooks";
+import type { SubAgentEndContext, SubAgentStartContext } from "../team";
 import { SessionSource, type SessionStatus } from "../types/common";
 import { nowIso, SessionArtifacts, unlinkIfExists } from "./session-artifacts";
 import {
@@ -30,9 +28,28 @@ import type {
 	SessionRow,
 	UpsertSubagentInput,
 } from "./session-service";
+import {
+	buildManifestFromRow,
+	buildMessagesFilePayload,
+	deriveTitleFromPrompt,
+	normalizeStoredMessagesForPersistence,
+	normalizeTitle,
+	resolveMessagesFileContext,
+	resolveMetadataWithTitle,
+	sanitizeMetadata,
+	withLatestAssistantTurnMetadata,
+	withOccRetry,
+	writeEmptyMessagesFile,
+} from "./utils/helpers";
+import type {
+	PersistedSessionUpdateInput,
+	SessionPersistenceAdapter,
+	StoredMessageWithMetadata,
+} from "./utils/types";
+
+export type { PersistedSessionUpdateInput, SessionPersistenceAdapter };
 
 const SUBSESSION_SOURCE = SessionSource.SUBAGENT;
-const MAX_TITLE_LENGTH = 120;
 const OCC_MAX_RETRIES = 4;
 
 const SpawnAgentInputSchema = z.looseObject({
@@ -40,104 +57,6 @@ const SpawnAgentInputSchema = z.looseObject({
 	systemPrompt: z.string().optional(),
 });
 
-// ── Metadata helpers ──────────────────────────────────────────────────
-
-function normalizeTitle(title?: string | null): string | undefined {
-	const trimmed = title?.trim();
-	return trimmed ? trimmed.slice(0, MAX_TITLE_LENGTH) : undefined;
-}
-
-function deriveTitleFromPrompt(prompt?: string | null): string | undefined {
-	const normalized = normalizeUserInput(prompt ?? "").trim();
-	if (!normalized) return undefined;
-	return normalizeTitle(normalized.split("\n")[0]?.trim());
-}
-
-/** Strip invalid title from metadata, drop empty objects. */
-function sanitizeMetadata(
-	metadata: Record<string, unknown> | null | undefined,
-): Record<string, unknown> | undefined {
-	if (!metadata) return undefined;
-	const next = { ...metadata };
-	const title = normalizeTitle(
-		typeof next.title === "string" ? next.title : undefined,
-	);
-	if (title) {
-		next.title = title;
-	} else {
-		delete next.title;
-	}
-	return Object.keys(next).length > 0 ? next : undefined;
-}
-
-/** Resolve title from explicit title, prompt, or existing metadata. */
-function resolveMetadataWithTitle(input: {
-	metadata?: Record<string, unknown> | null;
-	title?: string | null;
-	prompt?: string | null;
-}): Record<string, unknown> | undefined {
-	const base = sanitizeMetadata(input.metadata) ?? {};
-	const title =
-		input.title !== undefined
-			? normalizeTitle(input.title)
-			: deriveTitleFromPrompt(input.prompt);
-	if (title) base.title = title;
-	return Object.keys(base).length > 0 ? base : undefined;
-}
-
-// ── File helpers ──────────────────────────────────────────────────────
-
-function writeEmptyMessagesFile(path: string, startedAt: string): void {
-	writeFileSync(
-		path,
-		`${JSON.stringify({ version: 1, updated_at: startedAt, messages: [] }, null, 2)}\n`,
-		"utf8",
-	);
-}
-
-// ── Interfaces ────────────────────────────────────────────────────────
-
-export interface PersistedSessionUpdateInput {
-	sessionId: string;
-	expectedStatusLock?: number;
-	status?: SessionStatus;
-	endedAt?: string | null;
-	exitCode?: number | null;
-	prompt?: string | null;
-	metadata?: Record<string, unknown> | null;
-	title?: string | null;
-	parentSessionId?: string | null;
-	parentAgentId?: string | null;
-	agentId?: string | null;
-	conversationId?: string | null;
-	setRunning?: boolean;
-}
-
-export interface SessionPersistenceAdapter {
-	ensureSessionsDir(): string;
-	upsertSession(row: SessionRow): Promise<void>;
-	getSession(sessionId: string): Promise<SessionRow | undefined>;
-	listSessions(options: {
-		limit: number;
-		parentSessionId?: string;
-		status?: string;
-	}): Promise<SessionRow[]>;
-	updateSession(
-		input: PersistedSessionUpdateInput,
-	): Promise<{ updated: boolean; statusLock: number }>;
-	deleteSession(sessionId: string, cascade: boolean): Promise<boolean>;
-	enqueueSpawnRequest(input: {
-		rootSessionId: string;
-		parentAgentId: string;
-		task?: string;
-		systemPrompt?: string;
-	}): Promise<void>;
-	claimSpawnRequest(
-		rootSessionId: string,
-		parentAgentId: string,
-	): Promise<string | undefined>;
-}
-
 // ── Service ───────────────────────────────────────────────────────────
 
 export class UnifiedSessionPersistenceService {
@@ -160,6 +79,35 @@ export class UnifiedSessionPersistenceService {
 		return this.adapter.ensureSessionsDir();
 	}
 
+	private initializeMessagesFile(
+		sessionId: string,
+		path: string,
+		startedAt: string,
+	): void {
+		writeEmptyMessagesFile(
+			path,
+			startedAt,
+			resolveMessagesFileContext(sessionId),
+		);
+	}
+
+	private toPersistedMessages(
+		messages: LlmsProviders.Message[] | undefined,
+		result?: AgentResult,
+		previousMessages?: LlmsProviders.Message[],
+	): StoredMessageWithMetadata[] | undefined {
+		if (!messages) return undefined;
+		return result
+			? withLatestAssistantTurnMetadata(
+					result.messages,
+					result,
+					previousMessages as LlmsProviders.MessageWithMetadata[] | undefined,
+				)
+			: normalizeStoredMessagesForPersistence(
+					messages as LlmsProviders.MessageWithMetadata[],
+				);
+	}
+
 	// ── Manifest I/O ──────────────────────────────────────────────────
 
 	private writeManifestFile(
@@ -177,6 +125,10 @@ export class UnifiedSessionPersistenceService {
 		this.writeManifestFile(manifestPath, manifest);
 	}
 
+	readSessionManifest(sessionId: string): SessionManifest | undefined {
+		return this.readManifestFile(sessionId).manifest;
+	}
+
 	private readManifestFile(sessionId: string): {
 		path: string;
 		manifest?: SessionManifest;
@@ -195,39 +147,6 @@ export class UnifiedSessionPersistenceService {
 		}
 	}
 
-	private buildManifestFromRow(
-		row: SessionRow,
-		overrides?: {
-			status?: SessionStatus;
-			endedAt?: string | null;
-			exitCode?: number | null;
-			metadata?: Record<string, unknown>;
-		},
-	): SessionManifest {
-		return SessionManifestSchema.parse({
-			version: 1,
-			session_id: row.sessionId,
-			source: row.source,
-			pid: row.pid,
-			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,
-			provider: row.provider,
-			model: row.model,
-			cwd: row.cwd,
-			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 ?? row.metadata ?? undefined,
-			messages_path: row.messagesPath ?? undefined,
-		});
-	}
-
 	// ── Path resolution ───────────────────────────────────────────────
 
 	private async resolveArtifactPath(
@@ -328,7 +247,7 @@ export class UnifiedSessionPersistenceService {
 			updatedAt: nowIso(),
 		});
 
-		writeEmptyMessagesFile(messagesPath, startedAt);
+		this.initializeMessagesFile(sessionId, messagesPath, startedAt);
 		this.writeManifestFile(manifestPath, manifest);
 		return { manifestPath, transcriptPath, hookPath, messagesPath, manifest };
 	}
@@ -340,24 +259,26 @@ export class UnifiedSessionPersistenceService {
 		status: SessionStatus,
 		exitCode?: number | null,
 	): Promise<{ updated: boolean; endedAt?: string }> {
-		for (let attempt = 0; attempt < OCC_MAX_RETRIES; attempt++) {
-			const row = await this.adapter.getSession(sessionId);
-			if (!row) return { updated: false };
-
-			const endedAt = nowIso();
-			const changed = await this.adapter.updateSession({
-				sessionId,
-				status,
-				endedAt,
-				exitCode: typeof exitCode === "number" ? exitCode : null,
-				expectedStatusLock: row.statusLock,
-			});
-			if (changed.updated) {
-				if (status === "cancelled") {
-					await this.applyStatusToRunningChildSessions(sessionId, "cancelled");
-				}
-				return { updated: true, endedAt };
+		let endedAt: string | undefined;
+		const result = await withOccRetry(
+			() => this.adapter.getSession(sessionId),
+			async (statusLock) => {
+				endedAt = nowIso();
+				return this.adapter.updateSession({
+					sessionId,
+					status,
+					endedAt,
+					exitCode: typeof exitCode === "number" ? exitCode : null,
+					expectedStatusLock: statusLock,
+				});
+			},
+			OCC_MAX_RETRIES,
+		);
+		if (result.updated) {
+			if (status === "cancelled") {
+				await this.applyStatusToRunningChildSessions(sessionId, "cancelled");
 			}
+			return { updated: true, endedAt };
 		}
 		return { updated: false };
 	}
@@ -543,7 +464,11 @@ export class UnifiedSessionPersistenceService {
 					...artifactPaths,
 				}),
 			);
-			writeEmptyMessagesFile(artifactPaths.messagesPath, startedAt);
+			this.initializeMessagesFile(
+				sessionId,
+				artifactPaths.messagesPath,
+				startedAt,
+			);
 			return sessionId;
 		}
 
@@ -626,13 +551,15 @@ export class UnifiedSessionPersistenceService {
 			"messagesPath",
 			(id) => this.artifacts.sessionMessagesPath(id),
 		);
-		const payload: {
-			version: number;
-			updated_at: string;
-			systemPrompt?: string;
-			messages: LlmsProviders.Message[];
-		} = { version: 1, updated_at: nowIso(), messages };
-		if (systemPrompt) payload.systemPrompt = systemPrompt;
+		const normalizedMessages = normalizeStoredMessagesForPersistence(
+			messages as LlmsProviders.MessageWithMetadata[],
+		);
+		const payload = buildMessagesFilePayload({
+			updatedAt: nowIso(),
+			context: resolveMessagesFileContext(sessionId),
+			messages: normalizedMessages,
+			systemPrompt,
+		});
 		writeFileSync(path, `${JSON.stringify(payload, null, 2)}\n`, "utf8");
 	}
 
@@ -693,9 +620,8 @@ export class UnifiedSessionPersistenceService {
 
 		const sessionId = makeTeamTaskSubSessionId(rootSessionId, agentId);
 		const startedAt = nowIso();
-		const transcriptPath = this.artifacts.sessionTranscriptPath(sessionId);
-		const hookPath = this.artifacts.sessionHookPath(sessionId);
-		const messagesPath = this.artifacts.sessionMessagesPath(sessionId);
+		const { transcriptPath, hookPath, messagesPath } =
+			this.artifacts.subagentArtifactPaths(sessionId, agentId);
 
 		await this.adapter.upsertSession(
 			this.buildSubsessionRow(root, {
@@ -710,7 +636,7 @@ export class UnifiedSessionPersistenceService {
 				messagesPath,
 			}),
 		);
-		writeEmptyMessagesFile(messagesPath, startedAt);
+		this.initializeMessagesFile(sessionId, messagesPath, startedAt);
 		await this.appendSubagentTranscriptLine(sessionId, `[start] ${message}`);
 
 		const key = this.teamTaskQueueKey(rootSessionId, agentId);
@@ -724,6 +650,7 @@ export class UnifiedSessionPersistenceService {
 		agentId: string,
 		status: SessionStatus,
 		summary?: string,
+		result?: AgentResult,
 		messages?: LlmsProviders.Message[],
 	): Promise<void> {
 		const key = this.teamTaskQueueKey(rootSessionId, agentId);
@@ -734,7 +661,15 @@ export class UnifiedSessionPersistenceService {
 		if (queue.length === 0) this.teamTaskSessionsByAgent.delete(key);
 		if (!sessionId) return;
 
-		if (messages) await this.persistSessionMessages(sessionId, messages);
+		const teammateMessages = result?.messages ?? messages;
+		const persistedMessages = this.toPersistedMessages(
+			teammateMessages,
+			result,
+			messages,
+		);
+		if (persistedMessages) {
+			await this.persistSessionMessages(sessionId, persistedMessages);
+		}
 		await this.appendSubagentTranscriptLine(
 			sessionId,
 			summary ?? `[done] ${status}`,
@@ -881,7 +816,7 @@ export class UnifiedSessionPersistenceService {
 
 			await this.applyStatusToRunningChildSessions(latest.sessionId, "failed");
 
-			const manifest = this.buildManifestFromRow(latest, {
+			const manifest = buildManifestFromRow(latest, {
 				status: "failed",
 				endedAt: detectedAt,
 				exitCode: 1,
@@ -890,7 +825,6 @@ export class UnifiedSessionPersistenceService {
 			const { path: manifestPath } = this.readManifestFile(latest.sessionId);
 			this.writeManifestFile(manifestPath, manifest);
 
-			// Write termination markers to hook + transcript files
 			appendFileSync(
 				latest.hookPath,
 				`${JSON.stringify({

package/src/session/rpc-session-service.ts

@@ -1,11 +1,11 @@
 import { existsSync, mkdirSync } from "node:fs";
 import { RpcSessionClient, type RpcSessionRow } from "@clinebot/rpc";
-import type { SessionRow } from "./session-service";
 import type {
 	PersistedSessionUpdateInput,
 	SessionPersistenceAdapter,
-} from "./unified-session-persistence-service";
-import { UnifiedSessionPersistenceService } from "./unified-session-persistence-service";
+} from "./persistence-service";
+import { UnifiedSessionPersistenceService } from "./persistence-service";
+import type { SessionRow } from "./session-service";
 
 // ── Adapter ──────────────────────────────────────────────────────────
 

package/src/session/runtime-oauth-token-manager.ts

@@ -1,4 +1,4 @@
-import type * as LlmsProviders from "@clinebot/llms/providers";
+import type * as LlmsProviders from "@clinebot/llms";
 import {
 	type ITelemetryService,
 	isOAuthProviderId,

package/src/session/session-agent-events.ts

@@ -1,4 +1,4 @@
-import type { AgentEvent } from "@clinebot/agents";
+import type { AgentEvent } from "@clinebot/shared";
 import {
 	captureConversationTurnEvent,
 	captureDiffEditFailure,

package/src/session/session-artifacts.ts

@@ -6,6 +6,7 @@ import {
 	unlinkSync,
 } from "node:fs";
 import { dirname, join } from "node:path";
+import { parseSubSessionId, parseTeamTaskSubSessionId } from "./session-graph";
 
 export function nowIso(): string {
 	return new Date().toISOString();
@@ -28,6 +29,32 @@ export interface SessionArtifactPaths {
 	messagesPath: string;
 }
 
+function childArtifactFileStem(sessionId: string): {
+	rootSessionId: string;
+	fileStem: string;
+} {
+	const teamTask = parseTeamTaskSubSessionId(sessionId);
+	if (teamTask) {
+		return {
+			rootSessionId: teamTask.rootSessionId,
+			fileStem: `${teamTask.agentId}__${teamTask.teamTaskId}`,
+		};
+	}
+
+	const subagent = parseSubSessionId(sessionId);
+	if (subagent) {
+		return {
+			rootSessionId: subagent.rootSessionId,
+			fileStem: subagent.agentId,
+		};
+	}
+
+	return {
+		rootSessionId: sessionId,
+		fileStem: sessionId,
+	};
+}
+
 export class SessionArtifacts {
 	constructor(private readonly ensureSessionsDir: () => string) {}
 
@@ -96,11 +123,12 @@ export class SessionArtifacts {
 	): SessionArtifactPaths {
 		void subAgentId;
 		void activeTeamTaskSessionId;
-		const dir = this.ensureSessionArtifactsDir(sessionId);
+		const { rootSessionId, fileStem } = childArtifactFileStem(sessionId);
+		const dir = this.ensureSessionArtifactsDir(rootSessionId);
 		return {
-			transcriptPath: join(dir, `${sessionId}.log`),
-			hookPath: join(dir, `${sessionId}.hooks.jsonl`),
-			messagesPath: join(dir, `${sessionId}.messages.json`),
+			transcriptPath: join(dir, `${fileStem}.log`),
+			hookPath: join(dir, `${fileStem}.hooks.jsonl`),
+			messagesPath: join(dir, `${fileStem}.messages.json`),
 		};
 	}
 }

package/src/session/session-config-builder.ts

@@ -1,5 +1,5 @@
 import type { ITelemetryService } from "@clinebot/shared";
-import { resolveAndLoadAgentPlugins } from "../agents/plugin-config-loader";
+import { resolveAndLoadAgentPlugins } from "../extensions/plugin/plugin-config-loader";
 import {
 	createHookAuditHooks,
 	createHookConfigFileHooks,
@@ -51,15 +51,25 @@ export async function buildEffectiveConfig(
 		auditHooks,
 	]);
 
-	const loadedPlugins = await resolveAndLoadAgentPlugins({
-		pluginPaths: input.config.pluginPaths,
-		workspacePath,
-		cwd: input.config.cwd,
-		onEvent: onPluginEvent,
-	});
+	let loadedPlugins:
+		| Awaited<ReturnType<typeof resolveAndLoadAgentPlugins>>
+		| undefined;
+	try {
+		loadedPlugins = await resolveAndLoadAgentPlugins({
+			pluginPaths: input.config.pluginPaths,
+			workspacePath,
+			cwd: input.config.cwd,
+			onEvent: onPluginEvent,
+		});
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		input.config.logger?.log?.(
+			`plugin loading failed; continuing without plugins (${message})`,
+		);
+	}
 	const effectiveExtensions = mergeAgentExtensions(
 		input.config.extensions,
-		loadedPlugins.extensions,
+		loadedPlugins?.extensions,
 	);
 
 	return {
@@ -69,7 +79,7 @@ export async function buildEffectiveConfig(
 			extensions: effectiveExtensions,
 			telemetry: input.config.telemetry ?? defaultTelemetry,
 		},
-		pluginSandboxShutdown: loadedPlugins.shutdown,
+		pluginSandboxShutdown: loadedPlugins?.shutdown,
 	};
 }
 
@@ -95,6 +105,9 @@ export function buildResolvedProviderConfig(
 	if (config.knownModels) {
 		providerConfig.knownModels = config.knownModels;
 	}
+	if (config.extensionContext) {
+		providerConfig.extensionContext = config.extensionContext;
+	}
 	return providerConfig;
 }
 

package/src/session/session-graph.ts

@@ -1,5 +1,5 @@
-import type { HookEventPayload } from "@clinebot/agents";
 import { nanoid } from "nanoid";
+import type { HookEventPayload } from "../hooks";
 import type { SessionStatus } from "../types/common";
 
 export function sanitizeSessionToken(value: string): string {

package/src/session/session-host.ts

@@ -2,6 +2,10 @@ import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
 import { resolve } from "node:path";
 import { getRpcServerDefaultAddress, getRpcServerHealth } from "@clinebot/rpc";
+import {
+	augmentNodeCommandForDebug,
+	withResolvedClineBuildEnv,
+} from "@clinebot/shared";
 import { resolveSessionDataDir } from "@clinebot/shared/storage";
 import type { ClineCoreOptions } from "../ClineCore";
 import { SqliteSessionStore } from "../storage/sqlite-session-store";
@@ -58,20 +62,24 @@ function startRpcServerInBackground(address: string): void {
 	const conditionsArg = process.execArgv.find((arg) =>
 		arg.startsWith("--conditions="),
 	);
-	const args = [
-		...(conditionsArg ? [conditionsArg] : []),
-		entry,
-		"rpc",
-		"start",
-		"--address",
-		address,
-	];
-
-	const child = spawn(launcher, args, {
+	const command = augmentNodeCommandForDebug(
+		[
+			launcher,
+			...(conditionsArg ? [conditionsArg] : []),
+			entry,
+			"rpc",
+			"start",
+			"--address",
+			address,
+		],
+		{ debugRole: "rpc" },
+	);
+
+	const child = spawn(command[0] ?? launcher, command.slice(1), {
 		detached: true,
 		stdio: "ignore",
 		env: {
-			...process.env,
+			...withResolvedClineBuildEnv(process.env),
 			CLINE_NO_INTERACTIVE: "1",
 		},
 		cwd: process.cwd(),

package/src/session/session-manager.ts

@@ -1,5 +1,9 @@
-import type { AgentResult } from "@clinebot/agents";
-import type * as LlmsProviders from "@clinebot/llms/providers";
+import type * as LlmsProviders from "@clinebot/llms";
+import type {
+	AgentResult,
+	ToolApprovalRequest,
+	ToolApprovalResult,
+} from "@clinebot/shared";
 import type { SessionSource } from "../types/common";
 import type { CoreSessionConfig } from "../types/config";
 import type { CoreSessionEvent } from "../types/events";
@@ -14,13 +18,14 @@ export interface StartSessionInput {
 	initialMessages?: LlmsProviders.Message[];
 	userImages?: string[];
 	userFiles?: string[];
-	userInstructionWatcher?: import("../agents").UserInstructionConfigWatcher;
+	userInstructionWatcher?: import("../extensions/config").UserInstructionConfigWatcher;
 	onTeamRestored?: () => void;
 	defaultToolExecutors?: Partial<import("../tools").ToolExecutors>;
-	toolPolicies?: import("@clinebot/agents").AgentConfig["toolPolicies"];
+	toolPolicies?: import("@clinebot/shared").AgentConfig["toolPolicies"];
 	requestToolApproval?: (
-		request: import("@clinebot/agents").ToolApprovalRequest,
-	) => Promise<import("@clinebot/agents").ToolApprovalResult>;
+		request: ToolApprovalRequest,
+	) => Promise<ToolApprovalResult>;
+	teamToolsFactory?: import("../runtime/session-runtime").TeamToolsFactory;
 }
 
 export interface StartSessionResult {

package/src/session/session-service.team-persistence.test.ts

@@ -1,8 +1,8 @@
 import { existsSync, mkdtempSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { AgentTeamsRuntime } from "@clinebot/agents";
 import { describe, expect, it } from "vitest";
+import { AgentTeamsRuntime } from "../team";
 import { FileTeamPersistenceStore } from "./session-service";
 
 describe("FileTeamPersistenceStore", () => {

package/src/session/session-service.ts

@@ -8,21 +8,18 @@ import {
 	writeFileSync,
 } from "node:fs";
 import { join } from "node:path";
-import type {
-	AgentTeamsRuntime,
-	TeamEvent,
-	TeamTeammateSpec,
-} from "@clinebot/agents";
+import type { TeamTeammateSpec } from "@clinebot/shared";
 import { resolveTeamDataDir } from "@clinebot/shared/storage";
 import type { SqliteSessionStore } from "../storage/sqlite-session-store";
+import type { AgentTeamsRuntime, TeamEvent } from "../team";
 import type { SessionSource, SessionStatus } from "../types/common";
-import { nowIso } from "./session-artifacts";
-import type { SessionManifest } from "./session-manifest";
 import type {
 	PersistedSessionUpdateInput,
 	SessionPersistenceAdapter,
-} from "./unified-session-persistence-service";
-import { UnifiedSessionPersistenceService } from "./unified-session-persistence-service";
+} from "./persistence-service";
+import { UnifiedSessionPersistenceService } from "./persistence-service";
+import { nowIso } from "./session-artifacts";
+import type { SessionManifest } from "./session-manifest";
 
 export interface SessionRow {
 	sessionId: string;