mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-02-02 20:43:36 +00:00
Merge pull request #658 from AutoMaker-Org/feature/v0.14.0rc-1769075904343-i0uw
feat: abillity to configure "Start Dev Server" command in project settings
This commit is contained in:
@@ -134,7 +134,7 @@ export function createWorktreeRoutes(
|
|||||||
router.post(
|
router.post(
|
||||||
'/start-dev',
|
'/start-dev',
|
||||||
validatePathParams('projectPath', 'worktreePath'),
|
validatePathParams('projectPath', 'worktreePath'),
|
||||||
createStartDevHandler()
|
createStartDevHandler(settingsService)
|
||||||
);
|
);
|
||||||
router.post('/stop-dev', createStopDevHandler());
|
router.post('/stop-dev', createStopDevHandler());
|
||||||
router.post('/list-dev-servers', createListDevServersHandler());
|
router.post('/list-dev-servers', createListDevServersHandler());
|
||||||
|
|||||||
@@ -1,16 +1,22 @@
|
|||||||
/**
|
/**
|
||||||
* POST /start-dev endpoint - Start a dev server for a worktree
|
* POST /start-dev endpoint - Start a dev server for a worktree
|
||||||
*
|
*
|
||||||
* Spins up a development server (npm run dev) in the worktree directory
|
* Spins up a development server in the worktree directory on a unique port,
|
||||||
* on a unique port, allowing preview of the worktree's changes without
|
* allowing preview of the worktree's changes without affecting the main dev server.
|
||||||
* affecting the main dev server.
|
*
|
||||||
|
* If a custom devCommand is configured in project settings, it will be used.
|
||||||
|
* Otherwise, auto-detection based on package manager (npm/yarn/pnpm/bun run dev) is used.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import type { Request, Response } from 'express';
|
import type { Request, Response } from 'express';
|
||||||
|
import type { SettingsService } from '../../../services/settings-service.js';
|
||||||
import { getDevServerService } from '../../../services/dev-server-service.js';
|
import { getDevServerService } from '../../../services/dev-server-service.js';
|
||||||
import { getErrorMessage, logError } from '../common.js';
|
import { getErrorMessage, logError } from '../common.js';
|
||||||
|
import { createLogger } from '@automaker/utils';
|
||||||
|
|
||||||
export function createStartDevHandler() {
|
const logger = createLogger('start-dev');
|
||||||
|
|
||||||
|
export function createStartDevHandler(settingsService?: SettingsService) {
|
||||||
return async (req: Request, res: Response): Promise<void> => {
|
return async (req: Request, res: Response): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
const { projectPath, worktreePath } = req.body as {
|
const { projectPath, worktreePath } = req.body as {
|
||||||
@@ -34,8 +40,25 @@ export function createStartDevHandler() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get custom dev command from project settings (if configured)
|
||||||
|
let customCommand: string | undefined;
|
||||||
|
if (settingsService) {
|
||||||
|
const projectSettings = await settingsService.getProjectSettings(projectPath);
|
||||||
|
const devCommand = projectSettings?.devCommand?.trim();
|
||||||
|
if (devCommand) {
|
||||||
|
customCommand = devCommand;
|
||||||
|
logger.debug(`Using custom dev command from project settings: ${customCommand}`);
|
||||||
|
} else {
|
||||||
|
logger.debug('No custom dev command configured, using auto-detection');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const devServerService = getDevServerService();
|
const devServerService = getDevServerService();
|
||||||
const result = await devServerService.startDevServer(projectPath, worktreePath);
|
const result = await devServerService.startDevServer(
|
||||||
|
projectPath,
|
||||||
|
worktreePath,
|
||||||
|
customCommand
|
||||||
|
);
|
||||||
|
|
||||||
if (result.success && result.result) {
|
if (result.success && result.result) {
|
||||||
res.json({
|
res.json({
|
||||||
|
|||||||
@@ -273,12 +273,56 @@ class DevServerService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parse a custom command string into cmd and args
|
||||||
|
* Handles quoted strings with spaces (e.g., "my command" arg1 arg2)
|
||||||
|
*/
|
||||||
|
private parseCustomCommand(command: string): { cmd: string; args: string[] } {
|
||||||
|
const tokens: string[] = [];
|
||||||
|
let current = '';
|
||||||
|
let inQuote = false;
|
||||||
|
let quoteChar = '';
|
||||||
|
|
||||||
|
for (let i = 0; i < command.length; i++) {
|
||||||
|
const char = command[i];
|
||||||
|
|
||||||
|
if (inQuote) {
|
||||||
|
if (char === quoteChar) {
|
||||||
|
inQuote = false;
|
||||||
|
} else {
|
||||||
|
current += char;
|
||||||
|
}
|
||||||
|
} else if (char === '"' || char === "'") {
|
||||||
|
inQuote = true;
|
||||||
|
quoteChar = char;
|
||||||
|
} else if (char === ' ') {
|
||||||
|
if (current) {
|
||||||
|
tokens.push(current);
|
||||||
|
current = '';
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
current += char;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (current) {
|
||||||
|
tokens.push(current);
|
||||||
|
}
|
||||||
|
|
||||||
|
const [cmd, ...args] = tokens;
|
||||||
|
return { cmd: cmd || '', args };
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Start a dev server for a worktree
|
* Start a dev server for a worktree
|
||||||
|
* @param projectPath - The project root path
|
||||||
|
* @param worktreePath - The worktree directory path
|
||||||
|
* @param customCommand - Optional custom command to run instead of auto-detected dev command
|
||||||
*/
|
*/
|
||||||
async startDevServer(
|
async startDevServer(
|
||||||
projectPath: string,
|
projectPath: string,
|
||||||
worktreePath: string
|
worktreePath: string,
|
||||||
|
customCommand?: string
|
||||||
): Promise<{
|
): Promise<{
|
||||||
success: boolean;
|
success: boolean;
|
||||||
result?: {
|
result?: {
|
||||||
@@ -311,22 +355,41 @@ class DevServerService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for package.json
|
// Determine the dev command to use
|
||||||
const packageJsonPath = path.join(worktreePath, 'package.json');
|
let devCommand: { cmd: string; args: string[] };
|
||||||
if (!(await this.fileExists(packageJsonPath))) {
|
|
||||||
return {
|
|
||||||
success: false,
|
|
||||||
error: `No package.json found in: ${worktreePath}`,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get dev command
|
// Normalize custom command: trim whitespace and treat empty strings as undefined
|
||||||
const devCommand = await this.getDevCommand(worktreePath);
|
const normalizedCustomCommand = customCommand?.trim();
|
||||||
if (!devCommand) {
|
|
||||||
return {
|
if (normalizedCustomCommand) {
|
||||||
success: false,
|
// Use the provided custom command
|
||||||
error: `Could not determine dev command for: ${worktreePath}`,
|
devCommand = this.parseCustomCommand(normalizedCustomCommand);
|
||||||
};
|
if (!devCommand.cmd) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
error: 'Invalid custom command: command cannot be empty',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
logger.debug(`Using custom command: ${normalizedCustomCommand}`);
|
||||||
|
} else {
|
||||||
|
// Check for package.json when auto-detecting
|
||||||
|
const packageJsonPath = path.join(worktreePath, 'package.json');
|
||||||
|
if (!(await this.fileExists(packageJsonPath))) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
error: `No package.json found in: ${worktreePath}`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get dev command from package manager detection
|
||||||
|
const detectedCommand = await this.getDevCommand(worktreePath);
|
||||||
|
if (!detectedCommand) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
error: `Could not determine dev command for: ${worktreePath}`,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
devCommand = detectedCommand;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Find available port
|
// Find available port
|
||||||
|
|||||||
@@ -852,6 +852,20 @@ export class SettingsService {
|
|||||||
delete updated.defaultFeatureModel;
|
delete updated.defaultFeatureModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Handle devCommand special cases:
|
||||||
|
// - null means delete the key (use auto-detection)
|
||||||
|
// - string means custom command
|
||||||
|
if ('devCommand' in updates && updates.devCommand === null) {
|
||||||
|
delete updated.devCommand;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle testCommand special cases:
|
||||||
|
// - null means delete the key (use auto-detection)
|
||||||
|
// - string means custom command
|
||||||
|
if ('testCommand' in updates && updates.testCommand === null) {
|
||||||
|
delete updated.testCommand;
|
||||||
|
}
|
||||||
|
|
||||||
await writeSettingsJson(settingsPath, updated);
|
await writeSettingsJson(settingsPath, updated);
|
||||||
logger.info(`Project settings updated for ${projectPath}`);
|
logger.info(`Project settings updated for ${projectPath}`);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,316 @@
|
|||||||
|
import { useState, useEffect, useCallback, type KeyboardEvent } from 'react';
|
||||||
|
import { Label } from '@/components/ui/label';
|
||||||
|
import { Input } from '@/components/ui/input';
|
||||||
|
import { Button } from '@/components/ui/button';
|
||||||
|
import { Terminal, Save, RotateCcw, Info, X, Play, FlaskConical } from 'lucide-react';
|
||||||
|
import { Spinner } from '@/components/ui/spinner';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { useProjectSettings } from '@/hooks/queries';
|
||||||
|
import { useUpdateProjectSettings } from '@/hooks/mutations';
|
||||||
|
import type { Project } from '@/lib/electron';
|
||||||
|
|
||||||
|
/** Preset dev server commands for quick selection */
|
||||||
|
const DEV_SERVER_PRESETS = [
|
||||||
|
{ label: 'npm run dev', command: 'npm run dev' },
|
||||||
|
{ label: 'yarn dev', command: 'yarn dev' },
|
||||||
|
{ label: 'pnpm dev', command: 'pnpm dev' },
|
||||||
|
{ label: 'bun dev', command: 'bun dev' },
|
||||||
|
{ label: 'npm start', command: 'npm start' },
|
||||||
|
{ label: 'cargo watch', command: 'cargo watch -x run' },
|
||||||
|
{ label: 'go run', command: 'go run .' },
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
/** Preset test commands for quick selection */
|
||||||
|
const TEST_PRESETS = [
|
||||||
|
{ label: 'npm test', command: 'npm test' },
|
||||||
|
{ label: 'yarn test', command: 'yarn test' },
|
||||||
|
{ label: 'pnpm test', command: 'pnpm test' },
|
||||||
|
{ label: 'bun test', command: 'bun test' },
|
||||||
|
{ label: 'pytest', command: 'pytest' },
|
||||||
|
{ label: 'cargo test', command: 'cargo test' },
|
||||||
|
{ label: 'go test', command: 'go test ./...' },
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
interface CommandsSectionProps {
|
||||||
|
project: Project;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function CommandsSection({ project }: CommandsSectionProps) {
|
||||||
|
// Fetch project settings using TanStack Query
|
||||||
|
const { data: projectSettings, isLoading, isError } = useProjectSettings(project.path);
|
||||||
|
|
||||||
|
// Mutation hook for updating project settings
|
||||||
|
const updateSettingsMutation = useUpdateProjectSettings(project.path);
|
||||||
|
|
||||||
|
// Local state for the input fields
|
||||||
|
const [devCommand, setDevCommand] = useState('');
|
||||||
|
const [originalDevCommand, setOriginalDevCommand] = useState('');
|
||||||
|
const [testCommand, setTestCommand] = useState('');
|
||||||
|
const [originalTestCommand, setOriginalTestCommand] = useState('');
|
||||||
|
|
||||||
|
// Sync local state when project settings load or project changes
|
||||||
|
useEffect(() => {
|
||||||
|
// Reset local state when project changes to avoid showing stale values
|
||||||
|
setDevCommand('');
|
||||||
|
setOriginalDevCommand('');
|
||||||
|
setTestCommand('');
|
||||||
|
setOriginalTestCommand('');
|
||||||
|
}, [project.path]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (projectSettings) {
|
||||||
|
const dev = projectSettings.devCommand || '';
|
||||||
|
const test = projectSettings.testCommand || '';
|
||||||
|
setDevCommand(dev);
|
||||||
|
setOriginalDevCommand(dev);
|
||||||
|
setTestCommand(test);
|
||||||
|
setOriginalTestCommand(test);
|
||||||
|
}
|
||||||
|
}, [projectSettings]);
|
||||||
|
|
||||||
|
// Check if there are unsaved changes
|
||||||
|
const hasDevChanges = devCommand !== originalDevCommand;
|
||||||
|
const hasTestChanges = testCommand !== originalTestCommand;
|
||||||
|
const hasChanges = hasDevChanges || hasTestChanges;
|
||||||
|
const isSaving = updateSettingsMutation.isPending;
|
||||||
|
|
||||||
|
// Save all commands
|
||||||
|
const handleSave = useCallback(() => {
|
||||||
|
const normalizedDevCommand = devCommand.trim();
|
||||||
|
const normalizedTestCommand = testCommand.trim();
|
||||||
|
|
||||||
|
updateSettingsMutation.mutate(
|
||||||
|
{
|
||||||
|
devCommand: normalizedDevCommand || null,
|
||||||
|
testCommand: normalizedTestCommand || null,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
onSuccess: () => {
|
||||||
|
setDevCommand(normalizedDevCommand);
|
||||||
|
setOriginalDevCommand(normalizedDevCommand);
|
||||||
|
setTestCommand(normalizedTestCommand);
|
||||||
|
setOriginalTestCommand(normalizedTestCommand);
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}, [devCommand, testCommand, updateSettingsMutation]);
|
||||||
|
|
||||||
|
// Reset to original values
|
||||||
|
const handleReset = useCallback(() => {
|
||||||
|
setDevCommand(originalDevCommand);
|
||||||
|
setTestCommand(originalTestCommand);
|
||||||
|
}, [originalDevCommand, originalTestCommand]);
|
||||||
|
|
||||||
|
// Use a preset command
|
||||||
|
const handleUseDevPreset = useCallback((command: string) => {
|
||||||
|
setDevCommand(command);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleUseTestPreset = useCallback((command: string) => {
|
||||||
|
setTestCommand(command);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// Clear commands
|
||||||
|
const handleClearDev = useCallback(() => {
|
||||||
|
setDevCommand('');
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleClearTest = useCallback(() => {
|
||||||
|
setTestCommand('');
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// Handle keyboard shortcuts (Enter to save)
|
||||||
|
const handleKeyDown = useCallback(
|
||||||
|
(e: KeyboardEvent<HTMLInputElement>) => {
|
||||||
|
if (e.key === 'Enter' && hasChanges && !isSaving) {
|
||||||
|
e.preventDefault();
|
||||||
|
handleSave();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[hasChanges, isSaving, handleSave]
|
||||||
|
);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={cn(
|
||||||
|
'rounded-2xl overflow-hidden',
|
||||||
|
'border border-border/50',
|
||||||
|
'bg-gradient-to-br from-card/90 via-card/70 to-card/80 backdrop-blur-xl',
|
||||||
|
'shadow-sm shadow-black/5'
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<div className="p-6 border-b border-border/50 bg-gradient-to-r from-transparent via-accent/5 to-transparent">
|
||||||
|
<div className="flex items-center gap-3 mb-2">
|
||||||
|
<div className="w-9 h-9 rounded-xl bg-gradient-to-br from-brand-500/20 to-brand-600/10 flex items-center justify-center border border-brand-500/20">
|
||||||
|
<Terminal className="w-5 h-5 text-brand-500" />
|
||||||
|
</div>
|
||||||
|
<h2 className="text-lg font-semibold text-foreground tracking-tight">Project Commands</h2>
|
||||||
|
</div>
|
||||||
|
<p className="text-sm text-muted-foreground/80 ml-12">
|
||||||
|
Configure custom commands for development and testing.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="p-6 space-y-8">
|
||||||
|
{isLoading ? (
|
||||||
|
<div className="flex items-center justify-center py-8">
|
||||||
|
<Spinner size="md" />
|
||||||
|
</div>
|
||||||
|
) : isError ? (
|
||||||
|
<div className="flex items-center justify-center py-8 text-sm text-destructive">
|
||||||
|
Failed to load project settings. Please try again.
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
{/* Dev Server Command Section */}
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Play className="w-4 h-4 text-brand-500" />
|
||||||
|
<h3 className="text-base font-medium text-foreground">Dev Server</h3>
|
||||||
|
{hasDevChanges && (
|
||||||
|
<span className="text-xs text-amber-500 font-medium">(unsaved)</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-3 pl-6">
|
||||||
|
<div className="relative">
|
||||||
|
<Input
|
||||||
|
id="dev-command"
|
||||||
|
value={devCommand}
|
||||||
|
onChange={(e) => setDevCommand(e.target.value)}
|
||||||
|
onKeyDown={handleKeyDown}
|
||||||
|
placeholder="e.g., npm run dev, yarn dev, cargo watch"
|
||||||
|
className="font-mono text-sm pr-8"
|
||||||
|
data-testid="dev-command-input"
|
||||||
|
/>
|
||||||
|
{devCommand && (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
onClick={handleClearDev}
|
||||||
|
className="absolute right-1 top-1/2 -translate-y-1/2 h-6 w-6 p-0 text-muted-foreground hover:text-foreground"
|
||||||
|
aria-label="Clear dev command"
|
||||||
|
>
|
||||||
|
<X className="w-3.5 h-3.5" />
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<p className="text-xs text-muted-foreground/80">
|
||||||
|
Leave empty to auto-detect based on your package manager.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{/* Dev Presets */}
|
||||||
|
<div className="flex flex-wrap gap-1.5">
|
||||||
|
{DEV_SERVER_PRESETS.map((preset) => (
|
||||||
|
<Button
|
||||||
|
key={preset.command}
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => handleUseDevPreset(preset.command)}
|
||||||
|
className="text-xs font-mono h-7 px-2"
|
||||||
|
>
|
||||||
|
{preset.label}
|
||||||
|
</Button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Divider */}
|
||||||
|
<div className="border-t border-border/30" />
|
||||||
|
|
||||||
|
{/* Test Command Section */}
|
||||||
|
<div className="space-y-4">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<FlaskConical className="w-4 h-4 text-brand-500" />
|
||||||
|
<h3 className="text-base font-medium text-foreground">Test Runner</h3>
|
||||||
|
{hasTestChanges && (
|
||||||
|
<span className="text-xs text-amber-500 font-medium">(unsaved)</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="space-y-3 pl-6">
|
||||||
|
<div className="relative">
|
||||||
|
<Input
|
||||||
|
id="test-command"
|
||||||
|
value={testCommand}
|
||||||
|
onChange={(e) => setTestCommand(e.target.value)}
|
||||||
|
onKeyDown={handleKeyDown}
|
||||||
|
placeholder="e.g., npm test, pytest, cargo test"
|
||||||
|
className="font-mono text-sm pr-8"
|
||||||
|
data-testid="test-command-input"
|
||||||
|
/>
|
||||||
|
{testCommand && (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
onClick={handleClearTest}
|
||||||
|
className="absolute right-1 top-1/2 -translate-y-1/2 h-6 w-6 p-0 text-muted-foreground hover:text-foreground"
|
||||||
|
aria-label="Clear test command"
|
||||||
|
>
|
||||||
|
<X className="w-3.5 h-3.5" />
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<p className="text-xs text-muted-foreground/80">
|
||||||
|
Leave empty to auto-detect based on your project structure.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
{/* Test Presets */}
|
||||||
|
<div className="flex flex-wrap gap-1.5">
|
||||||
|
{TEST_PRESETS.map((preset) => (
|
||||||
|
<Button
|
||||||
|
key={preset.command}
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => handleUseTestPreset(preset.command)}
|
||||||
|
className="text-xs font-mono h-7 px-2"
|
||||||
|
>
|
||||||
|
{preset.label}
|
||||||
|
</Button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Auto-detection Info */}
|
||||||
|
<div className="flex items-start gap-3 p-3 rounded-lg bg-accent/20 border border-border/30">
|
||||||
|
<Info className="w-4 h-4 text-brand-500 mt-0.5 shrink-0" />
|
||||||
|
<div className="text-xs text-muted-foreground">
|
||||||
|
<p className="font-medium text-foreground mb-1">Auto-detection</p>
|
||||||
|
<p>
|
||||||
|
When no custom command is set, the system automatically detects your package
|
||||||
|
manager and test framework based on project files (package.json, Cargo.toml,
|
||||||
|
go.mod, etc.).
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Action Buttons */}
|
||||||
|
<div className="flex items-center justify-end gap-2 pt-2">
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
onClick={handleReset}
|
||||||
|
disabled={!hasChanges || isSaving}
|
||||||
|
className="gap-1.5"
|
||||||
|
>
|
||||||
|
<RotateCcw className="w-3.5 h-3.5" />
|
||||||
|
Reset
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
onClick={handleSave}
|
||||||
|
disabled={!hasChanges || isSaving}
|
||||||
|
className="gap-1.5"
|
||||||
|
>
|
||||||
|
{isSaving ? <Spinner size="xs" /> : <Save className="w-3.5 h-3.5" />}
|
||||||
|
Save
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -6,7 +6,7 @@ import {
|
|||||||
AlertTriangle,
|
AlertTriangle,
|
||||||
Workflow,
|
Workflow,
|
||||||
Database,
|
Database,
|
||||||
FlaskConical,
|
Terminal,
|
||||||
} from 'lucide-react';
|
} from 'lucide-react';
|
||||||
import type { ProjectSettingsViewId } from '../hooks/use-project-settings-view';
|
import type { ProjectSettingsViewId } from '../hooks/use-project-settings-view';
|
||||||
|
|
||||||
@@ -19,7 +19,7 @@ export interface ProjectNavigationItem {
|
|||||||
export const PROJECT_SETTINGS_NAV_ITEMS: ProjectNavigationItem[] = [
|
export const PROJECT_SETTINGS_NAV_ITEMS: ProjectNavigationItem[] = [
|
||||||
{ id: 'identity', label: 'Identity', icon: User },
|
{ id: 'identity', label: 'Identity', icon: User },
|
||||||
{ id: 'worktrees', label: 'Worktrees', icon: GitBranch },
|
{ id: 'worktrees', label: 'Worktrees', icon: GitBranch },
|
||||||
{ id: 'testing', label: 'Testing', icon: FlaskConical },
|
{ id: 'commands', label: 'Commands', icon: Terminal },
|
||||||
{ id: 'theme', label: 'Theme', icon: Palette },
|
{ id: 'theme', label: 'Theme', icon: Palette },
|
||||||
{ id: 'claude', label: 'Models', icon: Workflow },
|
{ id: 'claude', label: 'Models', icon: Workflow },
|
||||||
{ id: 'data', label: 'Data', icon: Database },
|
{ id: 'data', label: 'Data', icon: Database },
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ export type ProjectSettingsViewId =
|
|||||||
| 'identity'
|
| 'identity'
|
||||||
| 'theme'
|
| 'theme'
|
||||||
| 'worktrees'
|
| 'worktrees'
|
||||||
| 'testing'
|
| 'commands'
|
||||||
| 'claude'
|
| 'claude'
|
||||||
| 'data'
|
| 'data'
|
||||||
| 'danger';
|
| 'danger';
|
||||||
|
|||||||
@@ -2,6 +2,6 @@ export { ProjectSettingsView } from './project-settings-view';
|
|||||||
export { ProjectIdentitySection } from './project-identity-section';
|
export { ProjectIdentitySection } from './project-identity-section';
|
||||||
export { ProjectThemeSection } from './project-theme-section';
|
export { ProjectThemeSection } from './project-theme-section';
|
||||||
export { WorktreePreferencesSection } from './worktree-preferences-section';
|
export { WorktreePreferencesSection } from './worktree-preferences-section';
|
||||||
export { TestingSection } from './testing-section';
|
export { CommandsSection } from './commands-section';
|
||||||
export { useProjectSettingsView, type ProjectSettingsViewId } from './hooks';
|
export { useProjectSettingsView, type ProjectSettingsViewId } from './hooks';
|
||||||
export { ProjectSettingsNavigation } from './components/project-settings-navigation';
|
export { ProjectSettingsNavigation } from './components/project-settings-navigation';
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { Button } from '@/components/ui/button';
|
|||||||
import { ProjectIdentitySection } from './project-identity-section';
|
import { ProjectIdentitySection } from './project-identity-section';
|
||||||
import { ProjectThemeSection } from './project-theme-section';
|
import { ProjectThemeSection } from './project-theme-section';
|
||||||
import { WorktreePreferencesSection } from './worktree-preferences-section';
|
import { WorktreePreferencesSection } from './worktree-preferences-section';
|
||||||
import { TestingSection } from './testing-section';
|
import { CommandsSection } from './commands-section';
|
||||||
import { ProjectModelsSection } from './project-models-section';
|
import { ProjectModelsSection } from './project-models-section';
|
||||||
import { DataManagementSection } from './data-management-section';
|
import { DataManagementSection } from './data-management-section';
|
||||||
import { DangerZoneSection } from '../settings-view/danger-zone/danger-zone-section';
|
import { DangerZoneSection } from '../settings-view/danger-zone/danger-zone-section';
|
||||||
@@ -87,8 +87,8 @@ export function ProjectSettingsView() {
|
|||||||
return <ProjectThemeSection project={currentProject} />;
|
return <ProjectThemeSection project={currentProject} />;
|
||||||
case 'worktrees':
|
case 'worktrees':
|
||||||
return <WorktreePreferencesSection project={currentProject} />;
|
return <WorktreePreferencesSection project={currentProject} />;
|
||||||
case 'testing':
|
case 'commands':
|
||||||
return <TestingSection project={currentProject} />;
|
return <CommandsSection project={currentProject} />;
|
||||||
case 'claude':
|
case 'claude':
|
||||||
return <ProjectModelsSection project={currentProject} />;
|
return <ProjectModelsSection project={currentProject} />;
|
||||||
case 'data':
|
case 'data':
|
||||||
|
|||||||
@@ -1,223 +0,0 @@
|
|||||||
import { useState, useEffect, useCallback } from 'react';
|
|
||||||
import { Label } from '@/components/ui/label';
|
|
||||||
import { Input } from '@/components/ui/input';
|
|
||||||
import { Button } from '@/components/ui/button';
|
|
||||||
import { FlaskConical, Save, RotateCcw, Info } from 'lucide-react';
|
|
||||||
import { Spinner } from '@/components/ui/spinner';
|
|
||||||
import { cn } from '@/lib/utils';
|
|
||||||
import { getHttpApiClient } from '@/lib/http-api-client';
|
|
||||||
import { toast } from 'sonner';
|
|
||||||
import type { Project } from '@/lib/electron';
|
|
||||||
|
|
||||||
interface TestingSectionProps {
|
|
||||||
project: Project;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function TestingSection({ project }: TestingSectionProps) {
|
|
||||||
const [testCommand, setTestCommand] = useState('');
|
|
||||||
const [originalTestCommand, setOriginalTestCommand] = useState('');
|
|
||||||
const [isLoading, setIsLoading] = useState(true);
|
|
||||||
const [isSaving, setIsSaving] = useState(false);
|
|
||||||
|
|
||||||
// Check if there are unsaved changes
|
|
||||||
const hasChanges = testCommand !== originalTestCommand;
|
|
||||||
|
|
||||||
// Load project settings when project changes
|
|
||||||
useEffect(() => {
|
|
||||||
let isCancelled = false;
|
|
||||||
const currentPath = project.path;
|
|
||||||
|
|
||||||
const loadProjectSettings = async () => {
|
|
||||||
setIsLoading(true);
|
|
||||||
try {
|
|
||||||
const httpClient = getHttpApiClient();
|
|
||||||
const response = await httpClient.settings.getProject(currentPath);
|
|
||||||
|
|
||||||
// Avoid updating state if component unmounted or project changed
|
|
||||||
if (isCancelled) return;
|
|
||||||
|
|
||||||
if (response.success && response.settings) {
|
|
||||||
const command = response.settings.testCommand || '';
|
|
||||||
setTestCommand(command);
|
|
||||||
setOriginalTestCommand(command);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
if (!isCancelled) {
|
|
||||||
console.error('Failed to load project settings:', error);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
if (!isCancelled) {
|
|
||||||
setIsLoading(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
loadProjectSettings();
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
isCancelled = true;
|
|
||||||
};
|
|
||||||
}, [project.path]);
|
|
||||||
|
|
||||||
// Save test command
|
|
||||||
const handleSave = useCallback(async () => {
|
|
||||||
setIsSaving(true);
|
|
||||||
try {
|
|
||||||
const httpClient = getHttpApiClient();
|
|
||||||
const normalizedCommand = testCommand.trim();
|
|
||||||
const response = await httpClient.settings.updateProject(project.path, {
|
|
||||||
testCommand: normalizedCommand || undefined,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (response.success) {
|
|
||||||
setTestCommand(normalizedCommand);
|
|
||||||
setOriginalTestCommand(normalizedCommand);
|
|
||||||
toast.success('Test command saved');
|
|
||||||
} else {
|
|
||||||
toast.error('Failed to save test command', {
|
|
||||||
description: response.error,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Failed to save test command:', error);
|
|
||||||
toast.error('Failed to save test command');
|
|
||||||
} finally {
|
|
||||||
setIsSaving(false);
|
|
||||||
}
|
|
||||||
}, [project.path, testCommand]);
|
|
||||||
|
|
||||||
// Reset to original value
|
|
||||||
const handleReset = useCallback(() => {
|
|
||||||
setTestCommand(originalTestCommand);
|
|
||||||
}, [originalTestCommand]);
|
|
||||||
|
|
||||||
// Use a preset command
|
|
||||||
const handleUsePreset = useCallback((command: string) => {
|
|
||||||
setTestCommand(command);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div
|
|
||||||
className={cn(
|
|
||||||
'rounded-2xl overflow-hidden',
|
|
||||||
'border border-border/50',
|
|
||||||
'bg-gradient-to-br from-card/90 via-card/70 to-card/80 backdrop-blur-xl',
|
|
||||||
'shadow-sm shadow-black/5'
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
<div className="p-6 border-b border-border/50 bg-gradient-to-r from-transparent via-accent/5 to-transparent">
|
|
||||||
<div className="flex items-center gap-3 mb-2">
|
|
||||||
<div className="w-9 h-9 rounded-xl bg-gradient-to-br from-brand-500/20 to-brand-600/10 flex items-center justify-center border border-brand-500/20">
|
|
||||||
<FlaskConical className="w-5 h-5 text-brand-500" />
|
|
||||||
</div>
|
|
||||||
<h2 className="text-lg font-semibold text-foreground tracking-tight">
|
|
||||||
Testing Configuration
|
|
||||||
</h2>
|
|
||||||
</div>
|
|
||||||
<p className="text-sm text-muted-foreground/80 ml-12">
|
|
||||||
Configure how tests are run for this project.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div className="p-6 space-y-6">
|
|
||||||
{isLoading ? (
|
|
||||||
<div className="flex items-center justify-center py-8">
|
|
||||||
<Spinner size="md" />
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
{/* Test Command Input */}
|
|
||||||
<div className="space-y-3">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<Label htmlFor="test-command" className="text-foreground font-medium">
|
|
||||||
Test Command
|
|
||||||
</Label>
|
|
||||||
{hasChanges && (
|
|
||||||
<span className="text-xs text-amber-500 font-medium">(unsaved changes)</span>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<Input
|
|
||||||
id="test-command"
|
|
||||||
value={testCommand}
|
|
||||||
onChange={(e) => setTestCommand(e.target.value)}
|
|
||||||
placeholder="e.g., npm test, yarn test, pytest, go test ./..."
|
|
||||||
className="font-mono text-sm"
|
|
||||||
data-testid="test-command-input"
|
|
||||||
/>
|
|
||||||
<p className="text-xs text-muted-foreground/80 leading-relaxed">
|
|
||||||
The command to run tests for this project. If not specified, the test runner will
|
|
||||||
auto-detect based on your project structure (package.json, Cargo.toml, go.mod,
|
|
||||||
etc.).
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Auto-detection Info */}
|
|
||||||
<div className="flex items-start gap-3 p-3 rounded-lg bg-accent/20 border border-border/30">
|
|
||||||
<Info className="w-4 h-4 text-brand-500 mt-0.5 shrink-0" />
|
|
||||||
<div className="text-xs text-muted-foreground">
|
|
||||||
<p className="font-medium text-foreground mb-1">Auto-detection</p>
|
|
||||||
<p>
|
|
||||||
When no custom command is set, the test runner automatically detects and uses the
|
|
||||||
appropriate test framework based on your project files (Vitest, Jest, Pytest,
|
|
||||||
Cargo, Go Test, etc.).
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Quick Presets */}
|
|
||||||
<div className="space-y-3">
|
|
||||||
<Label className="text-foreground font-medium">Quick Presets</Label>
|
|
||||||
<div className="flex flex-wrap gap-2">
|
|
||||||
{[
|
|
||||||
{ label: 'npm test', command: 'npm test' },
|
|
||||||
{ label: 'yarn test', command: 'yarn test' },
|
|
||||||
{ label: 'pnpm test', command: 'pnpm test' },
|
|
||||||
{ label: 'bun test', command: 'bun test' },
|
|
||||||
{ label: 'pytest', command: 'pytest' },
|
|
||||||
{ label: 'cargo test', command: 'cargo test' },
|
|
||||||
{ label: 'go test', command: 'go test ./...' },
|
|
||||||
].map((preset) => (
|
|
||||||
<Button
|
|
||||||
key={preset.command}
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
onClick={() => handleUsePreset(preset.command)}
|
|
||||||
className="text-xs font-mono"
|
|
||||||
>
|
|
||||||
{preset.label}
|
|
||||||
</Button>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<p className="text-xs text-muted-foreground/80">
|
|
||||||
Click a preset to use it as your test command.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Action Buttons */}
|
|
||||||
<div className="flex items-center justify-end gap-2 pt-2">
|
|
||||||
<Button
|
|
||||||
variant="outline"
|
|
||||||
size="sm"
|
|
||||||
onClick={handleReset}
|
|
||||||
disabled={!hasChanges || isSaving}
|
|
||||||
className="gap-1.5"
|
|
||||||
>
|
|
||||||
<RotateCcw className="w-3.5 h-3.5" />
|
|
||||||
Reset
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
onClick={handleSave}
|
|
||||||
disabled={!hasChanges || isSaving}
|
|
||||||
className="gap-1.5"
|
|
||||||
>
|
|
||||||
{isSaving ? <Spinner size="xs" /> : <Save className="w-3.5 h-3.5" />}
|
|
||||||
Save
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1190,6 +1190,14 @@ export interface ProjectSettings {
|
|||||||
*/
|
*/
|
||||||
testCommand?: string;
|
testCommand?: string;
|
||||||
|
|
||||||
|
// Dev Server Configuration
|
||||||
|
/**
|
||||||
|
* Custom command to start the development server for this project.
|
||||||
|
* If not specified, auto-detection will be used based on project structure.
|
||||||
|
* Examples: "npm run dev", "yarn dev", "pnpm dev", "cargo watch", "go run ."
|
||||||
|
*/
|
||||||
|
devCommand?: string;
|
||||||
|
|
||||||
// Phase Model Overrides (per-project)
|
// Phase Model Overrides (per-project)
|
||||||
/**
|
/**
|
||||||
* Override phase model settings for this project.
|
* Override phase model settings for this project.
|
||||||
|
|||||||
Reference in New Issue
Block a user