@owdproject/cli 0.1.0 → 0.2.0

package/README.md

@@ -31,7 +31,7 @@ pnpm add -g @owdproject/cli
 Once installed, run the `desktop` command to open the control panel:
 
 ```bash
-desktop
+pnpm desktop
 ```
 
 ### CLI Reference
@@ -39,27 +39,27 @@ desktop
 #### Dev Server
 Start the development server for the monorepo or automatically detect a module's playground:
 ```bash
-desktop dev [--playground]
+pnpm desktop dev [--playground]
 ```
 
 #### Add Packages
 Install apps, modules, or themes from npm, local directories, or custom repositories:
 ```bash
-desktop add app-todo --npm
-desktop add theme-nova --dev
-desktop add module-fs --from <github-user>
+pnpm desktop add app-todo --npm
+pnpm desktop add theme-nova --dev
+pnpm desktop add module-fs --from <github-user>
 ```
 
 #### Scaffold a Project
 Initialize a fresh OWD workspace:
 ```bash
-desktop init [project-name]
+pnpm desktop init [project-name]
 ```
 
 #### Validation
 Check Nuxt module configuration and playground directory structures:
 ```bash
-desktop validate
+pnpm desktop validate
 ```
 
 ## License

package/bin/bridge.js

@@ -12,7 +12,8 @@ import {
   readDesktopConfig,
   writeDesktopConfig,
   readDesktopDependencies,
-  writeDesktopDependencies
+  writeDesktopDependencies,
+  resolveConfigPathForWrite
 } from './lib/config.js'
 import { loadCatalog, mergeInstalled } from './lib/catalog.js'
 import { resolveDevTarget } from './lib/playgroundContext.js'
@@ -98,7 +99,8 @@ async function main() {
       // payload = { config: { theme, apps, modules }, depsToAdd: { name: version }, depsToRemove: [name], settings?: { ... } }
       
       if (payload.config) {
-        writeDesktopConfig(ctx.paths.config, ctx.workspaceRoot, payload.config)
+        const configPath = resolveConfigPathForWrite(ctx.paths)
+        writeDesktopConfig(configPath, ctx.workspaceRoot, payload.config)
       }
       
       if (payload.depsToAdd || payload.depsToRemove) {

package/bin/cli.js

@@ -68,8 +68,11 @@ CONTROL PANEL (TUI)
   g                       Settings (GitHub user, SSH, trusted orgs)
   r                       Refresh package list from GitHub (detects new modules)
   b                       Run pnpm run generate
+  n                       Create a new app or module (interactive wizard)
   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} add <package> [options]
   ${name} add <kind> <name> [options]
   ${name} validate [path...]  Check Nuxt module + playground layout
@@ -136,6 +139,7 @@ async function openControlPanel(name) {
   const cliDir = join(fileURLToPath(import.meta.url), '..')
   const goDir = join(cliDir, '../go')
   const binaryPath = join(goDir, 'desktop-go')
+  const readline = await import('node:readline/promises')
 
   // Compile the Go Control Panel if binary doesn't exist
   if (!existsSync(binaryPath)) {
@@ -145,16 +149,52 @@ async function openControlPanel(name) {
       console.log('Go Control Panel compiled successfully!')
     } catch (err) {
       console.warn('Failed to compile Go Control Panel, falling back to legacy CP:', err.message)
-      const { runCp } = await import('./cp.js')
-      await runCp(name)
+      const child = spawn(process.execPath, [
+        '-e',
+        `import('./cp.js').then(m => m.runCp(${JSON.stringify(name)}))`
+      ], {
+        cwd: cliDir,
+        stdio: 'inherit',
+      })
+      child.on('exit', async (code) => {
+        if (code === 10) {
+          const { runCreateCli } = await import('./lib/create.js')
+          const workspaceRoot = findWorkspaceRoot()
+          try {
+            await runCreateCli({ workspaceRoot })
+          } catch (err) {
+            console.error('\n✗ Error creating package:', err.message)
+            const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
+            await rl.question('\nPress Enter to return to the control panel...')
+            rl.close()
+          }
+          await openControlPanel(name)
+        } else {
+          process.exit(code ?? 0)
+        }
+      })
       return
     }
   }
 
   // Execute Go TUI
   const child = spawn(binaryPath, [], { stdio: 'inherit' })
-  child.on('exit', (code) => {
-    process.exit(code ?? 0)
+  child.on('exit', async (code) => {
+    if (code === 10) {
+      const { runCreateCli } = await import('./lib/create.js')
+      const workspaceRoot = findWorkspaceRoot()
+      try {
+        await runCreateCli({ workspaceRoot })
+      } catch (err) {
+        console.error('\n✗ Error creating package:', err.message)
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout })
+        await rl.question('\nPress Enter to return to the control panel...')
+        rl.close()
+      }
+      await openControlPanel(name)
+    } else {
+      process.exit(code ?? 0)
+    }
   })
 }
 
@@ -351,6 +391,20 @@ export async function runCli(name, argv, options = {}) {
     return
   }
 
+  if (cmd === 'create' || cmd === 'new') {
+    if (!workspaceRoot) {
+      fail(
+        'Not inside an OWD workspace.',
+        `Run from inside an OWD workspace directory to scaffold a new package.`,
+      )
+    }
+    const { runCreateCli } = await import('./lib/create.js')
+    const kind = _[1]
+    const name = _[2]
+    await runCreateCli({ kind, name, workspaceRoot })
+    return
+  }
+
   if (!cmd) {
     if (!workspaceRoot) {
       fail(
@@ -414,7 +468,11 @@ export async function runCli(name, argv, options = {}) {
       })
       process.exit(0)
     }
-    runNpmInstall(kind, pkgName, workspaceRoot)
+    try {
+      await runNpmInstall(kind, pkgName, workspaceRoot)
+    } catch (error) {
+      fail(error.message ?? String(error))
+    }
   } else {
     try {
       await runWorkspaceInstall({

package/bin/cp.js

@@ -489,6 +489,7 @@ export async function runCp(commandName = 'desktop') {
     { id: 'docs', label: 'Open documentation', key: 'i' },
     { id: 'settings', label: 'Settings', key: 'g' },
     { id: 'build', label: 'Build (pnpm generate)', key: 'b' },
+    { id: 'create', label: 'Create new app or module', key: 'n' },
     { id: 'quit', label: 'Quit control panel', key: 'q' },
   ]
 
@@ -1385,11 +1386,16 @@ export async function runCp(commandName = 'desktop') {
       ? `{${C.accent}-fg}${keyHint('s')} save (${queue}){/}`
       : `${keyHint('s')} save`
 
+    const serverRunning = isDevServerUp()
+    const serverShortcut = serverRunning
+      ? `{${C.accent}-fg}${keyHint('x')} stop server{/}`
+      : `${keyHint('d')} start server`
+
     helpBar.setContent(
       [
         msgLine,
         `  Legend: {${C.add}-fg}[+]{/} add  {${C.remove}-fg}[-]{/} remove  {${C.accent}-fg}[*]{/} on desktop  |  {${C.npm}-fg}NPM{/} registry  {${C.git}-fg}GIT{/} repo  {${C.local}-fg}LOC{/} workspace  |  {${C.warn}-fg}WRN{/} untrusted`,
-        `  Shortcuts: ↑↓ Space toggle  ${keyHint('1')}${keyHint('2')}${keyHint('3')} tabs  ${saveShortcut}  ${keyHint('d')} server  ${keyHint('O')} sort  ${keyHint('m')} menu  ${keyHint('u')} updates  ${keyHint('r')} refresh  ${keyHint('q')} quit`,
+        `  Shortcuts: ↑↓ Space toggle  ${keyHint('1')}${keyHint('2')}${keyHint('3')} tabs  ${saveShortcut}  ${serverShortcut}  ${keyHint('g')} settings  ${keyHint('O')} sort  ${keyHint('m')} menu  ${keyHint('u')} updates  ${keyHint('r')} refresh  ${keyHint('n')} new  ${keyHint('q')} quit`,
       ].join('\n'),
     )
   }
@@ -1410,6 +1416,7 @@ export async function runCp(commandName = 'desktop') {
         const newConfig = readDesktopConfig(paths.config, workspaceRoot)
         configError = null
         if (!areConfigsEqual(config, newConfig)) {
+          const oldTheme = config ? config.theme : null
           config = newConfig
           deps = readDesktopDependencies(paths.packageJson)
 
@@ -1420,7 +1427,7 @@ export async function runCp(commandName = 'desktop') {
               pendingPackages.delete(name)
             }
           }
-          if (pendingTheme === config.theme || !pendingTheme) {
+          if (pendingTheme === oldTheme || !pendingTheme) {
             pendingTheme = config.theme
           }
 
@@ -2036,6 +2043,9 @@ export async function runCp(commandName = 'desktop') {
           refreshTerminalUi()
         }
         break
+      case 'create':
+        process.exit(10)
+        break
       case 'quit':
         process.exit(0)
         break
@@ -2723,30 +2733,35 @@ export async function runCp(commandName = 'desktop') {
       installWizardList.setItems(
         installWizardOptions.map((opt) => {
           const prefix =
-            opt.kind === 'npm' ? `{${C.npm}-fg}NPM{/}` : `{${C.git}-fg}GIT{/}`
+            opt.kind === 'npm' ? `{${C.npm}-fg}NPM{/}` : opt.kind === 'local' ? `{${C.local}-fg}LOC{/}` : `{${C.git}-fg}GIT{/}`
           return `${prefix}  ${opt.label}`
         }),
       )
       let defaultIdx = 0
-      const lastId = settings.lastInstallChoiceId
-      if (lastId) {
-        let found = installWizardOptions.findIndex((opt) => opt.id === lastId)
-        if (found >= 0) {
-          defaultIdx = found
-        } else {
-          const isSsh = lastId.includes('ssh')
-          const isHttps = lastId.includes('https')
-          const isNpm = lastId === 'npm'
-          if (isNpm) {
-            found = installWizardOptions.findIndex((opt) => opt.id === 'npm')
-            if (found >= 0) defaultIdx = found
+      const isLocalAvailable = installWizardOptions.some((opt) => opt.id === 'local')
+      if (isLocalAvailable) {
+        defaultIdx = installWizardOptions.findIndex((opt) => opt.id === 'local')
+      } else {
+        const lastId = settings.lastInstallChoiceId
+        if (lastId) {
+          let found = installWizardOptions.findIndex((opt) => opt.id === lastId)
+          if (found >= 0) {
+            defaultIdx = found
           } else {
-            found = installWizardOptions.findIndex((opt) => {
-              if (isSsh && opt.protocol === 'ssh') return true
-              if (isHttps && opt.protocol === 'https') return true
-              return false
-            })
-            if (found >= 0) defaultIdx = found
+            const isSsh = lastId.includes('ssh')
+            const isHttps = lastId.includes('https')
+            const isNpm = lastId === 'npm'
+            if (isNpm) {
+              found = installWizardOptions.findIndex((opt) => opt.id === 'npm')
+              if (found >= 0) defaultIdx = found
+            } else {
+              found = installWizardOptions.findIndex((opt) => {
+                if (isSsh && opt.protocol === 'ssh') return true
+                if (isHttps && opt.protocol === 'https') return true
+                return false
+              })
+              if (found >= 0) defaultIdx = found
+            }
           }
         }
       }
@@ -3216,6 +3231,10 @@ export async function runCp(commandName = 'desktop') {
     if (menuOpen) closeMenu()
     else openMenu()
   })
+  screen.key(['n', 'N'], () => {
+    if (settingsOpen || installWizardOpen || sortPickerOpen || menuOpen || confirmDialogOpen) return
+    process.exit(10)
+  })
   screen.key(['d', 'D'], () => {
     if (!overlayBlocksKeys()) {
       if (isDevServerUp()) stopDevServer()
@@ -3481,7 +3500,7 @@ export async function runCp(commandName = 'desktop') {
   startConfigWatcher()
 
   setStatus(
-    `Select packages · ${keyHint('s')} opens install wizard · ${keyHint('u')} updates · ${keyHint('g')} settings · ${keyHint('d')} server`,
+    `Select packages · ${keyHint('s')} opens install wizard · ${keyHint('u')} updates · ${keyHint('d')} start server · ${keyHint('g')} settings`,
     'info',
   )
 
@@ -3490,7 +3509,7 @@ export async function runCp(commandName = 'desktop') {
 
   setInterval(async () => {
     const now = Date.now()
-    if (now - lastShowcaseTime >= 5000) {
+    if (now - lastShowcaseTime >= 15000) {
       showcaseIndex++
       lastShowcaseTime = now
     }

package/bin/lib/catalog.js

@@ -312,6 +312,7 @@ export async function loadCatalog(workspaceRoot, settings, options = {}) {
         byName.set(item.shortName, {
           ...prev,
           ...item,
+          stars: prev.stars ?? 0, // preserve GitHub stars — scanLocal always sets 0
           localPath: item.localPath,
           remote: item.remote ?? prev.remote,
           updatedAt: item.updatedAt ?? prev.updatedAt,
@@ -336,6 +337,8 @@ export async function loadCatalog(workspaceRoot, settings, options = {}) {
     trusted: isTrustedPublisher(entry, settings),
   }))
 
+  entries = entries.filter((e) => !e.name.includes('-template') && !e.shortName.includes('-template'))
+
   entries = await enrichCatalogEntries(entries, workspaceRoot, settings)
 
   return {

package/bin/lib/config.js

@@ -1,4 +1,4 @@
-import { readFileSync, existsSync, copyFileSync } from 'node:fs'
+import { readFileSync, writeFileSync, existsSync, copyFileSync } from 'node:fs'
 import { createRequire } from 'node:module'
 import { join } from 'node:path'
 import { SCOPE } from './workspace.js'
@@ -7,13 +7,6 @@ import { LEGACY_CONFIG_DEPRECATION } from './desktopConfig.js'
 const require = createRequire(import.meta.url)
 
 function loadTsMorph(workspaceRoot) {
-  const utilPath = join(
-    workspaceRoot,
-    'node_modules/@owdproject/nx/dist/utils/utilConfig.js',
-  )
-  if (!existsSync(utilPath)) {
-    throw new Error('Missing @owdproject/nx — run pnpm install at the repo root.')
-  }
   const { Project, SyntaxKind } = require('ts-morph')
   return { Project, SyntaxKind }
 }
@@ -128,3 +121,53 @@ export function writeDesktopDependencies(packageJsonPath, toAdd, toRemove) {
   
   writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + '\n')
 }
+
+export function addToDesktopConfig(configPath, workspaceRoot, key, value) {
+  const { Project, SyntaxKind } = loadTsMorph(workspaceRoot)
+  const project = new Project()
+  const sourceFile = project.addSourceFileAtPath(configPath)
+  const configObj = getConfigObject(sourceFile, SyntaxKind)
+
+  const rawProp = configObj.getProperty(key)
+  const targetProp = rawProp?.asKind(SyntaxKind.PropertyAssignment)
+
+  if (!targetProp) {
+    // if property doesn't exist, create it
+    configObj.addPropertyAssignment({
+      name: key,
+      initializer: key === 'theme' ? `'${value}'` : `[ '${value}' ]`,
+    })
+
+    sourceFile.saveSync()
+    console.log(`🛠️ Created '${key}' and added '${value}'`)
+    return
+  }
+
+  // handle 'theme' key — just set string literal
+  if (key === 'theme') {
+    targetProp.setInitializer(`'${value}'`)
+    sourceFile.saveSync()
+    console.log(`🎨 Theme set to '${value}'`)
+    return
+  }
+
+  // ensure initializer is an array
+  const initializer = targetProp.getInitializerIfKind(SyntaxKind.ArrayLiteralExpression)
+  if (!initializer) {
+    throw new Error(`Expected '${key}' to be an array`)
+  }
+
+  const exists = initializer.getElements().some((el) => {
+    const text = el.getText().trim().replace(/['"`]/g, '')
+    return text === value
+  })
+
+  if (exists) {
+    console.log(`⚠️ '${value}' already exists in '${key}'`)
+    return
+  }
+
+  initializer.addElement(`'${value}'`)
+  sourceFile.saveSync()
+  console.log(`✅ Added '${value}' to '${key}'`)
+}

package/bin/lib/cpFormat.js

@@ -160,7 +160,7 @@ export function formatCatalogRowPlain(item, ctx = {}) {
 
   // 3.5 DIR Column (4 chars)
   let dirTag = ''
-  const isMissing = item.installed && !item.localSource
+  const isMissing = item.installed && !item.localSource && !item.inPackageJson
   if (isMissing) {
     dirTag = `{red-fg}MISS{/}`
   } else if (item.localSource) {
@@ -321,7 +321,7 @@ export function formatDetailPanel(item, targetDir, colors = DEFAULT_COLORS, widt
     lines.push(`  {${c.muted}-fg}${item.description.slice(0, maxDescLen)}{/}`)
   }
 
-  const isMissing = item.installed && !item.localSource
+  const isMissing = item.installed && !item.localSource && !item.inPackageJson
   if (isMissing) {
     lines.push(`  {red-fg}{bold}⚠ WARNING: Local workspace folder is missing!{/}{/}`)
   }

package/bin/lib/create.js

@@ -0,0 +1,246 @@
+import { existsSync, mkdirSync, readFileSync, writeFileSync, readdirSync, statSync, mkdtempSync, rmSync } from 'node:fs'
+import { join, dirname, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import readline from 'node:readline/promises'
+import { stdin as input, stdout as output } from 'node:process'
+import { KINDS } from './workspace.js'
+import {
+  resolveDesktopConfigPath,
+  desktopConfigWritePath,
+} from './desktopConfig.js'
+import { addToDesktopConfig } from './config.js'
+import {
+  linkWorkspacePackage,
+  spawnAsync,
+} from './install.js'
+import { createRequire } from 'node:module'
+
+const require = createRequire(import.meta.url)
+const __dirname = dirname(fileURLToPath(import.meta.url))
+const CLI_ROOT = resolve(__dirname, '../..')
+
+function pascalCase(str) {
+  return str
+    .replace(/(?:^|-|_)(\w)/g, (_, c) => c.toUpperCase())
+    .replace(/[-_]/g, '')
+}
+
+function camelCase(str) {
+  const p = pascalCase(str)
+  return p.charAt(0).toLowerCase() + p.slice(1)
+}
+
+async function cloneTemplate(gitUrl, destDir) {
+  try {
+    await spawnAsync('git', ['clone', '--depth', '1', gitUrl, destDir])
+  } catch (err) {
+    if (gitUrl.startsWith('git@')) {
+      const httpsUrl = gitUrl
+        .replace('git@github.com:', 'https://github.com/')
+        .replace(/\.git$/, '') + '.git'
+      console.log(`SSH clone failed, trying HTTPS fallback: ${httpsUrl}`)
+      await spawnAsync('git', ['clone', '--depth', '1', httpsUrl, destDir])
+    } else {
+      throw err
+    }
+  }
+}
+
+function copyAndScaffold(srcDir, destDir, replacements) {
+  if (!existsSync(destDir)) {
+    mkdirSync(destDir, { recursive: true })
+  }
+
+  const entries = readdirSync(srcDir)
+  for (const entry of entries) {
+    if (
+      entry === 'node_modules' ||
+      entry === '.nuxt' ||
+      entry === 'dist' ||
+      entry === '.output' ||
+      entry === '.git'
+    ) {
+      continue
+    }
+
+    const srcPath = join(srcDir, entry)
+    let destEntry = entry
+    for (const [placeholder, val] of Object.entries(replacements)) {
+      destEntry = destEntry.replaceAll(placeholder, val)
+    }
+    const destPath = join(destDir, destEntry)
+
+    const stat = statSync(srcPath)
+    if (stat.isDirectory()) {
+      copyAndScaffold(srcPath, destPath, replacements)
+    } else {
+      const fileContent = readFileSync(srcPath)
+      const isText = !fileContent.slice(0, 512).includes(0)
+      if (isText) {
+        let textContent = fileContent.toString('utf8')
+        for (const [placeholder, val] of Object.entries(replacements)) {
+          textContent = textContent.replaceAll(placeholder, val)
+        }
+        writeFileSync(destPath, textContent, 'utf8')
+      } else {
+        writeFileSync(destPath, fileContent)
+      }
+    }
+  }
+}
+
+export async function runCreateCli(options = {}) {
+  const workspaceRoot = options.workspaceRoot
+  if (!workspaceRoot) {
+    throw new Error('Not inside an OWD workspace.')
+  }
+
+  let { kind, name } = options
+
+  const rl = readline.createInterface({ input, output })
+
+  try {
+    // 1. Prompt for Kind if missing or invalid
+    while (!kind || (kind !== 'app' && kind !== 'module')) {
+      const answer = await rl.question('Select package kind (app / module) [app]: ')
+      const cleaned = answer.trim().toLowerCase()
+      if (cleaned === '') {
+        kind = 'app'
+      } else if (cleaned === 'app' || cleaned === 'module') {
+        kind = cleaned
+      } else {
+        console.log('Invalid kind. Please select "app" or "module".')
+      }
+    }
+
+    // 2. Prompt for Name if missing
+    while (!name || name.trim() === '') {
+      const answer = await rl.question(`Enter ${kind} name: `)
+      name = answer.trim().toLowerCase().replace(/[^a-z0-9-_]/g, '')
+      if (name === '') {
+        console.log('Name is required and should contain only alphanumeric characters, dashes, or underscores.')
+      }
+    }
+  } finally {
+    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)
+  }
+
+  const pkgShortName = `${kind}-${name}`
+  const pkgFullName = `@owdproject/${pkgShortName}`
+  const workspaceDir = KINDS[kind].workspaceDir
+  const targetDir = join(workspaceRoot, workspaceDir, pkgShortName)
+
+  if (existsSync(targetDir)) {
+    throw new Error(`Directory already exists: ${targetDir}`)
+  }
+
+  console.log(`\nCreating new ${kind} in ${targetDir}...\n`)
+
+  let templateSrc = null
+  let tempCloneDir = null
+
+  if (kind === 'app') {
+    const monorepoPath = join(workspaceRoot, 'apps/app-template')
+    if (existsSync(join(monorepoPath, 'package.json'))) {
+      templateSrc = monorepoPath
+    }
+  } else if (kind === 'module') {
+    const monorepoPath = join(workspaceRoot, 'packages/module-template')
+    if (existsSync(join(monorepoPath, 'package.json'))) {
+      templateSrc = monorepoPath
+    }
+  }
+
+  if (!templateSrc) {
+    const gitUrl = kind === 'app'
+      ? 'git@github.com:owdproject/app-template.git'
+      : 'git@github.com:owdproject/module-template.git'
+
+    console.log(`Cloning template from ${gitUrl}...`)
+    try {
+      const tmpPrefix = join(workspaceRoot, '.owd-template-')
+      tempCloneDir = mkdtempSync(tmpPrefix)
+      await cloneTemplate(gitUrl, tempCloneDir)
+      templateSrc = tempCloneDir
+    } catch (err) {
+      if (tempCloneDir && existsSync(tempCloneDir)) {
+        try {
+          rmSync(tempCloneDir, { recursive: true, force: true })
+        } catch {}
+      }
+      throw new Error(`Failed to clone template from GitHub: ${err.message}`)
+    }
+  }
+
+  // Prepare replacements
+  const replacements = {}
+  if (kind === 'app') {
+    replacements['@owdproject/app-template'] = pkgFullName
+    replacements['app-template'] = pkgShortName
+    replacements['desktop-app-template'] = `desktop-app-${name}`
+    replacements['desktop-app-template-register'] = `desktop-app-${name}-register`
+    replacements['appTemplate'] = `app${pascalCase(name)}`
+    replacements['AppTemplate'] = `App${pascalCase(name)}`
+    replacements['WindowTemplate'] = `Window${pascalCase(name)}`
+    replacements['myApp'] = `app${pascalCase(name)}`
+    replacements['my-app'] = `app-${name}`
+    replacements['ext.domain.app'] = `ext.domain.${name}`
+    replacements['Template'] = pascalCase(name)
+  } else {
+    replacements['@owdproject/module-template'] = pkgFullName
+    replacements['module-template'] = pkgShortName
+    replacements['desktop-module-template'] = `desktop-module-${name}`
+    replacements['desktop-module-template-register'] = `desktop-module-${name}-register`
+    replacements['moduleTemplate'] = `module${pascalCase(name)}`
+    replacements['ModuleTemplate'] = `Module${pascalCase(name)}`
+    replacements['ext.domain.module'] = `ext.domain.${name}`
+    replacements['owd-module-template'] = `owd-module-${name}`
+    replacements['owd-plugin-template'] = `owd-plugin-${name}`
+    replacements['Template'] = pascalCase(name)
+  }
+
+  // Copy and replace placeholders
+  try {
+    copyAndScaffold(templateSrc, targetDir, replacements)
+    console.log(`✓ Files scaffolded from template.`)
+  } finally {
+    if (tempCloneDir && existsSync(tempCloneDir)) {
+      try {
+        rmSync(tempCloneDir, { recursive: true, force: true })
+      } catch {}
+    }
+  }
+
+  // Run pnpm install in root
+  console.log('Running pnpm install in workspace root...')
+  await spawnAsync('pnpm', ['install'], { cwd: workspaceRoot })
+
+  // Link package in desktop
+  console.log(`Linking ${pkgFullName} in desktop project...`)
+  const desktopPath = join(workspaceRoot, 'desktop')
+  await linkWorkspacePackage(desktopPath, pkgFullName)
+
+  // Update desktop/desktop.config.ts
+  console.log('Registering package in desktop.config.ts...')
+  const resolved = resolveDesktopConfigPath(desktopPath)
+  const configPath = resolved?.path ?? desktopConfigWritePath(desktopPath)
+
+  addToDesktopConfig(configPath, workspaceRoot, KINDS[kind].configKey, pkgFullName)
+
+  // Run dev:prepare
+  console.log(`Running dev:prepare on ${pkgFullName}...`)
+  try {
+    await spawnAsync('pnpm', ['--filter', pkgFullName, 'run', 'dev:prepare'], { cwd: workspaceRoot })
+  } catch (err) {
+    console.warn(`(warning: dev:prepare failed — it's normal if package does not have the script)`)
+  }
+
+  console.log(`\n✓ Scaffolded and registered new ${kind}: ${pkgFullName}\n`)
+}