Repository navigation
merge: resolve composer resume-test conflict so Sync can finish - #13
Merged
Merged
Conversation
…e test (stablyai#26097) stablyai#25835 kept the onAcceptMention prop that stablyai#26017 replaced with onChooseMentionFile and mentionFiles, so the web typecheck fails on main.
Pin generated skill JSON and Vitest snapshots to LF so Windows autocrlf checkouts pass byte-for-byte verification. Cover the checkout behavior with a real Git regression test. Co-authored-by: Shuhei Konno <shuhei.konno@gmail.com>
…er lanes (stablyai#26093) vitest 5 does not apply a CLI --exclude to inline projects, so the glibc floor container ran profile-state-writer-stall.electron.test.ts and failed with 'spawn xvfb-run ENOENT'. Resolve the selectors to files and filter them before vitest sees them.
# Conflicts: # src/renderer/src/components/native-chat/native-chat-composer-field-resume.test.tsx Co-authored-by: karlorz <karlorz@users.noreply.github.com>
karlorz
marked this pull request as ready for review
October 7, 2026 07:48
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ELI5
After PR #12, Sync fork main from upstream stopped on one test file. This PR finishes that same merge by hand. The app still has the fork’s own voice, Herdr, grok
--agent minimal, and trusted-machine settings. The automatic allowlist is unchanged.What Changed
Before:
fork-mainwas atb5b538d648(PR #12). Sync fail-closed at https://github.com/karlorz/orca/actions/runs/37587088027 onsrc/renderer/src/components/native-chat/native-chat-composer-field-resume.test.tsx. Upstream tip is4077fb4a8d. The other three upstream commits auto-merged.After:
fork-maincan take this--no-ffmerge ofstablyai/orcamain(same spirit asconfig/scripts/fork-sync-fork-main.mjs). The held-queue Resume composer test still covers Resume/Send/Stop. It uses upstream’s@mention props (mentionFiles+onChooseMentionFile) in the same order as stablyai#26097.Mechanism: one
--no-ffmerge of4077fb4a8dinto a branch fromb5b538d648. The only conflict was that test file: fork-main already hadmentionFilesnext toautocomplete; upstream placed it afteronChooseMentionFile. Resolution takes upstream’s placement so the props are not duplicated.AUTO_RESOLVABLE_SYNC_PATHSis not changed.Fork customs kept: pet voice /
pet.speak.*, grok--agent minimal, Herdr,keyExpiryDisabled, packaging contract test.Why
Expanding the allowlist would teach the daily workflow to auto-resolve a product test. A normal PR is the right place. Taking one side wholesale was unnecessary: both sides already had the mention props; only the key order collided.
Linked Issue
Fork ops: blocked sync run https://github.com/karlorz/orca/actions/runs/37587088027. Maintainer-authorized unattended merge into
fork-main. No upstream issue.Visual Proof
N/A — merge conflict resolution in a unit test. No UI restyle.
Testing
AUTO_RESOLVABLE_SYNC_PATHSunchangedv1.4.222-0if the script says so)Coolify/prod not touched.
Agent skill upstream boundary
docs/reference/agent-skill-sharing-upstream-boundary.mdand copies or mechanically translates no upstream skill-installer source, tests, fixtures, registry entries, path tables, comments, or documentation.Notes
Coolify and production remain on HOLD.
Checklist
N/Awith reasonpnpm lint,pnpm typecheck,pnpm test, andpnpm buildpass (or CI will cover; local preferred)