fix(export): guard auto-export against richer JSONL overwrite
Refuse opt-in auto-export when the existing target contains records outside auto-export scope, preserving richer JSONL files instead of silently replacing them with the viewer-scoped auto-export subset. Fixes #4069 Validation: - go test -tags gms_pure_go ./cmd/bd -run 'TestGuardAutoExportOverwrite|TestShouldExport|TestShouldRunPostCommandAutoExport|TestShouldSkipEmptyAutoExport|TestMissingJSONLIssueIDsInStore' -count=1 - go test -tags gms_pure_go ./cmd/bd (fails on existing Dolt server/test-environment setup issues) _codex-gpt-5.5-medium on behalf of maphew_
This commit is contained in:
parent
3a7a2e852a
commit
663bc010a1
3 changed files with 170 additions and 2 deletions
|
|
@ -39,6 +39,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
|
||||
### Fixed
|
||||
|
||||
- **JSONL auto-export shrink guard** - when opt-in `export.auto` is enabled,
|
||||
auto-export now refuses to overwrite an existing `.beads/issues.jsonl` that
|
||||
contains records outside the auto-export scope (memories, infrastructure
|
||||
beads, templates, ephemeral wisps, or unknown record types). This prevents
|
||||
a viewer/interchange refresh from silently replacing a richer JSONL file
|
||||
with the filtered auto-export subset. ([#4069](https://github.com/gastownhall/beads/issues/4069))
|
||||
- **`bd dolt status` reports externally-managed local servers truthfully** - when a rig is configured as `dolt_mode: server` pointing at a local host but `dolt.auto-start: false` (so an orchestrator or systemd owns the sql-server lifecycle), `bd dolt status` previously said `not running` because no PID file existed. It now SQL-probes the configured endpoint, matching the path already used for non-local hosts, and reports `running (external)` with host/port/database/version when the server answers. **JSON output shape change**: on affected rigs, `bd dolt status --json` now emits `{"running": true, "mode": "external", ...}` instead of `{"running": false, "pid": 0, ...}`. Automation that parsed the old `running:false` as a "needs restart" sentinel should switch to checking `running` directly. (be-0eyj, [#3550](https://github.com/gastownhall/beads/pull/3550))
|
||||
|
||||
## [1.0.4] - 2026-05-07
|
||||
|
|
|
|||
|
|
@ -300,6 +300,11 @@ func sampleStrings(values []string, limit int) []string {
|
|||
}
|
||||
|
||||
func autoExportFilter(ctx context.Context) types.IssueFilter {
|
||||
filter, _ := buildAutoExportFilter(ctx)
|
||||
return filter
|
||||
}
|
||||
|
||||
func buildAutoExportFilter(ctx context.Context) (types.IssueFilter, map[string]bool) {
|
||||
filter := types.IssueFilter{Limit: 0}
|
||||
var infraTypes []string
|
||||
if store != nil {
|
||||
|
|
@ -313,6 +318,11 @@ func autoExportFilter(ctx context.Context) types.IssueFilter {
|
|||
if len(infraTypes) == 0 {
|
||||
infraTypes = dolt.DefaultInfraTypes()
|
||||
}
|
||||
infraTypeSet := make(map[string]bool, len(infraTypes))
|
||||
for _, t := range infraTypes {
|
||||
infraTypeSet[t] = true
|
||||
}
|
||||
sort.Strings(infraTypes)
|
||||
for _, t := range infraTypes {
|
||||
filter.ExcludeTypes = append(filter.ExcludeTypes, types.IssueType(t))
|
||||
}
|
||||
|
|
@ -324,7 +334,7 @@ func autoExportFilter(ctx context.Context) types.IssueFilter {
|
|||
persistentOnly := false
|
||||
filter.Ephemeral = &persistentOnly
|
||||
|
||||
return filter
|
||||
return filter, infraTypeSet
|
||||
}
|
||||
|
||||
// exportToFile atomically exports issues + memories to the given file path.
|
||||
|
|
@ -341,11 +351,16 @@ func exportToFile(ctx context.Context, path string, includeMemories bool) (issue
|
|||
}
|
||||
}()
|
||||
|
||||
issues, err := store.SearchIssues(ctx, "", autoExportFilter(ctx))
|
||||
filter, infraTypeSet := buildAutoExportFilter(ctx)
|
||||
issues, err := store.SearchIssues(ctx, "", filter)
|
||||
if err != nil {
|
||||
return 0, 0, fmt.Errorf("failed to search issues: %w", err)
|
||||
}
|
||||
|
||||
if err := guardAutoExportOverwrite(path, infraTypeSet, includeMemories); err != nil {
|
||||
return 0, 0, err
|
||||
}
|
||||
|
||||
// Bulk-load relational data
|
||||
if len(issues) > 0 {
|
||||
issueIDs := make([]string, len(issues))
|
||||
|
|
@ -431,6 +446,84 @@ func exportToFile(ctx context.Context, path string, includeMemories bool) (issue
|
|||
return issueCount, memoryCount, nil
|
||||
}
|
||||
|
||||
func guardAutoExportOverwrite(path string, infraTypes map[string]bool, includeMemories bool) error {
|
||||
f, err := os.Open(path) //nolint:gosec
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("auto-export shrink guard: inspect existing JSONL: %w", err)
|
||||
}
|
||||
defer func() { _ = f.Close() }()
|
||||
|
||||
var stats autoExportOverwriteStats
|
||||
scanner := bufio.NewScanner(f)
|
||||
scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
|
||||
lineNo := 0
|
||||
for scanner.Scan() {
|
||||
lineNo++
|
||||
line := strings.TrimSpace(scanner.Text())
|
||||
if line == "" {
|
||||
continue
|
||||
}
|
||||
if err := classifyExistingAutoExportRecord([]byte(line), infraTypes, includeMemories, &stats); err != nil {
|
||||
return fmt.Errorf("auto-export shrink guard: inspect existing JSONL line %d: %w", lineNo, err)
|
||||
}
|
||||
}
|
||||
if err := scanner.Err(); err != nil {
|
||||
return fmt.Errorf("auto-export shrink guard: inspect existing JSONL: %w", err)
|
||||
}
|
||||
|
||||
if stats.FilteredRecords == 0 {
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("auto-export shrink guard: refusing to overwrite %s because it contains %d record(s) outside auto-export scope (%d memories, %d infra/template/ephemeral issues, %d unknown); run an explicit export if you want to replace it", path, stats.FilteredRecords, stats.Memories, stats.FilteredIssues, stats.UnknownRecords)
|
||||
}
|
||||
|
||||
type autoExportOverwriteStats struct {
|
||||
FilteredRecords int
|
||||
Memories int
|
||||
FilteredIssues int
|
||||
UnknownRecords int
|
||||
}
|
||||
|
||||
func classifyExistingAutoExportRecord(line []byte, infraTypes map[string]bool, includeMemories bool, stats *autoExportOverwriteStats) error {
|
||||
var record struct {
|
||||
Type string `json:"_type"`
|
||||
IssueType types.IssueType `json:"issue_type"`
|
||||
IsTemplate bool `json:"is_template"`
|
||||
Ephemeral bool `json:"ephemeral"`
|
||||
ID string `json:"id"`
|
||||
}
|
||||
if err := json.Unmarshal(line, &record); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
switch record.Type {
|
||||
case "memory":
|
||||
if !includeMemories {
|
||||
stats.FilteredRecords++
|
||||
stats.Memories++
|
||||
}
|
||||
return nil
|
||||
case "", "issue":
|
||||
if record.ID == "" {
|
||||
stats.FilteredRecords++
|
||||
stats.UnknownRecords++
|
||||
return nil
|
||||
}
|
||||
if infraTypes[string(record.IssueType)] || record.IsTemplate || record.Ephemeral {
|
||||
stats.FilteredRecords++
|
||||
stats.FilteredIssues++
|
||||
}
|
||||
return nil
|
||||
default:
|
||||
stats.FilteredRecords++
|
||||
stats.UnknownRecords++
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func loadExportAutoState(beadsDir string) *exportAutoState {
|
||||
path := filepath.Join(beadsDir, exportAutoStateFile)
|
||||
data, err := os.ReadFile(path) //nolint:gosec
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
|
|
@ -188,6 +189,74 @@ func TestShouldRunPostCommandAutoExportSkipsReadOnlyCommands(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestGuardAutoExportOverwriteAllowsViewerScopedJSONL(t *testing.T) {
|
||||
path := filepath.Join(t.TempDir(), "issues.jsonl")
|
||||
writeJSONLLines(t, path,
|
||||
map[string]any{"_type": "issue", "id": "bd-1", "issue_type": "task", "title": "kept"},
|
||||
map[string]any{"id": "bd-legacy", "issue_type": "bug", "title": "legacy issue record"},
|
||||
)
|
||||
|
||||
if err := guardAutoExportOverwrite(path, map[string]bool{"agent": true}, false); err != nil {
|
||||
t.Fatalf("guardAutoExportOverwrite: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestGuardAutoExportOverwriteBlocksRicherJSONL(t *testing.T) {
|
||||
path := filepath.Join(t.TempDir(), "issues.jsonl")
|
||||
writeJSONLLines(t, path,
|
||||
map[string]any{"_type": "issue", "id": "bd-1", "issue_type": "task", "title": "kept"},
|
||||
map[string]any{"_type": "memory", "key": "keep-me", "value": "private context"},
|
||||
map[string]any{"_type": "issue", "id": "bd-agent", "issue_type": "agent", "title": "infra"},
|
||||
map[string]any{"_type": "issue", "id": "bd-template", "issue_type": "task", "is_template": true},
|
||||
map[string]any{"_type": "issue", "id": "bd-wisp", "issue_type": "task", "ephemeral": true},
|
||||
map[string]any{"_type": "event", "id": "bd-event"},
|
||||
)
|
||||
|
||||
err := guardAutoExportOverwrite(path, map[string]bool{"agent": true}, false)
|
||||
if err == nil {
|
||||
t.Fatal("expected guardAutoExportOverwrite to reject richer JSONL, got nil")
|
||||
}
|
||||
msg := err.Error()
|
||||
for _, want := range []string{
|
||||
"refusing to overwrite",
|
||||
"5 record(s) outside auto-export scope",
|
||||
"1 memories",
|
||||
"3 infra/template/ephemeral issues",
|
||||
"1 unknown",
|
||||
} {
|
||||
if !strings.Contains(msg, want) {
|
||||
t.Fatalf("guard error %q does not contain %q", msg, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestGuardAutoExportOverwriteAllowsMemoriesWhenIncluded(t *testing.T) {
|
||||
path := filepath.Join(t.TempDir(), "issues.jsonl")
|
||||
writeJSONLLines(t, path,
|
||||
map[string]any{"_type": "memory", "key": "keep-me", "value": "private context"},
|
||||
)
|
||||
|
||||
if err := guardAutoExportOverwrite(path, nil, true); err != nil {
|
||||
t.Fatalf("guardAutoExportOverwrite with memories included: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func writeJSONLLines(t *testing.T, path string, records ...map[string]any) {
|
||||
t.Helper()
|
||||
var b strings.Builder
|
||||
for _, rec := range records {
|
||||
data, err := json.Marshal(rec)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
b.Write(data)
|
||||
b.WriteByte('\n')
|
||||
}
|
||||
if err := os.WriteFile(path, []byte(b.String()), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
// TestPathInsideDir covers the common structural cases plus the
|
||||
// fresh-file + symlinked-parent case that tripped the initial fix
|
||||
// (macOS /tmp -> /private/tmp asymmetry when the target file doesn't
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue