Merge branch 'main' into fix/deepseek-provider

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

@@ -15,11 +15,11 @@ function ToolActivityIndicator({ activity }: { activity: ToolActivity[] }) {
 	if (activity.length === 0) return null;
 
 	return (
-		<div className="flex flex-col gap-1 px-3 py-2">
+		<div className="flex flex-wrap items-center gap-1.5 mt-2">
 			{activity.map((tool, index) => (
-				<div
+				<span
 					key={`${tool.tool}-${index}`}
-					className="flex items-center gap-2 rounded bg-app-darkBox/40 px-2 py-1"
+					className="inline-flex items-center gap-1.5 rounded-full bg-app-box/60 px-2.5 py-0.5"
 				>
 					{tool.status === "running" ? (
 						<span className="h-1.5 w-1.5 animate-pulse rounded-full bg-amber-400" />
@@ -28,60 +28,141 @@ function ToolActivityIndicator({ activity }: { activity: ToolActivity[] }) {
 					)}
 					<span className="font-mono text-tiny text-ink-faint">{tool.tool}</span>
 					{tool.status === "done" && tool.result_preview && (
-						<span className="min-w-0 flex-1 truncate text-tiny text-ink-faint/60">
+						<span className="min-w-0 max-w-[120px] truncate text-tiny text-ink-faint/60">
 							{tool.result_preview.slice(0, 80)}
 						</span>
 					)}
-				</div>
+				</span>
 			))}
 		</div>
 	);
 }
 
+function ThinkingIndicator() {
+	return (
+		<div className="flex items-center gap-1.5 py-1">
+			<span className="inline-block h-1.5 w-1.5 animate-pulse rounded-full bg-ink-faint" />
+			<span className="inline-block h-1.5 w-1.5 animate-pulse rounded-full bg-ink-faint [animation-delay:0.2s]" />
+			<span className="inline-block h-1.5 w-1.5 animate-pulse rounded-full bg-ink-faint [animation-delay:0.4s]" />
+		</div>
+	);
+}
+
+function CortexChatInput({
+	value,
+	onChange,
+	onSubmit,
+	isStreaming,
+}: {
+	value: string;
+	onChange: (value: string) => void;
+	onSubmit: () => void;
+	isStreaming: boolean;
+}) {
+	const textareaRef = useRef<HTMLTextAreaElement>(null);
+
+	useEffect(() => {
+		textareaRef.current?.focus();
+	}, []);
+
+	useEffect(() => {
+		const textarea = textareaRef.current;
+		if (!textarea) return;
+
+		const adjustHeight = () => {
+			textarea.style.height = "auto";
+			const scrollHeight = textarea.scrollHeight;
+			const maxHeight = 160;
+			textarea.style.height = `${Math.min(scrollHeight, maxHeight)}px`;
+			textarea.style.overflowY = scrollHeight > maxHeight ? "auto" : "hidden";
+		};
+
+		adjustHeight();
+		textarea.addEventListener("input", adjustHeight);
+		return () => textarea.removeEventListener("input", adjustHeight);
+	}, [value]);
+
+	const handleKeyDown = (event: React.KeyboardEvent<HTMLTextAreaElement>) => {
+		if (event.key === "Enter" && !event.shiftKey) {
+			event.preventDefault();
+			onSubmit();
+		}
+	};
+
+	return (
+		<div className="rounded-xl border border-app-line/50 bg-app-box/40 backdrop-blur-xl transition-colors duration-200 hover:border-app-line/70">
+			<div className="flex items-end gap-2 p-2.5">
+				<textarea
+					ref={textareaRef}
+					value={value}
+					onChange={(event) => onChange(event.target.value)}
+					onKeyDown={handleKeyDown}
+					placeholder={isStreaming ? "Waiting for response..." : "Message the cortex..."}
+					disabled={isStreaming}
+					rows={1}
+					className="flex-1 resize-none bg-transparent px-1 py-1 text-sm text-ink placeholder:text-ink-faint/60 focus:outline-none disabled:opacity-40"
+					style={{ maxHeight: "160px" }}
+				/>
+				<button
+					type="button"
+					onClick={onSubmit}
+					disabled={isStreaming || !value.trim()}
+					className="flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-accent text-white transition-all duration-150 hover:bg-accent-deep disabled:opacity-30 disabled:hover:bg-accent"
+				>
+					<svg
+						width="14"
+						height="14"
+						viewBox="0 0 24 24"
+						fill="none"
+						stroke="currentColor"
+						strokeWidth="2"
+						strokeLinecap="round"
+						strokeLinejoin="round"
+					>
+						<path d="M12 19V5M5 12l7-7 7 7" />
+					</svg>
+				</button>
+			</div>
+		</div>
+	);
+}
+
 export function CortexChatPanel({ agentId, channelId, onClose }: CortexChatPanelProps) {
 	const { messages, isStreaming, error, toolActivity, sendMessage, newThread } = useCortexChat(agentId, channelId);
 	const [input, setInput] = useState("");
 	const messagesEndRef = useRef<HTMLDivElement>(null);
-	const inputRef = useRef<HTMLInputElement>(null);
 
-	// Auto-scroll on new messages or tool activity
 	useEffect(() => {
 		messagesEndRef.current?.scrollIntoView({ behavior: "smooth" });
 	}, [messages.length, isStreaming, toolActivity.length]);
 
-	// Focus input on mount
-	useEffect(() => {
-		inputRef.current?.focus();
-	}, []);
-
-	const handleSubmit = (event: React.FormEvent) => {
-		event.preventDefault();
+	const handleSubmit = () => {
 		const trimmed = input.trim();
 		if (!trimmed || isStreaming) return;
 		setInput("");
 		sendMessage(trimmed);
 	};
 
 	return (
-		<div className="flex h-full w-full flex-col bg-app-darkBox/30">
+		<div className="flex h-full w-full flex-col">
 			{/* Header */}
-			<div className="flex h-12 items-center justify-between border-b border-app-line/50 px-4">
+			<div className="flex h-10 items-center justify-between border-b border-app-line/50 px-3">
 				<div className="flex items-center gap-2">
 					<span className="text-sm font-medium text-ink">Cortex</span>
 					{channelId && (
-						<span className="rounded bg-violet-500/10 px-1.5 py-0.5 text-tiny text-violet-400">
-							{channelId.length > 24 ? `${channelId.slice(0, 24)}...` : channelId}
+						<span className="rounded-full bg-app-box px-2 py-0.5 text-tiny text-ink-faint">
+							{channelId.length > 20 ? `${channelId.slice(0, 20)}...` : channelId}
 						</span>
 					)}
 				</div>
-				<div className="flex items-center gap-1">
+				<div className="flex items-center gap-0.5">
 					<Button
 						onClick={newThread}
 						variant="ghost"
 						size="icon"
 						disabled={isStreaming}
 						className="h-7 w-7"
-						title="New chat"
+						title="New thread"
 					>
 						<HugeiconsIcon icon={PlusSignIcon} className="h-3.5 w-3.5" />
 					</Button>
@@ -101,51 +182,39 @@ export function CortexChatPanel({ agentId, channelId, onClose }: CortexChatPanel
 
 			{/* Messages */}
 			<div className="flex-1 overflow-y-auto">
-				<div className="flex flex-col gap-3 p-4">
+				<div className="flex flex-col gap-5 p-3 pb-4">
 					{messages.length === 0 && !isStreaming && (
-						<p className="py-8 text-center text-sm text-ink-faint">
-							Ask the cortex anything
-						</p>
+						<div className="flex items-center justify-center py-12">
+							<p className="text-sm text-ink-faint">Ask the cortex anything</p>
+						</div>
 					)}
+
 					{messages.map((message) => (
-						<div
-							key={message.id}
-							className={`rounded-md px-3 py-2 ${
-								message.role === "user"
-									? "ml-8 bg-accent/10"
-									: "mr-2 bg-app-darkBox/50"
-							}`}
-						>
-							<span className={`text-tiny font-medium ${
-								message.role === "user" ? "text-accent-faint" : "text-violet-400"
-							}`}>
-								{message.role === "user" ? "admin" : "cortex"}
-							</span>
-							<div className="mt-0.5 text-sm text-ink-dull">
-								{message.role === "assistant" ? (
+						<div key={message.id}>
+							{message.role === "user" ? (
+								<div className="flex justify-end">
+									<div className="max-w-[85%] rounded-2xl rounded-br-md bg-accent/10 px-3 py-2">
+										<p className="text-sm text-ink">{message.content}</p>
+									</div>
+								</div>
+							) : (
+								<div className="text-sm text-ink-dull">
 									<Markdown>{message.content}</Markdown>
-								) : (
-									<p>{message.content}</p>
-								)}
-							</div>
+								</div>
+							)}
 						</div>
 					))}
+
+					{/* Streaming state */}
 					{isStreaming && (
-						<div className="mr-2 rounded-md bg-app-darkBox/50 px-3 py-2">
-							<span className="text-tiny font-medium text-violet-400">cortex</span>
+						<div>
 							<ToolActivityIndicator activity={toolActivity} />
-							{toolActivity.length === 0 && (
-								<div className="mt-1 flex items-center gap-1">
-									<span className="inline-block h-1.5 w-1.5 animate-pulse rounded-full bg-violet-400" />
-									<span className="inline-block h-1.5 w-1.5 animate-pulse rounded-full bg-violet-400 [animation-delay:0.2s]" />
-									<span className="inline-block h-1.5 w-1.5 animate-pulse rounded-full bg-violet-400 [animation-delay:0.4s]" />
-									<span className="ml-1 text-tiny text-ink-faint">thinking...</span>
-								</div>
-							)}
+							{toolActivity.length === 0 && <ThinkingIndicator />}
 						</div>
 					)}
+
 					{error && (
-						<div className="rounded-md border border-red-500/20 bg-red-500/10 px-3 py-2 text-sm text-red-400">
+						<div className="rounded-lg border border-red-500/20 bg-red-500/5 px-3 py-2.5 text-sm text-red-400">
 							{error}
 						</div>
 					)}
@@ -154,27 +223,14 @@ export function CortexChatPanel({ agentId, channelId, onClose }: CortexChatPanel
 			</div>
 
 			{/* Input */}
-			<form onSubmit={handleSubmit} className="border-t border-app-line/50 p-3">
-				<div className="flex gap-2">
-					<input
-						ref={inputRef}
-						type="text"
-						value={input}
-						onChange={(event) => setInput(event.target.value)}
-						placeholder={isStreaming ? "Waiting for response..." : "Message the cortex..."}
-						disabled={isStreaming}
-						className="flex-1 rounded-md border border-app-line bg-app-darkBox px-3 py-1.5 text-sm text-ink placeholder:text-ink-faint focus:border-violet-500/50 focus:outline-none disabled:opacity-50"
-					/>
-				<Button
-					type="submit"
-					disabled={isStreaming || !input.trim()}
-					size="sm"
-					className="bg-violet-500/20 text-violet-400 hover:bg-violet-500/30"
-				>
-					Send
-				</Button>
-				</div>
-			</form>
+			<div className="border-t border-app-line/50 p-3">
+				<CortexChatInput
+					value={input}
+					onChange={setInput}
+					onSubmit={handleSubmit}
+					isStreaming={isStreaming}
+				/>
+			</div>
 		</div>
 	);
 }

interface/src/components/CortexChatPanel.tsx

@@ -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",