@simplysm/sd-cli 14.0.15 → 14.0.17

package/tests/commands/device.spec.ts

@@ -31,6 +31,27 @@ vi.mock("../../src/utils/sd-config", () => ({
   loadSdConfig: vi.fn(),
 }));
 
+// fs mock (포트 파일 읽기용)
+const mockReadFileSync = vi.fn();
+const mockExistsSync = vi.fn().mockReturnValue(false);
+vi.mock("node:fs", () => ({
+  default: {
+    readFileSync: (...args: any[]) => mockReadFileSync(...args),
+    existsSync: (...args: any[]) => mockExistsSync(...args),
+  },
+  readFileSync: (...args: any[]) => mockReadFileSync(...args),
+  existsSync: (...args: any[]) => mockExistsSync(...args),
+}));
+
+// http mock (헬스체크용)
+const mockHttpGet = vi.fn();
+vi.mock("node:http", () => ({
+  default: {
+    get: (...args: any[]) => mockHttpGet(...args),
+  },
+  get: (...args: any[]) => mockHttpGet(...args),
+}));
+
 const { Capacitor } = await import("../../src/capacitor/capacitor");
 const { Electron } = await import("../../src/electron/electron");
 const { loadSdConfig } = await import("../../src/utils/sd-config");
@@ -55,14 +76,14 @@ describe("runDevice", () => {
       },
     });
 
-    await runDevice({ package: "client-pda", options: [] });
+    await runDevice({ target: "client-pda", options: [] });
 
     expect(Capacitor.create).toHaveBeenCalledWith(
       expect.stringContaining("client-pda"),
       { appId: "com.test.app", appName: "TestApp" },
       undefined,
     );
-    expect(mockCapacitorInstance.run).toHaveBeenCalledWith("http://localhost:40480");
+    expect(mockCapacitorInstance.run).toHaveBeenCalledWith("http://localhost:40480/client-pda/");
   });
 
   // Acceptance: Scenario "device 명령어로 Electron 앱 실행"
@@ -77,14 +98,14 @@ describe("runDevice", () => {
       },
     });
 
-    await runDevice({ package: "my-client", options: [] });
+    await runDevice({ target: "my-client", options: [] });
 
     expect(Electron.create).toHaveBeenCalledWith(
       expect.stringContaining("my-client"),
       { appId: "com.test.electron" },
       undefined,
     );
-    expect(mockElectronInstance.run).toHaveBeenCalledWith("http://localhost:4200");
+    expect(mockElectronInstance.run).toHaveBeenCalledWith("http://localhost:4200/my-client/");
   });
 
   // Acceptance: Scenario "device 명령어에 URL 옵션 지정"
@@ -99,7 +120,7 @@ describe("runDevice", () => {
       },
     });
 
-    await runDevice({ package: "client-pda", url: "http://192.168.1.100:4200", options: [] });
+    await runDevice({ target: "client-pda", url: "http://192.168.1.100:4200", options: [] });
 
     expect(mockCapacitorInstance.run).toHaveBeenCalledWith("http://192.168.1.100:4200");
   });
@@ -117,7 +138,7 @@ describe("runDevice", () => {
       },
     });
 
-    await runDevice({ package: "my-client", options: [] });
+    await runDevice({ target: "my-client", options: [] });
 
     expect(Electron.create).toHaveBeenCalled();
     expect(Capacitor.create).not.toHaveBeenCalled();
@@ -131,7 +152,7 @@ describe("runDevice", () => {
       },
     });
 
-    await expect(runDevice({ package: "nonexistent", options: [] })).rejects.toThrow();
+    await expect(runDevice({ target: "nonexistent", options: [] })).rejects.toThrow();
   });
 
   // Unit: client가 아닌 패키지 에러
@@ -142,6 +163,85 @@ describe("runDevice", () => {
       },
     });
 
-    await expect(runDevice({ package: "my-server", options: [] })).rejects.toThrow();
+    await expect(runDevice({ target: "my-server", options: [] })).rejects.toThrow();
+  });
+
+  // Acceptance: Scenario "dev 서버 실행 중 device 실행 시 URL 자동 생성"
+  it("auto-detects URL from .dev-port when server is a string", async () => {
+    vi.mocked(loadSdConfig).mockResolvedValue({
+      packages: {
+        "client-devtool": {
+          target: "client",
+          server: "server",
+          electron: { appId: "com.test.electron" },
+        },
+      },
+    });
+
+    mockReadFileSync.mockReturnValue("5173");
+
+    // HTTP 헬스체크 성공 mock
+    mockHttpGet.mockImplementation((_url: string, cb: Function) => {
+      const res = { resume: vi.fn() };
+      cb(res);
+      return { on: vi.fn(), setTimeout: vi.fn() };
+    });
+
+    await runDevice({ target: "client-devtool", options: [] });
+
+    expect(mockElectronInstance.run).toHaveBeenCalledWith(
+      "http://localhost:5173/client-devtool/",
+    );
+  });
+
+  // Acceptance: Scenario "dev 서버 미실행 시 에러"
+  it("throws when .dev-port file does not exist and server is a string", async () => {
+    vi.mocked(loadSdConfig).mockResolvedValue({
+      packages: {
+        "client-devtool": {
+          target: "client",
+          server: "server",
+          electron: { appId: "com.test.electron" },
+        },
+      },
+    });
+
+    mockReadFileSync.mockImplementation(() => {
+      throw new Error("ENOENT");
+    });
+
+    await expect(runDevice({ target: "client-devtool", options: [] })).rejects.toThrow(
+      "dev 서버가 실행 중이 아닙니다",
+    );
+  });
+
+  // Acceptance: Scenario "stale 포트 파일 존재 시 헬스체크 실패 에러"
+  it("throws when .dev-port exists but health check fails", async () => {
+    vi.mocked(loadSdConfig).mockResolvedValue({
+      packages: {
+        "client-devtool": {
+          target: "client",
+          server: "server",
+          electron: { appId: "com.test.electron" },
+        },
+      },
+    });
+
+    mockReadFileSync.mockReturnValue("5173");
+
+    // HTTP 헬스체크 실패 mock
+    mockHttpGet.mockImplementation((_url: string, _cb: Function) => {
+      const req = {
+        on: vi.fn((event: string, handler: Function) => {
+          if (event === "error") handler(new Error("ECONNREFUSED"));
+        }),
+        setTimeout: vi.fn(),
+      };
+      return req;
+    });
+
+    await expect(runDevice({ target: "client-devtool", options: [] })).rejects.toThrow(
+      "dev 서버가 응답하지 않습니다",
+    );
   });
 });

package/tests/commands/publish.spec.ts

@@ -446,7 +446,7 @@ describe("runPublish", () => {
         (c: unknown[]) => c[0] === "claude",
       );
       expect(claudeCalls).toHaveLength(1);
-      expect((claudeCalls[0][1] as string[])).toContain("/sd-commit all");
+      expect((claudeCalls[0][1] as string[])).toContain("/sd-commit");
     });
 
     it("aborts when auto-commit claude command fails", async () => {
@@ -1105,7 +1105,7 @@ describe("runPublish", () => {
       });
 
       expect(mocks.loadSdConfig).toHaveBeenCalledWith(
-        expect.objectContaining({ options: ["production"] }),
+        expect.objectContaining({ opt: ["production"] }),
       );
     });
 

package/tests/commands/typecheck.spec.ts

@@ -299,7 +299,7 @@ describe("executeTypecheck", () => {
     await executeTypecheck({ targets: [], options: ["key=value"] });
 
     expect(mocks.loadSdConfig).toHaveBeenCalledWith(
-      expect.objectContaining({ options: ["key=value"] }),
+      expect.objectContaining({ opt: ["key=value"] }),
     );
   });
 

package/tests/electron/electron.spec.ts

@@ -7,6 +7,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 const mockFsxExists = vi.fn();
 const mockFsxReadJson = vi.fn();
 const mockFsxWriteJson = vi.fn().mockResolvedValue(undefined);
+const mockFsxWrite = vi.fn().mockResolvedValue(undefined);
 const mockFsxMkdir = vi.fn().mockResolvedValue(undefined);
 const mockFsxCopy = vi.fn().mockResolvedValue(undefined);
 const mockFsxReaddir = vi.fn();
@@ -17,6 +18,7 @@ vi.mock("@simplysm/core-node", () => ({
     exists: mockFsxExists,
     readJson: mockFsxReadJson,
     writeJson: mockFsxWriteJson,
+    write: mockFsxWrite,
     mkdir: mockFsxMkdir,
     copy: mockFsxCopy,
     readdir: mockFsxReaddir,
@@ -96,6 +98,11 @@ function setupDefaultMocks() {
       "better-sqlite3": "^11.0.0",
       "sharp": "^0.34.0",
     },
+    devDependencies: {
+      "electron": "^35.0.0",
+      "@electron/rebuild": "^4.0.0",
+      "electron-builder": "^26.0.0",
+    },
   });
   mockFsxReaddir.mockResolvedValue(["index.html", "assets", "electron"]);
   // Default: glob returns one exe file matching the builder output
@@ -169,7 +176,7 @@ describe("Electron", () => {
   //#region Rule: Electron 프로젝트를 초기화한다
 
   describe("인수 테스트: 초기화", () => {
-    it("package.json 생성 + npm install + electron-rebuild를 실행한다", async () => {
+    it("package.json 생성 + pnpm install + electron-rebuild를 실행한다", async () => {
       const { Electron } = await import("../../src/electron/electron.js");
 
       const electron = await Electron.create(PKG_PATH, {
@@ -181,13 +188,13 @@ describe("Electron", () => {
 
       expect(findElectronPackageJson()).toBeDefined();
 
-      const execaCalls = mockCpxSpawn.mock.calls;
+      const spawnCalls = mockCpxSpawn.mock.calls;
       expect(
-        execaCalls.find((c) => c[0] === "npm" && (c[1] as string[]).includes("install")),
+        spawnCalls.find((c) => c[0] === "pnpm" && (c[1] as string[]).includes("install")),
       ).toBeDefined();
       expect(
-        execaCalls.find(
-          (c) => typeof c[0] === "string" && c[0].includes("electron-rebuild"),
+        spawnCalls.find(
+          (c) => c[0] === "pnpm" && (c[1] as string[]).includes("electron-rebuild"),
         ),
       ).toBeDefined();
     });
@@ -199,7 +206,7 @@ describe("Electron", () => {
       await electron.initialize();
 
       const rebuildCall = mockCpxSpawn.mock.calls.find(
-        (c) => typeof c[0] === "string" && c[0].includes("electron-rebuild"),
+        (c) => c[0] === "pnpm" && (c[1] as string[]).includes("electron-rebuild"),
       );
       expect(rebuildCall).toBeUndefined();
     });
@@ -455,9 +462,9 @@ describe("Electron", () => {
       const electronKill = vi.fn();
       let resolveElectron: () => void = () => {};
 
-      mockCpxSpawn.mockImplementation((cmd: string) => {
-        if (typeof cmd === "string" && cmd.includes("electron")) {
-          // Electron process: create a deferred promise we can resolve externally
+      mockCpxSpawn.mockImplementation((cmd: string, args: string[]) => {
+        // pnpm exec electron . → Electron 프로세스
+        if (cmd === "pnpm" && args[0] === "exec" && args[1] === "electron" && args[2] === ".") {
           const p = new Promise<void>((resolve) => {
             resolveElectron = resolve;
           }) as any;
@@ -537,8 +544,8 @@ describe("Electron", () => {
   describe("단위: run() 플러그인 동작", () => {
     it("passes custom env and ELECTRON_DEV_URL via esbuild banner", async () => {
       let resolveElectron: () => void = () => {};
-      mockCpxSpawn.mockImplementation((cmd: string) => {
-        if (typeof cmd === "string" && cmd.includes("electron")) {
+      mockCpxSpawn.mockImplementation((cmd: string, args: string[]) => {
+        if (cmd === "pnpm" && args[0] === "exec" && args[1] === "electron" && args[2] === ".") {
           const p = new Promise<void>((resolve) => {
             resolveElectron = resolve;
           }) as any;
@@ -570,8 +577,8 @@ describe("Electron", () => {
 
     it("calls initialize() before starting esbuild context", async () => {
       let resolveElectron: () => void = () => {};
-      mockCpxSpawn.mockImplementation((cmd: string) => {
-        if (typeof cmd === "string" && cmd.includes("electron")) {
+      mockCpxSpawn.mockImplementation((cmd: string, args: string[]) => {
+        if (cmd === "pnpm" && args[0] === "exec" && args[1] === "electron" && args[2] === ".") {
           const p = new Promise<void>((resolve) => {
             resolveElectron = resolve;
           }) as any;
@@ -589,11 +596,11 @@ describe("Electron", () => {
       resolveElectron();
       await runPromise;
 
-      // initialize calls npm install -> execa should have been called with npm install
-      const npmInstallCall = mockCpxSpawn.mock.calls.find(
-        (c: any[]) => c[0] === "npm" && (c[1] as string[]).includes("install"),
+      // initialize calls pnpm install
+      const pnpmInstallCall = mockCpxSpawn.mock.calls.find(
+        (c: any[]) => c[0] === "pnpm" && (c[1] as string[]).includes("install"),
       );
-      expect(npmInstallCall).toBeDefined();
+      expect(pnpmInstallCall).toBeDefined();
     }, 10_000);
   });
 

package/tests/engines/ngtsc-engine.spec.ts

@@ -78,7 +78,6 @@ describe("NgtscEngine", () => {
           output: { js: true, dts: true },
         }),
       );
-      expect(result.success).toBe(true);
       expect(result.build.success).toBe(true);
       expect(result.build.diagnostics).toEqual([]);
       await engine.stop();
@@ -133,7 +132,6 @@ describe("NgtscEngine", () => {
       const engine = new NgtscEngine({ cwd: "/root", pkg: createMockPkg() });
       const result = await engine.run({ js: true, dts: true });
 
-      expect(result.success).toBe(false);
       expect(result.build.success).toBe(false);
       expect(result.build.errors).toContain("TS2322: Type error");
       await engine.stop();
@@ -148,7 +146,6 @@ describe("NgtscEngine", () => {
       const engine = new NgtscEngine({ cwd: "/root", pkg: createMockPkg() });
       const result = await engine.run({ js: true, dts: true });
 
-      expect(result.success).toBe(false);
       expect(result.build.success).toBe(false);
       expect(result.build.errors).toEqual(["ngtsc compilation error"]);
       await engine.stop();

package/tests/engines/server-esbuild-engine.spec.ts

@@ -89,7 +89,6 @@ describe("ServerEsbuildEngine", () => {
           packageManager: "mise",
         }),
       );
-      expect(result.success).toBe(true);
       expect(result.build.success).toBe(true);
       await engine.stop();
     });
@@ -104,7 +103,6 @@ describe("ServerEsbuildEngine", () => {
       const engine = new ServerEsbuildEngine({ cwd: "/root", pkg: createMockPkg() });
       const result = await engine.run({ js: true, dts: false });
 
-      expect(result.success).toBe(false);
       expect(result.build.warnings).toEqual(["warn1"]);
       expect(result.build.success).toBe(false);
       expect(result.build.diagnostics).toEqual([{ code: 2345, category: 1 }]);
@@ -121,7 +119,6 @@ describe("ServerEsbuildEngine", () => {
       const engine = new ServerEsbuildEngine({ cwd: "/root", pkg: createMockPkg() });
       const result = await engine.run({ js: true, dts: false });
 
-      expect(result.success).toBe(false);
       expect(result.build.success).toBe(false);
       expect(result.build.errors).toEqual(["esbuild error"]);
       await engine.stop();

package/tests/engines/tsc-engine.spec.ts

@@ -75,7 +75,6 @@ describe("TscEngine", () => {
           output: { js: true, dts: true },
         }),
       );
-      expect(result.success).toBe(true);
       expect(result.build.success).toBe(true);
       await engine.stop();
     });
@@ -101,7 +100,7 @@ describe("TscEngine", () => {
       const engine = new TscEngine({ cwd: "/root", pkg: createMockPkg() });
       const result = await engine.run({ js: true, dts: true });
 
-      expect(result.success).toBe(false);
+      expect(result.build.success).toBe(false);
       expect(result.build.errors).toEqual(["type error"]);
       expect(result.build.diagnostics).toHaveLength(1);
       await engine.stop();

package/tests/engines/vite-engine.spec.ts

@@ -74,7 +74,6 @@ describe("ViteEngine", () => {
           pkgDir: "/packages/my-client",
         }),
       );
-      expect(result.success).toBe(true);
       expect(result.build.success).toBe(true);
       expect(result.build.errors).toEqual([]);
       expect(result.build.diagnostics).toEqual([]);
@@ -91,7 +90,6 @@ describe("ViteEngine", () => {
       const engine = new ViteEngine({ cwd: "/root", pkg: createMockPkg() });
       const result = await engine.run({ js: true, dts: false });
 
-      expect(result.success).toBe(false);
       expect(result.build.success).toBe(false);
       expect(result.build.errors).toContain("TS2345: Argument of type...");
       await engine.stop();

package/tests/infra/signal-handler.spec.ts

@@ -1,23 +1,13 @@
-import { describe, it, expect } from "vitest";
+import { describe, it } from "vitest";
 import { SignalHandler } from "../../src/infra/SignalHandler";
 
 describe("SignalHandler", () => {
   it("resolves waitForTermination on requestTermination", async () => {
     const handler = new SignalHandler();
 
-    expect(handler.isTerminated()).toBe(false);
-
     handler.requestTermination();
 
     await handler.waitForTermination();
-    expect(handler.isTerminated()).toBe(true);
-  });
-
-  it("is not terminated initially", () => {
-    const handler = new SignalHandler();
-    expect(handler.isTerminated()).toBe(false);
-    // Clean up: prevent dangling signal listeners
-    handler.requestTermination();
   });
 
   it("handles double requestTermination gracefully", async () => {
@@ -27,6 +17,5 @@ describe("SignalHandler", () => {
     handler.requestTermination();
 
     await handler.waitForTermination();
-    expect(handler.isTerminated()).toBe(true);
   });
 });

package/tests/orchestrators/build-orchestrator.spec.ts

@@ -66,7 +66,6 @@ vi.mock("../../src/engines/index", () => ({
   createBuildEngine: vi.fn(() => {
     const engine = {
       run: vi.fn().mockResolvedValue({
-        success: true,
         build: { success: true, errors: [], warnings: [], diagnostics: [] },
       }),
       startWatch: vi.fn().mockResolvedValue(undefined),
@@ -159,7 +158,6 @@ beforeEach(() => {
   vi.mocked(createBuildEngine).mockImplementation(() => {
     const engine = {
       run: vi.fn().mockResolvedValue({
-        success: true,
         build: { success: true, errors: [], warnings: [], diagnostics: [] },
 
       }),
@@ -218,7 +216,7 @@ describe("BuildOrchestrator.initialize", () => {
     await orchestrator.initialize();
 
     expect(loadSdConfig).toHaveBeenCalledWith(
-      expect.objectContaining({ options: ["production"] }),
+      expect.objectContaining({ opt: ["production"] }),
     );
   });
 
@@ -413,7 +411,6 @@ describe("BuildOrchestrator.start", () => {
     });
     vi.mocked(createBuildEngine).mockReturnValue({
       run: vi.fn().mockResolvedValue({
-        success: false,
         build: { success: false, errors: ["Module not found"], warnings: [], diagnostics: [] },
       }),
       startWatch: vi.fn(),
@@ -603,7 +600,6 @@ describe("BuildOrchestrator client build", () => {
     });
     vi.mocked(createBuildEngine).mockReturnValue({
       run: vi.fn().mockResolvedValue({
-        success: true,
         build: { success: true, errors: [], warnings: [], diagnostics: [] },
       }),
       startWatch: vi.fn(),
@@ -637,7 +633,6 @@ describe("BuildOrchestrator client build", () => {
     });
     vi.mocked(createBuildEngine).mockReturnValue({
       run: vi.fn().mockResolvedValue({
-        success: false,
         build: { success: false, errors: ["Template error"], warnings: [], diagnostics: [] },
       }),
       startWatch: vi.fn(),
@@ -957,7 +952,6 @@ describe("BuildOrchestrator native build integration (Slice 1)", () => {
     });
     vi.mocked(createBuildEngine).mockReturnValue({
       run: vi.fn().mockResolvedValue({
-        success: false,
         build: { success: false, errors: ["Build error"], warnings: [], diagnostics: [] },
       }),
       startWatch: vi.fn(),

package/tests/orchestrators/dev-watch-orchestrator.spec.ts

@@ -651,8 +651,9 @@ describe("DevWatchOrchestrator", () => {
         expect.any(Object),
       );
       expect(mockBuildEngines[0].startWatch).toHaveBeenCalledWith({ js: true, dts: false, lint: false });
-      // Runtime is NOT started during initial build; it starts via batchComplete
-      expect(Worker.create).not.toHaveBeenCalled();
+      // Runtime starts during start() after all engines ready
+      expect(Worker.create).toHaveBeenCalled();
+      expect(mockRuntimeProxies[0].start).toHaveBeenCalled();
     });
 
     // --- Acceptance: Server 패키지 dev 모드 실행 ---
@@ -833,7 +834,7 @@ describe("DevWatchOrchestrator", () => {
     });
 
     // --- Acceptance: Server batchComplete 시 runtime 시작 ---
-    it("starts runtime on batchComplete with success", async () => {
+    it("starts runtime during start() after all engines ready", async () => {
       setupDefaults(createConfig({
         packages: { "service-server": { target: "server" } },
       }));
@@ -843,18 +844,7 @@ describe("DevWatchOrchestrator", () => {
       await orchestrator.initialize();
       await orchestrator.start();
 
-      // No runtime started initially
-      expect(Worker.create).not.toHaveBeenCalled();
-
-      // Get batchComplete handler
-      const rebuildInstance = vi.mocked(RebuildManager).mock.instances[0];
-      const onCall = vi.mocked(rebuildInstance.on).mock.calls.find((c) => c[0] === "batchComplete");
-      const batchHandler = onCall?.[1] as ((keys: string[]) => void) | undefined;
-
-      batchHandler?.(["service-server:build"]);
-      await new Promise((r) => setTimeout(r, 200));
-
-      // First runtime created via batchComplete
+      // Runtime starts during start(), not via batchComplete
       expect(mockRuntimeProxies).toHaveLength(1);
       expect(mockRuntimeProxies[0].start).toHaveBeenCalled();
     });
@@ -870,12 +860,8 @@ describe("DevWatchOrchestrator", () => {
       await orchestrator.initialize();
       await orchestrator.start();
 
-      // Trigger batchComplete to create runtime first
-      const rebuildInstance = vi.mocked(RebuildManager).mock.instances[0];
-      const onCall = vi.mocked(rebuildInstance.on).mock.calls.find((c) => c[0] === "batchComplete");
-      const batchHandler = onCall?.[1] as ((keys: string[]) => void) | undefined;
-      batchHandler?.(["service-server:build"]);
-      await new Promise((r) => setTimeout(r, 200));
+      // Runtime is now started during start()
+      expect(mockRuntimeProxies).toHaveLength(1);
 
       await orchestrator.shutdown();
 
@@ -911,7 +897,7 @@ describe("DevWatchOrchestrator", () => {
     });
 
     // Unit: multiple server packages
-    it("creates engines for multiple server packages (runtimes start via batchComplete)", async () => {
+    it("creates engines for multiple server packages (runtimes start during start())", async () => {
       setupDefaults(createConfig({
         packages: {
           "service-server": { target: "server" },
@@ -925,8 +911,8 @@ describe("DevWatchOrchestrator", () => {
       await orchestrator.start();
 
       expect(createBuildEngine).toHaveBeenCalledTimes(2);
-      // Runtimes are NOT started during initial build
-      expect(Worker.create).not.toHaveBeenCalled();
+      // Runtimes start during start() after all engines ready
+      expect(Worker.create).toHaveBeenCalledTimes(2);
     });
 
     // Unit: skips start when no packages
@@ -1027,16 +1013,7 @@ describe("DevWatchOrchestrator", () => {
       await orchestrator.initialize();
       await orchestrator.start();
 
-      // Runtime starts via batchComplete, not initial start
-      expect(Worker.create).not.toHaveBeenCalled();
-
-      // Trigger batchComplete
-      const rebuildInstance = vi.mocked(RebuildManager).mock.instances[0];
-      const onCall = vi.mocked(rebuildInstance.on).mock.calls.find((c) => c[0] === "batchComplete");
-      const batchHandler = onCall?.[1] as ((keys: string[]) => void) | undefined;
-      batchHandler?.(["service-server:build"]);
-      await new Promise((r) => setTimeout(r, 200));
-
+      // Runtime starts during start() with client ports available
       expect(Worker.create).toHaveBeenCalled();
       expect(mockRuntimeProxies[0].start).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -1059,13 +1036,7 @@ describe("DevWatchOrchestrator", () => {
       await orchestrator.initialize();
       await orchestrator.start();
 
-      // Trigger batchComplete to start server runtime
-      const rebuildInstance = vi.mocked(RebuildManager).mock.instances[0];
-      const onCall = vi.mocked(rebuildInstance.on).mock.calls.find((c) => c[0] === "batchComplete");
-      const batchHandler = onCall?.[1] as ((keys: string[]) => void) | undefined;
-      batchHandler?.(["service-server:build"]);
-      await new Promise((r) => setTimeout(r, 200));
-
+      // Runtime starts during start(), standalone client ports excluded
       expect(mockRuntimeProxies[0].start).toHaveBeenCalledWith(
         expect.objectContaining({
           clientPorts: {},
@@ -1112,13 +1083,7 @@ describe("DevWatchOrchestrator", () => {
       await orchestrator.initialize();
       await orchestrator.start();
 
-      // Trigger batchComplete to start server runtime
-      const rebuildInstance = vi.mocked(RebuildManager).mock.instances[0];
-      const onCall = vi.mocked(rebuildInstance.on).mock.calls.find((c) => c[0] === "batchComplete");
-      const batchHandler = onCall?.[1] as ((keys: string[]) => void) | undefined;
-      batchHandler?.(["service-server:build"]);
-      await new Promise((r) => setTimeout(r, 200));
-
+      // Runtime starts during start() but client port unavailable → empty clientPorts
       expect(mockRuntimeProxies[0].start).toHaveBeenCalledWith(
         expect.objectContaining({
           clientPorts: {},
@@ -1126,8 +1091,8 @@ describe("DevWatchOrchestrator", () => {
       );
     });
 
-    // --- Acceptance: printServers에 serverClientsMap 전달 ---
-    it("passes serverClientsMap to printServers", async () => {
+    // --- Acceptance: printServers는 start()에서 직접 호출되지 않는다 (serverReady 이벤트 경로만 사용) ---
+    it("does not call printServers directly during start()", async () => {
       setupDefaults(createConfig({
         packages: {
           "service-server": { target: "server" },
@@ -1140,12 +1105,9 @@ describe("DevWatchOrchestrator", () => {
       await orchestrator.initialize();
       await orchestrator.start();
 
-      expect(_printServers).toHaveBeenCalledWith(
-        expect.any(Map),
-        expect.any(Map),
-      );
-      const serverClientsMap = vi.mocked(_printServers).mock.calls[0][1] as Map<string, string[]>;
-      expect(serverClientsMap.get("service-server")).toEqual(["my-client"]);
+      // printServers should NOT be called directly during start()
+      // It should only be called via serverReady → _schedulePrintServers()
+      expect(_printServers).not.toHaveBeenCalled();
     });
 
     // --- Acceptance: 서버 rebuild 시 프록시 재등록 ---
@@ -1162,14 +1124,7 @@ describe("DevWatchOrchestrator", () => {
       await orchestrator.initialize();
       await orchestrator.start();
 
-      // Trigger first batchComplete to start runtime
-      const rebuildInstance = vi.mocked(RebuildManager).mock.instances[0];
-      const onCall = vi.mocked(rebuildInstance.on).mock.calls.find((c) => c[0] === "batchComplete");
-      const batchHandler = onCall?.[1] as ((keys: string[]) => void) | undefined;
-      batchHandler?.(["service-server:build"]);
-      await new Promise((r) => setTimeout(r, 200));
-
-      // First runtime created with clientPorts
+      // First runtime created during start() with clientPorts
       expect(mockRuntimeProxies).toHaveLength(1);
       expect(mockRuntimeProxies[0].start).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -1177,11 +1132,14 @@ describe("DevWatchOrchestrator", () => {
         }),
       );
 
-      // Trigger second batchComplete (rebuild)
+      // Trigger batchComplete (rebuild after initial build)
+      const rebuildInstance = vi.mocked(RebuildManager).mock.instances[0];
+      const onCall = vi.mocked(rebuildInstance.on).mock.calls.find((c) => c[0] === "batchComplete");
+      const batchHandler = onCall?.[1] as ((keys: string[]) => void) | undefined;
       batchHandler?.(["service-server:build"]);
       await new Promise((r) => setTimeout(r, 200));
 
-      // Second runtime start should also have clientPorts
+      // Second runtime start (rebuild) should also have clientPorts
       expect(mockRuntimeProxies).toHaveLength(2);
       expect(mockRuntimeProxies[0].terminate).toHaveBeenCalled();
       expect(mockRuntimeProxies[1].start).toHaveBeenCalledWith(