Repository navigation
Studio: add guarded Git review, checkpoints, and owned worktrees - #10594
PhilipJohnBasile wants to merge 13 commits into
Conversation
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: fc82fdb534
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
This also changes call_tool_sync in studio/backend/core/inference/mcp_client.py so a failing config_check now denies dispatch on every MCP tool call, which affects a path that works today. Could you confirm that behaviour and split the mcp_client and chat_history changes out so the Git and worktrees surface stands on its own? |
Studio projects gain bounded Git status/diffs, selected-file checkpoints, owned worktrees, prepared commit refs, and an explicitly confirmed GitHub handoff. Prepared commits preserve the active branch and staging index; uncertain publication retains recovery evidence.
This split excludes
mcp_client.pyandchat_history.pychanges. Project lifecycle support is reviewed in #10633; one-shot MCP configuration checks are in #10632. A false or raising configuration check intentionally denies MCP dispatch, including one-shot transports. The 28 focused configuration/one-shot tests pass in that separate MCP branch. Here, Git mutations refuse before workspace access without lifecycle support, and OAuth handoff refuses without the MCP capability. Read-only Git review remains available independently.Current repair head:
9d86e2547b9ce03b89910912e095c80aae23e719. Preparing the first commit on a new attached branch now creates a parentless commit under a prepared ref. It includes only selected reviewed files and leaves HEAD, the index, and unrelated staged files unchanged. A first commit created externally after preview invalidates confirmation. Broken existing refs remain errors. The UI labels the no-commit state. Worktrees and checkpoints retain their committed-HEAD requirement.Earlier review fixes retain staged rename sources, expose carriage-return-only changes, reconcile interrupted marker cleanup, expire abandoned confirmations without candidate SHAs, and report the actual workspace revision. Optional task ownership guards prevent cleanup/merge while a task physically owns the checkout. The private owned-worktree proof lets already-fenced task commands validate ownership without nested-lock deadlocks.
Local validation on macOS arm64 / Python 3.11: 68 backend tests passed with lifecycle commit
10eec87e411ee03fed1999fd3df3971bf0c8d632composed; 99 focused frontend tests, application/test typechecks, production build, and bundle checks passed. Startup transfer remains 7.1 KB below the unchanged ceiling. The missing continuation-test filesystem import already on upstream main is included so test typechecking runs on this source branch. Python lint/format and diff checks pass; the touched UI passes Biome error checks.Current native matrix: run 34433421808. It qualifies Linux/macOS/Windows with lifecycle-only and secure-command/edit compositions pinned to the current review commits. All six jobs pass at
9d86e2547b9ce03b89910912e095c80aae23e719; earlier six-job success at016da2365remains historical evidence.Review and reproduction details:
studio/GIT_WORKTREES_REVIEW.md. Real model/provider loops, packaged desktop behavior, existing-folder grants, and authenticated connector submission remain separate qualification gates. Upstream approval and merge remain pending.