github-actions[bot]
5dd4263b3b
chore(merge): enforce policy removals (images + cargo caches)
2025-09-22 18:54:23 +00:00
just-every-code
0c3b192cfc
docs(merge): add MERGE_PLAN and MERGE_REPORT for upstream sync (by-bucket)
2025-09-22 18:46:38 +00:00
just-every-code
eec509fcd0
merge(upstream): integrate upstream/main into upstream-merge\n\n- Mode: by-bucket\n- Preserved our TUI and strict ordering\n- Adopted upstream elsewhere; no net content changes due to conflicts only in protected TUI files\n- Verified purge globs remain clean
2025-09-22 18:46:01 +00:00
friel-openai and GitHub
bad33471f9
Tui: fix backtracking ( #4020 )
...
Backtracking multiple times could drop earlier turns. We now derive the
active user-turn positions from the transcript on demand (keying off the
latest session header) instead of caching state. This keeps the replayed
context intact during repeated edits and adds a regression test.
2025-09-22 11:16:25 -07:00
Jeremy Rose and GitHub
8acae68a9c
simplify StreamController ( #3928 )
...
no intended functional change, just simplifying the code.
2025-09-22 11:14:04 -07:00
Ahmed Ibrahim and GitHub
8224593dfe
Add limits to /status ( #4053 )
...
Add limits to status
<img width="579" height="430" alt="image"
src="https://github.com/user-attachments/assets/d3794d92-ffca-47be-8011-b4452223cc89 "
/>
2025-09-22 18:13:34 +00:00
just-every-code
57b5c00789
Merge upstream/main: preserve core/TUI; adopt upstream in common; build-fast ok
...
- Prefer ours: core/codex.rs, core/config.rs, core/config_types.rs, core/mcp_connection_manager.rs, TUI files (chat_composer, history_cell, markdown_stream), keep wrapping.rs deleted.
- Prefer theirs: common/exec/file-search where merged cleanly.
- Reconciliations: restored core mcp_tool_call.rs signature; updated CLI mcp config to startup_timeout_ms; adjusted TUI callers to pass TextAreaState by value.
- Guards: tool families and UA/version preserved; verify.sh passed.
- Purge: no purged assets reintroduced.
Result: ./build-fast.sh success with zero warnings.
2025-09-22 17:54:57 +00:00
github-actions[bot]
9e86d09545
chore(merge): enforce policy removals (images + cargo caches)
2025-09-22 17:42:31 +00:00
just-every-code
232990ed14
docs(upstream-merge): add MERGE_REPORT summary (verify.sh + build-fast OK)
2025-09-22 17:38:04 +00:00
just-every-code
7a16018855
chore(merge): upstream main -> upstream-merge (by-bucket)
...
- Adopt upstream for common/exec/file-search (prefer_theirs)
- Keep ours for TUI and core tool wiring (prefer_ours)
- Restore workspace profiles (dev-fast/perf/release-prod)
- Fix CLI/bin naming + MCP server crate name
- Minimal Cargo.toml fixes (tokio, agent-client-protocol, codex-version)
verify.sh: ok; ./build-fast.sh: ok (no warnings)
2025-09-22 17:37:53 +00:00
Jeremy Rose and GitHub
1ee0afdf16
timeouts for mcp tool calls ( #3959 )
...
defaults to 60sec, overridable with MCP_TOOL_TIMEOUT or on a per-server
basis in the config.
2025-09-22 10:30:59 -07:00
just-every-code
742f2535c7
docs(upstream-merge): add MERGE_PLAN for by-bucket strategy
2025-09-22 17:16:13 +00:00
jif-oai and GitHub
0952d113d8
chore: more clippy rules 2 ( #4057 )
...
The only file to watch is the cargo.toml
All the others come from just fix + a few manual small fix
The set of rules have been taken from the list of clippy rules
arbitrarily while trying to optimise the learning and style of the code
while limiting the loss of productivity
2025-09-22 17:16:02 +00:00
jif-oai and GitHub
5df3e8f166
chore: unify cargo versions ( #4044 )
...
Unify cargo versions at root
2025-09-22 16:47:01 +00:00
github-actions[bot]
b50f94da00
chore(merge): enforce policy removals (images + cargo caches)
2025-09-22 15:56:13 +00:00
just-every-code
e2a42df279
docs(upstream-merge): add MERGE_REPORT summary (verify.sh + build-fast OK)
2025-09-22 15:46:35 +00:00
just-every-code
4c6927f727
Merge upstream/main: adopt upstream on shared crates; keep fork invariants (browser/agent tools, UA/version). Build+verify clean.
2025-09-22 15:46:27 +00:00
just-every-code
4b2834ecb3
docs(upstream-merge): add MERGE_PLAN for by-bucket strategy
2025-09-22 15:22:40 +00:00
just-every-code
9bf7e1bd86
Merge remote-tracking branch 'origin/main' into upstream-merge
2025-09-22 15:21:17 +00:00
pakrym-oai and GitHub
de0731685b
Add non_sandbox_test helper ( #3880 )
...
Makes tests shorter
2025-09-22 14:50:41 +00:00
GitHub Action
c8d30c68b1
docs(changelog): update for v0.2.162 [skip ci]
2025-09-22 12:18:08 +00:00
GitHub Action
67bf7c8ce3
chore(release): 0.2.162 [skip ci]
2025-09-22 12:16:22 +00:00
James Peter and GitHub
6f7ed7ee8a
Merge pull request #224 from just-every/issue-223
2025-09-22 22:00:53 +10:00
just-every-code
ef2f609b62
Auto: address issue #223 - Coder resume --last not always working
2025-09-22 11:51:22 +00:00
GitHub Action
9355975bd4
docs(changelog): update for v0.2.161 [skip ci]
2025-09-22 11:24:30 +00:00
GitHub Action
edb1a813b0
chore(release): 0.2.161 [skip ci]
2025-09-22 11:22:46 +00:00
James Peter
6c8d20d7d9
Merge branch 'upstream-merge' into main
2025-09-22 21:08:30 +10:00
GitHub Action
b8d5581b58
docs(changelog): update for v0.2.160 [skip ci]
2025-09-22 10:58:46 +00:00
GitHub Action
c76abf596e
chore(release): 0.2.160 [skip ci]
2025-09-22 10:57:11 +00:00
James Peter
e99248758c
Merge origin/main: adopt release metadata updates
2025-09-22 20:45:49 +10:00
James Peter
a4c88ff9f0
fix(core/config): coerce auto upgrade booleans
...
Closes #219
2025-09-22 20:43:18 +10:00
James Peter
1b5a8282d5
fix(tui/slash): route exit aliases through quit
2025-09-22 20:13:25 +10:00
James Peter
03cbf35b16
guard(exec): block redundant cd and python file writers
2025-09-22 19:57:18 +10:00
GitHub Action
b16495b498
docs(changelog): update for v0.2.159 [skip ci]
2025-09-22 09:33:17 +00:00
GitHub Action
ea845dfc6e
chore(release): 0.2.159 [skip ci]
2025-09-22 09:29:51 +00:00
James Peter
211cd65e6a
Merge origin/main: adopt release metadata 0.2.158
2025-09-22 19:19:13 +10:00
James Peter
5b81903b3e
docs(zed): streamline integration guide
2025-09-22 19:17:00 +10:00
GitHub Action
cd4b825bb5
docs(changelog): update for v0.2.158 [skip ci]
2025-09-22 09:03:30 +00:00
GitHub Action
d921ab1bfb
chore(release): 0.2.158 [skip ci]
2025-09-22 09:01:39 +00:00
James Peter
2e4be7b923
feat(acp): sync upstream protocol updates
2025-09-22 18:38:16 +10:00
James Peter
fbc10b1c63
misc: sync MCP and limits view edits
2025-09-22 16:54:46 +10:00
James Peter
5c83e3e09f
feat(tui/limits): align hourly and weekly usage presentation
2025-09-22 16:37:57 +10:00
James Peter
39b0d0ff06
fix(tui/limits): correct hourly window display and reset timing
2025-09-22 16:17:50 +10:00
James Peter
f8d26d9419
fix(mcp): tolerate numeric protocolVersion in initialize
2025-09-22 16:16:05 +10:00
James Peter
5ca7c05d85
docs(acp): document coder acp minimal config
2025-09-22 15:49:13 +10:00
James Peter
237d2446ed
feat(cli): add acp alias for mcp subcommand
2025-09-22 15:42:26 +10:00
James Peter
c7be9fed5c
docs(acp): align zed setup with code mcp
2025-09-22 15:36:22 +10:00
James Peter
c07c7b2429
feat(cli): expose mcp via code subcommand
2025-09-22 15:16:49 +10:00
James Peter
45f8060ead
feat(cli): ship code-mcp-server with npm install
2025-09-22 15:02:41 +10:00
github-actions[bot]
62dd8ce43e
chore(merge): enforce policy removals (images + cargo caches)
2025-09-22 04:57:41 +00:00
github-actions[bot]