Add remote agent graph store implementation

.codespellrc

@@ -1,6 +1,6 @@
 [codespell]
 # Ref: https://github.com/codespell-project/codespell#using-a-config-file
-skip = .git*,vendor,*-lock.yaml,*.lock,.codespellrc,*test.ts,*.jsonl,frame*.txt,*.snap,*.snap.new
+skip = .git*,vendor,*-lock.yaml,*.lock,.codespellrc,*test.ts,*.jsonl,frame*.txt,*.snap,*.snap.new,*meriyah.umd.min.js
 check-hidden = true
 ignore-regex = ^\s*"image/\S+": ".*|\b(afterAll)\b
 ignore-words-list = ratatui,ser,iTerm,iterm2,iterm,te,TE,PASE,SEH

.codex/skills/codex-issue-digest/SKILL.md

@@ -1,127 +0,0 @@
----
-name: codex-issue-digest
-description: Run a GitHub issue digest for openai/codex by feature-area labels, all areas, and configurable time windows. Use when asked to summarize recent Codex bug reports or enhancement requests, especially for owner-specific labels such as tui, exec, app, or similar areas.
----
-
-# Codex Issue Digest
-
-## Objective
-
-Produce a headline-first, insight-oriented digest of `openai/codex` issues for the requested feature-area labels over the previous 24 hours by default. Honor a different duration when the user asks for one, for example "past week" or "48 hours". Default to a summary-only response; include details only when requested.
-
-Include only issues that currently have `bug` or `enhancement` plus at least one requested owner label. If the user asks for all areas or all labels, collect `bug`/`enhancement` issues across all labels.
-
-## Inputs
-
-- Feature-area labels, for example `tui exec`
-- `all areas` / `all labels` to scan all current feature labels
-- Optional repo override, default `openai/codex`
-- Optional time window, default previous 24 hours; examples: `48h`, `7d`, `1w`, `past week`
-
-## Workflow
-
-1. Run the collector from a current Codex repo checkout:
-
-```bash
-python3 .codex/skills/codex-issue-digest/scripts/collect_issue_digest.py --labels tui exec --window-hours 24
-```
-
-Use `--window "past week"` or `--window-hours 168` when the user asks for a non-default duration. Use `--all-labels` when the user says all areas or all labels.
-
-2. Use the JSON as the source of truth. It includes new issues, new issue comments, new reactions/upvotes, current labels, current reaction counts, model-ready `summary_inputs`, and detailed `digest_rows`.
-3. Choose the output mode from the user's request:
-   - Default mode: start the report with `## Summary` and do not emit `## Details`.
-   - Details-upfront mode: if the user asks for details, a table, a full digest, "include details", or similar, start with `## Summary`, then include `## Details`.
-   - Follow-up details mode: if the user asks for more detail after a summary-only digest, produce `## Details` from the existing collector JSON when it is still available; otherwise rerun the collector.
-4. In `## Summary`, write a headline-first executive summary:
-   - The first nonblank line under `## Summary` must be a single-line headline or judgment, not a bullet. It should be useful even if the reader stops there.
-   - On quiet days, prefer exactly: `No major issues reported by users.` Use this when there are no elevated rows, no newly repeated theme, and nothing that needs owner action.
-   - When users are surfacing notable issues, make the headline name the count or theme, for example `Two issues are being surfaced by users:`.
-   - Immediately under an active headline, list only the issues or themes driving attention, ordered by importance. Start each line with the row's `attention_marker` when present, then a concise owner-readable description and inline issue refs.
-   - Treat `🔥🔥` as headline-worthy and `🔥` as elevated. Do not add fire emoji yourself; only copy the row's `attention_marker`.
-   - Keep any extra summary detail after the headline to 1-3 terse lines, only when it adds a decision-relevant caveat, repeated theme, or owner action.
-   - Do not include routine counts, broad stats, or low-signal table summaries in `## Summary` unless they change the headline. Put metadata and optional counts in `## Details` or the footer.
-   - In default mode, end the report with a concise prompt such as `Want details? I can expand this into the issue table.` Keep this separate from the summary headline so the headline stays clean.
-   - Cluster and name themes yourself from `summary_inputs`; the collector intentionally does not hard-code issue categories.
-   - Use a cluster only when the issues genuinely share the same product problem. If several issues merely share a broad platform or label, describe them individually.
-   - Do not omit a repeated theme just because its individual issues fall below the details table cutoff. Several similar reports should be called out as a repeated customer concern.
-   - For single-issue rows, summarize the concern directly instead of calling it a cluster.
-   - Use inline numbered issue links from each relevant row's `ref_markdown`.
-   - Example quiet summary:
-
-```markdown
-## Summary
-No major issues reported by users.
-
-Source: collector v4, git `abc123def456`, window `2026-04-27T00:00:00Z` to `2026-04-28T00:00:00Z`.
-Want details? I can expand this into the issue table.
-```
-
-   - Example active summary:
-
-```markdown
-## Summary
-Two issues are being surfaced by users:
-🔥🔥 Terminal launch hangs on startup [1](https://github.com/openai/codex/issues/123)
-🔥 Resume switches model providers unexpectedly [2](https://github.com/openai/codex/issues/456)
-
-Source: collector v4, git `abc123def456`, window `2026-04-27T00:00:00Z` to `2026-04-28T00:00:00Z`.
-Want details? I can expand this into the issue table.
-```
-5. In `## Details`, when details are requested, include a compact table only when useful:
-   - Prefer rows from `digest_rows`; include a `Refs` column using each row's `ref_markdown`.
-   - Keep the table short; omit low-signal rows when the summary already covers them.
-   - Use compact columns such as marker, area, type, description, interactions, and refs.
-   - The `Description` cell should be a short owner-readable phrase. Use row `description`, title, body excerpts, and recent comments, but do not mechanically copy the raw GitHub issue title when it contains incidental details.
-   - A clear quiet/no-concern sentence when there is no meaningful signal.
-6. Use the JSON `attention_marker` exactly. It is empty for normal rows, `🔥` for elevated rows, and `🔥🔥` for very high-attention rows. The actual cutoffs are in `attention_thresholds`.
-7. Use inline numbered references where a row or bullet points to issues, for example `Compaction bugs [1](https://github.com/openai/codex/issues/123), [2](https://github.com/openai/codex/issues/456)`. Do not add a separate footnotes section.
-8. Label `interactions` as `Interactions`; it counts posts/comments/reactions during the requested window, not unique people.
-9. Mention the collector `script_version`, repo checkout `git_head`, and time window in one compact source line. In default mode, put this before the details prompt so the final line still asks whether the user wants details. In details-upfront mode, it can be the footer.
-
-## Reaction Handling
-
-The collector uses GitHub reactions endpoints, which include `created_at`, to count reactions created during the digest window for hydrated issues. It reports both in-window reaction counts and current reaction totals. Treat current reaction totals as standing engagement, and treat `new_reactions` / `new_upvotes` as windowed activity.
-
-By default, the collector fetches issue comments with `since=<window start>` and caps the number of comment pages per issue. This keeps very long historical threads from dominating a digest run and focuses the report on recent posts. Use `--fetch-all-comments` only when exhaustive comment history is more important than runtime.
-
-GitHub issue search is still seeded by issue `updated_at`, so a purely reaction-only issue may be missed if reactions do not bump `updated_at`. Covering every reaction-only case would require either a persisted snapshot store or a broader scan of labeled issues.
-
-## Attention Markers
-
-The collector scales attention markers by the requested time window. The baseline is 5 human user interactions for `🔥` and 10 for `🔥🔥` over 24 hours; longer or shorter windows scale those cutoffs linearly and round up. For example, a one-week report uses 35 and 70 interactions. Human user interactions are human-authored new issue posts, human-authored new comments, and human reactions created during the window, including upvotes. Bot posts and bot reactions are excluded. In prose, explain this as high user interaction rather than naming the emoji.
-
-## Freshness
-
-The automation should run from a repo checkout that contains this skill. For shared daily use, prefer one of these patterns:
-
-- Run the automation in a checkout that is refreshed before the automation starts, for example with `git pull --ff-only`.
-- If the automation cannot safely mutate the checkout, have it report the current `git_head` from the collector output so readers know which skill/script version produced the digest.
-
-## Sample Owner Prompt
-
-```text
-Use $codex-issue-digest to run the Codex issue digest for labels tui and exec over the previous 24 hours.
-```
-
-```text
-Use $codex-issue-digest to run the Codex issue digest for all areas over the past week.
-```
-
-## Validation
-
-Dry run the collector against recent issues:
-
-```bash
-python3 .codex/skills/codex-issue-digest/scripts/collect_issue_digest.py --labels tui exec --window-hours 24
-```
-
-```bash
-python3 .codex/skills/codex-issue-digest/scripts/collect_issue_digest.py --all-labels --window "past week" --limit-issues 10
-```
-
-Run the focused script tests:
-
-```bash
-pytest .codex/skills/codex-issue-digest/scripts/test_collect_issue_digest.py
-```

.codex/skills/codex-issue-digest/agents/openai.yaml

@@ -1,4 +0,0 @@
-interface:
-  display_name: "Codex Issue Digest"
-  short_description: "Summarize Codex issues by labels or all areas"
-  default_prompt: "Use $codex-issue-digest to run the Codex issue digest for labels tui and exec over the previous 24 hours."

.codex/skills/codex-issue-digest/scripts/collect_issue_digest.py

@@ -1,994 +0,0 @@
-#!/usr/bin/env python3
-"""Collect recent openai/codex issue activity for owner-focused digests."""
-
-import argparse
-import json
-import math
-import re
-import subprocess
-import sys
-from datetime import datetime, timedelta, timezone
-from pathlib import Path
-from urllib.parse import quote
-
-SCRIPT_VERSION = 4
-QUALIFYING_KIND_LABELS = ("bug", "enhancement")
-REACTION_KEYS = ("+1", "-1", "laugh", "hooray", "confused", "heart", "rocket", "eyes")
-BASE_ATTENTION_WINDOW_HOURS = 24.0
-ONE_ATTENTION_INTERACTION_THRESHOLD = 5
-TWO_ATTENTION_INTERACTION_THRESHOLD = 10
-ALL_LABEL_PHRASES = {"all", "all areas", "all labels", "all-areas", "all-labels", "*"}
-
-
-class GhCommandError(RuntimeError):
-    pass
-
-
-def parse_args():
-    parser = argparse.ArgumentParser(
-        description="Collect recent GitHub issue activity for a Codex owner digest."
-    )
-    parser.add_argument(
-        "--repo", default="openai/codex", help="OWNER/REPO, default openai/codex"
-    )
-    parser.add_argument(
-        "--labels",
-        nargs="+",
-        default=[],
-        help="Feature-area labels owned by the digest recipient, for example: tui exec",
-    )
-    parser.add_argument(
-        "--all-labels",
-        action="store_true",
-        help="Collect bug/enhancement issues across all feature-area labels",
-    )
-    parser.add_argument(
-        "--window",
-        help='Lookback duration such as "24h", "7d", "1w", or "past week"',
-    )
-    parser.add_argument(
-        "--window-hours", type=float, default=24.0, help="Lookback window"
-    )
-    parser.add_argument(
-        "--since", help="UTC ISO timestamp override for the window start"
-    )
-    parser.add_argument("--until", help="UTC ISO timestamp override for the window end")
-    parser.add_argument(
-        "--limit-issues",
-        type=int,
-        default=200,
-        help="Maximum candidate issues to hydrate after search",
-    )
-    parser.add_argument(
-        "--body-chars", type=int, default=1200, help="Issue body excerpt length"
-    )
-    parser.add_argument(
-        "--comment-chars", type=int, default=900, help="Comment excerpt length"
-    )
-    parser.add_argument(
-        "--max-comment-pages",
-        type=int,
-        default=3,
-        help=(
-            "Maximum pages of issue comments to hydrate per issue after applying the "
-            "window filter. Use 0 with --fetch-all-comments for no page cap."
-        ),
-    )
-    parser.add_argument(
-        "--fetch-all-comments",
-        action="store_true",
-        help="Hydrate complete issue comment histories instead of only window-updated comments.",
-    )
-    return parser.parse_args()
-
-
-def parse_timestamp(value, arg_name):
-    if value is None:
-        return None
-    normalized = value.strip()
-    if not normalized:
-        return None
-    if normalized.endswith("Z"):
-        normalized = f"{normalized[:-1]}+00:00"
-    try:
-        parsed = datetime.fromisoformat(normalized)
-    except ValueError as err:
-        raise ValueError(f"{arg_name} must be an ISO timestamp") from err
-    if parsed.tzinfo is None:
-        parsed = parsed.replace(tzinfo=timezone.utc)
-    return parsed.astimezone(timezone.utc)
-
-
-def format_timestamp(value):
-    return (
-        value.astimezone(timezone.utc)
-        .replace(microsecond=0)
-        .isoformat()
-        .replace("+00:00", "Z")
-    )
-
-
-def resolve_window(args):
-    until = parse_timestamp(args.until, "--until") or datetime.now(timezone.utc)
-    since = parse_timestamp(args.since, "--since")
-    if since is None:
-        hours = parse_duration_hours(getattr(args, "window", None))
-        if hours is None:
-            hours = getattr(args, "window_hours", 24.0)
-        if hours <= 0:
-            raise ValueError("window duration must be > 0")
-        since = until - timedelta(hours=hours)
-    if since >= until:
-        raise ValueError("--since must be before --until")
-    return since, until
-
-
-def parse_duration_hours(value):
-    if value is None:
-        return None
-    text = value.strip().casefold().replace("_", " ")
-    if not text:
-        return None
-    text = re.sub(r"^(past|last)\s+", "", text)
-    aliases = {
-        "day": 24.0,
-        "24h": 24.0,
-        "week": 168.0,
-        "7d": 168.0,
-    }
-    if text in aliases:
-        return aliases[text]
-    match = re.fullmatch(r"(\d+(?:\.\d+)?)\s*(h|hr|hrs|hour|hours)", text)
-    if match:
-        return float(match.group(1))
-    match = re.fullmatch(r"(\d+(?:\.\d+)?)\s*(d|day|days)", text)
-    if match:
-        return float(match.group(1)) * 24.0
-    match = re.fullmatch(r"(\d+(?:\.\d+)?)\s*(w|week|weeks)", text)
-    if match:
-        return float(match.group(1)) * 168.0
-    raise ValueError(f"Unsupported duration: {value}")
-
-
-def normalize_requested_labels(labels, all_labels=False):
-    out = []
-    seen = set()
-    for raw in labels:
-        for piece in raw.split(","):
-            label = piece.strip()
-            if not label:
-                continue
-            key = label.casefold()
-            if key not in seen:
-                out.append(label)
-                seen.add(key)
-    phrase = " ".join(label.casefold() for label in out)
-    if all_labels or phrase in ALL_LABEL_PHRASES:
-        return [], True
-    if not out:
-        raise ValueError(
-            "At least one feature-area label is required, or use --all-labels"
-        )
-    return out, False
-
-
-def quote_label(label):
-    if re.fullmatch(r"[A-Za-z0-9_.:-]+", label):
-        return f"label:{label}"
-    escaped = label.replace('"', '\\"')
-    return f'label:"{escaped}"'
-
-
-def build_search_queries(
-    repo, owner_labels, since, kind_labels=QUALIFYING_KIND_LABELS, all_labels=False
-):
-    since_date = since.date().isoformat()
-    queries = []
-    if all_labels:
-        for kind_label in kind_labels:
-            queries.append(
-                " ".join(
-                    [
-                        f"repo:{repo}",
-                        "is:issue",
-                        f"updated:>={since_date}",
-                        quote_label(kind_label),
-                    ]
-                )
-            )
-        return queries
-    for owner_label in owner_labels:
-        for kind_label in kind_labels:
-            queries.append(
-                " ".join(
-                    [
-                        f"repo:{repo}",
-                        "is:issue",
-                        f"updated:>={since_date}",
-                        quote_label(owner_label),
-                        quote_label(kind_label),
-                    ]
-                )
-            )
-    return queries
-
-
-def _format_gh_error(cmd, err):
-    stdout = (err.stdout or "").strip()
-    stderr = (err.stderr or "").strip()
-    parts = [f"GitHub CLI command failed: {' '.join(cmd)}"]
-    if stdout:
-        parts.append(f"stdout: {stdout}")
-    if stderr:
-        parts.append(f"stderr: {stderr}")
-    return "\n".join(parts)
-
-
-def gh_json(args):
-    cmd = ["gh", *args]
-    try:
-        proc = subprocess.run(cmd, check=True, capture_output=True, text=True)
-    except FileNotFoundError as err:
-        raise GhCommandError("`gh` command not found") from err
-    except subprocess.CalledProcessError as err:
-        raise GhCommandError(_format_gh_error(cmd, err)) from err
-    raw = proc.stdout.strip()
-    if not raw:
-        return None
-    try:
-        return json.loads(raw)
-    except json.JSONDecodeError as err:
-        raise GhCommandError(
-            f"Failed to parse JSON from gh output for {' '.join(args)}"
-        ) from err
-
-
-def gh_text(args):
-    cmd = ["gh", *args]
-    try:
-        proc = subprocess.run(cmd, check=True, capture_output=True, text=True)
-    except (FileNotFoundError, subprocess.CalledProcessError):
-        return ""
-    return proc.stdout.strip()
-
-
-def git_head():
-    try:
-        proc = subprocess.run(
-            ["git", "rev-parse", "--short=12", "HEAD"],
-            check=True,
-            capture_output=True,
-            text=True,
-        )
-    except (FileNotFoundError, subprocess.CalledProcessError):
-        return None
-    return proc.stdout.strip() or None
-
-
-def skill_relative_path():
-    try:
-        return str(Path(__file__).resolve().relative_to(Path.cwd().resolve()))
-    except ValueError:
-        return str(Path(__file__).resolve())
-
-
-def gh_api_list_paginated(endpoint, per_page=100, max_pages=None, with_metadata=False):
-    items = []
-    page = 1
-    truncated = False
-    while True:
-        sep = "&" if "?" in endpoint else "?"
-        page_endpoint = f"{endpoint}{sep}per_page={per_page}&page={page}"
-        payload = gh_json(["api", page_endpoint])
-        if payload is None:
-            break
-        if not isinstance(payload, list):
-            raise GhCommandError(f"Unexpected paginated payload from gh api {endpoint}")
-        items.extend(payload)
-        if len(payload) < per_page:
-            break
-        if max_pages is not None and page >= max_pages:
-            truncated = True
-            break
-        page += 1
-    if with_metadata:
-        return {
-            "items": items,
-            "truncated": truncated,
-            "pages": page,
-            "max_pages": max_pages,
-        }
-    return items
-
-
-def search_issue_numbers(queries, limit):
-    numbers = {}
-    for query in queries:
-        page = 1
-        seen_for_query = 0
-        while True:
-            payload = gh_json(
-                [
-                    "api",
-                    "search/issues",
-                    "-X",
-                    "GET",
-                    "-f",
-                    f"q={query}",
-                    "-f",
-                    "sort=updated",
-                    "-f",
-                    "order=desc",
-                    "-f",
-                    "per_page=100",
-                    "-f",
-                    f"page={page}",
-                ]
-            )
-            if not isinstance(payload, dict):
-                raise GhCommandError("Unexpected payload from GitHub issue search")
-            items = payload.get("items") or []
-            if not isinstance(items, list):
-                raise GhCommandError("Expected search `items` to be a list")
-            for item in items:
-                if not isinstance(item, dict):
-                    continue
-                number = item.get("number")
-                if isinstance(number, int):
-                    numbers[number] = str(item.get("updated_at") or "")
-                    seen_for_query += 1
-            if len(items) < 100 or seen_for_query >= limit:
-                break
-            page += 1
-    ordered = sorted(
-        numbers, key=lambda number: (numbers[number], number), reverse=True
-    )
-    return ordered[:limit]
-
-
-def fetch_issue(repo, number):
-    payload = gh_json(["api", f"repos/{repo}/issues/{number}"])
-    if not isinstance(payload, dict):
-        raise GhCommandError(f"Unexpected issue payload for #{number}")
-    return payload
-
-
-def fetch_comments(repo, number, since=None, max_pages=None):
-    endpoint = f"repos/{repo}/issues/{number}/comments"
-    if since is not None:
-        endpoint = f"{endpoint}?since={quote(format_timestamp(since), safe='')}"
-    return gh_api_list_paginated(
-        endpoint,
-        max_pages=max_pages,
-        with_metadata=True,
-    )
-
-
-def fetch_reactions_for_item(endpoint, item):
-    if reaction_summary(item)["total"] <= 0:
-        return []
-    return gh_api_list_paginated(endpoint)
-
-
-def fetch_comment_reactions(repo, comments):
-    reactions_by_comment_id = {}
-    for comment in comments:
-        comment_id = comment.get("id")
-        if comment_id in (None, ""):
-            continue
-        endpoint = f"repos/{repo}/issues/comments/{comment_id}/reactions"
-        reactions_by_comment_id[comment_id] = fetch_reactions_for_item(
-            endpoint, comment
-        )
-    return reactions_by_comment_id
-
-
-def extract_login(user_obj):
-    if isinstance(user_obj, dict):
-        return str(user_obj.get("login") or "")
-    return ""
-
-
-def is_bot_login(login):
-    return bool(login) and login.lower().endswith("[bot]")
-
-
-def is_human_user(user_obj):
-    login = extract_login(user_obj)
-    return bool(login) and not is_bot_login(login)
-
-
-def label_names(issue):
-    labels = []
-    for label in issue.get("labels") or []:
-        if isinstance(label, dict) and label.get("name"):
-            labels.append(str(label["name"]))
-    return sorted(labels, key=str.casefold)
-
-
-def matching_labels(labels, requested):
-    labels_by_key = {label.casefold(): label for label in labels}
-    return [label for label in requested if label.casefold() in labels_by_key]
-
-
-def area_labels(labels):
-    kind_keys = {label.casefold() for label in QUALIFYING_KIND_LABELS}
-    return [label for label in labels if label.casefold() not in kind_keys]
-
-
-def attention_thresholds_for_window(window_hours):
-    if window_hours <= 0:
-        raise ValueError("window_hours must be > 0")
-    window_hours = round(window_hours, 6)
-    scale = window_hours / BASE_ATTENTION_WINDOW_HOURS
-    elevated = max(1, math.ceil(ONE_ATTENTION_INTERACTION_THRESHOLD * scale))
-    very_high = max(
-        elevated + 1, math.ceil(TWO_ATTENTION_INTERACTION_THRESHOLD * scale)
-    )
-    return {
-        "base_window_hours": BASE_ATTENTION_WINDOW_HOURS,
-        "window_hours": round(window_hours, 3),
-        "scale": round(scale, 3),
-        "elevated": elevated,
-        "very_high": very_high,
-    }
-
-
-def attention_level_for(user_interactions, attention_thresholds=None):
-    thresholds = attention_thresholds or attention_thresholds_for_window(
-        BASE_ATTENTION_WINDOW_HOURS
-    )
-    if user_interactions >= thresholds["very_high"]:
-        return 2
-    if user_interactions >= thresholds["elevated"]:
-        return 1
-    return 0
-
-
-def attention_marker_for(user_interactions, attention_thresholds=None):
-    return "🔥" * attention_level_for(user_interactions, attention_thresholds)
-
-
-def reaction_summary(item):
-    reactions = item.get("reactions")
-    if not isinstance(reactions, dict):
-        return {"total": 0, "counts": {}}
-    counts = {}
-    for key in REACTION_KEYS:
-        value = reactions.get(key, 0)
-        if isinstance(value, int) and value:
-            counts[key] = value
-    total = reactions.get("total_count")
-    if not isinstance(total, int):
-        total = sum(counts.values())
-    return {"total": total, "counts": counts}
-
-
-def reaction_event_summary(reactions, since, until):
-    counts = {}
-    total = 0
-    for reaction in reactions or []:
-        if not isinstance(reaction, dict):
-            continue
-        if not is_in_window(str(reaction.get("created_at") or ""), since, until):
-            continue
-        if not is_human_user(reaction.get("user")):
-            continue
-        content = str(reaction.get("content") or "")
-        if not content:
-            continue
-        counts[content] = counts.get(content, 0) + 1
-        total += 1
-    return {
-        "total": total,
-        "counts": counts,
-        "upvotes": counts.get("+1", 0),
-    }
-
-
-def compact_text(value, limit):
-    text = re.sub(r"\s+", " ", str(value or "")).strip()
-    if limit <= 0:
-        return ""
-    if len(text) <= limit:
-        return text
-    return f"{text[: max(limit - 1, 0)].rstrip()}..."
-
-
-def clean_title_for_description(title):
-    cleaned = re.sub(r"\s+", " ", str(title or "")).strip()
-    cleaned = re.sub(
-        r"^(codex(?: desktop| app|\.app| cli)?|desktop|windows codex app)\s*[:,-]\s*",
-        "",
-        cleaned,
-        flags=re.IGNORECASE,
-    )
-    cleaned = re.sub(r"^on windows,\s*", "Windows: ", cleaned, flags=re.IGNORECASE)
-    cleaned = cleaned.strip(" -:;")
-    return compact_text(cleaned, 80) or "Issue needs owner review"
-
-
-def issue_description(issue):
-    return clean_title_for_description(issue.get("title"))
-
-
-def is_in_window(timestamp, since, until):
-    parsed = parse_timestamp(timestamp, "timestamp")
-    if parsed is None:
-        return False
-    return since <= parsed < until
-
-
-def summarize_comment(
-    comment, comment_chars, reaction_events=None, since=None, until=None
-):
-    reactions = reaction_summary(comment)
-    new_reactions = (
-        reaction_event_summary(reaction_events, since, until)
-        if since is not None and until is not None
-        else {"total": 0, "counts": {}, "upvotes": 0}
-    )
-    human_user_interaction = is_human_user(comment.get("user"))
-    return {
-        "id": comment.get("id"),
-        "author": extract_login(comment.get("user")),
-        "author_association": str(comment.get("author_association") or ""),
-        "created_at": str(comment.get("created_at") or ""),
-        "updated_at": str(comment.get("updated_at") or ""),
-        "url": str(comment.get("html_url") or ""),
-        "human_user_interaction": human_user_interaction,
-        "reactions": reactions["counts"],
-        "reaction_total": reactions["total"],
-        "new_reactions": new_reactions["total"],
-        "new_upvotes": new_reactions["upvotes"],
-        "new_reaction_counts": new_reactions["counts"],
-        "body_excerpt": compact_text(comment.get("body"), comment_chars),
-    }
-
-
-def summarize_issue(
-    issue,
-    comments,
-    requested_labels,
-    since,
-    until,
-    body_chars,
-    comment_chars,
-    issue_reaction_events=None,
-    comment_reactions_by_id=None,
-    all_labels=False,
-    comments_hydration=None,
-    attention_thresholds=None,
-):
-    labels = label_names(issue)
-    labels_by_key = {label.casefold() for label in labels}
-    kind_labels = [
-        label for label in QUALIFYING_KIND_LABELS if label.casefold() in labels_by_key
-    ]
-    if all_labels:
-        owner_labels = area_labels(labels) or ["unlabeled"]
-    else:
-        owner_labels = matching_labels(labels, requested_labels)
-    if not kind_labels or not owner_labels:
-        return None
-
-    updated_at = str(issue.get("updated_at") or "")
-    if not is_in_window(updated_at, since, until):
-        return None
-
-    new_issue = is_in_window(str(issue.get("created_at") or ""), since, until)
-    comment_reactions_by_id = comment_reactions_by_id or {}
-    new_comments = [
-        summarize_comment(
-            comment,
-            comment_chars,
-            reaction_events=comment_reactions_by_id.get(comment.get("id")),
-            since=since,
-            until=until,
-        )
-        for comment in comments
-        if is_in_window(str(comment.get("created_at") or ""), since, until)
-    ]
-    new_comments.sort(key=lambda item: (item["created_at"], str(item["id"])))
-
-    issue_reactions = reaction_summary(issue)
-    issue_reaction_events_summary = reaction_event_summary(
-        issue_reaction_events, since, until
-    )
-    comment_reaction_events_summary = reaction_event_summary(
-        [
-            reaction
-            for reactions in comment_reactions_by_id.values()
-            for reaction in reactions
-        ],
-        since,
-        until,
-    )
-    new_reactions = (
-        issue_reaction_events_summary["total"]
-        + comment_reaction_events_summary["total"]
-    )
-    new_upvotes = (
-        issue_reaction_events_summary["upvotes"]
-        + comment_reaction_events_summary["upvotes"]
-    )
-    all_comment_reaction_total = sum(
-        reaction_summary(comment)["total"] for comment in comments
-    )
-    new_comment_reaction_total = sum(
-        comment["reaction_total"] for comment in new_comments
-    )
-    new_issue_user_interaction = new_issue and is_human_user(issue.get("user"))
-    new_comment_user_interactions = sum(
-        1 for comment in new_comments if comment["human_user_interaction"]
-    )
-    user_interactions = (
-        int(new_issue_user_interaction) + new_comment_user_interactions + new_reactions
-    )
-    attention_level = attention_level_for(user_interactions, attention_thresholds)
-    attention_marker = attention_marker_for(user_interactions, attention_thresholds)
-    updated_without_visible_new_post = (
-        not new_issue and not new_comments and new_reactions == 0
-    )
-
-    engagement_score = (
-        len(new_comments) * 3
-        + new_reactions
-        + issue_reactions["total"]
-        + new_comment_reaction_total
-        + min(int(issue.get("comments") or len(comments) or 0), 10)
-    )
-
-    return {
-        "number": issue.get("number"),
-        "title": str(issue.get("title") or ""),
-        "description": issue_description(issue),
-        "url": str(issue.get("html_url") or ""),
-        "state": str(issue.get("state") or ""),
-        "author": extract_login(issue.get("user")),
-        "author_association": str(issue.get("author_association") or ""),
-        "created_at": str(issue.get("created_at") or ""),
-        "updated_at": updated_at,
-        "labels": labels,
-        "kind_labels": kind_labels,
-        "owner_labels": owner_labels,
-        "comments_total": int(issue.get("comments") or len(comments) or 0),
-        "comments_hydration": comments_hydration
-        or {
-            "fetched": len(comments),
-            "since": None,
-            "truncated": False,
-            "max_pages": None,
-        },
-        "issue_reactions": issue_reactions["counts"],
-        "issue_reaction_total": issue_reactions["total"],
-        "comment_reaction_total": all_comment_reaction_total,
-        "new_comment_reaction_total": new_comment_reaction_total,
-        "new_issue_reactions": issue_reaction_events_summary["total"],
-        "new_issue_upvotes": issue_reaction_events_summary["upvotes"],
-        "new_comment_reactions": comment_reaction_events_summary["total"],
-        "new_comment_upvotes": comment_reaction_events_summary["upvotes"],
-        "new_reactions": new_reactions,
-        "new_upvotes": new_upvotes,
-        "user_interactions": user_interactions,
-        "attention": attention_level > 0,
-        "attention_level": attention_level,
-        "attention_marker": attention_marker,
-        "engagement_score": engagement_score,
-        "activity": {
-            "new_issue": new_issue,
-            "new_comments": len(new_comments),
-            "new_human_comments": new_comment_user_interactions,
-            "new_reactions": new_reactions,
-            "new_upvotes": new_upvotes,
-            "updated_without_visible_new_post": updated_without_visible_new_post,
-        },
-        "body_excerpt": compact_text(issue.get("body"), body_chars),
-        "new_comments": new_comments,
-    }
-
-
-def count_by_label(issues, labels):
-    out = {}
-    for label in labels:
-        matching = [issue for issue in issues if label in issue["owner_labels"]]
-        out[label] = {
-            "issues": len(matching),
-            "new_issues": sum(
-                1 for issue in matching if issue["activity"]["new_issue"]
-            ),
-            "new_comments": sum(
-                issue["activity"]["new_comments"] for issue in matching
-            ),
-        }
-    return out
-
-
-def count_by_kind(issues):
-    out = {}
-    for kind in QUALIFYING_KIND_LABELS:
-        matching = [issue for issue in issues if kind in issue["kind_labels"]]
-        out[kind] = {
-            "issues": len(matching),
-            "new_issues": sum(
-                1 for issue in matching if issue["activity"]["new_issue"]
-            ),
-            "new_comments": sum(
-                issue["activity"]["new_comments"] for issue in matching
-            ),
-        }
-    return out
-
-
-def hot_items(issues, limit=8):
-    ranked = sorted(
-        issues,
-        key=lambda issue: (
-            issue["attention"],
-            issue["attention_level"],
-            issue["user_interactions"],
-            issue["engagement_score"],
-            issue["activity"]["new_comments"],
-            issue["issue_reaction_total"] + issue["comment_reaction_total"],
-            issue["updated_at"],
-        ),
-        reverse=True,
-    )
-    return [
-        {
-            "number": issue["number"],
-            "title": issue["title"],
-            "url": issue["url"],
-            "owner_labels": issue["owner_labels"],
-            "kind_labels": issue["kind_labels"],
-            "attention": issue["attention"],
-            "attention_level": issue["attention_level"],
-            "attention_marker": issue["attention_marker"],
-            "user_interactions": issue["user_interactions"],
-            "new_reactions": issue["new_reactions"],
-            "new_upvotes": issue["new_upvotes"],
-            "engagement_score": issue["engagement_score"],
-            "new_comments": issue["activity"]["new_comments"],
-            "reaction_total": issue["issue_reaction_total"]
-            + issue["comment_reaction_total"],
-        }
-        for issue in ranked[:limit]
-        if issue["engagement_score"] > 0
-    ]
-
-
-def ranked_digest_issues(issues):
-    return sorted(
-        issues,
-        key=lambda issue: (
-            issue["attention"],
-            issue["attention_level"],
-            issue["user_interactions"],
-            issue["engagement_score"],
-            issue["activity"]["new_comments"],
-            issue["updated_at"],
-        ),
-        reverse=True,
-    )
-
-
-def digest_rows(issues, limit=10, ref_map=None):
-    ranked = ranked_digest_issues(issues)
-    if ref_map is None:
-        ref_map = {issue["number"]: ref for ref, issue in enumerate(ranked, start=1)}
-    rows = []
-    for issue in ranked[:limit]:
-        ref = ref_map[issue["number"]]
-        reaction_total = issue["issue_reaction_total"] + issue["comment_reaction_total"]
-        rows.append(
-            {
-                "ref": ref,
-                "ref_markdown": f"[{ref}]({issue['url']})",
-                "marker": issue["attention_marker"],
-                "attention_marker": issue["attention_marker"],
-                "number": issue["number"],
-                "description": issue["description"],
-                "title": issue["title"],
-                "url": issue["url"],
-                "area": ", ".join(issue["owner_labels"]),
-                "kind": ", ".join(issue["kind_labels"]),
-                "state": issue["state"],
-                "interactions": issue["user_interactions"],
-                "user_interactions": issue["user_interactions"],
-                "new_reactions": issue["new_reactions"],
-                "new_upvotes": issue["new_upvotes"],
-                "current_reactions": reaction_total,
-            }
-        )
-    return rows
-
-
-def issue_ref_markdown(issue, ref_map):
-    ref = ref_map[issue["number"]]
-    return f"[{ref}]({issue['url']})"
-
-
-def summary_inputs(issues, limit=80, ref_map=None):
-    ranked = ranked_digest_issues(issues)
-    if ref_map is None:
-        ref_map = {issue["number"]: ref for ref, issue in enumerate(ranked, start=1)}
-    rows = []
-    for issue in ranked[:limit]:
-        rows.append(
-            {
-                "ref": ref_map[issue["number"]],
-                "ref_markdown": issue_ref_markdown(issue, ref_map),
-                "number": issue["number"],
-                "title": issue["title"],
-                "description": issue["description"],
-                "url": issue["url"],
-                "labels": issue["labels"],
-                "owner_labels": issue["owner_labels"],
-                "kind_labels": issue["kind_labels"],
-                "state": issue.get("state", ""),
-                "attention_marker": issue.get("attention_marker", ""),
-                "interactions": issue["user_interactions"],
-                "new_comments": issue["activity"].get("new_comments", 0),
-                "new_reactions": issue.get("new_reactions", 0),
-                "new_upvotes": issue.get("new_upvotes", 0),
-                "current_reactions": issue.get("issue_reaction_total", 0)
-                + issue.get("comment_reaction_total", 0),
-            }
-        )
-    return rows
-
-
-def collect_digest(args):
-    since, until = resolve_window(args)
-    window_hours = (until - since).total_seconds() / 3600
-    attention_thresholds = attention_thresholds_for_window(window_hours)
-    requested_labels, all_labels = normalize_requested_labels(
-        args.labels, all_labels=args.all_labels
-    )
-    queries = build_search_queries(
-        args.repo, requested_labels, since, all_labels=all_labels
-    )
-    numbers = search_issue_numbers(queries, args.limit_issues)
-    gh_version_output = gh_text(["--version"])
-
-    issues = []
-    max_comment_pages = None if args.max_comment_pages <= 0 else args.max_comment_pages
-    for number in numbers:
-        issue = fetch_issue(args.repo, number)
-        comments_since = None if args.fetch_all_comments else since
-        comments_payload = fetch_comments(
-            args.repo,
-            number,
-            since=comments_since,
-            max_pages=max_comment_pages,
-        )
-        comments = comments_payload["items"]
-        issue_reaction_events = fetch_reactions_for_item(
-            f"repos/{args.repo}/issues/{number}/reactions", issue
-        )
-        comment_reactions_by_id = fetch_comment_reactions(args.repo, comments)
-        comments_hydration = {
-            "fetched": len(comments),
-            "total": int(issue.get("comments") or len(comments) or 0),
-            "since": format_timestamp(comments_since) if comments_since else None,
-            "truncated": comments_payload["truncated"],
-            "max_pages": comments_payload["max_pages"],
-            "fetch_all_comments": args.fetch_all_comments,
-        }
-        summary = summarize_issue(
-            issue,
-            comments,
-            requested_labels,
-            since,
-            until,
-            args.body_chars,
-            args.comment_chars,
-            issue_reaction_events=issue_reaction_events,
-            comment_reactions_by_id=comment_reactions_by_id,
-            all_labels=all_labels,
-            comments_hydration=comments_hydration,
-            attention_thresholds=attention_thresholds,
-        )
-        if summary is not None:
-            issues.append(summary)
-
-    issues.sort(
-        key=lambda issue: (issue["updated_at"], int(issue["number"] or 0)), reverse=True
-    )
-    totals = {
-        "candidate_issues": len(numbers),
-        "included_issues": len(issues),
-        "new_issues": sum(1 for issue in issues if issue["activity"]["new_issue"]),
-        "issues_with_new_comments": sum(
-            1 for issue in issues if issue["activity"]["new_comments"] > 0
-        ),
-        "new_comments": sum(issue["activity"]["new_comments"] for issue in issues),
-        "comments_fetched": sum(
-            issue["comments_hydration"]["fetched"] for issue in issues
-        ),
-        "issues_with_truncated_comment_hydration": sum(
-            1 for issue in issues if issue["comments_hydration"]["truncated"]
-        ),
-        "updated_without_visible_new_post": sum(
-            1
-            for issue in issues
-            if issue["activity"]["updated_without_visible_new_post"]
-        ),
-        "issue_reactions_current_total": sum(
-            issue["issue_reaction_total"] for issue in issues
-        ),
-        "comment_reactions_current_total": sum(
-            issue["comment_reaction_total"] for issue in issues
-        ),
-        "new_reactions": sum(issue["new_reactions"] for issue in issues),
-        "new_upvotes": sum(issue["new_upvotes"] for issue in issues),
-        "user_interactions": sum(issue["user_interactions"] for issue in issues),
-    }
-    ranked = ranked_digest_issues(issues)
-    ref_map = {issue["number"]: ref for ref, issue in enumerate(ranked, start=1)}
-    filter_label = "all" if all_labels else requested_labels
-
-    return {
-        "generated_at": format_timestamp(datetime.now(timezone.utc)),
-        "source": {
-            "repo": args.repo,
-            "skill": "codex-issue-digest",
-            "collector": skill_relative_path(),
-            "script_version": SCRIPT_VERSION,
-            "git_head": git_head(),
-            "gh_version": gh_version_output.splitlines()[0]
-            if gh_version_output
-            else None,
-        },
-        "window": {
-            "since": format_timestamp(since),
-            "until": format_timestamp(until),
-            "hours": round(window_hours, 3),
-        },
-        "attention_thresholds": attention_thresholds,
-        "filters": {
-            "owner_labels": filter_label,
-            "all_labels": all_labels,
-            "kind_labels": list(QUALIFYING_KIND_LABELS),
-        },
-        "collection_notes": [
-            "Issues are selected when they currently have bug or enhancement plus at least one requested owner label and were updated during the window.",
-            "By default, issue comments are fetched with since=window_start and a max page cap to avoid long historical threads; use --fetch-all-comments when exhaustive comment history is needed.",
-            "New issue comments are filtered by comment creation time within the window from the fetched comment set.",
-            "Reaction events are counted by GitHub reaction created_at timestamps for hydrated issues and fetched comments.",
-            "Current reaction totals are standing engagement signals; new_reactions and new_upvotes are windowed activity.",
-            "The collector does not assign semantic clusters; use summary_inputs as model-ready evidence for report-time clustering.",
-            "Pure reaction-only issues may be missed if GitHub issue search does not surface them via updated_at.",
-            "Issues updated during the window without a new issue body or new comment are retained because label/status edits can still be useful owner signals.",
-        ],
-        "totals": totals,
-        "by_owner_label": count_by_label(
-            issues,
-            sorted(
-                {area for issue in issues for area in issue["owner_labels"]},
-                key=str.casefold,
-            )
-            if all_labels
-            else requested_labels,
-        ),
-        "by_kind_label": count_by_kind(issues),
-        "hot_items": hot_items(issues),
-        "summary_inputs": summary_inputs(issues, ref_map=ref_map),
-        "digest_rows": digest_rows(issues, ref_map=ref_map),
-        "issues": issues,
-    }
-
-
-def main():
-    args = parse_args()
-    try:
-        digest = collect_digest(args)
-    except (GhCommandError, RuntimeError, ValueError) as err:
-        sys.stderr.write(f"collect_issue_digest.py error: {err}\n")
-        return 1
-    sys.stdout.write(json.dumps(digest, indent=2, sort_keys=True) + "\n")
-    return 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

.codex/skills/codex-issue-digest/scripts/test_collect_issue_digest.py

@@ -1,685 +0,0 @@
-import importlib.util
-from datetime import timezone
-from pathlib import Path
-
-
-MODULE_PATH = Path(__file__).with_name("collect_issue_digest.py")
-MODULE_SPEC = importlib.util.spec_from_file_location(
-    "collect_issue_digest", MODULE_PATH
-)
-collect_issue_digest = importlib.util.module_from_spec(MODULE_SPEC)
-assert MODULE_SPEC.loader is not None
-MODULE_SPEC.loader.exec_module(collect_issue_digest)
-
-
-def test_build_search_queries_uses_each_owner_and_kind_label():
-    since = collect_issue_digest.parse_timestamp("2026-04-25T12:34:56Z", "--since")
-
-    queries = collect_issue_digest.build_search_queries(
-        "openai/codex", ["tui", "exec"], since
-    )
-
-    assert queries == [
-        "repo:openai/codex is:issue updated:>=2026-04-25 label:tui label:bug",
-        "repo:openai/codex is:issue updated:>=2026-04-25 label:tui label:enhancement",
-        "repo:openai/codex is:issue updated:>=2026-04-25 label:exec label:bug",
-        "repo:openai/codex is:issue updated:>=2026-04-25 label:exec label:enhancement",
-    ]
-
-
-def test_build_search_queries_can_scan_all_labels():
-    since = collect_issue_digest.parse_timestamp("2026-04-25T12:34:56Z", "--since")
-
-    queries = collect_issue_digest.build_search_queries(
-        "openai/codex", [], since, all_labels=True
-    )
-
-    assert queries == [
-        "repo:openai/codex is:issue updated:>=2026-04-25 label:bug",
-        "repo:openai/codex is:issue updated:>=2026-04-25 label:enhancement",
-    ]
-
-
-def test_normalize_requested_labels_accepts_all_area_phrases():
-    assert collect_issue_digest.normalize_requested_labels(["all", "areas"]) == (
-        [],
-        True,
-    )
-    assert collect_issue_digest.normalize_requested_labels(["all-labels"]) == (
-        [],
-        True,
-    )
-
-
-def test_search_issue_numbers_requests_updated_sort(monkeypatch):
-    calls = []
-
-    def fake_gh_json(args):
-        calls.append(args)
-        return {
-            "items": [
-                {"number": 1, "updated_at": "2026-04-25T00:00:00Z"},
-            ]
-        }
-
-    monkeypatch.setattr(collect_issue_digest, "gh_json", fake_gh_json)
-
-    assert collect_issue_digest.search_issue_numbers(["query"], limit=10) == [1]
-    assert "-f" in calls[0]
-    assert "sort=updated" in calls[0]
-    assert "order=desc" in calls[0]
-
-
-def test_search_issue_numbers_applies_limit_per_query(monkeypatch):
-    calls = []
-
-    def fake_gh_json(args):
-        calls.append(args)
-        query = next(
-            value.removeprefix("q=") for value in args if value.startswith("q=")
-        )
-        page = int(
-            next(
-                value.removeprefix("page=")
-                for value in args
-                if value.startswith("page=")
-            )
-        )
-        base = 10_000 if query == "first" else 20_000
-        offset = (page - 1) * 100
-        return {
-            "items": [
-                {
-                    "number": base + offset + idx,
-                    "updated_at": f"2026-04-25T00:{idx:02d}:00Z",
-                }
-                for idx in range(100)
-            ]
-        }
-
-    monkeypatch.setattr(collect_issue_digest, "gh_json", fake_gh_json)
-
-    collect_issue_digest.search_issue_numbers(["first", "second"], limit=150)
-
-    queried_pages = [
-        (
-            next(
-                value.removeprefix("q=") for value in args if value.startswith("q=")
-            ),
-            next(
-                value.removeprefix("page=")
-                for value in args
-                if value.startswith("page=")
-            ),
-        )
-        for args in calls
-    ]
-    assert queried_pages == [
-        ("first", "1"),
-        ("first", "2"),
-        ("second", "1"),
-        ("second", "2"),
-    ]
-
-
-def test_summarize_issue_keeps_new_comments_and_reaction_signals():
-    since = collect_issue_digest.parse_timestamp("2026-04-25T00:00:00Z", "--since")
-    until = collect_issue_digest.parse_timestamp("2026-04-26T00:00:00Z", "--until")
-    issue = {
-        "number": 123,
-        "title": "TUI does not redraw",
-        "html_url": "https://github.com/openai/codex/issues/123",
-        "state": "open",
-        "created_at": "2026-04-24T20:00:00Z",
-        "updated_at": "2026-04-25T10:00:00Z",
-        "user": {"login": "alice"},
-        "author_association": "NONE",
-        "comments": 2,
-        "body": "The terminal freezes after resize.",
-        "labels": [{"name": "bug"}, {"name": "tui"}],
-        "reactions": {"total_count": 3, "+1": 2, "rocket": 1},
-    }
-    comments = [
-        {
-            "id": 1,
-            "created_at": "2026-04-25T11:00:00Z",
-            "updated_at": "2026-04-25T11:00:00Z",
-            "html_url": "https://github.com/openai/codex/issues/123#issuecomment-1",
-            "user": {"login": "bob"},
-            "author_association": "MEMBER",
-            "body": "I can reproduce this on main.",
-            "reactions": {"total_count": 4, "heart": 1, "+1": 3},
-        },
-        {
-            "id": 2,
-            "created_at": "2026-04-24T11:00:00Z",
-            "updated_at": "2026-04-24T11:00:00Z",
-            "html_url": "https://github.com/openai/codex/issues/123#issuecomment-2",
-            "user": {"login": "carol"},
-            "author_association": "NONE",
-            "body": "Older comment.",
-            "reactions": {"total_count": 1, "eyes": 1},
-        },
-    ]
-
-    summary = collect_issue_digest.summarize_issue(
-        issue,
-        comments,
-        ["tui", "exec"],
-        since,
-        until,
-        body_chars=200,
-        comment_chars=200,
-    )
-
-    assert summary == {
-        "number": 123,
-        "title": "TUI does not redraw",
-        "description": "TUI does not redraw",
-        "url": "https://github.com/openai/codex/issues/123",
-        "state": "open",
-        "author": "alice",
-        "author_association": "NONE",
-        "created_at": "2026-04-24T20:00:00Z",
-        "updated_at": "2026-04-25T10:00:00Z",
-        "labels": ["bug", "tui"],
-        "kind_labels": ["bug"],
-        "owner_labels": ["tui"],
-        "comments_total": 2,
-        "comments_hydration": {
-            "fetched": 2,
-            "since": None,
-            "truncated": False,
-            "max_pages": None,
-        },
-        "issue_reactions": {"+1": 2, "rocket": 1},
-        "issue_reaction_total": 3,
-        "comment_reaction_total": 5,
-        "new_comment_reaction_total": 4,
-        "new_issue_reactions": 0,
-        "new_issue_upvotes": 0,
-        "new_comment_reactions": 0,
-        "new_comment_upvotes": 0,
-        "new_reactions": 0,
-        "new_upvotes": 0,
-        "user_interactions": 1,
-        "attention": False,
-        "attention_level": 0,
-        "attention_marker": "",
-        "engagement_score": 12,
-        "activity": {
-            "new_issue": False,
-            "new_comments": 1,
-            "new_human_comments": 1,
-            "new_reactions": 0,
-            "new_upvotes": 0,
-            "updated_without_visible_new_post": False,
-        },
-        "body_excerpt": "The terminal freezes after resize.",
-        "new_comments": [
-            {
-                "id": 1,
-                "author": "bob",
-                "author_association": "MEMBER",
-                "created_at": "2026-04-25T11:00:00Z",
-                "updated_at": "2026-04-25T11:00:00Z",
-                "url": "https://github.com/openai/codex/issues/123#issuecomment-1",
-                "human_user_interaction": True,
-                "reactions": {"+1": 3, "heart": 1},
-                "reaction_total": 4,
-                "new_reactions": 0,
-                "new_upvotes": 0,
-                "new_reaction_counts": {},
-                "body_excerpt": "I can reproduce this on main.",
-            }
-        ],
-    }
-
-
-def test_summarize_issue_filters_non_owner_or_non_kind_labels():
-    since = collect_issue_digest.parse_timestamp("2026-04-25T00:00:00Z", "--since")
-    until = collect_issue_digest.parse_timestamp("2026-04-26T00:00:00Z", "--until")
-    base_issue = {
-        "number": 1,
-        "title": "Question",
-        "created_at": "2026-04-25T01:00:00Z",
-        "updated_at": "2026-04-25T01:00:00Z",
-        "labels": [{"name": "question"}, {"name": "tui"}],
-    }
-
-    assert (
-        collect_issue_digest.summarize_issue(
-            base_issue,
-            [],
-            ["tui"],
-            since,
-            until,
-            body_chars=100,
-            comment_chars=100,
-        )
-        is None
-    )
-
-    issue_without_owner = dict(base_issue)
-    issue_without_owner["labels"] = [{"name": "bug"}, {"name": "app"}]
-
-    assert (
-        collect_issue_digest.summarize_issue(
-            issue_without_owner,
-            [],
-            ["tui"],
-            since,
-            until,
-            body_chars=100,
-            comment_chars=100,
-        )
-        is None
-    )
-
-
-def test_resolve_window_defaults_to_previous_hours():
-    class Args:
-        since = None
-        until = "2026-04-26T12:00:00Z"
-        window_hours = 24
-
-    since, until = collect_issue_digest.resolve_window(Args())
-
-    assert since.isoformat() == "2026-04-25T12:00:00+00:00"
-    assert until.tzinfo == timezone.utc
-
-
-def test_parse_duration_hours_accepts_common_phrases():
-    assert collect_issue_digest.parse_duration_hours("past week") == 168
-    assert collect_issue_digest.parse_duration_hours("48h") == 48
-    assert collect_issue_digest.parse_duration_hours("2 days") == 48
-    assert collect_issue_digest.parse_duration_hours("1w") == 168
-
-
-def test_attention_thresholds_scale_by_window_length():
-    one_day = collect_issue_digest.attention_thresholds_for_window(24)
-    assert one_day["elevated"] == 5
-    assert one_day["very_high"] == 10
-
-    half_day = collect_issue_digest.attention_thresholds_for_window(12)
-    assert half_day["elevated"] == 3
-    assert half_day["very_high"] == 5
-
-    week = collect_issue_digest.attention_thresholds_for_window(168)
-    assert week["elevated"] == 35
-    assert week["very_high"] == 70
-    assert collect_issue_digest.attention_marker_for(34, week) == ""
-    assert collect_issue_digest.attention_marker_for(35, week) == "🔥"
-    assert collect_issue_digest.attention_marker_for(70, week) == "🔥🔥"
-
-
-def test_fetch_comments_uses_since_filter_and_page_cap(monkeypatch):
-    calls = []
-
-    def fake_gh_json(args):
-        calls.append(args)
-        return [{"id": idx} for idx in range(100)]
-
-    monkeypatch.setattr(collect_issue_digest, "gh_json", fake_gh_json)
-    since = collect_issue_digest.parse_timestamp("2026-04-25T00:00:00Z", "--since")
-
-    payload = collect_issue_digest.fetch_comments(
-        "openai/codex", 123, since=since, max_pages=1
-    )
-
-    assert len(payload["items"]) == 100
-    assert payload["truncated"] is True
-    assert payload["max_pages"] == 1
-    assert calls == [
-        [
-            "api",
-            "repos/openai/codex/issues/123/comments?since=2026-04-25T00%3A00%3A00Z&per_page=100&page=1",
-        ]
-    ]
-
-
-def test_issue_description_prefers_title_over_body_noise():
-    issue = {
-        "title": "Codex.app GUI: MCP child processes not reaped after task completion",
-        "body": "A later crash mention should not override the title-level symptom.",
-        "labels": [{"name": "app"}, {"name": "bug"}],
-    }
-
-    description = collect_issue_digest.issue_description(issue)
-    assert "MCP child processes" in description
-    assert "crash" not in description.casefold()
-
-
-def test_attention_markers_count_human_user_interactions():
-    since = collect_issue_digest.parse_timestamp("2026-04-25T00:00:00Z", "--since")
-    until = collect_issue_digest.parse_timestamp("2026-04-26T00:00:00Z", "--until")
-    issue = {
-        "number": 456,
-        "title": "Agent context is exploding",
-        "html_url": "https://github.com/openai/codex/issues/456",
-        "state": "open",
-        "created_at": "2026-04-25T01:00:00Z",
-        "updated_at": "2026-04-25T12:00:00Z",
-        "user": {"login": "alice"},
-        "labels": [{"name": "bug"}, {"name": "agent"}],
-    }
-    comments = [
-        {
-            "id": idx,
-            "created_at": "2026-04-25T02:00:00Z",
-            "updated_at": "2026-04-25T02:00:00Z",
-            "user": {"login": f"user-{idx}"},
-            "body": "same here",
-        }
-        for idx in range(4)
-    ]
-    comments.append(
-        {
-            "id": 99,
-            "created_at": "2026-04-25T02:00:00Z",
-            "updated_at": "2026-04-25T02:00:00Z",
-            "user": {"login": "github-actions[bot]"},
-            "body": "duplicate bot note",
-        }
-    )
-
-    summary = collect_issue_digest.summarize_issue(
-        issue,
-        comments,
-        ["agent"],
-        since,
-        until,
-        body_chars=100,
-        comment_chars=100,
-    )
-
-    assert summary["user_interactions"] == 5
-    assert summary["activity"]["new_human_comments"] == 4
-    assert summary["attention"] is True
-    assert summary["attention_level"] == 1
-    assert summary["attention_marker"] == "🔥"
-
-    issue["created_at"] = "2026-04-24T01:00:00Z"
-    comments.extend(
-        {
-            "id": idx,
-            "created_at": "2026-04-25T03:00:00Z",
-            "updated_at": "2026-04-25T03:00:00Z",
-            "user": {"login": f"extra-user-{idx}"},
-            "body": "also seeing this",
-        }
-        for idx in range(100, 106)
-    )
-
-    summary = collect_issue_digest.summarize_issue(
-        issue,
-        comments,
-        ["agent"],
-        since,
-        until,
-        body_chars=100,
-        comment_chars=100,
-    )
-
-    assert summary["user_interactions"] == 10
-    assert summary["attention_level"] == 2
-    assert summary["attention_marker"] == "🔥🔥"
-
-
-def test_reactions_count_toward_attention_markers():
-    since = collect_issue_digest.parse_timestamp("2026-04-25T00:00:00Z", "--since")
-    until = collect_issue_digest.parse_timestamp("2026-04-26T00:00:00Z", "--until")
-    issue = {
-        "number": 789,
-        "title": "Support 1M token context",
-        "html_url": "https://github.com/openai/codex/issues/789",
-        "state": "open",
-        "created_at": "2026-04-24T01:00:00Z",
-        "updated_at": "2026-04-25T12:00:00Z",
-        "user": {"login": "alice"},
-        "labels": [{"name": "enhancement"}, {"name": "context"}],
-        "reactions": {"total_count": 20, "+1": 20},
-    }
-    comments = [
-        {
-            "id": 1,
-            "created_at": "2026-04-25T02:00:00Z",
-            "updated_at": "2026-04-25T02:00:00Z",
-            "user": {"login": "commenter"},
-            "body": "please",
-            "reactions": {"total_count": 2, "+1": 2},
-        }
-    ]
-    issue_reactions = [
-        {
-            "content": "+1",
-            "created_at": "2026-04-25T03:00:00Z",
-            "user": {"login": f"reactor-{idx}"},
-        }
-        for idx in range(18)
-    ]
-    comment_reactions_by_id = {
-        1: [
-            {
-                "content": "heart",
-                "created_at": "2026-04-25T04:00:00Z",
-                "user": {"login": "human-reactor"},
-            },
-            {
-                "content": "+1",
-                "created_at": "2026-04-25T04:00:00Z",
-                "user": {"login": "github-actions[bot]"},
-            },
-        ]
-    }
-
-    summary = collect_issue_digest.summarize_issue(
-        issue,
-        comments,
-        ["context"],
-        since,
-        until,
-        body_chars=100,
-        comment_chars=100,
-        issue_reaction_events=issue_reactions,
-        comment_reactions_by_id=comment_reactions_by_id,
-    )
-
-    assert summary["new_reactions"] == 19
-    assert summary["new_upvotes"] == 18
-    assert summary["user_interactions"] == 20
-    assert summary["attention_level"] == 2
-    assert summary["attention_marker"] == "🔥🔥"
-    assert summary["new_comments"][0]["new_reactions"] == 1
-    assert summary["new_comments"][0]["new_upvotes"] == 0
-
-
-def test_digest_rows_are_table_ready_with_concise_descriptions():
-    rows = collect_issue_digest.digest_rows(
-        [
-            {
-                "number": 1,
-                "title": "Quiet bug",
-                "description": "Quiet bug",
-                "url": "https://github.com/openai/codex/issues/1",
-                "owner_labels": ["context"],
-                "kind_labels": ["bug"],
-                "state": "open",
-                "attention": False,
-                "attention_level": 0,
-                "attention_marker": "",
-                "user_interactions": 1,
-                "new_reactions": 0,
-                "new_upvotes": 0,
-                "engagement_score": 3,
-                "issue_reaction_total": 0,
-                "comment_reaction_total": 0,
-                "updated_at": "2026-04-25T01:00:00Z",
-                "activity": {
-                    "new_issue": True,
-                    "new_comments": 0,
-                    "new_reactions": 0,
-                    "updated_without_visible_new_post": False,
-                },
-            },
-            {
-                "number": 2,
-                "title": "Busy bug",
-                "description": "High-volume bug report",
-                "url": "https://github.com/openai/codex/issues/2",
-                "owner_labels": ["agent"],
-                "kind_labels": ["bug"],
-                "state": "open",
-                "attention": True,
-                "attention_level": 1,
-                "attention_marker": "🔥",
-                "user_interactions": 17,
-                "new_reactions": 3,
-                "new_upvotes": 2,
-                "engagement_score": 20,
-                "issue_reaction_total": 5,
-                "comment_reaction_total": 2,
-                "updated_at": "2026-04-25T02:00:00Z",
-                "activity": {
-                    "new_issue": False,
-                    "new_comments": 16,
-                    "new_reactions": 3,
-                    "updated_without_visible_new_post": False,
-                },
-            },
-        ]
-    )
-
-    assert rows[0] == {
-        "ref": 1,
-        "ref_markdown": "[1](https://github.com/openai/codex/issues/2)",
-        "marker": "🔥",
-        "attention_marker": "🔥",
-        "number": 2,
-        "description": "High-volume bug report",
-        "title": "Busy bug",
-        "url": "https://github.com/openai/codex/issues/2",
-        "area": "agent",
-        "kind": "bug",
-        "state": "open",
-        "interactions": 17,
-        "user_interactions": 17,
-        "new_reactions": 3,
-        "new_upvotes": 2,
-        "current_reactions": 7,
-    }
-
-
-def test_summary_inputs_are_model_ready_without_preclustering():
-    issues = [
-        {
-            "number": 20,
-            "title": "Windows app Browser Use external navigation fails",
-            "description": "Browser Use navigation or app-server failure",
-            "url": "https://github.com/openai/codex/issues/20",
-            "labels": ["app", "bug"],
-            "owner_labels": ["app"],
-            "kind_labels": ["bug"],
-            "attention": False,
-            "attention_level": 0,
-            "attention_marker": "",
-            "user_interactions": 3,
-            "new_reactions": 1,
-            "engagement_score": 8,
-            "updated_at": "2026-04-25T04:00:00Z",
-            "activity": {"new_comments": 2},
-        },
-        {
-            "number": 21,
-            "title": "On Windows, cmake output waits until timeout",
-            "description": "Windows command timeout/capture problem",
-            "url": "https://github.com/openai/codex/issues/21",
-            "labels": ["app", "bug"],
-            "owner_labels": ["app"],
-            "kind_labels": ["bug"],
-            "attention": False,
-            "attention_level": 0,
-            "attention_marker": "",
-            "user_interactions": 3,
-            "new_reactions": 0,
-            "engagement_score": 7,
-            "updated_at": "2026-04-25T03:00:00Z",
-            "activity": {"new_comments": 3},
-        },
-        {
-            "number": 22,
-            "title": "Windows computer use tool fails to click buttons",
-            "description": "Computer-use workflow failure",
-            "url": "https://github.com/openai/codex/issues/22",
-            "labels": ["app", "bug"],
-            "owner_labels": ["app"],
-            "kind_labels": ["bug"],
-            "attention": False,
-            "attention_level": 0,
-            "attention_marker": "",
-            "user_interactions": 3,
-            "new_reactions": 0,
-            "engagement_score": 6,
-            "updated_at": "2026-04-25T02:00:00Z",
-            "activity": {"new_comments": 3},
-        },
-    ]
-
-    rows = collect_issue_digest.summary_inputs(issues, ref_map={20: 1, 21: 2, 22: 3})
-
-    assert rows == [
-        {
-            "ref": 1,
-            "ref_markdown": "[1](https://github.com/openai/codex/issues/20)",
-            "number": 20,
-            "title": "Windows app Browser Use external navigation fails",
-            "description": "Browser Use navigation or app-server failure",
-            "url": "https://github.com/openai/codex/issues/20",
-            "labels": ["app", "bug"],
-            "owner_labels": ["app"],
-            "kind_labels": ["bug"],
-            "state": "",
-            "attention_marker": "",
-            "interactions": 3,
-            "new_comments": 2,
-            "new_reactions": 1,
-            "new_upvotes": 0,
-            "current_reactions": 0,
-        },
-        {
-            "ref": 2,
-            "ref_markdown": "[2](https://github.com/openai/codex/issues/21)",
-            "number": 21,
-            "title": "On Windows, cmake output waits until timeout",
-            "description": "Windows command timeout/capture problem",
-            "url": "https://github.com/openai/codex/issues/21",
-            "labels": ["app", "bug"],
-            "owner_labels": ["app"],
-            "kind_labels": ["bug"],
-            "state": "",
-            "attention_marker": "",
-            "interactions": 3,
-            "new_comments": 3,
-            "new_reactions": 0,
-            "new_upvotes": 0,
-            "current_reactions": 0,
-        },
-        {
-            "ref": 3,
-            "ref_markdown": "[3](https://github.com/openai/codex/issues/22)",
-            "number": 22,
-            "title": "Windows computer use tool fails to click buttons",
-            "description": "Computer-use workflow failure",
-            "url": "https://github.com/openai/codex/issues/22",
-            "labels": ["app", "bug"],
-            "owner_labels": ["app"],
-            "kind_labels": ["bug"],
-            "state": "",
-            "attention_marker": "",
-            "interactions": 3,
-            "new_comments": 3,
-            "new_reactions": 0,
-            "new_upvotes": 0,
-            "current_reactions": 0,
-        },
-    ]

.github/actions/prepare-bazel-ci/action.yml

@@ -8,7 +8,7 @@ inputs:
     description: Logical namespace used to keep concurrent Bazel jobs from reserving the same repository cache key.
     required: true
   install-test-prereqs:
-    description: Install DotSlash for Bazel-backed test jobs.
+    description: Install Node.js and DotSlash for Bazel-backed test jobs.
     required: false
     default: "false"
 outputs:

.github/actions/setup-bazel-ci/action.yml

@@ -5,7 +5,7 @@ inputs:
     description: Target triple used for cache namespacing.
     required: true
   install-test-prereqs:
-    description: Install DotSlash for Bazel-backed test jobs.
+    description: Install Node.js and DotSlash for Bazel-backed test jobs.
     required: false
     default: "false"
 outputs:
@@ -16,6 +16,12 @@ outputs:
 runs:
   using: composite
   steps:
+    - name: Set up Node.js for js_repl tests
+      if: inputs.install-test-prereqs == 'true'
+      uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
+      with:
+        node-version-file: codex-rs/node-version.txt
+
     # Some integration tests rely on DotSlash being installed.
     # See https://github.com/openai/codex/pull/7617.
     - name: Install DotSlash
@@ -33,7 +39,7 @@ runs:
       run: Copy-Item (Get-Command dotslash).Source -Destination "$env:LOCALAPPDATA\Microsoft\WindowsApps\dotslash.exe"
 
     - name: Set up Bazel
-      uses: bazel-contrib/setup-bazel@c5acdfb288317d0b5c0bbd7a396a3dc868bb0f86 # 0.19.0
+      uses: bazelbuild/setup-bazelisk@b39c379c82683a5f25d34f0d062761f62693e0b2 # v3
 
     - name: Configure Bazel repository cache
       id: configure_bazel_repository_cache

.github/pull_request_template.md

@@ -1,6 +1,6 @@
 # External (non-OpenAI) Pull Request Requirements
 
-External code contributions are by invitation only. Please read the dedicated "Contributing" markdown file for details:
+Before opening this Pull Request, please read the dedicated "Contributing" markdown file or your PR may be closed:
 https://github.com/openai/codex/blob/main/docs/contributing.md
 
 If your PR conforms to our contribution guidelines, replace this text with a detailed and high quality description of your changes.

.github/scripts/run-bazel-ci.sh

@@ -4,6 +4,7 @@ set -euo pipefail
 
 print_failed_bazel_test_logs=0
 print_failed_bazel_action_summary=0
+use_node_test_env=0
 remote_download_toplevel=0
 windows_msvc_host_platform=0
 
@@ -17,6 +18,10 @@ while [[ $# -gt 0 ]]; do
       print_failed_bazel_action_summary=1
       shift
       ;;
+    --use-node-test-env)
+      use_node_test_env=1
+      shift
+      ;;
     --remote-download-toplevel)
       remote_download_toplevel=1
       shift
@@ -37,7 +42,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 if [[ $# -eq 0 ]]; then
-  echo "Usage: $0 [--print-failed-test-logs] [--print-failed-action-summary] [--remote-download-toplevel] [--windows-msvc-host-platform] -- <bazel args> -- <targets>" >&2
+  echo "Usage: $0 [--print-failed-test-logs] [--print-failed-action-summary] [--use-node-test-env] [--remote-download-toplevel] [--windows-msvc-host-platform] -- <bazel args> -- <targets>" >&2
   exit 1
 fi
 
@@ -244,6 +249,16 @@ if [[ ${#bazel_args[@]} -eq 0 || ${#bazel_targets[@]} -eq 0 ]]; then
   exit 1
 fi
 
+if [[ $use_node_test_env -eq 1 ]]; then
+  # Bazel test sandboxes on macOS may resolve an older Homebrew `node`
+  # before the `actions/setup-node` runtime on PATH.
+  node_bin="$(which node)"
+  if [[ "${RUNNER_OS:-}" == "Windows" ]]; then
+    node_bin="$(cygpath -w "${node_bin}")"
+  fi
+  bazel_args+=("--test_env=CODEX_JS_REPL_NODE_PATH=${node_bin}")
+fi
+
 post_config_bazel_args=()
 if [[ "${RUNNER_OS:-}" == "Windows" && $windows_msvc_host_platform -eq 1 ]]; then
   has_host_platform_override=0

.github/workflows/Dockerfile.bazel

@@ -8,9 +8,25 @@ FROM ubuntu:24.04
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    curl git python3 ca-certificates && \
+    curl git python3 ca-certificates xz-utils && \
     rm -rf /var/lib/apt/lists/*
 
+COPY codex-rs/node-version.txt /tmp/node-version.txt
+
+RUN set -eux; \
+    node_arch="$(dpkg --print-architecture)"; \
+    case "${node_arch}" in \
+      amd64) node_dist_arch="x64" ;; \
+      arm64) node_dist_arch="arm64" ;; \
+      *) echo "unsupported architecture: ${node_arch}"; exit 1 ;; \
+    esac; \
+    node_version="$(tr -d '[:space:]' </tmp/node-version.txt)"; \
+    curl -fsSLO "https://nodejs.org/dist/v${node_version}/node-v${node_version}-linux-${node_dist_arch}.tar.xz"; \
+    tar -xJf "node-v${node_version}-linux-${node_dist_arch}.tar.xz" -C /usr/local --strip-components=1; \
+    rm "node-v${node_version}-linux-${node_dist_arch}.tar.xz" /tmp/node-version.txt; \
+    node --version; \
+    npm --version
+
 # Install dotslash.
 RUN curl -LSfs "https://github.com/facebook/dotslash/releases/download/v0.5.8/dotslash-ubuntu-22.04.$(uname -m).tar.gz" | tar fxz - -C /usr/local/bin
 

.github/workflows/bazel.yml

@@ -17,13 +17,6 @@ concurrency:
   cancel-in-progress: ${{ github.ref_name != 'main' }}
 jobs:
   test:
-    # Even though a no-cache-hit Windows build seems to exceed the 30-minute
-    # limit on occasion, the more common reason for exceeding the limit is a
-    # true test failure in a rust_test() marked "flaky" that gets run 3x.
-    # In that case, extra time generally does not give us more signal.
-    #
-    # Ultimately we need true distributed builds (e.g.,
-    # https://www.buildbuddy.io/docs/rbe-setup/) to speed things up.
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -92,6 +85,7 @@ jobs:
 
           bazel_wrapper_args=(
             --print-failed-test-logs
+            --use-node-test-env
           )
           bazel_test_args=(
             test

.github/workflows/ci.yml

@@ -45,16 +45,11 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: |
           set -euo pipefail
-          # Use a recent successful rust-release run that published the full
-          # cross-platform native payload required by the npm package layout.
-          # Passing the workflow URL directly avoids relying on old rust-v*
-          # branches remaining discoverable via `gh run list --branch ...`.
-          CODEX_VERSION=0.125.0
-          WORKFLOW_URL="https://github.com/openai/codex/actions/runs/24901475298"
+          # Use a rust-release version that includes all native binaries.
+          CODEX_VERSION=0.115.0
           OUTPUT_DIR="${RUNNER_TEMP}"
           python3 ./scripts/stage_npm_packages.py \
             --release-version "$CODEX_VERSION" \
-            --workflow-url "$WORKFLOW_URL" \
             --package codex \
             --output-dir "$OUTPUT_DIR"
           PACK_OUTPUT="${OUTPUT_DIR}/codex-npm-${CODEX_VERSION}.tgz"

.github/workflows/issue-deduplicator.yml

@@ -61,7 +61,7 @@ jobs:
       # .github/prompts/issue-deduplicator.txt file is obsolete and removed.
       - id: codex-all
         name: Find duplicates (pass 1, all issues)
-        uses: openai/codex-action@5c3f4ccdb2b8790f73d6b21751ac00e602aa0c02 # v1.7
+        uses: openai/codex-action@0b91f4a2703c23df3102c3f0967d3c6db34eedef # v1
         with:
           openai-api-key: ${{ secrets.CODEX_OPENAI_API_KEY }}
           allow-users: "*"
@@ -195,7 +195,7 @@ jobs:
 
       - id: codex-open
         name: Find duplicates (pass 2, open issues)
-        uses: openai/codex-action@5c3f4ccdb2b8790f73d6b21751ac00e602aa0c02 # v1.7
+        uses: openai/codex-action@0b91f4a2703c23df3102c3f0967d3c6db34eedef # v1
         with:
           openai-api-key: ${{ secrets.CODEX_OPENAI_API_KEY }}
           allow-users: "*"

.github/workflows/issue-labeler.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - id: codex
-        uses: openai/codex-action@5c3f4ccdb2b8790f73d6b21751ac00e602aa0c02 # v1.7
+        uses: openai/codex-action@0b91f4a2703c23df3102c3f0967d3c6db34eedef # v1
         with:
           openai-api-key: ${{ secrets.CODEX_OPENAI_API_KEY }}
           allow-users: "*"

.github/workflows/rust-ci-full.yml

@@ -560,6 +560,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - name: Set up Node.js for js_repl tests
+        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
+        with:
+          node-version-file: codex-rs/node-version.txt
       - name: Install Linux build dependencies
         if: ${{ runner.os == 'Linux' }}
         shell: bash

.github/workflows/rust-release-windows.yml

@@ -24,9 +24,7 @@ jobs:
   build-windows-binaries:
     name: Build Windows binaries - ${{ matrix.runner }} - ${{ matrix.target }} - ${{ matrix.bundle }}
     runs-on: ${{ matrix.runs_on }}
-    # Windows release builds can exceed an hour on fat-LTO mainline releases,
-    # so keep the timeout aligned with the top-level release build headroom.
-    timeout-minutes: 90
+    timeout-minutes: 60
     permissions:
       contents: read
     defaults:
@@ -139,7 +137,7 @@ jobs:
       - build-windows-binaries
     name: Build - ${{ matrix.runner }} - ${{ matrix.target }}
     runs-on: ${{ matrix.runs_on }}
-    timeout-minutes: 90
+    timeout-minutes: 60
     permissions:
       contents: read
       id-token: write

.github/workflows/rust-release.yml

@@ -49,9 +49,7 @@ jobs:
     needs: tag-check
     name: Build - ${{ matrix.runner }} - ${{ matrix.target }} - ${{ matrix.bundle }}
     runs-on: ${{ matrix.runs_on || matrix.runner }}
-    # Release builds can take a long time, so leave some headroom to avoid
-    # having to restart the full workflow due to a timeout.
-    timeout-minutes: 90
+    timeout-minutes: 60
     permissions:
       contents: read
       id-token: write
@@ -653,59 +651,11 @@ jobs:
             prefix="${NPM_TAG}-"
           fi
 
-          root_tarball="dist/npm/codex-npm-${VERSION}.tgz"
-          sdk_tarball="dist/npm/codex-sdk-npm-${VERSION}.tgz"
-          # Keep this list in sync with CODEX_PLATFORM_PACKAGES in
-          # codex-cli/scripts/build_npm_package.py. The root wrapper advances
-          # @openai/codex@latest as soon as it publishes, so every platform
-          # package it aliases must already exist in the registry first.
-          platform_tarballs=(
-            "dist/npm/codex-npm-linux-x64-${VERSION}.tgz"
-            "dist/npm/codex-npm-linux-arm64-${VERSION}.tgz"
-            "dist/npm/codex-npm-darwin-x64-${VERSION}.tgz"
-            "dist/npm/codex-npm-darwin-arm64-${VERSION}.tgz"
-            "dist/npm/codex-npm-win32-x64-${VERSION}.tgz"
-            "dist/npm/codex-npm-win32-arm64-${VERSION}.tgz"
-          )
-
-          for required_tarball in "${platform_tarballs[@]}" "${root_tarball}"; do
-            if [[ ! -f "${required_tarball}" ]]; then
-              echo "Missing npm tarball: ${required_tarball}"
-              exit 1
-            fi
-          done
-
           shopt -s nullglob
-          other_tarballs=()
-          for tarball in dist/npm/*-"${VERSION}".tgz; do
-            if [[ "${tarball}" == "${root_tarball}" || "${tarball}" == "${sdk_tarball}" ]]; then
-              continue
-            fi
-
-            is_platform_tarball=false
-            for platform_tarball in "${platform_tarballs[@]}"; do
-              if [[ "${tarball}" == "${platform_tarball}" ]]; then
-                is_platform_tarball=true
-                break
-              fi
-            done
-            if [[ "${is_platform_tarball}" == true ]]; then
-              continue
-            fi
-
-            other_tarballs+=("${tarball}")
-          done
-
-          # Publish the platform packages before the root CLI wrapper. The root
-          # wrapper advances @openai/codex@latest, so it should only publish
-          # after the optional dependency versions it references exist.
-          tarballs=(
-            "${platform_tarballs[@]}"
-            "${other_tarballs[@]}"
-            "${root_tarball}"
-          )
-          if [[ -f "${sdk_tarball}" ]]; then
-            tarballs+=("${sdk_tarball}")
+          tarballs=(dist/npm/*-"${VERSION}".tgz)
+          if [[ ${#tarballs[@]} -eq 0 ]]; then
+            echo "No npm tarballs found in dist/npm for version ${VERSION}"
+            exit 1
           fi
 
           for tarball in "${tarballs[@]}"; do

.github/workflows/rusty-v8-release.yml

@@ -78,9 +78,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up Bazel
-        uses: ./.github/actions/setup-bazel-ci
-        with:
-          target: ${{ matrix.target }}
+        uses: bazelbuild/setup-bazelisk@b39c379c82683a5f25d34f0d062761f62693e0b2 # v3
 
       - name: Set up Python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6

.github/workflows/v8-canary.yml

@@ -3,7 +3,6 @@ name: v8-canary
 on:
   pull_request:
     paths:
-      - ".github/actions/setup-bazel-ci/**"
       - ".github/scripts/rusty_v8_bazel.py"
       - ".github/workflows/rusty-v8-release.yml"
       - ".github/workflows/v8-canary.yml"
@@ -17,7 +16,6 @@ on:
     branches:
       - main
     paths:
-      - ".github/actions/setup-bazel-ci/**"
       - ".github/scripts/rusty_v8_bazel.py"
       - ".github/workflows/rusty-v8-release.yml"
       - ".github/workflows/v8-canary.yml"
@@ -77,9 +75,7 @@ jobs:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up Bazel
-        uses: ./.github/actions/setup-bazel-ci
-        with:
-          target: ${{ matrix.target }}
+        uses: bazelbuild/setup-bazelisk@b39c379c82683a5f25d34f0d062761f62693e0b2 # v3
 
       - name: Set up Python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6

AGENTS.md

@@ -19,12 +19,6 @@ In the codex-rs folder where the rust code lives:
   - You can run `just argument-comment-lint` to run the lint check locally. This is powered by Bazel, so running it the first time can be slow if Bazel is not warmed up, though incremental invocations should take <15s. Most of the time, it is best to update the PR and let CI take responsibility for checking this (or run it asynchronously in the background after submitting the PR). Note CI checks all three platforms, which the local run does not.
 - When possible, make `match` statements exhaustive and avoid wildcard arms.
 - Newly added traits should include doc comments that explain their role and how implementations are expected to use them.
-- Discourage both `#[async_trait]` and `#[allow(async_fn_in_trait)]` in Rust traits.
-  - Prefer native RPITIT trait methods with explicit `Send` bounds on the returned future, as in `3c7f013f9735` / `#16630`.
-  - Preferred trait shape:
-    `fn foo(&self, ...) -> impl std::future::Future<Output = T> + Send;`
-  - Implementations may still use `async fn foo(&self, ...) -> T` when they satisfy that contract.
-  - Do not use `#[allow(async_fn_in_trait)]` as a shortcut around spelling the future contract explicitly.
 - When writing tests, prefer comparing the equality of entire objects over fields one by one.
 - When making a change that adds or changes an API, ensure that the documentation in the `docs/` folder is up to date if applicable.
 - Prefer private modules and explicitly exported public crate API.

MODULE.bazel.lock

@@ -1560,7 +1560,6 @@
       "system-deps_7.0.7": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"assert_matches\",\"req\":\"^1.5\"},{\"features\":[\"targets\"],\"name\":\"cfg-expr\",\"req\":\">=0.17, <0.21\"},{\"name\":\"heck\",\"req\":\"^0.5\"},{\"kind\":\"dev\",\"name\":\"itertools\",\"req\":\"^0.14\"},{\"kind\":\"dev\",\"name\":\"lazy_static\",\"req\":\"^1\"},{\"name\":\"pkg-config\",\"req\":\"^0.3.25\"},{\"default_features\":false,\"features\":[\"parse\",\"std\"],\"name\":\"toml\",\"req\":\"^0.9\"},{\"name\":\"version-compare\",\"req\":\"^0.2\"}],\"features\":{}}",
       "tagptr_0.2.0": "{\"dependencies\":[],\"features\":{}}",
       "tar_0.4.44": "{\"dependencies\":[{\"name\":\"filetime\",\"req\":\"^0.2.8\"},{\"name\":\"libc\",\"req\":\"^0.2\",\"target\":\"cfg(unix)\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3\"},{\"name\":\"xattr\",\"optional\":true,\"req\":\"^1.1.3\",\"target\":\"cfg(unix)\"}],\"features\":{\"default\":[\"xattr\"]}}",
-      "tar_0.4.45": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"astral-tokio-tar\",\"req\":\"^0.5\"},{\"name\":\"filetime\",\"req\":\"^0.2.8\"},{\"name\":\"libc\",\"req\":\"^0.2\",\"target\":\"cfg(unix)\"},{\"features\":[\"small_rng\"],\"kind\":\"dev\",\"name\":\"rand\",\"req\":\"^0.8\"},{\"kind\":\"dev\",\"name\":\"tempfile\",\"req\":\"^3\"},{\"features\":[\"macros\",\"rt\"],\"kind\":\"dev\",\"name\":\"tokio\",\"req\":\"^1\"},{\"kind\":\"dev\",\"name\":\"tokio-stream\",\"req\":\"^0.1\"},{\"name\":\"xattr\",\"optional\":true,\"req\":\"^1.1.3\",\"target\":\"cfg(unix)\"}],\"features\":{\"default\":[\"xattr\"]}}",
       "target-lexicon_0.13.3": "{\"dependencies\":[{\"name\":\"serde\",\"optional\":true,\"req\":\"^1.0\"},{\"kind\":\"dev\",\"name\":\"serde_json\",\"req\":\"^1.0\"}],\"features\":{\"arch_z80\":[],\"arch_zkasm\":[],\"default\":[],\"serde_support\":[\"serde\",\"std\"],\"std\":[]}}",
       "tempfile_3.27.0": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"doc-comment\",\"req\":\"^0.3\"},{\"name\":\"fastrand\",\"req\":\"^2.1.1\"},{\"default_features\":false,\"name\":\"getrandom\",\"optional\":true,\"req\":\">=0.3.0, <0.5\",\"target\":\"cfg(any(unix, windows, target_os = \\\"wasi\\\"))\"},{\"default_features\":false,\"features\":[\"std\"],\"name\":\"once_cell\",\"req\":\"^1.19.0\"},{\"features\":[\"fs\"],\"name\":\"rustix\",\"req\":\"^1.1.4\",\"target\":\"cfg(any(unix, target_os = \\\"wasi\\\"))\"},{\"features\":[\"Win32_Storage_FileSystem\",\"Win32_Foundation\"],\"name\":\"windows-sys\",\"req\":\">=0.52, <0.62\",\"target\":\"cfg(windows)\"}],\"features\":{\"default\":[\"getrandom\"],\"nightly\":[]}}",
       "temporal_capi_0.1.2": "{\"dependencies\":[{\"default_features\":false,\"name\":\"diplomat\",\"req\":\"^0.14.0\"},{\"default_features\":false,\"name\":\"diplomat-runtime\",\"req\":\"^0.14.0\"},{\"default_features\":false,\"features\":[\"unstable\"],\"name\":\"icu_calendar\",\"req\":\"^2.1.0\"},{\"name\":\"icu_locale\",\"req\":\"^2.1.0\"},{\"default_features\":false,\"name\":\"num-traits\",\"req\":\"^0.2.19\"},{\"default_features\":false,\"name\":\"temporal_rs\",\"req\":\"^0.1.2\"},{\"name\":\"timezone_provider\",\"req\":\"^0.1.2\"},{\"name\":\"writeable\",\"req\":\"^0.6.0\"},{\"name\":\"zoneinfo64\",\"optional\":true,\"req\":\"^0.2.0\"}],\"features\":{\"compiled_data\":[\"temporal_rs/compiled_data\"],\"zoneinfo64\":[\"dep:zoneinfo64\",\"timezone_provider/zoneinfo64\"]}}",

NOTICE

@@ -4,3 +4,6 @@ Copyright 2025 OpenAI
 This project includes code derived from [Ratatui](https://github.com/ratatui/ratatui), licensed under the MIT license.
 Copyright (c) 2016-2022 Florian Dehau
 Copyright (c) 2023-2025 The Ratatui Developers
+
+This project includes Meriyah parser assets from [meriyah](https://github.com/meriyah/meriyah), licensed under the ISC license.
+Copyright (c) 2019 and later, KFlash and others.

codex-cli/scripts/run_in_container.sh

@@ -92,4 +92,4 @@ quoted_args=""
 for arg in "$@"; do
   quoted_args+=" $(printf '%q' "$arg")"
 done
-docker exec -it "$CONTAINER_NAME" bash -c "cd \"/app$WORK_DIR\" && codex --sandbox workspace-write --ask-for-approval on-request ${quoted_args}"
+docker exec -it "$CONTAINER_NAME" bash -c "cd \"/app$WORK_DIR\" && codex --full-auto ${quoted_args}"

codex-rs/BUILD.bazel

@@ -1,5 +1,6 @@
 exports_files([
     "clippy.toml",
+    "node-version.txt",
 ])
 
 filegroup(

codex-rs/Cargo.lock

@@ -1756,11 +1756,16 @@ dependencies = [
  "codex-protocol",
  "codex-state",
  "pretty_assertions",
+ "prost 0.14.3",
  "serde",
  "serde_json",
  "tempfile",
  "thiserror 2.0.18",
  "tokio",
+ "tokio-stream",
+ "tonic",
+ "tonic-prost",
+ "tonic-prost-build",
 ]
 
 [[package]]
@@ -1773,7 +1778,6 @@ dependencies = [
  "codex-protocol",
  "crypto_box",
  "ed25519-dalek",
- "jsonwebtoken",
  "pretty_assertions",
  "rand 0.9.3",
  "reqwest",
@@ -1868,16 +1872,12 @@ dependencies = [
  "codex-core-plugins",
  "codex-device-key",
  "codex-exec-server",
- "codex-external-agent-migration",
- "codex-external-agent-sessions",
  "codex-features",
  "codex-feedback",
  "codex-file-search",
  "codex-git-utils",
- "codex-hooks",
  "codex-login",
  "codex-mcp",
- "codex-memories-write",
  "codex-model-provider",
  "codex-model-provider-info",
  "codex-models-manager",
@@ -1899,7 +1899,6 @@ dependencies = [
  "codex-utils-rustls-provider",
  "constant_time_eq 0.3.1",
  "core_test_support",
- "flate2",
  "futures",
  "gethostname",
  "hmac",
@@ -1915,7 +1914,6 @@ dependencies = [
  "serial_test",
  "sha2",
  "shlex",
- "tar",
  "tempfile",
  "thiserror 2.0.18",
  "time",
@@ -2121,6 +2119,7 @@ dependencies = [
  "assert_matches",
  "clap",
  "clap_complete",
+ "codex-api",
  "codex-app-server",
  "codex-app-server-protocol",
  "codex-app-server-test-client",
@@ -2137,7 +2136,7 @@ dependencies = [
  "codex-login",
  "codex-mcp",
  "codex-mcp-server",
- "codex-memories-write",
+ "codex-model-provider",
  "codex-models-manager",
  "codex-protocol",
  "codex-responses-api-proxy",
@@ -2308,20 +2307,15 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "base64 0.22.1",
  "codex-app-server-protocol",
  "codex-execpolicy",
  "codex-features",
- "codex-file-system",
- "codex-git-utils",
  "codex-model-provider-info",
  "codex-network-proxy",
  "codex-protocol",
  "codex-utils-absolute-path",
  "codex-utils-path",
- "core-foundation 0.9.4",
  "dns-lookup",
- "dunce",
  "futures",
  "gethostname",
  "libc",
@@ -2345,7 +2339,6 @@ dependencies = [
  "tracing",
  "wildmatch",
  "winapi-util",
- "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2392,7 +2385,6 @@ dependencies = [
  "codex-hooks",
  "codex-login",
  "codex-mcp",
- "codex-memories-read",
  "codex-model-provider",
  "codex-model-provider-info",
  "codex-models-manager",
@@ -2405,6 +2397,7 @@ dependencies = [
  "codex-rollout",
  "codex-rollout-trace",
  "codex-sandboxing",
+ "codex-secrets",
  "codex-shell-command",
  "codex-shell-escalation",
  "codex-state",
@@ -2426,6 +2419,7 @@ dependencies = [
  "codex-utils-string",
  "codex-utils-template",
  "codex-windows-sandbox",
+ "core-foundation 0.9.4",
  "core_test_support",
  "csv",
  "ctor 0.6.3",
@@ -2476,27 +2470,11 @@ dependencies = [
  "walkdir",
  "which 8.0.0",
  "whoami",
+ "windows-sys 0.52.0",
  "wiremock",
  "zstd 0.13.3",
 ]
 
-[[package]]
-name = "codex-core-api"
-version = "0.0.0"
-dependencies = [
- "codex-analytics",
- "codex-arg0",
- "codex-config",
- "codex-core",
- "codex-exec-server",
- "codex-features",
- "codex-login",
- "codex-model-provider-info",
- "codex-models-manager",
- "codex-protocol",
- "codex-utils-absolute-path",
-]
-
 [[package]]
 name = "codex-core-plugins"
 version = "0.0.0"
@@ -2516,13 +2494,11 @@ dependencies = [
  "codex-utils-absolute-path",
  "codex-utils-plugins",
  "dirs",
- "flate2",
  "libc",
  "pretty_assertions",
  "reqwest",
  "serde",
  "serde_json",
- "tar",
  "tempfile",
  "thiserror 2.0.18",
  "tokio",
@@ -2604,7 +2580,6 @@ dependencies = [
  "codex-apply-patch",
  "codex-arg0",
  "codex-cloud-requirements",
- "codex-config",
  "codex-core",
  "codex-feedback",
  "codex-git-utils",
@@ -2648,7 +2623,7 @@ dependencies = [
  "bytes",
  "codex-app-server-protocol",
  "codex-client",
- "codex-file-system",
+ "codex-config",
  "codex-protocol",
  "codex-sandboxing",
  "codex-test-binary-support",
@@ -2717,32 +2692,6 @@ dependencies = [
  "syn 2.0.114",
 ]
 
-[[package]]
-name = "codex-external-agent-migration"
-version = "0.0.0"
-dependencies = [
- "codex-hooks",
- "pretty_assertions",
- "serde_json",
- "serde_yaml",
- "tempfile",
- "toml 0.9.11+spec-1.1.0",
-]
-
-[[package]]
-name = "codex-external-agent-sessions"
-version = "0.0.0"
-dependencies = [
- "chrono",
- "codex-app-server-protocol",
- "codex-protocol",
- "codex-utils-output-truncation",
- "serde",
- "serde_json",
- "sha2",
- "tempfile",
-]
-
 [[package]]
 name = "codex-features"
 version = "0.0.0"
@@ -2785,23 +2734,14 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "codex-file-system"
-version = "0.0.0"
-dependencies = [
- "async-trait",
- "codex-protocol",
- "codex-utils-absolute-path",
- "serde",
-]
-
 [[package]]
 name = "codex-git-utils"
 version = "0.0.0"
 dependencies = [
  "anyhow",
+ "assert_matches",
  "chrono",
- "codex-file-system",
+ "codex-exec-server",
  "codex-protocol",
  "codex-utils-absolute-path",
  "futures",
@@ -2826,7 +2766,6 @@ dependencies = [
  "anyhow",
  "chrono",
  "codex-config",
- "codex-plugin",
  "codex-protocol",
  "codex-utils-absolute-path",
  "futures",
@@ -2862,8 +2801,8 @@ version = "0.0.0"
 dependencies = [
  "cc",
  "clap",
+ "codex-config",
  "codex-core",
- "codex-process-hardening",
  "codex-protocol",
  "codex-sandboxing",
  "codex-utils-absolute-path",
@@ -2913,7 +2852,6 @@ dependencies = [
  "codex-terminal-detection",
  "codex-utils-template",
  "core_test_support",
- "jsonwebtoken",
  "keyring",
  "once_cell",
  "os_info",
@@ -2952,6 +2890,7 @@ dependencies = [
  "codex-plugin",
  "codex-protocol",
  "codex-rmcp-client",
+ "codex-utils-absolute-path",
  "codex-utils-plugins",
  "futures",
  "pretty_assertions",
@@ -2977,7 +2916,9 @@ dependencies = [
  "codex-config",
  "codex-core",
  "codex-exec-server",
+ "codex-features",
  "codex-login",
+ "codex-models-manager",
  "codex-protocol",
  "codex-shell-command",
  "codex-utils-absolute-path",
@@ -2999,55 +2940,6 @@ dependencies = [
  "wiremock",
 ]
 
-[[package]]
-name = "codex-memories-read"
-version = "0.0.0"
-dependencies = [
- "codex-protocol",
- "codex-shell-command",
- "codex-utils-absolute-path",
- "codex-utils-output-truncation",
- "codex-utils-template",
- "pretty_assertions",
- "tempfile",
- "tokio",
-]
-
-[[package]]
-name = "codex-memories-write"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "chrono",
- "codex-backend-client",
- "codex-config",
- "codex-core",
- "codex-features",
- "codex-git-utils",
- "codex-login",
- "codex-models-manager",
- "codex-otel",
- "codex-protocol",
- "codex-rollout",
- "codex-rollout-trace",
- "codex-secrets",
- "codex-state",
- "codex-terminal-detection",
- "codex-utils-absolute-path",
- "codex-utils-output-truncation",
- "codex-utils-template",
- "core_test_support",
- "futures",
- "pretty_assertions",
- "serde",
- "serde_json",
- "tempfile",
- "tokio",
- "tracing",
- "uuid",
- "wiremock",
-]
-
 [[package]]
 name = "codex-model-provider"
 version = "0.0.0"
@@ -3196,7 +3088,6 @@ dependencies = [
 name = "codex-plugin"
 version = "0.0.0"
 dependencies = [
- "codex-config",
  "codex-utils-absolute-path",
  "codex-utils-plugins",
  "thiserror 2.0.18",
@@ -3248,7 +3139,6 @@ dependencies = [
  "tracing",
  "ts-rs",
  "uuid",
- "wildmatch",
 ]
 
 [[package]]
@@ -3508,16 +3398,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "codex-thread-manager-sample"
-version = "0.0.0"
-dependencies = [
- "anyhow",
- "clap",
- "codex-core-api",
- "tracing",
-]
-
 [[package]]
 name = "codex-thread-store"
 version = "0.0.0"
@@ -3876,8 +3756,6 @@ version = "0.0.0"
 dependencies = [
  "pretty_assertions",
  "regex-lite",
- "serde",
- "serde_json",
 ]
 
 [[package]]
@@ -4153,7 +4031,6 @@ dependencies = [
  "assert_cmd",
  "base64 0.22.1",
  "codex-arg0",
- "codex-config",
  "codex-core",
  "codex-exec-server",
  "codex-features",
@@ -12373,16 +12250,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
 
-[[package]]
-name = "tar"
-version = "0.4.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973"
-dependencies = [
- "filetime",
- "libc",
-]
-
 [[package]]
 name = "target-lexicon"
 version = "0.13.3"

codex-rs/Cargo.toml

@@ -32,18 +32,14 @@ members = [
     "shell-escalation",
     "skills",
     "core",
-    "core-api",
     "core-plugins",
     "core-skills",
     "hooks",
     "secrets",
     "exec",
-    "file-system",
     "exec-server",
     "execpolicy",
     "execpolicy-legacy",
-    "external-agent-migration",
-    "external-agent-sessions",
     "keyring-store",
     "file-search",
     "linux-sandbox",
@@ -51,8 +47,6 @@ members = [
     "login",
     "codex-mcp",
     "mcp-server",
-    "memories/read",
-    "memories/write",
     "model-provider-info",
     "models-manager",
     "network-proxy",
@@ -99,7 +93,6 @@ members = [
     "state",
     "terminal-detection",
     "test-binary-support",
-    "thread-manager-sample",
     "thread-store",
     "uds",
     "codex-experimental-api-macros",
@@ -145,16 +138,12 @@ codex-code-mode = { path = "code-mode" }
 codex-config = { path = "config" }
 codex-connectors = { path = "connectors" }
 codex-core = { path = "core" }
-codex-core-api = { path = "core-api" }
 codex-core-plugins = { path = "core-plugins" }
 codex-core-skills = { path = "core-skills" }
 codex-device-key = { path = "device-key" }
 codex-exec = { path = "exec" }
-codex-file-system = { path = "file-system" }
 codex-exec-server = { path = "exec-server" }
 codex-execpolicy = { path = "execpolicy" }
-codex-external-agent-migration = { path = "external-agent-migration" }
-codex-external-agent-sessions = { path = "external-agent-sessions" }
 codex-experimental-api-macros = { path = "codex-experimental-api-macros" }
 codex-features = { path = "features" }
 codex-feedback = { path = "feedback" }
@@ -166,8 +155,6 @@ codex-keyring-store = { path = "keyring-store" }
 codex-linux-sandbox = { path = "linux-sandbox" }
 codex-lmstudio = { path = "lmstudio" }
 codex-login = { path = "login" }
-codex-memories-read = { path = "memories/read" }
-codex-memories-write = { path = "memories/write" }
 codex-mcp = { path = "codex-mcp" }
 codex-mcp-server = { path = "mcp-server" }
 codex-model-provider-info = { path = "model-provider-info" }
@@ -269,7 +256,6 @@ encoding_rs = "0.8.35"
 env-flags = "0.1.1"
 env_logger = "0.11.9"
 eventsource-stream = "0.2.3"
-flate2 = "1.1.8"
 futures = { version = "0.3", default-features = false }
 gethostname = "1.1.0"
 gix = { version = "0.81.0", default-features = false, features = ["sha1"] }
@@ -362,7 +348,6 @@ strum_macros = "0.28.0"
 supports-color = "3.0.2"
 syntect = "5"
 sys-locale = "0.3.2"
-tar = { version = "=0.4.45", default-features = false }
 tempfile = "3.23.0"
 test-log = "0.2.19"
 textwrap = "0.16.2"

codex-rs/README.md

@@ -59,22 +59,19 @@ To test to see what happens when a command is run under the sandbox provided by
 
 ```
 # macOS
-codex sandbox macos [--log-denials] [COMMAND]...
+codex sandbox macos [--full-auto] [--log-denials] [COMMAND]...
 
 # Linux
-codex sandbox linux [COMMAND]...
+codex sandbox linux [--full-auto] [COMMAND]...
 
 # Windows
-codex sandbox windows [COMMAND]...
+codex sandbox windows [--full-auto] [COMMAND]...
 
 # Legacy aliases
-codex debug seatbelt [--log-denials] [COMMAND]...
-codex debug landlock [COMMAND]...
+codex debug seatbelt [--full-auto] [--log-denials] [COMMAND]...
+codex debug landlock [--full-auto] [COMMAND]...
 ```
 
-To try a writable legacy sandbox mode with these commands, pass an explicit config override such
-as `-c 'sandbox_mode="workspace-write"'`.
-
 ### Selecting a sandbox policy via `--sandbox`
 
 The Rust CLI exposes a dedicated `--sandbox` (`-s`) flag that lets you pick the sandbox policy **without** having to reach for the generic `-c/--config` option:
@@ -97,7 +94,7 @@ In `workspace-write`, Codex also includes `~/.codex/memories` in its writable ro
 
 This folder is the root of a Cargo workspace. It contains quite a bit of experimental code, but here are the key crates:
 
-- [`core/`](./core) contains the business logic for Codex. Ultimately, we hope this becomes a library crate that is generally useful for building other Rust/native applications that use Codex.
+- [`core/`](./core) contains the business logic for Codex. Ultimately, we hope this to be a library crate that is generally useful for building other Rust/native applications that use Codex.
 - [`exec/`](./exec) "headless" CLI for use in automation.
 - [`tui/`](./tui) CLI that launches a fullscreen TUI built with [Ratatui](https://ratatui.rs/).
 - [`cli/`](./cli) CLI multitool that provides the aforementioned CLIs via subcommands.

codex-rs/agent-graph-store/Cargo.toml

@@ -8,6 +8,10 @@ version.workspace = true
 name = "codex_agent_graph_store"
 path = "src/lib.rs"
 
+[[example]]
+name = "generate-proto"
+path = "examples/generate-proto.rs"
+
 [lints]
 workspace = true
 
@@ -15,11 +19,17 @@ workspace = true
 async-trait = { workspace = true }
 codex-protocol = { workspace = true }
 codex-state = { workspace = true }
+prost = "0.14.3"
 serde = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
+tonic = { workspace = true }
+tonic-prost = { workspace = true }
 
 [dev-dependencies]
 pretty_assertions = { workspace = true }
 serde_json = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
+tokio-stream = { workspace = true, features = ["net"] }
+tonic = { workspace = true, features = ["router", "transport"] }
+tonic-prost-build = { version = "=0.14.3", default-features = false, features = ["transport"] }

codex-rs/agent-graph-store/examples/generate-proto.rs

@@ -0,0 +1,19 @@
+use std::path::PathBuf;
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    let Some(proto_dir_arg) = std::env::args().nth(1) else {
+        eprintln!("Usage: generate-proto <proto-dir>");
+        std::process::exit(1);
+    };
+
+    let proto_dir = PathBuf::from(proto_dir_arg);
+    let proto_file = proto_dir.join("codex.agent_graph_store.v1.proto");
+
+    tonic_prost_build::configure()
+        .build_client(true)
+        .build_server(true)
+        .out_dir(&proto_dir)
+        .compile_protos(&[proto_file], &[proto_dir])?;
+
+    Ok(())
+}

codex-rs/agent-graph-store/scripts/generate-proto.sh

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+repo_root="$(cd "$script_dir/../../.." && pwd)"
+proto_dir="$repo_root/codex-rs/agent-graph-store/src/remote/proto"
+generated="$proto_dir/codex.agent_graph_store.v1.rs"
+tmpdir="$(mktemp -d)"
+
+cleanup() {
+    rm -rf "$tmpdir"
+}
+trap cleanup EXIT
+
+(
+    cd "$repo_root/codex-rs"
+    CARGO_TARGET_DIR="$tmpdir/target" cargo run \
+        -p codex-agent-graph-store \
+        --example generate-proto \
+        -- "$proto_dir"
+)
+
+if ! sed -n '2p' "$generated" | grep -q 'clippy::trivially_copy_pass_by_ref'; then
+    {
+        sed -n '1p' "$generated"
+        printf '#![allow(clippy::trivially_copy_pass_by_ref)]\n'
+        sed '1d' "$generated"
+    } > "$tmpdir/generated.rs"
+    mv "$tmpdir/generated.rs" "$generated"
+fi
+
+rustfmt --edition 2024 "$generated"
+
+awk '
+    NR == 3 && previous ~ /clippy::trivially_copy_pass_by_ref/ && $0 != "" { print "" }
+    { print; previous = $0 }
+' "$generated" > "$tmpdir/formatted.rs"
+mv "$tmpdir/formatted.rs" "$generated"

codex-rs/agent-graph-store/src/lib.rs

@@ -2,11 +2,13 @@
 
 mod error;
 mod local;
+mod remote;
 mod store;
 mod types;
 
 pub use error::AgentGraphStoreError;
 pub use error::AgentGraphStoreResult;
 pub use local::LocalAgentGraphStore;
+pub use remote::RemoteAgentGraphStore;
 pub use store::AgentGraphStore;
 pub use types::ThreadSpawnEdgeStatus;

codex-rs/agent-graph-store/src/remote/AGENTS.md

@@ -0,0 +1,13 @@
+# Remote Agent Graph Store
+
+- The Rust protobuf output in `proto/codex.agent_graph_store.v1.rs` is checked in.
+- Do not add build-time protobuf generation to `codex-agent-graph-store` unless the Bazel/Cargo story is intentionally changed.
+- When `proto/codex.agent_graph_store.v1.proto` changes, regenerate the Rust file manually and include both files in the same commit.
+
+Run this from the repository root:
+
+```sh
+./codex-rs/agent-graph-store/scripts/generate-proto.sh
+```
+
+The command requires `protoc` to be available on `PATH`.

codex-rs/agent-graph-store/src/remote/helpers.rs

@@ -0,0 +1,42 @@
+use codex_protocol::ThreadId;
+
+use super::proto;
+use crate::AgentGraphStoreError;
+use crate::AgentGraphStoreResult;
+use crate::ThreadSpawnEdgeStatus;
+
+pub(super) fn proto_status(status: ThreadSpawnEdgeStatus) -> proto::ThreadSpawnEdgeStatus {
+    match status {
+        ThreadSpawnEdgeStatus::Open => proto::ThreadSpawnEdgeStatus::Open,
+        ThreadSpawnEdgeStatus::Closed => proto::ThreadSpawnEdgeStatus::Closed,
+    }
+}
+
+pub(super) fn proto_status_filter(status: Option<ThreadSpawnEdgeStatus>) -> Option<i32> {
+    status.map(proto_status).map(Into::into)
+}
+
+pub(super) fn thread_ids_from_proto(
+    thread_ids: Vec<String>,
+    field_name: &str,
+) -> AgentGraphStoreResult<Vec<ThreadId>> {
+    thread_ids
+        .into_iter()
+        .map(|thread_id| {
+            ThreadId::from_string(&thread_id).map_err(|err| AgentGraphStoreError::InvalidRequest {
+                message: format!("remote agent graph store returned invalid {field_name}: {err}"),
+            })
+        })
+        .collect()
+}
+
+pub(super) fn remote_status_to_error(status: tonic::Status) -> AgentGraphStoreError {
+    match status.code() {
+        tonic::Code::InvalidArgument => AgentGraphStoreError::InvalidRequest {
+            message: status.message().to_string(),
+        },
+        _ => AgentGraphStoreError::Internal {
+            message: format!("remote agent graph store request failed: {status}"),
+        },
+    }
+}

codex-rs/agent-graph-store/src/remote/mod.rs

@@ -0,0 +1,339 @@
+mod helpers;
+
+use async_trait::async_trait;
+use codex_protocol::ThreadId;
+use proto::agent_graph_store_client::AgentGraphStoreClient;
+
+use crate::AgentGraphStore;
+use crate::AgentGraphStoreError;
+use crate::AgentGraphStoreResult;
+use crate::ThreadSpawnEdgeStatus;
+
+#[path = "proto/codex.agent_graph_store.v1.rs"]
+mod proto;
+
+/// gRPC-backed [`AgentGraphStore`] implementation for deployments whose durable
+/// subagent graph lives outside the app-server process.
+#[derive(Clone, Debug)]
+pub struct RemoteAgentGraphStore {
+    endpoint: String,
+}
+
+impl RemoteAgentGraphStore {
+    pub fn new(endpoint: impl Into<String>) -> Self {
+        Self {
+            endpoint: endpoint.into(),
+        }
+    }
+
+    async fn client(
+        &self,
+    ) -> AgentGraphStoreResult<AgentGraphStoreClient<tonic::transport::Channel>> {
+        AgentGraphStoreClient::connect(self.endpoint.clone())
+            .await
+            .map_err(|err| AgentGraphStoreError::Internal {
+                message: format!("failed to connect to remote agent graph store: {err}"),
+            })
+    }
+}
+
+#[async_trait]
+impl AgentGraphStore for RemoteAgentGraphStore {
+    async fn upsert_thread_spawn_edge(
+        &self,
+        parent_thread_id: ThreadId,
+        child_thread_id: ThreadId,
+        status: ThreadSpawnEdgeStatus,
+    ) -> AgentGraphStoreResult<()> {
+        let request = proto::UpsertThreadSpawnEdgeRequest {
+            parent_thread_id: parent_thread_id.to_string(),
+            child_thread_id: child_thread_id.to_string(),
+            status: helpers::proto_status(status).into(),
+        };
+        self.client()
+            .await?
+            .upsert_thread_spawn_edge(request)
+            .await
+            .map_err(helpers::remote_status_to_error)?;
+        Ok(())
+    }
+
+    async fn set_thread_spawn_edge_status(
+        &self,
+        child_thread_id: ThreadId,
+        status: ThreadSpawnEdgeStatus,
+    ) -> AgentGraphStoreResult<()> {
+        let request = proto::SetThreadSpawnEdgeStatusRequest {
+            child_thread_id: child_thread_id.to_string(),
+            status: helpers::proto_status(status).into(),
+        };
+        self.client()
+            .await?
+            .set_thread_spawn_edge_status(request)
+            .await
+            .map_err(helpers::remote_status_to_error)?;
+        Ok(())
+    }
+
+    async fn list_thread_spawn_children(
+        &self,
+        parent_thread_id: ThreadId,
+        status_filter: Option<ThreadSpawnEdgeStatus>,
+    ) -> AgentGraphStoreResult<Vec<ThreadId>> {
+        let response = self
+            .client()
+            .await?
+            .list_thread_spawn_children(proto::ListThreadSpawnChildrenRequest {
+                parent_thread_id: parent_thread_id.to_string(),
+                status_filter: helpers::proto_status_filter(status_filter),
+            })
+            .await
+            .map_err(helpers::remote_status_to_error)?
+            .into_inner();
+        helpers::thread_ids_from_proto(response.thread_ids, "child thread_id")
+    }
+
+    async fn list_thread_spawn_descendants(
+        &self,
+        root_thread_id: ThreadId,
+        status_filter: Option<ThreadSpawnEdgeStatus>,
+    ) -> AgentGraphStoreResult<Vec<ThreadId>> {
+        let response = self
+            .client()
+            .await?
+            .list_thread_spawn_descendants(proto::ListThreadSpawnDescendantsRequest {
+                root_thread_id: root_thread_id.to_string(),
+                status_filter: helpers::proto_status_filter(status_filter),
+            })
+            .await
+            .map_err(helpers::remote_status_to_error)?
+            .into_inner();
+        helpers::thread_ids_from_proto(response.thread_ids, "descendant thread_id")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::proto;
+    use super::proto::agent_graph_store_server;
+    use super::proto::agent_graph_store_server::AgentGraphStoreServer;
+    use super::*;
+    use pretty_assertions::assert_eq;
+    use tonic::Request;
+    use tonic::Response;
+    use tonic::Status;
+    use tonic::transport::Server;
+
+    fn thread_id(suffix: u128) -> ThreadId {
+        ThreadId::from_string(&format!("00000000-0000-0000-0000-{suffix:012}"))
+            .expect("valid thread id")
+    }
+
+    async fn serve_test_server(server: TestServer) -> (RemoteAgentGraphStore, ServerShutdown) {
+        let listener = tokio::net::TcpListener::bind("127.0.0.1:0")
+            .await
+            .expect("bind test server");
+        let addr = listener.local_addr().expect("test server addr");
+        let (shutdown_tx, shutdown_rx) = tokio::sync::oneshot::channel();
+        let handle = tokio::spawn(async move {
+            Server::builder()
+                .add_service(AgentGraphStoreServer::new(server))
+                .serve_with_incoming_shutdown(
+                    tokio_stream::wrappers::TcpListenerStream::new(listener),
+                    async {
+                        let _ = shutdown_rx.await;
+                    },
+                )
+                .await
+        });
+
+        (
+            RemoteAgentGraphStore::new(format!("http://{addr}")),
+            ServerShutdown {
+                shutdown_tx,
+                handle,
+            },
+        )
+    }
+
+    struct ServerShutdown {
+        shutdown_tx: tokio::sync::oneshot::Sender<()>,
+        handle: tokio::task::JoinHandle<Result<(), tonic::transport::Error>>,
+    }
+
+    impl ServerShutdown {
+        async fn shutdown(self) {
+            let _ = self.shutdown_tx.send(());
+            self.handle.await.expect("join server").expect("server");
+        }
+    }
+
+    #[derive(Clone, Copy, Debug)]
+    enum TestServer {
+        HappyPath,
+        InvalidThreadIdResponse,
+        InvalidArgumentStatus,
+    }
+
+    #[tonic::async_trait]
+    impl agent_graph_store_server::AgentGraphStore for TestServer {
+        async fn upsert_thread_spawn_edge(
+            &self,
+            request: Request<proto::UpsertThreadSpawnEdgeRequest>,
+        ) -> Result<Response<proto::Empty>, Status> {
+            match self {
+                TestServer::InvalidArgumentStatus => {
+                    Err(Status::invalid_argument("status must be specified"))
+                }
+                TestServer::HappyPath | TestServer::InvalidThreadIdResponse => {
+                    let request = request.into_inner();
+                    assert_eq!(
+                        request.parent_thread_id,
+                        "00000000-0000-0000-0000-000000000001"
+                    );
+                    assert_eq!(
+                        request.child_thread_id,
+                        "00000000-0000-0000-0000-000000000002"
+                    );
+                    assert_eq!(
+                        proto::ThreadSpawnEdgeStatus::try_from(request.status),
+                        Ok(proto::ThreadSpawnEdgeStatus::Open)
+                    );
+                    Ok(Response::new(proto::Empty {}))
+                }
+            }
+        }
+
+        async fn set_thread_spawn_edge_status(
+            &self,
+            request: Request<proto::SetThreadSpawnEdgeStatusRequest>,
+        ) -> Result<Response<proto::Empty>, Status> {
+            let request = request.into_inner();
+            assert_eq!(
+                request.child_thread_id,
+                "00000000-0000-0000-0000-000000000002"
+            );
+            assert_eq!(
+                proto::ThreadSpawnEdgeStatus::try_from(request.status),
+                Ok(proto::ThreadSpawnEdgeStatus::Closed)
+            );
+            Ok(Response::new(proto::Empty {}))
+        }
+
+        async fn list_thread_spawn_children(
+            &self,
+            request: Request<proto::ListThreadSpawnChildrenRequest>,
+        ) -> Result<Response<proto::ListThreadSpawnChildrenResponse>, Status> {
+            let request = request.into_inner();
+            assert_eq!(
+                request.parent_thread_id,
+                "00000000-0000-0000-0000-000000000001"
+            );
+            assert_eq!(
+                request
+                    .status_filter
+                    .map(proto::ThreadSpawnEdgeStatus::try_from),
+                Some(Ok(proto::ThreadSpawnEdgeStatus::Open))
+            );
+            let thread_ids = match self {
+                TestServer::InvalidThreadIdResponse => vec!["not-a-thread-id".to_string()],
+                TestServer::HappyPath | TestServer::InvalidArgumentStatus => {
+                    vec![
+                        "00000000-0000-0000-0000-000000000002".to_string(),
+                        "00000000-0000-0000-0000-000000000003".to_string(),
+                    ]
+                }
+            };
+            Ok(Response::new(proto::ListThreadSpawnChildrenResponse {
+                thread_ids,
+            }))
+        }
+
+        async fn list_thread_spawn_descendants(
+            &self,
+            request: Request<proto::ListThreadSpawnDescendantsRequest>,
+        ) -> Result<Response<proto::ListThreadSpawnDescendantsResponse>, Status> {
+            let request = request.into_inner();
+            assert_eq!(
+                request.root_thread_id,
+                "00000000-0000-0000-0000-000000000001"
+            );
+            assert_eq!(request.status_filter, None);
+            Ok(Response::new(proto::ListThreadSpawnDescendantsResponse {
+                thread_ids: vec![
+                    "00000000-0000-0000-0000-000000000002".to_string(),
+                    "00000000-0000-0000-0000-000000000003".to_string(),
+                    "00000000-0000-0000-0000-000000000004".to_string(),
+                ],
+            }))
+        }
+    }
+
+    #[tokio::test]
+    async fn remote_store_calls_agent_graph_service() {
+        let (store, shutdown) = serve_test_server(TestServer::HappyPath).await;
+        let parent_thread_id = thread_id(1);
+        let child_thread_id = thread_id(2);
+
+        store
+            .upsert_thread_spawn_edge(
+                parent_thread_id,
+                child_thread_id,
+                ThreadSpawnEdgeStatus::Open,
+            )
+            .await
+            .expect("upsert should succeed");
+        store
+            .set_thread_spawn_edge_status(child_thread_id, ThreadSpawnEdgeStatus::Closed)
+            .await
+            .expect("status update should succeed");
+
+        let children = store
+            .list_thread_spawn_children(parent_thread_id, Some(ThreadSpawnEdgeStatus::Open))
+            .await
+            .expect("children should load");
+        assert_eq!(children, vec![thread_id(2), thread_id(3)]);
+
+        let descendants = store
+            .list_thread_spawn_descendants(parent_thread_id, None)
+            .await
+            .expect("descendants should load");
+        assert_eq!(descendants, vec![thread_id(2), thread_id(3), thread_id(4)]);
+
+        shutdown.shutdown().await;
+    }
+
+    #[tokio::test]
+    async fn remote_store_maps_invalid_response_thread_id_to_invalid_request() {
+        let (store, shutdown) = serve_test_server(TestServer::InvalidThreadIdResponse).await;
+
+        let err = store
+            .list_thread_spawn_children(thread_id(1), Some(ThreadSpawnEdgeStatus::Open))
+            .await
+            .expect_err("invalid response thread id should fail");
+
+        assert!(matches!(
+            err,
+            AgentGraphStoreError::InvalidRequest { message } if message.contains("invalid child thread_id")
+        ));
+
+        shutdown.shutdown().await;
+    }
+
+    #[tokio::test]
+    async fn remote_store_maps_invalid_argument_status_to_invalid_request() {
+        let (store, shutdown) = serve_test_server(TestServer::InvalidArgumentStatus).await;
+
+        let err = store
+            .upsert_thread_spawn_edge(thread_id(1), thread_id(2), ThreadSpawnEdgeStatus::Open)
+            .await
+            .expect_err("invalid argument should fail");
+
+        assert!(matches!(
+            err,
+            AgentGraphStoreError::InvalidRequest { message } if message == "status must be specified"
+        ));
+
+        shutdown.shutdown().await;
+    }
+}

codex-rs/agent-graph-store/src/remote/proto/codex.agent_graph_store.v1.proto

@@ -0,0 +1,53 @@
+syntax = "proto3";
+
+package codex.agent_graph_store.v1;
+
+service AgentGraphStore {
+  rpc UpsertThreadSpawnEdge(UpsertThreadSpawnEdgeRequest) returns (Empty);
+  rpc SetThreadSpawnEdgeStatus(SetThreadSpawnEdgeStatusRequest) returns (Empty);
+  rpc ListThreadSpawnChildren(ListThreadSpawnChildrenRequest) returns (ListThreadSpawnChildrenResponse);
+  rpc ListThreadSpawnDescendants(ListThreadSpawnDescendantsRequest) returns (ListThreadSpawnDescendantsResponse);
+}
+
+message Empty {}
+
+message UpsertThreadSpawnEdgeRequest {
+  string parent_thread_id = 1;
+  string child_thread_id = 2;
+  // Servers must reject THREAD_SPAWN_EDGE_STATUS_UNSPECIFIED.
+  ThreadSpawnEdgeStatus status = 3;
+}
+
+message SetThreadSpawnEdgeStatusRequest {
+  string child_thread_id = 1;
+  // Servers must reject THREAD_SPAWN_EDGE_STATUS_UNSPECIFIED.
+  ThreadSpawnEdgeStatus status = 2;
+}
+
+message ListThreadSpawnChildrenRequest {
+  string parent_thread_id = 1;
+  // Absent means all statuses.
+  optional ThreadSpawnEdgeStatus status_filter = 2;
+}
+
+message ListThreadSpawnChildrenResponse {
+  // Ordered child thread ids.
+  repeated string thread_ids = 1;
+}
+
+message ListThreadSpawnDescendantsRequest {
+  string root_thread_id = 1;
+  // Absent means all statuses.
+  optional ThreadSpawnEdgeStatus status_filter = 2;
+}
+
+message ListThreadSpawnDescendantsResponse {
+  // Ordered descendant thread ids.
+  repeated string thread_ids = 1;
+}
+
+enum ThreadSpawnEdgeStatus {
+  THREAD_SPAWN_EDGE_STATUS_UNSPECIFIED = 0;
+  THREAD_SPAWN_EDGE_STATUS_OPEN = 1;
+  THREAD_SPAWN_EDGE_STATUS_CLOSED = 2;
+}

codex-rs/agent-graph-store/src/remote/proto/codex.agent_graph_store.v1.rs

@@ -0,0 +1,569 @@
+// This file is @generated by prost-build.
+#![allow(clippy::trivially_copy_pass_by_ref)]
+
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct Empty {}
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct UpsertThreadSpawnEdgeRequest {
+    #[prost(string, tag = "1")]
+    pub parent_thread_id: ::prost::alloc::string::String,
+    #[prost(string, tag = "2")]
+    pub child_thread_id: ::prost::alloc::string::String,
+    /// Servers must reject THREAD_SPAWN_EDGE_STATUS_UNSPECIFIED.
+    #[prost(enumeration = "ThreadSpawnEdgeStatus", tag = "3")]
+    pub status: i32,
+}
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct SetThreadSpawnEdgeStatusRequest {
+    #[prost(string, tag = "1")]
+    pub child_thread_id: ::prost::alloc::string::String,
+    /// Servers must reject THREAD_SPAWN_EDGE_STATUS_UNSPECIFIED.
+    #[prost(enumeration = "ThreadSpawnEdgeStatus", tag = "2")]
+    pub status: i32,
+}
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct ListThreadSpawnChildrenRequest {
+    #[prost(string, tag = "1")]
+    pub parent_thread_id: ::prost::alloc::string::String,
+    /// Absent means all statuses.
+    #[prost(enumeration = "ThreadSpawnEdgeStatus", optional, tag = "2")]
+    pub status_filter: ::core::option::Option<i32>,
+}
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct ListThreadSpawnChildrenResponse {
+    /// Ordered child thread ids.
+    #[prost(string, repeated, tag = "1")]
+    pub thread_ids: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+}
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct ListThreadSpawnDescendantsRequest {
+    #[prost(string, tag = "1")]
+    pub root_thread_id: ::prost::alloc::string::String,
+    /// Absent means all statuses.
+    #[prost(enumeration = "ThreadSpawnEdgeStatus", optional, tag = "2")]
+    pub status_filter: ::core::option::Option<i32>,
+}
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
+pub struct ListThreadSpawnDescendantsResponse {
+    /// Ordered descendant thread ids.
+    #[prost(string, repeated, tag = "1")]
+    pub thread_ids: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+}
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum ThreadSpawnEdgeStatus {
+    Unspecified = 0,
+    Open = 1,
+    Closed = 2,
+}
+impl ThreadSpawnEdgeStatus {
+    /// String value of the enum field names used in the ProtoBuf definition.
+    ///
+    /// The values are not transformed in any way and thus are considered stable
+    /// (if the ProtoBuf definition does not change) and safe for programmatic use.
+    pub fn as_str_name(&self) -> &'static str {
+        match self {
+            Self::Unspecified => "THREAD_SPAWN_EDGE_STATUS_UNSPECIFIED",
+            Self::Open => "THREAD_SPAWN_EDGE_STATUS_OPEN",
+            Self::Closed => "THREAD_SPAWN_EDGE_STATUS_CLOSED",
+        }
+    }
+    /// Creates an enum from field names used in the ProtoBuf definition.
+    pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
+        match value {
+            "THREAD_SPAWN_EDGE_STATUS_UNSPECIFIED" => Some(Self::Unspecified),
+            "THREAD_SPAWN_EDGE_STATUS_OPEN" => Some(Self::Open),
+            "THREAD_SPAWN_EDGE_STATUS_CLOSED" => Some(Self::Closed),
+            _ => None,
+        }
+    }
+}
+/// Generated client implementations.
+pub mod agent_graph_store_client {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value
+    )]
+    use tonic::codegen::http::Uri;
+    use tonic::codegen::*;
+    #[derive(Debug, Clone)]
+    pub struct AgentGraphStoreClient<T> {
+        inner: tonic::client::Grpc<T>,
+    }
+    impl AgentGraphStoreClient<tonic::transport::Channel> {
+        /// Attempt to create a new client by connecting to a given endpoint.
+        pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
+        where
+            D: TryInto<tonic::transport::Endpoint>,
+            D::Error: Into<StdError>,
+        {
+            let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
+            Ok(Self::new(conn))
+        }
+    }
+    impl<T> AgentGraphStoreClient<T>
+    where
+        T: tonic::client::GrpcService<tonic::body::Body>,
+        T::Error: Into<StdError>,
+        T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
+        <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
+    {
+        pub fn new(inner: T) -> Self {
+            let inner = tonic::client::Grpc::new(inner);
+            Self { inner }
+        }
+        pub fn with_origin(inner: T, origin: Uri) -> Self {
+            let inner = tonic::client::Grpc::with_origin(inner, origin);
+            Self { inner }
+        }
+        pub fn with_interceptor<F>(
+            inner: T,
+            interceptor: F,
+        ) -> AgentGraphStoreClient<InterceptedService<T, F>>
+        where
+            F: tonic::service::Interceptor,
+            T::ResponseBody: Default,
+            T: tonic::codegen::Service<
+                    http::Request<tonic::body::Body>,
+                    Response = http::Response<
+                        <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
+                    >,
+                >,
+            <T as tonic::codegen::Service<http::Request<tonic::body::Body>>>::Error:
+                Into<StdError> + std::marker::Send + std::marker::Sync,
+        {
+            AgentGraphStoreClient::new(InterceptedService::new(inner, interceptor))
+        }
+        /// Compress requests with the given encoding.
+        ///
+        /// This requires the server to support it otherwise it might respond with an
+        /// error.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.send_compressed(encoding);
+            self
+        }
+        /// Enable decompressing responses.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.inner = self.inner.accept_compressed(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_decoding_message_size(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.inner = self.inner.max_encoding_message_size(limit);
+            self
+        }
+        pub async fn upsert_thread_spawn_edge(
+            &mut self,
+            request: impl tonic::IntoRequest<super::UpsertThreadSpawnEdgeRequest>,
+        ) -> std::result::Result<tonic::Response<super::Empty>, tonic::Status> {
+            self.inner.ready().await.map_err(|e| {
+                tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
+            })?;
+            let codec = tonic_prost::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/codex.agent_graph_store.v1.AgentGraphStore/UpsertThreadSpawnEdge",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "codex.agent_graph_store.v1.AgentGraphStore",
+                "UpsertThreadSpawnEdge",
+            ));
+            self.inner.unary(req, path, codec).await
+        }
+        pub async fn set_thread_spawn_edge_status(
+            &mut self,
+            request: impl tonic::IntoRequest<super::SetThreadSpawnEdgeStatusRequest>,
+        ) -> std::result::Result<tonic::Response<super::Empty>, tonic::Status> {
+            self.inner.ready().await.map_err(|e| {
+                tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
+            })?;
+            let codec = tonic_prost::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/codex.agent_graph_store.v1.AgentGraphStore/SetThreadSpawnEdgeStatus",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "codex.agent_graph_store.v1.AgentGraphStore",
+                "SetThreadSpawnEdgeStatus",
+            ));
+            self.inner.unary(req, path, codec).await
+        }
+        pub async fn list_thread_spawn_children(
+            &mut self,
+            request: impl tonic::IntoRequest<super::ListThreadSpawnChildrenRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::ListThreadSpawnChildrenResponse>,
+            tonic::Status,
+        > {
+            self.inner.ready().await.map_err(|e| {
+                tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
+            })?;
+            let codec = tonic_prost::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/codex.agent_graph_store.v1.AgentGraphStore/ListThreadSpawnChildren",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "codex.agent_graph_store.v1.AgentGraphStore",
+                "ListThreadSpawnChildren",
+            ));
+            self.inner.unary(req, path, codec).await
+        }
+        pub async fn list_thread_spawn_descendants(
+            &mut self,
+            request: impl tonic::IntoRequest<super::ListThreadSpawnDescendantsRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::ListThreadSpawnDescendantsResponse>,
+            tonic::Status,
+        > {
+            self.inner.ready().await.map_err(|e| {
+                tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
+            })?;
+            let codec = tonic_prost::ProstCodec::default();
+            let path = http::uri::PathAndQuery::from_static(
+                "/codex.agent_graph_store.v1.AgentGraphStore/ListThreadSpawnDescendants",
+            );
+            let mut req = request.into_request();
+            req.extensions_mut().insert(GrpcMethod::new(
+                "codex.agent_graph_store.v1.AgentGraphStore",
+                "ListThreadSpawnDescendants",
+            ));
+            self.inner.unary(req, path, codec).await
+        }
+    }
+}
+/// Generated server implementations.
+pub mod agent_graph_store_server {
+    #![allow(
+        unused_variables,
+        dead_code,
+        missing_docs,
+        clippy::wildcard_imports,
+        clippy::let_unit_value
+    )]
+    use tonic::codegen::*;
+    /// Generated trait containing gRPC methods that should be implemented for use with AgentGraphStoreServer.
+    #[async_trait]
+    pub trait AgentGraphStore: std::marker::Send + std::marker::Sync + 'static {
+        async fn upsert_thread_spawn_edge(
+            &self,
+            request: tonic::Request<super::UpsertThreadSpawnEdgeRequest>,
+        ) -> std::result::Result<tonic::Response<super::Empty>, tonic::Status>;
+        async fn set_thread_spawn_edge_status(
+            &self,
+            request: tonic::Request<super::SetThreadSpawnEdgeStatusRequest>,
+        ) -> std::result::Result<tonic::Response<super::Empty>, tonic::Status>;
+        async fn list_thread_spawn_children(
+            &self,
+            request: tonic::Request<super::ListThreadSpawnChildrenRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::ListThreadSpawnChildrenResponse>,
+            tonic::Status,
+        >;
+        async fn list_thread_spawn_descendants(
+            &self,
+            request: tonic::Request<super::ListThreadSpawnDescendantsRequest>,
+        ) -> std::result::Result<
+            tonic::Response<super::ListThreadSpawnDescendantsResponse>,
+            tonic::Status,
+        >;
+    }
+    #[derive(Debug)]
+    pub struct AgentGraphStoreServer<T> {
+        inner: Arc<T>,
+        accept_compression_encodings: EnabledCompressionEncodings,
+        send_compression_encodings: EnabledCompressionEncodings,
+        max_decoding_message_size: Option<usize>,
+        max_encoding_message_size: Option<usize>,
+    }
+    impl<T> AgentGraphStoreServer<T> {
+        pub fn new(inner: T) -> Self {
+            Self::from_arc(Arc::new(inner))
+        }
+        pub fn from_arc(inner: Arc<T>) -> Self {
+            Self {
+                inner,
+                accept_compression_encodings: Default::default(),
+                send_compression_encodings: Default::default(),
+                max_decoding_message_size: None,
+                max_encoding_message_size: None,
+            }
+        }
+        pub fn with_interceptor<F>(inner: T, interceptor: F) -> InterceptedService<Self, F>
+        where
+            F: tonic::service::Interceptor,
+        {
+            InterceptedService::new(Self::new(inner), interceptor)
+        }
+        /// Enable decompressing requests with the given encoding.
+        #[must_use]
+        pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.accept_compression_encodings.enable(encoding);
+            self
+        }
+        /// Compress responses with the given encoding, if the client supports it.
+        #[must_use]
+        pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
+            self.send_compression_encodings.enable(encoding);
+            self
+        }
+        /// Limits the maximum size of a decoded message.
+        ///
+        /// Default: `4MB`
+        #[must_use]
+        pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
+            self.max_decoding_message_size = Some(limit);
+            self
+        }
+        /// Limits the maximum size of an encoded message.
+        ///
+        /// Default: `usize::MAX`
+        #[must_use]
+        pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
+            self.max_encoding_message_size = Some(limit);
+            self
+        }
+    }
+    impl<T, B> tonic::codegen::Service<http::Request<B>> for AgentGraphStoreServer<T>
+    where
+        T: AgentGraphStore,
+        B: Body + std::marker::Send + 'static,
+        B::Error: Into<StdError> + std::marker::Send + 'static,
+    {
+        type Response = http::Response<tonic::body::Body>;
+        type Error = std::convert::Infallible;
+        type Future = BoxFuture<Self::Response, Self::Error>;
+        fn poll_ready(
+            &mut self,
+            _cx: &mut Context<'_>,
+        ) -> Poll<std::result::Result<(), Self::Error>> {
+            Poll::Ready(Ok(()))
+        }
+        fn call(&mut self, req: http::Request<B>) -> Self::Future {
+            match req.uri().path() {
+                "/codex.agent_graph_store.v1.AgentGraphStore/UpsertThreadSpawnEdge" => {
+                    #[allow(non_camel_case_types)]
+                    struct UpsertThreadSpawnEdgeSvc<T: AgentGraphStore>(pub Arc<T>);
+                    impl<T: AgentGraphStore>
+                        tonic::server::UnaryService<super::UpsertThreadSpawnEdgeRequest>
+                        for UpsertThreadSpawnEdgeSvc<T>
+                    {
+                        type Response = super::Empty;
+                        type Future = BoxFuture<tonic::Response<Self::Response>, tonic::Status>;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::UpsertThreadSpawnEdgeRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as AgentGraphStore>::upsert_thread_spawn_edge(&inner, request)
+                                    .await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = UpsertThreadSpawnEdgeSvc(inner);
+                        let codec = tonic_prost::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
+                "/codex.agent_graph_store.v1.AgentGraphStore/SetThreadSpawnEdgeStatus" => {
+                    #[allow(non_camel_case_types)]
+                    struct SetThreadSpawnEdgeStatusSvc<T: AgentGraphStore>(pub Arc<T>);
+                    impl<T: AgentGraphStore>
+                        tonic::server::UnaryService<super::SetThreadSpawnEdgeStatusRequest>
+                        for SetThreadSpawnEdgeStatusSvc<T>
+                    {
+                        type Response = super::Empty;
+                        type Future = BoxFuture<tonic::Response<Self::Response>, tonic::Status>;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::SetThreadSpawnEdgeStatusRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as AgentGraphStore>::set_thread_spawn_edge_status(
+                                    &inner, request,
+                                )
+                                .await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = SetThreadSpawnEdgeStatusSvc(inner);
+                        let codec = tonic_prost::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
+                "/codex.agent_graph_store.v1.AgentGraphStore/ListThreadSpawnChildren" => {
+                    #[allow(non_camel_case_types)]
+                    struct ListThreadSpawnChildrenSvc<T: AgentGraphStore>(pub Arc<T>);
+                    impl<T: AgentGraphStore>
+                        tonic::server::UnaryService<super::ListThreadSpawnChildrenRequest>
+                        for ListThreadSpawnChildrenSvc<T>
+                    {
+                        type Response = super::ListThreadSpawnChildrenResponse;
+                        type Future = BoxFuture<tonic::Response<Self::Response>, tonic::Status>;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::ListThreadSpawnChildrenRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as AgentGraphStore>::list_thread_spawn_children(&inner, request)
+                                    .await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = ListThreadSpawnChildrenSvc(inner);
+                        let codec = tonic_prost::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
+                "/codex.agent_graph_store.v1.AgentGraphStore/ListThreadSpawnDescendants" => {
+                    #[allow(non_camel_case_types)]
+                    struct ListThreadSpawnDescendantsSvc<T: AgentGraphStore>(pub Arc<T>);
+                    impl<T: AgentGraphStore>
+                        tonic::server::UnaryService<super::ListThreadSpawnDescendantsRequest>
+                        for ListThreadSpawnDescendantsSvc<T>
+                    {
+                        type Response = super::ListThreadSpawnDescendantsResponse;
+                        type Future = BoxFuture<tonic::Response<Self::Response>, tonic::Status>;
+                        fn call(
+                            &mut self,
+                            request: tonic::Request<super::ListThreadSpawnDescendantsRequest>,
+                        ) -> Self::Future {
+                            let inner = Arc::clone(&self.0);
+                            let fut = async move {
+                                <T as AgentGraphStore>::list_thread_spawn_descendants(
+                                    &inner, request,
+                                )
+                                .await
+                            };
+                            Box::pin(fut)
+                        }
+                    }
+                    let accept_compression_encodings = self.accept_compression_encodings;
+                    let send_compression_encodings = self.send_compression_encodings;
+                    let max_decoding_message_size = self.max_decoding_message_size;
+                    let max_encoding_message_size = self.max_encoding_message_size;
+                    let inner = self.inner.clone();
+                    let fut = async move {
+                        let method = ListThreadSpawnDescendantsSvc(inner);
+                        let codec = tonic_prost::ProstCodec::default();
+                        let mut grpc = tonic::server::Grpc::new(codec)
+                            .apply_compression_config(
+                                accept_compression_encodings,
+                                send_compression_encodings,
+                            )
+                            .apply_max_message_size_config(
+                                max_decoding_message_size,
+                                max_encoding_message_size,
+                            );
+                        let res = grpc.unary(method, req).await;
+                        Ok(res)
+                    };
+                    Box::pin(fut)
+                }
+                _ => Box::pin(async move {
+                    let mut response = http::Response::new(tonic::body::Body::default());
+                    let headers = response.headers_mut();
+                    headers.insert(
+                        tonic::Status::GRPC_STATUS,
+                        (tonic::Code::Unimplemented as i32).into(),
+                    );
+                    headers.insert(
+                        http::header::CONTENT_TYPE,
+                        tonic::metadata::GRPC_CONTENT_TYPE,
+                    );
+                    Ok(response)
+                }),
+            }
+        }
+    }
+    impl<T> Clone for AgentGraphStoreServer<T> {
+        fn clone(&self) -> Self {
+            let inner = self.inner.clone();
+            Self {
+                inner,
+                accept_compression_encodings: self.accept_compression_encodings,
+                send_compression_encodings: self.send_compression_encodings,
+                max_decoding_message_size: self.max_decoding_message_size,
+                max_encoding_message_size: self.max_encoding_message_size,
+            }
+        }
+    }
+    /// Generated gRPC service name
+    pub const SERVICE_NAME: &str = "codex.agent_graph_store.v1.AgentGraphStore";
+    impl<T> tonic::server::NamedService for AgentGraphStoreServer<T> {
+        const NAME: &'static str = SERVICE_NAME;
+    }
+}

codex-rs/agent-identity/Cargo.toml

@@ -19,7 +19,6 @@ chrono = { workspace = true }
 codex-protocol = { workspace = true }
 crypto_box = { workspace = true }
 ed25519-dalek = { workspace = true }
-jsonwebtoken = { workspace = true }
 rand = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }
 serde = { workspace = true, features = ["derive"] }

codex-rs/agent-identity/src/lib.rs

@@ -8,7 +8,6 @@ use base64::engine::general_purpose::STANDARD as BASE64_STANDARD;
 use base64::engine::general_purpose::URL_SAFE_NO_PAD;
 use chrono::SecondsFormat;
 use chrono::Utc;
-use codex_protocol::auth::PlanType as AuthPlanType;
 use codex_protocol::protocol::SessionSource;
 use crypto_box::SecretKey as Curve25519SecretKey;
 use ed25519_dalek::Signer as _;
@@ -16,24 +15,14 @@ use ed25519_dalek::SigningKey;
 use ed25519_dalek::VerifyingKey;
 use ed25519_dalek::pkcs8::DecodePrivateKey;
 use ed25519_dalek::pkcs8::EncodePrivateKey;
-use jsonwebtoken::Algorithm;
-use jsonwebtoken::DecodingKey;
-use jsonwebtoken::Validation;
-use jsonwebtoken::decode;
-use jsonwebtoken::decode_header;
-use jsonwebtoken::jwk::JwkSet;
 use rand::TryRngCore;
 use rand::rngs::OsRng;
 use serde::Deserialize;
 use serde::Serialize;
-use serde::de::DeserializeOwned;
 use sha2::Digest as _;
 use sha2::Sha512;
 
 const AGENT_TASK_REGISTRATION_TIMEOUT: Duration = Duration::from_secs(30);
-const AGENT_IDENTITY_JWKS_TIMEOUT: Duration = Duration::from_secs(10);
-const AGENT_IDENTITY_JWT_AUDIENCE: &str = "codex-app-server";
-const AGENT_IDENTITY_JWT_ISSUER: &str = "https://chatgpt.com/codex-backend/agent-identity";
 
 /// Stored key material for a registered agent identity.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -61,22 +50,6 @@ pub struct GeneratedAgentKeyMaterial {
     pub public_key_ssh: String,
 }
 
-/// Claims carried by an Agent Identity JWT.
-#[derive(Clone, Debug, Deserialize, PartialEq, Eq)]
-pub struct AgentIdentityJwtClaims {
-    pub iss: String,
-    pub aud: String,
-    pub iat: usize,
-    pub exp: usize,
-    pub agent_runtime_id: String,
-    pub agent_private_key: String,
-    pub account_id: String,
-    pub chatgpt_user_id: String,
-    pub email: String,
-    pub plan_type: AuthPlanType,
-    pub chatgpt_account_is_fedramp: bool,
-}
-
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 struct AgentAssertionEnvelope {
     agent_runtime_id: String,
@@ -125,65 +98,6 @@ pub fn authorization_header_for_agent_task(
     Ok(format!("AgentAssertion {serialized_assertion}"))
 }
 
-pub async fn fetch_agent_identity_jwks(
-    client: &reqwest::Client,
-    chatgpt_base_url: &str,
-) -> Result<JwkSet> {
-    let response = client
-        .get(agent_identity_jwks_url(chatgpt_base_url))
-        .timeout(AGENT_IDENTITY_JWKS_TIMEOUT)
-        .send()
-        .await
-        .context("failed to request agent identity JWKS")?
-        .error_for_status()
-        .context("agent identity JWKS endpoint returned an error")?;
-
-    response
-        .json()
-        .await
-        .context("failed to decode agent identity JWKS")
-}
-
-pub fn decode_agent_identity_jwt(
-    jwt: &str,
-    jwks: Option<&JwkSet>,
-) -> Result<AgentIdentityJwtClaims> {
-    let Some(jwks) = jwks else {
-        return decode_agent_identity_jwt_payload(jwt);
-    };
-
-    let header = decode_header(jwt).context("failed to decode agent identity JWT header")?;
-    let kid = header
-        .kid
-        .context("agent identity JWT header does not include a kid")?;
-    let jwk = jwks
-        .find(&kid)
-        .with_context(|| format!("agent identity JWT kid {kid} is not trusted"))?;
-    let decoding_key = DecodingKey::from_jwk(jwk).context("failed to build JWT decoding key")?;
-    let mut validation = Validation::new(Algorithm::RS256);
-    validation.set_audience(&[AGENT_IDENTITY_JWT_AUDIENCE]);
-    validation.set_issuer(&[AGENT_IDENTITY_JWT_ISSUER]);
-    validation.required_spec_claims.insert("iss".to_string());
-    validation.required_spec_claims.insert("aud".to_string());
-    decode::<AgentIdentityJwtClaims>(jwt, &decoding_key, &validation)
-        .map(|data| data.claims)
-        .context("failed to verify agent identity JWT")
-}
-
-fn decode_agent_identity_jwt_payload<T: DeserializeOwned>(jwt: &str) -> Result<T> {
-    let mut parts = jwt.split('.');
-    let (_header_b64, payload_b64, _sig_b64) = match (parts.next(), parts.next(), parts.next()) {
-        (Some(h), Some(p), Some(s)) if !h.is_empty() && !p.is_empty() && !s.is_empty() => (h, p, s),
-        _ => anyhow::bail!("invalid agent identity JWT format"),
-    };
-    anyhow::ensure!(parts.next().is_none(), "invalid agent identity JWT format");
-
-    let payload_bytes = URL_SAFE_NO_PAD
-        .decode(payload_b64)
-        .context("agent identity JWT payload is not valid base64url")?;
-    serde_json::from_slice(&payload_bytes).context("agent identity JWT payload is not valid JSON")
-}
-
 pub fn sign_task_registration_payload(
     key: AgentIdentityKey<'_>,
     timestamp: &str,
@@ -203,27 +117,19 @@ pub async fn register_agent_task(
         signature: sign_task_registration_payload(key, &timestamp)?,
         timestamp,
     };
-    let url = agent_task_registration_url(chatgpt_base_url, key.agent_runtime_id);
 
     let response = client
-        .post(url)
+        .post(agent_task_registration_url(
+            chatgpt_base_url,
+            key.agent_runtime_id,
+        ))
         .timeout(AGENT_TASK_REGISTRATION_TIMEOUT)
         .json(&request)
         .send()
         .await
-        .context("failed to register agent task")?;
-    if !response.status().is_success() {
-        let status = response.status();
-        let body = response.text().await.unwrap_or_default();
-        let body = if body.len() > 512 {
-            format!("{}...", body.chars().take(512).collect::<String>())
-        } else {
-            body
-        };
-        anyhow::bail!("failed to register agent task with status {status}: {body}");
-    }
-
-    let response = response
+        .context("failed to register agent task")?
+        .error_for_status()
+        .context("failed to register agent task")?
         .json()
         .await
         .context("failed to decode agent task registration response")?;
@@ -311,15 +217,6 @@ pub fn agent_identity_biscuit_url(chatgpt_base_url: &str) -> String {
     format!("{trimmed}/authenticate_app_v2")
 }
 
-pub fn agent_identity_jwks_url(chatgpt_base_url: &str) -> String {
-    let trimmed = chatgpt_base_url.trim_end_matches('/');
-    if trimmed.contains("/backend-api") {
-        format!("{trimmed}/wham/agent-identities/jwks")
-    } else {
-        format!("{trimmed}/agent-identities/jwks")
-    }
-}
-
 pub fn agent_identity_request_id() -> Result<String> {
     let mut request_id_bytes = [0u8; 16];
     OsRng
@@ -331,6 +228,29 @@ pub fn agent_identity_request_id() -> Result<String> {
     ))
 }
 
+pub fn normalize_chatgpt_base_url(chatgpt_base_url: &str) -> String {
+    let mut base_url = chatgpt_base_url.trim_end_matches('/').to_string();
+    for suffix in [
+        "/wham/remote/control/server/enroll",
+        "/wham/remote/control/server",
+    ] {
+        if let Some(stripped) = base_url.strip_suffix(suffix) {
+            base_url = stripped.to_string();
+            break;
+        }
+    }
+    if let Some(stripped) = base_url.strip_suffix("/codex") {
+        base_url = stripped.to_string();
+    }
+    if (base_url.starts_with("https://chatgpt.com")
+        || base_url.starts_with("https://chat.openai.com"))
+        && !base_url.contains("/backend-api")
+    {
+        base_url = format!("{base_url}/backend-api");
+    }
+    base_url
+}
+
 pub fn build_abom(session_source: SessionSource) -> AgentBillOfMaterials {
     AgentBillOfMaterials {
         agent_version: env!("CARGO_PKG_VERSION").to_string(),
@@ -340,7 +260,6 @@ pub fn build_abom(session_source: SessionSource) -> AgentBillOfMaterials {
             | SessionSource::Exec
             | SessionSource::Mcp
             | SessionSource::Custom(_)
-            | SessionSource::Internal(_)
             | SessionSource::SubAgent(_)
             | SessionSource::Unknown => "codex-cli".to_string(),
         },
@@ -404,12 +323,8 @@ mod tests {
     use base64::Engine as _;
     use ed25519_dalek::Signature;
     use ed25519_dalek::Verifier as _;
-    use jsonwebtoken::EncodingKey;
-    use jsonwebtoken::Header;
     use pretty_assertions::assert_eq;
 
-    use codex_protocol::auth::KnownPlan;
-
     use super::*;
 
     #[test]
@@ -490,248 +405,10 @@ mod tests {
     }
 
     #[test]
-    fn decode_agent_identity_jwt_reads_claims() {
-        let jwt = jwt_with_payload(serde_json::json!({
-            "iss": AGENT_IDENTITY_JWT_ISSUER,
-            "aud": AGENT_IDENTITY_JWT_AUDIENCE,
-            "iat": 1_700_000_000usize,
-            "exp": 4_000_000_000usize,
-            "agent_runtime_id": "agent-runtime-id",
-            "agent_private_key": "private-key",
-            "account_id": "account-id",
-            "chatgpt_user_id": "user-id",
-            "email": "user@example.com",
-            "plan_type": "pro",
-            "chatgpt_account_is_fedramp": false,
-        }));
-
-        let claims = decode_agent_identity_jwt(&jwt, /*jwks*/ None).expect("JWT should decode");
-
+    fn normalize_chatgpt_base_url_strips_codex_before_backend_api() {
         assert_eq!(
-            claims,
-            AgentIdentityJwtClaims {
-                iss: AGENT_IDENTITY_JWT_ISSUER.to_string(),
-                aud: AGENT_IDENTITY_JWT_AUDIENCE.to_string(),
-                iat: 1_700_000_000,
-                exp: 4_000_000_000,
-                agent_runtime_id: "agent-runtime-id".to_string(),
-                agent_private_key: "private-key".to_string(),
-                account_id: "account-id".to_string(),
-                chatgpt_user_id: "user-id".to_string(),
-                email: "user@example.com".to_string(),
-                plan_type: AuthPlanType::Known(KnownPlan::Pro),
-                chatgpt_account_is_fedramp: false,
-            }
+            normalize_chatgpt_base_url("https://chatgpt.com/codex"),
+            "https://chatgpt.com/backend-api"
         );
     }
-
-    #[test]
-    fn decode_agent_identity_jwt_maps_raw_plan_aliases() {
-        let jwt = jwt_with_payload(serde_json::json!({
-            "iss": AGENT_IDENTITY_JWT_ISSUER,
-            "aud": AGENT_IDENTITY_JWT_AUDIENCE,
-            "iat": 1_700_000_000usize,
-            "exp": 4_000_000_000usize,
-            "agent_runtime_id": "agent-runtime-id",
-            "agent_private_key": "private-key",
-            "account_id": "account-id",
-            "chatgpt_user_id": "user-id",
-            "email": "user@example.com",
-            "plan_type": "hc",
-            "chatgpt_account_is_fedramp": false,
-        }));
-
-        let claims = decode_agent_identity_jwt(&jwt, /*jwks*/ None).expect("JWT should decode");
-
-        assert_eq!(claims.plan_type, AuthPlanType::Known(KnownPlan::Enterprise));
-    }
-
-    #[test]
-    fn decode_agent_identity_jwt_verifies_when_jwks_is_present() {
-        let jwks = test_jwks("test-key");
-        let claims = AgentIdentityJwtClaims {
-            iss: AGENT_IDENTITY_JWT_ISSUER.to_string(),
-            aud: AGENT_IDENTITY_JWT_AUDIENCE.to_string(),
-            iat: 1_700_000_000,
-            exp: 4_000_000_000,
-            agent_runtime_id: "agent-runtime-id".to_string(),
-            agent_private_key: "private-key".to_string(),
-            account_id: "account-id".to_string(),
-            chatgpt_user_id: "user-id".to_string(),
-            email: "user@example.com".to_string(),
-            plan_type: AuthPlanType::Known(KnownPlan::Pro),
-            chatgpt_account_is_fedramp: false,
-        };
-        let jwt = jsonwebtoken::encode(
-            &test_jwt_header("test-key"),
-            &serde_json::json!({
-                "iss": claims.iss,
-                "aud": claims.aud,
-                "iat": claims.iat,
-                "exp": claims.exp,
-                "agent_runtime_id": claims.agent_runtime_id,
-                "agent_private_key": claims.agent_private_key,
-                "account_id": claims.account_id,
-                "chatgpt_user_id": claims.chatgpt_user_id,
-                "email": claims.email,
-                "plan_type": "pro",
-                "chatgpt_account_is_fedramp": claims.chatgpt_account_is_fedramp,
-            }),
-            &test_rsa_encoding_key(),
-        )
-        .expect("JWT should encode");
-
-        let expected_claims = AgentIdentityJwtClaims {
-            iss: AGENT_IDENTITY_JWT_ISSUER.to_string(),
-            aud: AGENT_IDENTITY_JWT_AUDIENCE.to_string(),
-            iat: 1_700_000_000,
-            exp: 4_000_000_000,
-            agent_runtime_id: "agent-runtime-id".to_string(),
-            agent_private_key: "private-key".to_string(),
-            account_id: "account-id".to_string(),
-            chatgpt_user_id: "user-id".to_string(),
-            email: "user@example.com".to_string(),
-            plan_type: AuthPlanType::Known(KnownPlan::Pro),
-            chatgpt_account_is_fedramp: false,
-        };
-        assert_eq!(
-            decode_agent_identity_jwt(&jwt, Some(&jwks)).expect("JWT should verify"),
-            expected_claims
-        );
-    }
-
-    #[test]
-    fn decode_agent_identity_jwt_rejects_untrusted_kid() {
-        let jwks = test_jwks("other-key");
-
-        let jwt = jsonwebtoken::encode(
-            &test_jwt_header("test-key"),
-            &serde_json::json!({
-                "iss": AGENT_IDENTITY_JWT_ISSUER,
-                "aud": AGENT_IDENTITY_JWT_AUDIENCE,
-                "iat": 1_700_000_000,
-                "exp": 4_000_000_000usize,
-                "agent_runtime_id": "agent-runtime-id",
-                "agent_private_key": "private-key",
-                "account_id": "account-id",
-                "chatgpt_user_id": "user-id",
-                "email": "user@example.com",
-                "plan_type": "pro",
-                "chatgpt_account_is_fedramp": false,
-            }),
-            &test_rsa_encoding_key(),
-        )
-        .expect("JWT should encode");
-
-        decode_agent_identity_jwt(&jwt, Some(&jwks)).expect_err("JWT should not verify");
-    }
-
-    #[test]
-    fn decode_agent_identity_jwt_requires_issuer_and_audience() {
-        let jwks = test_jwks("test-key");
-        let jwt = jsonwebtoken::encode(
-            &test_jwt_header("test-key"),
-            &serde_json::json!({
-                "iat": 1_700_000_000,
-                "exp": 4_000_000_000usize,
-                "agent_runtime_id": "agent-runtime-id",
-                "agent_private_key": "private-key",
-                "account_id": "account-id",
-                "chatgpt_user_id": "user-id",
-                "email": "user@example.com",
-                "plan_type": "pro",
-                "chatgpt_account_is_fedramp": false,
-            }),
-            &test_rsa_encoding_key(),
-        )
-        .expect("JWT should encode");
-
-        decode_agent_identity_jwt(&jwt, Some(&jwks)).expect_err("JWT should not verify");
-    }
-
-    fn test_jwt_header(kid: &str) -> Header {
-        let mut header = Header::new(Algorithm::RS256);
-        header.kid = Some(kid.to_string());
-        header
-    }
-
-    fn test_rsa_encoding_key() -> EncodingKey {
-        EncodingKey::from_rsa_pem(
-            br#"-----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDWpAXYypOsYAwO
-bvBduMk/mxaoYDze0AZSzaSzLuIlcsl2EKDgC3AabhIWXh/qTGEJLOU3VB1e5mO9
-FPbBlmIZSL3FQTbyt/hYutPFKfCou5PLmScw/TzILS3/RhT8UY9kxxZvXiEbTki9
-mvxRuZFpVqDFJHwfitIjKZGhXDCYVKurPTrxetYZJg0h8sQBLKjkZ0BqqaTUkAsg
-0eBgZAlXEzG3By8PGhUqYLt6W1Q3KYw0FmGy/gTyzH1g0ukGgSJvOd8SkNT8MbOs
-zl5kKxDNqpuEE6UZ3jbuJ+5382d31w+rOAJRzbf7QVdI9+luCSwJcDACYPQ4WNBa
-uCpV0ovpAgMBAAECggEAVu84LwZdqYN9XpswX8VoPYrjMm9IODapWQBRpQFoNyK2
-1ksF3bjEPvA2Azk8U/l7k+vLKw22l6lY3EyRZPcz5GnB8xLm3ogE3mtNOp4yCyVu
-RxhQ91aaN7mU17/a4BdorLi2LYVCg3zBmYociD1Q2AluNGsCmwPu+K7tfR2J0Sg8
-NjqiTbDG1XDpR/icwgC9t6vh8lZpCHDhF4tbQfLLVLeA/OdcuzXDyMCXbmdVIdBQ
-rm4aIFmr2e1/2ctTbCg85S6AGFTH+pSLjrwTzyvf+F6NW5uNjLQAQLFj+EznBDxj
-Xdx90cySrjsKK6PVWQF4RiTvkSW8eWL7R6B2FZbGwQKBgQDuVQRj72hWloR7mbEL
-aUEEv3pIXTMXWEsoMBNczos/1L1RnAN1AI44TurznasPZAWvQj+kVbLDR+TAeZrL
-iA8HIWswQUI18hFmgKzSkwIXGtubcKVrgsKeS4lMDKCM/Ef6WAYdeq6ronoY5lCN
-YrJFmGp81W5zcV7lyiycgbSiGwKBgQDmjWYf6pZjrK7Z+OJ3X1AZfi2vss15SCvL
-3fPgzIDbViztpGyQhc3DQZIsBNIu0xZp/veGce9TEeTds2ro9NfdJFeou8+fC7Pq
-sOsM3amGFFi+ZW/9BWyjZEM88bgWWAjqLHbpfHDxjAf5CSxddqxgHlbP0Ytyb1Vg
-gmPDn9YKSwKBgQDbTi3hC35WFuDHn0/zcSHcDZmnFuOZeqyFyV83yfMGhGrEuqvP
-sPgtRikajJ3IZsB4WZyYSidZXEFY/0z6NjOl2xF38MTNQPbT/FmK1q1Yt2UWrlv5
-BvSwlk87RG9D7C0LZo4R+D7cPoDdgqjiwMvMEIkEX5zn641oI1ZTmWKuuwKBgQCD
-KF+3unnRvHRAVoFnTZbA2fJdqMeRvogD04GhGlYX8V9f1hFY6nXTJaNlXVzA/J8c
-r8ra9kgjJuPfZ+ljG58OFFW2DRohLcQtuHYPfK6rMzoFHqnl9EcIcMp7ijuionR3
-29HOJFgQYgxLFXfit9d6WugiE+BTupiEbckZif13HwKBgE/lAlkVHP6YahOO2Ljc
-J1bwkqKZTB5dHolX9A58e/xXnfZ5P8f3Z83+Izap3FwqQulk7b1WO1MQcHuVg2NN
-5da0D4h2rYOXnbYIg0BVu4spQbaM6ewsp66b8+MzLOBvj8SzWdt1Oyw0q/MRyQAR
-8U4M2TSWCKUY/A6sT4W8+mT9
------END PRIVATE KEY-----"#,
-        )
-        .expect("test RSA key should parse")
-    }
-
-    fn test_jwks(kid: &str) -> jsonwebtoken::jwk::JwkSet {
-        serde_json::from_value(serde_json::json!({
-            "keys": [{
-                "kty": "RSA",
-                "kid": kid,
-                "use": "sig",
-                "alg": "RS256",
-                "n": "1qQF2MqTrGAMDm7wXbjJP5sWqGA83tAGUs2ksy7iJXLJdhCg4AtwGm4SFl4f6kxhCSzlN1QdXuZjvRT2wZZiGUi9xUE28rf4WLrTxSnwqLuTy5knMP08yC0t_0YU_FGPZMcWb14hG05IvZr8UbmRaVagxSR8H4rSIymRoVwwmFSrqz068XrWGSYNIfLEASyo5GdAaqmk1JALINHgYGQJVxMxtwcvDxoVKmC7eltUNymMNBZhsv4E8sx9YNLpBoEibznfEpDU_DGzrM5eZCsQzaqbhBOlGd427ifud_Nnd9cPqzgCUc23-0FXSPfpbgksCXAwAmD0OFjQWrgqVdKL6Q",
-                "e": "AQAB",
-            }]
-        }))
-        .expect("test JWKS should parse")
-    }
-
-    #[test]
-    fn agent_identity_jwks_url_uses_backend_api_base_url() {
-        assert_eq!(
-            agent_identity_jwks_url("https://chatgpt.com/backend-api"),
-            "https://chatgpt.com/backend-api/wham/agent-identities/jwks"
-        );
-        assert_eq!(
-            agent_identity_jwks_url("https://chatgpt.com/backend-api/"),
-            "https://chatgpt.com/backend-api/wham/agent-identities/jwks"
-        );
-    }
-
-    #[test]
-    fn agent_identity_jwks_url_uses_codex_api_base_url() {
-        assert_eq!(
-            agent_identity_jwks_url("http://localhost:8080/api/codex"),
-            "http://localhost:8080/api/codex/agent-identities/jwks"
-        );
-        assert_eq!(
-            agent_identity_jwks_url("http://localhost:8080/api/codex/"),
-            "http://localhost:8080/api/codex/agent-identities/jwks"
-        );
-    }
-
-    fn jwt_with_payload(payload: serde_json::Value) -> String {
-        let encode = |bytes: &[u8]| URL_SAFE_NO_PAD.encode(bytes);
-        let header_b64 = encode(br#"{"alg":"none","typ":"JWT"}"#);
-        let payload_b64 = encode(&serde_json::to_vec(&payload).expect("payload should serialize"));
-        let signature_b64 = encode(b"sig");
-        format!("{header_b64}.{payload_b64}.{signature_b64}")
-    }
 }

codex-rs/analytics/src/analytics_client_tests.rs

@@ -59,19 +59,18 @@ use codex_app_server_protocol::ApprovalsReviewer as AppServerApprovalsReviewer;
 use codex_app_server_protocol::AskForApproval as AppServerAskForApproval;
 use codex_app_server_protocol::ClientInfo;
 use codex_app_server_protocol::ClientRequest;
-use codex_app_server_protocol::ClientResponsePayload;
+use codex_app_server_protocol::ClientResponse;
 use codex_app_server_protocol::CodexErrorInfo;
 use codex_app_server_protocol::InitializeCapabilities;
 use codex_app_server_protocol::InitializeParams;
 use codex_app_server_protocol::JSONRPCErrorError;
 use codex_app_server_protocol::NonSteerableTurnKind;
+use codex_app_server_protocol::PermissionProfile as AppServerPermissionProfile;
 use codex_app_server_protocol::RequestId;
 use codex_app_server_protocol::SandboxPolicy as AppServerSandboxPolicy;
 use codex_app_server_protocol::ServerNotification;
 use codex_app_server_protocol::SessionSource as AppServerSessionSource;
 use codex_app_server_protocol::Thread;
-use codex_app_server_protocol::ThreadArchiveParams;
-use codex_app_server_protocol::ThreadArchiveResponse;
 use codex_app_server_protocol::ThreadResumeResponse;
 use codex_app_server_protocol::ThreadStartResponse;
 use codex_app_server_protocol::ThreadStatus as AppServerThreadStatus;
@@ -98,6 +97,7 @@ use codex_protocol::protocol::AskForApproval;
 use codex_protocol::protocol::HookEventName;
 use codex_protocol::protocol::HookRunStatus;
 use codex_protocol::protocol::HookSource;
+use codex_protocol::protocol::SandboxPolicy;
 use codex_protocol::protocol::SessionSource;
 use codex_protocol::protocol::SubAgentSource;
 use codex_protocol::protocol::TokenUsage;
@@ -141,25 +141,27 @@ fn sample_thread_with_source(
     }
 }
 
-fn sample_thread_start_response(
-    thread_id: &str,
-    ephemeral: bool,
-    model: &str,
-) -> ClientResponsePayload {
-    ClientResponsePayload::ThreadStart(ThreadStartResponse {
-        thread: sample_thread(thread_id, ephemeral),
-        model: model.to_string(),
-        model_provider: "openai".to_string(),
-        service_tier: None,
-        cwd: test_path_buf("/tmp").abs(),
-        instruction_sources: Vec::new(),
-        approval_policy: AppServerAskForApproval::OnFailure,
-        approvals_reviewer: AppServerApprovalsReviewer::User,
-        sandbox: AppServerSandboxPolicy::DangerFullAccess,
-        permission_profile: None,
-        active_permission_profile: None,
-        reasoning_effort: None,
-    })
+fn sample_thread_start_response(thread_id: &str, ephemeral: bool, model: &str) -> ClientResponse {
+    ClientResponse::ThreadStart {
+        request_id: RequestId::Integer(1),
+        response: ThreadStartResponse {
+            thread: sample_thread(thread_id, ephemeral),
+            model: model.to_string(),
+            model_provider: "openai".to_string(),
+            service_tier: None,
+            cwd: test_path_buf("/tmp").abs(),
+            instruction_sources: Vec::new(),
+            approval_policy: AppServerAskForApproval::OnFailure,
+            approvals_reviewer: AppServerApprovalsReviewer::User,
+            sandbox: AppServerSandboxPolicy::DangerFullAccess,
+            permission_profile: Some(sample_permission_profile()),
+            reasoning_effort: None,
+        },
+    }
+}
+
+fn sample_permission_profile() -> AppServerPermissionProfile {
+    CorePermissionProfile::from_legacy_sandbox_policy(&SandboxPolicy::DangerFullAccess).into()
 }
 
 fn sample_app_server_client_metadata() -> CodexAppServerClientMetadata {
@@ -181,11 +183,7 @@ fn sample_runtime_metadata() -> CodexRuntimeMetadata {
     }
 }
 
-fn sample_thread_resume_response(
-    thread_id: &str,
-    ephemeral: bool,
-    model: &str,
-) -> ClientResponsePayload {
+fn sample_thread_resume_response(thread_id: &str, ephemeral: bool, model: &str) -> ClientResponse {
     sample_thread_resume_response_with_source(
         thread_id,
         ephemeral,
@@ -199,21 +197,23 @@ fn sample_thread_resume_response_with_source(
     ephemeral: bool,
     model: &str,
     source: AppServerSessionSource,
-) -> ClientResponsePayload {
-    ClientResponsePayload::ThreadResume(ThreadResumeResponse {
-        thread: sample_thread_with_source(thread_id, ephemeral, source),
-        model: model.to_string(),
-        model_provider: "openai".to_string(),
-        service_tier: None,
-        cwd: test_path_buf("/tmp").abs(),
-        instruction_sources: Vec::new(),
-        approval_policy: AppServerAskForApproval::OnFailure,
-        approvals_reviewer: AppServerApprovalsReviewer::User,
-        sandbox: AppServerSandboxPolicy::DangerFullAccess,
-        permission_profile: None,
-        active_permission_profile: None,
-        reasoning_effort: None,
-    })
+) -> ClientResponse {
+    ClientResponse::ThreadResume {
+        request_id: RequestId::Integer(2),
+        response: ThreadResumeResponse {
+            thread: sample_thread_with_source(thread_id, ephemeral, source),
+            model: model.to_string(),
+            model_provider: "openai".to_string(),
+            service_tier: None,
+            cwd: test_path_buf("/tmp").abs(),
+            instruction_sources: Vec::new(),
+            approval_policy: AppServerAskForApproval::OnFailure,
+            approvals_reviewer: AppServerApprovalsReviewer::User,
+            sandbox: AppServerSandboxPolicy::DangerFullAccess,
+            permission_profile: Some(sample_permission_profile()),
+            reasoning_effort: None,
+        },
+    }
 }
 
 fn sample_turn_start_request(thread_id: &str, request_id: i64) -> ClientRequest {
@@ -235,18 +235,21 @@ fn sample_turn_start_request(thread_id: &str, request_id: i64) -> ClientRequest
     }
 }
 
-fn sample_turn_start_response(turn_id: &str) -> ClientResponsePayload {
-    ClientResponsePayload::TurnStart(codex_app_server_protocol::TurnStartResponse {
-        turn: Turn {
-            id: turn_id.to_string(),
-            items: vec![],
-            status: AppServerTurnStatus::InProgress,
-            error: None,
-            started_at: None,
-            completed_at: None,
-            duration_ms: None,
+fn sample_turn_start_response(turn_id: &str, request_id: i64) -> ClientResponse {
+    ClientResponse::TurnStart {
+        request_id: RequestId::Integer(request_id),
+        response: codex_app_server_protocol::TurnStartResponse {
+            turn: Turn {
+                id: turn_id.to_string(),
+                items: vec![],
+                status: AppServerTurnStatus::InProgress,
+                error: None,
+                started_at: None,
+                completed_at: None,
+                duration_ms: None,
+            },
         },
-    })
+    }
 }
 
 fn sample_turn_started_notification(thread_id: &str, turn_id: &str) -> ServerNotification {
@@ -312,8 +315,7 @@ fn sample_turn_resolved_config(turn_id: &str) -> TurnResolvedConfigFact {
         session_source: SessionSource::Exec,
         model: "gpt-5".to_string(),
         model_provider: "openai".to_string(),
-        permission_profile: CorePermissionProfile::read_only(),
-        permission_profile_cwd: PathBuf::from("/tmp"),
+        sandbox_policy: SandboxPolicy::new_read_only_policy(),
         reasoning_effort: None,
         reasoning_summary: None,
         service_tier: None,
@@ -350,10 +352,13 @@ fn sample_turn_steer_request(
     }
 }
 
-fn sample_turn_steer_response(turn_id: &str) -> ClientResponsePayload {
-    ClientResponsePayload::TurnSteer(TurnSteerResponse {
-        turn_id: turn_id.to_string(),
-    })
+fn sample_turn_steer_response(turn_id: &str, request_id: i64) -> ClientResponse {
+    ClientResponse::TurnSteer {
+        request_id: RequestId::Integer(request_id),
+        response: TurnSteerResponse {
+            turn_id: turn_id.to_string(),
+        },
+    }
 }
 
 fn no_active_turn_steer_error() -> JSONRPCErrorError {
@@ -418,7 +423,7 @@ async fn ingest_rejected_turn_steer(
     .await;
     reducer
         .ingest(
-            AnalyticsFact::ClientRequest {
+            AnalyticsFact::Request {
                 connection_id: 7,
                 request_id: RequestId::Integer(4),
                 request: Box::new(sample_turn_steer_request(
@@ -478,9 +483,8 @@ async fn ingest_turn_prerequisites(
         ingest_initialize(reducer, out).await;
         reducer
             .ingest(
-                AnalyticsFact::ClientResponse {
+                AnalyticsFact::Response {
                     connection_id: 7,
-                    request_id: RequestId::Integer(1),
                     response: Box::new(sample_thread_start_response(
                         "thread-2", /*ephemeral*/ false, "gpt-5",
                     )),
@@ -493,7 +497,7 @@ async fn ingest_turn_prerequisites(
 
     reducer
         .ingest(
-            AnalyticsFact::ClientRequest {
+            AnalyticsFact::Request {
                 connection_id: 7,
                 request_id: RequestId::Integer(3),
                 request: Box::new(sample_turn_start_request("thread-2", /*request_id*/ 3)),
@@ -503,10 +507,9 @@ async fn ingest_turn_prerequisites(
         .await;
     reducer
         .ingest(
-            AnalyticsFact::ClientResponse {
+            AnalyticsFact::Response {
                 connection_id: 7,
-                request_id: RequestId::Integer(3),
-                response: Box::new(sample_turn_start_response("turn-2")),
+                response: Box::new(sample_turn_start_response("turn-2", /*request_id*/ 3)),
             },
             out,
         )
@@ -856,9 +859,8 @@ async fn initialize_caches_client_and_thread_lifecycle_publishes_once_initialize
 
     reducer
         .ingest(
-            AnalyticsFact::ClientResponse {
+            AnalyticsFact::Response {
                 connection_id: 7,
-                request_id: RequestId::Integer(1),
                 response: Box::new(sample_thread_start_response(
                     "thread-no-client",
                     /*ephemeral*/ false,
@@ -901,9 +903,8 @@ async fn initialize_caches_client_and_thread_lifecycle_publishes_once_initialize
 
     reducer
         .ingest(
-            AnalyticsFact::ClientResponse {
+            AnalyticsFact::Response {
                 connection_id: 7,
-                request_id: RequestId::Integer(2),
                 response: Box::new(sample_thread_resume_response(
                     "thread-1", /*ephemeral*/ true, "gpt-5",
                 )),
@@ -950,65 +951,6 @@ async fn initialize_caches_client_and_thread_lifecycle_publishes_once_initialize
     );
 }
 
-#[tokio::test]
-async fn unrelated_client_requests_are_ignored_by_reducer() {
-    let mut reducer = AnalyticsReducer::default();
-    let mut events = Vec::new();
-
-    reducer
-        .ingest(
-            AnalyticsFact::ClientRequest {
-                connection_id: 7,
-                request_id: RequestId::Integer(3),
-                request: Box::new(ClientRequest::ThreadArchive {
-                    request_id: RequestId::Integer(3),
-                    params: ThreadArchiveParams {
-                        thread_id: "thread-2".to_string(),
-                    },
-                }),
-            },
-            &mut events,
-        )
-        .await;
-    reducer
-        .ingest(
-            AnalyticsFact::ClientResponse {
-                connection_id: 7,
-                request_id: RequestId::Integer(3),
-                response: Box::new(sample_turn_start_response("turn-2")),
-            },
-            &mut events,
-        )
-        .await;
-
-    assert!(
-        events.is_empty(),
-        "unrelated requests must not create pending turn state"
-    );
-}
-
-#[tokio::test]
-async fn unrelated_client_responses_are_ignored_by_reducer() {
-    let mut reducer = AnalyticsReducer::default();
-    let mut events = Vec::new();
-
-    ingest_initialize(&mut reducer, &mut events).await;
-    reducer
-        .ingest(
-            AnalyticsFact::ClientResponse {
-                connection_id: 7,
-                request_id: RequestId::Integer(9),
-                response: Box::new(ClientResponsePayload::ThreadArchive(
-                    ThreadArchiveResponse {},
-                )),
-            },
-            &mut events,
-        )
-        .await;
-
-    assert!(events.is_empty());
-}
-
 #[tokio::test]
 async fn compaction_event_ingests_custom_fact() {
     let mut reducer = AnalyticsReducer::default();
@@ -1041,9 +983,8 @@ async fn compaction_event_ingests_custom_fact() {
         .await;
     reducer
         .ingest(
-            AnalyticsFact::ClientResponse {
+            AnalyticsFact::Response {
                 connection_id: 7,
-                request_id: RequestId::Integer(2),
                 response: Box::new(sample_thread_resume_response_with_source(
                     "thread-1",
                     /*ephemeral*/ false,
@@ -1153,9 +1094,8 @@ async fn guardian_review_event_ingests_custom_fact_with_optional_target_item() {
         .await;
     reducer
         .ingest(
-            AnalyticsFact::ClientResponse {
+            AnalyticsFact::Response {
                 connection_id: 7,
-                request_id: RequestId::Integer(1),
                 response: Box::new(sample_thread_start_response(
                     "thread-guardian",
                     /*ephemeral*/ false,
@@ -1556,15 +1496,6 @@ fn hook_run_metadata_maps_sources_and_statuses() {
         },
     ))
     .expect("serialize project hook");
-    let cloud_requirements = serde_json::to_value(codex_hook_run_metadata(
-        &tracking,
-        HookRunFact {
-            event_name: HookEventName::Stop,
-            hook_source: HookSource::CloudRequirements,
-            status: HookRunStatus::Blocked,
-        },
-    ))
-    .expect("serialize cloud requirements hook");
     let unknown = serde_json::to_value(codex_hook_run_metadata(
         &tracking,
         HookRunFact {
@@ -1579,8 +1510,6 @@ fn hook_run_metadata_maps_sources_and_statuses() {
     assert_eq!(system["status"], "completed");
     assert_eq!(project["hook_source"], "project");
     assert_eq!(project["status"], "blocked");
-    assert_eq!(cloud_requirements["hook_source"], "cloud_requirements");
-    assert_eq!(cloud_requirements["status"], "blocked");
     assert_eq!(unknown["hook_source"], "unknown");
     assert_eq!(unknown["status"], "failed");
 }
@@ -1935,7 +1864,7 @@ async fn accepted_turn_steer_emits_expected_event() {
     .await;
     reducer
         .ingest(
-            AnalyticsFact::ClientRequest {
+            AnalyticsFact::Request {
                 connection_id: 7,
                 request_id: RequestId::Integer(4),
                 request: Box::new(sample_turn_steer_request(
@@ -1947,10 +1876,9 @@ async fn accepted_turn_steer_emits_expected_event() {
         .await;
     reducer
         .ingest(
-            AnalyticsFact::ClientResponse {
+            AnalyticsFact::Response {
                 connection_id: 7,
-                request_id: RequestId::Integer(4),
-                response: Box::new(sample_turn_steer_response("turn-2")),
+                response: Box::new(sample_turn_steer_response("turn-2", /*request_id*/ 4)),
             },
             &mut out,
         )
@@ -2090,7 +2018,7 @@ async fn turn_start_error_response_discards_pending_start_request() {
     ingest_initialize(&mut reducer, &mut out).await;
     reducer
         .ingest(
-            AnalyticsFact::ClientRequest {
+            AnalyticsFact::Request {
                 connection_id: 7,
                 request_id: RequestId::Integer(3),
                 request: Box::new(sample_turn_start_request("thread-2", /*request_id*/ 3)),
@@ -2114,10 +2042,9 @@ async fn turn_start_error_response_discards_pending_start_request() {
     // failed turn/start request and attach request-scoped connection metadata.
     reducer
         .ingest(
-            AnalyticsFact::ClientResponse {
+            AnalyticsFact::Response {
                 connection_id: 7,
-                request_id: RequestId::Integer(3),
-                response: Box::new(sample_turn_start_response("turn-2")),
+                response: Box::new(sample_turn_start_response("turn-2", /*request_id*/ 3)),
             },
             &mut out,
         )
@@ -2232,7 +2159,7 @@ async fn accepted_steers_increment_turn_steer_count() {
 
     reducer
         .ingest(
-            AnalyticsFact::ClientRequest {
+            AnalyticsFact::Request {
                 connection_id: 7,
                 request_id: RequestId::Integer(4),
                 request: Box::new(sample_turn_steer_request(
@@ -2244,10 +2171,9 @@ async fn accepted_steers_increment_turn_steer_count() {
         .await;
     reducer
         .ingest(
-            AnalyticsFact::ClientResponse {
+            AnalyticsFact::Response {
                 connection_id: 7,
-                request_id: RequestId::Integer(4),
-                response: Box::new(sample_turn_steer_response("turn-2")),
+                response: Box::new(sample_turn_steer_response("turn-2", /*request_id*/ 4)),
             },
             &mut out,
         )
@@ -2255,7 +2181,7 @@ async fn accepted_steers_increment_turn_steer_count() {
 
     reducer
         .ingest(
-            AnalyticsFact::ClientRequest {
+            AnalyticsFact::Request {
                 connection_id: 7,
                 request_id: RequestId::Integer(5),
                 request: Box::new(sample_turn_steer_request(
@@ -2279,7 +2205,7 @@ async fn accepted_steers_increment_turn_steer_count() {
 
     reducer
         .ingest(
-            AnalyticsFact::ClientRequest {
+            AnalyticsFact::Request {
                 connection_id: 7,
                 request_id: RequestId::Integer(6),
                 request: Box::new(sample_turn_steer_request(
@@ -2291,10 +2217,9 @@ async fn accepted_steers_increment_turn_steer_count() {
         .await;
     reducer
         .ingest(
-            AnalyticsFact::ClientResponse {
+            AnalyticsFact::Response {
                 connection_id: 7,
-                request_id: RequestId::Integer(6),
-                response: Box::new(sample_turn_steer_response("turn-2")),
+                response: Box::new(sample_turn_steer_response("turn-2", /*request_id*/ 6)),
             },
             &mut out,
         )

codex-rs/analytics/src/client.rs

@@ -22,13 +22,11 @@ use crate::facts::TurnResolvedConfigFact;
 use crate::facts::TurnTokenUsageFact;
 use crate::reducer::AnalyticsReducer;
 use codex_app_server_protocol::ClientRequest;
-use codex_app_server_protocol::ClientResponsePayload;
+use codex_app_server_protocol::ClientResponse;
 use codex_app_server_protocol::InitializeParams;
 use codex_app_server_protocol::JSONRPCErrorError;
 use codex_app_server_protocol::RequestId;
 use codex_app_server_protocol::ServerNotification;
-use codex_app_server_protocol::ServerRequest;
-use codex_app_server_protocol::ServerResponse;
 use codex_login::AuthManager;
 use codex_login::default_client::create_client;
 use codex_plugin::PluginTelemetryMetadata;
@@ -51,7 +49,8 @@ pub(crate) struct AnalyticsEventsQueue {
 
 #[derive(Clone)]
 pub struct AnalyticsEventsClient {
-    queue: Option<AnalyticsEventsQueue>,
+    queue: AnalyticsEventsQueue,
+    analytics_enabled: Option<bool>,
 }
 
 impl AnalyticsEventsQueue {
@@ -120,15 +119,11 @@ impl AnalyticsEventsClient {
         analytics_enabled: Option<bool>,
     ) -> Self {
         Self {
-            queue: (analytics_enabled != Some(false))
-                .then(|| AnalyticsEventsQueue::new(Arc::clone(&auth_manager), base_url)),
+            queue: AnalyticsEventsQueue::new(Arc::clone(&auth_manager), base_url),
+            analytics_enabled,
         }
     }
 
-    pub fn disabled() -> Self {
-        Self { queue: None }
-    }
-
     pub fn track_skill_invocations(
         &self,
         tracking: TrackEventsContext,
@@ -186,30 +181,16 @@ impl AnalyticsEventsClient {
         )));
     }
 
-    pub fn track_request(
-        &self,
-        connection_id: u64,
-        request_id: RequestId,
-        request: &ClientRequest,
-    ) {
-        if !matches!(
-            request,
-            ClientRequest::TurnStart { .. } | ClientRequest::TurnSteer { .. }
-        ) {
-            return;
-        }
-        self.record_fact(AnalyticsFact::ClientRequest {
+    pub fn track_request(&self, connection_id: u64, request_id: RequestId, request: ClientRequest) {
+        self.record_fact(AnalyticsFact::Request {
             connection_id,
             request_id,
-            request: Box::new(request.clone()),
+            request: Box::new(request),
         });
     }
 
     pub fn track_app_used(&self, tracking: TrackEventsContext, app: AppInvocation) {
-        let Some(queue) = self.queue.as_ref() else {
-            return;
-        };
-        if !queue.should_enqueue_app_used(&tracking, &app) {
+        if !self.queue.should_enqueue_app_used(&tracking, &app) {
             return;
         }
         self.record_fact(AnalyticsFact::Custom(CustomAnalyticsFact::AppUsed(
@@ -224,10 +205,7 @@ impl AnalyticsEventsClient {
     }
 
     pub fn track_plugin_used(&self, tracking: TrackEventsContext, plugin: PluginTelemetryMetadata) {
-        let Some(queue) = self.queue.as_ref() else {
-            return;
-        };
-        if !queue.should_enqueue_plugin_used(&tracking, &plugin) {
+        if !self.queue.should_enqueue_plugin_used(&tracking, &plugin) {
             return;
         }
         self.record_fact(AnalyticsFact::Custom(CustomAnalyticsFact::PluginUsed(
@@ -290,30 +268,15 @@ impl AnalyticsEventsClient {
     }
 
     pub(crate) fn record_fact(&self, input: AnalyticsFact) {
-        if let Some(queue) = self.queue.as_ref() {
-            queue.try_send(input);
-        }
-    }
-
-    pub fn track_response(
-        &self,
-        connection_id: u64,
-        request_id: RequestId,
-        response: ClientResponsePayload,
-    ) {
-        if !matches!(
-            response,
-            ClientResponsePayload::ThreadStart(_)
-                | ClientResponsePayload::ThreadResume(_)
-                | ClientResponsePayload::ThreadFork(_)
-                | ClientResponsePayload::TurnStart(_)
-                | ClientResponsePayload::TurnSteer(_)
-        ) {
+        if self.analytics_enabled == Some(false) {
             return;
         }
-        self.record_fact(AnalyticsFact::ClientResponse {
+        self.queue.try_send(input);
+    }
+
+    pub fn track_response(&self, connection_id: u64, response: ClientResponse) {
+        self.record_fact(AnalyticsFact::Response {
             connection_id,
-            request_id,
             response: Box::new(response),
         });
     }
@@ -336,19 +299,6 @@ impl AnalyticsEventsClient {
     pub fn track_notification(&self, notification: ServerNotification) {
         self.record_fact(AnalyticsFact::Notification(Box::new(notification)));
     }
-
-    pub fn track_server_request(&self, connection_id: u64, request: ServerRequest) {
-        self.record_fact(AnalyticsFact::ServerRequest {
-            connection_id,
-            request: Box::new(request),
-        });
-    }
-
-    pub fn track_server_response(&self, response: ServerResponse) {
-        self.record_fact(AnalyticsFact::ServerResponse {
-            response: Box::new(response),
-        });
-    }
 }
 
 async fn send_track_events(
@@ -391,7 +341,3 @@ async fn send_track_events(
         }
     }
 }
-
-#[cfg(test)]
-#[path = "client_tests.rs"]
-mod tests;

codex-rs/analytics/src/client_tests.rs

@@ -1,221 +0,0 @@
-use super::AnalyticsEventsClient;
-use super::AnalyticsEventsQueue;
-use crate::facts::AnalyticsFact;
-use codex_app_server_protocol::ApprovalsReviewer as AppServerApprovalsReviewer;
-use codex_app_server_protocol::AskForApproval as AppServerAskForApproval;
-use codex_app_server_protocol::ClientRequest;
-use codex_app_server_protocol::ClientResponsePayload;
-use codex_app_server_protocol::PermissionProfile as AppServerPermissionProfile;
-use codex_app_server_protocol::RequestId;
-use codex_app_server_protocol::SandboxPolicy as AppServerSandboxPolicy;
-use codex_app_server_protocol::SessionSource as AppServerSessionSource;
-use codex_app_server_protocol::Thread;
-use codex_app_server_protocol::ThreadArchiveParams;
-use codex_app_server_protocol::ThreadArchiveResponse;
-use codex_app_server_protocol::ThreadForkResponse;
-use codex_app_server_protocol::ThreadResumeResponse;
-use codex_app_server_protocol::ThreadStartResponse;
-use codex_app_server_protocol::ThreadStatus as AppServerThreadStatus;
-use codex_app_server_protocol::Turn;
-use codex_app_server_protocol::TurnStartParams;
-use codex_app_server_protocol::TurnStartResponse;
-use codex_app_server_protocol::TurnStatus as AppServerTurnStatus;
-use codex_app_server_protocol::TurnSteerParams;
-use codex_app_server_protocol::TurnSteerResponse;
-use codex_protocol::models::PermissionProfile as CorePermissionProfile;
-use codex_utils_absolute_path::test_support::PathBufExt;
-use codex_utils_absolute_path::test_support::test_path_buf;
-use std::collections::HashSet;
-use std::sync::Arc;
-use std::sync::Mutex;
-use tokio::sync::mpsc;
-use tokio::sync::mpsc::error::TryRecvError;
-
-fn client_with_receiver() -> (AnalyticsEventsClient, mpsc::Receiver<AnalyticsFact>) {
-    let (sender, receiver) = mpsc::channel(8);
-    let queue = AnalyticsEventsQueue {
-        sender,
-        app_used_emitted_keys: Arc::new(Mutex::new(HashSet::new())),
-        plugin_used_emitted_keys: Arc::new(Mutex::new(HashSet::new())),
-    };
-    (AnalyticsEventsClient { queue: Some(queue) }, receiver)
-}
-
-fn sample_turn_start_request() -> ClientRequest {
-    ClientRequest::TurnStart {
-        request_id: RequestId::Integer(1),
-        params: TurnStartParams {
-            thread_id: "thread-1".to_string(),
-            input: Vec::new(),
-            ..Default::default()
-        },
-    }
-}
-
-fn sample_turn_steer_request() -> ClientRequest {
-    ClientRequest::TurnSteer {
-        request_id: RequestId::Integer(2),
-        params: TurnSteerParams {
-            thread_id: "thread-1".to_string(),
-            expected_turn_id: "turn-1".to_string(),
-            input: Vec::new(),
-            responsesapi_client_metadata: None,
-        },
-    }
-}
-
-fn sample_thread_archive_request() -> ClientRequest {
-    ClientRequest::ThreadArchive {
-        request_id: RequestId::Integer(3),
-        params: ThreadArchiveParams {
-            thread_id: "thread-1".to_string(),
-        },
-    }
-}
-
-fn sample_thread(thread_id: &str) -> Thread {
-    Thread {
-        id: thread_id.to_string(),
-        forked_from_id: None,
-        preview: "first prompt".to_string(),
-        ephemeral: false,
-        model_provider: "openai".to_string(),
-        created_at: 1,
-        updated_at: 2,
-        status: AppServerThreadStatus::Idle,
-        path: None,
-        cwd: test_path_buf("/tmp").abs(),
-        cli_version: "0.0.0".to_string(),
-        source: AppServerSessionSource::Exec,
-        agent_nickname: None,
-        agent_role: None,
-        git_info: None,
-        name: None,
-        turns: Vec::new(),
-    }
-}
-
-fn sample_permission_profile() -> AppServerPermissionProfile {
-    CorePermissionProfile::Disabled.into()
-}
-
-fn sample_thread_start_response() -> ClientResponsePayload {
-    ClientResponsePayload::ThreadStart(ThreadStartResponse {
-        thread: sample_thread("thread-1"),
-        model: "gpt-5".to_string(),
-        model_provider: "openai".to_string(),
-        service_tier: None,
-        cwd: test_path_buf("/tmp").abs(),
-        instruction_sources: Vec::new(),
-        approval_policy: AppServerAskForApproval::OnFailure,
-        approvals_reviewer: AppServerApprovalsReviewer::User,
-        sandbox: AppServerSandboxPolicy::DangerFullAccess,
-        permission_profile: Some(sample_permission_profile()),
-        active_permission_profile: None,
-        reasoning_effort: None,
-    })
-}
-
-fn sample_thread_resume_response() -> ClientResponsePayload {
-    ClientResponsePayload::ThreadResume(ThreadResumeResponse {
-        thread: sample_thread("thread-2"),
-        model: "gpt-5".to_string(),
-        model_provider: "openai".to_string(),
-        service_tier: None,
-        cwd: test_path_buf("/tmp").abs(),
-        instruction_sources: Vec::new(),
-        approval_policy: AppServerAskForApproval::OnFailure,
-        approvals_reviewer: AppServerApprovalsReviewer::User,
-        sandbox: AppServerSandboxPolicy::DangerFullAccess,
-        permission_profile: Some(sample_permission_profile()),
-        active_permission_profile: None,
-        reasoning_effort: None,
-    })
-}
-
-fn sample_thread_fork_response() -> ClientResponsePayload {
-    ClientResponsePayload::ThreadFork(ThreadForkResponse {
-        thread: sample_thread("thread-3"),
-        model: "gpt-5".to_string(),
-        model_provider: "openai".to_string(),
-        service_tier: None,
-        cwd: test_path_buf("/tmp").abs(),
-        instruction_sources: Vec::new(),
-        approval_policy: AppServerAskForApproval::OnFailure,
-        approvals_reviewer: AppServerApprovalsReviewer::User,
-        sandbox: AppServerSandboxPolicy::DangerFullAccess,
-        permission_profile: Some(sample_permission_profile()),
-        active_permission_profile: None,
-        reasoning_effort: None,
-    })
-}
-
-fn sample_turn_start_response() -> ClientResponsePayload {
-    ClientResponsePayload::TurnStart(TurnStartResponse {
-        turn: Turn {
-            id: "turn-1".to_string(),
-            items: Vec::new(),
-            status: AppServerTurnStatus::InProgress,
-            error: None,
-            started_at: None,
-            completed_at: None,
-            duration_ms: None,
-        },
-    })
-}
-
-fn sample_turn_steer_response() -> ClientResponsePayload {
-    ClientResponsePayload::TurnSteer(TurnSteerResponse {
-        turn_id: "turn-2".to_string(),
-    })
-}
-
-#[test]
-fn track_request_only_enqueues_analytics_relevant_requests() {
-    let (client, mut receiver) = client_with_receiver();
-
-    for (request_id, request) in [
-        (RequestId::Integer(1), sample_turn_start_request()),
-        (RequestId::Integer(2), sample_turn_steer_request()),
-    ] {
-        client.track_request(/*connection_id*/ 7, request_id, &request);
-        assert!(matches!(
-            receiver.try_recv(),
-            Ok(AnalyticsFact::ClientRequest { .. })
-        ));
-    }
-
-    let ignored_request = sample_thread_archive_request();
-    client.track_request(
-        /*connection_id*/ 7,
-        RequestId::Integer(3),
-        &ignored_request,
-    );
-    assert!(matches!(receiver.try_recv(), Err(TryRecvError::Empty)));
-}
-
-#[test]
-fn track_response_only_enqueues_analytics_relevant_responses() {
-    let (client, mut receiver) = client_with_receiver();
-
-    for (request_id, response) in [
-        (RequestId::Integer(1), sample_thread_start_response()),
-        (RequestId::Integer(2), sample_thread_resume_response()),
-        (RequestId::Integer(3), sample_thread_fork_response()),
-        (RequestId::Integer(4), sample_turn_start_response()),
-        (RequestId::Integer(5), sample_turn_steer_response()),
-    ] {
-        client.track_response(/*connection_id*/ 7, request_id, response);
-        assert!(matches!(
-            receiver.try_recv(),
-            Ok(AnalyticsFact::ClientResponse { .. })
-        ));
-    }
-
-    client.track_response(
-        /*connection_id*/ 7,
-        RequestId::Integer(6),
-        ClientResponsePayload::ThreadArchive(ThreadArchiveResponse {}),
-    );
-    assert!(matches!(receiver.try_recv(), Err(TryRecvError::Empty)));
-}

codex-rs/analytics/src/events.rs

@@ -684,8 +684,6 @@ fn analytics_hook_source(source: HookSource) -> &'static str {
         HookSource::Project => "project",
         HookSource::Mdm => "mdm",
         HookSource::SessionFlags => "session_flags",
-        HookSource::Plugin => "plugin",
-        HookSource::CloudRequirements => "cloud_requirements",
         HookSource::LegacyManagedConfigFile => "legacy_managed_config_file",
         HookSource::LegacyManagedConfigMdm => "legacy_managed_config_mdm",
         HookSource::Unknown => "unknown",

codex-rs/analytics/src/facts.rs

@@ -2,25 +2,23 @@ use crate::events::AppServerRpcTransport;
 use crate::events::CodexRuntimeMetadata;
 use crate::events::GuardianReviewEventParams;
 use codex_app_server_protocol::ClientRequest;
-use codex_app_server_protocol::ClientResponsePayload;
+use codex_app_server_protocol::ClientResponse;
 use codex_app_server_protocol::InitializeParams;
 use codex_app_server_protocol::JSONRPCErrorError;
 use codex_app_server_protocol::RequestId;
 use codex_app_server_protocol::ServerNotification;
-use codex_app_server_protocol::ServerRequest;
-use codex_app_server_protocol::ServerResponse;
 use codex_plugin::PluginTelemetryMetadata;
 use codex_protocol::config_types::ApprovalsReviewer;
 use codex_protocol::config_types::ModeKind;
 use codex_protocol::config_types::Personality;
 use codex_protocol::config_types::ReasoningSummary;
 use codex_protocol::config_types::ServiceTier;
-use codex_protocol::models::PermissionProfile;
 use codex_protocol::openai_models::ReasoningEffort;
 use codex_protocol::protocol::AskForApproval;
 use codex_protocol::protocol::HookEventName;
 use codex_protocol::protocol::HookRunStatus;
 use codex_protocol::protocol::HookSource;
+use codex_protocol::protocol::SandboxPolicy;
 use codex_protocol::protocol::SessionSource;
 use codex_protocol::protocol::SkillScope;
 use codex_protocol::protocol::SubAgentSource;
@@ -64,8 +62,7 @@ pub struct TurnResolvedConfigFact {
     pub session_source: SessionSource,
     pub model: String,
     pub model_provider: String,
-    pub permission_profile: PermissionProfile,
-    pub permission_profile_cwd: PathBuf,
+    pub sandbox_policy: SandboxPolicy,
     pub reasoning_effort: Option<ReasoningEffort>,
     pub reasoning_summary: Option<ReasoningSummary>,
     pub service_tier: Option<ServiceTier>,
@@ -274,15 +271,14 @@ pub(crate) enum AnalyticsFact {
         runtime: CodexRuntimeMetadata,
         rpc_transport: AppServerRpcTransport,
     },
-    ClientRequest {
+    Request {
         connection_id: u64,
         request_id: RequestId,
         request: Box<ClientRequest>,
     },
-    ClientResponse {
+    Response {
         connection_id: u64,
-        request_id: RequestId,
-        response: Box<ClientResponsePayload>,
+        response: Box<ClientResponse>,
     },
     ErrorResponse {
         connection_id: u64,
@@ -290,13 +286,6 @@ pub(crate) enum AnalyticsFact {
         error: JSONRPCErrorError,
         error_type: Option<AnalyticsJsonRpcError>,
     },
-    ServerRequest {
-        connection_id: u64,
-        request: Box<ServerRequest>,
-    },
-    ServerResponse {
-        response: Box<ServerResponse>,
-    },
     Notification(Box<ServerNotification>),
     // Facts that do not naturally exist on the app-server protocol surface, or
     // would require non-trivial protocol reshaping on this branch.

codex-rs/analytics/src/reducer.rs

@@ -61,7 +61,7 @@ use codex_login::default_client::originator;
 use codex_protocol::config_types::ModeKind;
 use codex_protocol::config_types::Personality;
 use codex_protocol::config_types::ReasoningSummary;
-use codex_protocol::models::PermissionProfile;
+use codex_protocol::protocol::SandboxPolicy;
 use codex_protocol::protocol::SessionSource;
 use codex_protocol::protocol::SkillScope;
 use codex_protocol::protocol::TokenUsage;
@@ -106,7 +106,6 @@ impl ThreadMetadataState {
             | SessionSource::Exec
             | SessionSource::Mcp
             | SessionSource::Custom(_)
-            | SessionSource::Internal(_)
             | SessionSource::Unknown => (None, None),
         };
         Self {
@@ -172,21 +171,18 @@ impl AnalyticsReducer {
                     rpc_transport,
                 );
             }
-            AnalyticsFact::ClientRequest {
+            AnalyticsFact::Request {
                 connection_id,
                 request_id,
                 request,
             } => {
                 self.ingest_request(connection_id, request_id, *request);
             }
-            AnalyticsFact::ClientResponse {
+            AnalyticsFact::Response {
                 connection_id,
-                request_id,
                 response,
             } => {
-                if let Some(response) = response.into_client_response(request_id) {
-                    self.ingest_response(connection_id, response, out);
-                }
+                self.ingest_response(connection_id, *response, out);
             }
             AnalyticsFact::ErrorResponse {
                 connection_id,
@@ -199,13 +195,6 @@ impl AnalyticsReducer {
             AnalyticsFact::Notification(notification) => {
                 self.ingest_notification(*notification, out);
             }
-            AnalyticsFact::ServerRequest {
-                connection_id: _connection_id,
-                request: _request,
-            } => {}
-            AnalyticsFact::ServerResponse {
-                response: _response,
-            } => {}
             AnalyticsFact::Custom(input) => match input {
                 CustomAnalyticsFact::SubAgentThreadStarted(input) => {
                     self.ingest_subagent_thread_started(input, out);
@@ -895,8 +884,7 @@ fn codex_turn_event_params(
         session_source: _session_source,
         model,
         model_provider,
-        permission_profile,
-        permission_profile_cwd,
+        sandbox_policy,
         reasoning_effort,
         reasoning_summary,
         service_tier,
@@ -921,10 +909,7 @@ fn codex_turn_event_params(
         parent_thread_id: thread_metadata.parent_thread_id.clone(),
         model: Some(model),
         model_provider,
-        sandbox_policy: Some(sandbox_policy_mode(
-            &permission_profile,
-            permission_profile_cwd.as_path(),
-        )),
+        sandbox_policy: Some(sandbox_policy_mode(&sandbox_policy)),
         reasoning_effort: reasoning_effort.map(|value| value.to_string()),
         reasoning_summary: reasoning_summary_mode(reasoning_summary),
         service_tier: service_tier
@@ -969,27 +954,12 @@ fn codex_turn_event_params(
     }
 }
 
-fn sandbox_policy_mode(permission_profile: &PermissionProfile, cwd: &Path) -> &'static str {
-    match permission_profile {
-        PermissionProfile::Disabled => "full_access",
-        PermissionProfile::External { .. } => "external_sandbox",
-        PermissionProfile::Managed { .. } => {
-            let file_system_policy = permission_profile.file_system_sandbox_policy();
-            if file_system_policy.has_full_disk_write_access() {
-                if permission_profile.network_sandbox_policy().is_enabled() {
-                    "full_access"
-                } else {
-                    "custom_permissions"
-                }
-            } else if file_system_policy
-                .get_writable_roots_with_cwd(cwd)
-                .is_empty()
-            {
-                "read_only"
-            } else {
-                "workspace_write"
-            }
-        }
+fn sandbox_policy_mode(sandbox_policy: &SandboxPolicy) -> &'static str {
+    match sandbox_policy {
+        SandboxPolicy::DangerFullAccess => "full_access",
+        SandboxPolicy::ReadOnly { .. } => "read_only",
+        SandboxPolicy::WorkspaceWrite { .. } => "workspace_write",
+        SandboxPolicy::ExternalSandbox { .. } => "external_sandbox",
     }
 }
 
@@ -1080,25 +1050,3 @@ pub(crate) fn normalize_path_for_skill_id(
         _ => resolved_path.to_string_lossy().replace('\\', "/"),
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use codex_protocol::models::SandboxEnforcement;
-    use codex_protocol::permissions::FileSystemSandboxPolicy;
-    use codex_protocol::permissions::NetworkSandboxPolicy;
-
-    #[test]
-    fn managed_full_disk_with_restricted_network_reports_custom_permissions() {
-        let permission_profile = PermissionProfile::from_runtime_permissions_with_enforcement(
-            SandboxEnforcement::Managed,
-            &FileSystemSandboxPolicy::unrestricted(),
-            NetworkSandboxPolicy::Restricted,
-        );
-
-        assert_eq!(
-            sandbox_policy_mode(&permission_profile, Path::new("/")),
-            "custom_permissions"
-        );
-    }
-}

codex-rs/app-server-client/src/lib.rs

@@ -41,12 +41,12 @@ use codex_app_server_protocol::Result as JsonRpcResult;
 use codex_app_server_protocol::ServerNotification;
 use codex_app_server_protocol::ServerRequest;
 use codex_arg0::Arg0DispatchPaths;
-use codex_config::CloudRequirementsLoader;
-use codex_config::LoaderOverrides;
 use codex_config::NoopThreadConfigLoader;
 use codex_config::RemoteThreadConfigLoader;
 use codex_config::ThreadConfigLoader;
 use codex_core::config::Config;
+use codex_core::config_loader::CloudRequirementsLoader;
+use codex_core::config_loader::LoaderOverrides;
 pub use codex_exec_server::EnvironmentManager;
 pub use codex_exec_server::EnvironmentManagerArgs;
 pub use codex_exec_server::ExecServerRuntimePaths;
@@ -1396,55 +1396,6 @@ mod tests {
         client.shutdown().await.expect("shutdown should complete");
     }
 
-    #[tokio::test]
-    async fn remote_typed_request_accepts_large_single_frame_response() {
-        let padding = "x".repeat((17 << 20) + 1024);
-        let websocket_url = start_test_remote_server(move |mut websocket| async move {
-            expect_remote_initialize(&mut websocket).await;
-            let JSONRPCMessage::Request(request) = read_websocket_message(&mut websocket).await
-            else {
-                panic!("expected account/read request");
-            };
-            assert_eq!(request.method, "account/read");
-            write_websocket_message(
-                &mut websocket,
-                JSONRPCMessage::Response(JSONRPCResponse {
-                    id: request.id,
-                    result: serde_json::json!({
-                        "account": null,
-                        "requiresOpenaiAuth": false,
-                        "padding": padding,
-                    }),
-                }),
-            )
-            .await;
-            websocket.close(None).await.expect("close should succeed");
-        })
-        .await;
-        let client = RemoteAppServerClient::connect(test_remote_connect_args(websocket_url))
-            .await
-            .expect("remote client should connect");
-
-        let response: GetAccountResponse = client
-            .request_typed(ClientRequest::GetAccount {
-                request_id: RequestId::Integer(1),
-                params: codex_app_server_protocol::GetAccountParams {
-                    refresh_token: false,
-                },
-            })
-            .await
-            .expect("large typed request should succeed");
-        assert_eq!(
-            response,
-            GetAccountResponse {
-                account: None,
-                requires_openai_auth: false,
-            }
-        );
-
-        client.shutdown().await.expect("shutdown should complete");
-    }
-
     #[tokio::test]
     async fn remote_connect_includes_auth_header_when_configured() {
         let auth_token = "remote-bearer-token".to_string();
@@ -2029,17 +1980,14 @@ mod tests {
     #[tokio::test]
     async fn runtime_start_args_forward_environment_manager() {
         let config = Arc::new(build_test_config().await);
-        let environment_manager = Arc::new(
-            EnvironmentManager::create_for_tests(
-                Some("ws://127.0.0.1:8765".to_string()),
-                ExecServerRuntimePaths::new(
-                    std::env::current_exe().expect("current exe"),
-                    /*codex_linux_sandbox_exe*/ None,
-                )
-                .expect("runtime paths"),
+        let environment_manager = Arc::new(EnvironmentManager::new(EnvironmentManagerArgs {
+            exec_server_url: Some("ws://127.0.0.1:8765".to_string()),
+            local_runtime_paths: ExecServerRuntimePaths::new(
+                std::env::current_exe().expect("current exe"),
+                /*codex_linux_sandbox_exe*/ None,
             )
-            .await,
-        );
+            .expect("runtime paths"),
+        }));
 
         let runtime_args = InProcessClientStartArgs {
             arg0_paths: Arg0DispatchPaths::default(),

codex-rs/app-server-client/src/remote.rs

@@ -45,18 +45,16 @@ use tokio::sync::oneshot;
 use tokio::time::timeout;
 use tokio_tungstenite::MaybeTlsStream;
 use tokio_tungstenite::WebSocketStream;
-use tokio_tungstenite::connect_async_with_config;
+use tokio_tungstenite::connect_async;
 use tokio_tungstenite::tungstenite::Message;
 use tokio_tungstenite::tungstenite::client::IntoClientRequest;
 use tokio_tungstenite::tungstenite::http::HeaderValue;
 use tokio_tungstenite::tungstenite::http::header::AUTHORIZATION;
-use tokio_tungstenite::tungstenite::protocol::WebSocketConfig;
 use tracing::warn;
 use url::Url;
 
 const CONNECT_TIMEOUT: Duration = Duration::from_secs(10);
 const INITIALIZE_TIMEOUT: Duration = Duration::from_secs(10);
-const REMOTE_APP_SERVER_MAX_WEBSOCKET_MESSAGE_SIZE: usize = 128 << 20;
 
 #[derive(Debug, Clone)]
 pub struct RemoteAppServerConnectArgs {
@@ -172,32 +170,20 @@ impl RemoteAppServerClient {
             request.headers_mut().insert(AUTHORIZATION, header_value);
         }
         ensure_rustls_crypto_provider();
-        // Remote resume responses can legitimately carry large thread histories.
-        // Keep a bounded cap, but raise it above tungstenite's 16 MiB frame default.
-        let websocket_config = WebSocketConfig::default()
-            .max_frame_size(Some(REMOTE_APP_SERVER_MAX_WEBSOCKET_MESSAGE_SIZE))
-            .max_message_size(Some(REMOTE_APP_SERVER_MAX_WEBSOCKET_MESSAGE_SIZE));
-        let stream = timeout(
-            CONNECT_TIMEOUT,
-            connect_async_with_config(
-                request,
-                Some(websocket_config),
-                /*disable_nagle*/ false,
-            ),
-        )
-        .await
-        .map_err(|_| {
-            IoError::new(
-                ErrorKind::TimedOut,
-                format!("timed out connecting to remote app server at `{websocket_url}`"),
-            )
-        })?
-        .map(|(stream, _response)| stream)
-        .map_err(|err| {
-            IoError::other(format!(
-                "failed to connect to remote app server at `{websocket_url}`: {err}"
-            ))
-        })?;
+        let stream = timeout(CONNECT_TIMEOUT, connect_async(request))
+            .await
+            .map_err(|_| {
+                IoError::new(
+                    ErrorKind::TimedOut,
+                    format!("timed out connecting to remote app server at `{websocket_url}`"),
+                )
+            })?
+            .map(|(stream, _response)| stream)
+            .map_err(|err| {
+                IoError::other(format!(
+                    "failed to connect to remote app server at `{websocket_url}`: {err}"
+                ))
+            })?;
         let mut stream = stream;
         let pending_events = initialize_remote_connection(
             &mut stream,
@@ -212,7 +198,6 @@ impl RemoteAppServerClient {
         let worker_handle = tokio::spawn(async move {
             let mut pending_requests =
                 HashMap::<RequestId, oneshot::Sender<IoResult<RequestResult>>>::new();
-            let mut worker_exit_error: Option<(ErrorKind, String)> = None;
             loop {
                 tokio::select! {
                     command = command_rx.recv() => {
@@ -239,19 +224,17 @@ impl RemoteAppServerClient {
                                 .await
                                 {
                                     let err_message = err.to_string();
-                                    let message = format!(
-                                        "remote app server at `{websocket_url}` write failed: {err_message}"
-                                    );
                                     if let Some(response_tx) = pending_requests.remove(&request_id) {
                                         let _ = response_tx.send(Err(err));
                                     }
                                     let _ = deliver_event(
                                         &event_tx,
                                         AppServerEvent::Disconnected {
-                                            message: message.clone(),
+                                            message: format!(
+                                                "remote app server at `{websocket_url}` write failed: {err_message}"
+                                            ),
                                         },
                                     );
-                                    worker_exit_error = Some((ErrorKind::BrokenPipe, message));
                                     break;
                                 }
                             }
@@ -368,34 +351,28 @@ impl RemoteAppServerClient {
                                                 .await
                                                 {
                                                     let err_message = reject_err.to_string();
-                                                    let message = format!(
-                                                        "remote app server at `{websocket_url}` write failed: {err_message}"
-                                                    );
                                                     let _ = deliver_event(
                                                         &event_tx,
                                                         AppServerEvent::Disconnected {
-                                                            message: message.clone(),
+                                                            message: format!(
+                                                                "remote app server at `{websocket_url}` write failed: {err_message}"
+                                                            ),
                                                         },
                                                     );
-                                                    worker_exit_error =
-                                                        Some((ErrorKind::BrokenPipe, message));
                                                     break;
                                                 }
                                             }
                                         }
                                     }
                                     Err(err) => {
-                                        let message = format!(
-                                            "remote app server at `{websocket_url}` sent invalid JSON-RPC: {err}"
-                                        );
                                         let _ = deliver_event(
                                             &event_tx,
                                             AppServerEvent::Disconnected {
-                                                message: message.clone(),
+                                                message: format!(
+                                                    "remote app server at `{websocket_url}` sent invalid JSON-RPC: {err}"
+                                                ),
                                             },
                                         );
-                                        worker_exit_error =
-                                            Some((ErrorKind::InvalidData, message));
                                         break;
                                     }
                                 }
@@ -406,19 +383,14 @@ impl RemoteAppServerClient {
                                     .map(|frame| frame.reason.to_string())
                                     .filter(|reason| !reason.is_empty())
                                     .unwrap_or_else(|| "connection closed".to_string());
-                                let message = format!(
-                                    "remote app server at `{websocket_url}` disconnected: {reason}"
-                                );
                                 let _ = deliver_event(
                                     &event_tx,
                                     AppServerEvent::Disconnected {
-                                        message: message.clone(),
+                                        message: format!(
+                                            "remote app server at `{websocket_url}` disconnected: {reason}"
+                                        ),
                                     },
                                 );
-                                worker_exit_error = Some((
-                                    ErrorKind::ConnectionAborted,
-                                    message,
-                                ));
                                 break;
                             }
                             Some(Ok(Message::Binary(_)))
@@ -426,29 +398,25 @@ impl RemoteAppServerClient {
                             | Some(Ok(Message::Pong(_)))
                             | Some(Ok(Message::Frame(_))) => {}
                             Some(Err(err)) => {
-                                let message = format!(
-                                    "remote app server at `{websocket_url}` transport failed: {err}"
-                                );
                                 let _ = deliver_event(
                                     &event_tx,
                                     AppServerEvent::Disconnected {
-                                        message: message.clone(),
+                                        message: format!(
+                                            "remote app server at `{websocket_url}` transport failed: {err}"
+                                        ),
                                     },
                                 );
-                                worker_exit_error = Some((ErrorKind::InvalidData, message));
                                 break;
                             }
                             None => {
-                                let message = format!(
-                                    "remote app server at `{websocket_url}` closed the connection"
-                                );
                                 let _ = deliver_event(
                                     &event_tx,
                                     AppServerEvent::Disconnected {
-                                        message: message.clone(),
+                                        message: format!(
+                                            "remote app server at `{websocket_url}` closed the connection"
+                                        ),
                                     },
                                 );
-                                worker_exit_error = Some((ErrorKind::UnexpectedEof, message));
                                 break;
                             }
                         }
@@ -456,14 +424,12 @@ impl RemoteAppServerClient {
                 }
             }
 
-            let (err_kind, err_message) = worker_exit_error.unwrap_or_else(|| {
-                (
-                    ErrorKind::BrokenPipe,
-                    "remote app-server worker channel is closed".to_string(),
-                )
-            });
+            let err = IoError::new(
+                ErrorKind::BrokenPipe,
+                "remote app-server worker channel is closed",
+            );
             for (_, response_tx) in pending_requests {
-                let _ = response_tx.send(Err(IoError::new(err_kind, err_message.clone())));
+                let _ = response_tx.send(Err(IoError::new(err.kind(), err.to_string())));
             }
         });
 

codex-rs/app-server-protocol/schema/json/ClientRequest.json

@@ -218,6 +218,17 @@
             "null"
           ]
         },
+        "permissionProfile": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/PermissionProfile"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "Optional full permissions profile for this command.\n\nDefaults to the user's configured permissions when omitted. Cannot be combined with `sandboxPolicy`."
+        },
         "processId": {
           "description": "Optional client-supplied, connection-scoped process id.\n\nRequired for `tty`, `streamStdin`, `streamStdoutStderr`, and follow-up `command/exec/write`, `command/exec/resize`, and `command/exec/terminate` calls. When omitted, buffered execution gets an internal id that is not exposed to the client.",
           "type": [
@@ -354,17 +365,6 @@
       ],
       "type": "object"
     },
-    "CommandMigration": {
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
-    },
     "ConfigBatchWriteParams": {
       "properties": {
         "edits": {
@@ -860,11 +860,7 @@
         "CONFIG",
         "SKILLS",
         "PLUGINS",
-        "MCP_SERVER_CONFIG",
-        "SUBAGENTS",
-        "HOOKS",
-        "COMMANDS",
-        "SESSIONS"
+        "MCP_SERVER_CONFIG"
       ],
       "type": "string"
     },
@@ -1032,6 +1028,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {
@@ -1404,27 +1415,36 @@
       },
       "type": "object"
     },
-    "HookMigration": {
+    "GhostCommit": {
+      "description": "Details of a ghost commit created from a repository state.",
       "properties": {
-        "name": {
+        "id": {
           "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
-    },
-    "HooksListParams": {
-      "properties": {
-        "cwds": {
-          "description": "When empty, defaults to the current session working directory.",
+        },
+        "parent": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "preexisting_untracked_dirs": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
+        "preexisting_untracked_files": {
           "items": {
             "type": "string"
           },
           "type": "array"
         }
       },
+      "required": [
+        "id",
+        "preexisting_untracked_dirs",
+        "preexisting_untracked_files"
+      ],
       "type": "object"
     },
     "ImageDetail": {
@@ -1598,9 +1618,6 @@
         },
         {
           "properties": {
-            "codexStreamlinedLogin": {
-              "type": "boolean"
-            },
             "type": {
               "enum": [
                 "chatgpt"
@@ -1736,17 +1753,6 @@
       ],
       "type": "object"
     },
-    "McpServerMigration": {
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
-    },
     "McpServerOauthLoginParams": {
       "properties": {
         "name": {
@@ -1830,49 +1836,16 @@
     },
     "MigrationDetails": {
       "properties": {
-        "commands": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/CommandMigration"
-          },
-          "type": "array"
-        },
-        "hooks": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/HookMigration"
-          },
-          "type": "array"
-        },
-        "mcpServers": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/McpServerMigration"
-          },
-          "type": "array"
-        },
         "plugins": {
-          "default": [],
           "items": {
             "$ref": "#/definitions/PluginsMigration"
           },
           "type": "array"
-        },
-        "sessions": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/SessionMigration"
-          },
-          "type": "array"
-        },
-        "subagents": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/SubagentMigration"
-          },
-          "type": "array"
         }
       },
+      "required": [
+        "plugins"
+      ],
       "type": "object"
     },
     "ModeKind": {
@@ -1911,9 +1884,6 @@
       },
       "type": "object"
     },
-    "ModelProviderCapabilitiesReadParams": {
-      "type": "object"
-    },
     "NetworkAccess": {
       "enum": [
         "restricted",
@@ -2039,31 +2009,6 @@
         }
       ]
     },
-    "PermissionProfileModificationParams": {
-      "oneOf": [
-        {
-          "description": "Additional concrete directory that should be writable.",
-          "properties": {
-            "path": {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            "type": {
-              "enum": [
-                "additionalWritableRoot"
-              ],
-              "title": "AdditionalWritableRootPermissionProfileModificationParamsType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "path",
-            "type"
-          ],
-          "title": "AdditionalWritableRootPermissionProfileModificationParams",
-          "type": "object"
-        }
-      ]
-    },
     "PermissionProfileNetworkPermissions": {
       "properties": {
         "enabled": {
@@ -2075,40 +2020,6 @@
       ],
       "type": "object"
     },
-    "PermissionProfileSelectionParams": {
-      "oneOf": [
-        {
-          "description": "Select a named built-in or user-defined profile and optionally apply bounded modifications that Codex knows how to validate.",
-          "properties": {
-            "id": {
-              "type": "string"
-            },
-            "modifications": {
-              "items": {
-                "$ref": "#/definitions/PermissionProfileModificationParams"
-              },
-              "type": [
-                "array",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "profile"
-              ],
-              "title": "ProfilePermissionProfileSelectionParamsType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "id",
-            "type"
-          ],
-          "title": "ProfilePermissionProfileSelectionParams",
-          "type": "object"
-        }
-      ]
-    },
     "Personality": {
       "enum": [
         "none",
@@ -2186,37 +2097,6 @@
       ],
       "type": "object"
     },
-    "PluginShareDeleteParams": {
-      "properties": {
-        "remotePluginId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "remotePluginId"
-      ],
-      "type": "object"
-    },
-    "PluginShareListParams": {
-      "type": "object"
-    },
-    "PluginShareSaveParams": {
-      "properties": {
-        "pluginPath": {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        },
-        "remotePluginId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "pluginPath"
-      ],
-      "type": "object"
-    },
     "PluginUninstallParams": {
       "properties": {
         "pluginId": {
@@ -2246,6 +2126,53 @@
       ],
       "type": "object"
     },
+    "ReadOnlyAccess": {
+      "oneOf": [
+        {
+          "properties": {
+            "includePlatformDefaults": {
+              "default": true,
+              "type": "boolean"
+            },
+            "readableRoots": {
+              "default": [],
+              "items": {
+                "$ref": "#/definitions/AbsolutePathBuf"
+              },
+              "type": "array"
+            },
+            "type": {
+              "enum": [
+                "restricted"
+              ],
+              "title": "RestrictedReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "RestrictedReadOnlyAccess",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "fullAccess"
+              ],
+              "title": "FullAccessReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "FullAccessReadOnlyAccess",
+          "type": "object"
+        }
+      ]
+    },
     "RealtimeOutputModality": {
       "enum": [
         "text",
@@ -2412,6 +2339,12 @@
               },
               "type": "array"
             },
+            "end_turn": {
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
             "id": {
               "type": [
                 "string",
@@ -2811,6 +2744,26 @@
           "title": "ImageGenerationCallResponseItem",
           "type": "object"
         },
+        {
+          "properties": {
+            "ghost_commit": {
+              "$ref": "#/definitions/GhostCommit"
+            },
+            "type": {
+              "enum": [
+                "ghost_snapshot"
+              ],
+              "title": "GhostSnapshotResponseItemType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "ghost_commit",
+            "type"
+          ],
+          "title": "GhostSnapshotResponseItem",
+          "type": "object"
+        },
         {
           "properties": {
             "encrypted_content": {
@@ -3103,6 +3056,16 @@
         },
         {
           "properties": {
+            "access": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "networkAccess": {
               "default": false,
               "type": "boolean"
@@ -3159,6 +3122,16 @@
               "default": false,
               "type": "boolean"
             },
+            "readOnlyAccess": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "type": {
               "enum": [
                 "workspaceWrite"
@@ -3200,27 +3173,6 @@
       ],
       "type": "string"
     },
-    "SessionMigration": {
-      "properties": {
-        "cwd": {
-          "type": "string"
-        },
-        "path": {
-          "type": "string"
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "cwd",
-        "path"
-      ],
-      "type": "object"
-    },
     "Settings": {
       "description": "Settings for a collaboration mode.",
       "properties": {
@@ -3330,17 +3282,6 @@
       ],
       "type": "string"
     },
-    "SubagentMigration": {
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
-    },
     "TextElement": {
       "properties": {
         "byteRange": {
@@ -3470,6 +3411,17 @@
             "null"
           ]
         },
+        "permissionProfile": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/PermissionProfile"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "Full permissions override for the forked thread. Cannot be combined with `sandbox`."
+        },
         "sandbox": {
           "anyOf": [
             {
@@ -3506,15 +3458,6 @@
       ],
       "type": "object"
     },
-    "ThreadGoalStatus": {
-      "enum": [
-        "active",
-        "paused",
-        "budgetLimited",
-        "complete"
-      ],
-      "type": "string"
-    },
     "ThreadInjectItemsParams": {
       "properties": {
         "items": {
@@ -3875,6 +3818,17 @@
             "null"
           ]
         },
+        "permissionProfile": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/PermissionProfile"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "Full permissions override for the resumed thread. Cannot be combined with `sandbox`."
+        },
         "personality": {
           "anyOf": [
             {
@@ -4058,6 +4012,17 @@
             "null"
           ]
         },
+        "permissionProfile": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/PermissionProfile"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "Full permissions override for this thread. Cannot be combined with `sandbox`."
+        },
         "personality": {
           "anyOf": [
             {
@@ -4269,6 +4234,17 @@
         "outputSchema": {
           "description": "Optional JSON Schema used to constrain the final assistant message for this turn."
         },
+        "permissionProfile": {
+          "anyOf": [
+            {
+              "$ref": "#/definitions/PermissionProfile"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "description": "Override the full permissions profile for this turn and subsequent turns. Cannot be combined with `sandboxPolicy`."
+        },
         "personality": {
           "anyOf": [
             {
@@ -4962,30 +4938,6 @@
       "title": "Skills/listRequest",
       "type": "object"
     },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "hooks/list"
-          ],
-          "title": "Hooks/listRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/HooksListParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Hooks/listRequest",
-      "type": "object"
-    },
     {
       "properties": {
         "id": {
@@ -5106,78 +5058,6 @@
       "title": "Plugin/readRequest",
       "type": "object"
     },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "plugin/share/save"
-          ],
-          "title": "Plugin/share/saveRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/PluginShareSaveParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Plugin/share/saveRequest",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "plugin/share/list"
-          ],
-          "title": "Plugin/share/listRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/PluginShareListParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Plugin/share/listRequest",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "plugin/share/delete"
-          ],
-          "title": "Plugin/share/deleteRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/PluginShareDeleteParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "Plugin/share/deleteRequest",
-      "type": "object"
-    },
     {
       "properties": {
         "id": {
@@ -5682,30 +5562,6 @@
       "title": "Model/listRequest",
       "type": "object"
     },
-    {
-      "properties": {
-        "id": {
-          "$ref": "#/definitions/RequestId"
-        },
-        "method": {
-          "enum": [
-            "modelProvider/capabilities/read"
-          ],
-          "title": "ModelProvider/capabilities/readRequestMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ModelProviderCapabilitiesReadParams"
-        }
-      },
-      "required": [
-        "id",
-        "method",
-        "params"
-      ],
-      "title": "ModelProvider/capabilities/readRequest",
-      "type": "object"
-    },
     {
       "properties": {
         "id": {

codex-rs/app-server-protocol/schema/json/CommandExecutionRequestApprovalParams.json

@@ -392,6 +392,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {

codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalParams.json

@@ -177,6 +177,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {

codex-rs/app-server-protocol/schema/json/PermissionsRequestApprovalResponse.json

@@ -177,6 +177,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {

codex-rs/app-server-protocol/schema/json/ServerNotification.json

@@ -1199,6 +1199,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {
@@ -1900,8 +1915,6 @@
         "project",
         "mdm",
         "sessionFlags",
-        "plugin",
-        "cloudRequirements",
         "legacyManagedConfigFile",
         "legacyManagedConfigMdm",
         "unknown"
@@ -2604,33 +2617,6 @@
       ],
       "type": "object"
     },
-    "RemoteControlConnectionStatus": {
-      "enum": [
-        "disabled",
-        "connecting",
-        "connected",
-        "errored"
-      ],
-      "type": "string"
-    },
-    "RemoteControlStatusChangedNotification": {
-      "description": "Current remote-control connection status and environment id exposed to clients.",
-      "properties": {
-        "environmentId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "status": {
-          "$ref": "#/definitions/RemoteControlConnectionStatus"
-        }
-      },
-      "required": [
-        "status"
-      ],
-      "type": "object"
-    },
     "RequestId": {
       "anyOf": [
         {
@@ -3042,93 +3028,6 @@
       ],
       "type": "object"
     },
-    "ThreadGoal": {
-      "properties": {
-        "createdAt": {
-          "format": "int64",
-          "type": "integer"
-        },
-        "objective": {
-          "type": "string"
-        },
-        "status": {
-          "$ref": "#/definitions/ThreadGoalStatus"
-        },
-        "threadId": {
-          "type": "string"
-        },
-        "timeUsedSeconds": {
-          "format": "int64",
-          "type": "integer"
-        },
-        "tokenBudget": {
-          "format": "int64",
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "tokensUsed": {
-          "format": "int64",
-          "type": "integer"
-        },
-        "updatedAt": {
-          "format": "int64",
-          "type": "integer"
-        }
-      },
-      "required": [
-        "createdAt",
-        "objective",
-        "status",
-        "threadId",
-        "timeUsedSeconds",
-        "tokensUsed",
-        "updatedAt"
-      ],
-      "type": "object"
-    },
-    "ThreadGoalClearedNotification": {
-      "properties": {
-        "threadId": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "threadId"
-      ],
-      "type": "object"
-    },
-    "ThreadGoalStatus": {
-      "enum": [
-        "active",
-        "paused",
-        "budgetLimited",
-        "complete"
-      ],
-      "type": "string"
-    },
-    "ThreadGoalUpdatedNotification": {
-      "properties": {
-        "goal": {
-          "$ref": "#/definitions/ThreadGoal"
-        },
-        "threadId": {
-          "type": "string"
-        },
-        "turnId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "goal",
-        "threadId"
-      ],
-      "type": "object"
-    },
     "ThreadId": {
       "type": "string"
     },
@@ -4828,46 +4727,6 @@
       "title": "Thread/name/updatedNotification",
       "type": "object"
     },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "thread/goal/updated"
-          ],
-          "title": "Thread/goal/updatedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadGoalUpdatedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Thread/goal/updatedNotification",
-      "type": "object"
-    },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "thread/goal/cleared"
-          ],
-          "title": "Thread/goal/clearedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/ThreadGoalClearedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "Thread/goal/clearedNotification",
-      "type": "object"
-    },
     {
       "properties": {
         "method": {
@@ -5370,26 +5229,6 @@
       "title": "App/list/updatedNotification",
       "type": "object"
     },
-    {
-      "properties": {
-        "method": {
-          "enum": [
-            "remoteControl/status/changed"
-          ],
-          "title": "RemoteControl/status/changedNotificationMethod",
-          "type": "string"
-        },
-        "params": {
-          "$ref": "#/definitions/RemoteControlStatusChangedNotification"
-        }
-      },
-      "required": [
-        "method",
-        "params"
-      ],
-      "title": "RemoteControl/status/changedNotification",
-      "type": "object"
-    },
     {
       "properties": {
         "method": {

codex-rs/app-server-protocol/schema/json/ServerRequest.json

@@ -731,6 +731,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {

codex-rs/app-server-protocol/schema/json/v2/CommandExecParams.json

@@ -146,6 +146,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {
@@ -359,6 +374,53 @@
       ],
       "type": "object"
     },
+    "ReadOnlyAccess": {
+      "oneOf": [
+        {
+          "properties": {
+            "includePlatformDefaults": {
+              "default": true,
+              "type": "boolean"
+            },
+            "readableRoots": {
+              "default": [],
+              "items": {
+                "$ref": "#/definitions/AbsolutePathBuf"
+              },
+              "type": "array"
+            },
+            "type": {
+              "enum": [
+                "restricted"
+              ],
+              "title": "RestrictedReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "RestrictedReadOnlyAccess",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "fullAccess"
+              ],
+              "title": "FullAccessReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "FullAccessReadOnlyAccess",
+          "type": "object"
+        }
+      ]
+    },
     "SandboxPolicy": {
       "oneOf": [
         {
@@ -379,6 +441,16 @@
         },
         {
           "properties": {
+            "access": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "networkAccess": {
               "default": false,
               "type": "boolean"
@@ -435,6 +507,16 @@
               "default": false,
               "type": "boolean"
             },
+            "readOnlyAccess": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "type": {
               "enum": [
                 "workspaceWrite"
@@ -505,6 +587,17 @@
         "null"
       ]
     },
+    "permissionProfile": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/PermissionProfile"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "description": "Optional full permissions profile for this command.\n\nDefaults to the user's configured permissions when omitted. Cannot be combined with `sandboxPolicy`."
+    },
     "processId": {
       "description": "Optional client-supplied, connection-scoped process id.\n\nRequired for `tty`, `streamStdin`, `streamStdoutStderr`, and follow-up `command/exec/write`, `command/exec/resize`, and `command/exec/terminate` calls. When omitted, buffered execution gets an internal id that is not exposed to the client.",
       "type": [

codex-rs/app-server-protocol/schema/json/v2/ExternalAgentConfigDetectResponse.json

@@ -1,17 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
-    "CommandMigration": {
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
-    },
     "ExternalAgentConfigMigrationItem": {
       "properties": {
         "cwd": {
@@ -50,81 +39,22 @@
         "CONFIG",
         "SKILLS",
         "PLUGINS",
-        "MCP_SERVER_CONFIG",
-        "SUBAGENTS",
-        "HOOKS",
-        "COMMANDS",
-        "SESSIONS"
+        "MCP_SERVER_CONFIG"
       ],
       "type": "string"
     },
-    "HookMigration": {
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
-    },
-    "McpServerMigration": {
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
-    },
     "MigrationDetails": {
       "properties": {
-        "commands": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/CommandMigration"
-          },
-          "type": "array"
-        },
-        "hooks": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/HookMigration"
-          },
-          "type": "array"
-        },
-        "mcpServers": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/McpServerMigration"
-          },
-          "type": "array"
-        },
         "plugins": {
-          "default": [],
           "items": {
             "$ref": "#/definitions/PluginsMigration"
           },
           "type": "array"
-        },
-        "sessions": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/SessionMigration"
-          },
-          "type": "array"
-        },
-        "subagents": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/SubagentMigration"
-          },
-          "type": "array"
         }
       },
+      "required": [
+        "plugins"
+      ],
       "type": "object"
     },
     "PluginsMigration": {
@@ -144,38 +74,6 @@
         "pluginNames"
       ],
       "type": "object"
-    },
-    "SessionMigration": {
-      "properties": {
-        "cwd": {
-          "type": "string"
-        },
-        "path": {
-          "type": "string"
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "cwd",
-        "path"
-      ],
-      "type": "object"
-    },
-    "SubagentMigration": {
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
     }
   },
   "properties": {

codex-rs/app-server-protocol/schema/json/v2/ExternalAgentConfigImportParams.json

@@ -1,17 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
-    "CommandMigration": {
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
-    },
     "ExternalAgentConfigMigrationItem": {
       "properties": {
         "cwd": {
@@ -50,81 +39,22 @@
         "CONFIG",
         "SKILLS",
         "PLUGINS",
-        "MCP_SERVER_CONFIG",
-        "SUBAGENTS",
-        "HOOKS",
-        "COMMANDS",
-        "SESSIONS"
+        "MCP_SERVER_CONFIG"
       ],
       "type": "string"
     },
-    "HookMigration": {
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
-    },
-    "McpServerMigration": {
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
-    },
     "MigrationDetails": {
       "properties": {
-        "commands": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/CommandMigration"
-          },
-          "type": "array"
-        },
-        "hooks": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/HookMigration"
-          },
-          "type": "array"
-        },
-        "mcpServers": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/McpServerMigration"
-          },
-          "type": "array"
-        },
         "plugins": {
-          "default": [],
           "items": {
             "$ref": "#/definitions/PluginsMigration"
           },
           "type": "array"
-        },
-        "sessions": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/SessionMigration"
-          },
-          "type": "array"
-        },
-        "subagents": {
-          "default": [],
-          "items": {
-            "$ref": "#/definitions/SubagentMigration"
-          },
-          "type": "array"
         }
       },
+      "required": [
+        "plugins"
+      ],
       "type": "object"
     },
     "PluginsMigration": {
@@ -144,38 +74,6 @@
         "pluginNames"
       ],
       "type": "object"
-    },
-    "SessionMigration": {
-      "properties": {
-        "cwd": {
-          "type": "string"
-        },
-        "path": {
-          "type": "string"
-        },
-        "title": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "cwd",
-        "path"
-      ],
-      "type": "object"
-    },
-    "SubagentMigration": {
-      "properties": {
-        "name": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "name"
-      ],
-      "type": "object"
     }
   },
   "properties": {

codex-rs/app-server-protocol/schema/json/v2/HookCompletedNotification.json

@@ -160,8 +160,6 @@
         "project",
         "mdm",
         "sessionFlags",
-        "plugin",
-        "cloudRequirements",
         "legacyManagedConfigFile",
         "legacyManagedConfigMdm",
         "unknown"

codex-rs/app-server-protocol/schema/json/v2/HookStartedNotification.json

@@ -160,8 +160,6 @@
         "project",
         "mdm",
         "sessionFlags",
-        "plugin",
-        "cloudRequirements",
         "legacyManagedConfigFile",
         "legacyManagedConfigMdm",
         "unknown"

codex-rs/app-server-protocol/schema/json/v2/HooksListParams.json

@@ -1,14 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "properties": {
-    "cwds": {
-      "description": "When empty, defaults to the current session working directory.",
-      "items": {
-        "type": "string"
-      },
-      "type": "array"
-    }
-  },
-  "title": "HooksListParams",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/HooksListResponse.json

@@ -1,173 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "AbsolutePathBuf": {
-      "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-      "type": "string"
-    },
-    "HookErrorInfo": {
-      "properties": {
-        "message": {
-          "type": "string"
-        },
-        "path": {
-          "type": "string"
-        }
-      },
-      "required": [
-        "message",
-        "path"
-      ],
-      "type": "object"
-    },
-    "HookEventName": {
-      "enum": [
-        "preToolUse",
-        "permissionRequest",
-        "postToolUse",
-        "sessionStart",
-        "userPromptSubmit",
-        "stop"
-      ],
-      "type": "string"
-    },
-    "HookHandlerType": {
-      "enum": [
-        "command",
-        "prompt",
-        "agent"
-      ],
-      "type": "string"
-    },
-    "HookMetadata": {
-      "properties": {
-        "command": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "displayOrder": {
-          "format": "int64",
-          "type": "integer"
-        },
-        "enabled": {
-          "type": "boolean"
-        },
-        "eventName": {
-          "$ref": "#/definitions/HookEventName"
-        },
-        "handlerType": {
-          "$ref": "#/definitions/HookHandlerType"
-        },
-        "isManaged": {
-          "type": "boolean"
-        },
-        "key": {
-          "type": "string"
-        },
-        "matcher": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "pluginId": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "source": {
-          "$ref": "#/definitions/HookSource"
-        },
-        "sourcePath": {
-          "$ref": "#/definitions/AbsolutePathBuf"
-        },
-        "statusMessage": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "timeoutSec": {
-          "format": "uint64",
-          "minimum": 0.0,
-          "type": "integer"
-        }
-      },
-      "required": [
-        "displayOrder",
-        "enabled",
-        "eventName",
-        "handlerType",
-        "isManaged",
-        "key",
-        "source",
-        "sourcePath",
-        "timeoutSec"
-      ],
-      "type": "object"
-    },
-    "HookSource": {
-      "enum": [
-        "system",
-        "user",
-        "project",
-        "mdm",
-        "sessionFlags",
-        "plugin",
-        "cloudRequirements",
-        "legacyManagedConfigFile",
-        "legacyManagedConfigMdm",
-        "unknown"
-      ],
-      "type": "string"
-    },
-    "HooksListEntry": {
-      "properties": {
-        "cwd": {
-          "type": "string"
-        },
-        "errors": {
-          "items": {
-            "$ref": "#/definitions/HookErrorInfo"
-          },
-          "type": "array"
-        },
-        "hooks": {
-          "items": {
-            "$ref": "#/definitions/HookMetadata"
-          },
-          "type": "array"
-        },
-        "warnings": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "cwd",
-        "errors",
-        "hooks",
-        "warnings"
-      ],
-      "type": "object"
-    }
-  },
-  "properties": {
-    "data": {
-      "items": {
-        "$ref": "#/definitions/HooksListEntry"
-      },
-      "type": "array"
-    }
-  },
-  "required": [
-    "data"
-  ],
-  "title": "HooksListResponse",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/ItemGuardianApprovalReviewCompletedNotification.json

@@ -184,6 +184,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {

codex-rs/app-server-protocol/schema/json/v2/ItemGuardianApprovalReviewStartedNotification.json

@@ -177,6 +177,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {

codex-rs/app-server-protocol/schema/json/v2/LoginAccountParams.json

@@ -23,9 +23,6 @@
     },
     {
       "properties": {
-        "codexStreamlinedLogin": {
-          "type": "boolean"
-        },
         "type": {
           "enum": [
             "chatgpt"

codex-rs/app-server-protocol/schema/json/v2/ModelProviderCapabilitiesReadParams.json

@@ -1,5 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "ModelProviderCapabilitiesReadParams",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/ModelProviderCapabilitiesReadResponse.json

@@ -1,21 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "properties": {
-    "imageGeneration": {
-      "type": "boolean"
-    },
-    "namespaceTools": {
-      "type": "boolean"
-    },
-    "webSearch": {
-      "type": "boolean"
-    }
-  },
-  "required": [
-    "imageGeneration",
-    "namespaceTools",
-    "webSearch"
-  ],
-  "title": "ModelProviderCapabilitiesReadResponse",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/PluginShareDeleteParams.json

@@ -1,13 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "properties": {
-    "remotePluginId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "remotePluginId"
-  ],
-  "title": "PluginShareDeleteParams",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/PluginShareDeleteResponse.json

@@ -1,5 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "PluginShareDeleteResponse",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/PluginShareListParams.json

@@ -1,5 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "title": "PluginShareListParams",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/PluginShareListResponse.json

@@ -1,291 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "AbsolutePathBuf": {
-      "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-      "type": "string"
-    },
-    "PluginAuthPolicy": {
-      "enum": [
-        "ON_INSTALL",
-        "ON_USE"
-      ],
-      "type": "string"
-    },
-    "PluginInstallPolicy": {
-      "enum": [
-        "NOT_AVAILABLE",
-        "AVAILABLE",
-        "INSTALLED_BY_DEFAULT"
-      ],
-      "type": "string"
-    },
-    "PluginInterface": {
-      "properties": {
-        "brandColor": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "capabilities": {
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "category": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "composerIcon": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Local composer icon path, resolved from the installed plugin package."
-        },
-        "composerIconUrl": {
-          "description": "Remote composer icon URL from the plugin catalog.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "defaultPrompt": {
-          "description": "Starter prompts for the plugin. Capped at 3 entries with a maximum of 128 characters per entry.",
-          "items": {
-            "type": "string"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "developerName": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "displayName": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "logo": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            {
-              "type": "null"
-            }
-          ],
-          "description": "Local logo path, resolved from the installed plugin package."
-        },
-        "logoUrl": {
-          "description": "Remote logo URL from the plugin catalog.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "longDescription": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "privacyPolicyUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "screenshotUrls": {
-          "description": "Remote screenshot URLs from the plugin catalog.",
-          "items": {
-            "type": "string"
-          },
-          "type": "array"
-        },
-        "screenshots": {
-          "description": "Local screenshot paths, resolved from the installed plugin package.",
-          "items": {
-            "$ref": "#/definitions/AbsolutePathBuf"
-          },
-          "type": "array"
-        },
-        "shortDescription": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "termsOfServiceUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "websiteUrl": {
-          "type": [
-            "string",
-            "null"
-          ]
-        }
-      },
-      "required": [
-        "capabilities",
-        "screenshotUrls",
-        "screenshots"
-      ],
-      "type": "object"
-    },
-    "PluginSource": {
-      "oneOf": [
-        {
-          "properties": {
-            "path": {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            "type": {
-              "enum": [
-                "local"
-              ],
-              "title": "LocalPluginSourceType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "path",
-            "type"
-          ],
-          "title": "LocalPluginSource",
-          "type": "object"
-        },
-        {
-          "properties": {
-            "path": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "refName": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "sha": {
-              "type": [
-                "string",
-                "null"
-              ]
-            },
-            "type": {
-              "enum": [
-                "git"
-              ],
-              "title": "GitPluginSourceType",
-              "type": "string"
-            },
-            "url": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "type",
-            "url"
-          ],
-          "title": "GitPluginSource",
-          "type": "object"
-        },
-        {
-          "description": "The plugin is available in the remote catalog. Download metadata is kept server-side and is not exposed through the app-server API.",
-          "properties": {
-            "type": {
-              "enum": [
-                "remote"
-              ],
-              "title": "RemotePluginSourceType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "type"
-          ],
-          "title": "RemotePluginSource",
-          "type": "object"
-        }
-      ]
-    },
-    "PluginSummary": {
-      "properties": {
-        "authPolicy": {
-          "$ref": "#/definitions/PluginAuthPolicy"
-        },
-        "enabled": {
-          "type": "boolean"
-        },
-        "id": {
-          "type": "string"
-        },
-        "installPolicy": {
-          "$ref": "#/definitions/PluginInstallPolicy"
-        },
-        "installed": {
-          "type": "boolean"
-        },
-        "interface": {
-          "anyOf": [
-            {
-              "$ref": "#/definitions/PluginInterface"
-            },
-            {
-              "type": "null"
-            }
-          ]
-        },
-        "name": {
-          "type": "string"
-        },
-        "source": {
-          "$ref": "#/definitions/PluginSource"
-        }
-      },
-      "required": [
-        "authPolicy",
-        "enabled",
-        "id",
-        "installPolicy",
-        "installed",
-        "name",
-        "source"
-      ],
-      "type": "object"
-    }
-  },
-  "properties": {
-    "data": {
-      "items": {
-        "$ref": "#/definitions/PluginSummary"
-      },
-      "type": "array"
-    }
-  },
-  "required": [
-    "data"
-  ],
-  "title": "PluginShareListResponse",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/PluginShareSaveParams.json

@@ -1,25 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "AbsolutePathBuf": {
-      "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-      "type": "string"
-    }
-  },
-  "properties": {
-    "pluginPath": {
-      "$ref": "#/definitions/AbsolutePathBuf"
-    },
-    "remotePluginId": {
-      "type": [
-        "string",
-        "null"
-      ]
-    }
-  },
-  "required": [
-    "pluginPath"
-  ],
-  "title": "PluginShareSaveParams",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/PluginShareSaveResponse.json

@@ -1,17 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "properties": {
-    "remotePluginId": {
-      "type": "string"
-    },
-    "shareUrl": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "remotePluginId",
-    "shareUrl"
-  ],
-  "title": "PluginShareSaveResponse",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/RawResponseItemCompletedNotification.json

@@ -143,6 +143,38 @@
         }
       ]
     },
+    "GhostCommit": {
+      "description": "Details of a ghost commit created from a repository state.",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "parent": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "preexisting_untracked_dirs": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
+        "preexisting_untracked_files": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        }
+      },
+      "required": [
+        "id",
+        "preexisting_untracked_dirs",
+        "preexisting_untracked_files"
+      ],
+      "type": "object"
+    },
     "ImageDetail": {
       "enum": [
         "auto",
@@ -313,6 +345,12 @@
               },
               "type": "array"
             },
+            "end_turn": {
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
             "id": {
               "type": [
                 "string",
@@ -712,6 +750,26 @@
           "title": "ImageGenerationCallResponseItem",
           "type": "object"
         },
+        {
+          "properties": {
+            "ghost_commit": {
+              "$ref": "#/definitions/GhostCommit"
+            },
+            "type": {
+              "enum": [
+                "ghost_snapshot"
+              ],
+              "title": "GhostSnapshotResponseItemType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "ghost_commit",
+            "type"
+          ],
+          "title": "GhostSnapshotResponseItem",
+          "type": "object"
+        },
         {
           "properties": {
             "encrypted_content": {

codex-rs/app-server-protocol/schema/json/v2/RemoteControlStatusChangedNotification.json

@@ -1,31 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "RemoteControlConnectionStatus": {
-      "enum": [
-        "disabled",
-        "connecting",
-        "connected",
-        "errored"
-      ],
-      "type": "string"
-    }
-  },
-  "description": "Current remote-control connection status and environment id exposed to clients.",
-  "properties": {
-    "environmentId": {
-      "type": [
-        "string",
-        "null"
-      ]
-    },
-    "status": {
-      "$ref": "#/definitions/RemoteControlConnectionStatus"
-    }
-  },
-  "required": [
-    "status"
-  ],
-  "title": "RemoteControlStatusChangedNotification",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/ThreadForkParams.json

@@ -64,19 +64,26 @@
         }
       ]
     },
-    "PermissionProfileModificationParams": {
+    "FileSystemAccessMode": {
+      "enum": [
+        "read",
+        "write",
+        "none"
+      ],
+      "type": "string"
+    },
+    "FileSystemPath": {
       "oneOf": [
         {
-          "description": "Additional concrete directory that should be writable.",
           "properties": {
             "path": {
               "$ref": "#/definitions/AbsolutePathBuf"
             },
             "type": {
               "enum": [
-                "additionalWritableRoot"
+                "path"
               ],
-              "title": "AdditionalWritableRootPermissionProfileModificationParamsType",
+              "title": "PathFileSystemPathType",
               "type": "string"
             }
           },
@@ -84,45 +91,319 @@
             "path",
             "type"
           ],
-          "title": "AdditionalWritableRootPermissionProfileModificationParams",
+          "title": "PathFileSystemPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "pattern": {
+              "type": "string"
+            },
+            "type": {
+              "enum": [
+                "glob_pattern"
+              ],
+              "title": "GlobPatternFileSystemPathType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "pattern",
+            "type"
+          ],
+          "title": "GlobPatternFileSystemPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "special"
+              ],
+              "title": "SpecialFileSystemPathType",
+              "type": "string"
+            },
+            "value": {
+              "$ref": "#/definitions/FileSystemSpecialPath"
+            }
+          },
+          "required": [
+            "type",
+            "value"
+          ],
+          "title": "SpecialFileSystemPath",
           "type": "object"
         }
       ]
     },
-    "PermissionProfileSelectionParams": {
+    "FileSystemSandboxEntry": {
+      "properties": {
+        "access": {
+          "$ref": "#/definitions/FileSystemAccessMode"
+        },
+        "path": {
+          "$ref": "#/definitions/FileSystemPath"
+        }
+      },
+      "required": [
+        "access",
+        "path"
+      ],
+      "type": "object"
+    },
+    "FileSystemSpecialPath": {
       "oneOf": [
         {
-          "description": "Select a named built-in or user-defined profile and optionally apply bounded modifications that Codex knows how to validate.",
           "properties": {
-            "id": {
+            "kind": {
+              "enum": [
+                "root"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "RootFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "minimal"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "MinimalFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "project_roots"
+              ],
               "type": "string"
             },
-            "modifications": {
-              "items": {
-                "$ref": "#/definitions/PermissionProfileModificationParams"
-              },
+            "subpath": {
               "type": [
-                "array",
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "KindFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "tmpdir"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "TmpdirFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "slash_tmp"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "SlashTmpFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "unknown"
+              ],
+              "type": "string"
+            },
+            "path": {
+              "type": "string"
+            },
+            "subpath": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "kind",
+            "path"
+          ],
+          "type": "object"
+        }
+      ]
+    },
+    "PermissionProfile": {
+      "oneOf": [
+        {
+          "description": "Codex owns sandbox construction for this profile.",
+          "properties": {
+            "fileSystem": {
+              "$ref": "#/definitions/PermissionProfileFileSystemPermissions"
+            },
+            "network": {
+              "$ref": "#/definitions/PermissionProfileNetworkPermissions"
+            },
+            "type": {
+              "enum": [
+                "managed"
+              ],
+              "title": "ManagedPermissionProfileType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "fileSystem",
+            "network",
+            "type"
+          ],
+          "title": "ManagedPermissionProfile",
+          "type": "object"
+        },
+        {
+          "description": "Do not apply an outer sandbox.",
+          "properties": {
+            "type": {
+              "enum": [
+                "disabled"
+              ],
+              "title": "DisabledPermissionProfileType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "DisabledPermissionProfile",
+          "type": "object"
+        },
+        {
+          "description": "Filesystem isolation is enforced by an external caller.",
+          "properties": {
+            "network": {
+              "$ref": "#/definitions/PermissionProfileNetworkPermissions"
+            },
+            "type": {
+              "enum": [
+                "external"
+              ],
+              "title": "ExternalPermissionProfileType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "network",
+            "type"
+          ],
+          "title": "ExternalPermissionProfile",
+          "type": "object"
+        }
+      ]
+    },
+    "PermissionProfileFileSystemPermissions": {
+      "oneOf": [
+        {
+          "properties": {
+            "entries": {
+              "items": {
+                "$ref": "#/definitions/FileSystemSandboxEntry"
+              },
+              "type": "array"
+            },
+            "globScanMaxDepth": {
+              "format": "uint",
+              "minimum": 1.0,
+              "type": [
+                "integer",
                 "null"
               ]
             },
             "type": {
               "enum": [
-                "profile"
+                "restricted"
               ],
-              "title": "ProfilePermissionProfileSelectionParamsType",
+              "title": "RestrictedPermissionProfileFileSystemPermissionsType",
               "type": "string"
             }
           },
           "required": [
-            "id",
+            "entries",
             "type"
           ],
-          "title": "ProfilePermissionProfileSelectionParams",
+          "title": "RestrictedPermissionProfileFileSystemPermissions",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "unrestricted"
+              ],
+              "title": "UnrestrictedPermissionProfileFileSystemPermissionsType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "UnrestrictedPermissionProfileFileSystemPermissions",
           "type": "object"
         }
       ]
     },
+    "PermissionProfileNetworkPermissions": {
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "enabled"
+      ],
+      "type": "object"
+    },
     "SandboxMode": {
       "enum": [
         "read-only",
@@ -207,6 +488,17 @@
         "null"
       ]
     },
+    "permissionProfile": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/PermissionProfile"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "description": "Full permissions override for the forked thread. Cannot be combined with `sandbox`."
+    },
     "sandbox": {
       "anyOf": [
         {

codex-rs/app-server-protocol/schema/json/v2/ThreadForkResponse.json

@@ -5,59 +5,6 @@
       "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
       "type": "string"
     },
-    "ActivePermissionProfile": {
-      "properties": {
-        "extends": {
-          "default": null,
-          "description": "Parent profile identifier once permissions profiles support inheritance. This is currently always `null`.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "id": {
-          "description": "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
-          "type": "string"
-        },
-        "modifications": {
-          "default": [],
-          "description": "Bounded user-requested modifications applied on top of the named profile, if any.",
-          "items": {
-            "$ref": "#/definitions/ActivePermissionProfileModification"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "id"
-      ],
-      "type": "object"
-    },
-    "ActivePermissionProfileModification": {
-      "oneOf": [
-        {
-          "description": "Additional concrete directory that should be writable.",
-          "properties": {
-            "path": {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            "type": {
-              "enum": [
-                "additionalWritableRoot"
-              ],
-              "title": "AdditionalWritableRootActivePermissionProfileModificationType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "path",
-            "type"
-          ],
-          "title": "AdditionalWritableRootActivePermissionProfileModification",
-          "type": "object"
-        }
-      ]
-    },
     "AgentPath": {
       "type": "string"
     },
@@ -622,6 +569,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {
@@ -1066,6 +1028,53 @@
       ],
       "type": "object"
     },
+    "ReadOnlyAccess": {
+      "oneOf": [
+        {
+          "properties": {
+            "includePlatformDefaults": {
+              "default": true,
+              "type": "boolean"
+            },
+            "readableRoots": {
+              "default": [],
+              "items": {
+                "$ref": "#/definitions/AbsolutePathBuf"
+              },
+              "type": "array"
+            },
+            "type": {
+              "enum": [
+                "restricted"
+              ],
+              "title": "RestrictedReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "RestrictedReadOnlyAccess",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "fullAccess"
+              ],
+              "title": "FullAccessReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "FullAccessReadOnlyAccess",
+          "type": "object"
+        }
+      ]
+    },
     "ReasoningEffort": {
       "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
       "enum": [
@@ -1098,6 +1107,16 @@
         },
         {
           "properties": {
+            "access": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "networkAccess": {
               "default": false,
               "type": "boolean"
@@ -1154,6 +1173,16 @@
               "default": false,
               "type": "boolean"
             },
+            "readOnlyAccess": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "type": {
               "enum": [
                 "workspaceWrite"
@@ -2538,6 +2567,18 @@
     "modelProvider": {
       "type": "string"
     },
+    "permissionProfile": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/PermissionProfile"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Canonical active permissions view for this thread."
+    },
     "reasoningEffort": {
       "anyOf": [
         {
@@ -2554,7 +2595,7 @@
           "$ref": "#/definitions/SandboxPolicy"
         }
       ],
-      "description": "Legacy sandbox policy retained for compatibility. Experimental clients should prefer `permissionProfile` when they need exact runtime permissions."
+      "description": "Legacy sandbox policy retained for compatibility. New clients should use `permissionProfile` when present as the canonical active permissions view."
     },
     "serviceTier": {
       "anyOf": [

codex-rs/app-server-protocol/schema/json/v2/ThreadGoalClearedNotification.json

@@ -1,13 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "properties": {
-    "threadId": {
-      "type": "string"
-    }
-  },
-  "required": [
-    "threadId"
-  ],
-  "title": "ThreadGoalClearedNotification",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/ThreadGoalUpdatedNotification.json

@@ -1,80 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "definitions": {
-    "ThreadGoal": {
-      "properties": {
-        "createdAt": {
-          "format": "int64",
-          "type": "integer"
-        },
-        "objective": {
-          "type": "string"
-        },
-        "status": {
-          "$ref": "#/definitions/ThreadGoalStatus"
-        },
-        "threadId": {
-          "type": "string"
-        },
-        "timeUsedSeconds": {
-          "format": "int64",
-          "type": "integer"
-        },
-        "tokenBudget": {
-          "format": "int64",
-          "type": [
-            "integer",
-            "null"
-          ]
-        },
-        "tokensUsed": {
-          "format": "int64",
-          "type": "integer"
-        },
-        "updatedAt": {
-          "format": "int64",
-          "type": "integer"
-        }
-      },
-      "required": [
-        "createdAt",
-        "objective",
-        "status",
-        "threadId",
-        "timeUsedSeconds",
-        "tokensUsed",
-        "updatedAt"
-      ],
-      "type": "object"
-    },
-    "ThreadGoalStatus": {
-      "enum": [
-        "active",
-        "paused",
-        "budgetLimited",
-        "complete"
-      ],
-      "type": "string"
-    }
-  },
-  "properties": {
-    "goal": {
-      "$ref": "#/definitions/ThreadGoal"
-    },
-    "threadId": {
-      "type": "string"
-    },
-    "turnId": {
-      "type": [
-        "string",
-        "null"
-      ]
-    }
-  },
-  "required": [
-    "goal",
-    "threadId"
-  ],
-  "title": "ThreadGoalUpdatedNotification",
-  "type": "object"
-}

codex-rs/app-server-protocol/schema/json/v2/ThreadResumeParams.json

@@ -138,6 +138,217 @@
         }
       ]
     },
+    "FileSystemAccessMode": {
+      "enum": [
+        "read",
+        "write",
+        "none"
+      ],
+      "type": "string"
+    },
+    "FileSystemPath": {
+      "oneOf": [
+        {
+          "properties": {
+            "path": {
+              "$ref": "#/definitions/AbsolutePathBuf"
+            },
+            "type": {
+              "enum": [
+                "path"
+              ],
+              "title": "PathFileSystemPathType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "path",
+            "type"
+          ],
+          "title": "PathFileSystemPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "pattern": {
+              "type": "string"
+            },
+            "type": {
+              "enum": [
+                "glob_pattern"
+              ],
+              "title": "GlobPatternFileSystemPathType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "pattern",
+            "type"
+          ],
+          "title": "GlobPatternFileSystemPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "special"
+              ],
+              "title": "SpecialFileSystemPathType",
+              "type": "string"
+            },
+            "value": {
+              "$ref": "#/definitions/FileSystemSpecialPath"
+            }
+          },
+          "required": [
+            "type",
+            "value"
+          ],
+          "title": "SpecialFileSystemPath",
+          "type": "object"
+        }
+      ]
+    },
+    "FileSystemSandboxEntry": {
+      "properties": {
+        "access": {
+          "$ref": "#/definitions/FileSystemAccessMode"
+        },
+        "path": {
+          "$ref": "#/definitions/FileSystemPath"
+        }
+      },
+      "required": [
+        "access",
+        "path"
+      ],
+      "type": "object"
+    },
+    "FileSystemSpecialPath": {
+      "oneOf": [
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "root"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "RootFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "minimal"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "MinimalFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "project_roots"
+              ],
+              "type": "string"
+            },
+            "subpath": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "KindFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "tmpdir"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "TmpdirFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "slash_tmp"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "SlashTmpFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "unknown"
+              ],
+              "type": "string"
+            },
+            "path": {
+              "type": "string"
+            },
+            "subpath": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "kind",
+            "path"
+          ],
+          "type": "object"
+        }
+      ]
+    },
     "FunctionCallOutputBody": {
       "anyOf": [
         {
@@ -206,6 +417,38 @@
         }
       ]
     },
+    "GhostCommit": {
+      "description": "Details of a ghost commit created from a repository state.",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "parent": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "preexisting_untracked_dirs": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
+        "preexisting_untracked_files": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        }
+      },
+      "required": [
+        "id",
+        "preexisting_untracked_dirs",
+        "preexisting_untracked_files"
+      ],
+      "type": "object"
+    },
     "ImageDetail": {
       "enum": [
         "auto",
@@ -298,65 +541,135 @@
         }
       ]
     },
-    "PermissionProfileModificationParams": {
+    "PermissionProfile": {
       "oneOf": [
         {
-          "description": "Additional concrete directory that should be writable.",
+          "description": "Codex owns sandbox construction for this profile.",
           "properties": {
-            "path": {
-              "$ref": "#/definitions/AbsolutePathBuf"
+            "fileSystem": {
+              "$ref": "#/definitions/PermissionProfileFileSystemPermissions"
+            },
+            "network": {
+              "$ref": "#/definitions/PermissionProfileNetworkPermissions"
             },
             "type": {
               "enum": [
-                "additionalWritableRoot"
+                "managed"
               ],
-              "title": "AdditionalWritableRootPermissionProfileModificationParamsType",
+              "title": "ManagedPermissionProfileType",
               "type": "string"
             }
           },
           "required": [
-            "path",
+            "fileSystem",
+            "network",
             "type"
           ],
-          "title": "AdditionalWritableRootPermissionProfileModificationParams",
+          "title": "ManagedPermissionProfile",
+          "type": "object"
+        },
+        {
+          "description": "Do not apply an outer sandbox.",
+          "properties": {
+            "type": {
+              "enum": [
+                "disabled"
+              ],
+              "title": "DisabledPermissionProfileType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "DisabledPermissionProfile",
+          "type": "object"
+        },
+        {
+          "description": "Filesystem isolation is enforced by an external caller.",
+          "properties": {
+            "network": {
+              "$ref": "#/definitions/PermissionProfileNetworkPermissions"
+            },
+            "type": {
+              "enum": [
+                "external"
+              ],
+              "title": "ExternalPermissionProfileType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "network",
+            "type"
+          ],
+          "title": "ExternalPermissionProfile",
           "type": "object"
         }
       ]
     },
-    "PermissionProfileSelectionParams": {
+    "PermissionProfileFileSystemPermissions": {
       "oneOf": [
         {
-          "description": "Select a named built-in or user-defined profile and optionally apply bounded modifications that Codex knows how to validate.",
           "properties": {
-            "id": {
-              "type": "string"
-            },
-            "modifications": {
+            "entries": {
               "items": {
-                "$ref": "#/definitions/PermissionProfileModificationParams"
+                "$ref": "#/definitions/FileSystemSandboxEntry"
               },
+              "type": "array"
+            },
+            "globScanMaxDepth": {
+              "format": "uint",
+              "minimum": 1.0,
               "type": [
-                "array",
+                "integer",
                 "null"
               ]
             },
             "type": {
               "enum": [
-                "profile"
+                "restricted"
               ],
-              "title": "ProfilePermissionProfileSelectionParamsType",
+              "title": "RestrictedPermissionProfileFileSystemPermissionsType",
               "type": "string"
             }
           },
           "required": [
-            "id",
+            "entries",
             "type"
           ],
-          "title": "ProfilePermissionProfileSelectionParams",
+          "title": "RestrictedPermissionProfileFileSystemPermissions",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "unrestricted"
+              ],
+              "title": "UnrestrictedPermissionProfileFileSystemPermissionsType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "UnrestrictedPermissionProfileFileSystemPermissions",
           "type": "object"
         }
       ]
     },
+    "PermissionProfileNetworkPermissions": {
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "enabled"
+      ],
+      "type": "object"
+    },
     "Personality": {
       "enum": [
         "none",
@@ -443,6 +756,12 @@
               },
               "type": "array"
             },
+            "end_turn": {
+              "type": [
+                "boolean",
+                "null"
+              ]
+            },
             "id": {
               "type": [
                 "string",
@@ -842,6 +1161,26 @@
           "title": "ImageGenerationCallResponseItem",
           "type": "object"
         },
+        {
+          "properties": {
+            "ghost_commit": {
+              "$ref": "#/definitions/GhostCommit"
+            },
+            "type": {
+              "enum": [
+                "ghost_snapshot"
+              ],
+              "title": "GhostSnapshotResponseItemType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "ghost_commit",
+            "type"
+          ],
+          "title": "GhostSnapshotResponseItem",
+          "type": "object"
+        },
         {
           "properties": {
             "encrypted_content": {
@@ -1062,6 +1401,17 @@
         "null"
       ]
     },
+    "permissionProfile": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/PermissionProfile"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "description": "Full permissions override for the resumed thread. Cannot be combined with `sandbox`."
+    },
     "personality": {
       "anyOf": [
         {

codex-rs/app-server-protocol/schema/json/v2/ThreadResumeResponse.json

@@ -5,59 +5,6 @@
       "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
       "type": "string"
     },
-    "ActivePermissionProfile": {
-      "properties": {
-        "extends": {
-          "default": null,
-          "description": "Parent profile identifier once permissions profiles support inheritance. This is currently always `null`.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "id": {
-          "description": "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
-          "type": "string"
-        },
-        "modifications": {
-          "default": [],
-          "description": "Bounded user-requested modifications applied on top of the named profile, if any.",
-          "items": {
-            "$ref": "#/definitions/ActivePermissionProfileModification"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "id"
-      ],
-      "type": "object"
-    },
-    "ActivePermissionProfileModification": {
-      "oneOf": [
-        {
-          "description": "Additional concrete directory that should be writable.",
-          "properties": {
-            "path": {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            "type": {
-              "enum": [
-                "additionalWritableRoot"
-              ],
-              "title": "AdditionalWritableRootActivePermissionProfileModificationType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "path",
-            "type"
-          ],
-          "title": "AdditionalWritableRootActivePermissionProfileModification",
-          "type": "object"
-        }
-      ]
-    },
     "AgentPath": {
       "type": "string"
     },
@@ -622,6 +569,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {
@@ -1066,6 +1028,53 @@
       ],
       "type": "object"
     },
+    "ReadOnlyAccess": {
+      "oneOf": [
+        {
+          "properties": {
+            "includePlatformDefaults": {
+              "default": true,
+              "type": "boolean"
+            },
+            "readableRoots": {
+              "default": [],
+              "items": {
+                "$ref": "#/definitions/AbsolutePathBuf"
+              },
+              "type": "array"
+            },
+            "type": {
+              "enum": [
+                "restricted"
+              ],
+              "title": "RestrictedReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "RestrictedReadOnlyAccess",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "fullAccess"
+              ],
+              "title": "FullAccessReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "FullAccessReadOnlyAccess",
+          "type": "object"
+        }
+      ]
+    },
     "ReasoningEffort": {
       "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
       "enum": [
@@ -1098,6 +1107,16 @@
         },
         {
           "properties": {
+            "access": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "networkAccess": {
               "default": false,
               "type": "boolean"
@@ -1154,6 +1173,16 @@
               "default": false,
               "type": "boolean"
             },
+            "readOnlyAccess": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "type": {
               "enum": [
                 "workspaceWrite"
@@ -2538,6 +2567,18 @@
     "modelProvider": {
       "type": "string"
     },
+    "permissionProfile": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/PermissionProfile"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Canonical active permissions view for this thread."
+    },
     "reasoningEffort": {
       "anyOf": [
         {
@@ -2554,7 +2595,7 @@
           "$ref": "#/definitions/SandboxPolicy"
         }
       ],
-      "description": "Legacy sandbox policy retained for compatibility. Experimental clients should prefer `permissionProfile` when they need exact runtime permissions."
+      "description": "Legacy sandbox policy retained for compatibility. New clients should use `permissionProfile` when present as the canonical active permissions view."
     },
     "serviceTier": {
       "anyOf": [

codex-rs/app-server-protocol/schema/json/v2/ThreadStartParams.json

@@ -90,19 +90,26 @@
       ],
       "type": "object"
     },
-    "PermissionProfileModificationParams": {
+    "FileSystemAccessMode": {
+      "enum": [
+        "read",
+        "write",
+        "none"
+      ],
+      "type": "string"
+    },
+    "FileSystemPath": {
       "oneOf": [
         {
-          "description": "Additional concrete directory that should be writable.",
           "properties": {
             "path": {
               "$ref": "#/definitions/AbsolutePathBuf"
             },
             "type": {
               "enum": [
-                "additionalWritableRoot"
+                "path"
               ],
-              "title": "AdditionalWritableRootPermissionProfileModificationParamsType",
+              "title": "PathFileSystemPathType",
               "type": "string"
             }
           },
@@ -110,45 +117,319 @@
             "path",
             "type"
           ],
-          "title": "AdditionalWritableRootPermissionProfileModificationParams",
+          "title": "PathFileSystemPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "pattern": {
+              "type": "string"
+            },
+            "type": {
+              "enum": [
+                "glob_pattern"
+              ],
+              "title": "GlobPatternFileSystemPathType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "pattern",
+            "type"
+          ],
+          "title": "GlobPatternFileSystemPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "special"
+              ],
+              "title": "SpecialFileSystemPathType",
+              "type": "string"
+            },
+            "value": {
+              "$ref": "#/definitions/FileSystemSpecialPath"
+            }
+          },
+          "required": [
+            "type",
+            "value"
+          ],
+          "title": "SpecialFileSystemPath",
           "type": "object"
         }
       ]
     },
-    "PermissionProfileSelectionParams": {
+    "FileSystemSandboxEntry": {
+      "properties": {
+        "access": {
+          "$ref": "#/definitions/FileSystemAccessMode"
+        },
+        "path": {
+          "$ref": "#/definitions/FileSystemPath"
+        }
+      },
+      "required": [
+        "access",
+        "path"
+      ],
+      "type": "object"
+    },
+    "FileSystemSpecialPath": {
       "oneOf": [
         {
-          "description": "Select a named built-in or user-defined profile and optionally apply bounded modifications that Codex knows how to validate.",
           "properties": {
-            "id": {
+            "kind": {
+              "enum": [
+                "root"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "RootFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "minimal"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "MinimalFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "project_roots"
+              ],
               "type": "string"
             },
-            "modifications": {
-              "items": {
-                "$ref": "#/definitions/PermissionProfileModificationParams"
-              },
+            "subpath": {
               "type": [
-                "array",
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "KindFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "tmpdir"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "TmpdirFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "slash_tmp"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "SlashTmpFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "unknown"
+              ],
+              "type": "string"
+            },
+            "path": {
+              "type": "string"
+            },
+            "subpath": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "kind",
+            "path"
+          ],
+          "type": "object"
+        }
+      ]
+    },
+    "PermissionProfile": {
+      "oneOf": [
+        {
+          "description": "Codex owns sandbox construction for this profile.",
+          "properties": {
+            "fileSystem": {
+              "$ref": "#/definitions/PermissionProfileFileSystemPermissions"
+            },
+            "network": {
+              "$ref": "#/definitions/PermissionProfileNetworkPermissions"
+            },
+            "type": {
+              "enum": [
+                "managed"
+              ],
+              "title": "ManagedPermissionProfileType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "fileSystem",
+            "network",
+            "type"
+          ],
+          "title": "ManagedPermissionProfile",
+          "type": "object"
+        },
+        {
+          "description": "Do not apply an outer sandbox.",
+          "properties": {
+            "type": {
+              "enum": [
+                "disabled"
+              ],
+              "title": "DisabledPermissionProfileType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "DisabledPermissionProfile",
+          "type": "object"
+        },
+        {
+          "description": "Filesystem isolation is enforced by an external caller.",
+          "properties": {
+            "network": {
+              "$ref": "#/definitions/PermissionProfileNetworkPermissions"
+            },
+            "type": {
+              "enum": [
+                "external"
+              ],
+              "title": "ExternalPermissionProfileType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "network",
+            "type"
+          ],
+          "title": "ExternalPermissionProfile",
+          "type": "object"
+        }
+      ]
+    },
+    "PermissionProfileFileSystemPermissions": {
+      "oneOf": [
+        {
+          "properties": {
+            "entries": {
+              "items": {
+                "$ref": "#/definitions/FileSystemSandboxEntry"
+              },
+              "type": "array"
+            },
+            "globScanMaxDepth": {
+              "format": "uint",
+              "minimum": 1.0,
+              "type": [
+                "integer",
                 "null"
               ]
             },
             "type": {
               "enum": [
-                "profile"
+                "restricted"
               ],
-              "title": "ProfilePermissionProfileSelectionParamsType",
+              "title": "RestrictedPermissionProfileFileSystemPermissionsType",
               "type": "string"
             }
           },
           "required": [
-            "id",
+            "entries",
             "type"
           ],
-          "title": "ProfilePermissionProfileSelectionParams",
+          "title": "RestrictedPermissionProfileFileSystemPermissions",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "unrestricted"
+              ],
+              "title": "UnrestrictedPermissionProfileFileSystemPermissionsType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "UnrestrictedPermissionProfileFileSystemPermissions",
           "type": "object"
         }
       ]
     },
+    "PermissionProfileNetworkPermissions": {
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "enabled"
+      ],
+      "type": "object"
+    },
     "Personality": {
       "enum": [
         "none",
@@ -260,6 +541,17 @@
         "null"
       ]
     },
+    "permissionProfile": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/PermissionProfile"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "description": "Full permissions override for this thread. Cannot be combined with `sandbox`."
+    },
     "personality": {
       "anyOf": [
         {

codex-rs/app-server-protocol/schema/json/v2/ThreadStartResponse.json

@@ -5,59 +5,6 @@
       "description": "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
       "type": "string"
     },
-    "ActivePermissionProfile": {
-      "properties": {
-        "extends": {
-          "default": null,
-          "description": "Parent profile identifier once permissions profiles support inheritance. This is currently always `null`.",
-          "type": [
-            "string",
-            "null"
-          ]
-        },
-        "id": {
-          "description": "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
-          "type": "string"
-        },
-        "modifications": {
-          "default": [],
-          "description": "Bounded user-requested modifications applied on top of the named profile, if any.",
-          "items": {
-            "$ref": "#/definitions/ActivePermissionProfileModification"
-          },
-          "type": "array"
-        }
-      },
-      "required": [
-        "id"
-      ],
-      "type": "object"
-    },
-    "ActivePermissionProfileModification": {
-      "oneOf": [
-        {
-          "description": "Additional concrete directory that should be writable.",
-          "properties": {
-            "path": {
-              "$ref": "#/definitions/AbsolutePathBuf"
-            },
-            "type": {
-              "enum": [
-                "additionalWritableRoot"
-              ],
-              "title": "AdditionalWritableRootActivePermissionProfileModificationType",
-              "type": "string"
-            }
-          },
-          "required": [
-            "path",
-            "type"
-          ],
-          "title": "AdditionalWritableRootActivePermissionProfileModification",
-          "type": "object"
-        }
-      ]
-    },
     "AgentPath": {
       "type": "string"
     },
@@ -622,6 +569,21 @@
           "title": "MinimalFileSystemSpecialPath",
           "type": "object"
         },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
         {
           "properties": {
             "kind": {
@@ -1066,6 +1028,53 @@
       ],
       "type": "object"
     },
+    "ReadOnlyAccess": {
+      "oneOf": [
+        {
+          "properties": {
+            "includePlatformDefaults": {
+              "default": true,
+              "type": "boolean"
+            },
+            "readableRoots": {
+              "default": [],
+              "items": {
+                "$ref": "#/definitions/AbsolutePathBuf"
+              },
+              "type": "array"
+            },
+            "type": {
+              "enum": [
+                "restricted"
+              ],
+              "title": "RestrictedReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "RestrictedReadOnlyAccess",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "fullAccess"
+              ],
+              "title": "FullAccessReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "FullAccessReadOnlyAccess",
+          "type": "object"
+        }
+      ]
+    },
     "ReasoningEffort": {
       "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
       "enum": [
@@ -1098,6 +1107,16 @@
         },
         {
           "properties": {
+            "access": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "networkAccess": {
               "default": false,
               "type": "boolean"
@@ -1154,6 +1173,16 @@
               "default": false,
               "type": "boolean"
             },
+            "readOnlyAccess": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "type": {
               "enum": [
                 "workspaceWrite"
@@ -2538,6 +2567,18 @@
     "modelProvider": {
       "type": "string"
     },
+    "permissionProfile": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/PermissionProfile"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "default": null,
+      "description": "Canonical active permissions view for this thread."
+    },
     "reasoningEffort": {
       "anyOf": [
         {
@@ -2554,7 +2595,7 @@
           "$ref": "#/definitions/SandboxPolicy"
         }
       ],
-      "description": "Legacy sandbox policy retained for compatibility. Experimental clients should prefer `permissionProfile` when they need exact runtime permissions."
+      "description": "Legacy sandbox policy retained for compatibility. New clients should use `permissionProfile` when present as the canonical active permissions view."
     },
     "serviceTier": {
       "anyOf": [

codex-rs/app-server-protocol/schema/json/v2/TurnStartParams.json

@@ -99,6 +99,217 @@
       ],
       "type": "object"
     },
+    "FileSystemAccessMode": {
+      "enum": [
+        "read",
+        "write",
+        "none"
+      ],
+      "type": "string"
+    },
+    "FileSystemPath": {
+      "oneOf": [
+        {
+          "properties": {
+            "path": {
+              "$ref": "#/definitions/AbsolutePathBuf"
+            },
+            "type": {
+              "enum": [
+                "path"
+              ],
+              "title": "PathFileSystemPathType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "path",
+            "type"
+          ],
+          "title": "PathFileSystemPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "pattern": {
+              "type": "string"
+            },
+            "type": {
+              "enum": [
+                "glob_pattern"
+              ],
+              "title": "GlobPatternFileSystemPathType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "pattern",
+            "type"
+          ],
+          "title": "GlobPatternFileSystemPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "special"
+              ],
+              "title": "SpecialFileSystemPathType",
+              "type": "string"
+            },
+            "value": {
+              "$ref": "#/definitions/FileSystemSpecialPath"
+            }
+          },
+          "required": [
+            "type",
+            "value"
+          ],
+          "title": "SpecialFileSystemPath",
+          "type": "object"
+        }
+      ]
+    },
+    "FileSystemSandboxEntry": {
+      "properties": {
+        "access": {
+          "$ref": "#/definitions/FileSystemAccessMode"
+        },
+        "path": {
+          "$ref": "#/definitions/FileSystemPath"
+        }
+      },
+      "required": [
+        "access",
+        "path"
+      ],
+      "type": "object"
+    },
+    "FileSystemSpecialPath": {
+      "oneOf": [
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "root"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "RootFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "minimal"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "MinimalFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "current_working_directory"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "CurrentWorkingDirectoryFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "project_roots"
+              ],
+              "type": "string"
+            },
+            "subpath": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "KindFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "tmpdir"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "TmpdirFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "slash_tmp"
+              ],
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind"
+          ],
+          "title": "SlashTmpFileSystemSpecialPath",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "kind": {
+              "enum": [
+                "unknown"
+              ],
+              "type": "string"
+            },
+            "path": {
+              "type": "string"
+            },
+            "subpath": {
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          },
+          "required": [
+            "kind",
+            "path"
+          ],
+          "type": "object"
+        }
+      ]
+    },
     "ModeKind": {
       "description": "Initial collaboration mode to use when the TUI starts.",
       "enum": [
@@ -114,65 +325,135 @@
       ],
       "type": "string"
     },
-    "PermissionProfileModificationParams": {
+    "PermissionProfile": {
       "oneOf": [
         {
-          "description": "Additional concrete directory that should be writable.",
+          "description": "Codex owns sandbox construction for this profile.",
           "properties": {
-            "path": {
-              "$ref": "#/definitions/AbsolutePathBuf"
+            "fileSystem": {
+              "$ref": "#/definitions/PermissionProfileFileSystemPermissions"
+            },
+            "network": {
+              "$ref": "#/definitions/PermissionProfileNetworkPermissions"
             },
             "type": {
               "enum": [
-                "additionalWritableRoot"
+                "managed"
               ],
-              "title": "AdditionalWritableRootPermissionProfileModificationParamsType",
+              "title": "ManagedPermissionProfileType",
               "type": "string"
             }
           },
           "required": [
-            "path",
+            "fileSystem",
+            "network",
             "type"
           ],
-          "title": "AdditionalWritableRootPermissionProfileModificationParams",
+          "title": "ManagedPermissionProfile",
+          "type": "object"
+        },
+        {
+          "description": "Do not apply an outer sandbox.",
+          "properties": {
+            "type": {
+              "enum": [
+                "disabled"
+              ],
+              "title": "DisabledPermissionProfileType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "DisabledPermissionProfile",
+          "type": "object"
+        },
+        {
+          "description": "Filesystem isolation is enforced by an external caller.",
+          "properties": {
+            "network": {
+              "$ref": "#/definitions/PermissionProfileNetworkPermissions"
+            },
+            "type": {
+              "enum": [
+                "external"
+              ],
+              "title": "ExternalPermissionProfileType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "network",
+            "type"
+          ],
+          "title": "ExternalPermissionProfile",
           "type": "object"
         }
       ]
     },
-    "PermissionProfileSelectionParams": {
+    "PermissionProfileFileSystemPermissions": {
       "oneOf": [
         {
-          "description": "Select a named built-in or user-defined profile and optionally apply bounded modifications that Codex knows how to validate.",
           "properties": {
-            "id": {
-              "type": "string"
-            },
-            "modifications": {
+            "entries": {
               "items": {
-                "$ref": "#/definitions/PermissionProfileModificationParams"
+                "$ref": "#/definitions/FileSystemSandboxEntry"
               },
+              "type": "array"
+            },
+            "globScanMaxDepth": {
+              "format": "uint",
+              "minimum": 1.0,
               "type": [
-                "array",
+                "integer",
                 "null"
               ]
             },
             "type": {
               "enum": [
-                "profile"
+                "restricted"
               ],
-              "title": "ProfilePermissionProfileSelectionParamsType",
+              "title": "RestrictedPermissionProfileFileSystemPermissionsType",
               "type": "string"
             }
           },
           "required": [
-            "id",
+            "entries",
             "type"
           ],
-          "title": "ProfilePermissionProfileSelectionParams",
+          "title": "RestrictedPermissionProfileFileSystemPermissions",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "unrestricted"
+              ],
+              "title": "UnrestrictedPermissionProfileFileSystemPermissionsType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "UnrestrictedPermissionProfileFileSystemPermissions",
           "type": "object"
         }
       ]
     },
+    "PermissionProfileNetworkPermissions": {
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        }
+      },
+      "required": [
+        "enabled"
+      ],
+      "type": "object"
+    },
     "Personality": {
       "enum": [
         "none",
@@ -181,6 +462,53 @@
       ],
       "type": "string"
     },
+    "ReadOnlyAccess": {
+      "oneOf": [
+        {
+          "properties": {
+            "includePlatformDefaults": {
+              "default": true,
+              "type": "boolean"
+            },
+            "readableRoots": {
+              "default": [],
+              "items": {
+                "$ref": "#/definitions/AbsolutePathBuf"
+              },
+              "type": "array"
+            },
+            "type": {
+              "enum": [
+                "restricted"
+              ],
+              "title": "RestrictedReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "RestrictedReadOnlyAccess",
+          "type": "object"
+        },
+        {
+          "properties": {
+            "type": {
+              "enum": [
+                "fullAccess"
+              ],
+              "title": "FullAccessReadOnlyAccessType",
+              "type": "string"
+            }
+          },
+          "required": [
+            "type"
+          ],
+          "title": "FullAccessReadOnlyAccess",
+          "type": "object"
+        }
+      ]
+    },
     "ReasoningEffort": {
       "description": "See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning",
       "enum": [
@@ -233,6 +561,16 @@
         },
         {
           "properties": {
+            "access": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "networkAccess": {
               "default": false,
               "type": "boolean"
@@ -289,6 +627,16 @@
               "default": false,
               "type": "boolean"
             },
+            "readOnlyAccess": {
+              "allOf": [
+                {
+                  "$ref": "#/definitions/ReadOnlyAccess"
+                }
+              ],
+              "default": {
+                "type": "fullAccess"
+              }
+            },
             "type": {
               "enum": [
                 "workspaceWrite"
@@ -563,6 +911,17 @@
     "outputSchema": {
       "description": "Optional JSON Schema used to constrain the final assistant message for this turn."
     },
+    "permissionProfile": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/PermissionProfile"
+        },
+        {
+          "type": "null"
+        }
+      ],
+      "description": "Override the full permissions profile for this turn and subsequent turns. Cannot be combined with `sandboxPolicy`."
+    },
     "personality": {
       "anyOf": [
         {

codex-rs/app-server-protocol/schema/typescript/GhostCommit.ts

@@ -0,0 +1,8 @@
+// GENERATED CODE! DO NOT MODIFY BY HAND!
+
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+/**
+ * Details of a ghost commit created from a repository state.
+ */
+export type GhostCommit = { id: string, parent: string | null, preexisting_untracked_files: Array<string>, preexisting_untracked_dirs: Array<string>, };

codex-rs/app-server-protocol/schema/typescript/InternalSessionSource.ts

@@ -1,5 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type InternalSessionSource = "memory_consolidation";

codex-rs/app-server-protocol/schema/typescript/ResponseItem.ts

@@ -3,6 +3,7 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ContentItem } from "./ContentItem";
 import type { FunctionCallOutputBody } from "./FunctionCallOutputBody";
+import type { GhostCommit } from "./GhostCommit";
 import type { LocalShellAction } from "./LocalShellAction";
 import type { LocalShellStatus } from "./LocalShellStatus";
 import type { MessagePhase } from "./MessagePhase";
@@ -10,8 +11,8 @@ import type { ReasoningItemContent } from "./ReasoningItemContent";
 import type { ReasoningItemReasoningSummary } from "./ReasoningItemReasoningSummary";
 import type { WebSearchAction } from "./WebSearchAction";
 
-export type ResponseItem = { "type": "message", role: string, content: Array<ContentItem>, phase?: MessagePhase, } | { "type": "reasoning", summary: Array<ReasoningItemReasoningSummary>, content?: Array<ReasoningItemContent>, encrypted_content: string | null, } | { "type": "local_shell_call",
+export type ResponseItem = { "type": "message", role: string, content: Array<ContentItem>, end_turn?: boolean, phase?: MessagePhase, } | { "type": "reasoning", summary: Array<ReasoningItemReasoningSummary>, content?: Array<ReasoningItemContent>, encrypted_content: string | null, } | { "type": "local_shell_call",
 /**
  * Set when using the Responses API.
  */
-call_id: string | null, status: LocalShellStatus, action: LocalShellAction, } | { "type": "function_call", name: string, namespace?: string, arguments: string, call_id: string, } | { "type": "tool_search_call", call_id: string | null, status?: string, execution: string, arguments: unknown, } | { "type": "function_call_output", call_id: string, output: FunctionCallOutputBody, } | { "type": "custom_tool_call", status?: string, call_id: string, name: string, input: string, } | { "type": "custom_tool_call_output", call_id: string, name?: string, output: FunctionCallOutputBody, } | { "type": "tool_search_output", call_id: string | null, status: string, execution: string, tools: unknown[], } | { "type": "web_search_call", status?: string, action?: WebSearchAction, } | { "type": "image_generation_call", id: string, status: string, revised_prompt?: string, result: string, } | { "type": "compaction", encrypted_content: string, } | { "type": "other" };
+call_id: string | null, status: LocalShellStatus, action: LocalShellAction, } | { "type": "function_call", name: string, namespace?: string, arguments: string, call_id: string, } | { "type": "tool_search_call", call_id: string | null, status?: string, execution: string, arguments: unknown, } | { "type": "function_call_output", call_id: string, output: FunctionCallOutputBody, } | { "type": "custom_tool_call", status?: string, call_id: string, name: string, input: string, } | { "type": "custom_tool_call_output", call_id: string, name?: string, output: FunctionCallOutputBody, } | { "type": "tool_search_output", call_id: string | null, status: string, execution: string, tools: unknown[], } | { "type": "web_search_call", status?: string, action?: WebSearchAction, } | { "type": "image_generation_call", id: string, status: string, revised_prompt?: string, result: string, } | { "type": "ghost_snapshot", ghost_commit: GhostCommit, } | { "type": "compaction", encrypted_content: string, } | { "type": "other" };

codex-rs/app-server-protocol/schema/typescript/SessionSource.ts

@@ -1,7 +1,6 @@
 // GENERATED CODE! DO NOT MODIFY BY HAND!
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { InternalSessionSource } from "./InternalSessionSource";
 import type { SubAgentSource } from "./SubAgentSource";
 
-export type SessionSource = "cli" | "vscode" | "exec" | "mcp" | { "custom": string } | { "internal": InternalSessionSource } | { "subagent": SubAgentSource } | "unknown";
+export type SessionSource = "cli" | "vscode" | "exec" | "mcp" | { "custom": string } | { "subagent": SubAgentSource } | "unknown";

codex-rs/app-server-protocol/schema/typescript/index.ts

@@ -29,6 +29,7 @@ export type { GetAuthStatusParams } from "./GetAuthStatusParams";
 export type { GetAuthStatusResponse } from "./GetAuthStatusResponse";
 export type { GetConversationSummaryParams } from "./GetConversationSummaryParams";
 export type { GetConversationSummaryResponse } from "./GetConversationSummaryResponse";
+export type { GhostCommit } from "./GhostCommit";
 export type { GitDiffToRemoteParams } from "./GitDiffToRemoteParams";
 export type { GitDiffToRemoteResponse } from "./GitDiffToRemoteResponse";
 export type { GitSha } from "./GitSha";
@@ -37,7 +38,6 @@ export type { InitializeCapabilities } from "./InitializeCapabilities";
 export type { InitializeParams } from "./InitializeParams";
 export type { InitializeResponse } from "./InitializeResponse";
 export type { InputModality } from "./InputModality";
-export type { InternalSessionSource } from "./InternalSessionSource";
 export type { LocalShellAction } from "./LocalShellAction";
 export type { LocalShellExecAction } from "./LocalShellExecAction";
 export type { LocalShellStatus } from "./LocalShellStatus";

codex-rs/app-server-protocol/schema/typescript/v2/ActivePermissionProfile.ts

@@ -1,21 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { ActivePermissionProfileModification } from "./ActivePermissionProfileModification";
-
-export type ActivePermissionProfile = {
-/**
- * Identifier from `default_permissions` or the implicit built-in default,
- * such as `:workspace` or a user-defined `[permissions.<id>]` profile.
- */
-id: string,
-/**
- * Parent profile identifier once permissions profiles support
- * inheritance. This is currently always `null`.
- */
-extends: string | null,
-/**
- * Bounded user-requested modifications applied on top of the named
- * profile, if any.
- */
-modifications: Array<ActivePermissionProfileModification>, };

codex-rs/app-server-protocol/schema/typescript/v2/ActivePermissionProfileModification.ts

@@ -1,6 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AbsolutePathBuf } from "../AbsolutePathBuf";
-
-export type ActivePermissionProfileModification = { "type": "additionalWritableRoot", path: AbsolutePathBuf, };

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecParams.ts

@@ -2,6 +2,7 @@
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { CommandExecTerminalSize } from "./CommandExecTerminalSize";
+import type { PermissionProfile } from "./PermissionProfile";
 import type { SandboxPolicy } from "./SandboxPolicy";
 
 /**
@@ -12,10 +13,12 @@ import type { SandboxPolicy } from "./SandboxPolicy";
  * sent only after all `command/exec/outputDelta` notifications for that
  * connection have been emitted.
  */
-export type CommandExecParams = {/**
+export type CommandExecParams = {
+/**
  * Command argv vector. Empty arrays are rejected.
  */
-command: Array<string>, /**
+command: Array<string>,
+/**
  * Optional client-supplied, connection-scoped process id.
  *
  * Required for `tty`, `streamStdin`, `streamStdoutStderr`, and follow-up
@@ -23,63 +26,81 @@ command: Array<string>, /**
  * `command/exec/terminate` calls. When omitted, buffered execution gets an
  * internal id that is not exposed to the client.
  */
-processId?: string | null, /**
+processId?: string | null,
+/**
  * Enable PTY mode.
  *
  * This implies `streamStdin` and `streamStdoutStderr`.
  */
-tty?: boolean, /**
+tty?: boolean,
+/**
  * Allow follow-up `command/exec/write` requests to write stdin bytes.
  *
  * Requires a client-supplied `processId`.
  */
-streamStdin?: boolean, /**
+streamStdin?: boolean,
+/**
  * Stream stdout/stderr via `command/exec/outputDelta` notifications.
  *
  * Streamed bytes are not duplicated into the final response and require a
  * client-supplied `processId`.
  */
-streamStdoutStderr?: boolean, /**
+streamStdoutStderr?: boolean,
+/**
  * Optional per-stream stdout/stderr capture cap in bytes.
  *
  * When omitted, the server default applies. Cannot be combined with
  * `disableOutputCap`.
  */
-outputBytesCap?: number | null, /**
+outputBytesCap?: number | null,
+/**
  * Disable stdout/stderr capture truncation for this request.
  *
  * Cannot be combined with `outputBytesCap`.
  */
-disableOutputCap?: boolean, /**
+disableOutputCap?: boolean,
+/**
  * Disable the timeout entirely for this request.
  *
  * Cannot be combined with `timeoutMs`.
  */
-disableTimeout?: boolean, /**
+disableTimeout?: boolean,
+/**
  * Optional timeout in milliseconds.
  *
  * When omitted, the server default applies. Cannot be combined with
  * `disableTimeout`.
  */
-timeoutMs?: number | null, /**
+timeoutMs?: number | null,
+/**
  * Optional working directory. Defaults to the server cwd.
  */
-cwd?: string | null, /**
+cwd?: string | null,
+/**
  * Optional environment overrides merged into the server-computed
  * environment.
  *
  * Matching names override inherited values. Set a key to `null` to unset
  * an inherited variable.
  */
-env?: { [key in string]?: string | null } | null, /**
+env?: { [key in string]?: string | null } | null,
+/**
  * Optional initial PTY size in character cells. Only valid when `tty` is
  * true.
  */
-size?: CommandExecTerminalSize | null, /**
+size?: CommandExecTerminalSize | null,
+/**
  * Optional sandbox policy for this command.
  *
  * Uses the same shape as thread/turn execution sandbox configuration and
  * defaults to the user's configured policy when omitted. Cannot be
  * combined with `permissionProfile`.
  */
-sandboxPolicy?: SandboxPolicy | null};
+sandboxPolicy?: SandboxPolicy | null,
+/**
+ * Optional full permissions profile for this command.
+ *
+ * Defaults to the user's configured permissions when omitted. Cannot be
+ * combined with `sandboxPolicy`.
+ */
+permissionProfile?: PermissionProfile | null, };

codex-rs/app-server-protocol/schema/typescript/v2/CommandExecutionRequestApprovalParams.ts

@@ -2,12 +2,15 @@
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { AbsolutePathBuf } from "../AbsolutePathBuf";
+import type { AdditionalPermissionProfile } from "./AdditionalPermissionProfile";
 import type { CommandAction } from "./CommandAction";
+import type { CommandExecutionApprovalDecision } from "./CommandExecutionApprovalDecision";
 import type { ExecPolicyAmendment } from "./ExecPolicyAmendment";
 import type { NetworkApprovalContext } from "./NetworkApprovalContext";
 import type { NetworkPolicyAmendment } from "./NetworkPolicyAmendment";
 
-export type CommandExecutionRequestApprovalParams = {threadId: string, turnId: string, itemId: string, /**
+export type CommandExecutionRequestApprovalParams = { threadId: string, turnId: string, itemId: string,
+/**
  * Unique identifier for this specific approval callback.
  *
  * For regular shell/unified_exec approvals, this is null.
@@ -16,25 +19,40 @@ export type CommandExecutionRequestApprovalParams = {threadId: string, turnId: s
  * one parent `itemId`, so `approvalId` is a distinct opaque callback id
  * (a UUID) used to disambiguate routing.
  */
-approvalId?: string | null, /**
+approvalId?: string | null,
+/**
  * Optional explanatory reason (e.g. request for network access).
  */
-reason?: string | null, /**
+reason?: string | null,
+/**
  * Optional context for a managed-network approval prompt.
  */
-networkApprovalContext?: NetworkApprovalContext | null, /**
+networkApprovalContext?: NetworkApprovalContext | null,
+/**
  * The command to be executed.
  */
-command?: string | null, /**
+command?: string | null,
+/**
  * The command's working directory.
  */
-cwd?: AbsolutePathBuf | null, /**
+cwd?: AbsolutePathBuf | null,
+/**
  * Best-effort parsed command actions for friendly display.
  */
-commandActions?: Array<CommandAction> | null, /**
+commandActions?: Array<CommandAction> | null,
+/**
+ * Optional additional permissions requested for this command.
+ */
+additionalPermissions?: AdditionalPermissionProfile | null,
+/**
  * Optional proposed execpolicy amendment to allow similar commands without prompting.
  */
-proposedExecpolicyAmendment?: ExecPolicyAmendment | null, /**
+proposedExecpolicyAmendment?: ExecPolicyAmendment | null,
+/**
  * Optional proposed network policy amendments (allow/deny host) for future requests.
  */
-proposedNetworkPolicyAmendments?: Array<NetworkPolicyAmendment> | null};
+proposedNetworkPolicyAmendments?: Array<NetworkPolicyAmendment> | null,
+/**
+ * Ordered list of decisions the client may present for this prompt.
+ */
+availableDecisions?: Array<CommandExecutionApprovalDecision> | null, };

codex-rs/app-server-protocol/schema/typescript/v2/CommandMigration.ts

@@ -1,5 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type CommandMigration = { name: string, };

codex-rs/app-server-protocol/schema/typescript/v2/ExternalAgentConfigMigrationItemType.ts

@@ -2,4 +2,4 @@
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type ExternalAgentConfigMigrationItemType = "AGENTS_MD" | "CONFIG" | "SKILLS" | "PLUGINS" | "MCP_SERVER_CONFIG" | "SUBAGENTS" | "HOOKS" | "COMMANDS" | "SESSIONS";
+export type ExternalAgentConfigMigrationItemType = "AGENTS_MD" | "CONFIG" | "SKILLS" | "PLUGINS" | "MCP_SERVER_CONFIG";

codex-rs/app-server-protocol/schema/typescript/v2/FileSystemSpecialPath.ts

@@ -2,4 +2,4 @@
 
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
-export type FileSystemSpecialPath = { "kind": "root" } | { "kind": "minimal" } | { "kind": "project_roots", subpath: string | null, } | { "kind": "tmpdir" } | { "kind": "slash_tmp" } | { "kind": "unknown", path: string, subpath: string | null, };
+export type FileSystemSpecialPath = { "kind": "root" } | { "kind": "minimal" } | { "kind": "current_working_directory" } | { "kind": "project_roots", subpath: string | null, } | { "kind": "tmpdir" } | { "kind": "slash_tmp" } | { "kind": "unknown", path: string, subpath: string | null, };

codex-rs/app-server-protocol/schema/typescript/v2/HookErrorInfo.ts

@@ -1,5 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type HookErrorInfo = { path: string, message: string, };

codex-rs/app-server-protocol/schema/typescript/v2/HookMetadata.ts

@@ -1,9 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { AbsolutePathBuf } from "../AbsolutePathBuf";
-import type { HookEventName } from "./HookEventName";
-import type { HookHandlerType } from "./HookHandlerType";
-import type { HookSource } from "./HookSource";
-
-export type HookMetadata = { key: string, eventName: HookEventName, handlerType: HookHandlerType, matcher: string | null, command: string | null, timeoutSec: bigint, statusMessage: string | null, sourcePath: AbsolutePathBuf, source: HookSource, pluginId: string | null, displayOrder: bigint, enabled: boolean, isManaged: boolean, };

codex-rs/app-server-protocol/schema/typescript/v2/HookMigration.ts

@@ -1,5 +0,0 @@
-// GENERATED CODE! DO NOT MODIFY BY HAND!
-
-// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-
-export type HookMigration = { name: string, };