@mycadet/assistant 0.12.9 → 0.12.10

package/src/daemon/event-loop-watchdog.test.ts

@@ -12,106 +12,8 @@
  */
 import { describe, expect, test } from "bun:test";
 
-import type { StallCapture } from "../monitoring/stall-capture.js";
-import type { SectionTrailEntry } from "../persistence/slow-sync-log.js";
-import type { DaemonActivityGroup } from "./activity-trail.js";
-
-const {
-  buildBlockTelemetryDetail,
-  detailFitsServerCap,
-  evaluateTick,
-  startEventLoopWatchdog,
-  stopEventLoopWatchdog,
-} = await import("./event-loop-watchdog.js");
-
-function captureWith(conversationCount: number): StallCapture {
-  return {
-    ts: 1,
-    daemonPid: 1,
-    heartbeatAgeMs: 21_000,
-    kernelStack: "[<0>] do_epoll_wait+0x4a0/0x4e0\n".repeat(12),
-    processState: "S",
-    waitState: {
-      syscall: 232,
-      epoll: {
-        fd: 7,
-        watched: 1,
-        listeningSockets: 0,
-        sockets: 0,
-        pipes: 1,
-        eventfds: 0,
-        timerfds: 0,
-        other: 0,
-      },
-      children: [{ pid: 200, comm: "git", state: "R", ageMs: 20_000 }],
-      threads: Array.from({ length: 8 }, (_, i) => ({
-        comm: `Bun Pool ${i}`,
-        state: "S",
-        wchan: "futex_wait_queue",
-        count: 1,
-      })),
-    },
-    sample: {
-      ts: 1,
-      memory: null,
-      memoryStat: null,
-      reclaim: null,
-      cpu: null,
-      events: null,
-      deltas: null,
-      disk: null,
-      processes: [
-        ...Array.from({ length: 6 }, (_, i) => ({
-          pid: 100 + i,
-          name: i === 0 ? "memory-worker" : `chrome-${i}`,
-          cpuPct: 150 - i * 10,
-          rssMb: 800,
-        })),
-        { pid: 1, name: "daemon", cpuPct: 4, rssMb: 900 },
-      ],
-      activeConversations: Array.from(
-        { length: conversationCount },
-        (_, i) => ({
-          conversationId: `01a0c9a0-0000-7000-8000-00000000000${i % 10}`,
-          title:
-            "A long title drawn from the user's own first message x".repeat(2),
-          originChannel: "cadet",
-          originInterface: "web",
-          processingStartedAt: 1,
-        }),
-      ),
-    },
-  };
-}
-
-/** The report's maximum of 10 activity groups, longest (a user turn) first. */
-const fullActivity: DaemonActivityGroup[] = [
-  {
-    kind: "turn",
-    conversationType: "standard",
-    callSite: "mainAgent",
-    turnInterface: "web",
-    interactive: true,
-    count: 1,
-    running: 1,
-    longestMs: 90_000,
-  },
-  ...Array.from({ length: 9 }, (_, i) => ({
-    kind: "turn" as const,
-    conversationType: "background" as const,
-    callSite: "heartbeatAgent" as const,
-    interactive: false,
-    count: i + 1,
-    running: 0,
-    longestMs: 60_000 - i,
-  })),
-];
-
-const trail: SectionTrailEntry[] = Array.from({ length: 16 }, (_, i) => ({
-  label: "conversation-crud:get-messages",
-  startedAgoMs: 100_000 + i * 1_000,
-  endedAgoMs: 99_000 + i * 1_000,
-}));
+const { evaluateTick, startEventLoopWatchdog, stopEventLoopWatchdog } =
+  await import("./event-loop-watchdog.js");
 
 describe("evaluateTick", () => {
   const INTERVAL = 1_000;
@@ -179,101 +81,3 @@ describe("start/stop lifecycle", () => {
     expect(() => stopEventLoopWatchdog()).not.toThrow();
   });
 });
-
-describe("buildBlockTelemetryDetail", () => {
-  test("never sends conversation titles", () => {
-    // GIVEN a capture whose active conversations carry titles
-    // WHEN the telemetry detail is built
-    const detail = buildBlockTelemetryDetail({
-      thresholdMs: 5_000,
-      daemonUptimeMs: 60_000,
-      activity: [],
-      sectionTrail: [],
-      stallCapture: captureWith(2),
-    });
-    // THEN every title is nulled but the rest of the entry is kept
-    const conversations = detail.stall_capture!.sample.activeConversations!;
-    expect(conversations).toHaveLength(2);
-    expect(conversations.every((c) => c.title === null)).toBe(true);
-    expect(conversations[0]!.originInterface).toBe("web");
-  });
-
-  test("does not mutate the caller's capture", () => {
-    // GIVEN a capture the caller also logs locally
-    const capture = captureWith(2);
-    // WHEN the telemetry detail is built
-    buildBlockTelemetryDetail({
-      thresholdMs: 5_000,
-      daemonUptimeMs: 60_000,
-      activity: [],
-      sectionTrail: trail,
-      stallCapture: capture,
-    });
-    // THEN the local copy still has its titles
-    expect(capture.sample.activeConversations![0]!.title).not.toBeNull();
-  });
-
-  test("a small report is sent untrimmed", () => {
-    // GIVEN a report well under the byte cap
-    // WHEN the telemetry detail is built
-    const detail = buildBlockTelemetryDetail({
-      thresholdMs: 5_000,
-      daemonUptimeMs: 60_000,
-      activity: [],
-      sectionTrail: trail.slice(0, 2),
-      stallCapture: captureWith(1),
-    });
-    // THEN nothing is trimmed and the wait state survives intact
-    expect(detail.trimmed).toBeUndefined();
-    expect(detail.stall_capture!.waitState!.threads).toHaveLength(8);
-  });
-
-  test("an oversize report is trimmed to fit, keeping the wait state", () => {
-    // GIVEN a full trail and many active conversations (the heavy-user case)
-    // WHEN the telemetry detail is built
-    const detail = buildBlockTelemetryDetail({
-      thresholdMs: 5_000,
-      daemonUptimeMs: 60_000,
-      activity: fullActivity,
-      sectionTrail: trail,
-      stallCapture: captureWith(20),
-    });
-    // THEN it fits the server cap, records what was trimmed, and still
-    // carries the attribution the report exists for
-    expect(detailFitsServerCap(detail)).toBe(true);
-    expect(detail.trimmed!.length).toBeGreaterThan(0);
-    expect(detail.stall_capture!.waitState!.epoll!.pipes).toBe(1);
-    expect(detail.stall_capture!.waitState!.children).toHaveLength(1);
-    expect(detail.activity.length).toBeGreaterThanOrEqual(4);
-    expect(
-      detail.stall_capture!.sample.processes!.length,
-    ).toBeGreaterThanOrEqual(3);
-    expect(detail.stall_capture!.sample.processes![0]!.name).toBe(
-      "memory-worker",
-    );
-    // Trimming keeps the daemon for comparison.
-    expect(
-      detail.stall_capture!.sample.processes!.some((p) => p.name === "daemon"),
-    ).toBe(true);
-    expect(detail.activity[0]).toMatchObject({
-      kind: "turn",
-      conversationType: "standard",
-    });
-  });
-});
-
-describe("detailFitsServerCap", () => {
-  test("ignores undefined keys, which serialization drops", () => {
-    // GIVEN a small detail with an undefined field
-    // WHEN it is checked against the server cap
-    // THEN the undefined key does not count as an invalid payload
-    expect(detailFitsServerCap({ a: 1, b: undefined })).toBe(true);
-  });
-
-  test("rejects a detail over the server cap", () => {
-    // GIVEN a detail larger than 4096 serialized bytes
-    // WHEN it is checked against the server cap
-    // THEN it does not fit
-    expect(detailFitsServerCap({ blob: "x".repeat(5_000) })).toBe(false);
-  });
-});

package/src/daemon/event-loop-watchdog.ts

@@ -53,8 +53,6 @@ import {
   getSectionTrail,
   type SectionTrailEntry,
 } from "../persistence/slow-sync-log.js";
-import { watchdogTelemetryEventSchema } from "../telemetry/telemetry-wire.generated.js";
-import { recordWatchdogEvent } from "../telemetry/watchdog-events-store.js";
 import { getLogger } from "../util/logger.js";
 import {
   type DaemonActivityGroup,
@@ -90,167 +88,6 @@ const REPORT_COOLDOWN_MS = 30_000;
  */
 const STALL_CAPTURE_MATCH_GRACE_MS = 5_000;
 
-/**
- * Whether ingest accepts `detail`, judged by the generated wire contract so
- * the byte measurement matches the server's exactly. The detail is checked
- * as serialized (undefined keys dropped, as on the wire). The other event
- * fields are fixed valid values; only issues on `detail` count.
- */
-export function detailFitsServerCap(detail: object): boolean {
-  const result = watchdogTelemetryEventSchema.safeParse({
-    type: "watchdog",
-    daemon_event_id: "size-check",
-    recorded_at: 0,
-    check_name: EVENT_LOOP_BLOCKED_CHECK_NAME,
-    detail: JSON.parse(JSON.stringify(detail)),
-  });
-  return (
-    result.success || !result.error.issues.some((i) => i.path[0] === "detail")
-  );
-}
-
-type BlockTelemetryDetail = {
-  threshold_ms: number;
-  tick_interval_ms: number;
-  /** Process uptime at report time; small values mean boot work. */
-  daemon_uptime_ms: number;
-  /** Work on this process that overlapped the block, grouped by label. */
-  activity: DaemonActivityGroup[];
-  section_trail: SectionTrailEntry[];
-  stall_capture: StallCapture | null;
-  /** Trim steps applied to fit the byte cap, in order. Absent when none. */
-  trimmed?: string[];
-};
-
-/**
- * Ordered steps that shrink an oversize report, least diagnostic loss first.
- * The activity groups, the busiest processes, the newest section-trail
- * entries, and the capture's wait state are what attribute a block, so they
- * go last.
- */
-const TRIM_STEPS: Array<{
-  name: string;
-  apply: (detail: BlockTelemetryDetail) => void;
-}> = [
-  {
-    name: "section_trail_8",
-    apply: (d) => {
-      d.section_trail = d.section_trail.slice(0, 8);
-    },
-  },
-  {
-    name: "thread_groups",
-    apply: (d) => {
-      if (d.stall_capture?.waitState) {
-        d.stall_capture.waitState.threads = [];
-      }
-    },
-  },
-  {
-    name: "active_conversations",
-    apply: (d) => {
-      if (d.stall_capture) {
-        d.stall_capture.sample.activeConversations = null;
-      }
-    },
-  },
-  {
-    name: "memory_stat",
-    apply: (d) => {
-      if (d.stall_capture) {
-        d.stall_capture.sample.memoryStat = null;
-      }
-    },
-  },
-  {
-    name: "kernel_stack_512",
-    apply: (d) => {
-      if (d.stall_capture?.kernelStack) {
-        d.stall_capture.kernelStack = d.stall_capture.kernelStack.slice(0, 512);
-      }
-    },
-  },
-  {
-    name: "section_trail_3",
-    apply: (d) => {
-      d.section_trail = d.section_trail.slice(0, 3);
-    },
-  },
-  {
-    // Keeps the daemon, which the sampler always lists last, for comparison.
-    name: "processes_3",
-    apply: (d) => {
-      const processes = d.stall_capture?.sample.processes;
-      if (processes) {
-        const daemon = processes.find((p) => p.name === "daemon");
-        const kept = processes.slice(0, 3);
-        d.stall_capture!.sample.processes =
-          daemon && !kept.includes(daemon) ? [...kept, daemon] : kept;
-      }
-    },
-  },
-  {
-    name: "activity_4",
-    apply: (d) => {
-      d.activity = d.activity.slice(0, 4);
-    },
-  },
-  {
-    // Last resort so the report itself always lands: blockedMs and the
-    // longest activity groups survive.
-    name: "stall_capture",
-    apply: (d) => {
-      d.stall_capture = null;
-      d.section_trail = [];
-    },
-  },
-];
-
-/**
- * The telemetry `detail` for a block report. Conversation titles are dropped
- * (the event is metadata only and titles can carry user content), then trim
- * steps apply until the bag fits the server's byte cap. An oversize bag is
- * rejected outright, losing the whole report. Pure so the budget
- * logic is unit-testable.
- */
-export function buildBlockTelemetryDetail(input: {
-  thresholdMs: number;
-  daemonUptimeMs: number;
-  activity: DaemonActivityGroup[];
-  sectionTrail: SectionTrailEntry[];
-  stallCapture: StallCapture | null;
-}): BlockTelemetryDetail {
-  // Deep copy: the trim steps mutate, and the caller's objects also feed the log.
-  const stallCapture: StallCapture | null = input.stallCapture
-    ? structuredClone(input.stallCapture)
-    : null;
-  if (stallCapture?.sample.activeConversations) {
-    stallCapture.sample.activeConversations =
-      stallCapture.sample.activeConversations.map((conversation) => ({
-        ...conversation,
-        title: null,
-      }));
-  }
-  const detail: BlockTelemetryDetail = {
-    threshold_ms: input.thresholdMs,
-    tick_interval_ms: TICK_INTERVAL_MS,
-    daemon_uptime_ms: input.daemonUptimeMs,
-    activity: [...input.activity],
-    section_trail: [...input.sectionTrail],
-    stall_capture: stallCapture,
-  };
-
-  for (const step of TRIM_STEPS) {
-    if (detailFitsServerCap(detail)) {
-      break;
-    }
-    step.apply(detail);
-    // Assigned before the next measurement so the marker counts too.
-    detail.trimmed = [...(detail.trimmed ?? []), step.name];
-  }
-  return detail;
-}
-
 let tickTimer: ReturnType<typeof setInterval> | null = null;
 let lastTickAt = 0;
 let lastReportAt = Number.NEGATIVE_INFINITY;
@@ -275,7 +112,6 @@ export function evaluateTick(
  * this exact string, so it is the primary group-by dimension downstream —
  * keep it stable.
  */
-export const EVENT_LOOP_BLOCKED_CHECK_NAME = "event_loop_blocked";
 
 async function reportBlock(
   blockedMs: number,
@@ -322,27 +158,6 @@ async function reportBlock(
     },
     "event loop blocked",
   );
-  // Persist a `watchdog` telemetry event so the cloud can surface
-  // event-loop blocking in the infrastructure admin chart. `recordWatchdogEvent`
-  // no-ops when usage-data collection is disabled (the event is dropped to
-  // honor the opt-out), so the watchdog runs unconditionally without leaking
-  // health data for opted-out owners. Never let a telemetry failure escape
-  // the timer callback.
-  try {
-    recordWatchdogEvent({
-      checkName: EVENT_LOOP_BLOCKED_CHECK_NAME,
-      value: blockedMs,
-      detail: buildBlockTelemetryDetail({
-        thresholdMs,
-        daemonUptimeMs: Math.round(process.uptime() * 1000),
-        activity,
-        sectionTrail,
-        stallCapture,
-      }),
-    });
-  } catch {
-    // Never let a telemetry failure escape the timer callback.
-  }
 }
 
 /**

package/src/daemon/external-plugins-bootstrap.ts

@@ -73,8 +73,8 @@ import {
   registerPluginTools,
   unregisterPluginTools,
 } from "../tools/registry.js";
+import { getWorkspaceDir, getWorkspacePluginsDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir, getWorkspacePluginsDir } from "../util/platform.js";
 import { APP_VERSION } from "../version.js";
 
 const log = getLogger("plugins-bootstrap");

package/src/daemon/first-greeting.ts

@@ -1,6 +1,6 @@
 import { existsSync } from "node:fs";
 
-import { getWorkspacePromptPath } from "../util/platform.js";
+import { getWorkspacePromptPath } from "../util/layout.js";
 
 type Tone = "grounded" | "warm" | "energetic" | "poetic";
 

package/src/daemon/handlers/skills.ts

@@ -81,7 +81,7 @@ import {
   resolveSkillSource,
   searchSkillsRegistry,
 } from "../../skills/skillssh-registry.js";
-import { getWorkspaceSkillsDir } from "../../util/platform.js";
+import { getWorkspaceSkillsDir } from "../../util/layout.js";
 import { safeStringSlice } from "../../util/unicode.js";
 import { getConfigWatcher } from "../config-watcher.js";
 import type {

package/src/daemon/host-app-control-proxy.ts

@@ -39,7 +39,7 @@
  * specific app.
  *
  * **No step cap.** Unlike {@link HostCuProxy} which enforces a per-session
- * step ceiling via `loadConfig().maxStepsPerSession`, app-control sessions
+ * step ceiling via `getConfig().maxStepsPerSession`, app-control sessions
  * are not capped. App-control flows are typically narrower (single-app,
  * shorter horizons) and the loop guard plus user oversight are the
  * intended safeguards.

package/src/daemon/host-cu-proxy.ts

@@ -15,7 +15,7 @@
  */
 import { v4 as uuid } from "uuid";
 
-import { loadConfig } from "../config/loader.js";
+import { getConfig } from "../config/loader.js";
 import { escapeAxTreeContent } from "../context/outbound-sanitize.js";
 import type { ContentBlock } from "../providers/types.js";
 import {
@@ -256,7 +256,7 @@ export class HostCuProxy {
     }
   >();
 
-  constructor(maxSteps = loadConfig().maxStepsPerSession) {
+  constructor(maxSteps = getConfig().maxStepsPerSession) {
     this._maxSteps = maxSteps;
   }
 

package/src/daemon/identity-helpers.ts

@@ -3,7 +3,7 @@ import { join } from "node:path";
 
 import { resolveGuardianPersonaStrict } from "../prompts/persona-resolver.js";
 import { DECLINED_BY_USER_SENTINEL } from "../prompts/user-reference.js";
-import { getWorkspacePromptPath } from "../util/platform.js";
+import { getWorkspacePromptPath } from "../util/layout.js";
 
 /** Read the assistant's name from IDENTITY.md for personalized responses. */
 export function getAssistantName(): string | null {

package/src/daemon/lifecycle.ts

@@ -11,8 +11,8 @@ import { syncWorkspaceIdentityToPlatform } from "../cloud/sync-identity.js";
 import { initFeatureFlagOverrides } from "../config/assistant-feature-flags.js";
 import { setIngressPublicBaseUrl, validateEnv } from "../config/env.js";
 import {
+  getConfig,
   hasPendingDefaultWorkspaceConfig,
-  loadConfig,
   mergeDefaultWorkspaceConfig,
 } from "../config/loader.js";
 import { seedInferenceProfiles } from "../config/seed-inference-profiles.js";
@@ -56,14 +56,13 @@ import { reconcilePluginSchedules } from "../schedule/plugin-schedule-reconciler
 import { recoverStaleSchedules } from "../schedule/schedule-recovery.js";
 import { startScheduler } from "../schedule/scheduler.js";
 import { getSubagentManager } from "../subagent/index.js";
-import { startUsageTelemetryReporter } from "../telemetry/usage-telemetry-reporter.js";
-import { getLogger, initLogger } from "../util/logger.js";
-import { DAEMON_OOM_SCORE_ADJ, setOomScoreAdj } from "../util/oom-priority.js";
 import {
   ensureDataDir,
   getDotEnvPath,
   getWorkspaceDir,
-} from "../util/platform.js";
+} from "../util/layout.js";
+import { getLogger, initLogger } from "../util/logger.js";
+import { DAEMON_OOM_SCORE_ADJ, setOomScoreAdj } from "../util/oom-priority.js";
 import { APP_VERSION } from "../version.js";
 import { drainOrphanedWatchTimelineEntries } from "../watch/watch-timeline.js";
 import { getWorkflowRunManager } from "../workflows/run-manager.js";
@@ -545,7 +544,7 @@ export async function runDaemon(): Promise<void> {
 
   // Merge CLI-provided default config (from CADET_DEFAULT_WORKSPACE_CONFIG_PATH)
   // into the workspace config file before profile seeding and the first
-  // loadConfig() call so onboarding/platform preferences are visible to the
+  // getConfig() call so onboarding/platform preferences are visible to the
   // seeder and persisted alongside schema defaults.
   const defaultConfigMerge = mergeDefaultWorkspaceConfig();
 
@@ -600,7 +599,7 @@ export async function runDaemon(): Promise<void> {
   }
 
   // Runs on every boot, after the overlay merge and profile seeding and
-  // before the first loadConfig(), so no resolution ever sees a partial
+  // before the first getConfig(), so no resolution ever sees a partial
   // custom profile. See workspace/custom-profile-ensure.ts for why this is
   // an ensure pass rather than a workspace migration.
   try {
@@ -614,7 +613,7 @@ export async function runDaemon(): Promise<void> {
   }
 
   log.info("Daemon startup: loading config");
-  const config = loadConfig();
+  const config = getConfig();
 
   // Select conversations left mid-turn by the previous shutdown for auto-resume
   // when `conversations.resumeProcessingOnStartup` is enabled. Their
@@ -678,12 +677,10 @@ export async function runDaemon(): Promise<void> {
     });
   }
 
-  // Refresh the consent cache regardless of dev mode so record-time telemetry
-  // writes (which drop on a confirmed opt-out) work in dev too. The usage
-  // telemetry reporter re-checks share_analytics on every flush, so dev still
-  // never sends telemetry to the cloud. Fire-and-forget: startConsentRefresh()
-  // runs an immediate non-blocking refresh, so the startup hot path is never
-  // blocked.
+  // Refresh the consent cache (gates crash-diagnostics sharing) regardless of
+  // dev mode so the cache is warm in dev too. Fire-and-forget:
+  // startConsentRefresh() runs an immediate non-blocking refresh, so the
+  // startup hot path is never blocked.
   startConsentRefresh();
 
   // Open the assistant's CES RPC client (handshake + reconnect wiring).
@@ -732,7 +729,6 @@ export async function runDaemon(): Promise<void> {
     log.warn({ err }, "Guardian principal cache warm failed — continuing"),
   );
 
-  startUsageTelemetryReporter();
   startDiskPressureGuardForLifecycle();
   startResourcePressureGuardForLifecycle();
   startOrphanReaper();

package/src/daemon/main.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env bun
 process.title = "cadet-daemon";
 
+import { getDataDir, getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getDataDir, getWorkspaceDir } from "../util/platform.js";
 import { runDaemon } from "./lifecycle.js";
 import { emitDaemonError } from "./startup-error.js";
 

package/src/daemon/now-scratchpad.ts

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync } from "node:fs";
 
-import { getWorkspacePromptPath } from "../util/platform.js";
+import { getWorkspacePromptPath } from "../util/layout.js";
 import { stripCommentLines } from "../util/strip-comment-lines.js";
 
 /**

package/src/daemon/process-message.ts

@@ -29,13 +29,13 @@ import {
   setConversationOriginInterfaceIfUnset,
 } from "../persistence/conversation-crud.js";
 import { updateMetaFile } from "../persistence/conversation-disk-view.js";
-import { broadcastMessage } from "../runtime/assistant-event-hub.js";
-import { DAEMON_INTERNAL_ASSISTANT_ID } from "../runtime/assistant-scope.js";
-import { publishConversationMessagesChanged } from "../runtime/sync/resource-sync-events.js";
 import {
   readTurnFailure,
   type TurnFailure,
-} from "../telemetry/turn-outcome.js";
+} from "../persistence/turn-outcome.js";
+import { broadcastMessage } from "../runtime/assistant-event-hub.js";
+import { DAEMON_INTERNAL_ASSISTANT_ID } from "../runtime/assistant-scope.js";
+import { publishConversationMessagesChanged } from "../runtime/sync/resource-sync-events.js";
 import { getLogger } from "../util/logger.js";
 import type { Conversation } from "./conversation.js";
 import {

package/src/daemon/profiler-run-store.ts

@@ -32,12 +32,12 @@ import {
   getProfilerMode,
   getProfilerRunId,
 } from "../config/env-registry.js";
-import { getLogger } from "../util/logger.js";
 import {
   getProfilerRootDir,
   getProfilerRunDir,
   getProfilerRunsDir,
-} from "../util/platform.js";
+} from "../util/layout.js";
+import { getLogger } from "../util/logger.js";
 
 const log = getLogger("profiler-run-store");
 

package/src/daemon/providers-setup.ts

@@ -1,4 +1,4 @@
-import { rehydrateCloudCredentials } from "../config/cloud-rehydration.js";
+import { ensureCloudIdentityIds } from "../config/cloud-identity.js";
 import { maybeDefaultSpeechToCloud } from "../config/cloud-speech-defaults.js";
 import type { AssistantConfig } from "../config/types.js";
 import { getMcpServerManager } from "../mcp/manager.js";
@@ -32,7 +32,7 @@ export async function initializeProvidersAndTools(
   // Rehydrate the cloud base URL and IDs from the credential store so
   // cloud proxy activation survives assistant restarts. The in-memory
   // overrides are normally only set by the secret-routes handlers at runtime.
-  await rehydrateCloudCredentials();
+  await ensureCloudIdentityIds();
 
   // Speech defaulting normally fires when the cloud credentials land
   // (secret-routes); evaluating it once per boot also covers assistants whose

package/src/daemon/shutdown-handlers.ts

@@ -20,7 +20,6 @@ import { stopRouteHost } from "../routes/control.js";
 import { stopRuntimeHttpServer } from "../runtime/http-server.js";
 import { stopScheduler } from "../schedule/scheduler.js";
 import { getSubagentManager } from "../subagent/index.js";
-import { stopUsageTelemetryReporter } from "../telemetry/usage-telemetry-reporter.js";
 import { browserManager } from "../tools/browser/browser-manager.js";
 import { getLogger } from "../util/logger.js";
 import { APP_VERSION } from "../version.js";
@@ -152,15 +151,6 @@ async function shutdown(): Promise<void> {
     log.warn({ err }, "Enrichment service shutdown failed (non-fatal)");
   }
 
-  try {
-    const timeout = new Promise<void>((_, reject) =>
-      setTimeout(() => reject(new Error("Telemetry flush timed out")), 3_000),
-    );
-    await Promise.race([stopUsageTelemetryReporter(), timeout]);
-  } catch (err) {
-    log.warn({ err }, "Telemetry reporter shutdown failed (non-fatal)");
-  }
-
   await stopRuntimeHttpServer();
   await browserManager.closeAllPages();
   stopScheduler();