@agent-native/core 0.80.4 → 0.80.6

package/corpus/templates/design/actions/index-design-system-with-builder.ts

@@ -7,11 +7,9 @@ import {
   getRequestOrgId,
   getRequestUserEmail,
 } from "@agent-native/core/server/request-context";
-import { eq } from "drizzle-orm";
-import { nanoid } from "nanoid";
 import { z } from "zod";
 
-import { getDb, schema } from "../server/db/index.js";
+import { upsertBuilderProxyDesignSystem } from "../server/lib/builder-design-system-proxy.js";
 
 const MAX_CODE_FILES = 50;
 const MAX_TOTAL_CODE_BYTES = 2 * 1024 * 1024;
@@ -52,83 +50,6 @@ function makeFiles(
   return files;
 }
 
-function localBuilderDesignSystemId(builderDesignSystemId: string): string {
-  const slug = builderDesignSystemId
-    .replace(/[^a-zA-Z0-9_-]+/g, "-")
-    .replace(/^-+|-+$/g, "")
-    .slice(0, 96);
-  return `builder-${slug || "design-system"}`;
-}
-
-function builderProxyData({
-  builderDesignSystemId,
-  jobId,
-  builderUrl,
-  projectName,
-  description,
-}: {
-  builderDesignSystemId: string;
-  jobId: string;
-  builderUrl: string;
-  projectName?: string;
-  description?: string;
-}) {
-  return JSON.stringify({
-    source: "builder",
-    builderDesignSystemId,
-    builderJobId: jobId,
-    builderUrl,
-    colors: {
-      primary: "var(--primary)",
-      secondary: "var(--secondary)",
-      accent: "var(--accent)",
-      background: "var(--background)",
-      surface: "var(--card)",
-      text: "var(--foreground)",
-      textMuted: "var(--muted-foreground)",
-    },
-    typography: {
-      headingFont: "inherit",
-      bodyFont: "inherit",
-      headingWeight: "700",
-      bodyWeight: "400",
-      headingSizes: { h1: "48px", h2: "32px", h3: "24px" },
-    },
-    spacing: { elementGap: "24px", pagePadding: "48px" },
-    borders: { radius: "12px", accentWidth: "1px" },
-    logos: [],
-    notes: [
-      "This is a local proxy for a Builder-indexed design system.",
-      `Builder design system id: ${builderDesignSystemId}`,
-      `Builder indexing job id: ${jobId}`,
-      `Builder URL: ${builderUrl}`,
-      projectName ? `Requested name: ${projectName}` : "",
-      description ? `Context: ${description}` : "",
-      "Use Builder as the source of truth for extracted tokens and guidance.",
-    ]
-      .filter(Boolean)
-      .join("\n"),
-  });
-}
-
-function builderProxyInstructions({
-  builderDesignSystemId,
-  jobId,
-  builderUrl,
-}: {
-  builderDesignSystemId: string;
-  jobId: string;
-  builderUrl: string;
-}) {
-  return [
-    "This design system is indexed and owned by Builder.",
-    `Builder design system id: ${builderDesignSystemId}`,
-    `Builder job id: ${jobId}`,
-    `Builder URL: ${builderUrl}`,
-    "When generating designs, treat Builder as the source of truth for the final extracted tokens, assets, and guidance.",
-  ].join("\n");
-}
-
 export default defineAction({
   description:
     "Start Builder design-system indexing from a GitHub repository and/or code files. " +
@@ -174,86 +95,18 @@ export default defineAction({
     const ownerEmail = getRequestUserEmail();
     if (!ownerEmail) throw new Error("no authenticated user");
 
-    const db = getDb();
-    const now = new Date().toISOString();
-    const orgId = getRequestOrgId();
-    const baseLocalDesignSystemId = localBuilderDesignSystemId(
-      result.designSystemId,
-    );
-    const title = projectName?.trim() || "Builder indexed design system";
-    const localData = builderProxyData({
-      builderDesignSystemId: result.designSystemId,
-      jobId: result.jobId,
-      builderUrl: result.builderUrl,
+    const proxy = await upsertBuilderProxyDesignSystem({
+      result,
+      ownerEmail,
+      orgId: getRequestOrgId(),
       projectName,
       description,
     });
-    const customInstructions = builderProxyInstructions({
-      builderDesignSystemId: result.designSystemId,
-      jobId: result.jobId,
-      builderUrl: result.builderUrl,
-    });
-    const [existing] = await db
-      .select({
-        id: schema.designSystems.id,
-        ownerEmail: schema.designSystems.ownerEmail,
-      })
-      .from(schema.designSystems)
-      .where(eq(schema.designSystems.id, baseLocalDesignSystemId))
-      .limit(1);
-    const localDesignSystemId =
-      existing && existing.ownerEmail !== ownerEmail
-        ? `${baseLocalDesignSystemId}-${nanoid(8)}`
-        : baseLocalDesignSystemId;
-    if (existing && existing.ownerEmail === ownerEmail) {
-      await db
-        .update(schema.designSystems)
-        .set({
-          title,
-          description:
-            description ??
-            `Builder indexed design system ${result.designSystemId}`,
-          data: localData,
-          assets: "[]",
-          customInstructions,
-          updatedAt: now,
-        })
-        .where(eq(schema.designSystems.id, existing.id));
-    } else {
-      const [ownedSystem] = await db
-        .select({ id: schema.designSystems.id })
-        .from(schema.designSystems)
-        .where(eq(schema.designSystems.ownerEmail, ownerEmail))
-        .limit(1);
-      await db.insert(schema.designSystems).values({
-        id: localDesignSystemId,
-        title,
-        description:
-          description ??
-          `Builder indexed design system ${result.designSystemId}`,
-        data: localData,
-        assets: "[]",
-        customInstructions,
-        isDefault: !ownedSystem,
-        ownerEmail,
-        orgId,
-        createdAt: now,
-        updatedAt: now,
-      });
-    }
 
     return {
       ...result,
-      localDesignSystemId,
+      ...proxy,
       uploadedFileCount: files.length,
-      instructions: [
-        "Builder design-system indexing has started.",
-        `Builder design system: ${result.designSystemId}`,
-        `Local selectable design system: ${localDesignSystemId}`,
-        `Builder job: ${result.jobId}`,
-        `Open: ${result.builderUrl}`,
-        "Use the local design system id in Design flows; Builder remains the source of truth for the indexed brand kit.",
-      ].join("\n"),
     };
   },
 });

package/corpus/templates/design/actions/navigate.ts

@@ -21,6 +21,7 @@
  *   --inspectorTab Inspector tab for designs: design, tweaks, or extensions
  *   --fileId     Screen/file id to focus in the design editor
  *   --filename   Screen filename to focus in the design editor
+ *   --tool       Design editor tool to activate
  *   --designSystemId Design system ID (for design-systems view)
  *   --path       URL path to navigate to
  */
@@ -29,61 +30,110 @@ import { defineAction } from "@agent-native/core";
 import { writeAppState } from "@agent-native/core/application-state";
 import { z } from "zod";
 
+const designEditorToolSchema = z.enum([
+  "move",
+  "frame",
+  "rect",
+  "line",
+  "arrow",
+  "ellipse",
+  "polygon",
+  "star",
+  "text",
+  "pen",
+  "hand",
+  "comment",
+  "draw",
+  "scale",
+]);
+
 export default defineAction({
   description:
-    "Navigate the UI to a specific view or path. Views: list, editor, design-systems, present, templates, settings. Use --designId with editor/present views and --designSystemId with design-systems. For designs, use editorView=overview to show the infinite screens canvas, or editorView=single with fileId/filename/screen to focus a screen. Use inspectorTab=extensions to focus the in-editor extension panel.",
-  schema: z.object({
-    view: z
-      .enum([
-        "list",
-        "editor",
-        "design-systems",
-        "present",
-        "templates",
-        "examples",
-        "settings",
-      ])
-      .optional()
-      .describe("View name to navigate to"),
-    designId: z.string().optional().describe("Design ID for editor/present"),
-    editorView: z
-      .enum(["single", "overview"])
-      .optional()
-      .describe(
-        "Design editor view: overview for the infinite screens canvas, single for a focused screen",
-      ),
-    viewMode: z
-      .enum(["single", "overview"])
-      .optional()
-      .describe("Alias for editorView"),
-    inspectorTab: z
-      .enum(["design", "tweaks", "extensions"])
-      .optional()
-      .describe("Design editor inspector tab to focus"),
-    inspector: z
-      .enum(["design", "tweaks", "extensions"])
-      .optional()
-      .describe("Alias for inspectorTab"),
-    fileId: z.string().optional().describe("Design file/screen ID to focus"),
-    screenId: z.string().optional().describe("Alias for fileId"),
-    filename: z
-      .string()
-      .optional()
-      .describe("Design screen filename to focus, such as checkout.html"),
-    screen: z
-      .string()
-      .optional()
-      .describe("Screen id, filename, or name to focus"),
-    zoom: z
-      .number()
-      .optional()
-      .describe("Optional design canvas zoom percentage"),
-    designSystemId: z
-      .string()
-      .optional()
-      .describe("Design system ID for design-systems view"),
-    path: z.string().optional().describe("URL path to navigate to"),
-  }),
+    "Navigate the UI to a specific view or path. Views: list, editor, design-systems, present, templates, settings. Use --designId with editor/present views and --designSystemId with design-systems. For designs, use editorView=overview to show the infinite screens canvas, or editorView=single with fileId/filename/screen to focus a screen. Use inspectorTab=extensions to focus the in-editor extension panel. Use tool to activate a design editor tool.",
+  schema: z
+    .object({
+      view: z
+        .enum([
+          "list",
+          "editor",
+          "design-systems",
+          "present",
+          "templates",
+          "examples",
+          "settings",
+        ])
+        .optional()
+        .describe("View name to navigate to"),
+      designId: z.string().optional().describe("Design ID for editor/present"),
+      editorView: z
+        .enum(["single", "overview"])
+        .optional()
+        .describe(
+          "Design editor view: overview for the infinite screens canvas, single for a focused screen",
+        ),
+      viewMode: z
+        .enum(["single", "overview"])
+        .optional()
+        .describe("Alias for editorView"),
+      inspectorTab: z
+        .enum(["design", "tweaks", "extensions"])
+        .optional()
+        .describe("Design editor inspector tab to focus"),
+      inspector: z
+        .enum(["design", "tweaks", "extensions"])
+        .optional()
+        .describe("Alias for inspectorTab"),
+      fileId: z.string().optional().describe("Design file/screen ID to focus"),
+      screenId: z.string().optional().describe("Alias for fileId"),
+      filename: z
+        .string()
+        .optional()
+        .describe("Design screen filename to focus, such as checkout.html"),
+      screen: z
+        .string()
+        .optional()
+        .describe("Screen id, filename, or name to focus"),
+      zoom: z
+        .number()
+        .optional()
+        .describe("Optional design canvas zoom percentage"),
+      tool: designEditorToolSchema
+        .optional()
+        .describe("Optional design editor tool to activate"),
+      designSystemId: z
+        .string()
+        .optional()
+        .describe("Design system ID for design-systems view"),
+      path: z.string().optional().describe("URL path to navigate to"),
+    })
+    .superRefine((args, ctx) => {
+      const editorView = args.editorView ?? args.viewMode;
+      if (
+        (args.view === "editor" || args.view === "present") &&
+        !args.designId
+      ) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: ["designId"],
+          message: `designId is required for ${args.view} view`,
+        });
+      }
+      if (
+        args.view === "editor" &&
+        editorView === "single" &&
+        !args.fileId &&
+        !args.screenId &&
+        !args.filename &&
+        !args.screen
+      ) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          path: ["editorView"],
+          message:
+            "single editor view requires a fileId, screenId, filename, or screen",
+        });
+      }
+    }),
   http: false,
   run: async (args) => {
     if (!args.view && !args.path) {
@@ -101,6 +151,7 @@ export default defineAction({
     if (args.filename) nav.filename = args.filename;
     if (args.screen) nav.screen = args.screen;
     if (args.zoom !== undefined) nav.zoom = args.zoom;
+    if (args.tool) nav.tool = args.tool;
     if (args.designSystemId) nav.designSystemId = args.designSystemId;
     if (args.path) nav.path = args.path;
     await writeAppState("navigate", nav);
@@ -112,6 +163,6 @@ export default defineAction({
       args.fileId || args.screenId || args.filename || args.screen
         ? ` (screen: ${args.fileId ?? args.screenId ?? args.filename ?? args.screen})`
         : ""
-    }${args.designSystemId ? ` (design system: ${args.designSystemId})` : ""}`;
+    }${args.tool ? ` (${args.tool} tool)` : ""}${args.designSystemId ? ` (design system: ${args.designSystemId})` : ""}`;
   },
 });

package/corpus/templates/design/actions/set-default-design-system.ts

@@ -1,7 +1,10 @@
 import { defineAction } from "@agent-native/core";
-import { getRequestUserEmail } from "@agent-native/core/server/request-context";
+import {
+  getRequestOrgId,
+  getRequestUserEmail,
+} from "@agent-native/core/server/request-context";
 import { assertAccess } from "@agent-native/core/sharing";
-import { and, eq } from "drizzle-orm";
+import { and, eq, isNull } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
@@ -20,6 +23,7 @@ export default defineAction({
 
     const userEmail = getRequestUserEmail();
     if (!userEmail) throw new Error("no authenticated user");
+    const orgId = getRequestOrgId();
 
     const [target] = await db
       .select({ ownerEmail: schema.designSystems.ownerEmail })
@@ -35,7 +39,17 @@ export default defineAction({
       await tx
         .update(schema.designSystems)
         .set({ isDefault: false, updatedAt: now })
-        .where(eq(schema.designSystems.ownerEmail, userEmail));
+        .where(
+          orgId
+            ? and(
+                eq(schema.designSystems.ownerEmail, userEmail),
+                eq(schema.designSystems.orgId, orgId),
+              )
+            : and(
+                eq(schema.designSystems.ownerEmail, userEmail),
+                isNull(schema.designSystems.orgId),
+              ),
+        );
 
       await tx
         .update(schema.designSystems)

package/corpus/templates/design/actions/show-design-questions.ts

@@ -4,6 +4,8 @@ import { buildDeepLink } from "@agent-native/core/server";
 import { assertAccess } from "@agent-native/core/sharing";
 import { z } from "zod";
 
+import "../server/db/index.js"; // ensure registerShareableResource runs
+
 function designDeepLink(designId: string): string {
   return buildDeepLink({
     app: "design",

package/corpus/templates/design/actions/update-design.ts

@@ -20,6 +20,7 @@ export default defineAction({
       .describe("Updated project type"),
     designSystemId: z
       .string()
+      .min(1)
       .nullable()
       .optional()
       .describe("Design system ID to link, or null to unlink"),
@@ -41,7 +42,7 @@ export default defineAction({
     }
 
     await assertAccess("design", id, "editor");
-    if (designSystemId) {
+    if (designSystemId != null) {
       await assertAccess("design-system", designSystemId, "viewer");
     }
 

package/corpus/templates/design/actions/view-screen.ts

@@ -26,9 +26,8 @@ export default defineAction({
   schema: z.object({}),
   http: false,
   run: async () => {
-    const [navigation, designVariants, designSelection] = await Promise.all([
+    const [navigation, designSelection] = await Promise.all([
       readAppStateForCurrentTab("navigation"),
-      readAppState("design-variants"),
       readAppStateForCurrentTab("design-selection"),
     ]);
     const designId =
@@ -44,6 +43,14 @@ export default defineAction({
     const generationSession = designId
       ? await readAppState(designGenerationSessionKey(designId))
       : undefined;
+    const designVariants = designId
+      ? await readAppState("design-variants").then((value) => {
+          if (!value || typeof value !== "object") return undefined;
+          return (value as { designId?: unknown }).designId === designId
+            ? value
+            : undefined;
+        })
+      : undefined;
 
     const screen: Record<string, unknown> = {};
     if (navigation) screen.navigation = navigation;
@@ -95,10 +102,9 @@ export default defineAction({
           id: designId,
           title: (access.resource as { title?: unknown }).title ?? null,
           screens: files,
-          activeScreen:
-            files.find((file) => file.id === activeFileId) ??
-            files.find((file) => file.filename === activeFilename) ??
-            null,
+          activeScreen: activeFileId
+            ? (files.find((file) => file.id === activeFileId) ?? null)
+            : (files.find((file) => file.filename === activeFilename) ?? null),
           canvasFrames: parseCanvasFrameGeometryById(data.canvasFrames),
         };
       }

package/corpus/templates/design/app/components/design/CanvasContextMenu.tsx

@@ -209,7 +209,7 @@ const DEFAULT_LABELS: CanvasContextMenuLabels = {
 };
 
 const DEFAULT_SHORTCUTS: CanvasContextMenuShortcuts = {
-  pasteHere: "⌘V",
+  pasteHere: "",
   selectAll: "⌘A",
   zoomToFit: "⇧1",
   zoomToSelection: "⇧2",
@@ -234,16 +234,16 @@ type ActionCallbackMap = Partial<
   Record<CanvasContextMenuAction, CanvasContextMenuActionHandler>
 >;
 
-// Figma-style menu chrome: compact, dark-border, subtle shadow, no animation jitter
+// design-editor menu chrome: compact, dark-border, subtle shadow, no animation jitter
 const MENU_CONTENT_CLASS =
   "w-52 min-w-[200px] rounded-[6px] border border-[var(--design-editor-control-border)] bg-[var(--design-editor-panel-bg)] py-[3px] px-[3px] text-[12px] text-foreground shadow-[0_4px_16px_rgba(0,0,0,0.16),0_0_0_0.5px_rgba(0,0,0,0.08)] outline-none data-[state=open]:animate-in data-[state=open]:fade-in-0 data-[state=open]:zoom-in-[0.97] data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 duration-100";
-// Figma row height ~28px, full-width highlight on hover, no icon gap waste
+// design row height ~28px, full-width highlight on hover, no icon gap waste
 const MENU_ITEM_CLASS =
   "flex h-7 cursor-default select-none items-center rounded-[4px] px-2 py-0 text-[12px] leading-none gap-0 focus:bg-[var(--design-editor-selection-color)] focus:text-white data-[disabled]:pointer-events-none data-[disabled]:opacity-35";
 // Submenu trigger mirrors item styles + chevron sizing
 const MENU_SUB_TRIGGER_CLASS =
   "flex h-7 cursor-default select-none items-center rounded-[4px] px-2 py-0 text-[12px] leading-none focus:bg-[var(--design-editor-selection-color)] focus:text-white data-[state=open]:bg-[var(--design-editor-selection-color)] data-[state=open]:text-white [&>svg:last-child]:ms-auto [&>svg:last-child]:size-3 [&>svg:last-child]:opacity-50";
-// Separator: 1px, full-width flush, Figma-like muted line
+// Separator: 1px, full-width flush, design-editor muted line
 const MENU_SEPARATOR_CLASS =
   "mx-0 my-[3px] h-px bg-[var(--design-editor-control-border)] opacity-80";
 // Shortcut: right-aligned, muted, use system UI for symbol rendering