Merge branch 'worktree-fix-permission-request-ui' into dev

src/renderer/components/team/ToolApprovalSheet.tsx

@@ -7,7 +7,10 @@ import { shortenDisplayPath } from '@renderer/utils/pathDisplay';
 import { highlightLines } from '@renderer/utils/syntaxHighlighter';
 import { AlertTriangle, FileText, Search, Terminal } from 'lucide-react';
 
-import { ToolApprovalSettingsPanel } from './dialogs/ToolApprovalSettingsPanel';
+import {
+  ToolApprovalSettingsContent,
+  ToolApprovalSettingsToggle,
+} from './dialogs/ToolApprovalSettingsPanel';
 import { FileIcon } from './editor/FileIcon';
 import { ToolApprovalDiffPreview } from './ToolApprovalDiffPreview';
 
@@ -124,6 +127,7 @@ export const ToolApprovalSheet: React.FC = () => {
   const [disabled, setDisabled] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [diffExpanded, setDiffExpanded] = useState(false);
+  const [settingsExpanded, setSettingsExpanded] = useState(false);
 
   // Clear error when current approval changes
   useEffect(() => {
@@ -333,10 +337,16 @@ export const ToolApprovalSheet: React.FC = () => {
                 {pendingApprovals.length - 1} pending
               </span>
             )}
-            <ToolApprovalSettingsPanel />
+            <ToolApprovalSettingsToggle
+              expanded={settingsExpanded}
+              onToggle={() => setSettingsExpanded((v) => !v)}
+            />
           </div>
         </div>
 
+        {/* Settings expanded content — below actions row */}
+        <ToolApprovalSettingsContent expanded={settingsExpanded} />
+
         {/* Timeout progress bar */}
         <TimeoutProgress receivedAt={current.receivedAt} />
       </div>

src/renderer/components/team/dialogs/ToolApprovalSettingsPanel.tsx

@@ -13,153 +13,153 @@ import { ChevronDown, ChevronRight, Settings } from 'lucide-react';
 
 import type { ToolApprovalTimeoutAction } from '@shared/types';
 
-export const ToolApprovalSettingsPanel: React.FC = () => {
-  const [expanded, setExpanded] = useState(false);
+export const ToolApprovalSettingsToggle: React.FC<{ expanded: boolean; onToggle: () => void }> = ({
+  expanded,
+  onToggle,
+}) => (
+  <button
+    type="button"
+    onClick={onToggle}
+    className="flex items-center gap-1.5 rounded px-2 py-1 text-[11px] transition-colors"
+    style={{ color: 'var(--color-text-muted)' }}
+    onMouseEnter={(e) => {
+      Object.assign(e.currentTarget.style, {
+        backgroundColor: 'var(--color-surface-raised)',
+      });
+    }}
+    onMouseLeave={(e) => {
+      Object.assign(e.currentTarget.style, { backgroundColor: 'transparent' });
+    }}
+  >
+    <Settings className="size-3" />
+    <span>Settings</span>
+    {expanded ? <ChevronDown className="size-3" /> : <ChevronRight className="size-3" />}
+  </button>
+);
+
+export const ToolApprovalSettingsContent: React.FC<{ expanded: boolean }> = ({ expanded }) => {
   const [localSeconds, setLocalSeconds] = useState<string>('');
   const settings = useStore((s) => s.toolApprovalSettings);
   const updateSettings = useStore((s) => s.updateToolApprovalSettings);
 
+  if (!expanded) return null;
+
   return (
-    <>
-      {/* Toggle button — rendered inline in parent layout */}
-      <button
-        type="button"
-        onClick={() => setExpanded(!expanded)}
-        className="flex items-center gap-1.5 rounded px-2 py-1 text-[11px] transition-colors"
-        style={{ color: 'var(--color-text-muted)' }}
-        onMouseEnter={(e) => {
-          Object.assign(e.currentTarget.style, {
-            backgroundColor: 'var(--color-surface-raised)',
-          });
-        }}
-        onMouseLeave={(e) => {
-          Object.assign(e.currentTarget.style, { backgroundColor: 'transparent' });
+    <div
+      className="mx-4 mb-2 space-y-3 rounded-md border p-3"
+      style={{
+        backgroundColor: 'var(--color-surface)',
+        borderColor: 'var(--color-border)',
+      }}
+    >
+      {/* Auto-allow ALL */}
+      <label
+        className="flex items-center gap-2 text-xs font-medium"
+        style={{ color: 'var(--color-text-secondary)' }}
+      >
+        <Checkbox
+          checked={settings.autoAllowAll}
+          onCheckedChange={(checked) => void updateSettings({ autoAllowAll: checked === true })}
+        />
+        Auto-allow all tools
+      </label>
+
+      {/* Separator */}
+      <div className="border-t" style={{ borderColor: 'var(--color-border)' }} />
+
+      {/* Auto-allow file edits */}
+      <label
+        className="flex items-center gap-2 text-xs"
+        style={{
+          color: 'var(--color-text-secondary)',
+          opacity: settings.autoAllowAll ? 0.5 : 1,
         }}
       >
-        <Settings className="size-3" />
-        <span>Settings</span>
-        {expanded ? <ChevronDown className="size-3" /> : <ChevronRight className="size-3" />}
-      </button>
+        <Checkbox
+          checked={settings.autoAllowAll || settings.autoAllowFileEdits}
+          disabled={settings.autoAllowAll}
+          onCheckedChange={(checked) =>
+            void updateSettings({ autoAllowFileEdits: checked === true })
+          }
+        />
+        Auto-allow file edits (Edit, Write, NotebookEdit)
+      </label>
 
-      {/* Collapsible panel — full-width, below toggle */}
-      {expanded && (
-        <div
-          className="mx-4 mb-2 mt-1 space-y-3 rounded-md border p-3"
-          style={{
-            backgroundColor: 'var(--color-surface)',
-            borderColor: 'var(--color-border)',
-          }}
+      {/* Auto-allow safe bash */}
+      <label
+        className="flex items-center gap-2 text-xs"
+        style={{
+          color: 'var(--color-text-secondary)',
+          opacity: settings.autoAllowAll ? 0.5 : 1,
+        }}
+      >
+        <Checkbox
+          checked={settings.autoAllowAll || settings.autoAllowSafeBash}
+          disabled={settings.autoAllowAll}
+          onCheckedChange={(checked) =>
+            void updateSettings({ autoAllowSafeBash: checked === true })
+          }
+        />
+        Auto-allow safe commands (git, pnpm, npm, ls...)
+      </label>
+
+      {/* Separator */}
+      <div className="border-t" style={{ borderColor: 'var(--color-border)' }} />
+
+      {/* Timeout section */}
+      <div
+        className="flex items-center gap-2 text-xs"
+        style={{ color: 'var(--color-text-secondary)' }}
+      >
+        <span className="shrink-0">On timeout:</span>
+        <Select
+          value={settings.timeoutAction}
+          onValueChange={(value) =>
+            void updateSettings({ timeoutAction: value as ToolApprovalTimeoutAction })
+          }
         >
-          {/* Auto-allow ALL */}
-          <label
-            className="flex items-center gap-2 text-xs font-medium"
-            style={{ color: 'var(--color-text-secondary)' }}
-          >
-            <Checkbox
-              checked={settings.autoAllowAll}
-              onCheckedChange={(checked) => void updateSettings({ autoAllowAll: checked === true })}
+          <SelectTrigger className="h-7 w-[120px] text-xs">
+            <SelectValue />
+          </SelectTrigger>
+          <SelectContent className="z-[60]">
+            <SelectItem value="wait">Wait forever</SelectItem>
+            <SelectItem value="allow">Allow</SelectItem>
+            <SelectItem value="deny">Deny</SelectItem>
+          </SelectContent>
+        </Select>
+
+        {settings.timeoutAction !== 'wait' && (
+          <>
+            <span className="shrink-0">after</span>
+            <input
+              type="number"
+              min={5}
+              max={300}
+              value={localSeconds !== '' ? localSeconds : String(settings.timeoutSeconds)}
+              onChange={(e) => setLocalSeconds(e.target.value)}
+              onBlur={() => {
+                const val = parseInt(localSeconds, 10);
+                if (!isNaN(val) && val >= 5 && val <= 300) {
+                  void updateSettings({ timeoutSeconds: val });
+                }
+                setLocalSeconds('');
+              }}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter') {
+                  e.currentTarget.blur();
+                }
+              }}
+              className="w-14 rounded border px-1.5 py-0.5 text-center text-xs"
+              style={{
+                backgroundColor: 'var(--color-surface-raised)',
+                borderColor: 'var(--color-border)',
+                color: 'var(--color-text)',
+              }}
             />
-            Auto-allow all tools
-          </label>
-
-          {/* Separator */}
-          <div className="border-t" style={{ borderColor: 'var(--color-border)' }} />
-
-          {/* Auto-allow file edits */}
-          <label
-            className="flex items-center gap-2 text-xs"
-            style={{
-              color: 'var(--color-text-secondary)',
-              opacity: settings.autoAllowAll ? 0.5 : 1,
-            }}
-          >
-            <Checkbox
-              checked={settings.autoAllowAll || settings.autoAllowFileEdits}
-              disabled={settings.autoAllowAll}
-              onCheckedChange={(checked) =>
-                void updateSettings({ autoAllowFileEdits: checked === true })
-              }
-            />
-            Auto-allow file edits (Edit, Write, NotebookEdit)
-          </label>
-
-          {/* Auto-allow safe bash */}
-          <label
-            className="flex items-center gap-2 text-xs"
-            style={{
-              color: 'var(--color-text-secondary)',
-              opacity: settings.autoAllowAll ? 0.5 : 1,
-            }}
-          >
-            <Checkbox
-              checked={settings.autoAllowAll || settings.autoAllowSafeBash}
-              disabled={settings.autoAllowAll}
-              onCheckedChange={(checked) =>
-                void updateSettings({ autoAllowSafeBash: checked === true })
-              }
-            />
-            Auto-allow safe commands (git, pnpm, npm, ls...)
-          </label>
-
-          {/* Separator */}
-          <div className="border-t" style={{ borderColor: 'var(--color-border)' }} />
-
-          {/* Timeout section */}
-          <div
-            className="flex items-center gap-2 text-xs"
-            style={{ color: 'var(--color-text-secondary)' }}
-          >
-            <span className="shrink-0">On timeout:</span>
-            <Select
-              value={settings.timeoutAction}
-              onValueChange={(value) =>
-                void updateSettings({ timeoutAction: value as ToolApprovalTimeoutAction })
-              }
-            >
-              <SelectTrigger className="h-7 w-[120px] text-xs">
-                <SelectValue />
-              </SelectTrigger>
-              <SelectContent className="z-[60]">
-                <SelectItem value="wait">Wait forever</SelectItem>
-                <SelectItem value="allow">Allow</SelectItem>
-                <SelectItem value="deny">Deny</SelectItem>
-              </SelectContent>
-            </Select>
-
-            {settings.timeoutAction !== 'wait' && (
-              <>
-                <span className="shrink-0">after</span>
-                <input
-                  type="number"
-                  min={5}
-                  max={300}
-                  value={localSeconds !== '' ? localSeconds : String(settings.timeoutSeconds)}
-                  onChange={(e) => setLocalSeconds(e.target.value)}
-                  onBlur={() => {
-                    const val = parseInt(localSeconds, 10);
-                    if (!isNaN(val) && val >= 5 && val <= 300) {
-                      void updateSettings({ timeoutSeconds: val });
-                    }
-                    setLocalSeconds('');
-                  }}
-                  onKeyDown={(e) => {
-                    if (e.key === 'Enter') {
-                      e.currentTarget.blur();
-                    }
-                  }}
-                  className="w-14 rounded border px-1.5 py-0.5 text-center text-xs"
-                  style={{
-                    backgroundColor: 'var(--color-surface-raised)',
-                    borderColor: 'var(--color-border)',
-                    color: 'var(--color-text)',
-                  }}
-                />
-                <span className="shrink-0">sec</span>
-              </>
-            )}
-          </div>
-        </div>
-      )}
-    </>
+            <span className="shrink-0">sec</span>
+          </>
+        )}
+      </div>
+    </div>
   );
 };