feat(web): All Threads, a Linear-like list of every thread

apps/contract/src/contract.ts

@@ -346,17 +346,20 @@ export const SyncTracking = Schema.Union([
 ]);
 export type SyncTracking = typeof SyncTracking.Type;
 
-/** What the dashboard splits an organization's threads by. */
-export const DashboardBy = Schema.Literals(["status", "priority", "grouping"]);
-export type DashboardBy = typeof DashboardBy.Type;
+/** What All Threads splits an organization's threads by. */
+export const ThreadsBy = Schema.Literals(["status", "priority", "grouping"]);
+export type ThreadsBy = typeof ThreadsBy.Type;
 
-/** A thread as the dashboard lists it, with its desktop columns. */
-export const DashboardThread = Schema.Struct({
+/** A thread as All Threads lists it, with its machine and desktop columns. */
+export const ListedThread = Schema.Struct({
 	id: Schema.String,
 	sessionId: Schema.String,
 	originKind: Schema.Literals(["main", "fork"]),
+	/** The thread a fork was cut from (a fork's, for a fork of a fork); null for a main thread. */
+	originThreadId: Schema.NullOr(Schema.String),
 	/** Its own title, else its nearest titled ancestor's, else what an untitled one is called. */
 	title: Schema.String,
+	machine: Schema.Struct({ id: Schema.String, name: Schema.String }),
 	project: Schema.Struct({ id: Schema.String, name: Schema.String }),
 	runState: RunState,
 	status: ThreadStatus,
@@ -368,29 +371,29 @@ export const DashboardThread = Schema.Struct({
 	/** Last activity, epoch milliseconds. */
 	updatedAt: Schema.Number,
 });
-export type DashboardThread = typeof DashboardThread.Type;
+export type ListedThread = typeof ListedThread.Type;
 
-/** One list of the dashboard: the threads with one status, one priority, or in one group (`null` is ungrouped), in `ordering`. */
-export const DashboardList = Schema.Union([
-	Schema.TaggedStruct("Status", { status: ThreadStatus, threads: Schema.Array(DashboardThread) }),
-	Schema.TaggedStruct("Priority", { priority: Priority, threads: Schema.Array(DashboardThread) }),
+/** One list of All Threads: the threads with one status, one priority, or in one group (`null` is ungrouped), in `ordering`. */
+export const ThreadList = Schema.Union([
+	Schema.TaggedStruct("Status", { status: ThreadStatus, threads: Schema.Array(ListedThread) }),
+	Schema.TaggedStruct("Priority", { priority: Priority, threads: Schema.Array(ListedThread) }),
 	Schema.TaggedStruct("Grouping", {
 		groupingId: Schema.NullOr(Schema.String),
-		threads: Schema.Array(DashboardThread),
+		threads: Schema.Array(ListedThread),
 	}),
 ]);
-export type DashboardList = typeof DashboardList.Type;
+export type ThreadList = typeof ThreadList.Type;
 
 /**
  * An organization's threads split into lists, each present even when empty: by status, by priority
  * (urgent first, none last), or by group (groups in their `ordering`, ungrouped last). The
  * organization's groups come with it, in their `ordering`, whatever the split.
  */
-export const Dashboard = Schema.Struct({
-	lists: Schema.Array(DashboardList),
+export const AllThreads = Schema.Struct({
+	lists: Schema.Array(ThreadList),
 	groups: Schema.Array(Grouping),
 });
-export type Dashboard = typeof Dashboard.Type;
+export type AllThreads = typeof AllThreads.Type;
 
 /**
  * The topics a client follows to keep each read current; it reads again when one fires.
@@ -399,12 +402,12 @@ export type Dashboard = typeof Dashboard.Type;
  * - `threads.line`: `sync/changed` whose `threadId` is the thread (its entries and inbox) or that
  *   names a thread (the thread itself, or the ancestor an untitled fork takes its title from);
  *   `sync/delta/<thread>` streams its draft between checkpoints.
- * - `dashboard.list`: `sync/changed` naming a thread or a removed session; every `sync/status` and
+ * - `threads.list`: `sync/changed` naming a thread or a removed session; every `sync/status` and
  *   `sync/tracking`.
  */
 export const readTopics = {
 	sidebar: [syncTopics.changed, syncTopics.tracking],
-	dashboard: [syncTopics.changed, syncTopics.status, syncTopics.tracking],
+	threads: [syncTopics.changed, syncTopics.status, syncTopics.tracking],
 	line: (threadId: string) => [syncTopics.changed, syncTopics.delta(threadId)],
 };
 
@@ -432,9 +435,9 @@ export const Api = RpcGroup.make(
 		error: SyncError,
 	}),
 	/** An organization's threads that are not deleted, subagents left out, split by `by` into lists in `ordering`. Read from app.db alone. */
-	Rpc.make("dashboard.list", {
-		payload: { organizationId: Schema.String, by: DashboardBy },
-		success: Dashboard,
+	Rpc.make("threads.list", {
+		payload: { organizationId: Schema.String, by: ThreadsBy },
+		success: AllThreads,
 	}),
 	/** The models a new session can use; `hostDir` is its folder, whose project settings apply. */
 	Rpc.make("models.list", {

apps/server/src/handlers.ts

@@ -45,7 +45,7 @@ export const layer = Contract.Api.toLayer(
 			...tracking,
 
 			"sidebar.list": (input) => Reads.sidebar(input).pipe(Effect.provideService(SqlClient.SqlClient, sql)),
-			"dashboard.list": (input) => Reads.dashboard(input).pipe(Effect.provideService(SqlClient.SqlClient, sql)),
+			"threads.list": (input) => Reads.threads(input).pipe(Effect.provideService(SqlClient.SqlClient, sql)),
 			"threads.line": (input) => Reads.line(input).pipe(Effect.provideService(SqlClient.SqlClient, sql)),
 
 			"host.info": Effect.fn("host.info")(function* () {

apps/server/src/reads.ts

@@ -1,10 +1,10 @@
 import { Effect, Schema } from "effect";
 import { SqlClient } from "effect/sql";
 import {
-	type Dashboard,
-	type DashboardBy,
-	type DashboardList,
-	type DashboardThread,
+	type AllThreads,
+	type ListedThread,
+	type ThreadList,
+	type ThreadsBy,
 	type Grouping,
 	type LineRequest,
 	LineThread,
@@ -120,7 +120,7 @@ export const sidebar = Effect.fn("Reads.sidebar")(function* ({
 	return listed.toSorted((a, b) => activity(b) - activity(a));
 }, Effect.orDie);
 
-/** The status lists in the order the dashboard shows them: what needs the user first. */
+/** The status lists in the order All Threads shows them: what needs the user first. */
 const STATUSES: ReadonlyArray<ThreadStatus> = ["working", "attention", "settled", "cancelled"];
 /** Urgent first and none last, as Linear. */
 const PRIORITIES: ReadonlyArray<Priority> = [1, 2, 3, 4, 0];
@@ -130,25 +130,27 @@ const SPLIT = {
 	status: "thread.status, thread.ordering",
 	priority: "thread.priority, thread.ordering",
 	grouping: "thread.grouping_id, thread.ordering",
-} satisfies Record<DashboardBy, string>;
+} satisfies Record<ThreadsBy, string>;
 
-export const dashboard = Effect.fn("Reads.dashboard")(function* ({
+export const threads = Effect.fn("Reads.threads")(function* ({
 	organizationId,
 	by,
 }: {
 	readonly organizationId: string;
-	readonly by: DashboardBy;
+	readonly by: ThreadsBy;
 }) {
 	const sql = yield* SqlClient.SqlClient;
 	const rows = yield* sql<{
 		id: string;
 		sessionId: string;
-		originKind: DashboardThread["originKind"];
+		originKind: ListedThread["originKind"];
 		originThreadId: string | null;
 		title: string | null;
+		machineId: string;
+		machineName: string;
 		projectId: string;
 		projectName: string;
-		runState: DashboardThread["runState"];
+		runState: ListedThread["runState"];
 		status: ThreadStatus;
 		priority: Priority;
 		groupingId: string | null;
@@ -157,12 +159,13 @@ export const dashboard = Effect.fn("Reads.dashboard")(function* ({
 		updatedAt: number;
 	}>`
 		SELECT thread.id, thread.session_id, thread.origin_kind, thread.origin_thread_id, thread.title,
-			project.id AS project_id, project.name AS project_name, thread.run_state, thread.status, thread.priority,
+			machine.id AS machine_id, machine.name AS machine_name, project.id AS project_id, project.name AS project_name, thread.run_state, thread.status, thread.priority,
 			thread.grouping_id, thread.ordering, COALESCE(thread.color, session.color) AS color, thread.updated_at
 		FROM thread
 		JOIN session ON session.id = thread.session_id
 		JOIN space ON space.machine_id = session.machine_id AND space.id = session.space_id
 		JOIN project ON project.machine_id = space.machine_id AND project.id = space.project_id
+		JOIN machine ON machine.id = session.machine_id
 		WHERE thread.organization_id = ${organizationId} AND thread.deleted_at IS NULL AND thread.origin_kind <> 'subagent'
 		ORDER BY ${sql.literal(SPLIT[by])}
 	`;
@@ -181,11 +184,13 @@ export const dashboard = Effect.fn("Reads.dashboard")(function* ({
 		}
 		return UNTITLED;
 	};
-	const threads = rows.map((row): DashboardThread => ({
+	const listed = rows.map((row): ListedThread => ({
 		id: row.id,
 		sessionId: row.sessionId,
 		originKind: row.originKind,
+		originThreadId: row.originThreadId,
 		title: titleOf(row),
+		machine: { id: row.machineId, name: row.machineName },
 		project: { id: row.projectId, name: row.projectName },
 		runState: row.runState,
 		status: row.status,
@@ -195,25 +200,25 @@ export const dashboard = Effect.fn("Reads.dashboard")(function* ({
 		color: row.color,
 		updatedAt: row.updatedAt,
 	}));
-	const lists: Array<DashboardList> =
+	const lists: Array<ThreadList> =
 		by === "status"
 			? STATUSES.map((status) => ({
 					_tag: "Status",
 					status,
-					threads: threads.filter((thread) => thread.status === status),
+					threads: listed.filter((thread) => thread.status === status),
 				}))
 			: by === "priority"
 				? PRIORITIES.map((priority) => ({
 						_tag: "Priority",
 						priority,
-						threads: threads.filter((thread) => thread.priority === priority),
+						threads: listed.filter((thread) => thread.priority === priority),
 					}))
 				: [...groups.map((group) => group.id), null].map((groupingId) => ({
 						_tag: "Grouping",
 						groupingId,
-						threads: threads.filter((thread) => thread.groupingId === groupingId),
+						threads: listed.filter((thread) => thread.groupingId === groupingId),
 					}));
-	return { lists, groups } satisfies Dashboard;
+	return { lists, groups } satisfies AllThreads;
 }, Effect.orDie);
 
 /**

apps/server/test/__artifacts__/dashboard.grouping.json → apps/server/test/__artifacts__/threads.grouping.json

@@ -8,7 +8,12 @@
 					"id": "<thread B>",
 					"sessionId": "<session B>",
 					"originKind": "main",
+					"originThreadId": null,
 					"title": "Thread B",
+					"machine": {
+						"id": "<machine>",
+						"name": "Scripted"
+					},
 					"project": {
 						"id": "<id 1>",
 						"name": "Board"
@@ -31,7 +36,12 @@
 					"id": "<thread C>",
 					"sessionId": "<session C>",
 					"originKind": "main",
+					"originThreadId": null,
 					"title": "Thread C",
+					"machine": {
+						"id": "<machine>",
+						"name": "Scripted"
+					},
 					"project": {
 						"id": "<id 1>",
 						"name": "Board"
@@ -48,7 +58,12 @@
 					"id": "<thread A>",
 					"sessionId": "<session A>",
 					"originKind": "main",
+					"originThreadId": null,
 					"title": "Thread A",
+					"machine": {
+						"id": "<machine>",
+						"name": "Scripted"
+					},
 					"project": {
 						"id": "<id 1>",
 						"name": "Board"
@@ -71,7 +86,12 @@
 					"id": "<thread A fork>",
 					"sessionId": "<session A>",
 					"originKind": "fork",
+					"originThreadId": "<thread A>",
 					"title": "Thread A",
+					"machine": {
+						"id": "<machine>",
+						"name": "Scripted"
+					},
 					"project": {
 						"id": "<id 1>",
 						"name": "Board"
@@ -88,7 +108,12 @@
 					"id": "<thread D>",
 					"sessionId": "<session D>",
 					"originKind": "main",
+					"originThreadId": null,
 					"title": "Thread D",
+					"machine": {
+						"id": "<machine>",
+						"name": "Scripted"
+					},
 					"project": {
 						"id": "<id 1>",
 						"name": "Board"

apps/server/test/__artifacts__/dashboard.priority.json → apps/server/test/__artifacts__/threads.priority.json

@@ -8,7 +8,12 @@
 					"id": "<thread C>",
 					"sessionId": "<session C>",
 					"originKind": "main",
+					"originThreadId": null,
 					"title": "Thread C",
+					"machine": {
+						"id": "<machine>",
+						"name": "Scripted"
+					},
 					"project": {
 						"id": "<id 1>",
 						"name": "Board"
@@ -25,7 +30,12 @@
 					"id": "<thread B>",
 					"sessionId": "<session B>",
 					"originKind": "main",
+					"originThreadId": null,
 					"title": "Thread B",
+					"machine": {
+						"id": "<machine>",
+						"name": "Scripted"
+					},
 					"project": {
 						"id": "<id 1>",
 						"name": "Board"
@@ -53,7 +63,12 @@
 					"id": "<thread D>",
 					"sessionId": "<session D>",
 					"originKind": "main",
+					"originThreadId": null,
 					"title": "Thread D",
+					"machine": {
+						"id": "<machine>",
+						"name": "Scripted"
+					},
 					"project": {
 						"id": "<id 1>",
 						"name": "Board"
@@ -76,7 +91,12 @@
 					"id": "<thread A>",
 					"sessionId": "<session A>",
 					"originKind": "main",
+					"originThreadId": null,
 					"title": "Thread A",
+					"machine": {
+						"id": "<machine>",
+						"name": "Scripted"
+					},
 					"project": {
 						"id": "<id 1>",
 						"name": "Board"
@@ -99,7 +119,12 @@
 					"id": "<thread A fork>",
 					"sessionId": "<session A>",
 					"originKind": "fork",
+					"originThreadId": "<thread A>",
 					"title": "Thread A",
+					"machine": {
+						"id": "<machine>",
+						"name": "Scripted"
+					},
 					"project": {
 						"id": "<id 1>",
 						"name": "Board"