Skip to content

fix(core): rewrite replacements while hoisting layers#35175

Merged
jlongster merged 1 commit into
devfrom
hoist-compile-dev
Jul 3, 2026
Merged

fix(core): rewrite replacements while hoisting layers#35175
jlongster merged 1 commit into
devfrom
hoist-compile-dev

Conversation

@jlongster

@jlongster jlongster commented Jul 3, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Summary

  • Keep LayerNode.hoist(...) responsible for applying replacements.
  • When a tagged node is moved into the hoisted group, rewrite that hoisted node's dependency tree with rewriteReplacementDependencies(node, replacementMap) before storing it.
  • buildLocationServiceMap passes replacements into hoist(...) and compiles both returned graphs plainly.

Why

hoist(...) stops descending when it reaches a tagged node. Without rewriting that hoisted node's dependencies at the point it is stored, dependencies under hoisted globals keep their original implementations (for example, a global service depending on httpClient would bypass an httpClient replacement). Rewriting on store keeps the invariant that after hoist(...), replacements are already done.

Verification

  • bun test test/effect/layer-node/node-build.test.ts test/effect/layer-node/layer-node.test.ts from packages/core passes on this branch. This includes the prior CI failure: node build > shares top-level project with location services.

@jlongster jlongster force-pushed the hoist-compile-dev branch 4 times, most recently from 20ab7b3 to c2988b2 Compare July 3, 2026 15:14
@jlongster jlongster changed the title fix(core): apply replacements when compiling hoisted layers fix(core): rewrite replacements while hoisting layers Jul 3, 2026
@jlongster jlongster force-pushed the hoist-compile-dev branch from c2988b2 to 6b78c3c Compare July 3, 2026 15:17
@jlongster jlongster merged commit 33ed95f into dev Jul 3, 2026
8 checks passed
@jlongster jlongster deleted the hoist-compile-dev branch July 3, 2026 15:26
LuisAlbertoMK pushed a commit to LuisAlbertoMK/opencode that referenced this pull request Jul 3, 2026
@jlongster @LuisAlbertoMK
fix(core): rewrite replacements while hoisting layers (anomalyco#35175)
9393be3
LuisAlbertoMK added a commit to LuisAlbertoMK/opencode that referenced this pull request Jul 3, 2026
@LuisAlbertoMK
Revert "fix(core): rewrite replacements while hoisting layers (anomal…
2ca81bb 
…yco#35175)"

This reverts commit 9393be3.
LuisAlbertoMK added a commit to LuisAlbertoMK/opencode that referenced this pull request Jul 3, 2026
@LuisAlbertoMK
chore(docs): cycle 10 — upstream cherry-pick (5 applied, 2 reverted)
a4a1573 
- Cherry-pick 5 upstream commits: Cerebras reasoning (anomalyco#34826),
  session list filter (anomalyco#34842), copilot endpoints (anomalyco#34958),
  TUI debug dialog (anomalyco#35004), stats fix
- Revert 2 incompatible commits: observability (anomalyco#35171) imports
  nonexistent modules; core layer rewrite (anomalyco#35175) breaks buildLayer callers
- TUI tests 7/7 PASS, benchmark 616.4ms (-36.4% from Cycle 9)
- Cycle 10 report + benchmark data + CYCLE.md update
Wiktor102 pushed a commit to Wiktor102/opencode that referenced this pull request Jul 5, 2026
@jlongster @Wiktor102
fix(core): rewrite replacements while hoisting layers (anomalyco#35175)
416c437
github-actions Bot added a commit to wallentx/opencode-termux that referenced this pull request Jul 6, 2026
@github-actions @wallentx
@vglafirov @opencode-agent @adamdotdevin @fwang @Hona @usrnk1 @jayair @rekram1-node @Brendonovich @arvsrn @StarpTech @kitlangton @jlongster @simonklee
Termux v1.17.13 (#4)
768e090 
* ci: Add Android build and publish workflow with APK artifact upload

Signed-off-by: wallentx <william.allentx@gmail.com>

* ci: Allow publish workflow to run with android_only input

Signed-off-by: wallentx <william.allentx@gmail.com>

* ci: Use github.token instead of committer output in publish workflow

Signed-off-by: wallentx <william.allentx@gmail.com>

* feat: Add aarch64-linux-android target to sidecar binaries

Signed-off-by: wallentx <william.allentx@gmail.com>

* ci: Simplify publish workflow and fix Android build conditions

Signed-off-by: wallentx <william.allentx@gmail.com>

* feat: Refactor app initialization and add WSL path conversion

Signed-off-by: wallentx <william.allentx@gmail.com>

* ci: Fix Android-only workflow condition and update dependencies

Signed-off-by: wallentx <william.allentx@gmail.com>

* sync release versions for v1.17.13

* chore: bump gitlab-ai-provider to 6.10.0 (anomalyco#34756)

* chore: update nix node_modules hashes

* feat(stats): redesign lab hero

* feat(stats): add lab overview

* feat(stats): redesign lab usage

* feat(data): another redesigned lab section

* feat(stats): use catalog descriptions

* chore: generate

* fix(stats): refine lab page tooltips

* fix(stats): include locale header in vary (anomalyco#34789)

* zen: new inference

* fix(desktop): keep window tabs across app close (anomalyco#34807)

* fix(app): stabilize session timeline layout continuity (anomalyco#34533)

* feat(desktop): refine session tab preview popover (anomalyco#34792)

* fix(ui): raise v2 tooltip layer (anomalyco#34455)

Co-authored-by: Jay <53023+jayair@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>

* chore: update nix node_modules hashes

* fix(opencode): update Cerebras SDK reasoning replay (anomalyco#34826)

Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>

* chore: update nix node_modules hashes

* fix(app): resolve target session lineage outside router transition (anomalyco#34838)

* chore: generate

* fix(opencode): filter session list by resolved instance directory (anomalyco#34842)

* fix(app): only allow \(...\) syntax for inline latex (anomalyco#34850)

* test(opencode): cover Windows session list directory spellings (anomalyco#34857)

* fix(app): scope session tab indicators to the tab's server (anomalyco#34861)

* chore: generate

* fix(app): clear original prompt after retarget (anomalyco#34863)

* fix(app): seed session status before warming session info (anomalyco#34864)

* feat(app): v2 review panel overhaul (anomalyco#31882)

Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>

* fix(app): keep terminal mounted when switching session tabs in a workspace (anomalyco#34852)

Co-authored-by: Brendan Allan <git@brendonovich.dev>

* fix(ui): resolve toast icon inside the toast component (anomalyco#34874)

* fix(copilot): honor advertised model endpoints (anomalyco#34958)

* fix(stats): polish lab pages

* feat(stats): redesign model hero

* chore: generate

* feat(tui): add debug info dialog with copy to clipboard (anomalyco#35004)

* zen: new inference

* zen: new inference

* feat(app): navigate tabs on mousedown in new layout (anomalyco#35042)

* zen: new inference

* zen: new inference

* fix(app): keep v2 review pane mounted across session tab switches (anomalyco#35074)

* feat: experimental codemode (anomalyco#34677)

* chore: generate

* fix(ci): setup Node 24 before bun install for node-gyp (anomalyco#35076)

* revert: back out experimental codemode (anomalyco#35077)

* feat(codemode): add confined execution package (anomalyco#35079)

* chore: generate

* chore: update nix node_modules hashes

* chore: remove root node-gyp pin after Node 24 setup (anomalyco#35092)

* feat(desktop): add recently closed projects to home (anomalyco#34926)

* feat(app): align subagent UI with v2 (anomalyco#34931)

Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>

* chore: generate

* feat(desktop): papercut fixes (anomalyco#34939)

* refactor(opencode): expose MCP tools in native shape from the service (anomalyco#35103)

* feat(app): improvements to model search (anomalyco#34954)

* chore: generate

* feat(opencode): add code-mode MCP adapter (anomalyco#35085)

* chore: generate

* chore: update nix node_modules hashes

* feat(app): dropdown search fix (anomalyco#34961)

Co-authored-by: Brendan Allan <git@brendonovich.dev>

* fix(opencode): provide Observability beneath all route service graphs (anomalyco#35171)

* chore: upgrade turbo (anomalyco#35173)

* feat(stats): add model momentum section

* chore: generate

* fix(core): rewrite replacements while hoisting layers (anomalyco#35175)

* fix(stats): link market share labs

* chore: artifacts

* chore: generate

* feat(tui): render code-mode execute tool with child calls (anomalyco#35113)

* refactor(opencode): fail the execute tool on program failure (anomalyco#35180)

* fix(tui): align execute child calls with task indentation (anomalyco#35190)

* refactor(core): move path resolve into fs service (anomalyco#35202)

* feat(opencode): gate execute tool behind code mode flag (anomalyco#35185)

* chore: generate

* cleanup: tweak compaction prompt (anomalyco#35220)

Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>

* fix(app): restore unfocused composer typing (anomalyco#35249)

* fix(app): delay initial tab preview (anomalyco#35266)

Co-authored-by: Jay <53023+jayair@users.noreply.github.com>

* fix(desktop): stabilize esm shim injection (anomalyco#35270)

* fix(app): match new session panel corners (anomalyco#35257)

* tui: preserve spinner registration (anomalyco#35292)

* feat: Add aarch64-linux-android target to sidecar binaries

Signed-off-by: wallentx <william.allentx@gmail.com>

* chore(ci): Improve workflow portability and add Android build support

Signed-off-by: wallentx <william.allentx@gmail.com>

* feat(ci): Add Android artifact build workflow and guidance

Signed-off-by: wallentx <william.allentx@gmail.com>

* fix(opencode): use NDK sysroot for Android artifact build

* fix(opencode): pass Android NDK libc paths to Zig

* fix(opencode): patch OpenTUI Android system libs

* fix(opencode): rely on NDK libc config for Android

* fix(opencode): resolve Android OpenTUI loader relatively

* chore(ci): add Android Bun compile smoke target

* fix(opencode): relocate Android Bun payload pointer

* chore(ci): build Android Bun runtime from source

* fix(ci): install LLVM for Android Bun source build

* fix(ci): bootstrap LLVM 21 for Android Bun build

* fix(ci): keep Bun Android build inside source tree

* fix(ci): link Android NDK runtimes for Bun build

* fix(ci): use Android strip for Bun runtime build

* chore(termux): add release mirror workflows

* chore(termux): align app token variables

* chore(termux): use app client id input

* chore(termux): fall back to github token

* chore(termux): prepare v1.17.13

---------

Signed-off-by: wallentx <william.allentx@gmail.com>
Co-authored-by: wallentx <william.allentx@gmail.com>
Co-authored-by: opencode <opencode@sst.dev>
Co-authored-by: Vladimir Glafirov <vglafirov@gitlab.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com>
Co-authored-by: Frank <frank@anoma.ly>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: usrnk1 <7547651+usrnk1@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: Jay <53023+jayair@users.noreply.github.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Co-authored-by: Aarav Sareen <96787824+arvsrn@users.noreply.github.com>
Co-authored-by: Brendan Allan <git@brendonovich.dev>
Co-authored-by: Dustin Deus <deusdustin@gmail.com>
Co-authored-by: Kit Langton <kit.langton@gmail.com>
Co-authored-by: James Long <longster@gmail.com>
Co-authored-by: Simon Klee <hello@simonklee.dk>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

contributor

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@jlongster