@mycadet/assistant 0.12.9 → 0.12.11

package/src/plugins/defaults/turn-context/package.json

@@ -9,6 +9,6 @@
     "node": ">=20.12.0"
   },
   "peerDependencies": {
-    "@mycadet/plugin-api": "^0.8.0"
+    "@mycadet/plugin-api": "^0.12.7"
   }
 }

package/src/plugins/defaults/workspace/injectors.ts

@@ -23,7 +23,7 @@ import type { TrustContext } from "../../../daemon/trust-context-types.js";
 import {
   getConfigQuarantineNoticePath,
   getConfigValidationResetNoticePath,
-} from "../../../util/platform.js";
+} from "../../../util/layout.js";
 import {
   type InjectionBlock,
   type Injector,

package/src/plugins/defaults/workspace/package.json

@@ -9,6 +9,6 @@
     "node": ">=20.12.0"
   },
   "peerDependencies": {
-    "@mycadet/plugin-api": "^0.8.0"
+    "@mycadet/plugin-api": "^0.12.7"
   }
 }

package/src/plugins/disabled-state.ts

@@ -15,7 +15,7 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
 
-import { getWorkspacePluginsDir } from "../util/platform.js";
+import { getWorkspacePluginsDir } from "../util/layout.js";
 
 /**
  * Return `true` when the `.disabled` sentinel exists for `pluginName`.

package/src/plugins/ensure-plugin-api-shim.ts

@@ -42,8 +42,8 @@ import {
   PLUGIN_API_EXPORTS,
   PLUGIN_API_REGISTRY_KEY,
 } from "../embedded/plugin-api.js";
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 
 const log = getLogger("plugin-api-shim");
 

package/src/plugins/ensure-shared-dep-links.ts

@@ -56,8 +56,8 @@ import { existsSync, readFileSync } from "node:fs";
 import { mkdir, symlink } from "node:fs/promises";
 import { dirname, join } from "node:path";
 
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 
 const log = getLogger("shared-dep-links");
 

package/src/plugins/installed-plugin-dirs.ts

@@ -21,7 +21,7 @@
 import { readdirSync, realpathSync, statSync } from "node:fs";
 import { join, sep } from "node:path";
 
-import { getWorkspacePluginsDir } from "../util/platform.js";
+import { getWorkspacePluginsDir } from "../util/layout.js";
 import { hasPluginManifest } from "../util/plugin-manifest.js";
 
 export interface InstalledPluginDir {

package/src/plugins/mcp-servers.ts

@@ -54,17 +54,15 @@ export const PLUGIN_MCP_MANIFEST = "mcp.json";
  * `mcp.json` has no risk field, since the spec defines none, so a host
  * default applies.
  *
- * The review happens earlier: the marketplace catalog
- * (`plugins/marketplace.json`) is a curated whitelist of SHA-pinned
- * entries, and installing a plugin is itself the user's decision to run
- * the code it ships. Gating every call afterwards prompts on the tools
- * the user installed the plugin to get.
+ * The review happens earlier: the installable catalog is the Cadet Cloud
+ * marketplace's reviewed entries, and installing a plugin is itself the
+ * user's decision to run the code it ships. Gating every call afterwards
+ * prompts on the tools the user installed the plugin to get.
  *
  * The gap this leaves is deliberate and known: a plugin installed
- * off-marketplace straight from a GitHub URL gets the same default, and
- * nothing recorded at install time distinguishes the two afterwards. A
- * provenance signal is what would let this default be curation-gated
- * rather than blanket. A workspace entry of the same id replaces the
+ * straight from a GitHub URL gets the same default, and nothing recorded
+ * at install time distinguishes the two afterwards. A provenance signal
+ * is what would let this default be curation-gated rather than blanket. A workspace entry of the same id replaces the
  * plugin server wholesale (transport included) and uses the workspace
  * origin risk.
  */

package/src/plugins/mtime-cache.ts

@@ -54,11 +54,11 @@ import {
 } from "../security/plugin-secret-patterns.js";
 import { finalizeTool } from "../tools/tool-defaults.js";
 import type { Tool, ToolDefinition } from "../tools/types.js";
-import { getLogger } from "../util/logger.js";
 import {
   getWorkspaceHooksDir,
   getWorkspacePluginsDir,
-} from "../util/platform.js";
+} from "../util/layout.js";
+import { getLogger } from "../util/logger.js";
 import { hasPluginManifest } from "../util/plugin-manifest.js";
 import { collectSourceVersions } from "./collect-source-versions.js";
 import {

package/src/plugins/source-versions.ts

@@ -21,7 +21,7 @@
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
 
-import { getMonitoringDataDir } from "../util/platform.js";
+import { getMonitoringDataDir } from "../util/layout.js";
 
 /**
  * Sentinel filename, under the monitoring data directory

package/src/prompts/bootstrap-cleanup.ts

@@ -1,7 +1,7 @@
 import { existsSync, unlinkSync } from "node:fs";
 
+import { getWorkspacePromptPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspacePromptPath } from "../util/platform.js";
 
 const log = getLogger("bootstrap-cleanup");
 

package/src/prompts/persona-resolver.ts

@@ -11,8 +11,8 @@ import {
 } from "../contacts/guardian-delivery-reader.js";
 import type { ChannelCapabilities } from "../daemon/conversation-runtime-assembly.js";
 import type { TrustContext } from "../daemon/trust-context-types.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 type { NormalizedOnboarding } from "./normalize-onboarding.js";
 

package/src/prompts/sections.ts

@@ -2,11 +2,11 @@ import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 
 import { parseFrontmatterFields } from "../skills/frontmatter.js";
-import { getLogger } from "../util/logger.js";
 import {
   getWorkspacePromptPath,
   getWorkspaceSystemPromptDir,
-} from "../util/platform.js";
+} from "../util/layout.js";
+import { getLogger } from "../util/logger.js";
 import { stripCommentLines } from "../util/strip-comment-lines.js";
 import {
   BUNDLED_SYSTEM_SECTIONS,

package/src/prompts/system-prompt.ts

@@ -12,17 +12,15 @@ import { getIsContainerized } from "../config/env-registry.js";
 import type { ChannelCapabilities } from "../daemon/conversation-runtime-assembly.js";
 import { resolveTrustClass } from "../daemon/trust-context.js";
 import type { TrustContext } from "../daemon/trust-context-types.js";
-import { markActivationSession } from "../plugins/defaults/memory/activation-session-store.js";
 import { derivePersonaTrustFlags } from "../runtime/trust-class.js";
-import { ACTIVATION_RAIL_BOOTSTRAP_TEMPLATE } from "../telemetry/activation-funnel.js";
 import type { OnboardingContext } from "../types/onboarding-context.js";
 import { resolveBundledDir } from "../util/bundled-asset.js";
-import { getLogger } from "../util/logger.js";
 import {
   getConversationsDir,
   getWorkspaceDir,
   getWorkspacePromptPath,
-} from "../util/platform.js";
+} from "../util/layout.js";
+import { getLogger } from "../util/logger.js";
 import { stripCommentLines } from "../util/strip-comment-lines.js";
 import { cleanupBootstrapFiles } from "./bootstrap-cleanup.js";
 import { SYSTEM_PROMPT_CACHE_BOUNDARY } from "./cache-boundary.js";
@@ -336,40 +334,11 @@ export function maybeReseedBootstrap(templateFileName: string): boolean {
 
 /**
  * Reseed BOOTSTRAP.md from the requested onboarding template (one-shot,
- * idempotent) and, when that template is the activation rail AND the rail is
- * now the active bootstrap, mark the conversation as an activation session.
- *
- * Marking happens here — at the single point where the bootstrap selection is
- * known — so it lands BEFORE the agent loop resolves tools and BEFORE the model
- * can call the emit tool on the first activation-rail turn. (`resolveTools`
- * runs before the system-prompt build in the loop, so the system-prompt build is
- * too late to be the *only* marking site.) The marker write is best-effort and
- * idempotent (`markActivationSession` swallows errors and dedups on the PK), so
- * calling this from both `setOnboardingContext` and `buildSystemPrompt` is safe.
- *
- * The activation mark is gated on the rail actually being the active bootstrap —
- * either this call just installed it, OR BOOTSTRAP.md already holds the
- * activation-rail template. When the reseed no-ops because BOOTSTRAP.md is
- * missing or customized to something else, the rail is NOT active, so we must
- * NOT mark (otherwise non-rail conversations would pollute activation
- * telemetry).
+ * idempotent). No-op when the workspace's BOOTSTRAP.md is missing or has been
+ * customized away from the generic template.
  */
-export function applyBootstrapTemplate(
-  bootstrapTemplate: string,
-  conversationId?: string,
-): void {
-  const installedActivationRail = maybeReseedBootstrap(bootstrapTemplate);
-  if (
-    bootstrapTemplate === ACTIVATION_RAIL_BOOTSTRAP_TEMPLATE &&
-    conversationId &&
-    (installedActivationRail ||
-      isTemplateContent(
-        readPromptFile(getWorkspacePromptPath("BOOTSTRAP.md")),
-        ACTIVATION_RAIL_BOOTSTRAP_TEMPLATE,
-      ))
-  ) {
-    markActivationSession(conversationId);
-  }
+export function applyBootstrapTemplate(bootstrapTemplate: string): void {
+  maybeReseedBootstrap(bootstrapTemplate);
 }
 
 /**
@@ -460,13 +429,12 @@ export interface BuildSystemPromptOptions {
  * file-backed bodies, and runtime-computed transforms.
  */
 export function buildSystemPrompt(options?: BuildSystemPromptOptions): string {
-  // One-shot bootstrap reseed + activation-rail marking. The marking also runs
-  // earlier, at `setOnboardingContext`, so the activation session is recorded
-  // before the agent loop resolves tools on the first turn; this call is a
-  // harmless idempotent backstop for prompt builds outside that path.
+  // One-shot bootstrap reseed, at prompt build for prompt paths outside the
+  // onboarding-context entry point (idempotent — no-op once BOOTSTRAP.md is
+  // customized).
   const bootstrapTemplate = options?.onboardingContext?.bootstrapTemplate;
   if (bootstrapTemplate) {
-    applyBootstrapTemplate(bootstrapTemplate, options?.conversationId);
+    applyBootstrapTemplate(bootstrapTemplate);
   }
 
   // Slugs used by the persona sections (`10-user-persona`,

package/src/prompts/templates/BOOTSTRAP-ACTIVATION-RAIL.md

@@ -16,8 +16,6 @@ The prompt itself must be one-click copyable. Inline paragraph text the user has
 
 DONE: the user has the copyable prompt in hand (or you've explicitly backfilled/skipped Port per the task-first opener below).
 
-<!-- Funnel: segment activation events by port_accepted vs port_declined so the no-port branch can be tuned separately. Instrumentation is a follow-up; this template only defines the branch. -->
-
 _If the user declines the port (`port_declined`)._ Don't re-pitch and don't ask two questions to make up for the missing paste. Ask exactly ONE question — the one that buys the most signal for Propose ("what's the one thing you most want off your plate this week?"). Their answer is the Moment 1 output that Port would have produced. Stay in a bounded context loop: at most two context-gathering turns total. If you still don't have a surface to point at after that, propose anyway with what you have — a thin proposal beats stalling for more input.
 
 On `port_declined`, render exactly ONE small structured intake surface before moving to Propose — a `ui_show` `choice` surface (`display: "inline"`, single-select) whose options are a short background list (Founder / Engineer / Creative / Operator / Investor / Student / Other), so the no-port branch still hands Propose a structured signal. (A `form` with one short field, or a `choice` phrased as a single top-of-mind question, is an acceptable substitute — pick one; the background `choice` is the default.) This is the deliberate structured-intake exception to the "don't enumerate options / the recommendation IS the click" guidance — scoped to the no-port branch only, where there's no paste to infer from, so a small menu is the cheapest way to get traction. The port (paste) branch is unchanged: it never renders this surface.
@@ -85,41 +83,6 @@ Identity writes (IDENTITY.md, SOUL.md), user-profile writes, journal entries: al
 
 Your opener is the Port pitch — no other intake surface precedes it.
 
-## Telemetry: tag your `ui_show` surfaces
-
-The activation funnel is measured passively — there is no separate tool to call.
-When you render the `ui_show` surface for a rail move that IS a funnel moment,
-add the optional `activation_moment` parameter to that same `ui_show` call. It's
-a tag on a surface you're already showing, not extra work.
-
-Most moments record when the user COMMITS the tagged surface (clicks an action /
-submits / selects). The one exception is `first_wow_executed`, which records the
-moment the surface RENDERS — because the wow has already happened by the time you
-show its result, and a result card is often display-only with nothing to commit.
-
-Which surface to tag with which moment:
-
-- `moment_1` — the no-port intake `choice` surface, OR the Port-summary card
-  (background + top-of-mind captured, or the user explicitly skipped). Records on
-  commit (when the intake resolves).
-- `moment_2` — the Propose offer surface (the `ui_show` offer card/choice where
-  the user picks an outcome). Records on commit.
-- `moment_3` — the task-selection surface (the specific thing you're about to
-  run is chosen). Records on commit.
-- `first_wow_executed` — the Run result surface (e.g. `work_result` / the result
-  the user sees after the wow ran against real data). Records on RENDER — you do
-  not need the user to click anything; just tag the result surface.
-- `first_wow_interacted` — the user's first engagement AFTER the wow. Tag the
-  surface they act on (a result-card action button, or the follow-through
-  `choice` you render next). Records on commit. Don't put this on the same
-  surface as `first_wow_executed` — one tag per surface, and that surface already
-  records "executed" on render.
-
-A surface carries at most one `activation_moment`. The milestone no-ops outside
-an activation session, and a missing or mistimed tag is non-fatal — but accurate,
-move-bound tags are what make the funnel meaningful. Omit `activation_moment` on
-every non-funnel surface.
-
 ## Wrap
 
 <!-- Open question: the default wrap tone below is opinionated (brisk, dataset-first). Whether that's the right note to end the activation rail on is a conscious call we haven't made yet — flag, don't silently change. -->

package/src/providers/__tests__/cadet-connection-routing.test.ts

@@ -39,7 +39,7 @@ const cadetConnection = {
 const resolvedAuth: ResolvedAuth = {
   kind: "header",
   headers: { Authorization: "Bearer test-key" },
-  baseUrl: "https://platform.example/v1/runtime-proxy/fireworks",
+  baseUrl: "https://test-cloud.mycadet.ai/v1/runtime-proxy/fireworks",
 };
 
 describe("cadet connection routing", () => {
@@ -76,7 +76,7 @@ describe("cadet connection routing", () => {
       {
         kind: "header",
         headers: { Authorization: "Bearer test-key" },
-        baseUrl: "https://platform.example/v1/runtime-proxy/cadet",
+        baseUrl: "https://test-cloud.mycadet.ai/v1/runtime-proxy/cadet",
       },
       {
         model: "qwen/qwen3-8b",

package/src/providers/cadet/client.ts

@@ -1,4 +1,4 @@
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import { OpenAIChatCompletionsProvider } from "../openai/chat-completions-provider.js";
 import type { SendMessageOptions } from "../types.js";
 import { hostedDirectionsExtraBody } from "./personality-directions.js";

package/src/providers/inference/__tests__/base-url-route-validation.test.ts

@@ -42,7 +42,7 @@ mock.module("../../../config/assistant-feature-flags.js", () => ({
 
 // Mock platform detection: tests default to platform mode (SSRF enforced).
 // Individual tests can override via `mockIsPlatform = false`. Spread the real
-// module so the config loader's transitive `util/platform` imports still
+// module so the config loader's transitive `util/layout` imports still
 // resolve — only `getIsCloud` is overridden.
 let mockIsPlatform = true;
 

package/src/providers/inference/adapter-factory.ts

@@ -371,7 +371,7 @@ export function createAdapterFromConnection(
         }
         const expectedFallback = FALLBACK_PROFILE_BY_KEY[primaryProfile];
         if (
-          winner.entry?.source !== "managed" ||
+          winner.entry?.provider !== "cadet" ||
           winner.entry.fallbackProfile !== expectedFallback
         ) {
           return null;

package/src/providers/inference/backfill.ts

@@ -17,7 +17,6 @@
  * default profile and on any legacy bare-`provider` callsite override.
  */
 
-import { MANAGED_PROFILE_NAMES } from "../../config/default-profile-catalog.js";
 import { getIsCloud } from "../../config/env-registry.js";
 import { loadRawConfig, saveRawConfig } from "../../config/loader.js";
 import type { DrizzleDb } from "../../persistence/db-connection.js";
@@ -207,17 +206,11 @@ function ensureProviderConnection(
   // custom-named connection already exists.
   //
   // Managed-owned entries are excluded: a cloud preset must stay on the
-  // cloud route, not start dispatching against a key the user
-  // brought for their own profiles. Managed-owned means `source: "managed"`
-  // or a canonical managed name without an explicit `source: "user"` —
-  // legacy seeders wrote canonical entries source-less, and only an explicit
-  // user source marks a shadow the user took ownership of (mirrors
-  // workspace migration 109). `entryLabel` is the profile name for the
+  // cloud route, not start dispatching against a key the user brought for
+  // their own profiles. `entryLabel` is the profile name for the
   // `llm.profiles.*` walk; the other walks pass bracketed labels that never
   // collide with canonical names.
-  const isManagedOwned =
-    entry.source === "managed" ||
-    (entry.source !== "user" && MANAGED_PROFILE_NAMES.has(entryLabel));
+  const isManagedOwned = entry.provider === "cadet";
   const entryModel = typeof entry.model === "string" ? entry.model : undefined;
   const existingForProvider = isManagedOwned
     ? undefined

package/src/providers/inference/profile-probe.ts

@@ -127,7 +127,7 @@ export async function probeInferenceProfile(
 ): Promise<ProfileCheck | null> {
   const { llm } = getConfigReadOnly();
   const entry = llm.profiles?.[name] as Record<string, unknown> | undefined;
-  if (!entry || entry.status === "disabled" || entry.source === "managed") {
+  if (!entry || entry.status === "disabled" || entry.provider === "cadet") {
     return null;
   }
 

package/src/providers/retry.ts

@@ -710,7 +710,6 @@ function normalizeSendMessageOptions(
   // (after the `openai` promptCacheKey copy above) so they never leak into
   // provider request bodies even when callers set them without a `callSite`.
   delete nextConfig.overrideProfile;
-  delete nextConfig.overrideProfileOrigin;
   delete nextConfig.forceOverrideProfile;
   delete nextConfig.selectionSeed;
   delete nextConfig.conversationId;
@@ -725,7 +724,6 @@ function normalizeSendMessageOptions(
     const attribution = resolveUsageAttribution({
       callSite: config.callSite,
       overrideProfile: config.overrideProfile,
-      overrideProfileOrigin: config.overrideProfileOrigin,
       forceOverrideProfile: config.forceOverrideProfile,
       selectionSeed: config.selectionSeed,
     });

package/src/providers/types.ts

@@ -346,13 +346,6 @@ export interface SendMessageConfig {
    * silently fall through.
    */
   overrideProfile?: string;
-  /**
-   * Who chose `overrideProfile`: `"auto"` when the Auto profile's router
-   * picked it for the turn. Usage attribution reports it as the profile
-   * source so a routed turn is not counted as a user pin. A routing-time
-   * concern only; stripped before any provider wire request.
-   */
-  overrideProfileOrigin?: "auto";
   /**
    * When true, the resolver floats `overrideProfile` above the call-site
    * layers (named site profile + call-site override) for non-main-agent call

package/src/providers/usage-tracking.ts

@@ -80,7 +80,7 @@ export class UsageTrackingProvider implements Provider {
         // A rerouted serve ran on the backup the wrapper chose, not on the
         // router's pick, so the origin applies only to the original route.
         ...(response.actualInferenceProfile === undefined
-          ? { overrideProfileOrigin: config.overrideProfileOrigin }
+          ? {}
           : { forceOverrideProfile: true }),
       });
       const providerName = response.actualProvider ?? this.inner.name;

package/src/routes/__tests__/route-host.test.ts

@@ -17,7 +17,7 @@ import {
   test,
 } from "bun:test";
 
-import { getProcPidPath, getProcSocketPath } from "../../util/platform.js";
+import { getProcPidPath, getProcSocketPath } from "../../util/layout.js";
 import {
   RouteHostClient,
   RouteHostTimeoutError,

package/src/routes/control.ts

@@ -17,8 +17,8 @@
  */
 
 import { getConfigReadOnly } from "../config/loader.js";
+import { getProcPidPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getProcPidPath } from "../util/platform.js";
 import {
   probeWorkerPidFile,
   spawnWorkerProcess,

package/src/routes/route-host-client.ts

@@ -23,8 +23,8 @@ import { connect, type Socket } from "node:net";
 import type { IpcEnvelope } from "@mycadet/ipc-server-utils";
 import { IpcFrameReader, writeMessage } from "@mycadet/ipc-server-utils";
 
+import { getProcPidPath, getProcSocketPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getProcPidPath, getProcSocketPath } from "../util/platform.js";
 import { spawnWorkerProcess } from "../util/worker-process.js";
 import {
   ROUTE_HOST_PROC_NAME,

package/src/routes/worker.ts

@@ -31,12 +31,12 @@ import {
   importRouteModule,
   sourceRootForHandler,
 } from "../runtime/routes/user-route-import.js";
-import { getLogger } from "../util/logger.js";
 import {
   ensureProcDir,
   getProcPidPath,
   getProcSocketPath,
-} from "../util/platform.js";
+} from "../util/layout.js";
+import { getLogger } from "../util/logger.js";
 import {
   cleanupWorkerPidFile,
   startWorkerPidFileGuard,

package/src/runtime/agent-wake.ts

@@ -120,6 +120,7 @@ import {
   recordRequestLog,
   setAgentLoopExitReasonOnLatestLog,
 } from "../persistence/llm-request-log-store.js";
+import { stampTurnOutcome } from "../persistence/turn-outcome.js";
 import type { SystemPromptPersonaOverride } from "../prompts/system-prompt.js";
 import type { Message, ToolDefinition } from "../providers/types.js";
 import { getScheduleRunStatus } from "../schedule/schedule-store.js";
@@ -127,7 +128,6 @@ import {
   type UntrustedContentSource,
   wrapUntrustedContent,
 } from "../security/untrusted-content.js";
-import { stampTurnOutcome } from "../telemetry/turn-outcome.js";
 import type { CompletedBackgroundTool } from "../tools/background-tool-registry.js";
 import { getLogger } from "../util/logger.js";
 import { safeStringSlice } from "../util/unicode.js";

package/src/runtime/assistant-stream-state.ts

@@ -68,8 +68,8 @@ import {
   SSE_REPLAY_RING_COUNT_LIMIT,
 } from "../api/constants/sse-replay.js";
 import type { AssistantEventEnvelope } from "../api/index.js";
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 import type { AssistantEventPublishOptions } from "./assistant-event-publish-options.js";
 import {
   matchesTargeting,

package/src/runtime/auth/token-service.ts

@@ -22,8 +22,8 @@ import {
 import { dirname, join } from "node:path";
 
 import { getIsContainerized } from "../../config/env-registry.js";
+import { getDeprecatedDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getDeprecatedDir } from "../../util/platform.js";
 import { isStaleEpoch } from "./policy.js";
 import type { ScopeProfile, TokenAudience, TokenClaims } from "./types.js";
 

package/src/runtime/background-job-runner.ts

@@ -28,8 +28,8 @@ import { emitBackgroundFailureSignal } from "../notifications/background-failure
 import { bootstrapConversation } from "../persistence/conversation-bootstrap.js";
 import { addMessage } from "../persistence/conversation-crud.js";
 import type { TitleOrigin } from "../persistence/conversation-title-service.js";
+import type { TurnFailure } from "../persistence/turn-outcome.js";
 import { dispatchProviderResolvable } from "../providers/provider-resolvability.js";
-import type { TurnFailure } from "../telemetry/turn-outcome.js";
 import { getLogger } from "../util/logger.js";
 import { hasReceivedUserMessage } from "./pre-first-message-gate.js";
 

package/src/runtime/middleware/twilio-validation.ts

@@ -3,7 +3,7 @@
  */
 
 import { TwilioVoiceProvider } from "../../calls/twilio-provider.js";
-import { loadConfig } from "../../config/loader.js";
+import { getConfig } from "../../config/loader.js";
 import { getPublicBaseUrl } from "../../inbound/public-ingress-urls.js";
 import { getLogger } from "../../util/logger.js";
 import { httpError } from "../http-errors.js";
@@ -84,7 +84,7 @@ export async function validateTwilioWebhook(
   // signature.
   let publicBaseUrl: string | undefined;
   try {
-    publicBaseUrl = getPublicBaseUrl(loadConfig());
+    publicBaseUrl = getPublicBaseUrl(getConfig());
   } catch {
     // No webhook base URL configured -- fall back to using req.url as-is
   }

package/src/runtime/routes/__tests__/app-pin-routes.test.ts

@@ -29,7 +29,7 @@ import {
 import { getDb } from "../../../persistence/db-connection.js";
 import { initializeDb } from "../../../persistence/db-init.js";
 import { appPins } from "../../../persistence/schema/index.js";
-import { getWorkspacePluginsDir } from "../../../util/platform.js";
+import { getWorkspacePluginsDir } from "../../../util/layout.js";
 import { ROUTES as APP_ROUTES } from "../app-management-routes.js";
 import { BadRequestError } from "../errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "../types.js";

package/src/runtime/routes/__tests__/apps-refresh-route.test.ts

@@ -84,7 +84,7 @@ mock.module("../../../apps/app-pin-store.js", () => ({
 }));
 
 const { createApp } = await import("../../../apps/app-store.js");
-const { getWorkspacePluginsDir } = await import("../../../util/platform.js");
+const { getWorkspacePluginsDir } = await import("../../../util/layout.js");
 const { ROUTES } = await import("../app-management-routes.js");
 
 function findHandler(operationId: string) {

package/src/runtime/routes/__tests__/avatar-state-routes.test.ts

@@ -22,15 +22,6 @@ mock.module("../../sync/resource-sync-events.js", () => ({
   },
 }));
 
-/** Every telemetry event the store records, in order. */
-const recorded: Array<{ name: string; fields: Record<string, unknown> }> = [];
-mock.module("../../../telemetry/telemetry-events-outbox.js", () => ({
-  recordTelemetryEvent: (name: string, fields: Record<string, unknown>) => {
-    recorded.push({ name, fields });
-    return { id: "evt", createdAt: 0 };
-  },
-}));
-
 import type { AvatarState } from "../../../avatar/avatar-manifest.js";
 import { writeManifest } from "../../../avatar/avatar-manifest.js";
 import { ROUTES } from "../avatar-routes.js";
@@ -253,7 +244,6 @@ describe("avatar write/remove handlers", () => {
     prevWorkspaceDir = process.env.CADET_WORKSPACE_DIR;
     process.env.CADET_WORKSPACE_DIR = workspaceDir;
     publishedOrigins.length = 0;
-    recorded.length = 0;
   });
 
   afterEach(() => {
@@ -585,30 +575,10 @@ describe("avatar write/remove handlers", () => {
     });
   });
 
-  describe("client OS on avatar_changed", () => {
-    test("the client-os header reaches the event, sanitized", async () => {
-      await uploadRed({ "x-cadet-client-os": " macOS " });
-
-      expect(recorded).toHaveLength(1);
-      expect(recorded[0]!.name).toBe("avatar_changed");
-      expect(recorded[0]!.fields).toMatchObject({
-        action: "upload_image",
-        client_os: "macos",
-      });
-    });
+  test("the client id reaches the fan-out", async () => {
+    await uploadRed({ "x-cadet-client-id": "web-1" });
 
-    test("an out-of-bounds client-os header is dropped, not forwarded", async () => {
-      await uploadRed({ "x-cadet-client-os": "a".repeat(65) });
-
-      expect(recorded).toHaveLength(1);
-      expect(recorded[0]!.fields).not.toHaveProperty("client_os");
-    });
-
-    test("the client id reaches the fan-out", async () => {
-      await uploadRed({ "x-cadet-client-id": "web-1" });
-
-      expect(publishedOrigins).toEqual(["web-1"]);
-    });
+    expect(publishedOrigins).toEqual(["web-1"]);
   });
 });