Repository navigation
fix: restore main after the #7044 merge dropped ~32 merged PRs - #7058
Merged
senamakel merged 6 commits intoOct 7, 2026
Merged
Conversation
The "Merge main into pr/7044" commit (e558c90) resolved the merge by keeping the PR's side almost everywhere, so merging tinyhumansai#7044 reverted the work of every PR merged between tinyhumansai#6995 and tinyhumansai#7045 (about 35 PRs, and the 0.64.11/0.64.12 release bumps). A later "merge main into pr/7046" did the same to tinyhumansai#7048's changes in Conversations.tsx. This redoes the tinyhumansai#7044 merge (one real conflict, the rust-layout allowance for runtime_session.rs, kept at tinyhumansai#7044's 1489), keeps tinyhumansai#7044's own edits in the four files main never touched, and replays the difference onto main. Conflicts with PRs merged since are unions: both the Turkish and the restored Japanese and Arabic locales, tests and README links. Conversations.tsx is tinyhumansai#7048's version (which already carries tinyhumansai#6996's and tinyhumansai#7045's logic) plus tinyhumansai#7046's openTinyVoice change.
- Config::clone lists voice_live: tinyhumansai#7050's hand-written clone and tinyhumansai#7046's new field merged separately and left main failing to compile. - Conversations sends leave the model to the core by default again (composerModelOverride ?? undefined), as tinyhumansai#6996 intended; tinyhumansai#7048 had put hint:chat back while building on the damaged main, which also left the model-clear barrier unreachable. - Japanese gets the 109 strings added while it was missing; Turkish gets those plus the 61 restored English keys, and drops six memory-engine keys tinyhumansai#7029 removed. - The legacy memory migration test checks that the sqlite backend key is gone, not that no key in the whole config contains "backend".
tinyhumansai#7048 added CreateConversationThread::working_dir after tinyhumansai#7046 branched, so the voice feature (in the product set) stopped compiling on main.
…r-7044 # Conflicts: # Cargo.lock
tinyhumansai#7054 refreshed the root Cargo.lock but not crates/openhuman-app's.
Tiny Sweeper review
|
Contributor
|
Note Currently processing new changes in this PR. This may take a few minutes, please wait... ⚙️ Run configuration
⛔ Files ignored due to path filters (2)
📒 Files selected for processing (276)
Comment |
12 tasks done
12 tasks done
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
2 participants
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
Conversations.tsx. That file is fixed here too.Problem
e558c90918has main (ba1e9e6b4e) as a parent, yet its tree is the PR branch plus a few small edits. Every first-parent merge on main between #6995 and #7045 therefore disappeared when #7044 landed. Examples:0.64.10;memory/convert.rs(fix(memory): read PDF, Word, PowerPoint and Excel into the brain (#7023) #7034) is gone;INSUFFICIENT_CREDITSandUNAVAILABLE(fix(memory): tell a credit refusal and an outage apart from an empty memory (#6718) #7013) are gone;PRs restored:
#7004, #7008, #7009, #7011, #7012, #7013, #7014, #7015, #7017, #7018, #7019, #7021, #7024, #7026, #7027, #7028, #7029, #7030, #7031, #7033, #7034, #7035, #7036, #7038, #7043, #6935, #6978, #6986, #6996, #6997, #6998, #7045, plus the 0.64.11 and 0.64.12 release commits.
Solution
ba1e9e6b4einto the PR tip6514bd8b32again.runtime_session.rs. It is kept at Host-injected session store: per-agent conversations outside the workspace #7044's value, 1489.session_store/mod.rs,tinyagents/reaper.rs, andopenhuman-embedruntime/{builder,mod}.rs.e558c90918.LanguageSelect.test.tsxandi18n/__tests__/coverage.test.ts.Conversations.tsxis feat(chat): OpenClaw-inspired chat UI: working folder, per-model thinking, real thread titles, richer sidebar and run-state cues #7048's version, which already carries fix(routing): honour the Chat UI model picker's provider selection #6996's and fix(chat): make Stop work when the socket is down, the send is pending, or the cancel event is lost #7045's logic in its later form, plus Live voice agents: talk to Tiny in real time, with tools (Gemini Live, ElevenLabs, Sarvam) #7046'sopenTinyVoicechange.Config::clonegainsvoice_live. perf(core): emit Config::clone once, box cross-crate async entry points, ICF on Linux release #7050's hand-written clone and Live voice agents: talk to Tiny in real time, with tools (Gemini Live, ElevenLabs, Sarvam) #7046's new field merged separately, and main does not compile today (E0063).CreateConversationThreadgetsworking_dir: Noneinvoice/live/session.rsandpersist_tests.rs. feat(chat): OpenClaw-inspired chat UI: working folder, per-model thinking, real thread titles, richer sidebar and run-state cues #7048 added the field after Live voice agents: talk to Tiny in real time, with tools (Gemini Live, ElevenLabs, Sarvam) #7046 branched, so thevoicefeature (in the product set, and so the desktop app) does not compile on main either.composerModelOverride ?? undefined), as fix(routing): honour the Chat UI model picker's provider selection #6996 intended. feat(chat): OpenClaw-inspired chat UI: working folder, per-model thinking, real thread titles, richer sidebar and run-state cues #7048's "restore conversation send defaults" puthint:chatback while building on the damaged main. That also left the model-clear barrier unreachable, becausemodelOverridecan never beundefined. @senamakel, please confirm this is what you want. fix(routing): honour the Chat UI model picker's provider selection #6996's routing tests and the Conversations render tests pass with it, 101 of 101.memoryPage.engine.*keys that feat(memory): CortexDB engine tab as a three-option accordion #7029 removed and nothing uses. Turkish was already 109 keys short on main.cargo fmtonsession_store/mod.rsandopenhuman-embedruntime/mod.rs, which failrust:format:checkon main as they stand.crates/openhuman-app/Cargo.lockrefreshed for chore(vendor): pin tinymcp v0.4.0 and tinyskills v0.2.8 #7054'stinymcp0.4.0. chore(vendor): pin tinymcp v0.4.0 and tinyskills v0.2.8 #7054 refreshed only the root lock, so--lockedfails on the app lock.backend = "sqlite"is gone. Before, it required that no key in the whole saved config contain "backend", whichobservability.backend = "otel"and fix(memory): keep legacy local profiles off hosted memory #7041's ownlegacy_backend_unsupportedalways break.Checks:
Submission Checklist
Impact
Related
AI Authored PR Metadata (required for Codex/Linear PRs)
Linear Issue
Commit & Branch
Validation Run
cargo check --locked --workspace --all-targetstsc --noEmit(app); Rust layout checkcargo test -p openhuman --lib -- memory:: config::(865 passed)Validation Blocked
command:cargo test -p openhuman --lib(full suite, macOS)error:the test binary aborts with SIGABRT and no panic message on this Mac; twosecure_opentests assert Linux errno valuesimpact:this PR's Linux CI runs the full suite; main itself cannot build a baseline because it does not compileBehavior Changes
Parity Contract
Duplicate / Superseded PR Handling
Summary by CodeRabbit
New Features
Bug Fixes