@kosdev-code/kos-codegen-core 0.1.0-next.789 → 0.1.0-next.792

package/index.js

@@ -977,6 +977,63 @@ function generateModel(params) {
     );
   }
 }
+function resolveModelFilePath(codegenFs, query, projects) {
+  const kosConfig = getKosProjectConfiguration(
+    codegenFs,
+    query.modelProject,
+    projects
+  );
+  const internal = !!kosConfig?.generator?.internal;
+  const project = findProjectByName(
+    codegenFs.root,
+    query.modelProject,
+    projects
+  );
+  const sourceRoot = project ? project.sourceRoot || path__namespace.join(project.root, "src") : void 0;
+  if (query.modelPath) {
+    return { modelFilePath: query.modelPath, internal, sourceRoot };
+  }
+  if (!project) {
+    throw new Error(
+      `Project not found: ${query.modelProject}. Ensure a project.json exists.`
+    );
+  }
+  const { modelNameDashCase } = normalizeAllValues({
+    modelName: query.modelName
+  });
+  const modelLocation = kosConfig?.generator?.defaults?.model?.folder || "";
+  const modelFilePath = path__namespace.join(
+    sourceRoot,
+    modelLocation,
+    modelNameDashCase,
+    `${modelNameDashCase}-model.ts`
+  );
+  if (codegenFs.exists(modelFilePath)) {
+    return { modelFilePath, internal, sourceRoot };
+  }
+  const discovered = findModelFileByName(
+    codegenFs,
+    path__namespace.join(sourceRoot, modelLocation),
+    modelNameDashCase
+  );
+  if (discovered) {
+    return { modelFilePath: discovered, internal, sourceRoot };
+  }
+  return { modelFilePath, internal, sourceRoot };
+}
+function findModelFileByName(codegenFs, searchRoot, modelNameDashCase) {
+  const fileName = `${modelNameDashCase}-model.ts`;
+  const candidates = codegenFs.listFiles(searchRoot).filter((f) => path__namespace.basename(f) === fileName).sort();
+  if (candidates.length === 0) return null;
+  if (candidates.length > 1) {
+    throw new Error(
+      `Model name '${modelNameDashCase}' is ambiguous — multiple files match ${fileName}:
+` + candidates.map((c) => `  - ${c}`).join("\n") + `
+Pass modelPath to pick one.`
+    );
+  }
+  return candidates[0];
+}
 function normalizeAddFutureOptions(codegenFs, options, projects) {
   const projectConfiguration = findProjectByName(
     codegenFs.root,
@@ -1005,9 +1062,12 @@ function normalizeAddFutureOptions(codegenFs, options, projects) {
   const nameLowerCase = normalizedValues.modelNameLowerCase;
   const projectRoot = projectConfiguration.root;
   const sourceRoot = projectConfiguration.sourceRoot || path__namespace.join(projectRoot, "src");
-  const modelLocation = kosConfig?.generator?.defaults?.model?.folder || "";
-  const modelDirectory = path__namespace.join(sourceRoot, modelLocation, nameDashCase);
-  const modelFilePath = path__namespace.join(modelDirectory, `${nameDashCase}-model.ts`);
+  const { modelFilePath } = resolveModelFilePath(
+    codegenFs,
+    { modelName: options.modelName, modelProject: options.modelProject },
+    projects
+  );
+  const modelDirectory = path__namespace.dirname(modelFilePath);
   const servicesDirectory = path__namespace.join(modelDirectory, "services");
   const servicesFilePath = codegenFs.exists(servicesDirectory) ? path__namespace.join(servicesDirectory, `${nameDashCase}-services.ts`) : void 0;
   const registrationFilePath = path__namespace.join(
@@ -1030,6 +1090,173 @@ function normalizeAddFutureOptions(codegenFs, options, projects) {
     internal
   };
 }
+function transformSourceFile(codegenFs, filePath, mutate) {
+  const content = codegenFs.read(filePath);
+  if (content === null) {
+    throw new Error(`File not found: ${filePath}`);
+  }
+  const project = new tsMorph.Project({
+    useInMemoryFileSystem: true,
+    manipulationSettings: {
+      indentationText: tsMorph.IndentationText.TwoSpaces,
+      quoteKind: tsMorph.QuoteKind.Double
+    }
+  });
+  const sourceFile = project.createSourceFile(filePath, content, {
+    overwrite: true
+  });
+  mutate(sourceFile);
+  codegenFs.write(filePath, sourceFile.getFullText());
+}
+function ensureNamedImport(sourceFile, moduleSpecifier, names) {
+  const decls = sourceFile.getImportDeclarations().filter((d) => d.getModuleSpecifierValue() === moduleSpecifier);
+  const existing = /* @__PURE__ */ new Set();
+  for (const d of decls) {
+    for (const n of d.getNamedImports()) existing.add(n.getName());
+  }
+  let target = decls.find((d) => !d.isTypeOnly());
+  if (!target) {
+    target = sourceFile.addImportDeclaration({ moduleSpecifier });
+  }
+  for (const { name, isTypeOnly } of names) {
+    if (existing.has(name)) continue;
+    target.addNamedImport({ name, isTypeOnly: !!isTypeOnly });
+    existing.add(name);
+  }
+}
+function resolveSdkModuleSpecifier(sourceFile) {
+  const decl = sourceFile.getImportDeclarations().find((d) => d.getNamedImports().some((n) => n.getName() === "kosModel"));
+  return decl?.getModuleSpecifierValue() ?? "@kosdev-code/kos-ui-sdk";
+}
+function getModelClass(sourceFile, preferName) {
+  const classes = sourceFile.getClasses();
+  const byName = preferName ? classes.find((c) => c.getName() === preferName) : void 0;
+  if (byName) return byName;
+  const impl = classes.find((c) => /ModelImpl$/.test(c.getName() ?? ""));
+  if (impl) return impl;
+  const exported = classes.find((c) => c.isExported());
+  if (exported) return exported;
+  if (classes.length > 0) return classes[0];
+  throw new Error("No class declaration found in model file.");
+}
+function addClassDecorator(cls, name, opts) {
+  if (cls.getDecorator(name)) return;
+  const typeArgs = opts?.typeArgs?.length ? `<${opts.typeArgs.join(", ")}>` : "";
+  const args = opts?.argsText ?? "";
+  const decorators = cls.getDecorators();
+  const kosModelIdx = decorators.findIndex((d) => d.getName() === "kosModel");
+  const insertIdx = kosModelIdx >= 0 ? kosModelIdx + 1 : decorators.length;
+  cls.insertDecorator(insertIdx, {
+    name: `${name}${typeArgs}`,
+    arguments: args ? [args] : []
+  });
+}
+function ensureDeclarationMerge(sourceFile, interfaceName, extendsExpr, typeParameters = []) {
+  const baseType = extendsExpr.split("<")[0].trim();
+  let iface = sourceFile.getInterface(interfaceName);
+  if (iface) {
+    const already = iface.getExtends().some((e) => e.getText().split("<")[0].trim() === baseType);
+    if (!already) iface.addExtends(extendsExpr);
+    return;
+  }
+  iface = sourceFile.addInterface({
+    name: interfaceName,
+    isExported: true,
+    typeParameters,
+    extends: [extendsExpr]
+  });
+  sourceFile.insertText(
+    iface.getStart(),
+    "// eslint-disable-next-line @typescript-eslint/no-empty-interface\n"
+  );
+}
+function ensureFileEslintDisable(sourceFile, rule) {
+  if (sourceFile.getFullText().includes(rule)) return;
+  sourceFile.insertText(0, `/* eslint-disable ${rule} */
+`);
+}
+function addDecoratedMethod(cls, spec) {
+  if (cls.getMethod(spec.name)) return false;
+  cls.addMethod({
+    name: spec.name,
+    isAsync: spec.isAsync,
+    returnType: spec.returnType,
+    parameters: spec.parameters?.map((p) => {
+      return { name: p.name, type: p.type };
+    }),
+    statements: spec.statements,
+    decorators: [
+      {
+        name: spec.decoratorName,
+        arguments: spec.decoratorArgsText ? [spec.decoratorArgsText] : []
+      }
+    ]
+  });
+  return true;
+}
+function propertyInsertIndex(cls) {
+  const props = cls.getProperties();
+  if (props.length === 0) return 0;
+  return props[props.length - 1].getChildIndex() + 1;
+}
+function addPlainProperty(cls, spec) {
+  if (cls.getProperty(spec.name)) return false;
+  cls.insertProperty(propertyInsertIndex(cls), {
+    name: spec.name,
+    type: spec.type,
+    initializer: spec.initializer,
+    isReadonly: !!spec.readonly,
+    scope: spec.scope ? SCOPE_MAP[spec.scope] : void 0,
+    hasExclamationToken: spec.initializer ? false : !!spec.hasExclamation
+  });
+  return true;
+}
+const SCOPE_MAP = {
+  private: tsMorph.Scope.Private,
+  protected: tsMorph.Scope.Protected,
+  public: tsMorph.Scope.Public
+};
+function addDecoratedProperty(cls, spec) {
+  if (cls.getProperty(spec.name)) return false;
+  cls.insertProperty(propertyInsertIndex(cls), {
+    name: spec.name,
+    type: spec.type,
+    initializer: spec.initializer,
+    scope: spec.scope ? SCOPE_MAP[spec.scope] : void 0,
+    hasExclamationToken: spec.initializer ? false : !!spec.hasExclamation,
+    decorators: [
+      spec.bare && !spec.decoratorArgsText ? { name: spec.decoratorName } : {
+        name: spec.decoratorName,
+        arguments: spec.decoratorArgsText ? [spec.decoratorArgsText] : []
+      }
+    ]
+  });
+  return true;
+}
+function addGetter(cls, spec) {
+  if (cls.getGetAccessor(spec.name)) return false;
+  const ctor = cls.getConstructors()[0];
+  const index = ctor ? ctor.getChildIndex() + 1 : propertyInsertIndex(cls);
+  cls.insertGetAccessor(index, {
+    name: spec.name,
+    returnType: spec.returnType,
+    statements: spec.statements ?? "// TODO: derive and return the computed value"
+  });
+  return true;
+}
+const LEGACY_IMPORTS = /* @__PURE__ */ new Set([
+  "setupCompleteFutureSupport",
+  "setupMinimalFutureSupport",
+  "FutureAwareContainer",
+  "FutureHandlerContainer",
+  "FutureStateAccessor",
+  "FutureUpdateHandler"
+]);
+const LEGACY_IMPLEMENTS = /* @__PURE__ */ new Set([
+  "FutureUpdateHandler",
+  "FutureHandlerContainer",
+  "FutureStateAccessor"
+]);
 class ModelFileTransformer {
   constructor(codegenFs, options) {
     this.codegenFs = codegenFs;
@@ -1037,292 +1264,173 @@ class ModelFileTransformer {
   }
   codegenFs;
   options;
+  get progressType() {
+    const { nameProperCase, updateServices } = this.options;
+    return updateServices ? `${nameProperCase}OperationProgress` : "Record<string, unknown>";
+  }
   transform() {
     const { modelFilePath } = this.options;
     if (!this.codegenFs.exists(modelFilePath)) {
       throw new Error(`Model file not found: ${modelFilePath}`);
     }
-    let content = this.codegenFs.read(modelFilePath);
-    content = this.addESLintDisable(content);
-    content = this.addImports(content);
-    content = this.addServiceImport(content);
-    content = this.addInterfaceMerging(content);
-    content = this.addDecorator(content);
-    content = this.updatePublicType(content);
-    content = this.removeLegacySetup(content);
-    content = this.addFutureMethod(content);
-    if (this.options.futureType === "complete") {
-      content = this.addOnFutureUpdateMethod(content);
-    }
-    this.codegenFs.write(modelFilePath, content);
-  }
-  addESLintDisable(content) {
-    if (content.includes("@typescript-eslint/no-unsafe-declaration-merging")) {
-      return content;
-    }
-    const eslintDisable = "/* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */\n";
-    return eslintDisable + content;
-  }
-  addImports(content) {
-    const { internal, futureType } = this.options;
-    const isComplete = futureType === "complete";
-    const kosModelImportRegex = internal ? /import\s*{\s*([^}]*kosModel[^}]*)\s*}\s*from\s*"\.\.\/\.\.\/\.\.\/core\/core\/decorators"/ : /import\s*{\s*([^}]*kosModel[^}]*)\s*}\s*from\s*"@kosdev-code\/kos-ui-sdk"/;
-    const kosModelMatch = content.match(kosModelImportRegex);
-    if (kosModelMatch) {
-      const existingImportsStr = kosModelMatch[1] || "";
-      const newImports = [
-        "kosFuture",
-        "kosFutureAware",
-        isComplete ? "KosFutureAwareFull" : "KosFutureAwareMinimal"
-      ];
-      const existingImports = existingImportsStr.split(",").map((s) => s.trim()).filter(Boolean);
-      const importsToRemove = [
-        "setupCompleteFutureSupport",
-        "setupMinimalFutureSupport"
-      ];
-      const cleanedImports = existingImports.filter(
-        (imp) => !importsToRemove.includes(imp)
-      );
-      const importsToAdd = newImports.filter(
-        (imp) => !cleanedImports.includes(imp)
-      );
-      const allImports = [...cleanedImports, ...importsToAdd];
-      const newImportLine = internal ? `import { ${allImports.join(
-        ", "
-      )} } from "../../../core/core/decorators"` : `import { ${allImports.join(", ")} } from "@kosdev-code/kos-ui-sdk"`;
-      content = content.replace(kosModelImportRegex, newImportLine);
-    }
-    const typeImportsBase = internal ? "../../../models/types/future-interfaces" : "@kosdev-code/kos-ui-sdk";
-    const futureTypeImports = ["ExternalFutureInterface", "IFutureModel"];
-    const typeImportRegex = internal ? /import type {([^}]*)} from "\.\.\/\.\.\/\.\.\/models\/types\/future-interfaces"/ : /import type {([^}]*)} from "@kosdev-code\/kos-ui-sdk"/;
-    const typeImportMatch = content.match(typeImportRegex);
-    if (typeImportMatch) {
-      const existingTypes = typeImportMatch[1] || "";
-      const existingTypesList = existingTypes.split(",").map((s) => s.trim()).filter(Boolean);
-      const typesToRemove = [
-        "FutureAwareContainer",
-        "FutureHandlerContainer",
-        "FutureStateAccessor",
-        "FutureUpdateHandler"
-      ];
-      const cleanedTypes = existingTypesList.filter(
-        (type) => !typesToRemove.includes(type)
-      );
-      const typesToAdd = futureTypeImports.filter(
-        (type) => !cleanedTypes.includes(type)
+    transformSourceFile(this.codegenFs, modelFilePath, (sf) => {
+      this.removeLegacyImports(sf);
+      this.addImports(sf);
+      const cls = getModelClass(sf, `${this.options.nameProperCase}ModelImpl`);
+      this.removeLegacyClassMembers(cls);
+      this.addDecorator(cls);
+      this.addFutureMethod(cls);
+      if (this.options.futureType === "complete") {
+        this.addOnFutureUpdateMethod(cls);
+      }
+      this.updatePublicType(sf);
+      ensureDeclarationMerge(
+        sf,
+        `${this.options.nameProperCase}ModelImpl`,
+        `${this.options.futureType === "complete" ? "KosFutureAwareFull" : "KosFutureAwareMinimal"}<${this.progressType}>`
       );
-      const allTypes = [...cleanedTypes, ...typesToAdd].join(", ");
-      const newTypeImport = `import type { ${allTypes} } from "${typeImportsBase}"`;
-      content = content.replace(typeImportRegex, newTypeImport);
-    } else {
-      const importLines = content.split("\n");
-      const lastImportIndex = importLines.findLastIndex(
-        (line) => line.trim().startsWith("import")
+      ensureFileEslintDisable(
+        sf,
+        "@typescript-eslint/no-unsafe-declaration-merging"
       );
-      if (lastImportIndex >= 0) {
-        const newTypeImport = `import type { ${futureTypeImports.join(
-          ", "
-        )} } from "${typeImportsBase}";`;
-        importLines.splice(lastImportIndex + 1, 0, newTypeImport);
-        content = importLines.join("\n");
-      }
-    }
-    return content;
+    });
   }
-  addServiceImport(content) {
-    const { nameProperCase, updateServices } = this.options;
-    if (!updateServices) {
-      return content;
-    }
-    if (content.includes(`${nameProperCase}OperationProgress`)) {
-      return content;
-    }
-    const servicesImportRegex = /import\s*{([^}]*)}\s*from\s*["']\.\/services["'];?/s;
-    const servicesMatch = content.match(servicesImportRegex);
-    if (servicesMatch) {
-      const existingImports = servicesMatch[1];
-      const cleanedImports = existingImports.split(",").map((s) => s.trim()).filter(Boolean);
-      cleanedImports.push(`${nameProperCase}OperationProgress`);
-      const newImport = `import { ${cleanedImports.join(
-        ", "
-      )} } from "./services";`;
-      content = content.replace(servicesImportRegex, newImport);
-    } else {
-      const typesImportRegex = /import\s+type\s+{[^}]*}\s+from\s+["']\.\/types["'];?/;
-      const typesMatch = content.match(typesImportRegex);
-      if (typesMatch) {
-        const newImport = `
-import type { ${nameProperCase}OperationProgress } from "./services";`;
-        content = content.replace(typesMatch[0], typesMatch[0] + newImport);
+  removeLegacyImports(sf) {
+    for (const decl of sf.getImportDeclarations()) {
+      for (const named of decl.getNamedImports()) {
+        if (LEGACY_IMPORTS.has(named.getName())) named.remove();
       }
-    }
-    return content;
-  }
-  addInterfaceMerging(content) {
-    const { nameProperCase, futureType } = this.options;
-    const isComplete = futureType === "complete";
-    const interfaceType = isComplete ? "KosFutureAwareFull" : "KosFutureAwareMinimal";
-    const progressType = this.options.updateServices ? `${nameProperCase}OperationProgress` : "Record<string, unknown>";
-    const classRegex = new RegExp(
-      `(@kosModel[^\\n]*\\n)([^\\n]*export\\s+class\\s+${nameProperCase}ModelImpl)`,
-      "m"
-    );
-    const classMatch = content.match(classRegex);
-    if (classMatch) {
-      const interfaceRegex = new RegExp(
-        `interface\\s+${nameProperCase}ModelImpl\\s+extends`
-      );
-      if (!content.match(interfaceRegex)) {
-        const interfaceMerging = `
-// Interface merging for Future Container type safety
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface ${nameProperCase}ModelImpl extends ${interfaceType}<${progressType}> {}
-
-`;
-        content = content.replace(
-          classMatch[0],
-          interfaceMerging + classMatch[0]
-        );
+      if (decl.getNamedImports().length === 0 && !decl.getDefaultImport() && !decl.getNamespaceImport()) {
+        decl.remove();
       }
     }
-    return content;
   }
-  addDecorator(content) {
-    const { nameProperCase, futureType } = this.options;
+  addImports(sf) {
+    const { internal, futureType, updateServices, nameProperCase } = this.options;
     const isComplete = futureType === "complete";
-    const classRegex = new RegExp(
-      `(@kosModel[^\\n]*\\n)((?:@[^\\n]*\\n)*)([^\\n]*export\\s+class\\s+${nameProperCase}ModelImpl)`,
-      "m"
-    );
-    const classMatch = content.match(classRegex);
-    if (classMatch) {
-      if (!classMatch[2].includes("@kosFutureAware")) {
-        const decoratorOptions = isComplete ? "" : "{ mode: 'minimal' }";
-        const futureDecorator = `@kosFutureAware(${decoratorOptions})
-`;
-        content = content.replace(
-          classMatch[0],
-          classMatch[1] + classMatch[2] + futureDecorator + classMatch[3]
-        );
+    const sdkSpec = resolveSdkModuleSpecifier(sf);
+    ensureNamedImport(sf, sdkSpec, [
+      { name: "kosFuture" },
+      { name: "kosFutureAware" },
+      {
+        name: isComplete ? "KosFutureAwareFull" : "KosFutureAwareMinimal",
+        isTypeOnly: true
       }
+    ]);
+    const typeSpec = internal ? "../../../models/types/future-interfaces" : sdkSpec;
+    ensureNamedImport(sf, typeSpec, [
+      { name: "ExternalFutureInterface", isTypeOnly: true },
+      ...isComplete ? [{ name: "IFutureModel", isTypeOnly: true }] : []
+    ]);
+    if (updateServices) {
+      ensureNamedImport(sf, "./services", [
+        { name: `${nameProperCase}OperationProgress`, isTypeOnly: true }
+      ]);
     }
-    return content;
   }
-  updatePublicType(content) {
-    const { nameProperCase, updateServices } = this.options;
-    const progressType = updateServices ? `${nameProperCase}OperationProgress` : "Record<string, unknown>";
-    const typeRegex = new RegExp(
-      `export\\s+type\\s+${nameProperCase}Model\\s*=\\s*PublicModelInterface<${nameProperCase}ModelImpl>([^;]*);`,
-      "s"
-    );
-    const typeMatch = content.match(typeRegex);
-    if (typeMatch) {
-      if (!typeMatch[1].includes("ExternalFutureInterface")) {
-        const newType = `export type ${nameProperCase}Model = PublicModelInterface<${nameProperCase}ModelImpl> & ExternalFutureInterface<${progressType}>;`;
-        content = content.replace(typeMatch[0], newType);
+  removeLegacyClassMembers(cls) {
+    for (const ctor of cls.getConstructors()) {
+      for (const stmt of ctor.getStatements()) {
+        if (/setup(Complete|Minimal)FutureSupport\s*\(\s*this\s*\)/.test(
+          stmt.getText()
+        )) {
+          stmt.remove();
+        }
       }
     }
-    return content;
+    const futureHandler = cls.getProperty("futureHandler");
+    if (futureHandler?.getTypeNode()?.getText().includes("FutureAwareContainer")) {
+      futureHandler.remove();
+    }
+    const future = cls.getProperty("future");
+    if (future?.getTypeNode()?.getText().includes("IFutureModel")) {
+      future.remove();
+    }
+    const impls = cls.getImplements();
+    for (let i = impls.length - 1; i >= 0; i--) {
+      const base = impls[i].getText().split("<")[0].trim();
+      if (LEGACY_IMPLEMENTS.has(base)) cls.removeImplements(i);
+    }
   }
-  removeLegacySetup(content) {
-    const setupRegex = /\s*setup(Complete|Minimal)FutureSupport\(this\);?\s*/g;
-    content = content.replace(setupRegex, "");
-    const propertyRegex = /\s*(public|private|protected)?\s*(declare\s+)?futureHandler[!?]?:\s*FutureAwareContainer[^;]*;\s*/g;
-    content = content.replace(propertyRegex, "");
-    const futurePropertyRegex = /\s*(public|private|protected)?\s*(declare\s+)?future\??:\s*IFutureModel[^;]*;\s*/g;
-    content = content.replace(futurePropertyRegex, "");
-    const implementsRegex = new RegExp(
-      `(implements\\s+[^{]*?)\\s*,?\\s*(FutureUpdateHandler|FutureHandlerContainer|FutureStateAccessor)`,
-      "g"
-    );
-    content = content.replace(implementsRegex, "$1");
-    content = content.replace(/,\s*,/g, ",");
-    content = content.replace(/implements\s*,/g, "implements");
-    return content;
+  addDecorator(cls) {
+    const argsText = this.options.futureType === "complete" ? "" : `{ mode: "minimal" }`;
+    addClassDecorator(cls, "kosFutureAware", { argsText });
   }
-  addFutureMethod(content) {
+  updatePublicType(sf) {
     const { nameProperCase } = this.options;
-    if (content.includes("@kosFuture()")) {
-      return content;
+    const alias = sf.getTypeAlias(`${nameProperCase}Model`);
+    if (!alias) return;
+    const text = alias.getTypeNode()?.getText() ?? "";
+    if (!text.includes(`PublicModelInterface<${nameProperCase}ModelImpl>`) || text.includes("ExternalFutureInterface")) {
+      return;
     }
-    const classRegex = new RegExp(
-      `class\\s+${nameProperCase}ModelImpl[^{]*{([\\s\\S]*)}\\s*$`,
-      "m"
+    alias.setType(
+      `PublicModelInterface<${nameProperCase}ModelImpl> & ExternalFutureInterface<${this.progressType}>`
     );
-    const classMatch = content.match(classRegex);
-    if (classMatch) {
-      const methodCode = `
-  /**
-   * Placeholder method for Future operations
-   * Replace this with your actual long-running operation
-   */
-  @kosFuture()
-  async performLongRunningOperation(): Promise<void> {
-    // TODO: Implement your long-running operation here
-    // This method should use a service that returns a Future for progress tracking
-
-    this.logger.debug(\`Starting long-running operation for \${this.id}\`);
-
-    // Example implementation pattern using services:
-    // import { perform${nameProperCase}Operation } from './services';
-    //
-    // const future = await perform${nameProperCase}Operation();
-    // return this.futureHandler.setFuture(future);
-
-    // Placeholder that doesn't actually do anything
-    await new Promise(resolve => setTimeout(resolve, 1000));
-
-    this.logger.debug(\`Completed long-running operation for \${this.id}\`);
   }
-`;
-      const classContent = classMatch[1];
-      const lastBraceIndex = classContent.lastIndexOf("}");
-      if (lastBraceIndex >= 0) {
-        const updatedContent = classContent.slice(0, lastBraceIndex) + methodCode + classContent.slice(lastBraceIndex);
-        content = content.replace(
-          classMatch[0],
-          `class ${nameProperCase}ModelImpl${classMatch[0].match(/[^{]*/)?.[0]}{${updatedContent}}`
-        );
-      }
-    }
-    return content;
+  addFutureMethod(cls) {
+    const { nameProperCase } = this.options;
+    const hasFutureMethod = cls.getMethods().some((m) => m.getDecorator("kosFuture"));
+    if (hasFutureMethod || cls.getMethod("performLongRunningOperation")) return;
+    cls.addMethod({
+      name: "performLongRunningOperation",
+      isAsync: true,
+      returnType: "Promise<void>",
+      decorators: [{ name: "kosFuture", arguments: [] }],
+      docs: [
+        {
+          description: "Placeholder method for Future operations\nReplace this with your actual long-running operation"
+        }
+      ],
+      statements: [
+        "// TODO: Implement your long-running operation here",
+        "// This method should use a service that returns a Future for progress tracking",
+        "",
+        "this.logger.debug(`Starting long-running operation for ${this.id}`);",
+        "",
+        "// Example implementation pattern using services:",
+        `// import { perform${nameProperCase}Operation } from './services';`,
+        "//",
+        `// const future = await perform${nameProperCase}Operation();`,
+        "// return this.futureHandler.setFuture(future);",
+        "",
+        "// Placeholder that doesn't actually do anything",
+        "await new Promise((resolve) => setTimeout(resolve, 1000));",
+        "",
+        "this.logger.debug(`Completed long-running operation for ${this.id}`);"
+      ]
+    });
   }
-  addOnFutureUpdateMethod(content) {
-    const { nameProperCase, updateServices } = this.options;
-    const progressType = updateServices ? `${nameProperCase}OperationProgress` : "Record<string, unknown>";
-    if (content.includes("onFutureUpdate")) {
-      return content;
-    }
-    const futureMethodRegex = /@kosFuture\(\)[^}]*}/s;
-    const futureMethodMatch = content.match(futureMethodRegex);
-    if (futureMethodMatch) {
-      const methodCode = `
-
-  /**
-   * Optional: Custom Future update handling
-   * Called whenever the Future state changes (progress, status, completion, etc.)
-   */
-  onFutureUpdate?(update: IFutureModel<${progressType}>): void {
-    // Add custom Future update logic here
-    // Examples:
-    // - Log progress milestones
-    // - Update derived state based on progress
-    // - Handle specific error conditions
-    // - Trigger notifications at certain thresholds
-
-    this.logger.debug(\`Future update for \${this.id}:\`, {
-      progress: update.progress,
-      status: update.status,
-      endState: update.endState,
-      clientData: update.clientData
+  addOnFutureUpdateMethod(cls) {
+    if (cls.getMethod("onFutureUpdate")) return;
+    cls.addMethod({
+      name: "onFutureUpdate",
+      hasQuestionToken: true,
+      returnType: "void",
+      parameters: [
+        { name: "update", type: `IFutureModel<${this.progressType}>` }
+      ],
+      docs: [
+        {
+          description: "Optional: Custom Future update handling\nCalled whenever the Future state changes (progress, status, completion, etc.)"
+        }
+      ],
+      statements: [
+        "// Add custom Future update logic here",
+        "// Examples:",
+        "// - Log progress milestones",
+        "// - Update derived state based on progress",
+        "// - Handle specific error conditions",
+        "// - Trigger notifications at certain thresholds",
+        "",
+        "this.logger.debug(`Future update for ${this.id}:`, {",
+        "  progress: update.progress,",
+        "  status: update.status,",
+        "  endState: update.endState,",
+        "  clientData: update.clientData,",
+        "});"
+      ]
     });
-  }`;
-      content = content.replace(
-        futureMethodMatch[0],
-        futureMethodMatch[0] + methodCode
-      );
-    }
-    return content;
   }
 }
 class ServiceFileTransformer {
@@ -1505,9 +1613,16 @@ class RegistrationFileTransformer {
       logger.warn("Registration file not found, skipping registration updates");
       return;
     }
-    let content = this.codegenFs.read(registrationFilePath);
+    const original = this.codegenFs.read(registrationFilePath);
+    let content = original;
     content = this.addTypeCast(content);
     content = this.updateDocumentation(content);
+    if (content === original) {
+      logger.info(
+        "Registration file has no legacy future patterns — leaving it untouched"
+      );
+      return;
+    }
     this.codegenFs.write(registrationFilePath, content);
   }
   addTypeCast(content) {
@@ -1575,7 +1690,7 @@ function addFutureToModel(codegenFs, options, projects) {
     }
     if (normalized.registrationFilePath) {
       logger.info(
-        `Would modify registration file: ${normalized.registrationFilePath}`
+        `Would update registration file (only if legacy patterns are present): ${normalized.registrationFilePath}`
       );
     }
     return;
@@ -1626,191 +1741,6 @@ function addFutureToModel(codegenFs, options, projects) {
     throw error;
   }
 }
-function resolveModelFilePath(codegenFs, query, projects) {
-  const kosConfig = getKosProjectConfiguration(
-    codegenFs,
-    query.modelProject,
-    projects
-  );
-  const internal = !!kosConfig?.generator?.internal;
-  const project = findProjectByName(
-    codegenFs.root,
-    query.modelProject,
-    projects
-  );
-  const sourceRoot = project ? project.sourceRoot || path__namespace.join(project.root, "src") : void 0;
-  if (query.modelPath) {
-    return { modelFilePath: query.modelPath, internal, sourceRoot };
-  }
-  if (!project) {
-    throw new Error(
-      `Project not found: ${query.modelProject}. Ensure a project.json exists.`
-    );
-  }
-  const { modelNameDashCase } = normalizeAllValues({
-    modelName: query.modelName
-  });
-  const modelLocation = kosConfig?.generator?.defaults?.model?.folder || "";
-  const modelFilePath = path__namespace.join(
-    sourceRoot,
-    modelLocation,
-    modelNameDashCase,
-    `${modelNameDashCase}-model.ts`
-  );
-  return { modelFilePath, internal, sourceRoot };
-}
-function transformSourceFile(codegenFs, filePath, mutate) {
-  const content = codegenFs.read(filePath);
-  if (content === null) {
-    throw new Error(`File not found: ${filePath}`);
-  }
-  const project = new tsMorph.Project({
-    useInMemoryFileSystem: true,
-    manipulationSettings: {
-      indentationText: tsMorph.IndentationText.TwoSpaces,
-      quoteKind: tsMorph.QuoteKind.Double
-    }
-  });
-  const sourceFile = project.createSourceFile(filePath, content, {
-    overwrite: true
-  });
-  mutate(sourceFile);
-  codegenFs.write(filePath, sourceFile.getFullText());
-}
-function ensureNamedImport(sourceFile, moduleSpecifier, names) {
-  const decls = sourceFile.getImportDeclarations().filter((d) => d.getModuleSpecifierValue() === moduleSpecifier);
-  const existing = /* @__PURE__ */ new Set();
-  for (const d of decls) {
-    for (const n of d.getNamedImports()) existing.add(n.getName());
-  }
-  let target = decls.find((d) => !d.isTypeOnly());
-  if (!target) {
-    target = sourceFile.addImportDeclaration({ moduleSpecifier });
-  }
-  for (const { name, isTypeOnly } of names) {
-    if (existing.has(name)) continue;
-    target.addNamedImport({ name, isTypeOnly: !!isTypeOnly });
-    existing.add(name);
-  }
-}
-function resolveSdkModuleSpecifier(sourceFile) {
-  const decl = sourceFile.getImportDeclarations().find((d) => d.getNamedImports().some((n) => n.getName() === "kosModel"));
-  return decl?.getModuleSpecifierValue() ?? "@kosdev-code/kos-ui-sdk";
-}
-function getModelClass(sourceFile, preferName) {
-  const classes = sourceFile.getClasses();
-  const impl = classes.find((c) => /ModelImpl$/.test(c.getName() ?? ""));
-  if (impl) return impl;
-  const exported = classes.find((c) => c.isExported());
-  if (exported) return exported;
-  if (classes.length > 0) return classes[0];
-  throw new Error("No class declaration found in model file.");
-}
-function addClassDecorator(cls, name, opts) {
-  if (cls.getDecorator(name)) return;
-  const typeArgs = opts?.typeArgs?.length ? `<${opts.typeArgs.join(", ")}>` : "";
-  const args = opts?.argsText ?? "";
-  const decorators = cls.getDecorators();
-  const kosModelIdx = decorators.findIndex((d) => d.getName() === "kosModel");
-  const insertIdx = kosModelIdx >= 0 ? kosModelIdx + 1 : decorators.length;
-  cls.insertDecorator(insertIdx, {
-    name: `${name}${typeArgs}`,
-    arguments: args ? [args] : []
-  });
-}
-function ensureDeclarationMerge(sourceFile, interfaceName, extendsExpr, typeParameters = []) {
-  const baseType = extendsExpr.split("<")[0].trim();
-  let iface = sourceFile.getInterface(interfaceName);
-  if (iface) {
-    const already = iface.getExtends().some((e) => e.getText().split("<")[0].trim() === baseType);
-    if (!already) iface.addExtends(extendsExpr);
-    return;
-  }
-  iface = sourceFile.addInterface({
-    name: interfaceName,
-    isExported: true,
-    typeParameters,
-    extends: [extendsExpr]
-  });
-  sourceFile.insertText(
-    iface.getStart(),
-    "// eslint-disable-next-line @typescript-eslint/no-empty-interface\n"
-  );
-}
-function ensureFileEslintDisable(sourceFile, rule) {
-  if (sourceFile.getFullText().includes(rule)) return;
-  sourceFile.insertText(0, `/* eslint-disable ${rule} */
-`);
-}
-function addDecoratedMethod(cls, spec) {
-  if (cls.getMethod(spec.name)) return false;
-  cls.addMethod({
-    name: spec.name,
-    isAsync: spec.isAsync,
-    returnType: spec.returnType,
-    parameters: spec.parameters?.map((p) => {
-      return { name: p.name, type: p.type };
-    }),
-    statements: spec.statements,
-    decorators: [
-      {
-        name: spec.decoratorName,
-        arguments: spec.decoratorArgsText ? [spec.decoratorArgsText] : []
-      }
-    ]
-  });
-  return true;
-}
-function propertyInsertIndex(cls) {
-  const props = cls.getProperties();
-  if (props.length === 0) return 0;
-  return props[props.length - 1].getChildIndex() + 1;
-}
-function addPlainProperty(cls, spec) {
-  if (cls.getProperty(spec.name)) return false;
-  cls.insertProperty(propertyInsertIndex(cls), {
-    name: spec.name,
-    type: spec.type,
-    initializer: spec.initializer,
-    isReadonly: !!spec.readonly,
-    scope: spec.scope ? SCOPE_MAP[spec.scope] : void 0,
-    hasExclamationToken: spec.initializer ? false : !!spec.hasExclamation
-  });
-  return true;
-}
-const SCOPE_MAP = {
-  private: tsMorph.Scope.Private,
-  protected: tsMorph.Scope.Protected,
-  public: tsMorph.Scope.Public
-};
-function addDecoratedProperty(cls, spec) {
-  if (cls.getProperty(spec.name)) return false;
-  cls.insertProperty(propertyInsertIndex(cls), {
-    name: spec.name,
-    type: spec.type,
-    initializer: spec.initializer,
-    scope: spec.scope ? SCOPE_MAP[spec.scope] : void 0,
-    hasExclamationToken: spec.initializer ? false : !!spec.hasExclamation,
-    decorators: [
-      spec.bare && !spec.decoratorArgsText ? { name: spec.decoratorName } : {
-        name: spec.decoratorName,
-        arguments: spec.decoratorArgsText ? [spec.decoratorArgsText] : []
-      }
-    ]
-  });
-  return true;
-}
-function addGetter(cls, spec) {
-  if (cls.getGetAccessor(spec.name)) return false;
-  const ctor = cls.getConstructors()[0];
-  const index = ctor ? ctor.getChildIndex() + 1 : propertyInsertIndex(cls);
-  cls.insertGetAccessor(index, {
-    name: spec.name,
-    returnType: spec.returnType,
-    statements: spec.statements ?? "// TODO: derive and return the computed value"
-  });
-  return true;
-}
 function buildDecoratorArgs(options) {
   const top = [];
   if (options.containerProperty) {
@@ -3120,6 +3050,7 @@ exports.pascalCase = pascalCase;
 exports.properCase = properCase;
 exports.readJson = readJson;
 exports.readNxJson = readNxJson;
+exports.resolveModelFilePath = resolveModelFilePath;
 exports.setCodegenLogger = setCodegenLogger;
 exports.updateJson = updateJson;
 exports.updateModelIndex = updateModelIndex;