Skip to content

chore: merge dev into v2 - #36312

Merged
rekram1-node merged 417 commits into
v2from
merge-dev-0710
Jul 10, 2026
Merged

rekram1-node merged 417 commits into
v2from
merge-dev-0710

Conversation

@opencode-agent

Copy link
Copy Markdown
Contributor

Summary

  • merge the current dev history into v2
  • preserve dev's timeline outline-clipping fix
  • retain V2's apply_patch → patch tool rename while keeping legacy apply_patch compatibility

Conflict review

One App timeline conflict was resolved compositionally:

  • dev's extracted tool lookup and outline-clipping behavior survive
  • V2's renamed patch tool remains classified as asynchronous file work
  • legacy apply_patch remains recognized

Validation

  • bun install --frozen-lockfile --ignore-scripts
  • packages/app: bun typecheck
  • packages/app: timeline projection tests (9 passed)

opencode-agent Bot and others added 30 commits July 1, 2026 11:28
Co-authored-by: LukeParkerDev <[email protected]>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: LukeParkerDev <[email protected]>
Co-authored-by: Brendan Allan <[email protected]>
Co-authored-by: Brendan Allan <[email protected]>
opencode-agent Bot and others added 20 commits July 10, 2026 00:55
Compute all stat dimensions and both grains in one GROUPING SETS query
so each sync pass scans the source table once instead of eight times.
Hourly passes now only recompute the current ISO week; a daily full pass
refreshes the whole display window. Restarted daemons resume the hourly
cadence from the last completed sync instead of immediately re-running a
pass, and the workgroup kills any query scanning more than 2 TB.
@rekram1-node
rekram1-node marked this pull request as ready for review July 10, 2026 20:11
@rekram1-node
rekram1-node merged commit 43ecf3f into v2 Jul 10, 2026
10 checks passed
@rekram1-node
rekram1-node deleted the merge-dev-0710 branch July 10, 2026 20:11
jinhuang712 pushed a commit to jinhuang712/opencode that referenced this pull request Sep 26, 2026
Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: LukeParkerDev <[email protected]>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Aiden Cline <[email protected]>
Co-authored-by: Brendan Allan <[email protected]>
Co-authored-by: Aarav Sareen <[email protected]>
Co-authored-by: Julian Coy <[email protected]>
Co-authored-by: Brendan Allan <[email protected]>
Co-authored-by: usrnk1 <[email protected]>
Co-authored-by: opencode <[email protected]>
Co-authored-by: Vladimir Glafirov <[email protected]>
Co-authored-by: Adam <[email protected]>
Co-authored-by: Frank <[email protected]>
Co-authored-by: Jay <[email protected]>
Co-authored-by: Dustin Deus <[email protected]>
Co-authored-by: Kit Langton <[email protected]>
Co-authored-by: James Long <[email protected]>
Co-authored-by: Simon Klee <[email protected]>
Co-authored-by: Jay <[email protected]>
Co-authored-by: Jack <[email protected]>
Co-authored-by: David Hill <[email protected]>
Co-authored-by: Aiden Cline <[email protected]>
Co-authored-by: James Long <[email protected]>
Co-authored-by: 冯基魁 <[email protected]>
Co-authored-by: Aiden Cline <[email protected]>
Co-authored-by: Victor Navarro <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.