Skip to content

Commit 1af2e05

Browse files
committed
Merge remote-tracking branch 'origin/canary' into PG-1023-secret-cards
2 parents 32e767f + c79b571 commit 1af2e05

9 files changed

Lines changed: 146 additions & 166 deletions

File tree

‎.agents/dashboard/asks.md‎

Lines changed: 15 additions & 11 deletions
Large diffs are not rendered by default.

‎api/hono/src/lib/dashboard/inbox.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2329,7 +2329,7 @@ async function recordLink(
23292329
return row ? toItem(row) : null
23302330
}
23312331

2332-
// The poster closes its own open decision or draft (`bun run ask settle`), when it was decided another way: it reads Answered by the poster, with the note, and goes to Done at once, as a closed answer does. One the owner has answered is refused, as is a reply its poster has acked (a settle would replace its answer) and an update, which asks nothing.
2332+
// The poster closes its own open decision or draft (`bun run ask settle`), when it was decided another way: it reads Decided by the poster, with the note, and goes to Done at once, as a closed answer does. One the owner has answered is refused, as is a reply its poster has acked (a settle would replace its answer) and an update, which asks nothing.
23332333
export async function settleItem(
23342334
db: Database,
23352335
key: string,

‎packages/scripts/src/verify/dashboard-map.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@
5757
"A session waiting on a decision or draft it posted reads Waiting on your inbox, linked to the item.",
5858
"A session whose Claude login expired, as its transcript's API error or ops-unstick's read of its pane says, shows a Login expired card above its steps in place of the lost-prompt line: Add account opens Settings' own Add account dialog, and the Claude account it keeps restarts the session on it through POST /api/v1/workers/:sessionId/restart (spawn.sh close, then resume on --account), its conversation kept; Restart reopens it on this Mac's own login; the composer keeps a typed /login unsent and says to use Add account, so it never lands on a prompt.",
5959
"Above the steps, on a Checkpoint line, Load older pages back through the session's older steps from the database until the start of the session, or says the database has not read that far.",
60-
"An answered Inbox item keeps one line above its footer saying what he chose and whether it reached its poster, a go reading as still being carried out (Sending in Slack… for a sent draft, Saving a Slack draft… for a Draft) until its poster closes it, then linking where it landed (a Slack link as Open thread) or giving why there is no link, a Draft Slack refused reading, gray, Draft not saved with why.",
60+
"An answered Inbox item keeps one line above its footer naming what he picked in the card's own words (B · Hotfix main, Approve · Ship 3f9a2c1 to main, Sent), adding a state only where the answer waits or failed (Queued for, Send failed), his comment on the line under it as You: <comment>, a go's light blue until its poster closes it, then linking where it landed (a Slack link as Open thread) or giving why there is no link, a Draft Slack refused reading, gray, Draft not saved with why.",
6161
"An Inbox answer that did not reach its poster stays in the list and its count, its result reading Send failed, Lost, or Send unconfirmed, with the reason above a footer whose left end holds Retry, which sends it again, or for Send unconfirmed Check it for me, and whose right end holds Dismiss, then Reply; one the session holds reads Queued until it is delivered, and offers Retry once stuck queued past 11 minutes.",
6262
"An Inbox decision, except a secret ask, previews exactly what Approve does (an extension accept, a change to your apps or a System Settings pane for a macOS permission, which the Dashboard carries out itself, a Slack message, a ship of canary, a new Linear ticket, a delete, a schema, a budget, or a plain ask saying what its poster does) over its options, picked by click or number key then sent with Send: Approve and Deny in muted green and red for a yes or no, or lettered A to E then None of these for real alternatives, then an optional comment box that goes with whatever he answers, and on the right Archive, which keeps it out of the list unanswered (to the Archive row), Later and Reply.",
6363
"An Inbox decision's plain ask labels its own options, one line each: one and a Deny label for a yes or no, or 2 to 5 lettered A to E, and once answered its card names the option picked.",
6464
"An Inbox draft is its Slack message or Linear comment, editable in place, over Send, Draft (a Slack draft alone: its poster saves it in Slack's Drafts & Sent) and Discard, its meta line naming which from its link and linking the thread it replies in as Open thread.",
6565
"An Inbox item keeps its place while the list is open: one that arrives waits behind a pill at the top (1 new update), which puts what waits on top, newest first, as the list glides down, and a card that moved under him (another left for Done, or the pill was taken) pauses its buttons for 1 second.",
66-
"An Inbox secret ask names its key and where its value goes (a Vercel project and its environments, or an item in this Mac's Keychain) over a masked field and Submit, which hands the value to that place and keeps it nowhere, and a comment box that Reply alone sends, refusing words equal to the field, then reads only Provided at its time with each environment's exit status, or saved.",
66+
"An Inbox secret ask names its key and where its value goes (a Vercel project and its environments, or an item in this Mac's Keychain) over a masked field and Submit, which hands the value to that place and keeps it nowhere, and a comment box that Reply alone sends, refusing words equal to the field, then reads only Provided with each environment's mark (✓, or ✗ with its line), or saved.",
6767
"An Inbox update is an outcome, bold with a dot while unread, and a click on its title, its tick or its Dismiss marks it read.",
6868
"Below the owner rung, a lock.",
6969
"Beside the view, the aside window's tabs, the Inbox first, then on another session's view dispatcher's own chat and composer (Chat), then a square for each app you show, then Pages, then Apps last (on a phone the view's own tab leads them): one plain list of what the factory posted through bun run ask, in priority order (decisions and drafts that need you, then unread updates, then the rest: whatever waits on a verb, however old, and anything else from the last week, each newest first), each a card whose band ends in its time and a Mark as read tick and whose footer holds an open decision's Send or a draft's Send, Draft and Discard at its left end and, at its right end, its verbs by its state (Done, Later, Archive, Move back and Dismiss, where offered), then every card's Expand or Collapse toggle, then Reply, an open decision or draft taking an optional comment, an answered or settled card's result reading on its own line above the footer; the list and its shelves are rows that open and shut, each with its count: Inbox with Mark all as read, then In progress (an approved go or a sent draft its poster carries out, until its poster closes it), Later, Archive and Done, and All caught up over a list with nothing waiting; a card that needs no answer now folds to its band, title, result line and row of choices until opened, every shelf shows the same card with no shelf mute, and an archived one offers Later, Move back and Dismiss.",

‎skills/zerostarter/design/SKILL.md‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎tests/web/next/src/components/dashboard/inbox.test.ts‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ const named = (html: string, label: string): string =>
9696
})
9797
?.split(">")[0] ?? ""
9898

99-
// The delivery line names its poster by its label, and the label keeps the raw session name on hover, as the sender label does. The dashboard here holds no live session, so the poster reads as plain text with its hover.
100-
describe("a delivered answer's poster", () => {
99+
// A result line that names its poster (Queued for, Send unconfirmed) names it by its label, and the label keeps the raw session name on hover, as the sender label does. The dashboard here holds no live session, so the poster reads as plain text with its hover.
100+
describe("a queued answer's poster", () => {
101101
const answered = {
102102
...decision,
103103
answer: {
@@ -114,16 +114,20 @@ describe("a delivered answer's poster", () => {
114114
} as InboxItem
115115

116116
test("is shown by its label with the raw name on hover", () => {
117-
const html = render(false, answered)
118-
expect(html).toContain("Delivered to")
117+
const html = render(false, {
118+
...answered,
119+
delivery: { at: "2026-10-12T10:05:01.000Z", status: "queued" },
120+
} as InboxItem)
121+
expect(html).toContain("Queued for")
119122
expect(html).toContain('aria-description="ops"')
120123
})
121124

122125
test("is the session that took the answer when the poster had ended, with its raw name on hover", () => {
123126
const html = render(false, {
124127
...answered,
125-
delivery: { ...answered.delivery, to: "dispatcher" },
128+
delivery: { at: "2026-10-12T10:05:01.000Z", status: "queued", to: "dispatcher" },
126129
} as InboxItem)
130+
expect(html).toContain("Queued for")
127131
expect(html).toContain('aria-description="dispatcher"')
128132
})
129133
})
@@ -239,14 +243,14 @@ describe("a card's change and colour: its updated time, and colour for its kind
239243
// #882: a folded row keeps its choices
240244
test("an answered card folds to its result, keeping Done, Dismiss and its chevron, and opened, they sit in the footer row left of Reply, its result above the row", () => {
241245
const folded = render(false, sending)
242-
expect(folded).toContain("Being carried out")
246+
expect(folded).toContain("Approve · Ship 3f9a2c1 to main")
243247
for (const label of ["Done", "Dismiss", "Expand"]) expect(named(folded, label)).not.toBe("")
244248
const html = opened(sending)
245249
const dismiss = named(html, "Dismiss")
246250
expect(dismiss).not.toBe("")
247251
const reply = html.indexOf('aria-label="Reply to #i41"')
248252
expect(reply).toBeGreaterThan(-1)
249-
expect(html.indexOf("Being carried out")).toBeLessThan(html.indexOf(dismiss))
253+
expect(html.indexOf("Approve · Ship 3f9a2c1 to main")).toBeLessThan(html.indexOf(dismiss))
250254
expect(html.indexOf(dismiss)).toBeLessThan(reply)
251255
})
252256
})
@@ -356,9 +360,10 @@ describe("a card a chat reply collapsed", () => {
356360
.find((button) => /aria-label="(Expand|Collapse)"/.test(button))
357361
?.split(">")[0] ?? ""
358362

359-
test("reads as being worked on, folded: no Send, Draft, Discard or Later, and Expand to open it, on E too", () => {
363+
test("reads as being worked on, folded: its blue light, no Send, Draft, Discard or Later, and Expand to open it, on E too", () => {
360364
const html = render(false, replied())
361-
expect(html).toContain("is on it…")
365+
expect(html).toContain("You replied")
366+
expect(html).toContain("animate-spin")
362367
for (const label of ["Send", "Draft", "Discard", "Later"]) expect(named(html, label)).toBe("")
363368
expect(toggle(html)).toContain('aria-expanded="false"')
364369
expect(toggle(html)).toContain('aria-keyshortcuts="E"')
@@ -776,7 +781,7 @@ describe("a settled card's footer", () => {
776781

777782
test("the result sits above the footer row and Dismiss stands in the row, left of Reply", () => {
778783
const html = opened(settled)
779-
const resultAt = html.indexOf("Answered by")
784+
const resultAt = html.indexOf("Decided by")
780785
const footerAt = html.indexOf('data-slot="card-footer"')
781786
const dismissAt = html.indexOf(named(html, "Dismiss"))
782787
const replyAt = html.indexOf('aria-label="Reply to #i41"')
@@ -793,15 +798,15 @@ describe("a settled card's footer", () => {
793798
).toBe(-1)
794799
})
795800

796-
test("the poster's settle reason reads once, in the result, never as Your note, since he never wrote it", () => {
801+
test("the poster's settle reason reads once, in the result, never as his comment, since he never wrote it", () => {
797802
const html = render(false, settled)
798-
expect(html).not.toContain("Your note")
803+
expect(html).not.toContain("You: ")
799804
const approved = {
800805
...decision,
801806
answer: { at: "2026-10-12T10:05:00.000Z", choice: "approve", note: "Ship it after lunch." },
802807
status: "done",
803808
} as InboxItem
804-
expect(render(false, approved)).toContain("Your note: Ship it after lunch.")
809+
expect(render(false, approved)).toContain("You: Ship it after lunch.")
805810
})
806811
})
807812

0 commit comments

Comments
 (0)