Skip to content

Commit 6c8855b

Browse files
committed
Simplify format functions - remove overloaded signatures
- Remove formatForkCommand overloads (only ForkOptions signature needed) - Remove formatCompactCommand overloads (only CompactOptions signature needed) - Fix lint issues: - Remove unused Tooltip imports in WorkspaceListItem - Use nullish coalescing (??) instead of logical OR (||) in CompactModal - Fix missing dependencies in useEffect hook All call sites already use the options object signature.
1 parent 0e08afc commit 6c8855b

File tree

3 files changed

+14
-38
lines changed

3 files changed

+14
-38
lines changed

src/components/CompactModal.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ const CompactModal: React.FC<CompactModalProps> = ({ isOpen, onClose, onCompact
3030
maxOutputTokens: maxOutputTokensInput.trim()
3131
? parseInt(maxOutputTokensInput.trim(), 10)
3232
: undefined,
33-
model: options.model?.trim() || undefined,
34-
continueMessage: options.continueMessage?.trim() || undefined,
33+
model: options.model?.trim() ?? undefined,
34+
continueMessage: options.continueMessage?.trim() ?? undefined,
3535
});
36-
}, [maxOutputTokensInput]);
36+
}, [maxOutputTokensInput, options.model, options.continueMessage]);
3737

3838
// Reset form when modal opens
3939
useEffect(() => {

src/components/WorkspaceListItem.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import type { FrontendWorkspaceMetadata } from "@/types/workspace";
55
import { useWorkspaceSidebarState } from "@/stores/WorkspaceStore";
66
import { useGitStatus } from "@/stores/GitStatusStore";
77
import { formatRelativeTime } from "@/utils/ui/dateTime";
8-
import { TooltipWrapper, Tooltip } from "./Tooltip";
98
import { GitStatusIndicator } from "./GitStatusIndicator";
109
import { ModelDisplay } from "./Messages/ModelDisplay";
1110
import { StatusIndicator } from "./StatusIndicator";

src/utils/chatCommands.ts

Lines changed: 11 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -119,17 +119,10 @@ export interface ForkOptions {
119119
/**
120120
* Format /fork command string for display
121121
*/
122-
export function formatForkCommand(options: ForkOptions): string;
123-
export function formatForkCommand(newName: string, startMessage?: string): string;
124-
export function formatForkCommand(
125-
optionsOrName: ForkOptions | string,
126-
startMessage?: string
127-
): string {
128-
const name = typeof optionsOrName === "string" ? optionsOrName : optionsOrName.newName;
129-
const msg = typeof optionsOrName === "string" ? startMessage : optionsOrName.startMessage;
130-
let cmd = `/fork ${name}`;
131-
if (msg) {
132-
cmd += `\n${msg}`;
122+
export function formatForkCommand(options: ForkOptions): string {
123+
let cmd = `/fork ${options.newName}`;
124+
if (options.startMessage) {
125+
cmd += `\n${options.startMessage}`;
133126
}
134127
return cmd;
135128
}
@@ -240,32 +233,16 @@ export async function executeCompaction(
240233
/**
241234
* Format compaction command string for display
242235
*/
243-
export function formatCompactCommand(options: CompactOptions): string;
244-
export function formatCompactCommand(
245-
maxOutputTokens?: number,
246-
model?: string,
247-
continueMessage?: string
248-
): string;
249-
export function formatCompactCommand(
250-
optionsOrTokens?: CompactOptions | number,
251-
model?: string,
252-
continueMessage?: string
253-
): string {
254-
const tokens =
255-
typeof optionsOrTokens === "object" ? optionsOrTokens.maxOutputTokens : optionsOrTokens;
256-
const mdl = typeof optionsOrTokens === "object" ? optionsOrTokens.model : model;
257-
const msg =
258-
typeof optionsOrTokens === "object" ? optionsOrTokens.continueMessage : continueMessage;
259-
236+
export function formatCompactCommand(options: CompactOptions): string {
260237
let cmd = "/compact";
261-
if (tokens) {
262-
cmd += ` -t ${tokens}`;
238+
if (options.maxOutputTokens) {
239+
cmd += ` -t ${options.maxOutputTokens}`;
263240
}
264-
if (mdl) {
265-
cmd += ` -m ${mdl}`;
241+
if (options.model) {
242+
cmd += ` -m ${options.model}`;
266243
}
267-
if (msg) {
268-
cmd += `\n${msg}`;
244+
if (options.continueMessage) {
245+
cmd += `\n${options.continueMessage}`;
269246
}
270247
return cmd;
271248
}

0 commit comments

Comments
 (0)