mirror of
https://github.com/onyx-dot-app/onyx.git
synced 2026-10-23 03:42:59 -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 -->
105 lines
2.7 KiB
Go
105 lines
2.7 KiB
Go
package cmd
|
|
|
|
import (
|
|
"errors"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"runtime"
|
|
"strconv"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/onyx-dot-app/onyx/tools/ods/internal/gittest"
|
|
)
|
|
|
|
// devtoolRepo creates an empty git repository, makes it the working directory,
|
|
// and returns its root as git reports it.
|
|
func devtoolRepo(t *testing.T) string {
|
|
t.Helper()
|
|
project, isolated := rootProject, rootIsolated
|
|
rootProject, rootIsolated = "", false
|
|
t.Cleanup(func() { rootProject, rootIsolated = project, isolated })
|
|
dir := t.TempDir()
|
|
gittest.Git(t, dir, "init", "-q")
|
|
t.Chdir(dir)
|
|
root, err := filepath.EvalSymlinks(dir)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
return root
|
|
}
|
|
|
|
// devtoolBinDir replaces PATH with a new directory that holds only git, so any
|
|
// other tool a command starts must be a fake that the test provides.
|
|
func devtoolBinDir(t *testing.T) string {
|
|
t.Helper()
|
|
if runtime.GOOS == "windows" {
|
|
t.Skip("the fake tools are shell scripts")
|
|
}
|
|
git, err := exec.LookPath("git")
|
|
if err != nil {
|
|
t.Fatalf("git is required: %v", err)
|
|
}
|
|
dir := t.TempDir()
|
|
if err := os.Symlink(git, filepath.Join(dir, "git")); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
t.Setenv("PATH", dir)
|
|
return dir
|
|
}
|
|
|
|
// devtoolFakeTool writes an executable script called name into binDir. Each
|
|
// run appends its working dir, argument count and arguments, each
|
|
// NUL-terminated, to the returned call log, then runs body.
|
|
func devtoolFakeTool(t *testing.T, binDir, name, body string) string {
|
|
t.Helper()
|
|
calls := filepath.Join(binDir, name+".calls")
|
|
script := "#!/bin/sh\nprintf '%s\\0' \"$(pwd -P)\" \"$#\" \"$@\" >> \"$0.calls\"\n" + body
|
|
if err := os.WriteFile(filepath.Join(binDir, name), []byte(script), 0o755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
return calls
|
|
}
|
|
|
|
// devtoolCall is one recorded run of a fake tool.
|
|
type devtoolCall struct {
|
|
Dir string
|
|
Args []string
|
|
}
|
|
|
|
// devtoolCalls returns the invocations recorded in a call log, in order.
|
|
func devtoolCalls(t *testing.T, calls string) []devtoolCall {
|
|
t.Helper()
|
|
data, err := os.ReadFile(calls)
|
|
if errors.Is(err, os.ErrNotExist) {
|
|
return nil
|
|
}
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
fields := strings.Split(strings.TrimSuffix(string(data), "\x00"), "\x00")
|
|
var got []devtoolCall
|
|
for len(fields) > 0 {
|
|
if len(fields) < 2 {
|
|
t.Fatalf("malformed call log %q", data)
|
|
}
|
|
n, err := strconv.Atoi(fields[1])
|
|
if err != nil || n > len(fields)-2 {
|
|
t.Fatalf("malformed call log %q", data)
|
|
}
|
|
got = append(got, devtoolCall{Dir: fields[0], Args: fields[2 : 2+n]})
|
|
fields = fields[2+n:]
|
|
}
|
|
return got
|
|
}
|
|
|
|
// devtoolUnsetenv removes key for the rest of the test and restores it after.
|
|
func devtoolUnsetenv(t *testing.T, key string) {
|
|
t.Helper()
|
|
t.Setenv(key, "")
|
|
if err := os.Unsetenv(key); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|