From 0764b161e570faf0f4ab3769d8d77717597e5d97 Mon Sep 17 00:00:00 2001 From: LoopX Agent <337587101+loopx-agent@users.noreply.github.com> Date: Sat, 21 Nov 2026 22:17:49 +0800 Subject: [PATCH 1/2] feat(workspace): add worker roster state rings, scope, now focus, and progress pills Signed-off-by: LoopX Agent <337587101+loopx-agent@users.noreply.github.com> --- .../attached-agent-conversations.css | 10 +- .../attached-agent-conversations.tsx | 26 +- .../personal-workspace/collaboration-card.css | 225 +++++- .../personal-workspace/collaboration-card.tsx | 237 ++++-- .../collaboration-status.test.mjs | 329 ++++++++ .../collaboration-status.ts | 761 ++++++++++++++++++ .../personal-workspace/context-drawer.tsx | 51 +- .../goal-agent-work-page.tsx | 26 +- .../goal-workspace-work.css | 5 +- .../goal-workspace-work.tsx | 47 +- .../personal-workspace/worker-roster.css | 358 ++++++++ .../personal-workspace/worker-roster.tsx | 142 ++++ 12 files changed, 2125 insertions(+), 92 deletions(-) create mode 100644 apps/presentation/dashboard/src/features/personal-workspace/collaboration-status.test.mjs create mode 100644 apps/presentation/dashboard/src/features/personal-workspace/collaboration-status.ts create mode 100644 apps/presentation/dashboard/src/features/personal-workspace/worker-roster.css create mode 100644 apps/presentation/dashboard/src/features/personal-workspace/worker-roster.tsx diff --git a/apps/presentation/dashboard/src/features/personal-workspace/attached-agent-conversations.css b/apps/presentation/dashboard/src/features/personal-workspace/attached-agent-conversations.css index 80461ad86d..93a3a02355 100644 --- a/apps/presentation/dashboard/src/features/personal-workspace/attached-agent-conversations.css +++ b/apps/presentation/dashboard/src/features/personal-workspace/attached-agent-conversations.css @@ -43,12 +43,16 @@ .goal-agent-work-page .attached-conversation-heading h2 {overflow-wrap: anywhere;} .agent-work-navigation {display: flex; flex-wrap: wrap; align-items: center; gap: 8px; min-width: 0;} .agent-work-navigation select, .agent-work-directory button {font: inherit; border: 1px solid var(--pw-line); background: var(--pw-card); color: var(--pw-text); border-radius: 6px; padding: 8px 12px; min-height: 44px; max-width: 100%;} -.agent-work-directory {display: grid; gap: 12px; padding-block: 24px;} -.agent-work-directory button {text-align: left; cursor: pointer;} +.agent-work-directory {display: grid; gap: 10px; padding-block: 20px; min-width: 0;} +.agent-work-directory-row {display: grid; gap: 6px; padding: 10px 12px; border: 1px solid var(--pw-line); border-radius: 8px; background: var(--pw-card); min-width: 0;} +.agent-work-directory-top {display: flex; flex-wrap: wrap; align-items: center; gap: 6px 8px; min-width: 0;} +.agent-work-directory-top .pw-roster-progress {margin-left: auto;} +.agent-work-directory button {text-align: left; cursor: pointer; font-weight: 600;} .agent-work-unavailable {padding-block: 24px; color: var(--pw-muted); line-height: var(--leading-prose);} .goal-agent-work-page .attached-conversation-content {flex: 1; display: flex; flex-direction: column; padding: 0 0 16px; overflow: auto;} .goal-agent-work-page .attached-conversation-content > p {margin-block: 8px;} -.goal-agent-work-page .attached-conversation-source {display: flex; align-items: center; gap: 8px; font-size: var(--text-caption); color: var(--pw-muted);} +.goal-agent-work-page .attached-conversation-source {display: flex; flex-wrap: wrap; align-items: center; gap: 6px 8px; font-size: var(--text-caption); color: var(--pw-muted); min-width: 0;} +.attached-connection-meta {display: grid; gap: 6px; min-width: 0;} .goal-agent-work-page .attached-conversation-messages {flex: 1; min-height: 160px; max-height: none; margin-block: 12px;} .goal-agent-work-page .attached-conversation-content > button {align-self: flex-start; min-height: 44px;} .goal-agent-work-page form {flex-shrink: 0; display: flex; gap: 12px; align-items: flex-end; border-top: 1px solid var(--pw-line); padding-top: 8px;} diff --git a/apps/presentation/dashboard/src/features/personal-workspace/attached-agent-conversations.tsx b/apps/presentation/dashboard/src/features/personal-workspace/attached-agent-conversations.tsx index 7f490d8abd..99790ad11d 100644 --- a/apps/presentation/dashboard/src/features/personal-workspace/attached-agent-conversations.tsx +++ b/apps/presentation/dashboard/src/features/personal-workspace/attached-agent-conversations.tsx @@ -3,6 +3,8 @@ import {ExternalLink, Keyboard} from "lucide-react"; import {AttachedConversationTimeline, type ConversationRecord, type ContentPage} from "./attached-conversation-record"; import {composerKeyAction} from "./composer-keyboard"; import {ContextHelp} from "./context-help"; +import {deriveAttachedWorkerStatus} from "./collaboration-status"; +import {WorkerNowLine, WorkerScopeTag, WorkerStateBadge} from "./worker-roster"; import "./attached-agent-conversations.css"; export type Binding = {agent_id: string; thread_id: string; binding_ref: string}; @@ -91,8 +93,8 @@ async function readVisiblePage(params: URLSearchParams, current: () => boolean): } /** Remount on binding changes so history, live readers and pending input cannot cross Sessions. */ -export function AttachedConversation({goalId, binding, zh, reconnect}: { - goalId: string; binding: Binding; zh: boolean; reconnect: () => void; +export function AttachedConversation({goalId, binding, agentLabel, hostSurfaces, zh, reconnect}: { + goalId: string; binding: Binding; agentLabel?: string; hostSurfaces?: readonly string[]; zh: boolean; reconnect: () => void; }) { const [messages, setMessages] = useState([]); const [snapshot, setSnapshot] = useState(null); @@ -509,13 +511,28 @@ export function AttachedConversation({goalId, binding, zh, reconnect}: { ? (zh ? "无法验证原会话的绑定或访问权限。" : "This conversation's binding or access could not be verified.") : error; const connectionError = connectionMessage ?

{connectionMessage}

: null; + const attachedStatus = deriveAttachedWorkerStatus({ + agentId: binding.agent_id, + label: agentLabel, + connected: snapshot?.connected, + canReply: snapshot?.can_reply, + activeTurn: activeRevision !== null, + liveActive, + bindingRejected: bindingReadRejected, + bindingError: error, + turnModel, + hostSurfaces, + locale: zh ? "zh-CN" : "en", + }); return
{recoveryError ?

{recoveryError}

: null} {sendNotice ?

{sendNotice}

: null} -
+
- Codex App + + + Codex App

{zh ? "已保存消息与工具记录自动更新;实时内容来自原宿主。" : "Saved messages and tools update automatically; live content comes from the original host."}

@@ -523,6 +540,7 @@ export function AttachedConversation({goalId, binding, zh, reconnect}: { {connectionStatus} {activeRevision !== null ? <>{" · "}{turnProfile} : null}

: null} +
diff --git a/apps/presentation/dashboard/src/features/personal-workspace/collaboration-card.css b/apps/presentation/dashboard/src/features/personal-workspace/collaboration-card.css index c9a01e4019..48f275637f 100644 --- a/apps/presentation/dashboard/src/features/personal-workspace/collaboration-card.css +++ b/apps/presentation/dashboard/src/features/personal-workspace/collaboration-card.css @@ -1,13 +1,192 @@ -.personal-collaboration { margin-top: 12px; border: 1px solid var(--color-border, #ebebeb); border-radius: 6px; padding: 12px 16px; overflow-wrap: anywhere; } -.personal-collaboration header { display: flex; flex-wrap: wrap; justify-content: space-between; gap: 8px; } -.personal-collaboration header span, .personal-collaboration-status { font-size: var(--text-caption); line-height: var(--leading-caption); opacity: .75; } -.personal-collaboration-status { display: flex; flex-wrap: wrap; gap: 8px 16px; } -.personal-collaboration summary { cursor: pointer; min-height: 44px; display: list-item; align-content: center; } -.personal-collaboration h4 { margin: 12px 0 4px; font-size: var(--text-body); line-height: var(--leading-body); } -.personal-collaboration p { white-space: pre-wrap; } -.personal-collaboration ul { padding-left: 20px; } +.pw-collab-roster-summary { + margin-top: 12px; + padding: 10px 12px; + border: 1px solid var(--pw-line); + border-radius: 8px; + background: var(--pw-bg); + display: grid; + gap: 8px; + min-width: 0; +} + +.pw-collab-roster-head { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: 6px 12px; + min-width: 0; +} + +.pw-collab-roster-list { + list-style: none; + margin: 0; + padding: 0; + display: grid; + gap: 6px; +} + +.pw-collab-roster-list li { + display: grid; + grid-template-columns: 12px auto auto auto minmax(0, 1fr) auto; + align-items: center; + gap: 8px; + padding-top: 6px; + border-top: 1px solid var(--pw-line); + min-width: 0; + font-size: var(--text-caption); + line-height: var(--leading-caption); +} + +.pw-collab-roster-agent { + font-weight: 600; + color: var(--pw-text); + white-space: nowrap; +} + +.pw-collab-roster-state-text { + color: var(--pw-muted); + white-space: nowrap; +} + +.pw-collab-roster-list li[data-roster-state="working"] .pw-collab-roster-state-text { + color: var(--pw-green); +} + +.pw-collab-roster-list li[data-roster-state="lease_expired"] .pw-collab-roster-state-text { + color: var(--pw-amber); +} + +.pw-collab-roster-list li[data-roster-state="needs_decision"] .pw-collab-roster-state-text { + color: var(--pw-red); +} + +.pw-collab-roster-now { + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: var(--pw-muted); +} + +.personal-collaboration { + margin-top: 10px; + border: 1px solid var(--pw-line); + border-radius: 8px; + padding: 12px 14px; + background: var(--pw-card); + overflow-wrap: anywhere; + min-width: 0; + display: grid; + gap: 8px; +} + +.personal-collaboration[data-roster-state="needs_decision"] { + border-color: color-mix(in srgb, var(--pw-red) 32%, var(--pw-line)); +} + +.personal-collaboration[data-roster-state="lease_expired"] { + border-color: color-mix(in srgb, var(--pw-amber) 36%, var(--pw-line)); +} + +.personal-collaboration[data-roster-state="working"] { + border-color: color-mix(in srgb, var(--pw-green) 28%, var(--pw-line)); +} + +.personal-collaboration header { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + align-items: flex-start; + gap: 8px 12px; + min-width: 0; +} + +.pw-collab-title-group { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 8px; + min-width: 0; + flex: 1 1 220px; +} + +.pw-collab-title-group strong { + font-size: var(--text-body); + line-height: var(--leading-body); + color: var(--pw-text); + overflow-wrap: anywhere; +} + +.pw-collab-meta-group { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 6px; + min-width: 0; +} + +.pw-collab-owner-label { + color: var(--pw-muted); + white-space: nowrap; +} + +.personal-collaboration header span, +.personal-collaboration-status { + font-size: var(--text-caption); + line-height: var(--leading-caption); +} + +.personal-collaboration-status { + display: flex; + flex-wrap: wrap; + gap: 4px 12px; + margin: 0; + color: var(--pw-muted); +} + +.pw-collab-reason { + margin: 0; + color: var(--pw-text); + font-size: var(--text-caption); + line-height: var(--leading-caption); +} + +.personal-collaboration summary { + cursor: pointer; + min-height: 44px; + display: list-item; + align-content: center; + color: var(--pw-text); + font-size: var(--text-caption); + font-weight: 500; +} + +.personal-collaboration h4 { + margin: 12px 0 4px; + font-size: var(--text-body); + line-height: var(--leading-body); +} + +.personal-collaboration p { + white-space: pre-wrap; +} + +.personal-collaboration .pw-roster-now { + white-space: nowrap; +} + +.personal-collaboration ul { + padding-left: 20px; +} + .personal-collaboration small { display: block; font-family: var(--font-mono); font-size: var(--text-caption); line-height: var(--leading-caption); } -.personal-collaboration summary:focus-visible { outline: 2px solid var(--color-link, #0070f3); outline-offset: 2px; } + +.personal-collaboration summary:focus-visible { + outline: 2px solid var(--pw-blue); + outline-offset: 2px; +} + .personal-request-control { border-top: 1px solid var(--pw-line); margin-top: 16px; padding-top: 12px; } .personal-request-control form, .personal-request-control label { display: grid; gap: 6px; } .personal-request-control form { gap: 12px; margin-top: 12px; } @@ -21,3 +200,31 @@ .personal-request-control button:disabled { opacity: .5; cursor: default; } .personal-request-control :is(button, input, textarea):focus-visible { outline: 2px solid var(--pw-blue); outline-offset: 2px; } .personal-request-control :is(input, textarea) { padding: 8px 10px; border: 1px solid var(--pw-line-strong); border-radius: 6px; background: var(--pw-card); color: var(--pw-text); font: inherit; } + +@media (max-width: 640px) { + .pw-collab-roster-list li { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 4px 8px; + } + + .pw-collab-roster-list .pw-roster-progress { + order: 2; + margin-left: auto; + } + + .pw-collab-roster-list .pw-roster-scope { + order: 5; + max-width: 100%; + } + + .pw-collab-roster-list .pw-collab-roster-now { + flex: 1 0 100%; + order: 10; + } + + .pw-collab-meta-group { + width: 100%; + } +} diff --git a/apps/presentation/dashboard/src/features/personal-workspace/collaboration-card.tsx b/apps/presentation/dashboard/src/features/personal-workspace/collaboration-card.tsx index c67facf8b1..8e18686d3a 100644 --- a/apps/presentation/dashboard/src/features/personal-workspace/collaboration-card.tsx +++ b/apps/presentation/dashboard/src/features/personal-workspace/collaboration-card.tsx @@ -1,30 +1,53 @@ import type { CollaborationReadback } from "../../data/chat-model"; -import {currentCollaborationConclusion} from "../../data/conversation-returns"; -import {useEffect, useState} from "react"; -import type {RequestControlView} from "../../data/request-control"; -import {RequestControl} from "./request-control"; +import { currentCollaborationConclusion } from "../../data/conversation-returns"; +import { useEffect, useState } from "react"; +import type { RequestControlView } from "../../data/request-control"; +import { RequestControl } from "./request-control"; import { useWorkspaceI18n } from "./i18n"; import { needsOriginalDeliveryProof } from "./return-delivery-status"; +import { + WORKER_ROSTER_STATES, + deriveCollaborationCardStatus, + deriveCollaborationRosterSummary, + workerRosterStateLabel, +} from "./collaboration-status"; +import { + WorkerNowLine, + WorkerProgressBadge, + WorkerScopeTag, + WorkerStateBadge, + WorkerStateGlyph, +} from "./worker-roster"; import "./collaboration-card.css"; const copy = { "zh-CN": { - title: "交办说明", context: "背景与补充", constraints: "约束", inputs: "输入材料", - acceptance: "验收要求", return: "需要回传", supplied: "已提供给接收方", pending: "等待接收方读取", - decision: "接收方判断", unknown: "尚未记录", unavailable: "暂时无法读取", - adopt: "已采纳", defer: "已暂缓", reject: "未采纳", no_change: "无需调整", - result: "回复等待送达", delivered: "回复已送达", unverified: "回复送达尚未核验", details: "查看交办内容", - owner: "接收方", reason: "原因", + title: "交办说明", + context: "背景与补充", + constraints: "约束", + inputs: "输入材料", + acceptance: "验收要求", + return: "需要回传", + decision: "接收方判断", + details: "查看交办内容", + owner: "接收方", + reason: "原因", + rosterSummary: "协作接收方概览", }, en: { - title: "Delegation brief", context: "Context & corrections", constraints: "Constraints", inputs: "Inputs", - acceptance: "Acceptance", return: "Expected return", supplied: "Supplied to receiver", pending: "Awaiting receiver read", - decision: "Receiver decision", unknown: "Not recorded", unavailable: "Readback unavailable", - adopt: "Adopted", defer: "Deferred", reject: "Rejected", no_change: "No change needed", - result: "Reply awaiting delivery", delivered: "Reply delivered", unverified: "Reply delivery unverified", details: "View delegation details", - owner: "Recipient", reason: "Reason", + title: "Delegation brief", + context: "Context & corrections", + constraints: "Constraints", + inputs: "Inputs", + acceptance: "Acceptance", + return: "Expected return", + decision: "Receiver decision", + details: "View delegation details", + owner: "Recipient", + reason: "Reason", + rosterSummary: "Recipient collaboration roster", }, -}; +} as const; export function CollaborationCard({ request }: { request?: CollaborationReadback }) { const { locale, t } = useWorkspaceI18n(); @@ -32,60 +55,150 @@ export function CollaborationCard({ request }: { request?: CollaborationReadback const [unavailable, setUnavailable] = useState(false); const [editing, setEditing] = useState(false); const [detailsOpen, setDetailsOpen] = useState(false); - useEffect(() => {setObserved(null); setUnavailable(false);}, [request?.request_id]); + + useEffect(() => { + setObserved(null); + setUnavailable(false); + }, [request?.request_id]); + useEffect(() => { if (request?.request_control && observed && request.request_control.control_version >= observed.control_version) { - setObserved(null); setUnavailable(false); + setObserved(null); + setUnavailable(false); } - }, [request?.request_control]); + }, [request?.request_control, observed]); + if (!request) return null; + const c = copy[locale]; const brief = observed?.brief ?? request.brief; const revision = observed?.revision ?? request.request_revision; - const readStatus = unavailable ? "unavailable" : observed ? observed.read_readback === "recorded" ? "supplied" - : observed.read_readback === "unavailable" ? "unavailable" : "pending" : request.read_status; - const recordedDecision = unavailable ? "unavailable" : observed ? observed.assessment?.decision - ?? (observed.assessment_readback === "unavailable" ? "unavailable" : "pending") : request.decision; - const decision = (() => { - switch (recordedDecision) { - case "adopt": return c.adopt; - case "defer": return c.defer; - case "reject": return c.reject; - case "no_change": return c.no_change; - case "unavailable": return c.unavailable; - default: return c.unknown; - } - })(); - const conclusion = currentCollaborationConclusion({...request, request_revision: revision}); + const status = deriveCollaborationCardStatus({ request, observed, unavailable, locale }); + const conclusion = currentCollaborationConclusion({ ...request, request_revision: revision }); const decisionReason = observed ? observed.assessment?.reason : request.decision_reason; - return
-
{brief.purpose}{c.owner}: {request.goal_id ? `${request.goal_id} / ` : ""}{request.agent_id}
-

- {revision !== undefined ? {locale === "zh-CN" ? "请求版本" : "Request revision"} {revision} : null} - {readStatus === "supplied" ? c.supplied : readStatus === "unavailable" ? c.unavailable : c.pending} - {c.decision}: {decision} - {conclusion ? {needsOriginalDeliveryProof(conclusion) ? t("returnDelivery.originalHandoff") - : conclusion.status === "delivered" ? c.delivered - : conclusion.status === "queued" ? c.result : c.unverified} : null} -

- {decisionReason && !unavailable ?

{c.reason}: {decisionReason}

: null} -
setDetailsOpen(event.currentTarget.open)}> - {c.details} - {request.control_route ? {setObserved(value); setUnavailable(value === null);}} onEditing={setEditing} /> : null} - {!editing && <> -

{c.context}

{brief.context}

- {brief.constraints.length ? <>

{c.constraints}

    {brief.constraints.map((item, i) =>
  • {item}
  • )}
: null} - {brief.inputs.length ? <>

{c.inputs}

    {brief.inputs.map((input, i) =>
  • {input.ref} — {input.description}{input.sha256 ? sha256:{input.sha256} : null}
  • )}
: null} -

{c.acceptance}

    {brief.acceptance.map((item, i) =>
  • {item}
  • )}
-

{c.return}

{brief.return_requirement}

- } -
-
; + const conclusionText = conclusion + ? (needsOriginalDeliveryProof(conclusion) ? t("returnDelivery.originalHandoff") : status.conclusionLabel) + : null; + + return ( +
+
+
+ + {brief.purpose} +
+
+ {c.owner}: + + +
+
+ +

+ {status.revisionLabel ? {status.revisionLabel} : null} + {status.readLabel} + {c.decision}: {status.decisionLabel} + {conclusionText ? {conclusionText} : null} +

+ {decisionReason && !unavailable && status.decisionReason !== status.now ? ( +

{c.reason}: {decisionReason}

+ ) : null} +
setDetailsOpen(event.currentTarget.open)}> + {c.details} + {request.control_route ? ( + { + setObserved(value); + setUnavailable(value === null); + }} + onEditing={setEditing} + /> + ) : null} + {!editing && ( + <> +

{c.context}

+

{brief.context}

+ {brief.constraints.length ? ( + <> +

{c.constraints}

+
    {brief.constraints.map((item, i) =>
  • {item}
  • )}
+ + ) : null} + {brief.inputs.length ? ( + <> +

{c.inputs}

+
    + {brief.inputs.map((input, i) => ( +
  • + {input.ref} — {input.description} + {input.sha256 ? sha256:{input.sha256} : null} +
  • + ))} +
+ + ) : null} +

{c.acceptance}

+
    {brief.acceptance.map((item, i) =>
  • {item}
  • )}
+

{c.return}

+

{brief.return_requirement}

+ + )} +
+
+ ); } /** Each recipient retains its own request controls, decision and return. */ -export function CollaborationCards({request, requests}: {request?: CollaborationReadback; requests?: CollaborationReadback[]}) { - return <>{(requests ?? (request ? [request] : [])).map(row => - )}; +export function CollaborationCards({ + request, + requests, +}: { + request?: CollaborationReadback; + requests?: CollaborationReadback[]; +}) { + const { locale } = useWorkspaceI18n(); + const rows = requests ?? (request ? [request] : []); + if (!rows.length) return null; + const summary = rows.length > 1 ? deriveCollaborationRosterSummary(rows, locale) : null; + + return ( + <> + {summary ? ( + + ) : null} + {rows.map((row) => )} + + ); } diff --git a/apps/presentation/dashboard/src/features/personal-workspace/collaboration-status.test.mjs b/apps/presentation/dashboard/src/features/personal-workspace/collaboration-status.test.mjs new file mode 100644 index 0000000000..b67b5f0ec1 --- /dev/null +++ b/apps/presentation/dashboard/src/features/personal-workspace/collaboration-status.test.mjs @@ -0,0 +1,329 @@ +import assert from "node:assert/strict"; +import test from "node:test"; +import { + WORKER_ROSTER_STATES, + deriveAttachedWorkerStatus, + deriveCollaborationCardStatus, + deriveCollaborationRosterSummary, + deriveGoalWorkerRoster, + formatProgressCounter, + sanitizeFocusLine, +} from "./collaboration-status.ts"; + +function makeCollaborationRequest(overrides = {}) { + return { + schema_version: "collaboration_request_readback_v0", + request_id: "req-1", + agent_id: "worker-a", + goal_id: "goal-ui", + request_revision: 1, + brief: { + purpose: "Refine collaboration header layout", + context: "Check desktop and narrow spacing", + constraints: ["Keep zero horizontal overflow at 390px"], + inputs: [], + acceptance: ["Verified visual layout across viewports"], + return_requirement: "Report updated contrast and responsive screenshots", + }, + read_status: "pending", + decision: "pending", + returns: [], + ...overrides, + }; +} + +function makeControlView(overrides = {}) { + return { + schema_version: "collaboration_request_control_v0", + request_id: "req-1", + goal_ref: { goal_id: "goal-ui", goal_instance_id: "inst-1" }, + receiver_agent_id: "worker-a", + revision: 2, + control_version: 2, + revision_digest: "deadbeef", + brief: makeCollaborationRequest().brief, + reason: "Initial delegation", + read_at: "2026-11-21T10:00:00Z", + read_readback: "recorded", + assessment: { decision: "adopt", reason: "Accepted UX slice", assessed_at: "2026-11-21T10:01:00Z" }, + assessment_readback: "recorded", + control_state: "open", + cancellation: null, + active_reservation: null, + terminal_effects: [], + execution_authority_granted: false, + ...overrides, + }; +} + +test("sanitizeFocusLine strips JSON payloads, ANSI codes, shell noise, and preserves clean surrogate-safe text", () => { + const noisy = [ + '{"schema_version":"v0","ok":true,"turn_id":"t_123"}', + "$ npm run build", + "[stderr] Traceback (most recent call last):", + "2026-11-21T10:05:00Z Now: \u001b[32mPASS\u001b[0m \u001b[1mAlign roster badges & truncate long CJK titles\u001b[0m {\"exit\":0}", + "Second line ignored", + ].join("\n"); + assert.equal( + sanitizeFocusLine(noisy, 80), + "PASS Align roster badges & truncate long CJK titles", + ); + + const emojiAndCjk = "🔥 迁移并核验多 Worker 协作状态看板与响应式卡片在 390px 窄屏下的换行表现避免截断"; + const truncated = sanitizeFocusLine(emojiAndCjk, 18); + assert.ok(Array.from(truncated).length <= 18); + assert.ok(truncated.endsWith("…")); + assert.ok(!/[\uD800-\uDFFF]/.test(truncated.replace(/[\u{10000}-\u{10FFFF}]/gu, ""))); + + assert.equal(sanitizeFocusLine('{"raw":"only"}'), ""); + assert.equal(sanitizeFocusLine("sha256:0123456789abcdef0123456789abcdef"), ""); +}); + +test("formatProgressCounter keeps unknown measurements distinct instead of fabricating zero", () => { + assert.deepEqual(formatProgressCounter(2, 5), { done: 2, total: 5, open: null, label: "[2/5]" }); + assert.deepEqual(formatProgressCounter(3, null, 2), { done: 3, total: 5, open: 2, label: "[3/5]" }); + assert.deepEqual(formatProgressCounter(3, null), { done: 3, total: null, open: null, label: "[3/—]" }); + assert.deepEqual(formatProgressCounter(null, null, 4, "en"), { done: null, total: null, open: 4, label: "[4 open]" }); + assert.deepEqual(formatProgressCounter(null, null, 4, "zh-CN"), { done: null, total: null, open: 4, label: "[4 待办]" }); + assert.deepEqual(formatProgressCounter(null, null, null), { done: null, total: null, open: null, label: "" }); +}); + +test("deriveCollaborationCardStatus classifies all 4 Roster states accurately", () => { + const waitingCard = deriveCollaborationCardStatus({ + request: makeCollaborationRequest(), + locale: "en", + }); + assert.equal(waitingCard.state, "waiting"); + assert.equal(waitingCard.scope, "goal-ui / worker-a"); + assert.equal(waitingCard.progress.label, "[0/3]"); + + const workingCard = deriveCollaborationCardStatus({ + request: makeCollaborationRequest({ + read_status: "supplied", + decision: "adopt", + decision_reason: "Starting implementation", + }), + locale: "zh-CN", + }); + assert.equal(workingCard.state, "working"); + assert.equal(workingCard.stateLabel, "执行中"); + assert.equal(workingCard.progress.label, "[2/3]"); + + const adoptedBeforeReadSyncCard = deriveCollaborationCardStatus({ + request: makeCollaborationRequest({ + read_status: "pending", + decision: "adopt", + decision_reason: "Independent check underway", + }), + locale: "zh-CN", + }); + assert.equal(adoptedBeforeReadSyncCard.state, "working"); + assert.equal(adoptedBeforeReadSyncCard.now, "Independent check underway"); + + const decisionCard = deriveCollaborationCardStatus({ + request: makeCollaborationRequest({ + read_status: "supplied", + decision: "defer", + decision_reason: "Waiting for schema owner confirmation", + }), + observed: makeControlView({ + assessment: { decision: "defer", reason: "Needs owner sign-off\n{\"internal\":1}", assessed_at: "2026-11-21T10:05:00Z" }, + control_state: "effect_pending", + }), + locale: "en", + }); + assert.equal(decisionCard.state, "needs_decision"); + assert.equal(decisionCard.now, "Needs owner sign-off"); + + const expiredCard = deriveCollaborationCardStatus({ + request: makeCollaborationRequest({ + read_status: "supplied", + decision: "adopt", + returns: [ + { phase: "conclusion", status: "verification_required", error: "initial_delivery_receipt_unavailable", request_revision: 1 }, + ], + }), + locale: "en", + }); + assert.equal(expiredCard.state, "lease_expired"); + + const settledCard = deriveCollaborationCardStatus({ + request: makeCollaborationRequest({ + read_status: "supplied", + decision: "adopt", + decision_reason: "Completed roster polish", + returns: [{ phase: "conclusion", status: "delivered", request_revision: 1 }], + }), + locale: "zh-CN", + }); + assert.equal(settledCard.state, "waiting"); + assert.equal(settledCard.progress.label, "[3/3]"); +}); + +test("deriveCollaborationRosterSummary rolls up multi-recipient roster counts and progress", () => { + const summary = deriveCollaborationRosterSummary([ + makeCollaborationRequest({ request_id: "r1", agent_id: "builder", read_status: "supplied", decision: "adopt" }), + makeCollaborationRequest({ request_id: "r2", agent_id: "reviewer", read_status: "supplied", decision: "adopt", returns: [{ phase: "conclusion", status: "delivered", request_revision: 1 }] }), + makeCollaborationRequest({ request_id: "r3", agent_id: "qa", read_status: "supplied", decision: "reject", decision_reason: "Scope mismatch" }), + makeCollaborationRequest({ request_id: "r4", agent_id: "ops", read_status: "unavailable", decision: "unavailable" }), + ], "en"); + + assert.equal(summary.total, 4); + assert.equal(summary.concluded, 1); + assert.equal(summary.progress.label, "[1/4]"); + assert.deepEqual(summary.counts, { + working: 1, + waiting: 1, + needs_decision: 1, + lease_expired: 1, + }); +}); + +test("deriveGoalWorkerRoster classifies populated multi-worker states from observed typed facts without fabricating liveness", () => { + const nowMs = Date.parse("2026-11-21T12:00:00Z"); + const goal = { + goalId: "goal-ui", + agentId: "coordinator", + agentLabel: "Coordinator", + registeredAgentIds: ["coordinator", "builder", "verifier", "scout"], + agentLanes: [ + { agentId: "builder", label: "Builder Agent with an Extraordinarily Long Multi-Word Roster Name", hostSurfaces: ["codex-app"] }, + { agentId: "verifier", label: "Verifier", hostSurfaces: ["loopx"] }, + { agentId: "scout", label: "Scout", hostSurfaces: ["codex-app"] }, + { agentId: "coordinator", label: "Coordinator", hostSurfaces: ["loopx"] }, + ], + agentSentence: "Shipping workspace polish", + nextSentence: "Verify narrow screen", + activationState: "active", + state: "安静运行", + title: "Personal Workspace Roster UX", + doneTodoCount: 3, + openTodoCount: 4, + agentTodos: [ + { todoId: "t1", done: true, claimedBy: "builder", taskDomain: "dashboard", text: "Extract pure collaboration status helper" }, + { todoId: "t2", done: false, claimedBy: "builder", taskDomain: "dashboard", text: "Render Roster rings in overview" }, + { todoId: "t3", done: false, claimedBy: "verifier", taskDomain: "qa", status: "blocked", blockedReason: "Confirm narrow 390px overflow policy", text: "Review PR head" }, + { todoId: "t4", done: false, claimedBy: "scout", taskDomain: "research", text: "Inspect legacy screenshot fixtures" }, + { todoId: "t5", done: true, claimedBy: "coordinator", taskDomain: "ops", text: "Wire worktree environment" }, + { todoId: "t6", done: false, claimedBy: "coordinator", taskDomain: "ops", status: "deferred", resumeWhen: "After verifier approves", text: "Prepare handoff note" }, + ], + hostThreadActivity: { + completeness: "complete", + threads: [ + { agentId: "builder", hostSurface: "codex-app", state: "turn_open", lastEventAt: "2026-11-21T11:57:00Z", deliveryWindow: { state: "fresh" } }, + // Old open turn > 15m must surface as lease_expired rather than live working. + { agentId: "scout", hostSurface: "codex-app", state: "turn_open", lastEventAt: "2026-11-21T10:30:00Z", deliveryWindow: { state: "stale" } }, + ], + }, + workerObservations: { + read_status: "read", + rows: [], + }, + }; + + const digest = { + schema: "goal_workspace_digest_v0", + observedAt: "2026-11-21T12:00:00Z", + objective: "Polish Roster UX", + lifecycle: { activation: "active", finishingTurn: false }, + attentionSummary: { blocking: 1, optional: 0, coverage: "complete" }, + work: { + open: 4, + done: 3, + total: 7, + coverage: "complete", + listedOpen: 4, + classes: { running_observed: 1, needs_you: 0, waiting_dependency: 0, open: 1, blocked: 1, deferred: 1, done: 3 }, + rows: [ + { todoId: "t2", ownerId: "builder", displayClass: "running_observed", prerequisiteIds: [] }, + { todoId: "t3", ownerId: "verifier", displayClass: "blocked", prerequisiteIds: [] }, + { todoId: "t4", ownerId: "scout", displayClass: "open", prerequisiteIds: [] }, + { todoId: "t6", ownerId: "coordinator", displayClass: "deferred", prerequisiteIds: [] }, + ], + groups: [], + rail: { needsYou: [], open: ["t2", "t4"], blocked: ["t3", "t6"], done: ["t1", "t5"] }, + }, + needsYou: { availability: "ok", blocking: 1, optional: 0, coverage: "complete" }, + vitals: { attention: { kind: "ok" }, execution: { kind: "idle" }, progress: { done: 3, total: 7 }, usage: { kind: "empty" } }, + }; + + const items = [ + { + id: "run-1", + kind: "run", + run: { + runId: "run-1", + agentId: "builder", + agentLabel: "Builder", + completedSteps: 2, + totalSteps: 4, + goalId: "goal-ui", + goalTitle: "Personal Workspace Roster UX", + latestActivity: "{\"event\":\"step\"}\nRefining CollaborationCard status pills", + status: "running", + title: "Build Roster Strip", + }, + }, + ]; + + const roster = deriveGoalWorkerRoster({ + goal, + digest, + items, + locale: "en", + nowMs, + }); + + assert.equal(roster.progress.label, "[3/7]"); + assert.deepEqual( + roster.workers.map((w) => [w.agentId, w.state]), + [ + ["verifier", "needs_decision"], + ["builder", "working"], + ["scout", "lease_expired"], + ["coordinator", "waiting"], + ], + ); + + const builder = roster.workers.find((w) => w.agentId === "builder"); + assert.equal(builder?.scope, "dashboard"); + assert.equal(builder?.now, "Refining CollaborationCard status pills"); + assert.equal(builder?.progress.label, "[1/2]"); + assert.ok((builder?.label.length ?? 0) <= 48); + + const scout = roster.workers.find((w) => w.agentId === "scout"); + assert.equal(scout?.state, "lease_expired"); + assert.match(scout?.now ?? "", /Host delivery window stale/); + + const verifier = roster.workers.find((w) => w.agentId === "verifier"); + assert.equal(verifier?.now, "Confirm narrow 390px overflow policy"); + + assert.deepEqual( + new Set(roster.workers.map((w) => w.state)), + new Set(WORKER_ROSTER_STATES), + ); +}); + +test("deriveAttachedWorkerStatus reflects active turn, idle accepting, and disconnected states", () => { + const live = deriveAttachedWorkerStatus({ + agentId: "builder", + label: "Frontend Builder", + connected: true, + canReply: false, + activeTurn: true, + turnModel: { model: "gpt-5.4", reasoning_effort: "high" }, + locale: "en", + }); + assert.equal(live.state, "working"); + assert.equal(live.scope, "codex-app / builder"); + assert.match(live.now, /gpt-5.4 · high/); + + const broken = deriveAttachedWorkerStatus({ + agentId: "builder", + bindingRejected: true, + activeTurn: false, + locale: "zh-CN", + }); + assert.equal(broken.state, "lease_expired"); + assert.equal(broken.stateLabel, "租约过期"); +}); diff --git a/apps/presentation/dashboard/src/features/personal-workspace/collaboration-status.ts b/apps/presentation/dashboard/src/features/personal-workspace/collaboration-status.ts new file mode 100644 index 0000000000..8418559717 --- /dev/null +++ b/apps/presentation/dashboard/src/features/personal-workspace/collaboration-status.ts @@ -0,0 +1,761 @@ +import type { GoalWorkspaceDigest, GoalWorkDisplayClass } from "../../../../../../loopx/control_plane/presentation/goal_workspace_digest.js"; +import type { CollaborationReadback } from "../../data/chat-model"; +import type { RequestControlView } from "../../data/request-control"; +import type { GoalHostThread } from "./goal-activity"; + +/** Mirrors `quietTurnMinutes` from `goal-activity.ts` to keep zero runtime imports for Node test execution. */ +const QUIET_TURN_MINUTES = 15; +import type { + WorkspaceAgentTodo, + WorkspaceAttention, + WorkspaceGoal, + WorkspaceRun, + WorkspaceTimelineItem, +} from "./personal-workspace-model"; + +export const WORKER_ROSTER_STATES = [ + "needs_decision", + "working", + "lease_expired", + "waiting", +] as const; + +export type WorkerRosterState = (typeof WORKER_ROSTER_STATES)[number]; +export type CollaborationLocale = "zh-CN" | "en"; + +export type ProgressCounter = { + done: number | null; + total: number | null; + open: number | null; + label: string; +}; + +export type CollaborationCardRosterStatus = { + state: WorkerRosterState; + stateLabel: string; + scope: string; + now: string; + progress: ProgressCounter; + revisionLabel: string | null; + readLabel: string; + decisionLabel: string; + conclusionLabel: string | null; + decisionReason: string; + unavailable: boolean; +}; + +export type CollaborationRosterSummary = { + total: number; + concluded: number; + counts: Record; + progress: ProgressCounter; + workers: Array<{ + requestId: string; + agentId: string; + scope: string; + state: WorkerRosterState; + stateLabel: string; + now: string; + progress: ProgressCounter; + }>; +}; + +export type WorkerRosterEntry = { + agentId: string; + label: string; + state: WorkerRosterState; + stateLabel: string; + scope: string; + now: string; + progress: ProgressCounter; + hostSurfaces: string[]; + hasConversation: boolean; +}; + +export type GoalWorkerRoster = { + workers: WorkerRosterEntry[]; + counts: Record; + progress: ProgressCounter; +}; + +export type AttachedWorkerStatusInput = { + agentId: string; + label?: string | null; + connected?: boolean | null; + canReply?: boolean | null; + activeTurn: boolean; + liveActive?: boolean; + bindingRejected?: boolean; + bindingError?: string | null; + turnModel?: { model: string; reasoning_effort?: string | null } | null; + hostSurfaces?: readonly string[]; + latestFocus?: string | null; + locale: CollaborationLocale; +}; + +export type AttachedWorkerStatus = { + agentId: string; + label: string; + state: WorkerRosterState; + stateLabel: string; + scope: string; + now: string; +}; + +const STATE_PRIORITY: Record = { + needs_decision: 0, + working: 1, + lease_expired: 2, + waiting: 3, +}; + +const STATE_LABELS: Record> = { + "zh-CN": { + needs_decision: "需决定", + working: "执行中", + lease_expired: "租约过期", + waiting: "等待中", + }, + en: { + needs_decision: "Needs decision", + working: "Working", + lease_expired: "Lease expired", + waiting: "Waiting", + }, +}; + +const CARD_WORDS = { + "zh-CN": { + supplied: "已提供给接收方", + pending: "等待接收方读取", + unavailable: "暂时无法读取", + adopt: "已采纳", + defer: "已暂缓", + reject: "未采纳", + no_change: "无需调整", + unknown: "尚未记录", + delivered: "回复已送达", + result: "回复等待送达", + unverified: "回复送达尚未核验", + originalHandoff: "等待原会话回传确认", + revisionPrefix: "请求版本", + awaitingReadNow: "等待接收方读取交办说明", + cancelledNow: "请求已取消,已交付任务保留", + decisionPendingNow: "待确认请求调整或暂缓决定", + leaseExpiredNow: "读取或回执状态不可用,需核对原会话", + unverifiedReturnNow: "回复送达尚未核验,请确认原发送记录", + workingFallbackNow: "已采纳请求,正在推进回传", + settledNow: "结论已送达", + }, + en: { + supplied: "Supplied to receiver", + pending: "Awaiting receiver read", + unavailable: "Readback unavailable", + adopt: "Adopted", + defer: "Deferred", + reject: "Rejected", + no_change: "No change needed", + unknown: "Not recorded", + delivered: "Reply delivered", + result: "Reply awaiting delivery", + unverified: "Reply delivery unverified", + originalHandoff: "Awaiting original handoff proof", + revisionPrefix: "Request revision", + awaitingReadNow: "Awaiting receiver readback", + cancelledNow: "Request cancelled; committed work retained", + decisionPendingNow: "Needs decision on deferred or pending change", + leaseExpiredNow: "Readback or receipt unavailable; verify in host", + unverifiedReturnNow: "Reply delivery unverified; check original handoff", + workingFallbackNow: "Adopted brief; preparing return", + settledNow: "Conclusion delivered", + }, +} as const; + +const ROSTER_WORDS = { + "zh-CN": { + standingBy: "待命,等待下一项分配", + completedStandingBy: "近期任务已完成,待命", + replanPaused: "需要补充方向或确认,已暂停复核", + outcomeUnknown: "原请求结果未知,待核实后再继续", + staleWindow: "宿主投递窗口已过期,待核实连接", + leaseExpired: "执行租约已过期或未刷新", + connecting: "正在连接原会话", + acceptingReplies: "原会话空闲,可直接回复", + runningTurn: "原会话回合运行中", + connectionLost: "原会话连接或状态未确认", + bindingRejected: "无法验证原会话绑定与访问权限", + openCount: (open: number) => `${open} 待办`, + }, + en: { + standingBy: "Standing by for next assignment", + completedStandingBy: "Recent work completed; standing by", + replanPaused: "Needs direction; review paused", + outcomeUnknown: "Original outcome unknown; check settlement", + staleWindow: "Host delivery window stale; check connection", + leaseExpired: "Lease expired or turn silent", + connecting: "Connecting to original conversation", + acceptingReplies: "Idle and accepting replies", + runningTurn: "Running active turn in original host", + connectionLost: "Original conversation unavailable or unconfirmed", + bindingRejected: "Binding or access verification failed", + openCount: (open: number) => `${open} open`, + }, +} as const; + +// eslint-disable-next-line no-control-regex +const ANSI_PATTERN = /\u001b\[[0-9;]*[A-Za-z]/g; +// eslint-disable-next-line no-control-regex +const CONTROL_PATTERN = /[\u0000-\u0008\u000b-\u001f\u007f]/g; + +export function workerRosterStateLabel(state: WorkerRosterState, locale: CollaborationLocale): string { + return STATE_LABELS[locale][state]; +} + +export function truncateCodePoints(text: string, maxLength: number): string { + const safeLimit = Math.max(2, Math.floor(maxLength)); + const points = Array.from(text); + if (points.length <= safeLimit) return text; + const trimmed = points + .slice(0, safeLimit - 1) + .join("") + .replace(/[\s,.;:!?,。;:!?\-—/]+$/u, ""); + return `${trimmed || points.slice(0, safeLimit - 1).join("")}…`; +} + +function isTerminalOrJsonNoiseLine(line: string): boolean { + if (!line) return true; + if (/^(```|~~~|---+|===+|\*{3,})/.test(line)) return true; + if (/^[{\[]/.test(line) && (/[}\]]$/.test(line) || /"[^"]+"\s*:/.test(line))) return true; + if (/^(?:\$\s+|(?:npm|pnpm|yarn)\s+(?:run|test|exec|install)\b|(?:uv\s+run|pytest|node\s+--test)\b)/.test(line)) return true; + if (/^(Traceback\b|File\s+"|at\s+[\w.$<>]+\s*\(|EXIT_CODE[:=]|\[(?:stdout|stderr|debug|trace)\])/i.test(line)) return true; + if (/^sha256:[a-f0-9]{12,}$/i.test(line)) return true; + if (/^\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?Z?$/.test(line)) return true; + if (/^\/Users\/[^/\s]+\/[^\s]*$/.test(line)) return true; + return false; +} + +function cleanSingleLine(line: string): string { + return line + .replace(ANSI_PATTERN, "") + .replace(CONTROL_PATTERN, " ") + .replace(/\{[^{}]*"[^"]+"\s*:[^{}]*\}/g, " ") + .replace(/\[[^[\]]*"[^"]+"\s*:[^[\]]*\]/g, " ") + .replace(/\/(?:Users|home)\/[^/\s]+/g, "~") + .replace(/\bsha256:[a-f0-9]{12,}\b/gi, "") + .replace(/\b\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?Z?\b\s*[-:|]?\s*/g, "") + .replace(/^([#>*]+\s+|\d+\.\s+)/, "") + .replace(/^(?:Now|Current|Focus|当前|实时)\s*[::]\s*/i, "") + .replace(/\s+/g, " ") + .trim(); +} + +export function sanitizeFocusLine(raw: string | null | undefined, maxLength = 88): string { + if (!raw) return ""; + const stripped = raw.replace(ANSI_PATTERN, "").replace(CONTROL_PATTERN, "\n"); + const lines = stripped.split(/\r?\n+/).map((entry) => entry.trim()).filter(Boolean); + for (const candidate of lines) { + if (isTerminalOrJsonNoiseLine(candidate)) continue; + const cleaned = cleanSingleLine(candidate); + if (!cleaned || /^[{}\[\](),.;:!?'"`~\\/|+\-=*_]+$/.test(cleaned)) continue; + return truncateCodePoints(cleaned, maxLength); + } + return ""; +} + +export function formatProgressCounter( + done: number | null | undefined, + total: number | null | undefined, + open?: number | null, + locale: CollaborationLocale = "en", +): ProgressCounter { + const safeDone = typeof done === "number" && Number.isFinite(done) ? Math.max(0, Math.round(done)) : null; + const safeOpen = typeof open === "number" && Number.isFinite(open) ? Math.max(0, Math.round(open)) : null; + const safeTotal = typeof total === "number" && Number.isFinite(total) && total >= 0 + ? Math.round(total) + : safeDone !== null && safeOpen !== null + ? safeDone + safeOpen + : null; + + if (safeDone !== null && safeTotal !== null) { + return { done: safeDone, total: safeTotal, open: safeOpen, label: `[${safeDone}/${safeTotal}]` }; + } + if (safeDone !== null) { + return { done: safeDone, total: null, open: safeOpen, label: `[${safeDone}/—]` }; + } + if (safeOpen !== null) { + return { + done: null, + total: null, + open: safeOpen, + label: `[${ROSTER_WORDS[locale].openCount(safeOpen)}]`, + }; + } + return { done: null, total: null, open: null, label: "" }; +} + +function currentConclusion(request: CollaborationReadback, revision: number | undefined) { + const replies = request.returns.filter( + (reply) => reply.phase === "conclusion" + && (revision === undefined || (reply.request_revision ?? 1) === revision), + ); + return replies.find((reply) => reply.status === "delivered") + ?? replies.find((reply) => reply.status !== "superseded") + ?? replies[0]; +} + +function isConclusionProofMissing(conclusion?: { error?: string | null; status: string }) { + return conclusion?.error === "initial_delivery_receipt_unavailable" + && conclusion.status !== "delivered" + && conclusion.status !== "superseded"; +} + +function formatScope(parts: Array, fallback = ""): string { + const cleaned = parts + .map((part) => sanitizeFocusLine(part, 36)) + .filter(Boolean); + const unique = [...new Set(cleaned)]; + if (!unique.length) return fallback; + return truncateCodePoints(unique.join(" / "), 44); +} + +export function deriveCollaborationCardStatus({ + request, + observed, + unavailable = false, + locale, +}: { + request: CollaborationReadback; + observed?: RequestControlView | null; + unavailable?: boolean; + locale: CollaborationLocale; +}): CollaborationCardRosterStatus { + const c = CARD_WORDS[locale]; + const brief = observed?.brief ?? request.brief; + const revision = observed?.revision ?? request.request_revision; + const readStatus = unavailable + ? "unavailable" + : observed + ? observed.read_readback === "recorded" + ? "supplied" + : observed.read_readback === "unavailable" + ? "unavailable" + : "pending" + : request.read_status; + const recordedDecision = unavailable + ? "unavailable" + : observed + ? observed.assessment?.decision ?? (observed.assessment_readback === "unavailable" ? "unavailable" : "pending") + : request.decision; + const controlState = observed?.control_state ?? request.request_control?.control_state ?? null; + const conclusion = currentConclusion(request, revision); + const decisionReason = sanitizeFocusLine(observed ? observed.assessment?.reason : request.decision_reason, 120); + + const decisionLabel = (() => { + switch (recordedDecision) { + case "adopt": return c.adopt; + case "defer": return c.defer; + case "reject": return c.reject; + case "no_change": return c.no_change; + case "unavailable": return c.unavailable; + default: return c.unknown; + } + })(); + + const readLabel = readStatus === "supplied" + ? c.supplied + : readStatus === "unavailable" + ? c.unavailable + : c.pending; + + const proofMissing = isConclusionProofMissing(conclusion); + const conclusionLabel = conclusion + ? proofMissing + ? c.originalHandoff + : conclusion.status === "delivered" + ? c.delivered + : conclusion.status === "queued" + ? c.result + : c.unverified + : null; + + const hasExpiredReadback = unavailable + || readStatus === "unavailable" + || recordedDecision === "unavailable" + || proofMissing + || conclusion?.status === "explicit_unverified" + || conclusion?.status === "failed"; + + const needsDecision = recordedDecision === "defer" + || recordedDecision === "reject" + || controlState === "effect_pending" + || controlState === "cancellation_pending"; + + const isAdoptedActive = !unavailable + && recordedDecision === "adopt" + && controlState !== "cancelled" + && conclusion?.status !== "delivered" + && conclusion?.status !== "superseded" + && !hasExpiredReadback; + + const state: WorkerRosterState = hasExpiredReadback + ? "lease_expired" + : needsDecision + ? "needs_decision" + : isAdoptedActive + ? "working" + : "waiting"; + + const stepDone = conclusion?.status === "delivered" + ? 3 + : ["adopt", "defer", "reject", "no_change"].includes(recordedDecision) + ? 2 + : readStatus === "supplied" + ? 1 + : 0; + + const cleanPurpose = sanitizeFocusLine(brief.purpose, 72); + const cleanReturnReq = sanitizeFocusLine(brief.return_requirement, 72); + const cleanContext = sanitizeFocusLine(brief.context, 72); + const cleanAcceptance = sanitizeFocusLine(brief.acceptance[0], 72); + + const now = (() => { + if (controlState === "cancelled") return c.cancelledNow; + if (hasExpiredReadback) return proofMissing ? c.unverifiedReturnNow : c.leaseExpiredNow; + if (needsDecision) return decisionReason || cleanContext || c.decisionPendingNow; + if (conclusion?.status === "delivered") return decisionReason || cleanReturnReq || c.settledNow; + if (recordedDecision === "adopt") return decisionReason || cleanReturnReq || cleanAcceptance || c.workingFallbackNow; + if (readStatus !== "supplied") return cleanReturnReq || cleanContext || c.awaitingReadNow; + return [cleanReturnReq, cleanAcceptance, cleanContext].find((candidate) => candidate && candidate !== cleanPurpose) + || decisionReason + || c.workingFallbackNow; + })(); + + return { + state, + stateLabel: workerRosterStateLabel(state, locale), + scope: formatScope([request.goal_id, request.agent_id], request.agent_id), + now: sanitizeFocusLine(now, 88), + progress: formatProgressCounter(stepDone, 3, null, locale), + revisionLabel: revision !== undefined ? `${c.revisionPrefix} ${revision}` : null, + readLabel, + decisionLabel, + conclusionLabel, + decisionReason, + unavailable, + }; +} + +export function deriveCollaborationRosterSummary( + requests: readonly CollaborationReadback[], + locale: CollaborationLocale, +): CollaborationRosterSummary { + const counts: Record = { + needs_decision: 0, + working: 0, + lease_expired: 0, + waiting: 0, + }; + let concluded = 0; + const workers = requests.map((request) => { + const status = deriveCollaborationCardStatus({ request, locale }); + counts[status.state] += 1; + if (status.progress.done === 3) concluded += 1; + return { + requestId: request.request_id, + agentId: request.agent_id, + scope: status.scope, + state: status.state, + stateLabel: status.stateLabel, + now: status.now, + progress: status.progress, + }; + }); + return { + total: requests.length, + concluded, + counts, + progress: formatProgressCounter(concluded, requests.length, null, locale), + workers, + }; +} + +function pickPrioritizedTodo( + todos: readonly WorkspaceAgentTodo[], + rowById: ReadonlyMap, +): WorkspaceAgentTodo | undefined { + const order: Record = { + running_observed: 0, + needs_you: 1, + blocked: 2, + open: 3, + waiting_dependency: 4, + deferred: 5, + done: 6, + }; + return [...todos] + .filter((todo) => !todo.done) + .sort((left, right) => { + const leftClass = rowById.get(left.todoId)?.displayClass ?? "open"; + const rightClass = rowById.get(right.todoId)?.displayClass ?? "open"; + return order[leftClass] - order[rightClass]; + })[0]; +} + +function isFreshHostTurn(thread: GoalHostThread, nowMs: number, quietMinutes = QUIET_TURN_MINUTES): boolean { + if (thread.state !== "turn_open") return false; + if (thread.deliveryWindow?.state === "stale" || thread.deliveryWindow?.state === "missing") return false; + const stamp = thread.lastEventAt ?? thread.turnStartedAt; + const parsed = stamp ? Date.parse(stamp) : Number.NaN; + if (Number.isNaN(parsed)) return false; + return nowMs - parsed <= quietMinutes * 60_000; +} + +function isExpiredOrStaleHostThread(thread: GoalHostThread, nowMs: number, quietMinutes = QUIET_TURN_MINUTES): boolean { + if (thread.state === "unknown") return true; + if (thread.deliveryWindow?.state === "stale" || thread.deliveryWindow?.state === "missing") return true; + if (thread.state === "turn_open") { + const stamp = thread.lastEventAt ?? thread.turnStartedAt; + const parsed = stamp ? Date.parse(stamp) : Number.NaN; + if (Number.isNaN(parsed) || nowMs - parsed > quietMinutes * 60_000) return true; + } + return false; +} + +export function deriveGoalWorkerRoster({ + goal, + digest = null, + items = [], + userTodos = [], + locale, + nowMs = Date.now(), +}: { + goal: WorkspaceGoal; + digest?: GoalWorkspaceDigest | null; + items?: readonly WorkspaceTimelineItem[]; + userTodos?: readonly WorkspaceAttention[]; + locale: CollaborationLocale; + nowMs?: number; +}): GoalWorkerRoster { + const w = ROSTER_WORDS[locale]; + const counts: Record = { + needs_decision: 0, + working: 0, + lease_expired: 0, + waiting: 0, + }; + const laneById = new Map((goal.agentLanes ?? []).map((lane) => [lane.agentId, lane])); + const registeredSet = new Set(goal.registeredAgentIds ?? []); + const runsByAgent = new Map(); + const runningTodoIds = new Set(); + for (const item of items) { + if (item.kind !== "run" || item.run.goalId !== goal.goalId) continue; + const list = runsByAgent.get(item.run.agentId) ?? []; + list.push(item.run); + runsByAgent.set(item.run.agentId, list); + if (item.run.status === "running" && item.run.todoId) runningTodoIds.add(item.run.todoId); + } + const digestRows: ReadonlyArray<{ todoId: string; ownerId: string | null; displayClass: GoalWorkDisplayClass }> = digest + ? digest.work.rows + : goal.agentTodos.filter((todo) => !todo.done).map((todo) => ({ + todoId: todo.todoId, + ownerId: todo.claimedBy ?? null, + displayClass: todo.status === "blocked" + ? "blocked" + : todo.status === "deferred" + ? "deferred" + : runningTodoIds.has(todo.todoId) + ? "running_observed" + : "open", + })); + const rowById = new Map(digestRows.map((row) => [row.todoId, row])); + const coverageComplete = digest + ? digest.work.coverage === "complete" + : goal.openTodoCount === undefined || goal.agentTodos.filter((todo) => !todo.done).length >= goal.openTodoCount; + const goalAttention = userTodos.filter((item) => item.goalId === goal.goalId); + + const discoveredIds = [ + ...(goal.agentLanes ?? []).map((lane) => lane.agentId), + ...(goal.registeredAgentIds ?? []), + ...(goal.workerObservations?.rows ?? []).map((row) => row.agent_id), + ...(goal.hostThreadActivity?.threads ?? []).flatMap((thread) => (thread.agentId ? [thread.agentId] : [])), + ...digestRows.flatMap((row) => (row.ownerId ? [row.ownerId] : [])), + ...runsByAgent.keys(), + ]; + const workerIds = [...new Set(discoveredIds.filter(Boolean))]; + + const workers: WorkerRosterEntry[] = workerIds.map((agentId) => { + const lane = laneById.get(agentId); + const label = sanitizeFocusLine(lane?.label, 48) || agentId; + const workerRuns = runsByAgent.get(agentId) ?? []; + const activeRun = workerRuns.find((run) => run.status === "running"); + const failedRun = workerRuns.find((run) => run.status === "failed" || run.sessionStatus === "resume_failed"); + const workerTodos = goal.agentTodos.filter((todo) => todo.claimedBy === agentId); + const workerRows = digestRows.filter((row) => row.ownerId === agentId); + const threads = (goal.hostThreadActivity?.threads ?? []).filter((thread) => thread.agentId === agentId); + const observations = (goal.workerObservations?.rows ?? []).filter((row) => row.agent_id === agentId); + + const freshThread = threads.some((thread) => isFreshHostTurn(thread, nowMs)); + const staleThread = threads.find((thread) => isExpiredOrStaleHostThread(thread, nowMs)); + const pausedObs = observations.find((row) => row.status === "replan_paused"); + const unknownObs = observations.find((row) => row.status === "replan_outcome_unknown"); + const expiredTodo = workerTodos.find( + (todo) => !todo.done && ( + (todo.resumeInvalidReason && todo.resumeInvalidReason !== "dependency_cycle") + || (todo.expiresAt && !Number.isNaN(Date.parse(todo.expiresAt)) && Date.parse(todo.expiresAt) < nowMs) + ), + ); + const laneStateNormalized = lane?.state?.trim().toLowerCase() ?? ""; + const laneExpired = laneStateNormalized === "lease_expired" || laneStateNormalized === "stale" || laneStateNormalized === "expired"; + + const hasExpiredLease = Boolean(staleThread || unknownObs || expiredTodo || laneExpired || failedRun?.sessionStatus === "resume_failed"); + const hasObservedActive = Boolean(activeRun) || freshThread || (!hasExpiredLease && workerRows.some((row) => row.displayClass === "running_observed")); + + const matchingAttention = goalAttention.find((item) => + item.blocking && workerTodos.some((todo) => todo.todoId === item.todoId || (todo.dependencies ?? []).includes(item.todoId)), + ); + const blockingTodo = workerTodos.find((todo) => !todo.done && (todo.status === "blocked" || rowById.get(todo.todoId)?.displayClass === "needs_you" || rowById.get(todo.todoId)?.displayClass === "blocked")); + const hasDecisionGate = Boolean(pausedObs || blockingTodo || matchingAttention); + + const state: WorkerRosterState = pausedObs + ? "needs_decision" + : hasExpiredLease && !activeRun && !freshThread + ? "lease_expired" + : hasObservedActive + ? "working" + : hasDecisionGate + ? "needs_decision" + : "waiting"; + + counts[state] += 1; + + const hostSurfaces = [...new Set([...(lane?.hostSurfaces ?? []), ...threads.map((thread) => thread.hostSurface)].filter(Boolean))]; + const domains = [...new Set(workerTodos.map((todo) => todo.taskDomain).filter((value): value is string => Boolean(value && value.trim())))]; + const scope = formatScope( + domains.length + ? domains.slice(0, 2) + : hostSurfaces.length + ? [hostSurfaces[0], label !== agentId ? agentId : null] + : [label !== agentId ? agentId : goal.repository?.branch ?? goal.goalId], + agentId, + ); + + const openTodos = workerTodos.filter((todo) => !todo.done); + const doneTodos = workerTodos.filter((todo) => todo.done); + const runProgress = activeRun && activeRun.totalSteps > 0 + ? formatProgressCounter(activeRun.completedSteps, activeRun.totalSteps, null, locale) + : null; + const progress = (workerTodos.length > 0 && (coverageComplete || doneTodos.length > 0)) + ? formatProgressCounter(doneTodos.length, doneTodos.length + openTodos.length, openTodos.length, locale) + : runProgress + ? runProgress + : openTodos.length > 0 + ? formatProgressCounter(null, null, openTodos.length, locale) + : formatProgressCounter(null, null, null, locale); + + const prioritizedTodo = pickPrioritizedTodo(workerTodos, rowById); + const rawNow = (() => { + if (state === "working") { + return sanitizeFocusLine(activeRun?.latestActivity, 84) + || sanitizeFocusLine(activeRun?.title, 84) + || sanitizeFocusLine(prioritizedTodo?.text, 84) + || w.runningTurn; + } + if (state === "needs_decision") { + return sanitizeFocusLine(blockingTodo?.blockedReason, 84) + || sanitizeFocusLine(matchingAttention?.text, 84) + || sanitizeFocusLine(blockingTodo?.text, 84) + || (pausedObs ? w.replanPaused : w.standingBy); + } + if (state === "lease_expired") { + if (unknownObs) return w.outcomeUnknown; + if (staleThread?.deliveryWindow?.state === "stale" || staleThread?.deliveryWindow?.state === "missing") return w.staleWindow; + return sanitizeFocusLine(prioritizedTodo?.text, 84) || w.leaseExpired; + } + return sanitizeFocusLine(prioritizedTodo?.text, 84) + || sanitizeFocusLine(prioritizedTodo?.resumeWhen, 84) + || sanitizeFocusLine(workerRuns[0]?.latestActivity, 84) + || (doneTodos.length > 0 ? w.completedStandingBy : w.standingBy); + })(); + + return { + agentId, + label, + state, + stateLabel: workerRosterStateLabel(state, locale), + scope, + now: sanitizeFocusLine(rawNow, 84), + progress, + hostSurfaces, + hasConversation: registeredSet.has(agentId), + }; + }); + + workers.sort((left, right) => { + const priorityDiff = STATE_PRIORITY[left.state] - STATE_PRIORITY[right.state]; + return priorityDiff !== 0 ? priorityDiff : left.label.localeCompare(right.label); + }); + + const overallDone = digest ? digest.work.done : (goal.doneTodoCount ?? null); + const overallOpen = digest ? digest.work.open : (goal.openTodoCount ?? goal.agentTodos.filter((todo) => !todo.done).length); + const overallTotal = digest ? digest.work.total : (overallDone !== null ? overallDone + overallOpen : null); + + return { + workers, + counts, + progress: formatProgressCounter(overallDone, overallTotal, overallOpen, locale), + }; +} + +export function deriveAttachedWorkerStatus({ + agentId, + label, + connected, + canReply, + activeTurn, + liveActive = false, + bindingRejected = false, + bindingError, + turnModel, + hostSurfaces = [], + latestFocus, + locale, +}: AttachedWorkerStatusInput): AttachedWorkerStatus { + const w = ROSTER_WORDS[locale]; + const state: WorkerRosterState = bindingRejected || Boolean(bindingError) || connected === false + ? "lease_expired" + : liveActive || activeTurn + ? "working" + : canReply === false && !activeTurn && connected !== undefined + ? "lease_expired" + : "waiting"; + + const scope = formatScope( + [hostSurfaces[0] ?? "codex-app", label && label !== agentId ? agentId : null], + agentId, + ); + const modelText = turnModel + ? [turnModel.model, turnModel.reasoning_effort].filter(Boolean).join(" · ") + : ""; + const now = sanitizeFocusLine(latestFocus, 84) || ( + bindingRejected + ? w.bindingRejected + : bindingError + ? sanitizeFocusLine(bindingError, 84) || w.connectionLost + : state === "lease_expired" + ? w.connectionLost + : state === "working" + ? (modelText ? `${w.runningTurn} · ${modelText}` : w.runningTurn) + : canReply + ? w.acceptingReplies + : w.connecting + ); + + return { + agentId, + label: sanitizeFocusLine(label, 48) || agentId, + state, + stateLabel: workerRosterStateLabel(state, locale), + scope, + now, + }; +} diff --git a/apps/presentation/dashboard/src/features/personal-workspace/context-drawer.tsx b/apps/presentation/dashboard/src/features/personal-workspace/context-drawer.tsx index 9814753166..f3c8347c72 100644 --- a/apps/presentation/dashboard/src/features/personal-workspace/context-drawer.tsx +++ b/apps/presentation/dashboard/src/features/personal-workspace/context-drawer.tsx @@ -53,6 +53,48 @@ import { MarkdownText } from "./markdown"; import { formatMonitorDate } from "./monitor-readback"; import { parseTodoCompletionProof } from "./todo-completion-feedback"; import { useDrawerOverlay } from "./workspace-shell"; +import { + deriveGoalWorkerRoster, + formatProgressCounter, + sanitizeFocusLine, + type CollaborationLocale, + type WorkerRosterState, +} from "./collaboration-status"; +import { + GoalWorkerRosterStrip, + WorkerProgressBadge, + WorkerStateBadge, +} from "./worker-roster"; + +function GoalDrawerWorkerRoster({ + goal, + runs, + attentionHistory, + locale, +}: { + goal: WorkspaceGoal; + runs: WorkspaceRun[]; + attentionHistory: WorkspaceAttention[]; + locale: CollaborationLocale; +}) { + const roster = deriveGoalWorkerRoster({ + goal, + items: runs.map((run) => ({ id: run.runId, kind: "run" as const, run })), + userTodos: attentionHistory, + locale, + }); + return roster.workers.length > 0 ? ( + + ) : null; +} + +function runRosterState(run: WorkspaceRun): WorkerRosterState { + if (run.status === "running") return "working"; + if (run.status === "failed" || run.status === "interrupted" || run.sessionStatus === "resume_failed") { + return "lease_expired"; + } + return "waiting"; +} function subagentModelRequest(include: boolean, model: string, effort: string) { if (!include) return {}; @@ -831,6 +873,7 @@ export function ContextDrawer({ agents, attentionHistory = [], onSelectAttention {localizedGoalState(selection.item.state, locale)}

{selection.item.title}

{selection.item.agentSentence}

+
@@ -1091,7 +1134,11 @@ export function ContextDrawer({ agents, attentionHistory = [], onSelectAttention
{selection.item.agentLabel} · {localizedSessionStatus(selection.item.sessionStatus ?? selection.item.status, t)}

{selection.item.title}

-

{selection.item.latestActivity}

+
+ + +
+

{sanitizeFocusLine(selection.item.latestActivity, 140) || selection.item.latestActivity}

Goal
{selection.item.goalTitle}
{t("drawer.progress")}
{selection.item.completedSteps}/{selection.item.totalSteps}
@@ -1132,7 +1179,7 @@ export function ContextDrawer({ agents, attentionHistory = [], onSelectAttention
{selection.item.agentLabel} · {localizedSessionStatus(selection.item.status, t)}

{selection.item.title}

-

{selection.item.latestActivity}

+

{sanitizeFocusLine(selection.item.latestActivity, 140) || selection.item.latestActivity}

Goal
{selection.item.goalTitle}
{t("drawer.progress")}
{selection.item.completedSteps}/{selection.item.totalSteps}
diff --git a/apps/presentation/dashboard/src/features/personal-workspace/goal-agent-work-page.tsx b/apps/presentation/dashboard/src/features/personal-workspace/goal-agent-work-page.tsx index 8279e95b1f..de43311a29 100644 --- a/apps/presentation/dashboard/src/features/personal-workspace/goal-agent-work-page.tsx +++ b/apps/presentation/dashboard/src/features/personal-workspace/goal-agent-work-page.tsx @@ -5,6 +5,8 @@ import {AttachedConversation, request, retryableRead, readFailureMessage, type B import {fetchManagedAgentSessions, type ChatSessionSummary} from "../../data/chat"; import {useWorkspaceI18n} from "./i18n"; import type {WorkspaceGoal} from "./personal-workspace-model"; +import {deriveGoalWorkerRoster} from "./collaboration-status"; +import {WorkerNowLine, WorkerProgressBadge, WorkerScopeTag, WorkerStateBadge} from "./worker-roster"; /** Navigation uses the Goal directory; only the native provider can authorize a conversation. */ export function GoalAgentWorkPage({goal, agentId, readOnly, sessionId, onSession, onRetryManagedSession, children, onSelect, onClose}: { @@ -14,10 +16,13 @@ export function GoalAgentWorkPage({goal, agentId, readOnly, sessionId, onSession onSelect: (agentId: string) => void; onClose: () => void; }) { const zh = useWorkspaceI18n().locale === "zh-CN"; + const locale = zh ? "zh-CN" : "en"; const heading = useRef(null); useEffect(() => {heading.current?.focus({preventScroll: true});}, [agentId]); const ids = [...new Set(goal.registeredAgentIds ?? [])]; const lane = goal.agentLanes?.find(item => item.agentId === agentId); + const roster = deriveGoalWorkerRoster({goal, locale}); + const rosterById = new Map(roster.workers.map(worker => [worker.agentId, worker])); const registered = ids.includes(agentId); const hosts = lane?.hostSurfaces ?? []; const title = zh ? "工作记录" : "Work conversation"; @@ -33,18 +38,29 @@ export function GoalAgentWorkPage({goal, agentId, readOnly, sessionId, onSession
{!agentId ?
- {ids.map(id => )} + {ids.map(id => { + const entry = rosterById.get(id); + return
+
+ + {entry ? : null} + {entry ? : null} + {entry ? : null} +
+ {entry?.now ? : null} +
; + })} {!ids.length ?

{zh ? "此 Goal 尚无已注册的 Agent。" : "This Goal has no registered Agents."}

: null}
: readOnly ?

{zh ? "此来源仅提供状态快照,无法在这里读取或回复原会话。" : "This source provides a status snapshot; original conversations cannot be read or replied to here."}

: !registered ?

{zh ? "此 Agent 不在当前 Goal 的已注册列表中,请选择列表中的 Agent。" : "This Agent is not registered in the current Goal. Choose an Agent from its directory."}

- : {children}} ; } /** Both providers stay under the registered Agent; the reader retains its original owner. */ -function AgentSessions({goalId, agentId, hosts, attached, zh, sessionId, onSession, onRetryManagedSession, children}: { - goalId: string; agentId: string; hosts: string[]; attached: boolean; zh: boolean; sessionId?: string; +function AgentSessions({goalId, agentId, agentLabel, hosts, attached, zh, sessionId, onSession, onRetryManagedSession, children}: { + goalId: string; agentId: string; agentLabel?: string; hosts: string[]; attached: boolean; zh: boolean; sessionId?: string; onSession: (sessionId: string, replace?: boolean) => void; children?: ReactNode; onRetryManagedSession?: () => void; }) { @@ -120,6 +136,6 @@ function AgentSessions({goalId, agentId, hosts, attached, zh, sessionId, onSessi : null} {managed ? <>
LoopX · {managed.agent_id}

{managed.session_id}

{managed.agent_model_id ?? (zh ? "模型未读取" : "Model not observed")} · {managed.agent_reasoning_effort ?? "—"}

-
{children} : binding ? : null} +
{children} : binding ? : null} ; } diff --git a/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.css b/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.css index 7b1fbcfbb5..3da01be436 100644 --- a/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.css +++ b/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.css @@ -18,9 +18,10 @@ .goal-work-lenses button[aria-pressed="true"], .goal-work-filters button[aria-pressed="true"], .goal-all-work > [role="group"] button[aria-pressed="true"] { color: var(--pw-text); background: var(--pw-hover); border-color: var(--pw-line); } .goal-owner-group { margin-top: 20px; } .goal-owner-group:first-child { margin-top: 0; } -.goal-owner-group > header { display: flex; flex-wrap: wrap; gap: 12px; align-items: baseline; padding: 8px 0; border-bottom: 1px solid var(--pw-line-strong); } +.goal-owner-group > header { display: grid; gap: 6px; padding: 8px 0; border-bottom: 1px solid var(--pw-line-strong); min-width: 0; } +.pw-owner-header-top { display: flex; flex-wrap: wrap; gap: 6px 10px; align-items: center; min-width: 0; } .goal-owner-group h3 { font-size: var(--text-body); line-height: var(--leading-body); font-weight: 600; } -.goal-owner-group > header > span { color: var(--pw-muted); font-size: var(--text-caption); } +.pw-owner-header-count { color: var(--pw-muted); font-size: var(--text-caption); } .goal-work-more > summary { width: fit-content; padding: 12px 0; color: var(--pw-muted); font-size: var(--text-body); cursor: pointer; } .goal-overview .goal-work-row { width: 100%; display: grid; grid-template-columns: 16px minmax(0, 1fr) auto 36px; gap: 10px; border: 0; border-bottom: 1px solid var(--pw-line); border-radius: 0; background: transparent; padding: 12px 0; } .goal-overview .goal-work-row[aria-pressed="true"] { background: var(--pw-hover); box-shadow: inset 2px 0 var(--pw-blue); } diff --git a/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.tsx b/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.tsx index 6c2ac4ebbc..332815e2b7 100644 --- a/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.tsx +++ b/apps/presentation/dashboard/src/features/personal-workspace/goal-workspace-work.tsx @@ -7,6 +7,14 @@ import {localizedSessionStatus, useWorkspaceI18n} from "./i18n"; import {CompletedTaskLane} from "./completed-task-lane"; import {boundedLength, todoCreateRequest, todoTextLimit} from "./workspace-action-form"; import {useGoalWorkBrowse} from "./goal-work-browse"; +import { deriveGoalWorkerRoster } from "./collaboration-status"; +import { + GoalWorkerRosterStrip, + WorkerNowLine, + WorkerProgressBadge, + WorkerScopeTag, + WorkerStateBadge, +} from "./worker-roster"; import "./goal-workspace-work.css"; const glyphs = {running_observed: Play, needs_you: Hand, open: Circle, waiting_dependency: Clock, blocked: CircleAlert, deferred: Clock, done: CircleCheck}; @@ -131,7 +139,16 @@ export function GoalWorkspaceWork({goal, digest, items, userTodos, selectedTodoI const [railTab, setRailTab] = useState<"work" | "activity">("work"); const todos = useMemo(() => new Map(goal.agentTodos.map(todo => [todo.todoId, todo])), [goal.agentTodos]); const rows = useMemo(() => new Map(digest.work.rows.map(row => [row.todoId, row])), [digest]); - const attention = userTodos.filter(todo => todo.goalId === goal.goalId); + const attention = useMemo(() => userTodos.filter(todo => todo.goalId === goal.goalId), [userTodos, goal.goalId]); + const workspaceLocale = zh ? "zh-CN" : "en"; + const roster = useMemo( + () => deriveGoalWorkerRoster({ goal, digest, items, userTodos: attention, locale: workspaceLocale }), + [goal, digest, items, attention, workspaceLocale], + ); + const rosterById = useMemo( + () => new Map(roster.workers.map((worker) => [worker.agentId, worker])), + [roster.workers], + ); const ownerName = (id: string | null) => id === null ? (zh ? "未分配" : "Unassigned") : goal.agentLanes?.find(lane => lane.agentId === id)?.label ?? id; const owners = [...new Set([...(goal.agentLanes ?? []).map(lane => lane.agentId), ...digest.work.rows.flatMap(row => row.ownerId ?? [])])]; const matchesOwner = (id: string) => owner === "all" || (rows.get(id)?.ownerId ?? "") === owner; @@ -223,16 +240,36 @@ export function GoalWorkspaceWork({goal, digest, items, userTodos, selectedTodoI
: null} {!readOnly ? : null} - {visited.has("board") || lens === "board" ? : null} {visited.has("map") || lens === "map" ? : null} diff --git a/apps/presentation/dashboard/src/features/personal-workspace/worker-roster.css b/apps/presentation/dashboard/src/features/personal-workspace/worker-roster.css new file mode 100644 index 0000000000..9aaee87a95 --- /dev/null +++ b/apps/presentation/dashboard/src/features/personal-workspace/worker-roster.css @@ -0,0 +1,358 @@ +/* Swarm-inspired Worker Roster glyphs, scope tags, progress pills, and single-line Now focus. */ + +.pw-roster-ring { + position: relative; + display: inline-block; + flex: none; + width: 12px; + height: 12px; + box-sizing: border-box; + border-radius: 50%; +} + +.pw-roster-ring.is-working { + border: 1.5px solid color-mix(in srgb, var(--pw-green) 28%, transparent); + color: var(--pw-green); +} + +.pw-roster-ring.is-working::before { + content: ""; + position: absolute; + inset: 2px; + border-radius: 50%; + background: currentColor; +} + +.pw-roster-ring.is-working::after { + content: ""; + position: absolute; + inset: -1.5px; + border: 1.5px solid transparent; + border-top-color: currentColor; + border-radius: 50%; + animation: pw-spin 1s linear infinite; +} + +.pw-roster-ring.is-waiting { + border: 1.5px solid var(--pw-muted); + background: transparent; +} + +.pw-roster-ring.is-lease_expired { + border: 1.5px dashed var(--pw-amber); + background: transparent; +} + +.pw-roster-ring.is-needs_decision { + border: 1.5px solid color-mix(in srgb, var(--pw-red) 45%, transparent); + background: transparent; +} + +.pw-roster-ring.is-needs_decision::before { + content: ""; + position: absolute; + inset: 2px; + border-radius: 50%; + background: var(--pw-red); +} + +@media (prefers-reduced-motion: reduce) { + .pw-roster-ring.is-working::after { + animation: none; + } +} + +.pw-roster-state { + display: inline-flex; + align-items: center; + gap: 6px; + min-width: 0; + padding: 2px 8px; + border-radius: 9999px; + font-size: var(--text-caption); + line-height: var(--leading-caption); + font-weight: 500; + white-space: nowrap; +} + +.pw-roster-state.is-working { + background: var(--pw-green-bg); + color: var(--pw-green); +} + +.pw-roster-state.is-waiting { + background: var(--pw-hover); + color: var(--pw-muted); +} + +.pw-roster-state.is-lease_expired { + background: var(--pw-amber-bg); + color: var(--pw-amber); +} + +.pw-roster-state.is-needs_decision { + background: var(--pw-red-bg); + color: var(--pw-red); +} + +.pw-roster-scope { + display: inline-block; + max-width: min(340px, 100%); + min-width: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + padding: 2px 7px; + border: 1px solid var(--pw-line); + border-radius: 5px; + background: var(--pw-card); + color: var(--pw-muted); + font-family: var(--font-mono); + font-size: var(--text-caption); + line-height: var(--leading-caption); +} + +.pw-roster-progress { + display: inline-block; + flex: none; + padding: 2px 7px; + border: 1px solid var(--pw-line); + border-radius: 5px; + background: var(--pw-bg); + color: var(--pw-text); + font-family: var(--font-mono); + font-size: var(--text-caption); + line-height: var(--leading-caption); + font-variant-numeric: tabular-nums; + white-space: nowrap; +} + +.pw-roster-now, +.personal-detail-card .pw-roster-now { + display: flex; + align-items: baseline; + gap: 6px; + margin: 0; + min-width: 0; + font-size: var(--text-caption); + line-height: var(--leading-caption); + color: var(--pw-muted); +} + +.pw-roster-now-key { + flex: none; + color: var(--pw-faint); + font-family: var(--font-mono); + font-weight: 500; +} + +.pw-roster-now-key::after { + content: ":"; +} + +.pw-roster-now-text { + min-width: 0; + flex: 1 1 auto; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: var(--pw-text); +} + +.pw-roster-panel { + display: grid; + gap: 8px; + padding: 10px 12px; + border: 1px solid var(--pw-line); + border-radius: 8px; + background: var(--pw-card); + min-width: 0; +} + +.pw-roster-panel.is-compact { + padding: 10px 0 0; + border: 0; + border-top: 1px solid var(--pw-line); + border-radius: 0; + background: transparent; +} + +.pw-roster-head { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + gap: 6px 12px; + min-width: 0; +} + +.pw-roster-counts { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 6px; + min-width: 0; +} + +.pw-roster-list { + list-style: none; + margin: 0; + padding: 0; + display: grid; + gap: 0; +} + +.pw-roster-row { + display: grid; + gap: 4px; + padding: 8px 0; + border-top: 1px solid var(--pw-line); + min-width: 0; +} + +.pw-roster-row-top { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 6px 8px; + min-width: 0; +} + +.pw-roster-name { + min-width: 0; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-size: var(--text-body); + line-height: var(--leading-body); + font-weight: 600; + color: var(--pw-text); +} + +.pw-roster-state-text { + font-size: var(--text-caption); + line-height: var(--leading-caption); + color: var(--pw-muted); + white-space: nowrap; +} + +.pw-roster-row[data-roster-state="working"] .pw-roster-state-text { + color: var(--pw-green); +} + +.pw-roster-row[data-roster-state="lease_expired"] .pw-roster-state-text { + color: var(--pw-amber); +} + +.pw-roster-row[data-roster-state="needs_decision"] .pw-roster-state-text { + color: var(--pw-red); +} + +.pw-roster-row .pw-roster-jump, +.goal-overview .pw-roster-row .pw-roster-jump { + margin-left: auto; + min-height: 30px; + padding: 3px 10px; + border: 1px solid var(--pw-line); + border-radius: 5px; + background: transparent; + color: var(--pw-muted); + font-size: var(--text-caption); + line-height: var(--leading-caption); + cursor: pointer; +} + +.pw-roster-chips { + list-style: none; + margin: 0; + padding: 6px 0 0; + border-top: 1px solid var(--pw-line); + display: grid; + gap: 6px; + min-width: 0; +} + +.pw-roster-chip { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 6px 8px; + min-width: 0; + width: 100%; + padding: 6px 8px; + border: 1px solid var(--pw-line); + border-radius: 6px; + background: var(--pw-bg); + font-size: var(--text-caption); + line-height: var(--leading-caption); + box-sizing: border-box; +} + +.pw-roster-chip-name { + min-width: 0; + max-width: 180px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-weight: 600; + color: var(--pw-text); +} + +.pw-roster-chip[data-roster-state="working"] .pw-roster-state-text { + color: var(--pw-green); +} + +.pw-roster-chip[data-roster-state="lease_expired"] .pw-roster-state-text { + color: var(--pw-amber); +} + +.pw-roster-chip[data-roster-state="needs_decision"] .pw-roster-state-text { + color: var(--pw-red); +} + +.pw-roster-chip .pw-roster-chip-jump, +.goal-overview .pw-roster-chip .pw-roster-chip-jump { + margin-left: auto; + min-height: 26px; + padding: 1px 8px; + border: 1px solid var(--pw-line); + border-radius: 4px; + background: var(--pw-card); + color: var(--pw-muted); + font-size: var(--text-caption); + line-height: var(--leading-caption); + cursor: pointer; +} + +.pw-roster-chip .pw-roster-chip-jump:hover, +.goal-overview .pw-roster-chip .pw-roster-chip-jump:hover { + border-color: var(--pw-line-strong); + background: var(--pw-hover); + color: var(--pw-text); +} + +.pw-roster-row .pw-roster-jump:hover { + border-color: var(--pw-line-strong); + background: var(--pw-hover); + color: var(--pw-text); +} + +.pw-roster-row .pw-roster-jump:focus-visible { + outline: 2px solid var(--pw-blue); + outline-offset: 2px; +} + +@media (max-width: 640px) { + .pw-roster-panel { + padding: 10px; + } + + .pw-roster-scope { + max-width: 100%; + } + + .pw-roster-row .pw-roster-jump { + margin-left: 0; + } +} diff --git a/apps/presentation/dashboard/src/features/personal-workspace/worker-roster.tsx b/apps/presentation/dashboard/src/features/personal-workspace/worker-roster.tsx new file mode 100644 index 0000000000..f192acb1c7 --- /dev/null +++ b/apps/presentation/dashboard/src/features/personal-workspace/worker-roster.tsx @@ -0,0 +1,142 @@ +import { + WORKER_ROSTER_STATES, + workerRosterStateLabel, + type CollaborationLocale, + type GoalWorkerRoster, + type ProgressCounter, + type WorkerRosterState, +} from "./collaboration-status"; +import "./worker-roster.css"; + +export function WorkerStateGlyph({ state }: { state: WorkerRosterState }) { + return