@simplysm/sd-cli 14.0.16 → 14.0.18

package/src/utils/angular-compiler.ts

@@ -285,11 +285,16 @@ export class AngularCompiler {
     const programFiles = tsProgram.getSourceFiles();
     logger.debug(`ts.Program 소스 파일: ${programFiles.length}개`);
 
-    // 9. BuilderProgram 생성
+    // 9. BuilderProgram 생성 (진단 + affected file 탐지용)
+    //    .tsbuildinfo에서 이전 상태를 복원하여 프로세스 재시작 후에도 incremental 진단 유지
+    let oldBuilderProgram = this._builderProgram;
+    if (oldBuilderProgram == null) {
+      oldBuilderProgram = ts.readBuilderProgram(mergedOptions, host) ?? undefined;
+    }
     const builderProgram = ts.createEmitAndSemanticDiagnosticsBuilderProgram(
       tsProgram,
       host,
-      this._builderProgram,
+      oldBuilderProgram,
     );
 
     // 10. AOT 분석
@@ -446,7 +451,7 @@ export class AngularCompiler {
     }
 
     const angularCompiler = this._ngtscProgram.compiler;
-    const builderProgram = this._builderProgram;
+    const tsProgram = this._ngtscProgram.getTsProgram();
     const affectedFiles = this._affectedFiles;
 
     // 2. prepareEmit() → Angular transformers 획득
@@ -466,7 +471,6 @@ export class AngularCompiler {
 
     // 4. emit 결과를 수집하는 구조
     const emitResults: EmitResult[] = [];
-    const emittedSourceFiles = new Set<ts.SourceFile>();
     const emitDeclarationOnly = !!compilerOptions.emitDeclarationOnly;
 
     const writeFileCallback: ts.WriteFileCallback = (
@@ -484,25 +488,16 @@ export class AngularCompiler {
         return;
       }
       angularCompiler.incrementalCompilation.recordSuccessfulEmit(sourceFile);
-      emittedSourceFiles.add(sourceFile);
       emitResults.push({ filename, contents, sourceFileName: sourceFile.fileName });
     };
 
-    // 5. emitNextAffectedFile 루프
-    while (
-      builderProgram.emitNextAffectedFile(
-        writeFileCallback,
-        undefined,
-        emitDeclarationOnly,
-        transformers,
-      )
-    ) {
-      /* empty */
-    }
-
-    // 6. 2차 루프: TypeScript가 affected로 판단하지 않았지만 Angular이 처리해야 할 파일
-    for (const sourceFile of builderProgram.getSourceFiles()) {
-      if (emittedSourceFiles.has(sourceFile) || angularCompiler.ignoreForEmit.has(sourceFile)) {
+    // 5. ts.Program.emit()으로 직접 emit (NgtscProgram.emit 패턴)
+    //    EmitAndSemanticDiagnosticsBuilderProgram.emitNextAffectedFile()은 내부적으로
+    //    emitKind를 DTS-only로 결정할 수 있어 Angular before transformer가 .js를 생성하지 않고
+    //    DtsTransformRegistry에 메타데이터를 등록하지 않는 문제가 있다.
+    //    ts.Program.emit()을 직접 호출하면 항상 full emit이 수행된다.
+    for (const sourceFile of tsProgram.getSourceFiles()) {
+      if (angularCompiler.ignoreForEmit.has(sourceFile)) {
         continue;
       }
       if (sourceFile.isDeclarationFile) {
@@ -514,7 +509,7 @@ export class AngularCompiler {
       ) {
         continue;
       }
-      builderProgram.emit(
+      tsProgram.emit(
         sourceFile,
         writeFileCallback,
         undefined,
@@ -523,6 +518,11 @@ export class AngularCompiler {
       );
     }
 
+    // 6. .tsbuildinfo 영속화 (프로세스 재시작 후 incremental 진단 유지)
+    //    TS 5.9에서 emitBuildInfo()가 제거됨. emit()이 내부적으로 build info를 기록한다.
+    //    no-op writeFile로 JS/DTS 재출력 없이 build info만 갱신.
+    this._builderProgram.emit(undefined, () => {});
+
     // 7. sourceFilter 적용 후 yield
     logger.debug(`emitAffectedFiles 완료 (${emitResults.length}개 파일)`);
     for (const result of emitResults) {

package/src/utils/esbuild-config.ts

@@ -14,9 +14,8 @@ const logger = consola.withTag("sd:cli:esbuild-config");
  * - 기타 파일(.js.map 등): 원본 내용을 그대로 비교한다
  * - 기존 파일과 내용이 동일하면 타임스탬프 보존을 위해 쓰기를 스킵한다
  */
-export async function writeChangedOutputFiles(outputFiles: esbuild.OutputFile[]): Promise<boolean> {
+export async function writeChangedOutputFiles(outputFiles: esbuild.OutputFile[]): Promise<void> {
   logger.debug(`변경된 출력 파일 쓰기 시작 (${outputFiles.length}개)`);
-  let hasChanges = false;
   await Promise.all(
     outputFiles.map(async (file) => {
       const finalText = file.path.endsWith(".js")
@@ -36,13 +35,11 @@ export async function writeChangedOutputFiles(outputFiles: esbuild.OutputFile[])
         // 파일이 아직 존재하지 않음
       }
 
-      hasChanges = true;
       await fs.mkdir(path.dirname(file.path), { recursive: true });
       await fs.writeFile(file.path, finalText);
     }),
   );
-  logger.debug(`변경된 출력 파일 쓰기 완료 (변경: ${String(hasChanges)})`);
-  return hasChanges;
+  logger.debug("변경된 출력 파일 쓰기 완료");
 }
 
 /**

package/src/utils/ngtsc-build-core.ts

@@ -59,10 +59,17 @@ export function buildCompilerOptions(
   pkgDir: string,
   output: BuildOutput,
 ): ts.CompilerOptions {
+  const needsEmit = output.js || output.dts;
   const options: ts.CompilerOptions = {
     ...baseOptions,
     sourceMap: false,
     outDir: path.join(pkgDir, "dist"),
+    incremental: true,
+    tsBuildInfoFile: path.join(
+      pkgDir,
+      ".cache",
+      needsEmit ? "ngtsc-build.tsbuildinfo" : "ngtsc-typecheck.tsbuildinfo",
+    ),
   };
 
   if (output.js && output.dts) {

package/src/utils/tsc-build.ts

@@ -30,6 +30,8 @@ export interface TscPackageBuildOptions {
   env?: TypecheckEnv;
   /** 타입체크 전용 모드에서 tests/ 파일 포함 여부. 기본값 false. */
   includeTests?: boolean;
+  /** 이전 빌드의 BuilderProgram. watch 모드에서 SourceFile 재사용을 위해 전달한다. */
+  oldBuilderProgram?: ts.EmitAndSemanticDiagnosticsBuilderProgram;
 }
 
 /**
@@ -46,6 +48,9 @@ export interface TscPackageBuildResult {
   /** 이 빌드에서 영향받은 파일 (정규화된 순방향 슬래시 경로).
    *  watch 모드에서 증분 lint에 사용한다. */
   affectedFiles?: ReadonlySet<string>;
+  /** 다음 빌드에서 SourceFile 재사용을 위한 BuilderProgram.
+   *  watch 모드에서 이 값을 저장해두고 다음 빌드 시 oldBuilderProgram으로 전달한다. */
+  builderProgram?: ts.EmitAndSemanticDiagnosticsBuilderProgram;
 }
 
 /**
@@ -142,6 +147,7 @@ export function runTscPackageBuild(options: TscPackageBuildOptions): TscPackageB
       rootFiles,
       compilerOptions,
       host,
+      options.oldBuilderProgram,
     );
 
     // builder program의 증분 분석을 통해 affected 파일을 추적한다.
@@ -199,6 +205,7 @@ export function runTscPackageBuild(options: TscPackageBuildOptions): TscPackageB
       warningCount,
       program: builderProgram.getProgram(),
       affectedFiles,
+      builderProgram,
     };
   } catch (err) {
     const message = errNs.message(err);

package/src/utils/vite-config.ts

@@ -1,6 +1,5 @@
 import type { InlineConfig, PluginOption } from "vite";
 import path from "path";
-import tsconfigPaths from "vite-tsconfig-paths";
 import browserslistToEsbuild from "browserslist-to-esbuild";
 import { sdAngularPlugin } from "../angular/vite-angular-plugin.js";
 import solidPlugin from "vite-plugin-solid";
@@ -10,8 +9,7 @@ import {
 } from "./vite-scope-watch-plugin.js";
 import { sdPostCssInlinePlugin } from "../angular/vite-postcss-inline-plugin.js";
 import type { SdPwaConfig } from "../sd-config.types.js";
-import { VitePWA } from "vite-plugin-pwa";
-import { generatePwaIcons } from "./generate-pwa-icons.js";
+import { sdPwaPlugin } from "./vite-pwa-plugin.js";
 
 /** createClientViteConfig 옵션 */
 export interface CreateClientViteConfigOptions {
@@ -70,9 +68,9 @@ export interface CreateClientViteConfigOptions {
  * Angular AOT 플러그인, tsconfigPaths, env define, server/build 기본 설정,
  * browserslist, PostCSS, polyfills, legacyModule (inlineDynamicImports) 등을 통합 구성한다.
  */
-export async function createClientViteConfig(
+export function createClientViteConfig(
   options: CreateClientViteConfigOptions,
-): Promise<InlineConfig> {
+): InlineConfig {
   const name = options.pkgName.replace(/^@[^/]+\//, "");
 
   // browserslist → esbuild target
@@ -101,9 +99,7 @@ export async function createClientViteConfig(
   }
 
   // plugins
-  const plugins: PluginOption[] = [
-    tsconfigPaths({ projects: [options.tsconfigPath] }),
-  ];
+  const plugins: PluginOption[] = [];
 
   if (options.framework === "solid") {
     plugins.push(solidPlugin());
@@ -170,59 +166,23 @@ export async function createClientViteConfig(
   const config: InlineConfig = {
     root: options.pkgDir,
     base: options.base ?? `/${name}/`,
+    resolve: { tsconfigPaths: true },
     define: Object.keys(define).length > 0 ? define : undefined,
     plugins,
     server: serverConfig,
     css: cssConfig,
-    esbuild: {
-      target: esbuildTarget,
-    },
     build: {
       target: esbuildTarget,
     },
     optimizeDeps: {
       ...optimizeDepsConfig,
-      esbuildOptions: {
-        target: esbuildTarget as string[],
-      },
     },
   };
 
   // PWA (build 모드 + pwa !== false)
   if (options.mode === "build" && options.pwa !== false) {
-    const pwaConfig = typeof options.pwa === "object" ? options.pwa : {};
-
-    // 아이콘 자동 생성 (커스텀 icons 미설정 시)
-    let iconsConfig: Record<string, unknown> = {};
-    if (pwaConfig.manifest?.icons != null) {
-      iconsConfig = { icons: pwaConfig.manifest.icons };
-    } else {
-      const generatedIcons = await generatePwaIcons(options.pkgDir);
-      if (generatedIcons.length > 0) {
-        iconsConfig = { icons: generatedIcons };
-      }
-    }
-
-    const pwaManifest = {
-      name: pwaConfig.manifest?.name ?? name,
-      short_name: pwaConfig.manifest?.short_name ?? name,
-      display: pwaConfig.manifest?.display ?? "standalone",
-      theme_color: pwaConfig.manifest?.theme_color ?? "#ffffff",
-      background_color: pwaConfig.manifest?.background_color ?? "#ffffff",
-      ...iconsConfig,
-    };
-    const pwaWorkbox = {
-      globPatterns: pwaConfig.workbox?.globPatterns ?? [
-        "**/*.{js,css,html,ico,png,svg,woff2}",
-      ],
-    };
     (config.plugins as PluginOption[]).push(
-      VitePWA({
-        registerType: "prompt",
-        injectRegister: "script",
-        manifest: pwaManifest,
-        workbox: pwaWorkbox,
-      }),
+      sdPwaPlugin({ pkgDir: options.pkgDir, pkgName: name, pwa: options.pwa }),
     );
   }
 
@@ -271,24 +231,18 @@ export async function createClientViteConfig(
     }
   }
 
-  // legacyModule: true → 코드 스플리팅 비활성화 + esbuild import.meta 변환 + 잔여 import() 제거
+  // legacyModule: true → 코드 스플리팅 비활성화 + import.meta/import() 치환 (Chrome 61 호환)
   if (options.legacyModule === true) {
-    config.esbuild = {
-      ...config.esbuild,
-      supported: {
-        "import-meta": false,
-      },
-    };
     config.build = {
       ...config.build,
-      rollupOptions: {
+      rolldownOptions: {
         output: {
           inlineDynamicImports: true,
         },
       },
     };
 
-    // Rollup이 인라인하지 못한 잔여 dynamic import()를 제거한다.
+    // Rolldown이 인라인하지 못한 잔여 dynamic import()를 제거한다.
     // inlineDynamicImports가 정적 경로를 모두 인라인한 후에도,
     // @vite-ignore나 런타임 계산 경로의 import()가 남을 수 있다.
     // Chrome 61은 import() 구문을 파싱하지 못하므로 no-op 함수로 치환한다.
@@ -306,6 +260,20 @@ export async function createClientViteConfig(
         };
       },
     });
+
+    // import.meta 구문을 치환한다. Chrome 61은 import.meta를 파싱하지 못한다 (Chrome 64+).
+    // Vite/Rolldown이 빌드 시 대부분의 import.meta를 resolve하지만, 잔여분에 대한 안전망이다.
+    (config.plugins as PluginOption[]).push({
+      name: "sd-legacy-strip-import-meta",
+      enforce: "post",
+      renderChunk(code) {
+        if (!code.includes("import.meta")) return null;
+        return {
+          code: code.replace(/\bimport\.meta\b/g, "(void 0)"),
+          map: null,
+        };
+      },
+    });
   }
 
   // build 모드 설정 (프로덕션 빌드 또는 legacyModule dev)

package/src/utils/vite-pwa-plugin.ts

@@ -0,0 +1,168 @@
+import type { PluginOption, ResolvedConfig } from "vite";
+import type { SdPwaConfig } from "../sd-config.types.js";
+import { generatePwaIcons } from "./generate-pwa-icons.js";
+import fs from "node:fs";
+import path from "node:path";
+import { glob } from "glob";
+
+export interface SdPwaPluginOptions {
+  pkgDir: string;
+  pkgName: string;
+  pwa?: SdPwaConfig;
+}
+
+export function sdPwaPlugin(options: SdPwaPluginOptions): PluginOption {
+  const pwaConfig = options.pwa ?? {};
+  let resolvedBase: string;
+  let resolvedOutDir: string;
+
+  return {
+    name: "sd-pwa",
+
+    configResolved(config: ResolvedConfig) {
+      resolvedBase = config.base;
+      resolvedOutDir = config.build.outDir;
+    },
+
+    transformIndexHtml() {
+      return [
+        {
+          tag: "link",
+          attrs: { rel: "manifest", href: "manifest.webmanifest" },
+          injectTo: "head" as const,
+        },
+        {
+          tag: "script",
+          children: generateRegistrationScript(),
+          injectTo: "body" as const,
+        },
+      ];
+    },
+
+    async closeBundle() {
+      // Read version from package.json
+      const pkgJsonPath = path.join(options.pkgDir, "package.json");
+      const pkgJson = JSON.parse(
+        fs.readFileSync(pkgJsonPath, "utf-8"),
+      ) as Record<string, unknown>;
+      const version = pkgJson["version"] as string;
+
+      // Icons
+      let iconsField: Record<string, unknown> = {};
+      if (pwaConfig.manifest?.icons != null) {
+        iconsField = { icons: pwaConfig.manifest.icons };
+      } else {
+        const generated = await generatePwaIcons(options.pkgDir);
+        if (generated.length > 0) {
+          iconsField = { icons: generated };
+        }
+      }
+
+      // Manifest
+      const manifest = {
+        name: pwaConfig.manifest?.name ?? options.pkgName,
+        short_name: pwaConfig.manifest?.short_name ?? options.pkgName,
+        display: pwaConfig.manifest?.display ?? "standalone",
+        theme_color: pwaConfig.manifest?.theme_color ?? "#ffffff",
+        background_color: pwaConfig.manifest?.background_color ?? "#ffffff",
+        start_url: ".",
+        scope: ".",
+        ...iconsField,
+      };
+
+      fs.writeFileSync(
+        path.join(resolvedOutDir, "manifest.webmanifest"),
+        JSON.stringify(manifest, null, 2),
+      );
+
+      // Precache file list
+      const globPatterns = pwaConfig.workbox?.globPatterns ?? [
+        "**/*.{js,css,html,ico,png,svg,woff2}",
+      ];
+      const globResults = await Promise.all(
+        globPatterns.map((pattern) => glob(pattern, { cwd: resolvedOutDir })),
+      );
+      const precacheUrls = [...new Set(globResults.flat())]
+        .filter((f) => f !== "sw.js" && f !== "manifest.webmanifest")
+        .map((f) => f.replace(/\\/g, "/"));
+
+      // Service Worker
+      const swContent = generateSwContent(version, resolvedBase, precacheUrls);
+      fs.writeFileSync(path.join(resolvedOutDir, "sw.js"), swContent);
+    },
+  };
+}
+
+function generateRegistrationScript(): string {
+  return `(function(){
+  if(!("serviceWorker" in navigator))return;
+  navigator.serviceWorker.register("sw.js").then(function(reg){
+    if(reg.waiting){d(reg.waiting);return}
+    reg.addEventListener("updatefound",function(){
+      var w=reg.installing;
+      if(!w)return;
+      w.addEventListener("statechange",function(){
+        if(w.state==="installed"&&navigator.serviceWorker.controller)d(w);
+      });
+    });
+  });
+  var r=false;
+  navigator.serviceWorker.addEventListener("controllerchange",function(){
+    if(!r){r=true;window.location.reload()}
+  });
+  function d(w){
+    window.dispatchEvent(new CustomEvent("sd-pwa-update-ready",{
+      detail:{update:function(){w.postMessage({type:"SKIP_WAITING"})}}
+    }));
+  }
+})();`;
+}
+
+function generateSwContent(
+  version: string,
+  base: string,
+  precacheUrls: string[],
+): string {
+  const urlsArray = JSON.stringify(precacheUrls, null, 2);
+  return `const APP_VERSION = ${JSON.stringify(version)};
+const CACHE_NAME = "precache-" + APP_VERSION;
+const BASE_URL = ${JSON.stringify(base)};
+const PRECACHE_URLS = ${urlsArray};
+
+self.addEventListener("install", (event) => {
+  event.waitUntil(
+    caches.open(CACHE_NAME).then((cache) => cache.addAll(PRECACHE_URLS))
+  );
+});
+
+self.addEventListener("activate", (event) => {
+  event.waitUntil(
+    caches.keys().then((names) =>
+      Promise.all(
+        names
+          .filter((name) => name.startsWith("precache-") && name !== CACHE_NAME)
+          .map((name) => caches.delete(name))
+      )
+    ).then(() => self.clients.claim())
+  );
+});
+
+self.addEventListener("fetch", (event) => {
+  event.respondWith(
+    caches.match(event.request).then((cached) => {
+      if (cached) return cached;
+      if (event.request.mode === "navigate") {
+        return caches.match(BASE_URL + "index.html").then((resp) => resp || fetch(event.request));
+      }
+      return fetch(event.request);
+    })
+  );
+});
+
+self.addEventListener("message", (event) => {
+  if (event.data && event.data.type === "SKIP_WAITING") {
+    self.skipWaiting();
+  }
+});
+`;
+}

package/src/utils/worker-utils.ts

@@ -1,18 +1,12 @@
-import consola, { type ConsolaInstance, LogLevels } from "consola";
-import { SdCliReporter } from "./SdCliReporter";
+import { type ConsolaInstance } from "consola";
+import { setupConsola } from "@simplysm/core-node";
 
 /**
- * 워커 스레드에서 sd-cli 리포터와 디버그 로그 레벨을 적용한다.
- *
- * SD_DEBUG 환경변수(메인 프로세스의 --debug 플래그로 설정)를 확인하고
- * 현재 워커 스레드의 consola에 디버그 로그 레벨을 적용한다.
+ * 워커 스레드에서 consola를 설정한다.
  * 워커 모듈 최상위에서 호출해야 한다.
  */
-export function applyDebugLevel(): void {
-  consola.options.reporters = [new SdCliReporter()];
-  if (process.env["SD_DEBUG"] === "true") {
-    consola.level = LogLevels.debug;
-  }
+export function setupWorkerConsola(): void {
+  setupConsola({ cli: true });
 }
 
 /**

package/src/workers/client.worker.ts

@@ -6,13 +6,13 @@ import mime from "mime";
 import { createWorker } from "@simplysm/core-node";
 import { err as errNs } from "@simplysm/core-common";
 import { consola } from "consola";
-import { registerCleanupHandlers, applyDebugLevel } from "../utils/worker-utils.js";
+import { registerCleanupHandlers, setupWorkerConsola } from "../utils/worker-utils.js";
 import { createClientViteConfig } from "../utils/vite-config.js";
 import type { ScopeWatchReplaceDep } from "../utils/vite-scope-watch-plugin.js";
 import type { SdBrowserSupportConfig, SdPwaConfig } from "../sd-config.types.js";
 import type { LintWithProgramResult } from "../utils/lint-with-program.js";
 
-applyDebugLevel();
+setupWorkerConsola();
 
 //#region Types
 
@@ -247,8 +247,13 @@ async function startWatch(info: ClientBuildInfo): Promise<ClientBuildResult> {
 
     sender.send("serverReady", { port: actualPort });
 
+    // .dev-port 기록 (device 명령어에서 자동 탐지용)
+    const distDir = path.join(info.pkgDir, "dist");
+    fs.mkdirSync(distDir, { recursive: true });
+    fs.writeFileSync(path.join(distDir, ".dev-port"), String(actualPort));
+
     // .config.json 생성
-    writeConfigJson(path.join(info.pkgDir, "dist"), info.configs);
+    writeConfigJson(distDir, info.configs);
 
     return { success: true };
   } catch (err) {
@@ -323,6 +328,9 @@ async function startLegacyWatch(info: ClientBuildInfo): Promise<ClientBuildResul
 
     sender.send("serverReady", { port: serverPort });
 
+    // .dev-port 기록 (device 명령어에서 자동 탐지용)
+    fs.writeFileSync(path.join(info.pkgDir, "dist", ".dev-port"), String(serverPort));
+
     // 첫 빌드 완료 대기
     return await new Promise<ClientBuildResult>((resolve) => {
       let firstBuildResolved = false;

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

@@ -9,9 +9,9 @@ import type { LintWithProgramResult } from "../utils/lint-with-program";
 import { runTscPackageBuild } from "../utils/tsc-build";
 import { LintWithProgramRunner } from "../utils/lint-with-program";
 import { collectDeps } from "../utils/package-utils";
-import { registerCleanupHandlers, createOnceGuard, applyDebugLevel } from "../utils/worker-utils";
+import { registerCleanupHandlers, createOnceGuard, setupWorkerConsola } from "../utils/worker-utils";
 
-applyDebugLevel();
+setupWorkerConsola();
 
 //#region Types
 
@@ -53,6 +53,7 @@ async function cleanup(): Promise<void> {
   const watcherToClose = fsWatcher;
   fsWatcher = undefined;
   lastSourceFilePaths = undefined;
+  lastBuilderProgram = undefined;
   await watcherToClose?.close();
 }
 
@@ -106,6 +107,7 @@ const guardStartWatch = createOnceGuard("startWatch");
 let watchInfo: LibraryBuildInfo | undefined;
 let watchLintRunner: LintWithProgramRunner | undefined;
 let lastSourceFilePaths: Set<string> | undefined;
+let lastBuilderProgram: ts.EmitAndSemanticDiagnosticsBuilderProgram | undefined;
 
 function extractSourceFilePaths(program: ts.Program | undefined): Set<string> | undefined {
   if (program == null) return undefined;
@@ -126,7 +128,9 @@ async function rebuildAll(): Promise<CombinedBuildEvent> {
     output: info.output,
     env: info.output.env,
     includeTests: info.output.includeTests,
+    oldBuilderProgram: lastBuilderProgram,
   });
+  lastBuilderProgram = tscResult.builderProgram ?? lastBuilderProgram;
 
   // 의존성 필터링을 위한 소스 파일 경로 업데이트
   lastSourceFilePaths = extractSourceFilePaths(tscResult.program) ?? lastSourceFilePaths;

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

@@ -3,7 +3,7 @@ import ts from "typescript";
 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";
+import { registerCleanupHandlers, createOnceGuard, setupWorkerConsola } from "../utils/worker-utils";
 import {
   runNgtscBuild,
   buildCompilerOptions,
@@ -28,7 +28,7 @@ import {
 import { AngularCompiler, AngularSourceFileCache } from "../utils/angular-compiler";
 import { collectDeps } from "../utils/package-utils";
 
-applyDebugLevel();
+setupWorkerConsola();
 
 //#region 타입 (워커 인터페이스용 re-export)
 

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

@@ -1,3 +1,4 @@
+import type ts from "typescript";
 import path from "path";
 import fs from "fs";
 import esbuild from "esbuild";
@@ -18,7 +19,7 @@ import {
 } from "../utils/esbuild-config";
 import { runTscPackageBuild } from "../utils/tsc-build";
 import { LintWithProgramRunner } from "../utils/lint-with-program";
-import { registerCleanupHandlers, createOnceGuard, applyDebugLevel } from "../utils/worker-utils";
+import { registerCleanupHandlers, createOnceGuard, setupWorkerConsola } from "../utils/worker-utils";
 import { collectDeps } from "../utils/package-utils";
 import { copyPublicFiles, watchPublicFiles } from "../utils/copy-public";
 
@@ -96,7 +97,7 @@ export interface ServerBuildWorkerEvents extends Record<string, unknown> {
 
 //#region Resource Management
 
-applyDebugLevel();
+setupWorkerConsola();
 
 const logger = consola.withTag("sd:cli:server-build:worker");
 
@@ -116,6 +117,7 @@ async function cleanup(): Promise<void> {
   const contextToDispose = esbuildContext;
   esbuildContext = undefined;
   lastMetafile = undefined;
+  lastBuilderProgram = undefined;
 
   const watcherToClose = publicWatcher;
   publicWatcher = undefined;
@@ -427,6 +429,7 @@ const guardStartWatch = createOnceGuard("startWatch");
 // watch 모드용 가변 상태
 let watchInfo: ServerWatchInfo | undefined;
 let watchLintRunner: LintWithProgramRunner | undefined;
+let lastBuilderProgram: ts.EmitAndSemanticDiagnosticsBuilderProgram | undefined;
 
 /**
  * esbuild + tsc 병렬 리빌드 (watch 모드)
@@ -467,7 +470,9 @@ async function rebuildAll(): Promise<ServerCombinedBuildEvent> {
     parsedConfig,
     env: info.output.env,
     includeTests: info.output.includeTests,
+    oldBuilderProgram: lastBuilderProgram,
   });
+  lastBuilderProgram = tscResult.builderProgram ?? lastBuilderProgram;
 
   // lint 실행 (활성화 + program 사용 가능 시)
   let lint: LintWithProgramResult | undefined;