Human-facing task state

web/src/switcher.ts

@@ -148,7 +148,7 @@ export function openSwitcher(): void {
       const el = h(
         "li",
         { style: taskStyle(task.id) },
-        h("span", { class: `dot ${ts ?? "none"}`, title: ts ?? "no session" }),
+        h("span", { class: `dot ${ts.kind}`, title: ts.title }),
         h(
           "span",
           { class: "task-title" },
@@ -158,9 +158,7 @@ export function openSwitcher(): void {
           h("span", { class: "task-name" }, task.title),
         ),
         count > 0 && h("span", { class: "badge", title: "inbox items" }, count),
-        task.merge_queued_at !== undefined && h("span", { class: "task-state warn", title: "Waiting for the merge in progress in this project to finish" }, "merge held"),
-        task.merging_into_parent && h("span", { class: "task-state warn", title: "Waiting for the parent task's agent to merge it" }, "merging into parent"),
-        h("span", { class: "task-state" }, ts ?? "no agent"),
+        h("span", { class: `task-state ${ts.kind}`, title: ts.title }, ts.label),
       );
       return { el, pick: () => go(task.id) };
     });