Commit Graph

3039 Commits

Author SHA1 Message Date
Michael Bolin
121926da9f Merge 8a46a47f42 into sapling-pr-archive-bolinfest 2025-08-18 09:49:51 -07:00
Michael Bolin
8a46a47f42 fix: remove shutdown_flag param to run_login_server() 2025-08-18 09:49:35 -07:00
Michael Bolin
977e586b96 fix: reduce references to Server in codex-login crate 2025-08-18 09:47:10 -07:00
Michael Bolin
7a91cf2d78 fix: make ShutdownHandle a private field of LoginServer 2025-08-18 09:47:10 -07:00
Michael Bolin
df8a64494b fix: eliminate ServerOptions.login_timeout and have caller use tokio::time::timeout() instead 2025-08-18 09:47:10 -07:00
Michael Bolin
dc7ef4c896 fix: change shutdown_flag from Arc<AtomicBool> to tokio::sync::Notify 2025-08-18 09:47:10 -07:00
Michael Bolin
74ccd9dba1 fix: async-ify login flow 2025-08-18 09:47:10 -07:00
Michael Bolin
b887124e72 chore: prefer returning Err to expect() 2025-08-18 09:47:10 -07:00
Michael Bolin
dcda0c9184 merge commit for archive created by Sapling 2025-08-18 09:39:14 -07:00
Michael Bolin
f27a1627ec protocol-ts 2025-08-18 09:38:57 -07:00
Michael Bolin
a4f76bd75a chore: add TS annotation to generated mcp-types (#2424)
Adds the `TS` annotation from https://crates.io/crates/ts-rs to all
types to facilitate codegen.

---
[//]: # (BEGIN SAPLING FOOTER)
Stack created with [Sapling](https://sapling-scm.com). Best reviewed
with [ReviewStack](https://reviewstack.dev/openai/codex/pull/2424).
* __->__ #2424
* #2423
2025-08-18 09:38:47 -07:00
Michael Bolin
712bfa04ac chore: move mcp-server/src/wire_format.rs to protocol/src/mcp_protocol.rs (#2423)
The existing `wire_format.rs` should share more types with the
`codex-protocol` crate (like `AskForApproval` instead of maintaining a
parallel `CodexToolCallApprovalPolicy` enum), so this PR moves
`wire_format.rs` into `codex-protocol`, renaming it as
`mcp-protocol.rs`. We also de-dupe types, where appropriate.

---
[//]: # (BEGIN SAPLING FOOTER)
Stack created with [Sapling](https://sapling-scm.com). Best reviewed
with [ReviewStack](https://reviewstack.dev/openai/codex/pull/2423).
* #2424
* __->__ #2423
2025-08-18 09:36:57 -07:00
Michael Bolin
bcc28e906f merge commit for archive created by Sapling 2025-08-18 09:20:18 -07:00
Michael Bolin
57d181ddb8 chore: add TS annotation to generated mcp-types 2025-08-18 09:08:08 -07:00
ae
da69d50c60 fix: stop using ANSI blue (#2421)
- One less color.
- Replaced with cyan which looks better next to other cyan components.
2025-08-18 16:02:25 +00:00
dependabot[bot]
be6a4faa45 chore(deps-dev): bump @types/node from 24.2.1 to 24.3.0 in /.github/actions/codex (#2411)
Bumps
[@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node)
from 24.2.1 to 24.3.0.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@types/node&package-manager=bun&previous-version=24.2.1&new-version=24.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-18 08:33:17 -07:00
Michael Bolin
63074572c8 chore: move mcp-server/src/wire_format.rs to protocol/src/mcp_protocol.rs 2025-08-18 08:31:04 -07:00
ae
5bce369c4d fix: clean up styles & colors and define in styles.md (#2401)
New style guide:

  # Headers, primary, and secondary text
  
- **Headers:** Use `bold`. For markdown with various header levels,
leave in the `#` signs.
  - **Primary text:** Default.
  - **Secondary text:** Use `dim`.
  
  # Foreground colors
  
- **Default:** Most of the time, just use the default foreground color.
`reset` can help get it back.
- **Selection:** Use ANSI `blue`. (Ed & AE want to make this cyan too,
but we'll do that in a followup since it's riskier in different themes.)
  - **User input tips and status indicators:** Use ANSI `cyan`.
  - **Success and additions:** Use ANSI `green`.
  - **Errors, failures and deletions:** Use ANSI `red`.
  - **Codex:** Use ANSI `magenta`.
  
  # Avoid
  
- Avoid custom colors because there's no guarantee that they'll contrast
well or look good on various terminal color themes.
- Avoid ANSI `black`, `white`, `yellow` as foreground colors because the
terminal theme will do a better job. (Use `reset` if you need to in
order to get those.) The exception is if you need contrast rendering
over a manually colored background.
  
  (There are some rules to try to catch this in `clippy.toml`.)

# Testing

Tested in a variety of light and dark color themes in Terminal, iTerm2, and Ghostty.
2025-08-18 08:26:29 -07:00
Michael Bolin
a269754668 remove mcp-server/src/mcp_protocol.rs and the code that depends on it (#2360) 2025-08-18 00:29:18 -07:00
Michael Bolin
897961811f merge commit for archive created by Sapling 2025-08-17 23:06:13 -07:00
Michael Bolin
a06dc97fb5 remove mcp-server/src/mcp_protocol.rs and the code that depends on it 2025-08-17 23:06:07 -07:00
Michael Bolin
682e4a6029 Merge 538fa74044 into sapling-pr-archive-bolinfest 2025-08-17 23:05:16 -07:00
Michael Bolin
538fa74044 remove mcp-server/src/mcp_protocol.rs and the code that depends on it 2025-08-17 23:05:13 -07:00
Michael Bolin
43de9cd001 merge commit for archive created by Sapling 2025-08-17 23:04:09 -07:00
Michael Bolin
6b4292b9e4 remove mcp-server/src/mcp_protocol.rs and the code that depends on it 2025-08-17 23:04:04 -07:00
Michael Bolin
44a58feb94 merge commit for archive created by Sapling 2025-08-17 23:00:28 -07:00
Michael Bolin
991b1b32ed remove mcp-server/src/mcp_protocol.rs and the code that depends on it 2025-08-17 23:00:21 -07:00
Michael Bolin
017214f079 merge commit for archive created by Sapling 2025-08-17 22:11:33 -07:00
Michael Bolin
d973d33c1c remove mcp-server/src/mcp_protocol.rs and the code that depends on it 2025-08-17 22:11:28 -07:00
Michael Bolin
1bf636e340 merge commit for archive created by Sapling 2025-08-17 22:08:10 -07:00
Michael Bolin
84215cf9e3 remove mcp-server/src/mcp_protocol.rs and the code that depends on it 2025-08-17 22:08:04 -07:00
Michael Bolin
b581498882 fix: introduce EventMsg::TurnAborted (#2365)
Introduces `EventMsg::TurnAborted` that should be sent in response to
`Op::Interrupt`.

In the MCP server, updates the handling of a
`ClientRequest::InterruptConversation` request such that it sends the
`Op::Interrupt` but does not respond to the request until it sees an
`EventMsg::TurnAborted`.
2025-08-17 21:40:31 -07:00
Michael Bolin
1040fc439f merge commit for archive created by Sapling 2025-08-17 21:33:09 -07:00
Michael Bolin
a42cb311d8 fix: introduce EventMsg::TurnAborted 2025-08-17 21:33:02 -07:00
Michael Bolin
18711d4cfd Merge 00139a1afc into sapling-pr-archive-bolinfest 2025-08-17 15:43:25 -07:00
Michael Bolin
00139a1afc fix: introduce EventMsg::TurnAborted 2025-08-17 15:43:10 -07:00
Michael Bolin
22fc98224b Merge 1cd51fe1b8 into sapling-pr-archive-bolinfest 2025-08-17 15:34:37 -07:00
Michael Bolin
1cd51fe1b8 fix: remove shutdown_flag param to run_login_server() 2025-08-17 15:34:28 -07:00
Michael Bolin
cfcbac1591 Merge 437caeffa6 into sapling-pr-archive-bolinfest 2025-08-17 15:27:04 -07:00
Michael Bolin
437caeffa6 fix: reduce references to Server in codex-login crate 2025-08-17 15:26:58 -07:00
Michael Bolin
88cdde4df0 Merge 3aff1f62ef into sapling-pr-archive-bolinfest 2025-08-17 14:54:03 -07:00
Michael Bolin
3aff1f62ef fix: make ShutdownHandle a private field of LoginServer 2025-08-17 14:53:55 -07:00
Michael Bolin
a7bd7e458a merge commit for archive created by Sapling 2025-08-17 14:39:36 -07:00
Michael Bolin
4dc441bca6 fix: eliminate ServerOptions.login_timeout and have caller use tokio::time::timeout() instead 2025-08-17 14:39:30 -07:00
Michael Bolin
e634182ac8 merge commit for archive created by Sapling 2025-08-17 14:35:46 -07:00
Michael Bolin
3544a84d50 fix: eliminate ServerOptions.login_timeout and have caller use tokio::time::timeout() instead 2025-08-17 14:35:40 -07:00
Michael Bolin
b52dc59f26 merge commit for archive created by Sapling 2025-08-17 14:32:26 -07:00
Michael Bolin
16766382a3 fix: change shutdown_flag from Arc<AtomicBool> to tokio::sync::Notify 2025-08-17 14:32:17 -07:00
Michael Bolin
cfca8371f6 fix: eliminate ServerOptions.login_timeout and have caller use tokio::time::timeout() instead 2025-08-17 14:32:17 -07:00
Michael Bolin
67c58ee62d Merge 173fa5fab4 into sapling-pr-archive-bolinfest 2025-08-17 14:26:44 -07:00