🤖 Use shared CompactOptions and ForkOptions types

ammar-agent · ammar-agent · commit 2295414f6ce3 · 2025-10-18T21:55:03.000-05:00
- Rename internal execution types to avoid confusion
- ForkOptions/CompactOptions are now user-facing types
- ForkExecutionOptions/CompactExecutionOptions for internal use
- Modals use options type directly as state
- Eliminates intermediate object construction

Generated with `cmux`
diff --git a/src/components/CompactModal.tsx b/src/components/CompactModal.tsx
@@ -10,25 +10,36 @@ import {
   CommandDisplay,
   CommandLabel,
 } from "./Modal";
-import { formatCompactCommand } from "@/utils/chatCommands";
+import { formatCompactCommand, type CompactOptions } from "@/utils/chatCommands";
 
 interface CompactModalProps {
   isOpen: boolean;
   onClose: () => void;
-  onCompact: (maxOutputTokens?: number, model?: string) => Promise<void>;
+  onCompact: (options: CompactOptions) => Promise<void>;
 }
 
 const CompactModal: React.FC<CompactModalProps> = ({ isOpen, onClose, onCompact }) => {
-  const [maxOutputTokens, setMaxOutputTokens] = useState<string>("");
-  const [model, setModel] = useState<string>("");
+  const [options, setOptions] = useState<CompactOptions>({});
+  const [maxOutputTokensInput, setMaxOutputTokensInput] = useState<string>("");
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const infoId = useId();
 
+  // Sync options with input fields
+  useEffect(() => {
+    setOptions({
+      maxOutputTokens: maxOutputTokensInput.trim()
+        ? parseInt(maxOutputTokensInput.trim(), 10)
+        : undefined,
+      model: options.model?.trim() || undefined,
+      continueMessage: options.continueMessage?.trim() || undefined,
+    });
+  }, [maxOutputTokensInput]);
+
   // Reset form when modal opens
   useEffect(() => {
     if (isOpen) {
-      setMaxOutputTokens("");
-      setModel("");
+      setOptions({});
+      setMaxOutputTokensInput("");
       setIsLoading(false);
     }
   }, [isOpen]);
@@ -45,12 +56,9 @@ const CompactModal: React.FC<CompactModalProps> = ({ isOpen, onClose, onCompact
     setIsLoading(true);
 
     try {
-      const tokens = maxOutputTokens.trim() ? parseInt(maxOutputTokens.trim(), 10) : undefined;
-      const modelParam = model.trim() || undefined;
-
-      await onCompact(tokens, modelParam);
-      setMaxOutputTokens("");
-      setModel("");
+      await onCompact(options);
+      setOptions({});
+      setMaxOutputTokensInput("");
       onClose();
     } catch (err) {
       console.error("Compact failed:", err);
@@ -60,9 +68,6 @@ const CompactModal: React.FC<CompactModalProps> = ({ isOpen, onClose, onCompact
     }
   };
 
-  const tokensValue = maxOutputTokens.trim() ? parseInt(maxOutputTokens.trim(), 10) : undefined;
-  const modelValue = model.trim() || undefined;
-
   return (
     <Modal
       isOpen={isOpen}
@@ -78,8 +83,8 @@ const CompactModal: React.FC<CompactModalProps> = ({ isOpen, onClose, onCompact
           <input
             id="maxOutputTokens"
             type="number"
-            value={maxOutputTokens}
-            onChange={(event) => setMaxOutputTokens(event.target.value)}
+            value={maxOutputTokensInput}
+            onChange={(event) => setMaxOutputTokensInput(event.target.value)}
             disabled={isLoading}
             placeholder="e.g., 3000"
             min="100"
@@ -94,14 +99,33 @@ const CompactModal: React.FC<CompactModalProps> = ({ isOpen, onClose, onCompact
           <input
             id="model"
             type="text"
-            value={model}
-            onChange={(event) => setModel(event.target.value)}
+            value={options.model ?? ""}
+            onChange={(event) =>
+              setOptions({ ...options, model: event.target.value || undefined })
+            }
             disabled={isLoading}
             placeholder="e.g., claude-3-5-sonnet-20241022"
           />
           <HelpText>Specify a model for compaction. Leave empty to use current model.</HelpText>
         </FormGroup>
 
+        <FormGroup>
+          <label htmlFor="continueMessage">Continue Message (optional):</label>
+          <input
+            id="continueMessage"
+            type="text"
+            value={options.continueMessage ?? ""}
+            onChange={(event) =>
+              setOptions({ ...options, continueMessage: event.target.value || undefined })
+            }
+            disabled={isLoading}
+            placeholder="Message to send after compaction completes"
+          />
+          <HelpText>
+            If provided, this message will be sent automatically after compaction finishes.
+          </HelpText>
+        </FormGroup>
+
         <ModalInfo id={infoId}>
           <p>
             Compaction will summarize your conversation history, allowing you to continue with a
@@ -112,7 +136,7 @@ const CompactModal: React.FC<CompactModalProps> = ({ isOpen, onClose, onCompact
 
         <div>
           <CommandLabel>Equivalent command:</CommandLabel>
-          <CommandDisplay>{formatCompactCommand(tokensValue, modelValue)}</CommandDisplay>
+          <CommandDisplay>{formatCompactCommand(options)}</CommandDisplay>
         </div>
 
         <ModalActions>
diff --git a/src/components/ForkWorkspaceModal.tsx b/src/components/ForkWorkspaceModal.tsx
@@ -10,13 +10,13 @@ import {
   CommandDisplay,
   CommandLabel,
 } from "./Modal";
-import { formatForkCommand } from "@/utils/chatCommands";
+import { formatForkCommand, type ForkOptions } from "@/utils/chatCommands";
 
 interface ForkWorkspaceModalProps {
   isOpen: boolean;
   sourceWorkspaceName: string;
   onClose: () => void;
-  onFork: (newName: string) => Promise<void>;
+  onFork: (options: ForkOptions) => Promise<void>;
 }
 
 const ForkWorkspaceModal: React.FC<ForkWorkspaceModalProps> = ({
@@ -25,15 +25,15 @@ const ForkWorkspaceModal: React.FC<ForkWorkspaceModalProps> = ({
   onClose,
   onFork,
 }) => {
-  const [newName, setNewName] = useState<string>("");
+  const [options, setOptions] = useState<ForkOptions>({ newName: "" });
   const [error, setError] = useState<string | null>(null);
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const infoId = useId();
 
   // Reset form when modal opens
   useEffect(() => {
     if (isOpen) {
-      setNewName("");
+      setOptions({ newName: "" });
       setError(null);
       setIsLoading(false);
     }
@@ -48,7 +48,7 @@ const ForkWorkspaceModal: React.FC<ForkWorkspaceModalProps> = ({
   const handleSubmit = async (event: React.FormEvent) => {
     event.preventDefault();
 
-    const trimmedName = newName.trim();
+    const trimmedName = options.newName.trim();
     if (!trimmedName) {
       setError("Workspace name cannot be empty");
       return;
@@ -58,8 +58,8 @@ const ForkWorkspaceModal: React.FC<ForkWorkspaceModalProps> = ({
     setError(null);
 
     try {
-      await onFork(trimmedName);
-      setNewName("");
+      await onFork({ ...options, newName: trimmedName });
+      setOptions({ newName: "" });
       onClose();
     } catch (err) {
       const message = err instanceof Error ? err.message : "Failed to fork workspace";
@@ -84,8 +84,8 @@ const ForkWorkspaceModal: React.FC<ForkWorkspaceModalProps> = ({
           <input
             id="newName"
             type="text"
-            value={newName}
-            onChange={(event) => setNewName(event.target.value)}
+            value={options.newName}
+            onChange={(event) => setOptions({ ...options, newName: event.target.value })}
             disabled={isLoading}
             placeholder="Enter new workspace name"
             required
@@ -102,18 +102,20 @@ const ForkWorkspaceModal: React.FC<ForkWorkspaceModalProps> = ({
           </p>
         </ModalInfo>
 
-        {newName.trim() && (
+        {options.newName.trim() && (
           <div>
             <CommandLabel>Equivalent command:</CommandLabel>
-            <CommandDisplay>{formatForkCommand(newName.trim())}</CommandDisplay>
+            <CommandDisplay>
+              {formatForkCommand({ ...options, newName: options.newName.trim() })}
+            </CommandDisplay>
           </div>
         )}
 
         <ModalActions>
           <CancelButton type="button" onClick={handleCancel} disabled={isLoading}>
             Cancel
           </CancelButton>
-          <PrimaryButton type="submit" disabled={isLoading || newName.trim().length === 0}>
+          <PrimaryButton type="submit" disabled={isLoading || options.newName.trim().length === 0}>
             {isLoading ? "Forking..." : "Fork Workspace"}
           </PrimaryButton>
         </ModalActions>
diff --git a/src/components/ProjectSidebar.tsx b/src/components/ProjectSidebar.tsx
@@ -19,7 +19,12 @@ import { WorkspaceListItem, type WorkspaceSelection } from "./WorkspaceListItem"
 import { RenameProvider } from "@/contexts/WorkspaceRenameContext";
 import ForkWorkspaceModal from "./ForkWorkspaceModal";
 import CompactModal from "./CompactModal";
-import { forkWorkspace, executeCompaction } from "@/utils/chatCommands";
+import {
+  forkWorkspace,
+  executeCompaction,
+  type ForkOptions,
+  type CompactOptions,
+} from "@/utils/chatCommands";
 import { useSendMessageOptions } from "@/hooks/useSendMessageOptions";
 
 // Re-export WorkspaceSelection for backwards compatibility
@@ -679,14 +684,15 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
     setCompactModalState({ workspaceId });
   };
 
-  const handleForkSubmit = async (newName: string) => {
+  const handleForkSubmit = async (options: ForkOptions) => {
     if (!forkModalState) {
       return;
     }
 
     const result = await forkWorkspace({
       sourceWorkspaceId: forkModalState.workspaceId,
-      newName,
+      newName: options.newName,
+      startMessage: options.startMessage,
       sendMessageOptions,
     });
 
@@ -695,15 +701,16 @@ const ProjectSidebarInner: React.FC<ProjectSidebarProps> = ({
     }
   };
 
-  const handleCompactSubmit = async (maxOutputTokens?: number, model?: string) => {
+  const handleCompactSubmit = async (options: CompactOptions) => {
     if (!compactModalState) {
       return;
     }
 
     const result = await executeCompaction({
       workspaceId: compactModalState.workspaceId,
-      maxOutputTokens,
-      model,
+      maxOutputTokens: options.maxOutputTokens,
+      model: options.model,
+      continueMessage: options.continueMessage,
       sendMessageOptions,
     });
 
diff --git a/src/utils/chatCommands.ts b/src/utils/chatCommands.ts
