@mycadet/assistant 0.12.9 → 0.12.11

package/src/daemon/sqlite-corruption-watchdog.test.ts

@@ -8,33 +8,9 @@
  * a wrapped connection hits corruption. The direct emit itself (opt-out gate,
  * POST payload) is covered in `../telemetry/watchdog-direct-emit.test.ts`.
  */
-import { mkdtempSync, writeFileSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import { Database } from "bun:sqlite";
-import { beforeEach, describe, expect, mock, test } from "bun:test";
+import { describe, expect, test } from "bun:test";
 
-// Capture direct emits instead of POSTing them.
-const emitCalls: Array<{ checkName: string; detail: Record<string, unknown> }> =
-  [];
-mock.module("../telemetry/watchdog-direct-emit.js", () => ({
-  emitWatchdogEventDirect: (
-    checkName: string,
-    detail: Record<string, unknown>,
-  ) => {
-    emitCalls.push({ checkName, detail });
-    return Promise.resolve();
-  },
-}));
-
-import { wrapSqliteForSlowQueryLogging } from "../persistence/slow-query-log.js";
-import {
-  flushCorruptionEmitsForTesting,
-  isSqliteCorruptionError,
-  observeSqliteStatementError,
-  resetSqliteCorruptionWatchdogForTesting,
-  SQLITE_CORRUPTED_CHECK_NAME,
-} from "./sqlite-corruption-watchdog.js";
+import { isSqliteCorruptionError } from "./sqlite-corruption-watchdog.js";
 
 /** A synthetic `bun:sqlite`-style error carrying a `code`. */
 function sqliteError(code: string, message: string): Error {
@@ -86,119 +62,3 @@ describe("isSqliteCorruptionError", () => {
     );
   });
 });
-
-describe("observeSqliteStatementError", () => {
-  beforeEach(() => {
-    emitCalls.length = 0;
-    resetSqliteCorruptionWatchdogForTesting();
-  });
-
-  test("a corruption error emits sqlite_corrupted with detail", async () => {
-    observeSqliteStatementError(
-      sqliteError("SQLITE_CORRUPT", "database disk image is malformed"),
-      {
-        sql: "SELECT * FROM messages WHERE id = ?",
-        database: "main",
-        label: "load-history",
-      },
-    );
-    await flushCorruptionEmitsForTesting();
-
-    expect(emitCalls).toHaveLength(1);
-    expect(emitCalls[0].checkName).toBe(SQLITE_CORRUPTED_CHECK_NAME);
-    expect(emitCalls[0].checkName).toBe("sqlite_corrupted");
-    expect(emitCalls[0].detail).toMatchObject({
-      database: "main",
-      error: "database disk image is malformed",
-      sql: "SELECT * FROM messages WHERE id = ?",
-      label: "load-history",
-    });
-  });
-
-  test('falls back to "unknown" when the connection carried no database tag', async () => {
-    observeSqliteStatementError(new Error("file is not a database"), {
-      sql: "SELECT 1",
-    });
-    await flushCorruptionEmitsForTesting();
-
-    expect(emitCalls).toHaveLength(1);
-    expect(emitCalls[0].detail.database).toBe("unknown");
-  });
-
-  test("a transient / unrelated error emits nothing", async () => {
-    observeSqliteStatementError(sqliteError("SQLITE_BUSY", "locked"), {
-      sql: "INSERT ...",
-      database: "main",
-    });
-    observeSqliteStatementError(
-      sqliteError("SQLITE_CONSTRAINT", "UNIQUE constraint failed"),
-      { sql: "INSERT ...", database: "main" },
-    );
-    observeSqliteStatementError(new Error("no such table: foo"), {
-      sql: "SELECT ...",
-      database: "main",
-    });
-    await flushCorruptionEmitsForTesting();
-
-    expect(emitCalls).toHaveLength(0);
-  });
-
-  test("debounces repeated corruption on the same database", async () => {
-    const err = sqliteError(
-      "SQLITE_CORRUPT",
-      "database disk image is malformed",
-    );
-    observeSqliteStatementError(err, { sql: "SELECT 1", database: "main" });
-    observeSqliteStatementError(err, { sql: "SELECT 2", database: "main" });
-    observeSqliteStatementError(err, { sql: "SELECT 3", database: "main" });
-    await flushCorruptionEmitsForTesting();
-    // One report for `main` within the cooldown window...
-    expect(emitCalls).toHaveLength(1);
-
-    // ...but a distinct database is still free to report.
-    observeSqliteStatementError(err, { sql: "SELECT 1", database: "memory" });
-    await flushCorruptionEmitsForTesting();
-    expect(emitCalls).toHaveLength(2);
-  });
-});
-
-describe("wired into the slow-query wrapper", () => {
-  beforeEach(() => {
-    emitCalls.length = 0;
-    resetSqliteCorruptionWatchdogForTesting();
-  });
-
-  test("a wrapped connection hitting a corrupt-header file emits, and the error still propagates", async () => {
-    // A garbage file throws SQLITE_NOTADB while `.query()` compiles the SQL —
-    // the wrapper's create-time seam surfaces it straight to the watchdog, and
-    // names the file from the connection's own `filename` (no key plumbing).
-    const dir = mkdtempSync(join(tmpdir(), "sqlite-corruption-wd-"));
-    const garbagePath = join(dir, "not-a.db");
-    writeFileSync(
-      garbagePath,
-      Buffer.from("this is definitely not a sqlite db"),
-    );
-
-    const db = new Database(garbagePath);
-    wrapSqliteForSlowQueryLogging(db);
-
-    // The original SQLite error must still propagate unchanged.
-    expect(() => db.query("SELECT name FROM sqlite_master").all()).toThrow();
-    await flushCorruptionEmitsForTesting();
-
-    expect(emitCalls).toHaveLength(1);
-    expect(emitCalls[0].checkName).toBe("sqlite_corrupted");
-    expect(emitCalls[0].detail.database).toBe("not-a.db");
-  });
-
-  test("a wrapped connection running healthy queries emits nothing", async () => {
-    const db = new Database(":memory:");
-    wrapSqliteForSlowQueryLogging(db);
-    db.exec("CREATE TABLE t (id INTEGER PRIMARY KEY)");
-    db.query("INSERT INTO t (id) VALUES (1)").run();
-    db.query("SELECT * FROM t").all();
-    await flushCorruptionEmitsForTesting();
-
-    expect(emitCalls).toHaveLength(0);
-  });
-});

package/src/daemon/sqlite-corruption-watchdog.ts

@@ -1,62 +1,29 @@
 /**
  * SQLite corruption watchdog.
  *
- * The daemon keeps all of its state — conversations, schedules, memory,
- * telemetry — in `bun:sqlite` files. When one of those files is damaged (a
- * torn write, a truncated file, bad disk media) SQLite surfaces it as a
- * `SQLITE_CORRUPT` / `SQLITE_NOTADB` error ("database disk image is malformed"
- * / "file is not a database") on the next statement that touches the damaged
- * page. Left unobserved, that damage is only noticed when a user hits a broken
- * feature; the cloud has no fleet-wide view of how often it happens.
+ * The daemon keeps all of its state — conversations, schedules, memory — in
+ * `bun:sqlite` files. When one of those files is damaged (a torn write, a
+ * truncated file, bad disk media) SQLite surfaces it as a `SQLITE_CORRUPT` /
+ * `SQLITE_NOTADB` error ("database disk image is malformed" / "file is not a
+ * database") on the next statement that touches the damaged page. Left
+ * unobserved, that damage is only noticed when a user hits a broken feature.
  *
- * This watchdog makes corruption observable. It emits a `watchdog` telemetry
- * event with `check_name = "sqlite_corrupted"` — the same stream the event-loop
- * watchdog uses — but POSTs it *directly* to the cloud ingest rather than
- * through the SQLite-backed watchdog buffer: a check that fires because SQLite
- * is unusable must not depend on writing to SQLite, and going direct keeps this
- * module out of the `db-connection` import graph. The direct path still honors
- * the `share_analytics` opt-out (see {@link emitWatchdogEventDirect}). The
- * platform's already-merged `watchdog__sqlite_corruption_daily` admin query
- * filters `check_name` to this exact string, so it is the cross-repo contract
- * and must stay stable.
+ * This watchdog makes corruption observable locally: it logs an operator-facing
+ * error the moment any statement hits a damaged page.
  *
  * Detection is per-statement: the shared slow-query wrapper — which already
- * wraps every `bun:sqlite` connection (main, logs, memory, telemetry — Drizzle
- * and raw) — hands every failed statement to {@link observeSqliteStatementError}.
- * So corruption is caught on *any* failing query or write, read or write, the
+ * wraps every `bun:sqlite` connection (main, logs, memory — Drizzle and raw) —
+ * hands every failed statement to {@link observeSqliteStatementError}. So
+ * corruption is caught on *any* failing query or write, read or write, the
  * moment the workload actually hits the damaged page — no dedicated scan
  * needed. Non-corruption errors (constraint violations, syntax errors,
  * transient `SQLITE_BUSY`) are ignored.
- *
- * Reports are debounced per-database (a corrupt file throws on every
- * subsequent statement) — see {@link REPORT_COOLDOWN_MS}.
  */
 
 import { getLogger } from "../util/logger.js";
 
 const log = getLogger("sqlite-corruption-watchdog");
 
-/**
- * Check name emitted for SQLite corruption events. The cloud's
- * `watchdog__sqlite_corruption_daily` admin query filters `check_name` to
- * this exact string — it is the cross-repo contract, keep it stable.
- */
-export const SQLITE_CORRUPTED_CHECK_NAME = "sqlite_corrupted";
-
-/**
- * Minimum spacing between reports for a single database. Corruption is sticky:
- * once a file is malformed every subsequent statement against it throws the
- * same way, so without a cooldown a single damaged DB hit in a tight loop
- * would emit a flood of identical events. Keyed per database so damage to one
- * file never suppresses the first report for another.
- */
-const REPORT_COOLDOWN_MS = 60_000;
-
-const lastReportAtByDatabase = new Map<string, number>();
-
-/** The most recent in-flight direct emit, so tests can await it. */
-let pendingEmit: Promise<unknown> = Promise.resolve();
-
 /**
  * Whether an error is SQLite reporting structural corruption — the
  * `SQLITE_CORRUPT` / `SQLITE_NOTADB` families, by extended result code or by
@@ -81,34 +48,13 @@ export function isSqliteCorruptionError(err: unknown): boolean {
 }
 
 /**
- * Report a corruption detection: debounce per database and emit the
- * `sqlite_corrupted` telemetry event directly (opt-out gated inside
- * {@link emitWatchdogEventDirect}). The direct emit is lazy-imported so the
- * platform/telemetry stack only loads on the rare corruption path — and so this
- * module never pulls `db-connection` into its static import graph. Fire-and-
- * forget: the observer runs on a query hot path, so nothing here throws or
- * blocks on the POST.
+ * Report a corruption detection as an operator-facing error log. Fire-and-
+ * forget by construction (logging never throws).
  */
 function reportCorruption(
   detail: Record<string, unknown> & { database: string },
 ): void {
-  const now = Date.now();
-  const last =
-    lastReportAtByDatabase.get(detail.database) ?? Number.NEGATIVE_INFINITY;
-  if (now - last < REPORT_COOLDOWN_MS) {
-    return;
-  }
-  lastReportAtByDatabase.set(detail.database, now);
-
   log.error(detail, "SQLite corruption detected");
-
-  pendingEmit = import("../telemetry/watchdog-direct-emit.js")
-    .then(({ emitWatchdogEventDirect }) =>
-      emitWatchdogEventDirect(SQLITE_CORRUPTED_CHECK_NAME, detail),
-    )
-    .catch(() => {
-      // Best-effort; never let a telemetry failure escape the query path.
-    });
 }
 
 /** Context handed to {@link observeSqliteStatementError} for a failed execution. */
@@ -126,10 +72,10 @@ export interface StatementErrorContext {
 }
 
 /**
- * Called by the slow-query wrapper for every failed statement: fires the
- * corruption event for `SQLITE_CORRUPT` / `SQLITE_NOTADB` errors and ignores
- * everything else (constraint/syntax errors, transient `SQLITE_BUSY` /
- * `SQLITE_IOERR` contention). The wrapper calls this directly, so there is no
+ * Called by the slow-query wrapper for every failed statement: logs corruption
+ * for `SQLITE_CORRUPT` / `SQLITE_NOTADB` errors and ignores everything else
+ * (constraint/syntax errors, transient `SQLITE_BUSY` / `SQLITE_IOERR`
+ * contention). The wrapper calls this directly, so there is no
  * observer registration or start/stop lifecycle — a corrupt file reports the
  * moment a statement hits it.
  */
@@ -147,13 +93,3 @@ export function observeSqliteStatementError(
     ...(context.label ? { label: context.label } : {}),
   });
 }
-
-/** Test-only: clear the per-database debounce state between cases. */
-export function resetSqliteCorruptionWatchdogForTesting(): void {
-  lastReportAtByDatabase.clear();
-}
-
-/** Test-only: await the most recent fire-and-forget direct emit. */
-export function flushCorruptionEmitsForTesting(): Promise<unknown> {
-  return pendingEmit;
-}

package/src/daemon/tool-side-effects.ts

@@ -20,8 +20,8 @@ import { getConceptsDir } from "../plugins/defaults/memory/substrate/page-store.
 import { broadcastMessage } from "../runtime/assistant-event-hub.js";
 import { publishDocumentsChanged } from "../runtime/sync/resource-sync-events.js";
 import type { ToolExecutionResult } from "../tools/types.js";
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 import {
   broadcastAppFilesChanged,
   notifyAppSurfacesChanged,

package/src/desktop/desktop-session-manager.ts

@@ -14,9 +14,9 @@ import { join } from "node:path";
 import { getIsContainerized } from "../config/env-registry.js";
 import { connectCdpWsTransport } from "../tools/browser/cdp-client/cdp-inspect/ws-transport.js";
 import { terminateProcessTree } from "../util/host-process.js";
+import { getDataDir, getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
 import { CHILD_OOM_SCORE_ADJ, withOomScoreAdj } from "../util/oom-priority.js";
-import { getDataDir, getWorkspaceDir } from "../util/platform.js";
 import { sleep } from "../util/retry.js";
 import { DesktopBrowserClient } from "./desktop-browser-client.js";
 import {

package/src/desktop/desktop-wallpaper-renderer.ts

@@ -8,8 +8,8 @@ import { renderCharacterPng } from "../avatar/png-renderer.js";
 import { getResvg, isResvgAvailable } from "../avatar/resvg-lazy.js";
 import { isTemplatePlaceholder } from "../daemon/handlers/identity.js";
 import { getAssistantName } from "../daemon/identity-helpers.js";
+import { getAvatarImagePath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getAvatarImagePath } from "../util/platform.js";
 import { escapeXmlContent } from "../util/xml.js";
 
 function wallpaperWordmark(

package/src/heartbeat/heartbeat-service.ts

@@ -27,8 +27,8 @@ import {
   resolveScheduleTimezone,
 } from "../schedule/schedule-timezone.js";
 import { readTextFileSync } from "../util/fs.js";
+import { getWorkspaceDir, getWorkspacePromptPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir, getWorkspacePromptPath } from "../util/platform.js";
 import { stripCommentLines } from "../util/strip-comment-lines.js";
 import {
   completeHeartbeatRun,

package/src/home/feed-writer.ts

@@ -42,8 +42,8 @@ import {
   isPendingGuardianFeedItem,
 } from "../api/responses/home.js";
 import { broadcastMessage } from "../runtime/assistant-event-hub.js";
+import { getDataDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getDataDir } from "../util/platform.js";
 import {
   type FeedItem,
   type FeedItemStatus,

package/src/home/home-greeting-cache.ts

@@ -18,7 +18,7 @@ import {
   setMemoryCheckpoint,
 } from "../persistence/checkpoints.js";
 import { resolveGuardianPersona } from "../prompts/persona-resolver.js";
-import { getWorkspacePromptPath } from "../util/platform.js";
+import { getWorkspacePromptPath } from "../util/layout.js";
 
 // ---------------------------------------------------------------------------
 // Constants

package/src/home/relationship-state-writer.ts

@@ -26,12 +26,12 @@ import { countConversations as countConversationsDb } from "../persistence/conve
 import { resolveGuardianPersonaPath } from "../prompts/persona-resolver.js";
 import { broadcastMessage } from "../runtime/assistant-event-hub.js";
 import type { OnboardingContext } from "../types/onboarding-context.js";
-import { getLogger } from "../util/logger.js";
 import {
   getDataDir,
   getWorkspaceDir,
   getWorkspacePromptPath,
-} from "../util/platform.js";
+} from "../util/layout.js";
+import { getLogger } from "../util/logger.js";
 import { resolveAndPersistHatchedAt } from "../workspace/hatched-date.js";
 import { computeProgressPercent, computeTier } from "./progress-formula.js";
 import {

package/src/hooks/__tests__/hook-live-reload.test.ts

@@ -30,7 +30,7 @@ import { afterAll, beforeEach, describe, expect, test } from "bun:test";
 
 import { evictModule } from "../../plugins/surface-import.js";
 import type { HookEntry } from "../../plugins/types.js";
-import { getWorkspacePluginsDir } from "../../util/platform.js";
+import { getWorkspacePluginsDir } from "../../util/layout.js";
 import {
   collectUserHookEntries,
   evictHooksForOwner,

package/src/hooks/hook-loader.ts

@@ -69,12 +69,12 @@ import {
   withTimeout,
 } from "../plugins/surface-import.js";
 import type { HookEntry } from "../plugins/types.js";
-import { getLogger } from "../util/logger.js";
 import {
   getWorkspaceDir,
   getWorkspaceHooksDir,
   getWorkspacePluginsDir,
-} from "../util/platform.js";
+} from "../util/layout.js";
+import { getLogger } from "../util/logger.js";
 import { APP_VERSION } from "../version.js";
 
 const log = getLogger("hook-loader");

package/src/inbound/__tests__/oauth-callback-url.test.ts

@@ -26,7 +26,7 @@ mock.module("../public-ingress-urls.js", () => ({
 }));
 
 mock.module("../../config/loader.js", () => ({
-  loadConfig: () => ({}),
+  getConfig: () => ({}),
 }));
 
 const {
@@ -51,7 +51,7 @@ describe("resolveMcpOAuthClientMetadataUrl", () => {
   test("returns undefined for a callback served somewhere else", () => {
     expect(
       resolveMcpOAuthClientMetadataUrl(
-        "https://platform.example/v1/gateway/callbacks/assistant-123/webhooks/oauth/callback",
+        "https://test-cloud.mycadet.ai/v1/gateway/callbacks/assistant-123/webhooks/oauth/callback",
       ),
     ).toBeUndefined();
   });

package/src/inbound/oauth-callback-url.ts

@@ -16,7 +16,7 @@
  * for plugin ingress.
  */
 
-import { loadConfig } from "../config/loader.js";
+import { getConfig } from "../config/loader.js";
 import { resolveCallbackUrl } from "./cloud-callback-registration.js";
 import {
   getMcpOAuthClientMetadataUrl,
@@ -57,7 +57,7 @@ const OAUTH_REGISTRATION_TYPE = "oauth";
  */
 export async function resolveOauthCallbackUrl(): Promise<string> {
   return resolveCallbackUrl(
-    () => getOAuthCallbackUrl(loadConfig()),
+    () => getOAuthCallbackUrl(getConfig()),
     OAUTH_CALLBACK_PATH,
     OAUTH_REGISTRATION_TYPE,
   );
@@ -77,7 +77,7 @@ export function resolveMcpOAuthClientMetadataUrl(
   redirectUrl: string,
 ): string | undefined {
   try {
-    const config = loadConfig();
+    const config = getConfig();
     if (getOAuthCallbackUrl(config) !== redirectUrl) {
       return undefined;
     }

package/src/ipc/__tests__/attachment-ipc.test.ts

@@ -12,7 +12,7 @@ import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 
 import { initializeDb } from "../../persistence/db-init.js";
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import { AssistantIpcServer } from "../assistant-server.js";
 import { cliIpcCall } from "../cli-client.js";
 

package/src/ipc/socket-path.ts

@@ -1,6 +1,6 @@
 import { resolveIpcEndpoint } from "@mycadet/ipc-server-utils";
 
-import { getWorkspaceDir } from "../util/platform.js";
+import { getWorkspaceDir } from "../util/layout.js";
 
 export function resolveIpcSocketPath(socketName: string): {
   path: string;

package/src/live-voice/__tests__/live-voice-archive.test.ts

@@ -13,7 +13,7 @@ import {
 import { getDb } from "../../persistence/db-connection.js";
 import { initializeDb } from "../../persistence/db-init.js";
 import { rawAll, rawGet, rawRun } from "../../persistence/raw-query.js";
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import type { LiveVoiceAudioArtifactMetadata } from "../live-voice-archive.js";
 import {
   archiveLiveVoiceAssistantResponseAudio,

package/src/live-voice/__tests__/live-voice-vad.test.ts

@@ -30,7 +30,7 @@ import {
   unregisterSkillTools,
 } from "../../tools/registry.js";
 import { finalizeTool } from "../../tools/tool-defaults.js";
-import { getWorkspaceSkillsDir } from "../../util/platform.js";
+import { getWorkspaceSkillsDir } from "../../util/layout.js";
 import type { LiveVoiceContinuationJudge } from "../continuation-judge.js";
 import type { LiveVoiceContinuationLabeler } from "../continuation-label.js";
 import type { LiveVoiceAudioArchiveResult } from "../live-voice-archive.js";

package/src/live-voice/live-voice-session.ts

@@ -75,10 +75,6 @@ import type {
 } from "../daemon/conversation-mode-session.js";
 import { isRefusedInReadOnlyPass } from "../daemon/conversation-tool-setup.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
-import {
-  recordLiveVoiceSessionEnded,
-  recordLiveVoiceSessionStarted,
-} from "../onboarding/onboarding-events-store.js";
 import { isInstalledStaticSkillLoad } from "../permissions/checker.js";
 import {
   attachmentExists,
@@ -113,11 +109,6 @@ import type {
 } from "../stt/types.js";
 import { getSubagentManager } from "../subagent/index.js";
 import type { SubagentParentNotification } from "../subagent/parent-notification.js";
-import {
-  liveVoiceEndScreen,
-  liveVoiceSilenceReason,
-  liveVoiceStartScreen,
-} from "../telemetry/live-voice-funnel.js";
 import { getTool, getToolOwner } from "../tools/registry.js";
 import { resolveSkillExecuteInvocation } from "../tools/skills/resolve-execute-invocation.js";
 import {
@@ -1250,13 +1241,8 @@ export class LiveVoiceSession implements LiveVoiceSessionContract {
    * teardown has already destroyed by then: `state` has moved on, the current
    * utterance is gone, and the turn detector is disposed.
    *
-   * A quarter of sessions end with no turn at all, and these three booleans are
-   * what separate a microphone that never opened from one that was muted from a
-   * user who simply left. See `telemetry/live-voice-funnel.ts`.
+   * A quarter of sessions end with no turn at all.
    */
-  private reachedActive = false;
-  private receivedAudio = false;
-  private detectedSpeech = false;
   private dispatchedTurn = false;
   // Loudest server-VAD chunk not attributed to assistant playback, on the
   // gate's own scale. Logged with a silent session's end so `no_speech` can
@@ -1591,18 +1577,6 @@ export class LiveVoiceSession implements LiveVoiceSessionContract {
       return;
     }
 
-    // Before the preflight, not after: a session rejected for missing
-    // credentials is precisely the one the failure rate needs to count, and
-    // recording the start only once `ready` goes out would hide every such
-    // session from both the numerator and the denominator.
-    recordLiveVoiceSessionStarted({
-      sessionId: this.context.sessionId,
-      screen: liveVoiceStartScreen(
-        this.context.startFrame.client,
-        this.context.startFrame.entry,
-      ),
-    });
-
     if (this.resolveCredentialReadiness) {
       const readiness = await this.resolveCredentialReadiness();
       if (readiness.status === "not-ready") {
@@ -1644,7 +1618,6 @@ export class LiveVoiceSession implements LiveVoiceSessionContract {
     // through the pending/pre-roll paths and flushes on arm. An arm failure
     // surfaces as a non-recoverable error frame instead of a start rejection.
     this.state = "active";
-    this.reachedActive = true;
     if (this.turnDetector) {
       this.logInputDiagnostic("voice_input_started");
     }
@@ -2140,33 +2113,7 @@ export class LiveVoiceSession implements LiveVoiceSessionContract {
       });
     }
 
-    // Recorded first, and independently of `shouldEmitSessionEndMetrics`
-    // below: that flag governs the client-facing `metrics` frame, and a
-    // failed session (which suppresses the frame) is the one whose end
-    // telemetry matters most. Session duration downstream is this row's
-    // `recorded_at` minus the started row's, so it must be written before the
-    // teardown below, which waits for the active turn and can run long.
-    const failed = this.state === "failed";
-    // Only a session that never dispatched a turn gets a silence reason; for
-    // every other session the question is meaningless.
-    const silenceReason = this.dispatchedTurn
-      ? null
-      : liveVoiceSilenceReason({
-          reachedActive: this.reachedActive,
-          audioInput: this.audioInput,
-          receivedAudio: this.receivedAudio,
-          detectedSpeech: this.detectedSpeech,
-        });
-    recordLiveVoiceSessionEnded({
-      sessionId: this.context.sessionId,
-      screen: liveVoiceEndScreen(
-        reason,
-        failed ? this.failureCode : null,
-        silenceReason,
-      ),
-      outcome: failed ? "failed" : "completed",
-    });
-    if (silenceReason !== null) {
+    if (!this.dispatchedTurn) {
       // The levels behind a silent session, on the gate's scale, since the
       // end event carries only the classification. A peak below `speechGate`
       // on a `no_speech` session is a microphone the gate could not hear.
@@ -2174,7 +2121,6 @@ export class LiveVoiceSession implements LiveVoiceSessionContract {
         {
           sessionId: this.context.sessionId,
           reason,
-          silenceReason,
           peakChunkAmplitude: Math.round(this.peakChunkAmplitude),
           noiseFloor:
             this.roomNoiseFloor.floor === null
@@ -2527,12 +2473,10 @@ export class LiveVoiceSession implements LiveVoiceSessionContract {
     // early returns below. The question it answers is "did the microphone ever
     // open", which a chunk arriving at all settles regardless of what the
     // session then does with it.
-    this.receivedAudio = true;
     // A text-only session armed no transcriber, so there is nothing downstream
     // to route this into. Dropped rather than errored: the client was told on
     // `ready` that the microphone leg is dead, and a client still streaming is
-    // one that has not caught up, not one to end the session over. The flag
-    // above is still set, so telemetry keeps seeing that the mic did open.
+    // one that has not caught up, not one to end the session over.
     if (!this.audioInput) {
       return;
     }
@@ -2554,10 +2498,6 @@ export class LiveVoiceSession implements LiveVoiceSessionContract {
     // The chunk belongs to an utterance the user is still holding the button
     // for, whether or not the transcriber has produced any text for it yet.
     utterance.manualAudioCaptured = true;
-    // Manual sessions have no VAD, so the user holding the talk button is
-    // the only speech signal available. Without this every abandoned manual
-    // session would be misfiled as `no_turn` instead of `no_speech`.
-    this.detectedSpeech = true;
     this.collectUserAudio(utterance, chunk);
     if (utterance.phase === "pending") {
       // The transcriber is still arming (session start overlaps the STT
@@ -2798,7 +2738,6 @@ export class LiveVoiceSession implements LiveVoiceSessionContract {
     // resets it.
     if (hasSpeech || this.vadPreRollHasSpeech) {
       utterance.speechRouted = true;
-      this.detectedSpeech = true;
     }
     for (const preRollChunk of this.takeVadPreRoll()) {
       await this.routeVadAudio(utterance, preRollChunk);
@@ -3110,7 +3049,6 @@ export class LiveVoiceSession implements LiveVoiceSessionContract {
     if (preRollHadSpeech) {
       utterance.preDialBargeInGuard = preRollBargeInGuard;
       utterance.speechRouted = true;
-      this.detectedSpeech = true;
     }
   }
 
@@ -4917,7 +4855,6 @@ export class LiveVoiceSession implements LiveVoiceSessionContract {
     }
     if (this.providerTurnStartActive) {
       utterance.speechRouted = true;
-      this.detectedSpeech = true;
       this.markSpeechStart(utterance);
       this.handleSpeechStart("provider");
     }

package/src/mcp/__tests__/effective-config.test.ts

@@ -20,7 +20,7 @@ import { join } from "node:path";
 import { beforeEach, describe, expect, test } from "bun:test";
 
 import type { McpConfig } from "../../config/schemas/mcp.js";
-import { getWorkspacePluginsDir } from "../../util/platform.js";
+import { getWorkspacePluginsDir } from "../../util/layout.js";
 import {
   buildEffectiveMcpConfig,
   pluginMcpServersChangedSinceLastBuild,