@superblocksteam/vite-plugin-file-sync 2.0.0-next.9 → 2.0.0-next.90

package/dist/ai-service/state-machine/handlers/post-processing.js

@@ -1,71 +1,123 @@
 import { Paths } from "../../const.js";
-import { AddMetadataToApiYamlTransformer } from "../../transform/add-metadata-to-api-yaml/transformer.js";
-import { ApiBuilderToYamlTransformer } from "../../transform/api-builder/to-yaml-transformer.js";
-import { RemoveApiBuilderImportsTransformer } from "../../transform/remove-api-builder-imports/transformer.js";
-import { applyFileTransformations, matchPath } from "../../transform/shared.js";
-import { WorkaroundMissingSbApiTransformer } from "../../transform/workaround-missing-sbapi/transformer.js";
+import { matchMultiplePaths, renderPath } from "../../transform/shared.js";
 import { LLM_FINISHED, POST_PROCESSING_ERRORED, POST_PROCESSING_FINISHED, } from "../clark-fsm.js";
+import { sendChangeInfoHelper, DependencyInfoPath, } from "../helpers/change-info.js";
 import { sendUserMessageChannel } from "../helpers/peer.js";
 import { transitionFrom } from "../helpers/transition.js";
-export const doPostProcessing = (clark, { applicationId, organizationId, draftInterface, templateRenderer, appShell, }) => {
+export const doPostProcessing = (clark, { draftInterface, appShell }) => {
     const transitionTo = transitionFrom(clark);
+    const sendChangeInfo = sendChangeInfoHelper(clark);
     const sendUserMessage = sendUserMessageChannel(clark);
     const createDraftFiles = (files) => {
+        for (const file of files) {
+            // ui > page/api change infos: ready dot
+            void sendChangeInfo({
+                type: "ready",
+                filePath: file.filePath,
+            });
+        }
         return Promise.all(files.map((file) => draftInterface.createDraftFile(file.filePath, file.content)));
     };
+    // send ui messages and invoke package installer
+    const handleDependencies = async (packageJson) => {
+        // ui > control message A: spin
+        void sendUserMessage({
+            type: "control",
+            group: "dependency-resolve",
+            status: "pending",
+            text: "Resolving dependencies…",
+        });
+        const packageChanges = await parsePackageJsonChanges(draftInterface, packageJson.content);
+        // ui > deps change infos: spin
+        for (const change of packageChanges) {
+            void sendChangeInfo({
+                type: "pending",
+                filePath: renderPath(DependencyInfoPath, {
+                    packageName: change.package,
+                }),
+                action: change.type,
+            });
+        }
+        // ui > control message A: checkmark
+        void sendUserMessage({
+            type: "control",
+            group: "dependency-resolve",
+            status: "validated",
+            text: "Resolved dependencies",
+        });
+        // any previous package changes that are still marked ready
+        // should be treated as deleted
+        const previousReadyChanges = Object.values(clark.context.generatedChangeInfo ?? {}).filter((change) => change.status === "ready" &&
+            change.action !== "delete" &&
+            change.filePath.startsWith(DependencyInfoPath));
+        // ui > deps change infos: delete
+        for (const change of previousReadyChanges) {
+            sendChangeInfo({
+                type: "ready",
+                filePath: change.filePath,
+                action: "delete",
+            });
+        }
+        // ui > control message B: spin
+        void sendUserMessage({
+            type: "control",
+            group: "dependency-validate",
+            status: "pending",
+            text: "Verifying dependencies…",
+        });
+        await appShell.runNpmInstall(clark.context.abortController?.signal);
+        // ui > deps change infos: checkmark
+        for (const change of packageChanges) {
+            sendChangeInfo({
+                type: "validated",
+                filePath: renderPath(DependencyInfoPath, {
+                    packageName: change.package,
+                }),
+            });
+        }
+        // ui > control message B: checkmark
+        void sendUserMessage({
+            type: "control",
+            group: "dependency-validate",
+            status: "validated",
+            text: "Dependencies verified",
+        });
+    };
     return async ({ event }) => {
         switch (event.type) {
             case LLM_FINISHED: {
                 const { files } = event;
+                const apiPaths = matchMultiplePaths(
+                // we have already drafted the generated apis into yaml at this point,
+                // but the api builder files are still in the event's files list
+                Paths.ApiYamls, Paths.GeneratedApis);
+                const scopePaths = matchMultiplePaths(Paths.PageScopes, Paths.AppScope);
                 try {
-                    const transformed = await applyFileTransformations(files, [
-                        new ApiBuilderToYamlTransformer({
-                            skipCleanup: true,
-                            templateRenderer,
-                        }),
-                        new AddMetadataToApiYamlTransformer({
-                            applicationId,
-                            organizationId,
-                        }),
-                        new RemoveApiBuilderImportsTransformer(),
-                        new WorkaroundMissingSbApiTransformer(),
-                    ]);
-                    const scopePathMatcher = matchPath(Paths.AllScopes);
-                    const apiPathMatcher = matchPath(Paths.ApiYamls);
-                    // bucket files because order matters
-                    const { packageJson, scopes, apiYamls, otherArtifacts } = transformed.reduce((acc, file) => {
-                        if (file.filePath === "package.json") {
+                    const { packageJson, scopes, notApiArtifacts } = files.reduce((acc, file) => {
+                        if (file.filePath === Paths.PackageJson) {
                             acc.packageJson = file;
                         }
-                        else if (scopePathMatcher(file.filePath).matched) {
+                        else if (scopePaths(file.filePath).matched) {
                             acc.scopes.push(file);
                         }
-                        else if (apiPathMatcher(file.filePath).matched) {
-                            acc.apiYamls.push(file);
-                        }
-                        else {
-                            acc.otherArtifacts.push(file);
+                        else if (!apiPaths(file.filePath).matched) {
+                            acc.notApiArtifacts.push(file);
                         }
                         return acc;
                     }, {
                         packageJson: null,
-                        apiYamls: [],
                         scopes: [],
-                        otherArtifacts: [],
+                        notApiArtifacts: [],
                     });
                     if (packageJson) {
-                        sendUserMessage({
-                            text: "Installing dependencies…",
-                        });
                         await createDraftFiles([packageJson]);
-                        await appShell.runNpmInstall(clark.context.abortController?.signal);
+                        await handleDependencies(packageJson);
                     }
                     await createDraftFiles(scopes);
-                    await createDraftFiles(apiYamls);
-                    await createDraftFiles(otherArtifacts);
+                    await createDraftFiles(notApiArtifacts);
                     transitionTo({
                         type: POST_PROCESSING_FINISHED,
-                        files: transformed,
+                        files: files,
                     });
                 }
                 catch (err) {
@@ -82,4 +134,88 @@ export const doPostProcessing = (clark, { applicationId, organizationId, draftIn
         }
     };
 };
+// get dependency changes to be shown in the ui
+export const parsePackageJsonChanges = async (draftInterface, updatedPackageJsonContent) => {
+    // TODO: as an optimization, we could get the datastructure diff form rather than string
+    const diff = await draftInterface.getDraftDiff([Paths.PackageJson]);
+    if (!diff) {
+        return [];
+    }
+    let updatedPackageJson;
+    try {
+        updatedPackageJson = JSON.parse(updatedPackageJsonContent);
+    }
+    catch {
+        return [];
+    }
+    const allCurrentPackages = new Set([
+        // we only surface packages in the dependencies object
+        ...Object.keys(updatedPackageJson.dependencies || {}),
+    ]);
+    const changes = [];
+    const lines = diff.split("\n");
+    const addedPackages = new Set();
+    const removedPackages = new Set();
+    const packageRegex = /^\s*"([^"]+)":\s*"[^"]*",?$/;
+    for (const line of lines) {
+        // Skip non-diff content lines
+        if (!line.startsWith("+") && !line.startsWith("-")) {
+            continue;
+        }
+        // Skip diff metadata lines (like +++ or ---)
+        if (line.startsWith("+++") || line.startsWith("---")) {
+            continue;
+        }
+        const lineContent = line.slice(1); // Remove +, -, or space prefix
+        const match = lineContent.match(packageRegex);
+        if (match) {
+            const packageName = match[1];
+            if (!packageName) {
+                continue;
+            }
+            if (line.startsWith("+")) {
+                // For additions, verify the package is actually in the final dependencies
+                if (allCurrentPackages.has(packageName)) {
+                    addedPackages.add(packageName);
+                }
+            }
+            else if (line.startsWith("-")) {
+                // For removals, exclude obvious top-level package.json fields
+                if (!commonTopLevelPackageJsonFields.has(packageName)) {
+                    removedPackages.add(packageName);
+                }
+            }
+        }
+    }
+    // Determine the type of change for each package
+    for (const packageName of addedPackages) {
+        if (removedPackages.has(packageName)) {
+            // Package appears in both add and remove = edit
+            changes.push({ type: "edit", package: packageName });
+        }
+        else {
+            // Package only appears in add = addition
+            changes.push({ type: "create", package: packageName });
+        }
+    }
+    for (const packageName of removedPackages) {
+        if (!addedPackages.has(packageName)) {
+            changes.push({ type: "delete", package: packageName });
+        }
+    }
+    return changes;
+};
+const commonTopLevelPackageJsonFields = new Set([
+    "name",
+    "version",
+    "description",
+    "main",
+    "scripts",
+    "keywords",
+    "author",
+    "license",
+    "repository",
+    "homepage",
+    "bugs",
+]);
 //# sourceMappingURL=post-processing.js.map

package/dist/ai-service/state-machine/handlers/post-processing.js.map

@@ -1 +1 @@
-{"version":3,"file":"post-processing.js","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/handlers/post-processing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"post-processing.js","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/handlers/post-processing.ts"],"names":[],"mappings":"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"}

package/dist/ai-service/state-machine/handlers/runtime-reviewing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-reviewing.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/handlers/runtime-reviewing.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAKV,KAAK,EACL,eAAe,EAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE/D,eAAO,MAAM,kBAAkB,GAC7B,OAAO,KAAK,EACZ,QAAQ,uBAAuB,MAIjB,WAAW,eAAe,KAAG,OAAO,CAAC,IAAI,CAwCxD,CAAC"}
+{"version":3,"file":"runtime-reviewing.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/handlers/runtime-reviewing.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAKV,KAAK,EACL,eAAe,EAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE/D,eAAO,MAAM,kBAAkB,GAC7B,OAAO,KAAK,EACZ,QAAQ,uBAAuB,MAMjB,WAAW,eAAe,KAAG,OAAO,CAAC,IAAI,CA0DxD,CAAC"}

package/dist/ai-service/state-machine/handlers/runtime-reviewing.js

@@ -1,7 +1,11 @@
 import { APP_RUNTIME_UPDATED_WITHOUT_EDITS, POST_PROCESSING_FINISHED, RUNTIME_REVIEW_ERRORED, RUNTIME_REVIEW_FINISHED, USER_REJECTED_DRAFT, } from "../clark-fsm.js";
+import { sendChangeInfoHelper } from "../helpers/change-info.js";
+import { sendUserMessageChannel } from "../helpers/peer.js";
 import { transitionFrom } from "../helpers/transition.js";
 export const doRuntimeReviewing = (clark, params) => {
     const transitionTo = transitionFrom(clark);
+    const sendChangeInfo = sendChangeInfoHelper(clark);
+    const sendUserMessage = sendUserMessageChannel(clark);
     return async ({ event }) => {
         switch (event.type) {
             case USER_REJECTED_DRAFT:
@@ -26,6 +30,20 @@ export const doRuntimeReviewing = (clark, params) => {
                         });
                     }
                     else {
+                        for (const filePath of Object.keys(clark.context.generatedChangeInfo ?? {})) {
+                            void sendChangeInfo({
+                                type: "validated",
+                                filePath,
+                            });
+                        }
+                        if (clark.context.usedDebugging) {
+                            void sendUserMessage({
+                                type: "control",
+                                group: "debugging",
+                                status: "pending",
+                                text: "QA checks passed",
+                            });
+                        }
                         transitionTo({
                             type: RUNTIME_REVIEW_FINISHED,
                         });

package/dist/ai-service/state-machine/handlers/runtime-reviewing.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-reviewing.js","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/handlers/runtime-reviewing.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iCAAiC,EACjC,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAW1D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAY,EACZ,MAA+B,EAC/B,EAAE;IACF,MAAM,YAAY,GAAG,cAAc,CAAoB,KAAK,CAAC,CAAC;IAE9D,OAAO,KAAK,EAAE,EAAE,KAAK,EAAmB,EAAiB,EAAE;QACzD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,mBAAmB;gBACtB,gCAAgC;gBAChC,0EAA0E;gBAC1E,YAAY,CAAQ;oBAClB,IAAI,EAAE,iCAAiC;iBACxC,CAAC,CAAC;gBACH,MAAM;YAER,KAAK,wBAAwB;gBAC3B,CAAC;oBACC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;oBAExB,KAAK,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;wBAChC,GAAG,OAAO;wBACV,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;qBAC3D,CAAC,CAAC,CAAC;oBAEJ,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,YAAY,CACvD,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CACtC,CAAC;oBAEF,IAAI,cAAc,EAAE,CAAC;wBACnB,YAAY,CAAiB;4BAC3B,IAAI,EAAE,sBAAsB;4BAC5B,cAAc;yBACf,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,YAAY,CAAgB;4BAC1B,IAAI,EAAE,uBAAuB;yBAC9B,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;gBACD,MAAM;YAER;gBACE,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,EAAE,CAAC,CAAC;QACjD,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"runtime-reviewing.js","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/handlers/runtime-reviewing.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iCAAiC,EACjC,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,EACvB,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAW1D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAY,EACZ,MAA+B,EAC/B,EAAE;IACF,MAAM,YAAY,GAAG,cAAc,CAAoB,KAAK,CAAC,CAAC;IAC9D,MAAM,cAAc,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,eAAe,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAEtD,OAAO,KAAK,EAAE,EAAE,KAAK,EAAmB,EAAiB,EAAE;QACzD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,mBAAmB;gBACtB,gCAAgC;gBAChC,0EAA0E;gBAC1E,YAAY,CAAQ;oBAClB,IAAI,EAAE,iCAAiC;iBACxC,CAAC,CAAC;gBACH,MAAM;YAER,KAAK,wBAAwB;gBAC3B,CAAC;oBACC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;oBAExB,KAAK,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;wBAChC,GAAG,OAAO;wBACV,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;qBAC3D,CAAC,CAAC,CAAC;oBAEJ,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,YAAY,CACvD,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CACtC,CAAC;oBAEF,IAAI,cAAc,EAAE,CAAC;wBACnB,YAAY,CAAiB;4BAC3B,IAAI,EAAE,sBAAsB;4BAC5B,cAAc;yBACf,CAAC,CAAC;oBACL,CAAC;yBAAM,CAAC;wBACN,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,IAAI,CAChC,KAAK,CAAC,OAAO,CAAC,mBAAmB,IAAI,EAAE,CACxC,EAAE,CAAC;4BACF,KAAK,cAAc,CAAC;gCAClB,IAAI,EAAE,WAAW;gCACjB,QAAQ;6BACT,CAAC,CAAC;wBACL,CAAC;wBAED,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;4BAChC,KAAK,eAAe,CAAC;gCACnB,IAAI,EAAE,SAAS;gCACf,KAAK,EAAE,WAAW;gCAClB,MAAM,EAAE,SAAS;gCACjB,IAAI,EAAE,kBAAkB;6BACzB,CAAC,CAAC;wBACL,CAAC;wBAED,YAAY,CAAgB;4BAC1B,IAAI,EAAE,uBAAuB;yBAC9B,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;gBACD,MAAM;YAER;gBACE,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,EAAE,CAAC,CAAC;QACjD,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC"}

package/dist/ai-service/state-machine/helpers/change-info.d.ts

@@ -0,0 +1,8 @@
+import type { Clark } from "../clark-fsm.js";
+export declare const DependencyInfoPath = "package.json/:packageName";
+export declare const sendChangeInfoHelper: (clark: Clark) => ({ type, filePath, action, }: {
+    type: "pending" | "error" | "ready" | "validated";
+    filePath: string;
+    action?: "create" | "edit" | "delete";
+}) => Promise<void> | undefined;
+//# sourceMappingURL=change-info.d.ts.map

package/dist/ai-service/state-machine/helpers/change-info.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-info.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/helpers/change-info.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,eAAO,MAAM,kBAAkB,8BAA8B,CAAC;AAE9D,eAAO,MAAM,oBAAoB,GAAI,OAAO,KAAK,MAsBvC,6BAIL;IACD,IAAI,EAAE,SAAS,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,CAAC;IAClD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAC;CACvC,8BA+FF,CAAC"}

package/dist/ai-service/state-machine/helpers/change-info.js

@@ -0,0 +1,109 @@
+import { basename } from "node:path";
+import { getLogger } from "../../../util/logger.js";
+import { Paths } from "../../const.js";
+import { matchPath, renderPath } from "../../transform/shared.js";
+import { sendChangeInfoChannel } from "./peer.js";
+export const DependencyInfoPath = "package.json/:packageName";
+export const sendChangeInfoHelper = (clark) => {
+    const apiPathMatcher = matchPath(Paths.GeneratedApis);
+    const componentPathMatcher = matchPath(Paths.Components);
+    const pagePathMatcher = matchPath(Paths.PageIndexes);
+    const dependencyPathMatcher = matchPath(DependencyInfoPath);
+    const sendChangeInfo = sendChangeInfoChannel(clark);
+    const push = (info) => {
+        clark.updateContext((context) => ({
+            ...context,
+            generatedChangeInfo: {
+                ...context.generatedChangeInfo,
+                [info.filePath]: info,
+            },
+        }));
+        return sendChangeInfo(info);
+    };
+    if (!clark.context.generatedChangeInfo) {
+        clark.updateContext({
+            generatedChangeInfo: {},
+        });
+    }
+    return ({ type, filePath, action, }) => {
+        const { initialFilePaths } = clark.context;
+        const existingChangeInfo = clark.context.generatedChangeInfo?.[filePath];
+        switch (type) {
+            case "ready":
+            case "validated":
+            case "error": {
+                if (!existingChangeInfo) {
+                    getLogger().warn(`[ai-service] can't update changeInfo for unknown file: ${filePath} (type: ${type}, action: ${action})`);
+                    getLogger().info(`[ai-service] ${JSON.stringify({
+                        generatedChangeInfo: clark.context.generatedChangeInfo,
+                    })}`);
+                    return;
+                }
+                return push({
+                    ...existingChangeInfo,
+                    status: type,
+                });
+            }
+            case "pending": {
+                const { apis, components } = initialFilePaths ?? {};
+                if (existingChangeInfo) {
+                    return push({
+                        ...existingChangeInfo,
+                        status: "pending",
+                    });
+                }
+                const dependencyPath = dependencyPathMatcher(filePath);
+                if (dependencyPath.matched) {
+                    const { packageName } = dependencyPath.params;
+                    return push({
+                        type: "dependency",
+                        name: packageName,
+                        action: action ?? "create",
+                        status: "pending",
+                        filePath,
+                    });
+                }
+                const componentPath = componentPathMatcher(filePath);
+                if (componentPath.matched) {
+                    let { componentName } = componentPath.params;
+                    componentName = basename(componentName, ".tsx");
+                    return push({
+                        type: "component",
+                        name: componentName,
+                        action: components?.includes(componentName) ? "edit" : "create",
+                        status: "pending",
+                        filePath,
+                    });
+                }
+                const pagePath = pagePathMatcher(filePath);
+                if (pagePath.matched) {
+                    const { pageName } = pagePath.params;
+                    return push({
+                        type: "page",
+                        name: pageName,
+                        action: "edit",
+                        status: "pending",
+                        filePath,
+                    });
+                }
+                const apiPath = apiPathMatcher(filePath);
+                if (apiPath.matched) {
+                    let { apiName } = apiPath.params;
+                    apiName = basename(apiName, ".ts");
+                    const yamlPath = renderPath(Paths.ApiYamls, {
+                        ...apiPath.params,
+                        apiName,
+                    });
+                    return push({
+                        type: "api",
+                        name: apiName,
+                        action: apis?.includes(yamlPath) ? "edit" : "create",
+                        status: "pending",
+                        filePath,
+                    });
+                }
+            }
+        }
+    };
+};
+//# sourceMappingURL=change-info.js.map

package/dist/ai-service/state-machine/helpers/change-info.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"change-info.js","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/helpers/change-info.ts"],"names":[],"mappings":"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"}

package/dist/ai-service/state-machine/helpers/peer.d.ts

@@ -1,5 +1,6 @@
 import type { Clark } from "../clark-fsm.js";
 import type { EditorClientMethods } from "@superblocksteam/library-shared/types";
-export declare const sendUserMessageChannel: (clark: Clark) => (payload: Parameters<EditorClientMethods["aiPushMessage"]>[0]) => undefined;
-export declare const sendUserCompletionChannel: (clark: Clark) => (payload: Parameters<EditorClientMethods["aiSetCompleted"]>[0]) => Promise<undefined>;
+export declare const sendUserMessageChannel: (clark: Clark) => (payload: Parameters<EditorClientMethods["aiPushMessage"]>[0], delay?: number) => Promise<void>;
+export declare const sendUserCompletionChannel: (clark: Clark) => (payload: Parameters<EditorClientMethods["aiSetCompleted"]>[0], delay?: number) => Promise<void>;
+export declare const sendChangeInfoChannel: (clark: Clark) => (payload: Parameters<EditorClientMethods["aiPushChangeInfo"]>[0], delay?: number) => Promise<void>;
 //# sourceMappingURL=peer.d.ts.map

package/dist/ai-service/state-machine/helpers/peer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"peer.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/helpers/peer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,eAAO,MAAM,sBAAsB,GAChC,OAAO,KAAK,MACZ,SAAS,UAAU,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,cAE5D,CAAC;AAEJ,eAAO,MAAM,yBAAyB,GACnC,OAAO,KAAK,MACN,SAAS,UAAU,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,uBAEnE,CAAC"}
+{"version":3,"file":"peer.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/helpers/peer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAwBjF,eAAO,MAAM,sBAAsB,GAAI,OAAO,KAAK,MAG/C,SAAS,UAAU,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,EAC5D,cAAS,kBAOZ,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,OAAO,KAAK,MAGlD,SAAS,UAAU,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,EAC7D,cAAS,kBAOZ,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,OAAO,KAAK,MAG9C,SAAS,UAAU,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,EAC/D,cAAS,kBAOZ,CAAC"}

package/dist/ai-service/state-machine/helpers/peer.js

@@ -1,7 +1,38 @@
-export const sendUserMessageChannel = (clark) => (payload) => {
-    return void clark.context.peer?.call.aiPushMessage(payload);
+import { OperationQueue } from "../../../util/operation-queue.js";
+const peerQueue = (clark) => {
+    const queue = clark.context.peerChannelQueue ?? new OperationQueue();
+    clark.updateContext({
+        peerChannelQueue: queue,
+    });
+    return (operation, delay = 0) => {
+        if (delay) {
+            queue.enqueue(() => new Promise((resolve) => {
+                setTimeout(() => {
+                    operation().then(resolve);
+                }, delay);
+            }));
+        }
+        else {
+            queue.enqueue(operation);
+        }
+    };
 };
-export const sendUserCompletionChannel = (clark) => async (payload) => {
-    return void clark.context.peer?.call.aiSetCompleted(payload);
+export const sendUserMessageChannel = (clark) => {
+    const queue = peerQueue(clark);
+    return async (payload, delay = 0) => {
+        return queue(async () => clark.context.peer?.call.aiPushMessage(payload), delay);
+    };
+};
+export const sendUserCompletionChannel = (clark) => {
+    const queue = peerQueue(clark);
+    return async (payload, delay = 0) => {
+        return queue(async () => clark.context.peer?.call.aiSetCompleted(payload), delay);
+    };
+};
+export const sendChangeInfoChannel = (clark) => {
+    const queue = peerQueue(clark);
+    return async (payload, delay = 0) => {
+        return queue(async () => clark.context.peer?.call.aiPushChangeInfo(payload), delay);
+    };
 };
 //# sourceMappingURL=peer.js.map

package/dist/ai-service/state-machine/helpers/peer.js.map

@@ -1 +1 @@
-{"version":3,"file":"peer.js","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/helpers/peer.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,sBAAsB,GACjC,CAAC,KAAY,EAAE,EAAE,CACjB,CAAC,OAA4D,EAAE,EAAE;IAC/D,OAAO,KAAK,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,yBAAyB,GACpC,CAAC,KAAY,EAAE,EAAE,CACjB,KAAK,EAAE,OAA6D,EAAE,EAAE;IACtE,OAAO,KAAK,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;AAC/D,CAAC,CAAC"}
+{"version":3,"file":"peer.js","sourceRoot":"","sources":["../../../../src/ai-service/state-machine/helpers/peer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAIlE,MAAM,SAAS,GAAG,CAAC,KAAY,EAAE,EAAE;IACjC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB,IAAI,IAAI,cAAc,EAAE,CAAC;IACrE,KAAK,CAAC,aAAa,CAAC;QAClB,gBAAgB,EAAE,KAAK;KACxB,CAAC,CAAC;IAEH,OAAO,CAAC,SAA8B,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE;QACnD,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,OAAO,CACX,GAAG,EAAE,CACH,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACtB,UAAU,CAAC,GAAG,EAAE;oBACd,SAAS,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5B,CAAC,EAAE,KAAK,CAAC,CAAC;YACZ,CAAC,CAAC,CACL,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAY,EAAE,EAAE;IACrD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,OAAO,KAAK,EACV,OAA4D,EAC5D,KAAK,GAAG,CAAC,EACT,EAAE;QACF,OAAO,KAAK,CACV,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAC3D,KAAK,CACN,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,KAAY,EAAE,EAAE;IACxD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,OAAO,KAAK,EACV,OAA6D,EAC7D,KAAK,GAAG,CAAC,EACT,EAAE;QACF,OAAO,KAAK,CACV,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAC5D,KAAK,CACN,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,KAAY,EAAE,EAAE;IACpD,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,OAAO,KAAK,EACV,OAA+D,EAC/D,KAAK,GAAG,CAAC,EACT,EAAE;QACF,OAAO,KAAK,CACV,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAC9D,KAAK,CACN,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,CAAC"}

package/dist/ai-service/state-machine/mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/ai-service/state-machine/mocks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,eAAO,MAAM,QAAQ,EAML,aAAa,CAAC,mBAAmB,CAAC,CAAC;AAEnD,eAAO,MAAM,SAAS,EAQN,KAAK,CAAC;AAEtB,eAAO,MAAM,iBAAiB,EAqDd,uBAAuB,CAAC"}
+{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../../src/ai-service/state-machine/mocks.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,eAAO,MAAM,QAAQ,EAML,aAAa,CAAC,mBAAmB,CAAC,CAAC;AAEnD,eAAO,MAAM,SAAS,EAQN,KAAK,CAAC;AAEtB,eAAO,MAAM,iBAAiB,EA6Dd,uBAAuB,CAAC"}

package/dist/ai-service/state-machine/mocks.js

@@ -33,9 +33,17 @@ export const mockHandlerParams = {
     signals: {
         emit: vi.fn(),
     },
+    sourceTrackerInterface: {
+        getElementToFilePathMap: vi.fn(),
+    },
     appShell: {
         appRootDirPath: "/test/app",
-        readFiles: vi.fn(),
+        readFiles: vi.fn().mockReturnValue([
+            {
+                name: "test.ts",
+                content: 'console.log("test");',
+            },
+        ]),
         runTypecheck: vi.fn(),
     },
     artifactProcessor: {

package/dist/ai-service/state-machine/mocks.js.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.js","sourceRoot":"","sources":["../../../src/ai-service/state-machine/mocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,IAAI,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAK5B,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,IAAI,EAAE;QACJ,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE;QACtB,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;KACxB;IACD,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;CACkC,CAAC;AAEnD,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,KAAK,EAAE,MAAM;IACb,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;IAC3B,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;IACpB,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE;IACtB,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;IACvB,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE;IACzB,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;CACM,CAAC;AAEtB,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,cAAc,EAAE;QACd,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;QACxB,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE;KACtB;IACD,cAAc,EAAE,WAAW;IAC3B,gBAAgB,EAAE;QAChB,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;QACZ,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;KACxD;IACD,gBAAgB,EAAE;QAChB,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE;KAChB;IACD,OAAO,EAAE;QACP,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;KACd;IACD,QAAQ,EAAE;QACR,cAAc,EAAE,WAAW;QAC3B,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE;QAClB,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE;KACtB;IACD,iBAAiB,EAAE;QACjB,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE;QAChB,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;YAC5C;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,sBAAsB;aAChC;SACF,CAAC;QACF,qBAAqB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;YAC7C,KAAK,EAAE,CAAC,SAAS,CAAC;YAClB,OAAO,EAAE,mBAAmB;SAC7B,CAAC;KACH;IACD,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CACxC,IAAI,mBAAmB,CAAC;QACtB,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;YACrB,MAAM,EAAE,sBAAsB,CAAC;gBAC7B,MAAM,EAAE;oBACN,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,EAAE;oBAC1C,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE;oBAC5C;wBACE,IAAI,EAAE,QAAQ;wBACd,YAAY,EAAE,MAAM;wBACpB,QAAQ,EAAE,SAAS;wBACnB,KAAK,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC,EAAE;qBACjD;iBACF;aACF,CAAC;YACF,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE;SAC9C,CAAC;KACH,CAAC,CACH;CACoC,CAAC"}
+{"version":3,"file":"mocks.js","sourceRoot":"","sources":["../../../src/ai-service/state-machine/mocks.ts"],"names":[],"mappings":"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"}

package/dist/ai-service/transform/api-builder/shared.js

@@ -13,7 +13,7 @@ export class ApiBuilderTransformer extends FileTransformer {
     runEvaluation(cwd) {
         return new Promise((resolve, reject) => {
             const logger = getLogger();
-            logger.debug("[ai-service] Evaluating in", cwd);
+            logger.debug(`[ai-service] Evaluating in ${cwd}`);
             const tsc = spawn("npx", ["tsc", "--noEmitOnError", "false"], { cwd });
             tsc.stdout.on("data", (data) => {
                 logger.info("[ai-service] tsc stdout", data.toString());

package/dist/ai-service/transform/api-builder/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/ai-service/transform/api-builder/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/C,MAAM,OAAgB,qBAGpB,SAAQ,eAA0B;IAIf;IAHnB,YACE,GAAQ,EACR,IAAU,EACO,gBAAkC;QAEnD,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAFA,qBAAgB,GAAhB,gBAAgB,CAAkB;IAGrD,CAAC;IAIS,KAAK,CAAC,cAAc;QAC5B,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;IACrE,CAAC;IAES,aAAa,CAAC,GAAW;QACjC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAC3B,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;YAChD,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YAEvE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBACvB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,yDAAyD;oBACzD,iBAAiB;oBACjB,eAAe;oBACf,iFAAiF;oBACjF,OAAO;oBACP,KAAK;gBACP,CAAC;gBAED,MAAM,SAAS,GAAG,KAAK,CACrB,MAAM,EACN,CAAC,UAAU,EAAE,iBAAiB,EAAE,IAAI,CAAC,UAAU,CAAC,EAChD,EAAE,GAAG,EAAE,CACR,CAAC;gBAEF,IAAI,UAAU,GAAG,EAAE,CAAC;gBACpB,IAAI,SAAS,GAAG,EAAE,CAAC;gBAEnB,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACnC,UAAU,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,CAAC,CAAC,CAAC;gBAEH,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACnC,SAAS,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC/B,CAAC,CAAC,CAAC;gBAEH,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC7B,IAAI,IAAI,KAAK,CAAC,IAAI,SAAS,EAAE,CAAC;wBAC5B,OAAO,MAAM,CACX,IAAI,KAAK,CACP,uCAAuC,IAAI,KAAK,SAAS,EAAE,CAC5D,CACF,CAAC;oBACJ,CAAC;oBAED,IAAI,CAAC;wBACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;wBACtC,OAAO,CAAC,MAAM,CAAC,CAAC;oBAClB,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,MAAM,CAAC,IAAI,KAAK,CAAC,sCAAsC,KAAK,EAAE,CAAC,CAAC,CAAC;oBACnE,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/ai-service/transform/api-builder/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI/C,MAAM,OAAgB,qBAGpB,SAAQ,eAA0B;IAIf;IAHnB,YACE,GAAQ,EACR,IAAU,EACO,gBAAkC;QAEnD,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAFA,qBAAgB,GAAhB,gBAAgB,CAAkB;IAGrD,CAAC;IAIS,KAAK,CAAC,cAAc;QAC5B,OAAO,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;IACrE,CAAC;IAES,aAAa,CAAC,GAAW;QACjC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAC3B,MAAM,CAAC,KAAK,CAAC,8BAA8B,GAAG,EAAE,CAAC,CAAC;YAClD,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YAEvE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBAC7B,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC1D,CAAC,CAAC,CAAC;YAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBACvB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,yDAAyD;oBACzD,iBAAiB;oBACjB,eAAe;oBACf,iFAAiF;oBACjF,OAAO;oBACP,KAAK;gBACP,CAAC;gBAED,MAAM,SAAS,GAAG,KAAK,CACrB,MAAM,EACN,CAAC,UAAU,EAAE,iBAAiB,EAAE,IAAI,CAAC,UAAU,CAAC,EAChD,EAAE,GAAG,EAAE,CACR,CAAC;gBAEF,IAAI,UAAU,GAAG,EAAE,CAAC;gBACpB,IAAI,SAAS,GAAG,EAAE,CAAC;gBAEnB,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACnC,UAAU,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,CAAC,CAAC,CAAC;gBAEH,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACnC,SAAS,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC/B,CAAC,CAAC,CAAC;gBAEH,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC7B,IAAI,IAAI,KAAK,CAAC,IAAI,SAAS,EAAE,CAAC;wBAC5B,OAAO,MAAM,CACX,IAAI,KAAK,CACP,uCAAuC,IAAI,KAAK,SAAS,EAAE,CAC5D,CACF,CAAC;oBACJ,CAAC;oBAED,IAAI,CAAC;wBACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;wBACtC,OAAO,CAAC,MAAM,CAAC,CAAC;oBAClB,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,MAAM,CAAC,IAAI,KAAK,CAAC,sCAAsC,KAAK,EAAE,CAAC,CAAC,CAAC;oBACnE,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}

package/dist/ai-service/transform/api-builder/to-sdk-transformer.js

@@ -18,7 +18,7 @@ export class YamlToApiBuilderTransformer extends ApiBuilderTransformer {
         // TODO: move the following to the AppShell service
         const apiDir = path.join(this.config.appRootDirPath, path.dirname(relativePath));
         const parentDir = path.dirname(apiDir);
-        return readAppApiYamlFile(parentDir, pathParams.apiName);
+        return readAppApiYamlFile(parentDir, pathParams.apiName, false);
     }
     async transform(src) {
         // prepare the template

package/dist/ai-service/transform/api-builder/to-sdk-transformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"to-sdk-transformer.js","sourceRoot":"","sources":["../../../../src/ai-service/transform/api-builder/to-sdk-transformer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"to-sdk-transformer.js","sourceRoot":"","sources":["../../../../src/ai-service/transform/api-builder/to-sdk-transformer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAQpD,MAAM,GAAG,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAW,CAAC;AAC9C,MAAM,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,aAAa,EAAW,CAAC;AAKpD,MAAM,OAAO,2BAA4B,SAAQ,qBAGhD;IAIoB;IAHT,UAAU,GAAG,0BAA0B,CAAC;IAElD,YACmB,MAKhB;QAED,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAPzB,WAAM,GAAN,MAAM,CAKtB;IAGH,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,UAAsC;QAEtC,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAE5D,mDAAmD;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CACtB,IAAI,CAAC,MAAM,CAAC,cAAc,EAC1B,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAC3B,CAAC;QACF,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,OAAO,kBAAkB,CAAC,SAAS,EAAE,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,SAAS,CACb,GAA0B;QAE1B,uBAAuB;QACvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QAEnD,IAAI,aAAa,GAAG,MAAM,EAAE,CAAC,QAAQ,CACnC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,EACrC,OAAO,CACR,CAAC;QAEF,6CAA6C;QAC7C,aAAa,GAAG,aAAa,CAAC,OAAO,CACnC,sBAAsB,EACtB,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAC/D,CAAC;QAEF,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;YAC/B,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAE7D,yCAAyC;YACzC,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CACjC,kBAAkB,EAClB,gBAAgB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CACvC,CAAC;YAEF,MAAM,QAAQ,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC;YAEpD,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAEvD,4DAA4D;QAC5D,6CAA6C;QAC7C,MAAM,kBAAkB,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CACxC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACX,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC;YACtD,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAA4B,CAC7B,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,EAAE;YACxE,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;YAClD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,sEAAsE;gBACtE,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAC;YAC5D,CAAC;YAED,OAAO;gBACL,UAAU,EAAE;oBACV,QAAQ;oBACR,OAAO,EAAE,GAAG,OAAO,KAAK;iBACzB;gBACD,OAAO;aACR,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC7B,MAAM,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO;YACL,IAAI,EAAE,OAAO;SACd,CAAC;IACJ,CAAC;CACF"}