@owdproject/cli 0.0.3 → 0.2.0

package/go/tui/resolver.go

@@ -0,0 +1,377 @@
+package tui
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"owd-cli/bridge"
+)
+
+// readDesktopPackageDeps reads @owdproject/* deps with versions from desktop/package.json.
+func readDesktopPackageDeps(packageJsonPath string) (map[string]string, error) {
+	data, err := os.ReadFile(packageJsonPath)
+	if err != nil {
+		return nil, err
+	}
+	var pkg struct {
+		Dependencies    map[string]string `json:"dependencies"`
+		DevDependencies map[string]string `json:"devDependencies"`
+	}
+	if err := json.Unmarshal(data, &pkg); err != nil {
+		return nil, err
+	}
+	deps := make(map[string]string)
+	for k, v := range pkg.Dependencies {
+		if strings.HasPrefix(k, "@owdproject/") {
+			deps[k] = v
+		}
+	}
+	for k, v := range pkg.DevDependencies {
+		if strings.HasPrefix(k, "@owdproject/") {
+			deps[k] = v
+		}
+	}
+	return deps, nil
+}
+
+func isNpmVersion(version string) bool {
+	if version == "" {
+		return false
+	}
+	if version == "workspace:*" || version == "workspace:^" {
+		return false
+	}
+	return true
+}
+
+func shortNameFromPkg(name string) string {
+	if idx := strings.LastIndex(name, "/"); idx >= 0 {
+		return name[idx+1:]
+	}
+	return name
+}
+
+func kindDirForKind(kind string) string {
+	switch kind {
+	case "app":
+		return "apps"
+	case "module":
+		return "packages"
+	case "theme":
+		return "themes"
+	default:
+		return "packages"
+	}
+}
+
+func catalogEntryForName(catalog *bridge.CatalogResponse, name string) bridge.CatalogEntry {
+	if catalog != nil {
+		for _, e := range catalog.Entries {
+			if e.Name == name {
+				return e
+			}
+		}
+	}
+	short := shortNameFromPkg(name)
+	kind := "module"
+	if strings.HasPrefix(short, "app-") {
+		kind = "app"
+	} else if strings.HasPrefix(short, "theme-") {
+		kind = "theme"
+	}
+	return bridge.CatalogEntry{
+		Name:      name,
+		ShortName: short,
+		Kind:      kind,
+	}
+}
+
+// packagesFromConfig returns all configured package names from desktop.config.ts.
+func packagesFromConfig(config *bridge.Config) []struct {
+	Name string
+	Kind string
+} {
+	var out []struct {
+		Name string
+		Kind string
+	}
+	if config == nil {
+		return out
+	}
+	for _, name := range config.Apps {
+		out = append(out, struct {
+			Name string
+			Kind string
+		}{Name: name, Kind: "app"})
+	}
+	for _, name := range config.Modules {
+		out = append(out, struct {
+			Name string
+			Kind string
+		}{Name: name, Kind: "module"})
+	}
+	if config.Theme != nil && *config.Theme != "" {
+		out = append(out, struct {
+			Name string
+			Kind string
+		}{Name: *config.Theme, Kind: "theme"})
+	}
+	return out
+}
+
+// BuildQueueFromConfig resolves packages in config against desktop/package.json.
+func BuildQueueFromConfig(
+	workspaceRoot string,
+	ctx *bridge.WorkspaceContext,
+	catalog *bridge.CatalogResponse,
+	logFn func(string),
+) *WorkQueue {
+	q := NewWorkQueue()
+	if ctx == nil {
+		return q
+	}
+
+	deps, err := readDesktopPackageDeps(ctx.Paths.PackageJson)
+	if err != nil {
+		logFn("✖ Failed to read desktop/package.json: " + err.Error())
+		return q
+	}
+
+	seen := map[string]bool{}
+	for _, pkg := range packagesFromConfig(&ctx.Config) {
+		if seen[pkg.Name] {
+			continue
+		}
+		seen[pkg.Name] = true
+		addPackageToQueue(q, workspaceRoot, pkg.Name, pkg.Kind, deps, catalog, false, logFn)
+	}
+
+	// Recursively scan dependencies of all local packages in the queue
+	scanned := map[string]bool{}
+	for {
+		hasNewScan := false
+		var names []string
+		for _, item := range q.Items {
+			if !scanned[item.Name] {
+				names = append(names, item.Name)
+			}
+		}
+
+		for _, name := range names {
+			scanned[name] = true
+			item := q.FindByName(name)
+			if item != nil && isLocallyAvailable(workspaceRoot, item.ShortName) {
+				DiscoverNestedDeps(workspaceRoot, *item, catalog, q, logFn)
+				hasNewScan = true
+			}
+		}
+		if !hasNewScan {
+			break
+		}
+	}
+
+	return q
+}
+
+// BuildStartupCheckQueue builds queue for installed-but-not-local packages.
+func BuildStartupCheckQueue(
+	workspaceRoot string,
+	ctx *bridge.WorkspaceContext,
+	catalog *bridge.CatalogResponse,
+	logFn func(string),
+) *WorkQueue {
+	q := NewWorkQueue()
+	if catalog == nil || ctx == nil {
+		return q
+	}
+
+	deps, _ := readDesktopPackageDeps(ctx.Paths.PackageJson)
+	seen := map[string]bool{}
+
+	for _, entry := range catalog.Entries {
+		if entry.Installed && !entry.LocalSource {
+			if !seen[entry.Name] {
+				seen[entry.Name] = true
+				addPackageToQueue(q, workspaceRoot, entry.Name, entry.Kind, deps, catalog, false, logFn)
+			}
+		}
+	}
+
+	// Theme kit dependencies
+	var themeShort string
+	if ctx.Config.Theme != nil && *ctx.Config.Theme != "" {
+		themeShort = shortNameFromPkg(*ctx.Config.Theme)
+	}
+	if themeShort != "" {
+		themeDeps, err := getThemeDependencies(workspaceRoot, themeShort)
+		if err == nil {
+			for _, dep := range themeDeps {
+				if seen[dep] {
+					continue
+				}
+				short := shortNameFromPkg(dep)
+				if !strings.HasPrefix(short, "kit-") && !strings.HasPrefix(short, "module-") {
+					continue
+				}
+				if isLocallyAvailable(workspaceRoot, short) {
+					logFn("ℹ " + short + " already available")
+					continue
+				}
+				seen[dep] = true
+				addPackageToQueue(q, workspaceRoot, dep, "module", deps, catalog, true, logFn)
+			}
+		}
+	}
+
+	// Recursively scan dependencies of all local packages in the queue
+	scanned := map[string]bool{}
+	for {
+		hasNewScan := false
+		var names []string
+		for _, item := range q.Items {
+			if !scanned[item.Name] {
+				names = append(names, item.Name)
+			}
+		}
+
+		for _, name := range names {
+			scanned[name] = true
+			item := q.FindByName(name)
+			if item != nil && isLocallyAvailable(workspaceRoot, item.ShortName) {
+				DiscoverNestedDeps(workspaceRoot, *item, catalog, q, logFn)
+				hasNewScan = true
+			}
+		}
+		if !hasNewScan {
+			break
+		}
+	}
+
+	return q
+}
+
+func addPackageToQueue(
+	q *WorkQueue,
+	workspaceRoot, name, kind string,
+	deps map[string]string,
+	catalog *bridge.CatalogResponse,
+	discovered bool,
+	logFn func(string),
+) {
+	entry := catalogEntryForName(catalog, name)
+	if kind != "" {
+		entry.Kind = kind
+	}
+	short := entry.ShortName
+	if short == "" {
+		short = shortNameFromPkg(name)
+	}
+
+	version, inPkg := deps[name]
+
+	if (entry.LocalSource || isLocallyAvailable(workspaceRoot, short)) && inPkg {
+		logFn("ℹ " + short + " already available and configured in package.json")
+		q.AppendUnique(WorkItem{
+			Name:       name,
+			ShortName:  short,
+			Type:       entry.Kind,
+			Source:     "local",
+			Status:     StatusSkipped,
+			Kind:       KindLocal,
+			TargetDir:  filepath.Join(workspaceRoot, kindDirForKind(entry.Kind), short),
+			Discovered: discovered,
+			Entry:      entry,
+		})
+		return
+	}
+
+	if !inPkg {
+		logFn("⚠ " + short + " missing from package.json")
+		q.AppendUnique(WorkItem{
+			Name:       name,
+			ShortName:  short,
+			Type:       entry.Kind,
+			Source:     SourcePending,
+			Status:     StatusPending,
+			Kind:       KindPrompt,
+			Discovered: discovered,
+			Entry:      entry,
+		})
+		return
+	}
+
+	if version == "workspace:*" || version == "workspace:^" {
+		logFn("⚠ " + short + " configured as workspace dependency")
+		q.AppendUnique(WorkItem{
+			Name:       name,
+			ShortName:  short,
+			Type:       entry.Kind,
+			Source:     SourcePending,
+			Status:     StatusPending,
+			Kind:       KindClone,
+			TargetDir:  filepath.Join(workspaceRoot, kindDirForKind(entry.Kind), short),
+			Discovered: discovered,
+			Entry:      entry,
+		})
+		return
+	}
+
+	if isNpmVersion(version) {
+		logFn("ℹ " + short + " resolved as npm package (" + version + ")")
+		q.AppendUnique(WorkItem{
+			Name:       name,
+			ShortName:  short,
+			Type:       entry.Kind,
+			Source:     "npm:" + version,
+			Status:     StatusSkipped,
+			Kind:       KindNpm,
+			Discovered: discovered,
+			Entry:      entry,
+		})
+		return
+	}
+
+	logFn("⚠ " + short + " has unknown source (" + version + ") — needs resolution")
+	q.AppendUnique(WorkItem{
+		Name:       name,
+		ShortName:  short,
+		Type:       entry.Kind,
+		Source:     SourcePending,
+		Status:     StatusPending,
+		Kind:       KindPrompt,
+		Discovered: discovered,
+		Entry:      entry,
+	})
+}
+
+// DiscoverNestedDeps scans a cloned/local package for deps.
+func DiscoverNestedDeps(
+	workspaceRoot string,
+	item WorkItem,
+	catalog *bridge.CatalogResponse,
+	existing *WorkQueue,
+	logFn func(string),
+) {
+	deps, found := getOwdDepsLocal(workspaceRoot, item.ShortName, item.Type)
+	if !found {
+		return
+	}
+
+	for _, dep := range deps {
+		if existing.FindByName(dep) != nil {
+			continue
+		}
+		depShort := shortNameFromPkg(dep)
+		depKind := "module"
+		if strings.HasPrefix(depShort, "app-") {
+			depKind = "app"
+		} else if strings.HasPrefix(depShort, "theme-") {
+			depKind = "theme"
+		}
+		logFn("⚠ Dependency discovered: " + depShort)
+		pkgDeps, _ := readDesktopPackageDeps(filepath.Join(workspaceRoot, "desktop", "package.json"))
+		addPackageToQueue(existing, workspaceRoot, dep, depKind, pkgDeps, catalog, true, logFn)
+	}
+}

package/go/tui/resolver_test.go

@@ -0,0 +1,86 @@
+package tui
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+
+	"owd-cli/bridge"
+)
+
+func TestIsNpmVersion(t *testing.T) {
+	if !isNpmVersion("^1.2.0") {
+		t.Fatal("semver should be npm")
+	}
+	if !isNpmVersion("latest") {
+		t.Fatal("latest should be npm")
+	}
+	if isNpmVersion("workspace:*") {
+		t.Fatal("workspace should not be npm")
+	}
+}
+
+func TestReadDesktopPackageDeps(t *testing.T) {
+	dir := t.TempDir()
+	pkgPath := filepath.Join(dir, "package.json")
+	content := `{
+  "dependencies": {
+    "@owdproject/app-about": "workspace:*",
+    "@owdproject/theme-nova": "^1.0.0"
+  }
+}`
+	if err := os.WriteFile(pkgPath, []byte(content), 0644); err != nil {
+		t.Fatal(err)
+	}
+	deps, err := readDesktopPackageDeps(pkgPath)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if deps["@owdproject/app-about"] != "workspace:*" {
+		t.Fatalf("unexpected workspace dep: %v", deps)
+	}
+	if deps["@owdproject/theme-nova"] != "^1.0.0" {
+		t.Fatalf("unexpected npm dep: %v", deps)
+	}
+}
+
+func TestBuildQueueFromConfigWorkspaceAndNpm(t *testing.T) {
+	dir := t.TempDir()
+	desktopDir := filepath.Join(dir, "desktop")
+	if err := os.MkdirAll(desktopDir, 0755); err != nil {
+		t.Fatal(err)
+	}
+	pkgPath := filepath.Join(desktopDir, "package.json")
+	content := `{
+  "dependencies": {
+    "@owdproject/app-about": "workspace:*",
+    "@owdproject/theme-nova": "^1.2.0"
+  }
+}`
+	if err := os.WriteFile(pkgPath, []byte(content), 0644); err != nil {
+		t.Fatal(err)
+	}
+
+	theme := "@owdproject/theme-nova"
+	ctx := &bridge.WorkspaceContext{
+		Config: bridge.Config{
+			Theme: &theme,
+			Apps:  []string{"@owdproject/app-about"},
+		},
+		Paths: bridge.WorkspacePaths{PackageJson: pkgPath},
+	}
+
+	var logs []string
+	q := BuildQueueFromConfig(dir, ctx, nil, func(s string) { logs = append(logs, s) })
+	if q.TotalCount() != 2 {
+		t.Fatalf("expected 2 queue items, got %d", q.TotalCount())
+	}
+	about := q.FindByName("@owdproject/app-about")
+	if about == nil || about.Source != SourcePending {
+		t.Fatalf("expected pending workspace item, got %+v", about)
+	}
+	nova := q.FindByName("@owdproject/theme-nova")
+	if nova == nil || nova.Kind != KindNpm {
+		t.Fatalf("expected npm item, got %+v", nova)
+	}
+}

package/go/tui/styles.go

@@ -0,0 +1,153 @@
+package tui
+
+import (
+	"github.com/charmbracelet/lipgloss"
+)
+
+// ─────────────────────────────────────────────
+// Colors & Styles
+// ─────────────────────────────────────────────
+
+var (
+	colorAccent    = lipgloss.Color("#7ee787")
+	colorCyan      = lipgloss.Color("#24ebff")
+	colorDim       = lipgloss.Color("#3a3a4a")
+	colorMuted     = lipgloss.Color("#6c7086")
+	colorWarn      = lipgloss.Color("#f9e2af")
+	colorErr       = lipgloss.Color("#f38ba8")
+	colorNpm       = lipgloss.Color("#7ee787")
+	colorGit       = lipgloss.Color("#89dceb")
+	colorLocal     = lipgloss.Color("#ff79c6")
+	colorBorder    = lipgloss.Color("#4a4a6a")
+	colorBorderAct = lipgloss.Color("#7ee787")
+	colorWhite     = lipgloss.Color("#cdd6f4")
+	colorSubtle    = lipgloss.Color("#585b70")
+	colorBarBg     = lipgloss.Color("#11111b")
+	colorBarFg     = lipgloss.Color("#cdd6f4")
+)
+
+var (
+	panelBorderStyle = lipgloss.NewStyle().
+				Border(lipgloss.RoundedBorder()).
+				BorderForeground(colorBorder)
+
+	panelBorderActive = lipgloss.NewStyle().
+				Border(lipgloss.RoundedBorder()).
+				BorderForeground(colorBorderAct)
+
+	accentStyle = lipgloss.NewStyle().Foreground(colorAccent).Bold(true)
+	cyanStyle   = lipgloss.NewStyle().Foreground(colorCyan).Bold(true)
+	mutedStyle  = lipgloss.NewStyle().Foreground(colorMuted)
+	warnStyle   = lipgloss.NewStyle().Foreground(colorWarn)
+	errStyle    = lipgloss.NewStyle().Foreground(colorErr)
+	boldStyle   = lipgloss.NewStyle().Bold(true).Foreground(colorWhite)
+	dimStyle    = lipgloss.NewStyle().Foreground(colorDim)
+	subtleStyle = lipgloss.NewStyle().Foreground(colorSubtle)
+
+	tabActiveStyle = lipgloss.NewStyle().
+			Bold(true).
+			Background(colorAccent).
+			Foreground(lipgloss.Color("#1e1e2e")).
+			Padding(0, 2)
+
+	tabInactiveStyle = lipgloss.NewStyle().
+				Foreground(colorMuted).
+				Padding(0, 2)
+
+	selectedRowStyle = lipgloss.NewStyle().
+				Bold(true).
+				Foreground(colorAccent)
+
+	installedBadge   = lipgloss.NewStyle().Foreground(colorAccent).Render("●")
+	uninstalledBadge = lipgloss.NewStyle().Foreground(colorSubtle).Render("○")
+
+	// bottom bar — no border, gemini-style
+	barStyle = lipgloss.NewStyle().
+			Foreground(colorBarFg).
+			PaddingLeft(2)
+
+	barTextStyle = lipgloss.NewStyle().
+			Foreground(colorBarFg)
+
+	barKeyStyle = lipgloss.NewStyle().
+			Foreground(colorAccent).
+			Bold(true)
+
+	barSepStyle = lipgloss.NewStyle().
+			Foreground(colorSubtle)
+
+	modalStyle = lipgloss.NewStyle().
+			Padding(1, 3)
+
+	modalOptionActive = lipgloss.NewStyle().
+				Background(colorCyan).
+				Foreground(lipgloss.Color("#000000")).
+				Bold(true).
+				Padding(0, 2)
+
+	modalOptionInactive = lipgloss.NewStyle().
+				Background(colorDim).
+				Foreground(colorMuted).
+				Padding(0, 2)
+
+	modalConfirmActiveErr = lipgloss.NewStyle().
+				Background(colorErr).
+				Foreground(lipgloss.Color("#000000")).
+				Bold(true).
+				Padding(0, 2)
+
+	modalConfirmActiveAccent = lipgloss.NewStyle().
+				Background(colorAccent).
+				Foreground(lipgloss.Color("#000000")).
+				Bold(true).
+				Padding(0, 2)
+
+	settingsSaveActive = lipgloss.NewStyle().
+				Background(colorAccent).
+				Foreground(lipgloss.Color("#000000")).
+				Bold(true).
+				Padding(0, 3)
+
+	settingsSaveInactive = lipgloss.NewStyle().
+				Background(colorDim).
+				Foreground(colorWhite).
+				Padding(0, 3)
+
+	settingsCancelActive = lipgloss.NewStyle().
+				Background(colorErr).
+				Foreground(lipgloss.Color("#000000")).
+				Bold(true).
+				Padding(0, 3)
+
+	settingsCancelInactive = lipgloss.NewStyle().
+				Background(colorDim).
+				Foreground(colorWhite).
+				Padding(0, 3)
+
+	localSourceTag = lipgloss.NewStyle().
+				Foreground(colorLocal)
+
+	managePackageRightBorder = lipgloss.NewStyle().
+				Border(lipgloss.NormalBorder(), false, false, false, true).
+				BorderForeground(colorDim).
+				PaddingLeft(3)
+
+	progressBarEmptyStyle = lipgloss.NewStyle().Foreground(colorDim)
+	progressBarFilledStyle = lipgloss.NewStyle().Foreground(colorCyan)
+	spinnerStyle = lipgloss.NewStyle().Foreground(colorCyan).Bold(true)
+	managePackageLeftPanelStyle = lipgloss.NewStyle().Width(65)
+	desktopSubTitleStyle = lipgloss.NewStyle().Foreground(colorMuted)
+	modalWrapperStyle = lipgloss.NewStyle().
+				Border(lipgloss.RoundedBorder()).
+				BorderForeground(colorCyan).
+				Padding(1, 3)
+	tableHeaderStyle = lipgloss.NewStyle().Foreground(colorSubtle).Bold(true)
+	dirtyIndicatorStyle = lipgloss.NewStyle().Foreground(colorNpm)
+	selectedRowBgStyle = lipgloss.NewStyle().Background(colorDim)
+	statusGreenStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#2ea043"))
+	accentRegularStyle = lipgloss.NewStyle().Foreground(colorAccent)
+	cyanRegularStyle = lipgloss.NewStyle().Foreground(colorCyan)
+	warnBoldStyle = lipgloss.NewStyle().Foreground(colorWarn).Bold(true)
+	cyanBoldStyle = lipgloss.NewStyle().Foreground(colorCyan).Bold(true)
+	blinkGreenStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#2ea043")).Bold(true)
+)