thursday-agent 0.5.0 → 0.7.0

package/features/bot/components/bot-roster.tsx

@@ -1,22 +1,16 @@
 "use client";
 
-import type { BotRef } from "../task.store";
+import type { BotRef } from "../thread.store";
 import { BotMark } from "./bot-mark";
 
 /** Faces drawn before the count carries the rest. */
 const SHOWN = 3;
 
 /**
- * Who was in this room. A task that never left its own bot draws nothing: the
+ * Who was in this room. A thread that never left its own bot draws nothing: the
  * row already shows that bot's face, and a stack of one says less than none.
  */
-export function BotRoster({
-  bots,
-  taskId,
-}: {
-  bots: BotRef[];
-  taskId: string;
-}) {
+export function BotRoster({ bots }: { bots: BotRef[] }) {
   if (bots.length < 2) return null;
 
   return (
@@ -24,19 +18,20 @@ export function BotRoster({
       className="flex shrink-0 items-center gap-1.5"
       title={bots.map((bot) => bot.name).join(", ")}
     >
-      <span className="flex items-center">
+      <span className="flex items-center gap-0.5">
         {bots.slice(0, SHOWN).map((bot) => (
-          // A 3px shingle: enough to read as a group, not enough to hide a face.
+          // Side by side, not shingled: parting overlapped faces takes a ring, and
+          // a ring around a shape that is not a circle covers its neighbour.
           <BotMark
             key={bot.name}
             size={18}
             seed={bot.name}
-            vary={taskId}
             color={bot.icon?.color}
             shape={bot.icon?.shape}
             outline={bot.icon?.outline}
+            paint={bot.icon?.paint}
             notify={false}
-            className="-ml-[3px] rounded-[7px] ring-2 ring-background first:ml-0"
+            className="shrink-0"
           />
         ))}
       </span>

package/features/bot/components/bot-setting.tsx

@@ -57,12 +57,12 @@ import {
   type BotMemoryFile,
   MAX_PINNED_TOOLS,
   randomBotIcon,
-  type Task,
+  type Thread,
 } from "@/features/bot/bot.schema";
 import {
   BOT_SEEDS,
   type BotSeed,
-  rollSeedColors,
+  rollSeedIcons,
 } from "@/features/bot/bot.seed";
 import { BotMark } from "@/features/bot/components/bot-mark";
 import { MarkPalette } from "@/features/bot/components/mark-palette";
@@ -105,19 +105,21 @@ import { MARK_SHAPES, MARK_SYSTEM } from "../mark.const";
 export function BotSetting() {
   const { data, isLoading, error } = useServerRoute<Bot[]>(queryKey.bot);
   const bots = data ?? [];
-  // First page of history, not the inbox: the inbox keeps only a few finished tasks.
-  const { data: history } = useServerRoute<Task[]>(queryKey.taskHistory(null));
+  // First page of history, not the inbox: the inbox keeps only a few finished threads.
+  const { data: history } = useServerRoute<Thread[]>(
+    queryKey.threadHistory(null),
+  );
   const jobs = history ?? [];
   /** Picked roster entry: a bot name, NEW, or null for the first bot. */
   const [picked, setPicked] = useState<string | null>(null);
 
   /**
    * One roll for this screen, in BOT_SEEDS order. The faces on the invite, in the
-   * picker and on the bot that gets created are then the same colour, because
-   * `createSeedBotsAction` takes it (bot.seed rollSeedColors rolls per install so
+   * picker and on the bot that gets created are then the same, because
+   * `createSeedBotsAction` takes it (bot.seed rollSeedIcons rolls per install so
    * no two rosters look alike; a seed itself carries none).
    */
-  const [inks] = useState(rollSeedColors);
+  const [faces] = useState(rollSeedIcons);
 
   if (isLoading) return <SettingPanesSkeleton />;
   if (error) return <SettingError message={error.message} />;
@@ -155,7 +157,7 @@ export function BotSetting() {
             {bots.length > 0 && missing.length > 0 && (
               <SeedInvite
                 missing={missing}
-                inks={inks}
+                faces={faces}
                 have={have}
                 onDone={(name) => setPicked(name)}
               />
@@ -204,7 +206,7 @@ export function BotSetting() {
           // hold, so it fills it rather than sitting in a dialog nobody opened
           <SeedPackage
             have={have}
-            inks={inks}
+            faces={faces}
             onDone={(name) => setPicked(name)}
           />
         ) : (
@@ -239,7 +241,7 @@ function RosterRow({
 }: {
   bot: Bot;
   /** Latest job if it is on the first history page; `bot.lastJobAt` covers the rest. */
-  job: Task | null;
+  job: Thread | null;
   active: boolean;
   onPick: () => void;
 }) {
@@ -258,6 +260,7 @@ function RosterRow({
         {...markProps(bot.name, bot.icon)}
         state={job?.status === "running" ? "thinking" : "idle"}
         notify={job?.status === "waiting"}
+        crossed={job?.status === "cancelled"}
         className={cn("shrink-0", bot.disabled && "opacity-45")}
       />
       <span
@@ -296,7 +299,7 @@ function RosterRow({
  * was is the words' job, not the colour's.
  */
 function liveLine(
-  job: Task | null,
+  job: Thread | null,
   lastJobAt: Bot["lastJobAt"],
   disabled: boolean,
 ): {
@@ -354,7 +357,7 @@ function unmetLine(
  */
 function useSeedPicks(
   have: Set<string>,
-  inks: string[],
+  faces: BotIcon[],
   onDone: (name: string | null) => void,
 ) {
   const [off, setOff] = useState<Set<string>>(new Set());
@@ -390,7 +393,7 @@ function useSeedPicks(
       add(
         wanted.map((seed) => ({
           name: seed.name,
-          color: inks[BOT_SEEDS.indexOf(seed)],
+          icon: faces[BOT_SEEDS.indexOf(seed)],
         })),
       ),
   };
@@ -399,11 +402,11 @@ function useSeedPicks(
 /** The rows themselves. Both wrappers draw these and supply their own chrome. */
 function SeedRows({
   have,
-  inks,
+  faces,
   picks,
 }: {
   have: Set<string>;
-  inks: string[];
+  faces: BotIcon[];
   picks: ReturnType<typeof useSeedPicks>;
 }) {
   return (
@@ -433,8 +436,7 @@ function SeedRows({
             >
               <BotMark
                 size={28}
-                {...markProps(seed.name, seed.icon)}
-                color={inks[at]}
+                {...markProps(seed.name, faces[at])}
                 className={cn(
                   "shrink-0 transition-opacity",
                   !on && "opacity-35",
@@ -517,15 +519,15 @@ function SeedActions({
  */
 function SeedPackage({
   have,
-  inks,
+  faces,
   onDone,
 }: {
   /** Names already on the roster. */
   have: Set<string>;
-  inks: string[];
+  faces: BotIcon[];
   onDone: (name: string | null) => void;
 }) {
-  const picks = useSeedPicks(have, inks, onDone);
+  const picks = useSeedPicks(have, faces, onDone);
 
   return (
     <div className="flex min-h-full flex-col">
@@ -545,7 +547,7 @@ function SeedPackage({
       </div>
 
       <div className="px-8 pt-4">
-        <SeedRows have={have} inks={inks} picks={picks} />
+        <SeedRows have={have} faces={faces} picks={picks} />
       </div>
 
       <div className="mt-auto flex items-center gap-3 border-t border-border/60 px-8 py-4">
@@ -563,14 +565,14 @@ function SeedPackage({
 /** The same offer in a dialog, which brings its own padding and its own footer. */
 function SeedDialog({
   have,
-  inks,
+  faces,
   onDone,
 }: {
   have: Set<string>;
-  inks: string[];
+  faces: BotIcon[];
   onDone: (name: string | null) => void;
 }) {
-  const picks = useSeedPicks(have, inks, onDone);
+  const picks = useSeedPicks(have, faces, onDone);
 
   return (
     <SettingDialogContent
@@ -578,7 +580,7 @@ function SeedDialog({
       description="Each one is a starting point — rename it, re-prompt it, give it a model of its own. What a bot needs before it can work stands on its row."
       footer={<SeedActions picks={picks} onCancel={() => onDone(null)} />}
     >
-      <SeedRows have={have} inks={inks} picks={picks} />
+      <SeedRows have={have} faces={faces} picks={picks} />
     </SettingDialogContent>
   );
 }
@@ -591,12 +593,12 @@ function SeedDialog({
  */
 function SeedInvite({
   missing,
-  inks,
+  faces,
   have,
   onDone,
 }: {
   missing: BotSeed[];
-  inks: string[];
+  faces: BotIcon[];
   have: Set<string>;
   onDone: (name: string | null) => void;
 }) {
@@ -611,7 +613,7 @@ function SeedInvite({
           renderer: ({ close }) => (
             <SeedDialog
               have={have}
-              inks={inks}
+              faces={faces}
               onDone={(name) => {
                 close();
                 onDone(name);
@@ -634,8 +636,7 @@ function SeedInvite({
         >
           <BotMark
             size={20}
-            {...markProps(seed.name, seed.icon)}
-            color={inks[BOT_SEEDS.indexOf(seed)]}
+            {...markProps(seed.name, faces[BOT_SEEDS.indexOf(seed)])}
             notify={false}
           />
         </span>
@@ -654,6 +655,7 @@ function markProps(name: string, icon?: BotIcon | null) {
     color: icon?.color,
     shape: icon?.shape,
     outline: icon?.outline,
+    paint: icon?.paint,
   };
 }
 
@@ -670,7 +672,7 @@ function BotPage({
 }: {
   bot?: Bot;
   /** Recent jobs for this bot (RECENT); empty for a new bot. */
-  jobs: Task[];
+  jobs: Thread[];
   /** Created or deleted; where the roster should look next. */
   onDone: (name: string | null) => void;
   /** New bot only: folds the form. */
@@ -1201,8 +1203,8 @@ function Row({ label, children }: { label: string; children: ReactNode }) {
   );
 }
 
-/** This bot's recent jobs; the full list is in Settings > Tasks. */
-function Recent({ jobs }: { jobs: Task[] }) {
+/** This bot's recent jobs; the full list is in Settings > Threads. */
+function Recent({ jobs }: { jobs: Thread[] }) {
   return (
     <div className="pt-1">
       <div className="flex h-6 items-center">
@@ -1210,7 +1212,7 @@ function Recent({ jobs }: { jobs: Task[] }) {
         <span className="flex-1" />
         <button
           type="button"
-          onClick={() => openSettings("tasks")}
+          onClick={() => openSettings("threads")}
           className="flex items-center gap-1 rounded-md px-1.5 py-1 font-mono text-[11px] text-muted-foreground outline-none transition-colors hover:text-foreground focus-visible:ring-3 focus-visible:ring-ring/50"
         >
           <History className="size-3" />
@@ -1253,14 +1255,14 @@ function Recent({ jobs }: { jobs: Task[] }) {
   );
 }
 
-function jobState(job: Task): { text: string; tone: string } {
+function jobState(job: Thread): { text: string; tone: string } {
   switch (job.status) {
     case "waiting":
       return { text: "waiting on you", tone: WAITING_INK };
     case "running":
       return { text: "working", tone: "text-muted-foreground" };
-    case "failed":
-      return { text: "failed", tone: "text-destructive" };
+    case "cancelled":
+      return { text: "stopped", tone: "text-muted-foreground" };
     default:
       return { text: "done", tone: "text-muted-foreground" };
   }
@@ -1285,13 +1287,27 @@ function MarkPicker({
       <BotMark size={112} {...markProps(name, icon)} className="shrink-0" />
 
       {/* MARK_SYSTEM is an explicit "follow the theme ink", distinct from no
-          colour; picking the colour already on it goes back to none. */}
+          colour; picking the colour already on it goes back to none. A paint
+          covers the colour without clearing it; picking a colour takes it off. */}
       <MarkPalette
-        color={icon.color}
-        themePicked={icon.color === MARK_SYSTEM}
-        onTheme={() => onChange({ ...icon, color: MARK_SYSTEM })}
+        color={icon.paint ? undefined : icon.color}
+        themePicked={!icon.paint && icon.color === MARK_SYSTEM}
+        onTheme={() =>
+          onChange({ ...icon, paint: undefined, color: MARK_SYSTEM })
+        }
         onPick={(color) =>
-          onChange({ ...icon, color: icon.color === color ? undefined : color })
+          onChange({
+            ...icon,
+            paint: undefined,
+            color: !icon.paint && icon.color === color ? undefined : color,
+          })
+        }
+        paint={icon.paint}
+        onPaint={(paint) =>
+          onChange({
+            ...icon,
+            paint: icon.paint === paint ? undefined : paint,
+          })
         }
       />
 

package/features/bot/components/bot-tool.tsx

@@ -5,13 +5,11 @@ import {
   ChevronDown,
   ExternalLink,
   FilePen,
-  Flag,
-  Globe,
-  Image as ImageIcon,
   ListChecks,
   Loader2,
   type LucideIcon,
   MessageSquare,
+  PhoneOff,
   Search,
   Send,
   Terminal,
@@ -21,6 +19,7 @@ import { type ComponentType, type ReactNode, useState } from "react";
 import { queryKey } from "@/app/api/query-key";
 import { ShinyText } from "@/components/ui/shiny-text";
 import { Skeleton } from "@/components/ui/skeleton";
+import { TOOL_NAMES } from "@/features/ai/tools/tool-name";
 import type { ResultPart } from "@/features/bot/bot.schema";
 import { McpMark } from "@/features/connectors/components/mcp-mark";
 import { MemoryMark } from "@/features/memory/components/memory-mark";
@@ -28,51 +27,47 @@ import { SkillsMark } from "@/features/skills/components/skills-mark";
 import { FileLink } from "@/features/workspace/components/file-view";
 import { useServerRoute } from "@/lib/protocol/use-server-route";
 import { cn } from "@/lib/utils";
-import type { ToolUse } from "../task.store";
+import type { ToolUse } from "../thread.store";
 
 /*
  * Tool calls rendered per tool: TOOL_VIEWS by name, GenericTool for the rest. Results
- * arrive with only a few lines (bot.query RESULT_LINES); "Everything" fetches the rest on demand.
+ * arrive as a glance (thread.query RESULT_LINES, each line clipped); "Everything"
+ * fetches the whole output, and only once it is opened.
  */
 
 type ToolProps = {
   tool: ToolUse;
   /** Half of the key for fetching the full result. */
-  taskId?: string;
+  threadId?: string;
   /** Start folded to the title line. A running tool is always expanded regardless. */
   collapsed?: boolean;
 };
 
-export const TOOL_VIEWS: Record<string, ComponentType<ToolProps>> = {
-  web_search: WebSearchTool,
-  bash: ShellTool,
-  fetch: (props) => <MonoTool icon={Globe} {...props} />,
-  write_file: (props) => <FileTool icon={FilePen} {...props} />,
-  generate_image: DrawnTool,
+const TOOL_VIEWS: Partial<Record<string, ComponentType<ToolProps>>> = {
+  [TOOL_NAMES.web_search]: WebSearchTool,
+  [TOOL_NAMES.bash]: ShellTool,
+  [TOOL_NAMES.write_file]: (props) => <FileTool icon={FilePen} {...props} />,
 };
 
 /**
  * Icon per tool, for views with room for one glyph. A tool that belongs to a
  * domain draws that domain's own mark, so the pill and the nav never disagree.
  */
-const TOOL_ICONS: Record<string, LucideIcon> = {
-  web_search: Search,
-  bash: Terminal,
-  fetch: Globe,
-  write_file: FilePen,
-  generate_image: ImageIcon,
-  memory_recall: MemoryMark,
-  memory_remember: MemoryMark,
-  memory_forget: MemoryMark,
-  load_skill: SkillsMark,
-  tool_search: McpMark,
-  tool_call: McpMark,
-  delegate: Send,
-  task: ListChecks,
-  ask_bot: MessageSquare,
-  ask_back: MessageSquare,
-  ask_thursday: MessageSquare,
-  answer: Flag,
+const TOOL_ICONS: Partial<Record<string, LucideIcon>> = {
+  [TOOL_NAMES.web_search]: Search,
+  [TOOL_NAMES.bash]: Terminal,
+  [TOOL_NAMES.write_file]: FilePen,
+  [TOOL_NAMES.memory_recall]: MemoryMark,
+  [TOOL_NAMES.memory_remember]: MemoryMark,
+  [TOOL_NAMES.memory_forget]: MemoryMark,
+  [TOOL_NAMES.memory_conversation]: MemoryMark,
+  [TOOL_NAMES.load_skill]: SkillsMark,
+  [TOOL_NAMES.tool_search]: McpMark,
+  [TOOL_NAMES.tool_call]: McpMark,
+  [TOOL_NAMES.delegate]: Send,
+  [TOOL_NAMES.thread]: ListChecks,
+  [TOOL_NAMES.send_message]: MessageSquare,
+  [TOOL_NAMES.end_call]: PhoneOff,
 };
 
 export const toolIcon = (name: string): LucideIcon =>
@@ -83,10 +78,10 @@ export function BotTool(props: ToolProps) {
   return <View {...props} />;
 }
 
-function WebSearchTool({ tool, taskId, collapsed }: ToolProps) {
+function WebSearchTool({ tool, threadId, collapsed }: ToolProps) {
   const hits = texts(tool.results);
   return (
-    <Frame tool={tool} taskId={taskId} icon={Search} collapsed={collapsed}>
+    <Frame tool={tool} threadId={threadId} icon={Search} collapsed={collapsed}>
       <p className="px-3 pt-1 pb-1.5 text-[13px] leading-snug break-keep">
         “{tool.input}”
       </p>
@@ -107,10 +102,15 @@ function WebSearchTool({ tool, taskId, collapsed }: ToolProps) {
   );
 }
 
-function ShellTool({ tool, taskId, collapsed }: ToolProps) {
+function ShellTool({ tool, threadId, collapsed }: ToolProps) {
   const out = texts(tool.results);
   return (
-    <Frame tool={tool} taskId={taskId} icon={Terminal} collapsed={collapsed}>
+    <Frame
+      tool={tool}
+      threadId={threadId}
+      icon={Terminal}
+      collapsed={collapsed}
+    >
       <pre className="mx-3 overflow-x-auto rounded-lg bg-foreground/5 px-2.5 py-1.5 font-mono text-[11px] leading-relaxed scrollbar-none dark:bg-black/25">
         <span className="text-muted-foreground/60">$ </span>
         {tool.input}
@@ -122,39 +122,22 @@ function ShellTool({ tool, taskId, collapsed }: ToolProps) {
   );
 }
 
-/** A path or url and what was read from it. */
-function MonoTool({
-  icon,
-  tool,
-  taskId,
-  collapsed,
-}: ToolProps & { icon: LucideIcon }) {
-  return (
-    <Frame tool={tool} taskId={taskId} icon={icon} collapsed={collapsed}>
-      <p className="truncate px-3 pt-1 pb-1.5 font-mono text-[11px]">
-        {tool.input}
-      </p>
-      <Lines lines={texts(tool.results)} mono />
-    </Frame>
-  );
-}
-
 const OPEN_BUTTON =
   "flex shrink-0 items-center gap-1 rounded-md px-1.5 py-0.5 font-mono text-[10px] text-muted-foreground outline-none transition-colors hover:bg-background hover:text-foreground focus-visible:ring-3 focus-visible:ring-ring/50 disabled:opacity-50";
 
 /**
  * A file the bot read or wrote, with an Open link. Opens `tool.path`: `input` is folded
- * to one line, and a truncated path is a 404 (task.query LINE_MAX).
+ * to one line, and a truncated path is a 404 (thread.query LINE_MAX).
  */
 function FileTool({
   icon,
   tool,
-  taskId,
+  threadId,
   collapsed,
 }: ToolProps & { icon: LucideIcon }) {
   const path = tool.path ?? tool.input;
   return (
-    <Frame tool={tool} taskId={taskId} icon={icon} collapsed={collapsed}>
+    <Frame tool={tool} threadId={threadId} icon={icon} collapsed={collapsed}>
       <div className="flex items-center gap-2 px-3 pt-1 pb-1.5">
         <span className="min-w-0 flex-1 truncate font-mono text-[11px]">
           {tool.input}
@@ -169,35 +152,12 @@ function FileTool({
   );
 }
 
-/** A generated image. The path is the first result line, not the input: the name is made while generating. */
-function DrawnTool({ tool, taskId, collapsed }: ToolProps) {
-  const [path] = texts(tool.results);
-  return (
-    <Frame tool={tool} taskId={taskId} icon={ImageIcon} collapsed={collapsed}>
-      <p className="px-3 pt-1 text-[12px] leading-snug break-keep">
-        {tool.input}
-      </p>
-      {path && (
-        <div className="flex items-center gap-2 px-3 pt-1 pb-1.5">
-          <span className="min-w-0 flex-1 truncate font-mono text-[11px] text-muted-foreground">
-            {path}
-          </span>
-          <FileLink path={path} label={`Open ${path}`} className={OPEN_BUTTON}>
-            <ExternalLink className="size-3" />
-            Open
-          </FileLink>
-        </div>
-      )}
-    </Frame>
-  );
-}
-
 /** Anything without a view of its own, MCP tools included. */
-function GenericTool({ tool, taskId, collapsed }: ToolProps) {
+function GenericTool({ tool, threadId, collapsed }: ToolProps) {
   return (
     <Frame
       tool={tool}
-      taskId={taskId}
+      threadId={threadId}
       icon={toolIcon(tool.name)}
       collapsed={collapsed}
     >
@@ -211,12 +171,12 @@ function GenericTool({ tool, taskId, collapsed }: ToolProps) {
 
 /**
  * The shell every tool view sits in: a one-line step (icon, label, call, tool name,
- * state) with the body below it. A running tool is always expanded; a truncated
- * result gets "Everything" at the bottom.
+ * state) with the body below it. A running tool is always expanded; a finished one
+ * that returned anything gets "Everything" at the bottom.
  */
 function Frame({
   tool,
-  taskId,
+  threadId,
   icon: Icon,
   collapsed = false,
   children,
@@ -224,7 +184,9 @@ function Frame({
   const running = tool.results === undefined;
   const [open, setOpen] = useState(!collapsed);
   const shown = open || running;
-  const more = tool.more && taskId && tool.callId;
+  // The glance is text only and clipped, so any output can be opened whole
+  const whole =
+    threadId && tool.callId && ((tool.results?.length ?? 0) > 0 || tool.more);
 
   return (
     <div
@@ -294,8 +256,8 @@ function Frame({
       {shown && (
         <div className="pb-1.5 pl-[1.625rem]">
           {children}
-          {more && (
-            <Everything taskId={taskId} callId={tool.callId as string} />
+          {whole && (
+            <Everything threadId={threadId} callId={tool.callId as string} />
           )}
         </div>
       )}
@@ -304,10 +266,16 @@ function Frame({
 }
 
 /** The rest of a truncated result, fetched only when opened. */
-function Everything({ taskId, callId }: { taskId: string; callId: string }) {
+function Everything({
+  threadId,
+  callId,
+}: {
+  threadId: string;
+  callId: string;
+}) {
   const [open, setOpen] = useState(false);
   const { data, isLoading } = useServerRoute<ResultPart[]>(
-    open ? queryKey.toolResult(taskId, callId) : null,
+    open ? queryKey.toolResult(threadId, callId) : null,
   );
 
   return (