Skip to content

fix(ci): repair managed worktree follow-up gates#100793

Merged
vincentkoc merged 1 commit into
mainfrom
codex/fix-main-generated-gates
Jul 6, 2026
Merged

fix(ci): repair managed worktree follow-up gates#100793
vincentkoc merged 1 commit into
mainfrom
codex/fix-main-generated-gates

Conversation

@steipete

@steipete steipete commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Follow-up to #100788.

What Problem This Solves

The managed-session-worktree merge left SessionWorktreeInfo and SessionsCreateResult imported but not exported from the gateway protocol barrel, breaking production typechecking and lint on main. Its Android action also added the English resource without the required matching key in all 21 locale resource files. The new documentation heading initially left the generated docs map stale; current main now contains that generated refresh.

Why This Change Was Made

Export the two existing public result types beside their schemas, matching the barrel's established type/schema pairs. Add new_chat_in_worktree to every Android locale, reusing the matching reviewed Control UI translation where available and the Swedish equivalent for the remaining locale.

User Impact

Restores green production type/lint/Android-i18n gates, makes the new sessions.create worktree result types available from the public gateway-protocol entrypoint, and prevents the new Android action from falling out of locale resource alignment.

Evidence

  • Reproduced on current main: SessionWorktreeInfo and SessionsCreateResult fail both tsgo and oxlint as unused imports.
  • node scripts/run-oxlint.mjs --tsconfig config/tsconfig/oxlint.core.json packages/gateway-protocol/src/index.ts — passed.
  • node scripts/generate-docs-map.mjs --check — passed after canonical regeneration; the generated line subsequently landed on current main.
  • node --import tsx scripts/android-app-i18n.ts check — all 26 keys aligned across all 21 locales.
  • Blacksmith Testbox tbx_01kwvd238bg50e8jdpnr01xttq (run): pnpm test test/scripts/android-app-i18n.test.ts — 2 tests passed.
  • node --import tsx scripts/native-app-i18n.ts check — inventory unchanged and current.
  • oxfmt --check and git diff --check — passed.
  • Fresh AutoReview passes for both changes — no accepted/actionable findings; confidence 0.91 and 0.92.

@steipete steipete self-assigned this Jul 6, 2026
@openclaw-barnacle openclaw-barnacle Bot added docs Improvements or additions to documentation app: web-ui App: web-ui gateway Gateway runtime size: XS maintainer Maintainer-authored PR labels Jul 6, 2026
@steipete
steipete force-pushed the codex/fix-main-generated-gates branch from 64a9b07 to b2ae6ec Compare July 6, 2026 09:47
@openclaw-barnacle openclaw-barnacle Bot added app: android App: android and removed docs Improvements or additions to documentation labels Jul 6, 2026
@steipete steipete changed the title fix(protocol): export session worktree result types fix(ci): repair managed worktree follow-up gates Jul 6, 2026
@vincentkoc vincentkoc self-assigned this Jul 6, 2026
@blacksmith-sh

This comment has been minimized.

@openclaw-barnacle openclaw-barnacle Bot added scripts Repository scripts docker Docker and sandbox tooling extensions: openai extensions: google size: M and removed size: XS labels Jul 6, 2026
@vincentkoc
vincentkoc force-pushed the codex/fix-main-generated-gates branch from e3ba9ba to cbcfc62 Compare July 6, 2026 09:58
@openclaw-barnacle openclaw-barnacle Bot added size: XS and removed scripts Repository scripts docker Docker and sandbox tooling extensions: openai extensions: google size: M labels Jul 6, 2026
@vincentkoc
vincentkoc force-pushed the codex/fix-main-generated-gates branch from cbcfc62 to 3a05124 Compare July 6, 2026 10:02
@steipete

steipete commented Jul 6, 2026

Copy link
Copy Markdown
Contributor Author

@vincentkoc please stop rebasing or force-pushing this branch for now. The pushes at 09:58 and 10:02 UTC rewrote the same two commits and reset exact-head CI each time; this shared baseline repair is currently blocking four independent landing lanes.

The current 3a0512448bd62d4f4e1275f2b878211f3654a33f tree is patch-equivalent and mergeable. The active maintainer lane owns it through the native prepare/merge flow. If another workflow is intentionally managing this branch, please reply here before changing the head again.

@vincentkoc
vincentkoc force-pushed the codex/fix-main-generated-gates branch from 3a05124 to 8666549 Compare July 6, 2026 10:04
@openclaw-barnacle openclaw-barnacle Bot removed the app: android App: android label Jul 6, 2026
@vincentkoc

Copy link
Copy Markdown
Member

acknowledged. The final rewrite at 10:05 UTC was required because #100805 merged the full Android locale commit, so I dropped that now-duplicate commit instead of carrying conflicts forward.

The current exact head 8666549563577536f4bd2aad4d92695f5589a394 is now only the two gateway protocol type exports on 7f29380d21e45b72a16f53fe37cf56a8eb9753e3. No further pushes are planned; I am waiting on this head's hosted CI and autoreview before the native merge gate.

@vincentkoc

Copy link
Copy Markdown
Member

/review

@clawsweeper

clawsweeper Bot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

🦞🧹
ClawSweeper re-review requested.

I asked ClawSweeper to review this item again.
Action: item re-review queued (workflow sweep.yml, event repository_dispatch).
Result: the existing ClawSweeper review comment will be edited in place when the review finishes.

@clawsweeper

clawsweeper Bot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Codex review: needs maintainer review before merge. Reviewed July 6, 2026, 6:17 AM ET / 10:17 UTC.

Summary
The branch adds two type-only exports, SessionWorktreeInfo and SessionsCreateResult, to packages/gateway-protocol/src/index.ts.

PR surface: Source +2. Total +2 across 1 file.

Reproducibility: yes. from source inspection rather than local execution: current main imports the two type-only symbols but re-exports only the schemas, leaving the explicit public barrel inconsistent. The PR body and live CI also report the relevant prod-type and lint gates passing after the fix.

Review metrics: 1 noteworthy metric.

  • Gateway protocol exports: 2 added, 0 changed, 0 removed. The diff changes the public gateway-protocol type surface, so maintainers should notice that the API change is additive and type-only.

Root-cause cluster
Relationship: canonical
Canonical: #100793
Summary: This PR is the canonical remaining gateway-protocol export repair from the managed-worktree merge window; the Android locale companion fix has already merged separately.

Members:

Proposal only: this assessment does not dispatch repair, suppress jobs, mutate sibling items, close, or merge anything.

Merge readiness
Overall: 🐚 platinum hermit
Proof: 🐚 platinum hermit ✨ media proof bonus
Patch quality: 🦞 diamond lobster
Result: ready for maintainer review.

Overall follows the weaker of proof and patch quality, so missing proof can cap an otherwise strong patch.

Rank-up moves:

  • none.

Next step before merge

  • No automated repair is needed; the remaining action is maintainer-owned merge handling for a protected, focused, correct PR.

Maintainer decision needed

  • Question: Should the active maintainer lane land this exact gateway-protocol export repair once required exact-head checks are complete?
  • Rationale: The patch is correct and narrow, but the protected maintainer label and live discussion make the merge path a human-owned maintainer lane rather than a cleanup close or automated repair.
  • Likely owner: vincentkoc — They acknowledged ownership of the current exact head and stated they were waiting on hosted CI before the native merge gate.
  • Options:
    • Land after required checks (recommended): Proceed with the current exact head once branch protection and the native prepare/merge gate are satisfied.
    • Pause for maintainer lane: Keep the PR open without repair if the active lane needs to wait for QA Smoke or other maintainer-controlled validation.

Security
Cleared: The diff adds only type-only exports in a TypeScript protocol barrel and does not touch dependencies, workflows, permissions, secrets, generated artifacts, or code execution paths.

Review details

Best possible solution:

Land the focused type-export repair through the maintainer merge gate after required exact-head checks complete.

Do we have a high-confidence way to reproduce the issue?

Yes, from source inspection rather than local execution: current main imports the two type-only symbols but re-exports only the schemas, leaving the explicit public barrel inconsistent. The PR body and live CI also report the relevant prod-type and lint gates passing after the fix.

Is this the best way to solve the issue?

Yes, this is the best fix: the existing schemas and generated type aliases already exist, so adding the missing type exports beside their schemas is the narrowest maintainable repair.

AGENTS.md: found and applied where relevant.

Codex review notes: model internal, reasoning high; reviewed against 738654d20c7e.

Label changes

Label changes:

  • add P2: This is a normal-priority repair for a current-main type/lint regression in the gateway protocol barrel with a narrow fix and limited blast radius.
  • add proof: sufficient: Contributor real behavior proof is sufficient. For this CI/type-barrel repair, the PR body supplies after-fix command evidence and the live hosted check run shows the exact head passing prod-type and lint gates.
  • add rating: 🐚 platinum hermit: Overall readiness is 🐚 platinum hermit; proof is 🐚 platinum hermit and patch quality is 🦞 diamond lobster.
  • add status: 👀 ready for maintainer look: ClawSweeper has no concrete contributor-facing blocker left for this PR. Sufficient (linked_artifact): For this CI/type-barrel repair, the PR body supplies after-fix command evidence and the live hosted check run shows the exact head passing prod-type and lint gates.

Label justifications:

  • P2: This is a normal-priority repair for a current-main type/lint regression in the gateway protocol barrel with a narrow fix and limited blast radius.
  • rating: 🐚 platinum hermit: Overall readiness is 🐚 platinum hermit; proof is 🐚 platinum hermit and patch quality is 🦞 diamond lobster.
  • status: 👀 ready for maintainer look: ClawSweeper has no concrete contributor-facing blocker left for this PR. Sufficient (linked_artifact): For this CI/type-barrel repair, the PR body supplies after-fix command evidence and the live hosted check run shows the exact head passing prod-type and lint gates.
  • proof: sufficient: Contributor real behavior proof is sufficient. For this CI/type-barrel repair, the PR body supplies after-fix command evidence and the live hosted check run shows the exact head passing prod-type and lint gates.
Evidence reviewed

PR surface:

Source +2. Total +2 across 1 file.

View PR surface stats
Area Files Added Removed Net
Source 1 2 0 +2
Tests 0 0 0 0
Docs 0 0 0 0
Config 0 0 0 0
Generated 0 0 0 0
Other 0 0 0 0
Total 1 2 0 +2

What I checked:

Likely related people:

  • steipete: git blame and merged PR metadata tie the managed-session-worktree protocol symbols to the merged worktree feature, and this PR is the narrow follow-up for that surface. (role: introduced behavior; confidence: high; commits: b4b1984fe7a9, 866654956357; files: packages/gateway-protocol/src/index.ts, packages/gateway-protocol/src/schema/sessions.ts, packages/gateway-protocol/src/schema/types.ts)
  • vincentkoc: Live PR discussion says the active maintainer lane owns the exact head through the native prepare/merge flow, and the PR is assigned to this person. (role: likely follow-up owner; confidence: high; files: packages/gateway-protocol/src/index.ts)
  • zhangLei99586: Current blame on nearby long-standing session barrel export lines points to prior gateway-protocol barrel work, making this a secondary routing signal for the surrounding file structure. (role: adjacent area contributor; confidence: low; commits: 9f8bc7fa37; files: packages/gateway-protocol/src/index.ts)
What the crustacean ranks mean
  • 🦀 challenger crab: rare, exceptional readiness with strong proof, clean implementation, and convincing validation.
  • 🦞 diamond lobster: very strong readiness with only minor maintainer review expected.
  • 🐚 platinum hermit: good normal PR, likely mergeable with ordinary maintainer review.
  • 🦐 gold shrimp: useful signal, but proof or patch confidence is still limited.
  • 🦪 silver shellfish: thin signal; proof, validation, or implementation needs work.
  • 🧂 unranked krab: not merge-ready because proof is missing/unusable or there are serious correctness or safety concerns.
  • 🌊 off-meta tidepool: rating does not apply to this item.

Shiny media proof means a screenshot, video, or linked artifact directly shows the changed behavior. Runtime, network, CSP, and security claims still need visible diagnostics.

How this review workflow works
  • ClawSweeper keeps one durable marker-backed review comment per issue or PR.
  • Re-runs edit this comment so the latest verdict, findings, and automation markers stay together instead of adding duplicate bot comments.
  • A fresh review can be triggered by eligible @clawsweeper re-review comments, exact-item GitHub events, scheduled/background review runs, or manual workflow dispatch.
  • PR/issue authors and users with repository write access can comment @clawsweeper re-review or @clawsweeper re-run on an open PR or issue to request a fresh review only.
  • Maintainers can also comment @clawsweeper review to request a fresh review only.
  • Fresh-review commands do not start repair, autofix, rebase, CI repair, or automerge.
  • Maintainer-only repair and merge flows require explicit commands such as @clawsweeper autofix, @clawsweeper automerge, @clawsweeper fix ci, or @clawsweeper address review.
  • Maintainers can comment @clawsweeper explain to ask for more context, or @clawsweeper stop to stop active automation.

@clawsweeper clawsweeper Bot added proof: sufficient ClawSweeper judged the real behavior proof convincing. rating: 🐚 platinum hermit Good normal PR readiness with ordinary maintainer review expected. status: 👀 ready for maintainer look ClawSweeper has no concrete contributor-facing blocker left for this PR. P2 Normal backlog priority with limited blast radius. labels Jul 6, 2026
@vincentkoc
vincentkoc merged commit fda01a6 into main Jul 6, 2026
130 of 136 checks passed
@vincentkoc
vincentkoc deleted the codex/fix-main-generated-gates branch July 6, 2026 10:21
@vincentkoc

Copy link
Copy Markdown
Member

Merged via squash.

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

Labels

app: web-ui App: web-ui gateway Gateway runtime maintainer Maintainer-authored PR P2 Normal backlog priority with limited blast radius. proof: sufficient ClawSweeper judged the real behavior proof convincing. rating: 🐚 platinum hermit Good normal PR readiness with ordinary maintainer review expected. size: XS status: 👀 ready for maintainer look ClawSweeper has no concrete contributor-facing blocker left for this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants