feat(pipeline): report when a re-ingest disagrees with the page on disk (#104) #127
Closed
mathias
wants to merge 2 commits from
fix/104-surface-merge-conflicts-on-main into main
pull from: fix/104-surface-merge-conflicts-on-main
merge into: :main
:main
:fix/pipeline-writes-158
:fix/edit-path-io-192
:fix/create-regular-188
:fix/guard-special-179
:fix/linkcheck-keeps-write-178
:fix/write-dir-redirect-173
:fix/tunnel-detect-174
:fix/pipeline-root-157
:w3/154-mcp-auth-wiring
:fix/tunnel-traversal
:test/in-brain-targets-171
:fix/brain-scan-root-157
:fix/graph-wiki-root-157
:fix/vectorstore-root-157
:fix/notes-root-157
:fix/search-root-157
:fix/brainwide-root-157
:fix/raw-symlinks-153
:feat/symlink-tripwire-157
:fix/rest-auth-149
:fix/123-brain-edit-envelope-check
:feat/106-page-aware-extraction
:fix/105-source-drift-on-main
:fix/104-surface-merge-conflicts-on-main
:agent/b1-compile-on-ingest
:agent/104-surface-merge-conflicts
:agent/105-source-drift
:agent/107-loud-unconfigured-alerting
:feat/brain-read-edit
:fix/capture-i1-refusal-names-target
:renovate/configure
:feat/consolidate-single-harness
:icebox/cmd-routing
:feat/brain-pending-promote
:fix/close-session-classification-refresh
:fix/capture-summarywriter
No Reviewers
Labels
Clear labels
agent/ready
blocked/client
blocked/supplier
blocked/upstream
risk/high
risk/low
risk/medium
size/l
size/m
size/s
size/xs
status:dispatch
status:dispatched
status:review
status:reviewing
type/chore
type/decision
type/docs
type/feat
type/fix
type/ops
type/research
type/test
Meets the agent-ready contract; authorizes unattended execution
Waiting on the client
Waiting on a supplier
Waiting on an upstream project or vendor
Irreversible, security-relevant, or control plane
Reversible, local, test-covered
Touches shared state, deploys or data
Too big - split it
Under two days
Under half a day
Under an hour
Maintenance, no behaviour change
Human decision required; never agent/ready
Documentation only
New capability
Corrects broken behaviour
Infrastructure, deploy, runtime
Investigate; output is a finding, not code
Test coverage only
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
No Assignees
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: mathias/hyperguild#127
Reference in New Issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
Replaces #110, which was stacked on #109 (now closed/replaced by #126). Same single commit, rebased onto #126's branch instead of force-pushing over the old stale one (same reasoning as #126 itself).
One real conflict in
ingestion/internal/wiki/merge.go: #110 refactorsMergeinto a thin wrapper around a newMergeReport(a, b) (Page, []string)(reports section headings wherebdisagreed withaand lost, rather than discarding silently), while #103's later fix threadspreambleAthrough as a separateparseSections/rebuildContentargument. Resolved by keeping both:MergeReportnow returnspreambleAthrough torebuildContentalongside therefreshOwnedfrontmatter and the existingconflictsslice.Full module
go build ./... && go vet ./... && go test ./... -race -count=1green after resolution.Depends on #126 (base branch) merging first — same stacking order as before, just rebuilt on the surviving commit.
Closes #104.
Created via git-mcp on behalf of @mathias
Superseded by #129: same commit, rebased onto main now that #126 (this branch's base) merged via squash. Same non-force-push pattern as #126/#109 earlier in this sprint.
Created via git-mcp on behalf of @mathias
Pull request closed