mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-02-02 08:33:36 +00:00
Merge main into feat/cursor-cli-integration
Carefully merged latest changes from main branch into the Cursor CLI integration branch. This merge brings in important improvements and fixes while preserving all Cursor-related functionality. Key changes from main: - Sandbox mode security improvements and cloud storage compatibility - Version-based settings migrations (v2 schema) - Port configuration centralization - System paths utilities for CLI detection - Enhanced error handling in HttpApiClient - Windows MCP process cleanup fixes - New validation and build commands - GitHub issue templates and release process improvements Resolved conflicts in: - apps/server/src/routes/context/routes/describe-image.ts (Combined Cursor provider routing with secure-fs imports) - apps/server/src/services/auto-mode-service.ts (Merged failure tracking with raw output logging) - apps/server/tests/unit/services/terminal-service.test.ts (Updated to async tests with systemPathExists mocking) - libs/platform/src/index.ts (Combined WSL utilities with system-paths exports) - libs/types/src/settings.ts (Merged DEFAULT_PHASE_MODELS with SETTINGS_VERSION constants) All Cursor CLI integration features remain intact including: - CursorProvider and CliProvider base class - Phase-based model configuration - Provider registry and factory patterns - WSL support for Windows - Model override UI components - Cursor-specific settings and configurations 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -70,3 +70,66 @@ export {
|
||||
type WslCliResult,
|
||||
type WslOptions,
|
||||
} from './wsl.js';
|
||||
|
||||
// System paths for tool detection (GitHub CLI, Claude CLI, Node.js, etc.)
|
||||
export * as systemPaths from './system-paths.js';
|
||||
export {
|
||||
// CLI tool paths
|
||||
getGitHubCliPaths,
|
||||
getClaudeCliPaths,
|
||||
getClaudeConfigDir,
|
||||
getClaudeCredentialPaths,
|
||||
getClaudeSettingsPath,
|
||||
getClaudeStatsCachePath,
|
||||
getClaudeProjectsDir,
|
||||
getShellPaths,
|
||||
getExtendedPath,
|
||||
// Node.js paths
|
||||
getNvmPaths,
|
||||
getFnmPaths,
|
||||
getNodeSystemPaths,
|
||||
getScoopNodePath,
|
||||
getChocolateyNodePath,
|
||||
getWslVersionPath,
|
||||
// System path operations
|
||||
systemPathExists,
|
||||
systemPathAccess,
|
||||
systemPathIsExecutable,
|
||||
systemPathReadFile,
|
||||
systemPathReadFileSync,
|
||||
systemPathWriteFileSync,
|
||||
systemPathReaddir,
|
||||
systemPathReaddirSync,
|
||||
systemPathStatSync,
|
||||
systemPathStat,
|
||||
isAllowedSystemPath,
|
||||
// High-level methods
|
||||
findFirstExistingPath,
|
||||
findGitHubCliPath,
|
||||
findClaudeCliPath,
|
||||
getClaudeAuthIndicators,
|
||||
type ClaudeAuthIndicators,
|
||||
// Electron userData operations
|
||||
setElectronUserDataPath,
|
||||
getElectronUserDataPath,
|
||||
isElectronUserDataPath,
|
||||
electronUserDataReadFileSync,
|
||||
electronUserDataWriteFileSync,
|
||||
electronUserDataExists,
|
||||
// Script directory operations
|
||||
setScriptBaseDir,
|
||||
getScriptBaseDir,
|
||||
scriptDirExists,
|
||||
scriptDirMkdirSync,
|
||||
scriptDirCreateWriteStream,
|
||||
// Electron app bundle operations
|
||||
setElectronAppPaths,
|
||||
electronAppExists,
|
||||
electronAppReadFileSync,
|
||||
electronAppStatSync,
|
||||
electronAppStat,
|
||||
electronAppReadFile,
|
||||
} from './system-paths.js';
|
||||
|
||||
// Port configuration
|
||||
export { STATIC_PORT, SERVER_PORT, RESERVED_PORTS } from './config/ports.js';
|
||||
|
||||
Reference in New Issue
Block a user