Merge branch 'main' into bugfix/slack-tls-fix

Author: jamiepine

.githooks/pre-commit

@@ -1,14 +1,14 @@
-#!/bin/bash
+#!/bin/sh
 
-set -euo pipefail
+set -eu
 
-mapfile -t staged_rust_files < <(git diff --cached --name-only --diff-filter=ACMR -- '*.rs')
+staged_rust_files=$(git diff --cached --name-only --diff-filter=ACMR -- '*.rs')
 
-if [ "${#staged_rust_files[@]}" -eq 0 ]; then
+if [ -z "$staged_rust_files" ]; then
   exit 0
 fi
 
-if ! git diff --quiet -- "${staged_rust_files[@]}"; then
+if ! echo "$staged_rust_files" | xargs git diff --quiet --; then
   echo "pre-commit: staged Rust files have unstaged changes." >&2
   echo "Please stage or stash those changes, then commit again." >&2
   exit 1
@@ -17,4 +17,4 @@ fi
 echo "pre-commit: running cargo fmt --all"
 cargo fmt --all
 
-git add -- "${staged_rust_files[@]}"
+echo "$staged_rust_files" | xargs git add --

docs/design-docs/workers-tab.md

@@ -661,6 +661,7 @@ export interface CronExecutionsParams {
 export interface ProviderStatus {
 	anthropic: boolean;
 	openai: boolean;
+	openai_chatgpt: boolean;
 	openrouter: boolean;
 	zhipu: boolean;
 	groq: boolean;
@@ -669,10 +670,12 @@ export interface ProviderStatus {
 	deepseek: boolean;
 	xai: boolean;
 	mistral: boolean;
+	gemini: boolean;
 	ollama: boolean;
 	opencode_zen: boolean;
 	nvidia: boolean;
 	minimax: boolean;
+	minimax_cn: boolean;
 	moonshot: boolean;
 	zai_coding_plan: boolean;
 }
@@ -695,6 +698,20 @@ export interface ProviderModelTestResponse {
 	sample: string | null;
 }
 
+export interface OpenAiOAuthBrowserStartResponse {
+	success: boolean;
+	message: string;
+	authorization_url: string | null;
+	state: string | null;
+}
+
+export interface OpenAiOAuthBrowserStatusResponse {
+	found: boolean;
+	done: boolean;
+	success: boolean;
+	message: string | null;
+}
+
 // -- Model Types --
 
 export interface ModelInfo {
@@ -1153,6 +1170,28 @@ export const api = {
 		}
 		return response.json() as Promise<ProviderModelTestResponse>;
 	},
+	startOpenAiOAuthBrowser: async (params: {model: string}) => {
+		const response = await fetch(`${API_BASE}/providers/openai/oauth/browser/start`, {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify({
+				model: params.model,
+			}),
+		});
+		if (!response.ok) {
+			throw new Error(`API error: ${response.status}`);
+		}
+		return response.json() as Promise<OpenAiOAuthBrowserStartResponse>;
+	},
+	openAiOAuthBrowserStatus: async (state: string) => {
+		const response = await fetch(
+			`${API_BASE}/providers/openai/oauth/browser/status?state=${encodeURIComponent(state)}`,
+		);
+		if (!response.ok) {
+			throw new Error(`API error: ${response.status}`);
+		}
+		return response.json() as Promise<OpenAiOAuthBrowserStatusResponse>;
+	},
 	removeProvider: async (provider: string) => {
 		const response = await fetch(`${API_BASE}/providers/${encodeURIComponent(provider)}`, {
 			method: "DELETE",

interface/src/api/client.ts

@@ -16,6 +16,7 @@ const PROVIDER_LABELS: Record<string, string> = {
   anthropic: "Anthropic",
   openrouter: "OpenRouter",
   openai: "OpenAI",
+  "openai-chatgpt": "ChatGPT Plus (OAuth)",
   deepseek: "DeepSeek",
   xai: "xAI",
   mistral: "Mistral",
@@ -129,6 +130,7 @@ export function ModelSelect({
     "openrouter",
     "anthropic",
     "openai",
+    "openai-chatgpt",
     "ollama",
     "deepseek",
     "xai",

interface/src/components/ModelSelect.tsx

@@ -1,5 +1,7 @@
 import { useEffect, useRef, useState } from "react";
-import { useWebChat, type ToolActivity } from "@/hooks/useWebChat";
+import { useWebChat, getPortalChatSessionId, type ToolActivity } from "@/hooks/useWebChat";
+import type { ActiveWorker } from "@/hooks/useChannelLiveState";
+import { useLiveContext } from "@/hooks/useLiveContext";
 import { Markdown } from "@/components/Markdown";
 
 interface WebChatPanelProps {
@@ -38,6 +40,33 @@ function ThinkingIndicator() {
 	);
 }
 
+function ActiveWorkersPanel({ workers }: { workers: ActiveWorker[] }) {
+	if (workers.length === 0) return null;
+
+	return (
+		<div className="rounded-lg border border-amber-500/25 bg-amber-500/5 px-3 py-2">
+			<div className="mb-2 flex items-center gap-1.5 text-tiny text-amber-200">
+				<div className="h-1.5 w-1.5 animate-pulse rounded-full bg-amber-400" />
+				<span>
+					{workers.length} active worker{workers.length !== 1 ? "s" : ""}
+				</span>
+			</div>
+			<div className="flex flex-col gap-1.5">
+				{workers.map((worker) => (
+					<div key={worker.id} className="flex min-w-0 items-center gap-2 rounded-md bg-amber-500/10 px-2.5 py-1.5 text-tiny">
+						<span className="font-medium text-amber-300">Worker</span>
+						<span className="min-w-0 flex-1 truncate text-ink-dull">{worker.task}</span>
+						<span className="shrink-0 text-ink-faint">{worker.status}</span>
+						{worker.currentTool && (
+							<span className="max-w-40 shrink-0 truncate text-amber-400/80">{worker.currentTool}</span>
+						)}
+					</div>
+				))}
+			</div>
+		</div>
+	);
+}
+
 function FloatingChatInput({
 	value,
 	onChange,
@@ -125,12 +154,16 @@ function FloatingChatInput({
 
 export function WebChatPanel({ agentId }: WebChatPanelProps) {
 	const { messages, isStreaming, error, toolActivity, sendMessage } = useWebChat(agentId);
+	const { liveStates } = useLiveContext();
 	const [input, setInput] = useState("");
 	const messagesEndRef = useRef<HTMLDivElement>(null);
+	const sessionId = getPortalChatSessionId(agentId);
+	const activeWorkers = Object.values(liveStates[sessionId]?.workers ?? {});
+	const hasActiveWorkers = activeWorkers.length > 0;
 
 	useEffect(() => {
 		messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
-	}, [messages.length, isStreaming, toolActivity.length]);
+	}, [messages.length, isStreaming, toolActivity.length, activeWorkers.length]);
 
 	const handleSubmit = () => {
 		const trimmed = input.trim();
@@ -144,6 +177,12 @@ export function WebChatPanel({ agentId }: WebChatPanelProps) {
 			{/* Messages */}
 			<div className="flex-1 overflow-y-auto">
 				<div className="mx-auto flex max-w-2xl flex-col gap-6 px-4 py-6 pb-32">
+					{hasActiveWorkers && (
+						<div className="sticky top-0 z-10 bg-app/90 pb-2 pt-2 backdrop-blur-sm">
+							<ActiveWorkersPanel workers={activeWorkers} />
+						</div>
+					)}
+
 					{messages.length === 0 && !isStreaming && (
 						<div className="flex flex-col items-center justify-center py-24">
 							<p className="text-sm text-ink-faint">

interface/src/components/WebChatPanel.tsx

@@ -12,6 +12,10 @@ export interface WebChatMessage {
 	content: string;
 }
 
+export function getPortalChatSessionId(agentId: string) {
+	return `portal:chat:${agentId}`;
+}
+
 async function consumeSSE(
 	response: Response,
 	onEvent: (eventType: string, data: string) => void,
@@ -48,7 +52,7 @@ async function consumeSSE(
 }
 
 export function useWebChat(agentId: string) {
-	const sessionId = `portal:chat:${agentId}`;
+	const sessionId = getPortalChatSessionId(agentId);
 	const [messages, setMessages] = useState<WebChatMessage[]>([]);
 	const [isStreaming, setIsStreaming] = useState(false);
 	const [error, setError] = useState<string | null>(null);

interface/src/hooks/useWebChat.ts

@@ -99,6 +99,7 @@ export function ProviderIcon({ provider, className = "text-ink-faint", size = 24
 	const iconMap: Record<string, React.ComponentType<IconProps>> = {
 		anthropic: Anthropic,
 		openai: OpenAI,
+		"openai-chatgpt": OpenAI,
 		openrouter: OpenRouter,
 		groq: Groq,
 		mistral: Mistral,

interface/src/lib/providerIcons.tsx

@@ -78,16 +78,16 @@ function LiveWorkerRunItem({ item, live, channelId }: { item: TimelineWorkerRun;
 			</span>
 			<div className="min-w-0 flex-1">
 				<div className="rounded-md bg-amber-500/10 px-3 py-2">
-					<div className="flex items-center gap-2">
+					<div className="flex min-w-0 items-center gap-2 overflow-hidden">
 						<div className="h-2 w-2 animate-pulse rounded-full bg-amber-400" />
 						<span className="text-sm font-medium text-amber-300">Worker</span>
-						<span className="truncate text-sm text-ink-dull">{item.task}</span>
+						<span className="min-w-0 flex-1 truncate text-sm text-ink-dull">{item.task}</span>
 						<CancelButton onClick={() => { api.cancelProcess(channelId, "worker", item.id).catch(console.warn); }} />
 					</div>
-					<div className="mt-1 flex items-center gap-3 pl-4 text-tiny text-ink-faint">
-						<span>{live.status}</span>
+					<div className="mt-1 flex min-w-0 items-center gap-3 overflow-hidden pl-4 text-tiny text-ink-faint">
+						<span className="truncate">{live.status}</span>
 						{live.currentTool && (
-							<span className="text-amber-400/70">{live.currentTool}</span>
+							<span className="truncate text-amber-400/70">{live.currentTool}</span>
 						)}
 						{live.toolCalls > 0 && (
 							<span>{live.toolCalls} tool calls</span>
@@ -146,23 +146,22 @@ function WorkerRunItem({ item }: { item: TimelineWorkerRun }) {
 				{formatTimestamp(new Date(item.started_at).getTime())}
 			</span>
 			<div className="min-w-0 flex-1">
-				<Button
+				<button
 					type="button"
 					onClick={() => setExpanded(!expanded)}
-					variant="ghost"
-					className="h-auto w-full justify-start rounded-md bg-amber-500/10 px-3 py-2 text-left hover:bg-amber-500/15"
+					className="w-full rounded-md bg-amber-500/10 px-3 py-2 text-left transition-colors hover:bg-amber-500/15 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-400/60"
 				>
-					<div className="flex items-center gap-2">
+					<div className="flex min-w-0 items-center gap-2 overflow-hidden">
 						<div className="h-2 w-2 rounded-full bg-amber-400/50" />
 						<span className="text-sm font-medium text-amber-300">Worker</span>
-						<span className="truncate text-sm text-ink-dull">{item.task}</span>
+						<span className="min-w-0 flex-1 truncate text-sm text-ink-dull">{item.task}</span>
 						{item.result && (
 							<span className="ml-auto text-tiny text-ink-faint">
 								{expanded ? "▾" : "▸"}
 							</span>
 						)}
 					</div>
-				</Button>
+				</button>
 				{expanded && item.result && (
 					<div className="mt-1 rounded-md border border-amber-500/10 bg-amber-500/5 px-3 py-2">
 						<div className="text-sm text-ink-dull">