@mycadet/assistant 0.12.9 → 0.12.10

package/src/runtime/routes/oauth-providers.ts

@@ -9,7 +9,7 @@
 import { INTEGRATION_CATEGORIES } from "@mycadet/service-contracts/integration-categories";
 import { z } from "zod";
 
-import { loadConfig } from "../../config/loader.js";
+import { getConfig } from "../../config/loader.js";
 import { getOAuthCallbackUrl } from "../../inbound/public-ingress-urls.js";
 import {
   deleteApp,
@@ -66,7 +66,7 @@ function serializeProviderFull(row: ReturnType<typeof getProvider>) {
 
 function handleListProviders({ queryParams = {} }: RouteHandlerArgs) {
   const rows = listProviders();
-  const config = loadConfig();
+  const config = getConfig();
   const visibleRows = rows.filter((r) => isProviderVisible(r, config));
   let serialized = visibleRows
     .map((row) => serializeProviderSummary(row))
@@ -91,7 +91,7 @@ function handleGetProvider({ pathParams = {} }: RouteHandlerArgs) {
     );
   }
 
-  const config = loadConfig();
+  const config = getConfig();
   if (!isProviderVisible(row, config)) {
     throw new NotFoundError(
       `No OAuth provider registered for "${providerKey}"`,
@@ -203,7 +203,7 @@ function handleUpdateProvider({
     );
   }
 
-  if (!isProviderVisible(existing, loadConfig())) {
+  if (!isProviderVisible(existing, getConfig())) {
     throw new NotFoundError(
       `No OAuth provider registered for "${providerKey}"`,
     );
@@ -341,7 +341,7 @@ async function handleDeleteProvider({
     );
   }
 
-  if (!isProviderVisible(existing, loadConfig())) {
+  if (!isProviderVisible(existing, getConfig())) {
     throw new NotFoundError(
       `No OAuth provider registered for "${providerKey}"`,
     );

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

@@ -54,7 +54,6 @@ import {
 } from "../../cli/lib/plugin-catalog-cache.js";
 import { resolvePluginSourceFromCatalog } from "../../cli/lib/plugin-catalog-resolve.js";
 import {
-  DEFAULT_PIN_HISTORY_LIMIT,
   DEFAULT_PLUGIN_REF,
   type PluginUpgradeStrategy,
 } from "../../cli/lib/plugin-constants.js";
@@ -63,11 +62,6 @@ import {
   PluginDetailsNotFoundError,
 } from "../../cli/lib/plugin-details.js";
 import { readValidatedPluginIcon } from "../../cli/lib/plugin-icon-file.js";
-import {
-  listPinHistory,
-  PluginPinHistoryError,
-  resolvePinToMarketplaceCommit,
-} from "../../cli/lib/plugin-pin-history.js";
 import {
   assertValidSearchPattern,
   filterPluginCatalog,
@@ -101,8 +95,8 @@ import {
   reconcilePluginSourcesNow,
 } from "../../plugins/mtime-cache.js";
 import { getLocalCategorySlugs } from "../../skills/categories-cache.js";
+import { getWorkspacePluginsDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getWorkspacePluginsDir } from "../../util/platform.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import {
   getOriginClientId,
@@ -383,7 +377,7 @@ const pluginInstallRequestSchema = z.object({
     .string()
     .optional()
     .describe(
-      "Install a specific reviewed marketplace pin (full commit SHA) instead of the current one. The pin is validated against the plugin's marketplace pin history (`GET /v1/plugins/:name/versions`) and installed from the marketplace revision that introduced it; an unreviewed SHA is rejected. Use this to roll a plugin back to an older reviewed version.",
+      "Install a specific reviewed pin (full commit SHA). The pin must be the revision the catalog currently holds for the plugin; an unreviewed or older SHA is rejected.",
     ),
 });
 
@@ -399,32 +393,6 @@ const pluginInstallResponseSchema = z.object({
   ref: z.string().describe("Git ref the plugin was fetched from."),
 });
 
-const pluginPinHistoryEntrySchema = z.object({
-  pin: z
-    .string()
-    .describe("Plugin commit SHA pinned at this point in marketplace history."),
-  marketplaceCommit: z
-    .string()
-    .describe(
-      "Marketplace-manifest commit to install this pin from (the newest commit carrying it).",
-    ),
-  promotedAt: z
-    .string()
-    .nullable()
-    .describe(
-      "ISO-8601 committer date (UTC) of the marketplace commit that promoted this pin; null when unreadable.",
-    ),
-  current: z
-    .boolean()
-    .describe("True for the pin currently active on the default branch."),
-});
-
-const pluginVersionsResponseSchema = z
-  .array(pluginPinHistoryEntrySchema)
-  .describe(
-    "Distinct marketplace pins a plugin has been promoted to, newest first; the first entry is the current pin. Empty when the plugin has no resolvable history.",
-  );
-
 const fingerprintComparisonSchema = z
   .object({
     modified: z
@@ -1227,32 +1195,6 @@ async function handleGetPluginDetails({
 // Handler — install
 // ---------------------------------------------------------------------------
 
-/**
- * Resolve the marketplace ref an install should read from. With no `pin`, that
- * is the default reviewed branch. With a `pin`, it is the marketplace commit
- * that introduced that pin — but only when the pin appears in the plugin's
- * reviewed history; an unreviewed SHA is rejected as a bad request so the route
- * never installs an unvetted revision.
- */
-async function resolveInstallMarketplaceRef(
-  name: string,
-  pin: string | undefined,
-): Promise<string> {
-  if (!pin) {
-    return DEFAULT_PLUGIN_REF;
-  }
-  const entry = await resolvePinToMarketplaceCommit(name, pin, {
-    fetch: globalThis.fetch.bind(globalThis),
-  });
-  if (!entry) {
-    throw new BadRequestError(
-      `"${pin}" is not a reviewed marketplace pin for "${name}". ` +
-        `Use GET /v1/plugins/${name}/versions to list installable pins.`,
-    );
-  }
-  return entry.marketplaceCommit;
-}
-
 async function handleInstallPlugin({ body = {}, headers }: RouteHandlerArgs) {
   const rawName = typeof body.name === "string" ? body.name : "";
   if (!rawName) {
@@ -1264,15 +1206,14 @@ async function handleInstallPlugin({ body = {}, headers }: RouteHandlerArgs) {
   // The install source is never taken raw from the request: a caller-supplied
   // ref would let any `settings.write` principal install from an unreviewed
   // revision (a PR branch, fork ref, ...) whose manifest could carry attacker
-  // code the loader then dynamically imports. The default (no-pin) install
-  // resolves owner/repo/ref from the gated catalog — platform-first, or the
-  // bundled manifest when platform features are disabled — which is the same
-  // reviewed source of truth `handleSearchPlugins` advertises, and installs via
-  // a trusted pre-resolved source (no direct `plugins/marketplace.json` fetch).
-  // A `pin` is honored by mapping it — server-side — to the marketplace commit
-  // that introduced it through the plugin's reviewed pin history; an unreviewed
-  // SHA is refused. Operators who need an unreviewed revision use the local
-  // CLI's `assistant plugins install --pin <sha> --allow-unreviewed`.
+  // code the loader then dynamically imports. Every install resolves
+  // owner/repo/ref from the gated catalog — the same reviewed source of truth
+  // `handleSearchPlugins` advertises — and installs via a trusted
+  // pre-resolved source. A `pin` is accepted only when it is the revision the
+  // catalog currently holds; older reviewed pins cannot be resolved without
+  // the retired local marketplace manifest, so they are refused. Operators who
+  // need an unreviewed revision use the local
+  // CLI's `assistant plugins install <owner/repo> --pin <sha> --allow-unreviewed`.
   //
   // No `confirmStaged` consent gate: the daemon route is unattended by design
   // (there is no interactive surface to prompt on). Declared schedules the
@@ -1286,9 +1227,29 @@ async function handleInstallPlugin({ body = {}, headers }: RouteHandlerArgs) {
     const name = sanitizePluginName(rawName);
     let result;
     if (pin) {
-      const marketplaceRef = await resolveInstallMarketplaceRef(name, pin);
+      // Without the old local marketplace manifest there is no pin history to
+      // resolve against: the only reviewed revision is the one the live
+      // catalog currently pins, so a mismatched SHA is refused outright.
+      const source = await resolvePluginSourceFromCatalog(name, {
+        fetch: globalThis.fetch.bind(globalThis),
+      });
+      if (!source || source.kind !== "github" || source.ref !== pin) {
+        throw new BadRequestError(
+          `"${pin}" is not the pin the catalog currently holds for "${name}". ` +
+            "Rolling back to older reviewed pins is no longer supported.",
+        );
+      }
       result = await installPlugin(
-        { name, ref: marketplaceRef, force },
+        {
+          name,
+          force,
+          trustedSource: {
+            owner: source.owner,
+            repo: source.repo,
+            rootPath: source.path,
+            ref: source.ref,
+          },
+        },
         { fetch: globalThis.fetch.bind(globalThis) },
       );
     } else {
@@ -1302,15 +1263,12 @@ async function handleInstallPlugin({ body = {}, headers }: RouteHandlerArgs) {
         {
           name,
           force,
-          trustedSource:
-            source.kind === "local"
-              ? source
-              : {
-                  owner: source.owner,
-                  repo: source.repo,
-                  rootPath: source.path,
-                  ref: source.ref,
-                },
+          trustedSource: {
+            owner: source.owner,
+            repo: source.repo,
+            rootPath: source.path,
+            ref: source.ref,
+          },
         },
         { fetch: globalThis.fetch.bind(globalThis) },
       );
@@ -1349,10 +1307,6 @@ async function handleInstallPlugin({ body = {}, headers }: RouteHandlerArgs) {
     if (err instanceof PluginSourceUnavailableError) {
       throw new ServiceUnavailableError(err.message);
     }
-    // The pin-history read hits GitHub too; treat its failures as retryable.
-    if (err instanceof PluginPinHistoryError) {
-      throw new ServiceUnavailableError(err.message);
-    }
     // A rate-limited or unavailable platform catalog (no stale fallback) is
     // transient — surface it as retryable rather than a misleading 500.
     if (err instanceof PluginCatalogUnavailableError) {
@@ -1393,45 +1347,6 @@ async function handleInspectPlugin({ pathParams = {} }: RouteHandlerArgs) {
   }
 }
 
-// ---------------------------------------------------------------------------
-// Handler — versions (marketplace pin history)
-// ---------------------------------------------------------------------------
-
-async function handlePluginVersions({
-  pathParams = {},
-  queryParams = {},
-}: RouteHandlerArgs) {
-  const rawName = pathParams.name ?? "";
-
-  let limit: number | undefined;
-  if (queryParams.limit !== undefined) {
-    const parsed = Number.parseInt(queryParams.limit, 10);
-    if (!Number.isInteger(parsed) || parsed < 1) {
-      throw new BadRequestError("`limit` must be a positive integer.");
-    }
-    limit = parsed;
-  }
-
-  try {
-    return await listPinHistory(
-      rawName,
-      { fetch: globalThis.fetch.bind(globalThis) },
-      limit !== undefined ? { limit } : {},
-    );
-  } catch (err) {
-    if (err instanceof InvalidPluginNameError) {
-      throw new BadRequestError(err.message);
-    }
-    // The history read hits GitHub; its failures are retryable upstream errors.
-    if (err instanceof PluginPinHistoryError) {
-      throw new ServiceUnavailableError(err.message);
-    }
-    throw new InternalError(
-      err instanceof Error ? err.message : "plugin versions failed",
-    );
-  }
-}
-
 // ---------------------------------------------------------------------------
 // Handler — diff
 // ---------------------------------------------------------------------------
@@ -2004,46 +1919,6 @@ export const ROUTES: RouteDefinition[] = [
     },
     handler: handleInspectPlugin,
   },
-  {
-    operationId: "plugins_versions",
-    endpoint: "plugins/:name/versions",
-    method: "GET",
-    policy: {
-      requiredScopes: ["settings.read"],
-      allowedPrincipalTypes: ACTOR_PRINCIPALS,
-    },
-    summary: "List a plugin's reviewed marketplace pins",
-    description: `Report the distinct marketplace pins a plugin has been promoted to over time, newest first (the first entry is the current pin), capped at \`limit\` (default ${DEFAULT_PIN_HISTORY_LIMIT}). The curated \`marketplace.json\` stores only the current pin, so this is reconstructed from the manifest's own commit history on the default branch — every entry is therefore a reviewed, known-good revision. Pair with \`POST /v1/plugins/install\`'s \`pin\` field to roll a plugin back to an older reviewed version. An unknown name (never in the manifest) returns an empty array, not 404.`,
-    tags: ["plugins"],
-    pathParams: [
-      {
-        name: "name",
-        type: "string",
-        description:
-          "Install name. Must match the kebab-case name accepted by `assistant plugins install`.",
-      },
-    ],
-    queryParams: [
-      {
-        name: "limit",
-        type: "string",
-        required: false,
-        description: `Maximum number of pins to return (positive integer; default ${DEFAULT_PIN_HISTORY_LIMIT}).`,
-      },
-    ],
-    responseBody: pluginVersionsResponseSchema,
-    additionalResponses: {
-      "400": {
-        description:
-          "The plugin name failed sanitization, or `limit` was not a positive integer.",
-      },
-      "503": {
-        description:
-          "The marketplace pin history could not be read from GitHub (rate-limited or upstream error); retryable.",
-      },
-    },
-    handler: handlePluginVersions,
-  },
   {
     operationId: "plugins_diff",
     endpoint: "plugins/:name/diff",

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

@@ -35,8 +35,8 @@ import {
   rescanRuns,
   runProfilerSweep,
 } from "../../daemon/profiler-run-store.js";
+import { getProfilerRunDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getProfilerRunDir } from "../../util/platform.js";
 import { GATEWAY_PRINCIPALS } from "../auth/route-policy.js";
 import { createTarGz, MAX_ARCHIVE_BYTES } from "./archive-utils.js";
 import {

package/src/runtime/routes/route-host-worker-routes.ts

@@ -22,8 +22,8 @@ import {
   stopRouteHostWorkerProcess,
 } from "../../routes/control.js";
 import { ROUTE_HOST_PROC_NAME } from "../../routes/route-host-protocol.js";
+import { getProcPidPath } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getProcPidPath } from "../../util/platform.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { InternalError } from "./errors.js";
 import type { RouteDefinition } from "./types.js";

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

@@ -15,7 +15,7 @@ import { z } from "zod";
 
 import { credentialKey } from "../../security/credential-key.js";
 import { getSecureKeyAsync } from "../../security/secure-keys.js";
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { BadRequestError } from "./errors.js";
 import type { RouteDefinition, RouteHandlerArgs } from "./types.js";

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

@@ -54,8 +54,8 @@ import { getScheduleUsageSummaries } from "../../schedule/schedule-usage-store.j
 import { buildWakeScheduleOptions } from "../../schedule/wake-schedule-options.js";
 import { initializeTools } from "../../tools/registry.js";
 import { UserError } from "../../util/errors.js";
+import { getWorkspacePluginsDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getWorkspacePluginsDir } from "../../util/platform.js";
 import { normalizeCapabilityManifest } from "../../workflows/capabilities.js";
 import { getWorkflowRunManager } from "../../workflows/run-manager.js";
 import { isOwnerCaller } from "../auth/owner-caller.js";

package/src/runtime/routes/schedule-worker-routes.ts

@@ -18,8 +18,8 @@ import {
   spawnScheduleWorkerProcess,
   stopScheduleWorkerProcess,
 } from "../../schedule/worker-control.js";
+import { getScheduleWorkerPidPath } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getScheduleWorkerPidPath } from "../../util/platform.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { InternalError } from "./errors.js";
 import type { RouteDefinition } from "./types.js";

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

@@ -69,8 +69,8 @@ import {
   injectActivityField,
 } from "../../tools/schema-transforms.js";
 import { pathExists } from "../../util/fs.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import { getLogger } from "../../util/logger.js";
-import { getWorkspaceDir } from "../../util/platform.js";
 import { broadcastMessage } from "../assistant-event-hub.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { BadRequestError, InternalError, NotFoundError } from "./errors.js";

package/src/runtime/routes/sounds-config-routes.ts

@@ -18,7 +18,7 @@ import { join } from "node:path";
 
 import { z } from "zod";
 
-import { getSoundsDir } from "../../util/platform.js";
+import { getSoundsDir } from "../../util/layout.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { publishSoundsConfigUpdated } from "../sync/resource-sync-events.js";
 import { BadRequestError } from "./errors.js";

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

@@ -22,13 +22,11 @@ import {
 } from "../../daemon/conversation-registry.js";
 import { getOrCreateConversation } from "../../daemon/conversation-store.js";
 import {
-  parseActivationMomentTag,
   parseStoredActions,
   type StoredSurfaceAction,
 } from "../../daemon/conversation-surface-state.js";
 import { isRowVisibleToUntrustedActor } from "../../daemon/message-provenance.js";
 import { rawAll, rawGet } from "../../persistence/raw-query.js";
-import type { ActivationMomentParam } from "../../telemetry/activation-funnel.js";
 
 /**
  * Resolve the {@link Conversation} that owns the given surface.
@@ -97,7 +95,6 @@ export interface PersistedSurfaceState {
   data: Record<string, unknown>;
   title?: string;
   actions?: StoredSurfaceAction[];
-  activationMoment?: ActivationMomentParam;
 }
 
 /**
@@ -193,16 +190,13 @@ export function findPersistedSurfaceState(
       }
       // Serve verbatim: preserve the persisted `surfaceType` string and
       // `data` object as-is (the client parses them), applying only the same
-      // light shared parsing for `actions` and the daemon-only
-      // `activationMoment` tag that the live restore uses.
-      const activationMoment = parseActivationMomentTag(b.activationMoment);
+      // light shared parsing for `actions` that the live restore uses.
       return {
         surfaceType:
           typeof b.surfaceType === "string" ? b.surfaceType : "dynamic_page",
         data: coerceSurfaceDataRecord(b.data),
         title: typeof b.title === "string" ? b.title : undefined,
         actions: parseStoredActions(b.actions),
-        ...(activationMoment ? { activationMoment } : {}),
       };
     }
   }

package/src/runtime/routes/user-route-dispatcher.ts

@@ -339,9 +339,7 @@ export class UserRouteDispatcher {
   ): Promise<Response> {
     try {
       return await Promise.race([
-        Promise.resolve(
-          handler(request, buildDeprecatedRouteContext(routePath)),
-        ),
+        Promise.resolve(handler(request, buildDeprecatedRouteContext())),
         new Promise<never>((_, reject) =>
           setTimeout(
             () => reject(new Error("Handler timed out")),

package/src/runtime/routes/user-route-import.ts

@@ -19,7 +19,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 
 import { snapshotPluginSource } from "../../plugins/source-fingerprint.js";
 import { evictModule } from "../../plugins/surface-import.js";
-import { getWorkspaceRoutesDir } from "../../util/platform.js";
+import { getWorkspaceRoutesDir } from "../../util/layout.js";
 
 /**
  * Directory whose source files must stay mutually consistent with this

package/src/runtime/routes/user-route-resolution.ts

@@ -35,7 +35,7 @@ import { isPluginDisabled } from "../../plugins/disabled-state.js";
 import {
   getWorkspacePluginsDir,
   getWorkspaceRoutesDir,
-} from "../../util/platform.js";
+} from "../../util/layout.js";
 
 /** Supported file extensions for handler modules (`.js` preferred over `.ts`). */
 export const HANDLER_EXTENSIONS = [".ts", ".js"] as const;

package/src/runtime/routes/user-routes-cli.ts

@@ -13,7 +13,7 @@ import { z } from "zod";
 
 import { getConfig } from "../../config/loader.js";
 import { getPublicBaseUrl } from "../../inbound/public-ingress-urls.js";
-import { getWorkspaceDir, getWorkspaceRoutesDir } from "../../util/platform.js";
+import { getWorkspaceDir, getWorkspaceRoutesDir } from "../../util/layout.js";
 import { LOCAL_PRINCIPALS } from "../auth/route-policy.js";
 import { NotFoundError } from "./errors.js";
 import { parseBody } from "./parse-body.js";

package/src/runtime/routes/workspace-commit-routes.ts

@@ -5,7 +5,7 @@
 
 import { z } from "zod";
 
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import { getWorkspaceGitService } from "../../workspace/git-service.js";
 import { GATEWAY_PRINCIPALS } from "../auth/route-policy.js";
 import { BadRequestError } from "./errors.js";

package/src/runtime/routes/workspace-greetings.ts

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync } from "node:fs";
 
-import { getWorkspacePromptPath } from "../../util/platform.js";
+import { getWorkspacePromptPath } from "../../util/layout.js";
 
 function readWorkspaceFile(name: string): string {
   try {

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

@@ -19,7 +19,7 @@ import { basename, dirname, join } from "node:path";
 
 import { z } from "zod";
 
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import { ACTOR_PRINCIPALS } from "../auth/route-policy.js";
 import { publishSoundsConfigUpdated } from "../sync/resource-sync-events.js";
 import {

package/src/runtime/routes/workspace-utils.ts

@@ -10,7 +10,7 @@ import { dirname, resolve, sep } from "node:path";
 
 import { z } from "zod";
 
-import { getWorkspaceDir } from "../../util/platform.js";
+import { getWorkspaceDir } from "../../util/layout.js";
 import { BadRequestError, ConflictError } from "./errors.js";
 
 /**

package/src/runtime/sync/resource-sync-events.ts

@@ -6,7 +6,7 @@ import {
   SYNC_TAGS,
 } from "../../daemon/message-types/sync.js";
 import { resolveConversationTitle } from "../../i18n/index.js";
-import { getAvatarImagePath } from "../../util/platform.js";
+import { getAvatarImagePath } from "../../util/layout.js";
 import { broadcastMessage } from "../assistant-event-hub.js";
 import { isStreamSeqStampingDisabled } from "../assistant-stream-state.js";
 import { publishSyncInvalidation } from "./sync-publisher.js";

package/src/schedule/__tests__/plugin-schedule-declarations.test.ts

@@ -17,7 +17,7 @@ import {
   test,
 } from "bun:test";
 
-import { getWorkspacePluginsDir } from "../../util/platform.js";
+import { getWorkspacePluginsDir } from "../../util/layout.js";
 import {
   declarationExistsOnDisk,
   parsePluginScheduleDeclarations,

package/src/schedule/__tests__/plugin-schedule-reconciler.test.ts

@@ -68,7 +68,7 @@ import { setOverridesForTesting } from "../../__tests__/feature-flag-test-helper
 import { getDb } from "../../persistence/db-connection.js";
 import { initializeDb } from "../../persistence/db-init.js";
 import { listInstalledPluginDirs } from "../../plugins/installed-plugin-dirs.js";
-import { getWorkspacePluginsDir } from "../../util/platform.js";
+import { getWorkspacePluginsDir } from "../../util/layout.js";
 import {
   reconcilePluginSchedules,
   resetDefinitionErrorEmitGuardForTests,

package/src/schedule/plugin-schedule-availability.ts

@@ -29,7 +29,7 @@
 import { join } from "node:path";
 
 import { isPluginDirActivated } from "../plugins/mtime-cache.js";
-import { getWorkspacePluginsDir } from "../util/platform.js";
+import { getWorkspacePluginsDir } from "../util/layout.js";
 import { declarationExistsOnDisk } from "./plugin-schedule-declarations.js";
 
 /**

package/src/schedule/plugin-schedule-declarations.ts

@@ -31,7 +31,7 @@ import { isPluginDisabled } from "../plugins/disabled-state.js";
 import { parsePluginManifest } from "../plugins/external-plugin-loader.js";
 import { isInsidePluginRoot } from "../plugins/installed-plugin-dirs.js";
 import { FRONTMATTER_REGEX } from "../skills/frontmatter.js";
-import { getWorkspacePluginsDir } from "../util/platform.js";
+import { getWorkspacePluginsDir } from "../util/layout.js";
 import {
   computeNextRunAt,
   isSingleFireRRule,

package/src/schedule/run-script.ts

@@ -4,8 +4,8 @@ import {
   buildShellSpawnFlags,
   terminateProcessTree,
 } from "../util/host-process.js";
+import { getWorkspaceDir } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getWorkspaceDir } from "../util/platform.js";
 import { safeStringSlice } from "../util/unicode.js";
 
 const log = getLogger("run-script");

package/src/schedule/scheduler.ts

@@ -14,6 +14,7 @@ import { emitNotificationSignal } from "../notifications/emit-signal.js";
 import { emitScheduleResultNotification } from "../notifications/schedule-result-producer.js";
 import { getConversation } from "../persistence/conversation-crud.js";
 import { isLifecycleQuiesced } from "../persistence/lifecycle-quiesce.js";
+import type { TurnFailure } from "../persistence/turn-outcome.js";
 import { invalidateAssistantInferredItemsForConversation } from "../plugins/defaults/memory/task-memory-cleanup.js";
 import { dispatchProviderResolvable } from "../providers/provider-resolvability.js";
 import {
@@ -28,8 +29,6 @@ import {
 import { publishConversationListChanged } from "../runtime/sync/resource-sync-events.js";
 import { runSequencesOnce } from "../sequence/engine.js";
 import { getSubagentManager } from "../subagent/index.js";
-import type { TurnFailure } from "../telemetry/turn-outcome.js";
-import { recordWatchdogEvent } from "../telemetry/watchdog-events-store.js";
 import {
   cancelBackgroundTools,
   hasBackgroundToolWork,
@@ -506,21 +505,12 @@ export function startScheduler(): SchedulerHandle {
         { pid },
         "Schedule worker was not running — respawned by watchdog",
       );
-      recordWatchdogEvent({
-        checkName: "schedule_worker_respawn",
-        detail: { pid },
-      });
     },
     onPersistentFailure: (consecutiveFailures, err) => {
       log.error(
         { err, consecutiveFailures },
         "Schedule worker repeatedly failed to respawn — schedules are paused",
       );
-      recordWatchdogEvent({
-        checkName: "schedule_worker_down",
-        value: consecutiveFailures,
-        detail: { consecutiveFailures },
-      });
       emitScheduleWorkerDownNotification(consecutiveFailures);
     },
   });

package/src/schedule/worker-control.ts

@@ -8,8 +8,8 @@
  * path and entry point.
  */
 
+import { getScheduleWorkerPidPath } from "../util/layout.js";
 import { getLogger } from "../util/logger.js";
-import { getScheduleWorkerPidPath } from "../util/platform.js";
 import {
   probeWorkerPidFile,
   spawnWorkerProcess,