@mycadet/assistant 0.12.9 → 0.12.10

package/src/schedule/worker.ts

@@ -17,7 +17,7 @@ import {
   initFeatureFlagOverrides,
   refreshOverridesFromGateway,
 } from "../config/assistant-feature-flags.js";
-import { rehydrateCloudCredentials } from "../config/cloud-rehydration.js";
+import { ensureCloudIdentityIds } from "../config/cloud-identity.js";
 import { getConfig } from "../config/loader.js";
 import { startConversationEvictor } from "../daemon/conversation-evictor.js";
 import { stopMcpServerManager } from "../mcp/manager.js";
@@ -26,8 +26,8 @@ import { resetDb } from "../persistence/db-connection.js";
 import { registerWorkerPluginSurface } from "../plugins/worker-plugin-surface.js";
 import { disableStreamSeqStamping } from "../runtime/assistant-stream-state.js";
 import { initializeTools } from "../tools/registry.js";
+import { getScheduleWorkerPidPath, getSignalsDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getScheduleWorkerPidPath, getSignalsDir } from "../util/platform.js";
 import {
   cleanupWorkerPidFile,
   startWorkerPidFileGuard,
@@ -145,7 +145,7 @@ async function main(): Promise<void> {
   // the persisted platform environment instead of the CADET_ENVIRONMENT
   // default — otherwise valid credentials are sent to the wrong platform and
   // rejected for both inference and background-wake requests.
-  await rehydrateCloudCredentials();
+  await ensureCloudIdentityIds();
 
   // This process is the sole runner of schedule execution and hosts real agent
   // conversations (wake, execute, and workflow modes), so it needs the default

package/src/security/oauth2.ts

@@ -782,10 +782,10 @@ export async function startOAuth2Flow(
   try {
     // Dynamic imports required here to avoid circular dependencies with
     // config/loader → security → oauth2 module chains.
-    const { loadConfig } = await import("../config/loader.js");
+    const { getConfig } = await import("../config/loader.js");
     const { getPublicBaseUrl } =
       await import("../inbound/public-ingress-urls.js");
-    getPublicBaseUrl(loadConfig());
+    getPublicBaseUrl(getConfig());
     hasPublicUrl = true;
   } catch {
     // No public URL configured

package/src/security/secret-allowlist.ts

@@ -17,8 +17,8 @@ import { readFileSync } from "node:fs";
 import { join } from "node:path";
 
 import { pathExists } from "../util/fs.js";
+import { getDataDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getDataDir } from "../util/platform.js";
 
 const log = getLogger("secret-allowlist");
 

package/src/signals/cancel.ts

@@ -15,8 +15,8 @@ import { touchConversation } from "../daemon/conversation-evictor.js";
 import { findConversation } from "../daemon/conversation-registry.js";
 import { getSubagentManager } from "../subagent/index.js";
 import { createAbortReason } from "../util/abort-reasons.js";
+import { getSignalsDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getSignalsDir } from "../util/platform.js";
 
 const log = getLogger("signal:cancel");
 

package/src/signals/conversation-undo.ts

@@ -14,8 +14,8 @@ import { join } from "node:path";
 
 import { getIsContainerized } from "../config/env-registry.js";
 import { undoLastMessage } from "../daemon/handlers/conversations.js";
+import { getSignalsDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getSignalsDir } from "../util/platform.js";
 
 const log = getLogger("signal:conversation-undo");
 

package/src/signals/emit-event.ts

@@ -17,8 +17,8 @@ import { join } from "node:path";
 
 import type { AssistantEvent } from "../api/index.js";
 import { broadcastMessage } from "../runtime/assistant-event-hub.js";
+import { getSignalsDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getSignalsDir } from "../util/platform.js";
 
 const log = getLogger("signal:emit-event");
 

package/src/signals/event-stream.ts

@@ -26,7 +26,7 @@ import { join } from "node:path";
 
 import type { AssistantEventEnvelope } from "../api/index.js";
 import { getIsContainerized } from "../config/env-registry.js";
-import { getSignalsDir } from "../util/platform.js";
+import { getSignalsDir } from "../util/layout.js";
 
 // ── Write side (daemon) ──────────────────────────────────────────────
 

package/src/signals/user-message.ts

@@ -38,8 +38,8 @@ import {
 } from "../persistence/attachments-store.js";
 import { getOrCreateConversation as getOrCreateConversationKey } from "../persistence/conversation-key-store.js";
 import { checkIngressForSecrets } from "../security/secret-ingress.js";
+import { getSignalsDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getSignalsDir } from "../util/platform.js";
 
 const log = getLogger("signal:user-message");
 

package/src/skills/catalog-install.ts

@@ -23,8 +23,9 @@ import {
 import { getCloudBaseUrl } from "../config/env.js";
 import { loadSkillCatalog } from "../config/skills.js";
 import { isBunVirtualPath } from "../util/bundled-asset.js";
+import { getWorkspaceSkillsDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { addToPathEnv, getWorkspaceSkillsDir } from "../util/platform.js";
+import { addToPathEnv } from "../util/os.js";
 import {
   isSkillCompatibleWithCloud,
   normalizeSkillPlatforms,

package/src/skills/clawhub.ts

@@ -1,8 +1,8 @@
 import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 
+import { getWorkspaceSkillsDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceSkillsDir } from "../util/platform.js";
 import {
   computeSkillHash,
   readInstallMeta,

package/src/skills/cloud-store.ts

@@ -17,9 +17,9 @@ import { stringify as stringifyYaml } from "yaml";
 import { parseFrontmatter } from "../config/skills.js";
 import { deleteSkillCapabilityNode } from "../plugins/defaults/memory/graph/capability-seed.js";
 import { isDeniedBasename } from "../tools/shared/filesystem/path-policy.js";
+import { getWorkspaceDir, getWorkspaceSkillsDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
 import { isPlainObject } from "../util/object.js";
-import { getWorkspaceDir, getWorkspaceSkillsDir } from "../util/platform.js";
 import { parseFrontmatterFields } from "./frontmatter.js";
 import { writeInstallMeta } from "./install-meta.js";
 

package/src/skills/path-classifier.ts

@@ -2,7 +2,7 @@ import { existsSync, realpathSync } from "node:fs";
 import { basename, dirname, normalize, resolve, sep } from "node:path";
 
 import { getBundledSkillsDir } from "../config/skills.js";
-import { getWorkspaceSkillsDir } from "../util/platform.js";
+import { getWorkspaceSkillsDir } from "../util/layout.js";
 
 /**
  * Returns the cloud skills root directory. Managed skills are user-installed

package/src/skills/skill-history.ts

@@ -40,8 +40,8 @@
 // requires to be side-effect-free, so observing history must never be the
 // thing that brings a repository into existence.
 
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 import { getWorkspaceGitService } from "../workspace/git-service.js";
 import { validateCloudSkillId } from "./cloud-store.js";
 

package/src/skills/skillssh-registry.ts

@@ -1,7 +1,7 @@
 import { existsSync, rmSync } from "node:fs";
 import { join } from "node:path";
 
-import { getWorkspaceSkillsDir } from "../util/platform.js";
+import { getWorkspaceSkillsDir } from "../util/layout.js";
 import {
   commitStagedSkillInstall,
   createSkillInstallStagingDir,

package/src/skills/uninstall.ts

@@ -2,7 +2,7 @@ import { existsSync, rmSync } from "node:fs";
 import { join } from "node:path";
 
 import { deleteSkillCapabilityNode } from "../plugins/defaults/memory/graph/capability-seed.js";
-import { getWorkspaceSkillsDir } from "../util/platform.js";
+import { getWorkspaceSkillsDir } from "../util/layout.js";
 
 /**
  * Remove a locally-installed skill: delete its workspace directory and prune

package/src/skills/workspace-skill-md-signature.ts

@@ -1,7 +1,7 @@
 import { existsSync, readdirSync, statSync } from "node:fs";
 import { join } from "node:path";
 
-import { getWorkspaceSkillsDir } from "../util/platform.js";
+import { getWorkspaceSkillsDir } from "../util/layout.js";
 
 /**
  * Cheap change detector for workspace skill capability cards: the sorted set

package/src/subagent/manager.ts

@@ -36,8 +36,8 @@ import { RateLimitProvider } from "../providers/ratelimit.js";
 import { listProviders } from "../providers/registry.js";
 import type { Message, TextContent } from "../providers/types.js";
 import { createAbortReason } from "../util/abort-reasons.js";
+import { getSandboxWorkingDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getSandboxWorkingDir } from "../util/platform.js";
 import { sleep } from "../util/retry.js";
 import { injectMessageIntoParent } from "./notify.js";
 import {

package/src/theme/workspace-theme.ts

@@ -30,7 +30,7 @@ import { join } from "node:path";
 
 import { z } from "zod";
 
-import { getWorkspaceDir } from "../util/platform.js";
+import { getWorkspaceDir } from "../util/layout.js";
 
 /** Workspace-relative path clients and the config watcher both key on. */
 export const WORKSPACE_THEME_RELATIVE_PATH = "ui/theme.json";

package/src/tools/browser/auth-cache.ts

@@ -1,8 +1,8 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 
+import { getDataDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getDataDir } from "../../util/platform.js";
 
 const log = getLogger("auth-cache");
 

package/src/tools/browser/browser-manager.ts

@@ -1,8 +1,8 @@
 import { existsSync, mkdirSync } from "node:fs";
 import { isAbsolute, join, relative, resolve } from "node:path";
 
+import { getDataDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getDataDir } from "../../util/platform.js";
 import { authSessionCache } from "./auth-cache.js";
 import type { CdpClientKind } from "./cdp-client/types.js";
 import type { ExtractedCredential } from "./network-recording-types.js";

package/src/tools/browser/runtime-check.ts

@@ -2,8 +2,8 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 
 import { ensureBun } from "../../util/bun-runtime.js";
+import { getExternalDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getExternalDir } from "../../util/platform.js";
 
 const log = getLogger("runtime-check");
 

package/src/tools/executor.ts

@@ -12,15 +12,15 @@ import {
   type RiskClassificationWithMeta,
 } from "../permissions/checker.js";
 import { PermissionPrompter } from "../permissions/prompter.js";
+import {
+  recordToolError,
+  recordToolExecuted,
+} from "../persistence/tool-audit.js";
 import {
   runInPluginContext,
   runOutsidePluginContext,
 } from "../plugins/plugin-execution-context.js";
 import { TokenExpiredError } from "../security/token-manager.js";
-import {
-  recordToolError,
-  recordToolExecuted,
-} from "../telemetry/tool-audit.js";
 import { PermissionDeniedError, ToolError } from "../util/errors.js";
 import { pathExists, safeStatSync } from "../util/fs.js";
 import { truncateForLog } from "../util/logger.js";

package/src/tools/filesystem/write.ts

@@ -5,8 +5,8 @@ import { z } from "zod";
 import { getAppsDir } from "../../apps/app-store.js";
 import { RiskLevel } from "../../permissions/types.js";
 import { enqueuePkbIndexJob } from "../../plugins/defaults/memory/v1/jobs/embed-pkb-file.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getWorkspaceDir } from "../../util/platform.js";
 import { throwIfCancelled } from "../shared/abort.js";
 import { FileSystemOps } from "../shared/filesystem/file-ops-service.js";
 import { formatWriteSummary } from "../shared/filesystem/format-diff.js";

package/src/tools/permission-checker.ts

@@ -23,14 +23,8 @@ import type {
   RiskThreshold,
 } from "../permissions/types.js";
 import { RiskLevel } from "../permissions/types.js";
+import { recordToolDenied } from "../persistence/tool-audit.js";
 import { resolveCapabilities } from "../runtime/capabilities.js";
-import {
-  type PermissionPromptOutcome,
-  type PermissionPromptTelemetry,
-  recordToolDenied,
-  recordToolPermissionDecided,
-  recordToolPermissionPrompted,
-} from "../telemetry/tool-audit.js";
 import { getLogger } from "../util/logger.js";
 import { resolveExecutionTarget } from "./execution-target.js";
 import { getHostShell } from "./host-shell.js";
@@ -389,26 +383,6 @@ export class PermissionChecker {
           persistentDecisionsAllowed: !context.requireFreshApproval,
         };
 
-        // Grouping dimensions shared by this prompt and its decision, so the
-        // two series can be diffed by risk and by access preset without
-        // parsing anything out of the event name.
-        const promptTelemetry: PermissionPromptTelemetry = {
-          toolName: name,
-          riskLevel,
-          riskThreshold,
-          surface: context.executionChannel,
-          conversationId: context.conversationId,
-        };
-        // An already-aborted signal makes the prompter return without
-        // registering or sending a confirmation request, so nothing reaches
-        // the user and neither half of the pair is recorded. `prompt()` reads
-        // the same signal synchronously on entry, with no await in between, so
-        // this check and its check always agree.
-        const promptIsSurfaced = context.signal?.aborted !== true;
-        if (promptIsSurfaced) {
-          recordToolPermissionPrompted(promptTelemetry);
-        }
-
         let response: Awaited<ReturnType<PermissionPrompter["prompt"]>>;
         try {
           response = await this.prompter.prompt(
@@ -430,35 +404,12 @@ export class PermissionChecker {
         } catch (err) {
           // The prompter rejected rather than resolved: it was disposed while
           // this prompt was outstanding (client disconnect, conversation
-          // teardown). Nobody answered, so the prompt is abandoned.
-          if (promptIsSurfaced) {
-            recordToolPermissionDecided(promptTelemetry, "abandoned");
-          }
+          // teardown).
           throw err;
         }
 
         const decision = response.decision;
 
-        // A prompt that ends without a human answer is abandoned, not denied.
-        // The daemon resolves a timeout, a superseding user message, and a
-        // turn abort to `deny` so the agent loop stops, but none of the three
-        // is a decision the user made.
-        let outcome: PermissionPromptOutcome;
-        if (
-          response.wasTimeout === true ||
-          response.wasSystemCancel === true ||
-          response.wasAbort === true
-        ) {
-          outcome = "abandoned";
-        } else if (decision === "deny") {
-          outcome = "deny";
-        } else {
-          outcome = "allow";
-        }
-        if (promptIsSurfaced) {
-          recordToolPermissionDecided(promptTelemetry, outcome);
-        }
-
         if (decision === "deny") {
           const contextualDenial =
             typeof response.decisionContext === "string"

package/src/tools/run-standalone.ts

@@ -18,7 +18,7 @@
 import { v4 as uuid } from "uuid";
 
 import { PermissionPrompter } from "../permissions/prompter.js";
-import { getWorkspaceDir } from "../util/platform.js";
+import { getWorkspaceDir } from "../util/layout.js";
 import { ToolExecutor } from "./executor.js";
 import { resolveTool } from "./registry.js";
 import type { ToolContext } from "./types.js";

package/src/tools/skills/format-input-schema.ts

@@ -1,4 +1,4 @@
-import { getWorkspaceDirDisplay } from "../../util/platform.js";
+import { getWorkspaceDirDisplay } from "../../util/layout.js";
 
 /** Preserve nested fields and alternatives when disclosing a skill's input. */
 export function formatSkillInputSchema(schema: object): string {

package/src/tools/skills/load.ts

@@ -27,8 +27,8 @@ import {
 import { renderInlineCommands } from "../../skills/inline-command-render.js";
 import { parseToolManifestFile } from "../../skills/tool-manifest.js";
 import { computeSkillVersionHash } from "../../skills/version-hash.js";
+import { getWorkspaceDirDisplay } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getWorkspaceDirDisplay } from "../../util/platform.js";
 import { supportsClientOsForSkillTool } from "../client-os.js";
 import type {
   ToolContext,

package/src/tools/skills/scaffold-cloud.ts

@@ -16,16 +16,12 @@ import {
   getCloudSkillDir,
 } from "../../skills/cloud-store.js";
 import { readInstallMeta } from "../../skills/install-meta.js";
-import { recordWatchdogEvent } from "../../telemetry/watchdog-events-store.js";
 import { getLogger } from "../../util/logger.js";
 import { throwIfCancelled } from "../shared/abort.js";
 import type { ToolContext, ToolExecutionResult } from "../types.js";
 
 const log = getLogger("scaffold-cloud-skill");
 
-/** Watchdog check_name for the per-creation skill-authoring counter. */
-const SKILL_AUTHORED_CHECK_NAME = "skill_authored";
-
 /** Strip embedded newlines/carriage returns to prevent YAML frontmatter injection. */
 function sanitizeFrontmatterValue(value: string): string {
   return value.replace(/[\r\n]+/g, " ").trim();
@@ -92,10 +88,6 @@ function normalizeOptionalStringArray(
   return { value: normalized };
 }
 
-/** Watchdog check_name counted when a receipt entry could not be recorded. */
-const SKILL_UPDATE_RECEIPT_RECORD_FAILED_CHECK_NAME =
-  "skill_update_receipt_record_failed";
-
 /**
  * Record that a background pass changed a skill the user already has.
  *
@@ -166,15 +158,6 @@ function recordBackgroundSkillUpdate(args: {
       },
       "skill update receipt recording failed; the skill write stands and no receipt will name this update",
     );
-    try {
-      recordWatchdogEvent({
-        checkName: SKILL_UPDATE_RECEIPT_RECORD_FAILED_CHECK_NAME,
-        value: 1,
-      });
-    } catch {
-      // recordWatchdogEvent already no-ops on opt-out and a missing
-      // telemetry DB; anything past that is not worth surfacing here.
-    }
   }
 }
 
@@ -499,21 +482,6 @@ export async function executeScaffoldCloudSkill(
   // customer or procedure), and watchdog events are metadata-only with no
   // deletion-redaction tie to the source conversation. Never throws: a
   // telemetry failure must not fail a scaffold that already succeeded.
-  if (!managedSkillExistedBefore) {
-    try {
-      recordWatchdogEvent({
-        checkName: SKILL_AUTHORED_CHECK_NAME,
-        value: 1,
-        detail: {
-          authored_by: fromRetrospective ? "retrospective" : "user",
-        },
-      });
-    } catch {
-      // recordWatchdogEvent already no-ops on opt-out and a missing
-      // telemetry DB; anything past that is not worth surfacing here.
-    }
-  }
-
   // A background pass changed a skill that already existed. Creates announce
   // themselves through the skill card below; updates land on the skill-update
   // receipt that announces the whole burst. Covers an explicit

package/src/tools/terminal/safe-env.ts

@@ -15,7 +15,7 @@ import {
 } from "@mycadet/environments/shell";
 
 import { getGatewayInternalBaseUrl } from "../../config/env.js";
-import { getDataDir, getWorkspaceDir } from "../../util/platform.js";
+import { getDataDir, getWorkspaceDir } from "../../util/layout.js";
 
 export const SAFE_ENV_VARS = [
   "PATH",
@@ -41,7 +41,6 @@ export const SAFE_ENV_VARS = [
   "CADET_SLOW_SYNC_THRESHOLD_MS",
   "CADET_SLOW_QUERY_THRESHOLD_MS",
   "CADET_DEVICE_ID",
-  "CADET_DISABLE_CLOUD",
   "CADET_ENVIRONMENT",
   "CADET_TEST_LOG_LEVEL",
 

package/src/tools/terminal/sanitized-bash.ts

@@ -15,7 +15,7 @@ import {
   terminateProcessTree,
   watchShellProcessStart,
 } from "../../util/host-process.js";
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import { SHELL_DID_NOT_START_MESSAGE } from "../shared/shell-output.js";
 import { buildSanitizedEnv } from "./safe-env.js";
 

package/src/tools/terminal/shell.ts

@@ -16,8 +16,8 @@ import {
   terminateProcessTree,
   watchShellProcessStart,
 } from "../../util/host-process.js";
+import { getDataDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getDataDir } from "../../util/platform.js";
 import type { CompletedBackgroundTool } from "../background-tool-registry.js";
 import {
   generateBackgroundToolId,

package/src/tools/tool-approval-handler.ts

@@ -26,6 +26,10 @@ import {
   isOutOfWorkspaceFileInvocation,
   isWorkspaceWriteTool,
 } from "../permissions/workspace-policy.js";
+import {
+  recordToolDenied,
+  recordToolError,
+} from "../persistence/tool-audit.js";
 import {
   boundUnparseableToolArgs,
   isUnparseableToolArgs,
@@ -38,7 +42,6 @@ import {
 import { createOrReuseToolGrantRequest } from "../runtime/tool-grant-request-helper.js";
 import { redactSecrets } from "../security/secret-scanner.js";
 import { computeToolApprovalDigest } from "../security/tool-approval-digest.js";
-import { recordToolDenied, recordToolError } from "../telemetry/tool-audit.js";
 import { getLogger } from "../util/logger.js";
 import { resolveExecutionTarget } from "./execution-target.js";
 import { safeTimeoutMs } from "./execution-timeout.js";

package/src/tools/workflows/manage-workflows.ts

@@ -16,7 +16,7 @@
 import { z } from "zod";
 
 import { getConversationProfilesForProvider } from "../../config/default-profile-catalog.js";
-import { loadConfig } from "../../config/loader.js";
+import { getConfig } from "../../config/loader.js";
 import { callerOwnsWorkflowRun } from "../../workflows/capabilities.js";
 import type { WorkflowRun } from "../../workflows/journal-store.js";
 import { getWorkflowRunManager } from "../../workflows/run-manager.js";
@@ -198,7 +198,7 @@ export async function executeManageWorkflows(
       // Mirror the `config/llm/profiles` route: sorted profile names plus the
       // workspace-wide active profile. Read-only — leaves use this to pick a
       // valid `profile` for `run_workflow` (an unknown profile throws).
-      const { llm } = loadConfig();
+      const { llm } = getConfig();
       // A workflow leaf runs chat turns, so this is the conversation view,
       // which leaves out the cloud Jev profile.
       const profiles = getConversationProfilesForProvider(llm);

package/src/tools/workflows/run-workflow.test.ts

@@ -61,7 +61,7 @@ function makeContext(): Parameters<typeof executeRunWorkflow>[1] {
 
 beforeEach(() => {
   // `manage_workflows list_profiles` reads the workspace active profile via
-  // loadConfig(); the effective profile names always include the code-catalog
+  // getConfig(); the effective profile names always include the code-catalog
   // defaults, so only the active-profile selection needs seeding.
   setConfig("llm", { activeProfile: "balanced" });
   startThrows = null;

package/src/tools/workspace-tools/loader.ts

@@ -80,8 +80,8 @@ import { existsSync, readdirSync, statSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { extname, join } from "node:path";
 
+import { getWorkspaceToolsDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getWorkspaceToolsDir } from "../../util/platform.js";
 import { isProviderSafeToolName } from "../provider-tool-name.js";
 import {
   getCoreToolOverride,

package/src/tts/synthesis-stream.ts

@@ -12,7 +12,7 @@ import {
   type CallAudioFormat,
   createStreamingEntry,
 } from "../calls/audio-store.js";
-import { loadConfig } from "../config/loader.js";
+import { getConfig } from "../config/loader.js";
 import { getPublicBaseUrl } from "../inbound/public-ingress-urls.js";
 import type {
   TtsProvider,
@@ -245,7 +245,7 @@ export function createAudioStoreSink(
 ): AudioStoreSink {
   const createEntry = options.createEntry ?? createStreamingEntry;
   const handle = createEntry(options.format);
-  const baseUrl = getPublicBaseUrl(loadConfig());
+  const baseUrl = getPublicBaseUrl(getConfig());
   const url = `${baseUrl}/v1/audio/${handle.audioId}`;
 
   let playUrlSent = false;

package/src/usage/attribution.ts

@@ -10,15 +10,11 @@ import { safeStringSlice } from "../util/unicode.js";
 
 const MAX_METADATA_VALUE_LENGTH = 128;
 
-/** `profileSource` reported for a turn whose profile the Auto router chose. */
-export const AUTO_PROFILE_SOURCE = "auto";
-
 export type UsageAttributionProfileSource =
   | "call_site"
   | "conversation"
   | "active"
   | "default"
-  | typeof AUTO_PROFILE_SOURCE
   | "unknown";
 
 export interface UsageAttributionInput {
@@ -237,13 +233,7 @@ function appliedProfileFromWinnerSelection(
     call_site: "call_site",
     default: "default",
   } as const;
-  // An override the Auto router chose is reported as its own source: the
-  // applied profile is the routed arm, so without this a routed turn would
-  // be indistinguishable from a user who pinned that arm.
-  const profileSource =
-    selection.source === "override" && input.overrideProfileOrigin === "auto"
-      ? AUTO_PROFILE_SOURCE
-      : sourceBySelection[selection.source];
+  const profileSource = sourceBySelection[selection.source];
   return {
     appliedProfile: selection.profileName,
     profileSource,

package/src/util/browser.ts

@@ -1,8 +1,8 @@
 import { mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 
+import { getSignalsDir } from "./layout.js";
 import { getLogger } from "./logger.js";
-import { getSignalsDir } from "./platform.js";
 
 const log = getLogger("browser");
 

package/src/util/bun-runtime.ts

@@ -21,8 +21,9 @@ import {
 import { arch, homedir, platform } from "node:os";
 import { basename, join } from "node:path";
 
+import { getBinDir } from "./layout.js";
 import { getLogger } from "./logger.js";
-import { getBinDir, isWindows } from "./platform.js";
+import { isWindows } from "./os.js";
 
 const log = getLogger("bun-runtime");
 

package/src/util/device-id.ts

@@ -22,8 +22,8 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 
 import { getDeviceIdOverride } from "../config/env-registry.js";
+import { getWorkspaceDir } from "./layout.js";
 import { getLogger } from "./logger.js";
-import { getWorkspaceDir } from "./platform.js";
 
 const log = getLogger("device-id");