Skip to content

fix(pty): keep PtyManager spawn off the async runtime worker (KI-16) - #141

Merged
mergify[bot] merged 3 commits into
mainfrom
claude/ki-16-pty-spawn-blocking-v2
Oct 3, 2026
Merged

mergify[bot] merged 3 commits into
mainfrom
claude/ki-16-pty-spawn-blocking-v2

Conversation

@Cuarroc

@Cuarroc Cuarroc commented Oct 3, 2026 •

Copy link
Copy Markdown
Owner

Der Merge-Konflikt mit main ist gelöst und der PR steht wieder auf einem konfliktfreien Stand.
Die Auflösung bewahrt die KI-16-Nachführung und übernimmt zugleich die aktuellen Einträge aus main.
Die vollständige lokale Prüfbahn ist grün; der PR kann wieder in die Mergify-Queue.

Report

What changed

  • Merged origin/main into claude/ki-16-pty-spawn-blocking-v2 as 7ce90da.
  • Resolved the KNOWN_ISSUES.md conflict by retaining the KI-16 partial-fix entry and KI-19 entry from this branch while preserving the current main content.
  • The conflict resolution changed documentation only; it did not change runtime code or the KI-16 implementation logic.
  • The merge also contains the already-landed main changes in src-tauri/src/api.rs and src-tauri/src/providers.rs.

Evidence

  • git fetch origin main: exit 0.
  • git merge origin/main: initially reported the expected KNOWN_ISSUES.md conflict; resolved and committed as 7ce90da.
  • gitleaks detect --no-banner --redact --source .: exit 0; no leaks found.
  • git commit --no-edit: exit 0; precommit secrets, format, cargo-check and typecheck gates passed.
  • bash scripts/ci/gates.sh lane prepush: exit 0; 392 frontend tests, 502 HQ tests, 1660 Rust tests passed, 7 skipped, and clippy passed.
  • Push hook bash scripts/ci/gates.sh lane prepush: exit 0; same lane passed again before push.
  • git push -u origin claude/ki-16-pty-spawn-blocking-v2: exit 0; remote updated to 7ce90da.
  • git ls-remote origin claude/ki-16-pty-spawn-blocking-v2: exit 0; remote head is 7ce90da0e50fe29da96aa1278df218b17f9af432.

NICHT ABGEDECKT

  • Linux does not compile or run the #[cfg(windows)] tests (run_in_pty, npm_shim, ConPTY, DPAPI) or the Windows-only clippy arms; the Windows lane runs in the merge queue.
  • No desktop app was launched and no UI screenshot or live runtime measurement was taken.
  • External services were not exercised.

Review

Review: ausstehend (Stufe A, PTY).

Open points

  • Required independent Tier-A reviews remain pending.
  • spawn_pty in main.rs remains a separate follow-up as described in the original PR scope.

Cuarroc and others added 2 commits October 3, 2026 02:24
Test-First: src-tauri/src/pty.rs::blocking_spawn_work_leaves_the_runtime_worker_free

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
(cherry picked from commit fc8470c)
PtyManager::spawn_with_id ran openpty and process creation inline on the
Tokio worker. It now hands the worker over with block_in_place on a
multi-thread runtime; order, errors and signatures are unchanged.

Regression-For: f58728f

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
(cherry picked from commit dd322cb)

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b99574e7f5

ℹ️ 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".

Comment thread src-tauri/src/pty.rs
use super::*;

#[test]
fn blocking_spawn_work_leaves_the_runtime_worker_free() {

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Restore the required red-first commit

When this exact candidate is checked against its sole parent with BASE_SHA=1947110 HEAD_SHA=95eb4f3 bash scripts/ci/red-first.sh --plan, the gate exits 1 because the source-changing commit has no recognized trailer. The regression test appears in the same commit as the fix, so this history contains no compiling, failing revision for KI-16 despite the report claiming one; place the test in a preceding red commit with Test-First: and reference it from the fix with Regression-For:.

AGENTS.md reference: AGENTS.md:L16-L18

Useful? React with 👍 / 👎.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-03T00:54:11.341516Z b99574e PR opened
ℹ️ 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

…n-blocking-v2

# Conflicts:
#	KNOWN_ISSUES.md
@Cuarroc

Cuarroc commented Oct 3, 2026

Copy link
Copy Markdown
Owner Author

@Mergifyio queue

@mergify mergify Bot added the queued label Oct 3, 2026
@mergify
mergify Bot merged commit 376f75f into main Oct 3, 2026
11 checks passed
@mergify

mergify Bot commented Oct 3, 2026

Copy link
Copy Markdown
Contributor

Merge Queue Status

This pull request spent 47 minutes 5 seconds in the queue, including 10 minutes 12 seconds running CI.

Required conditions to merge

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant