mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-01-30 06:12:03 +00:00
* feat(platform): add cross-platform openInTerminal utility
Add utility function to open a terminal in a specified directory:
- macOS: Uses Terminal.app via AppleScript
- Windows: Tries Windows Terminal, falls back to cmd
- Linux: Tries common terminal emulators (gnome-terminal,
konsole, xfce4-terminal, xterm, x-terminal-emulator)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
* feat(server): add open-in-terminal endpoint
Add POST /open-in-terminal endpoint to open a system terminal in the
worktree directory using the cross-platform openInTerminal utility.
The endpoint validates that worktreePath is provided and is an
absolute path for security.
Extracted from PR #558.
* feat(ui): add Open in Terminal action to worktree dropdown
Add "Open in Terminal" option to the worktree actions dropdown menu.
This opens the system terminal in the worktree directory.
Changes:
- Add openInTerminal method to http-api-client
- Add Terminal icon and menu item to worktree-actions-dropdown
- Add onOpenInTerminal prop to WorktreeTab component
- Add handleOpenInTerminal handler to use-worktree-actions hook
- Wire up handler in worktree-panel for both mobile and desktop views
Extracted from PR #558.
* fix(ui): open in terminal navigates to Automaker terminal view
Instead of opening the system terminal, the "Open in Terminal" action
now opens Automaker's built-in terminal with the worktree directory:
- Add pendingTerminalCwd state to app store
- Update use-worktree-actions to set pending cwd and navigate to /terminal
- Add effect in terminal-view to create session with pending cwd
This matches the original PR #558 behavior.
* feat(ui): add terminal open mode setting (new tab vs split)
Add a setting to choose how "Open in Terminal" behaves:
- New Tab: Creates a new tab named after the branch (default)
- Split: Adds to current tab as a split view
Changes:
- Add openTerminalMode setting to terminal state ('newTab' | 'split')
- Update terminal-view to respect the setting
- Add UI in Terminal Settings to toggle the behavior
- Rename pendingTerminalCwd to pendingTerminal with branch name
The new tab mode names tabs after the branch for easy identification.
The split mode is useful for comparing terminals side by side.
* feat(ui): display branch name in terminal header with git icon
- Move branch name display from tab name to terminal header
- Show full branch name (no truncation) with GitBranch icon
- Display branch name for both 'new tab' and 'split' modes
- Persist openTerminalMode setting to server and include in import/export
- Update settings dropdown to simplified "New Tab" label
* feat: add external terminal support with cross-platform detection
Add support for opening worktree directories in external terminals
(iTerm2, Warp, Ghostty, System Terminal, etc.) while retaining the
integrated terminal as the default option.
Changes:
- Add terminal detection for macOS, Windows, and Linux
- Add "Open in Terminal" split-button in worktree dropdown
- Add external terminal selection in Settings > Terminal
- Add default open mode setting (new tab vs split)
- Display branch name in terminal panel header
- Support 20+ terminals across platforms
Part of #558, Closes #550
* fix: address PR review comments
- Add nonce parameter to terminal navigation to allow reopening same
worktree multiple times
- Fix shell path escaping in editor.ts using single-quote wrapper
- Add validatePathParams middleware to open-in-external-terminal route
- Remove redundant validation block from createOpenInExternalTerminalHandler
- Remove unused pendingTerminal state and setPendingTerminal action
- Remove unused getTerminalInfo function from editor.ts
* fix: address PR review security and validation issues
- Add runtime type check for worktreePath in open-in-terminal handler
- Fix Windows Terminal detection using commandExists before spawn
- Fix xterm shell injection by using sh -c with escapeShellArg
- Use loose equality for null/undefined in useEffectiveDefaultTerminal
- Consolidate duplicate imports from open-in-terminal.js
* chore: update package-lock.json
* fix: use response.json() to prevent disposal race condition in E2E test
Replace response.body() with response.json() in open-existing-project.spec.ts
to fix the "Response has been disposed" error. This matches the pattern used
in other test files.
* Revert "fix: use response.json() to prevent disposal race condition in E2E test"
This reverts commit 36bdf8c24a.
* fix: address PR review feedback for terminal feature
- Add explicit validation for worktreePath in createOpenInExternalTerminalHandler
- Add aria-label to refresh button in terminal settings for accessibility
- Only show "no terminals" message when not refreshing
- Reset initialCwdHandledRef on failure to allow retries
- Use z.coerce.number() for nonce URL param to handle string coercion
- Preserve branchName when creating layout for empty tab
- Update getDefaultTerminal return type to allow null result
---------
Co-authored-by: Kacper <kacperlachowiczwp.pl@wp.pl>
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
153 lines
5.8 KiB
TypeScript
153 lines
5.8 KiB
TypeScript
/**
|
|
* Worktree routes - HTTP API for git worktree operations
|
|
*/
|
|
|
|
import { Router } from 'express';
|
|
import type { EventEmitter } from '../../lib/events.js';
|
|
import { validatePathParams } from '../../middleware/validate-paths.js';
|
|
import { requireValidWorktree, requireValidProject, requireGitRepoOnly } from './middleware.js';
|
|
import { createInfoHandler } from './routes/info.js';
|
|
import { createStatusHandler } from './routes/status.js';
|
|
import { createListHandler } from './routes/list.js';
|
|
import { createDiffsHandler } from './routes/diffs.js';
|
|
import { createFileDiffHandler } from './routes/file-diff.js';
|
|
import { createMergeHandler } from './routes/merge.js';
|
|
import { createCreateHandler } from './routes/create.js';
|
|
import { createDeleteHandler } from './routes/delete.js';
|
|
import { createCreatePRHandler } from './routes/create-pr.js';
|
|
import { createPRInfoHandler } from './routes/pr-info.js';
|
|
import { createCommitHandler } from './routes/commit.js';
|
|
import { createGenerateCommitMessageHandler } from './routes/generate-commit-message.js';
|
|
import { createPushHandler } from './routes/push.js';
|
|
import { createPullHandler } from './routes/pull.js';
|
|
import { createCheckoutBranchHandler } from './routes/checkout-branch.js';
|
|
import { createListBranchesHandler } from './routes/list-branches.js';
|
|
import { createSwitchBranchHandler } from './routes/switch-branch.js';
|
|
import {
|
|
createOpenInEditorHandler,
|
|
createGetDefaultEditorHandler,
|
|
createGetAvailableEditorsHandler,
|
|
createRefreshEditorsHandler,
|
|
} from './routes/open-in-editor.js';
|
|
import {
|
|
createOpenInTerminalHandler,
|
|
createGetAvailableTerminalsHandler,
|
|
createGetDefaultTerminalHandler,
|
|
createRefreshTerminalsHandler,
|
|
createOpenInExternalTerminalHandler,
|
|
} from './routes/open-in-terminal.js';
|
|
import { createInitGitHandler } from './routes/init-git.js';
|
|
import { createMigrateHandler } from './routes/migrate.js';
|
|
import { createStartDevHandler } from './routes/start-dev.js';
|
|
import { createStopDevHandler } from './routes/stop-dev.js';
|
|
import { createListDevServersHandler } from './routes/list-dev-servers.js';
|
|
import { createGetDevServerLogsHandler } from './routes/dev-server-logs.js';
|
|
import {
|
|
createGetInitScriptHandler,
|
|
createPutInitScriptHandler,
|
|
createDeleteInitScriptHandler,
|
|
createRunInitScriptHandler,
|
|
} from './routes/init-script.js';
|
|
import type { SettingsService } from '../../services/settings-service.js';
|
|
|
|
export function createWorktreeRoutes(
|
|
events: EventEmitter,
|
|
settingsService?: SettingsService
|
|
): Router {
|
|
const router = Router();
|
|
|
|
router.post('/info', validatePathParams('projectPath'), createInfoHandler());
|
|
router.post('/status', validatePathParams('projectPath'), createStatusHandler());
|
|
router.post('/list', createListHandler());
|
|
router.post('/diffs', validatePathParams('projectPath'), createDiffsHandler());
|
|
router.post('/file-diff', validatePathParams('projectPath', 'filePath'), createFileDiffHandler());
|
|
router.post(
|
|
'/merge',
|
|
validatePathParams('projectPath'),
|
|
requireValidProject,
|
|
createMergeHandler()
|
|
);
|
|
router.post('/create', validatePathParams('projectPath'), createCreateHandler(events));
|
|
router.post('/delete', validatePathParams('projectPath', 'worktreePath'), createDeleteHandler());
|
|
router.post('/create-pr', createCreatePRHandler());
|
|
router.post('/pr-info', createPRInfoHandler());
|
|
router.post(
|
|
'/commit',
|
|
validatePathParams('worktreePath'),
|
|
requireGitRepoOnly,
|
|
createCommitHandler()
|
|
);
|
|
router.post(
|
|
'/generate-commit-message',
|
|
validatePathParams('worktreePath'),
|
|
requireGitRepoOnly,
|
|
createGenerateCommitMessageHandler(settingsService)
|
|
);
|
|
router.post(
|
|
'/push',
|
|
validatePathParams('worktreePath'),
|
|
requireValidWorktree,
|
|
createPushHandler()
|
|
);
|
|
router.post(
|
|
'/pull',
|
|
validatePathParams('worktreePath'),
|
|
requireValidWorktree,
|
|
createPullHandler()
|
|
);
|
|
router.post('/checkout-branch', requireValidWorktree, createCheckoutBranchHandler());
|
|
router.post(
|
|
'/list-branches',
|
|
validatePathParams('worktreePath'),
|
|
requireValidWorktree,
|
|
createListBranchesHandler()
|
|
);
|
|
router.post('/switch-branch', requireValidWorktree, createSwitchBranchHandler());
|
|
router.post('/open-in-editor', validatePathParams('worktreePath'), createOpenInEditorHandler());
|
|
router.post(
|
|
'/open-in-terminal',
|
|
validatePathParams('worktreePath'),
|
|
createOpenInTerminalHandler()
|
|
);
|
|
router.get('/default-editor', createGetDefaultEditorHandler());
|
|
router.get('/available-editors', createGetAvailableEditorsHandler());
|
|
router.post('/refresh-editors', createRefreshEditorsHandler());
|
|
|
|
// External terminal routes
|
|
router.get('/available-terminals', createGetAvailableTerminalsHandler());
|
|
router.get('/default-terminal', createGetDefaultTerminalHandler());
|
|
router.post('/refresh-terminals', createRefreshTerminalsHandler());
|
|
router.post(
|
|
'/open-in-external-terminal',
|
|
validatePathParams('worktreePath'),
|
|
createOpenInExternalTerminalHandler()
|
|
);
|
|
|
|
router.post('/init-git', validatePathParams('projectPath'), createInitGitHandler());
|
|
router.post('/migrate', createMigrateHandler());
|
|
router.post(
|
|
'/start-dev',
|
|
validatePathParams('projectPath', 'worktreePath'),
|
|
createStartDevHandler()
|
|
);
|
|
router.post('/stop-dev', createStopDevHandler());
|
|
router.post('/list-dev-servers', createListDevServersHandler());
|
|
router.get(
|
|
'/dev-server-logs',
|
|
validatePathParams('worktreePath'),
|
|
createGetDevServerLogsHandler()
|
|
);
|
|
|
|
// Init script routes
|
|
router.get('/init-script', createGetInitScriptHandler());
|
|
router.put('/init-script', validatePathParams('projectPath'), createPutInitScriptHandler());
|
|
router.delete('/init-script', validatePathParams('projectPath'), createDeleteInitScriptHandler());
|
|
router.post(
|
|
'/run-init-script',
|
|
validatePathParams('projectPath', 'worktreePath'),
|
|
createRunInitScriptHandler(events)
|
|
);
|
|
|
|
return router;
|
|
}
|