Commit Graph
1831 Commits
Author SHA1 Message Date
James Peter ea2a2c8dbc ci(release-notes): ignore CI-generated prompt/context; remove tracked files
These files are produced and consumed only by the release workflow. Keeping them untracked avoids stale content and reduces repo noise.
2025-09-08 08:21:20 +10:00
James PeterandGitHub c1b20ac202 Merge pull request #82 from just-every/upstream-merge
Merge upstream openai/codex@main into fork (by-bucket; keep TUI/CLI/workflows/docs ours)
2025-09-08 08:10:21 +10:00
just-every-code 8986c190e5 chore(merge): remove upstream workflows and TUI files per policy 2025-09-07 21:39:51 +00:00
just-every-code c3f0395bcb Merge upstream/main: keep ours for TUI/CLI/workflows/docs; adopt compatible core/test additions (by-bucket) 2025-09-07 21:38:12 +00:00
GitHub Action f435fa2130 docs(changelog): update for v0.2.83 [skip ci] 2025-09-07 20:49:23 +00:00
GitHub Action d0ac83b765 chore(release): 0.2.83 [skip ci] 2025-09-07 20:48:16 +00:00
James Peter 6e877b03b9 Merge origin/main: adopt remote version bumps; keep ours (tui JSON theming, apply_patch split + embedded scanner) 2025-09-08 06:39:23 +10:00
James Peter dcdb53ed37 fix(apply_patch/embedded): replace fragile tree-sitter query with robust heredoc scanner; prevent panic and gracefully degrade 2025-09-08 06:37:15 +10:00
James Peter 20fc47c437 feat(tui/exec): use UI-themed syntect for JSON stdout; clear ANSI BG so output inherits theme background 2025-09-08 06:29:54 +10:00
James Peter 8d422b4314 feat(tui/exec): theme-aware JSON preview in Run output; strip ANSI backgrounds and use UI-matched JSON highlighting; avoid white bg from jq -C 2025-09-08 06:28:07 +10:00
GitHub Action 9792601497 chore(release): 0.2.82 [skip ci] 2025-09-07 20:17:30 +00:00
James Peter 58c8348fc2 ci(upstream-merge): add direct cache for codex-rs/target (belt-and-suspenders) 2025-09-08 06:08:19 +10:00
James Peter dd90d69de3 fix(exec/apply_patch): split embedded apply_patch heredocs into separate Updated block before Run; preserve ordering and continue with remainder of script 2025-09-08 06:06:17 +10:00
James Peter f51915d00f Merge origin/main: keep ours for workflow tweak 2025-09-08 05:58:54 +10:00
James Peter 67ceb4e59a ci(upstream-merge): always permit --allow-unrelated-histories when no merge-base; remove input gate 2025-09-08 05:58:40 +10:00
GitHub Action 6d463c04be Merge origin/main: adopt remote workflow changes; keep release changes [skip ci] 2025-09-07 19:56:11 +00:00
GitHub Action 959aba2890 docs(changelog): update for v0.2.81 [skip ci] 2025-09-07 19:56:00 +00:00
GitHub Action 32e135ef55 chore(release): 0.2.81 [skip ci] 2025-09-07 19:54:49 +00:00
James Peter 3cd714072c ci(upstream-merge): add allow_unrelated_histories input; conditionally permit graft; split artifacts per-file; preview in step summary; handle no-merge-base output 2025-09-08 05:51:10 +10:00
James Peter 2122535145 ci(upstream-merge): write MERGE_PLAN/REPORT to .github/auto; ignore .github/auto in git; upload entire .github/auto directory as artifacts; remove any committed plan/report in cleanup 2025-09-08 05:46:12 +10:00
James Peter 68a17f7bd8 ci(upstream-merge): soften TUI invariants guard to warning-only 2025-09-07 21:10:38 +10:00
James Peter dd660dd288 ci(upstream-merge): run TUI invariants guard only when TUI changed; search repo-wide for tokens 2025-09-07 20:59:06 +10:00
James Peter 30ff305bac ci(upstream-merge): handle no merge-base case in context prep (skip reintroduced detection when unrelated histories) 2025-09-07 20:47:47 +10:00
James Peter b5bf29f34c ci(upstream-merge): avoid fetching tags to prevent 'would clobber existing tag' errors; add --no-tags to upstream/origin fetches 2025-09-07 20:39:36 +10:00
James Peter f417545d52 ci(upstream-merge): use cached static binaries for ripgrep/jq; add PATH; add debug trace for context prep 2025-09-07 20:36:07 +10:00
James Peter c6c9350f9a ci(upstream-merge): fetch with commit graph (blobless) for full history; forbid --allow-unrelated-histories; handle empty COMMITS.json 2025-09-07 20:22:21 +10:00
James Peter af7cd15ce2 ci(upstream-merge): compute REINTRODUCED_PATHS via merge-base; remove those in cleanup; minimize <policy> output; drop stale THEIRS_GLOBS 2025-09-07 20:19:53 +10:00
James Peter c6f1343987 ci(upstream-merge): cache Cargo registry under RUNNER_TEMP; guard apt installs for ripgrep/jq 2025-09-07 20:16:18 +10:00
James Peter 8a87248321 ci(upstream-merge): fix unbound DEFAULT_BRANCH in cleanup step; make artifacts upload tolerant; remove duplicate PR JS 2025-09-07 20:13:38 +10:00
James Peter d9b6682826 Merge origin/main: keep ours for enhanced merge workflow 2025-09-07 20:09:28 +10:00
James Peter 198a0723c8 ci(upstream-merge): precompute commit range + deleted paths + histogram; expand agent context; plan-first; TUI invariants guard; step summary + artifacts; set safe.directory 2025-09-07 20:09:26 +10:00
GitHub Action f24e31f3b7 docs(changelog): update for v0.2.80 [skip ci] 2025-09-07 10:05:08 +00:00
GitHub Action c87e5a326e chore(release): 0.2.80 [skip ci] 2025-09-07 10:04:13 +00:00
James Peter 6eecafa9d0 Merge origin/main: keep ours for CI updates 2025-09-07 19:54:41 +10:00
James Peter 06c0d8cc08 ci(upstream-merge): set git identity in workflow; renumber steps; rely on build-fast.sh default CARGO_HOME inside repo 2025-09-07 19:54:40 +10:00
GitHub Action a419948efa Merge origin/main: adopt remote workflow changes; keep release changes [skip ci] 2025-09-07 09:50:18 +00:00
GitHub Action 2610440e6b chore(release-notes): restore unrelated files accidentally staged [skip ci] 2025-09-07 09:50:04 +00:00
GitHub Action c2bf82c41c docs(changelog): update for v0.2.79 [skip ci] 2025-09-07 09:49:52 +00:00
GitHub Action bb94e2566f chore(release): 0.2.79 [skip ci] 2025-09-07 09:48:53 +00:00
James Peter 4a2dc218b7 ci(upstream-merge): instruct agent to judge each upstream commit using repo history; drop 'trivial-only' language 2025-09-07 19:42:38 +10:00
James Peter 4398e000bb Merge origin/main (no conflicts) 2025-09-07 19:36:19 +10:00
James Peter e2efa210a4 ci(upstream-merge): default-to-ours; remove prefer_theirs usage; dynamic cleanup for reintroduced crates; smarter purge; agent autonomy 2025-09-07 19:36:08 +10:00
GitHub Action 6aa14cbbdb docs(changelog): update for v0.2.78 [skip ci] 2025-09-07 09:03:44 +00:00
GitHub Action d438fac5c6 chore(release): 0.2.78 [skip ci] 2025-09-07 09:02:34 +00:00
James Peter 61ce1481a8 Merge origin/main (no conflicts) 2025-09-07 18:53:56 +10:00
James Peter ffe12a1e77 ci(upstream-merge): policy guard (docs/branding/perma-deleted); fix PR JS step placement; install jq; expand cleanup to purge_globs/perma 2025-09-07 18:52:34 +10:00
James Peter fe4d88eddb chore(gitignore): ignore local worktrees '/.wt-*'; drop accidental tracked worktree dir 2025-09-07 18:29:27 +10:00
James Peter 88a2a95580 ci(upstream-merge): skip when origin/upstream-merge already contains upstream + default tips 2025-09-07 18:29:13 +10:00
James Peter c4eaf51e03 ci(upstream-merge): purge nested Cargo caches under codex-rs (belt-and-suspenders) 2025-09-07 18:05:08 +10:00
James Peter b7d1036544 chore(gitignore): ignore Cargo caches anywhere (incl. codex-rs/.cargo-home and .cargo2) 2025-09-07 18:04:59 +10:00