Merge pull request #64 from zero-ide/feature/dockerfile-priority

fix(execution): add Dockerfile-first detection with safe fallback

Author: ori0o0p

Sources/Zero/Services/ExecutionService.swift

@@ -105,14 +105,17 @@ class ExecutionService: ObservableObject {
 
     func detectRunCommand(container: String) async throws -> String {
         let config = try buildConfigService.load()
-        
-        // 순서대로 체크 (우선순위)
-        // 1. Swift
+
+        if try dockerService.fileExists(container: container, path: "Dockerfile") {
+            if canUseDockerfileStrategy(container: container) {
+                return "docker build -t zero-runner . && docker run --rm zero-runner"
+            }
+        }
+
         if try dockerService.fileExists(container: container, path: "Package.swift") {
             return "swift run"
         }
 
-        // 2. Maven (pom.xml)
         if try dockerService.fileExists(container: container, path: "pom.xml") {
             if config.buildTool == .maven {
                 // Spring Boot 플러그인 확인
@@ -124,7 +127,6 @@ class ExecutionService: ObservableObject {
             return "mvn clean install"
         }
 
-        // 3. Gradle (build.gradle 또는 build.gradle.kts)
         let hasBuildGradle = try dockerService.fileExists(container: container, path: "build.gradle")
         let hasBuildGradleKts = try dockerService.fileExists(container: container, path: "build.gradle.kts")
         if hasBuildGradle || hasBuildGradleKts {
@@ -138,28 +140,35 @@ class ExecutionService: ObservableObject {
             return "gradle build"
         }
 
-        // 4. Node.js
         if try dockerService.fileExists(container: container, path: "package.json") {
             return "npm start"
         }
 
-        // 5. Python
         if try dockerService.fileExists(container: container, path: "main.py") {
             return "python3 main.py"
         }
 
-        // 6. Java (단일 파일)
         if try dockerService.fileExists(container: container, path: "Main.java") {
             return "javac Main.java && java Main"
         }
 
-        // 7. Go
         if try dockerService.fileExists(container: container, path: "go.mod") {
             return "go run ."
         }
 
         throw NSError(domain: "ExecutionService", code: 404, userInfo: [NSLocalizedDescriptionKey: "Cannot detect project type"])
     }
+
+    private func canUseDockerfileStrategy(container: String) -> Bool {
+        guard let output = try? dockerService.executeShell(
+            container: container,
+            script: "command -v docker >/dev/null 2>&1 && echo yes || echo no"
+        ) else {
+            return false
+        }
+
+        return output.contains("yes")
+    }
 
     /// Spring Boot 프로젝트 여부 확인
     private func isSpringBootProject(container: String, buildTool: BuildConfiguration.BuildTool) async throws -> Bool {

Tests/ZeroTests/ExecutionServiceTests.swift

@@ -37,6 +37,48 @@ final class ExecutionServiceTests: XCTestCase {
         // Then
         XCTAssertEqual(command, "npm start")
     }
+
+    func testDetectRunCommand_DockerfileTakesPriorityOverSwift() async throws {
+        // Given
+        mockDocker.dockerCommandAvailable = true
+        mockDocker.fileExistenceResults = [
+            "Dockerfile": true,
+            "Package.swift": true
+        ]
+
+        // When
+        let command = try await service.detectRunCommand(container: "test-container")
+
+        // Then
+        XCTAssertEqual(command, "docker build -t zero-runner . && docker run --rm zero-runner")
+    }
+
+    func testDetectRunCommand_DockerfileStrategyWhenOnlyDockerfileExists() async throws {
+        // Given
+        mockDocker.dockerCommandAvailable = true
+        mockDocker.fileExistenceResults = ["Dockerfile": true]
+
+        // When
+        let command = try await service.detectRunCommand(container: "test-container")
+
+        // Then
+        XCTAssertEqual(command, "docker build -t zero-runner . && docker run --rm zero-runner")
+    }
+
+    func testDetectRunCommand_DockerfileFallsBackWhenDockerUnavailable() async throws {
+        // Given
+        mockDocker.dockerCommandAvailable = false
+        mockDocker.fileExistenceResults = [
+            "Dockerfile": true,
+            "Package.swift": true
+        ]
+
+        // When
+        let command = try await service.detectRunCommand(container: "test-container")
+
+        // Then
+        XCTAssertEqual(command, "swift run")
+    }
 
     func testExecute_Success() async {
         // Given
@@ -139,6 +181,7 @@ class MockExecutionDockerService: DockerServiceProtocol {
     var cancelCurrentExecutionCalled = false
     var streamingChunks: [String] = []
     var interChunkDelayNanoseconds: UInt64 = 0
+    var dockerCommandAvailable = true
 
     func checkInstallation() throws -> Bool { return true }
 
@@ -154,6 +197,10 @@ class MockExecutionDockerService: DockerServiceProtocol {
     func runContainer(image: String, name: String) throws -> String { return "" }
     func executeCommand(container: String, command: String) throws -> String { return "" }
     func executeShell(container: String, script: String) throws -> String {
+        if script.contains("command -v docker") {
+            return dockerCommandAvailable ? "yes" : "no"
+        }
+
         if shouldBlockUntilCancelled {
             while !cancelCurrentExecutionCalled {
                 usleep(10_000)