chore: integrate opencode submodule and broker checks

Author: pRizz

Cargo.toml

@@ -4,6 +4,10 @@ members = [
     "packages/core",
     "packages/cli-rust",
 ]
+exclude = [
+    "packages/opencode/packages/opencode-broker",
+    "packages/opencode/packages/desktop/src-tauri",
+]
 
 [workspace.package]
 version = "19.0.1"

justfile

@@ -14,7 +14,7 @@ setup:
     @echo "✓ Development environment ready!"
 
 # Build everything
-build: build-rust build-node
+build: build-rust build-node build-opencode build-opencode-broker
 
 # Compile and run the occ binary (arguments automatically get passed to the binary)
 # Example: just run --version
@@ -46,6 +46,71 @@ build-node:
     pnpm -C packages/core build
     pnpm -r --filter="!@opencode-cloud/core" build
 
+# --- opencode Submodule Checks ---
+
+# Ensure opencode submodule is initialized in this worktree
+opencode-submodule-check:
+    @if [ -f packages/opencode/.git ] || [ -d packages/opencode/.git ]; then \
+        :; \
+    else \
+        echo "Submodule packages/opencode is not initialized."; \
+        echo "Run: git submodule update --init --recursive"; \
+        exit 1; \
+    fi
+
+# Install opencode dependencies when missing
+opencode-install-if-needed: opencode-submodule-check
+    @if [ ! -d packages/opencode/node_modules ]; then \
+        echo "Installing opencode submodule dependencies..."; \
+        bun install --cwd packages/opencode --frozen-lockfile; \
+    else \
+        echo "opencode submodule dependencies already installed."; \
+    fi
+
+# Typecheck opencode workspace
+lint-opencode: opencode-install-if-needed
+    bun --cwd packages/opencode turbo typecheck
+
+# Build the shared app package
+build-opencode-app: opencode-install-if-needed
+    bun run --cwd packages/opencode/packages/app build
+
+# Build opencode single-ui artifact using local models fixture for deterministic output
+build-opencode-single-ui: opencode-install-if-needed
+    @tmpfile="$(mktemp)"; \
+        trap 'rm -f "$tmpfile"' EXIT; \
+        perl -pe 'chomp if eof' "{{justfile_directory()}}/packages/opencode/packages/opencode/test/tool/fixtures/models-api.json" > "$tmpfile"; \
+        MODELS_DEV_API_JSON="$tmpfile" bun run --cwd packages/opencode/packages/opencode build-single-ui
+
+# Build opencode app and opencode binary/ui artifact
+build-opencode: build-opencode-app build-opencode-single-ui
+
+# Lint opencode-broker Rust crate
+lint-opencode-broker: opencode-submodule-check
+    cargo fmt --manifest-path packages/opencode/packages/opencode-broker/Cargo.toml --all -- --check
+    cargo clippy --manifest-path packages/opencode/packages/opencode-broker/Cargo.toml --all-targets -- -D warnings
+
+# Build opencode-broker Rust crate
+build-opencode-broker: opencode-submodule-check
+    cargo build --manifest-path packages/opencode/packages/opencode-broker/Cargo.toml
+
+# Test opencode-broker Rust crate
+test-opencode-broker: opencode-submodule-check
+    cargo test --manifest-path packages/opencode/packages/opencode-broker/Cargo.toml
+
+# Optional app unit test gate (not part of default pre-commit)
+test-opencode-ui: opencode-install-if-needed
+    bun run --cwd packages/opencode/packages/app test:unit
+
+# Optional submodule drift and dirty state check
+check-opencode-submodule-drift:
+    git submodule status --recursive
+    git submodule foreach --recursive 'git status --short --branch'
+
+# Update opencode submodule + Dockerfile OPENCODE_COMMIT pin
+update-opencode-commit:
+    ./scripts/update-opencode-commit.sh
+
 # --- Docker Sandbox Image ---
 
 # Build Docker sandbox image with BuildKit caching (amd64 only, for local dev)
@@ -88,10 +153,10 @@ check-docker:
     @echo "✓ Dockerfile check passed"
 
 # Run all tests (fast)
-test-all-fast: test-rust-fast test-node
+test-all-fast: test-rust-fast test-node test-opencode-broker
 
 # Run all tests (slow, includes doc-tests)
-test-all-slow: test-rust test-node
+test-all-slow: test-rust test-node test-opencode-broker
 
 # Run all tests (fast)
 test: test-all-fast
@@ -115,7 +180,7 @@ test-doc-slow:
     cargo test --workspace --doc
 
 # Lint everything
-lint: lint-rust lint-node lint-shell
+lint: lint-rust lint-node lint-shell lint-opencode lint-opencode-broker
 
 # Lint Rust code
 lint-rust:

packages/core/src/docker/Dockerfile

@@ -489,7 +489,7 @@ USER opencode
 # Clone the fork and build opencode from source (as non-root user)
 # Pin to specific commit for reproducibility
 # NOTE: OPENCODE_COMMIT is not tied to releases/tags; it tracks the latest stable
-# commit on the main branch of https://github.com/pRizz/opencode.
+# commit on the dev branch of https://github.com/pRizz/opencode.
 # Update it by running: ./scripts/update-opencode-commit.sh
 # Build opencode from source (BuildKit cache mounts disabled for now)
 RUN OPENCODE_COMMIT="ac8b3a8010c6a31d28e167c7f3cf1bd9e63c9229" \

packages/opencode

@@ -3,21 +3,61 @@ set -euo pipefail
 
 root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 dockerfile="${root_dir}/packages/core/src/docker/Dockerfile"
+submodule_dir="${root_dir}/packages/opencode"
+gitmodules="${root_dir}/.gitmodules"
 
 if [[ ! -f "${dockerfile}" ]]; then
   echo "Dockerfile not found at ${dockerfile}" >&2
   exit 1
 fi
 
-latest_commit="$(
-  git ls-remote https://github.com/pRizz/opencode.git HEAD | awk '{print $1}'
-)"
+if [[ ! -d "${submodule_dir}" || (! -f "${submodule_dir}/.git" && ! -d "${submodule_dir}/.git") ]]; then
+  echo "Submodule is not initialized at ${submodule_dir}." >&2
+  echo "Run: git submodule update --init --recursive" >&2
+  exit 1
+fi
+
+dirty_state="$(git -C "${submodule_dir}" status --porcelain)"
+if [[ -n "${dirty_state}" ]]; then
+  echo "Submodule ${submodule_dir} has uncommitted changes; clean or stash first." >&2
+  echo "${dirty_state}" >&2
+  exit 1
+fi
+
+submodule_branch="dev"
+if [[ -f "${gitmodules}" ]]; then
+  configured_branch="$(git config -f "${gitmodules}" --get submodule.packages/opencode.branch 2>/dev/null || true)"
+  if [[ -n "${configured_branch}" ]]; then
+    submodule_branch="${configured_branch}"
+  fi
+fi
 
+git -C "${submodule_dir}" fetch --prune origin "${submodule_branch}"
+latest_commit="$(git -C "${submodule_dir}" rev-parse FETCH_HEAD)"
 if [[ -z "${latest_commit}" ]]; then
-  echo "Failed to resolve latest commit for pRizz/opencode." >&2
+  echo "Failed to resolve latest commit for branch ${submodule_branch}." >&2
+  exit 1
+fi
+
+git -C "${submodule_dir}" checkout --detach "${latest_commit}"
+
+current_pin="$(grep -oE 'OPENCODE_COMMIT="[^\"]+"' "${dockerfile}" | head -n1 || true)"
+if [[ -z "${current_pin}" ]]; then
+  echo "Failed to find OPENCODE_COMMIT in ${dockerfile}." >&2
   exit 1
 fi
 
 perl -0pi -e "s/OPENCODE_COMMIT=\"[^\"]+\"/OPENCODE_COMMIT=\"${latest_commit}\"/" "${dockerfile}"
 
-echo "Updated OPENCODE_COMMIT to ${latest_commit}"
+expected_pin="OPENCODE_COMMIT=\"${latest_commit}\""
+updated_pin="$(grep -oE 'OPENCODE_COMMIT="[^\"]+"' "${dockerfile}" | head -n1 || true)"
+if [[ "${updated_pin}" != "${expected_pin}" ]]; then
+  echo "Failed to update OPENCODE_COMMIT in ${dockerfile}." >&2
+  exit 1
+fi
+
+echo "Updated opencode submodule and Dockerfile pin."
+echo "  Branch: ${submodule_branch}"
+echo "  Commit: ${latest_commit}"
+echo "  Submodule: ${submodule_dir}"
+echo "  Dockerfile: ${dockerfile}"