openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-09-08 15:50:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

codex: address PR review feedback (#20179)

Browse Source
This commit is contained in:
Eric Traut
2026-04-29 09:24:32 -07:00
parent 6d4a02fd4f
commit 6b20485bdf
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
.github/scripts/verify_tui_core_boundary.py vendored
View File

@@ -17,6 +17,7 @@ TUI_MANIFEST = TUI_ROOT / "Cargo.toml"
FORBIDDEN_PACKAGE = "codex-core"
CODEX_PROTOCOL_PACKAGE = "codex-protocol"
CODEX_PROTOCOL_MESSAGE = "references `codex_protocol::protocol`"
CODEX_PROTOCOL_GLOB_MESSAGE = "glob-imports `codex_protocol`, which exposes `protocol`"
IDENTIFIER = r"(?:r#)?[^\W\d]\w*"
PROTOCOL_IDENTIFIER = r"(?:r#)?protocol"
TOKEN_SEPARATOR = r"\s*"
@@ -132,6 +133,14 @@ def source_failures() -> list[str]:
continue
failures.append(source_failure(path, text, match.start(), CODEX_PROTOCOL_MESSAGE))
seen_locations.add(key)
for match in protocol_glob_import_matches(match_text, codex_protocol_names):
key = (match.start(), CODEX_PROTOCOL_GLOB_MESSAGE)
if key in seen_locations:
continue
failures.append(
source_failure(path, text, match.start(), CODEX_PROTOCOL_GLOB_MESSAGE)
)
seen_locations.add(key)
return failures
@@ -334,6 +343,29 @@ def protocol_reference_matches(
return matches
def protocol_glob_import_matches(
text: str, codex_protocol_names: set[str]
) -> list[re.Match[str]]:
matches = []
for crate_name in expanded_crate_aliases(text, codex_protocol_names):
crate_name_pattern = rf"(?:r#)?{re.escape(normalize_identifier(crate_name))}"
patterns = (
re.compile(
rf"\buse{REQUIRED_TOKEN_SEPARATOR}"
rf"(?:::{TOKEN_SEPARATOR})?{crate_name_pattern}"
rf"{TOKEN_SEPARATOR}::{TOKEN_SEPARATOR}\*{TOKEN_SEPARATOR};"
),
re.compile(
rf"\buse{REQUIRED_TOKEN_SEPARATOR}"
rf"(?:::{TOKEN_SEPARATOR})?{crate_name_pattern}"
rf"{TOKEN_SEPARATOR}::{TOKEN_SEPARATOR}\{{[^;]*\*"
),
)
for pattern in patterns:
matches.extend(pattern.finditer(text))
return matches
def expanded_crate_aliases(text: str, crate_names: set[str]) -> set[str]:
aliases = {normalize_identifier(crate_name) for crate_name in crate_names}
while True: