@superblocksteam/vite-plugin-file-sync 2.0.160 → 2.0.161

package/dist/ai-service/app-interface/shell.js

@@ -42,14 +42,17 @@ import JSON5 from "json5";
 import { detect, resolveCommand } from "package-manager-detector";
 import semver from "semver";
 import { normalizePath } from "vite";
-import { isProtectedCorePackage } from "@superblocksteam/library-shared/types";
+import { isProtectedCorePackage, isValidNpmPackageName, isValidNpmVersionSpec, } from "@superblocksteam/library-shared/types";
 import { bucketNpmRegistryHost, recordNpmInstall, } from "@superblocksteam/telemetry";
 import { applyPackageJsonSubstitutions, readDeclaredDependencies, } from "../../npm/apply-package-json-substitutions.js";
 import { preparePackageJsonForCloudNpm } from "../../npm/prepare-package-json-for-cloud-npm.js";
+import { parseTsxModule } from "../../parsing/parse-tsx-module.js";
 import { getErrorMeta, getLogger } from "../../util/logger.js";
+import { ToolExecutionError } from "../agent/tools2/types.js";
 import llmobs from "../llmobs/index.js";
 import { fixLucideDynamicTypeImports, isFixableLucidePath, } from "../transform/lucide-dynamic-type-imports/transformer.js";
 import { NpmInstallBlocked, NpmInstallError, scrubSecrets, } from "../types.js";
+import { execCancellable } from "./cancellable-exec.js";
 import { CLARK_APP_BLACKLIST_PATTERNS, APPLICATION_FILE_PATTERNS, STANDARD_IGNORE_PATTERNS, } from "./constants.js";
 import { DraftManager, validateFileOperation, } from "./filesystem/index.js";
 import { Linter } from "./linter.js";
@@ -86,6 +89,14 @@ function emitIndexUnavailableMetric() {
     })
         .add(1);
 }
+function emitWriteTsxParseRejectedMetric(extension) {
+    metrics
+        .getMeter("superblocks.clark.write")
+        .createCounter("superblocks.clark.write.tsx_parse_rejected", {
+        description: "Clark write rejected because TypeScript source failed Babel parse",
+    })
+        .add(1, { extension });
+}
 /**
  * npm `--json` stdout can be prefixed with non-JSON status lines on some
  * versions (`add foo 1.2.3\n{...}`). Slice from the first `{`.
@@ -272,6 +283,12 @@ let AppShell = (() => {
          * The reporter is fire-and-forget — see `maybeReportBlockedInstall`.
          */
         reportNpmInstallBlocked;
+        /**
+         * Optional sink for privacy-safe install-gate USER_EVENT reports. One call
+         * per gated AppShell install (`install_all` / `install_specific`) with
+         * outcome + runner only. Prefetch and uninstall never report.
+         */
+        reportNpmInstallOutcome;
         /**
          * Optional deps for the install-time vulnerability index lookup.
          * When absent the malware/CVE gate is skipped (test fixtures / deliberate
@@ -283,7 +300,7 @@ let AppShell = (() => {
          * Used to enforce read-before-write pattern for AI safety.
          */
         requiredReads = new Set();
-        constructor({ appRootDirPath, fsOperationQueue, messageSender, draftInterface, templateRenderer, virtualFileSystem, pathValidator, enableDeletingLockfiles, npmRegistryClient, reportNpmInstallBlocked, packageLookup, }) {
+        constructor({ appRootDirPath, fsOperationQueue, messageSender, draftInterface, templateRenderer, virtualFileSystem, pathValidator, enableDeletingLockfiles, npmRegistryClient, reportNpmInstallBlocked, reportNpmInstallOutcome, packageLookup, }) {
             // Normalize path to handle Windows drive letter case
             this.appRootDirPath = normalizePath(appRootDirPath);
             this.fsOperationQueue = fsOperationQueue;
@@ -298,6 +315,7 @@ let AppShell = (() => {
             this.enableDeletingLockfiles = enableDeletingLockfiles ?? false;
             this.npmRegistryClient = npmRegistryClient;
             this.reportNpmInstallBlocked = reportNpmInstallBlocked;
+            this.reportNpmInstallOutcome = reportNpmInstallOutcome;
             this.packageLookup = packageLookup;
         }
         /**
@@ -439,17 +457,15 @@ let AppShell = (() => {
                     "--tsBuildInfoFile .superblocks/app.tsbuildinfo",
                 ];
             }
-            const checkForErrors = new Promise((resolve) => {
-                exec([command, ...args].join(" "), {
-                    cwd: this.appRootDirPath,
-                    encoding: "utf-8",
-                    signal: abortSignal,
-                }, (_error, stdout, stderr) => {
-                    resolve(stdout || stderr);
-                });
+            // execCancellable, not exec: aborting an exec only signals the `/bin/sh`
+            // it spawned, leaving `npx` and the `tsc` compiler underneath it running
+            // and holding their heap. Cancelled checks therefore never freed memory,
+            // and overlapping compilers accumulated until the pod was OOMKilled.
+            const output = await execCancellable([command, ...args].join(" "), {
+                cwd: this.appRootDirPath,
+                signal: abortSignal,
             });
-            const output = await checkForErrors;
-            if (!output || typeof output !== "string") {
+            if (!output) {
                 return null;
             }
             return output;
@@ -708,7 +724,7 @@ let AppShell = (() => {
         /**
          * Emit one `superblocks.npm.install.*` observation (APPS-4189 / P6.2) and
          * annotate the active llmobs span with the same dimensions. Shared by
-         * every `AppShell.*install*` method so metric and span streams join on
+         * every `AppShell` install and uninstall method so metric and span streams join on
          * (runner, registry_host, outcome) without drift. Every value flows
          * through the P6.1 sanitization helpers inside `recordNpmInstall`, so a
          * raw registry hostname or token cannot reach an exported attribute even
@@ -733,6 +749,24 @@ let AppShell = (() => {
                     "npm.ignore_scripts_appended": String(shouldIgnoreInstallScripts(registryFetchResult)),
                 },
             });
+            this.maybeReportInstallOutcome(runner, tags["npm.outcome"]);
+        }
+        /**
+         * Report a gated install outcome for Snowflake USER_EVENTs. Only
+         * `install_all` and `install_specific` run the vulnerability gate.
+         * Fire-and-forget: a reporting failure must never break the install.
+         */
+        maybeReportInstallOutcome(runner, outcome) {
+            if (runner !== "install_all" && runner !== "install_specific")
+                return;
+            if (!this.reportNpmInstallOutcome)
+                return;
+            try {
+                this.reportNpmInstallOutcome({ outcome, runner });
+            }
+            catch {
+                // USER_EVENT reporting is best-effort and must not affect the install.
+            }
         }
         /**
          * Report a blocked controlled install to the server-side audit trail
@@ -1571,6 +1605,20 @@ let AppShell = (() => {
             if (!packages || packages.length === 0) {
                 throw new Error("No packages specified for installation");
             }
+            // Specs are interpolated into a command string that `/bin/sh -c` parses,
+            // so the name and version guards belong here rather than in each caller.
+            const invalidRequested = packages
+                .map((pkg) => pkg.name)
+                .filter((name) => !isValidNpmPackageName(name));
+            if (invalidRequested.length > 0) {
+                throw new Error(`Invalid package name(s): ${invalidRequested.join(", ")}.`);
+            }
+            const invalidVersions = packages
+                .filter((pkg) => pkg.version !== undefined && !isValidNpmVersionSpec(pkg.version))
+                .map((pkg) => pkg.name);
+            if (invalidVersions.length > 0) {
+                throw new Error(`Invalid package version(s) for: ${invalidVersions.join(", ")}.`);
+            }
             const installStart = Date.now();
             let outcome = "success";
             let capturedFetchResult;
@@ -1711,6 +1759,10 @@ let AppShell = (() => {
             }
         }
         async uninstallPackages(packages, options) {
+            const invalidRequested = packages.filter((name) => !isValidNpmPackageName(name));
+            if (invalidRequested.length > 0) {
+                throw new Error(`Invalid package name(s): ${invalidRequested.join(", ")}.`);
+            }
             // Core-package guard (APPS-4527): refuse to uninstall packages the
             // platform itself depends on (`@superblocksteam/*`, react, react-router,
             // vite, …). Removing one breaks the dev server, the bundle builder, or
@@ -1721,6 +1773,9 @@ let AppShell = (() => {
                 throw new Error(`Refusing to uninstall protected core package(s): ${protectedRequested.join(", ")}. ` +
                     "These are required by the Superblocks platform (dev server, build pipeline, or app runtime) and must remain in the app.");
             }
+            const installStart = Date.now();
+            let outcome = "success";
+            let capturedFetchResult;
             // Uninstalls hit the same registry resolution rules as installs (the
             // dependency-tree solver re-reifies the remaining tree and can re-fetch
             // metadata), so they run through the SAME safety wrapper as every
@@ -1746,56 +1801,67 @@ let AppShell = (() => {
             // `shouldIgnoreInstallScripts` honours the org's `allowInstallScripts`
             // policy on uninstall too — `preuninstall` / `postuninstall` lifecycle
             // scripts are just as dangerous as install-time ones.
-            return await this.withAuthFailedRetry(async (registryFetchResult) => {
-                this.maybeShortCircuitForUnreachable(registryFetchResult, packages);
-                const ignoreScripts = shouldIgnoreInstallScripts(registryFetchResult);
-                // pnpm in local dev (avoids store/lockfile conflicts with the
-                // surrounding workspace); npm everywhere else so the `--json` error
-                // contract — and therefore the registry-blocked advice matrix —
-                // applies. Mirrors `runNpmInstall` / `installSpecificPackages`.
-                const isNpm = process.env.SUPERBLOCKS_SERVER_ENV !== "local";
-                const packageManager = isNpm ? "npm" : "pnpm";
-                const uninstallCmd = isNpm ? "uninstall" : "remove";
-                const jsonFlag = isNpm ? " --json" : "";
-                const baseCommand = `${packageManager} ${uninstallCmd} ${packages.join(" ")}${jsonFlag}`;
-                const command = ignoreScripts
-                    ? `${baseCommand} --ignore-scripts`
-                    : baseCommand;
-                return await new Promise((resolve, reject) => {
-                    exec(command, {
-                        cwd: this.appRootDirPath,
-                        env: this.installLogEnv(),
-                        timeout: 30_000,
-                        signal: options?.abortSignal,
-                        // `--json` summary can outgrow the default 1 MiB exec buffer.
-                        maxBuffer: NPM_JSON_MAX_BUFFER,
-                    }, (error, stdout, stderr) => {
-                        if (error) {
-                            // Same classifier as the install paths: a registry block
-                            // (E404 / E401 / ENOTFOUND, ...) becomes a structured
-                            // `NpmInstallBlocked` (with row-aware advice + the
-                            // auth-failed retry signal consumed by `withAuthFailedRetry`);
-                            // anything else falls back to the legacy `NpmInstallError`.
-                            // pnpm doesn't emit the `--json` envelope, so it keeps the
-                            // raw-stderr error.
-                            if (isNpm) {
-                                return reject(this.classifyNpmExecError({ stdout, stderr, message: error.message }, undefined, registryFetchResult));
+            try {
+                return await this.withAuthFailedRetry(async (registryFetchResult) => {
+                    capturedFetchResult = registryFetchResult;
+                    this.maybeShortCircuitForUnreachable(registryFetchResult, packages);
+                    const ignoreScripts = shouldIgnoreInstallScripts(registryFetchResult);
+                    // pnpm in local dev (avoids store/lockfile conflicts with the
+                    // surrounding workspace); npm everywhere else so the `--json` error
+                    // contract — and therefore the registry-blocked advice matrix —
+                    // applies. Mirrors `runNpmInstall` / `installSpecificPackages`.
+                    const isNpm = process.env.SUPERBLOCKS_SERVER_ENV !== "local";
+                    const packageManager = isNpm ? "npm" : "pnpm";
+                    const uninstallCmd = isNpm ? "uninstall" : "remove";
+                    const jsonFlag = isNpm ? " --json" : "";
+                    const baseCommand = `${packageManager} ${uninstallCmd} ${packages.join(" ")}${jsonFlag}`;
+                    const command = ignoreScripts
+                        ? `${baseCommand} --ignore-scripts`
+                        : baseCommand;
+                    return await new Promise((resolve, reject) => {
+                        exec(command, {
+                            cwd: this.appRootDirPath,
+                            env: this.installLogEnv(),
+                            timeout: 30_000,
+                            signal: options?.abortSignal,
+                            // `--json` summary can outgrow the default 1 MiB exec buffer.
+                            maxBuffer: NPM_JSON_MAX_BUFFER,
+                        }, (error, stdout, stderr) => {
+                            if (error) {
+                                // Same classifier as the install paths: a registry block
+                                // (E404 / E401 / ENOTFOUND, ...) becomes a structured
+                                // `NpmInstallBlocked` (with row-aware advice + the
+                                // auth-failed retry signal consumed by `withAuthFailedRetry`);
+                                // anything else falls back to the legacy `NpmInstallError`.
+                                // pnpm doesn't emit the `--json` envelope, so it keeps the
+                                // raw-stderr error.
+                                if (isNpm) {
+                                    return reject(this.classifyNpmExecError({ stdout, stderr, message: error.message }, undefined, registryFetchResult));
+                                }
+                                return reject(new NpmInstallError(stderr || error.message));
                             }
-                            return reject(new NpmInstallError(stderr || error.message));
-                        }
-                        // On the npm path stdout is a `--json` blob; collapse it to a
-                        // compact human-readable summary (same as
-                        // `installSpecificPackages`), falling back to raw stdout on
-                        // shape drift.
-                        return resolve({
-                            stdout: isNpm
-                                ? (parseNpmJsonSuccess(stdout) ?? stdout)
-                                : stdout,
-                            stderr,
+                            // On the npm path stdout is a `--json` blob; collapse it to a
+                            // compact human-readable summary (same as
+                            // `installSpecificPackages`), falling back to raw stdout on
+                            // shape drift.
+                            return resolve({
+                                stdout: isNpm
+                                    ? (parseNpmJsonSuccess(stdout) ?? stdout)
+                                    : stdout,
+                                stderr,
+                            });
                         });
                     });
                 });
-            });
+            }
+            catch (err) {
+                outcome = outcomeFromInstallError(err);
+                this.maybeReportBlockedInstall(err, "uninstall");
+                throw err;
+            }
+            finally {
+                this.observeNpmInstall("uninstall", capturedFetchResult, outcome, Date.now() - installStart);
+            }
         }
         static MAX_GENERATION_RUNS = 10;
         async saveGeneratedArtifact(artifact, stepId, runTimestamp) {
@@ -1999,21 +2065,29 @@ let AppShell = (() => {
             if (Buffer.isBuffer(content) && isVirtual) {
                 throw new Error(`Cannot write binary content to virtual file: ${relativePath}`);
             }
-            // Handle virtual paths
+            if (!isVirtual) {
+                validateFileOperation("write", relativePath, this.appRootDirPath, undefined, this.pathValidator, this.getFileOperationBlacklistOptions());
+                if (relativePath.endsWith(".ts") || relativePath.endsWith(".tsx")) {
+                    try {
+                        parseTsxModule(typeof content === "string" ? content : content.toString("utf8"), relativePath);
+                    }
+                    catch (error) {
+                        getLogger().warn(`TSX parse validation rejected write: ${relativePath}`, getErrorMeta(error));
+                        emitWriteTsxParseRejectedMetric(relativePath.endsWith(".tsx") ? "tsx" : "ts");
+                        const message = error instanceof Error ? error.message : String(error);
+                        throw new ToolExecutionError(`${relativePath}: ${message}`);
+                    }
+                }
+            }
             if (isVirtual) {
                 await this.virtualFs.write(relativePath, content, {
                     appRootDirPath: this.appRootDirPath,
                 });
-                // Also create a draft marker for the virtual path
                 await this.draftManager.createDraftMarker(relativePath);
                 return;
             }
-            // Validate the operation for non-virtual files
-            validateFileOperation("write", relativePath, this.appRootDirPath, undefined, this.pathValidator, this.getFileOperationBlacklistOptions());
-            // Ensure parent directory exists
             const absolutePath = path.join(this.appRootDirPath, relativePath);
             await mkdir(path.dirname(absolutePath), { recursive: true });
-            // Create draft (this queues internally via draftInterface)
             await this.draftManager.createDraft(relativePath, content);
         }
         resolveAppRelativePath(relativePath, direction) {