fix(sync): resolve 8 Nous upstream conflicts blocking the nightly (513 commits) - #16

Closed

vashkartik wants to merge 2909 commits into

ace/patchesfrom

fix/nous-sync-conflicts-20260726

This pull request is big! We're only showing the most recent 250 commits

Commits on Jul 25, 2026

fix(checkpoints): an empty surviving mount point is not evidence of deletion

Frowtek
authored and
teknium1
committed
1fc338a
fix(checkpoints): require positive volume-attachment evidence before orphan classification
teknium1
committed
1cfc342
fix(telegram): require initial polling readiness

mannnrachman
authored and
teknium1
committed
83e30e3
fix(gateway): allow Telegram readiness budget

mannnrachman
authored and
teknium1
committed
9f8810a
fix(telegram): bind strict cold-start readiness to its own polling generation
teknium1
committed
c8ff720
test: record getUpdates progress in mocked cold-connect polling flows
teknium1
committed
9ac8b24
fix(config): add a collision-safe env var name for custom endpoint keys

committed
bfe7460
fix(windows): verify rebuilt Hermes.exe integrity before shipping it as an update (#69179)
teknium1
committed
199f558
fix(desktop): persist the whole discovered model list when saving an endpoint

OutThisLife
and
CDLOOO
committed
de6375e
fix(web_server): keep Desktop custom endpoint API keys out of config.yaml

committed
bd2dcfe
fix(cli): store custom endpoint API key in .env instead of config.yaml

OutThisLife
and
liuhao1024
committed
8a2925f
test: cover custom endpoint key storage and model-list persistence
OutThisLife
committed
15f29d0
fix(desktop): persist @image: refs instead of the vision-enrichment text

alelpoan
authored and
OutThisLife
committed
d0f5ef7
fix(desktop): keep cached attachment refs on session resume

BlackishGreen33
authored and
OutThisLife
committed
4696612
fix(desktop): quote persisted @image: paths so spaced paths render
OutThisLife
committed
6811a79
fix(desktop): persist the image ref for natively-vision-capable models too
OutThisLife
committed
ffbcfa1
refactor(desktop): memoize the directive image-segment filter
OutThisLife
committed
3d2033d
fix(desktop): lead persisted image turns with the caption
OutThisLife
committed
9b33f54
test(desktop): cover attached-image resume end to end
OutThisLife
committed
f71ba11
fix(models): resolve custom provider model ids

ijevin
authored and
OutThisLife
committed
8ca4c74
chore(contributors): map jevin@jevin.org to ijevin
OutThisLife
committed
1613dac
Merge pull request #71144 from NousResearch/bb/custom-model-id-resolution
OutThisLife
authored
808c38e
Merge pull request #71141 from NousResearch/bb/custom-endpoint-keys-and-models
OutThisLife
authored
8f8b66d
Merge pull request #71121 from NousResearch/bb/desktop-image-persist
OutThisLife
authored
6668242
fix(relay): normalize forwarded Discord interactions to leading-slash commands (#71048)
benbarclay
authored
e0dfcf2
feat(desktop): add session link title resolver
OutThisLife
committed
cbad98e
feat(desktop): show resolved titles on @session chips
OutThisLife
committed
dfbc9db
feat(desktop): render agent-written @session links as chips
OutThisLife
committed
92439be
fix(sessions): export delegate cascade before deletion

Drexuxux
authored and
kshitijk4poor
committed
c1fb170
refactor: extract lineage_is_logical local + document TOCTOU re-query
kshitijk4poor
committed
ca35663
feat(session-search): give the agent a link to hand back
OutThisLife
committed
99ab036
fix(tui_gateway): retain failed turns as replayable inflight snapshots

OutThisLife
and
Reza2kn
committed
57b351d
feat(desktop): crash-survivable in-flight turn journal

OutThisLife
and
Omar Baradei
committed
8d8d1d6
fix(desktop): surface terminal error frames as failed bubbles

OutThisLife
and
Reza2kn
committed
b8675a1
feat(desktop): auto-continue turns interrupted by a crash
OutThisLife
committed
082bd17
fix(update): stop `hermes update` stalling for minutes on a large state.db
teknium1
committed
01232e8
fix(gateway): emit error event when a turn is cancelled before agent ready

jinglun010-cpu
authored and
teknium1
committed
996d459
test(desktop): pin first-message delivery through the new-chat route transition (#62562)

giggling-ginger
authored and
teknium1
committed
620d580
test(desktop): pin first-send delivery across a late React Router route commit (#62990)

Roger--Han
authored and
teknium1
committed
eb2f648
test(desktop): pin the genuine post-create switch abort during attachment sync (#62805)

floatingrain
authored and
teknium1
committed
83333c6
test(desktop): pin busy-gateway churn tolerance end-to-end through the submit pipeline (#64327)

Dr Kennedy Umege
authored and
teknium1
committed
b20b235
fix(gateway): deliver the first message when the deferred agent build outlives 30s (#63078)
teknium1
committed
60c8fc6
test(desktop): pin visible agent-init-failure surfacing + optimistic-message survival (#63078)
teknium1
committed
3670375
Merge pull request #71184 from NousResearch/bb/desktop-stream-resume
OutThisLife
authored
62e0722
fmt(js): `npm run fix` on merge (#71196)

hermes-seaeye[bot]
and
github-actions[bot]
authored
9823f15
fix(desktop): mark kept-alive panes so document lookups can skip them
OutThisLife
committed
9285de4
fix(desktop): drop a dragged session on the tab the user can see
OutThisLife
committed
3fbc9be
fix(desktop): keep background tabs out of blur, timeline, and key routing
OutThisLife
committed
771dfcc
test(desktop): cover hidden-tab resolution for drops, focus, and timeline
OutThisLife
committed
0e1332a
test: accept #71184's terminal error frame in the build-failure surfacing test
teknium1
committed
893dcda
Merge pull request #71202 from NousResearch/bb/desktop-session-drop-target
OutThisLife
authored
4ba71e6
fix(scripts): accept legacy consecutive-hyphen GitHub logins in add_contributor
teknium1
committed
4aab4c2
fix(cli): show 'grew by' when optimize-storage DB size increases

chenbin
authored and
teknium1
committed
58b2a8c
fix(sessions): measure reclaimed space with SQLite page accounting

teknium1
and
chenbin
committed
0b3a50f
chore: contributor email mapping for the optimize-storage salvage
teknium1
committed
ce44c34
fix(update): detect the OS-native machine for the Windows exe integrity gate
teknium1
committed
d9c41b5
fix(state): loud failed state.db snapshot + zeroed-file quarantine

Jasmine Naderi
authored and
teknium1
committed
ed5e41d
fix(backup): skip prune when DB capture failed — preserve recovery source

Jasmine Naderi
authored and
teknium1
committed
fc99b54
fix(state): cross-process quarantine lock + oversized DB pruning suppression (#68805)

Jasmine Naderi
authored and
teknium1
committed
6048696
fix(state): quarantine lock fails closed when unacquireable (#68805)

Jasmine Naderi
authored and
teknium1
committed
22e5dac
chore: add contributor mapping for smfworks
teknium1
committed
886dddb
fix(tui_gateway): inject live session id into HERMES_SESSION_ID

jrfbch
authored and
teknium1
committed
3e340d9
fix(terminal): stop shared bash snapshot leaking HERMES_SESSION_* across sessions

jrfbch
authored and
teknium1
committed
f2e32ce
chore: add contributor mapping for jrfbch
teknium1
committed
50e1d7e
fix: brace-group the filtered export dump so $BASHPID expands in the parent shell
teknium1
committed
95a566b
fix(desktop): prevent cross-session leak in background queue drain

theone139344
authored and
teknium1
committed
062d261
fix: widen requestGateway mock signature for typecheck (follow-up for salvaged PR #69689)
teknium1
committed
fd29ce5
style: sort Harness props in the leak-guard test (perfectionist/sort-jsx-props)
teknium1
committed
0c48d2b
fmt(js): `npm run fix` on merge (#71236)

hermes-seaeye[bot]
and
github-actions[bot]
authored
760112a
feat(relay): Phase 1 parity — supported_ops discovery, wire identity fields, /handoff aliasing, provision displayName (#71300)
benbarclay
authored
ebab890
fix(telegram): restore 2x2 exec-approval button layout

HexLab98
authored and
kshitijk4poor
committed
fecceec
test(telegram): cover exec-approval keyboard row pairing

HexLab98
authored and
kshitijk4poor
committed
116a44f
test(telegram): cover smart_deny 2-button row structure
kshitijk4poor
committed
6ad632b
feat(relay): Phase 2 media parity — send_media egress + inbound media localization (#71363)
benbarclay
authored
689b51b
fix(tests): a run that collects nothing can no longer look green
teknium1
committed
35b1e57
fix(tests): gate WAL-dependent tests on the linked SQLite's real capability
teknium1
committed
07e97d2
feat(desktop): open the session a @session ref names
OutThisLife
committed
9edbc68
fix(session-search): stop the agent restating a linked session's title
OutThisLife
committed
efe4491
Merge pull request #71162 from NousResearch/bb/session-link-titles
OutThisLife
authored
5349c7c
fmt(js): `npm run fix` on merge (#71532)

hermes-seaeye[bot]
and
github-actions[bot]
authored
46815f4
fix(desktop): resolve unpacked spawn-helper before chmod (#71171)
tcconnally
authored
ac327df
feat(compression): progress-aware timeouts — stop punishing slow summary models
teknium1
committed
32fd9d6
fix(desktop): route live-turn and history actions by the current session, not a stale closure

teknium1
and
Automata-intelligentsia
committed
771f1b7
fmt(js): `npm run fix` on merge (#71549)

hermes-seaeye[bot]
and
github-actions[bot]
authored
5baf174
fix(desktop): avoid stale actions in memoized surfaces

falcon001
authored and
teknium1
committed
8f53429
test(desktop): cover stale steer action binding

eagle-nyp
authored and
teknium1
committed
3449767
fix(desktop): keep optional action handlers optional through the latest-actions adapters
teknium1
committed
78c0652
feat(relay): Phase 3 interactive — native prompt UX (approvals/confirms/clarify) + react ack lifecycle (#71404)
benbarclay
authored
fffa661
feat(aux): force streaming for providers that reject non-stream requests

kudi3699
authored and
teknium1
committed
5121a2a
feat(compression): stream the summary call on every compression path
teknium1
committed
9de7dfe
fix(desktop): keep model picker aligned with session state
helix4u
committed
c943787
fix(skills): stop treating an upstream skill rename as a user deletion
teknium1
committed
c537ae5
fix(desktop): slash commands target the user's chat, not a new session
teknium1
committed
584b274
fmt(js): `npm run fix` on merge (#71626)

hermes-seaeye[bot]
and
github-actions[bot]
authored
ec734b6
fix(update): stop WoA integrity gate rejecting ARM64 after IsWow64Process2 HANDLE truncation (#71381)
xxxigm
authored
fe3dd91
fix(desktop): /goal arg stays editable, kickoff queues when busy, slash header stops echoing long args

SHL0MS
authored and
teknium1
committed
6b26b40
fmt(js): `npm run fix` on merge (#71634)

hermes-seaeye[bot]
and
github-actions[bot]
authored
2ba1e02
fmt(js): `npm run fix` on merge (#71638)

hermes-seaeye[bot]
and
github-actions[bot]
authored
4448061
perf(cli): cut `hermes -w` startup from ~14s to ~1.8s by parallelizing + caching the worktree prune
teknium1
committed
776c43b
fix(image_gen/codex): remove unsupported tool_choice from request payload (#19505)

Tranquil-Flow
authored and
teknium1
committed
2bfe9fa
fix(image-gen): stop reporting the Codex tool_choice 400 as an account limit
teknium1
committed
064b6e4
fix(sessions): add offline state database recovery

helix4u
authored and
teknium1
committed
a9b8128
fix(sessions): point failed in-place repair at offline recovery
teknium1
committed
ec2a0f8
fix(managed-uv): retry with explicit patch when bare-minor SQLite repair still resolves vulnerable

ygd58
authored and
teknium1
committed
866cdce
fix(managed-uv): don't retry patches at or below the installed version
teknium1
committed
1161cc0

Commits on Jul 26, 2026

Commits on Jul 27, 2026

Merge remote-tracking branch 'upstream/main' into ace/patches-conflict-fix
vectorcmd
committed
4d47163