@mycadet/assistant 0.12.9 → 0.12.11

package/src/persistence/__tests__/main-db-readonly-probe.ts

@@ -1,52 +1,47 @@
 /**
- * Subprocess probe for the resource monitor's main-DB posture: telemetry
- * queries route through the dedicated read-only connection, writes through
- * it fail loudly, and the telemetry DB stays writable. Spawned by
- * `main-db-readonly.test.ts` with CADET_WORKSPACE_DIR pointing at a fresh
- * temp workspace, so the process-scoped posture and connection singletons
- * never leak into the test runner process.
+ * Subprocess probe for the main DB's read-only connection posture — the
+ * resource monitor's shape: reads through the dedicated read-only connection
+ * work, writes through it fail loudly instead of contending for the write
+ * lock. Spawned by `main-db-readonly.test.ts` with CADET_WORKSPACE_DIR
+ * pointing at a fresh temp workspace, so the process-scoped posture and
+ * connection singletons never leak into the test runner process.
  *
  * Exits 0 and prints READONLY_PROBE_OK when every assertion holds; any
  * failure throws and exits non-zero.
  */
 
-import {
-  getFlushCheckpoint,
-  setFlushCheckpoint,
-} from "../../telemetry/flush-checkpoints.js";
-import { useReadOnlyMainDbForTelemetry } from "../../telemetry/telemetry-main-db.js";
-import {
-  getMainDbReadOnly,
-  getTelemetryDb,
-  resetDb,
-} from "../db-connection.js";
+import { getMainDbReadOnly } from "../db-connection.js";
 import { initializeDb } from "../db-init.js";
-import { queryUnreportedUsageEvents } from "../llm-usage-store.js";
-import { memoryCheckpoints, telemetryEvents } from "../schema/index.js";
+import { conversations } from "../schema/index.js";
 
-// Create the schema over the normal read-write connections, then reopen
-// with the monitor's posture: telemetry main-DB reads go through the
-// dedicated read-only connection; the telemetry DB stays read-write.
+// Create the schema over the normal read-write connection, then exercise the
+// monitor's separate read-only connection against the same file.
 await initializeDb();
-resetDb();
-useReadOnlyMainDbForTelemetry();
 
-// Telemetry store queries work over the read-only main connection.
-const rows = queryUnreportedUsageEvents(0, undefined, 10);
-if (!Array.isArray(rows) || rows.length !== 0) {
-  throw new Error(`expected empty usage query, got ${JSON.stringify(rows)}`);
-}
-
-// Writes through the read-only connection fail loudly.
 const readOnlyDb = getMainDbReadOnly();
 if (!readOnlyDb) {
   throw new Error("read-only main DB connection unavailable");
 }
+
+// Reads work over the read-only connection.
+const rows = readOnlyDb.select().from(conversations).all();
+if (!Array.isArray(rows) || rows.length !== 0) {
+  throw new Error(
+    `expected empty conversations read, got ${JSON.stringify(rows)}`,
+  );
+}
+
+// Writes through the read-only connection fail loudly.
 let writeError: unknown;
 try {
   readOnlyDb
-    .insert(memoryCheckpoints)
-    .values({ key: "readonly-probe", value: "1", updatedAt: Date.now() })
+    .insert(conversations)
+    .values({
+      id: "readonly-probe",
+      title: "readonly probe",
+      createdAt: Date.now(),
+      updatedAt: Date.now(),
+    })
     .run();
 } catch (err) {
   writeError = err;
@@ -57,24 +52,4 @@ if (!writeError || !/readonly/i.test(String(writeError))) {
   );
 }
 
-// The telemetry DB stays writable: flush state and event rows.
-setFlushCheckpoint("telemetry:readonly-probe:last_reported_at", "123");
-if (getFlushCheckpoint("telemetry:readonly-probe:last_reported_at") !== "123") {
-  throw new Error("flush checkpoint round-trip failed");
-}
-const telemetryDb = getTelemetryDb();
-if (!telemetryDb) {
-  throw new Error("telemetry DB unavailable");
-}
-telemetryDb
-  .insert(telemetryEvents)
-  .values({
-    id: "readonly-probe-row",
-    name: "config_setting",
-    createdAt: Date.now(),
-    conversationId: null,
-    payload: '{"type":"config_setting"}',
-  })
-  .run();
-
 console.log("READONLY_PROBE_OK");

package/src/persistence/__tests__/message-content-file.test.ts

@@ -11,7 +11,7 @@ import { describe, expect, test } from "bun:test";
 
 import { contentBlockArraySchema } from "../../providers/content-block-schema.js";
 import type { ContentBlock } from "../../providers/types.js";
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import {
   appendContentDeltas,
   foldContentDeltas,

package/src/persistence/__tests__/slow-sync-log.test.ts

@@ -6,7 +6,6 @@ import {
   markSection,
   reportSlowSync,
   resetSectionTrailForTests,
-  SLOW_SYNC_CHECK_NAME,
   SLOW_SYNC_THRESHOLD_MS,
   timeSyncSection,
   traceAsyncSection,
@@ -15,7 +14,6 @@ import {
 describe("slow-sync-log", () => {
   test("threshold default is a positive number", () => {
     expect(SLOW_SYNC_THRESHOLD_MS).toBeGreaterThan(0);
-    expect(SLOW_SYNC_CHECK_NAME).toBe("slow_sync_operation");
   });
 
   test("timeSyncSection returns the section's value and runs it once", () => {

package/src/persistence/attachments-store.ts

@@ -26,8 +26,8 @@ import {
   normalizeImageBytes,
   sniffImageFileMimeType,
 } from "../util/image-conversion.js";
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 import { getConversationAttachmentsDirPath } from "./conversation-directories.js";
 import { getDb } from "./db-connection.js";
 import { rawAll, rawGet, rawRun } from "./raw-query.js";

package/src/persistence/conversation-crud.ts

@@ -52,9 +52,9 @@ import { getCurrentSeq } from "../runtime/assistant-stream-state.js";
 import { publishConversationListAndMetadataChanged } from "../runtime/sync/resource-sync-events.js";
 import { publishSyncInvalidation } from "../runtime/sync/sync-publisher.js";
 import { UserError } from "../util/errors.js";
+import { getConversationsDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
 import { getLogsDbPath } from "../util/logs-db-path.js";
-import { getConversationsDir } from "../util/platform.js";
 import { createRowMapper, parseJsonNullable } from "../util/row-mapper.js";
 import {
   isRetryableSqliteError,
@@ -128,7 +128,6 @@ import {
   enqueueLexicalIndexForMessage,
   enqueuePurgeConversationLexical,
 } from "./job-handlers/message-lexical.js";
-import { buildLifecycleTelemetryEvent } from "./lifecycle-events-store.js";
 import { resolveMessageContentBlocks } from "./message-content-file.js";
 import {
   loadMessageBound,
@@ -143,7 +142,6 @@ import {
   rawLogsRun,
   rawMemoryRun,
   rawRun,
-  rawTelemetryRun,
 } from "./raw-query.js";
 import {
   attachments,
@@ -4245,17 +4243,6 @@ export async function clearAll(): Promise<{
     }
   };
 
-  // Pending skill_loaded rows live in the telemetry_events outbox on the
-  // dedicated telemetry connection. Redact them FIRST, before any destructive
-  // delete: unshipped skill events reference conversations this wipe must
-  // redact, so a telemetry failure must abort the clear-all while the
-  // workspace is still fully intact — never after memory state is already
-  // gone.
-  rawTelemetryRun(
-    "conversation:clearAll:skillLoadedEvents",
-    "DELETE FROM telemetry_events WHERE name = 'skill_loaded'",
-  );
-
   // Delete in dependency order. The cascade handles tool_invocations. memory_jobs,
   // memory_segments, memory_embeddings, and memory_summaries each live on a
   // dedicated connection; clear them there rather than through a main-DB sqlite3
@@ -4310,30 +4297,6 @@ export async function clearAll(): Promise<{
   // orphan sweep reclaims those rows on the next memory boot.
   await runHook(HOOKS.CONVERSATIONS_CLEARED, {});
 
-  // Record audit event into the telemetry_events outbox (consent-bypassing);
-  // the trail persists platform-side once flushed. Best-effort: the
-  // destructive deletes above already completed, so telemetry degradation
-  // must not turn a finished wipe into a failure or skip the cleanup below.
-  try {
-    const auditEventId = uuid();
-    const auditEventAt = Date.now();
-    rawTelemetryRun(
-      "conversation:clearAll:auditEvent",
-      `INSERT INTO telemetry_events (id, name, created_at, conversation_id, payload) VALUES (?, 'lifecycle', ?, NULL, ?)`,
-      auditEventId,
-      auditEventAt,
-      JSON.stringify(
-        buildLifecycleTelemetryEvent(
-          auditEventId,
-          "conversations_clear_all",
-          auditEventAt,
-        ),
-      ),
-    );
-  } catch (err) {
-    log.warn({ err }, "clearAll: failed to record audit event");
-  }
-
   // Drop the whole lexical (Qdrant) collection — a "delete all" leaves no ids
   // to key per-message cleanup on. AWAITED so the drop completes before
   // clear-all returns and writes resume — a message created right after must

package/src/persistence/conversation-directories.ts

@@ -1,7 +1,7 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 
-import { getConversationsDir } from "../util/platform.js";
+import { getConversationsDir } from "../util/layout.js";
 
 function getConversationDirTimestamp(createdAtMs: number): string {
   return new Date(createdAtMs).toISOString().replace(/:/g, "-");

package/src/persistence/conversation-types.ts

@@ -163,14 +163,6 @@ export function isSystemCardMetadata(
  */
 export const NO_RESPONSE_MESSAGE_KIND = "no_response";
 
-/**
- * Metadata key on an assistant row from a turn that ran on the Auto profile:
- * the default profile key the router picked for the turn. Projected to
- * `ConversationMessage.autoRoutedProfile` so clients can show which profile
- * answered. Absent on every other row.
- */
-export const AUTO_ROUTED_PROFILE_METADATA_KEY = "autoRoutedProfile";
-
 /**
  * Shared predicate for the deliberate-silence marker, mirroring
  * {@link isSystemCardMetadata} so display merging, transcript rendering, and

package/src/persistence/db-async-query.ts

@@ -29,8 +29,8 @@
 import { spawn } from "node:child_process";
 import { Database } from "bun:sqlite";
 
+import { getDbPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getDbPath } from "../util/platform.js";
 import { findSqlite3 } from "../util/sqlite3-runtime.js";
 import { getSqlite, SQLITE_BUSY_TIMEOUT_MS } from "./db-connection.js";
 

package/src/persistence/db-connection.ts

@@ -5,9 +5,9 @@ import { Database } from "bun:sqlite";
 import { canonicalizePathThroughExistingParent } from "@mycadet/environments/test-path-guard";
 import { drizzle } from "drizzle-orm/bun-sqlite";
 
+import { ensureDataDir, getDbPath } from "../util/layout.js";
 import { getLogsDbPath } from "../util/logs-db-path.js";
 import { getMemoryDbPath } from "../util/memory-db-path.js";
-import { ensureDataDir, getDbPath } from "../util/platform.js";
 import { getTelemetryDbPath } from "../util/telemetry-db-path.js";
 import { clearStoredDb, getStoredDb, setStoredDb } from "./db-singleton.js";
 import * as schema from "./schema/index.js";
@@ -323,3 +323,13 @@ export function resetDb(): void {
   clearStoredDb("memory");
   clearStoredDb("telemetry");
 }
+
+/**
+ * Close only the telemetry connection. Migration 387 deletes the telemetry
+ * database file outright; closing its handle first lets that unlink succeed
+ * on platforms that lock open files, without disturbing the other dedicated
+ * connections the way the broader `resetDb()` would.
+ */
+export function closeTelemetryDb(): void {
+  clearStoredDb("telemetry");
+}

package/src/persistence/db-init.ts

@@ -1,7 +1,7 @@
 import { existsSync } from "node:fs";
 
+import { getDbPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getDbPath } from "../util/platform.js";
 import { runAsyncSqlite } from "./db-async-query.js";
 import { getDb, getSqliteFrom } from "./db-connection.js";
 import { runMigrationSteps } from "./migrations/run-migrations.js";

package/src/persistence/db-maintenance.ts

@@ -1,8 +1,8 @@
 import { statSync } from "node:fs";
 
 import { getConfig } from "../config/loader.js";
+import { getDbPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getDbPath } from "../util/platform.js";
 import { sweepOrphanedWatchTimelineEntries } from "../watch/watch-timeline.js";
 import { pruneRuns } from "../workflows/journal-store.js";
 import { getMemoryCheckpoint, setMemoryCheckpoint } from "./checkpoints.js";

package/src/persistence/embeddings/__tests__/embedding-local-lifecycle.test.ts

@@ -14,7 +14,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, describe, expect, test } from "bun:test";
 
-import { getEmbedWorkerPidPath } from "../../../util/platform.js";
+import { getEmbedWorkerPidPath } from "../../../util/layout.js";
 import {
   classifyWorkerOwnership,
   listWorkerProcesses,

package/src/persistence/embeddings/embedding-local.ts

@@ -10,15 +10,15 @@ import { join } from "node:path";
 import type { Subprocess } from "bun";
 
 import { getIsContainerized } from "../../config/env-registry.js";
+import {
+  getEmbeddingModelsDir,
+  getEmbedWorkerPidPath,
+} from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
 import {
   setOomScoreAdj,
   WORKER_OOM_SCORE_ADJ,
 } from "../../util/oom-priority.js";
-import {
-  getEmbeddingModelsDir,
-  getEmbedWorkerPidPath,
-} from "../../util/platform.js";
 import { isProcessAlive } from "../../util/process-liveness.js";
 import { PromiseGuard } from "../../util/promise-guard.js";
 import { workerComputeEnv } from "../../util/worker-compute.js";

package/src/persistence/embeddings/embedding-runtime-manager.ts

@@ -26,8 +26,8 @@ import { arch, platform } from "node:os";
 import { join } from "node:path";
 
 import { ensureBun, findBun } from "../../util/bun-runtime.js";
+import { getEmbeddingModelsDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getEmbeddingModelsDir } from "../../util/platform.js";
 import { PromiseGuard } from "../../util/promise-guard.js";
 
 const log = getLogger("embedding-runtime-manager");

package/src/persistence/embeddings/qdrant-client.ts

@@ -7,8 +7,8 @@ import { v4 as uuid } from "uuid";
 
 import { getQdrantHttpPortEnv, getQdrantUrlEnv } from "../../config/env.js";
 import type { AssistantConfig } from "../../config/types.js";
+import { getDataDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getDataDir } from "../../util/platform.js";
 
 const log = getLogger("qdrant-client");
 

package/src/persistence/embeddings/qdrant-manager.ts

@@ -16,12 +16,12 @@ import { dirname, join } from "node:path";
 import type { Subprocess } from "bun";
 
 import { getQdrantReadyzTimeoutMs, getQdrantUrlEnv } from "../../config/env.js";
+import { getDataDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
 import {
   setOomScoreAdj,
   WORKER_OOM_SCORE_ADJ,
 } from "../../util/oom-priority.js";
-import { getDataDir } from "../../util/platform.js";
 
 const log = getLogger("qdrant-manager");
 

package/src/persistence/job-handlers/__tests__/message-lexical-backfill.test.ts

@@ -71,7 +71,7 @@ import type {
   RouteDefinition,
   RouteHandlerArgs,
 } from "../../../runtime/routes/types.js";
-import { getWorkspacePluginsDir } from "../../../util/platform.js";
+import { getWorkspacePluginsDir } from "../../../util/layout.js";
 import {
   deleteMemoryCheckpoint,
   isLexicalBackfillComplete,

package/src/persistence/job-handlers/__tests__/message-lexical-enqueue.test.ts

@@ -39,7 +39,7 @@ import {
   loadRawConfig,
   saveRawConfig,
 } from "../../../config/loader.js";
-import { getWorkspacePluginsDir } from "../../../util/platform.js";
+import { getWorkspacePluginsDir } from "../../../util/layout.js";
 import { getMemoryDb } from "../../db-connection.js";
 import { initializeDb } from "../../db-init.js";
 import { memoryJobs } from "../../schema/index.js";

package/src/persistence/job-handlers/cleanup.ts

@@ -1,14 +1,14 @@
 import type { AssistantConfig } from "../../config/types.js";
 import { HOOKS } from "../../plugin-api/constants.js";
 import { runHook } from "../../plugins/pipeline.js";
-import { rotateToolInvocations } from "../../telemetry/tool-usage-store.js";
 import { getLogger } from "../../util/logger.js";
 import { getLogsDbPath } from "../../util/logs-db-path.js";
 import { purgeConversationSegments } from "../conversation-crud.js";
 import { runAsyncSqlite } from "../db-async-query.js";
 import { getDb } from "../db-connection.js";
 import { enqueueMemoryJob, type MemoryJob } from "../jobs-store.js";
-import { rawAll, rawLogsRun, rawRun, rawTelemetryRun } from "../raw-query.js";
+import { rawAll, rawLogsRun, rawRun } from "../raw-query.js";
+import { rotateToolInvocations } from "../tool-usage-store.js";
 
 const log = getLogger("memory-jobs-worker");
 
@@ -161,9 +161,8 @@ function parseDeletedCount(stdout: string | undefined): number {
  * Tables with onDelete cascade on conversation FK (memory_segments,
  * conversation_keys, channel_inbound_events, message_runs, call_sessions,
  * external_conversation_bindings) are handled automatically. Tables without
- * cascade (messages, tool_invocations, plus llm_request_logs and
- * conversation-scoped telemetry_events rows on their dedicated connections)
- * are deleted explicitly before removing the conversation row.
+ * cascade (messages, tool_invocations, plus llm_request_logs) are deleted
+ * explicitly before removing the conversation row.
  */
 export function pruneOldConversationsJob(
   job: MemoryJob,
@@ -211,23 +210,15 @@ export function pruneOldConversationsJob(
         return;
       }
 
-      // Non-cascading tables. llm_request_logs and conversation-scoped
-      // telemetry_events rows live in the dedicated logs/telemetry
-      // connections, so they are deleted there (outside this main-DB
-      // transaction). Both run before the main-DB deletes: a failure leaves
-      // the conversation row in place so the prune retries — unshipped
-      // telemetry events must never outlive their pruned conversation and
-      // flush later.
+      // Non-cascading tables. llm_request_logs lives in the dedicated logs
+      // connection, so it is deleted there (outside this main-DB
+      // transaction), before the main-DB deletes: a failure leaves the
+      // conversation row in place so the prune retries.
       rawLogsRun(
         "cleanup:pruneOldConversations:logs",
         `DELETE FROM llm_request_logs WHERE conversation_id = ?`,
         id,
       );
-      rawTelemetryRun(
-        "cleanup:pruneOldConversations:telemetry",
-        `DELETE FROM telemetry_events WHERE conversation_id = ?`,
-        id,
-      );
       rawRun(
         "cleanup:pruneOldConversations:toolInv",
         `DELETE FROM tool_invocations WHERE conversation_id = ?`,