Merge branch 'dev' into feature/ssh-support

Brings dev's retry-with-backoff (the transient `provider-retry` AgentEvent the
web frontend consumes) + the LSP-dead-server per-edit-hang fix into the SSH
feature branch, alongside the SSH waves 0-5c.

All code files auto-merged cleanly (run-turn.ts, orchestrator.ts, runtime.ts,
wire/index.ts, tool-edit-file/extension.ts, run-turn.test.ts — both computerId
threading and retry-with-backoff coexist). Only tasks.md conflicted (status
section — orchestrator-resolved; both feature sections kept).

Verified post-merge: tsc -b EXIT 0, biome clean (391 files), 1730 vitest pass
+6 sshd-integration skipped (was 1690; +40 from dev's retry/LSP tests).
Wire dist rebuilt so the FE can re-sync the pinned @dispatch/wire dep and pick
up BOTH provider-retry AND the SSH Computer/defaultComputerId types.
No merge or push (into dev or otherwise).

5 files changed, 132 insertions, 9 deletions

diff --git a/packages/cli/src/args.test.ts b/packages/cli/src/args.test.ts
index 3d07c96..e613f31 100644
--- a/packages/cli/src/args.test.ts
+++ b/packages/cli/src/args.test.ts
@@ -254,6 +254,41 @@ describe("parseArgs", () => {
 			});
 		});
 
+		it("parses 'list' with --workspace", () => {
+			expect(parseArgs(["list", "--workspace", "proj"], { defaultServer })).toEqual({
+				kind: "list",
+				server: "http://localhost:24203",
+				workspaceId: "proj",
+				all: false,
+			});
+		});
+
+		it("parses 'list' with -w shorthand", () => {
+			const result = parseArgs(["list", "-w", "ws"], { defaultServer });
+			expect(result.kind).toBe("list");
+			if (result.kind === "list") expect(result.workspaceId).toBe("ws");
+		});
+
+		it("parses 'list' with --workspace, --status, and a prefix together", () => {
+			const result = parseArgs(["list", "abc", "--status", "active", "--workspace", "proj"], {
+				defaultServer,
+			});
+			expect(result).toEqual({
+				kind: "list",
+				server: "http://localhost:24203",
+				query: "abc",
+				status: "active",
+				workspaceId: "proj",
+				all: false,
+			});
+		});
+
+		it("errors when --workspace has no value (list)", () => {
+			const result = parseArgs(["list", "--workspace"], { defaultServer });
+			expect(result.kind).toBe("error");
+			if (result.kind === "error") expect(result.message).toContain("--workspace requires a value");
+		});
+
 		it("parses 'list' with --all", () => {
 			expect(parseArgs(["list", "--all"], { defaultServer })).toEqual({
 				kind: "list",
@@ -320,11 +355,31 @@ describe("parseArgs", () => {
 				server: "http://localhost:24203",
 				conversationId: "deadbeef",
 				text: "hi",
+				file: undefined,
+				queue: false,
+				open: false,
+			});
+		});
+
+		it("parses 'send' with --file", () => {
+			expect(parseArgs(["send", "deadbeef", "--file", "foo.txt"], { defaultServer })).toEqual({
+				kind: "send",
+				server: "http://localhost:24203",
+				conversationId: "deadbeef",
+				text: undefined,
+				file: "foo.txt",
 				queue: false,
 				open: false,
 			});
 		});
 
+		it("parses 'send' with both --text and --file", () => {
+			const result = parseArgs(["send", "deadbeef", "--text", "hi", "--file", "f.txt"], {
+				defaultServer,
+			});
+			expect(result).toMatchObject({ kind: "send", text: "hi", file: "f.txt" });
+		});
+
 		it("parses 'send' with --queue", () => {
 			const result = parseArgs(["send", "deadbeef", "--text", "hi", "--queue"], {
 				defaultServer,
@@ -334,6 +389,7 @@ describe("parseArgs", () => {
 				server: "http://localhost:24203",
 				conversationId: "deadbeef",
 				text: "hi",
+				file: undefined,
 				queue: true,
 				open: false,
 			});
@@ -348,6 +404,7 @@ describe("parseArgs", () => {
 				server: "http://localhost:24203",
 				conversationId: "deadbeef",
 				text: "hi",
+				file: undefined,
 				queue: false,
 				open: true,
 			});
@@ -363,6 +420,7 @@ describe("parseArgs", () => {
 				server: "http://localhost:24203",
 				conversationId: "deadbeef",
 				text: "hi",
+				file: undefined,
 				queue: false,
 				open: false,
 				cwd: "/tmp",
@@ -370,10 +428,10 @@ describe("parseArgs", () => {
 			});
 		});
 
-		it("requires --text", () => {
+		it("errors when --text and --file are both missing", () => {
 			const result = parseArgs(["send", "deadbeef"], { defaultServer });
 			expect(result.kind).toBe("error");
-			if (result.kind === "error") expect(result.message).toContain("--text");
+			if (result.kind === "error") expect(result.message).toContain("--text or --file");
 		});
 
 		it("requires a conversation id", () => {
@@ -386,6 +444,12 @@ describe("parseArgs", () => {
 			const result = parseArgs(["send", "deadbeef", "--text"], { defaultServer });
 			expect(result.kind).toBe("error");
 		});
+
+		it("errors when --file has no value", () => {
+			const result = parseArgs(["send", "deadbeef", "--file"], { defaultServer });
+			expect(result.kind).toBe("error");
+			if (result.kind === "error") expect(result.message).toContain("--file requires a value");
+		});
 	});
 
 	describe("open", () => {
diff --git a/packages/cli/src/args.ts b/packages/cli/src/args.ts
index 8a63777..74cc56a 100644
--- a/packages/cli/src/args.ts
+++ b/packages/cli/src/args.ts
@@ -33,6 +33,7 @@ export type ParsedCommand =
 			readonly server: string;
 			readonly query?: string;
 			readonly status?: string;
+			readonly workspaceId?: string;
 			readonly all: boolean;
 	  }
 	| { readonly kind: "compact"; readonly server: string; readonly conversationId: string }
@@ -42,7 +43,8 @@ export type ParsedCommand =
 			readonly kind: "send";
 			readonly server: string;
 			readonly conversationId: string;
-			readonly text: string;
+			readonly text?: string | undefined;
+			readonly file?: string | undefined;
 			readonly queue: boolean;
 			readonly open: boolean;
 			readonly cwd?: string;
@@ -84,6 +86,7 @@ export function parseArgs(argv: readonly string[], opts: ParseOpts): ParsedComma
 		let server = opts.defaultServer;
 		let query: string | undefined;
 		let status: string | undefined;
+		let workspaceId: string | undefined;
 		let all = false;
 		for (let i = 1; i < argv.length; i++) {
 			const arg = argv[i] as string;
@@ -93,6 +96,9 @@ export function parseArgs(argv: readonly string[], opts: ParseOpts): ParsedComma
 			} else if (arg === "--status") {
 				if (i + 1 >= argv.length) return { kind: "error", message: "--status requires a value" };
 				status = argv[++i];
+			} else if (arg === "--workspace" || arg === "-w") {
+				if (i + 1 >= argv.length) return { kind: "error", message: "--workspace requires a value" };
+				workspaceId = argv[++i];
 			} else if (arg === "--all") {
 				all = true;
 			} else if (arg.startsWith("--")) {
@@ -108,6 +114,7 @@ export function parseArgs(argv: readonly string[], opts: ParseOpts): ParsedComma
 			server,
 			...(query !== undefined && { query }),
 			...(status !== undefined && { status }),
+			...(workspaceId !== undefined && { workspaceId }),
 			all,
 		};
 	}
@@ -204,6 +211,7 @@ export function parseArgs(argv: readonly string[], opts: ParseOpts): ParsedComma
 		let server = opts.defaultServer;
 		let conversationId: string | undefined;
 		let text: string | undefined;
+		let file: string | undefined;
 		let queue = false;
 		let open = false;
 		let cwd: string | undefined;
@@ -221,6 +229,10 @@ export function parseArgs(argv: readonly string[], opts: ParseOpts): ParsedComma
 					if (i + 1 >= argv.length) return { kind: "error", message: "--text requires a value" };
 					text = argv[++i];
 					break;
+				case "--file":
+					if (i + 1 >= argv.length) return { kind: "error", message: "--file requires a value" };
+					file = argv[++i];
+					break;
 				case "--queue":
 					queue = true;
 					break;
@@ -263,8 +275,11 @@ export function parseArgs(argv: readonly string[], opts: ParseOpts): ParsedComma
 		if (conversationId === undefined) {
 			return { kind: "error", message: "'send' requires a conversation id" };
 		}
-		if (text === undefined) {
-			return { kind: "error", message: "'send' requires --text" };
+		if (!text && !file) {
+			return {
+				kind: "error",
+				message: "At least one of --text or --file is required for 'send'",
+			};
 		}
 
 		return {
@@ -272,6 +287,7 @@ export function parseArgs(argv: readonly string[], opts: ParseOpts): ParsedComma
 			server,
 			conversationId,
 			text,
+			file,
 			queue,
 			open,
 			...(cwd !== undefined && { cwd }),
diff --git a/packages/cli/src/http.test.ts b/packages/cli/src/http.test.ts
index 2aa61e9..ab39813 100644
--- a/packages/cli/src/http.test.ts
+++ b/packages/cli/src/http.test.ts
@@ -289,6 +289,36 @@ describe("fetchConversations", () => {
 		expect(calledUrl).toBe("http://localhost:24203/conversations?q=abc+def");
 	});
 
+	it("appends ?workspaceId=<value> when a workspaceId is given", async () => {
+		let calledUrl: string | undefined;
+		const fakeFetch = (async (url: string | URL | Request): Promise<Response> => {
+			calledUrl = String(url);
+			return new Response(JSON.stringify({ conversations: [] }), { status: 200 });
+		}) as unknown as typeof fetch;
+
+		await fetchConversations(
+			{ fetchImpl: fakeFetch },
+			{ server: "http://localhost:24203", workspaceId: "proj" },
+		);
+		expect(calledUrl).toBe("http://localhost:24203/conversations?workspaceId=proj");
+	});
+
+	it("combines ?status= and ?workspaceId= when both are given", async () => {
+		let calledUrl: string | undefined;
+		const fakeFetch = (async (url: string | URL | Request): Promise<Response> => {
+			calledUrl = String(url);
+			return new Response(JSON.stringify({ conversations: [] }), { status: 200 });
+		}) as unknown as typeof fetch;
+
+		await fetchConversations(
+			{ fetchImpl: fakeFetch },
+			{ server: "http://localhost:24203", status: "active,idle", workspaceId: "proj" },
+		);
+		expect(calledUrl).toBe(
+			"http://localhost:24203/conversations?status=active%2Cidle&workspaceId=proj",
+		);
+	});
+
 	it("throws on non-OK status", async () => {
 		const fakeFetch = (async (): Promise<Response> =>
 			new Response("boom", { status: 500 })) as unknown as typeof fetch;
diff --git a/packages/cli/src/http.ts b/packages/cli/src/http.ts
index 42fcfec..e13842a 100644
--- a/packages/cli/src/http.ts
+++ b/packages/cli/src/http.ts
@@ -98,6 +98,7 @@ interface FetchConversationsOpts {
 	readonly server: string;
 	readonly query?: string;
 	readonly status?: string;
+	readonly workspaceId?: string;
 }
 
 export async function fetchConversations(
@@ -107,6 +108,7 @@ export async function fetchConversations(
 	const params = new URLSearchParams();
 	if (opts.query !== undefined) params.set("q", opts.query);
 	if (opts.status !== undefined) params.set("status", opts.status);
+	if (opts.workspaceId !== undefined) params.set("workspaceId", opts.workspaceId);
 	const qs = params.toString();
 	const url = qs.length > 0 ? `${opts.server}/conversations?${qs}` : `${opts.server}/conversations`;
 	const res = await deps.fetchImpl(url);
diff --git a/packages/cli/src/main.ts b/packages/cli/src/main.ts
index 9dfc317..cba0de7 100644
--- a/packages/cli/src/main.ts
+++ b/packages/cli/src/main.ts
@@ -24,12 +24,12 @@ import { extractLastText, formatConversationList, renderEvent } from "./render.j
 
 const USAGE = `Usage:
   dispatch models [--server <url>]
-  dispatch list [<prefix>] [--status <active|idle|closed>] [--all] [--server <url>]
+  dispatch list [<prefix>] [--status <active|idle|closed>] [--workspace <id>] [--all] [--server <url>]
   dispatch stop <conversationId> [--server <url>]
   dispatch compact <conversationId> [--server <url>]
   dispatch read <conversationId> [--server <url>]
   dispatch open <conversationId> [--server <url>]
-  dispatch send <conversationId> --text "..." [--queue] [--open] [--cwd <dir>] [--effort <level>] [--workspace <id>] [--server <url>]
+  dispatch send <conversationId> --text "..." [--file <path>] [--queue] [--open] [--cwd <dir>] [--effort <level>] [--workspace <id>] [--server <url>]
   dispatch <modelName> --text "..." [--file <path>] [--cwd <dir>] [--conversation <id>] [--effort <level>] [--workspace <id>] [--server <url>] [--show-reasoning] [--open]
   dispatch --help
 
@@ -61,6 +61,7 @@ async function main(): Promise<void> {
 					server: parsed.server,
 					...(parsed.query !== undefined && { query: parsed.query }),
 					...(status !== undefined && { status }),
+					...(parsed.workspaceId !== undefined && { workspaceId: parsed.workspaceId }),
 				},
 			);
 			const table = formatConversationList(result.conversations, Date.now());
@@ -156,10 +157,20 @@ async function main(): Promise<void> {
 				process.stdout.write(`Signaled frontend to open ${conversationId}\n`);
 			}
 
+			let fileContent: string | undefined;
+			if (parsed.file) {
+				fileContent = await readFile(parsed.file, "utf-8");
+			}
+			const message = composeMessage({
+				...(parsed.text !== undefined && { text: parsed.text }),
+				...(parsed.file !== undefined && { file: parsed.file }),
+				...(fileContent !== undefined && { fileContent }),
+			});
+
 			if (parsed.queue) {
 				const queued = await enqueueMessage(
 					{ fetchImpl: globalThis.fetch },
-					{ server: parsed.server, conversationId, text: parsed.text },
+					{ server: parsed.server, conversationId, text: message },
 				);
 				const line = queued.startedTurn
 					? `Started turn for ${conversationId}`
@@ -168,7 +179,7 @@ async function main(): Promise<void> {
 			} else {
 				const request = {
 					conversationId,
-					message: parsed.text,
+					message,
 					...(parsed.cwd !== undefined && { cwd: parsed.cwd }),
 					...(parsed.reasoningEffort !== undefined && { reasoningEffort: parsed.reasoningEffort }),
 					...(parsed.workspaceId !== undefined && { workspaceId: parsed.workspaceId }),