#909 merge: reconcile Wave 1 with latest main - #1023
Merged
Conversation
* #896 fix(automation): run hosted schedules internally * #896 test(automation): prove minute wakeup and session run * #896 fix(automation): adapt scheduler to AgentHost lifecycle * #863 fix(full-app): wire default front plugins * #863 fix(full-app): build automation front package * #896 fix(automation): migrate dev DB before runs * #896 fix(full-app): address hosted agent sessions * #896 feat(automation): prefix run session titles * #896 feat(automation): add pause and last-run status * #896 fix(automation): refresh scheduled runs live * #896 feat(automation): stream run updates * #896 fix(automation): recover abandoned hosted runs * #896 fix(ci): decouple migrations from runtime secrets * #863 refactor(full-app): register automation directly * #863 test(full-app): remove brittle source parity check * #896 docs: plan managed host worker lifecycle * #896 refactor(automation): manage scheduler as a host worker * fix(cli): use Fastify 5 static header API * #896 refactor(automation): rely on durable shutdown recovery * refactor(core): keep database resolution migration-local * refactor(core): reuse file secret resolution for migrations
hachej
added
the
ready-for-human
Owner
Author
|
The first CI run exposed a semantic merge interaction that was not a textual conflict: latest Fixed in Proof:
|
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
1 participant
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.
Summary
Merge current
origin/main(0900eed92) into the completed Wave 1 integration branch after exit items #1020–#1022.Conflict resolution
One conflict in
apps/full-app/package.json:.32's transitive topologicalbuild:depsselectorpnpm run migrateintodevProof
@hachej/boring-automation,@hachej/boring-mcp, and@hachej/boring-governanceThis PR exists solely to clear PR #1008's conflict with latest main before its final CI/merge gate.