@owdproject/cli 0.2.1 → 4.0.0-alpha.3

package/bin/cli.js

@@ -72,7 +72,7 @@ CONTROL PANEL (TUI)
   q / Esc                 Quit
   ${name} init [dir]      Create a new OWD project (then opens the control panel)
   ${name} create                  Create a new app or module (interactive wizard)
-  ${name} create <kind> <name>    Scaffold a new app or module (e.g. desktop create app todo)
+  ${name} create <kind> <name>    Scaffold a new app or module (e.g. desktop create app todo → @owdproject/nuxt-app-todo)
   ${name} add <package> [options]
   ${name} add <kind> <name> [options]
   ${name} validate [path...]  Check Nuxt module + playground layout
@@ -99,17 +99,17 @@ INSTALL SOURCES (control panel or CLI)
 EXAMPLES
   pnpm ${name}            # control panel
   pnpm ${name} dev        # monorepo desktop (from repo root)
-  cd apps/app-about && pnpm ${name} dev   # app-about playground
+  cd apps/owd-nuxt-app-about && pnpm ${name} dev   # about app playground
   pnpm ${name} dev --playground           # force playground when cwd is in a module
   ${name} init my-desktop # scaffold + pnpm install + control panel
-  ${name} add app-todo --npm
-  ${name} add app-todo --dev
-  ${name} add module-persistence --from dxlliv
+  ${name} add nuxt-app-todo --npm
+  ${name} add nuxt-app-todo --dev
+  ${name} add nuxt-module-pinia-persistence --from dxlliv
 
 KINDS (optional — inferred from the package name)
-  app       app-*     → apps/
-  module    module-*  → packages/  (kit-* and *-template are not listed in the control panel)
-  theme     theme-*   → themes/
+  app       nuxt-app-*    → apps/     (react-app-* for React desktops)
+  module    nuxt-module-* → packages/ (nuxt-kit-*, react-kit-* and *-template are not listed in the control panel)
+  theme     nuxt-theme-*  → themes/   (react-theme-* for React desktops)
 
 OPTIONS
   --playground      Start the module playground dev server (when cwd is inside an @owdproject/* package with playground/)
@@ -130,7 +130,7 @@ OPTIONS
   <git-url>       Full clone URL
 
 LEGACY (still supported)
-  ${name} install-app @owdproject/app-todo
+  ${name} install-app @owdproject/nuxt-app-todo
   → prefer: ${name} add app-todo
 `
 }
@@ -349,7 +349,7 @@ export async function runCli(name, argv, options = {}) {
     if (forcePlayground && !devTarget) {
       fail(
         'No @owdproject module with playground/desktop.config.ts found from this directory.',
-        'Run from an app/theme/module package (e.g. apps/app-about), or omit --playground for the monorepo desktop.',
+        'Run from an app/theme/module package (e.g. apps/owd-nuxt-app-about), or omit --playground for the monorepo desktop.',
       )
     }
     runDevForeground(devTarget)

package/bin/cp.js

@@ -2086,12 +2086,12 @@ export async function runCp(commandName = 'desktop') {
 
   const npmDownloads = {
     '@owdproject/core': 410,
-    '@owdproject/app-about': 8,
-    '@owdproject/app-todo': 12,
-    '@owdproject/app-terminal': 24,
-    '@owdproject/module-fs': 52,
-    '@owdproject/module-persistence': 38,
-    '@owdproject/theme-gnome': 14,
+    '@owdproject/nuxt-app-about': 8,
+    '@owdproject/nuxt-app-todo': 12,
+    '@owdproject/nuxt-app-terminal': 24,
+    '@owdproject/nuxt-module-fs': 52,
+    '@owdproject/nuxt-module-pinia-persistence': 38,
+    '@dxlliv/nuxt-theme-gnome': 14,
     '@owdproject/theme-win95': 36,
   }
 

package/bin/lib/catalog.js

@@ -14,6 +14,7 @@ import {
   fullName,
   shortName,
   inferKind,
+  withoutFrameworkPrefix,
   isInstallableDesktopModule,
   desktopMetaDir,
 } from './workspace.js'
@@ -416,7 +417,7 @@ export function filterCatalog(catalog, kind, options = {}) {
   const sortMode = normalizeCatalogSort(options.sortMode ?? 'updated')
   const filtered = catalog
     .filter((e) => e.kind === kind)
-    .filter((e) => kind !== 'module' || (isInstallableDesktopModule(e.name) && e.shortName.startsWith('module-')))
+    .filter((e) => kind !== 'module' || (isInstallableDesktopModule(e.name) && withoutFrameworkPrefix(e.shortName).startsWith('module-')))
 
   return sortCatalog(filtered, sortMode, options.config ?? null)
 }

package/bin/lib/create.js

@@ -64,8 +64,12 @@ function copyAndScaffold(srcDir, destDir, replacements) {
     }
 
     const srcPath = join(srcDir, entry)
+    // Longest placeholder first so e.g. `desktop-app-template` wins over `app-template`.
+    const orderedReplacements = Object.entries(replacements).sort(
+      (a, b) => b[0].length - a[0].length,
+    )
     let destEntry = entry
-    for (const [placeholder, val] of Object.entries(replacements)) {
+    for (const [placeholder, val] of orderedReplacements) {
       destEntry = destEntry.replaceAll(placeholder, val)
     }
     const destPath = join(destDir, destEntry)
@@ -78,7 +82,7 @@ function copyAndScaffold(srcDir, destDir, replacements) {
       const isText = !fileContent.slice(0, 512).includes(0)
       if (isText) {
         let textContent = fileContent.toString('utf8')
-        for (const [placeholder, val] of Object.entries(replacements)) {
+        for (const [placeholder, val] of orderedReplacements) {
           textContent = textContent.replaceAll(placeholder, val)
         }
         writeFileSync(destPath, textContent, 'utf8')
@@ -125,14 +129,16 @@ export async function runCreateCli(options = {}) {
     rl.close()
   }
 
-  // Normalize prefix from name (e.g. if user entered "app-todo" instead of "todo")
-  if (kind === 'app' && name.startsWith('app-')) {
-    name = name.slice(4)
-  } else if (kind === 'module' && name.startsWith('module-')) {
-    name = name.slice(7)
+  // Normalize prefix from name (e.g. if user entered "nuxt-app-todo" or "app-todo"
+  // instead of "todo"). New Nuxt extension packages are framework-first.
+  for (const prefix of [`nuxt-${kind}-`, `${kind}-`]) {
+    if (name.startsWith(prefix)) {
+      name = name.slice(prefix.length)
+      break
+    }
   }
 
-  const pkgShortName = `${kind}-${name}`
+  const pkgShortName = `nuxt-${kind}-${name}`
   const pkgFullName = `@owdproject/${pkgShortName}`
   const workspaceDir = KINDS[kind].workspaceDir
   const targetDir = join(workspaceRoot, workspaceDir, pkgShortName)

package/bin/lib/generateTemplate.js

@@ -24,15 +24,17 @@ const BLUEPRINT_ROOT = resolve(__dirname, '../../../core/template-blueprint')
 
 export const STARTER_DESKTOP_DEPS = [
   '@owdproject/core',
-  '@owdproject/theme-nova',
-  '@owdproject/app-about',
+  '@owdproject/nuxt',
+  '@owdproject/nuxt-theme-nova',
+  '@owdproject/nuxt-app-about',
   'h3',
 ]
 
 /** Used when a starter package is not on npm yet (before first publish). */
 export const TEMPLATE_NPM_FALLBACK_VERSIONS = {
-  '@owdproject/core': '3.4.0',
-  '@owdproject/theme-nova': '0.0.1',
+  '@owdproject/core': '4.0.0-alpha.3',
+  '@owdproject/nuxt': '4.0.0-alpha.3',
+  '@owdproject/nuxt-theme-nova': '4.0.0-alpha.3',
 }
 
 const DESKTOP_COPY_FILES = [
@@ -202,7 +204,7 @@ function buildTemplateDesktopPackageJson(versions) {
   }
 
   const pkg = {
-    name: '@owdproject/client',
+    name: '@owdproject/nuxt-desktop',
     private: true,
     nx: { name: 'desktop' },
     scripts: {

package/bin/lib/migrateModulePlayground.config.mjs

@@ -5,7 +5,7 @@ export const configs = [
   {
     path: 'apps/app-todo',
     slug: 'app-todo',
-    name: '@owdproject/app-todo',
+    name: '@owdproject/nuxt-app-todo',
     moduleName: 'desktop-app-todo',
     version: '0.1.3',
     keywords: ['owd-client', 'owd-apps', 'owd-modules'],
@@ -21,7 +21,7 @@ export const configs = [
   {
     path: 'apps/app-terminal',
     slug: 'app-terminal',
-    name: '@owdproject/app-terminal',
+    name: '@owdproject/nuxt-app-terminal',
     moduleName: 'desktop-app-terminal',
     version: '0.1.3',
     launch: {
@@ -36,7 +36,7 @@ export const configs = [
   {
     path: 'apps/app-debug',
     slug: 'app-debug',
-    name: '@owdproject/app-debug',
+    name: '@owdproject/nuxt-app-debug',
     moduleName: 'desktop-app-debug',
     version: '0.1.0',
     launch: {
@@ -51,7 +51,7 @@ export const configs = [
   {
     path: 'apps/app-dino',
     slug: 'app-dino',
-    name: '@owdproject/app-dino',
+    name: '@owdproject/nuxt-app-dino',
     moduleName: 'desktop-app-dino',
     version: '0.0.1',
     private: true,
@@ -66,7 +66,7 @@ export const configs = [
   {
     path: 'apps/app-soundcloud',
     slug: 'app-soundcloud',
-    name: '@owdproject/app-soundcloud',
+    name: '@owdproject/nuxt-app-soundcloud',
     moduleName: 'desktop-app-soundcloud',
     version: '0.1.0',
     launch: {
@@ -81,7 +81,7 @@ export const configs = [
   {
     path: 'apps/app-youtube',
     slug: 'app-youtube',
-    name: '@owdproject/app-youtube',
+    name: '@owdproject/nuxt-app-youtube',
     moduleName: 'desktop-app-youtube',
     version: '0.1.0',
     launch: {
@@ -96,16 +96,16 @@ export const configs = [
   {
     path: 'apps/app-classic-audioplayer',
     slug: 'app-classic-audioplayer',
-    name: '@owdproject/app-classic-audioplayer',
+    name: '@owdproject/nuxt-app-classic-audioplayer',
     moduleName: 'desktop-app-classic-audioplayer',
     version: '0.0.4',
-    playgroundModules: ['@owdproject/module-fs', '@owdproject/module-persistence'],
-    playgroundApps: ['@owdproject/app-classic-audioplayer'],
+    playgroundModules: ['@owdproject/nuxt-module-fs', '@owdproject/nuxt-module-pinia-persistence'],
+    playgroundApps: ['@owdproject/nuxt-app-classic-audioplayer'],
     fsMounts: { '/mnt/test': '/test.zip' },
     copyTestZip: true,
     playgroundExtraDevDeps: {
-      '@owdproject/module-fs': 'workspace:*',
-      '@owdproject/module-persistence': 'workspace:*',
+      '@owdproject/nuxt-module-fs': 'workspace:*',
+      '@owdproject/nuxt-module-pinia-persistence': 'workspace:*',
     },
     launch: {
       file: 'launch-audioplayer.client.ts',
@@ -120,7 +120,7 @@ export const configs = [
   {
     path: 'apps/app-classic-videoplayer',
     slug: 'app-classic-videoplayer',
-    name: '@owdproject/app-classic-videoplayer',
+    name: '@owdproject/nuxt-app-classic-videoplayer',
     moduleName: 'desktop-app-classic-videoplayer',
     version: '0.0.4',
     launch: {
@@ -138,13 +138,13 @@ export const configs = [
     name: '@owdproject/app-explorer',
     moduleName: 'desktop-app-explorer',
     version: '0.0.4',
-    playgroundModules: ['@owdproject/module-fs', '@owdproject/module-persistence'],
+    playgroundModules: ['@owdproject/nuxt-module-fs', '@owdproject/nuxt-module-pinia-persistence'],
     playgroundApps: ['@owdproject/app-explorer'],
     fsMounts: { '/mnt/test': '/test.zip' },
     copyTestZip: true,
     playgroundExtraDevDeps: {
-      '@owdproject/module-fs': 'workspace:*',
-      '@owdproject/module-persistence': 'workspace:*',
+      '@owdproject/nuxt-module-fs': 'workspace:*',
+      '@owdproject/nuxt-module-pinia-persistence': 'workspace:*',
     },
     dependencies: {
     },
@@ -160,20 +160,20 @@ export const configs = [
   {
     path: 'apps/app-atproto',
     slug: 'app-atproto',
-    name: '@owdproject/app-atproto',
+    name: '@owdproject/nuxt-app-atproto',
     moduleName: 'desktop-app-atproto',
     version: '0.0.3',
     playgroundTheme: '@owdproject/theme-win95',
     playgroundModules: ['@owdproject/module-atproto'],
-    playgroundApps: ['@owdproject/app-terminal', '@owdproject/app-atproto'],
+    playgroundApps: ['@owdproject/nuxt-app-terminal', '@owdproject/nuxt-app-atproto'],
     dependencies: {
-      '@owdproject/kit-tailwind': 'workspace:*',
+      '@owdproject/nuxt-kit-tailwind': 'workspace:*',
       '@owdproject/module-atproto': 'workspace:*',
     },
     playgroundExtraDevDeps: {
       '@owdproject/module-atproto': 'workspace:*',
       '@owdproject/theme-win95': 'workspace:*',
-      '@owdproject/app-terminal': 'workspace:*',
+      '@owdproject/nuxt-app-terminal': 'workspace:*',
     },
     launch: {
       file: 'launch-atproto.client.ts',

package/bin/lib/migrateModulePlayground.mjs

@@ -19,7 +19,7 @@ function fixAppPlugin(pluginPath, registerName) {
   writeFileSync(
     pluginPath,
     `import { defineNuxtPlugin } from 'nuxt/app'
-import { defineDesktopApp } from '@owdproject/core/kit/defineDesktopApp'
+import { defineDesktopApp } from '@owdproject/nuxt/kit/defineDesktopApp'
 import ${configVar} from './app.config'
 
 export default defineNuxtPlugin({
@@ -38,8 +38,8 @@ function buildLaunchPlugin(cfg) {
   if (l.fsDemo) {
     return `import { nextTick } from 'vue'
 import { defineNuxtPlugin } from 'nuxt/app'
-import { useApplicationManager } from '@owdproject/core/runtime/composables/useApplicationManager'
-import { openVfsFile } from '@owdproject/module-fs/runtime/utils/utilFsOpenFile'
+import { useApplicationManager } from '@owdproject/nuxt/runtime/composables/useApplicationManager'
+import { openVfsFile } from '@owdproject/nuxt-module-fs/runtime/utils/utilFsOpenFile'
 
 const APP_ID = '${l.appId}'
 
@@ -75,7 +75,7 @@ export default defineNuxtPlugin({
 
   return `import { nextTick } from 'vue'
 import { defineNuxtPlugin } from 'nuxt/app'
-import { useApplicationManager } from '@owdproject/core/runtime/composables/useApplicationManager'
+import { useApplicationManager } from '@owdproject/nuxt/runtime/composables/useApplicationManager'
 
 const APP_ID = '${l.appId}'
 const WINDOW_MODEL = 'main'
@@ -126,7 +126,8 @@ function buildPackageJson(cfg, old) {
     '@nuxt/module-builder': '^1.0.2',
     '@nuxt/schema': '^4.3.0',
     '@owdproject/core': 'workspace:*',
-    '@owdproject/theme-nova': 'workspace:*',
+    '@owdproject/nuxt': 'workspace:*',
+    '@owdproject/nuxt-theme-nova': 'workspace:*',
     nuxt: '^4.3.0',
     typescript: '~5.9.3',
     ...(cfg.devDependencies || {}),
@@ -158,7 +159,7 @@ function buildPackageJson(cfg, old) {
     },
     dependencies: deps,
     devDependencies: devDeps,
-    peerDependencies: old.peerDependencies || { '@owdproject/core': '^3.2.0' },
+    peerDependencies: old.peerDependencies || { '@owdproject/core': '>=4.0.0-alpha.0', '@owdproject/nuxt': '^4.0.0-alpha.3' },
   }
   if (cfg.private || old.private) pkg.private = true
   if (old.peerDependenciesMeta) pkg.peerDependenciesMeta = old.peerDependenciesMeta
@@ -168,11 +169,12 @@ function buildPackageJson(cfg, old) {
 function buildPlaygroundPkg(cfg) {
   const deps = {
     '@owdproject/core': 'workspace:*',
+    '@owdproject/nuxt': 'workspace:*',
     [cfg.name]: 'workspace:*',
     nuxt: '^4.4.4',
     ...(cfg.playgroundExtraDevDeps || {}),
   }
-  if (!cfg.playgroundTheme) deps['@owdproject/theme-nova'] = 'workspace:*'
+  if (!cfg.playgroundTheme) deps['@owdproject/nuxt-theme-nova'] = 'workspace:*'
   if (cfg.playgroundTheme) deps[cfg.playgroundTheme] = 'workspace:*'
   return {
     name: `${cfg.name}-playground`,
@@ -184,10 +186,10 @@ function buildPlaygroundPkg(cfg) {
 }
 
 function buildDesktopConfig(cfg) {
-  const theme = cfg.playgroundTheme || '@owdproject/theme-nova'
+  const theme = cfg.playgroundTheme || '@owdproject/nuxt-theme-nova'
   const apps = cfg.playgroundApps || [cfg.name]
   const modules = cfg.playgroundModules || []
-  let s = `import { defineDesktopConfig } from '@owdproject/core'\n\nexport default defineDesktopConfig({\n  theme: '${theme}',\n`
+  let s = `import { defineDesktopConfig } from '@owdproject/nuxt'\n\nexport default defineDesktopConfig({\n  theme: '${theme}',\n`
   if (apps.length) s += `  apps: [${apps.map((a) => `'${a}'`).join(', ')}],\n`
   if (modules.length) s += `  modules: [${modules.map((m) => `'${m}'`).join(', ')}],\n`
   s += '  systemBar: { enabled: true, startButton: true },\n'
@@ -201,7 +203,7 @@ function buildDesktopConfig(cfg) {
 }
 
 const NUXT = `export default defineNuxtConfig({
-  modules: ['@owdproject/core'],
+  modules: ['@owdproject/nuxt'],
   app: { baseURL: process.env.NUXT_APP_BASE_URL || '/' },
   i18n: { strategy: 'no_prefix' },
   devtools: { enabled: true },

package/bin/lib/scaffold.js

@@ -14,7 +14,7 @@ import { fileURLToPath } from 'node:url'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
 const CLIENT_TEMPLATE = resolve(__dirname, '../../../../template')
-const DEFAULT_CLIENT_REPO = 'https://github.com/owdproject/client.git'
+const DEFAULT_CLIENT_REPO = 'https://github.com/owdproject/nuxt-desktop.git'
 
 /**
  * @param {string} [startDir]

package/bin/lib/validateModule.js

@@ -1,12 +1,12 @@
 import { execSync } from 'node:child_process'
 import { existsSync, readFileSync, readdirSync, statSync } from 'node:fs'
 import { dirname, join, relative, resolve } from 'node:path'
-import { findWorkspaceRoot } from './workspace.js'
+import { findWorkspaceRoot, withoutFrameworkPrefix } from './workspace.js'
 
 const SCOPE = '@owdproject/'
 
 export const DESKTOP_CORE_PACKAGE = '@owdproject/core'
-export const DESKTOP_KIT_PRIMEVUE_PACKAGE = '@owdproject/kit-primevue'
+export const DESKTOP_KIT_PRIMEVUE_PACKAGE = '@owdproject/nuxt-kit-primevue'
 
 const REQUIRED_SCRIPTS = ['dev', 'dev:prepare', 'dev:generate', 'prepack']
 const INFRASTRUCTURE_PLAYBOOK_SCRIPTS = ['dev:prepare', 'prepack']
@@ -19,7 +19,7 @@ export function isDesktopCorePackage(pkgName) {
 }
 
 /**
- * Published Nuxt modules without an app/theme playground (core, kit-primevue).
+ * Published Nuxt modules without an app/theme playground (core, kit-nuxt-primevue).
  *
  * @param {string} pkgName
  */
@@ -35,8 +35,9 @@ export function isDesktopInfrastructurePackage(pkgName) {
  */
 export function inferModuleKind(pkgName) {
   const short = pkgName.startsWith(SCOPE) ? pkgName.slice(SCOPE.length) : pkgName
-  if (short.startsWith('app-')) return 'app'
-  if (short.startsWith('theme-')) return 'theme'
+  const base = withoutFrameworkPrefix(short)
+  if (base.startsWith('app-')) return 'app'
+  if (base.startsWith('theme-')) return 'theme'
   return 'module'
 }
 
@@ -439,11 +440,11 @@ export function validateOwdModule(packageDir, options = {}) {
   }
 
   const peerDeps = /** @type {Record<string, string>} */ (pkg.peerDependencies ?? {})
-  if (!peerDeps['@owdproject/core']) {
+  if (!peerDeps['@owdproject/core'] && !peerDeps['@owdproject/nuxt']) {
     issue(
       'warning',
       'peer-core',
-      'peerDependencies should declare @owdproject/core',
+      'peerDependencies should declare @owdproject/nuxt for shell APIs',
     )
   }
 
@@ -495,21 +496,21 @@ export function validateOwdModule(packageDir, options = {}) {
       moduleSrc.includes('registerTailwindPath') ||
       moduleSrc.includes('registerThemeTailwindPath')
     const hasKitPrimevue =
-      moduleSrc.includes("installModule('@owdproject/kit-primevue'") ||
-      moduleSrc.includes('installModule("@owdproject/kit-primevue"')
+      moduleSrc.includes("installModule('@owdproject/nuxt-kit-primevue'") ||
+      moduleSrc.includes('installModule("@owdproject/nuxt-kit-primevue"')
     if (kind === 'theme') {
       if (!hasKitPrimevue) {
         issue(
           'warning',
-          'kit-primevue',
-          'theme src/module.ts should install @owdproject/kit-primevue for PrimeVue + Tailwind',
+          'kit-nuxt-primevue',
+          'theme src/module.ts should install @owdproject/nuxt-kit-primevue for PrimeVue + Tailwind',
         )
       }
       if (!hasKitTailwind) {
         issue(
           'warning',
           'tailwind-path',
-          'theme src/module.ts should call registerThemeTailwindPath from @owdproject/kit-primevue/kit/registerTailwindPath',
+          'theme src/module.ts should call registerThemeTailwindPath from @owdproject/nuxt-kit-primevue/kit/registerTailwindPath',
         )
       }
 
@@ -561,7 +562,7 @@ export function validateOwdModule(packageDir, options = {}) {
       issue(
         'warning',
         'tailwind-path',
-        'src/module.ts should call registerTailwindPath from @owdproject/kit-tailwind/kit/registerTailwindPath for Vue components',
+        'src/module.ts should call registerTailwindPath from @owdproject/nuxt-kit-tailwind/kit/registerTailwindPath for Vue components',
       )
     }
 
@@ -615,18 +616,18 @@ export function validateOwdModule(packageDir, options = {}) {
             `playground/package.json must depend on ${pkgName}`,
           )
         }
-        if (!deps['@owdproject/core']) {
+        if (!deps['@owdproject/nuxt']) {
           issue(
             'error',
             'playground-core-dep',
-            'playground/package.json must depend on @owdproject/core',
+            'playground/package.json must depend on @owdproject/nuxt',
           )
         }
-        if (kind === 'app' && !deps['@owdproject/theme-nova']) {
+        if (kind === 'app' && !deps['@owdproject/nuxt-theme-nova']) {
           issue(
             'warning',
             'playground-theme-nova',
-            'app playgrounds should use @owdproject/theme-nova in dependencies',
+            'app playgrounds should use @owdproject/nuxt-theme-nova in dependencies',
           )
         }
       } catch {
@@ -639,11 +640,11 @@ export function validateOwdModule(packageDir, options = {}) {
       issue('error', 'playground-nuxt-config', 'playground/nuxt.config.ts is required')
     } else {
       const nuxtCfg = readFileSync(nuxtConfigPath, 'utf8')
-      if (!nuxtCfg.includes('@owdproject/core')) {
+      if (!nuxtCfg.includes('@owdproject/nuxt')) {
         issue(
           'error',
           'playground-nuxt-core',
-          'playground/nuxt.config.ts must register @owdproject/core',
+          'playground/nuxt.config.ts must register @owdproject/nuxt',
         )
       }
       if (!/\bssr\s*:\s*false\b/.test(nuxtCfg)) {
@@ -716,8 +717,8 @@ export function validateOwdModule(packageDir, options = {}) {
     if (appDeps[DESKTOP_KIT_PRIMEVUE_PACKAGE]) {
       issue(
         'warning',
-        'app-kit-primevue-dep',
-        'remove @owdproject/kit-primevue from app dependencies — PrimeVue comes from the theme at runtime; apps only need @owdproject/kit-tailwind',
+        'app-kit-nuxt-primevue-dep',
+        'remove @owdproject/nuxt-kit-primevue from app dependencies — PrimeVue comes from the theme at runtime; apps only need @owdproject/nuxt-kit-tailwind',
       )
     }
 
@@ -794,7 +795,7 @@ export function validateOwdModule(packageDir, options = {}) {
           issue(
             'warning',
             'launch-auto-start',
-            `${launchFile}: prefer autoStartPlaygroundApps(nuxtApp, [...]) from @owdproject/core (handles workArea + stale windows)`,
+            `${launchFile}: prefer autoStartPlaygroundApps(nuxtApp, [...]) from @owdproject/nuxt (handles workArea + stale windows)`,
           )
         }
       }

package/bin/lib/workspace.js

@@ -8,6 +8,19 @@ import {
 
 export const SCOPE = '@owdproject/'
 
+/** Framework segments used by framework-first OWD package names (nuxt-app-*, react-theme-*). */
+export const FRAMEWORKS = ['nuxt', 'react', 'vue', 'svelte', 'angular', 'astro']
+
+/**
+ * Strips a leading framework segment so kind/kit/module detection keeps working
+ * with framework-first names (nuxt-app-about -> app-about, react-theme-win95 -> theme-win95).
+ */
+export function withoutFrameworkPrefix(short) {
+  const idx = short.indexOf('-')
+  if (idx > 0 && FRAMEWORKS.includes(short.slice(0, idx))) return short.slice(idx + 1)
+  return short
+}
+
 /** Not loadable via desktop.config `modules` (core is the shell). */
 export const DESKTOP_NON_INSTALLABLE = new Set([
   '@owdproject/core',
@@ -37,21 +50,21 @@ export function docsBasePathFromConfig(config) {
 export function isDesktopKitPackage(pkgName) {
   const isScoped = pkgName.startsWith(SCOPE)
   const short = isScoped ? pkgName.slice(SCOPE.length) : pkgName
-  if (!isScoped && !pkgName.startsWith('kit-')) return false
-  return short.startsWith('kit-')
+  if (!isScoped && !withoutFrameworkPrefix(short).startsWith('kit-')) return false
+  return withoutFrameworkPrefix(short).startsWith('kit-')
 }
 
 /** Scaffold / blueprint packages — not loadable desktop modules. */
 export function isDesktopTemplatePackage(pkgName) {
   const isScoped = pkgName.startsWith(SCOPE)
   const short = isScoped ? pkgName.slice(SCOPE.length) : pkgName
-  if (!isScoped && !pkgName.endsWith('-template')) return false
   return short.endsWith('-template')
 }
 
 export function isInstallableDesktopModule(pkgName) {
   const isScoped = pkgName.startsWith(SCOPE)
-  if (!isScoped && !pkgName.startsWith('module-')) return false
+  const short = isScoped ? pkgName.slice(SCOPE.length) : pkgName
+  if (!isScoped && !withoutFrameworkPrefix(short).startsWith('module-')) return false
   return (
     !DESKTOP_NON_INSTALLABLE.has(pkgName) &&
     !isDesktopKitPackage(pkgName) &&
@@ -196,8 +209,9 @@ export function fullName(short) {
 }
 
 export function inferKind(shortName) {
-  if (shortName.startsWith('app-')) return 'app'
-  if (shortName.startsWith('theme-')) return 'theme'
+  const base = withoutFrameworkPrefix(shortName)
+  if (base.startsWith('app-')) return 'app'
+  if (base.startsWith('theme-')) return 'theme'
   return 'module'
 }
 

package/go/tui/engine_test.go

@@ -18,23 +18,23 @@ func TestResolveMethodLabel(t *testing.T) {
 func TestBuildConfigFromPendingRemovals(t *testing.T) {
 	ctx := &bridge.WorkspaceContext{
 		Config: bridge.Config{
-			Apps:    []string{"@owdproject/app-about", "@owdproject/app-todo"},
+			Apps:    []string{"@owdproject/nuxt-app-about", "@owdproject/nuxt-app-todo"},
 			Modules: []string{},
 		},
 	}
 	catalog := &bridge.CatalogResponse{
 		Entries: []bridge.CatalogEntry{
-			{Name: "@owdproject/app-todo", ShortName: "app-todo", Kind: "app"},
+			{Name: "@owdproject/nuxt-app-todo", ShortName: "app-todo", Kind: "app"},
 		},
 	}
 	pending := map[string]bool{
-		"@owdproject/app-todo": false,
+		"@owdproject/nuxt-app-todo": false,
 	}
 	config, removes := buildConfigFromPending(ctx, catalog, pending, nil)
-	if len(removes) != 1 || removes[0] != "@owdproject/app-todo" {
+	if len(removes) != 1 || removes[0] != "@owdproject/nuxt-app-todo" {
 		t.Fatalf("expected removal, got %v", removes)
 	}
-	if containsStr(config.Apps, "@owdproject/app-todo") {
+	if containsStr(config.Apps, "@owdproject/nuxt-app-todo") {
 		t.Fatalf("app-todo should be removed from config, got %v", config.Apps)
 	}
 }

package/go/tui/handlers.go

@@ -274,8 +274,8 @@ func (m *TuiModel) handleResolveDependencyKeys(msg tea.KeyMsg) (tea.Model, tea.C
 		methods = append(methods, struct{ Name, Label string }{"local", "Use Existing Local Folder"})
 	}
 	methods = append(methods,
-		struct{ Name, Label string }{"git-ssh", "Git SSH"},
 		struct{ Name, Label string }{"git-https", "Git HTTPS"},
+		struct{ Name, Label string }{"git-ssh", "Git SSH"},
 		struct{ Name, Label string }{"npm", "NPM Package"},
 	)
 

package/go/tui/helpers.go

@@ -176,7 +176,7 @@ func getOwdDepsLocal(workspaceRoot, shortName, kind string) ([]string, bool) {
 			if !strings.HasPrefix(name, "@owdproject/") || seen[name] {
 				continue
 			}
-			short := name[strings.LastIndex(name, "/")+1:]
+			short := baseKindName(name[strings.LastIndex(name, "/")+1:])
 			if strings.HasPrefix(short, "module-") || strings.HasPrefix(short, "kit-") || strings.HasPrefix(short, "app-") || strings.HasPrefix(short, "theme-") {
 				deps = append(deps, name)
 				seen[name] = true
@@ -219,7 +219,7 @@ func getOwdDepsFromNpm(pkgName string) ([]string, error) {
 		if !strings.HasPrefix(name, "@owdproject/") || seen[name] {
 			continue
 		}
-		short := name[strings.LastIndex(name, "/")+1:]
+		short := baseKindName(name[strings.LastIndex(name, "/")+1:])
 		if strings.HasPrefix(short, "module-") || strings.HasPrefix(short, "kit-") || strings.HasPrefix(short, "app-") || strings.HasPrefix(short, "theme-") {
 			deps = append(deps, name)
 			seen[name] = true

package/go/tui/helpers_test.go

@@ -73,7 +73,7 @@ func TestCatalogSourceLabel(t *testing.T) {
 }
 
 func TestActiveThemeName(t *testing.T) {
-	nova := "@owdproject/theme-nova"
+	nova := "@owdproject/nuxt-theme-nova"
 	gnome := "@owdproject/theme-gnome"
 	ctx := &bridge.WorkspaceContext{
 		Config: bridge.Config{Theme: &nova},

package/go/tui/modals.go

@@ -144,8 +144,8 @@ func (m *TuiModel) renderResolveDependencyModal() string {
 		options = append(options, struct{ Name, Label string }{"local", "Use Existing Local Folder"})
 	}
 	options = append(options,
-		struct{ Name, Label string }{"git-ssh", "Git SSH"},
 		struct{ Name, Label string }{"git-https", "Git HTTPS"},
+		struct{ Name, Label string }{"git-ssh", "Git SSH"},
 		struct{ Name, Label string }{"npm", "NPM Package"},
 	)
 	for i, opt := range options {
@@ -212,7 +212,7 @@ func (m *TuiModel) renderManagePackageModal(pkg *bridge.CatalogEntry) string {
 	// Kits
 	var kits []string
 	for _, dep := range m.promptPkgDeps {
-		if strings.HasPrefix(dep, "@owdproject/kit-") {
+		if isOwdKit(dep) {
 			shortKit := dep[strings.LastIndex(dep, "/")+1:]
 			kits = append(kits, shortKit)
 		}
@@ -263,7 +263,7 @@ func (m *TuiModel) renderManagePackageModal(pkg *bridge.CatalogEntry) string {
 	// Deps (excluding kits)
 	var otherDeps []string
 	for _, d := range m.promptPkgDeps {
-		if !strings.HasPrefix(d, "@owdproject/kit-") {
+		if !isOwdKit(d) {
 			s := d
 			if idx := strings.LastIndex(d, "/"); idx >= 0 {
 				s = d[idx+1:]

package/go/tui/resolver.go

@@ -53,6 +53,34 @@ func shortNameFromPkg(name string) string {
 	return name
 }
 
+// knownFrameworks are the framework segments used by framework-first OWD package
+// names (e.g. nuxt-app-about, react-theme-win95).
+var knownFrameworks = map[string]bool{
+	"nuxt":    true,
+	"react":   true,
+	"vue":     true,
+	"svelte":  true,
+	"angular": true,
+	"astro":   true,
+}
+
+// baseKindName strips a leading framework segment so kind/kit/module detection
+// keeps working with framework-first names (nuxt-app-about -> app-about).
+func baseKindName(short string) string {
+	if idx := strings.Index(short, "-"); idx >= 0 && knownFrameworks[short[:idx]] {
+		return short[idx+1:]
+	}
+	return short
+}
+
+// isOwdKit reports whether a scoped OWD package is a UI kit (kit-*, nuxt-kit-*, …).
+func isOwdKit(name string) bool {
+	if !strings.HasPrefix(name, "@owdproject/") {
+		return false
+	}
+	return strings.HasPrefix(baseKindName(shortNameFromPkg(name)), "kit-")
+}
+
 func kindDirForKind(kind string) string {
 	switch kind {
 	case "app":
@@ -76,9 +104,9 @@ func catalogEntryForName(catalog *bridge.CatalogResponse, name string) bridge.Ca
 	}
 	short := shortNameFromPkg(name)
 	kind := "module"
-	if strings.HasPrefix(short, "app-") {
+	if strings.HasPrefix(baseKindName(short), "app-") {
 		kind = "app"
-	} else if strings.HasPrefix(short, "theme-") {
+	} else if strings.HasPrefix(baseKindName(short), "theme-") {
 		kind = "theme"
 	}
 	return bridge.CatalogEntry{
@@ -212,7 +240,8 @@ func BuildStartupCheckQueue(
 					continue
 				}
 				short := shortNameFromPkg(dep)
-				if !strings.HasPrefix(short, "kit-") && !strings.HasPrefix(short, "module-") {
+				base := baseKindName(short)
+				if !strings.HasPrefix(base, "kit-") && !strings.HasPrefix(base, "module-") {
 					continue
 				}
 				if isLocallyAvailable(workspaceRoot, short) {
@@ -365,9 +394,9 @@ func DiscoverNestedDeps(
 		}
 		depShort := shortNameFromPkg(dep)
 		depKind := "module"
-		if strings.HasPrefix(depShort, "app-") {
+		if strings.HasPrefix(baseKindName(depShort), "app-") {
 			depKind = "app"
-		} else if strings.HasPrefix(depShort, "theme-") {
+		} else if strings.HasPrefix(baseKindName(depShort), "theme-") {
 			depKind = "theme"
 		}
 		logFn("⚠ Dependency discovered: " + depShort)

package/go/tui/resolver_test.go

@@ -25,8 +25,8 @@ func TestReadDesktopPackageDeps(t *testing.T) {
 	pkgPath := filepath.Join(dir, "package.json")
 	content := `{
   "dependencies": {
-    "@owdproject/app-about": "workspace:*",
-    "@owdproject/theme-nova": "^1.0.0"
+    "@owdproject/nuxt-app-about": "workspace:*",
+    "@owdproject/nuxt-theme-nova": "^1.0.0"
   }
 }`
 	if err := os.WriteFile(pkgPath, []byte(content), 0644); err != nil {
@@ -36,10 +36,10 @@ func TestReadDesktopPackageDeps(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if deps["@owdproject/app-about"] != "workspace:*" {
+	if deps["@owdproject/nuxt-app-about"] != "workspace:*" {
 		t.Fatalf("unexpected workspace dep: %v", deps)
 	}
-	if deps["@owdproject/theme-nova"] != "^1.0.0" {
+	if deps["@owdproject/nuxt-theme-nova"] != "^1.0.0" {
 		t.Fatalf("unexpected npm dep: %v", deps)
 	}
 }
@@ -53,19 +53,19 @@ func TestBuildQueueFromConfigWorkspaceAndNpm(t *testing.T) {
 	pkgPath := filepath.Join(desktopDir, "package.json")
 	content := `{
   "dependencies": {
-    "@owdproject/app-about": "workspace:*",
-    "@owdproject/theme-nova": "^1.2.0"
+    "@owdproject/nuxt-app-about": "workspace:*",
+    "@owdproject/nuxt-theme-nova": "^1.2.0"
   }
 }`
 	if err := os.WriteFile(pkgPath, []byte(content), 0644); err != nil {
 		t.Fatal(err)
 	}
 
-	theme := "@owdproject/theme-nova"
+	theme := "@owdproject/nuxt-theme-nova"
 	ctx := &bridge.WorkspaceContext{
 		Config: bridge.Config{
 			Theme: &theme,
-			Apps:  []string{"@owdproject/app-about"},
+			Apps:  []string{"@owdproject/nuxt-app-about"},
 		},
 		Paths: bridge.WorkspacePaths{PackageJson: pkgPath},
 	}
@@ -75,11 +75,11 @@ func TestBuildQueueFromConfigWorkspaceAndNpm(t *testing.T) {
 	if q.TotalCount() != 2 {
 		t.Fatalf("expected 2 queue items, got %d", q.TotalCount())
 	}
-	about := q.FindByName("@owdproject/app-about")
+	about := q.FindByName("@owdproject/nuxt-app-about")
 	if about == nil || about.Source != SourcePending {
 		t.Fatalf("expected pending workspace item, got %+v", about)
 	}
-	nova := q.FindByName("@owdproject/theme-nova")
+	nova := q.FindByName("@owdproject/nuxt-theme-nova")
 	if nova == nil || nova.Kind != KindNpm {
 		t.Fatalf("expected npm item, got %+v", nova)
 	}

package/go/tui/tasks.go

@@ -216,10 +216,10 @@ func kindDirForEntry(pkgName, shortName string, entries []bridge.CatalogEntry) s
 
 // kindDirForShortName infers the workspace subdirectory from the package short name.
 func kindDirForShortName(shortName string) string {
-	switch {
-	case strings.HasPrefix(shortName, "app-"):
+	switch base := baseKindName(shortName); {
+	case strings.HasPrefix(base, "app-"):
 		return "apps"
-	case strings.HasPrefix(shortName, "theme-"):
+	case strings.HasPrefix(base, "theme-"):
 		return "themes"
 	default:
 		return "packages" // module-*, kit-*, and anything else
@@ -600,7 +600,7 @@ export default defineDesktopConfig({
 		runtime.msgChan <- setupProgressMsg{Step: step, Total: totalSteps, Label: "Resetting package dependencies…"}
 		runtime.msgChan <- logLineMsg("ℹ Resetting desktop/package.json dependencies to core only…")
 		defaultPackageJson := `{
-  "name": "@owdproject/client",
+  "name": "@owdproject/nuxt-desktop",
   "private": true,
   "nx": {
     "name": "desktop"

package/go/tui/tui.go

@@ -822,10 +822,10 @@ func (m *TuiModel) loadPackageDetails(pkg *bridge.CatalogEntry) {
 				}
 				m.promptPkgDeps = append(m.promptPkgDeps, name)
 			}
-			if name == "@owdproject/kit-primevue" {
+			if name == "@owdproject/nuxt-kit-primevue" {
 				m.promptPkgHasPrimevue = true
 			}
-			if name == "@owdproject/kit-tailwind" || name == "tailwindcss" {
+			if name == "@owdproject/nuxt-kit-tailwind" || name == "tailwindcss" {
 				m.promptPkgHasTailwind = true
 			}
 		}

package/go/tui/tui_test.go

@@ -43,27 +43,27 @@ func TestEngineQueueMessages(t *testing.T) {
 }
 
 func TestBuildConfigFromPending(t *testing.T) {
-	theme := "@owdproject/theme-nova"
+	theme := "@owdproject/nuxt-theme-nova"
 	ctx := &bridge.WorkspaceContext{
 		Config: bridge.Config{
 			Theme:   &theme,
-			Apps:    []string{"@owdproject/app-about"},
+			Apps:    []string{"@owdproject/nuxt-app-about"},
 			Modules: []string{},
 		},
 	}
 	catalog := &bridge.CatalogResponse{
 		Entries: []bridge.CatalogEntry{
-			{Name: "@owdproject/app-todo", ShortName: "app-todo", Kind: "app"},
+			{Name: "@owdproject/nuxt-app-todo", ShortName: "app-todo", Kind: "app"},
 		},
 	}
 	pending := map[string]bool{
-		"@owdproject/app-todo": true,
+		"@owdproject/nuxt-app-todo": true,
 	}
 	config, removes := buildConfigFromPending(ctx, catalog, pending, nil)
 	if len(removes) != 0 {
 		t.Fatalf("expected no removals, got %v", removes)
 	}
-	if !containsStr(config.Apps, "@owdproject/app-todo") {
+	if !containsStr(config.Apps, "@owdproject/nuxt-app-todo") {
 		t.Fatalf("expected app-todo in apps, got %v", config.Apps)
 	}
 }

package/go/tui/workqueue_test.go

@@ -28,10 +28,10 @@ func TestWorkQueueProgress(t *testing.T) {
 
 func TestWorkQueueAppendUnique(t *testing.T) {
 	q := NewWorkQueue()
-	if !q.AppendUnique(WorkItem{Name: "@owdproject/app-about", ShortName: "app-about"}) {
+	if !q.AppendUnique(WorkItem{Name: "@owdproject/nuxt-app-about", ShortName: "app-about"}) {
 		t.Fatal("first append should succeed")
 	}
-	if q.AppendUnique(WorkItem{Name: "@owdproject/app-about", ShortName: "app-about"}) {
+	if q.AppendUnique(WorkItem{Name: "@owdproject/nuxt-app-about", ShortName: "app-about"}) {
 		t.Fatal("duplicate append should fail")
 	}
 	if len(q.Items) != 1 {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owdproject/cli",
-  "version": "0.2.1",
+  "version": "4.0.0-alpha.3",
   "description": "Control Panel and Command Line Interface for Open Web Desktop",
   "keywords": [
     "owd",
@@ -40,7 +40,12 @@
     "mitt": "^3.0.1",
     "nanoid": "^5.1.11",
     "shellwords": "^1.1.1",
-    "ts-morph": "^25.0.1",
-    "@owdproject/core": "3.5.0"
+    "@owdproject/core": "^4.0.0-alpha.3",
+    "ts-morph": "^25.0.1"
+  },
+  "publishConfig": {
+    "access": "public",
+    "tag": "alpha",
+    "registry": "https://registry.npmjs.org/"
   }
-}
+}