@agimon-ai/doompi-core 0.0.1-alpha.107 → 0.0.1-alpha.108

package/dist/childSession.d.mts

@@ -1,3 +1,3 @@
-import { DOOM_CHILD_SESSION_MCP_TOOL_SERVICE, DOOM_CHILD_SESSION_SERVICE, DoomChildSessionCapabilityCeiling, DoomChildSessionEvent, DoomChildSessionFreshSource, DoomChildSessionHandle, DoomChildSessionIntercom, DoomChildSessionRequest, DoomChildSessionRuntime, DoomChildSessionRuntimeFactory, DoomChildSessionScope, DoomChildSessionService, DoomChildSessionServiceProvider, DoomChildSessionSource, DoomChildSessionState, DoomChildSessionTerminalPiForkSource, DoomChildSessionTool, DoomChildSessionToolResult, DoomChildSessionUsage, DoomChildSessionV4ForkSource, DoomChildSessionV4RestoreSource, readDoomChildSessionService, requireDoomChildSessionService } from "./src/systems/child/types/childSession.mjs";
+import { DOOM_CHILD_SESSION_MCP_TOOL_SERVICE, DOOM_CHILD_SESSION_SERVICE, DoomChildSessionCapabilityCeiling, DoomChildSessionEvent, DoomChildSessionFreshSource, DoomChildSessionHandle, DoomChildSessionIntercom, DoomChildSessionMcpCatalog, DoomChildSessionMcpTool, DoomChildSessionRequest, DoomChildSessionRuntime, DoomChildSessionRuntimeFactory, DoomChildSessionScope, DoomChildSessionService, DoomChildSessionServiceProvider, DoomChildSessionSource, DoomChildSessionState, DoomChildSessionTerminalPiForkSource, DoomChildSessionTool, DoomChildSessionToolResult, DoomChildSessionUsage, DoomChildSessionV4ForkSource, DoomChildSessionV4RestoreSource, readDoomChildSessionService, requireDoomChildSessionService } from "./src/systems/child/types/childSession.mjs";
 import { DoomChildSessionServiceDependencies, createDoomChildSessionService } from "./src/systems/child/services/childSession/index.mjs";
-export { DOOM_CHILD_SESSION_MCP_TOOL_SERVICE, DOOM_CHILD_SESSION_SERVICE, DoomChildSessionCapabilityCeiling, DoomChildSessionEvent, DoomChildSessionFreshSource, DoomChildSessionHandle, DoomChildSessionIntercom, DoomChildSessionRequest, DoomChildSessionRuntime, DoomChildSessionRuntimeFactory, DoomChildSessionScope, DoomChildSessionService, DoomChildSessionServiceDependencies, DoomChildSessionServiceProvider, DoomChildSessionSource, DoomChildSessionState, DoomChildSessionTerminalPiForkSource, DoomChildSessionTool, DoomChildSessionToolResult, DoomChildSessionUsage, DoomChildSessionV4ForkSource, DoomChildSessionV4RestoreSource, createDoomChildSessionService, readDoomChildSessionService, requireDoomChildSessionService };
+export { DOOM_CHILD_SESSION_MCP_TOOL_SERVICE, DOOM_CHILD_SESSION_SERVICE, DoomChildSessionCapabilityCeiling, DoomChildSessionEvent, DoomChildSessionFreshSource, DoomChildSessionHandle, DoomChildSessionIntercom, DoomChildSessionMcpCatalog, DoomChildSessionMcpTool, DoomChildSessionRequest, DoomChildSessionRuntime, DoomChildSessionRuntimeFactory, DoomChildSessionScope, DoomChildSessionService, DoomChildSessionServiceDependencies, DoomChildSessionServiceProvider, DoomChildSessionSource, DoomChildSessionState, DoomChildSessionTerminalPiForkSource, DoomChildSessionTool, DoomChildSessionToolResult, DoomChildSessionUsage, DoomChildSessionV4ForkSource, DoomChildSessionV4RestoreSource, createDoomChildSessionService, readDoomChildSessionService, requireDoomChildSessionService };

package/dist/sqliteSessionStorage.cjs

@@ -60,24 +60,40 @@ function validateDurableSessionFile(file) {
 /** Completed histories use a read-only connection. Initialization cannot write or migrate. */
 async function openReadOnlyDurableStorage(file) {
 	validateDurableSessionFile(file);
-	const database = new _earendil_works_pi_durable_storage_sqlite_node.NodeSqliteDatabase(new node_sqlite.DatabaseSync(file, { readOnly: true }));
-	return await _earendil_works_pi_durable_storage_sqlite.SqliteStorage.open({
-		exec: (sql) => database.exec(sql),
-		run: (sql, ...params) => database.run(sql, ...params),
-		get: (sql, ...params) => database.get(sql, ...params),
-		all: (sql, ...params) => database.all(sql, ...params),
-		close: () => database.close(),
-		transaction: (callback) => callback({
-			exec: async (sql) => {
-				if (!/^CREATE TABLE IF NOT EXISTS durable_schema\s/u.test(sql)) throw new Error("Read-only durable storage");
-			},
-			run: async (sql) => {
-				if (sql !== "INSERT OR IGNORE INTO durable_schema (singleton, version) VALUES (1, 0)") throw new Error("Read-only durable storage");
-			},
+	const native = new node_sqlite.DatabaseSync(file, { readOnly: true });
+	const database = new _earendil_works_pi_durable_storage_sqlite_node.NodeSqliteDatabase(native);
+	let closed = false;
+	const close = async () => {
+		if (closed) return;
+		native.close();
+		closed = true;
+	};
+	try {
+		return await _earendil_works_pi_durable_storage_sqlite.SqliteStorage.open({
+			exec: (sql) => database.exec(sql),
+			run: (sql, ...params) => database.run(sql, ...params),
 			get: (sql, ...params) => database.get(sql, ...params),
-			all: (sql, ...params) => database.all(sql, ...params)
-		})
-	});
+			all: (sql, ...params) => database.all(sql, ...params),
+			close,
+			transaction: (callback) => callback({
+				exec: async (sql) => {
+					if (!/^CREATE TABLE IF NOT EXISTS durable_schema\s/u.test(sql)) throw new Error("Read-only durable storage");
+				},
+				run: async (sql) => {
+					if (sql !== "INSERT OR IGNORE INTO durable_schema (singleton, version) VALUES (1, 0)") throw new Error("Read-only durable storage");
+				},
+				get: (sql, ...params) => database.get(sql, ...params),
+				all: (sql, ...params) => database.all(sql, ...params)
+			})
+		});
+	} catch (error) {
+		try {
+			await close();
+		} catch (cleanupError) {
+			throw new AggregateError([error, cleanupError], "Read-only storage initialization cleanup failed");
+		}
+		throw error;
+	}
 }
 /** Opens the one fresh-format SQLite container owned by a server session. */
 async function openSqliteSessionStorage(options, context) {
@@ -97,10 +113,14 @@ async function openSqliteSessionStorage(options, context) {
 	});
 	const historyLease = await options.historyOwnership.acquire(sessionFile);
 	let storage;
+	let database;
+	let writerOpenAttempted = false;
 	try {
 		await historyLease.assertQuiescent();
 		if (node_fs.default.existsSync(sessionFile)) validateDurableSessionFile(sessionFile);
-		storage = await (0, _earendil_works_pi_durable_storage_sqlite_node.openNodeSqliteStorage)(sessionFile);
+		writerOpenAttempted = true;
+		database = await (0, _earendil_works_pi_durable_storage_sqlite_node.openNodeSqliteDatabase)(sessionFile);
+		storage = await _earendil_works_pi_durable_storage_sqlite.SqliteStorage.open(database);
 		const session = (0, _earendil_works_pi_durable.createSession)(storage);
 		const identity = await session.snapshot(SessionIdentityDoc, context);
 		if (existing && (!identity || identity.id !== id)) throw new Error("SQLite session id does not match the requested session");
@@ -121,10 +141,17 @@ async function openSqliteSessionStorage(options, context) {
 			historyLease
 		};
 	} catch (error) {
+		if (writerOpenAttempted && !database) throw error;
 		try {
 			if (storage) await storage.close(context);
-		} finally {
+			else if (database) await database.close();
+		} catch (cleanupError) {
+			throw new AggregateError([error, cleanupError], "SQLite storage initialization cleanup failed");
+		}
+		try {
 			await historyLease.release();
+		} catch (cleanupError) {
+			throw new AggregateError([error, cleanupError], "SQLite storage ownership cleanup failed");
 		}
 		throw error;
 	}

package/dist/sqliteSessionStorage.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"sqliteSessionStorage.cjs","names":["BACKGROUND_CONTEXT","defineDoc","DatabaseSync","NodeSqliteDatabase","SqliteStorage","path","randomUUID","fs","openNodeSqliteStorage","createSession"],"sources":["../src/services/sqliteSessionStorage/index.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\nimport fs from 'node:fs';\nimport path from 'node:path';\nimport { DatabaseSync } from 'node:sqlite';\n\nimport type { Context } from '@earendil-works/chord';\nimport { BACKGROUND_CONTEXT } from '@earendil-works/chord/context';\nimport { createSession, defineDoc, type Storage } from '@earendil-works/pi-durable';\nimport { SqliteStorage } from '@earendil-works/pi-durable/storage/sqlite';\nimport { NodeSqliteDatabase, openNodeSqliteStorage } from '@earendil-works/pi-durable/storage/sqlite/node';\n\nimport type { DirectHarnessRuntimeOptions } from '../../types/server/directHarnessRuntime';\n\nexport const DURABLE_BACKGROUND_CONTEXT = BACKGROUND_CONTEXT;\n\nexport const DURABLE_DIRECTORY = 'durable-v1';\n/** Public string identity belongs to Doom, not the durable numeric ID namespace. */\nexport const SessionIdentityDoc = defineDoc({\n  kind: 'doompi.session.identity',\n  version: 1,\n  scope: 'session',\n  initial: () => ({ id: '', createdAt: 0, parentSessionId: '' }),\n});\nexport const SessionMetadataDoc = defineDoc({\n  kind: 'doompi.session.metadata',\n  version: 1,\n  scope: 'session',\n  initial: () => ({ name: '', workspaceRoot: '', execution: '', laneName: 'main' }),\n});\n\n/** Validate existing files without admitting a writer or applying schema upgrades. */\nexport function validateDurableSessionFile(file: string): void {\n  const database = new DatabaseSync(file, { readOnly: true });\n  try {\n    const schema = database.prepare('SELECT version FROM durable_schema WHERE singleton = 1').get();\n    if (schema?.version !== 1) throw new Error('Unsupported durable SQLite schema');\n    const tables = database.prepare(\"SELECT name FROM sqlite_master WHERE type = 'table'\").all();\n    for (const name of [\n      'durable_metadata',\n      'record_ids',\n      'conversations',\n      'entries',\n      'tasks',\n      'submissions',\n      'documents',\n      'document_revisions',\n    ]) {\n      if (!tables.some((table) => table.name === name)) throw new Error('Invalid durable SQLite schema');\n    }\n  } catch (cause) {\n    throw new Error('Unsupported or legacy SQLite session format', { cause });\n  } finally {\n    database.close();\n  }\n}\n\n/** Completed histories use a read-only connection. Initialization cannot write or migrate. */\nexport async function openReadOnlyDurableStorage(file: string): Promise<Storage> {\n  validateDurableSessionFile(file);\n  const database = new NodeSqliteDatabase(new DatabaseSync(file, { readOnly: true }));\n  const storage = await SqliteStorage.open({\n    exec: (sql) => database.exec(sql),\n    run: (sql, ...params) => database.run(sql, ...params),\n    get: (sql, ...params) => database.get(sql, ...params),\n    all: (sql, ...params) => database.all(sql, ...params),\n    close: () => database.close(),\n    transaction: (callback) =>\n      callback({\n        exec: async (sql) => {\n          if (!/^CREATE TABLE IF NOT EXISTS durable_schema\\s/u.test(sql)) throw new Error('Read-only durable storage');\n        },\n        run: async (sql) => {\n          if (sql !== 'INSERT OR IGNORE INTO durable_schema (singleton, version) VALUES (1, 0)')\n            throw new Error('Read-only durable storage');\n        },\n        get: (sql, ...params) => database.get(sql, ...params),\n        all: (sql, ...params) => database.all(sql, ...params),\n      }),\n  });\n  return storage;\n}\n\n/** Opens the one fresh-format SQLite container owned by a server session. */\nexport async function openSqliteSessionStorage(\n  options: Pick<\n    DirectHarnessRuntimeOptions,\n    'historyOwnership' | 'sessionsRoot' | 'sessionPath' | 'sessionId' | 'parentSessionId'\n  >,\n  context: Context,\n) {\n  if (!options.historyOwnership) throw new Error('SQLite sessions require explicit HistoryOwnership');\n  if (!options.sessionsRoot && !options.sessionPath) throw new Error('SQLite sessions require a server data directory');\n  const id = options.sessionId ?? (options.sessionPath ? path.basename(options.sessionPath, '.sqlite') : randomUUID());\n  if (!/^[a-zA-Z0-9_-]+$/u.test(id)) throw new Error('Invalid SQLite session id');\n  const sessionFile = path.resolve(\n    options.sessionPath ?? path.join(options.sessionsRoot!, DURABLE_DIRECTORY, `${id}.sqlite`),\n  );\n  if (path.basename(path.dirname(sessionFile)) !== DURABLE_DIRECTORY || path.extname(sessionFile) !== '.sqlite')\n    throw new Error('Unsupported or legacy SQLite session path');\n  const existing = fs.existsSync(sessionFile);\n  if (!existing && options.sessionsRoot && fs.existsSync(path.join(options.sessionsRoot, `${id}.sqlite`)))\n    throw new Error('Legacy SQLite sessions are unsupported by fresh durable storage');\n  if (options.sessionPath && !existing) throw new Error(`SQLite session not found: ${sessionFile}`);\n  if (existing) validateDurableSessionFile(sessionFile);\n  fs.mkdirSync(path.dirname(sessionFile), { recursive: true, mode: 0o700 });\n  const historyLease = await options.historyOwnership.acquire(sessionFile);\n  let storage: Storage | undefined;\n  try {\n    await historyLease.assertQuiescent();\n    if (fs.existsSync(sessionFile)) validateDurableSessionFile(sessionFile);\n    storage = await openNodeSqliteStorage(sessionFile);\n    const session = createSession(storage);\n    const identity = await session.snapshot(SessionIdentityDoc, context);\n    if (existing && (!identity || identity.id !== id))\n      throw new Error('SQLite session id does not match the requested session');\n    if (!existing) {\n      await session.commit(async (tx) => {\n        const doc = await tx.doc(SessionIdentityDoc);\n        doc.id = id;\n        doc.createdAt = Date.now();\n        doc.parentSessionId = options.parentSessionId ?? '';\n      }, context);\n      fs.chmodSync(sessionFile, 0o600);\n    }\n    const repository = { close: (closeContext: Context = context) => session.close(closeContext) };\n    return { storage, session, sessionFile, repository, historyLease };\n  } catch (error) {\n    try {\n      if (storage) await storage.close(context);\n    } finally {\n      await historyLease.release();\n    }\n    throw error;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"sqliteSessionStorage.cjs","names":["BACKGROUND_CONTEXT","defineDoc","DatabaseSync","NodeSqliteDatabase","SqliteStorage","path","randomUUID","fs","openNodeSqliteDatabase","createSession"],"sources":["../src/services/sqliteSessionStorage/index.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\nimport fs from 'node:fs';\nimport path from 'node:path';\nimport { DatabaseSync } from 'node:sqlite';\n\nimport type { Context } from '@earendil-works/chord';\nimport { BACKGROUND_CONTEXT } from '@earendil-works/chord/context';\nimport { createSession, defineDoc, type Storage } from '@earendil-works/pi-durable';\nimport { SqliteStorage } from '@earendil-works/pi-durable/storage/sqlite';\nimport { NodeSqliteDatabase, openNodeSqliteDatabase } from '@earendil-works/pi-durable/storage/sqlite/node';\n\nimport type { DirectHarnessRuntimeOptions } from '../../types/server/directHarnessRuntime';\n\nexport const DURABLE_BACKGROUND_CONTEXT = BACKGROUND_CONTEXT;\n\nexport const DURABLE_DIRECTORY = 'durable-v1';\n/** Public string identity belongs to Doom, not the durable numeric ID namespace. */\nexport const SessionIdentityDoc = defineDoc({\n  kind: 'doompi.session.identity',\n  version: 1,\n  scope: 'session',\n  initial: () => ({ id: '', createdAt: 0, parentSessionId: '' }),\n});\nexport const SessionMetadataDoc = defineDoc({\n  kind: 'doompi.session.metadata',\n  version: 1,\n  scope: 'session',\n  initial: () => ({ name: '', workspaceRoot: '', execution: '', laneName: 'main' }),\n});\n\n/** Validate existing files without admitting a writer or applying schema upgrades. */\nexport function validateDurableSessionFile(file: string): void {\n  const database = new DatabaseSync(file, { readOnly: true });\n  try {\n    const schema = database.prepare('SELECT version FROM durable_schema WHERE singleton = 1').get();\n    if (schema?.version !== 1) throw new Error('Unsupported durable SQLite schema');\n    const tables = database.prepare(\"SELECT name FROM sqlite_master WHERE type = 'table'\").all();\n    for (const name of [\n      'durable_metadata',\n      'record_ids',\n      'conversations',\n      'entries',\n      'tasks',\n      'submissions',\n      'documents',\n      'document_revisions',\n    ]) {\n      if (!tables.some((table) => table.name === name)) throw new Error('Invalid durable SQLite schema');\n    }\n  } catch (cause) {\n    throw new Error('Unsupported or legacy SQLite session format', { cause });\n  } finally {\n    database.close();\n  }\n}\n\n/** Completed histories use a read-only connection. Initialization cannot write or migrate. */\nexport async function openReadOnlyDurableStorage(file: string): Promise<Storage> {\n  validateDurableSessionFile(file);\n  const native = new DatabaseSync(file, { readOnly: true });\n  const database = new NodeSqliteDatabase(native);\n  let closed = false;\n  const close = async () => {\n    if (closed) return;\n    // The writer adapter checkpoints WAL on close, which read-only connections cannot do.\n    native.close();\n    closed = true;\n  };\n  try {\n    const storage = await SqliteStorage.open({\n      exec: (sql) => database.exec(sql),\n      run: (sql, ...params) => database.run(sql, ...params),\n      get: (sql, ...params) => database.get(sql, ...params),\n      all: (sql, ...params) => database.all(sql, ...params),\n      close,\n      transaction: (callback) =>\n        callback({\n          exec: async (sql) => {\n            if (!/^CREATE TABLE IF NOT EXISTS durable_schema\\s/u.test(sql))\n              throw new Error('Read-only durable storage');\n          },\n          run: async (sql) => {\n            if (sql !== 'INSERT OR IGNORE INTO durable_schema (singleton, version) VALUES (1, 0)')\n              throw new Error('Read-only durable storage');\n          },\n          get: (sql, ...params) => database.get(sql, ...params),\n          all: (sql, ...params) => database.all(sql, ...params),\n        }),\n    });\n    return storage;\n  } catch (error) {\n    try {\n      await close();\n    } catch (cleanupError) {\n      throw new AggregateError([error, cleanupError], 'Read-only storage initialization cleanup failed');\n    }\n    throw error;\n  }\n}\n\n/** Opens the one fresh-format SQLite container owned by a server session. */\nexport async function openSqliteSessionStorage(\n  options: Pick<\n    DirectHarnessRuntimeOptions,\n    'historyOwnership' | 'sessionsRoot' | 'sessionPath' | 'sessionId' | 'parentSessionId'\n  >,\n  context: Context,\n) {\n  if (!options.historyOwnership) throw new Error('SQLite sessions require explicit HistoryOwnership');\n  if (!options.sessionsRoot && !options.sessionPath) throw new Error('SQLite sessions require a server data directory');\n  const id = options.sessionId ?? (options.sessionPath ? path.basename(options.sessionPath, '.sqlite') : randomUUID());\n  if (!/^[a-zA-Z0-9_-]+$/u.test(id)) throw new Error('Invalid SQLite session id');\n  const sessionFile = path.resolve(\n    options.sessionPath ?? path.join(options.sessionsRoot!, DURABLE_DIRECTORY, `${id}.sqlite`),\n  );\n  if (path.basename(path.dirname(sessionFile)) !== DURABLE_DIRECTORY || path.extname(sessionFile) !== '.sqlite')\n    throw new Error('Unsupported or legacy SQLite session path');\n  const existing = fs.existsSync(sessionFile);\n  if (!existing && options.sessionsRoot && fs.existsSync(path.join(options.sessionsRoot, `${id}.sqlite`)))\n    throw new Error('Legacy SQLite sessions are unsupported by fresh durable storage');\n  if (options.sessionPath && !existing) throw new Error(`SQLite session not found: ${sessionFile}`);\n  if (existing) validateDurableSessionFile(sessionFile);\n  fs.mkdirSync(path.dirname(sessionFile), { recursive: true, mode: 0o700 });\n  const historyLease = await options.historyOwnership.acquire(sessionFile);\n  let storage: Storage | undefined;\n  let database: NodeSqliteDatabase | undefined;\n  let writerOpenAttempted = false;\n  try {\n    await historyLease.assertQuiescent();\n    if (fs.existsSync(sessionFile)) validateDurableSessionFile(sessionFile);\n    writerOpenAttempted = true;\n    database = await openNodeSqliteDatabase(sessionFile);\n    storage = await SqliteStorage.open(database);\n    const session = createSession(storage);\n    const identity = await session.snapshot(SessionIdentityDoc, context);\n    if (existing && (!identity || identity.id !== id))\n      throw new Error('SQLite session id does not match the requested session');\n    if (!existing) {\n      await session.commit(async (tx) => {\n        const doc = await tx.doc(SessionIdentityDoc);\n        doc.id = id;\n        doc.createdAt = Date.now();\n        doc.parentSessionId = options.parentSessionId ?? '';\n      }, context);\n      fs.chmodSync(sessionFile, 0o600);\n    }\n    const repository = { close: (closeContext: Context = context) => session.close(closeContext) };\n    return { storage, session, sessionFile, repository, historyLease };\n  } catch (error) {\n    // ponytail: An upstream open rejection has no closure receipt, so retain ownership until shutdown is confirmed.\n    if (writerOpenAttempted && !database) throw error;\n    try {\n      if (storage) await storage.close(context);\n      else if (database) await database.close();\n    } catch (cleanupError) {\n      throw new AggregateError([error, cleanupError], 'SQLite storage initialization cleanup failed');\n    }\n    try {\n      await historyLease.release();\n    } catch (cleanupError) {\n      throw new AggregateError([error, cleanupError], 'SQLite storage ownership cleanup failed');\n    }\n    throw error;\n  }\n}\n"],"mappings":"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"}

package/dist/sqliteSessionStorage.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"sqliteSessionStorage.d.mts","names":[],"sources":["../src/services/sqliteSessionStorage/index.ts"],"mappings":";;;;;qBAaa,4BAA0B;qBAE1B;;qBAEA,yDAAkB;;;;;qBAMlB,yDAAkB;;;;;;;wBAQf,2BAA2B;;wBA0BrB,2BAA2B,eAAe,QAAQ;;wBA0BlD,yBACpB,SAAS,KACP,qHAGF,SAAS,UAAO;;;;;IAoC6B,QAAA,eAAA,YAAO;;gBAAA"}
+{"version":3,"file":"sqliteSessionStorage.d.mts","names":[],"sources":["../src/services/sqliteSessionStorage/index.ts"],"mappings":";;;;;qBAaa,4BAA0B;qBAE1B;;qBAEA,yDAAkB;;;;;qBAMlB,yDAAkB;;;;;;;wBAQf,2BAA2B;;wBA0BrB,2BAA2B,eAAe,QAAQ;;wBA4ClD,yBACpB,SAAS,KACP,qHAGF,SAAS,UAAO;;;;;IAwC6B,QAAA,eAAA,YAAO;;gBAAA"}

package/dist/sqliteSessionStorage.mjs

@@ -5,7 +5,7 @@ import { DatabaseSync } from "node:sqlite";
 import { createSession, defineDoc } from "@earendil-works/pi-durable";
 import { BACKGROUND_CONTEXT } from "@earendil-works/chord/context";
 import { SqliteStorage } from "@earendil-works/pi-durable/storage/sqlite";
-import { NodeSqliteDatabase, openNodeSqliteStorage } from "@earendil-works/pi-durable/storage/sqlite/node";
+import { NodeSqliteDatabase, openNodeSqliteDatabase } from "@earendil-works/pi-durable/storage/sqlite/node";
 //#region src/services/sqliteSessionStorage/index.ts
 const DURABLE_BACKGROUND_CONTEXT = BACKGROUND_CONTEXT;
 const DURABLE_DIRECTORY = "durable-v1";
@@ -56,24 +56,40 @@ function validateDurableSessionFile(file) {
 /** Completed histories use a read-only connection. Initialization cannot write or migrate. */
 async function openReadOnlyDurableStorage(file) {
 	validateDurableSessionFile(file);
-	const database = new NodeSqliteDatabase(new DatabaseSync(file, { readOnly: true }));
-	return await SqliteStorage.open({
-		exec: (sql) => database.exec(sql),
-		run: (sql, ...params) => database.run(sql, ...params),
-		get: (sql, ...params) => database.get(sql, ...params),
-		all: (sql, ...params) => database.all(sql, ...params),
-		close: () => database.close(),
-		transaction: (callback) => callback({
-			exec: async (sql) => {
-				if (!/^CREATE TABLE IF NOT EXISTS durable_schema\s/u.test(sql)) throw new Error("Read-only durable storage");
-			},
-			run: async (sql) => {
-				if (sql !== "INSERT OR IGNORE INTO durable_schema (singleton, version) VALUES (1, 0)") throw new Error("Read-only durable storage");
-			},
+	const native = new DatabaseSync(file, { readOnly: true });
+	const database = new NodeSqliteDatabase(native);
+	let closed = false;
+	const close = async () => {
+		if (closed) return;
+		native.close();
+		closed = true;
+	};
+	try {
+		return await SqliteStorage.open({
+			exec: (sql) => database.exec(sql),
+			run: (sql, ...params) => database.run(sql, ...params),
 			get: (sql, ...params) => database.get(sql, ...params),
-			all: (sql, ...params) => database.all(sql, ...params)
-		})
-	});
+			all: (sql, ...params) => database.all(sql, ...params),
+			close,
+			transaction: (callback) => callback({
+				exec: async (sql) => {
+					if (!/^CREATE TABLE IF NOT EXISTS durable_schema\s/u.test(sql)) throw new Error("Read-only durable storage");
+				},
+				run: async (sql) => {
+					if (sql !== "INSERT OR IGNORE INTO durable_schema (singleton, version) VALUES (1, 0)") throw new Error("Read-only durable storage");
+				},
+				get: (sql, ...params) => database.get(sql, ...params),
+				all: (sql, ...params) => database.all(sql, ...params)
+			})
+		});
+	} catch (error) {
+		try {
+			await close();
+		} catch (cleanupError) {
+			throw new AggregateError([error, cleanupError], "Read-only storage initialization cleanup failed");
+		}
+		throw error;
+	}
 }
 /** Opens the one fresh-format SQLite container owned by a server session. */
 async function openSqliteSessionStorage(options, context) {
@@ -93,10 +109,14 @@ async function openSqliteSessionStorage(options, context) {
 	});
 	const historyLease = await options.historyOwnership.acquire(sessionFile);
 	let storage;
+	let database;
+	let writerOpenAttempted = false;
 	try {
 		await historyLease.assertQuiescent();
 		if (fs.existsSync(sessionFile)) validateDurableSessionFile(sessionFile);
-		storage = await openNodeSqliteStorage(sessionFile);
+		writerOpenAttempted = true;
+		database = await openNodeSqliteDatabase(sessionFile);
+		storage = await SqliteStorage.open(database);
 		const session = createSession(storage);
 		const identity = await session.snapshot(SessionIdentityDoc, context);
 		if (existing && (!identity || identity.id !== id)) throw new Error("SQLite session id does not match the requested session");
@@ -117,10 +137,17 @@ async function openSqliteSessionStorage(options, context) {
 			historyLease
 		};
 	} catch (error) {
+		if (writerOpenAttempted && !database) throw error;
 		try {
 			if (storage) await storage.close(context);
-		} finally {
+			else if (database) await database.close();
+		} catch (cleanupError) {
+			throw new AggregateError([error, cleanupError], "SQLite storage initialization cleanup failed");
+		}
+		try {
 			await historyLease.release();
+		} catch (cleanupError) {
+			throw new AggregateError([error, cleanupError], "SQLite storage ownership cleanup failed");
 		}
 		throw error;
 	}

package/dist/sqliteSessionStorage.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"sqliteSessionStorage.mjs","names":[],"sources":["../src/services/sqliteSessionStorage/index.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\nimport fs from 'node:fs';\nimport path from 'node:path';\nimport { DatabaseSync } from 'node:sqlite';\n\nimport type { Context } from '@earendil-works/chord';\nimport { BACKGROUND_CONTEXT } from '@earendil-works/chord/context';\nimport { createSession, defineDoc, type Storage } from '@earendil-works/pi-durable';\nimport { SqliteStorage } from '@earendil-works/pi-durable/storage/sqlite';\nimport { NodeSqliteDatabase, openNodeSqliteStorage } from '@earendil-works/pi-durable/storage/sqlite/node';\n\nimport type { DirectHarnessRuntimeOptions } from '../../types/server/directHarnessRuntime';\n\nexport const DURABLE_BACKGROUND_CONTEXT = BACKGROUND_CONTEXT;\n\nexport const DURABLE_DIRECTORY = 'durable-v1';\n/** Public string identity belongs to Doom, not the durable numeric ID namespace. */\nexport const SessionIdentityDoc = defineDoc({\n  kind: 'doompi.session.identity',\n  version: 1,\n  scope: 'session',\n  initial: () => ({ id: '', createdAt: 0, parentSessionId: '' }),\n});\nexport const SessionMetadataDoc = defineDoc({\n  kind: 'doompi.session.metadata',\n  version: 1,\n  scope: 'session',\n  initial: () => ({ name: '', workspaceRoot: '', execution: '', laneName: 'main' }),\n});\n\n/** Validate existing files without admitting a writer or applying schema upgrades. */\nexport function validateDurableSessionFile(file: string): void {\n  const database = new DatabaseSync(file, { readOnly: true });\n  try {\n    const schema = database.prepare('SELECT version FROM durable_schema WHERE singleton = 1').get();\n    if (schema?.version !== 1) throw new Error('Unsupported durable SQLite schema');\n    const tables = database.prepare(\"SELECT name FROM sqlite_master WHERE type = 'table'\").all();\n    for (const name of [\n      'durable_metadata',\n      'record_ids',\n      'conversations',\n      'entries',\n      'tasks',\n      'submissions',\n      'documents',\n      'document_revisions',\n    ]) {\n      if (!tables.some((table) => table.name === name)) throw new Error('Invalid durable SQLite schema');\n    }\n  } catch (cause) {\n    throw new Error('Unsupported or legacy SQLite session format', { cause });\n  } finally {\n    database.close();\n  }\n}\n\n/** Completed histories use a read-only connection. Initialization cannot write or migrate. */\nexport async function openReadOnlyDurableStorage(file: string): Promise<Storage> {\n  validateDurableSessionFile(file);\n  const database = new NodeSqliteDatabase(new DatabaseSync(file, { readOnly: true }));\n  const storage = await SqliteStorage.open({\n    exec: (sql) => database.exec(sql),\n    run: (sql, ...params) => database.run(sql, ...params),\n    get: (sql, ...params) => database.get(sql, ...params),\n    all: (sql, ...params) => database.all(sql, ...params),\n    close: () => database.close(),\n    transaction: (callback) =>\n      callback({\n        exec: async (sql) => {\n          if (!/^CREATE TABLE IF NOT EXISTS durable_schema\\s/u.test(sql)) throw new Error('Read-only durable storage');\n        },\n        run: async (sql) => {\n          if (sql !== 'INSERT OR IGNORE INTO durable_schema (singleton, version) VALUES (1, 0)')\n            throw new Error('Read-only durable storage');\n        },\n        get: (sql, ...params) => database.get(sql, ...params),\n        all: (sql, ...params) => database.all(sql, ...params),\n      }),\n  });\n  return storage;\n}\n\n/** Opens the one fresh-format SQLite container owned by a server session. */\nexport async function openSqliteSessionStorage(\n  options: Pick<\n    DirectHarnessRuntimeOptions,\n    'historyOwnership' | 'sessionsRoot' | 'sessionPath' | 'sessionId' | 'parentSessionId'\n  >,\n  context: Context,\n) {\n  if (!options.historyOwnership) throw new Error('SQLite sessions require explicit HistoryOwnership');\n  if (!options.sessionsRoot && !options.sessionPath) throw new Error('SQLite sessions require a server data directory');\n  const id = options.sessionId ?? (options.sessionPath ? path.basename(options.sessionPath, '.sqlite') : randomUUID());\n  if (!/^[a-zA-Z0-9_-]+$/u.test(id)) throw new Error('Invalid SQLite session id');\n  const sessionFile = path.resolve(\n    options.sessionPath ?? path.join(options.sessionsRoot!, DURABLE_DIRECTORY, `${id}.sqlite`),\n  );\n  if (path.basename(path.dirname(sessionFile)) !== DURABLE_DIRECTORY || path.extname(sessionFile) !== '.sqlite')\n    throw new Error('Unsupported or legacy SQLite session path');\n  const existing = fs.existsSync(sessionFile);\n  if (!existing && options.sessionsRoot && fs.existsSync(path.join(options.sessionsRoot, `${id}.sqlite`)))\n    throw new Error('Legacy SQLite sessions are unsupported by fresh durable storage');\n  if (options.sessionPath && !existing) throw new Error(`SQLite session not found: ${sessionFile}`);\n  if (existing) validateDurableSessionFile(sessionFile);\n  fs.mkdirSync(path.dirname(sessionFile), { recursive: true, mode: 0o700 });\n  const historyLease = await options.historyOwnership.acquire(sessionFile);\n  let storage: Storage | undefined;\n  try {\n    await historyLease.assertQuiescent();\n    if (fs.existsSync(sessionFile)) validateDurableSessionFile(sessionFile);\n    storage = await openNodeSqliteStorage(sessionFile);\n    const session = createSession(storage);\n    const identity = await session.snapshot(SessionIdentityDoc, context);\n    if (existing && (!identity || identity.id !== id))\n      throw new Error('SQLite session id does not match the requested session');\n    if (!existing) {\n      await session.commit(async (tx) => {\n        const doc = await tx.doc(SessionIdentityDoc);\n        doc.id = id;\n        doc.createdAt = Date.now();\n        doc.parentSessionId = options.parentSessionId ?? '';\n      }, context);\n      fs.chmodSync(sessionFile, 0o600);\n    }\n    const repository = { close: (closeContext: Context = context) => session.close(closeContext) };\n    return { storage, session, sessionFile, repository, historyLease };\n  } catch (error) {\n    try {\n      if (storage) await storage.close(context);\n    } finally {\n      await historyLease.release();\n    }\n    throw error;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"sqliteSessionStorage.mjs","names":[],"sources":["../src/services/sqliteSessionStorage/index.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\nimport fs from 'node:fs';\nimport path from 'node:path';\nimport { DatabaseSync } from 'node:sqlite';\n\nimport type { Context } from '@earendil-works/chord';\nimport { BACKGROUND_CONTEXT } from '@earendil-works/chord/context';\nimport { createSession, defineDoc, type Storage } from '@earendil-works/pi-durable';\nimport { SqliteStorage } from '@earendil-works/pi-durable/storage/sqlite';\nimport { NodeSqliteDatabase, openNodeSqliteDatabase } from '@earendil-works/pi-durable/storage/sqlite/node';\n\nimport type { DirectHarnessRuntimeOptions } from '../../types/server/directHarnessRuntime';\n\nexport const DURABLE_BACKGROUND_CONTEXT = BACKGROUND_CONTEXT;\n\nexport const DURABLE_DIRECTORY = 'durable-v1';\n/** Public string identity belongs to Doom, not the durable numeric ID namespace. */\nexport const SessionIdentityDoc = defineDoc({\n  kind: 'doompi.session.identity',\n  version: 1,\n  scope: 'session',\n  initial: () => ({ id: '', createdAt: 0, parentSessionId: '' }),\n});\nexport const SessionMetadataDoc = defineDoc({\n  kind: 'doompi.session.metadata',\n  version: 1,\n  scope: 'session',\n  initial: () => ({ name: '', workspaceRoot: '', execution: '', laneName: 'main' }),\n});\n\n/** Validate existing files without admitting a writer or applying schema upgrades. */\nexport function validateDurableSessionFile(file: string): void {\n  const database = new DatabaseSync(file, { readOnly: true });\n  try {\n    const schema = database.prepare('SELECT version FROM durable_schema WHERE singleton = 1').get();\n    if (schema?.version !== 1) throw new Error('Unsupported durable SQLite schema');\n    const tables = database.prepare(\"SELECT name FROM sqlite_master WHERE type = 'table'\").all();\n    for (const name of [\n      'durable_metadata',\n      'record_ids',\n      'conversations',\n      'entries',\n      'tasks',\n      'submissions',\n      'documents',\n      'document_revisions',\n    ]) {\n      if (!tables.some((table) => table.name === name)) throw new Error('Invalid durable SQLite schema');\n    }\n  } catch (cause) {\n    throw new Error('Unsupported or legacy SQLite session format', { cause });\n  } finally {\n    database.close();\n  }\n}\n\n/** Completed histories use a read-only connection. Initialization cannot write or migrate. */\nexport async function openReadOnlyDurableStorage(file: string): Promise<Storage> {\n  validateDurableSessionFile(file);\n  const native = new DatabaseSync(file, { readOnly: true });\n  const database = new NodeSqliteDatabase(native);\n  let closed = false;\n  const close = async () => {\n    if (closed) return;\n    // The writer adapter checkpoints WAL on close, which read-only connections cannot do.\n    native.close();\n    closed = true;\n  };\n  try {\n    const storage = await SqliteStorage.open({\n      exec: (sql) => database.exec(sql),\n      run: (sql, ...params) => database.run(sql, ...params),\n      get: (sql, ...params) => database.get(sql, ...params),\n      all: (sql, ...params) => database.all(sql, ...params),\n      close,\n      transaction: (callback) =>\n        callback({\n          exec: async (sql) => {\n            if (!/^CREATE TABLE IF NOT EXISTS durable_schema\\s/u.test(sql))\n              throw new Error('Read-only durable storage');\n          },\n          run: async (sql) => {\n            if (sql !== 'INSERT OR IGNORE INTO durable_schema (singleton, version) VALUES (1, 0)')\n              throw new Error('Read-only durable storage');\n          },\n          get: (sql, ...params) => database.get(sql, ...params),\n          all: (sql, ...params) => database.all(sql, ...params),\n        }),\n    });\n    return storage;\n  } catch (error) {\n    try {\n      await close();\n    } catch (cleanupError) {\n      throw new AggregateError([error, cleanupError], 'Read-only storage initialization cleanup failed');\n    }\n    throw error;\n  }\n}\n\n/** Opens the one fresh-format SQLite container owned by a server session. */\nexport async function openSqliteSessionStorage(\n  options: Pick<\n    DirectHarnessRuntimeOptions,\n    'historyOwnership' | 'sessionsRoot' | 'sessionPath' | 'sessionId' | 'parentSessionId'\n  >,\n  context: Context,\n) {\n  if (!options.historyOwnership) throw new Error('SQLite sessions require explicit HistoryOwnership');\n  if (!options.sessionsRoot && !options.sessionPath) throw new Error('SQLite sessions require a server data directory');\n  const id = options.sessionId ?? (options.sessionPath ? path.basename(options.sessionPath, '.sqlite') : randomUUID());\n  if (!/^[a-zA-Z0-9_-]+$/u.test(id)) throw new Error('Invalid SQLite session id');\n  const sessionFile = path.resolve(\n    options.sessionPath ?? path.join(options.sessionsRoot!, DURABLE_DIRECTORY, `${id}.sqlite`),\n  );\n  if (path.basename(path.dirname(sessionFile)) !== DURABLE_DIRECTORY || path.extname(sessionFile) !== '.sqlite')\n    throw new Error('Unsupported or legacy SQLite session path');\n  const existing = fs.existsSync(sessionFile);\n  if (!existing && options.sessionsRoot && fs.existsSync(path.join(options.sessionsRoot, `${id}.sqlite`)))\n    throw new Error('Legacy SQLite sessions are unsupported by fresh durable storage');\n  if (options.sessionPath && !existing) throw new Error(`SQLite session not found: ${sessionFile}`);\n  if (existing) validateDurableSessionFile(sessionFile);\n  fs.mkdirSync(path.dirname(sessionFile), { recursive: true, mode: 0o700 });\n  const historyLease = await options.historyOwnership.acquire(sessionFile);\n  let storage: Storage | undefined;\n  let database: NodeSqliteDatabase | undefined;\n  let writerOpenAttempted = false;\n  try {\n    await historyLease.assertQuiescent();\n    if (fs.existsSync(sessionFile)) validateDurableSessionFile(sessionFile);\n    writerOpenAttempted = true;\n    database = await openNodeSqliteDatabase(sessionFile);\n    storage = await SqliteStorage.open(database);\n    const session = createSession(storage);\n    const identity = await session.snapshot(SessionIdentityDoc, context);\n    if (existing && (!identity || identity.id !== id))\n      throw new Error('SQLite session id does not match the requested session');\n    if (!existing) {\n      await session.commit(async (tx) => {\n        const doc = await tx.doc(SessionIdentityDoc);\n        doc.id = id;\n        doc.createdAt = Date.now();\n        doc.parentSessionId = options.parentSessionId ?? '';\n      }, context);\n      fs.chmodSync(sessionFile, 0o600);\n    }\n    const repository = { close: (closeContext: Context = context) => session.close(closeContext) };\n    return { storage, session, sessionFile, repository, historyLease };\n  } catch (error) {\n    // ponytail: An upstream open rejection has no closure receipt, so retain ownership until shutdown is confirmed.\n    if (writerOpenAttempted && !database) throw error;\n    try {\n      if (storage) await storage.close(context);\n      else if (database) await database.close();\n    } catch (cleanupError) {\n      throw new AggregateError([error, cleanupError], 'SQLite storage initialization cleanup failed');\n    }\n    try {\n      await historyLease.release();\n    } catch (cleanupError) {\n      throw new AggregateError([error, cleanupError], 'SQLite storage ownership cleanup failed');\n    }\n    throw error;\n  }\n}\n"],"mappings":"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"}

package/dist/src/server/directHarnessRuntime.cjs

@@ -562,9 +562,34 @@ async function createDirectHarnessRuntime(options) {
 		const attach = async () => {
 			if (watcher) await watcher.stop();
 			watcher = await (0, _earendil_works_pi_durable.watchEvents)(harness, conversation.id, context);
+			let predecessor = watcher.snapshot.entries.at(-1)?.id;
+			lastAssistant = void 0;
+			partial = void 0;
+			toolResults = [];
 			watcher.start(async (events, eventContext) => {
 				for (const event of events) {
 					let mapped;
+					if (event.type === "turn_start" || event.type === "run_start") {
+						lastAssistant = void 0;
+						partial = void 0;
+						toolResults = [];
+					}
+					if (event.type === "message_end" || event.type === "entry_appended") {
+						const entry = require_index$1.projectDurableEntries([event.entry])[0];
+						if (entry) {
+							entry.parentId = predecessor === void 0 ? null : String(predecessor);
+							const added = {
+								type: "entry_added",
+								entry
+							};
+							emit({
+								type: "entry_appended",
+								entry
+							});
+							eventsSettled = eventsSettled.then(() => deliver(added, eventContext));
+						}
+						predecessor = event.entry.id;
+					}
 					if ([
 						"run_start",
 						"run_end",
@@ -589,10 +614,6 @@ async function createDirectHarnessRuntime(options) {
 							runId: String(conversation.id)
 						};
 					}
-					if (event.type === "entry_appended") mapped = {
-						type: "entry_added",
-						entry: require_index$1.projectDurableEntries([event.entry])[0]
-					};
 					if (event.type === "tool_execution_start") mapped = {
 						...event,
 						type: "tool_start"
@@ -617,6 +638,8 @@ async function createDirectHarnessRuntime(options) {
 							toolResults
 						};
 						toolResults = [];
+						lastAssistant = void 0;
+						partial = void 0;
 					}
 					if (event.type === "message_update" && partial) for (const change of event.changes) {
 						if (change.type === "message") {
@@ -671,7 +694,7 @@ async function createDirectHarnessRuntime(options) {
 						type: "queue_update",
 						queues: event.items.map((item) => ({ kind: item.mode }))
 					};
-					if (event.type === "entry_appended") {
+					if (event.type === "message_end") {
 						for (const message of event.entry.model ?? []) if (message.role === "assistant") eventsSettled = eventsSettled.then(() => deliver({
 							type: "usage",
 							row: {
@@ -1099,20 +1122,26 @@ async function createDirectHarnessRuntime(options) {
 		};
 		let disposePromise;
 		const dispose = () => disposePromise ??= (async () => {
-			await interrupt();
+			const failures = [];
+			const attempt = async (cleanup) => {
+				try {
+					await cleanup();
+					return true;
+				} catch (error) {
+					failures.push(error);
+					return false;
+				}
+			};
+			await attempt(interrupt);
 			disposed = true;
-			await watcher.stop();
-			await eventsSettled;
-			try {
-				await harness.close(context);
-				await storage.repository?.close(context);
-				await environment.cleanup(context);
-				await storage.historyLease?.release();
-				resolveExited(0);
-			} catch (error) {
-				resolveExited(1);
-				throw error;
-			}
+			await attempt(() => watcher.stop());
+			await attempt(() => eventsSettled);
+			const harnessClosed = await attempt(() => harness.close(context));
+			const repositoryClosed = harnessClosed && await attempt(async () => storage.repository?.close(context));
+			await attempt(() => environment.cleanup(context));
+			if (harnessClosed && repositoryClosed) await attempt(async () => storage.historyLease?.release());
+			resolveExited(failures.length ? 1 : 0);
+			if (failures.length) throw new AggregateError(failures, "Direct harness cleanup failed");
 		})();
 		const recordUsage = async (usage, usageOptions) => {
 			const entryId = await appendEntry({
@@ -1600,12 +1629,8 @@ async function createDirectHarnessRuntime(options) {
 		} catch (closeError) {
 			failures.push(closeError);
 		}
-		try {
+		if (failures.length === 1) try {
 			await storage.repository?.close(context);
-		} catch (closeError) {
-			failures.push(closeError);
-		}
-		try {
 			await storage.historyLease?.release();
 		} catch (closeError) {
 			failures.push(closeError);