herdr-gentle-shell 1.4.0 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/DESIGN.md +62 -9
- package/README.md +38 -17
- package/extensions/gentle-herdr-state.ts +53 -5
- package/lib/customize-panel.js +5 -6
- package/package.json +1 -1
package/DESIGN.md
CHANGED
|
@@ -289,7 +289,20 @@ running delegate or a pending launch — neither of which says the
|
|
|
289
289
|
principal itself works. The native status keeps that aggregate meaning for
|
|
290
290
|
Herdr's own pane state; the row's working-vs-idle decision reads only
|
|
291
291
|
`gentle_principal_v1` (§5.2). It carries no count and alters neither the work
|
|
292
|
-
total nor the roles CSV.
|
|
292
|
+
total nor the roles CSV. `agentActive` alone would render that blocked call
|
|
293
|
+
as generic `gentle`.
|
|
294
|
+
The root session additionally emits `gentle_pending_v1` (`<hash>:<role>:<exp>`)
|
|
295
|
+
while a synchronous (task mode) `subagent_run`/`subagent_continue` tool call
|
|
296
|
+
is still in flight: such a call blocks the principal's own turn, so the
|
|
297
|
+
session is executing a tool call and waiting on the child rather than doing
|
|
298
|
+
its own model work. The value is the role word of the OLDEST in-flight
|
|
299
|
+
recognized launch (`agentToRole` of the pending record), republished on every
|
|
300
|
+
beat so a long child run stays covered by the ordinary beat, and cleared to
|
|
301
|
+
null the beat the call resolves, the agent settles, or the session resets.
|
|
302
|
+
It carries no count and alters neither the work total nor the roles CSV. A
|
|
303
|
+
background launch resolves its tool call immediately, so a queued or running
|
|
304
|
+
background delegate never publishes this marker and never changes the
|
|
305
|
+
principal's own display (S3).
|
|
293
306
|
|
|
294
307
|
### 4.3 Token formats (ABNF-ish, strict)
|
|
295
308
|
|
|
@@ -330,6 +343,21 @@ gentle_principal_v1 = sessionHash ":" expiry
|
|
|
330
343
|
; principal settles; decides working vs idle in §5.2
|
|
331
344
|
; while the native status keeps its aggregate meaning
|
|
332
345
|
; (running delegate / pending launch = working)
|
|
346
|
+
; caveat: a synchronous launch keeps it fresh for the
|
|
347
|
+
; whole blocked call — gentle_pending_v1 below carries the
|
|
348
|
+
; child's role for that window
|
|
349
|
+
gentle_pending_v1 = sessionHash ":" role ":" expiry
|
|
350
|
+
; blocking-delegate marker — fresh while a synchronous
|
|
351
|
+
; (task mode) subagent_run/subagent_continue tool call is
|
|
352
|
+
; in flight, carrying the role word of the OLDEST
|
|
353
|
+
; in-flight recognized launch; republished on every beat
|
|
354
|
+
; (same TTL discipline as gentle_work_v1) and null (clear)
|
|
355
|
+
; the beat the call resolves, the agent settles, or the
|
|
356
|
+
; session resets. Renders at role precedence in §5.2:
|
|
357
|
+
; below attention and terminal done, above the principal
|
|
358
|
+
; marker — the principal's turn is blocked on that child.
|
|
359
|
+
; Background launches resolve immediately and never
|
|
360
|
+
; publish it, so they never change the principal's row.
|
|
333
361
|
gentle_done_v1 = sessionHash ":" expiry
|
|
334
362
|
; synthesized finish signal, no count — minted ONCE at the
|
|
335
363
|
; settled-and-empty edge (principal settled, zero
|
|
@@ -392,6 +420,7 @@ pane.report_metadata --source gentle:v1 --token gentle_work_v1=Ab3_xK9q2mZ7QwErT
|
|
|
392
420
|
pane.report_metadata --source gentle:v1 --token gentle_roles_v1=worker,explorer
|
|
393
421
|
pane.report_metadata --source gentle:v1 --token gentle_orchestrating_v1=Ab3_xK9q2mZ7QwErTyUiOpAsDfGhJkL012345678:1789000000000
|
|
394
422
|
pane.report_metadata --source gentle:v1 --token gentle_principal_v1=Ab3_xK9q2mZ7QwErTyUiOpAsDfGhJkL012345678:1789000000000
|
|
423
|
+
pane.report_metadata --source gentle:v1 --token gentle_pending_v1=Ab3_xK9q2mZ7QwErTyUiOpAsDfGhJkL012345678:worker:1789000000000
|
|
395
424
|
pane.report_metadata --source gentle:v1 --token gentle_names_v1=planner,code-writer
|
|
396
425
|
pane.report_metadata --source gentle:v1 --token gentle_changes_v2=Ab3_xK9q2mZ7QwErTyUiOpAsDfGhJkL012345678:5:110:22:1789000000000
|
|
397
426
|
pane.report_metadata --source gentle:v1 --token gentle_error_v1=Ab3_xK9q2mZ7QwErTyUiOpAsDfGhJkL012345678:run-failed:1789000000000
|
|
@@ -448,7 +477,10 @@ principal marker the pane shows the oldest role word (or `idle`), never
|
|
|
448
477
|
new/reloaded session under a different session hash cannot retain the prior
|
|
449
478
|
session's change token. `gentle_names_v1` clears the same way when the
|
|
450
479
|
authoritative active TaskStore list has no labels, and `gentle_roles_v1`
|
|
451
|
-
clears (null) when no delegation is active.
|
|
480
|
+
clears (null) when no delegation is active. `gentle_pending_v1` clears
|
|
481
|
+
(null) on the first beat after the blocking call resolves, the agent
|
|
482
|
+
settles, or the session resets — the same full-state discipline, never a
|
|
483
|
+
lingering edge. The retired disclosure token is
|
|
452
484
|
cleared to remove any stale metadata. v2 stays the visible
|
|
453
485
|
normative source; v1 remains legacy only.
|
|
454
486
|
|
|
@@ -463,6 +495,9 @@ carry it as a suffix only when above one), `gentle_orchestrating_v1` (root-only
|
|
|
463
495
|
+ freshness gate for the `orchestrating` display — never rendered as a
|
|
464
496
|
count), `gentle_principal_v1` (principal-only activity marker + freshness
|
|
465
497
|
gate for the working-vs-idle decision — never rendered as a count),
|
|
498
|
+
`gentle_pending_v1` (blocking-delegate role marker + freshness gate for the
|
|
499
|
+
in-flight synchronous launch — renders the child's role word while the
|
|
500
|
+
principal's own turn is blocked on it),
|
|
466
501
|
`gentle_done_v1` (synthesized finish signal + its own hold freshness gate
|
|
467
502
|
for the reachable `done` display — the host never reports `done`, §4.3),
|
|
468
503
|
`gentle_error_v1` (durable run-error signal + freshness gate for the `error`
|
|
@@ -484,6 +519,16 @@ error := fresh `gentle_error_v1` (durable per-beat token, §4.3)
|
|
|
484
519
|
ask := fresh `gentle_ask_v1` (durable per-beat token, §4.3)
|
|
485
520
|
OR herdr:blocked has ask:* (fresh)
|
|
486
521
|
review := herdr:blocked has review:* (fresh)
|
|
522
|
+
blockingRole := fresh gentle_pending_v1 (session-bound, TTL-fresh) whose
|
|
523
|
+
role word is recognized — a synchronous subagent call is in
|
|
524
|
+
flight, so the principal's turn is blocked on that child;
|
|
525
|
+
renders exactly like the role branch below (display +
|
|
526
|
+
label via the role helpers, count suffix unchanged) and
|
|
527
|
+
outranks the principal marker, which stays fresh for the
|
|
528
|
+
whole blocked call. Stale, foreign, malformed, or
|
|
529
|
+
unrecognized evidence falls through. Background launches
|
|
530
|
+
resolve their tool call immediately, so a running background
|
|
531
|
+
delegate never reaches this branch.
|
|
487
532
|
principalWorking := fresh gentle_principal_v1 (session-bound, TTL-fresh) —
|
|
488
533
|
the principal's OWN activity, never the delegate count and
|
|
489
534
|
never the aggregate native status (which reads working for
|
|
@@ -520,7 +565,7 @@ done := (native done OR fresh gentle_done_v1) AND gentle_work_v1
|
|
|
520
565
|
idle := otherwise (native fallback; also all-gentle-tokens-missing-or-expired)
|
|
521
566
|
```
|
|
522
567
|
|
|
523
|
-
Priority: `error > ask > review > done > principal working > role > orchestrating > working(main) > idle`.
|
|
568
|
+
Priority: `error > ask > review > done > blockingRole > principal working > role > orchestrating > working(main) > idle`.
|
|
524
569
|
`done` is matched before the principal/role branches in the reducer; it is
|
|
525
570
|
listed here below the activity branches only so its settled-and-empty
|
|
526
571
|
precondition reads together.
|
|
@@ -533,7 +578,13 @@ principal** renders `gentle` (pink
|
|
|
533
578
|
`orchestrating` while a fresh root marker is live) and outranks every
|
|
534
579
|
delegate role word; an **idle principal** shows the oldest running role word
|
|
535
580
|
(`explorer`, `worker`, `verify`, `judge`, or `rdd` when it is the oldest)
|
|
536
|
-
however many delegates run. The
|
|
581
|
+
however many delegates run. The one exception sits between them and is
|
|
582
|
+
evidence-based, never a precedence guess: while a **synchronous**
|
|
583
|
+
`subagent_run`/`subagent_continue` call is in flight the principal's own turn
|
|
584
|
+
is blocked on the child, so the fresh `gentle_pending_v1` role word decides
|
|
585
|
+
the row (below attention and the terminal `done`, above the principal
|
|
586
|
+
marker). Background launches resolve their tool call immediately, so a queued
|
|
587
|
+
or running background delegate never changes the principal's own display. The fresh marker is not a principal-working
|
|
537
588
|
signal (it stays live while the principal is idle with queued or running
|
|
538
589
|
delegates), so it never outranks a role word. An in-flight attention `review`
|
|
539
590
|
(fresh `review:` label or durable `gentle_review_v1` token) overrides the
|
|
@@ -881,11 +932,13 @@ applies the focused row and `Esc` closes without a write; a click on a category
|
|
|
881
932
|
selects it, a click on a row applies it, and a click outside the panes is
|
|
882
933
|
ignored (a press only captures the gesture, so a drag never applies a row).
|
|
883
934
|
Each switch is one row that paints the stored state and carries the opposite
|
|
884
|
-
value.
|
|
885
|
-
`
|
|
886
|
-
|
|
887
|
-
|
|
888
|
-
|
|
935
|
+
value. Each category owns exactly one switch: `Herdr Sidebar` shows the single
|
|
936
|
+
`Sidebar agent rows` row and its description names the managed agent rows only,
|
|
937
|
+
while the only Moshi switch is the `Notifications` row under
|
|
938
|
+
`Moshi notifications`, which applies the `gentle-moshi.json` flag through
|
|
939
|
+
`applyMoshiNotifications`. The two channels are never mixed: the sidebar-rows
|
|
940
|
+
switch neither reads nor writes that flag, so disabling the agent rows leaves
|
|
941
|
+
the notification channel exactly as it was.
|
|
889
942
|
An inconclusive sidebar verdict (`unknown`) renders as `● Unknown` with a note
|
|
890
943
|
instead of hiding the row: toggling still attempts the repair and reports the
|
|
891
944
|
apply step's own error, exactly like the menu. The plain
|
package/README.md
CHANGED
|
@@ -15,11 +15,18 @@ subagents — (machine display key
|
|
|
15
15
|
(`gentle_principal_v1`, published while the principal session itself works and
|
|
16
16
|
cleared when it settles) decides the row — never the delegate count, and
|
|
17
17
|
never Herdr's aggregate native status (which reads `working` whenever any
|
|
18
|
-
delegate runs):
|
|
19
|
-
reads `gentle` and no delegate role word
|
|
18
|
+
delegate runs): the default is still the principal's own state, so while the
|
|
19
|
+
principal works its own turn it reads `gentle` and no delegate role word
|
|
20
|
+
wins; while the principal is idle
|
|
20
21
|
the oldest running delegate role shows — `explorer`, `worker`, `verify`,
|
|
21
22
|
`judge`, `rdd` — with the total running count in parentheses when two or
|
|
22
|
-
more subagents run, for example `explorer (3)`)
|
|
23
|
+
more subagents run, for example `explorer (3)`). The single exception is a
|
|
24
|
+
blocking synchronous subagent call (`gentle_pending_v1`): a task-mode
|
|
25
|
+
`subagent_run`/`subagent_continue` holds the principal's turn open until the
|
|
26
|
+
child returns, so the principal is waiting on that child rather than working
|
|
27
|
+
and the in-flight child's role renders instead. A queued or running
|
|
28
|
+
background delegate publishes no such marker and leaves the principal's
|
|
29
|
+
display untouched),
|
|
23
30
|
`ask` (three independent event legs — choice, native questionnaire, legacy rpiv — plus
|
|
24
31
|
executed `ask_user_question`/`ask_user_choice` tool calls (execution opens, end/result closes;
|
|
25
32
|
proposals never block), tool-gated `ui_prompt` dialog spans (a `custom` panel — agents view, ODD
|
|
@@ -253,12 +260,19 @@ aggregate native status (the work token counts running delegates, and the
|
|
|
253
260
|
native status reads `working` for any running delegate or pending launch — so
|
|
254
261
|
neither can say the principal works): the dedicated
|
|
255
262
|
`gentle_principal_v1` marker is published while the principal session itself
|
|
256
|
-
works and cleared when it settles.
|
|
257
|
-
pink
|
|
263
|
+
works and cleared when it settles. That is the default: a **working
|
|
264
|
+
principal** reads `gentle` — pink
|
|
258
265
|
`orchestrating` while a fresh root marker is live — and no delegate role word
|
|
259
266
|
wins; an **idle principal** shows the oldest running TaskStore role
|
|
260
267
|
(`explorer`, `worker`, `verify`, `judge`, `rdd`), however many delegates run.
|
|
261
|
-
|
|
268
|
+
The one exception is a blocking synchronous subagent call: while a task-mode
|
|
269
|
+
`subagent_run`/`subagent_continue` is in flight the principal's own turn is
|
|
270
|
+
blocked on the child, so the producer publishes that child's role in
|
|
271
|
+
`gentle_pending_v1` and it renders instead of `gentle`, for as long as the
|
|
272
|
+
call lasts. Background launches resolve their tool call immediately, so a
|
|
273
|
+
queued or running background delegate publishes no such marker and leaves
|
|
274
|
+
the principal's own display untouched. These yield to `ask`/`rdd`/`blocked`
|
|
275
|
+
and terminal `done` — where `done` needs
|
|
262
276
|
settled-plus-empty (principal settled with no running delegates and no
|
|
263
277
|
pending launches; a settled principal with running delegates keeps the role
|
|
264
278
|
word, never `done`). A role word is not a subagent label; it carries the
|
|
@@ -306,8 +320,9 @@ and confirm row 2 shows pink `gentle` (machine key
|
|
|
306
320
|
`orchestrating`) while
|
|
307
321
|
the principal session actively works — even with zero subagents — and keeps
|
|
308
322
|
`gentle` while its delegates run (a role word such as `worker`, `explorer`,
|
|
309
|
-
`verify`, `judge` shows once the principal itself is idle
|
|
310
|
-
|
|
323
|
+
`verify`, `judge` shows once the principal itself is idle — and also while a
|
|
324
|
+
task-mode subagent call blocks the principal's turn, until it returns), row 1
|
|
325
|
+
shows the single heading cell (`● <project>` plus ` +N`/` -N`/` ↑N` inline, zero `·`) after edits / when behind upstream; then `ask` on an open
|
|
311
326
|
question (choice / native-questionnaire / legacy event legs, executed `ask_user_question`/`ask_user_choice`, tool-gated `ui_prompt` dialog spans (a `custom` panel — agents view, ODD viewer, changes view, design canvas — never counts, because opening a panel is navigation, not a question), or permission waiting; `gentle_review` starts never speculate ask, and no failed tool ever does either: a tool error changes nothing, see the error rule below). `rdd` (machine key `review`) applies during acknowledged native capture/group execution only (`reviewerRunAcknowledged: true` at execution start — never proposal, never forecast-only, never `correctionLines` planning, never `gentle_review`/`gentle_review_scope` in any operation; no hook/sidebar signal observed; unknown legacy shapes stay dark; call-id tracked so thrown/cancelled calls still clear, read-only `assess` excluded). Bounded approximation: the acknowledged interval contains preparation and admission; no exact reviewer internal events exist today. The orchestrator-host `ask_user_choice` prompt emits no Pi tool/event observable by this extension and stays covered only by the event legs above. Never point the fixture commands at the live config: keep
|
|
312
327
|
`HERDR_CONFIG_PATH` on a temp file for apply/uninstall checks.
|
|
313
328
|
|
|
@@ -353,9 +368,13 @@ See [DESIGN.md](DESIGN.md) §4 (producer) and §5 (consumer), and
|
|
|
353
368
|
settled-plus-empty)) and the authoritative TaskStore role signal
|
|
354
369
|
(`explorer` / `worker` / `verify` / `judge` / `rdd` from `TaskRecord.agent`,
|
|
355
370
|
oldest running first by immutable first-seen, shown while the principal
|
|
356
|
-
itself is idle — a working principal keeps `gentle`, asserted by
|
|
357
|
-
principal-only `gentle_principal_v1` marker rather than by the delegate
|
|
358
|
-
count or Herdr's aggregate native status
|
|
371
|
+
itself is idle — a working principal's own turn keeps `gentle`, asserted by
|
|
372
|
+
the principal-only `gentle_principal_v1` marker rather than by the delegate
|
|
373
|
+
count or Herdr's aggregate native status, with one exception: a blocking
|
|
374
|
+
synchronous `subagent_run`/`subagent_continue` call holds the principal's
|
|
375
|
+
turn open, so the in-flight child's role shows instead (the
|
|
376
|
+
`gentle_pending_v1` role marker) until that call resolves, while a
|
|
377
|
+
background delegate never takes that path; `gentle` (machine
|
|
359
378
|
key `working`) for the principal's own working state; an unknown delegation
|
|
360
379
|
keeps its original sanitized name, 32-char bound — never a generic
|
|
361
380
|
collapse), with a running-count suffix on role labels when two or more
|
|
@@ -426,10 +445,12 @@ See [DESIGN.md](DESIGN.md) §4 (producer) and §5 (consumer), and
|
|
|
426
445
|
it is a key the panel answers to, and a narrow card compacts it instead of
|
|
427
446
|
wrapping. Pointer input still works without being advertised — a click on a
|
|
428
447
|
category selects it, a click on a row applies it, and a click outside the
|
|
429
|
-
panes is ignored.
|
|
430
|
-
`
|
|
431
|
-
`
|
|
432
|
-
|
|
448
|
+
panes is ignored. Each category owns exactly one switch: `Herdr Sidebar`
|
|
449
|
+
shows the single `Sidebar agent rows` row, and the only Moshi switch is the
|
|
450
|
+
`Notifications` row under `Moshi notifications`. The two are never mixed —
|
|
451
|
+
`Sidebar agent rows` neither reads nor writes `gentle-moshi.json`, so turning
|
|
452
|
+
the agent rows off never turns the notification channel off. The plain
|
|
453
|
+
two-step menu stays as the fallback
|
|
433
454
|
when the TUI helpers or `ctx.ui.custom` are unavailable.
|
|
434
455
|
`Sidebar agent rows` drives the Herdr plugin's own `bin/configure.js`
|
|
435
456
|
(`--check` to read, `--apply --reload` / `--uninstall --reload` to change) and
|
|
@@ -454,8 +475,8 @@ See [DESIGN.md](DESIGN.md) §4 (producer) and §5 (consumer), and
|
|
|
454
475
|
mkdir -p "$dir" && echo '{"enabled":true}' > "$dir/gentle-moshi.json"
|
|
455
476
|
```
|
|
456
477
|
|
|
457
|
-
`/herdr-gentle:customize` → `Moshi notifications`
|
|
458
|
-
|
|
478
|
+
`/herdr-gentle:customize` → `Moshi notifications` writes this flag for you,
|
|
479
|
+
and enabling there first
|
|
459
480
|
requires the `moshi-hook` CLI on `PATH` with `moshi-hook status --json`
|
|
460
481
|
reporting `paired: true` (an unpaired host is refused and nothing is
|
|
461
482
|
written).
|
|
@@ -50,6 +50,22 @@
|
|
|
50
50
|
// busy. The consumer uses it for the working-vs-idle
|
|
51
51
|
// decision; the aggregate native status keeps its own
|
|
52
52
|
// meaning. Never alters the work count or roles CSV.)
|
|
53
|
+
// gentle_pending_v1 = <hash>:<role>:<expiry>
|
|
54
|
+
// (blocking-delegate marker, session-bound + TTL-fresh
|
|
55
|
+
// like gentle_work_v1: the role word of the oldest
|
|
56
|
+
// in-flight `subagent_run`/`subagent_continue` call,
|
|
57
|
+
// republished on every beat while the call blocks, null
|
|
58
|
+
// / clear the beat it settles, the agent settles, or
|
|
59
|
+
// the session resets. A synchronous launch blocks the
|
|
60
|
+
// principal's own turn, so agentActive stays true and
|
|
61
|
+
// the principal marker would paint generic `gentle`
|
|
62
|
+
// while the child runs; this marker is the evidence
|
|
63
|
+
// that the row must show the child's role instead.
|
|
64
|
+
// Background launches resolve their tool call
|
|
65
|
+
// immediately, so they never leave a marker: a running
|
|
66
|
+
// background delegate never changes the principal's
|
|
67
|
+
// own display. Never alters the work count or roles
|
|
68
|
+
// CSV.)
|
|
53
69
|
// gentle_changes_v2 = <hash>:<files>:<added>:<deleted>:<expiry>
|
|
54
70
|
// (normative; exact added/deleted totals kept separate)
|
|
55
71
|
// gentle_changes_v1 = <hash>:<files>:<added+deleted>:<expiry>
|
|
@@ -839,6 +855,13 @@ const ERROR_TOKEN = "gentle_error_v1";
|
|
|
839
855
|
// computeNativeState alone — the aggregate native status answers `working`
|
|
840
856
|
// for any delegate, so the consumer cannot use it to decide the row.
|
|
841
857
|
const PRINCIPAL_TOKEN = "gentle_principal_v1";
|
|
858
|
+
// Blocking-delegate marker: session-bound + TTL-fresh `<hash>:<role>:<expiry>`,
|
|
859
|
+
// the role word of the oldest in-flight synchronous
|
|
860
|
+
// `subagent_run`/`subagent_continue` call. It exists because such a call
|
|
861
|
+
// blocks the principal's turn (agentActive stays true) while the child runs,
|
|
862
|
+
// so the principal marker alone renders generic `gentle`. Recognized roles
|
|
863
|
+
// only; null / clear when no blocking call is in flight.
|
|
864
|
+
const PENDING_TOKEN = "gentle_pending_v1";
|
|
842
865
|
|
|
843
866
|
const HASH_RE = /^[A-Za-z0-9_-]{43}$/;
|
|
844
867
|
const COUNT_RE = /^(0|[1-9]\d{0,15})$/;
|
|
@@ -2418,10 +2441,9 @@ async function applyCustomizeSwitch(id, value, ctx) {
|
|
|
2418
2441
|
// The single apply path shared by the overlay and the menu fallback. An
|
|
2419
2442
|
// inconclusive sidebar verdict is never a refusal: choosing On still attempts
|
|
2420
2443
|
// the repair and reports the apply step's own error, exactly like the baseline
|
|
2421
|
-
// menu did. `switchId` names the switch a row drives
|
|
2422
|
-
//
|
|
2423
|
-
//
|
|
2424
|
-
// file stays the single source of truth.
|
|
2444
|
+
// menu did. `switchId` names the switch a row drives, never the category it is
|
|
2445
|
+
// painted under: each category now owns exactly one switch, so the sidebar rows
|
|
2446
|
+
// can only ever resolve `sidebar` and the notification row only `moshi`.
|
|
2425
2447
|
async function applyCustomizeChoice(categoryId, valueId, ctx, switchId) {
|
|
2426
2448
|
const target = switchId === "sidebar" || switchId === "moshi" ? switchId : categoryId;
|
|
2427
2449
|
if (target !== "sidebar" && target !== "moshi") return;
|
|
@@ -3032,6 +3054,16 @@ export default function (pi) {
|
|
|
3032
3054
|
return out;
|
|
3033
3055
|
}
|
|
3034
3056
|
|
|
3057
|
+
// Role word of the OLDEST in-flight blocking launch, or undefined when no
|
|
3058
|
+
// recognized role is pending. `pendingRoleSubs` is already oldest-first by
|
|
3059
|
+
// call time, so the first entry is the one the row must show; recognized
|
|
3060
|
+
// filtering there means an unsalvageable agent name yields no role (the
|
|
3061
|
+
// consumer then stays on its own evidence instead of guessing).
|
|
3062
|
+
function pendingRole() {
|
|
3063
|
+
const oldest = pendingRoleSubs()[0];
|
|
3064
|
+
return oldest === undefined ? undefined : agentToRole(oldest.agent);
|
|
3065
|
+
}
|
|
3066
|
+
|
|
3035
3067
|
// Merged role sources, oldest-first by first-seen: authoritative running
|
|
3036
3068
|
// TaskStore subs plus pending role hints. Authoritative entries win on
|
|
3037
3069
|
// duplicates via rolesCsv dedup (first wins = oldest wins).
|
|
@@ -3215,6 +3247,17 @@ export default function (pi) {
|
|
|
3215
3247
|
// how many delegates keep running.
|
|
3216
3248
|
if (agentActive) tokens[PRINCIPAL_TOKEN] = `${sessionHash}:${expiry}`;
|
|
3217
3249
|
else tokens[PRINCIPAL_TOKEN] = null;
|
|
3250
|
+
// Blocking-delegate marker (same binding/TTL discipline): a synchronous
|
|
3251
|
+
// launch keeps the principal's agent active for the whole child run, so
|
|
3252
|
+
// the principal marker above is fresh while the row should instead show
|
|
3253
|
+
// the child's role. This carries that evidence per beat (never
|
|
3254
|
+
// edge-only), so a long child run stays covered by the ordinary beat and
|
|
3255
|
+
// a missed beat cannot strand the row. Cleared to null the beat the call
|
|
3256
|
+
// settles; background launches resolve their tool call immediately and so
|
|
3257
|
+
// never publish it.
|
|
3258
|
+
const pending = pendingRole();
|
|
3259
|
+
if (pending !== undefined) tokens[PENDING_TOKEN] = `${sessionHash}:${pending}:${expiry}`;
|
|
3260
|
+
else tokens[PENDING_TOKEN] = null;
|
|
3218
3261
|
// Synthesized finish signal (S2/D2): minted once at the settled-and-empty
|
|
3219
3262
|
// edge — principal settled with no running/queued delegate, no pending
|
|
3220
3263
|
// launch, no live background job, and no human-wait, review, or error leg
|
|
@@ -3926,7 +3969,12 @@ export default function (pi) {
|
|
|
3926
3969
|
}
|
|
3927
3970
|
const pending =
|
|
3928
3971
|
typeof event.toolCallId === "string" ? pendingCalls.get(event.toolCallId) : undefined;
|
|
3929
|
-
|
|
3972
|
+
const pendingResolved =
|
|
3973
|
+
typeof event.toolCallId === "string" ? pendingCalls.delete(event.toolCallId) : false;
|
|
3974
|
+
// A resolved launch releases the blocking-delegate marker on THIS beat,
|
|
3975
|
+
// not on the next periodic one: a failed/aborted launch carries no
|
|
3976
|
+
// gentleAgents details, so the record path below never publishes.
|
|
3977
|
+
if (pendingResolved) schedulePublish();
|
|
3930
3978
|
// A launch resolution retires the settle-time pending guard: the
|
|
3931
3979
|
// outcome is now covered by the task record (working via activeSubs),
|
|
3932
3980
|
// the error latch (blocked), or genuine emptiness (idle on next beat).
|
package/lib/customize-panel.js
CHANGED
|
@@ -174,16 +174,15 @@ const CUSTOMIZE_SWITCHES = [
|
|
|
174
174
|
},
|
|
175
175
|
];
|
|
176
176
|
|
|
177
|
-
//
|
|
178
|
-
//
|
|
179
|
-
//
|
|
180
|
-
// knows. Both rows read the one flag, so they can never disagree.
|
|
177
|
+
// Two categories, one row each. `Herdr Sidebar` owns the managed agent rows the
|
|
178
|
+
// plugin publishes and nothing else: the Moshi notification channel lives only
|
|
179
|
+
// under `Moshi notifications`, so the sidebar switch can never toggle it.
|
|
181
180
|
const CUSTOMIZE_CATEGORIES = [
|
|
182
181
|
{
|
|
183
182
|
id: "sidebar",
|
|
184
183
|
title: "Herdr Sidebar",
|
|
185
|
-
description: "
|
|
186
|
-
switches: ["sidebar"
|
|
184
|
+
description: "The managed agent rows this plugin hands to the Herdr sidebar.",
|
|
185
|
+
switches: ["sidebar"],
|
|
187
186
|
},
|
|
188
187
|
{
|
|
189
188
|
id: "moshi",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "herdr-gentle-shell",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.5.0",
|
|
4
4
|
"description": "Pi package for Herdr sidebar states: the Pi extension sidecar that publishes session facts as Herdr pane-metadata tokens, the optional Moshi notification channel, and the Pi-side helpers the Herdr Gentle Shell plugin drives.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pi-package",
|