feat(rig): provision a rig-managed .gitignore block at init/apply#23
Open
alex-mextner wants to merge 2 commits into
Open
feat(rig): provision a rig-managed .gitignore block at init/apply#23alex-mextner wants to merge 2 commits into
alex-mextner wants to merge 2 commits into
Conversation
Machine-artifact ignores must be provisioned by rig, not hand-edited into
~/.gitignore. rig now maintains a marker-delimited block in the repo's
.gitignore so harness artifacts are ignored declaratively, reconciled like
every other category.
- Default entry: .claude/worktrees/ (Claude Code's throwaway worktrees).
.serena/ is intentionally NOT ignored — Serena state is committed shared
project memory.
- Marker-fenced block (BEGIN/END); rig edits only its own lines, every other
line preserved byte-for-byte (CRLF, no-final-newline, trailing blanks via
offset splicing, not splitlines/rejoin).
- Idempotent: a correct block is a no-op; a missing block is appended
(creating .gitignore if absent); a drifted block is replaced in place.
- States shared by apply + drift via resolve_gitignore: ok / create / update /
conflict (unbalanced markers, left untouched + surfaced) / io_error
(unreadable path → error, never a silent skip).
- Config: gitignore.{enabled,entries}; default ON, opt out with enabled:false.
Fail-closed validation rejects a non-mapping block, non-bool enabled, unknown
keys, non-string entries, and an entry colliding with a managed marker.
- rig status reports drift on the block, including a leftover block after the
category is disabled (check_disabled_gitignore, mirrors the dispatcher scan).
- Tests cover every state, idempotency, verbatim preservation, drift parity,
and config validation. Docs (config-schema.md) and the dogfooded rig.yaml
updated.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 26cb7dc843
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
Comment on lines
+1354
to
+1356
| with path.open(encoding="utf-8", newline="") as fh: | ||
| content = fh.read() | ||
| except OSError as exc: |
There was a problem hiding this comment.
When a repo's .gitignore contains any byte that is not valid UTF-8, this strict text read raises UnicodeDecodeError, but the handler only catches OSError. rig status reaches this through drift._check_gitignore without run_plan's broad exception wrapper, so those repos crash with a traceback instead of surfacing the documented io_error drift item; catch decode errors here or read with a lossless error strategy.
Useful? React with 👍 / 👎.
…tignore imports Make the disabled-gitignore drift check detect rig's block the same way apply does, and source the gitignore constants from their home module. - drift.check_disabled_gitignore now matches the begin marker via _find_marker_lines (the offset scanner resolve_gitignore already uses) read with newline="" instead of an ad-hoc splitlines()/.strip() pass — so drift detection can never diverge from apply (CRLF / whitespace-padded marker lines match identically; _find_marker_lines returns an empty list when absent, so the truthiness check is correct). - Import GITIGNORE_BEGIN/END_MARKER and GITIGNORE_DEFAULT_ENTRIES from riglib.config (their canonical schema-layer home) in drift, plan, and tests, instead of re-exporting through runner; lift plan's deferred import to module top (no import cycle — config already imported there). runner's header comment updated to match. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds two OpenAI-compatible keyed HTTP backends to the
reviewCLI:zai/z.ai/zhipu/glm, pluszai:<model>(default modelglm-4.6, basehttps://api.z.ai/api/paas/v4). Key fromZAI_API_KEY/ZHIPU_API_KEY.common-code/commoncode/common_code, pluscommon-code:<model>. Modelled as a keyed OpenAI-compatible HTTP backend (commandcode / DeepSeek family). Default basehttps://api.deepseek.com+ modeldeepseek-chat, both overridable viaCOMMON_CODE_BASE_URL/COMMON_CODE_MODEL. Key resolves fromCOMMON_CODE_API_KEY/COMMANDCODE_API_KEY/DEEPSEEK_API_KEY. Nocommon-codeCLI exists on PATH, so it is intentionally an HTTP backend, not a CLI wrapper — DeepSeek is the default but everything is env-overridable.Both share a single
_openai_compatible_requesthelper (same wire shape) and a_resolve_keymulti-name resolver that also reads~/.config/review-cli/.env/GEMINI_ENV_FILE. Routing added inresolve_backend;backend_availablechecks for keys.Files
reviewlib/backends.py(+141/-3) — backends, key resolution, routingreviewlib/config.py,reviewlib/__init__.py— wiring/exportstests/test_provider_keys.py(+389) — full unit coveragetests/smoke.sh— provider-keys test added to smoke suiteTests
tests/test_provider_keys.py— all PASS (model-suffix parsing, env/file precedence, OpenAI request shape, requested-vs-provider model id, HTTP error mapping,backend_availablekey reflection).tests/smoke.sh— rc=0 (includes visual suite, which ran with ImageMagick + Pillow present).Rebased onto current
main(f3d17f8). No overlap with the already-merged visual/decompose work.🤖 Generated with Claude Code