Skip to content

The ultimate harness for coding agents and beyond. All your agents. All your machines. One command center. Start with code, then follow your curiosity and build across disciplines: CAD, circuits, robots, games and music.

feat(pro): Console Overview and Tab as cards, a slate ground, simpler gestures (#1298)

0xdiego25de7a0b264173
diff --git a/devices/harness-pro/firmware/main/app/pod_glue.c b/devices/harness-pro/firmware/main/app/pod_glue.c
index 3ab918777..eae30c067 100644
--- a/devices/harness-pro/firmware/main/app/pod_glue.c
+++ b/devices/harness-pro/firmware/main/app/pod_glue.c
@@ -204,10 +204,25 @@ static bool scrolls(const pod_ui_t *u)
{
const pod_frame_t *f = top(u);
if (!f) return false;
- if (u->nav.skin == POD_SKIN_CONSOLE) // v3: Overview pages sideways and Recap's summary does not scroll (nor the host's pane)
- return f->view == POD_V_TAB || f->view == POD_V_INBOX;
+ if (u->nav.skin == POD_SKIN_CONSOLE) // Overview pages sideways and a tab's cards page on a swipe (card_page); Recent's rows and
+ // the Inbox scroll; on Agent and Recap a drag scrolls the host's pane (host_scrolls)
+ return (f->view == POD_V_TAB && f->tab == POD_TAB_RECENT) || f->view == POD_V_INBOX || f->view == POD_V_AGENT || f->view == POD_V_RECAP;
return f->view == POD_V_TABS || f->view == POD_V_TAB || f->view == POD_V_RECAP || f->view == POD_V_INBOX;
}
+// Console Tab (not Recent): its cards page on a vertical swipe, from anywhere but the bar and the bottom zone (their own swipes;
+// the caller checks the zone, whose flag is cleared by then).
+static bool card_page(const pod_ui_t *u)
+{
+ const pod_frame_t *f = top(u);
+ return u->nav.skin == POD_SKIN_CONSOLE && f && f->view == POD_V_TAB && f->tab != POD_TAB_RECENT && !u->bar;
+}
+// Whether a vertical drag on this screen scrolls the host's terminal pane (the scroll sink): Recap in both skins, and in Console the
+// Agent screen too, as on the round. The bar and the bottom zone keep their own swipes (u->bar, u->edge), so a drag there does not.
+static bool host_scrolls(const pod_ui_t *u)
+{
+ const pod_frame_t *f = top(u);
+ return f && (f->view == POD_V_RECAP || (u->nav.skin == POD_SKIN_CONSOLE && f->view == POD_V_AGENT));
+}
// A horizontal swipe on the Agent, Recap and Talking screens steps panes, as on the round dial (swipe left = next, right =
// previous): travel >= POD_SW_MIN_PX, |dx| > 1.5 |dy|, released within POD_SW_MS or leaving at POD_SW_FLICK px/s.
// Not from the transport bar (taps only). It is never also a tap or a Recap scroll.
@@ -220,8 +235,8 @@ static bool swipes(const pod_ui_t *u)
return f && (f->view == POD_V_AGENT || f->view == POD_V_RECAP || f->view == POD_V_TALK ||
((f->view == POD_V_TAB || f->view == POD_V_TABS || f->view == POD_V_INBOX) && u->nav.skin == POD_SKIN_CONSOLE)); // Console: the tab view steps tabs, Overview pages, the Inbox goes back
}
-// Console hold to talk: on an agent screen, or on a Tab tile (the agent under the finger). Not in the command bar (crumbs, chips), not
-// on Recent's rows (they open an agent; the hold is for a tab's own tiles), not on an agent that asks (voice stays refused
+// Console hold to talk: only on the agent's own screens (Agent, Recap). Not on a Tab tile or a Recent row (a long press there is
+// a tap: its lift opens the agent), not in the command bar (crumbs, chips), not on an agent that asks (voice stays refused
// there, so the hold does not arm and no notice fires). Returns the agent id the hold would talk to, or NULL.
static const char *hold_target(const pod_ui_t *u)
{
@@ -229,9 +244,7 @@ static const char *hold_target(const pod_ui_t *u)
if (u->nav.skin != POD_SKIN_CONSOLE || !f || u->ban_touch) return NULL;
if (u->start_y < POD_BAR_H) return NULL; // nothing in the command bar holds
if (u->hit_valid && (u->hit.action == POD_A_BACK || u->hit.action == POD_A_ATTENTION || u->hit.action == POD_A_INBOX)) return NULL;
- const char *id;
- if (f->view == POD_V_TAB) id = u->hit_valid && u->hit.action == POD_A_OPEN_AGENT && f->tab != POD_TAB_RECENT && u->hit.id[0] ? u->hit.id : NULL;
- else id = f->view == POD_V_AGENT || f->view == POD_V_RECAP ? f->agent : NULL;
+ const char *id = f->view == POD_V_AGENT || f->view == POD_V_RECAP ? f->agent : NULL;
const pod_agent_t *a = id ? pod_model_find(&u->model, id) : NULL;
return a && pod_model_eff(&u->model, a) != POD_ASKING ? id : NULL;
}
@@ -346,7 +359,7 @@ static pod_out_t banner_open(pod_ui_t *u, uint32_t now_ms)
return o;
}
-// The Console hold's deadline passed with the finger still: talk to the agent (a Tab tile opens it first). An offline
+// The Console hold's deadline passed with the finger still: talk to the agent on screen. An offline
// machine gets the notice instead. The contact is the hold's from here on, tap or not. It runs from the touch samples
// (pod_ui_touch), the one task that also ends or aborts the recording, so a begin can never be overtaken by its end.
static pod_out_t hold_fire(pod_ui_t *u, uint32_t now_ms)
@@ -355,9 +368,7 @@ static pod_out_t hold_fire(pod_ui_t *u, uint32_t now_ms)
memset(&none, 0, sizeof none);
u->hold_armed = false;
const pod_frame_t *t = top(u);
- const bool tile = t && t->view == POD_V_TAB;
- const char *now_id = tile ? u->hit.id : t ? t->agent : "";
- if (!t || u->nav.depth != u->hold_depth || t->view != u->hold_view || strcmp(now_id, u->hold_agent) || (tile && !u->hit_valid))
+ if (!t || u->nav.depth != u->hold_depth || t->view != u->hold_view || strcmp(t->agent, u->hold_agent))
return none; // the screen or the agent changed under the finger since the DOWN: not this hold's any more
u->hold_fired = true;
u->hit_valid = false;
@@ -369,16 +380,8 @@ static pod_out_t hold_fire(pod_ui_t *u, uint32_t now_ms)
pod_ui_notice(u, "That machine is offline", now_ms);
return none;
}
- if (tile) {
- const pod_agent_t *l[POD_AGENTS_MAX];
- int cnt = pod_nav_list(&u->nav, &u->model, l, POD_AGENTS_MAX), at = -1;
- for (int i = 0; i < cnt && at < 0; i++) if (!strcmp(l[i]->id, id)) at = i;
- if (at < 0 || pod_nav_act(&u->nav, &u->model, POD_A_OPEN_AGENT, at, now_ms).fx != POD_FX_AGENT_OPEN) return none;
- u->hold_tile = true; // the host is not told agent.open: voice.start names the agent
- }
pod_out_t o = pod_nav_act(&u->nav, &u->model, POD_A_TALK, 0, now_ms);
if (o.fx != POD_FX_VOICE_BEGIN) {
- if (tile) pod_nav_act(&u->nav, &u->model, POD_A_BACK, 0, now_ms);
u->dirty = true;
return none;
}
@@ -404,9 +407,9 @@ pod_out_t pod_ui_touch(pod_ui_t *u, bool down, int x, int y, uint32_t now_ms, bo
u->last_touch_ms = now_ms;
u->cancelled = u->dragging = u->hit_valid = u->ban_touch = false;
memset(&u->hit, 0, sizeof u->hit); // a DOWN on nothing carries nothing over from the last contact
- if (u->hands_free && !pod_ui_talking(u)) u->hands_free = u->hold_voice = u->hold_tile = false; // Talk ended some other way
+ if (u->hands_free && !pod_ui_talking(u)) u->hands_free = u->hold_voice = false; // Talk ended some other way
u->hold_armed = u->hold_fired = false;
- if (!u->hands_free) u->hold_voice = u->hold_tile = false; // a hands-free recording keeps its owner for this tap
+ if (!u->hands_free) u->hold_voice = false; // a hands-free recording keeps its owner for this tap
u->bar = !u->hands_free && u->nav.skin == POD_SKIN_CONSOLE && u->nav.depth > 1 && y < POD_BAR_H && top(u)->view != POD_V_TALK;
u->start_x = x;
u->start_y = y;
@@ -417,7 +420,9 @@ pod_out_t pod_ui_touch(pod_ui_t *u, bool down, int x, int y, uint32_t now_ms, bo
// swipe up (BACK) or sideways (panes), decided on the lift by which direction dominates.
const bool console = u->nav.skin == POD_SKIN_CONSOLE;
u->sw_ok = !u->hands_free && swipes(u) && (console || y < POD_TRANSPORT_Y);
- u->edge = !u->hands_free && console && u->nav.depth > 1 && y >= POD_BOTTOM_Y && top(u)->view != POD_V_TALK;
+ const pod_view_t tv = top(u)->view;
+ u->edge = !u->hands_free && console && u->nav.depth > 1 && tv != POD_V_TALK &&
+ y >= (tv == POD_V_TAB || tv == POD_V_INBOX ? POD_LIST_BOTTOM_Y : POD_BOTTOM_Y);
u->sw_on = false;
u->sw_vx = 0;
u->sw_last_x = x;
@@ -496,7 +501,7 @@ pod_out_t pod_ui_touch(pod_ui_t *u, bool down, int x, int y, uint32_t now_ms, bo
int dy = y - u->anchor_y;
u->dragging = true;
u->anchor_y = y;
- if (top(u)->view == POD_V_RECAP && u->scroll_emit) {
+ if (host_scrolls(u) && u->scroll_emit) {
if (!u->scroll_begun) { // from the DOWN's point and time, so the first MOVE carries the travel so far
ht_scroll_begin(&u->scroll, u->start_x, u->start_y, u->down_ms, u->scroll_reversed, false, u->scroll_emit,
u->scroll_ctx);
@@ -515,7 +520,6 @@ pod_out_t pod_ui_touch(pod_ui_t *u, bool down, int x, int y, uint32_t now_ms, bo
u->hold_armed = false;
if (u->hold_fired) { // the hold already took this contact: its lift does nothing (a recording stays open, hands free)
u->hold_fired = false;
- if (!u->hold_voice) u->hold_tile = false;
return none;
}
if (u->scroll_begun) { // the lift carries the rest of the travel and the speed it left at
@@ -531,13 +535,14 @@ pod_out_t pod_ui_touch(pod_ui_t *u, bool down, int x, int y, uint32_t now_ms, bo
if (u->ban_on && iabs(dx) <= POD_TAP_SLOP && iabs(dy) <= POD_TAP_SLOP && inside(&u->hit, x, y)) return banner_open(u, now_ms);
return none;
}
- if (was && u->bar) { // Console: a swipe down from the command bar goes home, to Overview (and is not a crumb tap)
+ if (was && u->bar) { // Console: a swipe down from the command bar opens the Inbox (and is not a crumb tap); on the Inbox, nothing
int dx = x - u->start_x, dy = y - u->start_y;
if (dy >= POD_BAR_SWIPE && iabs(dy) * 2 > iabs(dx) * 3) {
*changed = true;
- return pod_nav_act(&u->nav, &u->model, POD_A_TABS, 0, now_ms);
+ return pod_nav_act(&u->nav, &u->model, POD_A_INBOX, 0, now_ms);
}
}
+ const bool from_edge = u->edge; // the contact began in the bottom zone (for card paging below, after the flag is cleared)
if (was && u->edge) { // Console: a swipe up from the bottom zone goes back one level (the sideways case falls through)
int dx = x - u->start_x, dy = y - u->start_y;
u->edge = false;
@@ -554,6 +559,15 @@ pod_out_t pod_ui_touch(pod_ui_t *u, bool down, int x, int y, uint32_t now_ms, bo
return pod_nav_act(&u->nav, &u->model, POD_A_INBOX, 0, now_ms);
}
}
+ if (was && !from_edge && card_page(u)) { // Console Tab: a swipe up shows the next page of the tab's cards, a swipe down the previous one
+ int dx = x - u->start_x, dy = y - u->start_y, last = cs_tab_pages(&u->nav, &u->model) - 1, at = top(u)->scroll;
+ at = at < 0 ? 0 : at > last ? last : at; // the page the view shows (the tab may have shrunk under the frame's scroll)
+ if (iabs(dy) >= POD_SW_MIN_PX && iabs(dy) * 2 > iabs(dx) * 3) {
+ int want = at + (dy < 0 ? 1 : -1);
+ if (want >= 0 && want <= last) { pod_nav_act(&u->nav, &u->model, POD_A_SCROLL, want - top(u)->scroll, now_ms); *changed = true; } // to the page itself
+ return none;
+ }
+ }
if (was && u->pg_mode == POD_PG_DRAG && pg_on(u)) { // dragged, or caught while settling: settle onto a page
pg_release(u, now_ms, false);
*changed = true;
@@ -571,6 +585,8 @@ pod_out_t pod_ui_touch(pod_ui_t *u, bool down, int x, int y, uint32_t now_ms, bo
if (want >= 0 && want <= last) pod_nav_act(&u->nav, &u->model, POD_A_SCROLL, want * 2 - top(u)->scroll, now_ms); // to the page itself, whatever the frame's scroll holds
return none;
}
+ if (u->nav.skin == POD_SKIN_CONSOLE && top(u)->view == POD_V_INBOX) // the Inbox: either way goes back to where it was opened
+ return pod_nav_act(&u->nav, &u->model, POD_A_BACK, 1, now_ms);
return pod_nav_act(&u->nav, &u->model, dx < 0 ? POD_A_NEXT : POD_A_PREV, 0, now_ms);
}
}
@@ -609,7 +625,7 @@ pod_out_t pod_ui_touch(pod_ui_t *u, bool down, int x, int y, uint32_t now_ms, bo
}
pod_out_t out = pod_nav_act(&u->nav, &u->model, u->hit.action, arg, now_ms);
*changed = true;
- if (u->hands_free && out.fx == POD_FX_VOICE_END) u->hands_free = u->hold_voice = u->hold_tile = false; // sent
+ if (u->hands_free && out.fx == POD_FX_VOICE_END) u->hands_free = u->hold_voice = false; // sent
return out;
}
@@ -623,7 +639,7 @@ pod_out_t pod_ui_touch_cancel(pod_ui_t *u)
u->cancelled = true;
u->hit_valid = false;
u->ban_touch = false;
- // The hold fired and a recording may be open: the finger is gone, so end it (and Talk, back to the Tab for a tile's hold).
+ // The hold fired and a recording may be open: the finger is gone, so end it (and Talk).
pod_out_t o = none;
if (u->hands_free && pod_ui_talking(u)) { // hands free: the recording does not depend on this contact
u->hold_armed = u->hold_fired = u->bar = false;
@@ -633,10 +649,9 @@ pod_out_t pod_ui_touch_cancel(pod_ui_t *u)
o.fx = POD_FX_VOICE_ABORT;
pod_copy_str(o.agent, sizeof o.agent, top(u)->agent);
pod_nav_talk_over(&u->nav);
- if (u->hold_tile) pod_nav_act(&u->nav, &u->model, POD_A_BACK, 0, u->down_ms);
u->dirty = true;
}
- u->hold_armed = u->hold_fired = u->hold_voice = u->hold_tile = u->bar = u->hands_free = false;
+ u->hold_armed = u->hold_fired = u->hold_voice = u->bar = u->hands_free = false;
return o;
}
@@ -660,10 +675,6 @@ bool pod_ui_talking(const pod_ui_t *u)
void pod_ui_talk_over(pod_ui_t *u)
{
pod_nav_talk_over(&u->nav); // back on the screen TALK came from, same stack; no ABORT: nothing records
- if (u->hold_voice && u->hold_tile) { // a tile's hold opened the agent for this recording: without one, back to the Tab
- pod_nav_act(&u->nav, &u->model, POD_A_BACK, 0, u->down_ms);
- u->dirty = true;
- }
u->hold_voice = u->hands_free = false;
}
@@ -677,8 +688,9 @@ bool pod_ui_pet_on_screen(const pod_ui_t *u)
{
const pod_frame_t *f = top(u);
if (!u->model.linked || !f) return false;
- if (u->nav.skin == POD_SKIN_CONSOLE) { // Console draws the hero pet on Agent and Recap (nothing when the agent has left the roster) and the listening pet on Talk
+ if (u->nav.skin == POD_SKIN_CONSOLE) { // Console draws the hero pet on Agent and Recap (nothing when the agent has left the roster), the listening pet on Talk and a pet per card on Overview and Tab
if (f->view == POD_V_TALK) return true;
+ if (f->view == POD_V_TABS || f->view == POD_V_TAB) return cs_cards_move(&u->nav, &u->model);
return (f->view == POD_V_AGENT || f->view == POD_V_RECAP) && pod_model_find(&u->model, f->agent);
}
return f->view == POD_V_AGENT || f->view == POD_V_RECAP || f->view == POD_V_TALK;
@@ -692,7 +704,12 @@ static uint32_t unit_ms(const pod_ui_t *u, uint32_t now_ms)
const pod_frame_t *f = top(u);
if (u->model.linked && f && f->view == POD_V_TABS && u->nav.skin != POD_SKIN_CONSOLE && u->pg_mode == POD_PG_IDLE && pod_tabs_ribbon(&u->model, pg_page(u)))
return POD_TABS_BAR_MS; // the Playing ribbon's bars: three tiny rects
- if (u->model.linked && f && f->view == POD_V_TAB && u->nav.skin == POD_SKIN_CONSOLE) { // Tab and Recent: the rows on screen
+ if (u->model.linked && f && f->view == POD_V_TAB && u->nav.skin == POD_SKIN_CONSOLE && f->tab != POD_TAB_RECENT) { // a tab's cards
+ const pod_agent_t *l[CS_PER_PAGE];
+ int n = cs_tab_page(&u->nav, &u->model, l);
+ for (int i = 0; i < n; i++)
+ if (pod_model_eff(&u->model, l[i]) == POD_WORKING) return POD_CS_ANIM_MS;
+ } else if (u->model.linked && f && f->view == POD_V_TAB && u->nav.skin == POD_SKIN_CONSOLE) { // Recent: the rows on screen
const pod_agent_t *l[POD_AGENTS_MAX];
int n = pod_nav_list(&u->nav, &u->model, l, POD_AGENTS_MAX), max = n > CS_ROWS_MAX ? n - CS_ROWS_MAX : 0;
int first = f->scroll < 0 ? 0 : f->scroll > max ? max : f->scroll;
diff --git a/devices/harness-pro/firmware/main/app/pod_glue.h b/devices/harness-pro/firmware/main/app/pod_glue.h
index 3658f6225..e11423de1 100644
--- a/devices/harness-pro/firmware/main/app/pod_glue.h
+++ b/devices/harness-pro/firmware/main/app/pod_glue.h
@@ -18,6 +18,9 @@ enum { POD_TAP_SLOP = 24 };
// Console gestures: hold this long to talk; slide down this far after it to cancel; the command bar's height and the
// travel of a swipe down from it.
enum { POD_HOLD_MS = 400, POD_BAR_H = 72, POD_BAR_SWIPE = 80, POD_BOTTOM_Y = 620, POD_EDGE_SWIPE = 80 };
+// Console Tab (cards and Recent's rows) and the Inbox fill the screen to its bottom margin, so their bottom zone (a swipe up goes
+// back) starts below the content instead of at POD_BOTTOM_Y: a swipe up from the last row or card scrolls or pages.
+enum { POD_LIST_BOTTOM_Y = 692 };
enum { POD_PG_IDLE, POD_PG_DRAG, POD_PG_ANIM };
enum { POD_PG_ANIM_MS = 170, POD_PG_STEP_MS = 16, POD_PG_FLICK = 300 }; // settle time; animation step; flick velocity, px/s (0.3 px/ms) // px: farther than this from the DOWN and the contact is a drag, not a tap
@@ -84,9 +87,8 @@ typedef struct {
bool scroll_reversed, scroll_begun;
uint32_t down_ms;
// Console hold to talk: armed at a DOWN that may talk, fired by the first still sample at or after hold_due_ms (pod_ui_touch, on the touch task); hold_voice is a recording
- // under way for this contact; hold_tile: it opened the agent from a Tab tile first. bar: the
- // contact began in the command bar below the root.
- bool hold_armed, hold_fired, hold_voice, hold_tile, bar;
+ // under way for this contact. bar: the contact began in the command bar below the root.
+ bool hold_armed, hold_fired, hold_voice, bar;
bool hands_free; // Console: the hold started a recording that outlives the finger; the next new tap sends it (cleared by END, ABORT, talk_over, a skin switch)
uint32_t hold_due_ms;
uint8_t hold_depth;
diff --git a/devices/harness-pro/firmware/main/pod/console/cs.h b/devices/harness-pro/firmware/main/pod/console/cs.h
index 4dd094e87..99832801d 100644
--- a/devices/harness-pro/firmware/main/pod/console/cs.h
+++ b/devices/harness-pro/firmware/main/pod/console/cs.h
@@ -5,9 +5,13 @@
void cs_render(pod_out_frame_t *f, const pod_nav_t *nav, pod_model_t *m, uint32_t now_ms);
// ---- chrome (cs_chrome.c): the command bar, hint strip, dots, badges and the step timeline ----------------------
-enum { CS_GROUND = 0x08090A, CS_SURFACE = 0x111214, CS_BORDER = 0x1E2024, CS_INK = 0xEDEEF0, CS_MUTED = 0x8A8F98,
- CS_RUN = 0x3DD68C, CS_ASK = 0xF5A524, CS_FAIL = 0xF2555A, CS_FOCUS = 0x7C6CFF };
-enum { CS_BAR_H = 72, CS_HINT_H = 52 };
+// The "slate" ground (owner, 2026-10-13): the Pro's IPS panel lifts black to grey, so Console sits on a lifted dark ground and
+// carries its contrast in brighter surfaces, edges and text (pro-console-ground-all.html, A).
+enum { CS_GROUND = 0x1B1E24, CS_SURFACE = 0x252932, CS_RAISED = 0x2E333D, CS_BORDER = 0x3A404B, CS_EDGE = 0x454B57,
+ CS_TRACK = 0x4A505C, CS_INK = 0xFFFFFF, CS_INK2 = 0xE2E5EA, CS_MUTED = 0xB8BDC6, CS_DIM = 0x9AA0AA,
+ CS_RUN = 0x3DD68C, CS_RUN_DIM = 0x2C5A43, CS_ASK = 0xF5A524, CS_ASK_FILL = 0x3B3222, CS_ASK_EDGE = 0x8A6418,
+ CS_FAIL = 0xF2555A, CS_FOCUS = 0x7C6CFF, CS_VOICE_BAR = 0x2C2852 };
+enum { CS_BAR_H = 72, CS_FOOT_H = 18 }; // CS_FOOT_H: the margin kept clear along the bottom (no hint strip)
// The 72 px command bar at the top. input == NULL: the breadcrumbs (every crumb but the last is a POD_A_BACK hit whose
// arg is the number of levels up). Otherwise the bar is the voice input: crumbs[n-1] as the "to" chip, then the text.
@@ -19,8 +23,6 @@ enum { CS_BAR_H = 72, CS_HINT_H = 52 };
void cs_bar(pod_out_frame_t *, const char *const crumbs[], int n, int running, int asking, int unread, const char *input, uint32_t now_ms);
// The bell count for a view's bar: the unread entries (at most 99) while linked; the caller passes 0 on Inbox and Talk.
int cs_unread(const pod_model_t *);
-// The 52 px hint strip along the bottom: n pairs of a key cap and a label.
-void cs_hints(pod_out_frame_t *, const char *const keys[], const char *const labels[], int n);
// A 12 px status dot centred on (cx, cy): 'g' running, 'q' asking, 'd' done, 'r' failed, 'i' idle. Static (now_ms unused,
// so it asks for no wake).
void cs_dot(ht_scene_t *, int cx, int cy, char state, uint32_t now_ms);
@@ -40,19 +42,42 @@ void cs_working_mark_small(ht_scene_t *, int x, int y, uint32_t now_ms);
void cs_text(ht_scene_t *, int x, int cy, int w, const ht_pro_font_t *, unsigned rgb, const char *);
// The runs a frame has used so far (the budget tests).
int cs_runs(const pod_out_frame_t *);
+// pct % of colour a over colour b, per channel (0xRRGGBB).
+unsigned cs_mix(unsigned a, unsigned b, unsigned pct);
// ---- Overview and Recent (cs_overview.c, cs_recent.c) -------------------------------------------------------------
-// The Recent-style row list shared by Recent and Tab: up to CS_ROWS_MAX rows of CS_ROW_H px from `first`, right under the bar.
+// Recent's row list: up to CS_ROWS_MAX rows of CS_ROW_H px from `first`, right under the bar.
// Each row: the 44 px logo, the working mark (WORKING) or a dot, the name, the tab's name when tab_col, the time (or "ask") right
// aligned, and the agent's line. Its hit is POD_A_OPEN_AGENT with the agent's index in `list` and its id. Returns the rows drawn.
-enum { CS_ROW_H = 108, CS_ROWS_MAX = 5, CS_ROWS_TOP = CS_BAR_H + 4, CS_PER_PAGE = 4 };
+enum { CS_ROW_H = 104, CS_ROWS_MAX = 6, CS_ROWS_TOP = CS_BAR_H + 4, CS_PER_PAGE = 4 };
int cs_rows(pod_out_frame_t *, const pod_model_t *, const pod_agent_t *const list[], int n, int first, bool tab_col, uint32_t now_ms);
-// The scroll limit of a Recent or Tab frame: its agents less the rows that show.
+// The scroll limit of a TAB frame: Recent's agents less the rows that show; a tab's last card page.
int cs_rows_max(const pod_nav_t *, const pod_model_t *);
void cs_view_overview(pod_out_frame_t *, const pod_nav_t *, pod_model_t *, uint32_t now_ms);
+// Overview cards. cs_card_lead: the agent that speaks for cover c (0 = Recent, else tab c - 1), among its first CS_CARD_AGENTS:
+// the first working, else asking, failed, done, idle; NULL with none. cs_card_loop: the pet loop a card draws for it (WORKING,
+// ASKING, else IDLE, drawn still).
+enum { CS_CARD_AGENTS = POD_PANES_MAX }; // every pane of a tab (Recent holds at most POD_RECENT_MAX)
+// The card grid Overview and Tab share: 2 x 2 cards of CS_CARD_W x CS_CARD_H from (CS_CARD_MARGIN, CS_CARD_TOP), CS_CARD_GAP apart;
+// a card's art is centred in its CS_CARD_ART_Y .. + CS_CARD_ART_H band.
+enum { CS_CARD_W = 338, CS_CARD_H = 296, CS_CARD_GAP = 12, CS_CARD_MARGIN = 16, CS_CARD_TOP = CS_BAR_H + 14, CS_CARD_ART_Y = 74,
+ CS_CARD_ART_H = 164 };
+// A card's art centred on (cx, cy): the agent's pet loop (cs_card_loop; still while idle), else its 72 px logo, else a ">_" outline
+// on `fill`.
+void cs_card_art(ht_scene_t *, int cx, int cy, const pod_model_t *, const pod_agent_t *, unsigned fill, uint32_t now_ms);
+const pod_agent_t *cs_card_lead(const pod_model_t *, int c);
+ht_pet_state_t cs_card_loop(const pod_model_t *, const pod_agent_t *);
+// Whether the cards on screen (Overview's page, or the card Tab's page) draw a moving pet (working or asking; a resting pet is
+// still), and the ms to the next step of any of them (never sooner than POD_CS_ANIM_MS's beat). False / 1000 on other screens.
+bool cs_cards_move(const pod_nav_t *, const pod_model_t *);
+uint32_t cs_cards_next_ms(const pod_nav_t *, const pod_model_t *, uint32_t now_ms);
void cs_view_recent(pod_out_frame_t *, const pod_nav_t *, pod_model_t *, uint32_t now_ms);
-// The selected tab (mockup screen 02): its panes, in pane order, as the Recent rows without the tab name.
+// The selected tab: its agents as cards (pro-console-tab-cards.html, B), four a page in the window's own pane order, each tinted by
+// its agent's state. The TAB frame's scroll is the page; a vertical swipe pages (the glue), sideways steps tabs.
void cs_view_tab(pod_out_frame_t *, const pod_nav_t *, pod_model_t *, uint32_t now_ms);
+// The tab's agents on the page the TAB frame shows (at most CS_PER_PAGE), and the number of pages (at least 1).
+int cs_tab_page(const pod_nav_t *, const pod_model_t *, const pod_agent_t *out[CS_PER_PAGE]);
+int cs_tab_pages(const pod_nav_t *, const pod_model_t *);
// Agents running (WORKING) and asking (ASKING), for the bar's chips.
void cs_counts(const pod_model_t *, int *running, int *asking);
// Seconds since the agent last had a task (act / library stamps against the model clock); 0 when unknown.
diff --git a/devices/harness-pro/firmware/main/pod/console/cs_agent.c b/devices/harness-pro/firmware/main/pod/console/cs_agent.c
index d0a067b24..ae9feca35 100644
--- a/devices/harness-pro/firmware/main/pod/console/cs_agent.c
+++ b/devices/harness-pro/firmware/main/pod/console/cs_agent.c
@@ -10,7 +10,7 @@
#include "pro_canvas.h"
#define C(rgb) ht_rgb(rgb)
-enum { HERO_BOTTOM = 240, PADX = 28, BOX_W = 170, BOX_H = 130, MUTED_LBL = 0x5f646d, EQ_N = 30, EQ_H = 30, LOGO = 28 };
+enum { HERO_BOTTOM = 240, PADX = 28, BOX_W = 170, BOX_H = 130, MUTED_LBL = CS_DIM, EQ_N = 30, EQ_H = 30, LOGO = 28 };
const char *cs_parent_name(const pod_nav_t *nav, const pod_model_t *m)
{
@@ -31,7 +31,7 @@ void cs_label(ht_scene_t *s, int x, int cy, unsigned rgb, const char *t)
void cs_spin(ht_scene_t *s, int cx, int cy, unsigned rgb, uint32_t now_ms)
{
- pod_arc(s, cx * 16, cy * 16, 10 * 16, 3 * 16, 0, 180, C(0x24262b));
+ pod_arc(s, cx * 16, cy * 16, 10 * 16, 3 * 16, 0, 180, C(CS_EDGE));
pod_arc(s, cx * 16, cy * 16, 10 * 16, 3 * 16, (int)((360 - now_ms % 900 * 360 / 900) % 360), 50, C(rgb));
}
@@ -46,8 +46,8 @@ int cs_hero(pod_out_frame_t *f, const pod_nav_t *nav, const pod_model_t *m, cons
ht_scene_t *s = f->scene;
pod_state_t st = pod_model_eff(m, a);
const int by = CS_BAR_H + 20;
- unsigned border = st == POD_ASKING ? 0x5a4210 : st == POD_DONE ? 0x26282d : CS_BORDER;
- ht_pro_rect_aa_stroke(s, PADX, by, BOX_W, BOX_H, 20, C(border), C(st == POD_ASKING ? 0x17130a : CS_SURFACE));
+ unsigned border = st == POD_ASKING ? CS_ASK_EDGE : st == POD_DONE ? CS_EDGE : CS_BORDER;
+ ht_pro_rect_aa_stroke(s, PADX, by, BOX_W, BOX_H, 20, C(border), C(st == POD_ASKING ? CS_ASK_FILL : CS_SURFACE));
pod_pet_draw(s, PADX + (BOX_W - 112) / 2, by + (BOX_H - 112) / 2, 112, a->engine, scene_for(st), now_ms, 0);
const int x = PADX + BOX_W + 24, w = POD_W - PADX - x;
@@ -59,7 +59,7 @@ int cs_hero(pod_out_frame_t *f, const pod_nav_t *nav, const pod_model_t *m, cons
// state . time: the state word in the 28 px medium face; an unknown time draws no time and no dot
const char *label = st == POD_WORKING ? "Running" : st == POD_ASKING ? "Needs input" : st == POD_DONE ? "Done" :
st == POD_OFFLINE ? "Offline" : a->failed ? "Failed" : "Idle";
- unsigned col = st == POD_WORKING ? CS_RUN : st == POD_ASKING ? CS_ASK : st == POD_DONE ? 0xc9ccd2 :
+ unsigned col = st == POD_WORKING ? CS_RUN : st == POD_ASKING ? CS_ASK : st == POD_DONE ? CS_INK2 :
(st != POD_OFFLINE && a->failed) ? CS_FAIL : CS_MUTED;
const int cy = by + 70;
cs_dot(s, x + 6, cy, cs_state_dot(m, a), now_ms);
@@ -69,7 +69,7 @@ int cs_hero(pod_out_frame_t *f, const pod_nav_t *nav, const pod_model_t *m, cons
char t[12];
pod_fmt_time(t, sizeof t, pod_agent_secs(a, now_ms));
int dw = ht_pro_width(&cs_rg_22, "\xc2\xb7"), tx = x + 22 + lw + 10;
- cs_text(s, tx, cy, dw + 2, &cs_rg_22, 0x3a3d44, "\xc2\xb7");
+ cs_text(s, tx, cy, dw + 2, &cs_rg_22, CS_TRACK, "\xc2\xb7");
cs_text(s, tx + dw + 10, cy, ht_pro_width(&cs_mono_26, t) + 2, &cs_mono_26, CS_INK, t);
}
@@ -89,7 +89,7 @@ static void equaliser(ht_scene_t *s, int x, int y, uint32_t now_ms)
for (int i = 0; i < EQ_N; i++) {
uint32_t period = 700 + (uint32_t)(i % 4) * 130, p = (now_ms + (uint32_t)i * 173) % period, half = period / 2;
int h = 9 + (int)((p < half ? p : period - p) * 21 / half);
- ht_pro_rect(s, x + i * pitch, y + EQ_H - h, 17, h, 2, C(i >= EQ_N - 8 ? CS_RUN : 0x1f3a2c));
+ ht_pro_rect(s, x + i * pitch, y + EQ_H - h, 17, h, 2, C(i >= EQ_N - 8 ? CS_RUN : CS_RUN_DIM));
}
}
@@ -110,18 +110,13 @@ void cs_view_agent(pod_out_frame_t *f, const pod_nav_t *nav, pod_model_t *m, uin
if (!a) return;
cs_back_hit(f, crumbs[0]); // the bar names only the tab; a tap on it goes up
pod_state_t st = pod_model_eff(m, a);
- // Voice stays refused on an asking agent (owner): no hold hint, and the glue does not arm the hold there.
- const char *const keys[] = {"hold", "\xe2\x86\x90 \xe2\x86\x92", "\xe2\x86\x91", "\xe2\x86\x93"};
- const char *const labels[] = {"talk", "panes", "back", "home"};
- if (st == POD_ASKING) cs_hints(f, keys + 1, labels + 1, 3);
- else cs_hints(f, keys, labels, 4);
int y = cs_hero(f, nav, m, a, now_ms);
if (st == POD_ASKING) {
char rows[4][POD_ROW_MAX];
int n = pod_wrap(a->question, &cs_sb_34, POD_W - 2 * 18 - 44, 4, rows);
const int top = y + 16, h = 18 + 18 + 10 + n * 42 + 16 + 28 + 24 + 18;
- ht_pro_rect_aa_stroke(s, 18, top, POD_W - 36, h, 18, C(0x5a4210), C(0x16120a));
+ ht_pro_rect_aa_stroke(s, 18, top, POD_W - 36, h, 18, C(CS_ASK_EDGE), C(CS_ASK_FILL));
cs_label(s, 18 + 22, top + 18 + 9, CS_ASK, "QUESTION");
for (int i = 0; i < n; i++) cs_text(s, 18 + 22, top + 18 + 18 + 10 + i * 42 + 21, POD_W - 36 - 44, &cs_sb_34, CS_INK, rows[i]);
int ay = top + 18 + 18 + 10 + n * 42 + 16;
diff --git a/devices/harness-pro/firmware/main/pod/console/cs_chrome.c b/devices/harness-pro/firmware/main/pod/console/cs_chrome.c
index 7212499f7..25648c8a7 100644
--- a/devices/harness-pro/firmware/main/pod/console/cs_chrome.c
+++ b/devices/harness-pro/firmware/main/pod/console/cs_chrome.c
@@ -20,7 +20,7 @@ void cs_text(ht_scene_t *s, int x, int cy, int w, const ht_pro_font_t *f, unsign
void cs_dot(ht_scene_t *s, int cx, int cy, char state, uint32_t now_ms)
{
(void)now_ms;
- unsigned rgb = state == 'g' ? CS_RUN : state == 'q' ? CS_ASK : state == 'd' ? CS_MUTED : state == 'r' ? CS_FAIL : 0x33363d;
+ unsigned rgb = state == 'g' ? CS_RUN : state == 'q' ? CS_ASK : state == 'd' ? CS_MUTED : state == 'r' ? CS_FAIL : CS_TRACK;
ht_pro_rect_aa(s, cx - 6, cy - 6, 12, 12, 6, C(rgb));
}
@@ -62,7 +62,7 @@ static int bell_chip(ht_scene_t *s, int right, int cy, int unread, int *out_x)
char t[8];
snprintf(t, sizeof t, "%d", unread);
int tw = ht_pro_width(&cs_mono_18, t), cw = 10 + 18 + 7 + tw + 10, x = right - cw, y = cy - 15;
- ht_pro_rect_aa_stroke(s, x, y, cw, 30, 8, C(0x26282d), C(0x15161a));
+ ht_pro_rect_aa_stroke(s, x, y, cw, 30, 8, C(CS_EDGE), C(CS_RAISED));
const int gx = x + 10, gy = cy - 9;
ht_pro_rect(s, gx + 7, gy, 4, 3, 1, C(CS_INK)); // the knob
ht_pro_rect(s, gx + 3, gy + 2, 12, 11, 5, C(CS_INK)); // the dome
@@ -79,7 +79,7 @@ void cs_bar(pod_out_frame_t *f, const char *const crumbs[], int n, int running,
{
ht_scene_t *s = f->scene;
bool talk = input != NULL;
- ht_pro_rect(s, 0, 0, POD_W, CS_BAR_H, 0, C(talk ? 0x14122a : 0x0b0c0e));
+ ht_pro_rect(s, 0, 0, POD_W, CS_BAR_H, 0, C(talk ? CS_VOICE_BAR : CS_GROUND));
ht_pro_rect(s, 0, talk ? CS_BAR_H - 2 : CS_BAR_H - 1, POD_W, talk ? 2 : 1, 0, C(talk ? CS_FOCUS : CS_BORDER));
const int cy = 36;
int lw = ht_pro_width(&cs_sb_22, "\xe2\x97\x86"); // ◆
@@ -134,7 +134,7 @@ void cs_bar(pod_out_frame_t *f, const char *const crumbs[], int n, int running,
if (x + w > limit) w = limit - x;
if (w <= 0) break;
if (!cur) {
- ht_pro_rect_aa(s, x - 10, cy - 18, w + 20, 36, 8, C(0x121316));
+ ht_pro_rect_aa(s, x - 10, cy - 18, w + 20, 36, 8, C(CS_RAISED));
pod_hit_add(f, x - 10, 0, w + 20, CS_BAR_H, POD_A_BACK, n - 1 - i);
}
text(s, x, cy, w, font, cur ? CS_INK : CS_MUTED, crumbs[i]);
@@ -142,7 +142,7 @@ void cs_bar(pod_out_frame_t *f, const char *const crumbs[], int n, int running,
if (!cur) {
x += 14;
int sw = ht_pro_width(&cs_rg_24, "/");
- text(s, x, cy, sw + 2, &cs_rg_24, 0x3a3d44, "/");
+ text(s, x, cy, sw + 2, &cs_rg_24, CS_TRACK, "/");
x += sw + 14;
}
}
@@ -157,24 +157,6 @@ void cs_bar(pod_out_frame_t *f, const char *const crumbs[], int n, int running,
}
}
-void cs_hints(pod_out_frame_t *f, const char *const keys[], const char *const labels[], int n)
-{
- ht_scene_t *s = f->scene;
- const int y = POD_W - CS_HINT_H, cy = y + CS_HINT_H / 2;
- ht_pro_rect(s, 0, y, POD_W, 1, 0, C(CS_BORDER));
- int x = 24;
- for (int i = 0; i < n; i++) {
- int kw = ht_pro_width(&cs_mono_15, keys[i]), cw = kw + 16 + 2;
- ht_pro_rect_aa_stroke(s, x, cy - 13, cw, 26, 6, C(0x26282d), C(0x15161a));
- text(s, x + 9, cy, kw + 2, &cs_mono_15, 0xb4b8c0, keys[i]);
- x += cw + 8;
- int lw = ht_pro_width(&cs_rg_17, labels[i]);
- if (x + lw > POD_W - 24) lw = POD_W - 24 - x;
- if (lw > 0) text(s, x, cy, lw, &cs_rg_17, 0x5f646d, labels[i]);
- x += lw + 26;
- }
-}
-
// Four bars `bw` px wide, `gap` apart, anchored at the bottom of an `hh` px box: each a triangle wave between 40 % and 100 % of hh, 900 ms.
static void mark(ht_scene_t *s, int x, int y, uint32_t now_ms, int bw, int gap, int hh)
{
@@ -190,3 +172,10 @@ void cs_working_mark(ht_scene_t *s, int x, int y, uint32_t now_ms) { mark(s, x,
void cs_working_mark_small(ht_scene_t *s, int x, int y, uint32_t now_ms) { mark(s, x, y, now_ms, 4, 2, 18); }
int cs_runs(const pod_out_frame_t *f) { return f->scene->count; }
+
+unsigned cs_mix(unsigned a, unsigned b, unsigned pct)
+{
+ unsigned r = 0;
+ for (int sh = 0; sh <= 16; sh += 8) r |= ((((a >> sh) & 0xff) * pct + ((b >> sh) & 0xff) * (100 - pct)) / 100) << sh;
+ return r;
+}
diff --git a/devices/harness-pro/firmware/main/pod/console/cs_inbox.c b/devices/harness-pro/firmware/main/pod/console/cs_inbox.c
index b2c6ef3da..e24a1879b 100644
--- a/devices/harness-pro/firmware/main/pod/console/cs_inbox.c
+++ b/devices/harness-pro/firmware/main/pod/console/cs_inbox.c
@@ -14,7 +14,7 @@
#define C(rgb) ht_rgb(rgb)
enum { PADX = 24, LOGO = 44, TEXT_X = PADX + LOGO + 16, HEAD_H = 44, TOP = CS_BAR_H + 2, MAX_ITEMS = 40, ROW_RUNS = 12, BUDGET = 184,
LINE_H = 34, LINES_MAX = 3, ROW_PAD_TOP = 14, NAME_H = 36, MSG_GAP = 6, ROW_PAD_BOT = 16, PITCH = 108,
- AVAIL = POD_W - CS_HINT_H - TOP };
+ AVAIL = POD_W - CS_FOOT_H - TOP };
typedef struct { char group; const pod_agent_t *a; const pod_unread_t *u; int unread_index; } item_t; // group: 0 NEEDS YOU, 1 FINISHED, 2 FAILED
@@ -82,7 +82,7 @@ static int row_h(const item_t *it)
return ROW_PAD_TOP + NAME_H + (n ? MSG_GAP + n * LINE_H : 0) + ROW_PAD_BOT + 1;
}
-// The scroll limit: the first row from which the rest of the list fits above the hint strip, so the last row can be reached.
+// The scroll limit: the first row from which the rest of the list fits above the bottom margin, so the last row can be reached.
int cs_inbox_max_row(const pod_model_t *m)
{
item_t it[MAX_ITEMS];
@@ -116,7 +116,7 @@ static int row(pod_out_frame_t *f, const pod_model_t *m, const item_t *it, int y
char line[POD_UNREAD_TEXT], rows[LINES_MAX][POD_ROW_MAX], age[8];
line_of(it, line, sizeof line);
int n = wrap3(line, rows);
- unsigned lc = it->group == 0 ? CS_ASK : it->group == 2 ? CS_FAIL : 0xc9ccd2;
+ unsigned lc = it->group == 0 ? CS_ASK : it->group == 2 ? CS_FAIL : CS_INK2;
if (it->u) {
int32_t d = (int32_t)(m->clock_ms - it->u->at_ms);
pod_fmt_age(age, sizeof age, d > 0 ? (uint32_t)d / 1000 : 0);
@@ -124,7 +124,7 @@ static int row(pod_out_frame_t *f, const pod_model_t *m, const item_t *it, int y
if (unread) ht_pro_rect(s, 0, y, 4, h - 1, 0, C(CS_FOCUS));
cs_logo(s, PADX, y + ROW_PAD_TOP + 4, LOGO, a ? a->engine : NULL);
const int cy = y + ROW_PAD_TOP + NAME_H / 2, aw = ht_pro_width(&cs_mono_22, age);
- cs_text(s, right - aw, cy, aw + 2, &cs_mono_22, mix(0x6b7078, dim), age);
+ cs_text(s, right - aw, cy, aw + 2, &cs_mono_22, mix(CS_DIM, dim), age);
int x = TEXT_X;
cs_dot(s, x + 6, cy, it->group == 0 ? 'q' : it->group == 2 ? 'r' : 'd', 0);
x += 22;
@@ -133,10 +133,10 @@ static int row(pod_out_frame_t *f, const pod_model_t *m, const item_t *it, int y
if (nw > avail * 3 / 5) nw = avail * 3 / 5;
cs_text(s, x, cy, nw, &cs_sb_32, mix(CS_INK, dim), name);
const pod_tab_t *tab = a ? pod_tab_of(m, a) : NULL;
- if (tab && avail - nw - 10 > 20) cs_text(s, x + nw + 10, cy, avail - nw - 10, &cs_rg_22, mix(0x6b7078, dim), tab->name);
+ if (tab && avail - nw - 10 > 20) cs_text(s, x + nw + 10, cy, avail - nw - 10, &cs_rg_22, mix(CS_DIM, dim), tab->name);
for (int i = 0; i < n; i++)
cs_text(s, TEXT_X, y + ROW_PAD_TOP + NAME_H + MSG_GAP + LINE_H / 2 + i * LINE_H, right - TEXT_X, &cs_rg_27, mix(lc, dim), rows[i]);
- ht_pro_rect(s, 0, y + h - 1, POD_W, 1, 0, C(0x15161a));
+ ht_pro_rect(s, 0, y + h - 1, POD_W, 1, 0, C(CS_RAISED));
// A row with an unread entry marks it read (OPEN_NOTIF); asking and failed agents have none: FOLLOW opens them by id.
if (it->u) pod_hit_add_id(f, 0, y, POD_W, h, POD_A_OPEN_NOTIF, it->unread_index, it->u->agent);
else pod_hit_add_id(f, 0, y, POD_W, h, POD_A_FOLLOW, (int)(a - m->agents), a->id);
@@ -150,8 +150,6 @@ void cs_view_inbox(pod_out_frame_t *f, const pod_nav_t *nav, pod_model_t *m, uin
cs_counts(m, &running, &asking);
const char *const crumbs[] = {"Inbox"};
cs_bar(f, crumbs, 1, running, asking, 0, NULL, now_ms);
- const char *const keys[] = {"tap", "\xe2\x86\x93"}, *const labels[] = {"open", "home"};
- cs_hints(f, keys, labels, 2);
item_t it[MAX_ITEMS];
int n = collect(m, it);
if (n == 0) {
@@ -168,11 +166,11 @@ void cs_view_inbox(pod_out_frame_t *f, const pod_nav_t *nav, pod_model_t *m, uin
int first = fr->scroll < 0 ? 0 : fr->scroll > max ? max : fr->scroll, y = TOP, prev = -1;
for (int i = first; i < n; i++) {
int need = (it[i].group != prev ? HEAD_H : 0) + row_h(&it[i]);
- if (y + need > POD_W - CS_HINT_H || cs_runs(f) + ROW_RUNS + 2 > BUDGET) break;
+ if (y + need > POD_W - CS_FOOT_H || cs_runs(f) + ROW_RUNS + 2 > BUDGET) break;
if (it[i].group != prev) {
char c[8];
snprintf(c, sizeof c, "%d", count[(int)it[i].group]);
- cs_text(s, PADX, y + 16 + 11, ht_pro_width(&cs_mono_18, title[(int)it[i].group]) + 2, &cs_mono_18, 0x6b7078, title[(int)it[i].group]);
+ cs_text(s, PADX, y + 16 + 11, ht_pro_width(&cs_mono_18, title[(int)it[i].group]) + 2, &cs_mono_18, CS_DIM, title[(int)it[i].group]);
int cw = ht_pro_width(&cs_mono_18, c);
cs_text(s, POD_W - PADX - cw, y + 16 + 11, cw + 2, &cs_mono_18, CS_MUTED, c);
y += HEAD_H;
diff --git a/devices/harness-pro/firmware/main/pod/console/cs_ota.c b/devices/harness-pro/firmware/main/pod/console/cs_ota.c
index 0ecd1ba49..6f2210181 100644
--- a/devices/harness-pro/firmware/main/pod/console/cs_ota.c
+++ b/devices/harness-pro/firmware/main/pod/console/cs_ota.c
@@ -49,16 +49,16 @@ void cs_view_ota(pod_out_frame_t *f, const char *from, const char *to, int pct,
snprintf(log[4], sizeof log[4], "check version \xc2\xb7 project \xc2\xb7 chip rev");
snprintf(log[5], sizeof log[5], "restart into %.20s", to);
const int cur = restarting ? 5 : pct >= 100 ? 3 : 2, top = py + 14 + 10 + 20 + 30, h = 6 * 46 + 28;
- ht_pro_rect_aa_stroke(s, x, top, w, h, 16, C(CS_BORDER), C(0x0c0d0f));
+ ht_pro_rect_aa_stroke(s, x, top, w, h, 16, C(CS_BORDER), C(CS_RAISED));
for (int i = 0; i < 6; i++) {
const int cy = top + 14 + i * 46 + 23, dx = x + 18 + 7;
if (i < cur) ht_pro_rect_aa(s, dx - 7, cy - 7, 14, 14, 7, C(CS_RUN));
else if (i == cur) {
- pod_arc(s, dx * 16, cy * 16, 6 * 16, 2 * 16, 0, 180, C(0x24262b));
+ pod_arc(s, dx * 16, cy * 16, 6 * 16, 2 * 16, 0, 180, C(CS_EDGE));
pod_arc(s, dx * 16, cy * 16, 6 * 16, 2 * 16, 60, 120, C(CS_FOCUS));
} else {
- pod_arc(s, dx * 16, cy * 16, 6 * 16, 2 * 16, 0, 180, C(0x3a3d44));
+ pod_arc(s, dx * 16, cy * 16, 6 * 16, 2 * 16, 0, 180, C(CS_TRACK));
}
- cs_text(s, x + 18 + 14 + 14, cy, w - 18 - 14 - 14 - 18, &cs_mono_18, i < cur ? 0x9a9ea7 : i == cur ? CS_INK : 0x5f646d, log[i]);
+ cs_text(s, x + 18 + 14 + 14, cy, w - 18 - 14 - 14 - 18, &cs_mono_18, i < cur ? CS_MUTED : i == cur ? CS_INK : CS_DIM, log[i]);
}
}
diff --git a/devices/harness-pro/firmware/main/pod/console/cs_overview.c b/devices/harness-pro/firmware/main/pod/console/cs_overview.c
index 2f5ea9136..2aa2e459a 100644
--- a/devices/harness-pro/firmware/main/pod/console/cs_overview.c
+++ b/devices/harness-pro/firmware/main/pod/console/cs_overview.c
@@ -1,6 +1,8 @@
-// Console Overview (mockup screen 01, .o2* in style5.css): a 2 x 2 page of tab cards, Recent first. Each card is the tab's name
-// (34 px) with a state badge, and up to three agent rows of 62 px: dot, 36 px logo, the name in the 28 px face, the time. More than
-// four cards page (the TABS frame's scroll is the first row of the page, two rows a page), with dots above the hint strip.
+// Console Overview ("one hero per tab", 7A' of pro-console-overview-v2.html): a 2 x 2 page of tab cards, Recent first. Each card
+// is tinted with its tab's hue; its head line is the tab's name (28 px, the lead's size) on the left and the agent count (a pane
+// glyph and N) on the right; then, centred, the agent that leads the tab (working > asking > failed > done > idle) as its pet, logo or a ">_"
+// outline, and that agent's name. Amber edge when anyone in the tab asks. More than four cards page (the
+// TABS frame's scroll is the first row of the page, two rows a page), with dots along the bottom.
#include <stdio.h>
#include <string.h>
@@ -9,8 +11,12 @@
#define C(rgb) ht_rgb(rgb)
enum {
- COLS = 2, CARD_W = 338, CARD_H = 277, GAP = 12, MARGIN = 16, TOP = CS_BAR_H + 14, PAD = 19, HEAD_H = 68, ROW_H = 62,
- DOT = 8, DOT_PITCH = 16, DOT_Y = 652, DOTS_MAX = 8
+ COLS = 2, CARD_W = CS_CARD_W, CARD_H = CS_CARD_H, GAP = CS_CARD_GAP, MARGIN = CS_CARD_MARGIN, TOP = CS_CARD_TOP, PAD = 19,
+ // the head line's middle (name and count), the art's box, the lead's name. The pet's square is 168 so every pet's
+ // small loop draws at its stored size (zoom 8, the rasteriser's fast path; Claude's frames are 145 wide); its ink fits ART_H
+ NAME_Y = 40, ART_Y = CS_CARD_ART_Y, ART_H = CS_CARD_ART_H, FOOT_Y = CARD_H - 30,
+ PET_SIDE = 168, LOGO = 72, MARK = 72, MARK_W = 26, GLYPH = 20,
+ DOT = 8, DOT_PITCH = 16, DOT_Y = 700, DOTS_MAX = 8
};
void cs_counts(const pod_model_t *m, int *running, int *asking)
@@ -49,68 +55,185 @@ unsigned cs_time_col(char *out, size_t n, const pod_model_t *m, const pod_agent_
pod_state_t st = pod_model_eff(m, a);
if (st == POD_WORKING) { pod_fmt_time(out, n, pod_agent_secs(a, now_ms)); return CS_RUN; }
if (st == POD_ASKING) { snprintf(out, n, "ask"); return CS_ASK; }
- if (st == POD_OFFLINE) { snprintf(out, n, "off"); return 0x5f646d; }
+ if (st == POD_OFFLINE) { snprintf(out, n, "off"); return CS_DIM; }
pod_fmt_age(out, n, cs_age_s(m, a));
- return 0x5f646d;
+ return CS_DIM;
}
-// The agents a card lists (at most 3): Recent's newest, or the tab's panes in order. working / asking count the whole tab.
-static int card_agents(const pod_model_t *m, int c, const pod_agent_t *out[3], int *working, int *asking)
+// A tab's agents for its card: Recent's newest first, or the tab's panes in pane order (at most CS_CARD_AGENTS).
+static int card_agents(const pod_model_t *m, int c, const pod_agent_t *out[CS_CARD_AGENTS])
{
- const pod_agent_t *all[POD_RECENT_MAX];
- int n = 0, w = 0, q = 0;
+ int n = 0;
if (c == 0) {
+ const pod_agent_t *all[POD_RECENT_MAX];
int k = pod_model_recent(m, all, POD_RECENT_MAX);
- for (int i = 0; i < k; i++) {
- pod_state_t st = pod_model_eff(m, all[i]);
- w += st == POD_WORKING;
- q += st == POD_ASKING;
- if (n < 3) out[n++] = all[i];
- }
+ for (int i = 0; i < k && n < CS_CARD_AGENTS; i++) out[n++] = all[i];
} else {
const pod_tab_t *t = &m->tabs[c - 1];
- for (int k = 0; k < t->count && k < POD_PANES_MAX && n < 3; k++)
+ for (int k = 0; k < t->count && k < POD_PANES_MAX && n < CS_CARD_AGENTS; k++)
if (t->agent[k] >= 0 && t->agent[k] < m->agent_count) out[n++] = &m->agents[t->agent[k]];
- pod_tab_counts(m, t, &w, &q);
}
- *working = w;
- *asking = q;
return n;
}
+// Which state speaks for a card: working, then asking, failed, done, idle. The first agent of the best rank leads.
+static int rank(char dot) { return dot == 'g' ? 0 : dot == 'q' ? 1 : dot == 'r' ? 2 : dot == 'd' ? 3 : 4; }
+
+// Every agent the card stands for (Recent's whole list, or every pane of the tab with an agent), and whether one asks.
+static int card_count(const pod_model_t *m, int c, bool *asks)
+{
+ int n = 0;
+ *asks = false;
+ if (c == 0) {
+ const pod_agent_t *all[POD_RECENT_MAX];
+ n = pod_model_recent(m, all, POD_RECENT_MAX);
+ for (int i = 0; i < n; i++) *asks |= pod_model_eff(m, all[i]) == POD_ASKING;
+ return n;
+ }
+ const pod_tab_t *t = &m->tabs[c - 1];
+ for (int k = 0; k < t->count && k < POD_PANES_MAX; k++)
+ if (t->agent[k] >= 0 && t->agent[k] < m->agent_count) {
+ n++;
+ *asks |= pod_model_eff(m, &m->agents[t->agent[k]]) == POD_ASKING;
+ }
+ return n;
+}
+
+const pod_agent_t *cs_card_lead(const pod_model_t *m, int c)
+{
+ const pod_agent_t *l[CS_CARD_AGENTS], *best = NULL;
+ int n = card_agents(m, c, l), br = 99;
+ for (int i = 0; i < n; i++) {
+ int r = rank(cs_state_dot(m, l[i]));
+ if (r < br) { br = r; best = l[i]; }
+ }
+ return best;
+}
+
+ht_pet_state_t cs_card_loop(const pod_model_t *m, const pod_agent_t *a)
+{
+ pod_state_t st = pod_model_eff(m, a);
+ return st == POD_WORKING ? HT_PET_WORKING : st == POD_ASKING ? HT_PET_ASKING : HT_PET_IDLE;
+}
+
+// The first cover on the page Overview shows and how many (the TABS frame's scroll is the page's first row, two rows a page).
+static int page_span(const pod_nav_t *nav, const pod_model_t *m, int *first)
+{
+ int covers = 1 + m->tab_count, pages = pod_tabs_pages_of(nav, m);
+ int page = nav->depth ? nav->stack[0].scroll / 2 : 0;
+ page = page < 0 ? 0 : page > pages - 1 ? pages - 1 : page;
+ *first = page * CS_PER_PAGE;
+ return covers - *first < CS_PER_PAGE ? covers - *first : CS_PER_PAGE;
+}
+
+// The agents whose cards the screen shows: Overview's leads on its page, or the card Tab's page. 0 on any other screen.
+static int on_screen(const pod_nav_t *nav, const pod_model_t *m, const pod_agent_t *out[CS_PER_PAGE])
+{
+ const pod_frame_t *f = nav->depth ? &nav->stack[nav->depth - 1] : NULL;
+ if (!f || nav->skin != POD_SKIN_CONSOLE) return 0;
+ if (f->view == POD_V_TAB && f->tab != POD_TAB_RECENT) return cs_tab_page(nav, m, out);
+ if (f->view != POD_V_TABS) return 0;
+ int first, n = page_span(nav, m, &first), k = 0;
+ for (int i = 0; i < n; i++) {
+ const pod_agent_t *a = cs_card_lead(m, first + i);
+ if (a) out[k++] = a;
+ }
+ return k;
+}
+
+uint32_t cs_cards_next_ms(const pod_nav_t *nav, const pod_model_t *m, uint32_t now_ms)
+{
+ const pod_agent_t *l[CS_PER_PAGE];
+ int n = on_screen(nav, m, l);
+ uint32_t best = 1000;
+ for (int i = 0; i < n; i++) {
+ if (cs_card_loop(m, l[i]) == HT_PET_IDLE) continue; // a resting pet is drawn still
+ uint32_t ms = pod_pet_loop_next_ms(l[i]->engine, cs_card_loop(m, l[i]), now_ms);
+ if (ms < best) best = ms;
+ }
+ // four pets redraw the whole page: no faster than the Console's animation beat
+ if (best < POD_CS_ANIM_MS) best = POD_CS_ANIM_MS - now_ms % POD_CS_ANIM_MS;
+ return best;
+}
+
+bool cs_cards_move(const pod_nav_t *nav, const pod_model_t *m)
+{
+ const pod_agent_t *l[CS_PER_PAGE];
+ int n = on_screen(nav, m, l);
+ for (int i = 0; i < n; i++)
+ if (cs_card_loop(m, l[i]) != HT_PET_IDLE && pod_pet_for(l[i]->engine)) return true;
+ return false;
+}
+
+// The tab hues: six that stay clear of the state colours (green working, amber asking), and the ground they are mixed into.
+static const unsigned HUES[] = {0x8B7CFF, 0x38BDF8, 0xF472B6, 0xFF8A65, 0x2DD4BF, 0xA3A8FF};
+enum { CARD_BASE = CS_GROUND };
+
+void cs_card_art(ht_scene_t *s, int cx, int cy, const pod_model_t *m, const pod_agent_t *a, unsigned fill, uint32_t now_ms)
+{
+ ht_pet_state_t loop = cs_card_loop(m, a); // a resting pet holds its first step: a quiet screen wakes once a second
+ if (pod_pet_draw_loop(s, cx - PET_SIDE / 2, cy - PET_SIDE / 2, PET_SIDE, a->engine, loop, loop == HT_PET_IDLE ? 0 : now_ms) ||
+ pod_logo_draw(s, cx - LOGO / 2, cy - LOGO / 2, LOGO, a->engine))
+ return;
+ ht_pro_rect_aa_stroke(s, cx - MARK / 2, cy - MARK / 2, MARK, MARK, 16, C(0x8A909A), C(fill));
+ int w = ht_pro_width(&cs_mono_26, ">_");
+ cs_text(s, cx - w / 2, cy, w + 2, &cs_mono_26, CS_INK2, ">_");
+}
+
+// Text centred on the card's middle line at cy, cut with an ellipsis at the card's inner width.
+static int centred(ht_scene_t *s, int x, int cy, const ht_pro_font_t *font, unsigned rgb, const char *t, int lead_w)
+{
+ int max = CARD_W - 2 * PAD - lead_w, w = ht_pro_width(font, t);
+ if (w > max) w = max;
+ int tx = x + (CARD_W - w - lead_w) / 2 + lead_w;
+ cs_text(s, tx, cy, w + 2, font, rgb, t);
+ return tx;
+}
+
static void card(pod_out_frame_t *f, const pod_model_t *m, int c, int x, int y, bool sel, uint32_t now_ms)
{
ht_scene_t *s = f->scene;
- ht_pro_rect(s, x, y, CARD_W, CARD_H, 18, C(sel ? 0x6f4d1a : CS_BORDER));
- ht_pro_rect(s, x + 1, y + 1, CARD_W - 2, CARD_H - 2, 17, C(sel ? 0x14120d : CS_SURFACE));
-
- const pod_agent_t *rows[3];
- int working, asking, n = card_agents(m, c, rows, &working, &asking);
- char b[16];
- unsigned fg = CS_MUTED, bg = 0x1a1c20;
- if (c > 0 && pod_tab_panes(&m->tabs[c - 1]) == 0) snprintf(b, sizeof b, "empty");
- else if (asking > 0) { snprintf(b, sizeof b, "%d ask", asking); fg = CS_ASK; bg = 0x2e2108; }
- else if (working > 0) { snprintf(b, sizeof b, "%d run", working); fg = CS_RUN; bg = 0x0f2a1d; }
- else snprintf(b, sizeof b, "idle");
- const int left = x + PAD, right = x + CARD_W - PAD, hy = y + 38;
- int bw = ht_pro_width(&cs_mono_18, b);
- ht_pro_rect_aa(s, right - bw - 16, hy - 13, bw + 16, 26, 6, C(bg));
- cs_text(s, right - bw - 8, hy, bw + 2, &cs_mono_18, fg, b);
- const char *name = c == 0 ? "Recent" : m->tabs[c - 1].name;
- cs_text(s, left, hy, right - left - bw - 16 - 10, &cs_sb_34, CS_INK, name);
- ht_pro_rect(s, left, y + HEAD_H, right - left, 1, 0, C(CS_BORDER));
+ bool asks;
+ int count = card_count(m, c, &asks);
+ const pod_agent_t *lead = cs_card_lead(m, c);
+ char tone = lead ? cs_state_dot(m, lead) : 'i';
- for (int i = 0; i < n; i++) {
- const int cy = y + HEAD_H + 6 + i * ROW_H + ROW_H / 2;
- char t[12];
- unsigned tc = cs_time_col(t, sizeof t, m, rows[i], now_ms);
- int tw = ht_pro_width(&cs_mono_22, t);
- cs_dot(s, left + 6, cy, cs_state_dot(m, rows[i]), 0);
- cs_logo(s, left + 24, cy - 18, 36, rows[i]->engine);
- cs_text(s, right - tw, cy, tw + 2, &cs_mono_22, tc, t);
- int nx = left + 72;
- cs_text(s, nx, cy, right - tw - 8 - nx, &cs_md_28, 0xe3e5e9, rows[i]->name);
+ // the tab's hue (by cover, six in turn): a dark tint of it fills the card and a mid one edges it. An amber edge when anyone in
+ // the tab asks; the selected card is outlined in the focus colour.
+ const unsigned hue = HUES[c % (int)(sizeof HUES / sizeof HUES[0])];
+ unsigned fill = cs_mix(hue, CARD_BASE, 15), border = sel ? CS_FOCUS : asks ? CS_ASK : cs_mix(hue, CARD_BASE, 75);
+ ht_pro_rect_aa_stroke(s, x, y, CARD_W, CARD_H, 18, C(border), C(fill));
+
+ // head line: the tab's name on the left; on the right the count chip (a 2 x 2 pane glyph and N, in the hue), or "empty"
+ const int left = x + PAD, right = x + CARD_W - PAD, hy = y + NAME_Y;
+ int cw;
+ if (c > 0 && pod_tab_panes(&m->tabs[c - 1]) == 0) {
+ cw = ht_pro_width(&cs_rg_22, "empty");
+ cs_text(s, right - cw, hy, cw + 2, &cs_rg_22, CS_MUTED, "empty");
+ } else {
+ char k[8];
+ snprintf(k, sizeof k, "%d", count);
+ int kw = ht_pro_width(&cs_mono_24, k), cx0;
+ cw = 10 + GLYPH + 8 + kw + 10;
+ cx0 = right - cw;
+ ht_pro_rect_aa(s, cx0, hy - 17, cw, 34, 10, C(cs_mix(hue, CARD_BASE, 50)));
+ for (int i = 0; i < 4; i++) // the pane glyph: four 8 px squares, 4 px apart
+ ht_pro_rect(s, cx0 + 10 + (i % 2) * 12, hy - GLYPH / 2 + (i / 2) * 12, 8, 8, 2, C(hue));
+ cs_text(s, cx0 + 10 + GLYPH + 8, hy, kw + 2, &cs_mono_24, CS_INK, k);
}
+ cs_text(s, left, hy, right - cw - 12 - left, &cs_md_28, CS_INK, c == 0 ? "Recent" : m->tabs[c - 1].name);
+ if (!lead) { pod_hit_add_id(f, x, y, CARD_W, CARD_H, POD_A_OPEN_TAB, c ? c - 1 : POD_TAB_RECENT, c ? m->tabs[c - 1].id : ""); return; }
+
+ // the lead (working first): its pet, else its logo straight on the card, else a thin ">_" outline
+ cs_card_art(s, x + CARD_W / 2, y + ART_Y + ART_H / 2, m, lead, fill, now_ms);
+
+ // its name at the foot, centred, after the working mark while it works
+ char nm[sizeof lead->name];
+ snprintf(nm, sizeof nm, "%s", lead->name);
+ for (char *p = nm; *p; p++) if (*p == '\n' || *p == '\r' || *p == '\t') *p = ' ';
+ const bool works = tone == 'g';
+ int tx = centred(s, x, y + FOOT_Y, &cs_md_28, CS_INK2, nm, works ? MARK_W + 10 : 0);
+ if (works) cs_working_mark(s, tx - MARK_W - 10, y + FOOT_Y - 13, now_ms);
pod_hit_add_id(f, x, y, CARD_W, CARD_H, POD_A_OPEN_TAB, c ? c - 1 : POD_TAB_RECENT, c ? m->tabs[c - 1].id : "");
}
@@ -121,25 +244,15 @@ void cs_view_overview(pod_out_frame_t *f, const pod_nav_t *nav, pod_model_t *m,
cs_counts(m, &running, &asking);
const char *const crumbs[] = {"Overview"};
cs_bar(f, crumbs, 1, running, asking, cs_unread(m), NULL, now_ms);
- // tap opens a tab; ← → pages (only with more than one page); ↓ opens the Inbox; ▲ goes to the ask (only while someone asks)
- const char *keys[4], *labels[4];
- int hn = 0, pages = pod_tabs_pages_of(nav, m);
- keys[hn] = "tap"; labels[hn++] = "open tab";
- if (pages > 1) { keys[hn] = "\xe2\x86\x90 \xe2\x86\x92"; labels[hn++] = "pages"; }
- keys[hn] = "\xe2\x86\x93"; labels[hn++] = "inbox";
- if (asking > 0) { keys[hn] = "\xe2\x96\xb2"; labels[hn++] = "go to the ask"; }
- cs_hints(f, keys, labels, hn);
-
- int covers = 1 + m->tab_count;
- int page = nav->depth ? nav->stack[0].scroll / 2 : 0;
- page = page < 0 ? 0 : page > pages - 1 ? pages - 1 : page;
- int first = page * CS_PER_PAGE, count = covers - first < CS_PER_PAGE ? covers - first : CS_PER_PAGE;
+ int pages = pod_tabs_pages_of(nav, m);
+
+ int first, count = page_span(nav, m, &first), page = first / CS_PER_PAGE;
for (int i = 0; i < count; i++) {
int c = first + i;
card(f, m, c, MARGIN + (i % COLS) * (CARD_W + GAP), TOP + (i / COLS) * (CARD_H + GAP), c > 0 && c - 1 == m->selected && m->tab_count, now_ms);
}
int dots = pages > 1 ? (pages < DOTS_MAX ? pages : DOTS_MAX) : 0;
- int x0 = (POD_W - (dots * DOT_PITCH - (DOT_PITCH - DOT))) / 2; // the page dots, centred above the hint strip
+ int x0 = (POD_W - (dots * DOT_PITCH - (DOT_PITCH - DOT))) / 2; // the page dots, centred along the bottom
for (int i = 0; i < dots; i++)
- ht_pro_rect(s, x0 + i * DOT_PITCH, DOT_Y, DOT, DOT, DOT / 2, C(i == (page < dots ? page : dots - 1) ? CS_INK : 0x33363d));
+ ht_pro_rect(s, x0 + i * DOT_PITCH, DOT_Y, DOT, DOT, DOT / 2, C(i == (page < dots ? page : dots - 1) ? CS_INK : CS_TRACK));
}
diff --git a/devices/harness-pro/firmware/main/pod/console/cs_recap.c b/devices/harness-pro/firmware/main/pod/console/cs_recap.c
index a045131a4..a890398da 100644
--- a/devices/harness-pro/firmware/main/pod/console/cs_recap.c
+++ b/devices/harness-pro/firmware/main/pod/console/cs_recap.c
@@ -10,7 +10,7 @@
#include "pro_canvas.h"
#define C(rgb) ht_rgb(rgb)
-enum { PADX = 28, TEXT_W = POD_W - 2 * PADX, SUM_Y = 261, SUM_PITCH = 47, TILE_H = 54, TILE_Y = POD_W - 68 - TILE_H, ROWS_ALL = 8, GAP = 6, TILES_MAX = 4 };
+enum { PADX = 28, TEXT_W = POD_W - 2 * PADX, SUM_Y = 261, SUM_PITCH = 47, TILE_H = 54, TILE_Y = POD_W - CS_FOOT_H - 6 - TILE_H, ROWS_ALL = 8, GAP = 6, TILES_MAX = 4 };
static EXT_RAM_BSS_ATTR char rows_buf[ROWS_ALL][POD_ROW_MAX];
@@ -80,9 +80,6 @@ void cs_view_recap(pod_out_frame_t *f, const pod_nav_t *nav, pod_model_t *m, uin
cs_bar(f, crumbs, 1, running, asking, cs_unread(m), NULL, now_ms);
if (!a) return;
cs_back_hit(f, crumbs[0]);
- const char *const keys[] = {"hold", "\xe2\x86\x90 \xe2\x86\x92", "\xe2\x86\x91", "\xe2\x86\x93"};
- const char *const labels[] = {"talk", "panes", "back", "home"};
- cs_hints(f, keys, labels, 4);
cs_hero(f, nav, m, a, now_ms);
// the tiles that have data
@@ -110,8 +107,8 @@ void cs_view_recap(pod_out_frame_t *f, const pod_nav_t *nav, pod_model_t *m, uin
if (!a->recap_lines) {
cs_text(s, PADX, SUM_Y + 17, TEXT_W, &cs_rg_24, CS_MUTED, "No recap yet.");
} else {
- const int floor_y = n ? TILE_Y - 8 : POD_W - CS_HINT_H - 12, rows = layout(a, (floor_y - SUM_Y) / SUM_PITCH);
- for (int r = 0; r < rows; r++) cs_text(s, PADX, SUM_Y + SUM_PITCH / 2 + r * SUM_PITCH, TEXT_W, &cs_rg_36, 0xe3e5e9, rows_buf[r]);
+ const int floor_y = n ? TILE_Y - 8 : POD_W - CS_FOOT_H - 12, rows = layout(a, (floor_y - SUM_Y) / SUM_PITCH);
+ for (int r = 0; r < rows; r++) cs_text(s, PADX, SUM_Y + SUM_PITCH / 2 + r * SUM_PITCH, TEXT_W, &cs_rg_36, CS_INK2, rows_buf[r]);
}
// widths: every tile its natural width; spare room spread evenly, a shortfall taken from TOKENS (its in/out is cut). When even
diff --git a/devices/harness-pro/firmware/main/pod/console/cs_recent.c b/devices/harness-pro/firmware/main/pod/console/cs_recent.c
index b62ae87f8..aa6192f76 100644
--- a/devices/harness-pro/firmware/main/pod/console/cs_recent.c
+++ b/devices/harness-pro/firmware/main/pod/console/cs_recent.c
@@ -14,7 +14,7 @@ enum { PADX = 24, LOGO = 44, TEXT_X = PADX + LOGO + 16 };
// (its recap's first line, or the activity). Colours follow the state.
static const char *line_of(const pod_agent_t *a, pod_state_t st, unsigned *rgb)
{
- *rgb = 0xa3a7af;
+ *rgb = CS_MUTED;
if (st == POD_ASKING && a->question[0]) { *rgb = CS_ASK; return a->question; }
if (st == POD_WORKING && a->activity[0]) return a->activity;
if (a->failed) *rgb = CS_FAIL;
@@ -36,11 +36,11 @@ int cs_rows(pod_out_frame_t *f, const pod_model_t *m, const pod_agent_t *const l
for (int i = 0; i < CS_ROWS_MAX && first + i < n; i++, drawn++) {
const pod_agent_t *a = list[first + i];
pod_state_t st = pod_model_eff(m, a);
- const int y = CS_ROWS_TOP + i * CS_ROW_H, cy = y + 36, right = POD_W - PADX;
- cs_logo(s, PADX, y + 20, LOGO, a->engine);
+ const int y = CS_ROWS_TOP + i * CS_ROW_H, cy = y + 34, right = POD_W - PADX;
+ cs_logo(s, PADX, y + 18, LOGO, a->engine);
char t[12] = ""; // an unknown time draws nothing
- unsigned tc = 0x5f646d;
+ unsigned tc = CS_DIM;
if (st == POD_ASKING) { snprintf(t, sizeof t, "ask"); tc = CS_ASK; }
else if (st == POD_WORKING) { pod_fmt_time(t, sizeof t, pod_agent_secs(a, now_ms)); tc = CS_RUN; }
else if (a->elapsed_s) pod_fmt_time(t, sizeof t, pod_agent_secs(a, now_ms));
@@ -58,14 +58,14 @@ int cs_rows(pod_out_frame_t *f, const pod_model_t *m, const pod_agent_t *const l
if (tab_col) {
const pod_tab_t *tab = pod_tab_of(m, a);
const char *where = tab ? tab->name : a->machine;
- if (avail - nw - 10 > 20) cs_text(s, x + nw + 10, cy, avail - nw - 10, &cs_rg_22, 0x5f646d, where);
+ if (avail - nw - 10 > 20) cs_text(s, x + nw + 10, cy, avail - nw - 10, &cs_rg_22, CS_DIM, where);
}
unsigned lc;
char line[POD_ACTIVITY_BYTES];
one_line(line, sizeof line, line_of(a, st, &lc));
- cs_text(s, TEXT_X, y + 76, right - TEXT_X, &cs_rg_27, lc, line);
- ht_pro_rect(s, 0, y + CS_ROW_H - 1, POD_W, 1, 0, C(0x15161a));
+ cs_text(s, TEXT_X, y + 72, right - TEXT_X, &cs_rg_27, lc, line);
+ ht_pro_rect(s, 0, y + CS_ROW_H - 1, POD_W, 1, 0, C(CS_RAISED));
pod_hit_add_id(f, 0, y, POD_W, CS_ROW_H, POD_A_OPEN_AGENT, first + i, a->id);
}
return drawn;
@@ -73,6 +73,8 @@ int cs_rows(pod_out_frame_t *f, const pod_model_t *m, const pod_agent_t *const l
int cs_rows_max(const pod_nav_t *nav, const pod_model_t *m)
{
+ const pod_frame_t *f = nav->depth ? &nav->stack[nav->depth - 1] : NULL;
+ if (f && f->tab != POD_TAB_RECENT) return cs_tab_pages(nav, m) - 1; // a tab's cards: the frame's scroll is the page
const pod_agent_t *list[POD_AGENTS_MAX];
int n = pod_nav_list(nav, m, list, POD_AGENTS_MAX);
return n > CS_ROWS_MAX ? n - CS_ROWS_MAX : 0;
@@ -85,8 +87,6 @@ void cs_view_recent(pod_out_frame_t *f, const pod_nav_t *nav, pod_model_t *m, ui
cs_counts(m, &running, &asking);
const char *const crumbs[] = {"Overview", "Recent"};
cs_bar(f, crumbs, 2, running, asking, cs_unread(m), NULL, now_ms);
- const char *const keys[] = {"tap", "\xe2\x86\x90 \xe2\x86\x92", "\xe2\x86\x91", "\xe2\x86\x93"}, *const labels[] = {"open", "tabs", "back", "home"};
- cs_hints(f, keys, labels, 4);
const pod_agent_t *list[POD_AGENTS_MAX];
int n = pod_nav_list(nav, m, list, POD_AGENTS_MAX);
diff --git a/devices/harness-pro/firmware/main/pod/console/cs_tab.c b/devices/harness-pro/firmware/main/pod/console/cs_tab.c
index fe455a729..6efdf1770 100644
--- a/devices/harness-pro/firmware/main/pod/console/cs_tab.c
+++ b/devices/harness-pro/firmware/main/pod/console/cs_tab.c
@@ -1,35 +1,92 @@
-// Console Tab (mockup screen 02): the selected tab's agents in pane order, in the Recent row style without the tab name (the bar
-// has it). Tap opens the agent; hold talks to that row's agent. Five rows show; a drag scrolls the rest. The working bars move
-// with now_ms: the glue's unit_ms wakes at 66 ms while a visible row works.
+// Console Tab (pro-console-tab-cards.html, B): the selected tab's agents as cards, four a page (the Overview grid), in the window's
+// own pane order. Each card takes its agent's state: green while it works, amber when it asks, a red edge when it failed. Head line:
+// the agent's name left, its time right ("ask" while it asks); then its pet, logo or ">_"; at the foot the state in a word (the
+// working bars before "Working"). Tap opens the agent. The TAB frame's scroll is the page; the glue pages on a vertical swipe and
+// steps tabs on a sideways one. More than one page: dots down the right edge.
#include <stdio.h>
#include <string.h>
#include "pod/console/cs.h"
#include "pro_canvas.h"
+#define C(rgb) ht_rgb(rgb)
+enum { PAD = 19, NAME_Y = 40, FOOT_Y = CS_CARD_H - 30, MARK_W = 26, DOT = 8, DOT_PITCH = 16, DOT_X = POD_W - 8, DOTS_MAX = 8 };
+
+int cs_tab_pages(const pod_nav_t *nav, const pod_model_t *m)
+{
+ const pod_agent_t *list[POD_AGENTS_MAX];
+ int n = pod_nav_list(nav, m, list, POD_AGENTS_MAX);
+ return n > 0 ? (n + CS_PER_PAGE - 1) / CS_PER_PAGE : 1;
+}
+
+int cs_tab_page(const pod_nav_t *nav, const pod_model_t *m, const pod_agent_t *out[CS_PER_PAGE])
+{
+ const pod_agent_t *list[POD_AGENTS_MAX];
+ int n = pod_nav_list(nav, m, list, POD_AGENTS_MAX), last = cs_tab_pages(nav, m) - 1;
+ int page = nav->depth ? nav->stack[nav->depth - 1].scroll : 0;
+ page = page < 0 ? 0 : page > last ? last : page;
+ int k = 0;
+ for (int i = page * CS_PER_PAGE; i < n && k < CS_PER_PAGE; i++) out[k++] = list[i];
+ return k;
+}
+
+static void card(pod_out_frame_t *f, const pod_model_t *m, const pod_agent_t *a, int idx, int x, int y, uint32_t now_ms)
+{
+ ht_scene_t *s = f->scene;
+ char st = cs_state_dot(m, a);
+ unsigned fill = st == 'g' ? cs_mix(CS_RUN, CS_GROUND, 12) : st == 'q' ? cs_mix(CS_ASK, CS_GROUND, 12) : CS_SURFACE;
+ unsigned border = st == 'g' ? cs_mix(CS_RUN, CS_GROUND, 45) : st == 'q' ? CS_ASK : st == 'r' ? cs_mix(CS_FAIL, CS_GROUND, 55) : CS_BORDER;
+ ht_pro_rect_aa_stroke(s, x, y, CS_CARD_W, CS_CARD_H, 18, C(border), C(fill));
+
+ // head line: the name left, the time right
+ const int left = x + PAD, right = x + CS_CARD_W - PAD, hy = y + NAME_Y;
+ char t[12];
+ unsigned tc = cs_time_col(t, sizeof t, m, a, now_ms);
+ int tw = t[0] ? ht_pro_width(&cs_mono_24, t) : 0;
+ if (tw) cs_text(s, right - tw, hy, tw + 2, &cs_mono_24, tc, t);
+ char name[sizeof a->name];
+ snprintf(name, sizeof name, "%s", a->name);
+ for (char *p = name; *p; p++) if (*p == '\n' || *p == '\r' || *p == '\t') *p = ' ';
+ cs_text(s, left, hy, right - (tw ? tw + 12 : 0) - left, &cs_md_28, CS_INK, name);
+
+ cs_card_art(s, x + CS_CARD_W / 2, y + CS_CARD_ART_Y + CS_CARD_ART_H / 2, m, a, fill, now_ms);
+
+ // the foot: the state in a word, centred (the working bars first)
+ const char *word = st == 'g' ? "Working" : st == 'q' ? "Needs you" : st == 'd' ? "Done" : st == 'r' ? "Failed" :
+ pod_model_eff(m, a) == POD_OFFLINE ? "Offline" : "Idle";
+ unsigned wc = st == 'g' ? CS_RUN : st == 'q' ? CS_ASK : st == 'd' ? CS_INK2 : st == 'r' ? CS_FAIL : CS_MUTED;
+ int ww = ht_pro_width(&cs_sb_26, word), lead = st == 'g' ? MARK_W + 10 : 0, wx = x + (CS_CARD_W - ww - lead) / 2 + lead;
+ if (lead) cs_working_mark(s, wx - lead, y + FOOT_Y - 12, now_ms);
+ cs_text(s, wx, y + FOOT_Y, ww + 2, &cs_sb_26, wc, word);
+ pod_hit_add_id(f, x, y, CS_CARD_W, CS_CARD_H, POD_A_OPEN_AGENT, idx, a->id);
+}
+
void cs_view_tab(pod_out_frame_t *f, const pod_nav_t *nav, pod_model_t *m, uint32_t now_ms)
{
ht_scene_t *s = f->scene;
const pod_frame_t *top = &nav->stack[nav->depth - 1];
- int ti = top->tab;
- const pod_tab_t *t = &m->tabs[ti];
+ const pod_tab_t *t = &m->tabs[top->tab];
int running, asking;
cs_counts(m, &running, &asking);
const char *const crumbs[] = {"Overview", t->name};
cs_bar(f, crumbs, 2, running, asking, cs_unread(m), NULL, now_ms);
- const char *const keys[] = {"tap", "\xe2\x86\x90 \xe2\x86\x92", "\xe2\x86\x91", "\xe2\x86\x93"}, *const labels[] = {"open", "tabs", "back", "home"};
- cs_hints(f, keys, labels, 4);
-
- const pod_agent_t *list[POD_AGENTS_MAX];
- int n = pod_nav_list(nav, m, list, POD_AGENTS_MAX);
- if (n <= 0) {
+ const pod_agent_t *page[CS_PER_PAGE];
+ int k = cs_tab_page(nav, m, page), pages = cs_tab_pages(nav, m);
+ if (k <= 0) {
const char *msg = "No panes in this tab";
int w = ht_pro_width(&cs_rg_24, msg);
cs_text(s, (POD_W - w) / 2, POD_W / 2, w + 2, &cs_rg_24, CS_MUTED, msg);
return;
}
- int max = n > CS_ROWS_MAX ? n - CS_ROWS_MAX : 0;
- cs_rows(f, m, list, n, top->scroll < 0 ? 0 : top->scroll > max ? max : top->scroll, false, now_ms);
+ int at = top->scroll < 0 ? 0 : top->scroll > pages - 1 ? pages - 1 : top->scroll;
+ for (int i = 0; i < k; i++)
+ card(f, m, page[i], at * CS_PER_PAGE + i, CS_CARD_MARGIN + (i % 2) * (CS_CARD_W + CS_CARD_GAP),
+ CS_CARD_TOP + (i / 2) * (CS_CARD_H + CS_CARD_GAP), now_ms);
+ if (pages > 1) { // the page dots, down the right edge
+ int dots = pages < DOTS_MAX ? pages : DOTS_MAX, y0 = CS_CARD_TOP + (2 * CS_CARD_H + CS_CARD_GAP - (dots * DOT_PITCH - (DOT_PITCH - DOT))) / 2;
+ for (int i = 0; i < dots; i++)
+ ht_pro_rect(s, DOT_X - DOT / 2, y0 + i * DOT_PITCH, DOT, DOT, DOT / 2, C(i == (at < dots ? at : dots - 1) ? CS_INK : CS_TRACK));
+ }
}
diff --git a/devices/harness-pro/firmware/main/pod/console/cs_talk.c b/devices/harness-pro/firmware/main/pod/console/cs_talk.c
index 0f02cb9b0..7fcef2683 100644
--- a/devices/harness-pro/firmware/main/pod/console/cs_talk.c
+++ b/devices/harness-pro/firmware/main/pod/console/cs_talk.c
@@ -10,7 +10,7 @@
#include "pro_canvas.h"
#define C(rgb) ht_rgb(rgb)
-enum { PET = 200, WAVE_N = 36, WAVE_H = 90, BAR_W = 9, BAR_GAP = 6, VIOLET_HI = 0xb9b2ff, AREA_H = POD_W - CS_BAR_H - CS_HINT_H };
+enum { PET = 200, WAVE_N = 36, WAVE_H = 90, BAR_W = 9, BAR_GAP = 6, VIOLET_HI = 0xb9b2ff, AREA_H = POD_W - CS_BAR_H - CS_FOOT_H };
static int tri(uint32_t t, uint32_t period) // 0..100
{
@@ -45,7 +45,7 @@ static void sending(ht_scene_t *s, const pod_model_t *m, const pod_agent_t *a, i
char where[2 * CABLE_NAME_MAX + 4];
snprintf(where, sizeof where, "%s%s%s", tab ? tab->name : "", tab && a->machine[0] ? " \xc2\xb7 " : "", a->machine);
int sx = x + 22 + 28 + 12 + tw + 12;
- if (where[0] && sx < x + w - 22) cs_text(s, sx, y + 32, x + w - 22 - sx, &cs_rg_17, 0x5f646d, where);
+ if (where[0] && sx < x + w - 22) cs_text(s, sx, y + 32, x + w - 22 - sx, &cs_rg_17, CS_DIM, where);
const int ty = y + 18 + 28 + 18, tw2 = w - 44, fw = tw2 * 4 / 10;
ht_pro_rect(s, x + 22, ty, tw2, 4, 2, C(CS_BORDER));
int fx = (int)(now_ms % 1400 * (uint32_t)(tw2 + fw) / 1400) - fw, l = fx < 0 ? 0 : fx, r = fx + fw > tw2 ? tw2 : fx + fw;
@@ -69,8 +69,6 @@ void cs_view_talk(pod_out_frame_t *f, const pod_nav_t *nav, pod_model_t *m, uint
sending(s, m, a, top + PET + 20, now_ms);
return;
}
- const char *const keys[] = {"tap"}, *const labels[] = {"send"};
- cs_hints(f, keys, labels, 1);
const int top = CS_BAR_H + (AREA_H - (PET + 20 + WAVE_H + 20 + 28)) / 2, wy = top + PET + 20 + WAVE_H / 2;
pod_pet_draw(s, (POD_W - PET) / 2, top, PET, a->engine, POD_SCENE_LISTEN, now_ms, nav->talk_started_ms);
wave(s, wy, f->mic_level, now_ms);
@@ -83,6 +81,6 @@ void cs_view_talk(pod_out_frame_t *f, const pod_nav_t *nav, pod_model_t *m, uint
const char *tap = "Tap anywhere to send"; // the pill (.vo-tap): the hold was the start, any new tap is the send
const int pw = ht_pro_width(&cs_sb_22, tap) + 44, ph = 44, px = (POD_W - pw) / 2, py = ly + 14 + 12;
ht_pro_rect_aa_stroke(s, px, py, pw, ph, ph / 2, C(0x4a40a6), C(0x2a2550));
- cs_text(s, px + 22, py + ph / 2, pw - 40, &cs_sb_22, 0xedeef0, tap);
+ cs_text(s, px + 22, py + ph / 2, pw - 40, &cs_sb_22, CS_INK, tap);
pod_hit_add(f, 0, 0, POD_W, POD_W, POD_A_TALK, 0); // LAST: hits are scanned last to first, so no crumb or chip steals the send
}
diff --git a/devices/harness-pro/firmware/main/pod/console/cs_toast.c b/devices/harness-pro/firmware/main/pod/console/cs_toast.c
index b6e174b75..d7ae81869 100644
--- a/devices/harness-pro/firmware/main/pod/console/cs_toast.c
+++ b/devices/harness-pro/firmware/main/pod/console/cs_toast.c
@@ -22,7 +22,7 @@ void cs_toast(pod_out_frame_t *f, const pod_model_t *m, const pod_unread_t *u, u
for (char *c = line; *c; c++) if (*c == '\n' || *c == '\r' || *c == '\t') *c = ' ';
int n = pod_wrap(line, &cs_rg_20, w - 40, 2, rows);
const int h = 16 + 30 + 10 + n * 27 + 10 + 18 + 14;
- ht_pro_rect_aa_stroke(s, x, y, w, h, 18, C(0x2c2e34), C(0x16171b));
+ ht_pro_rect_aa_stroke(s, x, y, w, h, 18, C(CS_EDGE), C(CS_RAISED));
const char *name = a && a->name[0] ? a->name : u->name[0] ? u->name : "Agent";
cs_logo(s, x + 20, y + 16, 28, a ? a->engine : NULL);
@@ -39,13 +39,13 @@ void cs_toast(pod_out_frame_t *f, const pod_model_t *m, const pod_unread_t *u, u
int tx = x + 20 + 28 + 12, tw = ht_pro_width(&cs_sb_22, title), room = x + w - 20 - ww - 12 - tx;
if (tw > room) tw = room;
cs_text(s, tx, cy, tw, &cs_sb_22, u->kind == POD_UNREAD_FAILED ? CS_FAIL : CS_INK, title);
- cs_text(s, x + w - 20 - ww, cy, ww, &cs_mono_15, 0x5f646d, when);
- for (int i = 0; i < n; i++) cs_text(s, x + 20, y + 16 + 30 + 10 + i * 27 + 13, w - 40, &cs_rg_20, 0xc9ccd2, rows[i]);
+ cs_text(s, x + w - 20 - ww, cy, ww, &cs_mono_15, CS_DIM, when);
+ for (int i = 0; i < n; i++) cs_text(s, x + 20, y + 16 + 30 + 10 + i * 27 + 13, w - 40, &cs_rg_20, CS_INK2, rows[i]);
const int fy = y + h - 14 - 9;
const char *dismiss = "swipe \xe2\x86\x91 to dismiss";
- cs_text(s, x + 20, fy, ht_pro_width(&cs_mono_15, "tap to open") + 2, &cs_mono_15, 0x5f646d, "tap to open");
+ cs_text(s, x + 20, fy, ht_pro_width(&cs_mono_15, "tap to open") + 2, &cs_mono_15, CS_DIM, "tap to open");
int dw = ht_pro_width(&cs_mono_15, dismiss);
- cs_text(s, x + w - 20 - dw, fy, dw + 2, &cs_mono_15, 0x5f646d, dismiss);
+ cs_text(s, x + w - 20 - dw, fy, dw + 2, &cs_mono_15, CS_DIM, dismiss);
int32_t left = CS_TOAST_MS - (int32_t)(now_ms - u->at_ms);
left = left < 0 ? 0 : left > CS_TOAST_MS ? CS_TOAST_MS : left;
diff --git a/devices/harness-pro/firmware/main/pod/pod_pet.c b/devices/harness-pro/firmware/main/pod/pod_pet.c
index eef736e44..8d7c58d04 100644
--- a/devices/harness-pro/firmware/main/pod/pod_pet.c
+++ b/devices/harness-pro/firmware/main/pod/pod_pet.c
@@ -258,6 +258,20 @@ uint32_t pod_pet_next_step_ms(const char *engine, pod_scene_t scene, uint32_t cl
return n * step_ms; // every step draws the same
}
+// The plain loop's next change (pod_pet_draw_loop): the first step after clock_ms that draws a different frame or offset.
+uint32_t pod_pet_loop_next_ms(const char *engine, ht_pet_state_t state, uint32_t clock_ms)
+{
+ const ht_pet_t *pet = pod_pet_for(engine);
+ if (!pet || state >= HT_PET_STATES) return 1000;
+ unsigned n = ht_pet_steps(pet), step_ms = pet->step_ms[state], from = (clock_ms / step_ms) % n;
+ for (unsigned k = 1; k <= n; k++) {
+ unsigned to = (from + k) % n;
+ if (pet->loops[state][from].frame != pet->loops[state][to].frame || pet->loops[state][from].dy != pet->loops[state][to].dy)
+ return k * step_ms - clock_ms % step_ms;
+ }
+ return 1000; // a still loop
+}
+
// ---- the player -----------------------------------------------------------------------------------------
// Logos are pre-rendered in native order at the exact sizes Pod draws (scripts/pod_gen_logos.py): a lookup and a blit.
@@ -301,6 +315,15 @@ void pod_mark_default_big(ht_scene_t *s, int x, int y, int size, uint16_t ground
ht_pro_text(s, x + (size - w) / 2, y + (size - f->height) / 2 - size / 16, w, f, ht_rgb(0x6f746f), ">_");
}
+bool pod_pet_draw_loop(ht_scene_t *s, int x, int y, int side, const char *engine, ht_pet_state_t state, uint32_t clock_ms)
+{
+ const ht_pet_t *pet = pod_pet_for(engine);
+ if (!pet || state >= HT_PET_STATES) return false;
+ ctx_t c = {s, x, y, side, x, y, 8};
+ play_rest(&c, pet, state, clock_ms);
+ return true;
+}
+
void pod_pet_draw(ht_scene_t *s, int x, int y, int side, const char *engine, pod_scene_t scene,
uint32_t clock_ms, uint32_t started_ms)
{
diff --git a/devices/harness-pro/firmware/main/pod/pod_pet.h b/devices/harness-pro/firmware/main/pod/pod_pet.h
index b38c36a59..4d236b5db 100644
--- a/devices/harness-pro/firmware/main/pod/pod_pet.h
+++ b/devices/harness-pro/firmware/main/pod/pod_pet.h
@@ -16,6 +16,11 @@ unsigned pod_pet_runs(const char *engine, pod_scene_t scene);
// started_ms and holds its last step.
void pod_pet_draw(ht_scene_t *s, int x, int y, int side, const char *engine, pod_scene_t scene,
uint32_t clock_ms, uint32_t started_ms);
+// The pet's own small loop for a state (idle, working, done, asking), centred in the square like REST, with none of the scenes'
+// props: the Console Overview's cards. At the stored size (zoom 8, the rasteriser's fast path) once side >= the frame's larger
+// side / 0.88. False, drawing nothing, when the engine has no pet. pod_pet_loop_next_ms: ms to its next change (1000 when still).
+bool pod_pet_draw_loop(ht_scene_t *s, int x, int y, int side, const char *engine, ht_pet_state_t state, uint32_t clock_ms);
+uint32_t pod_pet_loop_next_ms(const char *engine, ht_pet_state_t state, uint32_t clock_ms);
#define POD_PET_STEP_MS 33 // 1000 / 30: the frame rate of anything drawn in code from the clock
#define POD_CS_ANIM_MS 66 // Console: the equaliser, the spinner and the working mark (about 15 fps; a new height every 66 ms)
#define POD_CS_WAVE_MS 100 // Console: the voice wave (square bars)
diff --git a/devices/harness-pro/firmware/main/pod/pod_view.c b/devices/harness-pro/firmware/main/pod/pod_view.c
index d2ce971d3..19423e9f1 100644
--- a/devices/harness-pro/firmware/main/pod/pod_view.c
+++ b/devices/harness-pro/firmware/main/pod/pod_view.c
@@ -35,6 +35,8 @@ uint32_t pod_view_next_ms(const pod_nav_t *nav, const pod_model_t *m, uint32_t n
{
const pod_frame_t *top = nav->depth ? &nav->stack[nav->depth - 1] : NULL;
switch (top ? top->view : POD_V_TABS) {
+ case POD_V_TABS:
+ case POD_V_TAB: return nav->skin == POD_SKIN_CONSOLE ? cs_cards_next_ms(nav, m, now_ms) : POD_PET_STEP_MS; // Console: the cards' pets
case POD_V_AGENT: return pod_view_agent_next_ms(nav, m, now_ms);
case POD_V_RECAP: return pod_view_recap_next_ms(nav, m, now_ms);
case POD_V_TALK: {
diff --git a/devices/harness-pro/firmware/test/cs_perf_baseline.txt b/devices/harness-pro/firmware/test/cs_perf_baseline.txt
index e209c3463..ebd19f5d1 100644
--- a/devices/harness-pro/firmware/test/cs_perf_baseline.txt
+++ b/devices/harness-pro/firmware/test/cs_perf_baseline.txt
@@ -1,7 +1,10 @@
# Pre-change (v3 Task 4) host us per Console frame: 720x720 in 24-row strips, -O2, best of 18 runs, default font. test_cs_perf.sh needs <= 85% of these.
-tabs 207
-recent 196
-tabp:3 127
+# tabs: re-baselined for the one-lead-per-tab Overview (tinted cards, four pets' small loops at their stored size, about 212 us measured; 207 before).
+tabs 260
+# recent: re-baselined for six rows a screen instead of five (no hint strip; about 183 us measured; 196 before).
+recent 220
+# tabp:3: re-baselined for the Tab as cards (three pets instead of rows; about 146 us measured; 127 before).
+tabp:3 185
agent:fw 231
agent:cli 301
recap:desk 397
diff --git a/devices/harness-pro/firmware/test/golden-console-liberation.txt b/devices/harness-pro/firmware/test/golden-console-liberation.txt
index c5cfbafb4..5e8ca88e2 100644
--- a/devices/harness-pro/firmware/test/golden-console-liberation.txt
+++ b/devices/harness-pro/firmware/test/golden-console-liberation.txt
@@ -1,200 +1,200 @@
-028407c45d0a10786579c7d6d52c91eb9a585252a5ffb33d41f609d56c96e21e agent:fw@1234
-033ac4dea7513b9bccd568f8b9768c82d4798af4706346f9c22468387fbacc40 tabs:banner@5000
-0408ff201bd92855845ae9eb404db10bbf20db7bb2b6963e1c909fb5ddf59d91 recap:desk:scroll@0
-041a450a56ae4f83300da3a32bce4adb3cdf608f8ef9ebc235ecb07c0ff809de chrome:talk@2500
-04c6c5089fa485c6a0f6e9284f9819496ef25a6d785737a2dc353685bba423ab inbox:failed@2500
-04c6c5089fa485c6a0f6e9284f9819496ef25a6d785737a2dc353685bba423ab inbox@2500
-08d50babc57d1ce1b8c57a27ac84e592f340cf448d2ed046eee11893b065a63b tabp:3@5000
-08df98dce03b1f20fc1b2f87957f26acc48b22ef31039f668c85637115166767 talk:cur@5000
-093e4e1437ea622eec7194e61f5a29a8a6ba9ab8fecc114ac621a4c5a6e8fc5a agent:fw:banner@0
-0b0a5971d78bccdfcf5cfc9937cc5a979ecbcb7940cfd41d376f5bb140e3bcda recap:desk:extreme@2500
-0cb3893219f3a7304427a48193c0b94d8298af6fdceb5600d8026c5cbe5a946f agent:desk@5000
-0cb3893219f3a7304427a48193c0b94d8298af6fdceb5600d8026c5cbe5a946f recap:desk@5000
-0de653f1770f9b6d0561814e2a7fba52cf5b27f7b01a56663c6f80ff601e0ed7 recap:desk:testfail@0
-0fd0c96f9d4feda869559c620bf627a6a9f2d8723f361e3db96355bb78383568 chrome@5000
-106c7ba6d2790361b1ec8983f0499c151d063ba409ddc5002d61a4d0ee5e24c5 agent:desk@600
-106c7ba6d2790361b1ec8983f0499c151d063ba409ddc5002d61a4d0ee5e24c5 recap:desk@600
-107932cbfba05df26981b343f0dedcbbb8a1a38a54981aba731099df9de74bd2 chrome@2500
-11615dbe1c8db80ad0e5e83ad8e2b61a5382c5623cd8f4e8a5f7e2bc415bdd9b recap:desk:banner@1234
-12a707d6a1d6cff68ffa62332231f04868f952f4f34ae83df828a4121251a3d0 agent:be:offline@2500
-182bbb3df9594583bb27883193e58619d22efc5c8c0bae1778a758825f75b5e6 tabs@2500
-1834c881548bb14fd422ca1d751a886c382ac6e509f09c43645b8e2d9f1facf5 talk:cur@600
-186d1ca7c325c09e843e1838acf1671a3003f5f1109641e5262ebdeec1cce6a2 inbox:failed@1234
-186d1ca7c325c09e843e1838acf1671a3003f5f1109641e5262ebdeec1cce6a2 inbox@1234
-191b586dfa8b363ed25419386d5e06eaffc667443a35a431e8a30e41887e12a5 agent:cli:long@2500
-1bd68182eaa2b4e87f8c524f3a742da6a83ff6c0c761a6146d21f17b3c677e06 talk:cur@1234
-21522fe8c0cd89ff3a6ed3543f89353bfc20fc10e87f93168fef0cea889338ef agent:cli@600
-218ff961b83bc7c8f477021ccd5e93607482c861506ccb266a4e7892a73569cd talk:fw:send@0
-23eacccf4a2bdedc2ca63bb055c13aec8a9c0dfe4363230ae09b24b84ae9fb3a talk:fw:quiet@5000
-24666ea74905e130fc843243c5d407bacdfaab4b090d06fa5a93ec49b5939189 recent@600
-252add8089d63ef48bb7b299592afb8d94af29c180cfdb91cc684faf7241a8ae talk:fw:send@5000
-256668ee830fa6a6cd62765f84ddcce1c73fb76c870eaacf56112a9262fa60ee talk:cur@2500
-259913c5db1722cdc9124a6ba7644d2748dbd674eb75c83c03db153bbd56f8ef agent:be:offline@600
-29cfccb95b633e93b02c01cdadb862aa49a48738b02dfc427bc6265eb9dd16a9 tabs:mock@0
-2c44fe690e80290e97422c7aa1f569cecd31dad0b638dafa87081d2e4486b247 ota:62@0
-2c44fe690e80290e97422c7aa1f569cecd31dad0b638dafa87081d2e4486b247 ota:62@1234
-2c44fe690e80290e97422c7aa1f569cecd31dad0b638dafa87081d2e4486b247 ota:62@2500
-2c44fe690e80290e97422c7aa1f569cecd31dad0b638dafa87081d2e4486b247 ota:62@5000
-2c44fe690e80290e97422c7aa1f569cecd31dad0b638dafa87081d2e4486b247 ota:62@600
-2d166b2d2e99e2068b4ece360a08c07cb4eb8198ea2ebde5382eb5b965f39814 agent:desk@2500
-2d166b2d2e99e2068b4ece360a08c07cb4eb8198ea2ebde5382eb5b965f39814 recap:desk@2500
-2ebeafa8c51dd4ae0866f00c1f6786b4eb693e4c598095bcddcaffb5a70ed7e5 recap:desk:testfail@600
-2ed47a14ae45a05e4975dd4eab07bf7c1aa32c612998dc773bda63818e8c431c agent:cli:banner@2500
-2f05353e5a6cd047ad5f660906341458e40fd10b3c930a88f00e2fcc940586bb recap:docs@5000
-2fe1ad5127dc85e60fcbf98a85cb8a94213d7578973067670840dcccde2bded1 chrome@1234
-31a1d8c534fd7a340869d83a507384737beb1503be23964ae252cd7277457ba4 chrome:talk@0
-31b4be3cff60908a81c279721c7402c37ac094d4b07d297ee1196f06c894f6c6 tabs:mock@5000
-3775a837582db7daddd60314ab41119a1d076ad8e7ca4e77c8c7cfb184b0ec74 tabs:2+2@0
-38b8d2d02040d22b2c040bf784898bc0ba83a2a2b86c27aeb2190db0583cd453 agent:desk@0
-38b8d2d02040d22b2c040bf784898bc0ba83a2a2b86c27aeb2190db0583cd453 recap:desk@0
-39ba3166039214b9845248a67efc1b3182f5e22c4d0ee1bc26b53684cd089c79 tabp:8@0
-39cc36369a1e53ef65ffc334779317e13920f274463f315658546bc3aba3de9d tabs:mock@1234
-3a2f56e6e4d95a6d8b85991b417d7f15f9529f5ab232b05673de137636ecb8b2 agent:kilo@2500
-3a2f56e6e4d95a6d8b85991b417d7f15f9529f5ab232b05673de137636ecb8b2 recap:kilo@2500
-3aefc7aebf659b75d1361de5a5fbda2762931a3671b7478b00d8cb6c11861e05 agent:cli:banner@1234
-3c21f8c5b0d0e5c5a3fe56cadbed732ecf233898745c22a10077b73290fcf836 recent@5000
-3cae54326955ba9bb0b498d23de1225ea95cf9d61d39076531492385f4f74d73 agent:cli@0
-420a377c45c7b69f173dd091959b492991df876ed1c4415ab82bbe24b9cccfc9 talk:fw:send@1234
-43d72683e9715a2bbda77a897a189f05af885e4526661b4fddefcce46a94fdb7 ota:100@0
-43d72683e9715a2bbda77a897a189f05af885e4526661b4fddefcce46a94fdb7 ota:100@1234
-43d72683e9715a2bbda77a897a189f05af885e4526661b4fddefcce46a94fdb7 ota:100@2500
-43d72683e9715a2bbda77a897a189f05af885e4526661b4fddefcce46a94fdb7 ota:100@5000
-43d72683e9715a2bbda77a897a189f05af885e4526661b4fddefcce46a94fdb7 ota:100@600
-450a30cb84665801df4ed9571cfd8c6ccd837c6198d14ea5927706710d6ac6ba talk:be:send@1234
-45a6240aa7a6c45c3c7a42149ab5989f9c9403d6085510a0f0355d1631557d92 recap:desk:extreme@1234
-45d4ccef01e9d45f79fe0fc3f32c19005d02a11535c29c3e7e413cf23b21aea9 agent:kilo@5000
-45d4ccef01e9d45f79fe0fc3f32c19005d02a11535c29c3e7e413cf23b21aea9 recap:kilo@5000
-475bba9e414344a8570f243dbd0fc537af377540da8e6c95e6c9787b02bdae48 agent:cli@5000
-4782ba5840fc7272a18212325c26f7873a8a65365584a2c5fc702c31a2d8f3ba tabs@0
-47b93f6c77b2609764846f4f8bf4b5dc9169c56823eb837757997d11a689bd2e agent:kilo@600
-47b93f6c77b2609764846f4f8bf4b5dc9169c56823eb837757997d11a689bd2e recap:kilo@600
-4991e64b2085ccc9d726c2a2db729a5c75b4fca46cd5164691f72a41d482adc9 recap:desk:extreme@5000
-49f8ecda45e2ff8c6a3def7a7cb6bce5ee25e720125748df1faa8671a6a5b183 tabs:bell@5000
-4cd01a3529be30bc100a2efdd642013d3350bb91fd4e39fb84b54aaa17483861 tabs:0+2@2500
-4d1029aa6a3016f76623f2d84028f3a3541d74a0335f64e5a404bc87449dc635 tabs:bell@600
-4db858749df77eb4bf16cda859c5cd29584e3246579671dcdfc86da2d7658411 recap:desk:testfail@5000
-4e445664f0a0f74d54ff0218efb66214513aca026bdd1870f4b1e8db4f4c58e0 inbox:failed@5000
-4e445664f0a0f74d54ff0218efb66214513aca026bdd1870f4b1e8db4f4c58e0 inbox@5000
-4eae843ad7a730e1b22f55f8c7e993a0a30f090de0a7683d8ab2640ae081051c inbox:quiet@0
-510dbe79f4bb06a7675d15dfabefbcb93fb2af0fd7846d30b331ea778821ed47 recap:desk:banner@5000
-5153614d01ea4d8f4ec3dc8dfb81497bfc725387593c22854283db957a33d9f9 agent:fw:long@5000
-5228138fd78d2bcb05449f059a3e37c22ad4a1803514b7d30bae2ad06e89e482 talk:fw:quiet@2500
-56d3c1335419d853e61d0a859941defec3c9696119c8c9141acb7e22acee8745 recap:desk:testfail@1234
-56e210592f237e1a84e43f5b8304c9725535901185b174bd70bedc598b005391 recap:docs@1234
-5ef385cc382af5a08c5093c5ba8ff1e34a023aa4d4624b0859e65ca30387f5cc tabp:8@600
-5fa18068c0bb7bfe8753a20877fe95c6cf7b8a65bf14dd7114384dc051964aaa agent:fw@5000
-62b9398bda4ddce6495de3e149c43b0a7dd74bf3aa331a15f6d482ed428bfba8 talk:fw@5000
-6603db4aa78cae49fbab6436027cc630e42032e094dba13ae9d95dbaef8410ad talk:fw:quiet@600
-66579a68c3fddbc24a953cb8909a7227fff73b1cab70bbf503358873bca82df1 tabs:bell@1234
-69107dbc33e72516ff36168ef0f7cb7bde7632068eb14a752af5d88d11063dcf ota:restart@0
-69107dbc33e72516ff36168ef0f7cb7bde7632068eb14a752af5d88d11063dcf ota:restart@1234
-69107dbc33e72516ff36168ef0f7cb7bde7632068eb14a752af5d88d11063dcf ota:restart@2500
-69107dbc33e72516ff36168ef0f7cb7bde7632068eb14a752af5d88d11063dcf ota:restart@5000
-69107dbc33e72516ff36168ef0f7cb7bde7632068eb14a752af5d88d11063dcf ota:restart@600
-694af36e1fea1d6a92bd6372373d58ece3895709b22a58d3db08c81da6a295ac tabp:3@600
-6a9effd76f8447164edfc24ab6e41725955e31adb00bea5ff7c1448fece4be17 recap:desk:scroll@2500
-6bded6e3e47c724637c2963c86f4fae1284b683c8c4dd1f956ae3e73ae0180f3 talk:be:send@600
-6d54d284f7832a059e85ebdf0b161af736687d0f198f4326d09385315f32f3a3 tabp:1@2500
-6d7d807bf4f5756023fb3962ea15bf914ffed6cb6054ce0d70d8a541c8558293 ota:0@0
-6d7d807bf4f5756023fb3962ea15bf914ffed6cb6054ce0d70d8a541c8558293 ota:0@1234
-6d7d807bf4f5756023fb3962ea15bf914ffed6cb6054ce0d70d8a541c8558293 ota:0@2500
-6d7d807bf4f5756023fb3962ea15bf914ffed6cb6054ce0d70d8a541c8558293 ota:0@5000
-6d7d807bf4f5756023fb3962ea15bf914ffed6cb6054ce0d70d8a541c8558293 ota:0@600
-6e6561bc108154e432b174500a4f12dd15f3d0cf1b8cb5b189f871364a3a0664 tabs:0+2@1234
-7088075ed5c73a9afd147db0892c53fb6b143ccab61f6c61b23b5e27f13158ae agent:kilo@1234
-7088075ed5c73a9afd147db0892c53fb6b143ccab61f6c61b23b5e27f13158ae recap:kilo@1234
-717070f904e13add019cc59597061651196570c4dbaaa4b578f0f08deb6267c2 recap:docs@0
-719ef437f09974a49a73b05aabad7ad83516afebaf4efaf2a5564be9d0985741 agent:fw@0
-73a3af3fc9f0b1266d9ca45a1db252d8c94dec7f90c49cccee97311b8f9a4470 talk:be:send@5000
-75c1fc066ad76ba329169086137488fc8d138d97b32fa5f113b327de45538f88 tabs@600
-76af0e5ce4ff6a9113d329a9c9bbc99f60fc44405b98bfe1ff45599927805dec recent@2500
-793964e37eb10d766e1219925da8dc5a4c8d84c8c1e751d91314b9c314f9db15 tabp:1@1234
-7c76032996ff15821c4481134346de6f20d6500f6c6de86f618ae3ea0196d268 chrome:talk@600
-7c838bf6964f1742cea1786e93460d03938c5e3fe3a25ca3262397dc79470b9e recent@0
-7f753c537ea82b157937556f506ac123c122b24d6c545f5460aadba38fa7dfbd talk:fw@600
-81d694aa289c8fcf7496cc35fe47d1f3b0b76efff529913c8854825ebe7b6677 talk:fw:quiet@1234
-830518a6f687cef420fca84692b68d84ac9797f730e77e281322dd750228cca8 tabs:bell@0
-85a22133ad4110e39c3f1311725988a867a83b784bc7da68a6d07abcdf9ed15c talk:fw@2500
-89bf9c8c68b93e128a4290c5b19c34e46c0e05e1eecf894941a5bff8f6e38e01 agent:cli@1234
-8b0648c4da0c03b54131d6e2412945c5da76b1a0d2fb2510e15ab994413a8ebb talk:fw:send@2500
-8ba76237cf61eca63c8e120874a88c1c2e9a4f0f233ac7631790b8366c0c1240 agent:cli:banner@5000
-928bf3b463e102702547b6e57d2bd5fa43d3e3d073f006b3ff94d4e8582f5640 tabp:1@5000
-9370901b650e27ee857a31170e49d98a958e84622389e576382db9f991789889 tabs:2+2@5000
-9371c72946fe6a3f29f0d8ccd7cdd6f470fa5425b30c3e66c7a267bc9bff12f2 recap:desk:testfail@2500
-94b919c27b92711272c5673b7cde03f59590f99c775809723e2407677e49a571 recap:docs@600
-955a3670b25854193856c6583113d67f52ba9db964241bc3d080f4692b9bdaa4 tabs:banner@1234
-958b69337a15e9a6b892c3afec04efafe863f223d2480a68cb631bd1b3c3d163 tabs:0+2@600
-971944f447eb60563b4216f3b7bcaa35b95f2a991bed01f4c352614aef6ee97d agent:fw:long@0
-9730c7277d3839e0fc7aee493ea430031314fdbe0a58a5ffcff6d9ac74896c0e agent:cli@2500
-9a4802ee44d418e958c1ef58bf386322b62cfb86665ab1a46212211d0323415a tabp:1@600
-9adbd3d6b13e3dd1834f518de0fc9a1dcc7550c147ad2e5e93dafc99276dd944 agent:fw:long@2500
-a00fd0347c7f558a8697ceb4d1a2c4841db217b229a946a3d8aeb53076f1c179 tabs:mock@2500
-a1190cef96a79c0f0eba574e8808c87623959a7aee87901c793936ac83e47cc8 talk:be:send@2500
-a2136e582b28dc308b0bad2832b0af1ceaf18ab2f2bca1bcbb0f05bfda9adb2f agent:be:offline@5000
-a5a3ba7289620535847ee36c35aa0cd24dfa47eb2f7f2b9f85b5fe37548e94e8 agent:cli:long@1234
-ab90b64b969b78258f1f5ebbfb34cad7c56e0a6daf6d8c72414135d317d6084a tabs@1234
-acea83cc3ae5007826ee0bb6bb8d7e958f6e5d1a905d169c61031356c4bdf7dc inbox:quiet@600
-ae3f730bbba0adcf41803c8911a65e4fb6b0f651da6c4ed8c2326eb08d2ddf6a inbox:quiet@2500
-af55dc886f911273bbd131fe10ed7a9e9566e4a29b9cc8400856d3354b2122f5 recap:desk:scroll@1234
-b14de170e131f04d739d20c643f76c5046b319698fde0e03166ba2f5c6255f7b inbox:quiet@1234
-b200b8216ec27719b0cbbaf88e5bab46162bdc4446e5762b4f04155557470de6 inbox:failed@0
-b200b8216ec27719b0cbbaf88e5bab46162bdc4446e5762b4f04155557470de6 inbox@0
-b310f0676d5f56cb25910aa5625b823b45b9485c91f586356f3e009bc61fcb63 agent:cli:long@5000
-b4d9d5371a577da4ae14024109c0472150751f4e563f17715ed4f02c0d99f5d6 tabp:3@0
-b7a0e71cb70962c859f98f65b0aed96e4b96238a5d9f6a10a66daf5cb588b297 talk:fw:send@600
-b7f18764847334688b8f189bb61db5361494d825a59f0812614ff2d423a246f6 recap:desk:banner@0
-ba46d8e44bbb15fc2accd5fc2098866fb02610662cc28d134ca995515c63509b tabp:3@2500
-bbab8604bec530ee16015531f2a245fdcbf4acb2c0f6639710764b3e540f3d30 recap:desk:banner@600
-beffbfbcd7b66093301313a5a3dac419d0705294e495f1285d5c29effb6de358 tabs:2+2@2500
-bf85d6f30bbcc949b6142b57e10621d0947292b85581484167c6709820b74712 tabp:8@5000
-c2639e5390a3350205c209ded74a94b5f72b2e64265a6d1cb316222a4b0087f7 tabs:banner@600
-c2a7fbe2bf659782cb74ecf325fa8e44861c31f7dca81b08264dbd0b470340c7 agent:fw@2500
-c3e806f74569ea373b0d8fbe93fe92ee70bf4c7bca31ee27a6bb254bc6bc84cf tabs:banner@0
-c6732ac1364acf53de48d0615250c99f9a192398a0e46cd5c191984a056b8595 tabs:0+2@5000
-c6eb655a3123eb6f00aa3735ec6c54fab29b7b77bf7bc373cad25b9393c79e5a tabs:banner@2500
-c7aab1d5c2763eec5963ad5edaed57a727bd3e58ee483194f248b867b422139f tabs:2+2@600
-c93dd515454ad71020be7fe838b7c7b6048f957b7d8b8c8947e51fdcf09a2956 agent:cli:banner@0
-c94790f0c41fda0a5a91271089a0c37f43caa14686c4b81ce811dc31249a6127 agent:cli:long@0
-ca8869b94e7606f0d8c623f23302770f8d71515ed62ec88b5e052bc23c9a5ef4 chrome:talk@1234
-cb9dedaefeeff648af9cf16ad35a743724acf4b8c5119f919eebb634ddb2c24f agent:be:offline@1234
-ce63c84cfb7a088124b3aa5cb281122ff72f530218f8c7ab7b18bf28ae4b6145 agent:fw:banner@1234
-cfeeb8a9278895e1c53ec729261fd416a9ded8f706ae4128c3029e02a18b6b60 inbox:failed@600
-cfeeb8a9278895e1c53ec729261fd416a9ded8f706ae4128c3029e02a18b6b60 inbox@600
-d20497fffd7985ce06ab251eec699317bd9214afc6df8d37b63a0623d38bc2ff recap:docs@2500
-d208224cbbfc30035a5e2b42bf55b668478a1eba32aac2afc20825fa3b9ba2bb recap:desk:scroll@600
-d2a8ee30df83b1d4066e963593830f29ae008599810527bfa7226427098dc653 talk:cur@0
-d2b1f66043dcd560458964ae91daaf811395146b768a7a7f1c4b684133b08c72 recap:desk:extreme@600
-d57b4dc7af87ceca4bec7f6a5f23a76c03d7facbb8ae91d8a7ae4255b92a2b01 agent:cli:banner@600
-d5d6e83eb76e529e3fde830d7e8be6d5af83b8d7c5a33e81cbe32fbb9b1b20ed talk:fw@0
-d6da075110cb8e7c04325824b3aa9428fcf8c1eeedfcdc386be81c909baf0623 tabs:0+2@0
-d9423088cc0bc3c8078254e3b3009f83bc87baaa4ecf20644370e90c4d11cfdb tabp:1@0
-da4c86a85697e330b8b05354d5f7ad6c8cff1dcacd7d7e515357f6d5f17a938f agent:kilo@0
-da4c86a85697e330b8b05354d5f7ad6c8cff1dcacd7d7e515357f6d5f17a938f recap:kilo@0
-da6e1a46d6738459bde7f0d852adfef6d37a06a2cbd01c2814eb7a2758dd0320 tabp:3@1234
-daf4795da56e2209a685881ca2a7e02498b24e492e493262bbca73ac95f345ae agent:be:offline@0
-db7125bbadec23d858d63234291a19f4d1d5ada5305b4094c99732e49261448c chrome@0
-dd276a1e2ef9955a570867b3f91ab1dbfe325a3f5d1e293296cf0f34a7e8218b agent:desk@1234
-dd276a1e2ef9955a570867b3f91ab1dbfe325a3f5d1e293296cf0f34a7e8218b recap:desk@1234
-ddf00042bd684fd85a449ddf51c9f3ecd0593307c7b2486c9160a74061eaf9cc tabs:bell@2500
-df745bd923fc1e2533c43fa4ca8b48cb53cc053166a590a9b2259f3942266846 tabp:8@2500
-e1d275ac0976bbdbd0910809fcae0bb71a5cce63af4ba8bca10158cd489cb9d8 agent:fw:banner@600
-e476bafbadf3ea6225eb2e6cc0a4494170409ed33878ca579fc915fc165f1166 inbox:quiet@5000
-e546c53da411146ce5418faf060434a57495464985007328324c3e065246e27c agent:cli:long@600
-e61c1d4d297418e2811ec16c999bc23183e7c6cdce36c734119e75a3e26af5ef recap:desk:extreme@0
-e675e1370cf581201a22ec418549e9a7237c269ee8a4ce81ad6e048f89dbf668 talk:fw@1234
-e71ab6901fa5460c5565c3a23daa5be1cd8325479a79052385a2ac529810cc12 tabs:2+2@1234
-e754357511920a0cbb4f4faee1a736e722160cc27066bbdb36f57bd63eb02032 agent:fw:long@1234
-e8cb44e7cf843e63d9e5c1ba9dcb224d7e4171de7f49864cf26cbedb90685ce4 tabs:mock@600
-ea8f40908340978eb0db4fc65c8acdd6e83ac7ffe64883a65125904b1c3db42f chrome@600
-ebea5f390f1c370d895b1a30fbe5ab806095e30c84efc0ac7d312930f33520c3 chrome:talk@5000
-ecc05fbbbe8a901d72591d9d19cd9b59e3668fd4d95c7138ee0c896782f2d30e recent@1234
-ee28ab7c02085783af52e0d0493173df14fdf09485d42efe666b8bf7cf880c3e tabp:8@1234
-effd37698723a18a6d5da38fbbe57014aa6311d38958bc85d3759bab51b86a22 agent:fw:long@600
-f20329ee8dda6d89ecb742352a0d56703e80e6e6cd3fbe2154064de89c747019 agent:fw:banner@2500
-f46e9350b38fb0de14f0b02227b1a40773a2eef234de62fc74b0e3b7f7811063 tabs@5000
-f5b97fa121224c41c2fb8301d47c9f25c1d4e9916d53e6e0ceedc16aa453f274 agent:fw:banner@5000
-f8fa6ce5df714772a16da7f3e09fb234e81d856c550fe411161cd938c925280b recap:desk:banner@2500
-fb7f76dd9b6e4470cb8291e71070d1678bf826d8c836348576c760bfd5526e1d talk:be:send@0
-fbafe64303889070db9fb146fbe493eefdbb373e5b06777b7693ef5abe970ac8 recap:desk:scroll@5000
-fc8605e41b110a3f828ec7fdd50b7f6563477451b633139ca148411c31c297ee agent:fw@600
-fd0444c2ec2dda602e2bcabae1fb9631fb2c9d410d46bc4c655223cb5de304d5 talk:fw:quiet@0
+018e4f3d21a05b2d8ae1a959b1d351c8e3d7349e8e0cda7ddaf3450b93065b9d chrome@2500
+06261d1df67f22b5e6ddc299079a3b1405c9a077fbc5a7db6a9ae7dd0fb8e81f recent@600
+079e669ebdfb98597af6ab4e5ea9ebbb4e1fddbaf98484df8a721b1d0f23df76 agent:be:offline@5000
+0ad62fc7831be4bac3c89a6d38b4057517651ecccdfa5ae9914e41fe2b92aa10 recent@1234
+0b3758ad1519b07db99ade2fdac09791af79688bac8ae16d55383f0b9fb768ee recap:desk:scroll@5000
+0d5e0c5516f80f8f6e9098628766517a28e52d3b64d9668132c6c61180f2f39e talk:cur@5000
+0f81659fcd4957bc0982e5cb5d583ed7ac817e0827d823cf8d9bb95556379054 chrome@600
+1363a3930a98d572429097118bc0c4ea4cb486659c964b95d944f81a5fc89a2c inbox:quiet@2500
+13baca555d73a1dd1f3f6c6a80b9c8a1cf69f29c0ac35e3165fa94fd003ecd41 recap:docs@2500
+142b7284446a07a4a04ebee9498387e8a702bc5ce657325edad5babf349e05bf agent:be:offline@0
+176a8871b8ee9c75d0fb84b3c17643e86636fb7eaee02f00396f6d36f4a0fa48 recap:desk:testfail@2500
+1a4deaefd82c22525dc813eaf8d8ad08b988bad6498d49a3383c1c2a09714bee agent:cli@1234
+1b00dbd17f43d116e9d002d2649da87fc06f22f61ce9af7d38e0bb868375d8b6 recap:docs@5000
+1ce71df5a0f3c169b19e2ab849096ba88998135bab2fda7fe318f6f2c672cb69 tabp:1@0
+1f317f161feb6e182f405640bcd573f95fa208f2308292b12d6207cdef329732 agent:desk@1234
+1f317f161feb6e182f405640bcd573f95fa208f2308292b12d6207cdef329732 recap:desk@1234
+240294586074a949c1c1baaa40e8ce76f6cd30c682ba474515b3c79d934813db inbox:quiet@600
+265d997e6c22445cd12e343cb3f466cca71941e59930cdc9b19f94f6414ccc61 tabp:1@5000
+26c0d2eb23feeeaebeb519031bb163ff48a5b7a1fdbb25b783115554c6d05d1c agent:fw:long@5000
+26d72eba597fbd896cb72936428a93f01ae24b082e0ddef3bd9eabf94b7b9813 chrome@5000
+2867f5f9b6525e0e8315d5b986d50f93c87c0e26fb169ecd9bcb85a243513428 tabs:banner@0
+2b104baf0675a063c069838e6fdfb095472c4c273f83c3d824842cd501f22e23 tabs:2+2@2500
+2b7e71f5c25ad536b461fd3cfaa5b126d28cfe20b485d0d4b5ef9e5d355ce399 tabs:bell@5000
+2c8fe616c5acf370b6e5211e28d73514c57ed054936d75405be6d7fba67fbf75 agent:fw@5000
+2d10cbf64d14c4b54133e4697435cee381d15b99bdc2274c52122f62557857b9 inbox:failed@2500
+2d10cbf64d14c4b54133e4697435cee381d15b99bdc2274c52122f62557857b9 inbox@2500
+2d2c09b8a80417bc4220f5d2dafbc89c5bf11ce34fe42a5db2766363ef2ce0b7 agent:cli:long@2500
+2f7f6b4256a44149b9e0c3b65f903d9be8e0a1b297fa9a1809223e0f6c24c7b3 recap:docs@600
+2fba1436b8e47d7946a133ef34efbba305b90fff63555f3acd18d2b215edfc6d agent:kilo@1234
+2fba1436b8e47d7946a133ef34efbba305b90fff63555f3acd18d2b215edfc6d recap:kilo@1234
+31499ee36f196c3f72dd6f1a7c7cae0652e3f4c7b04ac9ceb8165d4ca0581cc0 tabs:banner@600
+364ce4e5df68c7cb35910e50359f62136906258a7d662ad8a38b4db1003ba088 agent:desk@2500
+364ce4e5df68c7cb35910e50359f62136906258a7d662ad8a38b4db1003ba088 recap:desk@2500
+3660fde6334900b6c25f20f13eed3604c3b6e971fdf657b7980bbe4673cfa1f5 talk:be:send@1234
+36d1062fff870a24e120dee87f925283f7e9795b8add536cf5b437ef635ec1e3 recap:desk:scroll@2500
+375a682b9706b9c1e3dbe616d04a0bcc1dfded1e8e8c06ffc6e69fe6cae5f4e5 chrome:talk@1234
+38c7a589d2f7d4e75261b138628573fe361d5edd08b5d5f681967430fb6f46a2 ota:62@0
+38c7a589d2f7d4e75261b138628573fe361d5edd08b5d5f681967430fb6f46a2 ota:62@1234
+38c7a589d2f7d4e75261b138628573fe361d5edd08b5d5f681967430fb6f46a2 ota:62@2500
+38c7a589d2f7d4e75261b138628573fe361d5edd08b5d5f681967430fb6f46a2 ota:62@5000
+38c7a589d2f7d4e75261b138628573fe361d5edd08b5d5f681967430fb6f46a2 ota:62@600
+3a221ad10c8eef93440efee217e6ce6d16d842fa6f763ed14fcc3439741703fb agent:fw@1234
+3aa6739259f4ceb2bdff54ac443d4917269fa93921fef7ee97fb9b62d9b1ba5f talk:cur@1234
+400986827a14646fc67fdd5d2c460a415fcb2f997eff299f531cc57a511cdf0f recap:docs@1234
+402913f1e22ad1d477fa6fc876daf68f3dbda61df5b1eb6463e5cb966f18e831 tabs:mock@600
+4102d10b7f8b6a9ac4ee4c6002cbf5d5831f74e8531a0feef1f1febb54b81439 tabp:3@0
+410366838aad6259e3778100afe457b68c4e7e63d5b439178967d81b150c7386 recap:desk:extreme@600
+420057a033a9982b40a72ed92444b1495127fa258f5b7057b018e389913fa20f tabp:3@2500
+422de852bc519195db46aaedd830201afdc025ca46fc81083a40b88ec914969d talk:fw:quiet@0
+42ab7c218a6a80ea84401a814aa9d98308f731d140ec3ead7badc5b41f82cf25 chrome:talk@600
+43391b2d7a3652679c06de167b40235bd1df39635a474e2cbc476c7641dc5ec9 agent:cli:banner@0
+43c34f3a84f3ee2ae3524546c04db38e742fef237b25183c7cd8ccaf6c9dac71 tabs:bell@600
+44b69e2aadac2da709980c6bff34b8c7d509d0a34aceb44bf4e3324c991a0321 tabs:banner@5000
+451a900ca256b3eeb62628a9c12ca89d6fa352f69e2030ad6699a3e0d43bcac4 recap:desk:scroll@1234
+454c372483809a8a62e3c1eecd22ab2f6bd5114854df1a9d5f6a9717e11eee98 tabp:3@600
+4ca4869c0e52c860e5c7157a8c0714ea71c57dce7739632655c15f2268ac84c0 tabs:2+2@600
+4fb75fc852dde72f6d5d0e800b6e7093ba1f053f9902a731cb6203adff998879 tabs:2+2@5000
+5142846cbc6ddbba23e16463fef13944e389f6edbb343ecd95e7e0348542b2e3 talk:fw:send@1234
+54eaf01a0c077ba9952f00ed817e32187421f404ca04bee67dfc53d376cdfdf4 tabs@5000
+55a0740a0d0f29edd60b567980d0361b122b147d14f5fa3c910e9ec74a949aa0 tabs:0+2@5000
+567ae514fe82f574a9dab158972bfe61dcd6019e2af346fb1ce55fee13bd376c agent:fw@0
+57a714838efed2e246c9b1e9b2bbba1bbbd1f57c10329e05b7e3a1ec329a3775 tabs:2+2@1234
+5cfcf34a09c1bd4636e2104515bc0c56365c1412dd3ee1baf4d4b52ace3c0642 inbox:quiet@1234
+5e2a60c5840ef23516e5ab8c7e479160c6e1a2ea7b8293bbc6165e052040f63a recap:desk:banner@600
+5e2a6a794af8ce554937b5dd5748a409436278eb7e054bfd0b25d7adf5b5f519 recap:desk:banner@1234
+631469c9dc888f2d86ab3ac327965ba9736efe958cde1a67748fdece92cdc13a agent:cli@2500
+634132bc0f887eddf6bde4415ab8fb1214b09a3d7ea7a24e6467ccd25fce36cd tabs@600
+64a27174c6cf3a587210f397f4d16c400ca5a63fcd5d2434ae10b434057d0f42 recap:desk:extreme@0
+661cf2f2a5855e79c62a333f29e37baccc1b71e44c2c6ae087cf01493e8e70c7 tabp:8@0
+66613e8f57ffa2d5acd8bb5729ba16b5afb310aeded2cf674001b89707b5163f tabs:0+2@2500
+69dda2318994e34bdb2a490c037954c392161e16dfed920e8643c06c08621f86 tabs@1234
+6c1c711683532f2bb00a8182fad4498101fd452b115a0b35d193d1a5c268a97c talk:cur@0
+6e4403780e7a08e9ec2f600e4b1a5a4deb1fccc20b65f98d94c419b6bd8561a8 talk:fw@0
+6e909480afe030eba65a532a4f9787b5e59b16cab4d818ce819aa1bfb4b92acb chrome@0
+6ed3aa4db78e1d960acbafa34ed4fcf4fd39730295d5f44506d3693463ea5695 tabs:mock@5000
+70f5eaeb3e754c9aa432f7df96680994e4f8fdd720f1788beb9e41930effff8c talk:cur@600
+7167b8addafc493af9b2e53fb3da4efeac77193e0a09b29bace60de5028a8c82 tabp:1@600
+75499592f9910b9737490244ba619464ff933399b5254e96b64580f811ed0c78 agent:fw:long@0
+76df3f707413204f2d42d35bbf3bba946c996ec0d1e2ba9fc7565f7b16c61f88 agent:desk@600
+76df3f707413204f2d42d35bbf3bba946c996ec0d1e2ba9fc7565f7b16c61f88 recap:desk@600
+76fc36c13a0e13ba9afd419f781aab62e89d253d3becf5adf7a3cab046235e27 chrome@1234
+7832ec017653c031bf6bbd8f67ef326d3c04fe509aec04b187ca3bb63f252236 tabp:1@2500
+79ebf5512ed3bada472ed24d82a33cbc35e35cc5aea1bb6f80357cfaf4618515 talk:fw:quiet@600
+7ad23c01dee6ba922e2883868c24e423c148d2c035ad1ad0b49cdbd2d8403526 recap:desk:testfail@1234
+7ad9b64cfb5e41613eef90507eb189dba04e1dbd9c80dbf553236e3a8fb8665e inbox:failed@0
+7ad9b64cfb5e41613eef90507eb189dba04e1dbd9c80dbf553236e3a8fb8665e inbox@0
+7bd0850064d7ed7c25db8ce2a717485845282bc72b7be62db5ba4df714b2eaa7 talk:fw:send@5000
+7c79d0ec6eb0189710a2ac130c45a2d24e46d7f719d0abb1cf3e526b3fb19aba recap:desk:scroll@600
+7cd08c4a413ac8e0c19ca0b5bcf51e7487dc55e88c76d58a569fe34b572edc39 agent:fw@2500
+7fbad1de09cde08d2f53b1d06e1e8e88fefdaf6bb6c24328885e6f2e536d298f tabp:3@1234
+80fe167de97ecb73c451c2c87726d3234486557de90e27a6e5007931eed4c937 agent:kilo@2500
+80fe167de97ecb73c451c2c87726d3234486557de90e27a6e5007931eed4c937 recap:kilo@2500
+81635561f6e8787c38dcc4523309c72dfd5643aff1062a58fc7f67a798f08fd1 agent:cli:banner@1234
+82269ef5ef066ce9d921108c2eb35ec6bfe64dcc57f16f37eb5062b9bc734e84 talk:be:send@600
+858bf7f0339377cb8d0f2c4244f75145c1bbfea28d47260a390384f8750d89ed talk:cur@2500
+894601455683a35a38b47ebacb1984f2f63e7f493e0c9bf13f2e0e8ecfb4056f talk:be:send@0
+8998e04a7a3799ee334b66a37989d77b8bc351164fcb34cd38b64fa15eb33f15 talk:be:send@2500
+8ea3cff095246609b6d505b7a23e888c8bdfa6bea226360ef6acea53c7cb5ab4 recap:desk:extreme@2500
+8ecaf997c5a2829df8815da7a767d06f80a2b4bca0429b96915d782edd83bac1 ota:100@0
+8ecaf997c5a2829df8815da7a767d06f80a2b4bca0429b96915d782edd83bac1 ota:100@1234
+8ecaf997c5a2829df8815da7a767d06f80a2b4bca0429b96915d782edd83bac1 ota:100@2500
+8ecaf997c5a2829df8815da7a767d06f80a2b4bca0429b96915d782edd83bac1 ota:100@5000
+8ecaf997c5a2829df8815da7a767d06f80a2b4bca0429b96915d782edd83bac1 ota:100@600
+91682cb091f74b1d8b3deaf9d4629dc00b040a349147ab9271e5b35bbd09f9ac talk:fw@5000
+92abc30631005b8dc13361e5dc32119f1b4407d082f4155fca4de109aeef959d tabp:8@2500
+92cd96aac5911e1c8fc96154f942d5ddb2f44e767090e376630c30c0142d1e88 agent:fw:long@1234
+92f7b3d2ab443b50259b783044e786621d5a491a89bd4c08540692e71c8add6a tabs:mock@2500
+95189942e2cd0236c2a61fb1026677e7adec2c9305290598ad5f21801c865fc2 agent:kilo@600
+95189942e2cd0236c2a61fb1026677e7adec2c9305290598ad5f21801c865fc2 recap:kilo@600
+96bb2e2dc0bd6da27bcb7f480810cfb726e492289c48ddc6737db6ce9167b347 agent:be:offline@1234
+991e704dbdd4ec1fff2e5be7c6355b480056f28c72f93f452446f9b6a9c14b9b chrome:talk@0
+9a1fc0d84bc39a3e08c9d30b07557b71545b2949671be51e1e50dafd4b78a0eb agent:be:offline@600
+9b7028bb2c32c2d5522fdb9630d376c322a67f7f4f18c9700e86100041d5a2fe tabs:bell@1234
+9d28e969028ed1cf7bc6d62b188cc282cd310b0c8f2175aa31bcc8aae76f903a talk:fw:send@600
+9d54a0ac955e36e634767f44a8a0b3019ab295b60717515d780faab8109f28b0 recap:desk:extreme@5000
+9e03dd007813b084bd2362537ffc2eba90ef0f8f368c849f9e3092fcf1643835 inbox:failed@600
+9e03dd007813b084bd2362537ffc2eba90ef0f8f368c849f9e3092fcf1643835 inbox@600
+9e82cacdcf9a98f75584c68de8aa5577ff784cd4d4d139109f0a696434f70c80 talk:fw@1234
+9ea799d36fa95b9ecdd2071fa3561dd56f167281cf17afbbef8bc7d2f275ac00 inbox:quiet@0
+9f4a511b671eb16bae0ef4841f37ef181b730e78f3296a8da2cb60ef1d440de9 inbox:failed@1234
+9f4a511b671eb16bae0ef4841f37ef181b730e78f3296a8da2cb60ef1d440de9 inbox@1234
+a0a8282556765c5c33d24ac07f3410829ecb83f29339a6139357a704199e8084 tabs:mock@1234
+a2781c27c9443acca417a4ef6f14be3123c8dd57f5596b402ba6c09326114b7a tabs@0
+a34cb679892aca587c2b3616dbf292fb1fb4ae202f6b04ffa0cd6f983e39043e agent:fw@600
+a48c1826425612368556cc4816ab7bcdb72cd0aff5cc796161b05f384fffeceb agent:cli:long@600
+a4cbdc82c5847ca6d80c40811f205e5d7fc8c22c48e836fbd4bce5cff228f93c recap:desk:testfail@5000
+a5310ad382b12d5dab86bff0229a50cf8c6d8cdfa872cea3ef386a4fefc05e33 talk:fw@2500
+a75fe7d9a0911c555d247046308a5f35819eb20ff24db35d7ce40ab9c15e51c0 talk:fw:send@2500
+a7a35131033d53c32e42154fcdd167b804b419d6cbb3de4cdc7dc6b111a94a8b tabp:1@1234
+a7c053cc12a265d3774bcaf894e1525af20d3bb387f277cb2c7d2ff251cf6f5c tabs:mock@0
+aba7c84757a8b376e0ace5bcbff5904671a4d68d0f8d86ef62276334f6e49316 tabs:2+2@0
+abdbb6f4921ceed0fafa7b7bfab734e729eb5f883de93d828504956fec1d4016 recap:desk:banner@5000
+acbe185c6eb8e2bfe817fda3ddcd689b31c1aaa0b727d4d3752427f6e1f18896 talk:fw@600
+ad3cd3d0408914283bf257bb61b5ea55c997a03aaa513128b76e47fc640ad022 talk:be:send@5000
+ae98cc3c91886e476ab36f7b30ee0246f0fb3e1d8aa7127d7276f25c4971bf49 agent:fw:banner@2500
+b11d5e7973404c87721679a0048cf9121f882ced65cf20371803889f26559787 recent@2500
+b1911a013541fa29b4ff3cfb6998391c8043b3d955ed2534ba1e64cb5354e223 tabs:banner@1234
+b2b76476e75b5f4fe3d0682da7183e1cd03d6c953fd69b08aab058d9565a76ba chrome:talk@2500
+b62e83137347876bcce03574f1e48156914d5fe48eeeab57418d0c469d48da30 recap:desk:scroll@0
+b649c76893a7dff87e7f51bad05ba7c2703c22b51a25328f888bfe558a1fd078 agent:cli:long@5000
+b65aef150e4f9b2aa685003e0af83f2a571e1d11c42408e9e0daf0f25f9a5d6d talk:fw:quiet@2500
+bc04cfee1ba439417a94a98adbf0a1dac363c835c18318fd9dd067dd4e7a60a1 agent:cli@600
+bc5c94b3549b160543e7bf1888e51a9130f91387c2b0973d02655bb0bd817e47 agent:fw:long@2500
+bd9224690b09c5c7b8dd1c42f3cbc25b2c841fb70f24d5051b57f4ebc51f90d4 tabs:0+2@0
+bf15804dfcaf3503fe6b7de499935a68a7c533d384e7f5cada5d5715e7307d6c recap:desk:extreme@1234
+c245120c2baf5de2d44806a390599eb55a3174a78f5a46c8697ea3a993d32c70 recap:desk:testfail@0
+c26f57bb75f6a204c4d73c54d00d0b0b71c5d7f244fa38e281bc9302bc3865ef inbox:failed@5000
+c26f57bb75f6a204c4d73c54d00d0b0b71c5d7f244fa38e281bc9302bc3865ef inbox@5000
+c3daf76603c1db2d0d5cec636f9d124aeb5b5b7e442c0e9cb72f87e79a828b5b recent@0
+c5e5a1e5a88c76147d2609caeec87bb9cbcf93034273c42a8efc8fb81c6ec025 talk:fw:send@0
+c61ecf5c4f88b01bcaa038eb1220ff14db0b3dd015a7eedcfae109d49e327505 tabs:0+2@600
+c6491c1f813b7aa08d07fbe6f9d136111e6d3b9f6ecaa8ae064b2f6624b81a01 agent:cli:banner@5000
+c6f8a7627ac6bb526f61a2835cf3f5a86b5832b716609b96342590b76ffa5eb3 recap:desk:banner@2500
+ca187e592c7ee17c5594143ae688689a14bf27b70aa9d4662fb059e6e8d53412 ota:restart@0
+ca187e592c7ee17c5594143ae688689a14bf27b70aa9d4662fb059e6e8d53412 ota:restart@1234
+ca187e592c7ee17c5594143ae688689a14bf27b70aa9d4662fb059e6e8d53412 ota:restart@2500
+ca187e592c7ee17c5594143ae688689a14bf27b70aa9d4662fb059e6e8d53412 ota:restart@5000
+ca187e592c7ee17c5594143ae688689a14bf27b70aa9d4662fb059e6e8d53412 ota:restart@600
+cdf1ef61a9101a1a9e6f885231e18cb7645fe5e18c8846cd5ab9e41cd7ff57c1 agent:fw:banner@1234
+cdff5beae4cdb0d244feb157b3c966b62d5692f4b572c2972586221874b55b8a tabs:bell@0
+cf13952da712279b20b6693103359416d4bcf08d0cefad0374d648105a684a6b tabp:8@1234
+cf43c1a3f9297cdd9edc10fd746421c78ed4e31d88d8ae0262634aede0aad1b6 ota:0@0
+cf43c1a3f9297cdd9edc10fd746421c78ed4e31d88d8ae0262634aede0aad1b6 ota:0@1234
+cf43c1a3f9297cdd9edc10fd746421c78ed4e31d88d8ae0262634aede0aad1b6 ota:0@2500
+cf43c1a3f9297cdd9edc10fd746421c78ed4e31d88d8ae0262634aede0aad1b6 ota:0@5000
+cf43c1a3f9297cdd9edc10fd746421c78ed4e31d88d8ae0262634aede0aad1b6 ota:0@600
+d4331793af611b9819f8aca4820d2094e9f4d5f31681e1c5d21e272501dcf44e tabp:3@5000
+d460f8d257a198525ca542f01af1d035750f954b0a6353300e39c3bbfd34511f agent:fw:long@600
+d4ad0137c750685a01d76c2e416dc52db85c91f6c834c4800fc88b29689c28bf recap:desk:banner@0
+d4ad55c0ccbbf57bb196b8b1219c2abdb71d71ed7342b207c97361e58a1ddb57 agent:fw:banner@5000
+d56cd0ebc017537874331ded568713c73e64250714c40c75bd04ff6b48b905bc agent:fw:banner@600
+d603b3ad456d1b264b596cba66e75cb3a6c130a2743b39c9fec72c32b52c3898 agent:cli:banner@2500
+d73c4f16af2b14cd8181daa0ac01e4324993aacdaf10a7b560d0a220c421e559 recap:desk:testfail@600
+d855fed8890dce4a80dddfebcf1f44dcc8eb884c9c1a0111b58828dcb0a720a8 agent:kilo@0
+d855fed8890dce4a80dddfebcf1f44dcc8eb884c9c1a0111b58828dcb0a720a8 recap:kilo@0
+d9aa539aad0a8ca47f5edddd8e1cbc176e71b3d2706e5fba445bde8dcb955629 talk:fw:quiet@5000
+d9b6ab73fe45d366af1daf1133a569d0a15c800dfd1c1a59c0e05b6fda9fa0cd agent:kilo@5000
+d9b6ab73fe45d366af1daf1133a569d0a15c800dfd1c1a59c0e05b6fda9fa0cd recap:kilo@5000
+dc5af655007426026977e693f4a4c1f00c96d655324feffd4f6e70255b452904 tabs:bell@2500
+e00444c8087dd18dc79c0c36e38e7f3d2701eaf198f0d00730a2a4c7138fda8c inbox:quiet@5000
+e1a43f8f08ae4a39b926af815979a1b061e9b2fbde9d616533ff209af9386a33 agent:cli:long@1234
+e25963e122793605c7aeed7bf3f8b11330a2e5f4fb8cb7151a3e85ede4771e82 agent:cli@5000
+e33234655c2be278fc6c1f99446e28c90e3a3cdd0e0476b4e1a6e11ed7a90589 chrome:talk@5000
+e960f1e8e1dcaa695f2390b24004f3977f0c7dc4a9d2672e599cb4c64dc49faa tabp:8@600
+e9653f887894747da898c2e07b01c86a009fe8ebbe055d8664bb0cbc2d97a545 recent@5000
+ed3c265791c09188c1780ed9f034eaae2042884b242ea0b8809499a2fb5e6c3c agent:cli@0
+ede37878af6b44a793c7c6f8ad9f4e227abf5c2c0ecfc1388b6912b3f15d5309 agent:desk@0
+ede37878af6b44a793c7c6f8ad9f4e227abf5c2c0ecfc1388b6912b3f15d5309 recap:desk@0
+eebe493a4299c47298f60d4db95eddb229ab13d59128db77a69e1f91f71a7ab0 agent:cli:long@0
+eeec47ee739e56a88ec35ee65e758c04d8639805b994d5ca863e262608ff8a1e agent:cli:banner@600
+ef28730b6279fe36bf6c6d782b60af59aca452fdbea1d10a2e8295eb82d83b52 tabs:0+2@1234
+f039317d9f967a3977ff7563e3bb3cf5f1555a91d558298f3ab107aede7363b6 talk:fw:quiet@1234
+f1c6434e650e5ad6c1ec15a9e0faf4f2698a829eb0d395491c0bf73978832c44 tabp:8@5000
+f96c4771ccb38e155930d366cf5f4e3b9b2c453b4b134bb2e3e1c1701f4ce0db agent:fw:banner@0
+fa3af31b843e1abc26866541435b571ca906bcb332eb433eba175a4a21d71f60 tabs@2500
+fb9c44eac3ddf34bc324fe3ea0fdf1b6b2e95e25c7d8a43e28c56faac8725ada agent:desk@5000
+fb9c44eac3ddf34bc324fe3ea0fdf1b6b2e95e25c7d8a43e28c56faac8725ada recap:desk@5000
+fc4b059d0a88cf4bd488660fb7d8a7001b3488f0d6f462e6a9de630e61fd3a98 agent:be:offline@2500
+feacc1204ed6dc5d2bb563d058569c94de42051d83107e1d80b89701a0e870d9 recap:docs@0
+fed793b72cc662a0825cca5f70eebe574e97e7e543931c20ed9811f29a7cdfd6 tabs:banner@2500
diff --git a/devices/harness-pro/firmware/test/golden-console.txt b/devices/harness-pro/firmware/test/golden-console.txt
index c5cfbafb4..5e8ca88e2 100644
--- a/devices/harness-pro/firmware/test/golden-console.txt
+++ b/devices/harness-pro/firmware/test/golden-console.txt
@@ -1,200 +1,200 @@
-028407c45d0a10786579c7d6d52c91eb9a585252a5ffb33d41f609d56c96e21e agent:fw@1234
-033ac4dea7513b9bccd568f8b9768c82d4798af4706346f9c22468387fbacc40 tabs:banner@5000
-0408ff201bd92855845ae9eb404db10bbf20db7bb2b6963e1c909fb5ddf59d91 recap:desk:scroll@0
-041a450a56ae4f83300da3a32bce4adb3cdf608f8ef9ebc235ecb07c0ff809de chrome:talk@2500
-04c6c5089fa485c6a0f6e9284f9819496ef25a6d785737a2dc353685bba423ab inbox:failed@2500
-04c6c5089fa485c6a0f6e9284f9819496ef25a6d785737a2dc353685bba423ab inbox@2500
-08d50babc57d1ce1b8c57a27ac84e592f340cf448d2ed046eee11893b065a63b tabp:3@5000
-08df98dce03b1f20fc1b2f87957f26acc48b22ef31039f668c85637115166767 talk:cur@5000
-093e4e1437ea622eec7194e61f5a29a8a6ba9ab8fecc114ac621a4c5a6e8fc5a agent:fw:banner@0
-0b0a5971d78bccdfcf5cfc9937cc5a979ecbcb7940cfd41d376f5bb140e3bcda recap:desk:extreme@2500
-0cb3893219f3a7304427a48193c0b94d8298af6fdceb5600d8026c5cbe5a946f agent:desk@5000
-0cb3893219f3a7304427a48193c0b94d8298af6fdceb5600d8026c5cbe5a946f recap:desk@5000
-0de653f1770f9b6d0561814e2a7fba52cf5b27f7b01a56663c6f80ff601e0ed7 recap:desk:testfail@0
-0fd0c96f9d4feda869559c620bf627a6a9f2d8723f361e3db96355bb78383568 chrome@5000
-106c7ba6d2790361b1ec8983f0499c151d063ba409ddc5002d61a4d0ee5e24c5 agent:desk@600
-106c7ba6d2790361b1ec8983f0499c151d063ba409ddc5002d61a4d0ee5e24c5 recap:desk@600
-107932cbfba05df26981b343f0dedcbbb8a1a38a54981aba731099df9de74bd2 chrome@2500
-11615dbe1c8db80ad0e5e83ad8e2b61a5382c5623cd8f4e8a5f7e2bc415bdd9b recap:desk:banner@1234
-12a707d6a1d6cff68ffa62332231f04868f952f4f34ae83df828a4121251a3d0 agent:be:offline@2500
-182bbb3df9594583bb27883193e58619d22efc5c8c0bae1778a758825f75b5e6 tabs@2500
-1834c881548bb14fd422ca1d751a886c382ac6e509f09c43645b8e2d9f1facf5 talk:cur@600
-186d1ca7c325c09e843e1838acf1671a3003f5f1109641e5262ebdeec1cce6a2 inbox:failed@1234
-186d1ca7c325c09e843e1838acf1671a3003f5f1109641e5262ebdeec1cce6a2 inbox@1234
-191b586dfa8b363ed25419386d5e06eaffc667443a35a431e8a30e41887e12a5 agent:cli:long@2500
-1bd68182eaa2b4e87f8c524f3a742da6a83ff6c0c761a6146d21f17b3c677e06 talk:cur@1234
-21522fe8c0cd89ff3a6ed3543f89353bfc20fc10e87f93168fef0cea889338ef agent:cli@600
-218ff961b83bc7c8f477021ccd5e93607482c861506ccb266a4e7892a73569cd talk:fw:send@0
-23eacccf4a2bdedc2ca63bb055c13aec8a9c0dfe4363230ae09b24b84ae9fb3a talk:fw:quiet@5000
-24666ea74905e130fc843243c5d407bacdfaab4b090d06fa5a93ec49b5939189 recent@600
-252add8089d63ef48bb7b299592afb8d94af29c180cfdb91cc684faf7241a8ae talk:fw:send@5000
-256668ee830fa6a6cd62765f84ddcce1c73fb76c870eaacf56112a9262fa60ee talk:cur@2500
-259913c5db1722cdc9124a6ba7644d2748dbd674eb75c83c03db153bbd56f8ef agent:be:offline@600
-29cfccb95b633e93b02c01cdadb862aa49a48738b02dfc427bc6265eb9dd16a9 tabs:mock@0
-2c44fe690e80290e97422c7aa1f569cecd31dad0b638dafa87081d2e4486b247 ota:62@0
-2c44fe690e80290e97422c7aa1f569cecd31dad0b638dafa87081d2e4486b247 ota:62@1234
-2c44fe690e80290e97422c7aa1f569cecd31dad0b638dafa87081d2e4486b247 ota:62@2500
-2c44fe690e80290e97422c7aa1f569cecd31dad0b638dafa87081d2e4486b247 ota:62@5000
-2c44fe690e80290e97422c7aa1f569cecd31dad0b638dafa87081d2e4486b247 ota:62@600
-2d166b2d2e99e2068b4ece360a08c07cb4eb8198ea2ebde5382eb5b965f39814 agent:desk@2500
-2d166b2d2e99e2068b4ece360a08c07cb4eb8198ea2ebde5382eb5b965f39814 recap:desk@2500
-2ebeafa8c51dd4ae0866f00c1f6786b4eb693e4c598095bcddcaffb5a70ed7e5 recap:desk:testfail@600
-2ed47a14ae45a05e4975dd4eab07bf7c1aa32c612998dc773bda63818e8c431c agent:cli:banner@2500
-2f05353e5a6cd047ad5f660906341458e40fd10b3c930a88f00e2fcc940586bb recap:docs@5000
-2fe1ad5127dc85e60fcbf98a85cb8a94213d7578973067670840dcccde2bded1 chrome@1234
-31a1d8c534fd7a340869d83a507384737beb1503be23964ae252cd7277457ba4 chrome:talk@0
-31b4be3cff60908a81c279721c7402c37ac094d4b07d297ee1196f06c894f6c6 tabs:mock@5000
-3775a837582db7daddd60314ab41119a1d076ad8e7ca4e77c8c7cfb184b0ec74 tabs:2+2@0
-38b8d2d02040d22b2c040bf784898bc0ba83a2a2b86c27aeb2190db0583cd453 agent:desk@0
-38b8d2d02040d22b2c040bf784898bc0ba83a2a2b86c27aeb2190db0583cd453 recap:desk@0
-39ba3166039214b9845248a67efc1b3182f5e22c4d0ee1bc26b53684cd089c79 tabp:8@0
-39cc36369a1e53ef65ffc334779317e13920f274463f315658546bc3aba3de9d tabs:mock@1234
-3a2f56e6e4d95a6d8b85991b417d7f15f9529f5ab232b05673de137636ecb8b2 agent:kilo@2500
-3a2f56e6e4d95a6d8b85991b417d7f15f9529f5ab232b05673de137636ecb8b2 recap:kilo@2500
-3aefc7aebf659b75d1361de5a5fbda2762931a3671b7478b00d8cb6c11861e05 agent:cli:banner@1234
-3c21f8c5b0d0e5c5a3fe56cadbed732ecf233898745c22a10077b73290fcf836 recent@5000
-3cae54326955ba9bb0b498d23de1225ea95cf9d61d39076531492385f4f74d73 agent:cli@0
-420a377c45c7b69f173dd091959b492991df876ed1c4415ab82bbe24b9cccfc9 talk:fw:send@1234
-43d72683e9715a2bbda77a897a189f05af885e4526661b4fddefcce46a94fdb7 ota:100@0
-43d72683e9715a2bbda77a897a189f05af885e4526661b4fddefcce46a94fdb7 ota:100@1234
-43d72683e9715a2bbda77a897a189f05af885e4526661b4fddefcce46a94fdb7 ota:100@2500
-43d72683e9715a2bbda77a897a189f05af885e4526661b4fddefcce46a94fdb7 ota:100@5000
-43d72683e9715a2bbda77a897a189f05af885e4526661b4fddefcce46a94fdb7 ota:100@600
-450a30cb84665801df4ed9571cfd8c6ccd837c6198d14ea5927706710d6ac6ba talk:be:send@1234
-45a6240aa7a6c45c3c7a42149ab5989f9c9403d6085510a0f0355d1631557d92 recap:desk:extreme@1234
-45d4ccef01e9d45f79fe0fc3f32c19005d02a11535c29c3e7e413cf23b21aea9 agent:kilo@5000
-45d4ccef01e9d45f79fe0fc3f32c19005d02a11535c29c3e7e413cf23b21aea9 recap:kilo@5000
-475bba9e414344a8570f243dbd0fc537af377540da8e6c95e6c9787b02bdae48 agent:cli@5000
-4782ba5840fc7272a18212325c26f7873a8a65365584a2c5fc702c31a2d8f3ba tabs@0
-47b93f6c77b2609764846f4f8bf4b5dc9169c56823eb837757997d11a689bd2e agent:kilo@600
-47b93f6c77b2609764846f4f8bf4b5dc9169c56823eb837757997d11a689bd2e recap:kilo@600
-4991e64b2085ccc9d726c2a2db729a5c75b4fca46cd5164691f72a41d482adc9 recap:desk:extreme@5000
-49f8ecda45e2ff8c6a3def7a7cb6bce5ee25e720125748df1faa8671a6a5b183 tabs:bell@5000
-4cd01a3529be30bc100a2efdd642013d3350bb91fd4e39fb84b54aaa17483861 tabs:0+2@2500
-4d1029aa6a3016f76623f2d84028f3a3541d74a0335f64e5a404bc87449dc635 tabs:bell@600
-4db858749df77eb4bf16cda859c5cd29584e3246579671dcdfc86da2d7658411 recap:desk:testfail@5000
-4e445664f0a0f74d54ff0218efb66214513aca026bdd1870f4b1e8db4f4c58e0 inbox:failed@5000
-4e445664f0a0f74d54ff0218efb66214513aca026bdd1870f4b1e8db4f4c58e0 inbox@5000
-4eae843ad7a730e1b22f55f8c7e993a0a30f090de0a7683d8ab2640ae081051c inbox:quiet@0
-510dbe79f4bb06a7675d15dfabefbcb93fb2af0fd7846d30b331ea778821ed47 recap:desk:banner@5000
-5153614d01ea4d8f4ec3dc8dfb81497bfc725387593c22854283db957a33d9f9 agent:fw:long@5000
-5228138fd78d2bcb05449f059a3e37c22ad4a1803514b7d30bae2ad06e89e482 talk:fw:quiet@2500
-56d3c1335419d853e61d0a859941defec3c9696119c8c9141acb7e22acee8745 recap:desk:testfail@1234
-56e210592f237e1a84e43f5b8304c9725535901185b174bd70bedc598b005391 recap:docs@1234
-5ef385cc382af5a08c5093c5ba8ff1e34a023aa4d4624b0859e65ca30387f5cc tabp:8@600
-5fa18068c0bb7bfe8753a20877fe95c6cf7b8a65bf14dd7114384dc051964aaa agent:fw@5000
-62b9398bda4ddce6495de3e149c43b0a7dd74bf3aa331a15f6d482ed428bfba8 talk:fw@5000
-6603db4aa78cae49fbab6436027cc630e42032e094dba13ae9d95dbaef8410ad talk:fw:quiet@600
-66579a68c3fddbc24a953cb8909a7227fff73b1cab70bbf503358873bca82df1 tabs:bell@1234
-69107dbc33e72516ff36168ef0f7cb7bde7632068eb14a752af5d88d11063dcf ota:restart@0
-69107dbc33e72516ff36168ef0f7cb7bde7632068eb14a752af5d88d11063dcf ota:restart@1234
-69107dbc33e72516ff36168ef0f7cb7bde7632068eb14a752af5d88d11063dcf ota:restart@2500
-69107dbc33e72516ff36168ef0f7cb7bde7632068eb14a752af5d88d11063dcf ota:restart@5000
-69107dbc33e72516ff36168ef0f7cb7bde7632068eb14a752af5d88d11063dcf ota:restart@600
-694af36e1fea1d6a92bd6372373d58ece3895709b22a58d3db08c81da6a295ac tabp:3@600
-6a9effd76f8447164edfc24ab6e41725955e31adb00bea5ff7c1448fece4be17 recap:desk:scroll@2500
-6bded6e3e47c724637c2963c86f4fae1284b683c8c4dd1f956ae3e73ae0180f3 talk:be:send@600
-6d54d284f7832a059e85ebdf0b161af736687d0f198f4326d09385315f32f3a3 tabp:1@2500
-6d7d807bf4f5756023fb3962ea15bf914ffed6cb6054ce0d70d8a541c8558293 ota:0@0
-6d7d807bf4f5756023fb3962ea15bf914ffed6cb6054ce0d70d8a541c8558293 ota:0@1234
-6d7d807bf4f5756023fb3962ea15bf914ffed6cb6054ce0d70d8a541c8558293 ota:0@2500
-6d7d807bf4f5756023fb3962ea15bf914ffed6cb6054ce0d70d8a541c8558293 ota:0@5000
-6d7d807bf4f5756023fb3962ea15bf914ffed6cb6054ce0d70d8a541c8558293 ota:0@600
-6e6561bc108154e432b174500a4f12dd15f3d0cf1b8cb5b189f871364a3a0664 tabs:0+2@1234
-7088075ed5c73a9afd147db0892c53fb6b143ccab61f6c61b23b5e27f13158ae agent:kilo@1234
-7088075ed5c73a9afd147db0892c53fb6b143ccab61f6c61b23b5e27f13158ae recap:kilo@1234
-717070f904e13add019cc59597061651196570c4dbaaa4b578f0f08deb6267c2 recap:docs@0
-719ef437f09974a49a73b05aabad7ad83516afebaf4efaf2a5564be9d0985741 agent:fw@0
-73a3af3fc9f0b1266d9ca45a1db252d8c94dec7f90c49cccee97311b8f9a4470 talk:be:send@5000
-75c1fc066ad76ba329169086137488fc8d138d97b32fa5f113b327de45538f88 tabs@600
-76af0e5ce4ff6a9113d329a9c9bbc99f60fc44405b98bfe1ff45599927805dec recent@2500
-793964e37eb10d766e1219925da8dc5a4c8d84c8c1e751d91314b9c314f9db15 tabp:1@1234
-7c76032996ff15821c4481134346de6f20d6500f6c6de86f618ae3ea0196d268 chrome:talk@600
-7c838bf6964f1742cea1786e93460d03938c5e3fe3a25ca3262397dc79470b9e recent@0
-7f753c537ea82b157937556f506ac123c122b24d6c545f5460aadba38fa7dfbd talk:fw@600
-81d694aa289c8fcf7496cc35fe47d1f3b0b76efff529913c8854825ebe7b6677 talk:fw:quiet@1234
-830518a6f687cef420fca84692b68d84ac9797f730e77e281322dd750228cca8 tabs:bell@0
-85a22133ad4110e39c3f1311725988a867a83b784bc7da68a6d07abcdf9ed15c talk:fw@2500
-89bf9c8c68b93e128a4290c5b19c34e46c0e05e1eecf894941a5bff8f6e38e01 agent:cli@1234
-8b0648c4da0c03b54131d6e2412945c5da76b1a0d2fb2510e15ab994413a8ebb talk:fw:send@2500
-8ba76237cf61eca63c8e120874a88c1c2e9a4f0f233ac7631790b8366c0c1240 agent:cli:banner@5000
-928bf3b463e102702547b6e57d2bd5fa43d3e3d073f006b3ff94d4e8582f5640 tabp:1@5000
-9370901b650e27ee857a31170e49d98a958e84622389e576382db9f991789889 tabs:2+2@5000
-9371c72946fe6a3f29f0d8ccd7cdd6f470fa5425b30c3e66c7a267bc9bff12f2 recap:desk:testfail@2500
-94b919c27b92711272c5673b7cde03f59590f99c775809723e2407677e49a571 recap:docs@600
-955a3670b25854193856c6583113d67f52ba9db964241bc3d080f4692b9bdaa4 tabs:banner@1234
-958b69337a15e9a6b892c3afec04efafe863f223d2480a68cb631bd1b3c3d163 tabs:0+2@600
-971944f447eb60563b4216f3b7bcaa35b95f2a991bed01f4c352614aef6ee97d agent:fw:long@0
-9730c7277d3839e0fc7aee493ea430031314fdbe0a58a5ffcff6d9ac74896c0e agent:cli@2500
-9a4802ee44d418e958c1ef58bf386322b62cfb86665ab1a46212211d0323415a tabp:1@600
-9adbd3d6b13e3dd1834f518de0fc9a1dcc7550c147ad2e5e93dafc99276dd944 agent:fw:long@2500
-a00fd0347c7f558a8697ceb4d1a2c4841db217b229a946a3d8aeb53076f1c179 tabs:mock@2500
-a1190cef96a79c0f0eba574e8808c87623959a7aee87901c793936ac83e47cc8 talk:be:send@2500
-a2136e582b28dc308b0bad2832b0af1ceaf18ab2f2bca1bcbb0f05bfda9adb2f agent:be:offline@5000
-a5a3ba7289620535847ee36c35aa0cd24dfa47eb2f7f2b9f85b5fe37548e94e8 agent:cli:long@1234
-ab90b64b969b78258f1f5ebbfb34cad7c56e0a6daf6d8c72414135d317d6084a tabs@1234
-acea83cc3ae5007826ee0bb6bb8d7e958f6e5d1a905d169c61031356c4bdf7dc inbox:quiet@600
-ae3f730bbba0adcf41803c8911a65e4fb6b0f651da6c4ed8c2326eb08d2ddf6a inbox:quiet@2500
-af55dc886f911273bbd131fe10ed7a9e9566e4a29b9cc8400856d3354b2122f5 recap:desk:scroll@1234
-b14de170e131f04d739d20c643f76c5046b319698fde0e03166ba2f5c6255f7b inbox:quiet@1234
-b200b8216ec27719b0cbbaf88e5bab46162bdc4446e5762b4f04155557470de6 inbox:failed@0
-b200b8216ec27719b0cbbaf88e5bab46162bdc4446e5762b4f04155557470de6 inbox@0
-b310f0676d5f56cb25910aa5625b823b45b9485c91f586356f3e009bc61fcb63 agent:cli:long@5000
-b4d9d5371a577da4ae14024109c0472150751f4e563f17715ed4f02c0d99f5d6 tabp:3@0
-b7a0e71cb70962c859f98f65b0aed96e4b96238a5d9f6a10a66daf5cb588b297 talk:fw:send@600
-b7f18764847334688b8f189bb61db5361494d825a59f0812614ff2d423a246f6 recap:desk:banner@0
-ba46d8e44bbb15fc2accd5fc2098866fb02610662cc28d134ca995515c63509b tabp:3@2500
-bbab8604bec530ee16015531f2a245fdcbf4acb2c0f6639710764b3e540f3d30 recap:desk:banner@600
-beffbfbcd7b66093301313a5a3dac419d0705294e495f1285d5c29effb6de358 tabs:2+2@2500
-bf85d6f30bbcc949b6142b57e10621d0947292b85581484167c6709820b74712 tabp:8@5000
-c2639e5390a3350205c209ded74a94b5f72b2e64265a6d1cb316222a4b0087f7 tabs:banner@600
-c2a7fbe2bf659782cb74ecf325fa8e44861c31f7dca81b08264dbd0b470340c7 agent:fw@2500
-c3e806f74569ea373b0d8fbe93fe92ee70bf4c7bca31ee27a6bb254bc6bc84cf tabs:banner@0
-c6732ac1364acf53de48d0615250c99f9a192398a0e46cd5c191984a056b8595 tabs:0+2@5000
-c6eb655a3123eb6f00aa3735ec6c54fab29b7b77bf7bc373cad25b9393c79e5a tabs:banner@2500
-c7aab1d5c2763eec5963ad5edaed57a727bd3e58ee483194f248b867b422139f tabs:2+2@600
-c93dd515454ad71020be7fe838b7c7b6048f957b7d8b8c8947e51fdcf09a2956 agent:cli:banner@0
-c94790f0c41fda0a5a91271089a0c37f43caa14686c4b81ce811dc31249a6127 agent:cli:long@0
-ca8869b94e7606f0d8c623f23302770f8d71515ed62ec88b5e052bc23c9a5ef4 chrome:talk@1234
-cb9dedaefeeff648af9cf16ad35a743724acf4b8c5119f919eebb634ddb2c24f agent:be:offline@1234
-ce63c84cfb7a088124b3aa5cb281122ff72f530218f8c7ab7b18bf28ae4b6145 agent:fw:banner@1234
-cfeeb8a9278895e1c53ec729261fd416a9ded8f706ae4128c3029e02a18b6b60 inbox:failed@600
-cfeeb8a9278895e1c53ec729261fd416a9ded8f706ae4128c3029e02a18b6b60 inbox@600
-d20497fffd7985ce06ab251eec699317bd9214afc6df8d37b63a0623d38bc2ff recap:docs@2500
-d208224cbbfc30035a5e2b42bf55b668478a1eba32aac2afc20825fa3b9ba2bb recap:desk:scroll@600
-d2a8ee30df83b1d4066e963593830f29ae008599810527bfa7226427098dc653 talk:cur@0
-d2b1f66043dcd560458964ae91daaf811395146b768a7a7f1c4b684133b08c72 recap:desk:extreme@600
-d57b4dc7af87ceca4bec7f6a5f23a76c03d7facbb8ae91d8a7ae4255b92a2b01 agent:cli:banner@600
-d5d6e83eb76e529e3fde830d7e8be6d5af83b8d7c5a33e81cbe32fbb9b1b20ed talk:fw@0
-d6da075110cb8e7c04325824b3aa9428fcf8c1eeedfcdc386be81c909baf0623 tabs:0+2@0
-d9423088cc0bc3c8078254e3b3009f83bc87baaa4ecf20644370e90c4d11cfdb tabp:1@0
-da4c86a85697e330b8b05354d5f7ad6c8cff1dcacd7d7e515357f6d5f17a938f agent:kilo@0
-da4c86a85697e330b8b05354d5f7ad6c8cff1dcacd7d7e515357f6d5f17a938f recap:kilo@0
-da6e1a46d6738459bde7f0d852adfef6d37a06a2cbd01c2814eb7a2758dd0320 tabp:3@1234
-daf4795da56e2209a685881ca2a7e02498b24e492e493262bbca73ac95f345ae agent:be:offline@0
-db7125bbadec23d858d63234291a19f4d1d5ada5305b4094c99732e49261448c chrome@0
-dd276a1e2ef9955a570867b3f91ab1dbfe325a3f5d1e293296cf0f34a7e8218b agent:desk@1234
-dd276a1e2ef9955a570867b3f91ab1dbfe325a3f5d1e293296cf0f34a7e8218b recap:desk@1234
-ddf00042bd684fd85a449ddf51c9f3ecd0593307c7b2486c9160a74061eaf9cc tabs:bell@2500
-df745bd923fc1e2533c43fa4ca8b48cb53cc053166a590a9b2259f3942266846 tabp:8@2500
-e1d275ac0976bbdbd0910809fcae0bb71a5cce63af4ba8bca10158cd489cb9d8 agent:fw:banner@600
-e476bafbadf3ea6225eb2e6cc0a4494170409ed33878ca579fc915fc165f1166 inbox:quiet@5000
-e546c53da411146ce5418faf060434a57495464985007328324c3e065246e27c agent:cli:long@600
-e61c1d4d297418e2811ec16c999bc23183e7c6cdce36c734119e75a3e26af5ef recap:desk:extreme@0
-e675e1370cf581201a22ec418549e9a7237c269ee8a4ce81ad6e048f89dbf668 talk:fw@1234
-e71ab6901fa5460c5565c3a23daa5be1cd8325479a79052385a2ac529810cc12 tabs:2+2@1234
-e754357511920a0cbb4f4faee1a736e722160cc27066bbdb36f57bd63eb02032 agent:fw:long@1234
-e8cb44e7cf843e63d9e5c1ba9dcb224d7e4171de7f49864cf26cbedb90685ce4 tabs:mock@600
-ea8f40908340978eb0db4fc65c8acdd6e83ac7ffe64883a65125904b1c3db42f chrome@600
-ebea5f390f1c370d895b1a30fbe5ab806095e30c84efc0ac7d312930f33520c3 chrome:talk@5000
-ecc05fbbbe8a901d72591d9d19cd9b59e3668fd4d95c7138ee0c896782f2d30e recent@1234
-ee28ab7c02085783af52e0d0493173df14fdf09485d42efe666b8bf7cf880c3e tabp:8@1234
-effd37698723a18a6d5da38fbbe57014aa6311d38958bc85d3759bab51b86a22 agent:fw:long@600
-f20329ee8dda6d89ecb742352a0d56703e80e6e6cd3fbe2154064de89c747019 agent:fw:banner@2500
-f46e9350b38fb0de14f0b02227b1a40773a2eef234de62fc74b0e3b7f7811063 tabs@5000
-f5b97fa121224c41c2fb8301d47c9f25c1d4e9916d53e6e0ceedc16aa453f274 agent:fw:banner@5000
-f8fa6ce5df714772a16da7f3e09fb234e81d856c550fe411161cd938c925280b recap:desk:banner@2500
-fb7f76dd9b6e4470cb8291e71070d1678bf826d8c836348576c760bfd5526e1d talk:be:send@0
-fbafe64303889070db9fb146fbe493eefdbb373e5b06777b7693ef5abe970ac8 recap:desk:scroll@5000
-fc8605e41b110a3f828ec7fdd50b7f6563477451b633139ca148411c31c297ee agent:fw@600
-fd0444c2ec2dda602e2bcabae1fb9631fb2c9d410d46bc4c655223cb5de304d5 talk:fw:quiet@0
+018e4f3d21a05b2d8ae1a959b1d351c8e3d7349e8e0cda7ddaf3450b93065b9d chrome@2500
+06261d1df67f22b5e6ddc299079a3b1405c9a077fbc5a7db6a9ae7dd0fb8e81f recent@600
+079e669ebdfb98597af6ab4e5ea9ebbb4e1fddbaf98484df8a721b1d0f23df76 agent:be:offline@5000
+0ad62fc7831be4bac3c89a6d38b4057517651ecccdfa5ae9914e41fe2b92aa10 recent@1234
+0b3758ad1519b07db99ade2fdac09791af79688bac8ae16d55383f0b9fb768ee recap:desk:scroll@5000
+0d5e0c5516f80f8f6e9098628766517a28e52d3b64d9668132c6c61180f2f39e talk:cur@5000
+0f81659fcd4957bc0982e5cb5d583ed7ac817e0827d823cf8d9bb95556379054 chrome@600
+1363a3930a98d572429097118bc0c4ea4cb486659c964b95d944f81a5fc89a2c inbox:quiet@2500
+13baca555d73a1dd1f3f6c6a80b9c8a1cf69f29c0ac35e3165fa94fd003ecd41 recap:docs@2500
+142b7284446a07a4a04ebee9498387e8a702bc5ce657325edad5babf349e05bf agent:be:offline@0
+176a8871b8ee9c75d0fb84b3c17643e86636fb7eaee02f00396f6d36f4a0fa48 recap:desk:testfail@2500
+1a4deaefd82c22525dc813eaf8d8ad08b988bad6498d49a3383c1c2a09714bee agent:cli@1234
+1b00dbd17f43d116e9d002d2649da87fc06f22f61ce9af7d38e0bb868375d8b6 recap:docs@5000
+1ce71df5a0f3c169b19e2ab849096ba88998135bab2fda7fe318f6f2c672cb69 tabp:1@0
+1f317f161feb6e182f405640bcd573f95fa208f2308292b12d6207cdef329732 agent:desk@1234
+1f317f161feb6e182f405640bcd573f95fa208f2308292b12d6207cdef329732 recap:desk@1234
+240294586074a949c1c1baaa40e8ce76f6cd30c682ba474515b3c79d934813db inbox:quiet@600
+265d997e6c22445cd12e343cb3f466cca71941e59930cdc9b19f94f6414ccc61 tabp:1@5000
+26c0d2eb23feeeaebeb519031bb163ff48a5b7a1fdbb25b783115554c6d05d1c agent:fw:long@5000
+26d72eba597fbd896cb72936428a93f01ae24b082e0ddef3bd9eabf94b7b9813 chrome@5000
+2867f5f9b6525e0e8315d5b986d50f93c87c0e26fb169ecd9bcb85a243513428 tabs:banner@0
+2b104baf0675a063c069838e6fdfb095472c4c273f83c3d824842cd501f22e23 tabs:2+2@2500
+2b7e71f5c25ad536b461fd3cfaa5b126d28cfe20b485d0d4b5ef9e5d355ce399 tabs:bell@5000
+2c8fe616c5acf370b6e5211e28d73514c57ed054936d75405be6d7fba67fbf75 agent:fw@5000
+2d10cbf64d14c4b54133e4697435cee381d15b99bdc2274c52122f62557857b9 inbox:failed@2500
+2d10cbf64d14c4b54133e4697435cee381d15b99bdc2274c52122f62557857b9 inbox@2500
+2d2c09b8a80417bc4220f5d2dafbc89c5bf11ce34fe42a5db2766363ef2ce0b7 agent:cli:long@2500
+2f7f6b4256a44149b9e0c3b65f903d9be8e0a1b297fa9a1809223e0f6c24c7b3 recap:docs@600
+2fba1436b8e47d7946a133ef34efbba305b90fff63555f3acd18d2b215edfc6d agent:kilo@1234
+2fba1436b8e47d7946a133ef34efbba305b90fff63555f3acd18d2b215edfc6d recap:kilo@1234
+31499ee36f196c3f72dd6f1a7c7cae0652e3f4c7b04ac9ceb8165d4ca0581cc0 tabs:banner@600
+364ce4e5df68c7cb35910e50359f62136906258a7d662ad8a38b4db1003ba088 agent:desk@2500
+364ce4e5df68c7cb35910e50359f62136906258a7d662ad8a38b4db1003ba088 recap:desk@2500
+3660fde6334900b6c25f20f13eed3604c3b6e971fdf657b7980bbe4673cfa1f5 talk:be:send@1234
+36d1062fff870a24e120dee87f925283f7e9795b8add536cf5b437ef635ec1e3 recap:desk:scroll@2500
+375a682b9706b9c1e3dbe616d04a0bcc1dfded1e8e8c06ffc6e69fe6cae5f4e5 chrome:talk@1234
+38c7a589d2f7d4e75261b138628573fe361d5edd08b5d5f681967430fb6f46a2 ota:62@0
+38c7a589d2f7d4e75261b138628573fe361d5edd08b5d5f681967430fb6f46a2 ota:62@1234
+38c7a589d2f7d4e75261b138628573fe361d5edd08b5d5f681967430fb6f46a2 ota:62@2500
+38c7a589d2f7d4e75261b138628573fe361d5edd08b5d5f681967430fb6f46a2 ota:62@5000
+38c7a589d2f7d4e75261b138628573fe361d5edd08b5d5f681967430fb6f46a2 ota:62@600
+3a221ad10c8eef93440efee217e6ce6d16d842fa6f763ed14fcc3439741703fb agent:fw@1234
+3aa6739259f4ceb2bdff54ac443d4917269fa93921fef7ee97fb9b62d9b1ba5f talk:cur@1234
+400986827a14646fc67fdd5d2c460a415fcb2f997eff299f531cc57a511cdf0f recap:docs@1234
+402913f1e22ad1d477fa6fc876daf68f3dbda61df5b1eb6463e5cb966f18e831 tabs:mock@600
+4102d10b7f8b6a9ac4ee4c6002cbf5d5831f74e8531a0feef1f1febb54b81439 tabp:3@0
+410366838aad6259e3778100afe457b68c4e7e63d5b439178967d81b150c7386 recap:desk:extreme@600
+420057a033a9982b40a72ed92444b1495127fa258f5b7057b018e389913fa20f tabp:3@2500
+422de852bc519195db46aaedd830201afdc025ca46fc81083a40b88ec914969d talk:fw:quiet@0
+42ab7c218a6a80ea84401a814aa9d98308f731d140ec3ead7badc5b41f82cf25 chrome:talk@600
+43391b2d7a3652679c06de167b40235bd1df39635a474e2cbc476c7641dc5ec9 agent:cli:banner@0
+43c34f3a84f3ee2ae3524546c04db38e742fef237b25183c7cd8ccaf6c9dac71 tabs:bell@600
+44b69e2aadac2da709980c6bff34b8c7d509d0a34aceb44bf4e3324c991a0321 tabs:banner@5000
+451a900ca256b3eeb62628a9c12ca89d6fa352f69e2030ad6699a3e0d43bcac4 recap:desk:scroll@1234
+454c372483809a8a62e3c1eecd22ab2f6bd5114854df1a9d5f6a9717e11eee98 tabp:3@600
+4ca4869c0e52c860e5c7157a8c0714ea71c57dce7739632655c15f2268ac84c0 tabs:2+2@600
+4fb75fc852dde72f6d5d0e800b6e7093ba1f053f9902a731cb6203adff998879 tabs:2+2@5000
+5142846cbc6ddbba23e16463fef13944e389f6edbb343ecd95e7e0348542b2e3 talk:fw:send@1234
+54eaf01a0c077ba9952f00ed817e32187421f404ca04bee67dfc53d376cdfdf4 tabs@5000
+55a0740a0d0f29edd60b567980d0361b122b147d14f5fa3c910e9ec74a949aa0 tabs:0+2@5000
+567ae514fe82f574a9dab158972bfe61dcd6019e2af346fb1ce55fee13bd376c agent:fw@0
+57a714838efed2e246c9b1e9b2bbba1bbbd1f57c10329e05b7e3a1ec329a3775 tabs:2+2@1234
+5cfcf34a09c1bd4636e2104515bc0c56365c1412dd3ee1baf4d4b52ace3c0642 inbox:quiet@1234
+5e2a60c5840ef23516e5ab8c7e479160c6e1a2ea7b8293bbc6165e052040f63a recap:desk:banner@600
+5e2a6a794af8ce554937b5dd5748a409436278eb7e054bfd0b25d7adf5b5f519 recap:desk:banner@1234
+631469c9dc888f2d86ab3ac327965ba9736efe958cde1a67748fdece92cdc13a agent:cli@2500
+634132bc0f887eddf6bde4415ab8fb1214b09a3d7ea7a24e6467ccd25fce36cd tabs@600
+64a27174c6cf3a587210f397f4d16c400ca5a63fcd5d2434ae10b434057d0f42 recap:desk:extreme@0
+661cf2f2a5855e79c62a333f29e37baccc1b71e44c2c6ae087cf01493e8e70c7 tabp:8@0
+66613e8f57ffa2d5acd8bb5729ba16b5afb310aeded2cf674001b89707b5163f tabs:0+2@2500
+69dda2318994e34bdb2a490c037954c392161e16dfed920e8643c06c08621f86 tabs@1234
+6c1c711683532f2bb00a8182fad4498101fd452b115a0b35d193d1a5c268a97c talk:cur@0
+6e4403780e7a08e9ec2f600e4b1a5a4deb1fccc20b65f98d94c419b6bd8561a8 talk:fw@0
+6e909480afe030eba65a532a4f9787b5e59b16cab4d818ce819aa1bfb4b92acb chrome@0
+6ed3aa4db78e1d960acbafa34ed4fcf4fd39730295d5f44506d3693463ea5695 tabs:mock@5000
+70f5eaeb3e754c9aa432f7df96680994e4f8fdd720f1788beb9e41930effff8c talk:cur@600
+7167b8addafc493af9b2e53fb3da4efeac77193e0a09b29bace60de5028a8c82 tabp:1@600
+75499592f9910b9737490244ba619464ff933399b5254e96b64580f811ed0c78 agent:fw:long@0
+76df3f707413204f2d42d35bbf3bba946c996ec0d1e2ba9fc7565f7b16c61f88 agent:desk@600
+76df3f707413204f2d42d35bbf3bba946c996ec0d1e2ba9fc7565f7b16c61f88 recap:desk@600
+76fc36c13a0e13ba9afd419f781aab62e89d253d3becf5adf7a3cab046235e27 chrome@1234
+7832ec017653c031bf6bbd8f67ef326d3c04fe509aec04b187ca3bb63f252236 tabp:1@2500
+79ebf5512ed3bada472ed24d82a33cbc35e35cc5aea1bb6f80357cfaf4618515 talk:fw:quiet@600
+7ad23c01dee6ba922e2883868c24e423c148d2c035ad1ad0b49cdbd2d8403526 recap:desk:testfail@1234
+7ad9b64cfb5e41613eef90507eb189dba04e1dbd9c80dbf553236e3a8fb8665e inbox:failed@0
+7ad9b64cfb5e41613eef90507eb189dba04e1dbd9c80dbf553236e3a8fb8665e inbox@0
+7bd0850064d7ed7c25db8ce2a717485845282bc72b7be62db5ba4df714b2eaa7 talk:fw:send@5000
+7c79d0ec6eb0189710a2ac130c45a2d24e46d7f719d0abb1cf3e526b3fb19aba recap:desk:scroll@600
+7cd08c4a413ac8e0c19ca0b5bcf51e7487dc55e88c76d58a569fe34b572edc39 agent:fw@2500
+7fbad1de09cde08d2f53b1d06e1e8e88fefdaf6bb6c24328885e6f2e536d298f tabp:3@1234
+80fe167de97ecb73c451c2c87726d3234486557de90e27a6e5007931eed4c937 agent:kilo@2500
+80fe167de97ecb73c451c2c87726d3234486557de90e27a6e5007931eed4c937 recap:kilo@2500
+81635561f6e8787c38dcc4523309c72dfd5643aff1062a58fc7f67a798f08fd1 agent:cli:banner@1234
+82269ef5ef066ce9d921108c2eb35ec6bfe64dcc57f16f37eb5062b9bc734e84 talk:be:send@600
+858bf7f0339377cb8d0f2c4244f75145c1bbfea28d47260a390384f8750d89ed talk:cur@2500
+894601455683a35a38b47ebacb1984f2f63e7f493e0c9bf13f2e0e8ecfb4056f talk:be:send@0
+8998e04a7a3799ee334b66a37989d77b8bc351164fcb34cd38b64fa15eb33f15 talk:be:send@2500
+8ea3cff095246609b6d505b7a23e888c8bdfa6bea226360ef6acea53c7cb5ab4 recap:desk:extreme@2500
+8ecaf997c5a2829df8815da7a767d06f80a2b4bca0429b96915d782edd83bac1 ota:100@0
+8ecaf997c5a2829df8815da7a767d06f80a2b4bca0429b96915d782edd83bac1 ota:100@1234
+8ecaf997c5a2829df8815da7a767d06f80a2b4bca0429b96915d782edd83bac1 ota:100@2500
+8ecaf997c5a2829df8815da7a767d06f80a2b4bca0429b96915d782edd83bac1 ota:100@5000
+8ecaf997c5a2829df8815da7a767d06f80a2b4bca0429b96915d782edd83bac1 ota:100@600
+91682cb091f74b1d8b3deaf9d4629dc00b040a349147ab9271e5b35bbd09f9ac talk:fw@5000
+92abc30631005b8dc13361e5dc32119f1b4407d082f4155fca4de109aeef959d tabp:8@2500
+92cd96aac5911e1c8fc96154f942d5ddb2f44e767090e376630c30c0142d1e88 agent:fw:long@1234
+92f7b3d2ab443b50259b783044e786621d5a491a89bd4c08540692e71c8add6a tabs:mock@2500
+95189942e2cd0236c2a61fb1026677e7adec2c9305290598ad5f21801c865fc2 agent:kilo@600
+95189942e2cd0236c2a61fb1026677e7adec2c9305290598ad5f21801c865fc2 recap:kilo@600
+96bb2e2dc0bd6da27bcb7f480810cfb726e492289c48ddc6737db6ce9167b347 agent:be:offline@1234
+991e704dbdd4ec1fff2e5be7c6355b480056f28c72f93f452446f9b6a9c14b9b chrome:talk@0
+9a1fc0d84bc39a3e08c9d30b07557b71545b2949671be51e1e50dafd4b78a0eb agent:be:offline@600
+9b7028bb2c32c2d5522fdb9630d376c322a67f7f4f18c9700e86100041d5a2fe tabs:bell@1234
+9d28e969028ed1cf7bc6d62b188cc282cd310b0c8f2175aa31bcc8aae76f903a talk:fw:send@600
+9d54a0ac955e36e634767f44a8a0b3019ab295b60717515d780faab8109f28b0 recap:desk:extreme@5000
+9e03dd007813b084bd2362537ffc2eba90ef0f8f368c849f9e3092fcf1643835 inbox:failed@600
+9e03dd007813b084bd2362537ffc2eba90ef0f8f368c849f9e3092fcf1643835 inbox@600
+9e82cacdcf9a98f75584c68de8aa5577ff784cd4d4d139109f0a696434f70c80 talk:fw@1234
+9ea799d36fa95b9ecdd2071fa3561dd56f167281cf17afbbef8bc7d2f275ac00 inbox:quiet@0
+9f4a511b671eb16bae0ef4841f37ef181b730e78f3296a8da2cb60ef1d440de9 inbox:failed@1234
+9f4a511b671eb16bae0ef4841f37ef181b730e78f3296a8da2cb60ef1d440de9 inbox@1234
+a0a8282556765c5c33d24ac07f3410829ecb83f29339a6139357a704199e8084 tabs:mock@1234
+a2781c27c9443acca417a4ef6f14be3123c8dd57f5596b402ba6c09326114b7a tabs@0
+a34cb679892aca587c2b3616dbf292fb1fb4ae202f6b04ffa0cd6f983e39043e agent:fw@600
+a48c1826425612368556cc4816ab7bcdb72cd0aff5cc796161b05f384fffeceb agent:cli:long@600
+a4cbdc82c5847ca6d80c40811f205e5d7fc8c22c48e836fbd4bce5cff228f93c recap:desk:testfail@5000
+a5310ad382b12d5dab86bff0229a50cf8c6d8cdfa872cea3ef386a4fefc05e33 talk:fw@2500
+a75fe7d9a0911c555d247046308a5f35819eb20ff24db35d7ce40ab9c15e51c0 talk:fw:send@2500
+a7a35131033d53c32e42154fcdd167b804b419d6cbb3de4cdc7dc6b111a94a8b tabp:1@1234
+a7c053cc12a265d3774bcaf894e1525af20d3bb387f277cb2c7d2ff251cf6f5c tabs:mock@0
+aba7c84757a8b376e0ace5bcbff5904671a4d68d0f8d86ef62276334f6e49316 tabs:2+2@0
+abdbb6f4921ceed0fafa7b7bfab734e729eb5f883de93d828504956fec1d4016 recap:desk:banner@5000
+acbe185c6eb8e2bfe817fda3ddcd689b31c1aaa0b727d4d3752427f6e1f18896 talk:fw@600
+ad3cd3d0408914283bf257bb61b5ea55c997a03aaa513128b76e47fc640ad022 talk:be:send@5000
+ae98cc3c91886e476ab36f7b30ee0246f0fb3e1d8aa7127d7276f25c4971bf49 agent:fw:banner@2500
+b11d5e7973404c87721679a0048cf9121f882ced65cf20371803889f26559787 recent@2500
+b1911a013541fa29b4ff3cfb6998391c8043b3d955ed2534ba1e64cb5354e223 tabs:banner@1234
+b2b76476e75b5f4fe3d0682da7183e1cd03d6c953fd69b08aab058d9565a76ba chrome:talk@2500
+b62e83137347876bcce03574f1e48156914d5fe48eeeab57418d0c469d48da30 recap:desk:scroll@0
+b649c76893a7dff87e7f51bad05ba7c2703c22b51a25328f888bfe558a1fd078 agent:cli:long@5000
+b65aef150e4f9b2aa685003e0af83f2a571e1d11c42408e9e0daf0f25f9a5d6d talk:fw:quiet@2500
+bc04cfee1ba439417a94a98adbf0a1dac363c835c18318fd9dd067dd4e7a60a1 agent:cli@600
+bc5c94b3549b160543e7bf1888e51a9130f91387c2b0973d02655bb0bd817e47 agent:fw:long@2500
+bd9224690b09c5c7b8dd1c42f3cbc25b2c841fb70f24d5051b57f4ebc51f90d4 tabs:0+2@0
+bf15804dfcaf3503fe6b7de499935a68a7c533d384e7f5cada5d5715e7307d6c recap:desk:extreme@1234
+c245120c2baf5de2d44806a390599eb55a3174a78f5a46c8697ea3a993d32c70 recap:desk:testfail@0
+c26f57bb75f6a204c4d73c54d00d0b0b71c5d7f244fa38e281bc9302bc3865ef inbox:failed@5000
+c26f57bb75f6a204c4d73c54d00d0b0b71c5d7f244fa38e281bc9302bc3865ef inbox@5000
+c3daf76603c1db2d0d5cec636f9d124aeb5b5b7e442c0e9cb72f87e79a828b5b recent@0
+c5e5a1e5a88c76147d2609caeec87bb9cbcf93034273c42a8efc8fb81c6ec025 talk:fw:send@0
+c61ecf5c4f88b01bcaa038eb1220ff14db0b3dd015a7eedcfae109d49e327505 tabs:0+2@600
+c6491c1f813b7aa08d07fbe6f9d136111e6d3b9f6ecaa8ae064b2f6624b81a01 agent:cli:banner@5000
+c6f8a7627ac6bb526f61a2835cf3f5a86b5832b716609b96342590b76ffa5eb3 recap:desk:banner@2500
+ca187e592c7ee17c5594143ae688689a14bf27b70aa9d4662fb059e6e8d53412 ota:restart@0
+ca187e592c7ee17c5594143ae688689a14bf27b70aa9d4662fb059e6e8d53412 ota:restart@1234
+ca187e592c7ee17c5594143ae688689a14bf27b70aa9d4662fb059e6e8d53412 ota:restart@2500
+ca187e592c7ee17c5594143ae688689a14bf27b70aa9d4662fb059e6e8d53412 ota:restart@5000
+ca187e592c7ee17c5594143ae688689a14bf27b70aa9d4662fb059e6e8d53412 ota:restart@600
+cdf1ef61a9101a1a9e6f885231e18cb7645fe5e18c8846cd5ab9e41cd7ff57c1 agent:fw:banner@1234
+cdff5beae4cdb0d244feb157b3c966b62d5692f4b572c2972586221874b55b8a tabs:bell@0
+cf13952da712279b20b6693103359416d4bcf08d0cefad0374d648105a684a6b tabp:8@1234
+cf43c1a3f9297cdd9edc10fd746421c78ed4e31d88d8ae0262634aede0aad1b6 ota:0@0
+cf43c1a3f9297cdd9edc10fd746421c78ed4e31d88d8ae0262634aede0aad1b6 ota:0@1234
+cf43c1a3f9297cdd9edc10fd746421c78ed4e31d88d8ae0262634aede0aad1b6 ota:0@2500
+cf43c1a3f9297cdd9edc10fd746421c78ed4e31d88d8ae0262634aede0aad1b6 ota:0@5000
+cf43c1a3f9297cdd9edc10fd746421c78ed4e31d88d8ae0262634aede0aad1b6 ota:0@600
+d4331793af611b9819f8aca4820d2094e9f4d5f31681e1c5d21e272501dcf44e tabp:3@5000
+d460f8d257a198525ca542f01af1d035750f954b0a6353300e39c3bbfd34511f agent:fw:long@600
+d4ad0137c750685a01d76c2e416dc52db85c91f6c834c4800fc88b29689c28bf recap:desk:banner@0
+d4ad55c0ccbbf57bb196b8b1219c2abdb71d71ed7342b207c97361e58a1ddb57 agent:fw:banner@5000
+d56cd0ebc017537874331ded568713c73e64250714c40c75bd04ff6b48b905bc agent:fw:banner@600
+d603b3ad456d1b264b596cba66e75cb3a6c130a2743b39c9fec72c32b52c3898 agent:cli:banner@2500
+d73c4f16af2b14cd8181daa0ac01e4324993aacdaf10a7b560d0a220c421e559 recap:desk:testfail@600
+d855fed8890dce4a80dddfebcf1f44dcc8eb884c9c1a0111b58828dcb0a720a8 agent:kilo@0
+d855fed8890dce4a80dddfebcf1f44dcc8eb884c9c1a0111b58828dcb0a720a8 recap:kilo@0
+d9aa539aad0a8ca47f5edddd8e1cbc176e71b3d2706e5fba445bde8dcb955629 talk:fw:quiet@5000
+d9b6ab73fe45d366af1daf1133a569d0a15c800dfd1c1a59c0e05b6fda9fa0cd agent:kilo@5000
+d9b6ab73fe45d366af1daf1133a569d0a15c800dfd1c1a59c0e05b6fda9fa0cd recap:kilo@5000
+dc5af655007426026977e693f4a4c1f00c96d655324feffd4f6e70255b452904 tabs:bell@2500
+e00444c8087dd18dc79c0c36e38e7f3d2701eaf198f0d00730a2a4c7138fda8c inbox:quiet@5000
+e1a43f8f08ae4a39b926af815979a1b061e9b2fbde9d616533ff209af9386a33 agent:cli:long@1234
+e25963e122793605c7aeed7bf3f8b11330a2e5f4fb8cb7151a3e85ede4771e82 agent:cli@5000
+e33234655c2be278fc6c1f99446e28c90e3a3cdd0e0476b4e1a6e11ed7a90589 chrome:talk@5000
+e960f1e8e1dcaa695f2390b24004f3977f0c7dc4a9d2672e599cb4c64dc49faa tabp:8@600
+e9653f887894747da898c2e07b01c86a009fe8ebbe055d8664bb0cbc2d97a545 recent@5000
+ed3c265791c09188c1780ed9f034eaae2042884b242ea0b8809499a2fb5e6c3c agent:cli@0
+ede37878af6b44a793c7c6f8ad9f4e227abf5c2c0ecfc1388b6912b3f15d5309 agent:desk@0
+ede37878af6b44a793c7c6f8ad9f4e227abf5c2c0ecfc1388b6912b3f15d5309 recap:desk@0
+eebe493a4299c47298f60d4db95eddb229ab13d59128db77a69e1f91f71a7ab0 agent:cli:long@0
+eeec47ee739e56a88ec35ee65e758c04d8639805b994d5ca863e262608ff8a1e agent:cli:banner@600
+ef28730b6279fe36bf6c6d782b60af59aca452fdbea1d10a2e8295eb82d83b52 tabs:0+2@1234
+f039317d9f967a3977ff7563e3bb3cf5f1555a91d558298f3ab107aede7363b6 talk:fw:quiet@1234
+f1c6434e650e5ad6c1ec15a9e0faf4f2698a829eb0d395491c0bf73978832c44 tabp:8@5000
+f96c4771ccb38e155930d366cf5f4e3b9b2c453b4b134bb2e3e1c1701f4ce0db agent:fw:banner@0
+fa3af31b843e1abc26866541435b571ca906bcb332eb433eba175a4a21d71f60 tabs@2500
+fb9c44eac3ddf34bc324fe3ea0fdf1b6b2e95e25c7d8a43e28c56faac8725ada agent:desk@5000
+fb9c44eac3ddf34bc324fe3ea0fdf1b6b2e95e25c7d8a43e28c56faac8725ada recap:desk@5000
+fc4b059d0a88cf4bd488660fb7d8a7001b3488f0d6f462e6a9de630e61fd3a98 agent:be:offline@2500
+feacc1204ed6dc5d2bb563d058569c94de42051d83107e1d80b89701a0e870d9 recap:docs@0
+fed793b72cc662a0825cca5f70eebe574e97e7e543931c20ed9811f29a7cdfd6 tabs:banner@2500
diff --git a/devices/harness-pro/firmware/test/pod_render.c b/devices/harness-pro/firmware/test/pod_render.c
index 51062c386..2ebb5d64e 100644
--- a/devices/harness-pro/firmware/test/pod_render.c
+++ b/devices/harness-pro/firmware/test/pod_render.c
@@ -414,8 +414,6 @@ int main(int argc, char **argv)
cs_badge(&S, 520, 96, "cursor"); cs_badge(&S, 560, 96, "kilo");
cs_working_mark(&S, 28, 140, now);
cs_logo(&S, 100, 130, 36, "claude"); cs_logo(&S, 150, 130, 44, "codex");
- const char *const keys[] = {"hold", "\xe2\x86\x90 \xe2\x86\x92", "\xe2\x86\x91"}, *const labels[] = {"talk", "panes", "back"};
- cs_hints(&F, keys, labels, 3);
} else if (!strncmp(screen, "chrome", 6)) { // the status bar and the transport alone: chrome or chrome:talk
pod_status(&F, "Firmware", true, 0);
pod_transport(&F, strstr(screen, "talk") != NULL);
diff --git a/devices/harness-pro/firmware/test/run.sh b/devices/harness-pro/firmware/test/run.sh
index a9289ae67..d44e9391a 100755
--- a/devices/harness-pro/firmware/test/run.sh
+++ b/devices/harness-pro/firmware/test/run.sh
@@ -58,13 +58,13 @@ cc "${cflags[@]}" -o "$out/test_cs_views" "$here/test_cs_views.c" "${objs[@]}"
cc "${cflags[@]}" -o "$out/test_cs_glue" "$here/test_cs_glue.c" "${objs[@]}"
"$out/test_cs_glue"
-# Skins: the Console stub paints the whole canvas #08090A; pod_render --skin console is the entry the golden uses.
+# Skins: the Console stub paints the whole canvas CS_GROUND (#1B1E24); pod_render --skin console is the entry the golden uses.
cc "${cflags[@]}" -o "$out/pod_render" "$here/pod_render.c" "${objs[@]}"
"$out/pod_render" --skin console tabs "$out/console.ppm" >/dev/null
px="$(dd if="$out/console.ppm" bs=1 skip=$(( 15 + (690 * 720 + 10) * 3 )) count=3 2>/dev/null | od -An -tx1 | tr -d ' \n')"
-# #08090A through RGB565 and back to the PPM's 8 bits is 080808.
-[[ "$px" == "080808" ]] || { echo "run.sh: console pixel (10,690) is $px, want 080808 (#08090A in RGB565)" >&2; exit 1; }
-echo "console skin: pixel (10,690) = #08090A"
+# #1B1E24 through RGB565 and back to the PPM's 8 bits is 181c20.
+[[ "$px" == "181c20" ]] || { echo "run.sh: console pixel (10,690) is $px, want 181c20 (#1B1E24 in RGB565)" >&2; exit 1; }
+echo "console skin: pixel (10,690) = #1B1E24"
# Console render time: every screen within 85% of its pre-change host time (test_cs_perf.sh; opt-in: runs only with CS_PERF=1, since absolute host microseconds are flaky on CI machines).
bash "$here/test_cs_perf.sh"
diff --git a/devices/harness-pro/firmware/test/test_cs_glue.c b/devices/harness-pro/firmware/test/test_cs_glue.c
index b8495dfcd..10d50285b 100644
--- a/devices/harness-pro/firmware/test/test_cs_glue.c
+++ b/devices/harness-pro/firmware/test/test_cs_glue.c
@@ -6,6 +6,7 @@
#include <string.h>
#include "app/pod_glue.h"
+#include "pod/console/cs.h"
static int checks;
#define CHECK(c) do { if (!(c)) { fprintf(stderr, "FAIL line %d: %s\n", __LINE__, #c); abort(); } checks++; } while (0)
@@ -107,8 +108,9 @@ static void drift_cancels(void) {
t_(true, MID_X, MID_Y, 1000);
t_(true, MID_X, MID_Y + 30, 1200);
CHECK(pod_ui_tick(&U, 1500).fx == POD_FX_NONE && top()->view == POD_V_AGENT);
- t_(false, MID_X, MID_Y + 30, 1600);
- CHECK(top()->view == POD_V_AGENT);
+ t_(true, MID_X, MID_Y + 60, 1550);
+ t_(false, MID_X, MID_Y + 60, 1600);
+ CHECK(sc_events > 0 && top()->view == POD_V_AGENT); // the drag scrolls the host's pane, as on the round
// Recap: the same contact scrolls the host's pane, and no recording starts.
fresh(POD_SKIN_CONSOLE);
to_agent(0, 2);
@@ -118,7 +120,7 @@ static void drift_cancels(void) {
CHECK(pod_ui_tick(&U, 1500).fx == POD_FX_NONE);
t_(true, MID_X, MID_Y - 60, 1550);
t_(false, MID_X, MID_Y - 60, 1600);
- CHECK(sc_events == 0 && top()->view == POD_V_RECAP); // v3: Console's Recap does not scroll the host terminal
+ CHECK(sc_events > 0 && top()->view == POD_V_RECAP); // the host's pane scrolls; the summary itself does not
// A contact lifted before the deadline is a tap/no hold: a late tick does nothing.
fresh(POD_SKIN_CONSOLE);
to_agent(0, 0);
@@ -143,8 +145,9 @@ static void bar_swipe(pod_skin_t skin) {
(void)o;
if (skin == POD_SKIN_CLASSIC) { CHECK(U.nav.depth == depth); return; }
(void)depth;
- CHECK(U.nav.depth == 1 && top()->view == POD_V_TABS); // v3: home (Overview), and no crumb tap on top of it
+ CHECK(U.nav.depth == depth + 1 && top()->view == POD_V_INBOX); // the Inbox (notifications), and no crumb tap on top of it
// 79 px is not enough; mostly sideways is not a swipe-down (a crumb tap would pop however far its arg says).
+ act(POD_A_TABS, 0);
to_agent(0, 0);
render(1200);
CHECK(U.nav.depth == 3);
@@ -170,28 +173,18 @@ static void tab_gestures(pod_skin_t skin) {
CHECK(top()->view == POD_V_TAB && top()->tab == 1);
t_(true, 200, MID_Y, 2000); t_(true, 300, MID_Y, 2050); t_(false, 400, MID_Y, 2100);
CHECK(top()->tab == 0);
- // A hold on a tile talks to that tile's agent.
+ // A long still press on a tile is no hold (the hold is the agent screens' own): no voice, and its lift opens the agent as a tap.
render(3000);
const pod_hit_t *tile = NULL;
for (int i = 0; i < U.frame.hit_count; i++) if (U.frame.hits[i].action == POD_A_OPEN_AGENT && !strcmp(U.frame.hits[i].id, "a2")) tile = &U.frame.hits[i];
CHECK(tile);
int cx = tile->x + tile->w / 2, cy = tile->y + tile->h / 2;
t_(true, cx, cy, 3000);
- pod_out_t o = pod_ui_tick(&U, 3400);
- CHECK(o.fx == POD_FX_VOICE_BEGIN && !strcmp(o.agent, "a2") && top()->view == POD_V_TALK);
- CHECK(t_(false, cx, cy, 3500).fx == POD_FX_NONE);
- render(3600);
- CHECK(tap_(cx, cy, 3700).fx == POD_FX_VOICE_END);
- // v2: sliding from a tile hold does not cancel.
- fresh(skin);
- to_tab(0);
- render(1000);
- for (int i = 0; i < U.frame.hit_count; i++) if (U.frame.hits[i].action == POD_A_OPEN_AGENT && !strcmp(U.frame.hits[i].id, "a2")) tile = &U.frame.hits[i];
- cx = tile->x + tile->w / 2; cy = tile->y + tile->h / 2;
- t_(true, cx, cy, 1000);
- CHECK(pod_ui_tick(&U, 1400).fx == POD_FX_VOICE_BEGIN);
- CHECK(t_(true, cx, cy + 130, 1500).fx == POD_FX_NONE && top()->view == POD_V_TALK);
- CHECK(t_(false, cx, cy + 130, 1600).fx == POD_FX_NONE && top()->view == POD_V_TALK);
+ CHECK(!U.hold_armed);
+ CHECK(pod_ui_tick(&U, 3400).fx == POD_FX_NONE && top()->view == POD_V_TAB);
+ for (uint32_t t = 3404; t <= 4500; t += 4) CHECK(t_(true, cx, cy, t).fx == POD_FX_NONE && top()->view == POD_V_TAB);
+ pod_out_t o = t_(false, cx, cy, 4600);
+ CHECK(o.fx == POD_FX_AGENT_OPEN && !strcmp(o.agent, "a2") && top()->view == POD_V_AGENT && !pod_ui_talking(&U) && !U.hands_free);
// A tap on a tile still opens it.
fresh(skin);
to_tab(0);
@@ -254,7 +247,7 @@ static void offline(void) {
CHECK(pod_ui_tick(&U, 1400).fx == POD_FX_NONE);
CHECK(U.notice_on && !strcmp(U.notice, "That machine is offline") && top()->view == POD_V_AGENT);
CHECK(t_(false, MID_X, MID_Y, 1500).fx == POD_FX_NONE && top()->view == POD_V_AGENT);
- // On a Tab tile too, and the agent is not opened.
+ // A Tab tile holds nothing, offline or not: no notice.
fresh(POD_SKIN_CONSOLE);
to_tab(0);
((pod_agent_t *)pod_model_find(&U.model, "a2"))->state = POD_OFFLINE;
@@ -263,9 +256,7 @@ static void offline(void) {
for (int i = 0; i < U.frame.hit_count; i++) if (U.frame.hits[i].action == POD_A_OPEN_AGENT && !strcmp(U.frame.hits[i].id, "a2")) tile = &U.frame.hits[i];
CHECK(tile);
t_(true, tile->x + tile->w / 2, tile->y + tile->h / 2, 1000);
- CHECK(pod_ui_tick(&U, 1400).fx == POD_FX_NONE && U.notice_on && top()->view == POD_V_TAB);
- t_(false, tile->x + tile->w / 2, tile->y + tile->h / 2, 1500);
- CHECK(top()->view == POD_V_TAB);
+ CHECK(pod_ui_tick(&U, 1400).fx == POD_FX_NONE && !U.notice_on && top()->view == POD_V_TAB);
}
static void skin_switch_mid_hold(void) {
@@ -314,7 +305,15 @@ static void hold_fires_on_held_samples(void) {
CHECK(o.fx == POD_FX_VOICE_BEGIN && !strcmp(o.agent, "a1") && top()->view == POD_V_TALK);
CHECK(t_(true, MID_X, MID_Y, 1404).fx == POD_FX_NONE); // once
CHECK(t_(false, MID_X, MID_Y, 1500).fx == POD_FX_NONE);
- // A tile hold too, and a move inside the slop keeps it armed.
+ // A move inside the slop keeps it armed.
+ fresh(POD_SKIN_CONSOLE);
+ to_agent(0, 0);
+ render(1000);
+ t_(true, MID_X, MID_Y, 1000);
+ CHECK(t_(true, MID_X + 5, MID_Y, 1200).fx == POD_FX_NONE);
+ o = t_(true, MID_X + 5, MID_Y, 1400);
+ CHECK(o.fx == POD_FX_VOICE_BEGIN && !strcmp(o.agent, "a1") && top()->view == POD_V_TALK);
+ // A Tab tile's still samples never begin voice: the hold is the agent screens' own.
fresh(POD_SKIN_CONSOLE);
to_tab(0);
render(1000);
@@ -322,9 +321,7 @@ static void hold_fires_on_held_samples(void) {
CHECK(tile);
int cx = tile->x + tile->w / 2, cy = tile->y + tile->h / 2;
t_(true, cx, cy, 1000);
- CHECK(t_(true, cx + 5, cy, 1200).fx == POD_FX_NONE);
- o = t_(true, cx + 5, cy, 1400);
- CHECK(o.fx == POD_FX_VOICE_BEGIN && !strcmp(o.agent, "a2") && top()->view == POD_V_TALK);
+ for (uint32_t t = 1004; t <= 2000; t += 4) CHECK(t_(true, cx, cy, t).fx == POD_FX_NONE && top()->view == POD_V_TAB);
}
// H2 (v2): a contact cancelled after the hold fired (an untrusted sample, a second finger, the glass turning, sleep) no
@@ -347,17 +344,6 @@ static void hold_cancel_keeps_recording(void) {
t_(true, MID_X, MID_Y, 1000);
CHECK(pod_ui_touch_cancel(&U).fx == POD_FX_NONE && top()->view == POD_V_AGENT);
CHECK(t_(true, MID_X, MID_Y, 1400).fx == POD_FX_NONE); // the cancelled contact never talks
- // From a tile: back on the Tab.
- fresh(POD_SKIN_CONSOLE);
- to_tab(0);
- render(1000);
- const pod_hit_t *tile = tile_of("a2");
- t_(true, tile->x + tile->w / 2, tile->y + tile->h / 2, 1000);
- CHECK(t_(true, tile->x + tile->w / 2, tile->y + tile->h / 2, 1400).fx == POD_FX_VOICE_BEGIN);
- o = pod_ui_touch_cancel(&U);
- CHECK(o.fx == POD_FX_NONE && top()->view == POD_V_TALK && U.hold_tile);
- pod_ui_talk_over(&U); // the app ended the recording: a tile's hold goes back to the Tab
- CHECK(top()->view == POD_V_TAB && !U.hands_free);
// A refused start (the glue already left Talk): the cancel has no recording to abort.
fresh(POD_SKIN_CONSOLE);
to_agent(0, 0);
@@ -450,7 +436,6 @@ static void working_bars_wake(void) {
CHECK(pod_ui_wake_ms(&U, 330) > 66);
}
-// H3: Recent rows open an agent (OPEN_AGENT) like Tab tiles do, but the hold is only for a tab's own tiles.
// v3 Task 4: the Console equaliser and spinner step at 66 ms and the voice wave at 100 ms; Classic keeps its 33 ms.
static void animation_rates(void) {
uint32_t most = 0;
@@ -476,6 +461,7 @@ static void animation_rates(void) {
CHECK(most == 100); // the wave steps at 100 ms: neither the pet's 33 nor the 66 ms beat
}
+// H3: Recent rows open an agent (OPEN_AGENT) like Tab tiles do, and like them they do not hold: a long still press is a tap.
static void recent_rows_do_not_hold(void) {
fresh(POD_SKIN_CONSOLE);
act(POD_A_OPEN_TAB, POD_TAB_RECENT);
@@ -485,8 +471,11 @@ static void recent_rows_do_not_hold(void) {
CHECK(row && row->y < 200);
int x = row->x + row->w / 2, y = row->y + row->h / 2;
t_(true, x, y, 1000);
- CHECK(t_(true, x, y, 1400).fx == POD_FX_NONE && top()->view == POD_V_TAB && top()->tab == POD_TAB_RECENT && !U.notice_on);
- CHECK(t_(false, x, y, 1500).fx == POD_FX_AGENT_OPEN); // still a tap
+ CHECK(!U.hold_armed);
+ for (uint32_t t = 1004; t <= 2000; t += 4) CHECK(t_(true, x, y, t).fx == POD_FX_NONE && top()->view == POD_V_TAB && top()->tab == POD_TAB_RECENT);
+ CHECK(pod_ui_tick(&U, 2000).fx == POD_FX_NONE && !U.notice_on);
+ pod_out_t o = t_(false, x, y, 2100); // still a tap
+ CHECK(o.fx == POD_FX_AGENT_OPEN && top()->view != POD_V_TAB && !pod_ui_talking(&U));
}
// M9: voice on an asking agent stays refused, so the hold does not arm there (no notice either).
@@ -539,18 +528,8 @@ static void hold_stays_with_its_target(void) {
CHECK(t_(true, 5, 713, 2400).fx == POD_FX_NONE && top()->view == POD_V_TAB);
}
-// L11: a tile hold that opened the agent and then lost its start (the gate refused it) goes back to the Tab.
-static void refused_tile_hold_returns_to_the_tab(void) {
- fresh(POD_SKIN_CONSOLE);
- to_tab(0);
- render(1000);
- const pod_hit_t *tile = tile_of("a2");
- t_(true, tile->x + tile->w / 2, tile->y + tile->h / 2, 1000);
- CHECK(t_(true, tile->x + tile->w / 2, tile->y + tile->h / 2, 1400).fx == POD_FX_VOICE_BEGIN);
- pod_ui_talk_over(&U); // what pro_app does when the recorder refuses
- CHECK(top()->view == POD_V_TAB && !U.hold_voice);
- CHECK(t_(false, tile->x + tile->w / 2, tile->y + tile->h / 2, 1500).fx == POD_FX_NONE && top()->view == POD_V_TAB);
- // On an agent screen the hold is the agent's own: it stays there.
+// L11: a refused start (the gate refused the recording) leaves the hold's agent screen where it was.
+static void refused_hold_stays_on_the_agent(void) {
fresh(POD_SKIN_CONSOLE);
to_agent(0, 0);
render(1000);
@@ -558,6 +537,14 @@ static void refused_tile_hold_returns_to_the_tab(void) {
CHECK(t_(true, MID_X, MID_Y, 1400).fx == POD_FX_VOICE_BEGIN);
pod_ui_talk_over(&U);
CHECK(top()->view == POD_V_AGENT);
+ fresh(POD_SKIN_CONSOLE); // and on a Recap
+ to_agent(0, 2);
+ CHECK(top()->view == POD_V_RECAP);
+ render(1000);
+ t_(true, MID_X, MID_Y, 1000);
+ CHECK(t_(true, MID_X, MID_Y, 1400).fx == POD_FX_VOICE_BEGIN);
+ pod_ui_talk_over(&U);
+ CHECK(top()->view == POD_V_RECAP);
}
// ---- v3 gestures -------------------------------------------------------------------------------------------
@@ -578,19 +565,20 @@ static void swipe(int x0, int y0, int x1, int y1, uint32_t t) {
t_(false, x1, y1, t + 80);
}
-// Console Inbox: a sideways swipe either way goes back one level (v1 swipe rules); a vertical drag scrolls and stays; Classic is unchanged.
+// Console Inbox: a sideways swipe either way goes back; a vertical drag scrolls and stays; Classic is unchanged.
static void inbox_swipe_goes_back(void) {
- // a sideways swipe on the Inbox does nothing, either way
- for (int k = 0; k < 2; k++) {
+ // a sideways swipe on the Inbox goes back to the screen it was opened from, either way
+ for (int k = 0; k < 4; k++) {
fresh(POD_SKIN_CONSOLE);
+ if (k >= 2) to_agent(0, 0);
act(POD_A_INBOX, 0);
- CHECK(top()->view == POD_V_INBOX);
+ CHECK(top()->view == POD_V_INBOX && U.nav.depth == (k >= 2 ? 4 : 2));
render(1000);
- int depth = U.nav.depth;
- if (k == 0) swipe(560, 300, 200, 310, 1000); else swipe(200, 300, 560, 310, 1000);
- CHECK(U.nav.depth == depth && top()->view == POD_V_INBOX);
+ if (k % 2 == 0) swipe(560, 300, 200, 310, 1000); else swipe(200, 300, 560, 310, 1000);
+ if (k < 2) CHECK(U.nav.depth == 1 && top()->view == POD_V_TABS);
+ else CHECK(U.nav.depth == 3 && top()->view == POD_V_AGENT);
}
- // a swipe up from the bottom zone still goes back; a swipe down from the bar still goes home
+ // a swipe up from the bottom zone still goes back; a swipe down from the bar does nothing (the Inbox is already open)
fresh(POD_SKIN_CONSOLE);
act(POD_A_INBOX, 0);
render(1000);
@@ -603,7 +591,7 @@ static void inbox_swipe_goes_back(void) {
t_(true, 360, 20, 1000);
t_(true, 360, 70, 1050);
t_(false, 360, 110, 1100);
- CHECK(U.nav.depth == 1 && top()->view == POD_V_TABS);
+ CHECK(U.nav.depth == 2 && top()->view == POD_V_INBOX);
fresh(POD_SKIN_CONSOLE); // too short (59 px) and too steep: nothing
act(POD_A_INBOX, 0);
render(1000);
@@ -623,13 +611,15 @@ static void inbox_swipe_goes_back(void) {
int before = top()->scroll;
swipe(360, 600, 360, 150, 3000);
CHECK(U.nav.depth == depth && top()->view == POD_V_INBOX && top()->scroll > before);
- // Classic: the Inbox keeps its own behaviour (a sideways swipe does not go back)
- fresh(POD_SKIN_CLASSIC);
- act(POD_A_INBOX, 0);
- render(1000);
- depth = U.nav.depth;
- swipe(560, 300, 200, 310, 1000);
- CHECK(U.nav.depth == depth);
+ // Classic: the Inbox keeps its own behaviour (a sideways swipe, either way, neither goes back nor home)
+ for (int k = 0; k < 2; k++) {
+ fresh(POD_SKIN_CLASSIC);
+ act(POD_A_INBOX, 0);
+ render(1000);
+ depth = U.nav.depth;
+ if (k == 0) swipe(560, 300, 200, 310, 1000); else swipe(200, 300, 560, 310, 1000);
+ CHECK(U.nav.depth == depth && depth > 1 && top()->view == POD_V_INBOX);
+ }
}
// Console Recent is one of the tabs: a sideways swipe steps Recent -> tab 0 -> ... -> last -> Recent; a vertical drag scrolls; Classic unchanged.
@@ -706,11 +696,11 @@ static void bottom_up_goes_back(void) {
static const pod_view_t want[] = {POD_V_AGENT, POD_V_RECAP, POD_V_TAB, POD_V_TAB, POD_V_INBOX};
CHECK(top()->view == want[k]);
render(1000);
- int depth = U.nav.depth;
- t_(true, 360, 690, 1000);
- t_(true, 360, 640, 1040);
+ int depth = U.nav.depth, y0 = k >= 2 ? POD_LIST_BOTTOM_Y + 10 : 690; // Tab, Recent and the Inbox: below their content
+ t_(true, 360, y0, 1000);
+ t_(true, 360, y0 - 50, 1040);
CHECK(U.nav.depth == depth); // nothing until the lift
- t_(false, 360, 570, 1080);
+ t_(false, 360, y0 - 120, 1080);
CHECK(U.nav.depth == depth - 1);
if (k == 1) CHECK(sc_events == 0);
}
@@ -760,16 +750,18 @@ static void bottom_start_sideways_is_a_pane_swipe(void) {
CHECK(top()->view == POD_V_TALK && U.nav.depth == 3);
}
-static void bar_down_goes_home(void) {
- for (int k = 0; k < 2; k++) {
+static void bar_down_opens_inbox(void) {
+ // from an agent (and a tab, and Recent) a swipe down from the bar opens the Inbox on top; on the Inbox it does nothing
+ for (int k = 0; k < 4; k++) {
fresh(POD_SKIN_CONSOLE);
- if (k == 0) to_agent(0, 0); else act(POD_A_INBOX, 0);
+ if (k == 0) to_agent(0, 0); else if (k == 1) to_tab(0); else if (k == 2) act(POD_A_OPEN_TAB, POD_TAB_RECENT); else act(POD_A_INBOX, 0);
render(1000);
- CHECK(U.nav.depth >= 2);
+ int depth = U.nav.depth;
+ CHECK(depth >= 2);
t_(true, 360, 20, 1000);
t_(true, 360, 70, 1040);
t_(false, 360, 140, 1080);
- CHECK(U.nav.depth == 1 && top()->view == POD_V_TABS);
+ CHECK(top()->view == POD_V_INBOX && U.nav.depth == (k == 3 ? depth : depth + 1));
}
}
@@ -789,14 +781,14 @@ static void toast_and_edges(void) {
CHECK(pod_ui_notify(&U, "a3", true, 1000));
render(1000);
CHECK(U.ban_on && pod_ui_wake_ms(&U, 1000) <= 33);
- // A bar swipe down while a toast is up still goes home.
+ // A bar swipe down while a toast is up still opens the Inbox.
fresh(POD_SKIN_CONSOLE);
to_agent(0, 0);
CHECK(pod_ui_notify(&U, "a3", true, 1000));
render(1000);
CHECK(U.ban_on);
t_(true, 360, 20, 1100); t_(true, 360, 70, 1140); t_(false, 360, 140, 1180);
- CHECK(U.nav.depth == 1);
+ CHECK(U.nav.depth == 4 && top()->view == POD_V_INBOX);
}
@@ -972,9 +964,19 @@ static void wake_rates(void) {
uint32_t n = wakes_in(2000, 10000, &mn);
CHECK(n >= 10000 / 66 && n <= 10000 / 66 + 40);
}
- for (int k = 0; k < 4; k++) { // nobody works: Overview, Tab, Recent and Inbox wake once a second
+ { // nobody works but Delta asks: Overview's Docs card plays the ask pet, at its own steps and never faster than 66 ms
+ fresh(POD_SKIN_CONSOLE);
+ calm();
+ render(1000);
+ CHECK(pod_ui_pet_on_screen(&U));
+ uint32_t n = wakes_in(2000, 10000, &mn);
+ CHECK(n > 10 && n <= 10000 / 66 + 1 && mn >= 1);
+ }
+ for (int k = 0; k < 4; k++) { // nobody works or asks: Overview (its pets rest, drawn still), Tab, Recent and Inbox wake once a second
fresh(POD_SKIN_CONSOLE);
calm();
+ pod_model_question_close(&U.model, "a4");
+ pod_model_turn(&U.model, "a4", "done", NULL, 0, 30);
if (k == 1) to_tab(1);
else if (k == 2) act(POD_A_OPEN_TAB, POD_TAB_RECENT);
else if (k == 3) act(POD_A_INBOX, 0);
@@ -1026,11 +1028,86 @@ static void agent_screen_wakes(void) {
CHECK(n == 10 && mn == 1000);
}
+// Console Tab cards: a tab of six agents is two pages of four. A swipe up (>= 60 px, |dy| > 1.5 |dx|) shows the next page, a swipe
+// down the previous one, clamped; a short or slanted drag and a tap do not page; sideways still steps tabs; Recent's rows still scroll.
+static void N_scroll(int v) { U.nav.stack[U.nav.depth - 1].scroll = (int16_t)v; }
+static void tab_cards_page(void) {
+ fresh(POD_SKIN_CONSOLE);
+ pod_model_agents_begin(&U.model);
+ static const char *const ids[] = {"a1", "a2", "a3", "a4", "a5", "a6"};
+ for (int i = 0; i < 6; i++) pod_model_agent(&U.model, ids[i], ids[i], "claude", "mac");
+ pod_model_agents_end(&U.model);
+ const char *const *l[2] = {ids, ids};
+ uint8_t cnt[2] = {6, 1};
+ cable_swarm_t it[2] = {{"s1", "Build", 6, 6}, {"s2", "Docs", 1, 1}};
+ pod_model_swarms(&U.model, it, l, cnt, 2, "s1", NULL, 0);
+ to_tab(0);
+ render(1000);
+ CHECK(top()->view == POD_V_TAB && top()->scroll == 0 && cs_tab_pages(&U.nav, &U.model) == 2);
+ swipe(360, 500, 360, 300, 1000); // up: the next page
+ CHECK(top()->view == POD_V_TAB && top()->scroll == 1);
+ render(1200);
+ swipe(360, 300, 360, 520, 1300); // down: the previous page
+ CHECK(top()->scroll == 0);
+ swipe(360, 300, 360, 520, 1400); // down on the first page: stays
+ CHECK(top()->scroll == 0);
+ swipe(360, 500, 360, 300, 1500);
+ swipe(360, 500, 360, 300, 1700); // up on the last page: stays on it
+ CHECK(top()->scroll == 1 && top()->view == POD_V_TAB);
+ swipe(360, 500, 360, 445, 1900); // 55 px: not a swipe
+ CHECK(top()->scroll == 1);
+ swipe(300, 500, 420, 400, 2100); // slanted (|dy| < 1.5 |dx|): not a page, not a tab step either
+ CHECK(top()->scroll == 1 && top()->view == POD_V_TAB);
+ render(2300);
+ const pod_hit_t *c = find(POD_A_OPEN_AGENT); // a tap on page 2's first card opens a5
+ CHECK(c && !strcmp(c->id, "a5"));
+ CHECK(tap_(c->x + c->w / 2, c->y + c->h / 2, 2400).fx == POD_FX_AGENT_OPEN && !strcmp(top()->agent, "a5"));
+ // sideways steps tabs, as before
+ act(POD_A_BACK, 0);
+ render(2600);
+ int tab = top()->tab;
+ swipe(560, 300, 200, 310, 2700);
+ CHECK(top()->view == POD_V_TAB && top()->tab != tab);
+ // the bottom card row reaches into the old bottom zone: a swipe up from it (y 650) pages, it does not go back
+ act(POD_A_TABS, 0);
+ act(POD_A_OPEN_TAB, 0);
+ CHECK(top()->view == POD_V_TAB && top()->tab == 0);
+ N_scroll(0);
+ render(3000);
+ int depth = U.nav.depth;
+ swipe(360, 650, 360, 450, 3000);
+ CHECK(U.nav.depth == depth && top()->scroll == 1);
+ swipe(360, 650, 360, 712, 3200); // a swipe down from there (62 px) pages back
+ CHECK(U.nav.depth == depth && top()->scroll == 0);
+ // below the cards (y >= 692) a swipe up still goes back
+ swipe(360, 710, 360, 450, 3400);
+ CHECK(U.nav.depth == depth - 1);
+ // a scroll left past the last page (the tab shrank) pages back from the page it shows
+ act(POD_A_OPEN_TAB, 0);
+ N_scroll(5);
+ render(3600);
+ swipe(360, 300, 360, 520, 3600);
+ CHECK(top()->scroll == 0);
+ // Recent keeps its row scroll, and its sixth row (y 596..700) starts a scroll rather than going back
+ fresh(POD_SKIN_CONSOLE);
+ pod_model_agents_begin(&U.model);
+ static const char *const r8[] = {"r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8"};
+ for (int i = 0; i < 8; i++) pod_model_agent(&U.model, r8[i], r8[i], "claude", "mac");
+ pod_model_agents_end(&U.model);
+ for (int i = 0; i < 8; i++) pod_model_turn(&U.model, r8[i], "activity", "Editing", 10, 900u + (uint32_t)i);
+ act(POD_A_OPEN_TAB, POD_TAB_RECENT);
+ render(1000);
+ CHECK(top()->tab == POD_TAB_RECENT && top()->scroll == 0 && pod_scroll_max(&U.nav, &U.model) == 2);
+ depth = U.nav.depth;
+ t_(true, 360, 660, 1000); t_(true, 360, 560, 1050); t_(true, 360, 450, 1100); t_(false, 360, 450, 1150);
+ CHECK(U.nav.depth == depth && top()->scroll > 0);
+}
+
int main(void) {
overview_pages();
bottom_up_goes_back();
bottom_start_sideways_is_a_pane_swipe();
- bar_down_goes_home();
+ bar_down_opens_inbox();
toast_and_edges();
hold_agent(POD_SKIN_CONSOLE);
hold_agent(POD_SKIN_CLASSIC);
@@ -1054,6 +1131,7 @@ int main(void) {
recent_rows_do_not_hold();
overview_down_opens_inbox();
inbox_swipe_goes_back();
+ tab_cards_page();
recent_swipe_steps_tabs();
overview_scroll_follows_tab_removal();
hold_not_in_bar();
@@ -1063,7 +1141,7 @@ int main(void) {
agent_screen_wakes();
asking_agents_do_not_hold();
hold_stays_with_its_target();
- refused_tile_hold_returns_to_the_tab();
+ refused_hold_stays_on_the_agent();
printf("test_cs_glue: %d checks ok\n", checks);
return 0;
}
diff --git a/devices/harness-pro/firmware/test/test_cs_views.c b/devices/harness-pro/firmware/test/test_cs_views.c
index fb3cb6ce3..928dd9bd8 100644
--- a/devices/harness-pro/firmware/test/test_cs_views.c
+++ b/devices/harness-pro/firmware/test/test_cs_views.c
@@ -16,7 +16,7 @@ static int texts(const char *t);
static ht_scene_t S;
static pod_out_frame_t F;
-static void fresh(void) { memset(&F, 0, sizeof F); ht_scene_clear(&S, ht_rgb(0x08090A)); F.scene = &S; }
+static void fresh(void) { memset(&F, 0, sizeof F); ht_scene_clear(&S, ht_rgb(CS_GROUND)); F.scene = &S; }
static const ht_run_t *text_run(const char *t) {
for (int i = 0; i < S.count; i++) if (S.runs[i].pro_kind == K_TEXT && !strcmp(S.runs[i].text, t)) return &S.runs[i];
return NULL;
@@ -42,7 +42,7 @@ int main(void) {
CHECK(cur);
for (int i = 0; i < F.hit_count; i++) CHECK(!(F.hits[i].x < cur->x && F.hits[i].x + F.hits[i].w > cur->x + cur->w && F.hits[i].action == POD_A_BACK));
CHECK(hits_of(POD_A_ATTENTION) == 0); // asking == 0: no chip
- CHECK(S.runs[0].fg == ht_rgb(0x0b0c0e));
+ CHECK(S.runs[0].fg == ht_rgb(CS_GROUND));
fresh();
cs_bar(&F, crumbs, 2, 6, 2, 0, NULL, 0);
@@ -156,7 +156,7 @@ int main(void) {
fresh();
cs_bar(&F, crumbs, 2, 1, 0, 0, "make the", 0);
CHECK(hits_of(POD_A_BACK) == 0);
- CHECK(S.runs[0].pro_kind == K_RECT && S.runs[0].fg == ht_rgb(0x14122a));
+ CHECK(S.runs[0].pro_kind == K_RECT && S.runs[0].fg == ht_rgb(CS_VOICE_BAR));
CHECK(text_run("make the") && text_run("Backend"));
fresh();
@@ -174,7 +174,7 @@ int main(void) {
CHECK(!cs_logo(&S, 10, 10, 40, "claude") && text_run("CL") && S.runs[0].w == 40); // 40 is not baked
cs_dot(&S, 100, 100, 'q', 0);
- CHECK(S.runs[S.count - 1].pro_kind == K_RECT_AA && S.runs[S.count - 1].fg == ht_rgb(0xF5A524));
+ CHECK(S.runs[S.count - 1].pro_kind == K_RECT_AA && S.runs[S.count - 1].fg == ht_rgb(CS_ASK));
// the working mark: four 5 px bars, 2 px gaps (26 px wide), anchored at the bottom of a 22 px box, each 40..100 % tall, moving with the clock
{
@@ -205,9 +205,7 @@ int main(void) {
fresh();
cs_bar(&F, crumbs, 2, 6, 3, 0, NULL, 0);
- const char *keys[] = {"hold", "\xe2\x86\x90 \xe2\x86\x92", "\xe2\x86\x91"}, *labels[] = {"talk to landing", "panes", "Desktop"};
- cs_hints(&F, keys, labels, 3);
- CHECK(text_run("\xe2\x86\x90 \xe2\x86\x92") && text_run("\xe2\x96\xb2 3")); // the marks reach the atlas
+ CHECK(text_run("\xe2\x96\xb2 3")); // the mark reaches the atlas
CHECK(cs_runs(&F) < 40);
// ---- Overview and Recent ----
@@ -248,53 +246,42 @@ int main(void) {
fresh();
cs_view_overview(&F, &N, &M, now);
CHECK(text_run("Recent") && text_run("Firmware") && text_run("Backend"));
- CHECK(text_run("1 ask") && text_run("\xe2\x96\xb2 1"));
+ CHECK(text_run("2") && text_run("3") && !text_run("2 agents") && text_run("\xe2\x96\xb2 1") && !text_run("1 ask"));
+ { // the count chip: its number in the 24 px mono face
+ const ht_run_t *k3 = text_run("3");
+ CHECK(k3 && k3->pro_font == &cs_mono_24);
+ }
CHECK(hits_of(POD_A_OPEN_TAB) == 4);
CHECK(nth_hit(POD_A_OPEN_TAB, 0)->arg == POD_TAB_RECENT && nth_hit(POD_A_OPEN_TAB, 1)->arg == 0 && !strcmp(nth_hit(POD_A_OPEN_TAB, 1)->id, "s0"));
CHECK(cs_runs(&F) <= 184);
- // 2 x 2 cards of 338 x 277 at x 16 / 366, y 86 / 375
+ // 2 x 2 cards of 338 x 296 at x 16 / 366, y 86 / 394
{
const pod_hit_t *c0 = nth_hit(POD_A_OPEN_TAB, 0), *c1 = nth_hit(POD_A_OPEN_TAB, 1), *c2 = nth_hit(POD_A_OPEN_TAB, 2), *c3 = nth_hit(POD_A_OPEN_TAB, 3);
- CHECK(c0->x == 16 && c0->y == 86 && c0->w == 338 && c0->h == 277);
- CHECK(c1->x == 366 && c1->y == 86 && c2->x == 16 && c2->y == 375 && c3->x == 366 && c3->y == 375 && c3->w == 338);
- // names in the 28 px medium face, tab names in the 34 px semibold, logos not badges, at most three rows a card
- const ht_run_t *an = text_run("agent-0"), *tn = text_run("Firmware");
- CHECK(an && an->pro_font == &cs_md_28 && tn && tn->pro_font == &cs_sb_34);
+ CHECK(c0->x == 16 && c0->y == 86 && c0->w == 338 && c0->h == 296);
+ CHECK(c1->x == 366 && c1->y == 86 && c2->x == 16 && c2->y == 394 && c3->x == 366 && c3->y == 394 && c3->w == 338);
+ // one hero per tab: the tab name left in the 28 px medium face, the count chip right, the lead (working first) and its name in the
+ // 28 px medium face; no agent rows, no logos at 36, no badges
+ const ht_run_t *tn = text_run("Firmware");
+ CHECK(tn && tn->pro_font == &cs_md_28 && tn->x == 366 + 19); // the lead's size, left at the card's pad (Firmware is the second card)
+ CHECK(cs_card_lead(&M, 2) == pod_model_find(&M, "a4")); // Backend: a4 works, so it leads over a2 that asks
+ CHECK(pod_model_eff(&M, cs_card_lead(&M, 0)) == POD_WORKING); // Recent: a working agent leads
+ CHECK(cs_card_lead(&M, 1) == pod_model_find(&M, "a0") && cs_card_lead(&M, 3) == pod_model_find(&M, "a5"));
+ const ht_run_t *ln = text_run("agent-4");
+ CHECK(ln && ln->pro_font == &cs_md_28 && text_run("agent-0") && text_run("agent-5") && !text_run("agent-2"));
CHECK(!text_run("CL") && !text_run("CO") && !text_run("MU"));
int imgs = 0;
for (int i = 0; i < S.count; i++) imgs += S.runs[i].pro_kind == 3 && S.runs[i].w == 36;
- CHECK(imgs == 9); // Recent 3 rows, Firmware 2, Backend 3, Tab2 1
+ CHECK(imgs == 0);
+ CHECK(cs_cards_move(&N, &M));
+ uint32_t nx = cs_cards_next_ms(&N, &M, now);
+ CHECK(nx >= 1 && nx <= 1000);
}
- // ▲ hint is dropped when nobody asks
- pod_model_question_close(&M, "a2");
- fresh();
- cs_view_overview(&F, &N, &M, now);
- CHECK(!text_run("go to the ask") && !text_run("\xe2\x96\xb2 1"));
- pod_model_question(&M, "a2", "Run the migration now?");
- fresh();
- cs_view_overview(&F, &N, &M, now);
- CHECK(text_run("go to the ask"));
- { // v3b A: "↓ inbox" is a hint; one page has no "← → pages"; every hint fits the strip whole
- fresh();
- cs_view_overview(&F, &N, &M, now);
- CHECK(pod_tabs_pages_of(&N, &M) == 1 && text_run("open tab") && text_run("inbox") && text_run("go to the ask") && !text_run("pages"));
- CHECK(text_run("\xe2\x86\x93") && !text_run("\xe2\x86\x90 \xe2\x86\x92"));
- const char *const lab[] = {"open tab", "pages", "inbox", "go to the ask"};
- for (int k = 0; k < 2; k++) {
- if (k) { pod_model_swarms(&M, sw, lists, counts, 6, "s0", NULL, 0); fresh(); cs_view_overview(&F, &N, &M, now); CHECK(text_run("pages") && text_run("\xe2\x86\x90 \xe2\x86\x92")); }
- for (int i = 0; i < 4; i++) {
- const ht_run_t *r = text_run(lab[i]);
- if (!r) continue;
- CHECK(r->w >= ht_pro_width(r->pro_font, lab[i]) && r->x + r->w <= POD_W - 24); // not cut
- }
- }
- pod_model_swarms(&M, sw, lists, counts, 3, "s0", NULL, 0);
- pod_model_question_close(&M, "a2");
- fresh();
- cs_view_overview(&F, &N, &M, now);
- CHECK(text_run("inbox") && text_run("open tab") && !text_run("go to the ask"));
- pod_model_question(&M, "a2", "Run the migration now?");
+ // no hint strip: no key caps or labels along the bottom, and nothing is drawn in the last CS_FOOT_H px but the page dots
+ {
+ const char *const gone[] = {"open tab", "pages", "inbox", "go to the ask", "tap"};
+ for (int k = 0; k < 5; k++) CHECK(!text_run(gone[k]));
+ for (int i = 0; i < F.hit_count; i++) CHECK(F.hits[i].y + F.hits[i].h <= POD_W - CS_FOOT_H);
}
// 6 tabs: 7 covers, 4 to a page: two pages; the second holds the last three
@@ -320,22 +307,23 @@ int main(void) {
N.stack[0].scroll = 0;
pod_model_swarms(&M, sw, lists, counts, 3, "s0", NULL, 0);
- // Recent: 8 agents, five rows of 108 px at a time; drag scroll shows the rest
+ // Recent: 8 agents, six rows of 104 px at a time (the screen down to its bottom margin); drag scroll shows the rest
pod_nav_act(&N, &M, POD_A_OPEN_TAB, POD_TAB_RECENT, now);
fresh();
cs_view_recent(&F, &N, &M, now);
const pod_agent_t *rl[POD_RECENT_MAX];
int rn = pod_model_recent(&M, rl, POD_RECENT_MAX);
- CHECK(rn == 8 && hits_of(POD_A_OPEN_AGENT) == 5);
- for (int i = 0; i < 5; i++) { const pod_hit_t *h = nth_hit(POD_A_OPEN_AGENT, i); CHECK(!strcmp(h->id, rl[i]->id) && h->arg == i && h->y == 76 + i * 108 && h->h == 108); }
+ CHECK(rn == 8 && hits_of(POD_A_OPEN_AGENT) == 6);
+ for (int i = 0; i < 6; i++) { const pod_hit_t *h = nth_hit(POD_A_OPEN_AGENT, i); CHECK(!strcmp(h->id, rl[i]->id) && h->arg == i && h->y == 76 + i * 104 && h->h == 104); }
+ CHECK(76 + 6 * 104 <= POD_W - CS_FOOT_H); // the last row ends above the bottom margin
CHECK(text_run("ask") && text_run("Recent") && text_run("Overview") && text_run("go to the ask") == NULL);
CHECK(hits_of(POD_A_BACK) == 1);
- CHECK(text_run("open") && text_run("tabs") && text_run("back") && text_run("home") && text_run("\xe2\x86\x90 \xe2\x86\x92") && text_run("\xe2\x86\x91") && text_run("\xe2\x86\x93") && !text_run("open agent"));
+ CHECK(!text_run("open") && !text_run("tabs") && !text_run("back") && !text_run("home")); // no hint strip
CHECK(cs_runs(&F) <= 184);
- CHECK(pod_scroll_pitch(&N) == 108 && pod_scroll_max(&N, &M) == 3);
+ CHECK(pod_scroll_pitch(&N) == 104 && pod_scroll_max(&N, &M) == 2);
{ // a WORKING agent has the four bars and no dot; the others a dot and no bars
int work = 0, bars = 0, green_dots = 0;
- for (int i = 0; i < 5; i++) work += pod_model_eff(&M, rl[i]) == POD_WORKING;
+ for (int i = 0; i < CS_ROWS_MAX; i++) work += pod_model_eff(&M, rl[i]) == POD_WORKING;
for (int i = 0; i < S.count; i++) {
const ht_run_t *r = &S.runs[i];
bars += r->pro_kind == K_RECT && r->w == 5 && r->fg == ht_rgb(CS_RUN);
@@ -348,11 +336,11 @@ int main(void) {
CHECK(ln && ln->pro_font == &cs_rg_27);
CHECK(text_run("Firmware")); // Recent names each agent's tab
}
- N.stack[N.depth - 1].scroll = 3;
+ N.stack[N.depth - 1].scroll = 2;
fresh();
cs_view_recent(&F, &N, &M, now);
- CHECK(hits_of(POD_A_OPEN_AGENT) == 5);
- for (int i = 0; i < 5; i++) { const pod_hit_t *h = nth_hit(POD_A_OPEN_AGENT, i); CHECK(!strcmp(h->id, rl[3 + i]->id) && h->arg == 3 + i); }
+ CHECK(hits_of(POD_A_OPEN_AGENT) == 6);
+ for (int i = 0; i < 6; i++) { const pod_hit_t *h = nth_hit(POD_A_OPEN_AGENT, i); CHECK(!strcmp(h->id, rl[2 + i]->id) && h->arg == 2 + i); }
N.stack[N.depth - 1].scroll = 0;
// ---- Tab: the real pane split (3 panes, then 8) ----
@@ -372,17 +360,23 @@ int main(void) {
fresh();
cs_view_tab(&F, &N, &M, now);
CHECK(hits_of(POD_A_OPEN_AGENT) == 3);
- // the Recent row style, in pane order: 108 px rows right under the bar; the hit's arg is the agent's place in the list
+ // cards in pane order on the Overview grid; the hit's arg is the agent's place in the list
for (int i = 0; i < 3; i++) {
const pod_hit_t *h = nth_hit(POD_A_OPEN_AGENT, i);
- CHECK(h->y == 76 + i * 108 && h->h == 108 && h->arg == i && !strcmp(h->id, a3[i]));
+ CHECK(h->x == CS_CARD_MARGIN + (i % 2) * (CS_CARD_W + CS_CARD_GAP) && h->y == CS_CARD_TOP + (i / 2) * (CS_CARD_H + CS_CARD_GAP));
+ CHECK(h->w == CS_CARD_W && h->h == CS_CARD_H && h->arg == i && !strcmp(h->id, a3[i]));
}
- CHECK(texts("Backend") == 1); // the bar's crumb only: no tab name in a row
- CHECK(text_run("Run the migration now?") && text_run("Overview") && text_run("Backend"));
- CHECK(text_run("open") && text_run("tabs") && text_run("back") && text_run("home") && text_run("\xe2\x86\x90 \xe2\x86\x92") && !text_run("talk to a pane") && !text_run("open pane"));
+ CHECK(texts("Backend") == 1); // the bar's crumb only: no tab name on a card
+ CHECK(text_run("Overview") && text_run("Backend") && !text_run("Run the migration now?")); // no activity line
+ // the state, in a word at each card's foot, in its colour; the name in the 28 px face; the asking card's time is "ask"
+ { const ht_run_t *w = text_run("Needs you"); CHECK(w && w->fg == ht_rgb(CS_ASK) && w->pro_font == &cs_sb_26); }
+ { const ht_run_t *w = text_run("Working"); CHECK(w && w->fg == ht_rgb(CS_RUN)); }
+ CHECK(text_run("ask") && text_run("ask")->fg == ht_rgb(CS_ASK));
+ CHECK(!text_run("open") && !text_run("home") && !text_run("talk to a pane") && !text_run("open pane"));
+ CHECK(cs_tab_pages(&N, &M) == 1);
CHECK(cs_runs(&F) <= 184);
- // 8 panes: five rows, drag scroll shows the rest
+ // 8 panes: two pages of four; the frame's scroll is the page, and page dots run down the right edge
cable_swarm_t sw8;
memset(&sw8, 0, sizeof sw8);
snprintf(sw8.id, SWARM_ID_MAX, "big");
@@ -401,16 +395,23 @@ int main(void) {
pod_nav_act(&N, &M, POD_A_OPEN_TAB, 0, now);
fresh();
cs_view_tab(&F, &N, &M, now);
- CHECK(hits_of(POD_A_OPEN_AGENT) == 5 && pod_scroll_max(&N, &M) == 3 && pod_scroll_pitch(&N) == 108);
+ CHECK(hits_of(POD_A_OPEN_AGENT) == 4 && cs_tab_pages(&N, &M) == 2 && pod_scroll_max(&N, &M) == 1);
CHECK(cs_runs(&F) <= 184);
- N.stack[N.depth - 1].scroll = 3;
+ int dots = 0;
+ for (int i = 0; i < S.count; i++) dots += S.runs[i].pro_kind == K_RECT && S.runs[i].w == 8 && S.runs[i].x > POD_W - 20;
+ CHECK(dots == 2);
+ N.stack[N.depth - 1].scroll = 1;
+ fresh();
+ cs_view_tab(&F, &N, &M, now);
+ CHECK(hits_of(POD_A_OPEN_AGENT) == 4 && !strcmp(nth_hit(POD_A_OPEN_AGENT, 0)->id, "a4") && nth_hit(POD_A_OPEN_AGENT, 3)->arg == 7);
+ N.stack[N.depth - 1].scroll = 9; // past the end: the last page
fresh();
cs_view_tab(&F, &N, &M, now);
- CHECK(hits_of(POD_A_OPEN_AGENT) == 5 && !strcmp(nth_hit(POD_A_OPEN_AGENT, 0)->id, "a3") && nth_hit(POD_A_OPEN_AGENT, 4)->arg == 7);
+ CHECK(hits_of(POD_A_OPEN_AGENT) == 4 && !strcmp(nth_hit(POD_A_OPEN_AGENT, 0)->id, "a4"));
}
}
- // a tab with 20 agents, every one working with a long line: five rows, the scroll reaches the rest, the run budget holds
+ // a tab with 20 agents, every one working with a long name: five pages of cards, the last reachable, the run budget holds
{
static pod_model_t M;
static pod_nav_t N;
@@ -435,18 +436,41 @@ int main(void) {
pod_nav_act(&N, &M, POD_A_OPEN_TAB, 0, 100000u);
fresh();
cs_view_tab(&F, &N, &M, 100000u);
- CHECK(hits_of(POD_A_OPEN_AGENT) == 5 && pod_scroll_max(&N, &M) == 15);
+ CHECK(hits_of(POD_A_OPEN_AGENT) == 4 && pod_scroll_max(&N, &M) == 4);
CHECK(cs_runs(&F) <= 184);
- N.stack[N.depth - 1].scroll = 15;
+ N.stack[N.depth - 1].scroll = 4;
fresh();
cs_view_tab(&F, &N, &M, 100000u);
- CHECK(hits_of(POD_A_OPEN_AGENT) == 5 && nth_hit(POD_A_OPEN_AGENT, 4)->arg == 19);
- bool cut = false; // the long name and line end with an ellipsis
+ CHECK(hits_of(POD_A_OPEN_AGENT) == 4 && nth_hit(POD_A_OPEN_AGENT, 3)->arg == 19);
+ CHECK(cs_runs(&F) <= 184);
+ bool cut = false; // the long name ends with an ellipsis
for (int i = 0; i < S.count; i++) cut |= S.runs[i].pro_kind == K_TEXT && strstr(S.runs[i].text, "...") != NULL;
CHECK(cut);
printf("runs tab-20 %d\n", cs_runs(&F));
}
+ // a tab of ten panes where only the ninth works: it still leads the tab's Overview card (every pane is ranked)
+ {
+ static pod_model_t M;
+ pod_model_reset(&M);
+ pod_model_agents_begin(&M);
+ static char ids[10][8], *idp[10];
+ for (int i = 0; i < 10; i++) { snprintf(ids[i], sizeof ids[i], "c%d", i); idp[i] = ids[i]; pod_model_agent(&M, ids[i], ids[i], "claude", "mac"); }
+ pod_model_agents_end(&M);
+ cable_swarm_t sw;
+ memset(&sw, 0, sizeof sw);
+ snprintf(sw.id, SWARM_ID_MAX, "ten");
+ snprintf(sw.name, CABLE_NAME_MAX, "Ten");
+ sw.panes = sw.agents = 10;
+ const char *const *lists[1] = {(const char *const *)idp};
+ uint8_t cnt[1] = {10};
+ pod_model_swarms(&M, &sw, lists, cnt, 1, "ten", NULL, 0);
+ pod_model_link(&M, true);
+ pod_model_turn(&M, "c8", "activity", "Editing", 12, 100000u);
+ pod_model_clock(&M, 100000u);
+ CHECK(cs_card_lead(&M, 1) == pod_model_find(&M, "c8"));
+ }
+
// ---- Agent, Recap, Talk, Inbox, Toast, Update (Task 10) ----
{
static pod_model_t M;
@@ -500,10 +524,10 @@ int main(void) {
fresh();
cs_view_agent(&F, &N, &M, now);
{ const ht_run_t *r = text_run("Running"); CHECK(r && r->fg == ht_rgb(CS_RUN) && r->pro_font == &cs_md_28); }
- CHECK(text_run("NOW") && text_run("landing") && text_run("hold") && text_run("src/hero.tsx"));
+ CHECK(text_run("NOW") && text_run("landing") && !text_run("hold") && text_run("src/hero.tsx"));
{ const ht_run_t *r = text_run("landing"); CHECK(r && r->pro_font == &cs_sb_34); }
CHECK(!text_run("THIS TURN") && !text_run("LEADING UP TO IT") && !text_run("TOKENS") && !text_run("step 0") && !text_run("step 5"));
- CHECK(text_run("talk") && text_run("back") && text_run("home") && text_run("panes") && text_run("Desktop") && !text_run("Overview"));
+ CHECK(!text_run("talk") && !text_run("back") && !text_run("home") && !text_run("panes") && text_run("Desktop") && !text_run("Overview"));
for (int i = 0; i < S.count; i++) CHECK(S.runs[i].pro_kind != K_TEXT || !strstr(S.runs[i].text, "pane ")); // no "pane i of n"
CHECK(text_run("Mac Studio") && text_run("\xc2\xb7"));
{ const ht_run_t *r = text_run("Mac Studio"); CHECK(r->pro_font == &cs_rg_20); }
@@ -559,7 +583,7 @@ int main(void) {
CHECK(!text_run("LEADING UP TO IT") && !text_run("THIS TURN") && !text_run("TOKENS") && !text_run("NOW"));
// M9: voice on an asking agent stays refused, so the screen does not offer it: no hold hint, no voice line.
CHECK(!text_run("or hold to answer by voice") && !text_run("answer by voice") && !text_run("hold") && !text_run("talk") && !text_run("talk to harness-cli"));
- CHECK(text_run("panes") && text_run("back") && text_run("home") && text_run("\xe2\x86\x91"));
+ CHECK(!text_run("panes") && !text_run("back") && !text_run("home"));
CHECK(!text_run("Read migrations/0042.sql") && !text_run("Ran the migration on a copy"));
CHECK(cs_runs(&F) <= 184);
printf("runs agent-ask %d\n", cs_runs(&F));
@@ -571,7 +595,7 @@ int main(void) {
cs_view_recap(&F, &N, &M, now);
CHECK(!text_run("SUMMARY") && text_run("Done") && text_run("TOKENS") && text_run("DURATION") && text_run("TESTS") && text_run("COMMITS"));
CHECK(!text_run("STEPS"));
- CHECK(text_run("54 \xe2\x9c\x93") && text_run("talk") && text_run("4:12"));
+ CHECK(text_run("54 \xe2\x9c\x93") && !text_run("talk") && text_run("4:12"));
CHECK(text_run("61.4k") && text_prefix("in 42.9k") && text_prefix("in 42.9k")->pro_font == &cs_mono_15);
{ // the sub-line, when drawn, starts "in " and is never cut inside a number: "in 42.9k" or "in 42.9k \xc2\xb7 out 18.5k", whole (Linux fonts are wider than macOS)
const ht_run_t *sub = text_prefix("in ");
@@ -590,7 +614,7 @@ int main(void) {
CHECK(tiles == 4 && tile_h > 0 && tile_h <= 54); // half of the old 108 px
for (int k = 0; k < 4; k++) {
const ht_run_t *l = NULL, *v = NULL;
- for (int i = 0; i < S.count; i++) if (S.runs[i].pro_kind == K_TEXT && S.runs[i].y >= 500 && S.runs[i].y < 640) { // the tile band
+ for (int i = 0; i < S.count; i++) if (S.runs[i].pro_kind == K_TEXT && S.runs[i].y >= 500 && S.runs[i].y < POD_W - CS_FOOT_H) { // the tile band
if (!strcmp(S.runs[i].text, labels[k])) l = &S.runs[i];
if (!strcmp(S.runs[i].text, values[k])) v = &S.runs[i];
}
@@ -696,7 +720,7 @@ int main(void) {
CHECK(bars == 36);
}
CHECK(hmax[1] > hmax[0] + 20);
- CHECK(text_run("Listening \xc2\xb7 0:03") && text_run("landing") && text_run("Tap anywhere to send") && text_run("tap") && text_run("send") && !text_run("release") && !text_run("slide \xe2\x86\x93"));
+ CHECK(text_run("Listening \xc2\xb7 0:03") && text_run("landing") && text_run("Tap anywhere to send") && !text_run("tap") && !text_run("send") && !text_run("release") && !text_run("slide \xe2\x86\x93"));
CHECK(F.hit_count && F.hits[F.hit_count - 1].action == POD_A_TALK && F.hits[F.hit_count - 1].w == POD_W); // topmost: wins over crumbs and chip
CHECK(cs_runs(&F) <= 184);
printf("runs talk-listen %d\n", cs_runs(&F));
@@ -719,7 +743,7 @@ int main(void) {
{
const ht_run_t *g1 = text_run("NEEDS YOU"), *g2 = text_run("FINISHED"), *g3 = text_run("FAILED");
CHECK(g1 && g2 && g3 && g1->y < g2->y && g2->y < g3->y);
- CHECK(text_run("api-retry") && text_run("harness-cli") && text_run("tap") && text_run("home"));
+ CHECK(text_run("api-retry") && text_run("harness-cli") && !text_run("tap") && !text_run("home"));
CHECK(cs_runs(&F) <= 184);
printf("runs inbox %d\n", cs_runs(&F));
// NEEDS YOU rows have no unread entry: they register FOLLOW (index into model->agents), and it opens the agent
@@ -752,8 +776,7 @@ int main(void) {
int logos = 0;
for (int i = 0; i < S.count; i++) if (S.runs[i].pro_kind != K_TEXT && S.runs[i].w == 44 && S.runs[i].pro_height == 44) logos++;
CHECK(logos >= 2);
- CHECK(text_run("tap") && text_run("open") && text_run("\xe2\x86\x93") && text_run("home"));
- CHECK(!text_run("back") && !text_run("\xe2\x86\x91") && !text_run("\xe2\x86\x90"));
+ CHECK(!text_run("tap") && !text_run("open") && !text_run("home") && !text_run("back")); // no hint strip
CHECK(cs_runs(&F) <= 184);
// a tall list: 8 entries of mixed lengths, each reachable by scrolling
const char *const msgs[] = {"Done.", "OTA resend on a gap; 3 tests added.", longmsg, "Short one", longmsg, "Draft ready for review.", "Build green on all targets after the rebase onto main today.", "Last row"};
@@ -774,7 +797,7 @@ int main(void) {
CHECK(cs_runs(&F) <= 184);
for (int i = 0; i < F.hit_count; i++) {
if (F.hits[i].action != POD_A_OPEN_NOTIF) continue;
- CHECK(F.hits[i].y + F.hits[i].h <= POD_W - CS_HINT_H);
+ CHECK(F.hits[i].y + F.hits[i].h <= POD_W - CS_FOOT_H);
for (int k = 0; k < 8; k++) { char id[8]; snprintf(id, sizeof id, "x%d", k); if (!strcmp(F.hits[i].id, id)) seen[k] = true; }
}
}
diff --git a/devices/harness-pro/firmware/test/test_pro_app.py b/devices/harness-pro/firmware/test/test_pro_app.py
index b4ddb70fb..0b095b362 100644
--- a/devices/harness-pro/firmware/test/test_pro_app.py
+++ b/devices/harness-pro/firmware/test/test_pro_app.py
@@ -2537,7 +2537,9 @@ static void console_hold_cancel_keeps_the_recording(void) {
ucontact(true, 360, 600, &c);
CHECK(R.end_abort == 0 && V.open && pod_ui_talking(&U));
}
-static void console_tile_hold_refused_returns_to_the_tab(void) {
+// The hold to talk is the agent screens' own: a long still press on a Tab tile never asks the recorder, and its lift
+// opens the agent as a tap does.
+static void console_tile_long_press_is_a_tap(void) {
setup();
pod_ui_set_skin(&U, POD_SKIN_CONSOLE);
render();
@@ -2547,14 +2549,12 @@ static void console_tile_hold_refused_returns_to_the_tab(void) {
for (int i = 0; i < U.frame.hit_count; i++) if (U.frame.hits[i].action == POD_A_OPEN_AGENT) { tile = &U.frame.hits[i]; break; }
CHECK(tile);
const int x = tile->x + tile->w / 2, y = tile->y + tile->h / 2;
- V.refuse = true;
bool c;
ucontact(true, x, y, &c);
- for (int i = 0; i < 30 && !R.begins; i++) ucontact(true, x, y, &c);
- CHECK(R.begins == 1 && !V.open);
- CHECK(top() == POD_V_TAB && !pod_ui_talking(&U) && U.notice_on); // not left on the Agent screen it opened
+ for (int i = 0; i < 60; i++) ucontact(true, x, y, &c);
+ CHECK(R.begins == 0 && !V.open && top() == POD_V_TAB && !pod_ui_talking(&U) && !U.notice_on);
ucontact(false, x, y, &c);
- CHECK(top() == POD_V_TAB);
+ CHECK(top() == POD_V_AGENT && R.begins == 0 && !pod_ui_talking(&U));
}
int main(int argc, char **argv) {
@@ -2603,7 +2603,7 @@ int main(int argc, char **argv) {
{"update_gate", update_gate}, {"ota_failed_returns", ota_failed_returns}, {"ota_keeps_awake", ota_keeps_awake},
{"ota_notifications_quiet", ota_notifications_quiet}, {"updated_notice", updated_notice},
{"console_hold_fires_on_the_touch_path", console_hold_fires_on_the_touch_path}, {"console_hold_cancel_keeps_the_recording", console_hold_cancel_keeps_the_recording},
- {"console_tile_hold_refused_returns_to_the_tab", console_tile_hold_refused_returns_to_the_tab},
+ {"console_tile_long_press_is_a_tap", console_tile_long_press_is_a_tap},
};
for (unsigned i = 0; i < sizeof tests / sizeof tests[0]; i++)
if (argc == 1 || !strcmp(argv[1], tests[i].name)) { tests[i].run(); printf("PASS %s\n", tests[i].name); }