@superblocksteam/sdk 2.0.153-next.2 → 2.0.153

package/src/cli-replacement/dev-startup-git-before-dbfs-order.test.mts

@@ -121,7 +121,7 @@ vi.mock("@superblocksteam/vite-plugin-file-sync/ai-service", () => ({
     removeIntegrationCache = vi.fn(async () => undefined);
     remediateDeclaredDependencies = vi.fn(async () => undefined);
     chatSessionStore = { invalidateCache: vi.fn() };
-    getNpmRegistryClient = mockGetNpmRegistryClient;
+    getNpmRegistryClient = vi.fn(() => undefined);
   },
   AiServiceFeatureFlags: class {
     static create = vi.fn(() => ({}));
@@ -136,84 +136,63 @@ vi.mock("@superblocksteam/vite-plugin-file-sync/ai-service", () => ({
 
 vi.mock("@superblocksteam/vite-plugin-file-sync/npm-registry", () => ({
   shouldIgnoreInstallScripts: vi.fn(() => false),
-  maybeWriteNpmrcForDir: vi.fn(async () => {
-    // Delay before the log push so this test fails if syncHomeNpmrc is
-    // fire-and-forget (initiation order alone would still look correct).
-    await new Promise((resolve) => setTimeout(resolve, 5));
-    startupOpLog.push("project-npmrc:maybeWriteNpmrcForDir");
-  }),
 }));
 
-const { startupOpLog, buildMockGitService, mockGetNpmRegistryClient } =
-  vi.hoisted(() => {
-    const startupOpLog: string[] = [];
-    const mockGetNpmRegistryClient = vi.fn(
-      ():
-        | {
-            getConfig: ReturnType<typeof vi.fn>;
-            organizationId: string;
-          }
-        | undefined => ({
-        organizationId: "org-1",
-        getConfig: vi.fn(async () => ({
-          source: "not-configured",
-          config: { configured: false },
-        })),
+const { startupOpLog, buildMockGitService } = vi.hoisted(() => {
+  const startupOpLog: string[] = [];
+  function buildMockGitService(cwd: string) {
+    return {
+      workDir: cwd,
+      configure: vi.fn(async () => {
+        startupOpLog.push("git:configure");
       }),
-    );
-    function buildMockGitService(cwd: string) {
-      return {
-        workDir: cwd,
-        configure: vi.fn(async () => {
-          startupOpLog.push("git:configure");
-        }),
-        init: vi.fn(async () => {
-          startupOpLog.push("git:init");
-        }),
-        addRemote: vi.fn(async () => {
-          startupOpLog.push("git:addRemote");
-        }),
-        fetch: vi.fn(async () => {
-          startupOpLog.push("git:fetch");
-        }),
-        raw: vi.fn(async (args: string | string[]) => {
-          const argv = Array.isArray(args) ? args : [args];
-          startupOpLog.push(`git:raw:${argv.join(" ")}`);
-          if (argv[0] === "ls-remote" && argv.includes("__live__")) {
-            return "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\trefs/heads/__live__\n";
-          }
-          if (argv[0] === "branch" && argv.includes("--show-current")) {
-            return "__live__\n";
-          }
-          if (argv[0] === "commit") {
-            return "";
-          }
+      init: vi.fn(async () => {
+        startupOpLog.push("git:init");
+      }),
+      addRemote: vi.fn(async () => {
+        startupOpLog.push("git:addRemote");
+      }),
+      fetch: vi.fn(async () => {
+        startupOpLog.push("git:fetch");
+      }),
+      raw: vi.fn(async (args: string | string[]) => {
+        const argv = Array.isArray(args) ? args : [args];
+        startupOpLog.push(`git:raw:${argv.join(" ")}`);
+        if (argv[0] === "ls-remote" && argv.includes("__live__")) {
+          return "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\trefs/heads/__live__\n";
+        }
+        if (argv[0] === "branch" && argv.includes("--show-current")) {
+          return "__live__\n";
+        }
+        if (argv[0] === "commit") {
           return "";
-        }),
-        push: vi.fn(async () => {
-          startupOpLog.push("git:push");
-        }),
-        getDefaultBranch: vi.fn(async () => "main"),
-        getRemotes: vi.fn(async () => [
-          { name: "origin", refs: { fetch: "https://example.test/repo.git" } },
-        ]),
-        remote: vi.fn(async () => {
-          startupOpLog.push("git:remote");
-        }),
-        revparse: vi.fn(async (ref: string) => {
-          startupOpLog.push(`git:revparse:${ref}`);
-          return "abc123\n";
-        }),
-        checkout: vi.fn(async () => {
-          startupOpLog.push("git:checkout");
-        }),
-        checkoutOrCreate: vi.fn(async () => {
-          startupOpLog.push("git:checkoutOrCreate");
-        }),
-      };
-    }
-    return { startupOpLog, buildMockGitService, mockGetNpmRegistryClient };
-  });
+        }
+        return "";
+      }),
+      push: vi.fn(async () => {
+        startupOpLog.push("git:push");
+      }),
+      getDefaultBranch: vi.fn(async () => "main"),
+      getRemotes: vi.fn(async () => [
+        { name: "origin", refs: { fetch: "https://example.test/repo.git" } },
+      ]),
+      remote: vi.fn(async () => {
+        startupOpLog.push("git:remote");
+      }),
+      revparse: vi.fn(async (ref: string) => {
+        startupOpLog.push(`git:revparse:${ref}`);
+        return "abc123\n";
+      }),
+      checkout: vi.fn(async () => {
+        startupOpLog.push("git:checkout");
+      }),
+      checkoutOrCreate: vi.fn(async () => {
+        startupOpLog.push("git:checkoutOrCreate");
+      }),
+    };
+  }
+  return { startupOpLog, buildMockGitService };
+});
 
 vi.mock("@superblocksteam/vite-plugin-file-sync/git-service", () => ({
   createGitService: vi.fn((cwd: string) => {
@@ -305,16 +284,10 @@ vi.mock("./automatic-upgrades.js", () => ({
 // `getNpmRegistryClient()` stub so the call site doesn't `TypeError`
 // and silently swallow this mock.
 vi.mock("./home-npmrc.mjs", () => ({
-  syncHomeNpmrc: vi.fn(async () => {
-    // Longer delay than maybeWriteNpmrcForDir: if both run without await,
-    // project pushes first and the order assertion fails.
-    await new Promise((resolve) => setTimeout(resolve, 30));
-    startupOpLog.push("home-npmrc:syncHomeNpmrc");
-    return {
-      outcome: "skipped-not-configured",
-      path: "/tmp/.superblocks/npmrc",
-    };
-  }),
+  syncHomeNpmrc: vi.fn(async () => ({
+    outcome: "skipped-not-configured",
+    path: "/tmp/.superblocks/npmrc",
+  })),
   superblocksNpmrcPath: vi.fn(() => "/tmp/.superblocks/npmrc"),
   superblocksLogsPath: vi.fn((appDir: string) => `${appDir}/.superblocks/logs`),
 }));
@@ -410,7 +383,6 @@ function setupExecMock() {
       _opts: unknown,
       cb?: (err: null, result: { stdout: string }) => void,
     ) => {
-      startupOpLog.push("installPackages:exec");
       if (typeof _opts === "function") {
         (_opts as (err: null, result: { stdout: string }) => void)(null, {
           stdout: "installed",
@@ -427,13 +399,6 @@ describe("dev startup: git reconciliation before DBFS download", () => {
 
   beforeEach(async () => {
     vi.clearAllMocks();
-    mockGetNpmRegistryClient.mockImplementation(() => ({
-      organizationId: "org-1",
-      getConfig: vi.fn(async () => ({
-        source: "not-configured",
-        config: { configured: false },
-      })),
-    }));
     startupOpLog.length = 0;
     setupExecMock();
     mockCheckVersions.mockResolvedValue({
@@ -479,40 +444,4 @@ describe("dev startup: git reconciliation before DBFS download", () => {
       "[dev-startup] Post-download hash matches server",
     );
   });
-
-  it("reconciles project .npmrc after home sync and before boot install", async () => {
-    const { maybeWriteNpmrcForDir } =
-      await import("@superblocksteam/vite-plugin-file-sync/npm-registry");
-    const { syncHomeNpmrc } = await import("./home-npmrc.mjs");
-    const { dev } = await import("./dev.mjs");
-
-    await dev(buildDevOptions(testCwd) as any);
-
-    const homeIdx = startupOpLog.indexOf("home-npmrc:syncHomeNpmrc");
-    const projectIdx = startupOpLog.indexOf(
-      "project-npmrc:maybeWriteNpmrcForDir",
-    );
-    const installIdx = startupOpLog.indexOf("installPackages:exec");
-
-    expect(syncHomeNpmrc).toHaveBeenCalled();
-    expect(maybeWriteNpmrcForDir).toHaveBeenCalled();
-    expect(homeIdx).toBeGreaterThanOrEqual(0);
-    expect(projectIdx).toBeGreaterThanOrEqual(0);
-    expect(homeIdx).toBeLessThan(projectIdx);
-    if (installIdx >= 0) {
-      expect(projectIdx).toBeLessThan(installIdx);
-    }
-  });
-
-  it("skips project .npmrc reconcile when the npm registry client is absent", async () => {
-    mockGetNpmRegistryClient.mockReturnValue(undefined);
-    const { maybeWriteNpmrcForDir } =
-      await import("@superblocksteam/vite-plugin-file-sync/npm-registry");
-    const { dev } = await import("./dev.mjs");
-
-    await dev(buildDevOptions(testCwd) as any);
-
-    expect(maybeWriteNpmrcForDir).not.toHaveBeenCalled();
-    expect(startupOpLog).not.toContain("project-npmrc:maybeWriteNpmrcForDir");
-  });
 });

package/src/cli-replacement/dev.mts

@@ -1,7 +1,6 @@
 import * as child_process from "node:child_process";
 import * as nodeFs from "node:fs/promises";
 import type { Server as HttpServer } from "node:http";
-import os from "node:os";
 import path from "node:path";
 import * as readline from "node:readline";
 import { promisify } from "node:util";
@@ -25,7 +24,6 @@ import {
   isGitHubRemoteUrl,
   SUPERBLOCKS_LIVE_GIT_BRANCH,
 } from "@superblocksteam/shared";
-import { npmRegistryEmitter } from "@superblocksteam/telemetry";
 import { maskUnixSignals } from "@superblocksteam/util";
 import {
   AiService,
@@ -47,7 +45,6 @@ import {
   type NpmRegistryFetchResult,
   type ParseContext,
   NpmInstallBlocked,
-  maybeWriteNpmrcForDir,
   shouldIgnoreInstallScripts,
 } from "@superblocksteam/vite-plugin-file-sync/npm-registry";
 import { OperationQueue } from "@superblocksteam/vite-plugin-file-sync/operation-queue";
@@ -100,7 +97,6 @@ import {
   syncHomeNpmrc,
 } from "./home-npmrc.mjs";
 import { normalizeWorkspaceProtocolForNpm } from "./normalize-workspace-protocol.js";
-import { readReapedChildCpuSeconds } from "./npm-install-cpu.mjs";
 import { parseNpmInstallSummary } from "./npm-install-summary.mjs";
 import { consumeNpmInstallTimingAttributes } from "./npm-install-timing.mjs";
 import {
@@ -646,11 +642,6 @@ export async function installPackages(
         env: buildInstallEnv(superblocksNpmrcPath(), logsDir),
       });
     installStart = Date.now();
-    // Reaped-child cpu total before the install, so the delta across the
-    // awaited spawn below covers the cpu the install burned. Compared against
-    // the wall-clock duration it separates a compute-bound install from one
-    // that spent its time waiting on the network or the disk.
-    const childCpuSecondsBefore = await readReapedChildCpuSeconds();
 
     // Cheap `df` snapshot before the install (statfs only — no directory walk
     // on the happy path). On a 3Gi live-edit PVC this is the baseline that
@@ -669,7 +660,6 @@ export async function installPackages(
 
     const { stdout } = await runInstall();
     const installDurationMs = Date.now() - installStart;
-    const childCpuSecondsAfter = await readReapedChildCpuSeconds();
     // npm's `--timing` breakdown lives in a file, so it has to be read back
     // once the install is done. Only npm writes one; reading under pnpm would
     // report a leftover npm file as this install's timings. The `catch` keeps
@@ -692,27 +682,11 @@ export async function installPackages(
           "Package installation completed successfully",
           attributes,
         );
-      // Cpu the install burned, to be read against the wall-clock duration
-      // beside it. Omitted rather than zeroed where procfs is unavailable, so a
-      // reading we could not take never looks like an install that used no cpu.
-      // The core count is what makes the ratio interpretable: 19 cpu-seconds
-      // over 19 wall-seconds is saturated on one core and nearly idle on eight.
-      const cpuAttributes: Record<string, number> =
-        childCpuSecondsBefore !== null && childCpuSecondsAfter !== null
-          ? {
-              "superblocks.npm.install.cpu_count": os.availableParallelism(),
-              "superblocks.npm.install.cpu_seconds": Math.max(
-                0,
-                childCpuSecondsAfter - childCpuSecondsBefore,
-              ),
-            }
-          : {};
       // Reuse the existing npm-install namespace and its duration unit. The
       // package counts are log-only sizing data from this separate install path.
       const commonAttributes = {
         "superblocks.npm.install.disk_recovered": false,
         "superblocks.npm.install.duration_seconds": installDurationMs / 1000,
-        ...cpuAttributes,
         ...timingAttributes,
       };
       if (summary) {
@@ -2022,22 +1996,6 @@ export async function dev(options: {
               }
             }
 
-            // Reconcile the project-dir `.npmrc` on the live-edit PVC before
-            // the boot install. Home sync alone is not enough: npm prefers
-            // the project file, which can hold a stale JWT or a
-            // deleted-registry proxy URL across pod recycles.
-            if (npmRegistryClient) {
-              try {
-                await maybeWriteNpmrcForDir(cwd, npmRegistryClient);
-              } catch (error) {
-                logger.warn(
-                  "[project-npmrc] boot reconcile failed unexpectedly; project .npmrc left untouched",
-                  getErrorMeta(error),
-                );
-                npmRegistryEmitter.recordSyncProjectNpmrc("error");
-              }
-            }
-
             let hasCliUpdated = false;
             let upgradePromises: Promise<void>[] = [];
             const forceUpgrade =

package/src/cli-replacement/install-packages.npm-registry.test.mts

@@ -76,16 +76,6 @@ vi.mock("./npm-install-timing.mjs", () => ({
     consumeTimingMock(logsDir),
 }));
 
-// Install cpu time is read from procfs, which does not exist on macOS, so a
-// real read would make the emitted attributes differ between a developer
-// machine and CI. The reader has its own coverage in `npm-install-cpu.test.mts`;
-// here we only care that a reading reaches the success log line, and that no
-// reading leaves the attributes off it entirely.
-const readChildCpuMock = vi.fn<() => Promise<number | null>>(async () => null);
-vi.mock("./npm-install-cpu.mjs", () => ({
-  readReapedChildCpuSeconds: () => readChildCpuMock(),
-}));
-
 const mockLogger = {
   info: vi.fn(),
   infoStructured: vi.fn(),
@@ -402,39 +392,6 @@ describe("installPackages success logging", () => {
     expect(mockLogger.info).toHaveBeenCalledWith("ok");
   });
 
-  it("emits the cpu time the install burned alongside its wall-clock duration", async () => {
-    // Two reads bracket the install, so the emitted figure is the difference.
-    readChildCpuMock.mockResolvedValueOnce(12).mockResolvedValueOnce(30.5);
-    const { installPackages } = await import("./dev.mjs");
-
-    await installPackages("/tmp/app", mockLogger as never);
-
-    expect(mockLogger.infoStructured).toHaveBeenCalledWith(
-      "Package installation completed successfully",
-      expect.objectContaining({
-        "superblocks.npm.install.cpu_count": expect.any(Number),
-        "superblocks.npm.install.cpu_seconds": 18.5,
-        "superblocks.npm.install.duration_seconds": expect.any(Number),
-      }),
-    );
-  });
-
-  it("omits cpu attributes when only one of the two reads succeeds", async () => {
-    // Half a measurement is not one: a difference taken against a missing
-    // baseline would invent a number rather than report one.
-    readChildCpuMock.mockResolvedValueOnce(12).mockResolvedValueOnce(null);
-    const { installPackages } = await import("./dev.mjs");
-
-    await installPackages("/tmp/app", mockLogger as never);
-
-    expect(mockLogger.infoStructured).toHaveBeenCalledWith(
-      "Package installation completed successfully",
-      expect.not.objectContaining({
-        "superblocks.npm.install.cpu_seconds": expect.anything(),
-      }),
-    );
-  });
-
   it("marks parsed npm summaries and emits their counts", async () => {
     const stdout = JSON.stringify({
       added: 8,