spine-framework 0.3.16 → 0.3.18

package/{scripts → .framework/scripts}/assemble-functions.sh

@@ -18,7 +18,7 @@
 set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-PROJECT_ROOT="${PROJECT_ROOT:-$(dirname "$SCRIPT_DIR")}"
+PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
 
 CORE_DIR="$PROJECT_ROOT/.framework/functions"
 CUSTOM_DIR="$PROJECT_ROOT/custom"
@@ -42,23 +42,12 @@ fi
 
 # 3. Overlay custom functions (overrides + additions), excluding test files
 CUSTOM_COUNT=0
-
-# 3a. Top-level custom/functions/ (project-level overrides)
 if [ -d "$CUSTOM_DIR/functions" ]; then
+  # Copy all files except test files (*-test.ts, *.test.ts)
   find "$CUSTOM_DIR/functions" -maxdepth 1 -name '*.ts' ! -name '*-test.ts' ! -name '*.test.ts' -exec cp {} "$TMP_DIR"/ \; 2>/dev/null || true
+  # Copy subdirectories if any
   find "$CUSTOM_DIR/functions" -mindepth 1 -type d -exec sh -c 'dir="$1"; base=$(basename "$dir"); mkdir -p "'"$TMP_DIR"'/$base" && cp -r "$dir"/* "'"$TMP_DIR"'/$base/"' _ {} \; 2>/dev/null || true
-fi
-
-# 3b. App functions from custom/apps/*/functions/ (installed app handlers)
-for APP_FUNCTIONS_DIR in "$CUSTOM_DIR"/apps/*/functions; do
-  if [ -d "$APP_FUNCTIONS_DIR" ]; then
-    find "$APP_FUNCTIONS_DIR" -maxdepth 1 -name '*.ts' ! -name '*-test.ts' ! -name '*.test.ts' -exec cp {} "$TMP_DIR"/ \; 2>/dev/null || true
-    find "$APP_FUNCTIONS_DIR" -mindepth 1 -type d -exec sh -c 'dir="$1"; base=$(basename "$dir"); mkdir -p "'"$TMP_DIR"'/$base" && cp -r "$dir"/* "'"$TMP_DIR"'/$base/"' _ {} \; 2>/dev/null || true
-  fi
-done
-
-CUSTOM_COUNT=$(find "$CUSTOM_DIR" -path '*/functions/*.ts' ! -name '*-test.ts' ! -name '*.test.ts' 2>/dev/null | wc -l | tr -d ' ')
-if [ "$CUSTOM_COUNT" -gt 0 ]; then
+  CUSTOM_COUNT=$(find "$CUSTOM_DIR/functions" -name '*.ts' ! -name '*-test.ts' ! -name '*.test.ts' 2>/dev/null | wc -l | tr -d ' ')
   echo "  ✓ Custom: $CUSTOM_COUNT files"
 else
   echo "  ○ Custom: (empty)"
@@ -69,37 +58,5 @@ rm -rf "$TARGET_DIR"
 mkdir -p "$(dirname "$TARGET_DIR")"
 mv "$TMP_DIR" "$TARGET_DIR"
 
-# 5. Generate handler-registry.ts — static imports of all custom_* handlers
-#    This replaces the stub in handler-registry.ts so esbuild can bundle all
-#    handlers into integration-routes at build time (no runtime dynamic imports).
-REGISTRY_FILE="$TARGET_DIR/handler-registry.ts"
-{
-  echo "// AUTO-GENERATED by assemble-functions.sh — do not edit manually"
-  echo "// Overrides the stub in .framework/functions/handler-registry.ts"
-  echo ""
-
-  # Collect all custom_*.ts handler files
-  HANDLER_NAMES=()
-  for f in "$TARGET_DIR"/custom_*.ts; do
-    [ -f "$f" ] || continue
-    name=$(basename "$f" .ts)
-    HANDLER_NAMES+=("$name")
-    var=$(echo "$name" | tr '-' '_')
-    echo "import * as ${var} from './${name}'"
-  done
-
-  echo ""
-  echo "export const HANDLER_REGISTRY: Record<string, any> = {"
-
-  for name in "${HANDLER_NAMES[@]}"; do
-    var=$(echo "$name" | tr '-' '_')
-    stripped="${name#custom_}"
-    echo "  '${name}': ${var},"
-    echo "  '${stripped}': ${var},"
-  done
-
-  echo "}"
-} > "$REGISTRY_FILE"
-
 echo "  ✓ Assembled: $(find "$TARGET_DIR" -name '*.ts' ! -name '*-test.ts' ! -name '*.test.ts' | wc -l | tr -d ' ') total functions"
 echo "✅ Done"

package/{scripts → .framework/scripts}/assemble.sh

@@ -19,12 +19,6 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
 
-# Detect if running inside node_modules (consumer project install)
-# If so, output to actual project root (3 levels up from scripts/)
-if [[ "$SCRIPT_DIR" == *"/node_modules/spine-framework/"* ]]; then
-  PROJECT_ROOT="$(dirname "$(dirname "$(dirname "$SCRIPT_DIR")")")"
-fi
-
 echo "Assembling Spine..."
 
 # Remove stale dist/ so Netlify CLI never reads its _redirects during dev
@@ -32,10 +26,10 @@ rm -rf "$PROJECT_ROOT/dist"
 
 # Step 1: Assemble functions
 echo "Assembling functions..."
-PROJECT_ROOT="$PROJECT_ROOT" bash "$SCRIPT_DIR/assemble-functions.sh"
+bash "$SCRIPT_DIR/assemble-functions.sh"
 
 # Step 2: Assemble frontend
 echo "Assembling frontend..."
-PROJECT_ROOT="$PROJECT_ROOT" bash "$SCRIPT_DIR/assemble-frontend.sh"
+bash "$SCRIPT_DIR/assemble-frontend.sh"
 
 echo "Spine assembly complete"

package/{scripts → .framework/scripts}/boundary-check.sh

@@ -28,12 +28,8 @@ fi
 echo ""
 
 # Check 2: Core importing custom_ prefixed modules
-# signal.ts is excluded: it uses a guarded dynamic import to optionally load a custom handler at runtime.
-# handler-registry.ts is excluded: it's a core stub that gets generated at assembly time.
 echo "2. Checking for custom_ module imports in core..."
-if grep -r "from.*custom_\|import.*custom_" .framework/ --include="*.ts" --include="*.tsx" 2>/dev/null \
-    | grep -v "signal\.ts:" \
-    | grep -v "handler-registry\.ts:"; then
+if grep -r "from.*custom_\|import.*custom_" .framework/ --include="*.ts" --include="*.tsx" 2>/dev/null; then
     echo "   ❌ FAIL: Core files import custom_ modules"
     VIOLATIONS=$((VIOLATIONS + 1))
 else
@@ -76,13 +72,13 @@ else
 fi
 echo ""
 
-# Check 5: Verify webhook registry pattern is used (dynamic lookup + static HANDLER_REGISTRY)
-echo "5. Checking integration-routes uses registry pattern..."
+# Check 5: Verify webhook registry is used (not static imports)
+echo "5. Checking integration-routes uses dynamic registry..."
 if grep -q "webhookHandlers\|custom_webhook-handlers" .framework/functions/integration-routes.ts 2>/dev/null; then
-    echo "   ❌ FAIL: integration-routes uses old static imports"
+    echo "   ❌ FAIL: integration-routes still uses static imports"
     VIOLATIONS=$((VIOLATIONS + 1))
 else
-    echo "   ✅ PASS: integration-routes uses registry pattern"
+    echo "   ✅ PASS: integration-routes uses dynamic registry"
 fi
 echo ""
 

package/.framework/seeds/link_types/account_cli_instances.json

@@ -0,0 +1,9 @@
+{
+  "slug": "account_cli_instances",
+  "source_kind": "account",
+  "target_kind": "item",
+  "target_type_slug": "spine_instance",
+  "name": "Account CLI Instances",
+  "description": "Links accounts to their CLI installations",
+  "is_active": true
+}

package/.framework/seeds/types/funnel_signal_use.json

@@ -0,0 +1,98 @@
+{
+  "slug": "funnel_signal_use",
+  "kind": "item",
+  "name": "Usage Signal",
+  "description": "Tracks CLI and app usage signals from npm installations",
+  "design_schema": {
+    "fields": {
+      "title": {
+        "data_type": "text",
+        "label": "Title",
+        "required": true,
+        "system": true
+      },
+      "source": {
+        "data_type": "select",
+        "label": "Source",
+        "required": true,
+        "options": ["use"]
+      },
+      "stage": {
+        "data_type": "select",
+        "label": "Stage",
+        "required": true,
+        "options": ["installed", "claimed", "active"]
+      },
+      "action_type": {
+        "data_type": "text",
+        "label": "Action Type",
+        "required": true
+      },
+      "action_value": {
+        "data_type": "number",
+        "label": "Action Value",
+        "required": true
+      },
+      "serial": {
+        "data_type": "text",
+        "label": "Install Serial",
+        "required": true
+      },
+      "app_slug": {
+        "data_type": "select",
+        "label": "App",
+        "required": false,
+        "options": ["framework", "cortex", "portal"]
+      },
+      "app_version": {
+        "data_type": "text",
+        "label": "App Version",
+        "required": false
+      }
+    },
+    "views": {
+      "default_list": {
+        "type": "list",
+        "display": "table",
+        "label": "Usage Signals",
+        "fields": {
+          "title": { "sortable": true, "display_type": "text" },
+          "action_type": { "sortable": true, "display_type": "badge" },
+          "stage": { "sortable": true, "display_type": "badge" },
+          "serial": { "sortable": true, "display_type": "text" },
+          "created_at": { "sortable": true, "display_type": "timestamp" }
+        }
+      },
+      "default_detail": {
+        "type": "detail",
+        "label": "Signal Detail",
+        "sections": [
+          {
+            "title": "Signal",
+            "fields": {
+              "action_type": { "display_type": "input" },
+              "action_value": { "display_type": "input" },
+              "stage": { "display_type": "select" }
+            }
+          },
+          {
+            "title": "Instance",
+            "fields": {
+              "serial": { "display_type": "input" },
+              "app_slug": { "display_type": "select" },
+              "app_version": { "display_type": "input" }
+            }
+          }
+        ]
+      }
+    },
+    "record_permissions": {
+      "system-admin": ["create", "read", "update", "delete"],
+      "support": ["create", "read", "update"],
+      "member": ["create", "read"]
+    }
+  },
+  "validation_schema": {},
+  "ownership": "pack",
+  "is_active": true
+}

package/.framework/seeds/types/spine_instance.json

@@ -0,0 +1,109 @@
+{
+  "slug": "spine_instance",
+  "kind": "item",
+  "name": "CLI Instance",
+  "description": "Tracks npm package installations per device",
+  "design_schema": {
+    "fields": {
+      "title": {
+        "data_type": "text",
+        "label": "Title",
+        "required": true,
+        "system": true
+      },
+      "serial": {
+        "data_type": "text",
+        "label": "Install Serial",
+        "required": true,
+        "validation": {
+          "pattern": "^sf_inst_[a-z0-9-]+$"
+        }
+      },
+      "app_slug": {
+        "data_type": "select",
+        "label": "App",
+        "required": true,
+        "options": ["framework", "cortex", "portal"]
+      },
+      "version": {
+        "data_type": "text",
+        "label": "Version",
+        "required": true
+      },
+      "claimed_by_person_id": {
+        "data_type": "reference",
+        "label": "Claimed By",
+        "required": false,
+        "validation": {
+          "reference_kind": "person"
+        }
+      },
+      "claimed_at": {
+        "data_type": "datetime",
+        "label": "Claimed At",
+        "required": false
+      },
+      "first_seen_at": {
+        "data_type": "datetime",
+        "label": "First Seen",
+        "required": true
+      },
+      "last_signal_at": {
+        "data_type": "datetime",
+        "label": "Last Signal",
+        "required": false
+      }
+    },
+    "views": {
+      "default_list": {
+        "type": "list",
+        "display": "table",
+        "label": "CLI Instances",
+        "fields": {
+          "title": { "sortable": true, "display_type": "text" },
+          "app_slug": { "sortable": true, "display_type": "badge" },
+          "version": { "sortable": true, "display_type": "text" },
+          "claimed_at": { "sortable": true, "display_type": "timestamp" },
+          "last_signal_at": { "sortable": true, "display_type": "timestamp" }
+        },
+        "default_sort": { "field": "created_at", "direction": "desc" }
+      },
+      "default_detail": {
+        "type": "detail",
+        "label": "Instance Detail",
+        "sections": [
+          {
+            "title": "Instance",
+            "fields": {
+              "serial": { "display_type": "input" },
+              "app_slug": { "display_type": "select" },
+              "version": { "display_type": "input" }
+            }
+          },
+          {
+            "title": "Claim",
+            "fields": {
+              "claimed_by_person_id": { "display_type": "reference_picker" },
+              "claimed_at": { "display_type": "timestamp" }
+            }
+          },
+          {
+            "title": "Activity",
+            "fields": {
+              "first_seen_at": { "display_type": "timestamp" },
+              "last_signal_at": { "display_type": "timestamp" }
+            }
+          }
+        ]
+      }
+    },
+    "record_permissions": {
+      "system-admin": ["create", "read", "update", "delete"],
+      "support": ["create", "read", "update"],
+      "member": ["create", "read", "update"]
+    }
+  },
+  "validation_schema": {},
+  "ownership": "pack",
+  "is_active": true
+}

package/.framework/src/App.tsx

@@ -3,12 +3,11 @@ import { Routes, Route, Navigate } from 'react-router-dom'
 import { useAuth } from './contexts/AuthContext'
 import { LoadingSpinner } from './components/ui/LoadingSpinner'
 import { LoginPage } from './pages/auth/LoginPage'
-import { RegisterPage } from './pages/auth/RegisterPage'
 import { NotFoundPage } from './pages/NotFoundPage'
 import { DashboardPage } from './pages/DashboardPage'
 import { AppWrapper } from './components/AppWrapper'
 import { AppsRegistryProvider, useAppsRegistry } from './contexts/AppContext'
-import { CustomAppLoader, getInstalledAppSlugs } from './components/CustomAppLoader'
+import { CustomAppLoader } from './components/CustomAppLoader'
 import { GenericAppShell } from './components/app-shell/GenericAppShell'
 import { APIPage } from './pages/spine-framework/APIPage'
 import { CLIPage } from './pages/spine-framework/CLIPage'
@@ -34,7 +33,6 @@ function App() {
       {!user ? (
         <Routes>
           <Route path="/login" element={<LoginPage />} />
-          <Route path="/register" element={<RegisterPage />} />
           <Route path="*" element={<Navigate to="/login" replace />} />
         </Routes>
       ) : (
@@ -58,31 +56,26 @@ function AuthenticatedRouter() {
     )
   }
 
-  // Filter to apps that are physically present in this build (custom renderer only —
-  // generic apps have no module to load so they're always allowed through).
-  const installedSlugs = getInstalledAppSlugs()
-
   // Sort: explicit prefixes first, root (/) last
   const sorted = [...apps]
     .filter(app => app.slug !== 'spine-framework' && !app.route_prefix?.startsWith('/spine-framework'))
-    .filter(app => app.renderer !== 'custom' || installedSlugs.has(app.slug))
     .sort((a, b) => {
       if (a.route_prefix === '/') return 1
       if (b.route_prefix === '/') return -1
       return (b.route_prefix?.length || 0) - (a.route_prefix?.length || 0)
     })
 
-  // When an app is mounted at root it owns all routes — suppress the
-  // framework's own /dashboard and catch-all 404 to avoid conflicts.
-  const hasRootApp = sorted.some(app => app.route_prefix === '/')
+  // Determine default redirect: first app with a route_prefix, or fall back to dashboard
+  const defaultApp = sorted.find(app => app.route_prefix && app.route_prefix !== '/')
+  const defaultRedirect = defaultApp?.route_prefix || '/dashboard'
 
   return (
     <Suspense fallback={<div className="min-h-screen flex items-center justify-center"><LoadingSpinner /></div>}>
       <Routes>
-        {/* Default redirect — suppressed when a root app is installed */}
-        {!hasRootApp && <Route path="/" element={<Navigate to="/dashboard" replace />} />}
-        {!hasRootApp && <Route path="/dashboard" element={<DashboardPage />} />}
-
+        {/* Default redirect to first available app, or dashboard if no apps */}
+        <Route path="/" element={<Navigate to={defaultRedirect} replace />} />
+        <Route path="/dashboard" element={<DashboardPage />} />
+        
         {/* Login route for authenticated users (redirects to qualified app) */}
         <Route path="/login" element={<LoginPage />} />
 
@@ -94,14 +87,12 @@ function AuthenticatedRouter() {
         {/* Dynamic app routes */}
         {sorted.map(app => {
           const prefix = app.route_prefix!
-          // React Router v6: path="/*" does NOT work for root — must use path="*"
-          const routePath = prefix === '/' ? '*' : `${prefix}/*`
 
           if (app.renderer === 'custom') {
             return (
               <Route
                 key={app.slug}
-                path={routePath}
+                path={`${prefix}/*`}
                 element={
                   <AppWrapper app={app}>
                     <CustomAppLoader slug={app.slug} />
@@ -115,7 +106,7 @@ function AuthenticatedRouter() {
             return (
               <Route
                 key={app.slug}
-                path={routePath}
+                path={`${prefix}/*`}
                 element={
                   <AppWrapper app={app}>
                     <GenericAppShell app={app} />
@@ -128,8 +119,7 @@ function AuthenticatedRouter() {
           return null
         })}
 
-        {/* 404 — suppressed when a root app is installed (it handles its own not-found) */}
-        {!hasRootApp && <Route path="*" element={<NotFoundPage />} />}
+        <Route path="*" element={<NotFoundPage />} />
       </Routes>
     </Suspense>
   )

package/.framework/src/components/CustomAppLoader.tsx

@@ -57,33 +57,16 @@ class AppErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState>
 // Static glob maps — Vite analyzes these at build time and builds a complete
 // module map. Runtime lookup is just a map key lookup, no dynamic string eval.
 // Custom apps take precedence over core apps with the same slug.
-const customAppModules = import.meta.glob('../../custom/apps/*/index.tsx')
+const customAppModules = import.meta.glob('../../../custom/apps/*/index.tsx')
 const coreAppModules   = import.meta.glob('../apps/*/index.tsx')
 
-// Extract app slug from glob key path (e.g., '.../apps/xyz/index.tsx' → 'xyz')
-function slugFromKey(key: string): string {
-  return key.split('/').slice(-2)[0]
-}
-
-/**
- * Returns the set of app slugs that are physically present in this build.
- * Used by App.tsx to filter DB app records down to only what's actually installed,
- * preventing route registration for apps that exist in the DB but not this deployment.
- */
-export function getInstalledAppSlugs(): Set<string> {
-  const slugs = new Set<string>()
-  Object.keys(customAppModules).forEach(k => slugs.add(slugFromKey(k)))
-  Object.keys(coreAppModules).forEach(k => slugs.add(slugFromKey(k)))
-  return slugs
-}
-
 // Module-level cache for lazy components to avoid re-creating on each render
 const appModuleCache = new Map<string, React.LazyExoticComponent<React.ComponentType>>()
 
 // Resolve the glob key for a given slug from the custom or core map.
 function resolveAppLoader(slug: string): (() => Promise<{ default: React.ComponentType }>) | null {
   // Check custom first (custom/apps/{slug}/index.tsx)
-  const customKey = `../../custom/apps/${slug}/index.tsx`
+  const customKey = `../../../custom/apps/${slug}/index.tsx`
   if (customAppModules[customKey]) {
     return customAppModules[customKey] as () => Promise<{ default: React.ComponentType }>
   }

package/.framework/src/components/ui/accordion.tsx

@@ -1,5 +1,5 @@
 import * as React from "react"
-import * as AccordionPrimitive from "@radix-ui/react-accordion"
+import { Accordion as AccordionPrimitive } from "radix-ui"
 
 import { cn } from "@/lib/utils"
 import { ChevronDownIcon, ChevronUpIcon } from "lucide-react"

package/.framework/src/components/ui/alert-dialog.tsx

@@ -1,5 +1,5 @@
 import * as React from "react"
-import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"
+import { AlertDialog as AlertDialogPrimitive } from "radix-ui"
 
 import { cn } from "@/lib/utils"
 import { Button } from "@/components/ui/button"

package/.framework/src/components/ui/aspect-ratio.tsx

@@ -1,6 +1,6 @@
 "use client"
 
-import * as AspectRatioPrimitive from "@radix-ui/react-aspect-ratio"
+import { AspectRatio as AspectRatioPrimitive } from "radix-ui"
 
 function AspectRatio({
   ...props

package/.framework/src/components/ui/avatar.tsx

@@ -1,5 +1,5 @@
 import * as React from "react"
-import * as AvatarPrimitive from "@radix-ui/react-avatar"
+import { Avatar as AvatarPrimitive } from "radix-ui"
 
 import { cn } from "@/lib/utils"
 

package/.framework/src/components/ui/badge.tsx

@@ -1,6 +1,6 @@
 import * as React from "react"
 import { cva, type VariantProps } from "class-variance-authority"
-import { Slot } from "@radix-ui/react-slot"
+import { Slot } from "radix-ui"
 
 import { cn } from "@/lib/utils"
 
@@ -34,7 +34,7 @@ function Badge({
   ...props
 }: React.ComponentProps<"span"> &
   VariantProps<typeof badgeVariants> & { asChild?: boolean }) {
-  const Comp = asChild ? Slot : "span"
+  const Comp = asChild ? Slot.Root : "span"
 
   return (
     <Comp

package/.framework/src/components/ui/breadcrumb.tsx

@@ -1,5 +1,5 @@
 import * as React from "react"
-import { Slot } from "@radix-ui/react-slot"
+import { Slot } from "radix-ui"
 
 import { cn } from "@/lib/utils"
 import { ChevronRightIcon, MoreHorizontalIcon } from "lucide-react"
@@ -45,7 +45,7 @@ function BreadcrumbLink({
 }: React.ComponentProps<"a"> & {
   asChild?: boolean
 }) {
-  const Comp = asChild ? Slot : "a"
+  const Comp = asChild ? Slot.Root : "a"
 
   return (
     <Comp

package/.framework/src/components/ui/button-group.tsx

@@ -1,5 +1,5 @@
 import { cva, type VariantProps } from "class-variance-authority"
-import { Slot } from "@radix-ui/react-slot"
+import { Slot } from "radix-ui"
 
 import { cn } from "@/lib/utils"
 import { Separator } from "@/components/ui/separator"
@@ -44,7 +44,7 @@ function ButtonGroupText({
 }: React.ComponentProps<"div"> & {
   asChild?: boolean
 }) {
-  const Comp = asChild ? Slot : "div"
+  const Comp = asChild ? Slot.Root : "div"
 
   return (
     <Comp

package/.framework/src/components/ui/button.tsx

@@ -1,6 +1,6 @@
 import * as React from "react"
 import { cva, type VariantProps } from "class-variance-authority"
-import { Slot } from "@radix-ui/react-slot"
+import { Slot } from "radix-ui"
 
 import { cn } from "@/lib/utils"
 
@@ -49,7 +49,7 @@ function Button({
   VariantProps<typeof buttonVariants> & {
     asChild?: boolean
   }) {
-  const Comp = asChild ? Slot : "button"
+  const Comp = asChild ? Slot.Root : "button"
 
   return (
     <Comp

package/.framework/src/components/ui/chart.tsx

@@ -2,6 +2,7 @@
 
 import * as React from "react"
 import * as RechartsPrimitive from "recharts"
+import type { TooltipValueType } from "recharts"
 
 import { cn } from "@/lib/utils"
 
@@ -9,6 +10,7 @@ import { cn } from "@/lib/utils"
 const THEMES = { light: "", dark: ".dark" } as const
 
 const INITIAL_DIMENSION = { width: 320, height: 200 } as const
+type TooltipNameType = number | string
 
 export type ChartConfig = Record<
   string,
@@ -136,7 +138,10 @@ function ChartTooltipContent({
     nameKey?: string
     labelKey?: string
   } & Omit<
-    RechartsPrimitive.TooltipContentProps,
+    RechartsPrimitive.DefaultTooltipContentProps<
+      TooltipValueType,
+      TooltipNameType
+    >,
     "accessibilityLayer"
   >) {
   const { config } = useChart()

package/.framework/src/components/ui/checkbox.tsx

@@ -1,5 +1,5 @@
 import * as React from "react"
-import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
+import { Checkbox as CheckboxPrimitive } from "radix-ui"
 
 import { cn } from "@/lib/utils"
 import { CheckIcon } from "lucide-react"

package/.framework/src/components/ui/collapsible.tsx

@@ -1,6 +1,6 @@
 "use client"
 
-import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"
+import { Collapsible as CollapsiblePrimitive } from "radix-ui"
 
 function Collapsible({
   ...props

package/.framework/src/components/ui/context-menu.tsx

@@ -1,5 +1,5 @@
 import * as React from "react"
-import * as ContextMenuPrimitive from "@radix-ui/react-context-menu"
+import { ContextMenu as ContextMenuPrimitive } from "radix-ui"
 
 import { cn } from "@/lib/utils"
 import { ChevronRightIcon, CheckIcon } from "lucide-react"

package/.framework/src/components/ui/dialog.tsx

@@ -1,7 +1,7 @@
 "use client"
 
 import * as React from "react"
-import * as DialogPrimitive from "@radix-ui/react-dialog"
+import { Dialog as DialogPrimitive } from "radix-ui"
 
 import { cn } from "@/lib/utils"
 import { Button } from "@/components/ui/button"