@tekmidian/pai 0.16.0 → 0.17.0

package/dist/factory-PDXQdkLO.mjs

@@ -0,0 +1,72 @@
+import { t as __exportAll } from "./rolldown-runtime-95iHPtFO.mjs";
+
+//#region src/storage/factory.ts
+var factory_exports = /* @__PURE__ */ __exportAll({ createStorageBackend: () => createStorageBackend });
+/** Backoff schedule (ms) for the bounded CLI retry path. */
+const CLI_RETRY_DELAYS_MS = [
+	500,
+	1e3,
+	2e3
+];
+/** Backoff cap (ms) for the daemon's infinite retry path. */
+const DAEMON_RETRY_CAP_MS = 15e3;
+/**
+* Create and return the configured StorageBackend.
+*
+* Auto-behaviour:
+*  - storageBackend = "sqlite"   → SQLiteBackend always
+*  - storageBackend = "postgres" → PostgresBackend (retried; never falls back)
+*/
+async function createStorageBackend(config, opts = {}) {
+	if (config.storageBackend === "postgres") return await connectPostgres(config, opts.waitForPostgres ?? false);
+	return createSQLiteBackend();
+}
+/**
+* Attempt a single Postgres connection (ensure DB + test). Returns the live
+* backend on success, or an error string describing why it failed.
+*/
+async function attemptPostgres(config) {
+	const { PostgresBackend } = await import("./postgres-BJxiqtqg.mjs");
+	const pgConfig = config.postgres ?? {};
+	let backend = null;
+	try {
+		await PostgresBackend.ensureDatabase(pgConfig);
+		backend = new PostgresBackend(pgConfig);
+		const err = await backend.testConnection();
+		if (err) {
+			await backend.close().catch(() => {});
+			return { error: err };
+		}
+		return { backend };
+	} catch (e) {
+		if (backend) await backend.close().catch(() => {});
+		return { error: e instanceof Error ? e.message : String(e) };
+	}
+}
+async function connectPostgres(config, waitForever) {
+	let attempt = 0;
+	let lastError = "unknown error";
+	while (true) {
+		attempt++;
+		const result = await attemptPostgres(config);
+		if ("backend" in result) {
+			if (attempt > 1) process.stderr.write(`[pai-daemon] Connected to PostgreSQL backend (after ${attempt} attempts).\n`);
+			else process.stderr.write("[pai-daemon] Connected to PostgreSQL backend.\n");
+			return result.backend;
+		}
+		lastError = result.error;
+		if (!waitForever && attempt > CLI_RETRY_DELAYS_MS.length) throw new Error(`Postgres backend unreachable after ${attempt} attempts: ${lastError}. Is Docker Desktop / Postgres running? Refusing to fall back to SQLite (would split the corpus). Start Postgres and retry.`);
+		const delayMs = waitForever ? Math.min(DAEMON_RETRY_CAP_MS, 1e3 * 2 ** Math.min(attempt - 1, 4)) : CLI_RETRY_DELAYS_MS[attempt - 1];
+		process.stderr.write(`[pai-daemon] Postgres unavailable (${lastError}). Retry ${attempt}${waitForever ? "" : `/${CLI_RETRY_DELAYS_MS.length + 1}`} in ${delayMs}ms...\n`);
+		await new Promise((r) => setTimeout(r, delayMs));
+	}
+}
+async function createSQLiteBackend() {
+	const { openFederation } = await import("./db-CYmBWcjh.mjs").then((n) => n.t);
+	const { SQLiteBackend } = await import("./sqlite-Nw8ZW5Rj.mjs");
+	return new SQLiteBackend(openFederation());
+}
+
+//#endregion
+export { factory_exports as n, createStorageBackend as t };
+//# sourceMappingURL=factory-PDXQdkLO.mjs.map

package/dist/factory-PDXQdkLO.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"factory-PDXQdkLO.mjs","names":[],"sources":["../src/storage/factory.ts"],"sourcesContent":["/**\n * Storage backend factory.\n *\n * Reads the daemon config and returns the appropriate StorageBackend.\n *\n * When Postgres is the configured backend we NEVER silently fall back to\n * SQLite — doing so would split the corpus across two databases. Instead:\n *  - Daemon (waitForPostgres: true) retries Postgres forever with capped\n *    backoff until it comes up (handles the boot race where launchd starts\n *    the daemon before Docker Desktop / Postgres is ready).\n *  - CLI / one-shot callers (default) retry a few times, then throw a clear\n *    error rather than returning a wrong/empty SQLite database.\n */\n\nimport type { PaiDaemonConfig } from \"../daemon/config.js\";\nimport type { StorageBackend } from \"./interface.js\";\n\nexport interface StorageBackendOptions {\n  /**\n   * When true, retry Postgres indefinitely instead of giving up. Used by the\n   * long-lived daemon so a not-yet-ready Postgres at boot is tolerated.\n   * Defaults to false (one-shot CLI behaviour: bounded retries, then throw).\n   */\n  waitForPostgres?: boolean;\n}\n\n/** Backoff schedule (ms) for the bounded CLI retry path. */\nconst CLI_RETRY_DELAYS_MS = [500, 1_000, 2_000];\n\n/** Backoff cap (ms) for the daemon's infinite retry path. */\nconst DAEMON_RETRY_CAP_MS = 15_000;\n\n/**\n * Create and return the configured StorageBackend.\n *\n * Auto-behaviour:\n *  - storageBackend = \"sqlite\"   → SQLiteBackend always\n *  - storageBackend = \"postgres\" → PostgresBackend (retried; never falls back)\n */\nexport async function createStorageBackend(\n  config: PaiDaemonConfig,\n  opts: StorageBackendOptions = {}\n): Promise<StorageBackend> {\n  if (config.storageBackend === \"postgres\") {\n    return await connectPostgres(config, opts.waitForPostgres ?? false);\n  }\n\n  // Default: SQLite\n  return createSQLiteBackend();\n}\n\n/**\n * Attempt a single Postgres connection (ensure DB + test). Returns the live\n * backend on success, or an error string describing why it failed.\n */\nasync function attemptPostgres(\n  config: PaiDaemonConfig\n): Promise<{ backend: StorageBackend } | { error: string }> {\n  const { PostgresBackend } = await import(\"./postgres.js\");\n  const pgConfig = config.postgres ?? {};\n\n  let backend: InstanceType<typeof PostgresBackend> | null = null;\n  try {\n    // Ensure the per-user database exists and has the schema applied.\n    await PostgresBackend.ensureDatabase(pgConfig);\n\n    backend = new PostgresBackend(pgConfig);\n    const err = await backend.testConnection();\n    if (err) {\n      await backend.close().catch(() => {});\n      return { error: err };\n    }\n    return { backend };\n  } catch (e) {\n    if (backend) await backend.close().catch(() => {});\n    return { error: e instanceof Error ? e.message : String(e) };\n  }\n}\n\nasync function connectPostgres(\n  config: PaiDaemonConfig,\n  waitForever: boolean\n): Promise<StorageBackend> {\n  let attempt = 0;\n  let lastError = \"unknown error\";\n\n  // eslint-disable-next-line no-constant-condition\n  while (true) {\n    attempt++;\n    const result = await attemptPostgres(config);\n    if (\"backend\" in result) {\n      if (attempt > 1) {\n        process.stderr.write(\n          `[pai-daemon] Connected to PostgreSQL backend (after ${attempt} attempts).\\n`\n        );\n      } else {\n        process.stderr.write(\"[pai-daemon] Connected to PostgreSQL backend.\\n\");\n      }\n      return result.backend;\n    }\n\n    lastError = result.error;\n\n    if (!waitForever && attempt > CLI_RETRY_DELAYS_MS.length) {\n      // Bounded CLI path exhausted — fail loudly, never silently use SQLite.\n      throw new Error(\n        `Postgres backend unreachable after ${attempt} attempts: ${lastError}. ` +\n          `Is Docker Desktop / Postgres running? Refusing to fall back to SQLite ` +\n          `(would split the corpus). Start Postgres and retry.`\n      );\n    }\n\n    const delayMs = waitForever\n      ? Math.min(DAEMON_RETRY_CAP_MS, 1_000 * 2 ** Math.min(attempt - 1, 4))\n      : CLI_RETRY_DELAYS_MS[attempt - 1];\n\n    process.stderr.write(\n      `[pai-daemon] Postgres unavailable (${lastError}). ` +\n        `Retry ${attempt}${waitForever ? \"\" : `/${CLI_RETRY_DELAYS_MS.length + 1}`} ` +\n        `in ${delayMs}ms...\\n`\n    );\n    await new Promise((r) => setTimeout(r, delayMs));\n  }\n}\n\nasync function createSQLiteBackend(): Promise<StorageBackend> {\n  const { openFederation } = await import(\"../memory/db.js\");\n  const { SQLiteBackend } = await import(\"./sqlite.js\");\n  const db = openFederation();\n  return new SQLiteBackend(db);\n}\n"],"mappings":";;;;;AA2BA,MAAM,sBAAsB;CAAC;CAAK;CAAO;CAAM;;AAG/C,MAAM,sBAAsB;;;;;;;;AAS5B,eAAsB,qBACpB,QACA,OAA8B,EAAE,EACP;AACzB,KAAI,OAAO,mBAAmB,WAC5B,QAAO,MAAM,gBAAgB,QAAQ,KAAK,mBAAmB,MAAM;AAIrE,QAAO,qBAAqB;;;;;;AAO9B,eAAe,gBACb,QAC0D;CAC1D,MAAM,EAAE,oBAAoB,MAAM,OAAO;CACzC,MAAM,WAAW,OAAO,YAAY,EAAE;CAEtC,IAAI,UAAuD;AAC3D,KAAI;AAEF,QAAM,gBAAgB,eAAe,SAAS;AAE9C,YAAU,IAAI,gBAAgB,SAAS;EACvC,MAAM,MAAM,MAAM,QAAQ,gBAAgB;AAC1C,MAAI,KAAK;AACP,SAAM,QAAQ,OAAO,CAAC,YAAY,GAAG;AACrC,UAAO,EAAE,OAAO,KAAK;;AAEvB,SAAO,EAAE,SAAS;UACX,GAAG;AACV,MAAI,QAAS,OAAM,QAAQ,OAAO,CAAC,YAAY,GAAG;AAClD,SAAO,EAAE,OAAO,aAAa,QAAQ,EAAE,UAAU,OAAO,EAAE,EAAE;;;AAIhE,eAAe,gBACb,QACA,aACyB;CACzB,IAAI,UAAU;CACd,IAAI,YAAY;AAGhB,QAAO,MAAM;AACX;EACA,MAAM,SAAS,MAAM,gBAAgB,OAAO;AAC5C,MAAI,aAAa,QAAQ;AACvB,OAAI,UAAU,EACZ,SAAQ,OAAO,MACb,uDAAuD,QAAQ,eAChE;OAED,SAAQ,OAAO,MAAM,kDAAkD;AAEzE,UAAO,OAAO;;AAGhB,cAAY,OAAO;AAEnB,MAAI,CAAC,eAAe,UAAU,oBAAoB,OAEhD,OAAM,IAAI,MACR,sCAAsC,QAAQ,aAAa,UAAU,6HAGtE;EAGH,MAAM,UAAU,cACZ,KAAK,IAAI,qBAAqB,MAAQ,KAAK,KAAK,IAAI,UAAU,GAAG,EAAE,CAAC,GACpE,oBAAoB,UAAU;AAElC,UAAQ,OAAO,MACb,sCAAsC,UAAU,WACrC,UAAU,cAAc,KAAK,IAAI,oBAAoB,SAAS,IAAI,MACrE,QAAQ,SACjB;AACD,QAAM,IAAI,SAAS,MAAM,WAAW,GAAG,QAAQ,CAAC;;;AAIpD,eAAe,sBAA+C;CAC5D,MAAM,EAAE,mBAAmB,MAAM,OAAO;CACxC,MAAM,EAAE,kBAAkB,MAAM,OAAO;AAEvC,QAAO,IAAI,cADA,gBAAgB,CACC"}

package/dist/hooks/context-compression-hook.mjs

@@ -490,13 +490,13 @@ var BOILERPLATE_PATTERNS = [
   /^>\s*Working directory:/,
   /^>\s*Resume with:/,
   /^>\s*_No checkpoint body was recorded/,
-  /^>?\s*$/,
   /^-{3,}$/
 ];
+var BLANK_LINE = /^>?\s*$/;
 function isBoilerplateOnly(lines) {
   return lines.every((line) => {
     const t = line.trim();
-    return BOILERPLATE_PATTERNS.some((re) => re.test(t));
+    return BLANK_LINE.test(t) || BOILERPLATE_PATTERNS.some((re) => re.test(t));
   });
 }
 function extractSectionContent(lines) {
@@ -506,7 +506,25 @@ function extractSectionContent(lines) {
     if (BOILERPLATE_PATTERNS.some((re) => re.test(t))) continue;
     kept.push(line);
   }
-  return kept.join("\n").trim();
+  return trimBlankEdges(collapseBlankRuns(kept)).join("\n");
+}
+function trimBlankEdges(lines) {
+  let start = 0;
+  let end = lines.length;
+  while (start < end && BLANK_LINE.test(lines[start].trim())) start += 1;
+  while (end > start && BLANK_LINE.test(lines[end - 1].trim())) end -= 1;
+  return lines.slice(start, end);
+}
+function collapseBlankRuns(lines) {
+  const out = [];
+  let lastWasBlank = false;
+  for (const line of lines) {
+    const isBlank = BLANK_LINE.test(line.trim());
+    if (isBlank && lastWasBlank) continue;
+    out.push(line);
+    lastWasBlank = isBlank;
+  }
+  return out;
 }
 function locateContinue(content) {
   const lines = content.split("\n");
@@ -609,6 +627,12 @@ function buildContinueBlock(opts) {
   parts.push("", MARKER_CLOSE, "", "---", "");
   return parts.join("\n");
 }
+function isSameSession(meta, opts) {
+  if (meta.sessionId && opts.sessionId) {
+    return meta.sessionId === opts.sessionId;
+  }
+  return meta.session === opts.sessionLine;
+}
 function applyContinue(opts) {
   const target = resolveTodoTarget(opts.rootPath, { create: !opts.dryRun });
   if (!target) {
@@ -623,7 +647,7 @@ function applyContinue(opts) {
   let carriedForward = false;
   let effectiveBody = opts.body;
   if (opts.authored === "auto" && existing) {
-    if (existing.meta?.authored === "model" && existing.meta.session === opts.sessionLine) {
+    if (existing.meta?.authored === "model" && isSameSession(existing.meta, opts)) {
       return {
         action: "preserved",
         path: target.path,
@@ -631,6 +655,14 @@ function applyContinue(opts) {
         preservedMeta: existing.meta
       };
     }
+    if (existing.meta && !(opts.body ?? "").trim() && !isBoilerplateOnly(existing.lines)) {
+      return {
+        action: "preserved",
+        path: target.path,
+        block: buildContinueBlock(opts),
+        preservedMeta: existing.meta ?? void 0
+      };
+    }
     if (!existing.meta && !isBoilerplateOnly(existing.lines)) {
       const salvaged = extractSectionContent(existing.lines);
       if (salvaged) {