Skip to content
Python

App shell: sidebar by machine, runs-on chip, composer, transcript

Rohit C Prasad0379865f6bf0
diff --git a/surfaces/gui/src/components/AuditView.tsx b/surfaces/gui/src/components/AuditView.tsx
index 8c051db6..089d7155 100644
--- a/surfaces/gui/src/components/AuditView.tsx
+++ b/surfaces/gui/src/components/AuditView.tsx
@@ -7,8 +7,8 @@ import { PanelHead } from "./IntegrationsView";
// (centered panel + PanelHead + cards), replacing the legacy `page-view` layout. Read-only:
// filterable, with sanitized arguments.
const CARD = "rounded-xl2 border border-line bg-panel";
-const INPUT = "px-3 py-1.5 rounded-lg border border-line bg-paper text-[13px] text-ink outline-none focus:border-accent";
-const BTN_ACCENT = "text-[13px] px-3 py-1.5 rounded-lg bg-accent text-white shrink-0";
+const INPUT = "px-3 py-1.5 rounded-lg border border-line bg-paper text-ui text-ink outline-none focus:border-accent";
+const BTN_ACCENT = "text-ui px-3 py-1.5 rounded-lg bg-accent text-white shrink-0";
export function AuditView() {
const [events, setEvents] = useState<AuditEvent[]>([]);
@@ -50,7 +50,7 @@ export function AuditView() {
</div>
{events.length === 0 ? (
- <div className={CARD + " p-4 text-[13px] text-muted"}>{t("audit.no_events")}</div>
+ <div className={CARD + " p-4 text-ui text-muted"}>{t("audit.no_events")}</div>
) : (
<div className="space-y-2">
{events.map((ev) => (
@@ -69,20 +69,20 @@ function AuditRow({ ev }: { ev: AuditEvent }) {
return (
<div className={CARD + " p-3.5"}>
<div className="flex items-center gap-2 flex-wrap">
- <span className="font-mono text-[13px] font-medium text-ink">{ev.tool}</span>
- <span className="text-[12px] text-faint">
+ <span className="font-mono text-ui font-medium text-ink">{ev.tool}</span>
+ <span className="text-meta text-faint">
{ev.connector || t("audit.fallback_tool")} · {ev.stage || ev.status || t("audit.fallback_event")} · {ev.timestamp}
</span>
</div>
- <div className="text-[12px] text-muted mt-0.5">
+ <div className="text-meta text-muted mt-0.5">
{t("audit.session")} {ev.session_id || "-"} {ev.approval ? `· ${ev.approval}` : ""} {ev.status ? `· ${ev.status}` : ""}
</div>
- {ev.resource && <div className="text-[12px] text-faint mt-0.5">{t("audit.resource", { value: ev.resource })}</div>}
+ {ev.resource && <div className="text-meta text-faint mt-0.5">{t("audit.resource", { value: ev.resource })}</div>}
{ev.args && Object.keys(ev.args).length > 0 && (
- <div className="font-mono text-[12px] text-muted mt-1.5 break-words">{formatAuditArgs(ev.args)}</div>
+ <div className="font-mono text-meta text-muted mt-1.5 break-words">{formatAuditArgs(ev.args)}</div>
)}
{(ev.reason || ev.result_preview) && (
- <div className="text-[12px] text-faint mt-1">{ev.reason || ev.result_preview}</div>
+ <div className="text-meta text-faint mt-1">{ev.reason || ev.result_preview}</div>
)}
</div>
);
diff --git a/surfaces/gui/src/components/AutomationQuickstart.tsx b/surfaces/gui/src/components/AutomationQuickstart.tsx
index 45ccd165..9a4f5939 100644
--- a/surfaces/gui/src/components/AutomationQuickstart.tsx
+++ b/surfaces/gui/src/components/AutomationQuickstart.tsx
@@ -303,13 +303,13 @@ export function AutomationQuickstart({
? t("automations.gate_pick_channel")
: "";
- const label = "block text-[12px] text-muted mt-3 mb-1";
+ const label = "block text-meta text-muted mt-3 mb-1";
const input =
- "w-full px-3 py-2 rounded-lg border border-line bg-panel text-[13px] outline-none focus:border-accent";
+ "w-full px-3 py-2 rounded-lg border border-line bg-panel text-ui outline-none focus:border-accent";
return (
<div className="mb-4">
- <div className="text-[11px] uppercase tracking-[0.05em] text-faint mb-2.5">
+ <div className="text-label text-faint mb-2.5">
{t("automations.start_from_template")}
</div>
{/* Equal-height cards (owner ask 2026-07-12): 1fr rows + h-full — <button> grid items
@@ -327,8 +327,8 @@ export function AutomationQuickstart({
}
onClick={() => pick(tpl)}
>
- <span className="text-[13px] font-semibold">{t(tpl.titleKey)}</span>
- <span className="text-[12px] text-muted leading-relaxed flex-1">{t(tpl.blurbKey)}</span>
+ <span className="text-ui font-semibold">{t(tpl.titleKey)}</span>
+ <span className="text-meta text-muted leading-relaxed flex-1">{t(tpl.blurbKey)}</span>
<span className="flex items-center gap-1.5 mt-1">
{tpl.conns.map((c) => {
const cs = connState(c.name);
@@ -347,7 +347,7 @@ export function AutomationQuickstart({
</span>
);
})}
- <span className="text-[11px] text-faint ml-0.5">
+ <span className="text-label text-faint ml-0.5">
{tpl.conns.length === 0 ? t("automations.no_conns_with_cadence", { cadence: t(tpl.cadenceKey) }) : t(tpl.cadenceKey)}
</span>
</span>
@@ -363,11 +363,11 @@ export function AutomationQuickstart({
>
{/* §30: the card names its template — without this it starts abruptly after the grid. */}
<div className="flex items-baseline gap-2 pb-2.5 mb-1 border-b border-line">
- <span className="text-[11px] uppercase tracking-[0.05em] text-accent font-semibold">
+ <span className="text-label text-accent font-medium">
{t("automations.set_up")}
</span>
- <span className="text-[14px] font-semibold">{t(picked.titleKey)}</span>
- <span className="ml-auto text-[12px] text-faint max-sm:hidden">
+ <span className="text-body font-semibold">{t(picked.titleKey)}</span>
+ <span className="ml-auto text-meta text-faint max-sm:hidden">
{picked.conns.length ? t("automations.conns_delivery_sched") : t("automations.delivery_sched")} ·{" "}
{t(picked.cadenceKey)}
</span>
@@ -380,13 +380,13 @@ export function AutomationQuickstart({
<div className="flex items-center gap-3 py-2.5">
{c && <ConnectorBadge connector={c} size={26} title={c.title} />}
<span className="min-w-0 flex-1">
- <span className="block text-[13px] font-medium">{c?.title || name}</span>
- <span className="block text-[12px] text-faint">{t(whyKey)}</span>
+ <span className="block text-ui font-medium">{c?.title || name}</span>
+ <span className="block text-meta text-faint">{t(whyKey)}</span>
</span>
{c?.connected ? (
- <span className="text-[13px] text-ok">{t("automations.connected_ok")}</span>
+ <span className="text-ui text-ok">{t("automations.connected_ok")}</span>
) : flow ? (
- <span className="inline-flex items-center gap-2 text-[12px] text-muted">
+ <span className="inline-flex items-center gap-2 text-meta text-muted">
<Spinner />
{flow.phase === "opening"
? t("automations.opening_browser")
@@ -394,7 +394,7 @@ export function AutomationQuickstart({
</span>
) : (
<button
- className="px-3.5 py-1 rounded-full border border-line text-[13px] hover:bg-paper"
+ className="px-3.5 py-1 rounded-full border border-line text-ui hover:bg-paper"
onClick={() => startConnect(name)}
data-testid={`ob-connect-${name}`}
>
@@ -406,7 +406,7 @@ export function AutomationQuickstart({
and let Cancel clear the LOCAL state (the browser tab is the user's). */}
{flow?.phase === "waiting" && (
<div
- className="flex items-start gap-2 bg-accentSoft/50 rounded-lg px-3 py-2 mb-2.5 text-[12px] text-muted"
+ className="flex items-start gap-2 bg-accentSoft/50 rounded-lg px-3 py-2 mb-2.5 text-meta text-muted"
data-testid="ob-connect-wait"
>
<span>↗</span>
@@ -431,22 +431,22 @@ export function AutomationQuickstart({
{pendingConn && !cloud?.signed_in && (
<div
- className="bg-accentSoft/50 rounded-xl px-4 py-3 mt-3 text-[13px] text-muted"
+ className="bg-accentSoft/50 rounded-xl px-4 py-3 mt-3 text-ui text-muted"
data-testid="ob-cloudpane"
>
- <span className="block text-[13px] text-ink font-medium">
+ <span className="block text-ui text-ink font-medium">
{t("automations.one_signin_unlocks")}
</span>
{t("automations.cloud_brokered")}
<div className="flex items-center gap-3 mt-2">
{signinPhase ? (
<>
- <span className="inline-flex items-center gap-2 text-[12px]">
+ <span className="inline-flex items-center gap-2 text-meta">
<Spinner />
{signinPhase === "opening" ? t("automations.opening_browser") : t("automations.waiting_signin")}
</span>
{signinPhase === "waiting" && (
- <span className="text-[12px] text-faint">
+ <span className="text-meta text-faint">
{t("automations.finish_signin_desc")}{" "}
<button
className="underline hover:text-muted"
@@ -460,7 +460,7 @@ export function AutomationQuickstart({
</>
) : (
<button
- className="px-3.5 py-1 rounded-full border border-line text-[13px] text-accent hover:bg-panel"
+ className="px-3.5 py-1 rounded-full border border-line text-ui text-accent hover:bg-panel"
onClick={signInThenConnect}
data-testid="ob-cloud-signin"
>
@@ -498,7 +498,7 @@ export function AutomationQuickstart({
}
/>
</div>
- <p className="text-[11px] text-warnInk mt-1">
+ <p className="text-label text-warnInk mt-1">
{t("automations.bot_member_hint")}
</p>
</>
@@ -514,7 +514,7 @@ export function AutomationQuickstart({
/>
</div>
<input
- className="w-28 px-3 py-2 rounded-lg border border-line bg-panel text-[13px] outline-none focus:border-accent"
+ className="w-28 px-3 py-2 rounded-lg border border-line bg-panel text-ui outline-none focus:border-accent"
type="time"
aria-label={t("automations.time_aria")}
value={time}
@@ -536,7 +536,7 @@ export function AutomationQuickstart({
</>
)}
{picked.consent ? (
- <label className="flex items-start gap-2.5 mt-3.5 text-[13px] text-muted select-none">
+ <label className="flex items-start gap-2.5 mt-3.5 text-ui text-muted select-none">
<input
type="checkbox"
className="mt-0.5"
@@ -554,7 +554,7 @@ export function AutomationQuickstart({
</span>
</label>
) : picked.conns.length > 0 ? (
- <p className="text-[13px] text-muted mt-3">
+ <p className="text-ui text-muted mt-3">
{t("automations.read_only_pref")} <b className="text-ink">{t("automations.reads")}</b> {t("automations.read_only_suff")}
</p>
) : null}
@@ -563,21 +563,21 @@ export function AutomationQuickstart({
<div className="flex items-center gap-3 mt-4">
<button
- className="text-[13px] text-faint hover:text-muted"
+ className="text-ui text-faint hover:text-muted"
onClick={() => setPickedKey(null)}
>
{t("automations.cancel")}
</button>
{/* A silently-disabled primary reads as a bug — always name the missing piece. */}
{gateHint && (
- <span className="ml-auto text-[12px] text-faint" data-testid="ob-create-hint">
+ <span className="ml-auto text-meta text-faint" data-testid="ob-create-hint">
{gateHint}
</span>
)}
<button
className={
(gateHint ? "" : "ml-auto ") +
- "px-5 py-2 rounded-full bg-ink text-panel text-[13px] disabled:opacity-40"
+ "px-5 py-2 rounded-full bg-ink text-panel text-ui disabled:opacity-40"
}
disabled={busy || !allConnected || (picked.needsChannel && !channel)}
onClick={create}
diff --git a/surfaces/gui/src/components/Composer.tsx b/surfaces/gui/src/components/Composer.tsx
index 5e4b0e1b..a98242dc 100644
--- a/surfaces/gui/src/components/Composer.tsx
+++ b/surfaces/gui/src/components/Composer.tsx
@@ -81,6 +81,12 @@ interface Props {
mode: string;
model: string;
models?: string[];
+ // Entries of `models` this machine cannot run (a coworker's `models:` list names them
+ // regardless, spec §4): shown in the menu with a note, never hidden.
+ unavailableModels?: string[];
+ // The coworker's own `models:` list when none of it runs here: the "No model" chip
+ // names what would work instead of a bare warning.
+ wantedModels?: string[];
modelLabels?: Record<string, string>; // curated display names (raw id when absent)
// The model is FIXED once the session has history (§17): the picker renders ONLY on a fresh
// session; after the first turn the fact lives in the topbar subtitle (§22) — no
@@ -102,6 +108,9 @@ interface Props {
sessionId?: string;
onInterrupt: () => void;
onModeChange: (mode: string) => void;
+ // §11.6: a team worker has no mode of its own — approvals follow its lead. Renders a
+ // read-only chip in place of the Mode menu.
+ followsLead?: boolean;
onModelChange: (model: string) => void;
// When set (Code/Cowork), the Mode menu is shown. The folder/roots + branch controls left the
// composer for the Session settings drawer (§22) — folder access is standing session config.
@@ -188,7 +197,7 @@ export function Composer(props: Props) {
const bindRow = (icon: "book" | "table", label: string, kind: "memory" | "board") => (
<button
className={
- "w-full flex items-center gap-2.5 px-3 py-1.5 text-[13px] text-left hover:bg-paper" +
+ "w-full flex items-center gap-2.5 px-3 py-1.5 text-ui text-left hover:bg-paper" +
(bindMenu === kind ? " bg-paper" : "")
}
onClick={() => setBindMenu(bindMenu === kind ? null : kind)}
@@ -245,11 +254,13 @@ export function Composer(props: Props) {
// Apply a prefill (text + attachments) pushed from outside, then focus the composer. Applied at
// most once per nonce (a ref guards against StrictMode/re-render double-fires), and attachments
// are de-duplicated so the same file never lands twice.
- const appliedNonce = useRef<number>(-1);
useEffect(() => {
const p = props.prefill;
- if (!p || p.nonce === appliedNonce.current) return;
- appliedNonce.current = p.nonce;
+ if (!p) return;
+ // No once-per-nonce ref guard: StrictMode's dev double-effect re-runs the
+ // clear above AFTER a guarded prefill had applied, leaving the composer
+ // empty. Re-applying is safe — setText is idempotent and the attachment
+ // merge de-duplicates — and the [nonce] dep still scopes when this fires.
setText(p.text);
if (p.attachments?.length) setAttachments((cur) => mergeAttachments(cur, p.attachments!));
textareaRef.current?.focus();
@@ -485,10 +496,48 @@ export function Composer(props: Props) {
).map((m) => ({
value: m,
label: props.modelLabels?.[m] || shortModel(m),
+ ...(props.unavailableModels?.includes(m)
+ ? { description: t("onmachine.composer.model_unavailable") }
+ : {}),
}));
const iconBtn =
- "w-7 h-7 grid place-items-center rounded-md text-muted hover:text-ink hover:bg-paper shrink-0";
+ "w-7 h-7 grid place-items-center rounded-md text-faint hover:text-ink hover:bg-paper shrink-0";
+
+ // UX-048: the model pill shows the model NAME; provider and the context line live in its
+ // tooltip. Curated labels read "Claude Sonnet 4.6 · Anthropic" — the part before the dot is
+ // the name (same split the old header subtitle used). The context ring (OPE-42 meter, now
+ // inside the pill) needs a known window; the setting governs the ring, never the tooltip.
+ const fullModelLabel = props.modelLabels?.[props.model] || shortModel(props.model);
+ const modelName = fullModelLabel.split(" · ")[0];
+ const hasUsage = !!props.usage && totalTokens(props.usage) > 0;
+ const ctxPct =
+ hasUsage && props.contextWindow
+ ? Math.min(100, Math.round((props.usage!.context / props.contextWindow) * 100))
+ : null;
+ const ctxLine = !hasUsage
+ ? ""
+ : ctxPct !== null
+ ? t("onmachine.composer.context_line", {
+ pct: ctxPct,
+ used: formatTokens(props.usage!.context),
+ window: formatTokens(props.contextWindow as number),
+ })
+ : t("onmachine.composer.context_unknown", { used: formatTokens(props.usage!.context) });
+ const providerName =
+ fullModelLabel.split(" · ")[1] ||
+ (props.model.includes(":") ? props.model.split(":")[0] : "");
+ const modelTip = (
+ <>
+ <div className="dd-tip-title">{modelName}</div>
+ {providerName && <div className="dd-tip-sub">{providerName}</div>}
+ <div className="dd-tip-row">
+ <ContextRing pct={ctxPct} size={14} />
+ <span>{ctxLine || t("onmachine.composer.no_usage")}</span>
+ </div>
+ <div className="dd-tip-hint">{t("onmachine.composer.click_change_model")}</div>
+ </>
+ );
// The send button is accent only when there's something to send — subtle grey otherwise, so the
// composer isn't carrying a constant blue dot.
@@ -501,7 +550,7 @@ export function Composer(props: Props) {
{props.approvalSlot}
{dictationError && (
- <div className="max-w-3xl mx-auto mb-2 px-1 text-[12px] text-red-600" role="alert">
+ <div className="max-w-3xl mx-auto mb-2 px-1 text-meta text-red-600" role="alert">
{dictationError}
</div>
)}
@@ -510,7 +559,7 @@ export function Composer(props: Props) {
{attachNotice && (
<div
data-testid="attach-notice"
- className="max-w-3xl mx-auto mb-1.5 flex items-center gap-2 rounded-lg border border-warnInk/30 bg-warnSoft px-3 py-1.5 text-[13px] text-warnInk"
+ className="max-w-3xl mx-auto mb-1.5 flex items-center gap-2 rounded-lg border border-warnInk/30 bg-warnSoft px-3 py-1.5 text-ui text-warnInk"
>
<span className="flex-1">{attachNotice}</span>
<button
@@ -534,7 +583,7 @@ export function Composer(props: Props) {
<div
className={
- "composer max-w-3xl mx-auto rounded-2xl border border-line bg-panel shadow-sm" +
+ "composer max-w-3xl mx-auto rounded-2xl border border-ink/[0.08] bg-panel shadow-[0_1px_2px_rgba(0,0,0,0.03),0_4px_14px_-10px_rgba(0,0,0,0.08)]" +
(dragging ? " dragging" : "")
}
onDragOver={(e) => {
@@ -551,11 +600,11 @@ export function Composer(props: Props) {
{/* "/" force-run popup — in-flow above the textarea; rows are the session's
effective menu only (muted/disabled skills never appear). */}
{slashQuery !== null && (
- <div className="px-2 pt-2" data-testid="skill-popup" role="listbox" aria-label="Skills">
+ <div className="px-2 pt-2" data-testid="skill-popup" role="listbox" aria-label={t("onmachine.composer.skills_aria")}>
{slashSkills === null ? (
- <div className="px-2 py-1.5 text-[12px] text-faint">Loading skills…</div>
+ <div className="px-2 py-1.5 text-meta text-faint">{t("onmachine.composer.skills_loading")}</div>
) : slashMatches.length === 0 ? (
- <div className="px-2 py-1.5 text-[12px] text-faint">No matching skills.</div>
+ <div className="px-2 py-1.5 text-meta text-faint">{t("onmachine.composer.skills_none")}</div>
) : (
slashMatches.map((s, i) => (
<button
@@ -569,9 +618,9 @@ export function Composer(props: Props) {
onMouseEnter={() => setSlashIndex(i)}
onClick={() => pickSkill(s)}
>
- <span className="text-[13px] font-medium text-accent shrink-0">/{s.name}</span>
- <span className="text-[12px] text-faint truncate flex-1">{s.description}</span>
- <span className="text-[11px] px-1.5 py-0.5 rounded-full border border-line text-faint shrink-0">
+ <span className="text-ui font-medium text-accent shrink-0">/{s.name}</span>
+ <span className="text-meta text-faint truncate flex-1">{s.description}</span>
+ <span className="text-label px-1.5 py-0.5 rounded-full border border-line text-faint shrink-0">
{s.scope}
</span>
</button>
@@ -581,7 +630,7 @@ export function Composer(props: Props) {
)}
<textarea
ref={textareaRef}
- className="w-full block px-3.5 pt-3.5 pb-1.5 text-[14px]"
+ className="w-full block px-3.5 pt-3.5 pb-1.5 text-body"
placeholder={
props.gateOpen
? t("composer.placeholder_gate")
@@ -617,7 +666,7 @@ export function Composer(props: Props) {
/>
<div className="absolute z-40 bottom-full mb-1 left-0 min-w-[200px] rounded-xl border border-line bg-panel shadow-2xl py-1.5">
{sessionRows && (
- <div className="px-3 pt-1 pb-0.5 text-[10.5px] font-semibold tracking-wide uppercase text-faint">
+ <div className="px-3 pt-1 pb-0.5 text-[10.5px] font-medium text-faint">
{t("composer.attach_this_message")}
</div>
)}
@@ -631,7 +680,7 @@ export function Composer(props: Props) {
{sessionRows && (
<>
<div className="my-1 border-t border-line" />
- <div className="px-3 pt-0.5 pb-0.5 text-[10.5px] font-semibold tracking-wide uppercase text-faint">
+ <div className="px-3 pt-0.5 pb-0.5 text-[10.5px] font-medium text-faint">
{t("composer.attach_this_session")}
</div>
{bindRow("book", t("composer.bind_memory"), "memory")}
@@ -675,8 +724,16 @@ export function Composer(props: Props) {
return <i key={index} style={{ height: Math.round(4 + level * 24) }} />;
})}
</span>
- <span className="text-[12px] text-muted tabular-nums">{recordingTime}</span>
+ <span className="text-meta text-muted tabular-nums">{recordingTime}</span>
</div>
+ ) : props.followsLead ? (
+ <span
+ className="inline-flex items-center gap-1 px-2 py-1 rounded-lg text-meta text-muted shrink-0"
+ data-testid="mode-follows-lead"
+ title={t("onmachine.composer.follows_lead_title")}
+ >
+ {t("onmachine.composer.follows_lead")}
+ </span>
) : props.workspace !== undefined ? (
<ModeMenu
reviewerPaused={props.reviewerPaused}
@@ -687,23 +744,10 @@ export function Composer(props: Props) {
/>
) : null}
- {dictationBusy === t("composer.starting_transcribe") && <span className="text-[12px] text-accent">{dictationBusy}</span>}
+ {dictationBusy === t("composer.starting_transcribe") && <span className="text-meta text-accent">{dictationBusy}</span>}
<span className="ml-auto" />
- {/* token usage (OPE-42) — a quiet chip; hidden until the server reports usage.
- Shows the context-window fill bar alone (the session total lives in the
- popover), or the session total when there's no window / the bar is off. */}
- {!dictation?.recording && props.usage && totalTokens(props.usage) > 0 && (
- <UsageChip
- usage={props.usage}
- contextWindow={props.contextWindow}
- contextBar={props.contextBar}
- model={props.model}
- modelLabels={props.modelLabels}
- />
- )}
-
{/* model — a quiet chip, now for the session's whole life (§17 rev 2026-07-22:
mid-session switching shipped, so the picker stays actionable; the topbar
subtitle still states the current model). */}
@@ -711,14 +755,32 @@ export function Composer(props: Props) {
<button
className="pill model-warn chip"
onClick={() => props.onConnectModel?.()}
- title={t("composer.model.connect")}
+ title={
+ props.wantedModels?.length
+ ? t("onmachine.composer.runs_on_models", {
+ models: props.wantedModels.map(shortModel).join(t("onmachine.list_or")),
+ })
+ : t("composer.model.connect")
+ }
aria-label={t("composer.model.none_aria")}
>
<span className="pill-label">{t("composer.model.none")}</span>
<span className="model-warn-ico" aria-hidden>⚠</span>
</button>
) : modelsLoaded ? (
- <Dropdown value={props.model} options={modelOptions} onChange={props.onModelChange} align="right" />
+ <Dropdown
+ value={props.model}
+ options={modelOptions}
+ onChange={props.onModelChange}
+ align="right"
+ displayLabel={modelName}
+ tooltip={modelTip}
+ leading={
+ props.contextBar === true && hasUsage ? (
+ <ContextRing pct={ctxPct} label={ctxLine} testId="usage-chip" />
+ ) : null
+ }
+ />
) : (
<button
className="pill chip text-faint cursor-default"
@@ -788,148 +850,41 @@ export function Composer(props: Props) {
);
}
-// Token-usage chip + popover (OPE-42). Trigger: a tiny context-fill meter (only when the
-// active model's window is known) + the session's total token count. Click → per-model
-// breakdown. Tokens only, never dollars (true cost is unknowable client-side — discounted
-// pricing, per-provider cache billing).
-function UsageChip({
- usage,
- contextWindow,
- contextBar,
- model,
- modelLabels,
+// Context ring (OPE-42 meter, UX-048 placement): a small ring at the left of the model name
+// and inside its hover card. Accent arc = context-window fill, warn color from 80%; with no
+// known window (custom / Ollama models) the track renders empty. The old popover is gone —
+// the hover card carries the figures.
+function ContextRing({
+ pct,
+ size = 12,
+ label,
+ testId,
}: {
- usage: SessionUsage;
- contextWindow?: number;
- contextBar?: boolean;
- model: string;
- modelLabels?: Record<string, string>;
+ pct: number | null;
+ size?: number;
+ label?: string;
+ testId?: string;
}) {
- const [open, setOpen] = useState(false);
- const total = totalTokens(usage);
- const pct = contextWindow
- ? Math.min(100, Math.round((usage.context / contextWindow) * 100))
- : null;
- // Settings can hide the bar; without a known window there is nothing to fill either.
- const showBar = pct !== null && contextBar === true;
- // Release hold (owner call 2026-08-24): cumulative session totals need more vetting
- // before they ship — cache-read sums across turns read like a bill. Until then the
- // chip and popover speak context-window only. Flip this to restore the breakdown.
- const SHOW_SESSION_TOTALS = false;
- const labelFor = (id: string) =>
- id === "unknown" ? "Unknown model" : modelLabels?.[id] || shortModel(id);
- // One field per line, session-summed (owner ask 2026-07-28). Values are cumulative
- // across the whole session, never just the last turn; "Input" is the fresh
- // (uncached) share — the cached share sits in the cache rows at its own price.
- const stat = (label: string, value: number) => (
- <div className="flex items-baseline justify-between text-[12px] leading-snug">
- <span className="text-faint">{label}</span>
- <span className="text-ink tabular-nums">{formatTokens(value)}</span>
- </div>
- );
+ const color = pct !== null && pct >= 80 ? "var(--warn-ink)" : "var(--accent)";
+ const fill = pct === null ? 0 : Math.max(pct, 3);
return (
- <div className="relative">
- <button
- className="inline-flex items-center gap-1.5 px-2 py-1 rounded-lg text-[12px] text-muted hover:text-ink hover:bg-paper shrink-0"
- onClick={() => setOpen((v) => !v)}
- aria-haspopup="menu"
- aria-expanded={open}
- aria-label="Token usage"
- title={
- pct !== null
- ? `Context window ${pct}% full — ${formatTokens(usage.context)} of ${formatTokens(contextWindow as number)}`
- : `In context now: ${formatTokens(usage.context)} tokens`
- }
- data-testid="usage-chip"
- >
- {/* The bar is the context-window fill. With totals on release hold, the numeric
- fallback is the in-context size — the one figure we trust — never the
- cumulative session total. */}
- {showBar ? (
- <span className="w-12 h-1.5 rounded-full bg-line overflow-hidden" aria-hidden="true">
- <span
- className="block h-full bg-accent transition-all"
- style={{ width: `${Math.max(pct as number, 4)}%` }}
- />
- </span>
- ) : (
- <span className="tabular-nums">
- {SHOW_SESSION_TOTALS ? formatTokens(total) : formatTokens(usage.context)}
- </span>
- )}
- </button>
- {open && (
- <>
- <div className="fixed inset-0 z-30" onClick={() => setOpen(false)} />
- <div
- className="absolute z-40 bottom-full mb-1 right-0 w-[280px] rounded-xl border border-line bg-panel shadow-2xl p-3"
- role="menu"
- data-testid="usage-popover"
- >
- {contextWindow ? (
- <div className="mb-2.5">
- <div className="text-[11px] uppercase tracking-[0.06em] text-faint font-semibold mb-1">
- Context window
- </div>
- <div className="h-1.5 rounded-full bg-line overflow-hidden">
- <div
- className="h-full bg-accent transition-all"
- style={{ width: `${pct}%` }}
- />
- </div>
- <div className="mt-1 text-[12px] text-muted tabular-nums">
- {formatTokens(usage.context)} of {formatTokens(contextWindow)} · {pct}%
- </div>
- </div>
- ) : usage.context > 0 ? (
- <div className="mb-2.5 text-[12px] text-muted tabular-nums">
- In context now: {formatTokens(usage.context)} tokens
- </div>
- ) : null}
- {SHOW_SESSION_TOTALS && (<>
- <div className="text-[11px] uppercase tracking-[0.06em] text-faint font-semibold mb-1">
- Session totals
- </div>
- <div className="flex flex-col gap-1.5">
- {Object.entries(usage.byModel).map(([id, t]) => (
- <div key={id}>
- <div className="text-[12px] text-ink font-medium truncate" title={id}>
- {labelFor(id)}
- </div>
- {/* Every row is a session sum. With a cache split, the input rows are
- the three BILLING CLASSES of input (each priced differently) and
- read as components: uncached + cache reads + cache writes = total.
- Without one (Ollama, compat vendors), plain "Input" says it all. */}
- <div className="mt-0.5 flex flex-col gap-0.5">
- {t.cache_read + t.cache_write > 0 ? (
- <>
- {stat("Uncached input", t.input)}
- {stat("Cache reads", t.cache_read)}
- {stat("Cache writes", t.cache_write)}
- {stat("Total input", t.input + t.cache_read + t.cache_write)}
- </>
- ) : (
- stat("Input", t.input)
- )}
- {stat("Output", t.output)}
- </div>
- </div>
- ))}
- </div>
- <div className="mt-2 pt-2 border-t border-line flex items-baseline justify-between text-[12px]">
- <span className="text-faint">Total</span>
- <span className="text-ink tabular-nums">{formatTokens(total)} tokens</span>
- </div>
- </>)}
- {model && !modelLabels?.[model] && contextWindow === undefined && (
- <div className="mt-1 text-[11px] text-faint leading-snug">
- Context meter unavailable for custom models.
- </div>
- )}
- </div>
- </>
- )}
- </div>
+ <span
+ className="relative inline-block rounded-full shrink-0"
+ style={{
+ width: size,
+ height: size,
+ background: `conic-gradient(${color} ${fill}%, color-mix(in srgb, currentColor 18%, transparent) 0)`,
+ }}
+ data-testid={testId}
+ aria-label={label}
+ role={label ? "img" : undefined}
+ >
+ <span
+ className="absolute rounded-full"
+ style={{ inset: Math.max(2, Math.round(size / 7)), background: "var(--tip-hole, var(--panel))" }}
+ aria-hidden="true"
+ />
+ </span>
);
}
@@ -971,7 +926,7 @@ function ModeMenu({
comparison): "Ask for approval ⌄" not a generic "Mode ⌄" pill. aria-label stays
"Mode" so the accessible name is stable across mode changes. */}
<button
- className="inline-flex items-center gap-1 px-2 py-1 rounded-lg text-[12px] text-muted hover:text-ink hover:bg-paper shrink-0"
+ className="inline-flex items-center gap-1 px-2 py-1 rounded-lg text-meta text-muted hover:text-ink hover:bg-paper shrink-0"
onClick={() => setOpen((v) => !v)}
aria-haspopup="menu"
aria-expanded={open}
@@ -984,7 +939,7 @@ function ModeMenu({
>
{current ? t(current.label) : mode}
{reviewerPaused && mode === "auto-approve" && (
- <span className="text-[11px] text-warnInk" data-testid="mode-paused">· {t("composer.paused")}</span>
+ <span className="text-label text-warnInk" data-testid="mode-paused">· {t("composer.paused")}</span>
)}
<Icon name="chevronDown" size={11} className="text-faint" />
</button>
@@ -1007,7 +962,7 @@ function ModeMenu({
>
<span
className={
- "flex items-center text-[13px] " +
+ "flex items-center text-ui " +
(o.value === mode ? "font-medium text-accent" : "text-ink")
}
>
@@ -1017,7 +972,7 @@ function ModeMenu({
{t(o.label)}
{o.value === mode && <span className="ml-1.5">✓</span>}
</span>
- <span className="text-[11px] text-faint leading-snug">{t(o.description ?? "")}</span>
+ <span className="text-label text-faint leading-snug">{t(o.description ?? "")}</span>
</button>
))}
{onUnattendedChange && (
@@ -1025,8 +980,8 @@ function ModeMenu({
<div className="my-1 border-t border-line" />
<div className="flex items-center gap-2 px-2.5 py-1.5">
<span className="flex-1 min-w-0">
- <span className="block text-[13px] text-ink">{t("composer.approvals_to_inbox")}</span>
- <span className="block text-[11px] text-faint leading-snug">
+ <span className="block text-ui text-ink">{t("composer.approvals_to_inbox")}</span>
+ <span className="block text-label text-faint leading-snug">
{t("composer.approvals_to_inbox_help")}
</span>
</span>
@@ -1049,7 +1004,7 @@ function ModeMenu({
function attachItem(icon: "image" | "file" | "fileCode", label: string, onClick: () => void) {
return (
<button
- className="w-full flex items-center gap-2.5 px-3 py-1.5 text-[13px] text-left hover:bg-paper"
+ className="w-full flex items-center gap-2.5 px-3 py-1.5 text-ui text-left hover:bg-paper"
onClick={onClick}
>
<Icon name={icon} size={15} className="shrink-0 text-muted" /> {label}
diff --git a/surfaces/gui/src/components/Dropdown.tsx b/surfaces/gui/src/components/Dropdown.tsx
index c048016b..dfb986e3 100644
--- a/surfaces/gui/src/components/Dropdown.tsx
+++ b/surfaces/gui/src/components/Dropdown.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useRef, useState, type ReactNode } from "react";
import { Icon } from "./Icon";
export interface Option {
@@ -15,20 +15,65 @@ interface Props {
align?: "left" | "right";
// Extra classes appended to the trigger pill (e.g. "chip" for a bordered composer-head chip).
className?: string;
+ // UX-048: the trigger may show a shorter label than the menu rows (model name without its
+ // provider), carry its own tooltip, and lead with a small node (the context ring).
+ displayLabel?: string;
+ title?: string;
+ leading?: ReactNode;
+ // Rich hover card rendered ABOVE the trigger after a short delay (replaces the native
+ // title, which is slow, bottom-anchored and unstyled). Hidden while the menu is open.
+ tooltip?: ReactNode;
}
-export function Dropdown({ prefix, value, options, onChange, align = "left", className }: Props) {
+const TIP_DELAY_MS = 450;
+
+export function Dropdown({
+ prefix,
+ value,
+ options,
+ onChange,
+ align = "left",
+ className,
+ displayLabel,
+ title,
+ leading,
+ tooltip,
+}: Props) {
const [open, setOpen] = useState(false);
+ const [tip, setTip] = useState(false);
+ const timer = useRef<number | null>(null);
+ const armTip = () => {
+ if (!tooltip) return;
+ if (timer.current) window.clearTimeout(timer.current);
+ timer.current = window.setTimeout(() => setTip(true), TIP_DELAY_MS);
+ };
+ const disarmTip = () => {
+ if (timer.current) window.clearTimeout(timer.current);
+ timer.current = null;
+ setTip(false);
+ };
+ useEffect(() => () => disarmTip(), []);
const current = options.find((o) => o.value === value);
const label = (prefix ? `${prefix}: ` : "") + (current?.label || value);
return (
- <div className="dd">
+ <div className="dd" onMouseEnter={armTip} onMouseLeave={disarmTip}>
+ {tip && !open && tooltip && (
+ <div className={"dd-tip " + align} role="tooltip" data-testid="dd-tip">
+ {tooltip}
+ </div>
+ )}
<button
className={"pill" + (className ? " " + className : "")}
- onClick={() => setOpen((v) => !v)}
- title={label}
+ onClick={() => {
+ disarmTip();
+ setOpen((v) => !v);
+ }}
+ onFocus={armTip}
+ onBlur={disarmTip}
+ title={tooltip ? undefined : title ?? label}
>
- <span className="pill-label">{label}</span>
+ {leading}
+ <span className="pill-label">{displayLabel ?? label}</span>
<Icon name="chevronDown" size={13} className="caret" />
</button>
{open && (
diff --git a/surfaces/gui/src/components/Icon.tsx b/surfaces/gui/src/components/Icon.tsx
index da3b5ce8..bdfdbf53 100644
--- a/surfaces/gui/src/components/Icon.tsx
+++ b/surfaces/gui/src/components/Icon.tsx
@@ -18,6 +18,8 @@ export type IconName =
| "sliders"
| "gear"
| "inbox"
+ | "monitor"
+ | "cloud"
| "code"
| "wrench"
| "pencil"
@@ -43,6 +45,7 @@ export type IconName =
| "mic"
| "stop"
| "warning"
+ | "user"
| "x";
export function Icon({
@@ -110,6 +113,13 @@ export function Icon({
<path d="M15 4.5v15" />
</svg>
);
+ case "user":
+ return (
+ <svg {...s}>
+ <circle cx="12" cy="8" r="3.6" />
+ <path d="M4.8 20.2c.9-3.6 3.7-5.4 7.2-5.4s6.3 1.8 7.2 5.4" />
+ </svg>
+ );
case "signOut":
return (
<svg {...s}>
@@ -131,6 +141,21 @@ export function Icon({
<path d="M9.3 12.1l1.9 1.9 3.5-3.6" />
</svg>
);
+ case "monitor":
+ // A machine that is a real box (VM, server): screen on a stand.
+ return (
+ <svg {...s}>
+ <rect x="3" y="4" width="18" height="12" rx="1.5" />
+ <path d="M8 20h8M12 16v4" />
+ </svg>
+ );
+ case "cloud":
+ // A managed sandbox (Fly): cloud outline.
+ return (
+ <svg {...s}>
+ <path d="M7 18a4 4 0 0 1-.6-7.95A6 6 0 0 1 18 9a4.5 4.5 0 0 1-.5 9H7z" />
+ </svg>
+ );
case "file":
// Document with a folded corner + text lines.
return (
diff --git a/surfaces/gui/src/components/Onboarding.tsx b/surfaces/gui/src/components/Onboarding.tsx
index 310705bf..65bca11f 100644
--- a/surfaces/gui/src/components/Onboarding.tsx
+++ b/surfaces/gui/src/components/Onboarding.tsx
@@ -124,8 +124,8 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
{step === 0 && (
<section data-testid="ob-step-model" className="flex-1 min-h-0 flex flex-col">
{/* Persistent header — stays put while the region below swaps (§39). */}
- <h1 className="text-[20px] font-semibold">{t("onboarding.welcome")}<span className="beta-tag">BETA</span></h1>
- <p className="text-[13px] text-muted mt-0.5 mb-4">
+ <h1 className="text-title font-semibold">{t("onboarding.welcome")}<span className="beta-tag">BETA</span></h1>
+ <p className="text-ui text-muted mt-0.5 mb-4">
{t("onboarding.model_intro")}
</p>
@@ -144,11 +144,11 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
{/* Persistent footer (§39). */}
<div className="flex items-center gap-3 pt-5">
{!skipConfirm ? (
- <button className="text-[13px] text-faint hover:text-muted" onClick={() => setSkipConfirm(true)}>
+ <button className="text-ui text-faint hover:text-muted" onClick={() => setSkipConfirm(true)}>
{t("onboarding.skip_setup")}
</button>
) : (
- <span className="text-[13px] text-muted">
+ <span className="text-ui text-muted">
{t("onboarding.skip_warn_pref")}{" "}
<button className="text-accent" onClick={() => finish()}>
{t("onboarding.skip_anyway")}
@@ -156,7 +156,7 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
</span>
)}
<button
- className="ml-auto px-6 py-2 rounded-full bg-ink text-panel text-[13px] disabled:opacity-40"
+ className="ml-auto px-6 py-2 rounded-full bg-ink text-panel text-ui disabled:opacity-40"
disabled={!canNext || ps.verify.state === "testing"}
onClick={advance}
data-testid="ob-continue"
@@ -164,7 +164,7 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
{ps.verify.state === "testing" ? t("onboarding.checking") : t("onboarding.next")}
</button>
</div>
- <p className="text-[11px] text-faint mt-3">
+ <p className="text-label text-faint mt-3">
{t("onboarding.models_settings_hint")}
</p>
</section>
@@ -177,8 +177,8 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
slot keeps its place but flips to a green congrats, and every row grows a quiet
Connect pill. The gated Google pair is ONE combined grayed row. */
<section data-testid="ob-step-tools" className="flex-1 min-h-0 flex flex-col">
- <h1 className="text-[20px] font-semibold">{t("onboarding.connect_tools_title")}</h1>
- <p className="text-[13px] text-muted mt-0.5 mb-3">
+ <h1 className="text-title font-semibold">{t("onboarding.connect_tools_title")}</h1>
+ <p className="text-ui text-muted mt-0.5 mb-3">
{t("onboarding.connect_tools_intro")}
</p>
@@ -194,17 +194,17 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
>
<ConnectorBadge connector={c} size={34} title={c.title} />
<span className="min-w-0 flex-1">
- <span className="block text-[13px] font-semibold leading-tight">{t(benefitKey)}</span>
- <span className="block text-[12px] text-muted truncate">{t(detailKey)}</span>
+ <span className="block text-ui font-semibold leading-tight">{t(benefitKey)}</span>
+ <span className="block text-meta text-muted truncate">{t(detailKey)}</span>
</span>
{cloud?.signed_in &&
(c.connected ? (
- <span className="text-[12px] text-ok font-medium shrink-0">{t("onboarding.connected_ok")}</span>
+ <span className="text-meta text-ok font-medium shrink-0">{t("onboarding.connected_ok")}</span>
) : pendingTool === name ? (
- <span className="text-[12px] text-muted shrink-0">{t("onboarding.check_browser")}</span>
+ <span className="text-meta text-muted shrink-0">{t("onboarding.check_browser")}</span>
) : (
<button
- className="shrink-0 rounded-full border border-line px-4 py-1.5 text-[13px] font-medium hover:border-lineStrong"
+ className="shrink-0 rounded-full border border-line px-4 py-1.5 text-ui font-medium hover:border-lineStrong"
onClick={() => startTool(name)}
>
{t("onboarding.connect")}
@@ -222,14 +222,14 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
})}
</span>
<span className="min-w-0 flex-1">
- <span className="block text-[13px] font-semibold leading-tight text-faint">
+ <span className="block text-ui font-semibold leading-tight text-faint">
{t("onboarding.google_pair_title")}
</span>
- <span className="block text-[12px] text-faint truncate">
+ <span className="block text-meta text-faint truncate">
{t("onboarding.google_pair_detail")}
</span>
</span>
- {cloud?.signed_in && <span className="text-[12px] text-faint shrink-0">{t("onboarding.coming_soon")}</span>}
+ {cloud?.signed_in && <span className="text-meta text-faint shrink-0">{t("onboarding.coming_soon")}</span>}
</div>
</div>
@@ -238,14 +238,14 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
returns from the browser (§41). */}
{!cloud?.signed_in ? (
<div className="mt-3.5 rounded-xl border border-line bg-paper px-4 py-3 flex items-center gap-3.5 shrink-0">
- <span className="flex-1 text-[13px] text-muted leading-snug">
- <span className="block text-[13px] font-semibold text-ink mb-0.5">
+ <span className="flex-1 text-ui text-muted leading-snug">
+ <span className="block text-ui font-semibold text-ink mb-0.5">
{t("onboarding.signin_for_oneclick")}
</span>
{t("onboarding.signin_band_desc")}
</span>
{signinPhase ? (
- <span className="inline-flex items-center gap-2 text-[13px] text-muted shrink-0">
+ <span className="inline-flex items-center gap-2 text-ui text-muted shrink-0">
<Spinner />
{signinPhase === "opening" ? (
t("onboarding.opening_browser")
@@ -264,7 +264,7 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
</span>
) : (
<button
- className="shrink-0 px-5 py-2 rounded-full bg-ink text-panel text-[13px]"
+ className="shrink-0 px-5 py-2 rounded-full bg-ink text-panel text-ui"
onClick={async () => {
setSigninPhase("opening");
await cloudLogin().catch(() => {});
@@ -281,12 +281,12 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
className="mt-3.5 rounded-xl border border-line bg-okSoft px-4 py-3 shrink-0"
data-testid="ob-tools-signedin"
>
- <span className="block text-[13px] font-semibold text-ok mb-0.5">
+ <span className="block text-ui font-semibold text-ok mb-0.5">
{cloud.account
? t("onboarding.signed_in_as", { account: cloud.account })
: t("onboarding.signed_in")}
</span>
- <span className="block text-[13px] text-muted">
+ <span className="block text-ui text-muted">
{t("onboarding.signed_in_desc")}
</span>
</div>
@@ -296,7 +296,7 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
<div className="flex items-center mt-3.5">
{cloud?.signed_in ? (
<button
- className="ml-auto px-6 py-2 rounded-full bg-ink text-panel text-[13px] shrink-0"
+ className="ml-auto px-6 py-2 rounded-full bg-ink text-panel text-ui shrink-0"
onClick={() => setStep(2)}
data-testid="ob-continue-tools"
>
@@ -304,7 +304,7 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
</button>
) : (
<button
- className="ml-auto px-5 py-2 rounded-full border border-line text-[13px] text-muted hover:text-ink hover:border-lineStrong shrink-0"
+ className="ml-auto px-5 py-2 rounded-full border border-line text-ui text-muted hover:text-ink hover:border-lineStrong shrink-0"
onClick={() => setStep(2)}
data-testid="ob-tools-skip"
>
@@ -312,7 +312,7 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
</button>
)}
</div>
- <p className="text-[11px] text-faint mt-3">
+ <p className="text-label text-faint mt-3">
{t("onboarding.more_tools_hint")}
</p>
</section>
@@ -321,11 +321,11 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
{step === 2 && (
<section data-testid="ob-step-done" className="flex-1 min-h-0 flex flex-col overflow-y-auto">
<div className="text-center">
- <div className="w-12 h-12 rounded-full bg-okSoft text-ok grid place-items-center mx-auto mb-3 text-[22px]">
+ <div className="w-12 h-12 rounded-full bg-okSoft text-ok grid place-items-center mx-auto mb-3 text-title">
✓
</div>
- <h1 className="text-[20px] font-semibold mb-1">{t("onboarding.youre_set_up")}</h1>
- <p className="text-[13px] text-muted mb-5">{t("onboarding.two_ways")}</p>
+ <h1 className="text-title font-semibold mb-1">{t("onboarding.youre_set_up")}</h1>
+ <p className="text-ui text-muted mb-5">{t("onboarding.two_ways")}</p>
</div>
<button
@@ -333,12 +333,12 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
onClick={() => finish("automations")}
data-testid="ob-cta-automation"
>
- <span className="w-9 h-9 rounded-lg bg-accentSoft text-accent grid place-items-center text-[14px] shrink-0">
+ <span className="w-9 h-9 rounded-lg bg-accentSoft text-accent grid place-items-center text-body shrink-0">
◷
</span>
<span className="flex-1 min-w-0 text-left">
- <b className="block text-[13px]">{t("onboarding.cta_automation_title")}</b>
- <span className="text-[12px] text-muted">
+ <b className="block text-ui">{t("onboarding.cta_automation_title")}</b>
+ <span className="text-meta text-muted">
{t("onboarding.cta_automation_desc")}
</span>
</span>
@@ -349,12 +349,12 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
onClick={() => finish("work")}
data-testid="ob-start"
>
- <span className="w-9 h-9 rounded-lg bg-accentSoft text-accent grid place-items-center text-[14px] shrink-0">
+ <span className="w-9 h-9 rounded-lg bg-accentSoft text-accent grid place-items-center text-body shrink-0">
✦
</span>
<span className="flex-1 min-w-0 text-left">
- <b className="block text-[13px]">{t("onboarding.cta_work_title")}</b>
- <span className="text-[12px] text-muted">
+ <b className="block text-ui">{t("onboarding.cta_work_title")}</b>
+ <span className="text-meta text-muted">
{t("onboarding.cta_work_desc")}
</span>
</span>
@@ -364,7 +364,7 @@ export function Onboarding({ onDone }: { onDone: (next?: "work" | "gallery" | "a
{/* The Specialist-coworkers gallery card and the per-session-scope line stay HIDDEN
(owner call 2026-07-12); the finish("gallery") plumbing remains for their return. */}
- <p className="text-[11px] text-faint text-center mt-auto pt-5">
+ <p className="text-label text-faint text-center mt-auto pt-5">
{t("onboarding.replay_hint")}
</p>
</section>
diff --git a/surfaces/gui/src/components/ProjectBindMenu.tsx b/surfaces/gui/src/components/ProjectBindMenu.tsx
index 13a4c5d6..6f5545a3 100644
--- a/surfaces/gui/src/components/ProjectBindMenu.tsx
+++ b/surfaces/gui/src/components/ProjectBindMenu.tsx
@@ -83,7 +83,7 @@ export function ProjectBindMenu(props: {
) => (
<button
key={key}
- className="w-full flex items-center gap-2.5 px-3 py-1.5 text-[13px] text-left hover:bg-paper"
+ className="w-full flex items-center gap-2.5 px-3 py-1.5 text-ui text-left hover:bg-paper"
onClick={onClick}
>
<span
@@ -102,14 +102,14 @@ export function ProjectBindMenu(props: {
className="absolute z-50 bottom-full mb-1 left-[190px] w-[248px] rounded-xl border border-line bg-panel shadow-2xl py-1.5"
data-testid={`project-menu-${kind}`}
>
- <div className="px-3 pt-1 pb-1.5 text-[10.5px] font-semibold tracking-wide uppercase text-faint">
+ <div className="px-3 pt-1 pb-1.5 text-[10.5px] font-medium text-faint">
{title}
</div>
{named.length >= FILTER_AT && (
<div className="mx-2.5 mb-1.5 flex items-center gap-1.5 rounded-lg border border-line px-2 py-1">
<Icon name="search" size={12} className="text-faint shrink-0" />
<input
- className="w-full bg-transparent text-[12.5px] outline-none"
+ className="w-full bg-transparent text-meta outline-none"
placeholder={t("bindmenu.filter_placeholder")}
value={filter}
onChange={(e) => setFilter(e.target.value)}
@@ -126,10 +126,10 @@ export function ProjectBindMenu(props: {
menu.derived.kind === "git" ? (
<span className="inline-flex items-center gap-1.5">
<Icon name="branch" size={12} className="text-faint shrink-0" />
- <span className="font-mono text-[12px]">{menu.derived.label}</span>
+ <span className="font-mono text-meta">{menu.derived.label}</span>
</span>
) : (
- <span className="font-mono text-[12px] text-muted" title={menu.derived.full}>
+ <span className="font-mono text-meta text-muted" title={menu.derived.full}>
{trimPath(menu.derived.label)}
</span>
),
@@ -147,14 +147,14 @@ export function ProjectBindMenu(props: {
),
)}
{q && shown.length === 0 && (
- <div className="px-3 py-1.5 text-[12px] text-faint">{t("bindmenu.no_matches")}</div>
+ <div className="px-3 py-1.5 text-meta text-faint">{t("bindmenu.no_matches")}</div>
)}
<div className="my-1 border-t border-line" />
{naming ? (
<div className="mx-2.5 my-1 flex items-center gap-1.5">
<input
ref={nameInput}
- className="w-full rounded-lg border border-line bg-transparent px-2 py-1 text-[12.5px] outline-none"
+ className="w-full rounded-lg border border-line bg-transparent px-2 py-1 text-meta outline-none"
placeholder={
kind === "memory" ? t("bindmenu.name_placeholder_memory") : t("bindmenu.name_placeholder_board")
}
@@ -168,7 +168,7 @@ export function ProjectBindMenu(props: {
</div>
) : (
<button
- className="w-full flex items-center gap-2.5 px-3 py-1.5 text-[12.5px] text-left text-muted hover:bg-paper"
+ className="w-full flex items-center gap-2.5 px-3 py-1.5 text-meta text-left text-muted hover:bg-paper"
onClick={() => setNaming(true)}
>
<Icon name="pencil" size={13} className="shrink-0" />{" "}
@@ -177,7 +177,7 @@ export function ProjectBindMenu(props: {
)}
{kind === "memory" && props.onOpenMemory && (
<button
- className="w-full flex items-center gap-2.5 px-3 py-1.5 text-[12.5px] text-left text-muted hover:bg-paper"
+ className="w-full flex items-center gap-2.5 px-3 py-1.5 text-meta text-left text-muted hover:bg-paper"
onClick={() => {
props.onClose();
props.onOpenMemory?.();
@@ -186,7 +186,7 @@ export function ProjectBindMenu(props: {
<Icon name="sliders" size={13} className="shrink-0" /> {t("bindmenu.view_edit")}
</button>
)}
- {error && <div className="px-3 py-1 text-[11.5px] text-red-500">{error}</div>}
+ {error && <div className="px-3 py-1 text-label text-red-500">{error}</div>}
</div>
);
}
diff --git a/surfaces/gui/src/components/RightRail.tsx b/surfaces/gui/src/components/RightRail.tsx
index 307404d0..fca42f20 100644
--- a/surfaces/gui/src/components/RightRail.tsx
+++ b/surfaces/gui/src/components/RightRail.tsx
@@ -19,6 +19,10 @@ import type { SessionInfo, TodoItem } from "../types";
import { AccessSection } from "./AccessSection";
import { BoardSection } from "./BoardPanel";
import { Icon } from "./Icon";
+import { formatTokens, totalTokens } from "../usage";
+import type { SessionUsage, TurnUsage } from "../types";
+
+const totalOf = (u: TurnUsage) => u.input + u.output + u.cache_read + u.cache_write;
import { Markdown, OPEN_ARTIFACT_EVENT } from "./Markdown";
type Panel = "progress" | "artifacts" | "board" | "journal" | "team" | "files";
@@ -76,6 +80,8 @@ interface Props {
teamMembers?: SessionInfo[];
teamChatEnabled?: boolean;
teamChatUnread?: number;
+ // Tokens by model for the lead plus its workers (spec §5) — shown under the members.
+ teamUsage?: SessionUsage;
onOpenTeamChat?: () => void;
onOpenWorker?: (s: SessionInfo) => void;
// Bumped when a [.](board:) chip in the transcript is clicked — expands the Board section.
@@ -105,6 +111,7 @@ export function RightRail({
teamMembers = [],
teamChatEnabled = false,
teamChatUnread = 0,
+ teamUsage,
onOpenTeamChat,
onOpenWorker,
openBoardKey = 0,
@@ -162,7 +169,7 @@ export function RightRail({
setJournal([]);
return;
}
- getJournalCases().then(setJournal).catch(() => setJournal([]));
+ getJournalCases(sessionId).then(setJournal).catch(() => setJournal([]));
}, [active, sessionId, refreshKey, board?.space]);
// Switching conversations closes any open artifact — it belongs to the previous session's
@@ -327,6 +334,24 @@ export function RightRail({
{teamChatUnread > 0 && <span className="team-chat-badge">{teamChatUnread}</span>}
</button>
)}
+ {teamUsage && totalTokens(teamUsage) > 0 && (
+ /* Tokens for the whole tree (lead + workers), by model. Counts only —
+ no dollars (owner ruling, spec §5). */
+ <div className="rail-team-usage" data-testid="team-usage">
+ <div className="rail-team-usage-head">
+ <span>{t("misc.rail.tokens")}</span>
+ <span className="text-muted">{formatTokens(totalTokens(teamUsage))}</span>
+ </div>
+ {Object.entries(teamUsage.byModel)
+ .sort((a, b) => totalOf(b[1]) - totalOf(a[1]))
+ .map(([model, u]) => (
+ <div className="rail-team-usage-row" key={model} title={t("misc.rail.usage_title", { model, input: u.input, output: u.output, cached: u.cache_read })}>
+ <span className="rail-team-usage-model">{model.includes(":") ? model.split(":").slice(1).join(":") : model}</span>
+ <span className="text-muted">{formatTokens(totalOf(u))}</span>
+ </div>
+ ))}
+ </div>
+ )}
</div>
</RailSection>
)}
diff --git a/surfaces/gui/src/components/ScheduledView.tsx b/surfaces/gui/src/components/ScheduledView.tsx
index bab346fa..4b5113d5 100644
--- a/surfaces/gui/src/components/ScheduledView.tsx
+++ b/surfaces/gui/src/components/ScheduledView.tsx
@@ -128,14 +128,14 @@ export function ScheduledView({ onOpenRun, onRunNow, initialOpenId }: Props) {
<PanelHead title={t("automations.title")} sub={t("automations.sub")} />
</div>
<button
- className="text-[13px] px-3 py-1.5 rounded-lg border border-lineStrong bg-panel hover:border-accent hover:text-accent shrink-0"
+ className="text-ui px-3 py-1.5 rounded-lg border border-lineStrong bg-panel hover:border-accent hover:text-accent shrink-0"
onClick={() => setShowForm((v) => !v)}
>
{t("automations.new_btn")}
</button>
</div>
- <div className="text-[12px] text-faint flex gap-1.5 mb-4">
+ <div className="text-meta text-faint flex gap-1.5 mb-4">
<span aria-hidden>ⓘ</span>
<span>{t("automations.server_hint")}</span>
</div>
@@ -154,7 +154,7 @@ export function ScheduledView({ onOpenRun, onRunNow, initialOpenId }: Props) {
{empty ? (
!showForm && (
- <div className={CARD + " p-4 text-[13px] text-muted"}>
+ <div className={CARD + " p-4 text-ui text-muted"}>
<Trans
i18nKey="automations.empty_state"
components={{ strong: <strong /> }}
@@ -170,7 +170,7 @@ export function ScheduledView({ onOpenRun, onRunNow, initialOpenId }: Props) {
onClick={() => setOpenId(task.id)}
>
<div className="flex items-center justify-between gap-2.5 mb-1">
- <span className="text-[13px] font-semibold truncate">{task.title}</span>
+ <span className="text-ui font-semibold truncate">{task.title}</span>
<button
className="sched-card-del"
title={t("automations.delete_title")}
@@ -184,7 +184,7 @@ export function ScheduledView({ onOpenRun, onRunNow, initialOpenId }: Props) {
<Icon name="trash" size={14} />
</button>
</div>
- <div className="flex items-center gap-1.5 text-[12px] text-muted">
+ <div className="flex items-center gap-1.5 text-meta text-muted">
<Icon name="clock" size={13} className="text-faint shrink-0" />
{task.enabled ? task.schedule : t("automations.paused")} · {t("automations.next", { time: fmt(task.next_run) })} · {t("automations.run_count", { count: task.run_count })}
{task.last_status ? ` · ${t("automations.last", { status: task.last_status })}` : ""}
@@ -216,7 +216,7 @@ function NewAutomationForm({
return (
<div className={CARD + " tmpl-form p-4 mb-4"}>
- <div className="text-[11px] uppercase tracking-[0.05em] text-faint mb-2.5">
+ <div className="text-label text-faint mb-2.5">
{t("automations.new_automation")}
</div>
<input
@@ -331,7 +331,7 @@ function TaskDetail({
if (!task)
return (
<Shell>
- <div className="text-[13px] text-muted">{tt("automations.loading")}</div>
+ <div className="text-ui text-muted">{tt("automations.loading")}</div>
</Shell>
);
@@ -369,7 +369,7 @@ function TaskDetail({
return (
<Shell>
- <button className="text-[13px] text-muted hover:text-ink mb-3" onClick={onBack}>
+ <button className="text-ui text-muted hover:text-ink mb-3" onClick={onBack}>
{tt("automations.back_to_automations")}
</button>
<div className="sched-detail">
@@ -382,7 +382,7 @@ function TaskDetail({
placeholder={tt("automations.title_label")}
/>
) : (
- <h2 className="text-[20px] font-semibold tracking-tight">{task.title}</h2>
+ <h2 className="text-title font-semibold tracking-tight">{task.title}</h2>
)}
<div className="sched-actions">
{editing ? (
diff --git a/surfaces/gui/src/components/SearchModal.tsx b/surfaces/gui/src/components/SearchModal.tsx
index 83445a65..455f8b9e 100644
--- a/surfaces/gui/src/components/SearchModal.tsx
+++ b/surfaces/gui/src/components/SearchModal.tsx
@@ -98,12 +98,12 @@ export function SearchModal({
onMouseEnter={() => setActive(idx)}
onClick={() => choose(s)}
>
- <span className="min-w-0 flex-1 truncate text-[13px] text-ink">
+ <span className="min-w-0 flex-1 truncate text-ui text-ink">
{s.title || s.session_id}
</span>
- <span className="text-[12px] text-faint shrink-0">{tagFor(s)}</span>
+ <span className="text-meta text-faint shrink-0">{tagFor(s)}</span>
{idx < 9 && (
- <kbd className="text-[11px] text-faint bg-paper border border-line rounded px-1.5 py-0.5 shrink-0 font-sans">
+ <kbd className="text-label text-faint bg-paper border border-line rounded px-1.5 py-0.5 shrink-0 font-sans">
⌘{idx + 1}
</kbd>
)}
@@ -122,20 +122,20 @@ export function SearchModal({
value={query}
onChange={(e) => setQuery(e.target.value)}
placeholder={t("search.placeholder")}
- className="flex-1 bg-transparent outline-none text-[14px] text-ink placeholder:text-faint"
+ className="flex-1 bg-transparent outline-none text-body text-ink placeholder:text-faint"
/>
- <kbd className="text-[11px] text-faint bg-paper border border-line rounded px-1.5 py-0.5 font-sans">
+ <kbd className="text-label text-faint bg-paper border border-line rounded px-1.5 py-0.5 font-sans">
Esc
</kbd>
</div>
<div className="max-h-[52vh] overflow-y-auto hairline-scroll py-2">
{ordered.length === 0 ? (
- <div className="px-4 py-8 text-center text-[13px] text-faint">{t("search.no_results")}</div>
+ <div className="px-4 py-8 text-center text-ui text-faint">{t("search.no_results")}</div>
) : (
<>
{pinned.length > 0 && (
<div className="px-2">
- <div className="px-2 py-1 text-[11px] uppercase tracking-[0.05em] text-faint font-semibold">
+ <div className="px-2 py-1 text-label text-faint font-medium">
{t("search.pinned")}
</div>
{pinned.map((s, i) => row(s, i))}
@@ -143,7 +143,7 @@ export function SearchModal({
)}
{recent.length > 0 && (
<div className="px-2 mt-1">
- <div className="px-2 py-1 text-[11px] uppercase tracking-[0.05em] text-faint font-semibold">
+ <div className="px-2 py-1 text-label text-faint font-medium">
{t("search.recent")}
</div>
{recent.map((s, i) => row(s, pinned.length + i))}
diff --git a/surfaces/gui/src/components/SelectMenu.tsx b/surfaces/gui/src/components/SelectMenu.tsx
index 612e1014..891bfa2f 100644
--- a/surfaces/gui/src/components/SelectMenu.tsx
+++ b/surfaces/gui/src/components/SelectMenu.tsx
@@ -38,7 +38,7 @@ export function SelectMenu({
<div className="relative">
<button
type="button"
- className="w-full flex items-center gap-2 px-2.5 py-2 rounded-lg border border-line bg-paper text-[13px] text-ink hover:border-lineStrong"
+ className="w-full flex items-center gap-2 px-2.5 py-2 rounded-lg border border-line bg-paper text-ui text-ink hover:border-lineStrong"
aria-haspopup="listbox"
aria-expanded={open}
aria-label={ariaLabel}
@@ -63,7 +63,7 @@ export function SelectMenu({
o.group && o.group !== options[i - 1]?.group ? (
<div
className={
- "px-2.5 pb-1 text-[11px] uppercase tracking-[0.06em] text-faint font-semibold " +
+ "px-2.5 pb-1 text-label text-faint font-medium " +
(i === 0 ? "pt-1" : "pt-2.5 mt-1.5 border-t border-line")
}
>
@@ -89,14 +89,14 @@ export function SelectMenu({
<span className="min-w-0 flex-1">
<span
className={
- "block text-[13px] truncate " + (sel ? "font-semibold text-ink" : "text-ink")
+ "block text-ui truncate " + (sel ? "font-semibold text-ink" : "text-ink")
}
>
{o.label}
</span>
- {o.sub && <span className="block text-[12px] text-faint truncate">{o.sub}</span>}
+ {o.sub && <span className="block text-meta text-faint truncate">{o.sub}</span>}
</span>
- {sel && <span className="text-accent text-[12px] shrink-0">✓</span>}
+ {sel && <span className="text-accent text-meta shrink-0">✓</span>}
<span
className={
"w-1.5 h-1.5 rounded-full shrink-0 " + (o.dot ? "bg-ok" : "bg-transparent")
diff --git a/surfaces/gui/src/components/SendFolderDialog.tsx b/surfaces/gui/src/components/SendFolderDialog.tsx
index 1eadf625..80c50c27 100644
--- a/surfaces/gui/src/components/SendFolderDialog.tsx
+++ b/surfaces/gui/src/components/SendFolderDialog.tsx
@@ -1,6 +1,6 @@
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
-import { getRecentWorkspaces, openWorkspace, type RecentWorkspace } from "../api";
+import { getRecentWorkspaces, openWorkspace, type Machine, type RecentWorkspace } from "../api";
import { chooseFolder } from "../tauri";
import { baseName } from "../paths";
import { Icon } from "./Icon";
@@ -11,20 +11,25 @@ import { Icon } from "./Icon";
interface Props {
coworkerName: string;
+ // Remote homes: set when the draft runs on a machine — recents and path
+ // validation come from THAT machine, the native picker (which browses this
+ // computer) is hidden, and a typed path replaces it.
+ machine?: Machine | null;
onPick: (path: string, branch?: string | null) => void;
onTemp: () => void;
onCancel: () => void;
}
-export function SendFolderDialog({ coworkerName, onPick, onTemp, onCancel }: Props) {
+export function SendFolderDialog({ coworkerName, machine, onPick, onTemp, onCancel }: Props) {
const { t } = useTranslation();
const [recents, setRecents] = useState<RecentWorkspace[]>([]);
const [error, setError] = useState("");
const [busy, setBusy] = useState(false);
+ const [typedPath, setTypedPath] = useState("");
useEffect(() => {
- getRecentWorkspaces().then(setRecents).catch(() => {});
- }, []);
+ getRecentWorkspaces(machine?.id).then(setRecents).catch(() => {});
+ }, [machine?.id]);
useEffect(() => {
const onKey = (e: KeyboardEvent) => {
@@ -36,7 +41,7 @@ export function SendFolderDialog({ coworkerName, onPick, onTemp, onCancel }: Pro
const pick = async (path: string) => {
setError("");
- const res = await openWorkspace(path);
+ const res = await openWorkspace(path, false, machine?.id);
if (res.ok) onPick(res.path, res.git_branch);
else setError(res.error || t("folder_gate.open_error"));
};
@@ -53,10 +58,14 @@ export function SendFolderDialog({ coworkerName, onPick, onTemp, onCancel }: Pro
data-testid="send-folder-dialog"
onClick={(e) => e.stopPropagation()}
>
- <h3 className="text-[14px] font-semibold text-ink mb-1">
+ <h3 className="text-body font-semibold text-ink mb-1">
{t("folder_gate.where_work", { name: coworkerName })}
</h3>
- <p className="text-[13px] text-muted mb-3">{t("folder_gate.send_sub")}</p>
+ <p className="text-ui text-muted mb-3">
+ {machine
+ ? t("onmachine.folder.send_sub", { machine: machine.name })
+ : t("folder_gate.send_sub")}
+ </p>
{recents
.filter((w) => w.exists)
.slice(0, 4)
@@ -68,20 +77,49 @@ export function SendFolderDialog({ coworkerName, onPick, onTemp, onCancel }: Pro
title={w.path}
>
<Icon name="folder" size={13} className="shrink-0 text-muted" />
- <span className="text-[13px] text-ink truncate">{baseName(w.path)}</span>
- <span className="ml-auto text-[12px] text-faint truncate max-w-[45%]">{w.path}</span>
+ <span className="text-ui text-ink truncate">{baseName(w.path)}</span>
+ <span className="ml-auto text-meta text-faint truncate max-w-[45%]">{w.path}</span>
</button>
))}
- <div className="flex gap-2 mt-3">
- <button
- className="flex-1 text-center text-[13px] px-2.5 py-2 rounded-lg border border-lineStrong text-ink hover:bg-paper"
- onClick={() => void browse()}
- disabled={busy}
+ {machine && (
+ <form
+ className="flex gap-2 mt-1"
+ onSubmit={(e) => {
+ e.preventDefault();
+ if (typedPath.trim()) void pick(typedPath.trim());
+ }}
>
- {t("folder_gate.choose_a_folder")}
- </button>
+ <input
+ className="flex-1 min-w-0 px-2.5 py-2 rounded-lg border border-line bg-paper font-mono text-meta text-ink outline-none focus:border-accent"
+ placeholder={t("onmachine.folder.path_placeholder", { machine: machine.name })}
+ value={typedPath}
+ onChange={(e) => setTypedPath(e.target.value)}
+ data-testid="remote-path-input"
+ autoFocus
+ />
+ <button
+ type="submit"
+ className="text-ui px-3 py-2 rounded-lg border border-lineStrong text-ink hover:bg-paper disabled:opacity-40"
+ disabled={!typedPath.trim() || busy}
+ data-testid="remote-path-open"
+ >
+ {t("folder_gate.open")}
+ </button>
+ </form>
+ )}
+ <div className="flex gap-2 mt-3">
+ {/* The native picker browses THIS computer — never shown for a remote draft. */}
+ {!machine && (
+ <button
+ className="flex-1 text-center text-ui px-2.5 py-2 rounded-lg border border-lineStrong text-ink hover:bg-paper"
+ onClick={() => void browse()}
+ disabled={busy}
+ >
+ {t("folder_gate.choose_a_folder")}
+ </button>
+ )}
<button
- className="flex-1 text-center text-[13px] px-2.5 py-2 rounded-lg bg-accent text-white font-semibold hover:opacity-95"
+ className="flex-1 text-center text-ui px-2.5 py-2 rounded-lg bg-accent text-white font-semibold hover:opacity-95"
data-testid="start-temp-folder"
onClick={() => {
if (busy) return;
@@ -90,11 +128,15 @@ export function SendFolderDialog({ coworkerName, onPick, onTemp, onCancel }: Pro
}}
disabled={busy}
>
- {t("folder_gate.use_temp")}
+ {machine ? t("onmachine.folder.use_temp", { machine: machine.name }) : t("folder_gate.use_temp")}
</button>
</div>
- {error && <div className="mt-2 text-[12px] text-warnInk">{error}</div>}
- <p className="text-[11px] text-faint mt-2.5">{t("folder_gate.temp_note")}</p>
+ {error && <div className="mt-2 text-meta text-warnInk">{error}</div>}
+ <p className="text-label text-faint mt-2.5">
+ {machine
+ ? t("onmachine.folder.temp_note", { machine: machine.name })
+ : t("folder_gate.temp_note")}
+ </p>
</div>
</div>
);
diff --git a/surfaces/gui/src/components/SessionSetupRow.tsx b/surfaces/gui/src/components/SessionSetupRow.tsx
index 0faec905..10343d6e 100644
--- a/surfaces/gui/src/components/SessionSetupRow.tsx
+++ b/surfaces/gui/src/components/SessionSetupRow.tsx
@@ -1,6 +1,12 @@
import { useState } from "react";
import { useTranslation } from "react-i18next";
-import { getRecentWorkspaces, openWorkspace, type Persona, type RecentWorkspace } from "../api";
+import {
+ getRecentWorkspaces,
+ openWorkspace,
+ type Machine,
+ type Persona,
+ type RecentWorkspace,
+} from "../api";
import { chooseFolder } from "../tauri";
import { fullPersonaName } from "../personaScope";
import { baseName } from "../paths";
@@ -19,6 +25,14 @@ interface Props {
showFolder: boolean;
// The user's explicit folder pick for this draft, if any (never a temporary dir's path).
folderName: string | null;
+ // Remote homes (UX-045 frame B): the runs-on chip. Renders only when ≥1 machine
+ // is enrolled — with zero machines none of this exists visually.
+ machines?: Machine[];
+ machine?: string | null;
+ // Cloud mode: there is no local home — "This Mac" isn't a choice, and a
+ // machine is required (the chip label prompts until one is picked).
+ cloud?: boolean;
+ onPickMachine?: (id: string | null) => void;
onPickCoworker: (id: string) => void;
onPickFolder: (path: string, branch?: string | null) => void;
onManage: () => void;
@@ -29,13 +43,15 @@ interface Props {
export function SessionSetupRow(props: Props) {
const { t } = useTranslation();
- const [openMenu, setOpenMenu] = useState<"coworker" | "folder" | null>(null);
+ const [openMenu, setOpenMenu] = useState<"coworker" | "folder" | "machine" | null>(null);
const [recents, setRecents] = useState<RecentWorkspace[] | null>(null);
const [error, setError] = useState("");
const personas = (props.personas || []).filter((p) => p.enabled);
const current = personas.find((p) => p.id === props.agent);
+ const machines = props.machines || [];
+ const currentMachine = machines.find((m) => m.id === props.machine) || null;
- const toggle = (menu: "coworker" | "folder") => {
+ const toggle = (menu: "coworker" | "folder" | "machine") => {
setError("");
if (menu === "folder" && openMenu !== "folder") {
getRecentWorkspaces().then(setRecents).catch(() => setRecents([]));
@@ -59,7 +75,7 @@ export function SessionSetupRow(props: Props) {
};
const chip =
- "relative inline-flex items-center gap-1.5 px-2 py-1.5 rounded-lg text-[13px] text-muted hover:text-ink hover:bg-paper cursor-pointer select-none whitespace-nowrap";
+ "relative inline-flex items-center gap-1.5 px-2 py-1.5 rounded-lg text-ui text-muted hover:text-ink hover:bg-paper cursor-pointer select-none whitespace-nowrap";
return (
<div className="max-w-3xl mx-auto mb-1.5 px-1 flex items-center gap-1.5" data-testid="setup-row">
@@ -85,17 +101,17 @@ export function SessionSetupRow(props: Props) {
props.onPickCoworker(p.id);
}}
>
- <span className="block text-[13px] font-medium text-ink">
+ <span className="block text-ui font-medium text-ink">
{fullPersonaName(p.name, p.id)}
</span>
{p.tagline && (
- <span className="block text-[12px] text-muted truncate">{p.tagline}</span>
+ <span className="block text-meta text-muted truncate">{p.tagline}</span>
)}
</button>
))}
<div className="border-t border-line mt-1 pt-1">
<button
- className="w-full text-left px-2.5 py-1.5 rounded-lg hover:bg-paper text-[12px] text-accent"
+ className="w-full text-left px-2.5 py-1.5 rounded-lg hover:bg-paper text-meta text-accent"
data-testid="import-coworker"
onClick={() => {
setOpenMenu(null);
@@ -105,7 +121,7 @@ export function SessionSetupRow(props: Props) {
{t("setup.import_coworker")}
</button>
<button
- className="w-full text-left px-2.5 py-1.5 rounded-lg hover:bg-paper text-[12px] text-accent"
+ className="w-full text-left px-2.5 py-1.5 rounded-lg hover:bg-paper text-meta text-accent"
onClick={() => {
setOpenMenu(null);
props.onManage();
@@ -142,20 +158,81 @@ export function SessionSetupRow(props: Props) {
>
<Icon name="folder" size={13} className="mt-0.5 shrink-0 text-muted" />
<span className="min-w-0">
- <span className="block text-[13px] font-medium text-ink truncate">{baseName(w.path)}</span>
- <span className="block text-[12px] text-faint truncate">{w.path}</span>
+ <span className="block text-ui font-medium text-ink truncate">{baseName(w.path)}</span>
+ <span className="block text-meta text-faint truncate">{w.path}</span>
</span>
</button>
))}
<div className={(recents || []).some((w) => w.exists) ? "border-t border-line mt-1 pt-1" : ""}>
<button
- className="w-full text-left px-2.5 py-1.5 rounded-lg hover:bg-paper text-[12px] text-accent"
+ className="w-full text-left px-2.5 py-1.5 rounded-lg hover:bg-paper text-meta text-accent"
onClick={() => void browse()}
>
{props.folderName ? t("setup.choose_another_folder") : t("setup.choose_a_folder")}
</button>
</div>
- {error && <div className="px-2.5 py-1 text-[12px] text-warnInk">{error}</div>}
+ {error && <div className="px-2.5 py-1 text-meta text-warnInk">{error}</div>}
+ </div>
+ )}
+ </div>
+ )}
+
+ {/* Runs-on chip (UX-045 frame B) — only when ≥1 machine is enrolled. Fixed at
+ creation: the row leaves after the first message, taking the choice with it. */}
+ {machines.length > 0 && props.onPickMachine && (
+ <div className="relative">
+ <button className={chip} data-testid="runson-chip" onClick={() => toggle("machine")}>
+ <span aria-hidden>⌂</span>
+ <span className="max-w-[160px] truncate">
+ {currentMachine ? currentMachine.name : props.cloud ? t("onmachine.setup.choose_machine") : t("onmachine.this_mac")}
+ </span>
+ <Icon name="chevronDown" size={12} className="text-faint" />
+ </button>
+ {openMenu === "machine" && (
+ <div className="setup-menu absolute bottom-full mb-1.5 left-0 z-30 w-[240px] bg-panel border border-line rounded-xl2 shadow-xl p-1">
+ {!props.cloud && (
+ <button
+ className={
+ "w-full text-left px-2.5 py-2 rounded-lg hover:bg-paper " +
+ (!props.machine ? "bg-accentSoft/50" : "")
+ }
+ onClick={() => {
+ setOpenMenu(null);
+ props.onPickMachine!(null);
+ }}
+ >
+ <span className="block text-ui font-medium text-ink">{t("onmachine.this_mac")}</span>
+ </button>
+ )}
+ {machines.map((m, i) => (
+ // Union view: cloud rows sit under a quiet divider — same
+ // choice, different registry (they wear the origin, that's all).
+ <div key={m.id}>
+ {m.origin === "cloud" && machines[i - 1]?.origin !== "cloud" && (
+ <div className="px-2.5 pt-2 pb-1 text-[10.5px] text-faint font-medium">
+ {t("onmachine.openworker_cloud")}
+ </div>
+ )}
+ <button
+ className={
+ "w-full text-left px-2.5 py-2 rounded-lg " +
+ (m.connected ? "hover:bg-paper " : "opacity-45 cursor-not-allowed ") +
+ (m.id === props.machine ? "bg-accentSoft/50" : "")
+ }
+ disabled={!m.connected}
+ title={m.connected ? undefined : t("onmachine.offline")}
+ onClick={() => {
+ setOpenMenu(null);
+ props.onPickMachine!(m.id);
+ }}
+ >
+ <span className="block text-ui font-medium text-ink">⌂ {m.name}</span>
+ {!m.connected && (
+ <span className="block text-meta text-faint">{t("onmachine.offline")}</span>
+ )}
+ </button>
+ </div>
+ ))}
</div>
)}
</div>
diff --git a/surfaces/gui/src/components/Sidebar.tsx b/surfaces/gui/src/components/Sidebar.tsx
index a5e11fb8..7f349b7f 100644
--- a/surfaces/gui/src/components/Sidebar.tsx
+++ b/surfaces/gui/src/components/Sidebar.tsx
@@ -11,6 +11,7 @@ import {
getPersonas,
getSettings,
INBOX_UNLOCK,
+ isCloudMode,
PERSONAS_CHANGED,
setNavLayout,
waitForCloudSignIn,
@@ -18,8 +19,8 @@ import {
type CloudStatus,
type Persona,
type RecentWorkspace,
- type SurfaceVisibility,
-} from "../api";
+ type SurfaceVisibility, Machine } from "../api";
+import { cloudMe } from "../cloudAuth";
import type { SessionInfo } from "../types";
import { isProjectScoped, shortPersonaName } from "../personaScope";
import { ConnectorIcon } from "../connectors/ConnectorIcon";
@@ -45,16 +46,18 @@ const surfaceFromPersona = (p: Persona) => ({
// Attention = Inbox items awaiting a session (an accent count that bubbles session → persona →
// footer Inbox — all views of the one Inbox queue, never a second list).
+// "Needs you": a session parked on a question or an approval. A dot, not a count — a
+// session parks on one prompt at a time, so the number was always 1 (owner 2026-09-03).
+// Amber, so it never reads as the accent "working" pulse beside it.
function AttnBadge({ n }: { n: number }) {
const { t } = useTranslation();
if (!n) return null;
return (
<span
- className="text-[11px] font-semibold text-ink bg-faint/30 rounded-full px-1.5 leading-[15px] shrink-0"
- title={t("sidebar.awaiting_attention", { n })}
- >
- {n > 99 ? "99+" : n}
- </span>
+ className="w-1.5 h-1.5 rounded-full bg-warnInk shrink-0"
+ title={t("onmachine.sidebar.waiting_for_you")}
+ data-testid="attn-dot"
+ />
);
}
@@ -66,7 +69,7 @@ function UnseenBadge({ n, failed }: { n: number; failed?: boolean }) {
if (!n) return null;
return (
<span
- className="text-[11px] font-semibold text-ink bg-faint/30 rounded-full px-1.5 leading-[15px] shrink-0"
+ className="text-label font-semibold text-ink bg-faint/30 rounded-full px-1.5 leading-[15px] shrink-0"
title={failed ? t("sidebar.unseen_failed", { count: n }) : t("sidebar.unseen_new", { count: n })}
>
{n > 99 ? "99+" : n}
@@ -117,6 +120,13 @@ function ConnectorDot({ subs }: { subs?: string[] }) {
}
interface Props {
+ // Enrolled machines — the Machine grouping reads each group's provenance from here
+ // (sandbox → cloud icon, anything else → monitor).
+ machines?: Machine[];
+ // Settings open (owner 2026-09-03, peer-app pattern): the middle of the column becomes
+ // the settings nav (SettingsView portals it into #settings-rail); brand row and the
+ // account footer stay, so sign-in / Inbox / sign-out remain one click away.
+ settingsRail?: boolean;
agent: string;
workspace: string;
surfaces: SurfaceVisibility;
@@ -141,6 +151,9 @@ interface Props {
onOpenIntegrations: () => void;
onOpenAudit: () => void;
onOpenInbox: () => void;
+ // Remote homes (UX-045): at least one machine is enrolled — unlocks the
+ // Machine grouping entry. Row badges key off each session's own tag.
+ hasMachines?: boolean;
scheduledActive: boolean;
integrationsActive: boolean;
auditActive: boolean;
@@ -286,22 +299,26 @@ export function Sidebar(props: Props) {
// ungrouped list (Pinned + Recent). Flat stays the default even with Coworkers shipped
// (UX-029 flips the flag for the picker, not the nav shape — the flat chronological
// list default is the 2026-07-20 owner call). An explicit stored choice always wins.
- const defaultLayout: "flat" | "grouped" = "flat";
- const [layout, setLayout] = useState<"flat" | "grouped">(defaultLayout);
+ const defaultLayout: "flat" | "grouped" | "machine" = "flat";
+ const [layout, setLayout] = useState<"flat" | "grouped" | "machine">(defaultLayout);
// Sessions shown per group before "Show more" — Settings ▸ Appearance ▸ Sidebar.
const [peek, setPeek] = useState(5);
useEffect(() => {
getSettings()
.then((s) => {
setLayout(
- s.nav_layout === "flat" ? "flat" : s.nav_layout === "grouped" ? "grouped" : defaultLayout,
+ s.nav_layout === "grouped" || s.nav_layout === "machine"
+ ? s.nav_layout
+ : s.nav_layout === "flat"
+ ? "flat"
+ : defaultLayout,
);
if (s.sessions_peek) setPeek(s.sessions_peek);
})
.catch(() => {});
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
- const setGroupBy = (next: "flat" | "grouped") => {
+ const setGroupBy = (next: "flat" | "grouped" | "machine") => {
setLayout(next);
setNavLayout(next).catch(() => {});
};
@@ -357,7 +374,7 @@ export function Sidebar(props: Props) {
) => (
<button
className={
- "w-full flex items-center gap-2.5 px-3 py-1.5 text-[13px] text-left " +
+ "w-full flex items-center gap-2.5 px-3 py-1.5 text-ui text-left " +
(active ? "text-ink bg-chromeHover" : "hover:bg-chromeHover")
}
onClick={() => {
@@ -375,10 +392,14 @@ export function Sidebar(props: Props) {
// Display identity for the account row: the cloud profile only carries the email, so the
// row shows the capitalized local part ("rohit@…" → "Rohit"); the menu header shows it all.
- const accountEmail = cloud?.signed_in ? cloud.account : "";
+ // On the hosted dashboard the identity comes from the Auth0 sign-in gate instead — the
+ // gateway account concept ("OpenWorker Cloud" sign-in) does not exist there.
+ const hostedActor = isCloudMode() ? (cloudMe()?.actor ?? "") : "";
+ const accountEmail = hostedActor || (cloud?.signed_in ? cloud.account : "");
const accountName = accountEmail
? accountEmail.split("@")[0].replace(/^./, (c) => c.toUpperCase())
: "";
+ const accountSignedIn = Boolean(hostedActor) || Boolean(cloud?.signed_in);
// Roll the per-session attention/liveness up to the persona header and the footer Inbox: the
// accent count bubbles (sum), the liveness dot aggregates (working wins over sleeping).
@@ -446,7 +467,7 @@ export function Sidebar(props: Props) {
const menuOpen = rowMenu?.id === s.session_id;
const item = (testid: string, icon: IconName, label: string, onClick: () => void) => (
<button
- className="w-full flex items-center gap-2 px-2.5 py-1.5 text-[13px] text-left hover:bg-paper"
+ className="w-full flex items-center gap-2 px-2.5 py-1.5 text-ui text-left hover:bg-paper"
data-testid={testid}
role="menuitem"
onClick={() => {
@@ -461,7 +482,12 @@ export function Sidebar(props: Props) {
return (
<span
// Stay visible while this row's menu is open — the pointer may be on the menu, off the row.
- className={(menuOpen ? "flex" : "hidden group-hover:flex") + " items-center shrink-0"}
+ // The slot is always reserved (w-7) and only fades in on hover, so the title never
+ // re-truncates when the pointer arrives (owner catch 2026-09-03).
+ className={
+ "absolute inset-y-0 right-0 flex items-center " +
+ (menuOpen ? "visible" : "invisible group-hover:visible")
+ }
onClick={(e) => e.stopPropagation()}
>
<button
@@ -501,7 +527,7 @@ export function Sidebar(props: Props) {
{confirmDelId === s.session_id ? (
<button
title={t("sidebar.confirm_delete")}
- className="w-full flex items-center gap-2 px-2.5 py-1.5 text-[13px] text-left font-medium text-danger hover:bg-paper"
+ className="w-full flex items-center gap-2 px-2.5 py-1.5 text-ui text-left font-medium text-danger hover:bg-paper"
data-testid="row-menu-delete"
role="menuitem"
onClick={() => {
@@ -514,7 +540,7 @@ export function Sidebar(props: Props) {
</button>
) : (
<button
- className="w-full flex items-center gap-2 px-2.5 py-1.5 text-[13px] text-left text-danger hover:bg-paper"
+ className="w-full flex items-center gap-2 px-2.5 py-1.5 text-ui text-left text-danger hover:bg-paper"
data-testid="row-menu-delete"
role="menuitem"
onClick={() => setConfirmDelId(s.session_id)}
@@ -545,19 +571,20 @@ export function Sidebar(props: Props) {
<div
key={s.session_id}
className={
- "group flex items-center gap-2 px-2 py-1.5 rounded-lg text-left cursor-pointer " +
+ "group flex items-center gap-2 px-2 py-1.5 rounded-[7px] text-left cursor-pointer " +
(active
- ? "bg-ink/[0.055]"
- : "hover:bg-panel")
+ ? "bg-chromeHover"
+ : "hover:bg-panel") +
+ (s.machine_offline ? " opacity-45" : "")
}
onClick={() => {
if (!editing) props.onSelectSession(s.session_id, s.workspace, s.agent);
}}
- title={editing ? undefined : title}
+ title={editing ? undefined : s.machine_offline ? t("onmachine.sidebar.row_offline", { title, machine: s.machine_name || t("onmachine.machine_fallback") }) : title}
>
{editing ? (
<input
- className="flex-1 min-w-0 px-1.5 py-0.5 rounded-md bg-panel border border-accent text-[13px] text-ink outline-none"
+ className="flex-1 min-w-0 px-1.5 py-0.5 rounded-md bg-panel border border-accent text-ui text-ink outline-none"
value={editValue}
autoFocus
onClick={(e) => e.stopPropagation()}
@@ -573,27 +600,32 @@ export function Sidebar(props: Props) {
<>
<span
className={
- "min-w-0 flex-1 flex items-center gap-1.5 truncate text-[13px] " +
+ // pr-2 + the reserved menu slot: the ellipsis lands early and never moves (owner 2026-09-03).
+ "min-w-0 flex-1 flex items-center gap-1.5 truncate pr-2 text-ui " +
(active ? "font-medium text-ink" : "text-ink")
}
>
{s.pinned && <Icon name="pin" size={11} className="text-faint shrink-0" />}
- <span className="truncate">{title}</span>
+ <span className="min-w-0 truncate">{title}</span>
</span>
- <span
- className={
- "flex items-center gap-1.5 shrink-0 group-hover:hidden" +
- (rowMenu?.id === s.session_id ? " hidden" : "")
- }
- >
- {opts.showTime && compactAge(s.updated_at) && (
- <span className="text-[11px] text-faint tabular-nums">{compactAge(s.updated_at)}</span>
- )}
- <OriginIcon s={s} />
- <LiveDot state={s.liveness} />
- <AttnBadge n={s.attention || 0} />
+ {/* One right-edge slot: badges at rest, the ⋮ menu on hover, same width either
+ way so the title never re-truncates (owner 2026-09-03). */}
+ <span className="relative shrink-0 min-w-7 h-5 flex items-center justify-end">
+ <span
+ className={
+ "flex items-center gap-1.5 " +
+ (rowMenu?.id === s.session_id ? "invisible" : "group-hover:invisible")
+ }
+ >
+ {opts.showTime && compactAge(s.updated_at) && (
+ <span className="text-label text-faint tabular-nums">{compactAge(s.updated_at)}</span>
+ )}
+ <OriginIcon s={s} />
+ <LiveDot state={s.liveness} />
+ <AttnBadge n={s.attention || 0} />
+ </span>
+ {rowActions(s, title)}
</span>
- {rowActions(s, title)}
</>
)}
</div>
@@ -617,12 +649,15 @@ export function Sidebar(props: Props) {
<div
key={s.session_id}
className={
- "group w-full flex items-center gap-2.5 px-2 py-2 rounded-lg cursor-pointer text-left " +
+ "group w-full flex items-center gap-2.5 px-2 py-1.5 rounded-[7px] cursor-pointer text-left " +
(active
- ? "bg-ink/[0.055]"
- : "hover:bg-chromeHover")
+ ? "bg-chromeHover"
+ : "hover:bg-chromeHover") +
+ // Snapshot row: its machine is offline — visible but quiet (UX-045:
+ // greyed, never vanished).
+ (s.machine_offline ? " opacity-45" : "")
}
- title={editing ? undefined : title}
+ title={editing ? undefined : s.machine_offline ? t("onmachine.sidebar.row_offline", { title, machine: s.machine_name || t("onmachine.machine_fallback") }) : title}
onClick={() => {
if (!editing) props.onSelectSession(s.session_id, s.workspace, s.agent);
}}
@@ -632,7 +667,7 @@ export function Sidebar(props: Props) {
worker rows live in the drawer's Team panel (seventeenth pass). */}
{editing ? (
<input
- className="flex-1 min-w-0 px-1.5 py-0.5 rounded-md bg-panel border border-accent text-[13px] text-ink outline-none"
+ className="flex-1 min-w-0 px-1.5 py-0.5 rounded-md bg-panel border border-accent text-ui text-ink outline-none"
value={editValue}
autoFocus
onClick={(e) => e.stopPropagation()}
@@ -648,23 +683,26 @@ export function Sidebar(props: Props) {
<>
<span
className={
- "min-w-0 flex-1 block truncate text-[13px] " + (active ? "font-medium" : "")
+ // pr-2 + the reserved menu slot: the ellipsis lands early and never moves (owner 2026-09-03).
+ "min-w-0 flex-1 block truncate pr-2 text-ui " + (active ? "font-medium" : "")
}
>
{title}
</span>
- <span
- className={
- "flex items-center gap-1.5 shrink-0 group-hover:hidden" +
- (rowMenu?.id === s.session_id ? " hidden" : "")
- }
- >
- <OriginIcon s={s} />
- <ConnectorDot subs={s.subscriptions} />
- <LiveDot state={s.liveness} />
- <AttnBadge n={s.attention || 0} />
+ <span className="relative shrink-0 min-w-7 h-5 flex items-center justify-end">
+ <span
+ className={
+ "flex items-center gap-1.5 " +
+ (rowMenu?.id === s.session_id ? "invisible" : "group-hover:invisible")
+ }
+ >
+ <OriginIcon s={s} />
+ <ConnectorDot subs={s.subscriptions} />
+ <LiveDot state={s.liveness} />
+ <AttnBadge n={s.attention || 0} />
+ </span>
+ {rowActions(s, title)}
</span>
- {rowActions(s, title)}
</>
)}
</div>
@@ -676,7 +714,7 @@ export function Sidebar(props: Props) {
const pinnedBand = () =>
pinnedSessions.length > 0 ? (
<div>
- <div className="px-1.5 text-[11px] uppercase tracking-[0.07em] text-faint font-semibold mb-1">
+ <div className="px-1.5 text-label text-faint font-medium mb-1">
{t("sidebar.pinned")}
</div>
<div className="space-y-0.5">
@@ -691,7 +729,7 @@ export function Sidebar(props: Props) {
const scheduledBand = () =>
automations.length > 0 ? (
<div data-testid="scheduled-band">
- <div className="px-1.5 text-[11px] uppercase tracking-[0.07em] text-faint font-semibold mb-1">
+ <div className="px-1.5 text-label text-faint font-medium mb-1">
{t("sidebar.scheduled")}
</div>
<div className="space-y-0.5">
@@ -704,8 +742,8 @@ export function Sidebar(props: Props) {
onClick={() => props.onOpenAutomation(a.id)}
>
<div className="flex-1 min-w-0">
- <div className="text-[13px] text-ink truncate">{a.title}</div>
- <div className="text-[11px] text-faint truncate">{a.schedule}</div>
+ <div className="text-ui text-ink truncate">{a.title}</div>
+ <div className="text-label text-faint truncate">{a.schedule}</div>
</div>
<UnseenBadge n={a.unseen_runs || 0} failed={a.unseen_failed} />
</button>
@@ -723,7 +761,7 @@ export function Sidebar(props: Props) {
);
return (
<div className="relative flex items-center justify-between px-1.5 mb-1" data-testid="recent-header">
- <span className="text-[11px] uppercase tracking-[0.07em] text-faint font-semibold">
+ <span className="text-label text-muted font-medium">
{t("sidebar.recent")}
</span>
<button
@@ -742,18 +780,25 @@ export function Sidebar(props: Props) {
role="menu"
data-testid="group-filter-menu"
>
- <div className="px-2 pt-1 pb-1 text-[11px] uppercase tracking-[0.06em] text-faint font-semibold">
+ <div className="px-2 pt-1 pb-1 text-label text-faint font-medium">
{t("sidebar.group_by")}
</div>
- {([["grouped", t("sidebar.group_persona")], ["flat", t("sidebar.group_chrono")]] as ["flat" | "grouped", string][]).map(
+ {(
+ [
+ ["grouped", t("sidebar.group_persona")],
+ ["flat", t("sidebar.group_chrono")],
+ // UX-045: the entry exists only once a machine does.
+ ...(props.hasMachines ? [["machine", t("onmachine.sidebar.group_machine")]] : []),
+ ] as ["flat" | "grouped" | "machine", string][]
+ ).map(
([key, label]) => (
<button
key={key}
- className="w-full flex items-center gap-2 px-2 py-1.5 rounded-lg text-[13px] text-left hover:bg-paper"
+ className="w-full flex items-center gap-2 px-2 py-1.5 rounded-lg text-ui text-left hover:bg-paper"
onClick={() => setGroupBy(key)}
>
<span className="flex-1">{label}</span>
- {layout === key && <span className="text-accent text-[12px]">✓</span>}
+ {layout === key && <span className="text-accent text-meta">✓</span>}
</button>
),
)}
@@ -761,11 +806,11 @@ export function Sidebar(props: Props) {
<>
<div className="my-1 border-t border-line" />
<div className="px-2 pt-1 pb-1 flex items-center justify-between">
- <span className="text-[11px] uppercase tracking-[0.06em] text-faint font-semibold">
+ <span className="text-label text-faint font-medium">
{t("sidebar.filter_coworker")}
</span>
{filterPersonas.size > 0 && (
- <button className="text-[11px] text-accent" onClick={() => setFilterPersonas(new Set())}>
+ <button className="text-label text-accent" onClick={() => setFilterPersonas(new Set())}>
{t("sidebar.clear")}
</button>
)}
@@ -776,7 +821,7 @@ export function Sidebar(props: Props) {
return (
<button
key={p.id}
- className="w-full flex items-center gap-2 px-2 py-1.5 rounded-lg text-[13px] text-left hover:bg-paper"
+ className="w-full flex items-center gap-2 px-2 py-1.5 rounded-lg text-ui text-left hover:bg-paper"
onClick={() => toggleFilterPersona(p.id)}
>
<span
@@ -792,7 +837,7 @@ export function Sidebar(props: Props) {
);
})}
</div>
- <div className="px-2 pt-1 pb-0.5 text-[11px] text-faint leading-snug">
+ <div className="px-2 pt-1 pb-0.5 text-label text-faint leading-snug">
{t("sidebar.filter_all_hint")}
</div>
</>
@@ -881,7 +926,7 @@ export function Sidebar(props: Props) {
{/* Codex-style Projects: a "+" header affordance, then collapsible folders whose
rows carry a right-aligned compact age and truncate to PROJECT_PEEK + "Show more". */}
<div className="flex items-center justify-between px-1.5 pt-1">
- <span className="text-[11px] uppercase tracking-[0.07em] text-faint font-semibold">
+ <span className="text-label text-faint font-medium">
{t("sidebar.projects")}
</span>
<button
@@ -895,7 +940,7 @@ export function Sidebar(props: Props) {
</div>
<div className="space-y-0.5">
{projectOrder.length === 0 && (
- <div className="px-2 py-1.5 text-[12px] text-faint leading-snug">
+ <div className="px-2 py-1.5 text-meta text-faint leading-snug">
{t("sidebar.no_projects_yet")}
</div>
)}
@@ -923,7 +968,7 @@ export function Sidebar(props: Props) {
<Icon name="folder" size={15} className="shrink-0" />
<span
className={
- "truncate min-w-0 text-[13px] " + (isActive ? "font-semibold" : "font-medium")
+ "truncate min-w-0 text-ui " + (isActive ? "font-semibold" : "font-medium")
}
>
{baseName(proj)}
@@ -943,7 +988,7 @@ export function Sidebar(props: Props) {
{shown.map((s) => sessionRow(s, { showTime: true }))}
{!showAll && list.length > peek && (
<button
- className="px-2 py-1 text-[12px] text-faint hover:text-muted"
+ className="px-2 py-1 text-meta text-faint hover:text-muted"
onClick={() => setProjShowAll((s) => toggleSet(s, proj))}
>
{t("sidebar.show_more_n", { n: list.length - peek })}
@@ -951,7 +996,7 @@ export function Sidebar(props: Props) {
)}
</div>
) : (
- <div className="px-2 py-1.5 pl-[19px] text-[12px] text-faint leading-snug">
+ <div className="px-2 py-1.5 pl-[19px] text-meta text-faint leading-snug">
{t("sidebar.no_project_convos")}
</div>
))}
@@ -963,7 +1008,7 @@ export function Sidebar(props: Props) {
) : (
<div className="space-y-0.5">
{mine.filter(matches).length === 0 ? (
- <div className="px-2 py-1.5 text-[12px] text-faint leading-snug">
+ <div className="px-2 py-1.5 text-meta text-faint leading-snug">
{normalizedQuery ? t("sidebar.no_matching") : t("sidebar.no_conversations")}
</div>
) : (
@@ -974,7 +1019,7 @@ export function Sidebar(props: Props) {
).map((s) => sessionRow(s))}
{!personaShowAll.has(browseKey) && mine.filter(matches).length > peek && (
<button
- className="px-2 py-1 text-[12px] text-faint hover:text-muted"
+ className="px-2 py-1 text-meta text-faint hover:text-muted"
onClick={() => setPersonaShowAll((s) => toggleSet(s, browseKey))}
>
{t("sidebar.show_more_n", { n: mine.filter(matches).length - peek })}
@@ -988,7 +1033,7 @@ export function Sidebar(props: Props) {
{archived.length > 0 && (
<div className="mt-2 pt-1.5 border-t border-line">
<button
- className="w-full flex items-center gap-1.5 px-1.5 py-1 rounded text-[12px] text-faint hover:text-muted"
+ className="w-full flex items-center gap-1.5 px-1.5 py-1 rounded text-meta text-faint hover:text-muted"
onClick={() => setShowArchived((v) => !v)}
>
<Icon name={showArchived ? "chevronDown" : "chevronRight"} size={13} className="shrink-0" />
@@ -1005,7 +1050,7 @@ export function Sidebar(props: Props) {
return (
<div
- className="sidebar flex flex-col min-h-0 bg-chrome border-r border-line"
+ className="sidebar flex flex-col min-h-0 bg-chrome"
onMouseLeave={props.onPeekLeave}
>
{/* Header: collapse/pin control FIRST + wordmark. The pin sits at the same screen position
@@ -1024,15 +1069,23 @@ export function Sidebar(props: Props) {
<Icon name="sidebar" size={16} />
</button>
)}
- <div className="brand-wordmark text-[14px]">OpenWorker<span className="beta-tag">BETA</span></div>
+ <div className="brand-wordmark text-body">OpenWorker<span className="beta-tag">beta</span></div>
</div>
+ {props.settingsRail ? (
+ <div
+ id="settings-rail"
+ className="flex-1 min-h-0 flex flex-col"
+ data-testid="settings-rail"
+ />
+ ) : (
+ <>
{/* New session: a quiet nav row like its siblings (UX-040 — the filled accent block
shouted over the whole panel). The coworker pick lives in the composer's setup
row (UX-029); this starts the last-used persona. */}
<div className="px-2.5 pt-2">
<button
- className="w-full flex items-center gap-2.5 px-2.5 py-2 rounded-lg text-[13px] text-left font-medium text-ink hover:bg-chromeHover"
+ className="w-full flex items-center gap-2.5 px-2 py-1.5 rounded-[7px] text-ui text-left font-medium text-ink hover:bg-chromeHover"
onClick={() => props.onNewSession(props.agent)}
>
<Icon name="plus" size={15} className="shrink-0" /> {t("sidebar.new_session")}
@@ -1041,9 +1094,9 @@ export function Sidebar(props: Props) {
{/* Search: a borderless nav-style entry (not a boxed input) that opens the command-palette
SearchModal over the whole app. Matches the bottom-nav rows to reduce the boxy look. */}
- <div className="px-2.5 mt-1">
+ <div className="px-2.5 mt-0.5">
<button
- className="w-full flex items-center gap-2.5 px-2.5 py-2 rounded-lg text-[13px] text-left text-muted hover:bg-chromeHover hover:text-ink"
+ className="w-full flex items-center gap-2.5 px-2 py-1.5 rounded-[7px] text-ui text-left text-muted hover:bg-chromeHover hover:text-ink"
onClick={() => setSearchModalOpen(true)}
>
<Icon name="search" size={15} className="shrink-0" /> {t("sidebar.search")}
@@ -1052,10 +1105,10 @@ export function Sidebar(props: Props) {
{/* Automations: a first-class nav row (UX-023) — the account menu keeps its entry.
The badge is the cross-automation unseen-run total. */}
- <div className="px-2.5 mt-1">
+ <div className="px-2.5 mt-0.5">
<button
className={
- "w-full flex items-center gap-2.5 px-2.5 py-2 rounded-lg text-[13px] text-left hover:bg-chromeHover hover:text-ink " +
+ "w-full flex items-center gap-2.5 px-2 py-1.5 rounded-[7px] text-ui text-left hover:bg-chromeHover hover:text-ink " +
(props.scheduledActive ? "text-ink bg-chromeHover" : "text-muted")
}
data-testid="nav-automations"
@@ -1099,7 +1152,7 @@ export function Sidebar(props: Props) {
>
<span
className={
- "min-w-0 flex-1 truncate text-[13px] " +
+ "min-w-0 flex-1 truncate text-ui " +
(isCurrent(s.key) ? "font-semibold text-ink" : "font-medium text-ink")
}
>
@@ -1120,10 +1173,59 @@ export function Sidebar(props: Props) {
);
})}
</div>
+ ) : layout === "machine" ? (
+ // UX-045: grouped by home — This Mac first, then each machine (name-sorted).
+ // Groups render whole (no peek): the grouping IS the navigation.
+ <div className="space-y-3.5">
+ {recentSessions.length === 0 ? (
+ <div className="px-2 py-1.5 text-meta text-faint leading-snug">
+ {normalizedQuery ? t("sidebar.no_matching") : t("sidebar.no_conversations")}
+ </div>
+ ) : (
+ (() => {
+ const groups = new Map<string, SessionInfo[]>();
+ for (const s of recentSessions) {
+ const key = s.machine ? s.machine_name || "machine" : "This Mac";
+ if (!groups.has(key)) groups.set(key, []);
+ groups.get(key)!.push(s);
+ }
+ const order = ["This Mac", ...[...groups.keys()].filter((k) => k !== "This Mac").sort()];
+ // Header glyph (owner 2026-09-03): cloud for a managed sandbox, monitor for
+ // any other box; This Mac carries none.
+ const glyphFor = (k: string): "cloud" | "monitor" | null => {
+ if (k === "This Mac") return null;
+ const first = groups.get(k)?.[0];
+ const m = (props.machines || []).find((x) => x.id === first?.machine);
+ return m?.provenance === "fly" ? "cloud" : "monitor";
+ };
+ return order
+ .filter((k) => groups.has(k))
+ .map((k) => {
+ const glyph = glyphFor(k);
+ return (
+ <div key={k}>
+ <div className="px-2 pb-1 flex items-center gap-1.5 text-label text-faint font-medium">
+ {glyph && <Icon name={glyph} size={12} className="shrink-0" />}
+ {/* `k` is the stable group key; only the two built-in labels translate. */}
+ <span>
+ {k === "This Mac"
+ ? t("onmachine.this_mac")
+ : k === "machine"
+ ? t("onmachine.machine_fallback")
+ : k}
+ </span>
+ </div>
+ <div>{groups.get(k)!.map((s) => cardRow(s))}</div>
+ </div>
+ );
+ });
+ })()
+ )}
+ </div>
) : (
<div className="space-y-0.5">
{recentSessions.length === 0 ? (
- <div className="px-2 py-1.5 text-[12px] text-faint leading-snug">
+ <div className="px-2 py-1.5 text-meta text-faint leading-snug">
{normalizedQuery ? t("sidebar.no_matching") : t("sidebar.no_conversations")}
</div>
) : (
@@ -1134,7 +1236,7 @@ export function Sidebar(props: Props) {
).map((s) => cardRow(s))}
{recentSessions.length > RECENT_PEEK && (
<button
- className="w-full text-left px-2 py-1.5 text-[12px] text-muted hover:text-ink"
+ className="w-full text-left px-2 py-1.5 text-meta text-muted hover:text-ink"
onClick={() => setRecentExpanded((v) => !v)}
>
{recentExpanded
@@ -1149,6 +1251,8 @@ export function Sidebar(props: Props) {
</div>
</div>
</div>
+ </>
+ )}
{/* Bottom (§26): exactly ONE row — the account anchor. The inbox chip on it is
state-driven with a sticky unlock (quiet when empty, accent + count when pending);
@@ -1163,21 +1267,23 @@ export function Sidebar(props: Props) {
data-testid="account-menu"
role="menu"
>
- {cloud?.signed_in ? (
- /* Just the email — being signed in to OpenWorker Cloud is implicit. */
+ {cloud?.signed_in || hostedActor ? (
+ /* Just the email — being signed in is implicit. On the hosted
+ dashboard this is the Auth0 identity; the gateway sign-in
+ below makes no sense there (no sidecar to open a browser). */
<div
- className="px-3 py-1.5 mb-1 text-[11px] text-faint truncate border-b border-line"
+ className="px-3 py-1.5 mb-1 text-label text-faint truncate border-b border-line"
title={accountEmail}
>
{accountEmail}
</div>
) : (
<>
- <div className="px-3 py-1.5 text-[11px] text-faint border-b border-line">
+ <div className="px-3 py-1.5 text-label text-faint border-b border-line">
{t("sidebar.not_signed_in")}
</div>
<button
- className="w-full flex items-center gap-2.5 px-3 py-1.5 mb-1 text-[13px] text-left text-accent hover:bg-paper"
+ className="w-full flex items-center gap-2.5 px-3 py-1.5 mb-1 text-ui text-left text-accent hover:bg-paper"
data-testid="account-sign-in"
onClick={async () => {
setAppMenuOpen(false);
@@ -1210,7 +1316,7 @@ export function Sidebar(props: Props) {
t("nav.settings"),
props.onManage,
false,
- <span className="text-[11px] text-faint">⌘ ,</span>,
+ <span className="text-label text-faint">⌘ ,</span>,
)}
{/* No Automations here — the sidebar's top nav already carries it. */}
{appMenuItem("audit", t("nav.activity"), props.onOpenAudit, props.auditActive)}
@@ -1229,7 +1335,7 @@ export function Sidebar(props: Props) {
<button
className={
- "w-full flex items-center gap-2 px-2.5 py-2 rounded-lg text-[13px] text-left " +
+ "w-full flex items-center gap-2 px-2.5 py-2 rounded-lg text-ui text-left " +
(appMenuOpen ? "bg-chromeHover text-ink" : "hover:bg-chromeHover")
}
data-testid="account-row"
@@ -1239,23 +1345,23 @@ export function Sidebar(props: Props) {
}}
aria-haspopup="menu"
aria-expanded={appMenuOpen}
- aria-label={cloud?.signed_in ? t("sidebar.account_aria", { email: accountEmail }) : t("sidebar.account_not_signed_in_aria")}
+ aria-label={accountSignedIn ? t("sidebar.account_aria", { email: accountEmail }) : t("sidebar.account_not_signed_in_aria")}
>
<span
className={
- "w-6 h-6 rounded-full grid place-items-center text-[11px] font-semibold shrink-0 " +
- (cloud?.signed_in
+ "w-6 h-6 rounded-full grid place-items-center text-label font-semibold shrink-0 " +
+ (accountSignedIn
? "bg-accentSoft text-accent"
: "bg-panel text-faint border border-line")
}
aria-hidden
>
- {cloud?.signed_in ? accountName.slice(0, 1).toUpperCase() : "?"}
+ {accountSignedIn ? accountName.slice(0, 1).toUpperCase() : "?"}
</span>
- <span className={"truncate " + (cloud?.signed_in ? "" : "text-muted")}>
- {cloud?.signed_in ? accountName : t("sidebar.not_signed_in_row")}
+ <span className={"truncate " + (accountSignedIn ? "" : "text-muted")}>
+ {accountSignedIn ? accountName : t("sidebar.not_signed_in_row")}
</span>
- {cloud?.signed_in && (
+ {accountSignedIn && (
<span
className="w-[7px] h-[7px] rounded-full bg-ok shrink-0"
title={t("sidebar.signed_in_tooltip")}
@@ -1266,7 +1372,7 @@ export function Sidebar(props: Props) {
{inboxUnlocked && (
<span
className={
- "inline-flex items-center gap-1 rounded-full px-2 py-0.5 text-[12px] shrink-0 cursor-pointer " +
+ "inline-flex items-center gap-1 rounded-full px-2 py-0.5 text-meta shrink-0 cursor-pointer " +
(totalAttention > 0
? "bg-accentSoft text-accent font-semibold"
: "text-faint hover:text-ink")
diff --git a/surfaces/gui/src/components/SubscriptionsChip.tsx b/surfaces/gui/src/components/SubscriptionsChip.tsx
index 0c15d817..680bf867 100644
--- a/surfaces/gui/src/components/SubscriptionsChip.tsx
+++ b/surfaces/gui/src/components/SubscriptionsChip.tsx
@@ -30,11 +30,15 @@ export function ChannelPicker({
recent,
onSubmit,
onPickName,
+ machineId,
}: {
value: string;
onChange: (v: string) => void;
recent: RecentChannel[];
onSubmit?: () => void;
+ // The engine whose Slack workspaces feed the roster lookup: a session's machine
+ // (the dashboard has no connectors of its own; a remote session's live on its box).
+ machineId?: string | null;
// Fires when a pick RESOLVES a display name for the raw address — callers can echo the
// human name (+ workspace) wherever they show the target (§25 consent line, summaries).
onPickName?: (address: string, name: string, workspace?: string) => void;
@@ -56,7 +60,7 @@ export function ChannelPicker({
const [teams, setTeams] = useState<{ team_id: string; account: string }[] | null>(null);
useEffect(() => {
if (!open || teams !== null) return;
- getConnectors()
+ getConnectors(machineId)
.then((cs) => {
const s = cs.find((c) => c.name === "slack");
if (!s?.connected) return setTeams([]);
@@ -70,7 +74,7 @@ export function ChannelPicker({
);
})
.catch(() => setTeams([]));
- }, [open, teams]);
+ }, [open, teams, machineId]);
// Type a NAME → live roster suggestions (debounced; addresses/URLs skip the lookup).
// `searching` keeps the wait VISIBLE: the first lookup per workspace is a cold
@@ -90,7 +94,7 @@ export function ChannelPicker({
const rows = await Promise.all(
teams.map(async (tm) => {
try {
- const r = await getSlackChannels(tm.team_id, name);
+ const r = await getSlackChannels(tm.team_id, name, machineId);
return (r.ok ? r.channels || [] : []).map((c) => ({
address:
tm.team_id === "default" ? `slack:${c.id}` : `slack:${tm.team_id}/${c.id}`,
@@ -108,7 +112,7 @@ export function ChannelPicker({
setSearching(false);
}, 250);
return () => clearTimeout(t);
- }, [value, open, teams]);
+ }, [value, open, teams, machineId]);
// Filter as the user types (name, address, or last-message text); full list on focus.
const q = value.trim().toLowerCase();
@@ -188,12 +192,12 @@ export function ChannelPicker({
inputRef.current?.blur();
}}
>
- <span className="text-[13px] text-ink">
+ <span className="text-ui text-ink">
{c.name ? `#${c.name}` : c.channel}
</span>
- {c.name && <span className="ml-1.5 text-[11px] text-faint">{c.channel}</span>}
+ {c.name && <span className="ml-1.5 text-label text-faint">{c.channel}</span>}
{c.last_text && (
- <span className="block text-[11px] text-faint truncate">
+ <span className="block text-label text-faint truncate">
{c.last_from ? `${c.last_from}: ` : ""}
{c.last_text}
</span>
@@ -204,7 +208,7 @@ export function ChannelPicker({
channel roster (seconds on a big workspace; cached 15 min after). */}
{searching && lookups.length === 0 && (
<div
- className="px-3 py-1.5 text-[12px] text-faint"
+ className="px-3 py-1.5 text-meta text-faint"
data-testid="roster-searching"
>
{tt("inbox.searching_channels")}
@@ -228,15 +232,15 @@ export function ChannelPicker({
inputRef.current?.blur();
}}
>
- <span className="text-[13px] text-ink">
+ <span className="text-ui text-ink">
{r.is_private ? "🔒 " : "#"}
{r.name}
</span>
{r.workspace && (
- <span className="ml-1.5 text-[11px] text-faint">{r.workspace}</span>
+ <span className="ml-1.5 text-label text-faint">{r.workspace}</span>
)}
{!r.is_member && (
- <span className="block text-[11px] text-warnInk">
+ <span className="block text-label text-warnInk">
{tt("inbox.invite_to_listen")}
</span>
)}
diff --git a/surfaces/gui/src/components/Transcript.tsx b/surfaces/gui/src/components/Transcript.tsx
index 34213cee..3533e703 100644
--- a/surfaces/gui/src/components/Transcript.tsx
+++ b/surfaces/gui/src/components/Transcript.tsx
@@ -23,7 +23,7 @@ function ClampedUserText({ text }: { text: string }) {
<button
type="button"
onClick={() => setOpen((o) => !o)}
- className="block ml-auto mt-1.5 text-[13px] font-medium opacity-75 hover:opacity-100"
+ className="block ml-auto mt-1.5 text-ui font-medium opacity-75 hover:opacity-100"
>
{open ? t("transcript.user_less") : t("transcript.user_more")}
</button>
@@ -51,10 +51,10 @@ function BubbleMeta({ text, ts, align }: { text: string; ts?: number; align: "le
.catch(() => {});
};
return (
- <div className="relative h-0 select-none">
+ <div className="relative h-7 select-none">
<div
className={
- "absolute top-1 flex items-center gap-1.5 text-[11px] leading-none text-faint whitespace-nowrap opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 transition-opacity " +
+ "absolute top-3 flex items-center gap-1.5 text-label leading-none text-faint whitespace-nowrap opacity-0 group-hover:opacity-100 group-focus-within:opacity-100 transition-opacity " +
(align === "right" ? "right-0" : "left-0")
}
>
@@ -164,10 +164,10 @@ function originChip(origin: string | undefined, note: string | undefined, grant?
// Replayed user resolutions reuse the card-chip look (live sessions pair the card itself).
if (origin === "user") {
if (grant === "deny")
- return <span className="text-[11px] px-1.5 rounded-full bg-dangerSoft text-danger shrink-0">{t("transcript.approval.declined")}</span>;
+ return <span className="text-label px-1.5 rounded-full bg-dangerSoft text-danger shrink-0">{t("transcript.approval.declined")}</span>;
return (
<span
- className="text-[11px] px-1.5 rounded-full bg-okSoft text-ok shrink-0"
+ className="text-label px-1.5 rounded-full bg-okSoft text-ok shrink-0"
title={
(grant
? t("transcript.approval.approved_scope", { scope: grant.replace(/_/g, " ") })
@@ -195,7 +195,7 @@ function originChip(origin: string | undefined, note: string | undefined, grant?
return null;
return (
<span
- className="text-[11px] text-faint shrink-0"
+ className="text-label text-faint shrink-0"
data-testid="tool-approval-origin"
title={
origin === "reviewer"
@@ -229,10 +229,10 @@ function originChip(origin: string | undefined, note: string | undefined, grant?
function approvalChip(resolved: ApprovalDecision | undefined) {
const t = getI18n().getFixedT(null, "translation");
if (resolved === "deny")
- return <span className="text-[11px] px-1.5 rounded-full bg-dangerSoft text-danger shrink-0">{t("transcript.approval.declined")}</span>;
+ return <span className="text-label px-1.5 rounded-full bg-dangerSoft text-danger shrink-0">{t("transcript.approval.declined")}</span>;
return (
<span
- className="text-[11px] px-1.5 rounded-full bg-okSoft text-ok shrink-0"
+ className="text-label px-1.5 rounded-full bg-okSoft text-ok shrink-0"
title={
resolved
? t("transcript.approval.approved_scope", { scope: resolved.replace(/_/g, " ") })
@@ -246,7 +246,7 @@ function approvalChip(resolved: ApprovalDecision | undefined) {
function LineText({ line }: { line: HumanLine }) {
return (
- <span className="min-w-0 text-[13px] leading-relaxed">
+ <span className="min-w-0 text-ui leading-relaxed">
<span className="text-muted">{line.pre}</span>
{line.obj && <span className="text-ink">{line.obj}</span>}
{line.post && <span className="text-muted">{line.post}</span>}
@@ -273,7 +273,7 @@ function StepRow({
return (
<div>
<div className="group flex items-baseline gap-2 px-2 py-0.5 rounded-lg hover:bg-paper" data-testid="turn-step">
- <span className={"w-3.5 text-center text-[11px] shrink-0 " + (failed ? "text-danger" : running ? "text-accent" : "text-ok")}>
+ <span className={"w-3.5 text-center text-label shrink-0 " + (failed ? "text-danger" : running ? "text-accent" : "text-ok")}>
{running ? <span className="spinner" data-testid="step-running" /> : "●"}
</span>
<LineText
@@ -293,7 +293,7 @@ function StepRow({
{!approval && originChip(tool.approvalOrigin, tool.approvalNote, tool.approvalGrant)}
{!!tool.standingRule && (
<span
- className="text-[11px] px-1.5 rounded-full bg-tealSoft text-tealInk shrink-0"
+ className="text-label px-1.5 rounded-full bg-tealSoft text-tealInk shrink-0"
data-testid="tool-standing-rule"
title={t("transcript.step.auto_allowed_tip", { name: tool.standingRule })}
>
@@ -302,17 +302,17 @@ function StepRow({
)}
{!!tool.hidden && (
<span
- className="text-[11px] text-warnInk shrink-0"
+ className="text-label text-warnInk shrink-0"
data-testid="tool-hidden-count"
title={t("transcript.step.hidden_tip")}
>
{t("transcript.step.hidden_count_label", { n: tool.hidden })}
</span>
)}
- {failed && <span className="text-[11px] text-danger shrink-0">{tool.status}</span>}
+ {failed && <span className="text-label text-danger shrink-0">{tool.status}</span>}
{!running && (
<button
- className="ml-auto shrink-0 text-[11px] text-faint opacity-0 group-hover:opacity-100 cursor-pointer"
+ className="ml-auto shrink-0 text-label text-faint opacity-0 group-hover:opacity-100 cursor-pointer"
onClick={() => setRaw((v) => !v)}
>
{t("transcript.step.raw")}
@@ -320,7 +320,7 @@ function StepRow({
)}
</div>
{raw && (
- <pre className="ml-8 mr-2 my-1 px-2.5 py-1.5 rounded-lg border border-line bg-paper font-mono text-[12px] leading-relaxed text-muted whitespace-pre-wrap break-words max-h-56 overflow-auto">
+ <pre className="ml-8 mr-2 my-1 px-2.5 py-1.5 rounded-lg border border-line bg-paper font-mono text-meta leading-relaxed text-muted whitespace-pre-wrap break-words max-h-56 overflow-auto">
{`${tool.name} ${shortArgs(tool.args)}`}
{tool.preview ? `\n→ ${tool.preview.length > 1500 ? tool.preview.slice(0, 1500) + "\n…" : tool.preview}` : ""}
</pre>
@@ -330,12 +330,12 @@ function StepRow({
className="ml-8 mr-2 my-1 px-3 py-2 rounded-lg border border-line bg-dangerSoft/40"
data-testid="reviewer-deny-card"
>
- <div className="text-[11px] font-medium text-danger">{t("transcript.reviewer.blocked")}</div>
- <div className="text-[12px] text-ink mt-0.5">{tool.reviewerReason}</div>
- <div className="text-[11px] text-faint mt-1">{t("transcript.reviewer.explain")}</div>
+ <div className="text-label font-medium text-danger">{t("transcript.reviewer.blocked")}</div>
+ <div className="text-meta text-ink mt-0.5">{tool.reviewerReason}</div>
+ <div className="text-label text-faint mt-1">{t("transcript.reviewer.explain")}</div>
{tool.allowAnyway && onAllowAnyway && !overrideSent && (
<button
- className="mt-1.5 px-2.5 py-1 rounded-lg border border-line bg-panel text-[12px] text-ink hover:bg-paper"
+ className="mt-1.5 px-2.5 py-1 rounded-lg border border-line bg-panel text-meta text-ink hover:bg-paper"
data-testid="reviewer-allow-anyway"
onClick={() => {
setOverrideSent(true);
@@ -346,7 +346,7 @@ function StepRow({
</button>
)}
{overrideSent && (
- <div className="mt-1.5 text-[11px] text-ok" data-testid="reviewer-override-sent">
+ <div className="mt-1.5 text-label text-ok" data-testid="reviewer-override-sent">
{t("transcript.reviewer.override_sent")}
</div>
)}
@@ -388,7 +388,7 @@ function TurnGroup({
return (
<details className="stepgroup" open={open}>
<summary
- className="stepgroup-head flex items-center gap-2 py-0.5 cursor-pointer select-none text-[13px] text-faint hover:text-muted"
+ className="stepgroup-head flex items-center gap-2 py-0.5 cursor-pointer select-none text-ui text-faint hover:text-muted"
onClick={(e) => {
e.preventDefault(); // drive open/closed from state, not the native toggle
setUserToggle(!open);
@@ -424,12 +424,12 @@ function TurnGroup({
<div className="ml-1.5 mt-1 pl-2 border-l-2 border-line flex flex-col gap-0.5">
{rows.map((row, i) =>
row.type === "narr" ? (
- <div className="turn-narr px-2 py-1 text-[13px] text-muted max-w-[60ch]" key={i} data-testid="turn-narration">
+ <div className="turn-narr px-2 py-1 text-ui text-muted max-w-[60ch]" key={i} data-testid="turn-narration">
<Markdown text={row.text} />
</div>
) : row.type === "ask" ? (
<div className="flex items-baseline gap-2 px-2 py-0.5" key={i} data-testid="turn-ask">
- <span className={"w-3.5 text-center text-[11px] shrink-0 " + (row.approval.resolved === "deny" ? "text-danger" : "text-ok")}>●</span>
+ <span className={"w-3.5 text-center text-label shrink-0 " + (row.approval.resolved === "deny" ? "text-danger" : "text-ok")}>●</span>
<LineText line={humanizeAsk(row.approval.name, row.approval.args)} />
{approvalChip(row.approval.resolved)}
</div>
@@ -439,7 +439,7 @@ function TurnGroup({
)}
{streamingText && (
<div
- className="turn-narr px-2 py-1 text-[13px] text-muted max-w-[60ch]"
+ className="turn-narr px-2 py-1 text-ui text-muted max-w-[60ch]"
data-testid="turn-live-stream"
>
<Markdown text={streamingText} />
@@ -599,7 +599,7 @@ export function Transcript({ items, running, streamingText, onRetry, onOpenConne
case "user":
return (
<div className="group self-end max-w-[78%] flex flex-col items-end" key={bi}>
- <div className="bubble-user px-3.5 py-2.5 rounded-[14px_14px_4px_14px] bg-solid text-onSolid text-[14px] leading-relaxed whitespace-pre-wrap">
+ <div className="bubble-user px-3.5 py-2.5 rounded-[14px_14px_4px_14px] bg-solid text-onSolid text-body leading-relaxed whitespace-pre-wrap">
{item.attachments && item.attachments.length > 0 && (
<div className="bubble-attachments">
{item.attachments.map((a, i) =>
diff --git a/surfaces/gui/src/components/UpdateBanner.tsx b/surfaces/gui/src/components/UpdateBanner.tsx
index 99abfa89..5274c745 100644
--- a/surfaces/gui/src/components/UpdateBanner.tsx
+++ b/surfaces/gui/src/components/UpdateBanner.tsx
@@ -90,18 +90,18 @@ export function UpdateBanner() {
role="status"
data-testid="update-banner"
>
- <div className="text-[13px] font-semibold">{t("update.banner_title")}</div>
- <div className="text-[12px] text-muted mt-0.5">
+ <div className="text-ui font-semibold">{t("update.banner_title")}</div>
+ <div className="text-meta text-muted mt-0.5">
{t("update.ready", { version: update.version })}
</div>
{phase === "error" && (
- <div className="text-[12px] text-warnInk mt-1.5">
+ <div className="text-meta text-warnInk mt-1.5">
{t("update.install_failed")}
</div>
)}
<div className="flex items-center gap-2 mt-2.5">
<button
- className="px-3 py-1.5 rounded-full bg-accent text-white text-[13px] disabled:opacity-50"
+ className="px-3 py-1.5 rounded-full bg-accent text-white text-ui disabled:opacity-50"
onClick={install}
disabled={busy}
data-testid="update-install"
@@ -109,7 +109,7 @@ export function UpdateBanner() {
{busy ? t("update.downloading") : t("update.restart_to_update")}
</button>
<button
- className="px-2 py-1.5 text-[13px] text-faint hover:text-muted"
+ className="px-2 py-1.5 text-ui text-faint hover:text-muted"
onClick={() => {
dismissed.current = update.version;
setUpdate(null);
diff --git a/surfaces/gui/src/components/WorkspaceTrustPrompt.tsx b/surfaces/gui/src/components/WorkspaceTrustPrompt.tsx
index a0bd3ad6..1836f222 100644
--- a/surfaces/gui/src/components/WorkspaceTrustPrompt.tsx
+++ b/surfaces/gui/src/components/WorkspaceTrustPrompt.tsx
@@ -35,12 +35,12 @@ export function WorkspaceTrustPrompt({
</p>
<div className="rounded-lg border border-line bg-paper px-3 py-2.5 max-h-48 overflow-y-auto">
{request.requested_commands.map((command) => (
- <code key={command} className="block text-[13px] py-1 text-ink">
+ <code key={command} className="block text-ui py-1 text-ink">
{command}
</code>
))}
</div>
- <div className="text-[12px] text-muted mt-2 break-all">{request.workspace}</div>
+ <div className="text-meta text-muted mt-2 break-all">{request.workspace}</div>
{error && <div className="gate-error">{error}</div>}
<div className="gate-foot justify-end gap-2">
<button className="btn" onClick={onClose} disabled={saving}>