@mycadet/assistant 0.12.9 → 0.12.11

package/src/runtime/routes/conversation-routes.ts

@@ -109,7 +109,6 @@ import {
   type SlackMessageMetadata,
 } from "../../messaging/providers/slack/message-metadata.js";
 import { readProviderMetadata } from "../../messaging/read-provider-metadata.js";
-import { recordOnboardingEvent } from "../../onboarding/onboarding-events-store.js";
 import {
   classifyKind,
   getAttachmentById,
@@ -145,7 +144,6 @@ import {
 import { listConversationModeSessionsByIds } from "../../persistence/conversation-mode-sessions.js";
 import { searchConversations } from "../../persistence/conversation-queries.js";
 import {
-  AUTO_ROUTED_PROFILE_METADATA_KEY,
   computerUseScreenshotAttachmentIdsFromMetadata,
   isNoResponseMetadata,
   messageMetadataIsAmbientSightKeep,
@@ -167,11 +165,8 @@ import {
   isHeicFilename,
   normalizeImageBase64,
 } from "../../util/image-conversion.js";
+import { getWorkspaceDir, getWorkspacePromptPath } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import {
-  getWorkspaceDir,
-  getWorkspacePromptPath,
-} from "../../util/platform.js";
 import { safeStringSlice } from "../../util/unicode.js";
 import { assistantEventHub, broadcastMessage } from "../assistant-event-hub.js";
 import { getCurrentSeq } from "../assistant-stream-state.js";
@@ -1116,7 +1111,6 @@ export async function handleListMessages({
     let backgroundToolCompletion: ConversationMessage["backgroundToolCompletion"];
     let systemCard: boolean | undefined;
     let noResponse: boolean | undefined;
-    let autoRoutedProfile: string | undefined;
     const cameraFrame = messageMetadataIsAmbientSightKeep(msg.metadata)
       ? true
       : undefined;
@@ -1137,9 +1131,6 @@ export async function handleListMessages({
         if (isNoResponseMetadata(meta)) {
           noResponse = true;
         }
-        if (typeof meta[AUTO_ROUTED_PROFILE_METADATA_KEY] === "string") {
-          autoRoutedProfile = meta[AUTO_ROUTED_PROFILE_METADATA_KEY];
-        }
         // Channel facts live in the row's provider envelope. A reaction row,
         // either direction, projects its structured fact so clients never
         // render the stored "[reaction]" sentinel; a row deleted on its
@@ -1222,7 +1213,6 @@ export async function handleListMessages({
       backgroundToolCompletion,
       systemCard,
       noResponse,
-      autoRoutedProfile,
       cameraFrame,
       reaction,
       providerError,
@@ -1463,9 +1453,6 @@ export async function handleListMessages({
           : {}),
         ...(m.systemCard ? { systemCard: true } : {}),
         ...(m.noResponse ? { noResponse: true } : {}),
-        ...(m.autoRoutedProfile
-          ? { autoRoutedProfile: m.autoRoutedProfile }
-          : {}),
         ...(m.cameraFrame ? { cameraFrame: true as const } : {}),
         // The row's own marker, so a client gates per-row presentation on what
         // this row was written with rather than on the live flag.
@@ -2267,18 +2254,6 @@ export async function handleSendMessage(
 
       if (isFirstOnboarding) {
         persistOnboardingArtifacts(body.onboarding!);
-        try {
-          recordOnboardingEvent({
-            screen: "complete",
-            tools: body.onboarding!.tools,
-            tasks: body.onboarding!.tasks,
-            tone: body.onboarding!.tone,
-            googleConnected: body.onboarding!.googleConnected,
-            googleScopes: body.onboarding!.googleScopes,
-          });
-        } catch (err) {
-          log.warn({ err }, "Failed to record onboarding telemetry event");
-        }
       }
 
       scheduleCannedReplyRelease({
@@ -2360,18 +2335,6 @@ export async function handleSendMessage(
 
   if (isFirstOnboarding) {
     persistOnboardingArtifacts(body.onboarding!);
-    try {
-      recordOnboardingEvent({
-        screen: "complete",
-        tools: body.onboarding!.tools,
-        tasks: body.onboarding!.tasks,
-        tone: body.onboarding!.tone,
-        googleConnected: body.onboarding!.googleConnected,
-        googleScopes: body.onboarding!.googleScopes,
-      });
-    } catch (err) {
-      log.warn({ err }, "Failed to record onboarding telemetry event");
-    }
   }
 
   // When the scan path rewrote the first message, prefer the rewritten

package/src/runtime/routes/debug-routes.ts

@@ -17,7 +17,7 @@ import {
   listProviders,
 } from "../../providers/registry.js";
 import { countSchedules } from "../../schedule/schedule-store.js";
-import { getDbPath } from "../../util/platform.js";
+import { getDbPath } from "../../util/layout.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import type { RouteDefinition } from "./types.js";
 

package/src/runtime/routes/deprecated-route-context.ts

@@ -1,28 +1,18 @@
 /**
- * Deprecated `/x/*` route context — a telemetry-emitting compatibility shim.
+ * Deprecated `/x/*` route context — a compatibility shim.
  *
  * Route handlers now reach daemon capabilities through `@mycadet/plugin-api`
  * (`publishEvent`, `runConversationTurn`), which work identically in-process and
  * in the route-host subprocess. Installed route files written against the older
  * `(request, context)` signature keep working: each `context` field delegates
- * to its plugin-api equivalent and records a deprecation-usage telemetry signal
- * the first time a given route touches it, so usage can be watched down to zero
- * before the argument is removed.
+ * to its plugin-api equivalent.
  *
- * This whole module — and the handler's second parameter — is intended to be
- * deleted once the telemetry shows no route still depends on `context`.
- *
- * Telemetry: emitted daemon-side via the generic `watchdog` event (the
- * sanctioned named-label + open-`detail`-bag carrier, as `memory_tier` uses),
- * so it ships without a new platform wire type. `check_name` is
- * `"deprecated_api_use"`; `detail` carries `{ surface, api, replacement,
- * route_path }`. A dedicated first-class `deprecation` wire event is proposed to
- * platform; when it lands, swap the emit here to it and freeze.
+ * The handler's second parameter is deprecated — prefer importing from
+ * `@mycadet/plugin-api` directly in new handlers.
  */
 
 import { runConversationTurn } from "../../plugin-api/conversation-turn.js";
 import { publishEvent } from "../../plugin-api/publish-event.js";
-import { recordWatchdogEvent } from "../../telemetry/watchdog-events-store.js";
 
 /**
  * The deprecated second argument passed to `/x/*` route handlers. Every member
@@ -47,60 +37,19 @@ export interface UserRouteContext {
   };
 }
 
-/** Stable `watchdog` label for a deprecated-API-use signal. Frozen once shipped — dashboards pivot on it. */
-const DEPRECATED_API_CHECK_NAME = "deprecated_api_use";
-
-/** Separator for dedup keys. `api` is a fixed `context.*` string, so `::` cannot make two distinct (route, api) pairs collide. */
-const KEY_SEPARATOR = "::";
-
-/**
- * Fired-once keys (`route_path <sep> api`) so a route in a hot loop records one
- * signal per deprecated field per process rather than one per call. We only
- * need to learn *which* route depends on *which* field, not the call count.
- */
-const reportedUses = new Set<string>();
-
-function recordDeprecatedUse(
-  routePath: string,
-  api: string,
-  replacement: string,
-): void {
-  const key = `${routePath}${KEY_SEPARATOR}${api}`;
-  if (reportedUses.has(key)) {
-    return;
-  }
-  reportedUses.add(key);
-  recordWatchdogEvent({
-    checkName: DEPRECATED_API_CHECK_NAME,
-    detail: {
-      surface: "custom_route",
-      api,
-      replacement,
-      route_path: routePath,
-    },
-  });
-}
-
 /**
  * Build the deprecated `context` argument for a handler serving `routePath`.
  * The route path is captured so a use signal can be attributed to the specific
  * route that must migrate. The object is frozen so a handler cannot corrupt the
  * shared shim by reassigning its members.
  */
-export function buildDeprecatedRouteContext(
-  routePath: string,
-): UserRouteContext {
+export function buildDeprecatedRouteContext(): UserRouteContext {
   return Object.freeze({
     assistantEventHub: Object.freeze({
       publish: (
         event: Parameters<typeof publishEvent>[0],
         options?: Parameters<typeof publishEvent>[1],
       ): ReturnType<typeof publishEvent> => {
-        recordDeprecatedUse(
-          routePath,
-          "context.assistantEventHub.publish",
-          "plugin-api:publishEvent",
-        );
         return publishEvent(event, options);
       },
     }),
@@ -109,11 +58,6 @@ export function buildDeprecatedRouteContext(
         conversationId: string,
         text: string,
       ): Promise<{ messageId: string }> => {
-        recordDeprecatedUse(
-          routePath,
-          "context.conversations.postMessage",
-          "plugin-api:runConversationTurn",
-        );
         const { userMessageId } = await runConversationTurn({
           conversationId,
           content: [{ type: "text", text }],

package/src/runtime/routes/heartbeat-routes.ts

@@ -22,8 +22,8 @@ import { getConversation } from "../../persistence/conversation-crud.js";
 import { getUsageCostForConversationWindow } from "../../persistence/llm-usage-store.js";
 import { resolveScheduleTimezone } from "../../schedule/schedule-timezone.js";
 import { readTextFileSync } from "../../util/fs.js";
+import { getWorkspacePromptPath } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getWorkspacePromptPath } from "../../util/platform.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { BadRequestError, InternalError } from "./errors.js";
 import {

package/src/runtime/routes/identity-routes.ts

@@ -21,7 +21,7 @@ import {
 } from "../../util/cgroup-memory.js";
 import { getCachedContainerCpuPercent } from "../../util/container-cpu-sampler.js";
 import { getDiskUsageInfo } from "../../util/disk-usage.js";
-import { getWorkspacePromptPath } from "../../util/platform.js";
+import { getWorkspacePromptPath } from "../../util/layout.js";
 import { APP_VERSION } from "../../version.js";
 import { resolveHatchedAtReadOnly } from "../../workspace/hatched-date.js";
 import { WORKSPACE_MIGRATIONS } from "../../workspace/migrations/registry.js";

package/src/runtime/routes/index.ts

@@ -25,7 +25,6 @@ import { ROUTES as ATTACHMENT_ROUTES } from "./attachment-routes.js";
 import { ROUTES as AUDIO_ROUTES } from "./audio-routes.js";
 import { ROUTES as AUDIT_ROUTES } from "./audit-routes.js";
 import { ROUTES as AUTH_ROUTES } from "./auth-routes.js";
-import { ROUTES as AUTO_PROFILE_ROUTES } from "./auto-profile-routes.js";
 import { ROUTES as AVATAR_ROUTES } from "./avatar-routes.js";
 import { ROUTES as BACKGROUND_TOOL_ROUTES } from "./background-tool-routes.js";
 import { ROUTES as BACKGROUND_WAKE_ROUTES } from "./background-wake-routes.js";
@@ -107,7 +106,6 @@ import { ROUTES as TELEGRAM_ROUTES } from "./integrations/telegram.js";
 import { ROUTES as TWILIO_ROUTES } from "./integrations/twilio.js";
 import { ROUTES as VERCEL_ROUTES } from "./integrations/vercel.js";
 import { ROUTES as INTERNAL_OAUTH_ROUTES } from "./internal-oauth-routes.js";
-import { ROUTES as INTERNAL_TELEMETRY_ROUTES } from "./internal-telemetry-routes.js";
 import { ROUTES as INTERNAL_TWILIO_ROUTES } from "./internal-twilio-routes.js";
 import { ROUTES as LIFECYCLE_ROUTES } from "./lifecycle-routes.js";
 import { ROUTES as LIVE_VOICE_ROUTES } from "./live-voice-routes.js";
@@ -153,7 +151,6 @@ import { ROUTES as SUBAGENT_ROUTES } from "./subagents-routes.js";
 import { ROUTES as SUGGEST_TRUST_RULE_ROUTES } from "./suggest-trust-rule-routes.js";
 import { ROUTES as SURFACE_ACTION_ROUTES } from "./surface-action-routes.js";
 import { ROUTES as SURFACE_CONTENT_ROUTES } from "./surface-content-routes.js";
-import { ROUTES as TELEMETRY_ROUTES } from "./telemetry-routes.js";
 import { ROUTES as THEME_ROUTES } from "./theme-routes.js";
 import { ROUTES as TRUST_RULES_ROUTES } from "./trust-rules-routes.js";
 import { ROUTES as TTS_ROUTES } from "./tts-routes.js";
@@ -218,7 +215,6 @@ export const ROUTES: RouteDefinition[] = [
   ...CONVERSATION_QUERY_ROUTES,
   ...CONVERSATION_STARTER_ROUTES,
   ...ACTIVATION_ROUTES,
-  ...AUTO_PROFILE_ROUTES,
   ...DEBUG_ROUTES,
   ...DEFAULT_PROVIDER_ROUTES,
   ...DESKTOP_SETUP_ROUTES,
@@ -255,7 +251,6 @@ export const ROUTES: RouteDefinition[] = [
   ...INFERENCE_SEND_ROUTES,
   ...INGRESS_STATUS_ROUTES,
   ...INTERNAL_OAUTH_ROUTES,
-  ...INTERNAL_TELEMETRY_ROUTES,
   ...MCP_AUTH_ROUTES,
   ...OAUTH_CONNECT_ROUTES,
   ...INTERNAL_TWILIO_ROUTES,
@@ -315,7 +310,6 @@ export const ROUTES: RouteDefinition[] = [
   ...SURFACE_CONTENT_ROUTES,
   ...TELEGRAM_ROUTES,
   ...TWILIO_ROUTES,
-  ...TELEMETRY_ROUTES,
   ...THEME_ROUTES,
   ...TRUST_RULES_ROUTES,
   ...TTS_ROUTES,

package/src/runtime/routes/inference-profile-session-handler.ts

@@ -15,7 +15,7 @@
 import { randomUUID } from "node:crypto";
 
 import { getUserSelectableProfilesForProvider } from "../../config/default-profile-catalog.js";
-import { loadConfig } from "../../config/loader.js";
+import { getConfig } from "../../config/loader.js";
 import {
   nonTextConversationProfileMessage,
   profileSupportsTextGeneration,
@@ -156,7 +156,7 @@ export async function setInferenceProfileSession({
   }
 
   // --- Validate profile ---
-  const { llm } = loadConfig();
+  const { llm } = getConfig();
   const profiles = getUserSelectableProfilesForProvider(llm);
   if (!Object.prototype.hasOwnProperty.call(profiles, profile)) {
     throw new BadRequestError(
@@ -193,7 +193,7 @@ export async function setInferenceProfileSession({
   let clamped: number | null | undefined;
 
   if (typeof ttlSeconds === "number") {
-    const maxTtl = loadConfig().llm?.profileSession?.maxTtlSeconds ?? 43200;
+    const maxTtl = getConfig().llm?.profileSession?.maxTtlSeconds ?? 43200;
     clamped = Math.min(Math.max(1, ttlSeconds), maxTtl);
     newExpiresAt = Date.now() + clamped * 1000;
     newSessionId = callerSessionId ?? randomUUID();

package/src/runtime/routes/inference-profiles-routes.ts

@@ -24,6 +24,11 @@ import {
   MANAGED_PROFILE_NAMES,
   resolveDefaultProfileForProvider,
 } from "../../config/default-profile-catalog.js";
+import {
+  catalogEntryFor,
+  modalitiesOf,
+  resolveModalityOverride,
+} from "../../config/input-modalities.js";
 import {
   getConfig,
   getConfigReadOnly,
@@ -60,11 +65,7 @@ import {
   isModelInCatalog,
 } from "../../providers/model-catalog.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
-import {
-  commitConfigWrite,
-  normalizeCloudProfileWrites,
-  rejectCloudProfileDeletion,
-} from "./conversation-query-routes.js";
+import { commitConfigWrite } from "./conversation-query-routes.js";
 import { BadRequestError, ConflictError, NotFoundError } from "./errors.js";
 import {
   describeUnavailableProfile,
@@ -111,8 +112,22 @@ const profileSummarySchema = z
     provider: z.string().nullable(),
     model: z.string().nullable(),
     status: z.enum(["active", "disabled"]),
-    source: z.enum(["managed", "user"]),
     provider_connection: z.string().optional(),
+    /**
+     * Whether the entry's (provider, model) accepts image input: the model
+     * catalog's answer, with the entry's `inputModalities.image` override
+     * winning. Absent when the profile has no provider or model to judge
+     * (mix profiles, sparse stubs).
+     */
+    supportsVision: z.boolean().optional(),
+    /**
+     * Present when the profile is a mix: the weighted arm list the resolver
+     * expands per dispatch, carried so pickers can judge mix
+     * dispatchability from the summary. Absent for standard profiles.
+     */
+    mix: z
+      .array(z.object({ profile: z.string(), weight: z.number() }))
+      .optional(),
     /** Null when the profile has no provider to judge (e.g. mix profiles). */
     availability: availabilitySchema.nullable(),
     config_issue: profileConfigIssueSchema.optional(),
@@ -122,7 +137,8 @@ const profileSummarySchema = z
 const profileDetailSchema = z
   .object({
     name: z.string(),
-    entry: z.record(z.string(), z.unknown()),
+    /** The full effective body, resolved through the catalog like the list. */
+    entry: ProfileEntry,
     availability: availabilitySchema.nullable(),
     config_issue: profileConfigIssueSchema.optional(),
   })
@@ -280,7 +296,7 @@ function profileConfigIssue(record: Record<string, unknown>): {
   code: "model_unknown" | "over_output_cap" | "no_input_room";
   message: string;
 } | null {
-  if (record.mix != null || record.source === "managed") {
+  if (record.mix != null || record.provider === "cadet") {
     return null;
   }
   const provider =
@@ -531,16 +547,18 @@ async function handleListProfiles() {
     orderProfileKeys(effective, config.llm.profileOrder).map(async (name) => {
       const record = effective[name] as Record<string, unknown>;
       const configIssue = profileConfigIssue(record);
+      const supportsVision = resolveSupportsVision(effective[name]);
       return {
         name,
         label: typeof record.label === "string" ? record.label : null,
         provider: typeof record.provider === "string" ? record.provider : null,
         model: typeof record.model === "string" ? record.model : null,
         status: record.status === "disabled" ? "disabled" : "active",
-        source: record.source === "managed" ? "managed" : "user",
         ...(typeof record.provider_connection === "string"
           ? { provider_connection: record.provider_connection }
           : {}),
+        ...(record.mix != null ? { mix: record.mix } : {}),
+        ...(supportsVision === undefined ? {} : { supportsVision }),
         availability: await computeProfileAvailability(record),
         ...(configIssue ? { config_issue: configIssue } : {}),
       };
@@ -549,6 +567,26 @@ async function handleListProfiles() {
   return { profiles };
 }
 
+/**
+ * Resolve whether the entry's (provider, model) accepts image input: the
+ * model catalog's answer, with the entry's `inputModalities.image` override
+ * winning. Unknown (provider, model) pairs with no override default to
+ * `true` (fail-open) so image upload stays available for custom / unlisted
+ * models. Undefined when the entry has no provider or model to judge.
+ */
+function resolveSupportsVision(
+  entry: ProfileEntry | undefined,
+): boolean | undefined {
+  const provider = entry?.provider;
+  const model = entry?.model;
+  if (provider == null || model == null) {
+    return undefined;
+  }
+  const catalogVision = catalogEntryFor(provider, model)?.supportsVision;
+  const imageOverride = modalitiesOf(entry)?.image;
+  return resolveModalityOverride(imageOverride, catalogVision) ?? true;
+}
+
 async function handleGetProfile({ pathParams = {} }: RouteHandlerArgs) {
   const name = (pathParams.name ?? "").trim();
   if (!name) {
@@ -654,9 +692,6 @@ async function handleCreateProfile({ body = {} }: RouteHandlerArgs) {
   }
 
   profiles[name] = entry;
-  // Defensive: for a user-owned name this is a no-op; it re-asserts the
-  // managed-name protection at the shared write choke point.
-  normalizeCloudProfileWrites({ llm: { profiles: { [name]: entry } } });
 
   await commitConfigWrite(raw, "create inference profile");
 
@@ -703,7 +738,7 @@ async function handleUpdateProfile({
     }
     throw new NotFoundError(`Profile "${name}" not found.`);
   }
-  if (MANAGED_PROFILE_NAMES.has(name) && existing.source === "managed") {
+  if (MANAGED_PROFILE_NAMES.has(name) && existing.provider === "cadet") {
     throw new BadRequestError(
       `Cannot edit cloud profile "${name}". Cloud profiles are read-only; duplicate to a custom profile to customize.`,
     );
@@ -764,8 +799,6 @@ async function handleUpdateProfile({
     ...fragmentFromBody(body as Record<string, unknown>),
     ...(input.provider !== undefined ? { provider: input.provider } : {}),
     ...(input.model !== undefined ? { model: input.model } : {}),
-    source:
-      existing.source === "managed" ? "user" : (existing.source ?? "user"),
   };
   // Keep the allowUnlisted marker faithful to the pair being stored: stamp
   // it on a deliberate unlisted acceptance (warnings can only be the
@@ -799,7 +832,6 @@ async function handleUpdateProfile({
   }
 
   profiles[name] = merged;
-  normalizeCloudProfileWrites({ llm: { profiles: { [name]: merged } } });
 
   await commitConfigWrite(raw, "update inference profile");
 
@@ -834,11 +866,6 @@ async function handleDeleteProfile({ pathParams = {} }: RouteHandlerArgs) {
   const llm = asPlainObject(raw.llm);
   const profiles = asPlainObject(llm?.profiles);
 
-  // Reject deletion of a cloud default with a clear message before the
-  // existence check, so `delete balanced` explains itself even when the
-  // managed stub is on disk.
-  rejectCloudProfileDeletion({ llm: { profiles: { [name]: null } } });
-
   if (!profiles || profiles[name] === undefined) {
     throw new NotFoundError(`Profile "${name}" not found.`);
   }

package/src/runtime/routes/inference-provider-connection-routes.ts

@@ -600,7 +600,6 @@ async function handleDeleteConnection({ pathParams = {} }: RouteHandlerArgs) {
   // Cloud connections are write-protected: `seedCanonicalConnections` would
   // re-upsert them on the next daemon boot anyway, so a successful delete here
   // produces a confusing delete → reappear loop. Reject outright. Mirrors
-  // `rejectCloudProfileDeletion` for cloud profiles (which are similarly
   // re-overlaid by `seed-inference-profiles.ts` on boot).
   //
   // Gated on the row, not the name: an install predating the reserved name can

package/src/runtime/routes/llm-call-sites-routes.ts

@@ -5,7 +5,7 @@ import {
   resolveDefaultProfileKey,
   resolveShippedDefaultProfileKey,
 } from "../../config/llm-resolver.js";
-import { loadConfig } from "../../config/loader.js";
+import { getConfig } from "../../config/loader.js";
 import {
   CALL_SITE_CATALOG,
   CALL_SITE_DOMAINS,
@@ -55,7 +55,7 @@ export function buildCallSiteCatalog(llm: LLMConfig) {
 }
 
 async function handleGetCallSites() {
-  const { llm } = loadConfig();
+  const { llm } = getConfig();
   return {
     domains: CALL_SITE_DOMAINS,
     callSites: buildCallSiteCatalog(llm),
@@ -74,7 +74,7 @@ export type LlmProfilesListResult = z.infer<
 >;
 
 async function handleListProfiles(): Promise<LlmProfilesListResult> {
-  const { llm } = loadConfig();
+  const { llm } = getConfig();
   const profiles = getUserSelectableProfilesForProvider(llm);
   return {
     profiles: Object.keys(profiles).sort(),

package/src/runtime/routes/log-export/__tests__/installed-inventory.test.ts

@@ -19,7 +19,7 @@ import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 import {
   getWorkspacePluginsDir,
   getWorkspaceSkillsDir,
-} from "../../../../util/platform.js";
+} from "../../../../util/layout.js";
 import {
   collectInstalledInventory,
   collectPluginInventory,

package/src/runtime/routes/log-export/__tests__/workspace-allowlist-error-contract.test.ts

@@ -35,7 +35,7 @@ mock.module("../../../../persistence/conversation-directories.js", () => ({
   },
 }));
 
-import { getConversationsDir } from "../../../../util/platform.js";
+import { getConversationsDir } from "../../../../util/layout.js";
 import { collectWorkspaceData } from "../workspace-allowlist.js";
 
 let staging: string;

package/src/runtime/routes/log-export/__tests__/workspace-allowlist.test.ts

@@ -25,7 +25,7 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 
-import { getConversationsDir } from "../../../../util/platform.js";
+import { getConversationsDir } from "../../../../util/layout.js";
 import { collectWorkspaceData } from "../workspace-allowlist.js";
 
 // ---------------------------------------------------------------------------

package/src/runtime/routes/log-export/workspace-allowlist.ts

@@ -28,8 +28,8 @@ import { join } from "node:path";
 import { StringDecoder } from "node:string_decoder";
 
 import { parseConversationDirName } from "../../../persistence/conversation-directories.js";
+import { getConversationsDir } from "../../../util/layout.js";
 import { getLogger } from "../../../util/logger.js";
-import { getConversationsDir } from "../../../util/platform.js";
 
 const log = getLogger("log-export-workspace");
 

package/src/runtime/routes/log-export-routes.ts

@@ -22,7 +22,7 @@ import { join } from "node:path";
 import { and, desc, eq, gte, lte } from "drizzle-orm";
 import { z } from "zod";
 
-import { overlayWorkspaceMcpForConfigRead } from "../../mcp/workspace-mcp-config.js";
+import { loadWorkspaceMcpConfig } from "../../mcp/workspace-mcp-config.js";
 import { getDb, getLogsDb } from "../../persistence/db-connection.js";
 import {
   llmRequestLogs,
@@ -30,12 +30,12 @@ import {
   messages,
   toolInvocations,
 } from "../../persistence/schema/index.js";
-import { getLogger, LOG_FILE_PATTERN } from "../../util/logger.js";
 import {
   getDaemonStderrLogPath,
   getDataDir,
   getWorkspaceConfigPath,
-} from "../../util/platform.js";
+} from "../../util/layout.js";
+import { getLogger, LOG_FILE_PATTERN } from "../../util/logger.js";
 import { APP_VERSION, COMMIT_SHA } from "../../version.js";
 import { assistantEventHub } from "../assistant-event-hub.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
@@ -569,20 +569,22 @@ function readSanitizedConfig(): Record<string, unknown> | undefined {
       }
     }
 
-    overlayWorkspaceMcpForConfigRead(config);
-    const mcpServers = asRecord(asRecord(config.mcp)?.servers);
-    for (const server of Object.values(mcpServers ?? {})) {
-      const transport = asRecord(asRecord(server)?.transport);
-      if (!transport) {
+    // Project the workspace MCP servers onto the export, read through the
+    // module's API. Raw on purpose: the walk below redacts transport
+    // headers and env, which must be present to sanitize.
+    const mcp = loadWorkspaceMcpConfig();
+    config.mcp = mcp;
+    const mcpServers = mcp.servers;
+    for (const server of Object.values(mcpServers)) {
+      const transport = server.transport;
+      if (transport.type === "stdio") {
+        if (transport.env) {
+          transport.env = redactValueMap(transport.env);
+        }
         continue;
       }
-      const headers = asRecord(transport.headers);
-      if (headers) {
-        transport.headers = redactValueMap(headers);
-      }
-      const env = asRecord(transport.env);
-      if (env) {
-        transport.env = redactValueMap(env);
+      if (transport.headers) {
+        transport.headers = redactValueMap(transport.headers);
       }
     }
 

package/src/runtime/routes/migration-rollback-routes.ts

@@ -13,7 +13,7 @@ import { getDb } from "../../persistence/db-connection.js";
 import { getMaxRollbackVersion } from "../../persistence/migrations/run-migrations.js";
 import { rollbackMemoryMigration } from "../../persistence/migrations/validate-migration-state.js";
 import { migrationSteps } from "../../persistence/steps.js";
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import { WORKSPACE_MIGRATIONS } from "../../workspace/migrations/registry.js";
 import {
   getLastWorkspaceMigrationId,

package/src/runtime/routes/migration-routes.ts

@@ -33,7 +33,6 @@ import {
   getDb,
   getLogsSqlite,
   getMemorySqlite,
-  getTelemetrySqlite,
   resetDb,
 } from "../../persistence/db-connection.js";
 import { validateMigrationState } from "../../persistence/migrations/validate-migration-state.js";
@@ -49,8 +48,8 @@ import {
   getCredentialMetadata,
   upsertCredentialMetadata,
 } from "../../tools/credentials/metadata-store.js";
+import { getWorkspaceDir, getWorkspaceHooksDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getWorkspaceDir, getWorkspaceHooksDir } from "../../util/platform.js";
 import { APP_VERSION } from "../../version.js";
 import { DAEMON_INTERNAL_ASSISTANT_ID } from "../assistant-scope.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
@@ -197,7 +196,7 @@ async function checkpointDbsForExport(): Promise<void> {
   for (const [label, sqlite] of [
     ["logs", getLogsSqlite()],
     ["memory", getMemorySqlite()],
-    ["telemetry", getTelemetrySqlite()],
+    // (no telemetry: migration 387 deletes that database file outright)
   ] as const) {
     if (!sqlite) {
       log.warn(

package/src/runtime/routes/monitoring-routes.ts

@@ -20,11 +20,11 @@ import {
 } from "../../monitoring/control.js";
 import type { ResourceSample } from "../../monitoring/resource-sample-types.js";
 import { SampleRingBuffer } from "../../monitoring/sample-ring-buffer.js";
-import { getLogger } from "../../util/logger.js";
 import {
   getMonitoringDataDir,
   getMonitoringPidPath,
-} from "../../util/platform.js";
+} from "../../util/layout.js";
+import { getLogger } from "../../util/logger.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { InternalError } from "./errors.js";
 import type { RouteDefinition } from "./types.js";