ai/byre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Add --data, --listen and --ports to byre serve for task previews

Browse Source
This commit is contained in:
Ian Gulliver
2026-10-15 12:39:46 -07:00
parent 8beab6e384
commit 4a9888e653
18 changed files with 100 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/agents/inbox_internal_test.go
+1 -1
View File
@@ -69,7 +69,7 @@ func TestValidateAsk(t *testing.T) {
func TestCancelQuestion(t *testing.T) {
ctx := context.Background()
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), func(api.Event) {})
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(api.Event) {})
if err != nil {
t.Fatalf("open store: %v", err)
}
internal/agents/lead_internal_test.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
func TestPaneFreed(t *testing.T) {
ctx := context.Background()
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), func(api.Event) {})
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(api.Event) {})
if err != nil {
t.Fatalf("open store: %v", err)
}
internal/agents/manager_test.go
+1 -1
View File
@@ -48,7 +48,7 @@ func newEnv(t *testing.T) *env {
e := &env{t: t, ctx: ctx, events: make(chan api.Event, 4096), worktrees: t.TempDir(), leads: t.TempDir()}
var err error
e.store, err = store.Open(filepath.Join(t.TempDir(), "byre.db"), func(ev api.Event) { e.events <- ev })
e.store, err = store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(ev api.Event) { e.events <- ev })
if err != nil {
t.Fatalf("open store: %v", err)
}
internal/agents/mergetitle_internal_test.go
+1 -1
View File
@@ -14,7 +14,7 @@ import (
func TestSetMergeTitle(t *testing.T) {
ctx := context.Background()
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), func(api.Event) {})
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(api.Event) {})
if err != nil {
t.Fatalf("open store: %v", err)
}
internal/agents/ratelimit_internal_test.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
func TestRateLimitedTurn(t *testing.T) {
ctx := context.Background()
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), func(api.Event) {})
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(api.Event) {})
if err != nil {
t.Fatalf("open store: %v", err)
}
internal/agents/snapshots_internal_test.go
+1 -1
View File
@@ -17,7 +17,7 @@ import (
func TestSnapshots(t *testing.T) {
ctx := context.Background()
events := make(chan api.Event, 256)
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), func(ev api.Event) { events <- ev })
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(ev api.Event) { events <- ev })
if err != nil {
t.Fatalf("open store: %v", err)
}
internal/agents/subagent_internal_test.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
func TestSubagentEvents(t *testing.T) {
ctx := context.Background()
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), func(api.Event) {})
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(api.Event) {})
if err != nil {
t.Fatalf("open store: %v", err)
}
internal/push/push_test.go
+1 -1
View File
@@ -25,7 +25,7 @@ type received struct {
func TestBurstIsOneNotification(t *testing.T) {
ctx := context.Background()
var notifier *push.Notifier
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), func(ev api.Event) { notifier.Observe(ev) })
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(ev api.Event) { notifier.Observe(ev) })
if err != nil {
t.Fatalf("open store: %v", err)
}
internal/server/server.go
+2 -2
View File
@@ -38,7 +38,7 @@ type Server struct {
type ctxKey struct{}
func New(dataDir string, spa fs.FS) (*Server, error) {
func New(dataDir string, portFirst int, spa fs.FS) (*Server, error) {
err := os.MkdirAll(dataDir, 0o755)
if err != nil {
return nil, err
@@ -52,7 +52,7 @@ func New(dataDir string, spa fs.FS) (*Server, error) {
users: map[string]string{},
}
s.store, err = store.Open(filepath.Join(dataDir, "byre.db"), s.publish)
s.store, err = store.Open(filepath.Join(dataDir, "byre.db"), portFirst, s.publish)
if err != nil {
return nil, err
}
internal/server/server_test.go
+3 -2
View File
@@ -20,6 +20,7 @@ import (
"g.fc.run/misc/byre/internal/api"
"g.fc.run/misc/byre/internal/server"
"g.fc.run/misc/byre/internal/store"
"g.fc.run/misc/byre/web"
)
@@ -31,7 +32,7 @@ type harness struct {
}
func newHarness(t *testing.T) *harness {
srv, err := server.New(t.TempDir(), fstest.MapFS{"index.html": {Data: []byte("shell")}})
srv, err := server.New(t.TempDir(), store.DefaultPortFirst, fstest.MapFS{"index.html": {Data: []byte("shell")}})
if err != nil {
t.Fatalf("new server: %v", err)
}
@@ -109,7 +110,7 @@ func TestIdentityRequired(t *testing.T) {
}
func TestServesEmbeddedSPA(t *testing.T) {
srv, err := server.New(t.TempDir(), web.FS)
srv, err := server.New(t.TempDir(), store.DefaultPortFirst, web.FS)
if err != nil {
t.Fatalf("new server: %v", err)
}
internal/store/blob_test.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
func TestQueuedTurnKeepsImages(t *testing.T) {
ctx := context.Background()
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), func(api.Event) {})
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(api.Event) {})
if err != nil {
t.Fatalf("open store: %v", err)
}
internal/store/inbox_test.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
func TestClosingTaskDismissesOpenInbox(t *testing.T) {
ctx := context.Background()
events := []api.Event{}
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), func(ev api.Event) { events = append(events, ev) })
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(ev api.Event) { events = append(events, ev) })
if err != nil {
t.Fatalf("open store: %v", err)
}
internal/store/merging_test.go
+2 -2
View File
@@ -13,7 +13,7 @@ import (
func TestMergingBySurvivesReopen(t *testing.T) {
ctx := context.Background()
path := filepath.Join(t.TempDir(), "byre.db")
st, err := store.Open(path, func(api.Event) {})
st, err := store.Open(path, store.DefaultPortFirst, func(api.Event) {})
if err != nil {
t.Fatalf("open store: %v", err)
}
@@ -38,7 +38,7 @@ func TestMergingBySurvivesReopen(t *testing.T) {
}
st.Close()
st, err = store.Open(path, func(api.Event) {})
st, err = store.Open(path, store.DefaultPortFirst, func(api.Event) {})
if err != nil {
t.Fatalf("reopen store: %v", err)
}
internal/store/ports_test.go
+45
View File
@@ -0,0 +1,45 @@
package store_test
import (
"context"
"path/filepath"
"testing"
"time"
"g.fc.run/misc/byre/internal/api"
"g.fc.run/misc/byre/internal/store"
)
func TestPortBlocksStartAtPortFirst(t *testing.T) {
ctx := context.Background()
st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), 51000, func(api.Event) {})
if err != nil {
t.Fatalf("open store: %v", err)
}
t.Cleanup(func() { st.Close() })
now := time.Now().UTC()
_, err = st.EnsureUser(ctx, "alice", "Alice")
if err != nil {
t.Fatalf("ensure user: %v", err)
}
err = st.CreateProject(ctx, api.Project{Id: "p1", Name: "demo", RepoPath: "/nonexistent", DefaultBranch: "main", Remote: "none", CreatedBy: "alice", CreatedAt: now})
if err != nil {
t.Fatalf("create project: %v", err)
}
for i, want := range []int{51000, 51010} {
id := []string{"t1", "t2"}[i]
err = st.CreateTask(ctx, api.Task{Id: id, ProjectId: "p1", Title: id, Branch: id, WorktreePath: "/nonexistent", BaseRef: "x", Status: api.TaskStatusActive, CreatedBy: "alice", CreatedAt: now}, "alice")
if err != nil {
t.Fatalf("create task %s: %v", id, err)
}
task, err := st.GetTask(ctx, id)
if err != nil {
t.Fatalf("get task %s: %v", id, err)
}
if task.PortBase != want {
t.Fatalf("task %s port_base = %d, want %d", id, task.PortBase, want)
}
}
}
internal/store/store.go
+10 -9
View File
@@ -274,18 +274,19 @@ ALTER TABLE tasks ADD COLUMN merge_queued_at TEXT NOT NULL DEFAULT '';
`}}
const (
PortFirst = 41000
PortBlock = 10
DefaultPortFirst = 41000
PortBlock = 10
)
type Store struct {
db *sql.DB
path string
writeMu sync.Mutex
onEvent func(api.Event)
db *sql.DB
path string
portFirst int
writeMu sync.Mutex
onEvent func(api.Event)
}
func Open(path string, onEvent func(api.Event)) (*Store, error) {
func Open(path string, portFirst int, onEvent func(api.Event)) (*Store, error) {
dsn := "file:" + path + "?_pragma=journal_mode(WAL)&_pragma=busy_timeout(5000)&_pragma=foreign_keys(1)&_txlock=immediate"
db, err := sql.Open("sqlite", dsn)
if err != nil {
@@ -298,7 +299,7 @@ func Open(path string, onEvent func(api.Event)) (*Store, error) {
return nil, err
}
return &Store{db: db, path: path, onEvent: onEvent}, nil
return &Store{db: db, path: path, portFirst: portFirst, onEvent: onEvent}, nil
}
func migrate(db *sql.DB, migrations []migration) error {
@@ -557,7 +558,7 @@ func (s *Store) CreateTask(ctx context.Context, t api.Task, actor string) error
SELECT ? AS candidate
UNION ALL SELECT port_base + ? FROM tasks WHERE status = ?
) WHERE candidate NOT IN (SELECT port_base FROM tasks WHERE status = ?)
`, PortFirst, PortBlock, string(api.TaskStatusActive), string(api.TaskStatusActive)).Scan(&t.PortBase)
`, s.portFirst, PortBlock, string(api.TaskStatusActive), string(api.TaskStatusActive)).Scan(&t.PortBase)
if err != nil {
return err
}