@mycadet/assistant 0.12.9 → 0.12.10

package/src/__tests__/visible-app-context.test.ts

@@ -24,7 +24,7 @@ import {
 } from "../daemon/conversation-runtime-assembly.js";
 import { registerDefaultPluginInjectors } from "../plugins/defaults/index.js";
 import type { Message } from "../providers/types.js";
-import { getWorkspacePluginsDir } from "../util/platform.js";
+import { getWorkspacePluginsDir } from "../util/layout.js";
 import { asConversation } from "./helpers/mock-conversation.js";
 
 // The injector chain is registered by the daemon bootstrap in production; do

package/src/__tests__/voice-ingress-preflight.test.ts

@@ -8,7 +8,7 @@ let mockCredentialReadiness: Record<string, unknown>;
 let credentialReadinessCalls = 0;
 
 // Spread the real env-registry so the config loader's transitive
-// `util/platform` imports still resolve; only getIsCloud is driven per test.
+// `util/layout` imports still resolve; only getIsCloud is driven per test.
 mock.module("../config/env-registry.js", () => ({
   ...realEnvRegistry,
   getIsCloud: () => mockGetIsPlatform(),

package/src/__tests__/workspace-git-service.test.ts

@@ -14,7 +14,7 @@ import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 
-import { getWorkspaceConfigPath } from "../util/platform.js";
+import { getWorkspaceConfigPath } from "../util/layout.js";
 import {
   _getConsecutiveFailures,
   _getInitConsecutiveFailures,

package/src/__tests__/workspace-greetings.test.ts

@@ -9,7 +9,7 @@ import {
   parseGreetingsSection,
   readWorkspaceGreetings,
 } from "../runtime/routes/workspace-greetings.js";
-import { getWorkspacePromptPath } from "../util/platform.js";
+import { getWorkspacePromptPath } from "../util/layout.js";
 
 // Real SOUL.md in the preload's per-process workspace; dropped after each
 // test so absence assertions are honest.

package/src/acp/__tests__/helpers/acp-config-stub.ts

@@ -6,7 +6,7 @@
  * mutable `mockAcpConfig` + `mock.module(..., () => ({ getConfig: ... }))`
  * boilerplate; this helper consolidates it. The real loader's other named
  * exports are spread into the mock so tests whose code path transitively
- * imports `loadConfig`, `invalidateConfigCache`, etc. don't fail at parse
+ * imports `getConfig`, `invalidateConfigCache`, etc. don't fail at parse
  * time on "Export named 'X' not found".
  *
  * Like `which-stub.ts`, this is a process-global hook by design — Bun's

package/src/activation/progress-store.ts

@@ -75,8 +75,8 @@ import {
   ServiceUnavailableError,
 } from "../runtime/routes/errors.js";
 import { publishActivationProgressChanged } from "../runtime/sync/resource-sync-events.js";
+import { getDataDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getDataDir } from "../util/platform.js";
 
 const log = getLogger("activation-progress-store");
 

package/src/activation/turn-hooks.ts

@@ -12,8 +12,8 @@ import { basename, isAbsolute, relative, resolve, sep } from "node:path";
 
 import type { ActivationArtifact } from "../api/responses/activation.js";
 import type { AttachmentSourceType } from "../daemon/assistant-attachments.js";
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 import {
   bumpActivationStepCount,
   markActivationTurnComplete,

package/src/agent/loop.ts

@@ -62,7 +62,6 @@ import {
   boundUnparseableToolArgs,
   isUnparseableToolArgs,
 } from "../providers/unparseable-tool-args.js";
-import { recordWatchdogEvent } from "../telemetry/watchdog-events-store.js";
 import {
   ABORT_SETTLE_GRACE_MS,
   CANCELLED_TOOL_RESULT,
@@ -92,8 +91,6 @@ import { buildToolResultFollowUp } from "./tool-result-follow-up.js";
 
 const log = getLogger("agent-loop");
 
-/** Watchdog check name for both tool-gated reply outcomes. */
-const SEND_USER_MESSAGE_CHECK = "send_user_message_delivery";
 const MAX_CONSECUTIVE_UNPARSEABLE_TOOL_TURNS = 3;
 const SKILL_EXECUTE_TOOL_NAME = "skill_execute";
 
@@ -121,26 +118,6 @@ function deliveredUserMessage(block: {
     : null;
 }
 
-/**
- * Count one outcome of the tool-gated reply surface: the model was nudged for
- * a `send_user_message` call, or the run ended without one and the raw text
- * was surfaced as the fallback. Tagged with the model that served the call.
- * Best-effort observability, never a reason to fail a turn.
- */
-function recordSendUserMessageOutcome(
-  outcome: "nudge" | "fallback",
-  model: string | undefined,
-): void {
-  try {
-    recordWatchdogEvent({
-      checkName: SEND_USER_MESSAGE_CHECK,
-      detail: { outcome, model: model ?? null },
-    });
-  } catch {
-    // Telemetry must not affect the turn.
-  }
-}
-
 /**
  * Whether a response reported the OUTCOME of the work before it: it called
  * tools, and every one of them delivered a message to the user.
@@ -762,12 +739,6 @@ interface AgentLoopRunOptionsBase {
    * call-site named profile. Missing profile names silently fall through.
    */
   overrideProfile?: string;
-  /**
-   * Who chose `overrideProfile`: `"auto"` when the Auto profile's router
-   * picked it for this turn. Threaded onto each send's config so usage
-   * attribution reports the routed profile under the `auto` source.
-   */
-  overrideProfileOrigin?: "auto";
   /**
    * Float the override profile above the call-site layers (named site
    * profile + call-site override) for non-main-agent call sites — the
@@ -1510,7 +1481,6 @@ export class AgentLoop {
       supportsDynamicUi = true,
       trust,
       overrideProfile,
-      overrideProfileOrigin,
       forceOverrideProfile = false,
       resolveOverrideProfile,
       onModelCallPrepared,
@@ -2099,12 +2069,6 @@ export class AgentLoop {
           // in mid-turn (a confirmed profile session) is the user's pick, so
           // the origin applies only while the effective override is still
           // the one the turn started with.
-          if (
-            overrideProfileOrigin &&
-            effectiveOverrideProfile === overrideProfile
-          ) {
-            providerConfig.overrideProfileOrigin = overrideProfileOrigin;
-          }
           if (forceOverrideProfile) {
             providerConfig.forceOverrideProfile = true;
           }
@@ -2305,13 +2269,7 @@ export class AgentLoop {
           // resolver layers `llm.profiles[overrideProfile]` at the top of
           // precedence for the user-facing call, so a model router can pick
           // the profile per message; clearing it drops any seeded override.
-          // The hook context is seeded with the effective override, so an
-          // unchanged profile is still the router's pick and keeps its
-          // origin; a profile the hook changed or cleared is the hook's.
           const hookModelProfile = finalPreModelCtx.modelProfile?.trim();
-          if (hookModelProfile !== effectiveOverrideProfile) {
-            delete providerConfig.overrideProfileOrigin;
-          }
           if (hookModelProfile) {
             providerConfig.overrideProfile = hookModelProfile;
             if (forceOverrideProfile) {
@@ -2577,9 +2535,6 @@ export class AgentLoop {
           if (!suppressAssistantText) {
             return undefined;
           }
-          if (fallbackSurfaced) {
-            recordSendUserMessageOutcome("fallback", response.model);
-          }
           return fallbackSurfaced ? "visible" : "private";
         };
 
@@ -2854,12 +2809,6 @@ export class AgentLoop {
               { turn: toolUseTurns, retry: postModelCallContinues },
               "post-model-call requested a retry — re-querying the model",
             );
-            // On a suppressed run with nothing sent, this retry IS the
-            // send-user-message nudge (the default `empty-response` plugin
-            // owns the decision, the counter is the host's).
-            if (suppressAssistantText && !userToldOutcome) {
-              recordSendUserMessageOutcome("nudge", response.model);
-            }
             history = postModelCallMessages;
             continue;
           } else {

package/src/apps/app-store.ts

@@ -41,8 +41,8 @@ import { rawAll } from "../persistence/raw-query.js";
 import { isPluginDisabled } from "../plugins/disabled-state.js";
 import type { EditEngineResult } from "../tools/shared/filesystem/edit-engine.js";
 import { applyEdit } from "../tools/shared/filesystem/edit-engine.js";
+import { getDataDir, getWorkspacePluginsDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getDataDir, getWorkspacePluginsDir } from "../util/platform.js";
 import { hasPluginManifest } from "../util/plugin-manifest.js";
 
 const log = getLogger("app-store");

package/src/avatar/__tests__/avatar-store.test.ts

@@ -48,20 +48,6 @@ mock.module("../../runtime/sync/resource-sync-events.js", () => ({
   },
 }));
 
-/** Every telemetry event the store records, in order. */
-const recorded: Array<{ name: string; fields: Record<string, unknown> }> = [];
-/** When set, the outbox throws it instead of recording (an unmigrated DB). */
-let recordFailure: Error | null = null;
-mock.module("../../telemetry/telemetry-events-outbox.js", () => ({
-  recordTelemetryEvent: (name: string, fields: Record<string, unknown>) => {
-    if (recordFailure) {
-      throw recordFailure;
-    }
-    recorded.push({ name, fields });
-    return { id: "evt", createdAt: 0 };
-  },
-}));
-
 import { backfillAccent } from "../accent-backfill.js";
 import {
   clearAvatar,
@@ -111,8 +97,6 @@ describe("avatar-store", () => {
     // into it before the store's own mkdir runs.
     mkdirSync(avatarDir, { recursive: true });
     publishedOrigins.length = 0;
-    recorded.length = 0;
-    recordFailure = null;
   });
 
   afterEach(() => {
@@ -485,13 +469,12 @@ describe("avatar-store", () => {
       expect(avatarNote()).toBe("A custom image the user uploaded.");
     });
 
-    test("a refused accent publishes and records nothing", async () => {
+    test("a refused accent publishes nothing", async () => {
       expect(await setAccent("#12ab34")).toBeNull();
       expect(publishedOrigins).toEqual([]);
-      expect(recorded).toEqual([]);
     });
 
-    test("backfillAccent is a read-time repair: it publishes and records nothing", async () => {
+    test("backfillAccent is a read-time repair: it publishes nothing", async () => {
       writeFileSync(path(IMAGE_FILENAME), RED_PNG);
       const state = imageState("quiet-red");
       writeFileSync(path(MANIFEST_FILENAME), JSON.stringify(state));
@@ -499,159 +482,6 @@ describe("avatar-store", () => {
       await backfillAccent(state);
 
       expect(publishedOrigins).toEqual([]);
-      expect(recorded).toEqual([]);
-    });
-  });
-
-  describe("avatar_changed telemetry", () => {
-    const RED_ACCENT = { accent_hex: "#c81e1e", accent_source: "derived" };
-    const events = () => recorded.map((entry) => entry.fields);
-
-    test("an identical re-upload above the raster serving cap is not a change", async () => {
-      const big = Buffer.alloc(5 * 1024 * 1024 + 1, 7);
-
-      await setImage(big, "upload");
-      await setImage(big, "upload");
-
-      expect(events()).toHaveLength(1);
-      expect(events()[0]).toMatchObject({ previous_kind: "none" });
-    });
-
-    test("a failed record never fails the change: the manifest and fan-out stand", async () => {
-      recordFailure = new Error("no such table: telemetry_events");
-
-      await setImage(RED_PNG, "upload", { originClientId: "web-1" });
-
-      expect(readManifestFile()?.kind).toBe("image");
-      expect(publishedOrigins).toEqual(["web-1"]);
-      expect(recorded).toEqual([]);
-    });
-
-    test("an upload over an empty workspace records one image event carrying the client OS", async () => {
-      await setImage(RED_PNG, "upload", { clientOs: "macos" });
-
-      expect(recorded.map((entry) => entry.name)).toEqual(["avatar_changed"]);
-      expect(events()).toEqual([
-        {
-          action: "upload_image",
-          kind: "image",
-          previous_kind: "none",
-          ...RED_ACCENT,
-          client_os: "macos",
-        },
-      ]);
-    });
-
-    test("an AI image records generate_image, with no client_os key when none was given", async () => {
-      await setImage(RED_PNG, "ai");
-
-      expect(events()).toEqual([
-        {
-          action: "generate_image",
-          kind: "image",
-          previous_kind: "none",
-          ...RED_ACCENT,
-        },
-      ]);
-    });
-
-    test("the same bytes uploaded twice count once; different bytes count again", async () => {
-      await setImage(RED_PNG, "upload");
-      await setImage(RED_PNG, "upload");
-      expect(events()).toHaveLength(1);
-
-      await setImage(Buffer.from("v2"), "upload");
-      expect(events()).toHaveLength(2);
-      expect(events()[1]).toMatchObject({
-        action: "upload_image",
-        kind: "image",
-        previous_kind: "image",
-      });
-    });
-
-    test("the same bytes from a different source count again", async () => {
-      await setImage(RED_PNG, "upload");
-      await setImage(RED_PNG, "ai");
-
-      expect(events().map((fields) => fields.action)).toEqual([
-        "upload_image",
-        "generate_image",
-      ]);
-    });
-
-    test(
-      "a character records its traits and palette accent once, and an identical re-set not at all",
-      () => {
-        const result = setCharacter(VALID_TRAITS);
-        if (!result.ok) {
-          expect(result.reason).toBe("native_unavailable");
-          expect(recorded).toEqual([]);
-          return;
-        }
-
-        expect(events()).toEqual([
-          {
-            action: "set_character",
-            kind: "character",
-            previous_kind: "none",
-            body_shape: "blob",
-            eye_style: "curious",
-            color: "green",
-            accent_hex: "#4c9b50",
-            accent_source: "palette",
-          },
-        ]);
-
-        expect(setCharacter(VALID_TRAITS).ok).toBe(true);
-        expect(events()).toHaveLength(1);
-      },
-      NATIVE_RENDER_TEST_TIMEOUT_MS,
-    );
-
-    test("an accent counts only when it lands somewhere new", async () => {
-      await setImage(RED_PNG, "upload");
-      recorded.length = 0;
-
-      await setAccent("#123456");
-      expect(events()).toEqual([
-        {
-          action: "set_accent",
-          kind: "image",
-          previous_kind: "image",
-          accent_hex: "#123456",
-          accent_source: "custom",
-        },
-      ]);
-
-      await setAccent("#123456");
-      expect(events()).toHaveLength(1);
-
-      await setAccent(null);
-      expect(events()).toHaveLength(2);
-      expect(events()[1]).toEqual({
-        action: "set_accent",
-        kind: "image",
-        previous_kind: "image",
-        ...RED_ACCENT,
-      });
-
-      await setAccent(null);
-      expect(events()).toHaveLength(2);
-    });
-
-    test("clearing an image records a bare clear; clearing nothing publishes but records nothing", async () => {
-      await setImage(RED_PNG, "upload");
-      recorded.length = 0;
-
-      clearAvatar();
-      expect(events()).toEqual([
-        { action: "clear", kind: "none", previous_kind: "image" },
-      ]);
-
-      const publishedBefore = publishedOrigins.length;
-      clearAvatar();
-      expect(events()).toHaveLength(1);
-      expect(publishedOrigins.length).toBe(publishedBefore + 1);
     });
   });
 });

package/src/avatar/accent-backfill.ts

@@ -8,8 +8,8 @@
  */
 import type { AvatarAccent } from "@mycadet/avatar-manifest";
 
+import { getAvatarImagePath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getAvatarImagePath } from "../util/platform.js";
 import {
   deriveAccentHexFromImage,
   derivedAccent,

package/src/avatar/avatar-manifest.ts

@@ -31,8 +31,8 @@ import {
   parseAvatarManifest,
 } from "@mycadet/avatar-manifest";
 
+import { getAvatarDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getAvatarDir } from "../util/platform.js";
 import { paletteAccent } from "./avatar-accent.js";
 
 const log = getLogger("avatar-manifest");

package/src/avatar/avatar-store.ts

@@ -32,9 +32,8 @@ import {
 } from "@mycadet/avatar-manifest";
 
 import { publishAvatarChanged } from "../runtime/sync/resource-sync-events.js";
-import { recordTelemetryEvent } from "../telemetry/telemetry-events-outbox.js";
+import { getAvatarDir, getAvatarImagePath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getAvatarDir, getAvatarImagePath } from "../util/platform.js";
 import { automaticAccent } from "./accent-backfill.js";
 import {
   deriveAccentHexFromImage,
@@ -42,20 +41,15 @@ import {
   paletteAccent,
 } from "./avatar-accent.js";
 import {
-  type AvatarChangeAction,
-  avatarChangedFields,
-  IMAGE_ACTIONS,
-  type ImageSource,
-  isSameAvatar,
-} from "./avatar-changed-telemetry.js";
-import {
+  type AvatarSource,
   type AvatarState,
   computeImageMeta,
-  NONE_AVATAR_STATE,
   readAvatarState,
   writeManifest,
 } from "./avatar-manifest.js";
-import { readContainedAvatarRaster } from "./ensure-raster.js";
+
+/** The sources an image can be set from (everything but the builder render). */
+type ImageSource = Exclude<AvatarSource, "builder">;
 import {
   describeAvatarState,
   NO_AVATAR_IDENTITY_NOTE,
@@ -73,11 +67,6 @@ const log = getLogger("avatar-store");
 export interface AvatarChangeOptions {
   /** The client that made the change, so it can ignore its own sync echo. */
   originClientId?: string;
-  /**
-   * The caller's OS as reported by the client-metadata header, already
-   * sanitized; carried on the telemetry event.
-   */
-  clientOs?: string;
 }
 
 export interface ImageChangeOptions extends AvatarChangeOptions {
@@ -85,21 +74,11 @@ export interface ImageChangeOptions extends AvatarChangeOptions {
   imageDescription?: string;
 }
 
-interface AvatarTransition {
-  action: AvatarChangeAction;
-  previous: AvatarState;
-  next: AvatarState;
-  /** Set by the image write: the PNG bytes differ from the previous image's. */
-  imageBytesChanged?: boolean;
-}
-
 /**
- * The side effects every persisted change owes. An identical re-set notifies
- * and is not counted. Telemetry is best effort: the avatar is
- * already written and announced, so a failed record is logged, not thrown.
+ * The side effects every persisted change owes: refresh the identity note and
+ * notify connected clients so they re-read the avatar.
  */
 function announceChange(
-  transition: AvatarTransition,
   identityNote: string | null,
   options?: AvatarChangeOptions,
 ): void {
@@ -107,18 +86,6 @@ function announceChange(
     updateIdentityAvatarSection(identityNote);
   }
   publishAvatarChanged(options?.originClientId);
-  const { action, previous, next, imageBytesChanged } = transition;
-  if (isSameAvatar(previous, next, imageBytesChanged)) {
-    return;
-  }
-  try {
-    recordTelemetryEvent(
-      "avatar_changed",
-      avatarChangedFields(action, previous, next, options?.clientOs),
-    );
-  } catch (err) {
-    log.warn({ err, action }, "Failed to record the avatar_changed event");
-  }
 }
 
 /**
@@ -136,7 +103,6 @@ export function setCharacter(
   traits: CharacterTraits,
   options?: AvatarChangeOptions,
 ): TraitsSyncResult {
-  const previous = readAvatarState();
   const result = writeTraitsAndRenderAvatar(traits);
   if (!result.ok) {
     return result;
@@ -150,11 +116,7 @@ export function setCharacter(
     accent: paletteAccent(traits.color),
   };
   writeManifest(state);
-  announceChange(
-    { action: "set_character", previous, next: state },
-    describeAvatarState(state),
-    options,
-  );
+  announceChange(describeAvatarState(state), options);
   return result;
 }
 
@@ -175,13 +137,6 @@ export async function setImage(
   mkdirSync(avatarDir, { recursive: true });
 
   const pngPath = join(avatarDir, AVATAR_IMAGE_FILENAME);
-  const previous = readAvatarState();
-  // Capped at the upload's own size: a larger file cannot be identical, and
-  // the serving cap must not turn a big re-upload into a counted change.
-  const previousBytes =
-    previous.kind === "image"
-      ? readContainedAvatarRaster(pngPath, pngBuffer.length)
-      : null;
   const pngTmp = `${pngPath}.${randomUUID()}.tmp`;
   writeFileSync(pngTmp, pngBuffer);
   renameSync(pngTmp, pngPath);
@@ -203,12 +158,6 @@ export async function setImage(
     "Set avatar from image and removed character sidecars",
   );
   announceChange(
-    {
-      action: IMAGE_ACTIONS[source],
-      previous,
-      next: state,
-      imageBytesChanged: !previousBytes?.equals(pngBuffer),
-    },
     describeAvatarState(state, options?.imageDescription),
     options,
   );
@@ -234,11 +183,7 @@ export async function setAccent(
     accent: hex ? { hex, source: "custom" } : await automaticAccent(state),
   };
   writeManifest(next);
-  announceChange(
-    { action: "set_accent", previous: state, next },
-    null,
-    options,
-  );
+  announceChange(null, options);
   return next;
 }
 
@@ -264,10 +209,6 @@ export function clearAvatar(options?: AvatarChangeOptions): AvatarState {
   rmSync(join(avatarDir, AVATAR_MANIFEST_FILENAME), { force: true });
 
   log.info("Cleared avatar — removed all artifacts");
-  announceChange(
-    { action: "clear", previous, next: NONE_AVATAR_STATE },
-    NO_AVATAR_IDENTITY_NOTE,
-    options,
-  );
+  announceChange(NO_AVATAR_IDENTITY_NOTE, options);
   return previous;
 }

package/src/avatar/ensure-raster.ts

@@ -10,8 +10,8 @@ import {
 } from "node:fs";
 import { basename, dirname, isAbsolute, join, relative } from "node:path";
 
+import { getAvatarImagePath, getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getAvatarImagePath, getWorkspaceDir } from "../util/platform.js";
 import { type AvatarState, readAvatarState } from "./avatar-manifest.js";
 import { writeTraitsAndRenderAvatar } from "./traits-png-sync.js";
 

package/src/avatar/identity-avatar.ts

@@ -3,8 +3,8 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import type { AvatarState } from "@mycadet/avatar-manifest";
 
 import { isTemplateContent } from "../prompts/template-detection.js";
+import { getWorkspacePromptPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspacePromptPath } from "../util/platform.js";
 import { safeStringSlice } from "../util/unicode.js";
 
 const log = getLogger("identity-avatar");

package/src/avatar/sync-avatar.ts

@@ -62,8 +62,8 @@ import {
   type SyncedKey,
 } from "../cloud/cloud-patch-queue.js";
 import { detectMediaType } from "../tools/shared/filesystem/image-read.js";
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 import { backfillAccent } from "./accent-backfill.js";
 import { readAvatarState } from "./avatar-manifest.js";
 import {

package/src/avatar/traits-png-sync.ts

@@ -9,8 +9,8 @@ import {
   type CharacterTraits,
 } from "@mycadet/avatar-manifest";
 
+import { getAvatarDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getAvatarDir } from "../util/platform.js";
 import { renderCharacterAscii } from "./ascii-renderer.js";
 import { renderCharacterPng } from "./png-renderer.js";
 import { isResvgAvailable } from "./resvg-lazy.js";

package/src/bundler/compiler-tools.ts

@@ -18,8 +18,8 @@ import {
 import { arch, platform } from "node:os";
 import { basename, join } from "node:path";
 
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 import { PromiseGuard } from "../util/promise-guard.js";
 
 const log = getLogger("compiler-tools");

package/src/bundler/package-resolver.ts

@@ -10,8 +10,8 @@ import { mkdir } from "node:fs/promises";
 import { join } from "node:path";
 
 import { ensureBun } from "../util/bun-runtime.js";
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 
 const log = getLogger("package-resolver");