Merge remote-tracking branch 'origin/main'

Resolves merge conflicts after sandbox removal and prompt queuing implementation.
This merge combines:
- feat(ui): add prompt queuing system and improve session management (local)
- refactor: remove sandbox system and simplify agent architecture (remote)
- feat: enhance timeline UI with slide-in animation and improved layout (remote)

src/components/AgentSandboxSettings.tsx

@@ -1,122 +0,0 @@
-import React from "react";
-import { Shield, FileText, Upload, Network, AlertTriangle } from "lucide-react";
-import { Card } from "@/components/ui/card";
-import { Label } from "@/components/ui/label";
-import { Switch } from "@/components/ui/switch";
-import { Badge } from "@/components/ui/badge";
-import { type Agent } from "@/lib/api";
-import { cn } from "@/lib/utils";
-
-interface AgentSandboxSettingsProps {
-  agent: Agent;
-  onUpdate: (updates: Partial<Agent>) => void;
-  className?: string;
-}
-
-/**
- * Component for managing per-agent sandbox permissions
- * Provides simple toggles for sandbox enable/disable and file/network permissions
- */
-export const AgentSandboxSettings: React.FC<AgentSandboxSettingsProps> = ({ 
-  agent, 
-  onUpdate, 
-  className 
-}) => {
-  const handleToggle = (field: keyof Agent, value: boolean) => {
-    onUpdate({ [field]: value });
-  };
-
-  return (
-    <Card className={cn("p-4 space-y-4", className)}>
-      <div className="flex items-center gap-2">
-        <Shield className="h-5 w-5 text-amber-500" />
-        <h4 className="font-semibold">Sandbox Permissions</h4>
-        {!agent.sandbox_enabled && (
-          <Badge variant="secondary" className="text-xs">
-            Disabled
-          </Badge>
-        )}
-      </div>
-      
-      <div className="space-y-3">
-        {/* Master sandbox toggle */}
-        <div className="flex items-center justify-between p-3 rounded-lg border bg-muted/30">
-          <div className="space-y-1">
-            <Label className="text-sm font-medium">Enable Sandbox</Label>
-            <p className="text-xs text-muted-foreground">
-              Run this agent in a secure sandbox environment
-            </p>
-          </div>
-          <Switch 
-            checked={agent.sandbox_enabled} 
-            onCheckedChange={(checked) => handleToggle('sandbox_enabled', checked)}
-          />
-        </div>
-
-        {/* Permission toggles - only visible when sandbox is enabled */}
-        {agent.sandbox_enabled && (
-          <div className="space-y-3 pl-4 border-l-2 border-amber-200">
-            <div className="flex items-center justify-between">
-              <div className="flex items-center gap-2">
-                <FileText className="h-4 w-4 text-blue-500" />
-                <div>
-                  <Label className="text-sm font-medium">File Read Access</Label>
-                  <p className="text-xs text-muted-foreground">
-                    Allow reading files and directories
-                  </p>
-                </div>
-              </div>
-              <Switch 
-                checked={agent.enable_file_read} 
-                onCheckedChange={(checked) => handleToggle('enable_file_read', checked)}
-              />
-            </div>
-            
-            <div className="flex items-center justify-between">
-              <div className="flex items-center gap-2">
-                <Upload className="h-4 w-4 text-green-500" />
-                <div>
-                  <Label className="text-sm font-medium">File Write Access</Label>
-                  <p className="text-xs text-muted-foreground">
-                    Allow creating and modifying files
-                  </p>
-                </div>
-              </div>
-              <Switch 
-                checked={agent.enable_file_write} 
-                onCheckedChange={(checked) => handleToggle('enable_file_write', checked)}
-              />
-            </div>
-            
-            <div className="flex items-center justify-between">
-              <div className="flex items-center gap-2">
-                <Network className="h-4 w-4 text-purple-500" />
-                <div>
-                  <Label className="text-sm font-medium">Network Access</Label>
-                  <p className="text-xs text-muted-foreground">
-                    Allow outbound network connections
-                  </p>
-                </div>
-              </div>
-              <Switch 
-                checked={agent.enable_network} 
-                onCheckedChange={(checked) => handleToggle('enable_network', checked)}
-              />
-            </div>
-          </div>
-        )}
-
-        {/* Warning when sandbox is disabled */}
-        {!agent.sandbox_enabled && (
-          <div className="flex items-start gap-2 p-3 rounded-lg bg-amber-50 border border-amber-200 text-amber-800 dark:bg-amber-950/50 dark:border-amber-800 dark:text-amber-200">
-            <AlertTriangle className="h-4 w-4 mt-0.5 flex-shrink-0" />
-            <div className="text-xs">
-              <p className="font-medium">Sandbox Disabled</p>
-              <p>This agent will run with full system access. Use with caution.</p>
-            </div>
-          </div>
-        )}
-      </div>
-    </Card>
-  );
-};

src/components/CreateAgent.tsx

@@ -9,7 +9,6 @@ import { api, type Agent } from "@/lib/api";
 import { cn } from "@/lib/utils";
 import MDEditor from "@uiw/react-md-editor";
 import { type AgentIconName } from "./CCAgents";
-import { AgentSandboxSettings } from "./AgentSandboxSettings";
 import { IconPicker, ICON_MAP } from "./IconPicker";
 
 interface CreateAgentProps {
@@ -48,10 +47,6 @@ export const CreateAgent: React.FC<CreateAgentProps> = ({
   const [systemPrompt, setSystemPrompt] = useState(agent?.system_prompt || "");
   const [defaultTask, setDefaultTask] = useState(agent?.default_task || "");
   const [model, setModel] = useState(agent?.model || "sonnet");
-  const [sandboxEnabled, setSandboxEnabled] = useState(agent?.sandbox_enabled ?? true);
-  const [enableFileRead, setEnableFileRead] = useState(agent?.enable_file_read ?? true);
-  const [enableFileWrite, setEnableFileWrite] = useState(agent?.enable_file_write ?? true);
-  const [enableNetwork, setEnableNetwork] = useState(agent?.enable_network ?? false);
   const [saving, setSaving] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [toast, setToast] = useState<{ message: string; type: "success" | "error" } | null>(null);
@@ -81,11 +76,7 @@ export const CreateAgent: React.FC<CreateAgentProps> = ({
           selectedIcon, 
           systemPrompt, 
           defaultTask || undefined, 
-          model,
-          sandboxEnabled,
-          enableFileRead,
-          enableFileWrite,
-          enableNetwork
+          model
         );
       } else {
         await api.createAgent(
@@ -93,11 +84,7 @@ export const CreateAgent: React.FC<CreateAgentProps> = ({
           selectedIcon, 
           systemPrompt, 
           defaultTask || undefined, 
-          model,
-          sandboxEnabled,
-          enableFileRead,
-          enableFileWrite,
-          enableNetwork
+          model
         );
       }
       
@@ -119,11 +106,7 @@ export const CreateAgent: React.FC<CreateAgentProps> = ({
          selectedIcon !== (agent?.icon || "bot") || 
          systemPrompt !== (agent?.system_prompt || "") ||
          defaultTask !== (agent?.default_task || "") ||
-         model !== (agent?.model || "sonnet") ||
-         sandboxEnabled !== (agent?.sandbox_enabled ?? true) ||
-         enableFileRead !== (agent?.enable_file_read ?? true) ||
-         enableFileWrite !== (agent?.enable_file_write ?? true) ||
-         enableNetwork !== (agent?.enable_network ?? false)) && 
+         model !== (agent?.model || "sonnet")) && 
         !confirm("You have unsaved changes. Are you sure you want to leave?")) {
       return;
     }
@@ -309,29 +292,7 @@ export const CreateAgent: React.FC<CreateAgentProps> = ({
                 </p>
               </div>
 
-              {/* Sandbox Settings */}
-              <AgentSandboxSettings
-                agent={{
-                  id: agent?.id,
-                  name,
-                  icon: selectedIcon,
-                  system_prompt: systemPrompt,
-                  default_task: defaultTask || undefined,
-                  model,
-                  sandbox_enabled: sandboxEnabled,
-                  enable_file_read: enableFileRead,
-                  enable_file_write: enableFileWrite,
-                  enable_network: enableNetwork,
-                  created_at: agent?.created_at || "",
-                  updated_at: agent?.updated_at || ""
-                }}
-                onUpdate={(updates) => {
-                  if ('sandbox_enabled' in updates) setSandboxEnabled(updates.sandbox_enabled!);
-                  if ('enable_file_read' in updates) setEnableFileRead(updates.enable_file_read!);
-                  if ('enable_file_write' in updates) setEnableFileWrite(updates.enable_file_write!);
-                  if ('enable_network' in updates) setEnableNetwork(updates.enable_network!);
-                }}
-              />
+
 
               {/* System Prompt Editor */}
               <div className="space-y-2">
@@ -377,4 +338,4 @@ export const CreateAgent: React.FC<CreateAgentProps> = ({
       />
     </div>
   );
-}; 
+}; 

src/components/GitHubAgentBrowser.tsx

@@ -314,9 +314,6 @@ export const GitHubAgentBrowser: React.FC<GitHubAgentBrowserProps> = ({
                         </h3>
                         <div className="flex items-center gap-2 mt-1">
                           <Badge variant="outline">{selectedAgent.data.agent.model}</Badge>
-                          {selectedAgent.data.agent.sandbox_enabled && (
-                            <Badge variant="secondary">Sandbox</Badge>
-                          )}
                         </div>
                       </div>
                     </div>
@@ -341,21 +338,7 @@ export const GitHubAgentBrowser: React.FC<GitHubAgentBrowserProps> = ({
                       </div>
                     )}
 
-                    {/* Permissions */}
-                    <div>
-                      <h4 className="text-sm font-medium mb-2">Permissions</h4>
-                      <div className="flex flex-wrap gap-2">
-                        <Badge variant={selectedAgent.data.agent.enable_file_read ? "default" : "secondary"}>
-                          File Read: {selectedAgent.data.agent.enable_file_read ? "Yes" : "No"}
-                        </Badge>
-                        <Badge variant={selectedAgent.data.agent.enable_file_write ? "default" : "secondary"}>
-                          File Write: {selectedAgent.data.agent.enable_file_write ? "Yes" : "No"}
-                        </Badge>
-                        <Badge variant={selectedAgent.data.agent.enable_network ? "default" : "secondary"}>
-                          Network: {selectedAgent.data.agent.enable_network ? "Yes" : "No"}
-                        </Badge>
-                      </div>
-                    </div>
+
 
                     {/* Metadata */}
                     <div className="text-xs text-muted-foreground">

src/components/TimelineNavigator.tsx

@@ -580,4 +580,4 @@ export const TimelineNavigator: React.FC<TimelineNavigatorProps> = ({
       </Dialog>
     </div>
   );
-}; 
+};