framer-dalton 0.0.23 → 0.0.25

package/dist/cli.js

@@ -7,10 +7,12 @@ import http from 'http';
 import { spawn, execFile } from 'child_process';
 import { z } from 'zod';
 import os from 'os';
+import { ErrorCode, FramerAPIError } from 'framer-api';
+import net from 'net';
 import { fileURLToPath } from 'url';
 import { createTRPCClient, httpLink } from '@trpc/client';
 
-/* @framer/ai CLI v0.0.23 */
+/* @framer/ai CLI v0.0.25 */
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
@@ -328,7 +330,7 @@ __name(markTelemetryNoticeShown, "markTelemetryNoticeShown");
 // src/version.ts
 var VERSION = (
   // typeof is used to ensure this can be used just via tsx or node etc. without build
-  "0.0.23" 
+  "0.0.25" 
 );
 var trackingEndpoint = "https://events.framer.com/track";
 var inProgressTrackings = /* @__PURE__ */ new Set();
@@ -418,8 +420,27 @@ function trackError(payload) {
   });
 }
 __name(trackError, "trackError");
-
-// src/utils.ts
+function rehydrateFramerAPIError(error) {
+  if (!(error instanceof Error)) return null;
+  const framerApi = error.data?.framerApi;
+  if (!framerApi || typeof framerApi.code !== "string") return null;
+  const code = ErrorCode[framerApi.code] ?? ErrorCode.INTERNAL;
+  const options = framerApi.ref ? { ref: framerApi.ref } : void 0;
+  return new FramerAPIError(error.message, code, options);
+}
+__name(rehydrateFramerAPIError, "rehydrateFramerAPIError");
+function errorWithRef(message, ref) {
+  const err = new Error(message);
+  if (ref) err.ref = ref;
+  return err;
+}
+__name(errorWithRef, "errorWithRef");
+function getErrorRef(error) {
+  if (!(error instanceof Error)) return void 0;
+  const ref = error.ref;
+  return typeof ref === "string" && ref.length > 0 ? ref : void 0;
+}
+__name(getErrorRef, "getErrorRef");
 function formatError(error) {
   if (error instanceof Error) {
     return error.message;
@@ -427,6 +448,14 @@ function formatError(error) {
   return String(error);
 }
 __name(formatError, "formatError");
+function formatErrorForUser(error) {
+  if (!(error instanceof Error)) return String(error);
+  const rehydrated = rehydrateFramerAPIError(error);
+  if (rehydrated) return rehydrated.toString();
+  const ref = getErrorRef(error);
+  return ref ? `${error.message} [ref: ${ref}]` : error.message;
+}
+__name(formatErrorForUser, "formatErrorForUser");
 function printJson(value) {
   console.log(JSON.stringify(value, null, 2));
 }
@@ -518,7 +547,7 @@ function successHtml(theme, message) {
   return htmlPage({
     title: "Framer \u2014 Agent Approved",
     heading: "Agent Approved",
-    message: message ?? "Your local agent now has edit access to the project. You can close this tab and continue with the local agent.",
+    message: message ?? "Your external agent now has edit access to the project. You can close this tab and continue with the external agent.",
     theme
   });
 }
@@ -767,7 +796,7 @@ async function acquireAuthWithNewProject() {
     expectProjectId: true,
     successMessage: "Project created and agent authorized",
     authType: "new_project",
-    browserSuccessMessage: "A new project has been created and your local agent is authorized to edit it. You can close this tab."
+    browserSuccessMessage: "A new project has been created and your external agent is authorized to edit it. You can close this tab."
   });
 }
 __name(acquireAuthWithNewProject, "acquireAuthWithNewProject");
@@ -784,7 +813,7 @@ async function acquireAuthWithRemixProject(sourceProjectUrlOrId) {
     expectProjectId: true,
     successMessage: "Project remixed and agent authorized",
     authType: "remix",
-    browserSuccessMessage: "The project has been remixed and your local agent is authorized to edit it. You can close this tab.",
+    browserSuccessMessage: "The project has been remixed and your external agent is authorized to edit it. You can close this tab.",
     projectOrigin
   });
 }
@@ -797,6 +826,48 @@ function isAuthError(errorMessage) {
 }
 __name(isAuthError, "isAuthError");
 
+// src/closest-match.ts
+function levenshteinDistance(source, target) {
+  const sourceLength = source.length;
+  const targetLength = target.length;
+  const matrix = Array.from(
+    { length: sourceLength + 1 },
+    () => Array.from({ length: targetLength + 1 }).fill(0)
+  );
+  for (let row = 0; row <= sourceLength; row++) matrix[row][0] = row;
+  for (let col = 0; col <= targetLength; col++) matrix[0][col] = col;
+  for (let row = 1; row <= sourceLength; row++) {
+    for (let col = 1; col <= targetLength; col++) {
+      const cost = source[row - 1] === target[col - 1] ? 0 : 1;
+      matrix[row][col] = Math.min(
+        matrix[row - 1][col] + 1,
+        matrix[row][col - 1] + 1,
+        matrix[row - 1][col - 1] + cost
+      );
+    }
+  }
+  return matrix[sourceLength][targetLength];
+}
+__name(levenshteinDistance, "levenshteinDistance");
+function findClosestMatch(query, candidates) {
+  const queryLower = query.toLowerCase();
+  let bestMatch;
+  let bestDistance = Number.POSITIVE_INFINITY;
+  for (const candidate of candidates) {
+    const distance = levenshteinDistance(queryLower, candidate.toLowerCase());
+    if (distance < bestDistance) {
+      bestDistance = distance;
+      bestMatch = candidate;
+    }
+  }
+  const maxDistance = Math.max(2, Math.floor(query.length / 3));
+  if (bestDistance <= maxDistance) {
+    return bestMatch;
+  }
+  return void 0;
+}
+__name(findClosestMatch, "findClosestMatch");
+
 // src/types-data.ts
 var types = {
   addcomponentinstanceoptions: {
@@ -975,7 +1046,7 @@ var types = {
       {
         name: "imageUrls",
         type: "readonly string[]",
-        description: "Attach images to this agent turn by URL.\n\nURLs can be external or existing Framer asset URLs. They will be ingested into the\nproject's assets if needed, then sent to the model as image parts.\n\nTip: if you have a local file (or bytes), upload it first (e.g. `framer.uploadImage(...)`) and\npass the returned asset URL here.",
+        description: "Attach images to this agent turn by URL.\n\nURLs can be external or existing Framer asset URLs. They will be ingested into the\nproject's assets if needed, then made available to the agent as trusted attachment URLs.\n\nTip: if you have a local file (or bytes), upload it first (e.g. `framer.uploadImage(...)`) and\npass the returned asset URL here.",
         optional: true
       }
     ]
@@ -1733,6 +1804,12 @@ var types = {
     kind: "interface",
     references: ["CodeExportCommon"],
     members: [
+      {
+        name: "componentId",
+        type: "string",
+        description: "Component ID for this code file export.",
+        optional: false
+      },
       {
         name: "insertURL",
         type: "string",
@@ -4408,7 +4485,7 @@ var types = {
     name: "HostnameType",
     description: "",
     kind: "alias",
-    alias: '"default" | "custom" | "version"',
+    alias: '"default" | "custom" | "version" | "branch"',
     references: []
   },
   imageassetdata: {
@@ -6889,7 +6966,7 @@ var types = {
       },
       {
         name: "unstable_getCodeFile",
-        type: "(id: string) => Promise<CodeFileData | null>",
+        type: "(idOrPath: string) => Promise<CodeFileData | null>",
         description: "@deprecated",
         optional: false
       },
@@ -6949,7 +7026,7 @@ var types = {
       },
       {
         name: "getCodeFile",
-        type: "(id: string) => Promise<CodeFileData | null>",
+        type: "(idOrPath: string) => Promise<CodeFileData | null>",
         description: "",
         optional: false
       },
@@ -7690,9 +7767,15 @@ var types = {
       {
         name: "model",
         type: "string",
-        description: "",
+        description: "Supervisor model id, optionally with eval-style reasoning effort suffix, e.g. `anthropic/claude-opus-4.6=low`.",
         optional: false
       },
+      {
+        name: "userAgentModel",
+        type: "string",
+        description: "Inner Framer Agent model override. Defaults to `model` when omitted. Supports the same `model=effort` syntax.",
+        optional: true
+      },
       {
         name: "pagePath",
         type: "string",
@@ -7704,6 +7787,12 @@ var types = {
         type: "number",
         description: "",
         optional: true
+      },
+      {
+        name: "captureTrainingData",
+        type: "boolean",
+        description: "When true, capture per-step (system, tools, messages) \u2192 response training rows for SFT.",
+        optional: true
       }
     ]
   },
@@ -7724,6 +7813,18 @@ var types = {
         type: "string",
         description: "",
         optional: false
+      },
+      {
+        name: "trainingDataFilename",
+        type: "string",
+        description: "Training-data filename, present when `captureTrainingData` was set.",
+        optional: true
+      },
+      {
+        name: "trainingDataJsonl",
+        type: "string",
+        description: "JSONL string with one training row per inner-agent step, present when `captureTrainingData` was set.",
+        optional: true
       }
     ]
   },
@@ -13426,8 +13527,8 @@ var methodsByCategory = {
     {
       name: "getCodeFile",
       category: "framer",
-      signature: "getCodeFile(id: string): Promise<CodeFile | null>",
-      description: 'Get a specific code file by its ID.\n\n@param id - The unique identifier of the code file.\n@returns The CodeFile instance or `null` if not found.\n\n@example\n```ts\nconst codeFile = await framer.getCodeFile("code-file-id")\n```\n@category code-files',
+      signature: "getCodeFile(idOrPath: string): Promise<CodeFile | null>",
+      description: 'Get a specific code file by its ID or file path.\n\n@param idOrPath - The unique identifier (e.g. `"codeFile/AbcD_23"`) or\nfile path (e.g. `"Button.tsx"` or `"overrides/withAnalytics.tsx"`) of the\ncode file.\n@returns The CodeFile instance or `null` if not found.\n\n@example\n```ts\n// Look up by ID\nconst codeFile = await framer.getCodeFile("codeFile/AbcD_23")\n\n// Look up by file path\nconst codeFile = await framer.getCodeFile("Button.tsx")\n```\n@category code-files',
       references: ["CodeFile"]
     },
     {
@@ -15896,6 +15997,26 @@ function getType(name2) {
 __name(getType, "getType");
 
 // src/docs.ts
+function getAllKnownNames() {
+  const bareNames = [
+    ...Object.values(classes).map((classInfo) => classInfo.name),
+    ...Object.values(types).map((typeInfo) => typeInfo.name)
+  ];
+  const framerMethods = methodsByCategory.framer ?? [];
+  for (const method of framerMethods) {
+    bareNames.push(method.name);
+  }
+  const methodNames = [];
+  for (const [category, methods] of Object.entries(methodsByCategory)) {
+    const categoryInfo = classes[category];
+    const displayCategory = categoryInfo?.name ?? category;
+    for (const method of methods) {
+      methodNames.push(`${displayCategory}.${method.name}`);
+    }
+  }
+  return { bareNames, methodNames };
+}
+__name(getAllKnownNames, "getAllKnownNames");
 function formatDocComment(text, indent = "") {
   const lines = text.split("\n");
   if (lines.length === 1) {
@@ -15985,8 +16106,11 @@ function renderDocs(queries) {
     if (query.includes(".")) {
       const method = getMethod(query);
       if (!method) {
+        const { methodNames } = getAllKnownNames();
+        const suggestion = findClosestMatch(query, methodNames);
+        const hint = suggestion ? ` Did you mean '${suggestion}'?` : "";
         errors.push(
-          `Method '${query}' not found. Use 'framer docs' to list all.`
+          `Method '${query}' not found.${hint} Use 'framer docs' to list all.`
         );
         return { lines, errors };
       }
@@ -16031,7 +16155,12 @@ ${typeDef}`);
 ${typeDef}`);
           }
         } else {
-          errors.push(`'${query}' not found. Use 'framer docs' to list all.`);
+          const { bareNames } = getAllKnownNames();
+          const suggestion = findClosestMatch(query, bareNames);
+          const hint = suggestion ? ` Did you mean '${suggestion}'?` : "";
+          errors.push(
+            `'${query}' not found.${hint} Use 'framer docs' to list all.`
+          );
           return { lines, errors };
         }
       }
@@ -16109,6 +16238,7 @@ __name(readRelayToken, "readRelayToken");
 var __filename$1 = fileURLToPath(import.meta.url);
 var __dirname$1 = path7.dirname(__filename$1);
 var RELAY_PORT = Number(process.env.FRAMER_CLI_PORT) || 19988;
+var WAIT_TIMEOUT_SECONDS = 5;
 var client = createTRPCClient({
   links: [
     httpLink({
@@ -16136,6 +16266,43 @@ function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 __name(sleep, "sleep");
+var PORT_PROBE_TIMEOUT_MS = 1e3;
+function probePort(port) {
+  return new Promise((resolve) => {
+    const socket = net.createConnection({ host: "127.0.0.1", port });
+    const done = /* @__PURE__ */ __name((result) => {
+      socket.removeAllListeners();
+      socket.destroy();
+      resolve(result);
+    }, "done");
+    socket.setTimeout(PORT_PROBE_TIMEOUT_MS);
+    socket.once("connect", () => done("in_use"));
+    socket.once("timeout", () => {
+      debug("relay", `port ${port} probe timed out`);
+      done("unknown");
+    });
+    socket.once("error", (err) => {
+      if (err.code === "ECONNREFUSED") {
+        done("free");
+      } else {
+        debug("relay", `port ${port} probe error: ${err.code ?? err.message}`);
+        done("unknown");
+      }
+    });
+  });
+}
+__name(probePort, "probePort");
+async function waitForPortFree(port, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (await probePort(port) === "free") {
+      return true;
+    }
+    await sleep(100);
+  }
+  return false;
+}
+__name(waitForPortFree, "waitForPortFree");
 function compareVersions(v1, v2) {
   const parts1 = v1.split(".").map(Number);
   const parts2 = v2.split(".").map(Number);
@@ -16171,8 +16338,20 @@ async function ensureRelayServerRunning(options = {}) {
       debug("relay", "shutting down old server...");
       try {
         await client.shutdown.mutate();
-        await sleep(500);
-      } catch {
+      } catch (err) {
+        debug(
+          "relay",
+          `shutdown RPC failed: ${err instanceof Error ? err.message : String(err)}`
+        );
+      }
+      const freed = await waitForPortFree(
+        RELAY_PORT,
+        WAIT_TIMEOUT_SECONDS * 1e3
+      );
+      if (!freed) {
+        throw new Error(
+          `Old relay server (v${serverVersion}) is still listening on 127.0.0.1:${RELAY_PORT} after ${WAIT_TIMEOUT_SECONDS}s; please kill it manually`
+        );
       }
       debug("relay", "old server shut down");
     } else {
@@ -16201,7 +16380,7 @@ async function ensureRelayServerRunning(options = {}) {
       "relay",
       `readiness poll ${attempt + 1}/10: version=${newVersion ?? "not ready"}`
     );
-    if (newVersion) {
+    if (newVersion === VERSION) {
       logger?.log("Relay server started successfully");
       return;
     }
@@ -16209,6 +16388,16 @@ async function ensureRelayServerRunning(options = {}) {
   throw new Error("Failed to start relay server after 5 seconds");
 }
 __name(ensureRelayServerRunning, "ensureRelayServerRunning");
+
+// src/skill-discovery-wait.ts
+var CLAUDE_CODE_SKILL_DISCOVERY_WAIT_MS = 4e3;
+async function waitForClaudeCodeSkillDiscovery() {
+  if (process.env.CLAUDECODE === void 0) return;
+  await new Promise(
+    (resolve) => setTimeout(resolve, CLAUDE_CODE_SKILL_DISCOVERY_WAIT_MS)
+  );
+}
+__name(waitForClaudeCodeSkillDiscovery, "waitForClaudeCodeSkillDiscovery");
 var FRAMER_TEMPORARY_DIR = path7.join(os.tmpdir(), "framer");
 function ensureTemporaryDir() {
   fs7.mkdirSync(FRAMER_TEMPORARY_DIR, { recursive: true });
@@ -16254,26 +16443,27 @@ function renderTemplate(template, values) {
   return rendered;
 }
 __name(renderTemplate, "renderTemplate");
-var CANVAS_SKILL_PREFIX = "framer-canvas-editing-project-";
+var PROJECT_SKILL_PREFIX = "framer-project-";
+var LEGACY_CANVAS_EDITING_SKILL_PREFIX = "framer-canvas-editing-project-";
 function toSafeProjectId(projectId) {
   return projectId.replace(/[^a-zA-Z0-9_-]/g, "-");
 }
 __name(toSafeProjectId, "toSafeProjectId");
-function buildProjectCanvasSkill(projectId, agentContext, canvasPrompt) {
-  const skillName = `${CANVAS_SKILL_PREFIX}${toSafeProjectId(projectId)}`;
-  const template = readSkillDoc("framer-canvas-editing-project.md");
+function buildProjectSkill(projectId, agentContext, agentPrompt) {
+  const skillName = `${PROJECT_SKILL_PREFIX}${toSafeProjectId(projectId)}`;
+  const template = readSkillDoc("framer-project.md");
   const content = `${renderTemplate(template, {
     SKILL_NAME: skillName,
     PROJECT_ID: projectId,
     GENERATED_AT: (/* @__PURE__ */ new Date()).toISOString(),
-    CANVAS_PROMPT: canvasPrompt.trimEnd(),
+    AGENT_PROMPT: agentPrompt.trimEnd(),
     AGENT_CONTEXT: agentContext.trimEnd(),
     FRAMER_TEMPORARY_DIR
   })}
 `;
   return { skillName, content };
 }
-__name(buildProjectCanvasSkill, "buildProjectCanvasSkill");
+__name(buildProjectSkill, "buildProjectSkill");
 function writeSkill(root, skillName, content) {
   fs7.mkdirSync(root, { recursive: true });
   const rootStat = fs7.statSync(root);
@@ -16291,6 +16481,17 @@ function writeSkill(root, skillName, content) {
   return filePath;
 }
 __name(writeSkill, "writeSkill");
+function cleanupLegacyCanvasEditingSkills(skillRoots = getDefaultSkillRoots()) {
+  for (const root of skillRoots) {
+    if (!fs7.existsSync(root)) continue;
+    for (const entry of fs7.readdirSync(root)) {
+      if (!entry.startsWith(LEGACY_CANVAS_EDITING_SKILL_PREFIX)) continue;
+      const skillDir = path7.join(root, entry);
+      fs7.rmSync(skillDir, { recursive: true, force: true, maxRetries: 2 });
+    }
+  }
+}
+__name(cleanupLegacyCanvasEditingSkills, "cleanupLegacyCanvasEditingSkills");
 function getDefaultSkillRoots() {
   const home = os.homedir();
   return [
@@ -16299,16 +16500,15 @@ function getDefaultSkillRoots() {
   ];
 }
 __name(getDefaultSkillRoots, "getDefaultSkillRoots");
-function cleanupStaleSkills(activeProjectIds, skillRoots) {
-  const roots = skillRoots ?? getDefaultSkillRoots();
+function cleanupStaleSkills(activeProjectIds, skillRoots = getDefaultSkillRoots()) {
   const sanitizedActiveProjectIds = new Set(
     [...activeProjectIds].map(toSafeProjectId)
   );
-  for (const root of roots) {
+  for (const root of skillRoots) {
     if (!fs7.existsSync(root)) continue;
     for (const entry of fs7.readdirSync(root)) {
-      if (!entry.startsWith(CANVAS_SKILL_PREFIX)) continue;
-      const sanitizedProjectId = entry.slice(CANVAS_SKILL_PREFIX.length);
+      if (!entry.startsWith(PROJECT_SKILL_PREFIX)) continue;
+      const sanitizedProjectId = entry.slice(PROJECT_SKILL_PREFIX.length);
       const isActive = sanitizedActiveProjectIds.has(sanitizedProjectId);
       if (isActive) continue;
       const skillDir = path7.join(root, entry);
@@ -16327,10 +16527,10 @@ function installSkills(options = { type: "base" }) {
     }
   ];
   if (options.type === "project") {
-    const projectSkill = buildProjectCanvasSkill(
+    const projectSkill = buildProjectSkill(
       options.projectId,
       options.agentContext,
-      options.canvasPrompt
+      options.agentPrompt
     );
     skills.push({
       name: projectSkill.skillName,
@@ -16360,6 +16560,10 @@ program.name(PROGRAM_NAME).version(VERSION).description("Framer Server API CLI")
     setDebugEnabled(true);
   }
 });
+function throwRelayError(result) {
+  throw errorWithRef(result.error ?? "Relay error", result.errorRef);
+}
+__name(throwRelayError, "throwRelayError");
 async function readStdin() {
   const chunks = [];
   for await (const chunk of process.stdin) {
@@ -16402,9 +16606,7 @@ async function getAgentSystemPrompt(sessionId) {
     cwd: process.cwd()
   });
   debug("exec", "getAgentSystemPrompt: relay responded");
-  if (result.error) {
-    throw new Error(result.error);
-  }
+  if (result.error) throwRelayError(result);
   const prompt = result.output.at(-1);
   if (typeof prompt !== "string") {
     throw new Error("Did not receive agent prompt output.");
@@ -16420,9 +16622,7 @@ async function getAgentContext(sessionId) {
     cwd: process.cwd()
   });
   debug("exec", "getAgentContext: relay responded");
-  if (result.error) {
-    throw new Error(result.error);
-  }
+  if (result.error) throwRelayError(result);
   const context = result.output.at(-1);
   if (typeof context !== "string") {
     throw new Error("Did not receive agent context output.");
@@ -16433,21 +16633,22 @@ __name(getAgentContext, "getAgentContext");
 async function refreshSkillsFromSession(sessionId, projectId) {
   try {
     debug("skills", "fetching agent system prompt + context...");
-    const [canvasPrompt, agentContext] = await Promise.all([
+    const [agentPrompt, agentContext] = await Promise.all([
       getAgentSystemPrompt(sessionId),
       getAgentContext(sessionId)
     ]);
     debug("skills", "installing skills...");
     installSkills({
       type: "project",
-      canvasPrompt,
+      agentPrompt,
       projectId,
       agentContext
     });
     debug("skills", "skills installed");
   } catch (err) {
-    throw new Error(
-      `Failed to refresh skills for session ${sessionId}: ${formatError(err)}`
+    throw errorWithRef(
+      `Failed to refresh skills for session ${sessionId}: ${formatError(err)}`,
+      getErrorRef(err)
     );
   }
 }
@@ -16473,7 +16674,7 @@ async function resolveSessionCredentials(projectUrlOrId) {
       projectId,
       errorMessage: message
     });
-    printError(`Failed to resolve credentials: ${message}`);
+    printError(`Failed to resolve credentials: ${formatErrorForUser(err)}`);
     await waitForTrackingToFinish();
     process.exit(1);
   }
@@ -16487,9 +16688,7 @@ async function getProjectName(sessionId) {
     cwd: process.cwd()
   });
   debug("exec", "getProjectName: relay responded");
-  if (result.error) {
-    throw new Error(result.error);
-  }
+  if (result.error) throwRelayError(result);
   const projectName = result.output.at(-1);
   if (typeof projectName !== "string") {
     throw new Error("Did not receive project name output.");
@@ -16511,7 +16710,7 @@ async function ensureRelayForCli(context) {
       userId: context?.userId,
       errorMessage: message
     });
-    printError(`Failed to check relay status: ${message}`);
+    printError(`Failed to check relay status: ${formatErrorForUser(err)}`);
     await waitForTrackingToFinish();
     process.exit(1);
   }
@@ -16529,12 +16728,14 @@ async function execAndPrint(sessionId, code) {
       print(line);
     }
     if (result.error) {
-      printError(`Error: ${result.error}`);
+      printError(
+        `Error: ${formatErrorForUser(errorWithRef(result.error, result.errorRef))}`
+      );
       await waitForTrackingToFinish();
       process.exit(1);
     }
   } catch (err) {
-    printError(`Execution failed: ${formatError(err)}`);
+    printError(`Execution failed: ${formatErrorForUser(err)}`);
     await waitForTrackingToFinish();
     process.exit(1);
   }
@@ -16551,7 +16752,7 @@ program.command("exec").description("Execute code in a session").requiredOption(
     try {
       code = fs7.readFileSync(filePath, "utf-8");
     } catch (err) {
-      printError(`Failed to read file: ${formatError(err)}`);
+      printError(`Failed to read file: ${formatErrorForUser(err)}`);
       await waitForTrackingToFinish();
       process.exit(1);
     }
@@ -16640,6 +16841,7 @@ session.command("new <projectUrlOrId>").description("Create a new session and pr
         refreshSkillsFromSession(sessionId, projectId)
       ]);
       debug("session.new", `project name="${projectName}", skills refreshed`);
+      await waitForClaudeCodeSkillDiscovery();
       saveProject({
         projectId,
         apiKey: credentials.apiKey,
@@ -16656,7 +16858,7 @@ session.command("new <projectUrlOrId>").description("Create a new session and pr
         cleanupStaleSkills(activeProjectIds);
       } catch (error) {
         printWarning(
-          `Failed to clean up stale skills: ${formatError(error)}`
+          `Failed to clean up stale skills: ${formatErrorForUser(error)}`
         );
       }
       const activeSessionIds = activeSessions.map(
@@ -16666,7 +16868,7 @@ session.command("new <projectUrlOrId>").description("Create a new session and pr
         cleanupStaleSessionCodeFiles(activeSessionIds);
       } catch (error) {
         printWarning(
-          `Failed to clean up stale session code files: ${formatError(error)}`
+          `Failed to clean up stale session code files: ${formatErrorForUser(error)}`
         );
       }
       debug(
@@ -16685,7 +16887,7 @@ session.command("new <projectUrlOrId>").description("Create a new session and pr
         userId,
         errorMessage: message
       });
-      printError(`Failed to create session: ${message}`);
+      printError(`Failed to create session: ${formatErrorForUser(err)}`);
       if (isAuthError(message)) {
         clearApiKey(projectId);
         printError("The stored API key was invalid and has been removed.");
@@ -16719,7 +16921,7 @@ session.command("list").description("List all active sessions").action(async ()
       })
     );
   } catch (err) {
-    printError(`Failed to list sessions: ${formatError(err)}`);
+    printError(`Failed to list sessions: ${formatErrorForUser(err)}`);
     await waitForTrackingToFinish();
     process.exit(1);
   }
@@ -16759,7 +16961,7 @@ async function saveAuthResult(verb, authFn) {
     saveProject({ projectId, apiKey: result.apiKey, userId: result.userId });
     print(`Project ${projectId} saved`);
   } catch (error) {
-    printError(`Failed to ${verb} project: ${formatError(error)}`);
+    printError(`Failed to ${verb} project: ${formatErrorForUser(error)}`);
     await waitForTrackingToFinish();
     process.exit(1);
   }
@@ -16782,7 +16984,7 @@ session.command("destroy <sessionId>").description("Destroy a session").action(a
     await client.destroySession.mutate({ sessionId });
     print(`Session ${sessionId} destroyed`);
   } catch (err) {
-    printError(`Failed to destroy session: ${formatError(err)}`);
+    printError(`Failed to destroy session: ${formatErrorForUser(err)}`);
     await waitForTrackingToFinish();
     process.exit(1);
   }
@@ -16809,11 +17011,19 @@ program.command("setup").description(
   "Install Framer skills into ~/.agents/skills and ~/.claude/skills"
 ).action(async () => {
   try {
+    try {
+      cleanupLegacyCanvasEditingSkills();
+    } catch (error) {
+      printWarning(
+        `Failed to clean up legacy canvas editing skills: ${formatErrorForUser(error)}`
+      );
+    }
     const results = installSkills();
+    await waitForClaudeCodeSkillDiscovery();
     printSetupSummary(results);
     printTelemetryNotice();
   } catch (err) {
-    printError(`Setup failed: ${formatError(err)}`);
+    printError(`Setup failed: ${formatErrorForUser(err)}`);
     await waitForTrackingToFinish();
     process.exit(1);
   }