@mycadet/assistant 0.12.9 → 0.12.11

package/src/mcp/__tests__/mcp-oauth-client-registration.test.ts

@@ -16,7 +16,7 @@ import { auth } from "@modelcontextprotocol/sdk/client/auth.js";
 import { useMemorySecureKeyMap } from "../../__tests__/helpers/secure-keys.js";
 
 const CALLBACK_URL =
-  "https://platform.example/v1/gateway/callbacks/abc/webhooks/oauth/callback/";
+  "https://test-cloud.mycadet.ai/v1/gateway/callbacks/abc/webhooks/oauth/callback/";
 const PUBLIC_BASE_URL = "https://tunnel.example/assistant-123";
 const DIRECT_CALLBACK_URL = `${PUBLIC_BASE_URL}/webhooks/oauth/callback`;
 const CLIENT_METADATA_URL = `${PUBLIC_BASE_URL}/oauth/client-metadata.json`;
@@ -35,7 +35,7 @@ mock.module("../../inbound/public-ingress-urls.js", () => ({
 }));
 
 mock.module("../../config/loader.js", () => ({
-  loadConfig: () => ({ ingress: { publicBaseUrl } }),
+  getConfig: () => ({ ingress: { publicBaseUrl } }),
 }));
 
 /** In-memory stand-in for the credential store. */

package/src/mcp/__tests__/mcp-oauth-provider.test.ts

@@ -6,18 +6,17 @@ import { describe, expect, mock, test } from "bun:test";
 
 mock.module("../../inbound/cloud-callback-registration.js", () => ({
   resolveCallbackUrl: async () =>
-    "https://platform.example/v1/gateway/callbacks/abc/webhooks/oauth/callback/",
+    "https://test-cloud.mycadet.ai/v1/gateway/callbacks/abc/webhooks/oauth/callback/",
 }));
 
 mock.module("../../inbound/public-ingress-urls.js", () => ({
   getOAuthCallbackUrl: () =>
-    "https://platform.example/v1/gateway/callbacks/abc/webhooks/oauth/callback/",
+    "https://test-cloud.mycadet.ai/v1/gateway/callbacks/abc/webhooks/oauth/callback/",
   getMcpOAuthClientMetadataUrl: () =>
     "http://localhost/oauth/client-metadata.json",
 }));
 
 mock.module("../../config/loader.js", () => ({
-  loadConfig: () => ({}),
   // `clientMetadata` reads the assistant's name, which pulls the persona
   // resolver into the provider's import graph, and that reads config.
   getConfig: () => ({}),

package/src/mcp/__tests__/reload-signal-emission.test.ts

@@ -40,7 +40,7 @@ mock.module("../../plugins/mcp-servers.js", () => ({
   readPluginMcpServers: () => ({ servers: [], issues: [] }),
 }));
 
-const { getSignalsDir } = await import("../../util/platform.js");
+const { getSignalsDir } = await import("../../util/layout.js");
 const { MCP_RELOAD_SIGNAL_FILE } = await import("../reload-signal.js");
 const { reloadMcpServers } = await import("../../daemon/mcp-reload-service.js");
 

package/src/mcp/__tests__/reload-signal.test.ts

@@ -12,7 +12,7 @@ import { existsSync, mkdirSync, readFileSync, rmSync } from "node:fs";
 import { join } from "node:path";
 import { beforeEach, describe, expect, test } from "bun:test";
 
-import { getSignalsDir } from "../../util/platform.js";
+import { getSignalsDir } from "../../util/layout.js";
 import { MCP_RELOAD_SIGNAL_FILE, signalMcpReloaded } from "../reload-signal.js";
 
 const signalPath = () => join(getSignalsDir(), MCP_RELOAD_SIGNAL_FILE);

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

@@ -5,7 +5,6 @@ import { beforeEach, describe, expect, test } from "bun:test";
 import { AGENT_PLUGINS_MCP_SCHEMA_URL } from "../spec-schema.js";
 import {
   loadWorkspaceMcpConfig,
-  overlayWorkspaceMcpForConfigRead,
   readWorkspaceMcpFile,
   saveWorkspaceMcpConfig,
 } from "../workspace-mcp-config.js";
@@ -109,31 +108,30 @@ describe("workspace mcp.json", () => {
     );
   });
 
-  test("overlay projects transport-only servers for config reads", () => {
-    saveWorkspaceMcpConfig({
-      servers: {
-        remote: {
-          transport: {
+  test("raw load passes hand-authored headers through — serving layers strip them", () => {
+    mkdirSync(process.env.CADET_WORKSPACE_DIR!, { recursive: true });
+    writeFileSync(
+      mcpPath(),
+      JSON.stringify({
+        $schema: AGENT_PLUGINS_MCP_SCHEMA_URL,
+        mcpServers: {
+          remote: {
             type: "streamable-http",
             url: "https://example.com/mcp",
+            headers: { authorization: "Bearer secret" },
           },
         },
-      },
-    });
+      }),
+    );
 
-    const config: Record<string, unknown> = {
-      llm: { activeProfile: "balanced" },
-    };
-    overlayWorkspaceMcpForConfigRead(config);
-    expect(config.mcp).toEqual({
-      servers: {
-        remote: {
-          transport: {
-            type: "streamable-http",
-            url: "https://example.com/mcp",
-          },
-        },
-      },
+    // The module API returns the file's content unfiltered: a hand-authored
+    // mcp.json may carry headers, so anything serving this raw — config
+    // responses, exports — would leak secrets. The MCP list handler is the
+    // serving layer and strips them.
+    expect(loadWorkspaceMcpConfig().servers.remote?.transport).toEqual({
+      type: "streamable-http",
+      url: "https://example.com/mcp",
+      headers: { authorization: "Bearer secret" },
     });
   });
 });

package/src/mcp/reload-signal.ts

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

package/src/mcp/workspace-mcp-config.ts

@@ -17,8 +17,8 @@ import { dirname } from "node:path";
 
 import type { McpConfig, McpServerConfig } from "../config/schemas/mcp.js";
 import { McpConfigSchema } from "../config/schemas/mcp.js";
+import { getWorkspaceMcpConfigPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceMcpConfigPath } from "../util/platform.js";
 import {
   AGENT_PLUGINS_MCP_SCHEMA_URL,
   projectSpecServerToTransport,
@@ -168,25 +168,3 @@ export function saveWorkspaceMcpConfig(config: McpConfig): void {
   writeFileSync(tmpPath, JSON.stringify(document, null, 2) + "\n");
   renameSync(tmpPath, path);
 }
-
-/**
- * Replace `config.mcp` on a settings/export payload with the projected
- * workspace servers (transport only, headers stripped). Old clients that
- * still read `mcp.servers` from `/v1/config` keep seeing the same shape.
- */
-export function overlayWorkspaceMcpForConfigRead(config: unknown): void {
-  if (config === null || typeof config !== "object" || Array.isArray(config)) {
-    return;
-  }
-  const root = config as Record<string, unknown>;
-  const { servers } = loadWorkspaceMcpConfig();
-  const projected: Record<string, unknown> = {};
-  for (const [id, server] of Object.entries(servers)) {
-    const { headers: _headers, ...safeTransport } = server.transport as Record<
-      string,
-      unknown
-    >;
-    projected[id] = { transport: safeTransport };
-  }
-  root.mcp = { servers: projected };
-}

package/src/messaging/draft-store.ts

@@ -10,7 +10,7 @@ import { readdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 
 import { ensureDir, pathExists } from "../util/fs.js";
-import { getWorkspaceDir } from "../util/platform.js";
+import { getWorkspaceDir } from "../util/layout.js";
 
 export interface Draft {
   id: string;

package/src/monitoring/__tests__/active-conversations.test.ts

@@ -10,7 +10,7 @@ import { dirname } from "node:path";
 import { Database } from "bun:sqlite";
 import { beforeEach, describe, expect, test } from "bun:test";
 
-import { getDbPath } from "../../util/platform.js";
+import { getDbPath } from "../../util/layout.js";
 import { readActiveConversations } from "../active-conversations.js";
 
 function openWriter(): Database {

package/src/monitoring/__tests__/page-cache.test.ts

@@ -2,7 +2,7 @@ import { mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { describe, expect, test } from "bun:test";
 
-import { getDataDir, getDbPath } from "../../util/platform.js";
+import { getDataDir, getDbPath } from "../../util/layout.js";
 import { getTrackedDataFiles, parseFincoreJson } from "../page-cache.js";
 
 describe("parseFincoreJson", () => {

package/src/monitoring/__tests__/stall-capture.test.ts

@@ -9,7 +9,7 @@ import { mkdirSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { beforeEach, describe, expect, test } from "bun:test";
 
-import { getMonitoringDataDir } from "../../util/platform.js";
+import { getMonitoringDataDir } from "../../util/layout.js";
 import { getDaemonHeartbeatPath } from "../daemon-heartbeat.js";
 import type { ResourceSample } from "../resource-sample-types.js";
 import {

package/src/monitoring/__tests__/workspace-git-heartbeat.test.ts

@@ -9,7 +9,7 @@ import { readFileSync } from "node:fs";
 import { join } from "node:path";
 import { afterEach, describe, expect, test } from "bun:test";
 
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import {
   _resetGitServiceRegistry,
   getAllWorkspaceGitServices,

package/src/monitoring/active-conversations.ts

@@ -15,7 +15,7 @@
 
 import { Database } from "bun:sqlite";
 
-import { getDbPath } from "../util/platform.js";
+import { getDbPath } from "../util/layout.js";
 
 /** Cap on entries recorded per sample so a pathological burst stays bounded. */
 const MAX_ENTRIES = 20;

package/src/monitoring/control.ts

@@ -8,9 +8,9 @@
  * binds them to the monitor's PID path and entry point.
  */
 
+import { getMonitoringPidPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
 import { MONITOR_OOM_SCORE_ADJ } from "../util/oom-priority.js";
-import { getMonitoringPidPath } from "../util/platform.js";
 import {
   probeWorkerPidFile,
   spawnWorkerProcess,

package/src/monitoring/daemon-boot-time.ts

@@ -15,7 +15,7 @@
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 
-import { getMonitoringDataDir } from "../util/platform.js";
+import { getMonitoringDataDir } from "../util/layout.js";
 
 const BOOT_TIME_FILE = "daemon-boot-time";
 

package/src/monitoring/daemon-heartbeat.ts

@@ -21,7 +21,7 @@ import {
 } from "node:fs";
 import { dirname, join } from "node:path";
 
-import { getMonitoringDataDir } from "../util/platform.js";
+import { getMonitoringDataDir } from "../util/layout.js";
 
 const HEARTBEAT_FILE = "daemon-heartbeat";
 

package/src/monitoring/page-cache.ts

@@ -14,7 +14,7 @@ import { existsSync, readdirSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { promisify } from "node:util";
 
-import { getDataDir, getDbPath } from "../util/platform.js";
+import { getDataDir, getDbPath } from "../util/layout.js";
 
 const execFileAsync = promisify(execFile);
 

package/src/monitoring/plugin-auto-update.ts

@@ -55,8 +55,8 @@ import { getConfigReadOnly } from "../config/loader.js";
 import type { PluginUpdatesConfig } from "../config/schemas/plugin-updates.js";
 import { cliIpcCall } from "../ipc/cli-client.js";
 import { isPluginDisabled } from "../plugins/disabled-state.js";
+import { getMonitoringDataDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getMonitoringDataDir } from "../util/platform.js";
 
 const log = getLogger("plugin-auto-update");
 
@@ -155,12 +155,6 @@ function tracksCuratedSource(inspection: PluginInspection): boolean {
   if (!remote) {
     return false;
   }
-  if (source.kind === "local") {
-    return remote.kind === "local" && source.path === remote.path;
-  }
-  if (remote.kind === "local") {
-    return false;
-  }
   return (
     `${source.owner}/${source.repo}`.toLowerCase() ===
       remote.repo.toLowerCase() && (source.path ?? "") === remote.path

package/src/monitoring/plugin-source-watch.ts

@@ -42,8 +42,8 @@ import {
   readSourceVersions,
   SOURCE_VERSIONS_FORMAT,
 } from "../plugins/source-versions.js";
+import { getMonitoringDataDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getMonitoringDataDir } from "../util/platform.js";
 
 const log = getLogger("plugin-source-watch");
 

package/src/monitoring/recovery/db.ts

@@ -10,8 +10,8 @@
 import { existsSync } from "node:fs";
 import { Database } from "bun:sqlite";
 
+import { getDbPath } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getDbPath } from "../../util/platform.js";
 import { readDaemonBootTime } from "../daemon-boot-time.js";
 
 const log = getLogger("recovery-db");

package/src/monitoring/recovery/inflight-content.ts

@@ -43,8 +43,8 @@ import {
   resolveContentRefPath,
   resolveMessageContentBlocks,
 } from "../../persistence/message-content-file.js";
+import { getConversationsDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getConversationsDir } from "../../util/platform.js";
 import { openRecoveryDb } from "./db.js";
 
 const log = getLogger("recovery-inflight-content");

package/src/monitoring/resource-sampler.ts

@@ -32,8 +32,8 @@ import {
 } from "../util/cgroup-memory.js";
 import { diffCounters } from "../util/counter-diff.js";
 import { getDiskUsageInfo } from "../util/disk-usage.js";
+import { getMonitoringDataDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getMonitoringDataDir } from "../util/platform.js";
 import {
   listProcessTableAsync,
   type ProcessTableRow,
@@ -47,7 +47,6 @@ import { readActiveConversations } from "./active-conversations.js";
 import { readDaemonHeartbeat } from "./daemon-heartbeat.js";
 import { topProcessesByFd } from "./file-descriptors.js";
 import { sweepInheritedOomProtection } from "./oom-inheritance-sweep.js";
-import { createOomKillReporter } from "./oom-kill-reporter.js";
 import { getTrackedDataFiles, readFileResidency } from "./page-cache.js";
 import { topProcessesByMemory } from "./process-memory.js";
 import {
@@ -139,8 +138,7 @@ export async function takeSample(
         }
       : null,
     activeConversations: readActiveConversations(),
-    // Timestamped at the scan, not the tick start: the disk read above can
-    // take seconds, and the CPU rate needs the counters' real interval.
+    // Timestamped at the process scan so CPU rates use the real interval.
     processes:
       processUsage?.sample(Date.now(), readDaemonHeartbeat(now)?.pid ?? null) ??
       null,
@@ -268,12 +266,9 @@ export function startResourceSampler(
   // thread's kernel state mid-stall when the heartbeat goes stale.
   const stallCapture = createStallCaptureMonitor(dataDir);
   const processUsage = createProcessUsageTracker();
-  const oomKills = createOomKillReporter();
   let lastOomSweepAt = 0;
 
-  // Skip ticks while a sample is in flight: the disk measurement can take
-  // seconds (du over the workspace), and overlapping ticks would all delta
-  // against the same stale prevSample and land in one burst.
+  // Skip overlapping samples so deltas always use the previous completed sample.
   let sampleInFlight = false;
   const tick = async () => {
     if (sampleInFlight) {
@@ -308,12 +303,6 @@ export function startResourceSampler(
       log.warn({ err }, "Daemon stall check failed");
     }
 
-    try {
-      await oomKills.check(sample, now, readDaemonHeartbeat(now)?.pid ?? null);
-    } catch (err) {
-      log.warn({ err }, "OOM kill report failed");
-    }
-
     if (now - lastOomSweepAt >= OOM_SWEEP_INTERVAL_MS) {
       lastOomSweepAt = now;
       const daemonPid = readDaemonHeartbeat(now)?.pid;

package/src/monitoring/stall-capture.ts

@@ -19,8 +19,8 @@ import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { readdir, readFile } from "node:fs/promises";
 import { join } from "node:path";
 
+import { getMonitoringDataDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getMonitoringDataDir } from "../util/platform.js";
 import { readDaemonHeartbeat } from "./daemon-heartbeat.js";
 import { readStallWaitState, type StallWaitState } from "./proc-wait-state.js";
 import { prunePrefixedJsonFiles } from "./prune-snapshots.js";

package/src/monitoring/worker.ts

@@ -2,49 +2,27 @@
  * Standalone entry point for the resource monitor as its own OS process.
  *
  * Spawned at every daemon startup (and on demand by `assistant monitoring
- * start`). Loads config, starts the sampling loop and the non-turn telemetry
- * reporter, writes a PID file, and stays alive until SIGTERM/SIGINT.
+ * start`). Loads config, starts the sampling loop, writes a PID file, and
+ * stays alive until SIGTERM/SIGINT.
  *
  * Running as a separate process — off the assistant's main event loop — is the
- * whole point: the sampler keeps recording during a main-thread freeze, its
- * on-disk ring buffer survives the OOM SIGKILL that resets all in-VM state,
- * and telemetry keeps flushing while the daemon is busy or stalled.
- * Periodic workspace git auto-commits also run here so large `git add` /
- * `git commit` work cannot stall the daemon event loop.
+ * whole point: the sampler keeps recording during a main-thread freeze, and
+ * its on-disk ring buffer survives the OOM SIGKILL that resets all in-VM
+ * state. Periodic workspace git auto-commits also run here so large `git add`
+ * / `git commit` work cannot stall the daemon event loop.
  */
 
 import { mkdirSync, writeFileSync } from "node:fs";
 
-import { startConsentRefresh } from "../cloud/consent-cache.js";
-import { rehydrateCloudCredentials } from "../config/cloud-rehydration.js";
 import { getConfig } from "../config/loader.js";
 import { resetDb } from "../persistence/db-connection.js";
 import { disableStreamSeqStamping } from "../runtime/assistant-stream-state.js";
-import {
-  startConfigSnapshotReporter,
-  stopConfigSnapshotReporter,
-} from "../telemetry/config-setting-snapshot.js";
-import {
-  startMemoryTierReporter,
-  stopMemoryTierReporter,
-} from "../telemetry/memory-tier-reporter.js";
-import {
-  startMonitorUsageTelemetryReporter,
-  stopUsageTelemetryReporter,
-} from "../telemetry/usage-telemetry-reporter.js";
+import { getMonitoringDataDir, getMonitoringPidPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import {
-  getMonitoringDataDir,
-  getMonitoringPidPath,
-} from "../util/platform.js";
 import {
   cleanupWorkerPidFile,
   startWorkerPidFileGuard,
 } from "../util/worker-process.js";
-import {
-  startDbIntegritySampler,
-  stopDbIntegritySampler,
-} from "./db-integrity-sample.js";
 import {
   type FileDescriptorMonitorHandle,
   startFileDescriptorMonitor,
@@ -91,13 +69,6 @@ async function main(): Promise<void> {
     "Resource monitor process started",
   );
 
-  // Rehydrate the cloud base URL and IDs from the credential store before
-  // the telemetry reporter starts. The daemon does this in
-  // initializeProvidersAndTools(); this standalone process must do it itself so
-  // the non-turn telemetry it flushes carries the cloud organization and
-  // user context instead of shipping with those fields empty.
-  await rehydrateCloudCredentials();
-
   let sampler: ResourceSamplerHandle | null = null;
   let fdMonitor: FileDescriptorMonitorHandle | null = null;
   let mountWatch: MountWatchHandle | null = null;
@@ -122,28 +93,10 @@ async function main(): Promise<void> {
     }
     workspaceGitHeartbeat = null;
     recovery?.stop();
-    stopConfigSnapshotReporter();
-    stopMemoryTierReporter();
-    stopDbIntegritySampler();
     autoUpdate?.stop();
     sourceWatch?.stop();
     mountWatch?.stop();
     fdMonitor?.stop();
-    sampler?.stop();
-    // Bounded final telemetry flush, mirroring the daemon's shutdown. This
-    // is load-bearing for the opt-out contract: when share_analytics is
-    // off, flush() is what advances this process's watermarks past rows
-    // recorded during the opt-out window — without it, rows since the last
-    // 5-minute cycle would ship after a later opt-in. When opted in, it
-    // ships the tail instead of leaving it for the next boot.
-    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)");
-    }
     disposePidGuard?.();
     cleanupWorkerPidFile(pidPath);
     process.exit(0);
@@ -154,8 +107,8 @@ async function main(): Promise<void> {
 
   // Arm the identity guard before the monitoring subsystems start. Its on-arm
   // check runs synchronously, so a worker superseded during startup begins
-  // shutting down here. shutdown() is async (it flushes telemetry), so bail
-  // out explicitly rather than fall through and start the subsystems.
+  // shutting down here. shutdown() is async, so bail out explicitly rather
+  // than fall through and start the subsystems.
   disposePidGuard = startWorkerPidFileGuard(pidPath, {
     onEvicted: (reason) => {
       log.warn(
@@ -190,23 +143,6 @@ async function main(): Promise<void> {
   // `git commit` work stalls the event loop.
   workspaceGitHeartbeat = startWorkspaceGitHeartbeat();
 
-  // Flush the non-turn telemetry sources from this process, off the daemon's
-  // event loop. The reporter's share_analytics gate reads the consent cache,
-  // so this process runs its own refresh loop.
-  startConsentRefresh();
-  startMonitorUsageTelemetryReporter();
-
-  // Emit the tracked config settings into the config_setting pipeline this
-  // process flushes.
-  startConfigSnapshotReporter();
-
-  // Emit the coarse memory tier as a periodic per-assistant watchdog heartbeat.
-  startMemoryTierReporter();
-
-  // Sample the database's structural integrity (at most daily) so the fleet's
-  // corruption prevalence is measurable.
-  startDbIntegritySampler();
-
   process.on("SIGUSR1", () => {
     log.info("Received SIGUSR1 — refreshing database connections");
     resetDb();
@@ -220,7 +156,6 @@ async function main(): Promise<void> {
     mountWatch?.stop();
     fdMonitor?.stop();
     sampler?.stop();
-    stopDbIntegritySampler();
     cleanupWorkerPidFile(getMonitoringPidPath());
     process.exit(1);
   });
@@ -233,7 +168,6 @@ async function main(): Promise<void> {
     mountWatch?.stop();
     fdMonitor?.stop();
     sampler?.stop();
-    stopDbIntegritySampler();
     cleanupWorkerPidFile(getMonitoringPidPath());
     process.exit(1);
   });
@@ -245,7 +179,6 @@ async function main(): Promise<void> {
     mountWatch?.stop();
     fdMonitor?.stop();
     sampler?.stop();
-    stopDbIntegritySampler();
     cleanupWorkerPidFile(getMonitoringPidPath());
   });
 }

package/src/monitoring/workspace-git-heartbeat.ts

@@ -15,8 +15,8 @@
  * against the daemon's turn-boundary commits.
  */
 
+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 {
   startWorkspaceHeartbeatService,

package/src/oauth/connect-orchestrator.ts

@@ -19,7 +19,7 @@
  * - Running identity verifiers
  */
 
-import { loadConfig } from "../config/loader.js";
+import { getConfig } from "../config/loader.js";
 import { emitPostConnectNudge } from "../home/post-connect-feed.js";
 import { invalidateAssistantSuggestedPromptsCache } from "../home/suggested-prompts-cache.js";
 import type { TokenEndpointAuthMethod } from "../security/oauth2.js";
@@ -138,7 +138,7 @@ export async function orchestrateOAuthConnect(
   // them rather than relying on each entry point to check. The error matches
   // the not-found case above so a gated provider is indistinguishable from an
   // absent one, mirroring the provider routes.
-  if (!isProviderVisible(providerRow, loadConfig())) {
+  if (!isProviderVisible(providerRow, getConfig())) {
     return {
       success: false,
       error: `No OAuth provider registered for "${options.service}". Ensure the provider is seeded in the database.`,
@@ -227,11 +227,11 @@ export async function orchestrateOAuthConnect(
     try {
       // Gateway transport needs a public ingress URL
       if (callbackTransport !== "loopback") {
-        const { loadConfig } = await import("../config/loader.js");
+        const { getConfig } = await import("../config/loader.js");
         const { getPublicBaseUrl } =
           await import("../inbound/public-ingress-urls.js");
         try {
-          getPublicBaseUrl(loadConfig());
+          getPublicBaseUrl(getConfig());
         } catch {
           return {
             success: false,

package/src/permissions/checker.ts

@@ -29,7 +29,7 @@ import {
   getWorkspaceRoutesDir,
   getWorkspaceToolsDir,
   getWorkspaceWorkflowsDir,
-} from "../util/platform.js";
+} from "../util/layout.js";
 import {
   type ApprovalContext,
   DefaultApprovalPolicy,

package/src/permissions/workspace-policy.ts

@@ -12,7 +12,7 @@ import {
   getWorkspaceSystemPromptDir,
   getWorkspaceToolsDir,
   getWorkspaceWorkflowsDir,
-} from "../util/platform.js";
+} from "../util/layout.js";
 
 /**
  * Resolve a path to its canonical form. A trailing (possibly dangling)