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:48 -04:00
2026-08-31 18:00:48 -04:00
2026-08-31 18:00:49 -04:00
2026-08-29 21:23:00 -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-26 10:10:11 -07:00
2026-09-01 15:34:03 -07:00
2026-09-01 14:56:30 +05:30
2026-09-01 16:27:20 +05:30
2026-08-31 18:00:49 -04:00
2026-08-29 18:34:35 -07:00
2026-08-29 18:34:35 -07:00
2026-09-01 17:53:28 -04:00
2026-08-31 18:00:48 -04:00
2026-07-26 23:41:54 -07:00
2026-09-01 16:27:13 +05:30
2026-09-01 20:22:04 -04:00
2026-07-29 11:53:39 -07:00
2026-07-29 11:53:39 -07:00
2026-08-10 10:45:44 -07:00
2026-08-12 19:13:32 -07:00
2026-09-01 20:22:04 -04:00
2026-08-31 09:58:51 -07:00
2026-08-28 04:58:14 -07:00
2026-09-01 15:34:03 -07:00
2026-08-29 21:23:00 -04:00
2026-08-15 03:16:21 -07:00
2026-08-21 21:53:11 +05:30
2026-09-01 15:34:03 -07:00
2026-09-01 14:33:23 +05:30
2026-08-08 23:09:45 +05:30
2026-08-29 21:23:00 -04:00
2026-09-01 15:34:03 -07:00
2026-09-01 15:34:03 -07:00
2026-08-29 21:23:00 -04:00
2026-08-29 18:34:35 -07:00
2026-09-01 22:42:27 +05:30
2026-08-08 12:32:23 -07:00
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-06 03:16:26 +05:30
2026-08-29 21:23:00 -04:00
2026-08-16 22:06:08 -07:00
2026-08-28 04:58:06 -07:00
2026-08-21 15:24:03 -07:00
2026-09-01 20:22:04 -04:00
2026-08-28 06:36:22 -07:00
2026-08-27 21:07:21 +05:30
2026-07-26 20:59:16 -07:00
2026-08-29 21:23:00 -04:00
2026-08-08 14:49:28 -07:00
2026-08-19 16:10:01 -07:00
2026-09-01 16:01:53 -04:00
2026-08-14 02:04:24 +05:30
2026-08-23 18:25:19 -07:00
2026-08-08 05:09:43 -07:00
2026-07-29 11:53:39 -07:00
2026-08-29 21:23:00 -04:00
2026-08-29 21:23:00 -04:00
2026-08-19 22:41:05 -07:00
2026-08-31 09:57:22 -07:00
2026-08-25 03:55:55 -07:00
2026-08-15 01:04:19 -07:00
2026-08-30 20:40:43 -07:00
2026-08-29 12:06:48 +05:30
2026-08-13 23:10:16 +05:30
2026-09-01 20:22:04 -04:00
2026-08-29 21:23:00 -04:00
2026-08-30 05:16:10 -07:00
2026-08-29 21:23:00 -04:00
2026-08-29 21:23:00 -04:00
2026-08-02 15:01:11 -07:00
2026-08-29 19:14:15 -07:00
2026-08-12 16:25:20 -07:00
2026-08-12 18:38:25 -07:00
2026-09-01 02:14:35 -07:00
2026-09-01 12:08:11 -07:00
2026-09-01 20:22:04 -04:00
2026-08-29 11:33:05 +05:30
2026-09-01 02:14:35 -07:00
2026-08-29 12:23:41 +05:30
2026-08-26 10:10:11 -07:00
2026-08-29 20:39:44 +05:30
2026-08-06 22:02:37 -05:00
2026-08-27 03:24:20 -07:00
2026-09-01 12:07:16 -07:00
2026-08-19 08:52:01 -07:00
2026-08-19 08:52:03 -07:00
2026-08-08 23:46:17 -07:00
2026-08-16 01:55:51 -07:00
2026-07-29 10:13:50 -07:00
2026-08-23 19:04:37 -07:00
2026-09-01 16:01:53 -04:00
2026-08-21 13:21:46 +10:00
2026-08-29 13:02:13 +05:30
2026-08-29 21:23:00 -04:00
2026-08-29 08:23:47 -07:00
2026-08-29 21:23:00 -04:00
2026-08-31 18:00:49 -04:00
2026-07-29 15:28:15 -07:00
2026-09-01 20:22:04 -04:00
2026-08-08 15:10:24 +05:30
2026-08-23 18:25:19 -07:00
2026-08-29 21:23:00 -04:00
2026-09-01 20:22:04 -04:00
2026-08-24 20:10:44 -07:00
2026-08-24 20:10:44 -07:00
2026-08-15 00:33:01 -07:00
2026-08-16 22:10:02 -07:00
2026-08-25 15:24:15 -07:00
2026-08-28 23:10:01 -07:00
2026-08-25 02:45:10 -07:00
2026-08-31 18:00:48 -04:00
2026-08-29 11:33:05 +05:30
2026-08-12 19:01:30 -07:00
2026-08-12 19:13:32 -07:00
2026-08-12 19:13:32 -07:00
2026-09-01 16:01:53 -04:00
2026-08-31 14:02:55 -07:00
2026-09-01 03:19:59 +05:30
2026-08-28 03:46:24 -07:00
2026-07-26 17:47:51 -07:00
2026-08-24 03:23:07 -07:00
2026-08-16 00:14:58 -07:00
2026-08-12 01:15:25 -07:00
2026-08-31 18:00:49 -04:00
2026-08-28 05:10:33 -07:00
2026-08-19 16:10:01 -07:00
2026-09-01 10:56:49 -07:00
2026-09-01 10:56:49 -07:00