Skip to content

S10: Remove orphaned rebuild main-path coordinator + relocate exec types (#1117) - #1124

Merged
jeonghun-jj-lee merged 2 commits into
jj/1091-absorb-opencode-forkfrom
jj/1117-orphaned-coordinator
Sep 14, 2026
Merged

jeonghun-jj-lee merged 2 commits into
jj/1091-absorb-opencode-forkfrom
jj/1117-orphaned-coordinator

Conversation

@jeonghun-jj-lee

Copy link
Copy Markdown
Contributor

Closes #1117. Part of #1091. Stacked on #1122 (S9) — base is jj/1116-retire-fork-scripts; merge S9 first, then this rebases onto the integration branch trivially.

Removes the orphaned runRebuild orchestrator + rebuildFromMain + the whole main_source_resolver.ts, relocates the shared ExecResult/ExecFn to a new exec_types.ts (imported by the live dependency_resolver + coordinator), deletes the orphaned test cases, and corrects the residual fork-mode docstrings. Diff: 8 files, +55/−897.

This is the keystone that clears the integration branch's pre-existing typecheck red.

Gate (director-run, independent):

  • pnpm --filter amicode typecheck → exit 0, zero errors (was: coordinator.ts pendingPromotion TS2339). Confirmed.
  • git grep 'from "./main_source_resolver"' → none.
  • Test suite: 4 failures, all pre-existing env-dependent baseline (amicode_service_runner / chat_bridge clipboard / skills_integrity ×2); zero new.
  • Diff exact (8 intended files), working tree clean, no stash contamination.

Merge order for a green integration branch: S9 (#1122) → S10 (#1123-here) → S8 (#1123). Merge is human-gated.

@coderabbitai

coderabbitai Bot commented Sep 14, 2026

Copy link
Copy Markdown

Important

Draft PR not reviewed

Draft PRs are not automatically reviewed by default.

  • Trigger a manual review

To automatically review draft PRs, update your CodeRabbit configuration:

reviews:
  auto_review:
    drafts: true

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Delete the two fork-era rebuild scripts that predate fork absorption
(#1091) and have no in-tree callers:
- scripts/rebuild_amicode_locally.sh (built the fork binary with bun
  from a local opencode fork checkout)
- scripts/rebuild_amicode_remotely.sh (downloaded the pinned fork
  release binary)

The in-app Rebuild surface (S8) is the supported dev path; these
fork-clone / fork-release-download flows have no analog in the
overlay-build world.

Also correct the one rebuild coordinator docstring line that still
claimed the shell scripts call it. Coordinator logic and the
fork-mode comments (S10, #1117) are untouched.

Refs #1116, part of #1091.
@jeonghun-jj-lee
jeonghun-jj-lee force-pushed the jj/1116-retire-fork-scripts branch from 1ca5ea5 to dea7a2d Compare September 14, 2026 05:02
…es (#1117)

Fork absorption left an orphaned 'rebuild from main' path in the extension
rebuild coordinator. Remove the runRebuild orchestrator and the rebuildFromMain
resolver (only tests exercised them), relocating the shared exec type aliases
(ExecResult, ExecFn) they defined to a dedicated exec_types module first so the
live dependency-resolver and deployBuild path keep them.

- new src/rebuild/exec_types.ts holds ExecResult + ExecFn
- coordinator.ts: drop runRebuild + RebuildCoordinatorOpts/RebuildMode + dead
  imports and dead result fields; keep deployBuild fully intact; import exec
  types from ./exec_types; correct the fork-mode docstring header
- dependency_resolver.ts: import ExecResult from ./exec_types
- remove main_source_resolver.ts and its test entirely
- rebuild_coordinator.test.ts: drop the runRebuild cases, keep deployBuild cases
- dependency_resolver.test.ts: add exec-type provenance assertions
- fetch_opencode.d.mts: stop naming the removed resolver module

Fixes the integration-branch tsc error 'Property pendingPromotion does not
exist on type RebuildResult'. tsc --noEmit now green.

Part of #1091.
@jeonghun-jj-lee
jeonghun-jj-lee force-pushed the jj/1117-orphaned-coordinator branch from 9e8f4e0 to ed76304 Compare September 14, 2026 05:03
@jeonghun-jj-lee
jeonghun-jj-lee changed the base branch from jj/1116-retire-fork-scripts to jj/1091-absorb-opencode-fork September 14, 2026 05:28
@jeonghun-jj-lee
jeonghun-jj-lee marked this pull request as ready for review September 14, 2026 05:28
@jeonghun-jj-lee
jeonghun-jj-lee merged commit ddbb998 into jj/1091-absorb-opencode-fork Sep 14, 2026
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant