hanzoai/dev
2
0
Fork 0
mirror of https://github.com/hanzoai/dev.git synced 2026-10-25 03:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,836 Commits 4 Branches 404 Tags
deb150a4f4eac01f5a4dc00889ef0eeeecd759d7
Commit Graph
2836 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Peter deb150a4f4 Merge origin/upstream-merge: adopt MCP conversation id refactor 2025-09-19 09:45:42 +10:00
just-every-code 91116d60b4 merge(upstream): incorporate openai/codex main into upstream-merge (by-bucket) 
- Resolve parse_command.rs conflict preserving left-to-right order and small-formatter filtering
- Adopt upstream improvements in bash AST ordering (source-order restoration)
- Verified with scripts/upstream-merge/verify.sh and build-fast.sh (ok, zero warnings)

Refs: .github/auto/COMMITS.json buckets; policy-protected areas preserved
 2025-09-18 23:26:23 +00:00
Michael BolinandGitHub ce371ede12 fix: update try_parse_word_only_commands_sequence() to return commands in order (#3881) 
Incidentally, we had a test for this in
`accepts_multiple_commands_with_allowed_operators()`, but it was
verifying the bad behavior. Oops!
 2025-09-18 16:07:38 -07:00
James Peter be12105ab4 Merge branch 'code-branch-20250918-102707' into main 2025-09-19 08:19:11 +10:00
James Peter 1091f3bf95 merge local main into code-branch-20250918-102707 before merge 2025-09-19 08:19:11 +10:00
James Peter d6d3e92cf7 Fix branch reconfigure context handling 2025-09-19 08:18:40 +10:00
just-every-code 959a409129 merge(upstream): bring in upstream/main into upstream-merge 
- Adopt upstream exec sandbox cwd parameter and wire through Session
- Keep our core codex.rs and MCP codex_message_processor to preserve UA/tool invariants
- Align CLI debug_sandbox with new sandbox_cwd APIs
- Preserve fork policies (browser/agent tools, UA/version)

Build: ./build-fast.sh ok; verify.sh passed
 2025-09-18 22:04:09 +00:00
Michael BolinandGitHub f5d07b56c5 fix: ensure cwd for conversation and sandbox are separate concerns (#3874) 
Previous to this PR, both of these functions take a single `cwd`:


https://github.com/openai/codex/blob/d770cd22af56aa0fab448704bd74a849c70fa1d6/codex-rs/core/src/seatbelt.rs#L19-L25


https://github.com/openai/codex/blob/d770cd22af56aa0fab448704bd74a849c70fa1d6/codex-rs/core/src/landlock.rs#L16-L23

whereas `cwd` and `sandbox_cwd` should be set independently (fixed in
this PR).

Added `sandbox_distinguishes_command_and_policy_cwds()` to
`codex-rs/exec/tests/suite/sandbox.rs` to verify this.
 2025-09-18 14:37:06 -07:00
just-every-code 2811c2f365 merge: upstream main into upstream-merge (preserve core/TUI, adapt exec). build-fast ok 2025-09-18 21:33:38 +00:00
dedrisian-oaiandGitHub 36bd3c910d feat: /review (#3774) 
Adds `/review` action in TUI

<img width="637" height="370" alt="Screenshot 2025-09-17 at 12 41 19 AM"
src="https://github.com/user-attachments/assets/b1979a6e-844a-4b97-ab20-107c185aec1d"
/>
 2025-09-18 14:14:16 -07:00
Jeremy RoseandGitHub c01dd9e0f6 Reland "refactor transcript view to handle HistoryCells" (#3753) 
Reland of #3538
 2025-09-18 20:55:53 +00:00
just-every-code 02bc1037b4 merge(upstream): merge openai/codex main into upstream-merge\n\n- Adopt upstream changes outside protected areas\n- Preserve fork-specific tools, TUI, and UA/version invariants\n- verify.sh: build_fast=ok; api_check=ok 2025-09-18 18:59:16 +00:00
Jeremy RoseandGitHub d770cd22af fix error on missing notifications in [tui] (#3867) 
Fixes #3811.
 2025-09-18 11:25:09 -07:00
github-actions[bot] 6c094ee9a0 chore(merge): enforce policy removals (images + cargo caches) 2025-09-18 18:02:10 +00:00
just-every-code 60c3538f3b merge(upstream): merge openai/codex@main into upstream-merge 
- Keep our core codex.rs and browser/agent/web_fetch gating and UA/version invariants
- Retain minimal compact history path (compat with our Session/state types)
- Adopt upstream client_common.rs structure; reconcile get_full_instructions with model override
- Verified with scripts/upstream-merge/verify.sh and ./build-fast.sh (zero warnings)
 2025-09-18 17:52:49 +00:00
just-every-code e0ead0688b docs(upstream-merge): add by-bucket merge plan for upstream sync 2025-09-18 17:40:38 +00:00
jif-oaiandGitHub bf406d4dd4 chore: use tokio mutex and async function to prevent blocking a worker (#3850) 
### Why Use `tokio::sync::Mutex`

`std::sync::Mutex` are not _async-aware_. As a result, they will block
the entire thread instead of just yielding the task. Furthermore they
can be poisoned which is not the case of `tokio` Mutex.
This allows the Tokio runtime to continue running other tasks while
waiting for the lock, preventing deadlocks and performance bottlenecks.

In general, this is preferred in async environment
 2025-09-18 18:21:52 +01:00
jif-oaiandGitHub 1b5c071626 fix: some nit Rust reference issues (#3849) 
Fix some small references issue. No behavioural change. Just making the
code cleaner
 2025-09-18 18:18:06 +01:00
just-every-code a94a3ee56d merge(upstream): integrate openai/codex main into upstream-merge (by-bucket) 
- Keep fork TUI and wiring under codex-rs/tui/**
- Prefer upstream in shared crates; no conflicts in common/exec/file-search
- Resolve TUI merge conflicts by taking ours; adopt upstream CLI/TUI glue minimally
- Fix tui/cli to match fork run_main() return (TokenUsage) and drop owo-colors
- Ensure purge globs not reintroduced; workflows/docs unchanged

Build: ./build-fast.sh passes cleanly (0 warnings); verify.sh ok
 2025-09-18 17:00:11 +00:00
Jeremy RoseandGitHub 96861c69da hint for codex resume on tui exit (#3757) 
<img width="931" height="438" alt="Screenshot 2025-09-16 at 4 25 19 PM"
src="https://github.com/user-attachments/assets/ccfb8df1-feaf-45b4-8f7f-56100de916d5"
/>
 2025-09-18 09:28:32 -07:00
just-every-code 4ee1108be4 Merge upstream/main: by-bucket sync; keep TUI; add compact shim to preserve API (verify.sh + build-fast.sh pass) 2025-09-18 16:10:23 +00:00
jif-oaiandGitHub ded03a75e4 Make ESC button work when auto-compaction (#3857) 
Only emit a task finished when the compaction comes from a `/compact`
 2025-09-18 15:34:16 +00:00
jif-oaiandGitHub 73ade7a33a Unify animations (#3729) 
Unify the animation in a single code and add the CTRL + . in the
onboarding
 2025-09-18 16:27:15 +01:00
github-actions[bot] 14df19ddeb chore(merge): enforce policy removals (images + cargo caches) 2025-09-18 15:16:37 +00:00
just-every-code 9dc353a653 merge(upstream): incorporate upstream main into upstream-merge 
- Align ConversationId API to upstream; add From conversions
- Keep MCP server UA semantics and disable login flows in server
- Preserve ICU/sys-locale deps; keep uuid v4 usage
- Minimal fixes to core + recorder for new id type

Build: verify.sh ok; build-fast.sh ok (no warnings)
 2025-09-18 15:07:28 +00:00
just-every-code 6e7ed32ff2 chore(upstream-merge): add MERGE_PLAN.md for by-bucket strategy 2025-09-18 14:45:17 +00:00
pakrym-oaiandGitHub ff528bf0c3 Switch to uuid_v7 and tighten ConversationId usage (#3819) 
Make sure conversations have a timestamp.
 2025-09-18 14:37:03 +00:00
James Peter c020b0c16a Merge branch 'code-branch-20250918-072155' into main 2025-09-18 21:05:50 +10:00
James Peter dbe5ba84e1 merge local main into code-branch-20250918-072155 before merge 2025-09-18 21:05:50 +10:00
James Peter b91d565c7f merge main into code-branch-20250918-072155 before merge 2025-09-18 21:05:50 +10:00
James Peter 8bdd190a1c Queue user prompts into next request 2025-09-18 21:05:16 +10:00
James Peter 578f5e9cb0 feat(tui/status): show turn tokens and model limits 2025-09-18 20:48:07 +10:00
just-every-code 9e7dd9e380 merge(upstream): integrate openai/codex main into upstream-merge (by-bucket policy)\n\n- Preserve fork-specific core/TUI, browser_*/agent_* tools, UA/version helpers\n- Prefer upstream for common/exec/file-search buckets\n- Purged disallowed image assets (none found reintroduced)\n\nBuild: ./build-fast.sh ok; verify.sh api_check ok 2025-09-18 10:35:23 +00:00
just-every-code e8046e1609 Merge remote-tracking branch 'origin/main' into upstream-merge 2025-09-18 10:24:03 +00:00
James Peter 709ccc5943 Merge branch 'code-branch-20250918-093938' into main 2025-09-18 19:59:07 +10:00
James Peter 073a9761a4 merge local main into code-branch-20250918-093938 before merge 2025-09-18 19:59:07 +10:00
James Peter 76d7713aea merge main into code-branch-20250918-093938 before merge 2025-09-18 19:59:07 +10:00
James Peter 980d893898 Fix onboarding Enter handling on legacy Windows consoles 
Allow release key events through when enhanced keyboard flags are unavailable so first-run onboarding can progress. Closes #145.
 2025-09-18 19:57:32 +10:00
James Peter 7da12c1871 Merge branch 'code-branch-20250918-093808' into main 2025-09-18 19:55:57 +10:00
James Peter 2b0d8f71c2 merge main into code-branch-20250918-093808 before merge 2025-09-18 19:55:57 +10:00
James Peter 1b3317cffc Fix chat composer cursor overlay 
Closes #142
 2025-09-18 19:52:49 +10:00
jif-oaiandGitHub ec6b75ee55 bug: Ignore tests for now (#3777) 
Ignore flaky / long tests for now
 2025-09-18 10:43:45 +01:00
GitHub Action e324800e5d docs(changelog): update for v0.2.155 [skip ci] 2025-09-18 08:47:28 +00:00
GitHub Action 87f7fcc83f chore(release): 0.2.155 [skip ci] 2025-09-18 08:45:55 +00:00
James Peter daa3750319 Merge branch 'code-branch-20250918-072109' into main 2025-09-18 18:15:59 +10:00
James Peter 45af8c31d1 merge code-branch-20250918-072109 via /merge 2025-09-18 18:15:27 +10:00
James Peter 1871de8f14 Merge branch 'code-branch-20250918-070401' into main 2025-09-18 17:28:47 +10:00
James Peter 1cefdce653 Merge branch 'code-branch-20250918-070223' into main 2025-09-18 17:28:44 +10:00
James Peter de11f0f758 Merge remote-tracking branch 'origin/main' into code-branch-20250918-070401 2025-09-18 17:28:28 +10:00
James Peter 90484a0380 Merge remote-tracking branch 'origin/main' into code-branch-20250918-070223 2025-09-18 17:28:15 +10:00