framer-dalton 0.0.24 → 0.0.26

package/README.md

@@ -16,14 +16,14 @@ That installs skills into `~/.agents/skills` and `~/.claude/skills`.
 
 The CLI and the installed skills are meant to work together. There are three skills:
 
-- `framer` - the base skill that explains how to use the CLI and the API in general.
+- `framer` - the base meta skill that explains setup, project selection, and session creation.
 - `framer-code-components` - explains specific prompts for how to write code components and provides examples.
-- `framer-canvas-editing-project-<project id>` - a dynamically-created skill that explains how to canvas edit and includes project context.
+- `framer-project-<project id>` - a dynamically-created skill for interacting with a specific project.
 
-1. Running `npx framer-dalton@latest setup` will install the base `framer` and `framer-code-component` skills.
-2. The frontmatter of `framer-code-components` tells agents to always load `framer` first.
+1. Running `npx framer-dalton@latest setup` will install the base `framer` and `framer-code-components` skills.
+2. The frontmatter of `framer-code-components` tells agents to always load `framer` and the generated project skill first.
 3. The frontmatter of `framer` tells agents to run `npx framer-dalton@latest setup` BEFORE loading the skill. This command will auto-update the cli and update the skill files.
-4. Creating a new session for a project will create a `framer-canvas-editing-project-<project id>` file. This file contains the latest agent system prompt from `framer.getAgentSystemPrompt` and the latest project context from `framer.getAgentContext`. Agents are told not to load this skill until after creating a session.
+4. Creating a new session for a project will create a `framer-project-<project id>` file. This file contains the latest agent system prompt from `framer.getAgentSystemPrompt` and the latest project context from `framer.getAgentContext`. Agents must load this project-specific skill immediately after creating a session before doing any connected-project work.
 
 ## Local Development
 

package/dist/cli.js

@@ -8,10 +8,11 @@ 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.24 */
+/* @framer/ai CLI v0.0.26 */
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 
@@ -28,6 +29,51 @@ Please upgrade: https://nodejs.org/`
   );
   process.exit(1);
 }
+
+// src/agent-thread-context.ts
+var MAX_AGENT_THREAD_ID_LENGTH = 256;
+var MAX_AGENT_PROVIDER_LENGTH = 64;
+var SAFE_VALUE_PATTERN = /^[A-Za-z0-9._:-]+$/;
+var providerEnvVars = [
+  { provider: "codex", envVar: "CODEX_THREAD_ID" },
+  { provider: "claude", envVar: "CLAUDE_CODE_SESSION_ID" },
+  { provider: "claude", envVar: "CLAUDE_CODE_REMOTE_SESSION_ID" }
+];
+function normalizeValue(value, maxLength) {
+  const trimmed = value?.trim();
+  if (!trimmed) return void 0;
+  if (trimmed.length > maxLength) return void 0;
+  if (!SAFE_VALUE_PATTERN.test(trimmed)) return void 0;
+  return trimmed;
+}
+__name(normalizeValue, "normalizeValue");
+function normalizeAgentThreadContext(input) {
+  const agentThreadId = normalizeValue(
+    input.agentThreadId,
+    MAX_AGENT_THREAD_ID_LENGTH
+  );
+  if (!agentThreadId) return {};
+  const agentProvider = normalizeValue(
+    input.agentProvider,
+    MAX_AGENT_PROVIDER_LENGTH
+  );
+  return {
+    agentThreadId,
+    ...agentProvider ? { agentProvider } : {}
+  };
+}
+__name(normalizeAgentThreadContext, "normalizeAgentThreadContext");
+function resolveAgentThreadContext(env = process.env) {
+  for (const { provider, envVar } of providerEnvVars) {
+    const agentThreadContext = normalizeAgentThreadContext({
+      agentThreadId: env[envVar],
+      agentProvider: provider
+    });
+    if (agentThreadContext.agentThreadId) return agentThreadContext;
+  }
+  return {};
+}
+__name(resolveAgentThreadContext, "resolveAgentThreadContext");
 function openUrl(url) {
   const platform = process.platform;
   let cmd;
@@ -329,7 +375,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.24" 
+  "0.0.26" 
 );
 var trackingEndpoint = "https://events.framer.com/track";
 var inProgressTrackings = /* @__PURE__ */ new Set();
@@ -419,6 +465,45 @@ function trackError(payload) {
   });
 }
 __name(trackError, "trackError");
+
+// src/connection-errors.ts
+var RELAY_CONNECTION_LOST_PATTERNS = [
+  "fetch failed",
+  // undici top-level: relay gone / socket closed mid-request
+  "other side closed",
+  // undici SocketError: relay exited mid-request
+  "UND_ERR_SOCKET",
+  // undici socket error code
+  "ECONNREFUSED",
+  // relay not listening
+  "ECONNRESET",
+  // connection reset mid-request
+  "socket hang up"
+];
+function isRelayConnectionLost(err) {
+  const seen = /* @__PURE__ */ new Set();
+  const stack = [err];
+  while (stack.length > 0) {
+    const node = stack.pop();
+    if (node == null || seen.has(node)) continue;
+    seen.add(node);
+    const e = node;
+    const text = `${typeof e.message === "string" ? e.message : ""} ${typeof e.code === "string" ? e.code : ""}`;
+    if (RELAY_CONNECTION_LOST_PATTERNS.some((pattern) => text.includes(pattern)))
+      return true;
+    if (e.cause != null) stack.push(e.cause);
+    if (Array.isArray(e.errors)) stack.push(...e.errors);
+  }
+  return false;
+}
+__name(isRelayConnectionLost, "isRelayConnectionLost");
+var AUTH_ERROR_PATTERNS = ["does not have access", "UNAUTHORIZED"];
+function isAuthError(errorMessage) {
+  return AUTH_ERROR_PATTERNS.some((p) => errorMessage.includes(p));
+}
+__name(isAuthError, "isAuthError");
+
+// src/utils.ts
 function rehydrateFramerAPIError(error) {
   if (!(error instanceof Error)) return null;
   const framerApi = error.data?.framerApi;
@@ -447,10 +532,12 @@ function formatError(error) {
   return String(error);
 }
 __name(formatError, "formatError");
-function formatErrorForUser(error) {
+function formatErrorForUser(error, opts) {
   if (!(error instanceof Error)) return String(error);
   const rehydrated = rehydrateFramerAPIError(error);
   if (rehydrated) return rehydrated.toString();
+  if (!opts?.fromExecResult && isRelayConnectionLost(error))
+    return "Connection to the Framer server was lost. Run `framer session new` to reconnect.";
   const ref = getErrorRef(error);
   return ref ? `${error.message} [ref: ${ref}]` : error.message;
 }
@@ -818,13 +905,6 @@ async function acquireAuthWithRemixProject(sourceProjectUrlOrId) {
 }
 __name(acquireAuthWithRemixProject, "acquireAuthWithRemixProject");
 
-// src/connection-errors.ts
-var AUTH_ERROR_PATTERNS = ["does not have access", "UNAUTHORIZED"];
-function isAuthError(errorMessage) {
-  return AUTH_ERROR_PATTERNS.some((p) => errorMessage.includes(p));
-}
-__name(isAuthError, "isAuthError");
-
 // src/closest-match.ts
 function levenshteinDistance(source, target) {
   const sourceLength = source.length;
@@ -1803,6 +1883,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",
@@ -4478,7 +4564,7 @@ var types = {
     name: "HostnameType",
     description: "",
     kind: "alias",
-    alias: '"default" | "custom" | "version"',
+    alias: '"default" | "custom" | "version" | "branch"',
     references: []
   },
   imageassetdata: {
@@ -6959,7 +7045,7 @@ var types = {
       },
       {
         name: "unstable_getCodeFile",
-        type: "(id: string) => Promise<CodeFileData | null>",
+        type: "(idOrPath: string) => Promise<CodeFileData | null>",
         description: "@deprecated",
         optional: false
       },
@@ -7019,7 +7105,7 @@ var types = {
       },
       {
         name: "getCodeFile",
-        type: "(id: string) => Promise<CodeFileData | null>",
+        type: "(idOrPath: string) => Promise<CodeFileData | null>",
         description: "",
         optional: false
       },
@@ -7203,12 +7289,48 @@ var types = {
         description: "@alpha",
         optional: false
       },
+      {
+        name: "readComponentControlsForAgent",
+        type: "(input: {\n        componentIds: readonly string[];\n    }, options?: {\n        pagePath?: string;\n    }) => Promise<unknown>",
+        description: "@alpha",
+        optional: false
+      },
+      {
+        name: "readIconSetControlsForAgent",
+        type: "(input: {\n        iconSetNames: readonly string[];\n    }, options?: {\n        pagePath?: string;\n    }) => Promise<unknown>",
+        description: "@alpha",
+        optional: false
+      },
+      {
+        name: "readIconsForAgent",
+        type: "(input: {\n        iconSetName: string;\n    }, options?: {\n        pagePath?: string;\n    }) => Promise<string[]>",
+        description: "@alpha",
+        optional: false
+      },
+      {
+        name: "readLayoutTemplateControlsForAgent",
+        type: "(input: {\n        layoutTemplateIds: readonly string[];\n    }, options?: {\n        pagePath?: string;\n    }) => Promise<unknown>",
+        description: "@alpha",
+        optional: false
+      },
+      {
+        name: "readShaderControlsForAgent",
+        type: "(input: {\n        shaderNames: readonly string[];\n    }, options?: {\n        pagePath?: string;\n    }) => Promise<unknown>",
+        description: "@alpha",
+        optional: false
+      },
       {
         name: "applyAgentChanges",
         type: "(dsl: string, options?: {\n        pagePath?: string;\n    }) => Promise<void>",
         description: "@alpha",
         optional: false
       },
+      {
+        name: "ping",
+        type: "() => Promise<void>",
+        description: "@alpha Liveness round-trip; resolves when Vekter's plugin handler answers.",
+        optional: false
+      },
       {
         name: "publishForAgent",
         type: "(input?: Record<string, unknown>) => Promise<unknown>",
@@ -7760,9 +7882,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",
@@ -7812,6 +7940,18 @@ var types = {
         type: "string",
         description: "JSONL string with one training row per inner-agent step, present when `captureTrainingData` was set.",
         optional: true
+      },
+      {
+        name: "fixtureFilename",
+        type: "string",
+        description: "Document fixture filename, always present after a completed run.",
+        optional: false
+      },
+      {
+        name: "fixtureContent",
+        type: "string",
+        description: "Document fixture JSON content (tree + code files).",
+        optional: false
       }
     ]
   },
@@ -13211,6 +13351,13 @@ var methodsByCategory = {
       description: 'Paginate a large array of values across multiple calls. The cursor is\nopaque and only valid within the same headless session and page.\n\n- First page: pass `{ items }`.\n- Continuation: pass `{ keyName, cursor }` using values returned by a previous call.\n\n@param input - `{ items }` for a fresh array, or `{ keyName, cursor }` for continuation.\n@param options.pagePath - Target page path (e.g. `"/about"`). Defaults to the active page.\n@returns The current page, including `keyName`, `cursor`, `results`, `totalResults`, and (if more pages remain) `nextCursor`.',
       references: []
     },
+    {
+      name: "[$framerApiOnly.ping]",
+      category: "framer",
+      signature: "[$framerApiOnly.ping](): Promise<void>",
+      description: "Liveness round-trip: resolves once Vekter's plugin handler answers. Used by the headless\n backend to verify the transport actually routes, not just that the page is alive.",
+      references: []
+    },
     {
       name: "[$framerApiOnly.publishForAgent]",
       category: "framer",
@@ -13225,6 +13372,34 @@ var methodsByCategory = {
       description: 'Searches for stock images to use on the canvas (e.g. `"FrameNode"` `fill` values). Returns\ncandidate images with preview thumbnails and a `url` field for each. The returned URLs are\nregistered as trusted for this session so they can be applied directly via `fill="<url>"`\nin a subsequent {@link applyAgentChanges} DSL command. Without calling this method first,\nexternal image URLs are rejected at apply time.\n\nThe input schema is documented in the string returned by {@link getAgentSystemPrompt}.\n\n@param input - Search input object (source / query / count / orientation).\n@returns An object describing the candidates or an error.',
       references: []
     },
+    {
+      name: "[$framerApiOnly.readComponentControlsForAgent]",
+      category: "framer",
+      signature: "[$framerApiOnly.readComponentControlsForAgent](input: { componentIds: readonly string[]; }, options?: { pagePath?: string; }): Promise<unknown>",
+      description: "@alpha",
+      references: []
+    },
+    {
+      name: "[$framerApiOnly.readIconSetControlsForAgent]",
+      category: "framer",
+      signature: "[$framerApiOnly.readIconSetControlsForAgent](input: { iconSetNames: readonly string[]; }, options?: { pagePath?: string; }): Promise<unknown>",
+      description: "@alpha",
+      references: []
+    },
+    {
+      name: "[$framerApiOnly.readIconsForAgent]",
+      category: "framer",
+      signature: "[$framerApiOnly.readIconsForAgent](input: { iconSetName: string; }, options?: { pagePath?: string; }): Promise<string[]>",
+      description: "@alpha",
+      references: []
+    },
+    {
+      name: "[$framerApiOnly.readLayoutTemplateControlsForAgent]",
+      category: "framer",
+      signature: "[$framerApiOnly.readLayoutTemplateControlsForAgent](input: { layoutTemplateIds: readonly string[]; }, options?: { pagePath?: string; }): Promise<unknown>",
+      description: "@alpha",
+      references: []
+    },
     {
       name: "[$framerApiOnly.readProjectForAgent]",
       category: "framer",
@@ -13232,6 +13407,13 @@ var methodsByCategory = {
       description: 'Reads project state by executing an array of queries against the project.\n\nReturns one result per query. Available query types and their parameters\nare documented in the string returned by {@link getAgentSystemPrompt}.\n\n@param queries - Array of query objects. See {@link getAgentSystemPrompt} for available types.\n@param options.pagePath - Target page path (e.g. `"/about"`). Defaults to the active page.\n@returns An object with a `results` array, one entry per query.',
       references: []
     },
+    {
+      name: "[$framerApiOnly.readShaderControlsForAgent]",
+      category: "framer",
+      signature: "[$framerApiOnly.readShaderControlsForAgent](input: { shaderNames: readonly string[]; }, options?: { pagePath?: string; }): Promise<unknown>",
+      description: "@alpha",
+      references: []
+    },
     {
       name: "[$framerApiOnly.reviewChangesForAgent]",
       category: "framer",
@@ -13514,8 +13696,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"]
     },
     {
@@ -13791,6 +13973,13 @@ var methodsByCategory = {
       description: 'Paginate a large array of values across multiple calls. The cursor is\nopaque and only valid within the same headless session and page.\n\n- First page: pass `{ items }`.\n- Continuation: pass `{ keyName, cursor }` using values returned by a previous call.\n\n@param input - `{ items }` for a fresh array, or `{ keyName, cursor }` for continuation.\n@param options.pagePath - Target page path (e.g. `"/about"`). Defaults to the active page.\n@returns The current page, including `keyName`, `cursor`, `results`, `totalResults`, and (if more pages remain) `nextCursor`.',
       references: []
     },
+    {
+      name: "ping",
+      category: "framer",
+      signature: "ping(): Promise<void>",
+      description: "Liveness round-trip: resolves once Vekter's plugin handler answers. Used by the headless\n backend to verify the transport actually routes, not just that the page is alive.",
+      references: []
+    },
     {
       name: "publish",
       category: "framer",
@@ -13812,6 +14001,34 @@ var methodsByCategory = {
       description: 'Searches for stock images to use on the canvas (e.g. `"FrameNode"` `fill` values). Returns\ncandidate images with preview thumbnails and a `url` field for each. The returned URLs are\nregistered as trusted for this session so they can be applied directly via `fill="<url>"`\nin a subsequent {@link applyAgentChanges} DSL command. Without calling this method first,\nexternal image URLs are rejected at apply time.\n\nThe input schema is documented in the string returned by {@link getAgentSystemPrompt}.\n\n@param input - Search input object (source / query / count / orientation).\n@returns An object describing the candidates or an error.',
       references: []
     },
+    {
+      name: "readComponentControlsForAgent",
+      category: "framer",
+      signature: "readComponentControlsForAgent(input: { componentIds: readonly string[]; }, options?: { pagePath?: string; }): Promise<unknown>",
+      description: "@alpha",
+      references: []
+    },
+    {
+      name: "readIconSetControlsForAgent",
+      category: "framer",
+      signature: "readIconSetControlsForAgent(input: { iconSetNames: readonly string[]; }, options?: { pagePath?: string; }): Promise<unknown>",
+      description: "@alpha",
+      references: []
+    },
+    {
+      name: "readIconsForAgent",
+      category: "framer",
+      signature: "readIconsForAgent(input: { iconSetName: string; }, options?: { pagePath?: string; }): Promise<string[]>",
+      description: "@alpha",
+      references: []
+    },
+    {
+      name: "readLayoutTemplateControlsForAgent",
+      category: "framer",
+      signature: "readLayoutTemplateControlsForAgent(input: { layoutTemplateIds: readonly string[]; }, options?: { pagePath?: string; }): Promise<unknown>",
+      description: "@alpha",
+      references: []
+    },
     {
       name: "readProjectForAgent",
       category: "framer",
@@ -13819,6 +14036,13 @@ var methodsByCategory = {
       description: 'Reads project state by executing an array of queries against the project.\n\nReturns one result per query. Available query types and their parameters\nare documented in the string returned by {@link getAgentSystemPrompt}.\n\n@param queries - Array of query objects. See {@link getAgentSystemPrompt} for available types.\n@param options.pagePath - Target page path (e.g. `"/about"`). Defaults to the active page.\n@returns An object with a `results` array, one entry per query.',
       references: []
     },
+    {
+      name: "readShaderControlsForAgent",
+      category: "framer",
+      signature: "readShaderControlsForAgent(input: { shaderNames: readonly string[]; }, options?: { pagePath?: string; }): Promise<unknown>",
+      description: "@alpha",
+      references: []
+    },
     {
       name: "rejectAllPending",
       category: "framer",
@@ -14011,6 +14235,22 @@ var methodsByCategory = {
       references: ["NamedImageAssetInput", "ImageAsset"]
     }
   ],
+  framerapierror: [
+    {
+      name: "recentMethods",
+      category: "FramerAPIError",
+      signature: "recentMethods: string[]",
+      description: "@see FramerAPIErrorOptions.recentMethods",
+      references: []
+    },
+    {
+      name: "retryable",
+      category: "FramerAPIError",
+      signature: "retryable: boolean",
+      description: "@see FramerAPIErrorOptions.retryable",
+      references: []
+    }
+  ],
   imageasset: [
     {
       name: "altText",
@@ -16225,6 +16465,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({
@@ -16252,6 +16493,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);
@@ -16287,8 +16565,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 {
@@ -16317,7 +16607,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;
     }
@@ -16380,26 +16670,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);
@@ -16417,6 +16708,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 [
@@ -16425,16 +16727,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);
@@ -16453,10 +16754,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,
@@ -16559,14 +16860,14 @@ __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
     });
@@ -16655,7 +16956,7 @@ async function execAndPrint(sessionId, code) {
     }
     if (result.error) {
       printError(
-        `Error: ${formatErrorForUser(errorWithRef(result.error, result.errorRef))}`
+        `Error: ${formatErrorForUser(errorWithRef(result.error, result.errorRef), { fromExecResult: true })}`
       );
       await waitForTrackingToFinish();
       process.exit(1);
@@ -16733,6 +17034,7 @@ session.command("new <projectUrlOrId>").description("Create a new session and pr
 ).action(
   async (projectUrlOrId, options) => {
     const projectId = extractProjectId(projectUrlOrId);
+    const agentThreadContext = resolveAgentThreadContext();
     let sessionId;
     let userId;
     try {
@@ -16757,7 +17059,8 @@ session.command("new <projectUrlOrId>").description("Create a new session and pr
         projectId,
         apiKey: credentials.apiKey,
         userId: credentials.userId,
-        headlessServerUrl
+        headlessServerUrl,
+        ...agentThreadContext
       });
       sessionId = result.id;
       debug("session.new", `session created id=${sessionId}`);
@@ -16811,6 +17114,7 @@ session.command("new <projectUrlOrId>").description("Create a new session and pr
         errorType: "session_new_error",
         projectId,
         userId,
+        ...agentThreadContext,
         errorMessage: message
       });
       printError(`Failed to create session: ${formatErrorForUser(err)}`);
@@ -16937,6 +17241,13 @@ 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);