mirror of
https://github.com/onyx-dot-app/onyx.git
synced 2026-10-22 19:32:55 -05:00
## Description
Make ODS reuse shared development infrastructure by default, with
`--isolated` for separate datasets.
- Use the same service specifications and launchers for `stack`, `web
dev`, and `backend` commands. Remove the duplicate `stack
--frontend-only` option.
- Enforce project ownership across checkouts and resolve database
commands to the actual managed database.
- Stop services before pending migrations, preserve them when already at
head, and reject manual migrations beneath managed services.
- Harden startup cancellation, shutdown grace, descendant cleanup,
terminal input, and frontend API validation. Preserve Windows foreground
commands.
- Consolidate environment helpers, protect symlinked environment files,
propagate restore errors, and update help and documentation.
This PR contains only ODS and its development-stack skill. It does not
include the plugins implementation.
## How Has This Been Tested?
- Targeted command and regression tests using fake tools and disposable
Git repositories.
- Race tests for runtime targeting, ownership, migration ordering,
process cleanup, and terminal input.
- `go vet ./...`, pre-commit checks, native builds, and Windows
cross-builds.
- The full Go suite was run. Its remaining failures are the existing
macOS devcontainer SSH-mount fixture expectations in
`TestDevcontainerCommands` and `TestRunDevRebuild`.
No real database migrations, restores, or development-stack restarts
ran. Native Windows execution remains untested.
## Additional Options
- [ ] [Optional] Please cherry-pick this PR to the latest release
version.
- [x] [Optional] Override Linear Check
<!-- This is an auto-generated description by cubic. -->
---
## Summary by cubic
ODS now shares development infrastructure across worktrees by default,
with `--isolated` for separate datasets. `stack`, `web dev`, and
`backend` use the same service specs and launchers, and the duplicate
`stack --frontend-only` option is removed.
- Direct launches run the same dependency-prepare step as stack startup,
so `backend` and `web dev` work with fresh or stale Python environments.
- A stopped preview discards its former project state before retargeting
to another API owner.
- Enforces project ownership across checkouts and resolves database
commands to the managed database. New tests reject conflicting targets
before any mutation.
- Stops services before pending migrations, preserves them when already
at head, and rejects manual migrations beneath managed services.
Migration probe failures fail closed.
- Hardens startup cancellation, shutdown grace, and descendant cleanup;
ODS keeps the terminal foreground group so Ctrl-C still honors shutdown
timeouts, and tmux pane identifiers no longer change service identity.
- Database passwords reach tools through the child environment only,
never in process arguments; Windows foreground commands are preserved.
- Consolidates environment helpers, protects symlinked env files,
propagates restore errors, and refreshes help and documentation. Test
commits exercise the new migration-target and preview-launch paths.
<sup>Written for commit 14500cb051.
Summary will update on new commits.</sup>
<a
href="https://cubic.dev/pr/onyx-dot-app/onyx/pull/16246?utm_source=github"
target="_blank" rel="noopener noreferrer"
data-no-image-dialog="true"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://www.cubic.dev/buttons/review-in-cubic-dark.svg"><source
media="(prefers-color-scheme: light)"
srcset="https://www.cubic.dev/buttons/review-in-cubic-light.svg"><img
alt="View guided diff"
src="https://www.cubic.dev/buttons/review-in-cubic-light.svg"></picture></a>
<a
href="https://www.cubic.dev/action/auto-fix/pr/onyx-dot-app/onyx/16246?returnTo=https%3A%2F%2Fgithub.com%2Fonyx-dot-app%2Fonyx%2Fpull%2F16246&source=description"
target="_blank" rel="noopener noreferrer"
data-no-image-dialog="true"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://www.cubic.dev/buttons/turn-on-auto-fix-dark.svg"><source
media="(prefers-color-scheme: light)"
srcset="https://www.cubic.dev/buttons/turn-on-auto-fix-light.svg"><img
alt="Turn on auto-fix"
src="https://www.cubic.dev/buttons/turn-on-auto-fix-light.svg"></picture></a>
<!-- End of auto-generated description by cubic. -->
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **New Features**
* Added the global `--isolated` option for separate development stacks;
shared infrastructure is the default, with clearer project ownership and
status information.
* Added `ods web dev` previews that can use a healthy managed API on
macOS and Linux, plus foreground startup on Windows.
* Expanded command guidance for development workflows, database
targeting, and dump formats.
* **Bug Fixes**
* Pending migrations now stop managed application services first;
healthy services remain running when no migrations are needed.
* Database operations verify project ownership and target selection
before making changes. Restore errors now fail the command, SQL restores
stop on errors, and temporary files are cleaned up after failures.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
377 lines
12 KiB
Go
377 lines
12 KiB
Go
package cmd
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"crypto/sha256"
|
|
"encoding/hex"
|
|
"errors"
|
|
"io"
|
|
"os"
|
|
"path/filepath"
|
|
"reflect"
|
|
"slices"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestWebDevHelpDoesNotStartServices(t *testing.T) {
|
|
for _, args := range [][]string{
|
|
{"dev", "--help"}, {"dev", "-h"}, {"dev", "--", "--help"},
|
|
{"dev", "--port", "3100", "--help"}, {"dev", "--hostname", "localhost", "-h"},
|
|
} {
|
|
for _, mounted := range []bool{false, true} {
|
|
name := strings.Join(args, " ")
|
|
if mounted {
|
|
name = "ods web " + name
|
|
}
|
|
t.Run(name, func(t *testing.T) {
|
|
t.Chdir(t.TempDir())
|
|
cmd := NewWebCommand()
|
|
invocation := args
|
|
if mounted {
|
|
cmd = NewRootCommand()
|
|
invocation = append([]string{"web"}, args...)
|
|
}
|
|
var output bytes.Buffer
|
|
cmd.SetOut(&output)
|
|
cmd.SetArgs(invocation)
|
|
if err := cmd.Execute(); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !strings.Contains(output.String(), "Usage:") {
|
|
t.Fatalf("missing help: %s", output.String())
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
func writeFile(t *testing.T, path string, content string) {
|
|
t.Helper()
|
|
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := os.WriteFile(path, []byte(content), 0o644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
func setMtime(t *testing.T, path string, mtime time.Time) {
|
|
t.Helper()
|
|
if err := os.Chtimes(path, mtime, mtime); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
func TestNodeModulesNeedsInstall(t *testing.T) {
|
|
now := time.Now()
|
|
|
|
t.Run("missing node_modules", func(t *testing.T) {
|
|
webDir := t.TempDir()
|
|
needs, reason := nodeModulesNeedsInstall(webDir)
|
|
if !needs {
|
|
t.Fatal("expected install for missing node_modules")
|
|
}
|
|
if reason != "node_modules not found" {
|
|
t.Fatalf("unexpected reason: %q", reason)
|
|
}
|
|
})
|
|
|
|
t.Run("empty node_modules", func(t *testing.T) {
|
|
webDir := t.TempDir()
|
|
if err := os.Mkdir(filepath.Join(webDir, "node_modules"), 0o755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
needs, reason := nodeModulesNeedsInstall(webDir)
|
|
if !needs {
|
|
t.Fatal("expected install for empty node_modules")
|
|
}
|
|
if reason != "node_modules is empty" {
|
|
t.Fatalf("unexpected reason: %q", reason)
|
|
}
|
|
})
|
|
|
|
t.Run("populated without stamp is stale", func(t *testing.T) {
|
|
webDir := t.TempDir()
|
|
writeFile(t, filepath.Join(webDir, "bun.lock"), "lock-v1")
|
|
writeFile(t, filepath.Join(webDir, "node_modules", "pkg", "index.js"), "")
|
|
needs, _ := nodeModulesNeedsInstall(webDir)
|
|
if !needs {
|
|
t.Fatal("expected install when no stamp recorded")
|
|
}
|
|
})
|
|
|
|
t.Run("stamp matches lockfile", func(t *testing.T) {
|
|
webDir := t.TempDir()
|
|
writeFile(t, filepath.Join(webDir, "bun.lock"), "lock-v1")
|
|
writeFile(t, filepath.Join(webDir, "node_modules", "pkg", "index.js"), "")
|
|
writeLockStamp(webDir)
|
|
needs, reason := nodeModulesNeedsInstall(webDir)
|
|
if needs {
|
|
t.Fatalf("expected no install with matching stamp, got: %q", reason)
|
|
}
|
|
})
|
|
|
|
t.Run("lockfile changed after stamp", func(t *testing.T) {
|
|
webDir := t.TempDir()
|
|
writeFile(t, filepath.Join(webDir, "bun.lock"), "lock-v1")
|
|
writeFile(t, filepath.Join(webDir, "node_modules", "pkg", "index.js"), "")
|
|
writeLockStamp(webDir)
|
|
writeFile(t, filepath.Join(webDir, "bun.lock"), "lock-v2")
|
|
setMtime(t, filepath.Join(webDir, "bun.lock"), now)
|
|
needs, _ := nodeModulesNeedsInstall(webDir)
|
|
if !needs {
|
|
t.Fatal("expected install after lockfile change")
|
|
}
|
|
})
|
|
|
|
t.Run("stamp replaces an existing file it cannot write in place", func(t *testing.T) {
|
|
// Sessions run as different users against the shared node_modules
|
|
// volume, so the previous stamp may not be writable — only
|
|
// replaceable via the directory. Simulate with a read-only stamp.
|
|
webDir := t.TempDir()
|
|
writeFile(t, filepath.Join(webDir, "bun.lock"), "lock-v2")
|
|
writeFile(t, filepath.Join(webDir, "node_modules", "pkg", "index.js"), "")
|
|
stampPath := filepath.Join(webDir, "node_modules", lockStampName)
|
|
writeFile(t, stampPath, "stale-hash")
|
|
if err := os.Chmod(stampPath, 0o444); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
writeLockStamp(webDir)
|
|
needs, reason := nodeModulesNeedsInstall(webDir)
|
|
if needs {
|
|
t.Fatalf("expected stamp to be replaced despite read-only file, got: %q", reason)
|
|
}
|
|
})
|
|
|
|
t.Run("no lockfile skips staleness check", func(t *testing.T) {
|
|
webDir := t.TempDir()
|
|
writeFile(t, filepath.Join(webDir, "node_modules", "pkg", "index.js"), "")
|
|
needs, _ := nodeModulesNeedsInstall(webDir)
|
|
if needs {
|
|
t.Fatal("expected no install without a lockfile to compare")
|
|
}
|
|
})
|
|
}
|
|
|
|
func TestLibNeedsBuild(t *testing.T) {
|
|
old := time.Now().Add(-time.Hour)
|
|
older := old.Add(-time.Hour)
|
|
|
|
t.Run("missing package is skipped", func(t *testing.T) {
|
|
needs, _ := libNeedsBuild(filepath.Join(t.TempDir(), "lib", "nope"))
|
|
if needs {
|
|
t.Fatal("expected missing package to be skipped")
|
|
}
|
|
})
|
|
|
|
t.Run("missing dist", func(t *testing.T) {
|
|
pkgDir := t.TempDir()
|
|
writeFile(t, filepath.Join(pkgDir, "src", "index.ts"), "")
|
|
needs, reason := libNeedsBuild(pkgDir)
|
|
if !needs {
|
|
t.Fatal("expected build for missing dist")
|
|
}
|
|
if reason != "has no dist build" {
|
|
t.Fatalf("unexpected reason: %q", reason)
|
|
}
|
|
})
|
|
|
|
t.Run("dist newer than sources", func(t *testing.T) {
|
|
pkgDir := t.TempDir()
|
|
src := filepath.Join(pkgDir, "src", "index.ts")
|
|
dist := filepath.Join(pkgDir, "dist", "index.js")
|
|
writeFile(t, src, "")
|
|
writeFile(t, dist, "")
|
|
setMtime(t, src, older)
|
|
setMtime(t, filepath.Join(pkgDir, "src"), older)
|
|
setMtime(t, pkgDir, older)
|
|
needs, reason := libNeedsBuild(pkgDir)
|
|
if needs {
|
|
t.Fatalf("expected no build when dist is fresh, got: %q", reason)
|
|
}
|
|
})
|
|
|
|
t.Run("source newer than dist", func(t *testing.T) {
|
|
pkgDir := t.TempDir()
|
|
src := filepath.Join(pkgDir, "src", "index.ts")
|
|
dist := filepath.Join(pkgDir, "dist", "index.js")
|
|
writeFile(t, src, "")
|
|
writeFile(t, dist, "")
|
|
setMtime(t, dist, older)
|
|
setMtime(t, filepath.Join(pkgDir, "dist"), older)
|
|
setMtime(t, src, old)
|
|
needs, _ := libNeedsBuild(pkgDir)
|
|
if !needs {
|
|
t.Fatal("expected build when a source is newer than dist")
|
|
}
|
|
})
|
|
|
|
t.Run("changes under excluded dirs are ignored", func(t *testing.T) {
|
|
pkgDir := t.TempDir()
|
|
src := filepath.Join(pkgDir, "src", "index.ts")
|
|
dist := filepath.Join(pkgDir, "dist", "index.js")
|
|
dep := filepath.Join(pkgDir, "node_modules", "dep", "index.js")
|
|
writeFile(t, src, "")
|
|
writeFile(t, dist, "")
|
|
writeFile(t, dep, "")
|
|
setMtime(t, src, older)
|
|
setMtime(t, filepath.Join(pkgDir, "src"), older)
|
|
setMtime(t, pkgDir, older)
|
|
needs, reason := libNeedsBuild(pkgDir)
|
|
if needs {
|
|
t.Fatalf("expected node_modules churn to be ignored, got: %q", reason)
|
|
}
|
|
})
|
|
}
|
|
|
|
// devtoolFreshWebDir builds a repository whose web directory needs neither an
|
|
// install nor a library build, and returns the web dir and a fake bun's call log.
|
|
func devtoolFreshWebDir(t *testing.T) (string, string) {
|
|
t.Helper()
|
|
binDir := devtoolBinDir(t)
|
|
webDir := filepath.Join(devtoolRepo(t), "web")
|
|
writeFile(t, filepath.Join(webDir, "bun.lock"), "lock-v1")
|
|
writeFile(t, filepath.Join(webDir, "node_modules", "pkg", "index.js"), "")
|
|
writeLockStamp(webDir)
|
|
return webDir, devtoolFakeTool(t, binDir, "bun", "")
|
|
}
|
|
|
|
func TestRunWebScript_forwardsScriptArgs(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
args []string
|
|
want []string
|
|
}{
|
|
{"script only", []string{"build"}, []string{"run", "build"}},
|
|
{"flags get a separator", []string{"test", "--watch"}, []string{"run", "test", "--", "--watch"}},
|
|
{"other script help is forwarded", []string{"test", "--help"}, []string{"run", "test", "--", "--help"}},
|
|
{"separator is not repeated", []string{"test", "--", "--watch"}, []string{"run", "test", "--", "--watch"}},
|
|
}
|
|
for _, c := range cases {
|
|
t.Run(c.name, func(t *testing.T) {
|
|
webDir, bunCalls := devtoolFreshWebDir(t)
|
|
|
|
runWebScript(c.args)
|
|
|
|
want := []devtoolCall{{Dir: webDir, Args: c.want}}
|
|
if got := devtoolCalls(t, bunCalls); !reflect.DeepEqual(got, want) {
|
|
t.Fatalf("expected %q, got %q", want, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestPrepareWebDir_installsAndBuildsLibsInOrder(t *testing.T) {
|
|
binDir := devtoolBinDir(t)
|
|
webDir := filepath.Join(devtoolRepo(t), "web")
|
|
writeFile(t, filepath.Join(webDir, "bun.lock"), "lock-v1")
|
|
if err := os.MkdirAll(filepath.Join(webDir, "node_modules"), 0o755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
writeFile(t, filepath.Join(webDir, "lib", "opal", "src", "index.ts"), "")
|
|
writeFile(t, filepath.Join(webDir, "lib", "shared", "src", "index.ts"), "")
|
|
bunCalls := devtoolFakeTool(t, binDir, "bun", "")
|
|
|
|
prepareWebDir(webDir)
|
|
|
|
want := []devtoolCall{
|
|
{Dir: webDir, Args: []string{"install", "--frozen-lockfile"}},
|
|
{Dir: filepath.Join(webDir, "lib", "shared"), Args: []string{"run", "build"}},
|
|
{Dir: filepath.Join(webDir, "lib", "opal"), Args: []string{"run", "build"}},
|
|
}
|
|
if got := devtoolCalls(t, bunCalls); !reflect.DeepEqual(got, want) {
|
|
t.Fatalf("expected %q, got %q", want, got)
|
|
}
|
|
sum := sha256.Sum256([]byte("lock-v1"))
|
|
stamp, err := os.ReadFile(filepath.Join(webDir, "node_modules", lockStampName))
|
|
if err != nil {
|
|
t.Fatalf("expected a lock stamp after install: %v", err)
|
|
}
|
|
if got, want := string(stamp), hex.EncodeToString(sum[:])+"\n"; got != want {
|
|
t.Fatalf("expected %q, got %q", want, got)
|
|
}
|
|
}
|
|
|
|
func TestPrepareWebDir_canceledContextSkipsPreparation(t *testing.T) {
|
|
webDir, calls := devtoolFreshWebDir(t)
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel()
|
|
if err := prepareWebDirOutputContext(ctx, webDir, io.Discard); !errors.Is(err, context.Canceled) {
|
|
t.Fatalf("expected cancellation, got %v", err)
|
|
}
|
|
if got := devtoolCalls(t, calls); len(got) != 0 {
|
|
t.Fatalf("canceled preparation ran commands: %v", got)
|
|
}
|
|
}
|
|
|
|
func TestPrepareWebDir_skipsFreshInstallAndLibs(t *testing.T) {
|
|
webDir, bunCalls := devtoolFreshWebDir(t)
|
|
older := time.Now().Add(-time.Hour)
|
|
for _, lib := range webLibPackages {
|
|
pkgDir := filepath.Join(webDir, lib)
|
|
src := filepath.Join(pkgDir, "src", "index.ts")
|
|
writeFile(t, src, "")
|
|
writeFile(t, filepath.Join(pkgDir, "dist", "index.js"), "")
|
|
for _, path := range []string{src, filepath.Dir(src), pkgDir} {
|
|
setMtime(t, path, older)
|
|
}
|
|
}
|
|
|
|
prepareWebDir(webDir)
|
|
|
|
if got := devtoolCalls(t, bunCalls); got != nil {
|
|
t.Fatalf("expected no bun calls, got %q", got)
|
|
}
|
|
}
|
|
|
|
func TestLoadScripts_readsPackageJSON(t *testing.T) {
|
|
loaders := []struct {
|
|
dir string
|
|
load func() (map[string]string, error)
|
|
names func() []string
|
|
}{
|
|
{"web", loadWebScripts, webScriptNames},
|
|
{"desktop", loadDesktopScripts, desktopScriptNames},
|
|
}
|
|
for _, l := range loaders {
|
|
t.Run(l.dir, func(t *testing.T) {
|
|
packageJSON := filepath.Join(devtoolRepo(t), l.dir, "package.json")
|
|
|
|
if _, err := l.load(); err == nil || !strings.Contains(err.Error(), "failed to read") {
|
|
t.Fatalf("expected a read error without package.json, got %v", err)
|
|
}
|
|
|
|
writeFile(t, packageJSON, "{")
|
|
if _, err := l.load(); err == nil || !strings.Contains(err.Error(), "failed to parse") {
|
|
t.Fatalf("expected a parse error, got %v", err)
|
|
}
|
|
if got := l.names(); got != nil {
|
|
t.Fatalf("expected no names for an unparseable package.json, got %q", got)
|
|
}
|
|
|
|
writeFile(t, packageJSON, `{"name": "x"}`)
|
|
if scripts, err := l.load(); err != nil || scripts != nil {
|
|
t.Fatalf("expected no scripts and no error, got %v, %v", scripts, err)
|
|
}
|
|
|
|
writeFile(t, packageJSON, `{"scripts": {"lint": "eslint", "dev": "next dev"}}`)
|
|
if got, want := l.names(), []string{"dev", "lint"}; !slices.Equal(got, want) {
|
|
t.Fatalf("expected %q, got %q", want, got)
|
|
}
|
|
})
|
|
}
|
|
|
|
t.Run("outside a repository", func(t *testing.T) {
|
|
t.Chdir(t.TempDir())
|
|
if _, err := loadWebScripts(); err == nil {
|
|
t.Fatal("expected an error outside a repository")
|
|
}
|
|
if _, err := loadDesktopScripts(); err == nil {
|
|
t.Fatal("expected an error outside a repository")
|
|
}
|
|
})
|
|
}
|