Ben Barclay
f5b68ad58b
Merge origin/main into feat/hsp-sync-client
...
Resolves the PR's conflict with main (2252 commits). Two conflicts, both
"each side added an independent block in the same place" — kept both:
- gateway/run.py — the housekeeping loop. This branch adds the Skill Sync
pulls inside the CURATOR_EVERY branch (12-space indent); main adds a
stale-session auto-archive as a sibling `if` at loop level (8-space).
Different scopes, so the naive union would have mis-nested the archive
block into the curator branch; kept each at its own indent level.
- tools/skill_manager_tool.py — the _edit_skill result dict. This branch
appends the org auto-propose note; main appends
_add_description_prompt_preview(). Independent, order-insensitive.
No behaviour dropped from either side.
Verified: 3552 passed / 0 failed across 63 suites (scope regenerated to
include main's new maybe_auto_archive / _add_description_prompt_preview
consumers) via scripts/run_tests.sh. `hermes sync` and `hermes sync status`
still work against a live token, resolving the production plane default.
The Pyright Optional-parameter warnings in skill_manager_tool.py are
pre-existing on main (`content: str = None` etc.), not introduced here.
2026-07-29 13:01:36 -07:00
..
2026-07-29 11:53:39 -07:00
2026-07-25 02:30:20 +00:00
2026-07-05 13:42:46 -07:00
2026-07-24 11:45:57 -07:00
2026-07-29 10:14:11 -07:00
2026-07-29 11:53:39 -07:00
2026-05-28 00:20:11 -07:00
2026-07-22 10:58:22 -07:00
2026-07-29 17:13:48 +05:30
2026-07-29 12:29:39 -07:00
2026-07-27 11:53:48 -04:00
2026-07-18 20:01:55 +05:30
2026-07-16 04:23:12 -07:00
2026-07-28 18:17:56 -07:00
2026-05-18 10:14:38 -07:00
2026-07-26 23:41:54 -07:00
2026-07-25 19:27:17 -07:00
2026-07-21 13:54:11 -05:00
2026-07-23 11:45:07 -07:00
2026-07-22 18:08:59 -05:00
2026-07-29 11:53:39 -07:00
2026-07-29 11:53:39 -07:00
2026-07-05 14:00:20 -07:00
2026-05-17 04:04:15 -07:00
2026-05-29 04:22:27 -07:00
2026-07-29 11:33:41 -07:00
2026-07-29 12:29:39 -07:00
2026-07-29 11:53:39 -07:00
2026-07-24 16:01:38 -07:00
2026-07-26 18:06:21 -07:00
2026-07-28 20:04:58 +05:30
2026-07-23 19:44:35 -07:00
2026-07-27 22:55:18 -05:00
2026-07-28 20:04:58 +05:30
2026-07-29 11:54:18 -07:00
2026-07-24 17:10:39 -07:00
2026-07-02 13:17:41 -07:00
2026-07-24 15:50:36 -07:00
2026-07-24 17:10:39 -07:00
2026-07-28 21:36:23 +00:00
2026-07-18 02:31:20 -07:00
2026-07-29 11:53:39 -07:00
2026-07-23 07:33:36 -07:00
2026-07-18 12:28:59 -07:00
2026-07-27 20:27:56 -07:00
2026-07-17 13:49:12 -07:00
2026-07-22 04:40:07 -07:00
2026-07-28 18:17:56 -07:00
2026-07-26 20:59:16 -07:00
2026-07-24 12:10:03 -05:00
2026-06-18 22:13:07 -07:00
2026-05-13 22:31:28 -07:00
2026-07-23 08:32:09 -07:00
2026-07-28 18:47:54 +05:30
2026-07-26 12:54:45 -07:00
2026-05-28 00:20:11 -07:00
2026-07-14 16:47:33 +05:30
2026-06-30 16:56:01 -07:00
2026-07-29 11:53:39 -07:00
2026-07-01 16:25:48 -05:00
2026-06-30 15:16:21 -05:00
2026-07-16 07:57:51 -07:00
2026-07-23 08:19:14 -07:00
2026-07-24 13:00:53 +05:30
2026-06-21 12:03:46 -07:00
2026-06-19 15:23:41 +08:00
2026-07-29 12:29:39 -07:00
2026-07-28 01:10:05 +05:30
2026-07-01 04:07:46 -07:00
2026-07-29 11:54:18 -07:00
2026-07-29 10:52:13 -07:00
2026-07-20 11:05:52 -07:00
2026-07-24 17:10:39 -07:00
2026-07-22 12:10:58 -05:00
2026-06-23 08:01:50 +00:00
2026-07-16 01:13:43 -07:00
2026-07-05 03:14:55 -07:00
2026-07-29 13:01:36 -07:00
2026-07-28 20:04:58 +05:30
2026-07-10 05:41:59 -05:00
2026-07-28 20:04:58 +05:30
2026-07-26 20:59:11 -07:00
2026-07-28 09:58:43 -07:00
2026-07-28 10:19:53 -07:00
2026-07-27 21:10:51 -07:00
2026-07-19 08:25:35 +05:30
2026-07-29 10:13:50 -07:00
2026-07-16 04:32:23 -07:00
2026-07-22 04:39:17 -07:00
2026-07-26 20:36:47 -07:00
2026-07-05 14:48:11 -07:00
2026-07-28 03:44:17 -05:00
2026-07-24 11:45:57 -07:00
2026-07-29 13:01:36 -07:00
2026-07-24 15:53:38 -07:00
2026-07-02 04:51:56 +05:30
2026-05-28 04:53:27 -07:00
2026-07-17 18:31:09 +00:00
2026-07-29 11:53:39 -07:00
2026-07-01 04:55:15 -07:00
2026-07-22 08:11:09 +05:30
2026-07-28 01:10:05 +05:30
2026-07-16 01:07:29 +05:30
2026-06-25 19:00:48 -07:00
2026-06-30 17:28:33 -07:00
2026-07-26 02:58:16 -05:00
2026-07-16 04:26:32 -07:00
2026-07-29 11:53:39 -07:00
2026-07-26 21:27:45 -07:00
2026-07-11 05:41:58 -07:00
2026-07-24 11:45:57 -07:00
2026-05-25 01:41:19 -07:00
2026-07-14 02:59:39 +05:30
2026-05-24 18:04:54 -07:00
2026-07-14 02:59:39 +05:30
2026-07-28 08:10:58 -07:00
2026-07-27 21:10:51 -07:00
2026-07-22 12:02:40 -05:00
2026-07-26 17:47:51 -07:00
2026-07-28 11:54:46 -07:00
2026-07-24 15:55:08 -07:00
2026-07-12 04:32:52 -07:00
2026-06-30 00:59:29 -05:00
2026-07-02 06:07:56 +05:30
2026-07-14 02:59:39 +05:30
2026-07-14 02:59:39 +05:30
2026-07-06 02:42:24 -07:00
2026-07-06 04:38:17 -07:00