@superblocksteam/sdk 2.0.119-next.1 → 2.0.120-next.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (85) hide show
  1. package/.turbo/turbo-build.log +1 -1
  2. package/dist/cli-replacement/dev-s3-restore.test.mjs +116 -0
  3. package/dist/cli-replacement/dev-s3-restore.test.mjs.map +1 -1
  4. package/dist/cli-replacement/dev-startup-git-before-dbfs-order.test.mjs +1 -0
  5. package/dist/cli-replacement/dev-startup-git-before-dbfs-order.test.mjs.map +1 -1
  6. package/dist/cli-replacement/dev.d.mts +6 -0
  7. package/dist/cli-replacement/dev.d.mts.map +1 -1
  8. package/dist/cli-replacement/dev.mjs +77 -6
  9. package/dist/cli-replacement/dev.mjs.map +1 -1
  10. package/dist/client.d.ts +67 -6
  11. package/dist/client.d.ts.map +1 -1
  12. package/dist/client.js +94 -0
  13. package/dist/client.js.map +1 -1
  14. package/dist/dev-utils/dedupe-async.d.ts +16 -0
  15. package/dist/dev-utils/dedupe-async.d.ts.map +1 -0
  16. package/dist/dev-utils/dedupe-async.js +27 -0
  17. package/dist/dev-utils/dedupe-async.js.map +1 -0
  18. package/dist/dev-utils/dedupe-async.test.d.ts +2 -0
  19. package/dist/dev-utils/dedupe-async.test.d.ts.map +1 -0
  20. package/dist/dev-utils/dedupe-async.test.js +120 -0
  21. package/dist/dev-utils/dedupe-async.test.js.map +1 -0
  22. package/dist/dev-utils/dev-server-metrics.d.mts +95 -0
  23. package/dist/dev-utils/dev-server-metrics.d.mts.map +1 -0
  24. package/dist/dev-utils/dev-server-metrics.mjs +193 -0
  25. package/dist/dev-utils/dev-server-metrics.mjs.map +1 -0
  26. package/dist/dev-utils/dev-server-persist.test.mjs +117 -17
  27. package/dist/dev-utils/dev-server-persist.test.mjs.map +1 -1
  28. package/dist/dev-utils/dev-server.d.mts +19 -1
  29. package/dist/dev-utils/dev-server.d.mts.map +1 -1
  30. package/dist/dev-utils/dev-server.mjs +296 -28
  31. package/dist/dev-utils/dev-server.mjs.map +1 -1
  32. package/dist/flag.d.ts +1 -1
  33. package/dist/flag.d.ts.map +1 -1
  34. package/dist/flag.js +3 -3
  35. package/dist/flag.js.map +1 -1
  36. package/dist/index.d.ts +4 -3
  37. package/dist/index.d.ts.map +1 -1
  38. package/dist/index.js +3 -2
  39. package/dist/index.js.map +1 -1
  40. package/dist/sdk.d.ts +8 -1
  41. package/dist/sdk.d.ts.map +1 -1
  42. package/dist/sdk.js +24 -1
  43. package/dist/sdk.js.map +1 -1
  44. package/dist/sdk.test.js +102 -1
  45. package/dist/sdk.test.js.map +1 -1
  46. package/dist/telemetry/index.d.ts +2 -1
  47. package/dist/telemetry/index.d.ts.map +1 -1
  48. package/dist/telemetry/index.js +8 -1
  49. package/dist/telemetry/index.js.map +1 -1
  50. package/dist/telemetry/logging.d.ts +1 -2
  51. package/dist/telemetry/logging.d.ts.map +1 -1
  52. package/dist/telemetry/logging.js +1 -1
  53. package/dist/telemetry/logging.js.map +1 -1
  54. package/dist/telemetry/memory-metrics.d.ts +3 -0
  55. package/dist/telemetry/memory-metrics.d.ts.map +1 -0
  56. package/dist/telemetry/memory-metrics.js +59 -0
  57. package/dist/telemetry/memory-metrics.js.map +1 -0
  58. package/dist/types/common.d.ts +1 -1
  59. package/dist/types/common.d.ts.map +1 -1
  60. package/dist/version-control.d.mts.map +1 -1
  61. package/dist/version-control.mjs +14 -19
  62. package/dist/version-control.mjs.map +1 -1
  63. package/eslint.config.js +6 -0
  64. package/package.json +8 -8
  65. package/src/cli-replacement/dev-s3-restore.test.mts +156 -0
  66. package/src/cli-replacement/dev-startup-git-before-dbfs-order.test.mts +1 -0
  67. package/src/cli-replacement/dev.mts +104 -14
  68. package/src/client.ts +189 -6
  69. package/src/dev-utils/dedupe-async.test.ts +151 -0
  70. package/src/dev-utils/dedupe-async.ts +45 -0
  71. package/src/dev-utils/dev-server-metrics.mts +252 -0
  72. package/src/dev-utils/dev-server-persist.test.mts +170 -19
  73. package/src/dev-utils/dev-server.mts +366 -32
  74. package/src/flag.ts +4 -4
  75. package/src/index.ts +19 -1
  76. package/src/sdk.test.ts +145 -6
  77. package/src/sdk.ts +36 -0
  78. package/src/telemetry/index.ts +9 -1
  79. package/src/telemetry/logging.ts +2 -2
  80. package/src/telemetry/memory-metrics.ts +90 -0
  81. package/src/types/common.ts +1 -1
  82. package/src/version-control.mts +11 -30
  83. package/test/version-control.test.mts +0 -2
  84. package/tsconfig.tsbuildinfo +1 -1
  85. package/turbo.json +1 -0
package/dist/telemetry/memory-metrics.js ADDED
@@ -0,0 +1,59 @@
1
+ import { PerformanceObserver, } from "node:perf_hooks";
2
+ import { getMeter } from "./index.js";
3
+ let cleanupFn;
4
+ export function startMemoryMetrics() {
5
+ if (cleanupFn) {
6
+ return;
7
+ }
8
+ const meter = getMeter();
9
+ const heapUsedGauge = meter.createObservableGauge("nodejs.memory.heap_used_bytes", { description: "V8 heap memory used (bytes)", unit: "By" });
10
+ const heapTotalGauge = meter.createObservableGauge("nodejs.memory.heap_total_bytes", { description: "V8 heap memory allocated (bytes)", unit: "By" });
11
+ const rssGauge = meter.createObservableGauge("nodejs.memory.rss_bytes", {
12
+ description: "Resident Set Size - total memory allocated for the process",
13
+ unit: "By",
14
+ });
15
+ const externalGauge = meter.createObservableGauge("nodejs.memory.external_bytes", {
16
+ description: "Memory used by C++ objects bound to JavaScript objects",
17
+ unit: "By",
18
+ });
19
+ const arrayBuffersGauge = meter.createObservableGauge("nodejs.memory.array_buffers_bytes", {
20
+ description: "Memory allocated for ArrayBuffers and SharedArrayBuffers (also included in external)",
21
+ unit: "By",
22
+ });
23
+ const gcCountCounter = meter.createCounter("nodejs.gc.count", {
24
+ description: "Number of garbage collection events",
25
+ unit: "{event}",
26
+ });
27
+ const gauges = [
28
+ heapUsedGauge,
29
+ heapTotalGauge,
30
+ rssGauge,
31
+ externalGauge,
32
+ arrayBuffersGauge,
33
+ ];
34
+ // Single memoryUsage() call per export interval for all 5 gauges (idiomatic OTEL batch pattern).
35
+ const batchCb = (result) => {
36
+ const mem = process.memoryUsage();
37
+ result.observe(heapUsedGauge, mem.heapUsed);
38
+ result.observe(heapTotalGauge, mem.heapTotal);
39
+ result.observe(rssGauge, mem.rss);
40
+ result.observe(externalGauge, mem.external);
41
+ result.observe(arrayBuffersGauge, mem.arrayBuffers);
42
+ };
43
+ meter.addBatchObservableCallback(batchCb, gauges);
44
+ const gcObserver = new PerformanceObserver((list) => {
45
+ gcCountCounter.add(list.getEntries().length);
46
+ });
47
+ gcObserver.observe({ entryTypes: ["gc"], buffered: false });
48
+ cleanupFn = () => {
49
+ gcObserver.disconnect();
50
+ meter.removeBatchObservableCallback(batchCb, gauges);
51
+ };
52
+ }
53
+ export function stopMemoryMetrics() {
54
+ if (cleanupFn) {
55
+ cleanupFn();
56
+ cleanupFn = undefined;
57
+ }
58
+ }
59
+ //# sourceMappingURL=memory-metrics.js.map
package/dist/telemetry/memory-metrics.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"memory-metrics.js","sourceRoot":"","sources":["../../src/telemetry/memory-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,GAEpB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,IAAI,SAAmC,CAAC;AAExC,MAAM,UAAU,kBAAkB;IAChC,IAAI,SAAS,EAAE,CAAC;QACd,OAAO;IACT,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IAEzB,MAAM,aAAa,GAAG,KAAK,CAAC,qBAAqB,CAC/C,+BAA+B,EAC/B,EAAE,WAAW,EAAE,6BAA6B,EAAE,IAAI,EAAE,IAAI,EAAE,CAC3D,CAAC;IACF,MAAM,cAAc,GAAG,KAAK,CAAC,qBAAqB,CAChD,gCAAgC,EAChC,EAAE,WAAW,EAAE,kCAAkC,EAAE,IAAI,EAAE,IAAI,EAAE,CAChE,CAAC;IACF,MAAM,QAAQ,GAAG,KAAK,CAAC,qBAAqB,CAAC,yBAAyB,EAAE;QACtE,WAAW,EAAE,4DAA4D;QACzE,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,KAAK,CAAC,qBAAqB,CAC/C,8BAA8B,EAC9B;QACE,WAAW,EAAE,wDAAwD;QACrE,IAAI,EAAE,IAAI;KACX,CACF,CAAC;IACF,MAAM,iBAAiB,GAAG,KAAK,CAAC,qBAAqB,CACnD,mCAAmC,EACnC;QACE,WAAW,EACT,sFAAsF;QACxF,IAAI,EAAE,IAAI;KACX,CACF,CAAC;IAEF,MAAM,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC,iBAAiB,EAAE;QAC5D,WAAW,EAAE,qCAAqC;QAClD,IAAI,EAAE,SAAS;KAChB,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG;QACb,aAAa;QACb,cAAc;QACd,QAAQ;QACR,aAAa;QACb,iBAAiB;KAClB,CAAC;IAEF,iGAAiG;IACjG,MAAM,OAAO,GAAG,CAAC,MAA6B,EAAE,EAAE;QAChD,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;QAClC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9C,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACtD,CAAC,CAAC;IAEF,KAAK,CAAC,0BAA0B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAElD,MAAM,UAAU,GAAG,IAAI,mBAAmB,CACxC,CAAC,IAAkC,EAAE,EAAE;QACrC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC,CACF,CAAC;IACF,UAAU,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAE5D,SAAS,GAAG,GAAG,EAAE;QACf,UAAU,CAAC,UAAU,EAAE,CAAC;QACxB,KAAK,CAAC,6BAA6B,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB;IAC/B,IAAI,SAAS,EAAE,CAAC;QACd,SAAS,EAAE,CAAC;QACZ,SAAS,GAAG,SAAS,CAAC;IACxB,CAAC;AACH,CAAC"}
package/dist/types/common.d.ts CHANGED
@@ -9,12 +9,12 @@ export interface UserMeDto {
9
9
  export interface FlagBootstrap {
10
10
  "ui.enable-resource-signing"?: boolean;
11
11
  "superblocks.git.split.large.steps.enabled"?: boolean;
12
- "superblocks.git.split.large.steps.new.enabled"?: boolean;
13
12
  "superblocks.git.split.large.step.lines"?: number;
14
13
  "ui.code-mode.enable-session-recording"?: boolean;
15
14
  "superblocks.dev-server.inactivity-timeout.cloud"?: number;
16
15
  "superblocks.dev-server.inactivity-timeout.local"?: number;
17
16
  "superblocks.dev-server.llmobs.enabled"?: boolean;
17
+ "superblocks.dev-server.memory-metrics.enabled"?: boolean;
18
18
  "superblocks.deploy.include-dot-superblocks"?: boolean;
19
19
  }
20
20
  export interface TokenConfig {
package/dist/types/common.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/types/common.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/types/common.ts"],"names":[],"mappings":"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"}
package/dist/version-control.d.mts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"version-control.d.mts","sourceRoot":"","sources":["../src/version-control.mts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"version-control.d.mts","sourceRoot":"","sources":["../src/version-control.mts"],"names":[],"mappings":"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"}
package/dist/version-control.mjs CHANGED
@@ -1,10 +1,10 @@
1
- import * as https from "https";
1
+ import * as https from "node:https";
2
2
  import path from "node:path";
3
3
  import { dirname } from "path";
4
4
  import { bold } from "colorette";
5
5
  import fs from "fs-extra";
6
6
  import { isEmpty, isArray, isObject, get } from "lodash-es";
7
- import * as semver from "semver";
7
+ import semver from "semver";
8
8
  import { simpleGit } from "simple-git";
9
9
  import slugify from "slugify";
10
10
  import { parse, stringify as ymlstringify } from "yaml";
@@ -271,7 +271,7 @@ export async function writeResourceToDisk(resourceType, resourceId, resource, ro
271
271
  configType: "APPLICATION",
272
272
  defaultPageId: resource.page?.id,
273
273
  id: resource.application.id,
274
- metadata: getResourceConfigMetadata(featureFlags, existingApplicationConfig),
274
+ metadata: getResourceConfigMetadata(existingApplicationConfig),
275
275
  };
276
276
  const apiRepresentation = preferredApiRepresentation ??
277
277
  getApiRepresentation(featureFlags, newApplicationConfig);
@@ -327,7 +327,7 @@ export async function writeResourceToDisk(resourceType, resourceId, resource, ro
327
327
  const backendConfig = {
328
328
  id: resourceId,
329
329
  configType: "BACKEND",
330
- metadata: getResourceConfigMetadata(featureFlags, existingBackendConfig),
330
+ metadata: getResourceConfigMetadata(existingBackendConfig),
331
331
  };
332
332
  const apiRepresentation = preferredApiRepresentation ??
333
333
  getApiRepresentation(featureFlags, backendConfig);
@@ -364,7 +364,7 @@ export async function writeApplicationToDisk({ sdk, resource, projectRootFolder,
364
364
  await fs.mkdir(appDirName, { recursive: true });
365
365
  }
366
366
  if (resource.type === "code-mode") {
367
- await writeCodeModeApplicationToDisk(sdk, resource, appDirName, directoryContentsHash, branch, featureFlags);
367
+ await writeCodeModeApplicationToDisk(sdk, resource, appDirName, directoryContentsHash, branch);
368
368
  return {
369
369
  location: relativeLocation,
370
370
  resourceType: "APPLICATION",
@@ -385,7 +385,7 @@ async function writeV1ApplicationToDisk(resource, appDirName, featureFlags, rela
385
385
  const newApplicationConfig = {
386
386
  configType: "APPLICATION",
387
387
  id: resource.application.id,
388
- metadata: getResourceConfigMetadata(featureFlags, existingApplicationConfig),
388
+ metadata: getResourceConfigMetadata(existingApplicationConfig),
389
389
  };
390
390
  const apiRepresentation = preferredApiRepresentation ??
391
391
  getApiRepresentation(featureFlags, newApplicationConfig);
@@ -492,13 +492,13 @@ async function writeV1ApplicationToDisk(resource, appDirName, featureFlags, rela
492
492
  resourceType: "APPLICATION",
493
493
  };
494
494
  }
495
- async function writeCodeModeApplicationToDisk(sdk, resource, appDirName, directoryContentsHash, branch, featureFlags) {
495
+ async function writeCodeModeApplicationToDisk(sdk, resource, appDirName, directoryContentsHash, branch) {
496
496
  // Find the existing application config and existing file paths
497
497
  const existingApplicationConfig = await getSuperblocksApplicationConfigIfExists(appDirName);
498
498
  const newApplicationConfig = {
499
499
  configType: "APPLICATION_V2",
500
500
  id: resource.application.id,
501
- metadata: getResourceConfigMetadata(featureFlags, existingApplicationConfig),
501
+ metadata: getResourceConfigMetadata(existingApplicationConfig),
502
502
  };
503
503
  await fs.ensureDir(`${appDirName}/${SUPERBLOCKS_HOME_FOLDER_NAME}`);
504
504
  await fs.writeFile(`${appDirName}/${RESOURCE_CONFIG_PATH}`, JSON.stringify(sortByKey(newApplicationConfig), null, 2));
@@ -599,19 +599,14 @@ export function addExistingFilePathsForApi(api, location, paths, useNestedFolder
599
599
  }
600
600
  return paths;
601
601
  }
602
- function getResourceConfigMetadata(featureFlags, existingResourceConfig) {
602
+ function getResourceConfigMetadata(existingResourceConfig) {
603
603
  if (!existingResourceConfig) {
604
- // This is a new application, and we may need to add a metadata field to the application config
605
- if (featureFlags.splitLargeApiStepsInNewEnabled()) {
606
- return {
607
- fileVersion: LATEST_FILE_VERSION,
608
- };
609
- }
610
- }
611
- else if (existingResourceConfig.metadata) {
612
- return existingResourceConfig.metadata;
604
+ // This is a new application; tag the application config with the latest file version.
605
+ return {
606
+ fileVersion: LATEST_FILE_VERSION,
607
+ };
613
608
  }
614
- return undefined;
609
+ return existingResourceConfig.metadata;
615
610
  }
616
611
  export async function removeResourceFromDisk(rootPath, resourceRelativeLocation) {
617
612
  const resourceLocation = path.resolve(rootPath, resourceRelativeLocation);
package/dist/version-control.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"version-control.mjs","sourceRoot":"","sources":["../src/version-control.mts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"version-control.mjs","sourceRoot":"","sources":["../src/version-control.mts"],"names":[],"mappings":"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"}
package/eslint.config.js CHANGED
@@ -64,5 +64,11 @@ export default defineConfig(
64
64
  "@typescript-eslint/no-unused-expressions": "off",
65
65
  },
66
66
  },
67
+ {
68
+ files: ["src/dev-utils/dev-server.mts"],
69
+ rules: {
70
+ "no-console": "error",
71
+ },
72
+ },
67
73
  prettier,
68
74
  );
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@superblocksteam/sdk",
3
- "version": "2.0.119-next.1",
3
+ "version": "2.0.120-next.0",
4
4
  "description": "Superblocks JS SDK",
5
5
  "homepage": "https://www.superblocks.com",
6
6
  "license": "Superblocks Community Software License",
@@ -28,7 +28,7 @@
28
28
  "@opentelemetry/semantic-conventions": "^1.28.0",
29
29
  "@superblocksteam/bucketeer-sdk": "1.1.0",
30
30
  "@vitejs/plugin-react": "4.3.4",
31
- "axios": "^1.13.2",
31
+ "axios": "^1.15.2",
32
32
  "chokidar": "^4.0.3",
33
33
  "colorette": "^2.0.20",
34
34
  "cors": "^2.8.5",
@@ -48,11 +48,11 @@
48
48
  "vite-tsconfig-paths": "^6.0.4",
49
49
  "winston": "^3.17.0",
50
50
  "yaml": "^2.7.1",
51
- "@superblocksteam/library-shared": "2.0.119-next.1",
52
- "@superblocksteam/telemetry": "2.0.119-next.1",
53
- "@superblocksteam/util": "2.0.119-next.1",
54
- "@superblocksteam/shared": "0.9586.9",
55
- "@superblocksteam/vite-plugin-file-sync": "2.0.119-next.1"
51
+ "@superblocksteam/library-shared": "2.0.120-next.0",
52
+ "@superblocksteam/shared": "0.9589.2",
53
+ "@superblocksteam/telemetry": "2.0.120-next.0",
54
+ "@superblocksteam/util": "2.0.120-next.0",
55
+ "@superblocksteam/vite-plugin-file-sync": "2.0.120-next.0"
56
56
  },
57
57
  "devDependencies": {
58
58
  "@eslint/js": "^9.39.2",
@@ -71,7 +71,7 @@
71
71
  "globals": "^17.3.0",
72
72
  "tsx": "^4.19.2",
73
73
  "typescript": "^5.9.3",
74
- "typescript-eslint": "^8.54.0",
74
+ "typescript-eslint": "^8.59.2",
75
75
  "vitest": "^4.0.17"
76
76
  },
77
77
  "optionalDependencies": {
package/src/cli-replacement/dev-s3-restore.test.mts CHANGED
@@ -112,6 +112,7 @@ vi.mock("@superblocksteam/vite-plugin-file-sync/ai-service", () => ({
112
112
  executePendingRestore = vi.fn(async () => false);
113
113
  },
114
114
  isSdkApiTemplate: vi.fn(() => false),
115
+ stripResolvedFromLockfile: vi.fn(async () => undefined),
115
116
  }));
116
117
 
117
118
  vi.mock("@superblocksteam/vite-plugin-file-sync/git-service", () => ({
@@ -597,3 +598,158 @@ describe("dev startup after S3 workspace restore", () => {
597
598
  }
598
599
  });
599
600
  });
601
+
602
+ // Wires up `execMock` so install calls hang until the test calls
603
+ // `finishInstall`. We stash the promisify callback directly rather than
604
+ // chaining `.then` on a deferred promise, so the rejection flows through
605
+ // promisify's own reject path (and isn't observed as a transient
606
+ // unhandled-rejection on an intermediate promise).
607
+ function setupDeferredInstallMock(
608
+ options: {
609
+ fail?: boolean;
610
+ } = {},
611
+ ) {
612
+ let pendingInstallCallback:
613
+ | ((err: Error | null, result?: { stdout: string }) => void)
614
+ | undefined;
615
+ let signalInstallStarted: (() => void) | undefined;
616
+ const installStarted = new Promise<void>((resolve) => {
617
+ signalInstallStarted = resolve;
618
+ });
619
+
620
+ execMock.mockImplementation(
621
+ (
622
+ cmd: string,
623
+ opts: unknown,
624
+ cb?: (err: Error | null, result?: { stdout: string }) => void,
625
+ ) => {
626
+ const callback =
627
+ typeof opts === "function"
628
+ ? (opts as (err: Error | null, result?: { stdout: string }) => void)
629
+ : cb;
630
+ if (!callback) {
631
+ return;
632
+ }
633
+ if (typeof cmd === "string" && cmd.includes("install")) {
634
+ pendingInstallCallback = callback;
635
+ signalInstallStarted?.();
636
+ } else {
637
+ callback(null, { stdout: "" });
638
+ }
639
+ },
640
+ );
641
+
642
+ return {
643
+ awaitInstallStarted: async () => {
644
+ await installStarted;
645
+ // Let dev() advance to its next join point after exec was invoked.
646
+ await new Promise((r) => setImmediate(r));
647
+ await new Promise((r) => setImmediate(r));
648
+ },
649
+ finishInstall: async () => {
650
+ if (options.fail) {
651
+ pendingInstallCallback?.(new Error("simulated install failure"));
652
+ } else {
653
+ pendingInstallCallback?.(null, { stdout: "installed" });
654
+ }
655
+ // Yield to the microtask queue so the resolution propagates.
656
+ await new Promise((r) => setImmediate(r));
657
+ },
658
+ };
659
+ }
660
+
661
+ describe("dev background package install join semantics", () => {
662
+ beforeEach(async () => {
663
+ vi.clearAllMocks();
664
+ mockCheckVersions.mockResolvedValue({
665
+ cliUpdated: false,
666
+ upgradePromises: [],
667
+ });
668
+ const { readPackage } = await import("read-pkg");
669
+ (readPackage as Mock).mockResolvedValue({
670
+ name: "test-app",
671
+ dependencies: { "@superblocksteam/library": "1.0.0" },
672
+ });
673
+ });
674
+
675
+ it("awaits the background install before uploading local state", async () => {
676
+ const deferred = setupDeferredInstallMock();
677
+ const { dev } = await import("./dev.mjs");
678
+
679
+ const devPromise = dev(
680
+ buildDevOptions({ forcePackageInstall: true }) as any,
681
+ );
682
+
683
+ await deferred.awaitInstallStarted();
684
+ expect(mockSyncService.uploadDirectory).not.toHaveBeenCalled();
685
+ expect(mockLogger.info).toHaveBeenCalledWith(
686
+ "Waiting for background package install (before upload)…",
687
+ );
688
+
689
+ await deferred.finishInstall();
690
+ await devPromise;
691
+
692
+ expect(mockSyncService.uploadDirectory).toHaveBeenCalledWith("cli:sdk");
693
+ });
694
+
695
+ it("awaits the background install before createDevServer (Vite optimizeDeps race)", async () => {
696
+ const deferred = setupDeferredInstallMock();
697
+ // No upload, no restart — exercises the pre-Vite drain.
698
+ mockCheckVersions.mockResolvedValue({
699
+ cliUpdated: false,
700
+ upgradePromises: [Promise.resolve()],
701
+ });
702
+ const { dev } = await import("./dev.mjs");
703
+
704
+ const devPromise = dev(buildDevOptions() as any);
705
+
706
+ await deferred.awaitInstallStarted();
707
+ expect(mockCreateDevServer).not.toHaveBeenCalled();
708
+ expect(mockLogger.info).toHaveBeenCalledWith(
709
+ "Waiting for background package install (before Vite startup)…",
710
+ );
711
+
712
+ await deferred.finishInstall();
713
+ await devPromise;
714
+
715
+ expect(mockCreateDevServer).toHaveBeenCalled();
716
+ });
717
+
718
+ it("logs a structured error when the background install fails", async () => {
719
+ const deferred = setupDeferredInstallMock({ fail: true });
720
+ // Use upgradePromises so the install runs without forcing the upload
721
+ // path — the failure then propagates through the pre-Vite join, whose
722
+ // outer catch only sets the span status and rethrows (no process.exit,
723
+ // which vitest replaces with a throw that becomes an unhandled error).
724
+ mockCheckVersions.mockResolvedValue({
725
+ cliUpdated: false,
726
+ upgradePromises: [Promise.resolve()],
727
+ });
728
+ const { dev } = await import("./dev.mjs");
729
+
730
+ // Pre-attach a catcher so vitest's unhandled-rejection detector observes
731
+ // the rejection synchronously with promise creation; without this, the
732
+ // .catch backstop's logging counts as a handler but lands on the
733
+ // microtask queue after vitest's check.
734
+ let caughtError: unknown;
735
+ const devPromise = dev(buildDevOptions() as any).catch((err: unknown) => {
736
+ caughtError = err;
737
+ });
738
+
739
+ await deferred.awaitInstallStarted();
740
+ await deferred.finishInstall();
741
+ await devPromise;
742
+
743
+ expect(caughtError).toBeDefined();
744
+ // The .catch backstop fires regardless and tags the log with errorId so
745
+ // alert rules can match without needing typed attributes.
746
+ expect(
747
+ mockLogger.error.mock.calls.some(
748
+ (call) =>
749
+ typeof call[0] === "string" &&
750
+ call[0].includes("Background package install failed") &&
751
+ call[0].includes("errorId=DEV_SERVER_BG_INSTALL_FAILED"),
752
+ ),
753
+ ).toBe(true);
754
+ });
755
+ });
package/src/cli-replacement/dev-startup-git-before-dbfs-order.test.mts CHANGED
@@ -118,6 +118,7 @@ vi.mock("@superblocksteam/vite-plugin-file-sync/ai-service", () => ({
118
118
  executePendingRestore = vi.fn(async () => false);
119
119
  },
120
120
  isSdkApiTemplate: vi.fn(() => false),
121
+ stripResolvedFromLockfile: vi.fn(async () => undefined),
121
122
  }));
122
123
 
123
124
  const { startupOpLog, buildMockGitService } = vi.hoisted(() => {