@simplysm/sd-cli 14.0.7 → 14.0.9

package/src/workers/ngtsc-build.worker.ts

@@ -1,6 +1,6 @@
 import path from "path";
 import ts from "typescript";
-import { createWorker, FsWatcher } from "@simplysm/core-node";
+import { createWorker, FsWatcher, pathx } from "@simplysm/core-node";
 import { err as errNs } from "@simplysm/core-common";
 import { consola } from "consola";
 import { registerCleanupHandlers, createOnceGuard, applyDebugLevel } from "../utils/worker-utils";
@@ -22,6 +22,7 @@ import { LintWithProgramRunner, type LintWithProgramResult } from "../utils/lint
 import {
   parseTsconfig,
   getPackageSourceFiles,
+  getPackageFiles,
   getCompilerOptionsForEnv,
 } from "../utils/tsconfig";
 import { AngularCompiler, AngularSourceFileCache } from "../utils/angular-compiler";
@@ -50,6 +51,7 @@ let fsWatcher: FsWatcher | undefined;
 async function cleanup(): Promise<void> {
   const watcherToClose = fsWatcher;
   fsWatcher = undefined;
+  lastSourceFilePaths = undefined;
 
   if (watcherToClose != null) {
     await watcherToClose.close();
@@ -65,15 +67,17 @@ registerCleanupHandlers(cleanup, logger);
 async function build(info: NgtscBuildInfo): Promise<NgtscBuildResult> {
   logger.debug(`[${info.name}] ngtsc worker build 시작 (pkgDir: ${info.pkgDir})`);
   const { program, ...result } = await runNgtscBuild({ ...info, env: info.output.env });
-  logger.debug(`[${info.name}] ngtsc worker build 완료 (dts.success: ${result.dts.success})`);
+  logger.debug(`[${info.name}] ngtsc worker build 완료 (build.success: ${result.build.success})`);
 
   // Run lint if enabled and program is available
   if (info.output.lint === true && program != null) {
+    logger.debug(`[${info.name}] lint 시작`);
     const lintRunner = new LintWithProgramRunner({
       cwd: info.cwd,
       pkgName: info.name,
     });
     result.lint = await lintRunner.lint({ program });
+    logger.debug(`[${info.name}] lint 완료`);
   }
 
   return result;
@@ -88,8 +92,17 @@ const guardStartWatch = createOnceGuard("startWatch");
 let watchInfo: NgtscBuildInfo | undefined;
 let currentScssDependencies: Map<string, Set<string>> | undefined;
 let watchLintRunner: LintWithProgramRunner | undefined;
+let lastSourceFilePaths: Set<string> | undefined;
 const sideEffectScssRegistry = new Map<string, SideEffectScssEntry>();
 
+function extractSourceFilePaths(program: ReturnType<AngularCompiler["getTsProgram"]>): Set<string> {
+  const paths = new Set<string>();
+  for (const sf of program.getSourceFiles()) {
+    paths.add(pathx.posix(sf.fileName));
+  }
+  return paths;
+}
+
 /**
  * Perform a watch build (initial or incremental) using AngularCompiler.
  * Returns NgtscCombinedBuildEvent for sending to the engine.
@@ -105,8 +118,9 @@ async function performWatchBuild(
   affectedFileNames?: ReadonlySet<string>,
   hasScssChanges = true,
 ): Promise<NgtscCombinedBuildEvent> {
+  logger.debug(`[${info.name}] performWatchBuild 시작`);
   const pkgSrcDir = path.join(info.pkgDir, "src");
-  const normalizedSrcDir = pkgSrcDir.replace(/\\/g, "/");
+  const normalizedSrcDir = pathx.posix(pkgSrcDir);
 
   // Collect diagnostics — workspace scope (no package-level filtering)
   const allDiagnostics = [...compiler.collectDiagnostics()].filter(
@@ -124,7 +138,7 @@ async function performWatchBuild(
   const loadPaths = buildScssLoadPaths(info);
   const emitResults = compiler.emitAffectedFiles({
     sourceFilter: (fileName: string) =>
-      fileName.replace(/\\/g, "/").startsWith(normalizedSrcDir + "/"),
+      pathx.posix(fileName).startsWith(normalizedSrcDir + "/"),
   });
   writeEmitResults(emitResults, info.pkgDir, {
     loadPaths,
@@ -146,6 +160,7 @@ async function performWatchBuild(
   // Run lint if enabled
   let lint: LintWithProgramResult | undefined;
   if (info.output.lint === true) {
+    logger.debug(`[${info.name}] lint 시작`);
     if (watchLintRunner == null) {
       watchLintRunner = new LintWithProgramRunner({
         cwd: info.cwd,
@@ -156,11 +171,12 @@ async function performWatchBuild(
       program: compiler.getTsProgram(),
       affectedFiles: affectedFileNames,
     });
+    logger.debug(`[${info.name}] lint 완료`);
   }
 
+  logger.debug(`[${info.name}] performWatchBuild 완료`);
   return {
-    js: { success: true },
-    dts: {
+    build: {
       success: errorCount === 0 && scssErrors.length === 0 && globalScssErrors.length === 0,
       errors: allErrors.length > 0 ? allErrors : undefined,
     },
@@ -175,17 +191,16 @@ async function startWatch(info: NgtscBuildInfo): Promise<void> {
   try {
     // Parse tsconfig and prepare compiler options
     const parsedConfig = parseTsconfig(watchInfo.pkgDir);
-    const sourceFiles = getPackageSourceFiles(watchInfo.pkgDir, parsedConfig);
+    const sourceFiles = watchInfo.output.includeTests === true
+      ? getPackageFiles(watchInfo.pkgDir, parsedConfig)
+      : getPackageSourceFiles(watchInfo.pkgDir, parsedConfig);
     const baseOptions =
       watchInfo.env != null
         ? getCompilerOptionsForEnv(parsedConfig.options, watchInfo.env, watchInfo.pkgDir)
         : parsedConfig.options;
     const compilerOptions = buildCompilerOptions(baseOptions, watchInfo.pkgDir, watchInfo.output);
 
-    // Read angularCompilerOptions from root tsconfig
-    const rootTsconfigPath = path.join(watchInfo.cwd, "tsconfig.json");
-    const rootRawConfig = ts.readConfigFile(rootTsconfigPath, ts.sys.readFile);
-    const angularOptions = rootRawConfig.config?.angularCompilerOptions ?? {};
+    const angularOptions = (parsedConfig.raw?.angularCompilerOptions ?? {}) as Record<string, unknown>;
 
     // SCSS closure variables
     const scssErrors: string[] = [];
@@ -204,6 +219,7 @@ async function startWatch(info: NgtscBuildInfo): Promise<void> {
     });
     // Initial build
     await compiler.initialize();
+    lastSourceFilePaths = extractSourceFilePaths(compiler.getTsProgram());
     const initialResult = await performWatchBuild(watchInfo, compiler, scssDependencies, scssErrors);
     sender.send("build", initialResult);
 
@@ -215,6 +231,7 @@ async function startWatch(info: NgtscBuildInfo): Promise<void> {
     );
 
     // Start FsWatcher
+    logger.debug(`[${watchInfo.name}] FsWatcher 시작`);
     const watchPaths = [
       path.join(watchInfo.pkgDir, "src", "**", "*.{ts,scss,css}"),
       path.join(watchInfo.pkgDir, "scss", "**", "*.{scss,css}"),
@@ -234,7 +251,9 @@ async function startWatch(info: NgtscBuildInfo): Promise<void> {
 
     fsWatcher.onChange({ delay: 300 }, async (changedFiles) => {
       try {
-        sender.send("buildStart", {});
+        const hasFileAddOrRemove = changedFiles.some(
+          (c) => c.event === "add" || c.event === "unlink",
+        );
 
         // Collect modified files (all changed + SCSS dependency reverse-lookup)
         const modifiedFiles = new Set<string>();
@@ -254,6 +273,19 @@ async function startWatch(info: NgtscBuildInfo): Promise<void> {
           }
         }
 
+        // Dependency filter: skip rebuild if no relevant changes
+        if (!hasFileAddOrRemove && lastSourceFilePaths != null) {
+          const hasRelevantChange = [...modifiedFiles].some((p) =>
+            lastSourceFilePaths!.has(p),
+          );
+          if (!hasRelevantChange) {
+            logger.debug("변경된 파일이 빌드에 포함되지 않아 리빌드 건너뜀");
+            return;
+          }
+        }
+
+        sender.send("buildStart", {});
+
         // Clear SCSS errors for fresh rebuild
         scssErrors.length = 0;
         scssDependencies.clear();
@@ -261,10 +293,13 @@ async function startWatch(info: NgtscBuildInfo): Promise<void> {
         // Incremental rebuild via AngularCompiler.update()
         const updateResult = await compiler.update(modifiedFiles);
 
+        // Update source file paths after rebuild
+        lastSourceFilePaths = extractSourceFilePaths(compiler.getTsProgram());
+
         // Convert affected ts.SourceFile set to file name strings for incremental lint
         const affectedFileNames = new Set<string>();
         for (const sf of updateResult.affectedFiles) {
-          affectedFileNames.add(sf.fileName.replace(/\\/g, "/"));
+          affectedFileNames.add(pathx.posix(sf.fileName));
         }
 
         const hasScssChanges = changedFiles.some(

package/src/workers/server-build.worker.ts

@@ -1,8 +1,7 @@
 import path from "path";
 import fs from "fs";
-import { execaSync } from "execa";
 import esbuild from "esbuild";
-import { createWorker, FsWatcher, pathx } from "@simplysm/core-node";
+import { cpx, createWorker, FsWatcher, pathx } from "@simplysm/core-node";
 import { err as errNs } from "@simplysm/core-common";
 import { consola } from "consola";
 import type { BuildOutput } from "../engines/types";
@@ -70,8 +69,7 @@ export interface ServerWatchInfo {
  * Server build result (aligned with LibraryBuildResult + mainJsPath)
  */
 export interface ServerBuildResult {
-  js: { success: boolean; errors?: string[]; warnings?: string[] };
-  dts: { success: boolean; errors?: string[]; diagnostics: SerializedDiagnostic[] };
+  build: { success: boolean; errors?: string[]; warnings?: string[]; diagnostics: SerializedDiagnostic[] };
   lint?: LintWithProgramResult;
   mainJsPath: string;
 }
@@ -80,8 +78,7 @@ export interface ServerBuildResult {
  * Combined build event for watch mode
  */
 export interface ServerCombinedBuildEvent {
-  js: { success: boolean; errors?: string[]; warnings?: string[] };
-  dts: { success: boolean; errors?: string[] };
+  build: { success: boolean; errors?: string[]; warnings?: string[] };
   lint?: LintWithProgramResult;
   mainJsPath: string;
 }
@@ -231,7 +228,7 @@ function generateProductionFiles(
     distPkgJson["dependencies"] = resolveLockedVersions(info.cwd, externals);
   }
   if (info.packageManager === "volta") {
-    const nodeVersion = execaSync("node", ["-v"]).stdout.trim();
+    const nodeVersion = cpx.execSync("node", ["-v"]).stdout.trim();
     distPkgJson["volta"] = { node: nodeVersion };
   }
   fs.writeFileSync(path.join(distDir, "package.json"), JSON.stringify(distPkgJson, undefined, 2));
@@ -325,7 +322,7 @@ registerCleanupHandlers(cleanup, logger);
  * One-time build (production)
  */
 async function build(info: ServerBuildInfo): Promise<ServerBuildResult> {
-  const mainJsPath = path.join(info.pkgDir, "dist", "main.js");
+  const mainJsPath = pathx.posixResolve(info.pkgDir, "dist", "main.js");
   logger.debug(`[${info.name}] server worker build 시작 (js: ${info.output.js}, dts: ${info.output.dts})`);
 
   try {
@@ -370,6 +367,7 @@ async function build(info: ServerBuildInfo): Promise<ServerBuildResult> {
       output: { js: false, dts: info.output.dts },
       parsedConfig,
       env: info.output.env,
+      includeTests: info.output.includeTests,
     });
 
     const jsResult = esbuildPromise
@@ -379,11 +377,13 @@ async function build(info: ServerBuildInfo): Promise<ServerBuildResult> {
     // Run lint if enabled and program is available
     let lint: LintWithProgramResult | undefined;
     if (info.output.lint === true && tscResult.program != null) {
+      logger.debug(`[${info.name}] lint 시작`);
       const lintRunner = new LintWithProgramRunner({
         cwd: info.cwd,
         pkgName: info.name,
       });
       lint = await lintRunner.lint({ program: tscResult.program });
+      logger.debug(`[${info.name}] lint 완료`);
     }
 
     // Generate production artifacts only when JS output is requested
@@ -396,16 +396,13 @@ async function build(info: ServerBuildInfo): Promise<ServerBuildResult> {
       generateProductionFiles(info, external);
     }
 
-    logger.debug(`[${info.name}] server worker build 완료 (js: ${jsResult.success}, dts: ${tscResult.success})`);
+    const allErrors = [...(jsResult.errors ?? []), ...(tscResult.errors ?? [])];
+    logger.debug(`[${info.name}] server worker build 완료 (js: ${jsResult.success}, tsc: ${tscResult.success})`);
     return {
-      js: {
-        success: jsResult.success,
-        errors: jsResult.errors,
+      build: {
+        success: jsResult.success && tscResult.success,
+        errors: allErrors.length > 0 ? allErrors : undefined,
         warnings: jsResult.warnings,
-      },
-      dts: {
-        success: tscResult.success,
-        errors: tscResult.errors,
         diagnostics: tscResult.diagnostics,
       },
       lint,
@@ -419,8 +416,7 @@ async function build(info: ServerBuildInfo): Promise<ServerBuildResult> {
       logger.debug(`[${info.name}] 스택 트레이스:\n${stack}`);
     }
     return {
-      js: { success: false, errors: [message] },
-      dts: { success: false, errors: [message], diagnostics: [] },
+      build: { success: false, errors: [message], diagnostics: [] },
       mainJsPath,
     };
   }
@@ -437,7 +433,8 @@ let watchLintRunner: LintWithProgramRunner | undefined;
  */
 async function rebuildAll(): Promise<ServerCombinedBuildEvent> {
   const info = watchInfo!;
-  const mainJsPath = path.join(info.pkgDir, "dist", "main.js");
+  logger.debug(`[${info.name}] rebuildAll 시작`);
+  const mainJsPath = pathx.posixResolve(info.pkgDir, "dist", "main.js");
   const parsedConfig = parseTsconfig(info.pkgDir);
 
   // esbuild rebuild (async)
@@ -469,11 +466,13 @@ async function rebuildAll(): Promise<ServerCombinedBuildEvent> {
     output: { js: false, dts: info.output.dts },
     parsedConfig,
     env: info.output.env,
+    includeTests: info.output.includeTests,
   });
 
   // Run lint if enabled and program is available
   let lint: LintWithProgramResult | undefined;
   if (info.output.lint === true && tscResult.program != null) {
+    logger.debug(`[${info.name}] lint 시작`);
     if (watchLintRunner == null) {
       watchLintRunner = new LintWithProgramRunner({
         cwd: info.cwd,
@@ -484,15 +483,21 @@ async function rebuildAll(): Promise<ServerCombinedBuildEvent> {
       program: tscResult.program,
       affectedFiles: tscResult.affectedFiles,
     });
+    logger.debug(`[${info.name}] lint 완료`);
   }
 
   const jsResult = esbuildPromise
     ? await esbuildPromise
     : { success: true, errors: undefined, warnings: undefined };
 
+  const allErrors = [...(jsResult.errors ?? []), ...(tscResult.errors ?? [])];
+  logger.debug(`[${info.name}] rebuildAll 완료`);
   return {
-    js: { success: jsResult.success, errors: jsResult.errors, warnings: jsResult.warnings },
-    dts: { success: tscResult.success, errors: tscResult.errors },
+    build: {
+      success: jsResult.success && tscResult.success,
+      errors: allErrors.length > 0 ? allErrors : undefined,
+      warnings: jsResult.warnings,
+    },
     lint,
     mainJsPath,
   };
@@ -542,6 +547,7 @@ async function startWatch(info: ServerWatchInfo): Promise<void> {
     }
 
     // Initial build: esbuild + tsc parallel
+    sender.send("buildStart", {});
     const initialResult = await rebuildAll();
 
     // Write .config.json on first build
@@ -561,17 +567,17 @@ async function startWatch(info: ServerWatchInfo): Promise<void> {
     // Server package itself + workspace dependency packages source
     const watchDirs = [
       info.pkgDir,
-      ...workspaceDeps.map((d) => path.join(info.cwd, "packages", d)),
+      ...workspaceDeps.map((d) => pathx.posixResolve(info.cwd, "packages", d)),
     ];
     for (const dir of watchDirs) {
-      watchPaths.push(path.join(dir, "src", "**", "*"));
+      watchPaths.push(pathx.posixResolve(dir, "src", "**", "*"));
     }
 
     // ReplaceDeps dependency packages dist
     for (const pkg of replaceDeps) {
-      watchPaths.push(path.join(info.cwd, "node_modules", ...pkg.split("/"), "dist", "**", "*.{js,mjs,cjs}"));
+      watchPaths.push(pathx.posixResolve(info.cwd, "node_modules", ...pkg.split("/"), "dist", "**", "*.{js,mjs,cjs}"));
       watchPaths.push(
-        path.join(info.pkgDir, "node_modules", ...pkg.split("/"), "dist", "**", "*.{js,mjs,cjs}"),
+        pathx.posixResolve(info.pkgDir, "node_modules", ...pkg.split("/"), "dist", "**", "*.{js,mjs,cjs}"),
       );
     }
 
@@ -628,7 +634,7 @@ async function startWatch(info: ServerWatchInfo): Promise<void> {
 
         // Filter by metafile inputs
         const metafileAbsPaths = new Set(
-          Object.keys(lastMetafile.inputs).map((key) => pathx.norm(info.cwd, key)),
+          Object.keys(lastMetafile.inputs).map((key) => pathx.posixResolve(info.cwd, key)),
         );
 
         const hasRelevantChange = changes.some((c) => metafileAbsPaths.has(c.path));

package/tests/angular/vite-angular-plugin-hmr-fallback.spec.ts

@@ -138,8 +138,8 @@ describe("sdAngularPlugin CSS HMR compatibility", () => {
     await (plugin as any).buildEnd?.call({});
   });
 
-  // Unit: .scss 파일은 위임하지 않고 Angular가 처리한다 (대조군)
-  it("processes .scss files (does NOT delegate to Vite default)", async () => {
+  // Unit: .scss 파일이 TS 프로그램에 없으면 리빌드를 건너뛴다
+  it("skips .scss files not in the TypeScript program", async () => {
     const onBuildStart = vi.fn();
     const onBuild = vi.fn();
     const plugin = sdAngularPlugin({
@@ -151,6 +151,10 @@ describe("sdAngularPlugin CSS HMR compatibility", () => {
 
     await (plugin as any).buildStart?.call({});
 
+    // buildStart 완료 후 초기 빌드 결과 콜백 리셋
+    onBuildStart.mockClear();
+    onBuild.mockClear();
+
     const scssFilePath = path
       .join(FIXTURE_DIR, "src/styles.scss")
       .replace(/\\/g, "/");
@@ -163,12 +167,12 @@ describe("sdAngularPlugin CSS HMR compatibility", () => {
       read: () => Promise.resolve(""),
     });
 
-    // .scss는 Angular가 처리하므로 undefined가 아닌 배열 반환
-    expect(Array.isArray(result)).toBe(true);
+    // .scss 파일이 TS 프로그램에 없으므로 undefined 반환 (리빌드 건너뜀)
+    expect(result).toBeUndefined();
 
-    // Angular compiler update가 호출되어야 한다
-    expect(onBuildStart).toHaveBeenCalled();
-    expect(onBuild).toHaveBeenCalled();
+    // Angular compiler update가 호출되지 않아야 한다
+    expect(onBuildStart).not.toHaveBeenCalled();
+    expect(onBuild).not.toHaveBeenCalled();
 
     await (plugin as any).buildEnd?.call({});
   });

package/tests/angular/vite-angular-plugin-lint.spec.ts

@@ -19,7 +19,12 @@ vi.mock("../../src/utils/lint-with-program", () => ({
   LintWithProgramRunner: MockLintWithProgramRunner,
 }));
 
-const mockTsProgram = { getSourceFiles: () => [] };
+const mockTsProgram = {
+  getSourceFiles: () => [
+    { fileName: "/workspace/packages/client/src/main.ts" },
+    { fileName: "/workspace/packages/client/src/app.ts" },
+  ],
+};
 
 const mockCompiler = {
   initialize: vi.fn().mockResolvedValue({ affectedFiles: new Set() }),

package/tests/capacitor/capacitor-build.spec.ts

@@ -1,3 +1,4 @@
+import path from "path";
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
 //#region Mocks
@@ -25,6 +26,14 @@ vi.mock("@simplysm/core-node", () => ({
     glob: mockFsxGlob,
     copy: mockFsxCopy,
   },
+  cpx: {
+    exec: mockCpxExec,
+    execSync: vi.fn().mockReturnValue({ stdout: "", stderr: "", exitCode: 0 }),
+  },
+  pathx: {
+    posixResolve: (...args: string[]) => path.resolve(...args).replace(/\\/g, "/"),
+    posix: (p: string) => p.replace(/\\/g, "/"),
+  },
 }));
 
 // env mock
@@ -35,14 +44,12 @@ vi.mock("@simplysm/core-common", () => ({
   }),
 }));
 
-// execa mock
+// cpx mock (was execa)
 const execaCalls: { command: string; args: string[] }[] = [];
-vi.mock("execa", () => ({
-  execa: vi.fn((...args: unknown[]) => {
-    execaCalls.push({ command: args[0] as string, args: (args[1] as string[] | undefined) ?? [] });
-    return Promise.resolve({ stdout: "", stderr: "" });
-  }),
-}));
+const mockCpxExec = vi.fn((...args: unknown[]) => {
+  execaCalls.push({ command: args[0] as string, args: (args[1] as string[] | undefined) ?? [] });
+  return Promise.resolve({ stdout: "", stderr: "", exitCode: 0 });
+});
 
 const mockFsWriteFile = vi.fn().mockResolvedValue(undefined);
 vi.mock("node:fs", () => ({

package/tests/capacitor/capacitor-icon.spec.ts

@@ -1,3 +1,4 @@
+import path from "path";
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
 //#region Mocks
@@ -23,6 +24,14 @@ vi.mock("@simplysm/core-node", () => ({
     rm: mockFsxRm,
     glob: mockFsxGlob,
   },
+  cpx: {
+    exec: mockCpxExec,
+    execSync: vi.fn().mockReturnValue({ stdout: "", stderr: "", exitCode: 0 }),
+  },
+  pathx: {
+    posixResolve: (...args: string[]) => path.resolve(...args).replace(/\\/g, "/"),
+    posix: (p: string) => p.replace(/\\/g, "/"),
+  },
 }));
 
 // env mock
@@ -33,14 +42,12 @@ vi.mock("@simplysm/core-common", () => ({
   }),
 }));
 
-// execa mock
+// cpx mock (was execa)
 const execaCalls: { command: string; args: string[] }[] = [];
-vi.mock("execa", () => ({
-  execa: vi.fn((...args: unknown[]) => {
-    execaCalls.push({ command: args[0] as string, args: (args[1] as string[] | undefined) ?? [] });
-    return Promise.resolve({ stdout: "", stderr: "" });
-  }),
-}));
+const mockCpxExec = vi.fn((...args: unknown[]) => {
+  execaCalls.push({ command: args[0] as string, args: (args[1] as string[] | undefined) ?? [] });
+  return Promise.resolve({ stdout: "", stderr: "", exitCode: 0 });
+});
 
 const mockFsWriteFile = vi.fn().mockResolvedValue(undefined);
 vi.mock("node:fs", () => ({

package/tests/capacitor/capacitor-init.spec.ts

@@ -1,3 +1,4 @@
+import path from "path";
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
 //#region Mocks
@@ -24,6 +25,14 @@ vi.mock("@simplysm/core-node", () => ({
     glob: mockFsxGlob,
     copy: mockFsxCopy,
   },
+  cpx: {
+    exec: mockCpxExec,
+    execSync: vi.fn().mockReturnValue({ stdout: "", stderr: "", exitCode: 0 }),
+  },
+  pathx: {
+    posixResolve: (...args: string[]) => path.resolve(...args).replace(/\\/g, "/"),
+    posix: (p: string) => p.replace(/\\/g, "/"),
+  },
 }));
 
 let mockEnv: Record<string, unknown> = {};
@@ -34,12 +43,10 @@ vi.mock("@simplysm/core-common", () => ({
 }));
 
 const execaCalls: { command: string; args: string[] }[] = [];
-vi.mock("execa", () => ({
-  execa: vi.fn((...args: unknown[]) => {
-    execaCalls.push({ command: args[0] as string, args: (args[1] as string[] | undefined) ?? [] });
-    return Promise.resolve({ stdout: "", stderr: "" });
-  }),
-}));
+const mockCpxExec = vi.fn((...args: unknown[]) => {
+  execaCalls.push({ command: args[0] as string, args: (args[1] as string[] | undefined) ?? [] });
+  return Promise.resolve({ stdout: "", stderr: "", exitCode: 0 });
+});
 
 const mockFsWriteFile = vi.fn().mockResolvedValue(undefined);
 vi.mock("node:fs", () => ({

package/tests/capacitor/capacitor-run.spec.ts

@@ -1,3 +1,4 @@
+import path from "path";
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
 //#region Mocks
@@ -25,6 +26,14 @@ vi.mock("@simplysm/core-node", () => ({
     glob: mockFsxGlob,
     copy: mockFsxCopy,
   },
+  cpx: {
+    exec: mockCpxExec,
+    execSync: vi.fn().mockReturnValue({ stdout: "", stderr: "", exitCode: 0 }),
+  },
+  pathx: {
+    posixResolve: (...args: string[]) => path.resolve(...args).replace(/\\/g, "/"),
+    posix: (p: string) => p.replace(/\\/g, "/"),
+  },
 }));
 
 // env mock
@@ -35,17 +44,15 @@ vi.mock("@simplysm/core-common", () => ({
   }),
 }));
 
-// execa mock — tracks commands and resolves immediately
+// cpx mock (was execa) — tracks commands and resolves immediately
 const execaCalls: { command: string; args: string[] }[] = [];
-let execaFactory: (...args: unknown[]) => Promise<{ stdout: string; stderr: string }> = () =>
-  Promise.resolve({ stdout: "", stderr: "" });
+let execaFactory: (...args: unknown[]) => Promise<{ stdout: string; stderr: string; exitCode: number }> = () =>
+  Promise.resolve({ stdout: "", stderr: "", exitCode: 0 });
 
-vi.mock("execa", () => ({
-  execa: vi.fn((...args: unknown[]) => {
-    execaCalls.push({ command: args[0] as string, args: (args[1] as string[] | undefined) ?? [] });
-    return execaFactory(...args);
-  }),
-}));
+const mockCpxExec = vi.fn((...args: unknown[]) => {
+  execaCalls.push({ command: args[0] as string, args: (args[1] as string[] | undefined) ?? [] });
+  return execaFactory(...args);
+});
 
 const mockFsWriteFile = vi.fn().mockResolvedValue(undefined);
 vi.mock("node:fs", () => ({
@@ -135,7 +142,7 @@ export default config;`;
   mockEnv = { ANDROID_HOME: "C:/Android/Sdk" };
 
   execaCalls.length = 0;
-  execaFactory = () => Promise.resolve({ stdout: "", stderr: "" });
+  execaFactory = () => Promise.resolve({ stdout: "", stderr: "", exitCode: 0 });
   mockFsWriteFile.mockReset();
   mockFsWriteFile.mockResolvedValue(undefined);
 }
@@ -195,7 +202,7 @@ describe("Capacitor.run()", () => {
           return Promise.reject(new Error("cap run failed"));
         }
       }
-      return Promise.resolve({ stdout: "", stderr: "" });
+      return Promise.resolve({ stdout: "", stderr: "", exitCode: 0 });
     };
 
     const cap = await Capacitor.create(PKG_PATH, {

package/tests/capacitor/capacitor-workspace.spec.ts

@@ -1,3 +1,4 @@
+import path from "path";
 import { describe, it, expect, vi, beforeEach } from "vitest";
 
 //#region Mocks
@@ -24,6 +25,14 @@ vi.mock("@simplysm/core-node", () => ({
     glob: mockFsxGlob,
     copy: mockFsxCopy,
   },
+  cpx: {
+    exec: mockCpxExec,
+    execSync: vi.fn().mockReturnValue({ stdout: "", stderr: "", exitCode: 0 }),
+  },
+  pathx: {
+    posixResolve: (...args: string[]) => path.resolve(...args).replace(/\\/g, "/"),
+    posix: (p: string) => p.replace(/\\/g, "/"),
+  },
 }));
 
 let mockEnv: Record<string, unknown> = {};
@@ -34,12 +43,10 @@ vi.mock("@simplysm/core-common", () => ({
 }));
 
 const execaCalls: { command: string; args: string[] }[] = [];
-vi.mock("execa", () => ({
-  execa: vi.fn((...args: unknown[]) => {
-    execaCalls.push({ command: args[0] as string, args: (args[1] as string[] | undefined) ?? [] });
-    return Promise.resolve({ stdout: "", stderr: "" });
-  }),
-}));
+const mockCpxExec = vi.fn((...args: unknown[]) => {
+  execaCalls.push({ command: args[0] as string, args: (args[1] as string[] | undefined) ?? [] });
+  return Promise.resolve({ stdout: "", stderr: "", exitCode: 0 });
+});
 
 const mockFsWriteFile = vi.fn().mockResolvedValue(undefined);
 vi.mock("node:fs", () => ({

package/tests/commands/check.spec.ts

@@ -35,8 +35,11 @@ vi.mock("../../src/utils/sd-config", () => ({
   loadSdConfig: mocks.loadSdConfig,
 }));
 
-vi.mock("execa", () => ({
-  execa: mocks.execa,
+vi.mock("@simplysm/core-node", () => ({
+  cpx: {
+    exec: mocks.execa,
+    execSync: vi.fn().mockReturnValue({ stdout: "", stderr: "", exitCode: 0 }),
+  },
 }));
 
 vi.mock("../../src/utils/package-utils", async (importOriginal) => {