Skip to content

Commit a9d3092

Browse files
pRizzclaude
andcommitted
docs: add post-pull submodule sync rule to CLAUDE.md and AGENTS.md
Also sync submodule pointer and Dockerfile OPENCODE_COMMIT after pull. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 27fafad commit a9d3092

4 files changed

Lines changed: 4 additions & 2 deletions

File tree

AGENTS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ The `scripts/set-all-versions.sh` script handles version updates automatically.
8383
- Rebase pull from `main` first (for example: `git pull --rebase origin main`).
8484
- Then push to `main`.
8585
- After committing and pushing changes in the `packages/opencode/` submodule, run `just update-opencode-commit` in the superproject to update the Dockerfile's `OPENCODE_COMMIT` pin. Commit and push the resulting Dockerfile change to `main`.
86+
- After pulling the superproject, run `git submodule update --init --recursive` to sync the submodule working tree, then run `just update-opencode-commit`. If the Dockerfile changed, commit and push the update to keep the submodule pointer and Dockerfile `OPENCODE_COMMIT` pin in sync.
8687
- **Resolving `OPENCODE_COMMIT` merge conflicts:** If a rebase or merge produces a conflict in the Dockerfile's `OPENCODE_COMMIT` line, do not manually pick a SHA. Instead, accept either side to clear the conflict markers, then run `just update-opencode-commit` to set the correct value from the current submodule state.
8788

8889
## Working with Git Worktrees and Submodules

CLAUDE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ The `scripts/set-all-versions.sh` script handles version updates automatically.
8383
- Rebase pull from `main` first (for example: `git pull --rebase origin main`).
8484
- Then push to `main`.
8585
- After committing and pushing changes in the `packages/opencode/` submodule, run `just update-opencode-commit` in the superproject to update the Dockerfile's `OPENCODE_COMMIT` pin. Commit and push the resulting Dockerfile change to `main`.
86+
- After pulling the superproject, run `git submodule update --init --recursive` to sync the submodule working tree, then run `just update-opencode-commit`. If the Dockerfile changed, commit and push the update to keep the submodule pointer and Dockerfile `OPENCODE_COMMIT` pin in sync.
8687
- **Resolving `OPENCODE_COMMIT` merge conflicts:** If a rebase or merge produces a conflict in the Dockerfile's `OPENCODE_COMMIT` line, do not manually pick a SHA. Instead, accept either side to clear the conflict markers, then run `just update-opencode-commit` to set the correct value from the current submodule state.
8788

8889
## Working with Git Worktrees and Submodules

packages/core/src/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ COPY --chown=opencoder:opencoder packages/opencode /tmp/opencode-local
525525
# Update it by running: ./scripts/update-opencode-commit.sh
526526
RUN set -eux; \
527527
OPENCODE_COMMIT_OVERRIDE="${OPENCODE_COMMIT:-}"; \
528-
OPENCODE_COMMIT="665b98380a9d17795df11a49a19999b30d084af0"; \
528+
OPENCODE_COMMIT="d0a9f9ae8d671d95bb554e8bf3132943d395dd34"; \
529529
if [ -n "${OPENCODE_COMMIT_OVERRIDE}" ]; then OPENCODE_COMMIT="${OPENCODE_COMMIT_OVERRIDE}"; fi; \
530530
rm -rf /tmp/opencode-repo; \
531531
if [ "${OPENCODE_SOURCE}" = "local" ]; then \

packages/opencode

Submodule opencode updated 379 files

0 commit comments

Comments
 (0)