ethernet
c35a6d65c9
merge: upstream/main into ethie/pm-clean
Bring in 597 upstream commits while preserving the branch's intentional
divergence (pm store, MSIX desktop, Termux removal).
Resolution notes:
- local_runtime/local-models cluster (30 both-added files): took upstream's
evolved version — our side was a stale feat-merge snapshot with zero
post-merge commits, and our non-conflicted importers were verified against
upstream's exports.
- install scripts (install.ps1/install.sh/setup-hermes.sh): kept our staged
pm-store bootstrappers (upstream still ships the old monolithic installer).
- Deleted-by-us files (node-bootstrap.sh, install_ps1 tests, termux.md):
kept deleted — the pm store replaced that machinery.
- runtime_repair.py: kept ours (pm-based), restored upstream's managed_uv.py
which surviving upstream files still import.
- Core files (run_agent, update_cmd, main.py, hermes_constants, estop,
aux_client, browser_tool, desktop entry, config_defaults): per-file merges
combining both sides' features (upstream fleet-wide estop, PID-identity
daemon kill, editable-install guard; our utf-8-sig sweep, stable channel,
PYTHONPATH desktop entry).
- Desktop/i18n: took upstream's flag-gated local-models components; merged
both sides' i18n keys; merged run-electron-builder.mjs and notifications
tests keeping both sides' tests.
- pyproject.toml: upstream's expanded exclude-newer list + our
google-cloud-pubsub entry; uv.lock regenerated from the merged pyproject.
2026-09-01 20:22:04 -04:00
..
2026-08-31 18:00:49 -04:00
2026-09-01 20:22:04 -04:00
2026-08-28 23:10:01 -07:00
2026-08-16 22:08:05 -07:00
2026-08-28 23:10:01 -07:00
2026-09-01 20:22:04 -04:00
2026-08-27 13:48:51 -07:00
2026-08-15 02:51:59 +05:30
2026-08-29 21:23:00 -04:00
2026-08-23 20:00:18 -07:00
2026-09-01 20:22:04 -04:00
2026-08-29 21:23:00 -04:00
2026-08-29 21:23:00 -04:00
2026-08-24 21:51:44 -07:00
2026-08-28 04:57:52 -07:00
2026-08-21 22:33:45 +05:30
2026-08-31 21:59:11 +05:30
2026-09-01 20:22:04 -04:00
2026-09-01 20:22:04 -04:00
2026-08-19 16:31:16 -07:00
2026-08-31 18:00:48 -04:00
2026-08-14 21:24:36 -07:00
2026-08-26 16:42:44 -07:00
2026-08-28 23:10:01 -07:00
2026-08-29 21:23:00 -04:00
2026-08-28 01:39:33 -07:00
2026-08-31 18:00:48 -04:00
2026-08-24 20:10:44 -07:00
2026-08-31 18:00:49 -04:00
2026-09-01 12:07:52 -07:00
2026-08-29 21:23:00 -04:00
2026-08-31 21:11:11 -05:00
2026-08-29 21:23:00 -04:00
2026-08-28 23:10:01 -07:00
2026-08-24 20:10:44 -07:00
2026-08-31 18:00:48 -04:00
2026-08-26 06:26:02 -07:00
2026-08-29 18:33:41 -07:00
2026-08-28 23:10:01 -07:00
2026-08-12 15:21:47 +05:30
2026-08-13 11:09:51 -07:00
2026-08-28 03:58:52 -07:00
2026-08-08 04:19:38 -07:00
2026-08-23 16:04:41 -07:00
2026-08-31 10:42:39 -07:00
2026-08-13 10:47:40 -07:00
2026-08-08 12:32:23 -07:00
2026-08-28 20:16:26 -07:00
2026-08-29 21:23:00 -04:00
2026-08-29 21:23:00 -04:00
2026-08-29 21:23:00 -04:00
2026-08-20 20:20:23 -07:00
2026-08-26 02:54:35 +05:30
2026-08-29 21:23:00 -04:00
2026-08-28 23:10:01 -07:00
2026-08-12 15:21:47 +05:30
2026-08-28 03:24:43 -07:00
2026-08-28 23:10:01 -07:00
2026-09-01 20:22:04 -04:00
2026-08-28 23:10:01 -07:00
2026-09-01 20:55:35 +05:30
2026-08-31 18:00:48 -04:00
2026-08-28 23:10:01 -07:00
2026-08-28 23:10:01 -07:00
2026-08-28 23:10:01 -07:00
2026-08-29 21:23:00 -04:00
2026-08-17 10:03:36 -07:00
2026-08-31 10:06:34 -07:00
2026-09-01 20:55:35 +05:30
2026-08-29 17:58:51 -07:00
2026-08-12 13:57:59 +05:30
2026-09-01 20:22:04 -04:00
2026-08-29 21:23:00 -04:00
2026-09-01 20:22:04 -04:00
2026-09-01 20:22:04 -04:00
2026-08-29 21:23:00 -04:00
2026-08-29 21:23:00 -04:00
2026-08-31 18:00:49 -04:00
2026-09-01 20:22:04 -04:00
2026-08-29 21:23:00 -04:00
2026-08-29 21:23:00 -04:00
2026-08-31 18:00:49 -04:00
2026-08-13 11:09:51 -07:00
2026-08-17 19:41:32 +05:30
2026-08-15 23:48:15 -07:00
2026-09-01 20:22:04 -04:00
2026-08-29 20:39:31 -07:00
2026-08-31 21:11:11 -05:00
2026-08-31 18:00:48 -04:00
2026-08-29 18:40:51 -07:00
2026-09-01 10:56:49 -07:00
2026-08-20 00:16:22 -07:00
2026-08-25 16:39:12 -07:00
2026-08-31 21:11:11 -05:00
2026-08-31 18:00:48 -04:00
2026-08-31 18:00:48 -04:00
2026-09-01 10:56:49 -07:00
2026-08-28 05:10:33 -07:00
2026-09-01 16:01:53 -04:00
2026-08-23 03:54:52 -07:00
2026-08-31 18:00:48 -04:00
2026-08-31 18:00:48 -04:00
2026-08-29 21:23:00 -04:00
2026-09-01 10:56:49 -07:00
2026-08-29 21:23:00 -04:00
2026-08-31 18:00:48 -04:00
2026-08-29 21:23:00 -04:00
2026-08-16 21:20:29 -07:00
2026-08-16 21:20:29 -07:00