@mycadet/assistant 0.12.7 → 0.12.8

package/src/tools/network/__tests__/web-search.test.ts

@@ -42,7 +42,7 @@ function seedWebSearch(
   });
 }
 
-mock.module("../managed-search-proxy.js", () => ({
+mock.module("../cloud-search-proxy.js", () => ({
   callManagedSearchProxy: async (
     provider: string,
     request: Record<string, unknown>,
@@ -117,7 +117,7 @@ describe("web_search tool", () => {
 
   // ---- Provider cadet (managed, provider is the only axis) ---------------
 
-  test("provider cadet with no mode routes to the platform proxy", async () => {
+  test("provider cadet with no mode routes to the cloud proxy", async () => {
     seedWebSearch(undefined, "cadet");
 
     const result = await execute({ query: "cadet managed query" });
@@ -148,7 +148,7 @@ describe("web_search tool", () => {
       status: 402,
       headers: { "content-type": "application/json" },
       body: { detail: "Insufficient balance" },
-      message: "Managed search proxy returned status 402: Insufficient balance",
+      message: "Cloud search proxy returned status 402: Insufficient balance",
     };
     let byokFetchCalls = 0;
     globalThis.fetch = (async () => {
@@ -185,7 +185,7 @@ describe("web_search tool", () => {
     expect(mockManagedSearchProxyCalls).toHaveLength(0);
   });
 
-  test("provider native with no keys falls back to the platform proxy", async () => {
+  test("provider native with no keys falls back to the cloud proxy", async () => {
     seedWebSearch(undefined, "inference-provider-native");
 
     const result = await execute({ query: "no key native query" });
@@ -471,7 +471,7 @@ describe("web_search tool", () => {
     expect(callCount).toBe(4);
   });
 
-  // ---- Managed Brave provider -------------------------------------------
+  // ---- Cloud Brave provider -------------------------------------------
 
   test("provider cadet uses Brave proxy without BYOK provider keys", async () => {
     seedWebSearch(undefined, "cadet");
@@ -483,9 +483,9 @@ describe("web_search tool", () => {
         web: {
           results: [
             {
-              title: "Managed Result",
+              title: "Cloud Result",
               url: "https://example.com/managed",
-              description: "Managed Brave result",
+              description: "Cloud Brave result",
             },
           ],
         },
@@ -500,7 +500,7 @@ describe("web_search tool", () => {
     });
 
     expect(result.isError).toBe(false);
-    expect(result.content).toContain("Managed Result");
+    expect(result.content).toContain("Cloud Result");
     expect(mockManagedSearchProxyCalls).toHaveLength(1);
     expect(mockManagedSearchProxyCalls[0]).toMatchObject({
       provider: "brave",
@@ -565,7 +565,7 @@ describe("web_search tool", () => {
     );
   });
 
-  test("provider cadet passes abort signal to the platform proxy", async () => {
+  test("provider cadet passes abort signal to the cloud proxy", async () => {
     seedWebSearch(undefined, "cadet");
     const controller = new AbortController();
 
@@ -575,7 +575,7 @@ describe("web_search tool", () => {
     expect(mockManagedSearchProxyCalls[0].signal).toBe(controller.signal);
   });
 
-  test("provider cadet maps insufficient balance to a managed usage error", async () => {
+  test("provider cadet maps insufficient balance to a cloud usage error", async () => {
     seedWebSearch(undefined, "cadet");
     mockManagedSearchProxyResult = {
       ok: false,
@@ -583,7 +583,7 @@ describe("web_search tool", () => {
       status: 402,
       headers: { "content-type": "application/json" },
       body: { detail: "Insufficient balance" },
-      message: "Managed search proxy returned status 402: Insufficient balance",
+      message: "Cloud search proxy returned status 402: Insufficient balance",
     };
 
     const result = await execute({ query: "billing query" });
@@ -607,7 +607,7 @@ describe("web_search tool", () => {
 
     expect(result.isError).toBe(true);
     expect(result.content).toContain(
-      "Managed Brave Search provider returned status 400",
+      "Cloud Brave Search provider returned status 400",
     );
   });
 
@@ -616,13 +616,13 @@ describe("web_search tool", () => {
     mockManagedSearchProxyResult = {
       ok: false,
       kind: "unavailable",
-      message: "Managed search proxy is unavailable in this environment.",
+      message: "Cloud search proxy is unavailable in this environment.",
     };
 
     const result = await execute({ query: "local managed query" });
 
     expect(result.isError).toBe(true);
-    expect(result.content).toContain("Managed search proxy is unavailable");
+    expect(result.content).toContain("Cloud search proxy is unavailable");
     expect(result.content).toContain("Log in to Cadet");
   });
 

package/src/tools/network/{managed-search-proxy.ts → cloud-search-proxy.ts}

@@ -1,4 +1,4 @@
-import { CadetPlatformClient } from "../../platform/client.js";
+import { CadetCloudClient } from "../../cloud/client.js";
 
 export type ManagedSearchProxyProvider = "brave";
 
@@ -49,15 +49,15 @@ interface ManagedSearchProxyEnvelope {
 }
 
 /**
- * Whether the managed search proxy can be dialed at all: a platform client
+ * Whether the cloud search proxy can be dialed at all: a cloud client
  * exists and carries an assistant id. Mirrors `managedSpeechAvailable()`.
  * Callers use this to decide between the proxy and the BYOK chain *before*
  * attempting a call — the same two conditions `callManagedSearchProxy`
  * reports as `kind: "unavailable"`.
  */
 export async function managedSearchAvailable(): Promise<boolean> {
-  const client = await CadetPlatformClient.create();
-  return client !== null && Boolean(client.platformAssistantId);
+  const client = await CadetCloudClient.create();
+  return client !== null && Boolean(client.cloudAssistantId);
 }
 
 export async function callManagedSearchProxy(
@@ -65,27 +65,27 @@ export async function callManagedSearchProxy(
   request: ManagedSearchProxyRequest,
   signal?: AbortSignal,
 ): Promise<ManagedSearchProxyResult> {
-  const client = await CadetPlatformClient.create();
+  const client = await CadetCloudClient.create();
   if (!client) {
     return {
       ok: false,
       kind: "unavailable",
-      message: "Managed search proxy is unavailable in this environment.",
+      message: "Cloud search proxy is unavailable in this environment.",
     };
   }
 
-  if (!client.platformAssistantId) {
+  if (!client.cloudAssistantId) {
     return {
       ok: false,
       kind: "unavailable",
       message:
-        "Managed search proxy is unavailable: platform assistant ID is missing.",
+        "Cloud search proxy is unavailable: platform assistant ID is missing.",
     };
   }
 
   const path = `/v1/assistants/${encodeURIComponent(
-    client.platformAssistantId,
-  )}/managed-search-proxy/${encodeURIComponent(provider)}/`;
+    client.cloudAssistantId,
+  )}/cloud-search-proxy/${encodeURIComponent(provider)}/`;
 
   const envelope: ManagedSearchProxyEnvelope = {
     request: {
@@ -124,7 +124,7 @@ export async function callManagedSearchProxy(
       ok: false,
       kind: "invalid-response",
       body,
-      message: "Managed search proxy returned an invalid response envelope.",
+      message: "Cloud search proxy returned an invalid response envelope.",
     };
   }
 
@@ -176,9 +176,9 @@ function responseHeadersToRecord(headers: Headers): Record<string, string> {
 function platformErrorMessage(status: number, body: unknown): string {
   const detail = extractErrorDetail(body);
   if (detail) {
-    return `Managed search proxy returned status ${status}: ${detail}`;
+    return `Cloud search proxy returned status ${status}: ${detail}`;
   }
-  return `Managed search proxy returned status ${status}.`;
+  return `Cloud search proxy returned status ${status}.`;
 }
 
 function extractErrorDetail(body: unknown): string | undefined {

package/src/tools/network/web-search.ts

@@ -21,6 +21,7 @@ import type {
   ToolDefinition,
   ToolExecutionResult,
 } from "../types.js";
+import type { ManagedSearchProxyResult } from "./cloud-search-proxy.js";
 import { extractDomain } from "./domain-normalize.js";
 import {
   extractFirecrawlCompatSearchResults,
@@ -29,7 +30,6 @@ import {
   resolveProviderApiUrl,
   searchResultSnippet,
 } from "./firecrawl-compat.js";
-import type { ManagedSearchProxyResult } from "./managed-search-proxy.js";
 import {
   classifyWebSearchFailure,
   logWebSearchBackendFailure,
@@ -242,7 +242,7 @@ function getWebSearchProvider(): WebSearchProvider {
   // In Your Own mode, `inference-provider-native` is only executable when the
   // inference provider swaps this tool for a native hosted-search definition.
   // If this app-executed tool is still invoked, fall back to the existing BYOK
-  // provider chain. `cadet` short-circuits into the managed branch before
+  // provider chain. `cadet` short-circuits into the cloud branch before
   // this function runs, so its coercion here only satisfies the return type
   // and keeps an undefined WEB_SEARCH_ADAPTERS lookup unreachable.
   if (configured === "inference-provider-native" || configured === "cadet") {
@@ -1188,7 +1188,7 @@ async function executeManagedBraveSearch(
   freshness: string | undefined,
   signal?: AbortSignal,
 ): Promise<ToolExecutionResult> {
-  const { callManagedSearchProxy } = await import("./managed-search-proxy.js");
+  const { callManagedSearchProxy } = await import("./cloud-search-proxy.js");
   const startedAt = Date.now();
   const proxyResult = await callManagedSearchProxy(
     "brave",
@@ -1240,7 +1240,7 @@ async function executeManagedBraveSearch(
       query,
       "brave",
       startedAt,
-      "Managed Brave Search is not authenticated correctly. This is a Cadet Cloud configuration issue.",
+      "Cloud Brave Search is not authenticated correctly. This is a Cadet Cloud configuration issue.",
     );
   }
 
@@ -1254,8 +1254,8 @@ async function executeManagedBraveSearch(
         error: rawBodyDetail(proxyResult.body),
       },
       proxyResult.status === 429
-        ? "Managed Brave Search rate limit exceeded. Try again shortly."
-        : `Managed Brave Search provider returned status ${proxyResult.status}`,
+        ? "Cloud Brave Search rate limit exceeded. Try again shortly."
+        : `Cloud Brave Search provider returned status ${proxyResult.status}`,
     );
   }
 
@@ -1263,7 +1263,7 @@ async function executeManagedBraveSearch(
     query,
     "brave",
     startedAt,
-    `Managed Brave Search provider returned status ${proxyResult.status}`,
+    `Cloud Brave Search provider returned status ${proxyResult.status}`,
   );
 }
 
@@ -2497,7 +2497,7 @@ export const webSearchTool = {
       if (!apiKey) {
         // Provider Native reaches this app-executed path only when the
         // inference model had no hosted search of its own. The user's own keys
-        // win above; the platform proxy is the last resort, which is what
+        // win above; the cloud proxy is the last resort, which is what
         // `mode: "managed"` did for installs that never configured a search
         // key. Read the configured provider off config — the local `provider`
         // has already been coerced to "perplexity".
@@ -2506,7 +2506,7 @@ export const webSearchTool = {
           "inference-provider-native"
         ) {
           const { managedSearchAvailable } =
-            await import("./managed-search-proxy.js");
+            await import("./cloud-search-proxy.js");
           if (await managedSearchAvailable()) {
             return executeManagedSearch();
           }

package/src/tools/permission-checker.ts

@@ -274,14 +274,14 @@ export class PermissionChecker {
       // is preserved as a belt-and-suspenders guard.
       if (
         result.decision === "prompt" &&
-        context.isPlatformHosted &&
+        context.isCloudHosted &&
         name === "bash" &&
         resolveCapabilities(context.trustClass).canSelfApproveTools &&
         !context.requireFreshApproval
       ) {
         log.info(
           { toolName: name, riskLevel },
-          "Auto-approving bash tool for platform-hosted guardian session",
+          "Auto-approving bash tool for cloud-hosted guardian session",
         );
         return {
           allowed: true,

package/src/tools/shared/input-misuse.ts

@@ -11,7 +11,7 @@
  * `properties` instead would advertise parameters the tool does not accept.
  *
  * Rules describe the first-party tools that ship in `bundled-skills/`, and tool
- * names are not reserved: a managed, workspace, extra, or plugin skill may
+ * names are not reserved: a cloud, workspace, extra, or plugin skill may
  * define its own `subagent_read` with an entirely different contract. The
  * `bundled` prefix on the exports below is the reminder that callers must
  * establish bundled provenance before consulting the table.

package/src/tools/shared/input-repairs.ts

@@ -16,8 +16,8 @@
  * states.
  *
  * Rules describe the first-party tools that ship in `bundled-skills/`, and
- * tool names are not reserved: a managed, workspace, extra, or plugin skill
- * may define its own `scaffold_managed_skill` with a different contract. The
+ * tool names are not reserved: a cloud, workspace, extra, or plugin skill
+ * may define its own `scaffold_cloud_skill` with a different contract. The
  * `bundled` prefix on the export is the reminder that callers must establish
  * bundled provenance before applying a repair.
  */
@@ -30,7 +30,7 @@ interface ToolInputRepairRules {
    *
    * Each entry is a name the prose around the tool uses for a parameter the
    * schema declares under a different one, and models follow prose over
-   * schema. `scaffold_managed_skill` declares `body_markdown` while the
+   * schema. `scaffold_cloud_skill` declares `body_markdown` while the
    * skill-authoring prose talks throughout about writing "the body"; the
    * retrospective prompt tells the model to call `find_similar_skills` with a
    * short description, which the schema declares as `goal`.
@@ -44,7 +44,7 @@ interface ToolInputRepairRules {
 }
 
 const REPAIR_RULES: Readonly<Record<string, ToolInputRepairRules>> = {
-  scaffold_managed_skill: {
+  scaffold_cloud_skill: {
     aliases: {
       body: "body_markdown",
       content: "body_markdown",

package/src/tools/skills/{delete-managed.ts → delete-cloud.ts}

@@ -1,13 +1,13 @@
 import { refreshSkillCapabilityMemories } from "../../daemon/skill-memory-refresh.js";
-import { deleteManagedSkill } from "../../skills/managed-store.js";
+import { deleteCloudSkill } from "../../skills/cloud-store.js";
 import { throwIfCancelled } from "../shared/abort.js";
 import type { ToolContext, ToolExecutionResult } from "../types.js";
 
 /**
- * Core execution logic for delete_managed_skill.
+ * Core execution logic for delete_cloud_skill.
  * Exported so bundled-skill executors and tests can call it directly.
  */
-export async function executeDeleteManagedSkill(
+export async function executeDeleteCloudSkill(
   input: Record<string, unknown>,
   context: ToolContext,
 ): Promise<ToolExecutionResult> {
@@ -21,7 +21,7 @@ export async function executeDeleteManagedSkill(
 
   throwIfCancelled(context);
 
-  const result = deleteManagedSkill(skillId.trim());
+  const result = deleteCloudSkill(skillId.trim());
 
   if (!result.deleted) {
     return { content: `Error: ${result.error}`, isError: true };

package/src/tools/skills/find-similar-skills.test.ts

@@ -19,7 +19,7 @@ import { basename, join } from "node:path";
 import { afterEach, describe, expect, mock, test } from "bun:test";
 
 import type { SkillSource } from "../../config/skills.js";
-import type { StoredManagedSkill } from "../../skills/managed-store.js";
+import type { StoredCloudSkill } from "../../skills/cloud-store.js";
 import type { OwnerInfo } from "../types.js";
 
 // Map managed skill id → recorded author, consulted by the mocked
@@ -253,7 +253,7 @@ describe("find_similar_skills: current skill for a refinable hit", () => {
         source: "bundled",
       },
     );
-  const stored: Record<string, StoredManagedSkill> = {
+  const stored: Record<string, StoredCloudSkill> = {
     "weekly-export": {
       name: "Weekly Report Export",
       description: "Export the weekly usage report",
@@ -279,7 +279,7 @@ describe("find_similar_skills: current skill for a refinable hit", () => {
     },
   };
   const reads: string[] = [];
-  const readStoredManagedSkill = (skillId: string) => {
+  const readStoredCloudSkill = (skillId: string) => {
     reads.push(skillId);
     return stored[skillId] ?? null;
   };
@@ -299,7 +299,7 @@ describe("find_similar_skills: current skill for a refinable hit", () => {
       {
         nearestExistingSkills: hits,
         loadCatalog: refinableCatalog,
-        readStoredManagedSkill,
+        readStoredCloudSkill,
       },
     );
 
@@ -331,7 +331,7 @@ describe("find_similar_skills: current skill for a refinable hit", () => {
           { skillId: "user-skill", score: 1 },
         ],
         loadCatalog: refinableCatalog,
-        readStoredManagedSkill,
+        readStoredCloudSkill,
       },
     );
 
@@ -353,7 +353,7 @@ describe("find_similar_skills: current skill for a refinable hit", () => {
       {
         nearestExistingSkills: hits,
         loadCatalog: refinableCatalog,
-        readStoredManagedSkill,
+        readStoredCloudSkill,
       },
     );
 
@@ -418,7 +418,7 @@ describe("find_similar_skills: current skill for a refinable hit", () => {
           { skillId: "weekly-export", score: 0.9 },
         ],
         loadCatalog: refinableCatalog,
-        readStoredManagedSkill: () => null,
+        readStoredCloudSkill: () => null,
       },
     );
 

package/src/tools/skills/find-similar-skills.ts

@@ -2,16 +2,16 @@ import type { SkillSource } from "../../config/skills.js";
 import { loadSkillCatalog } from "../../config/skills.js";
 import { MEMORY_RETROSPECTIVE_ORIGIN } from "../../plugins/defaults/memory/memory-retrospective-constants.js";
 import { nearestExistingSkills } from "../../plugins/defaults/memory/v3/candidate-match.js";
-import { readInstallMeta } from "../../skills/install-meta.js";
-import {
-  getManagedSkillDir,
-  readStoredManagedSkill,
-  type StoredManagedSkill,
-} from "../../skills/managed-store.js";
 import {
   filterSkillsByPlatform,
   type SkillPlatform,
-} from "../../skills/platform-compatibility.js";
+} from "../../skills/cloud-compatibility.js";
+import {
+  getCloudSkillDir,
+  readStoredCloudSkill,
+  type StoredCloudSkill,
+} from "../../skills/cloud-store.js";
+import { readInstallMeta } from "../../skills/install-meta.js";
 import { throwIfCancelled } from "../shared/abort.js";
 import type { OwnerInfo, ToolContext, ToolExecutionResult } from "../types.js";
 
@@ -32,7 +32,7 @@ import type { OwnerInfo, ToolContext, ToolExecutionResult } from "../types.js";
  * refinement is a whole-file overwrite and the pass has no other read path:
  * its `skill_load` grant covers skill-management alone, and loading would
  * stamp `lastUsedAt` and count as usage. Fields are spelled as
- * `scaffold_managed_skill`'s own arguments so the pass carries forward what
+ * `scaffold_cloud_skill`'s own arguments so the pass carries forward what
  * it is not changing without translating names.
  */
 interface EnrichedHit {
@@ -45,7 +45,7 @@ interface EnrichedHit {
   current?: CurrentSkill;
 }
 
-/** The refinable skill's present content, in `scaffold_managed_skill` argument names. */
+/** The refinable skill's present content, in `scaffold_cloud_skill` argument names. */
 interface CurrentSkill {
   name: string;
   description: string;
@@ -79,7 +79,7 @@ export async function executeFindSimilarSkills(
       owner?: OwnerInfo;
       platforms?: SkillPlatform[];
     }[];
-    readStoredManagedSkill?: (skillId: string) => StoredManagedSkill | null;
+    readStoredCloudSkill?: (skillId: string) => StoredCloudSkill | null;
   } = {},
 ): Promise<ToolExecutionResult> {
   const goal = input.goal;
@@ -107,7 +107,7 @@ export async function executeFindSimilarSkills(
 
   const findNearest = deps.nearestExistingSkills ?? nearestExistingSkills;
   const loadCatalog = deps.loadCatalog ?? (() => loadSkillCatalog());
-  const readStored = deps.readStoredManagedSkill ?? readStoredManagedSkill;
+  const readStored = deps.readStoredCloudSkill ?? readStoredCloudSkill;
 
   const catalog = loadCatalog();
   const byId = new Map(catalog.map((s) => [s.id, s]));
@@ -163,7 +163,7 @@ export async function executeFindSimilarSkills(
     // meta read leaves `author` undefined rather than throwing.
     const author =
       skill.source === "managed"
-        ? readManagedSkillAuthor(hit.skillId)
+        ? readCloudSkillAuthor(hit.skillId)
         : undefined;
     // Only a refinable hit pays for the disk read, and a failed read drops
     // `current` rather than the hit: the pass can still skip a skill it
@@ -202,15 +202,15 @@ export async function executeFindSimilarSkills(
 }
 
 /**
- * Read a managed skill's install-meta author, if any. Best-effort: any failure
+ * Read a cloud skill's install-meta author, if any. Best-effort: any failure
  * (missing dir, malformed meta, untagged skill) resolves to undefined so the
  * enrichment loop never throws on a single bad hit.
  */
-function readManagedSkillAuthor(
+function readCloudSkillAuthor(
   skillId: string,
 ): "assistant" | "user" | undefined {
   try {
-    return readInstallMeta(getManagedSkillDir(skillId))?.author;
+    return readInstallMeta(getCloudSkillDir(skillId))?.author;
   } catch {
     return undefined;
   }

package/src/tools/skills/load.ts

@@ -15,16 +15,16 @@ import {
   autoInstallFromCatalog,
   resolveCatalog,
 } from "../../skills/catalog-install.js";
+import {
+  isSkillCompatibleWithCloud,
+  skillPlatformUnavailableMessage,
+} from "../../skills/cloud-compatibility.js";
 import {
   collectAllMissing,
   indexCatalogById,
   validateIncludeCycles,
 } from "../../skills/include-graph.js";
 import { renderInlineCommands } from "../../skills/inline-command-render.js";
-import {
-  isSkillCompatibleWithPlatform,
-  skillPlatformUnavailableMessage,
-} from "../../skills/platform-compatibility.js";
 import { parseToolManifestFile } from "../../skills/tool-manifest.js";
 import { computeSkillVersionHash } from "../../skills/version-hash.js";
 import { getLogger } from "../../util/logger.js";
@@ -213,7 +213,7 @@ export const skillLoadTool = {
 
     const skill = loaded.skill;
 
-    if (!isSkillCompatibleWithPlatform(skill)) {
+    if (!isSkillCompatibleWithCloud(skill)) {
       return {
         content: `Error: ${skillPlatformUnavailableMessage(skill.id, skill)}`,
         isError: true,
@@ -424,7 +424,7 @@ export const skillLoadTool = {
         if (childOutOfPluginScope(child)) {
           continue;
         }
-        if (!isSkillCompatibleWithPlatform(child)) {
+        if (!isSkillCompatibleWithCloud(child)) {
           continue;
         }
         const childFlagKey = skillFlagKey(child);

package/src/tools/skills/{scaffold-managed.ts → scaffold-cloud.ts}

@@ -11,17 +11,17 @@ import { getConversation } from "../../persistence/conversation-crud.js";
 import { upsertSkillCardInsertJob } from "../../persistence/jobs-store.js";
 import { MEMORY_RETROSPECTIVE_ORIGIN } from "../../plugins/defaults/memory/memory-retrospective-constants.js";
 import { recordSkillUpdate } from "../../plugins/defaults/memory/skill-update-receipt-job.js";
-import { readInstallMeta } from "../../skills/install-meta.js";
 import {
-  createManagedSkill,
-  getManagedSkillDir,
-} from "../../skills/managed-store.js";
+  createCloudSkill,
+  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-managed-skill");
+const log = getLogger("scaffold-cloud-skill");
 
 /** Watchdog check_name for the per-creation skill-authoring counter. */
 const SKILL_AUTHORED_CHECK_NAME = "skill_authored";
@@ -102,7 +102,7 @@ const SKILL_UPDATE_RECEIPT_RECORD_FAILED_CHECK_NAME =
  * A newly authored skill announces itself in the conversation through the
  * `skill_card` surface; an update is announced through a skill-update
  * receipt instead. The pass runs in a background fork and rewrites the body
- * of a skill the user may be relying on, and `createManagedSkill` writes
+ * of a skill the user may be relying on, and `createCloudSkill` writes
  * through an atomic rename keeping no prior version, so the receipt is what
  * puts the change in the background feed alongside the other unattended
  * work (sweeps, scheduled jobs, heartbeat), where a user already looks to
@@ -179,14 +179,14 @@ function recordBackgroundSkillUpdate(args: {
 }
 
 /**
- * Core execution logic for scaffold_managed_skill.
+ * Core execution logic for scaffold_cloud_skill.
  * Exported so bundled-skill executors and tests can call it directly.
  *
  * `deps` injects the catalog and conversation-lookup seams so the ownership
  * backstop's non-managed collision check and the lineage resolution can be
  * exercised without standing up a real bundled/plugin catalog or a live DB.
  */
-export async function executeScaffoldManagedSkill(
+export async function executeScaffoldCloudSkill(
   input: Record<string, unknown>,
   context: ToolContext,
   deps: {
@@ -271,7 +271,7 @@ export async function executeScaffoldManagedSkill(
 
   // Validate and normalize companion files. Each entry carries the file bytes
   // exactly one way: inline `content`, or `copy_from` naming an on-disk source
-  // the store validates and reads (managed-store.validateCompanionSource).
+  // the store validates and reads (cloud-store.validateCompanionSource).
   let files:
     | Array<{ path: string; content?: string; copyFrom?: string }>
     | undefined;
@@ -371,21 +371,21 @@ export async function executeScaffoldManagedSkill(
     context.requestOrigin === MEMORY_RETROSPECTIVE_ORIGIN;
   const author = fromRetrospective ? "assistant" : "user";
 
-  // Whether a managed SKILL.md already existed before this call. Drives the
+  // Whether a cloud SKILL.md already existed before this call. Drives the
   // ownership backstop below, the created-vs-refined discriminant for the
   // skill-card enqueue, and the `skill_authored` telemetry counter: only a
   // genuine CREATE (no pre-existing skill, regardless of the `overwrite`
   // flag) gets a card or a counter event.
   const managedSkillExistedBefore = existsSync(
-    join(getManagedSkillDir(id), "SKILL.md"),
+    join(getCloudSkillDir(id), "SKILL.md"),
   );
 
   // Ownership backstop (retrospective origin only): the retrospective may author
   // a skill ONLY if it owns it. Fail closed on either of two collisions.
   if (fromRetrospective) {
     // (1) A non-managed catalog entry (bundled, plugin, workspace, extra) owns
-    // this id. Creating a managed skill with that id SHADOWS the catalog entry,
-    // and an overwrite under the managed dir would never touch it — either way
+    // this id. Creating a cloud skill with that id SHADOWS the catalog entry,
+    // and an overwrite under the cloud dir would never touch it — either way
     // the retrospective must not stand on a skill it did not author. This covers
     // create AND overwrite. The prompt directs the model to skip when an
     // existing skill of any source already covers the procedure; this enforces
@@ -410,7 +410,7 @@ export async function executeScaffoldManagedSkill(
     // prune side where such skills are never pruned.
     if (
       managedSkillExistedBefore &&
-      readInstallMeta(getManagedSkillDir(id))?.author !== "assistant"
+      readInstallMeta(getCloudSkillDir(id))?.author !== "assistant"
     ) {
       return {
         content: `Error: skill "${id}" is not verifiably assistant-authored; the retrospective may not overwrite it or write companion files into it. Author a new skill instead.`,
@@ -425,7 +425,7 @@ export async function executeScaffoldManagedSkill(
   // it retries with the field, the way a missing activation_hints does.
   // Checked after the ownership backstop so a pass that may not touch the
   // skill hears that first, and only for a call that asked to overwrite: a
-  // call without the flag is blocked by the managed store's own overwrite
+  // call without the flag is blocked by the cloud store's own overwrite
   // error, and hearing about the summary instead would cost it a retry that
   // still cannot succeed. Before any write, so nothing is lost.
   if (
@@ -467,7 +467,7 @@ export async function executeScaffoldManagedSkill(
 
   throwIfCancelled(context);
 
-  const result = createManagedSkill({
+  const result = createCloudSkill({
     id,
     name: normalizedName,
     description: normalizedDescription,