refactor: implement recursive workspace dependency resolution and automated cloning for local, app, and theme packages

dxlliv · dxlliv · commit 165ad5564559 · 2026-06-28T23:13:39.000+02:00
diff --git a/bin/lib/installWizardFlow.js b/bin/lib/installWizardFlow.js
@@ -4,7 +4,8 @@ import {
   isInstallableDesktopModule,
   isDesktopKitPackage,
   shortName,
-  getPackagesRequiredByTheme
+  getPackagesRequiredByTheme,
+  findMissingWorkspaceDependencies,
 } from './workspace.js'
 import {
   readDesktopConfig,
@@ -275,6 +276,42 @@ export async function executeInstallPlan(ctx) {
       }
     }
 
+    // Detect and clone any missing workspace:* dependencies recursively
+    let missingWorkspaceDeps = findMissingWorkspaceDependencies(workspaceRoot)
+    const autoClonedDeps = new Set()
+
+    while (missingWorkspaceDeps.length > 0) {
+      const dep = missingWorkspaceDeps.shift()
+      if (autoClonedDeps.has(dep)) continue
+      autoClonedDeps.add(dep)
+
+      bump(`Cloning dependency ${shortName(dep)}…`)
+      ctx.clearLogs()
+
+      try {
+        const plan = await resolveInstallPlan(dep, settings, workspaceRoot)
+        if (plan.error) {
+          throw new Error(plan.error)
+        }
+        if (plan.targetDir && plan.source?.gitUrl) {
+          await cloneRepo(plan.targetDir, plan.source.gitUrl, undefined, workspaceRoot, { quiet: true })
+          didClone = true
+          clonedPackages.push(dep)
+          const newMissing = findMissingWorkspaceDependencies(workspaceRoot)
+          for (const m of newMissing) {
+            if (!autoClonedDeps.has(m) && !missingWorkspaceDeps.includes(m)) {
+              missingWorkspaceDeps.push(m)
+            }
+          }
+        } else {
+          throw new Error('Unknown git clone URL')
+        }
+      } catch (err) {
+        const msg = err.message?.split('\n').find(l => l.trim()) ?? String(err)
+        failures.push({ pkg: dep, error: `Failed to resolve workspace dependency ${shortName(dep)}: ${msg}` })
+      }
+    }
+
     if (didClone) {
       bump('Installing dependencies…')
       ctx.clearLogs()
@@ -597,6 +634,43 @@ export async function runStartupInstallFlow(ctx, { isStartup = false } = {}) {
       }
     }
 
+    // Detect and clone any missing workspace:* dependencies recursively
+    let missingWorkspaceDeps = findMissingWorkspaceDependencies(workspaceRoot)
+    const autoClonedDeps = new Set()
+
+    while (missingWorkspaceDeps.length > 0) {
+      const dep = missingWorkspaceDeps.shift()
+      if (autoClonedDeps.has(dep)) continue
+      autoClonedDeps.add(dep)
+
+      bump(`Cloning dependency ${shortName(dep)}…`)
+      ctx.clearLogs()
+
+      try {
+        const plan = await resolveInstallPlan(dep, settings, workspaceRoot)
+        if (plan.error) {
+          throw new Error(plan.error)
+        }
+        if (plan.targetDir && plan.source?.gitUrl) {
+          await cloneRepo(plan.targetDir, plan.source.gitUrl, undefined, workspaceRoot, { quiet: true })
+          didClone = true
+          allCloned.push(dep)
+          const newMissing = findMissingWorkspaceDependencies(workspaceRoot)
+          for (const m of newMissing) {
+            if (!autoClonedDeps.has(m) && !missingWorkspaceDeps.includes(m)) {
+              missingWorkspaceDeps.push(m)
+            }
+          }
+        } else {
+          throw new Error('Unknown git clone URL')
+        }
+      } catch (err) {
+        const msg = err.message?.split('\n').find(l => l.trim()) ?? String(err)
+        ctx.setStatus(`Failed to resolve workspace dependency ${shortName(dep)}: ${msg}`, 'error')
+        ctx.screen.render()
+      }
+    }
+
     if (didClone) {
       if (!ctx.isInstalling()) {
         dynTotal += 1 + allCloned.length + 1
diff --git a/bin/lib/workspace.js b/bin/lib/workspace.js
@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'node:fs'
+import { existsSync, readFileSync, mkdirSync, writeFileSync, readdirSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 import { execSync } from 'node:child_process'
 import {
@@ -220,3 +220,70 @@ export function getPackagesRequiredByTheme(workspaceRoot, themeName) {
   }
 }
 
+/**
+ * Scans all package.json files in the workspace (including desktop/)
+ * and returns any @owdproject/ dependencies that use the 'workspace:' protocol
+ * but are not present locally on disk.
+ * @param {string} workspaceRoot
+ * @returns {string[]}
+ */
+export function findMissingWorkspaceDependencies(workspaceRoot) {
+  const missing = new Set()
+  const localPackages = new Set()
+  const pkgPaths = []
+
+  // 1. Scan KINDS subdirectories for local packages
+  for (const kind of Object.values(KINDS)) {
+    const dir = join(workspaceRoot, kind.workspaceDir)
+    if (!existsSync(dir)) continue
+    try {
+      const entries = readdirSync(dir, { withFileTypes: true })
+      for (const entry of entries) {
+        if (entry.isDirectory()) {
+          const pkgJsonPath = join(dir, entry.name, 'package.json')
+          if (existsSync(pkgJsonPath)) {
+            const pkgPath = join(dir, entry.name)
+            pkgPaths.push(pkgPath)
+            try {
+              const pkgJson = JSON.parse(readFileSync(pkgJsonPath, 'utf8'))
+              if (pkgJson.name) {
+                localPackages.add(pkgJson.name)
+              }
+            } catch {}
+          }
+        }
+      }
+    } catch {}
+  }
+
+  // 2. Include the desktop app itself
+  const desktopDir = join(workspaceRoot, 'desktop')
+  if (existsSync(join(desktopDir, 'package.json'))) {
+    pkgPaths.push(desktopDir)
+    try {
+      const pkgJson = JSON.parse(readFileSync(join(desktopDir, 'package.json'), 'utf8'))
+      if (pkgJson.name) {
+        localPackages.add(pkgJson.name)
+      }
+    } catch {}
+  }
+
+  // 3. Find missing workspace:* dependencies
+  for (const pkgPath of pkgPaths) {
+    try {
+      const pkgJson = JSON.parse(readFileSync(join(pkgPath, 'package.json'), 'utf8'))
+      const deps = { ...pkgJson.dependencies, ...pkgJson.devDependencies }
+      for (const [depName, version] of Object.entries(deps)) {
+        if (depName.startsWith(SCOPE) && typeof version === 'string' && version.startsWith('workspace:')) {
+          if (!localPackages.has(depName)) {
+            missing.add(depName)
+          }
+        }
+      }
+    } catch {}
+  }
+
+  return Array.from(missing)
+}
+
+
diff --git a/go/tui/engine.go b/go/tui/engine.go
@@ -271,6 +271,15 @@ func (m *TuiModel) RunWizardEngine(
 				emitQueue(q)
 			}
 		}
+		var catalogEntries []bridge.CatalogEntry
+		if catalog != nil {
+			catalogEntries = catalog.Entries
+		}
+		if err := ResolveAndCloneMissingDependencies(workspaceRoot, catalogEntries, runtime, log, nil, nil, nil); err != nil {
+			emitPhase(PhaseFailed)
+			msgChan <- taskFinishedMsg{Success: false, Err: err}
+			return
+		}
 
 		emitPhase(PhaseInstall)
 		log("ℹ Running pnpm install")
@@ -330,6 +339,16 @@ func applyResolution(
 	short := item.ShortName
 
 	switch method {
+	case "local":
+		if err := bridge.WritePackageJsonDeps(workspaceRoot, map[string]string{name: "workspace:*"}, nil); err != nil {
+			log("✖ Failed to link local package " + short)
+			return err
+		}
+		q.SetSource(name, "local", KindLocal)
+		q.MarkSkipped(name)
+		log("✔ " + short + " linked as local package")
+		return nil
+
 	case "git-ssh", "git-https":
 		owner := resolveOwner(name, catalogEntriesSlice(catalog))
 		var gitURL string
diff --git a/go/tui/handlers.go b/go/tui/handlers.go
@@ -258,14 +258,26 @@ func (m *TuiModel) handleUninstallConfirmKeys(msg tea.KeyMsg) (tea.Model, tea.Cm
 }
 
 func (m *TuiModel) handleResolveDependencyKeys(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
-	methods := []struct {
+	shortName := "package"
+	if m.promptItem != nil {
+		shortName = m.promptItem.ShortName
+	}
+	if shortName == "" && m.promptPkg != nil {
+		shortName = m.promptPkg.ShortName
+	}
+
+	var methods []struct {
 		Name  string
 		Label string
-	}{
-		{"git-ssh", "Git SSH"},
-		{"git-https", "Git HTTPS"},
-		{"npm", "NPM Package"},
 	}
+	if isLocallyAvailable(m.workspaceRoot, shortName) {
+		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 }{"npm", "NPM Package"},
+	)
 
 	switch msg.String() {
 	case "esc", "q":
diff --git a/go/tui/helpers.go b/go/tui/helpers.go
@@ -177,7 +177,7 @@ func getOwdDepsLocal(workspaceRoot, shortName, kind string) ([]string, bool) {
 				continue
 			}
 			short := name[strings.LastIndex(name, "/")+1:]
-			if strings.HasPrefix(short, "module-") || strings.HasPrefix(short, "kit-") {
+			if strings.HasPrefix(short, "module-") || strings.HasPrefix(short, "kit-") || strings.HasPrefix(short, "app-") || strings.HasPrefix(short, "theme-") {
 				deps = append(deps, name)
 				seen[name] = true
 			}
@@ -220,7 +220,7 @@ func getOwdDepsFromNpm(pkgName string) ([]string, error) {
 			continue
 		}
 		short := name[strings.LastIndex(name, "/")+1:]
-		if strings.HasPrefix(short, "module-") || strings.HasPrefix(short, "kit-") {
+		if strings.HasPrefix(short, "module-") || strings.HasPrefix(short, "kit-") || strings.HasPrefix(short, "app-") || strings.HasPrefix(short, "theme-") {
 			deps = append(deps, name)
 			seen[name] = true
 		}
@@ -823,8 +823,12 @@ func activeThemeName(ctx *bridge.WorkspaceContext, pendingTheme *string) string
 func (m *TuiModel) getInstallMethods(pkg *bridge.CatalogEntry) []InstallMethod {
 	var methods []InstallMethod
 
-	// 0. Local folder option if already present in workspace (pkg.LocalSource is true)
-	if pkg.LocalSource {
+	// 0. Local folder option if already present in workspace
+	short := pkg.ShortName
+	if short == "" {
+		short = shortNameFromPkg(pkg.Name)
+	}
+	if pkg.LocalSource || isLocallyAvailable(m.workspaceRoot, short) {
 		methods = append(methods, InstallMethod{
 			Name:  "local",
 			Label: "Use Existing Local Folder",
diff --git a/go/tui/modals.go b/go/tui/modals.go
@@ -136,14 +136,18 @@ func (m *TuiModel) renderResolveDependencyModal() string {
 	}
 	content.WriteString("How do you want to resolve it?\n\n")
 
-	options := []struct {
+	var options []struct {
 		Name  string
 		Label string
-	}{
-		{"git-ssh", "Git SSH"},
-		{"git-https", "Git HTTPS"},
-		{"npm", "NPM Package"},
 	}
+	if isLocallyAvailable(m.workspaceRoot, shortName) {
+		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 }{"npm", "NPM Package"},
+	)
 	for i, opt := range options {
 		if i == m.promptSel {
 			content.WriteString("  " + modalOptionActive.Render(opt.Label) + "\n")
diff --git a/go/tui/resolver.go b/go/tui/resolver.go
diff --git a/go/tui/tasks.go b/go/tui/tasks.go
