@superblocksteam/sdk 2.0.96 → 2.0.97-next.0

package/dist/parse-sdk-registry.test.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"parse-sdk-registry.test.mjs","sourceRoot":"","sources":["../src/parse-sdk-registry.test.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parse-sdk-registry.test.mjs","sourceRoot":"","sources":["../src/parse-sdk-registry.test.mts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChC,MAAM,IAAI,GAAG,MAAM,CAAC;IACpB,MAAM,WAAW,GAAG,kBAAkB,CAAC;IACvC,MAAM,UAAU,GAAG,KAAK,EAAE,CAAS,EAAE,EAAE;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACvD,OAAO,CACL,GAAG,KAAK,6BAA6B;YACrC,GAAG,KAAK,gCAAgC;YACxC,GAAG,KAAK,gCAAgC;YACxC,GAAG,KAAK,2BAA2B,CACpC,CAAC;IACJ,CAAC,CAAC;IAEF,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,OAAO,GAAG;;;;;CAKnB,CAAC;QACE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,OAAO,EACP,WAAW,EACX,IAAI,EACJ,UAAU,CACX,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QACzE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACxE,MAAM,OAAO,GAAG;;;;CAInB,CAAC;QACE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,OAAO,EACP,WAAW,EACX,IAAI,EACJ,UAAU,CACX,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACpD,MAAM,OAAO,GAAG;;;CAGnB,CAAC;QACE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,OAAO,EACP,WAAW,EACX,IAAI,EACJ,UAAU,CACX,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,OAAO,GAAG;;;;;CAKnB,CAAC;QACE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,OAAO,EACP,WAAW,EACX,IAAI,EACJ,UAAU,CACX,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACpD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,kBAAkB,EAClB,WAAW,EACX,IAAI,EACJ,UAAU,CACX,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,OAAO,GAAG;;;;;CAKnB,CAAC;QACE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,OAAO,EACP,WAAW,EACX,IAAI,EACJ,UAAU,CACX,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC3D,MAAM,OAAO,GAAG;;;CAGnB,CAAC;QACE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,OAAO,EACP,WAAW,EACX,IAAI,EACJ,UAAU,CACX,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACpD,MAAM,OAAO,GAAG,gDAAgD,CAAC;QACjE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,OAAO,EACP,WAAW,EACX,IAAI,EACJ,UAAU,CACX,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,MAAM,OAAO,GAAG;;;CAGnB,CAAC;QACE,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,OAAO,EACP,WAAW,EACX,IAAI,EACJ,UAAU,CACX,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAC/D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superblocksteam/sdk",
-  "version": "2.0.96",
+  "version": "2.0.97-next.0",
   "description": "Superblocks JS SDK",
   "homepage": "https://www.superblocks.com",
   "license": "Superblocks Community Software License",
@@ -48,11 +48,11 @@
     "vite-tsconfig-paths": "^6.0.4",
     "winston": "^3.17.0",
     "yaml": "^2.7.1",
-    "@superblocksteam/library-shared": "2.0.96",
-    "@superblocksteam/shared": "0.9567.4",
-    "@superblocksteam/telemetry": "2.0.96",
-    "@superblocksteam/util": "2.0.96",
-    "@superblocksteam/vite-plugin-file-sync": "2.0.96"
+    "@superblocksteam/library-shared": "2.0.97-next.0",
+    "@superblocksteam/shared": "0.9568.0",
+    "@superblocksteam/telemetry": "2.0.97-next.0",
+    "@superblocksteam/util": "2.0.97-next.0",
+    "@superblocksteam/vite-plugin-file-sync": "2.0.97-next.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.2",

package/src/cli-replacement/dev.mts

@@ -5,7 +5,9 @@ import * as readline from "node:readline";
 import { promisify } from "node:util";
 import { SpanStatusCode } from "@opentelemetry/api";
 import {
+  buildGithubSuperblocksSyncWorkflow,
   ConflictError,
+  isGitHubRemoteUrl,
   NotFoundError,
   SUPERBLOCKS_LIVE_GIT_BRANCH,
 } from "@superblocksteam/shared";
@@ -33,7 +35,6 @@ import { createDevServer } from "../dev-utils/dev-server.mjs";
 import { AUTO_UPGRADE_EXIT_CODE } from "../index.js";
 import { getTracer } from "../telemetry/index.js";
 import { getErrorMeta, getLogger, type Logger } from "../telemetry/logging.js";
-import { buildGithubSuperblocksSyncWorkflow } from "./assets/git-workflows/github-superblocks-sync-workflow.js";
 import { checkVersionsAndWritePackageJson } from "./automatic-upgrades.js";
 import { getCurrentCliVersion } from "./version-detection.js";
 import type {
@@ -51,6 +52,7 @@ import type { DraftInterface } from "@superblocksteam/vite-plugin-file-sync/draf
 import type { GitService } from "@superblocksteam/vite-plugin-file-sync/git-service";
 
 const exec = promisify(child_process.exec);
+
 const passErrorToVSCode = (message: string | undefined, logger: Logger) => {
   if (message && process.env.SUPERBLOCKS_VSCODE === "true") {
     // Prefixing with `clierr:` will make the VS code extension capture this message and show it to the user.
@@ -479,18 +481,17 @@ export async function dev(options: {
               process.env.SUPERBLOCKS_APP_TEMPLATE_NAME ??
               options.prefetchedApplication?.application?.templateName;
             const sdkApiEnabled = isSdkApiTemplate(templateName);
+            const isAppFullstackTemplate = templateName === "app-fullstack";
+            const rawFlagBootstrap = currentUser.flagBootstrap as
+              | Record<string, unknown>
+              | undefined;
             const flagBootstrap = {
-              ...(currentUser.flagBootstrap as
-                | Record<string, unknown>
-                | undefined),
+              ...rawFlagBootstrap,
               "clark.sdk-api.enabled": sdkApiEnabled,
               "superblocks.native-git.enabled":
-                sdkApiEnabled &&
-                !!(
-                  currentUser.flagBootstrap as
-                    | Record<string, unknown>
-                    | undefined
-                )?.["superblocks.native-git.enabled"],
+                (isAppFullstackTemplate &&
+                  !!rawFlagBootstrap?.["superblocks.native-git.enabled"]) ||
+                !!rawFlagBootstrap?.["superblocks.native-git.forced"],
             };
 
             aiService = new AiService({
@@ -572,7 +573,14 @@ export async function dev(options: {
                 });
 
                 if (!bootstrappedGitService) {
-                  logger.info("No git remote configured, skipping git sync");
+                  logger.info("[git] startup git sync skipped", {
+                    gitCategory: "setup",
+                    gitOperation: "bootstrap",
+                    gitOutcome: "skipped",
+                    gitReason: "no_remote_configured",
+                    applicationId: applicationConfig.id,
+                    workDir: cwd,
+                  });
                   gitSpan.end();
                   return;
                 }
@@ -607,14 +615,30 @@ export async function dev(options: {
                   );
                 } catch (syncError) {
                   logger.warn(
-                    `Git remote sync failed (local repo still usable): ${syncError instanceof Error ? syncError.message : String(syncError)}`,
+                    "[git] startup remote sync failed but local repo remains usable",
+                    {
+                      gitCategory: "setup",
+                      gitOperation: "fetch-and-ensure-live-branch",
+                      gitOutcome: "failed",
+                      applicationId: applicationConfig.id,
+                      workDir: cwd,
+                      ...getGitErrorFields(syncError),
+                    },
                   );
                 }
               } catch (gitError) {
                 // Init/configure/ensureGitRepo failed — repo is not usable
                 gitService = undefined;
                 logger.warn(
-                  `Git setup failed, continuing without git: ${gitError instanceof Error ? gitError.message : String(gitError)}`,
+                  "[git] startup git setup failed, continuing without git",
+                  {
+                    gitCategory: "setup",
+                    gitOperation: "bootstrap",
+                    gitOutcome: "failed",
+                    applicationId: applicationConfig.id,
+                    workDir: cwd,
+                    ...getGitErrorFields(gitError),
+                  },
                 );
                 gitSpan.setStatus({
                   code: SpanStatusCode.ERROR,
@@ -748,10 +772,22 @@ export async function dev(options: {
             () => false,
           );
           if (!hasGit) {
-            logger.warn(
-              "[git] activateRuntimeGitService: .git directory disappeared, clearing cached git service",
-            );
+            logger.warn("[git] runtime git service cache invalidated", {
+              gitCategory: "setup",
+              gitOperation: "activate-runtime-service",
+              gitOutcome: "failed",
+              gitReason: "missing_git_directory",
+              workDir: cwd,
+            });
             gitService = undefined;
+            activeDbfsBranchName = await ensureRuntimeDbfsBranchConsistency({
+              sdk,
+              applicationConfig,
+              logger,
+              lockService,
+              syncService,
+              currentBranchName: activeDbfsBranchName,
+            });
             return undefined;
           }
 
@@ -776,6 +812,16 @@ export async function dev(options: {
             userEmail: gitUserEmail,
           });
           if (!runtimeGitService) {
+            // Git may have been disconnected while this dev server is running.
+            // Reconcile lock/sync branch context back to non-git runtime state.
+            activeDbfsBranchName = await ensureRuntimeDbfsBranchConsistency({
+              sdk,
+              applicationConfig,
+              logger,
+              lockService,
+              syncService,
+              currentBranchName: activeDbfsBranchName,
+            });
             return undefined;
           }
 
@@ -800,9 +846,14 @@ export async function dev(options: {
           gitService = runtimeGitService;
           return gitService;
         } catch (error) {
-          logger.warn(
-            `Git runtime bootstrap failed: ${error instanceof Error ? error.message : String(error)}`,
-          );
+          logger.warn("[git] runtime bootstrap failed", {
+            gitCategory: "setup",
+            gitOperation: "runtime-bootstrap",
+            gitOutcome: "failed",
+            applicationId: applicationConfig.id,
+            workDir: cwd,
+            ...getGitErrorFields(error),
+          });
           return undefined;
         }
       };
@@ -818,6 +869,7 @@ export async function dev(options: {
             syncService: syncService,
             lockService: lockService,
             aiService: aiService,
+            gitService: gitService,
             activateGitService: activateRuntimeGitService,
             snapshotManager: snapshotManager,
             logger: options.logger,
@@ -864,6 +916,17 @@ export async function dev(options: {
 // Git sync helpers
 // ---------------------------------------------------------------------------
 
+function getGitErrorFields(error: unknown): {
+  gitErrorKind: string;
+  gitErrorMessage: string;
+} {
+  const meta = getErrorMeta(error);
+  return {
+    gitErrorKind: meta.error.kind,
+    gitErrorMessage: meta.error.message,
+  };
+}
+
 async function bootstrapGitService({
   sdk,
   applicationId,
@@ -897,10 +960,12 @@ async function bootstrapGitService({
 
   const service = createGitService(cwd);
   let credentials: { username: string; token: string } | undefined;
+  let gitRemoteHost: string | undefined;
 
   if (gitConfig.hasCredential) {
     try {
       const host = new URL(gitConfig.gitRemoteUrl).hostname;
+      gitRemoteHost = host;
       const freshToken = await gitConfigSdk.getGitFreshToken(
         host,
         applicationId,
@@ -908,8 +973,16 @@ async function bootstrapGitService({
       if (freshToken) {
         credentials = freshToken;
       }
-    } catch {
-      logger.warn("Could not fetch git credentials, continuing without auth");
+    } catch (error) {
+      logger.warn("[git] credential fetch failed, continuing without auth", {
+        gitCategory: "setup",
+        gitOperation: "fetch-credentials",
+        gitOutcome: "failed",
+        applicationId,
+        gitRemoteHost,
+        gitRemoteUrl: gitConfig.gitRemoteUrl,
+        ...getGitErrorFields(error),
+      });
     }
   }
 
@@ -928,9 +1001,14 @@ async function fetchAndEnsureLiveBranch(
     await git.fetch();
   } catch (error) {
     fetchError = error;
-    getLogger().warn(
-      `${errorPrefix}: ${error instanceof Error ? error.message : String(error)}`,
-    );
+    getLogger().warn("[git] fetch and ensure live branch failed", {
+      gitCategory: "setup",
+      gitOperation: "fetch-and-ensure-live-branch",
+      gitOutcome: "failed",
+      gitReason: errorPrefix,
+      workDir: git.workDir,
+      ...getGitErrorFields(error),
+    });
   }
   // Always ensure the local superblocks/live branch exists,
   // even if fetch failed (remote may not be reachable yet).
@@ -961,9 +1039,15 @@ async function ensureGitRepo(
         `refs/heads/${SUPERBLOCKS_LIVE_GIT_BRANCH}`,
       ])
       .catch((err) => {
-        getLogger().warn(
-          `[git] ensureGitRepo: ls-remote failed (remote may be unreachable): ${err instanceof Error ? err.message : String(err)}`,
-        );
+        getLogger().warn("[git] ensure repo ls-remote failed", {
+          gitCategory: "setup",
+          gitOperation: "ensure-repo",
+          gitOutcome: "failed",
+          gitRemote: "origin",
+          gitBranch: SUPERBLOCKS_LIVE_GIT_BRANCH,
+          gitRemoteUrl: remoteUrl,
+          ...getGitErrorFields(err),
+        });
         return "";
       });
 
@@ -1003,17 +1087,36 @@ async function ensureGitRepo(
       const remotes = await git.getRemotes(true);
       const origin = remotes.find((r) => r.name === "origin");
       if (origin && origin.refs.fetch !== remoteUrl) {
-        getLogger().warn(
-          `[git] ensureGitRepo: remote URL changed from "${origin.refs.fetch}" to "${remoteUrl}", updating`,
-        );
+        getLogger().warn("[git] ensure repo remote url changed", {
+          gitCategory: "setup",
+          gitOperation: "ensure-repo",
+          gitOutcome: "fallback",
+          gitRemote: "origin",
+          gitPreviousRemoteUrl: origin.refs.fetch,
+          gitRemoteUrl: remoteUrl,
+        });
         await git.remote(["set-url", "origin", remoteUrl]);
       } else if (!origin) {
-        getLogger().warn("[git] ensureGitRepo: no origin remote found, adding");
+        getLogger().warn("[git] ensure repo origin remote missing, adding", {
+          gitCategory: "setup",
+          gitOperation: "ensure-repo",
+          gitOutcome: "fallback",
+          gitRemote: "origin",
+          gitRemoteUrl: remoteUrl,
+        });
         await git.addRemote("origin", remoteUrl);
       }
     } catch (remoteErr) {
       getLogger().warn(
-        `[git] ensureGitRepo: failed to inspect/update remotes, attempting fallback: ${remoteErr instanceof Error ? remoteErr.message : String(remoteErr)}`,
+        "[git] ensure repo remote inspection failed, attempting fallback",
+        {
+          gitCategory: "setup",
+          gitOperation: "ensure-repo",
+          gitOutcome: "failed",
+          gitRemote: "origin",
+          gitRemoteUrl: remoteUrl,
+          ...getGitErrorFields(remoteErr),
+        },
       );
       try {
         await git.addRemote("origin", remoteUrl);
@@ -1028,15 +1131,11 @@ async function ensureGitRepo(
   await seedGithubWorkflowIfNeeded(git.workDir, remoteUrl);
 }
 
-function isGithubRemote(remoteUrl: string): boolean {
-  return remoteUrl.includes("github.com");
-}
-
 async function seedGithubWorkflowIfNeeded(
   workDir: string,
   remoteUrl: string,
 ): Promise<void> {
-  if (!isGithubRemote(remoteUrl)) {
+  if (!isGitHubRemoteUrl(remoteUrl)) {
     return;
   }
 

package/src/parse-sdk-registry.mts

@@ -1,9 +1,10 @@
 import path from "node:path";
-import { parse } from "@babel/parser";
+import { parseSdkRegistryFromContent } from "@superblocksteam/vite-plugin-file-sync/parsing";
 
 export type RegistryKeyToPath = Map<string, string>;
 
 type PathExists = (p: string) => Promise<boolean>;
+const RESOLUTION_EXTENSIONS = [".ts", ".tsx", ".js"] as const;
 
 /**
  * Parse server/apis/index.ts to extract the mapping from registry key (used in
@@ -26,84 +27,9 @@ export async function parseSdkRegistry(
   root: string,
   pathExists: PathExists,
 ): Promise<RegistryKeyToPath> {
-  const result = new Map<string, string>();
-
-  let ast: ReturnType<typeof parse>;
-  try {
-    ast = parse(registryContent, {
-      sourceType: "module",
-      plugins: ["typescript"],
-    });
-  } catch {
-    return result;
-  }
-
-  const body = ast.program.body;
-
-  // Build import map: local name -> resolved path (relative to root)
-  const importMap = new Map<string, string>();
-  for (const node of body) {
-    if (node.type !== "ImportDeclaration") continue;
-    const imp = node;
-    const specifier = imp.specifiers[0];
-    if (!specifier || specifier.type !== "ImportDefaultSpecifier") continue;
-    const localName = specifier.local?.name;
-    const source = imp.source?.value;
-    if (typeof localName !== "string" || typeof source !== "string") continue;
-    const resolved = await resolveImportPath(
-      source,
-      registryDir,
-      root,
-      pathExists,
-    );
-    if (resolved) importMap.set(localName, resolved);
-  }
-
-  // Find the exported object
-  const exportedObject = findExportedObject(ast);
-  if (!exportedObject) return result;
-
-  for (const prop of exportedObject.properties) {
-    if (prop.type !== "ObjectProperty") continue;
-    const key = getPropertyKey(
-      prop as { key: { type: string; name?: string; value?: string } },
-    );
-    if (!key) continue;
-
-    const value = prop.value as {
-      type: string;
-      name?: string;
-      body?: { type: string };
-    };
-    let resolvedPath: string | undefined;
-
-    if (value.type === "Identifier") {
-      resolvedPath = importMap.get(value.name ?? "");
-    } else if (value.type === "CallExpression") {
-      resolvedPath = await resolveImportPathFromCall(
-        value as unknown as Parameters<typeof resolveImportPathFromCall>[0],
-        registryDir,
-        root,
-        pathExists,
-      );
-    }
-    // ObjectProperty with ArrowFunctionExpression: () => import('./x')
-    else if (value.type === "ArrowFunctionExpression") {
-      const body = value.body;
-      if (body?.type === "CallExpression") {
-        resolvedPath = await resolveImportPathFromCall(
-          body as unknown as Parameters<typeof resolveImportPathFromCall>[0],
-          registryDir,
-          root,
-          pathExists,
-        );
-      }
-    }
-
-    if (resolvedPath) result.set(key, resolvedPath);
-  }
-
-  return result;
+  return parseSdkRegistryFromContent(registryContent, (importPath) =>
+    resolveImportPath(importPath, registryDir, root, pathExists),
+  );
 }
 
 async function resolveImportPath(
@@ -116,112 +42,13 @@ async function resolveImportPath(
   const absoluteBase = path
     .normalize(path.join(registryDir, importPath))
     .replace(/\.(js|ts|tsx)$/, "");
-  for (const ext of [".ts", ".tsx"]) {
-    const candidate = absoluteBase + ext;
+
+  for (const extension of RESOLUTION_EXTENSIONS) {
+    const candidate = absoluteBase + extension;
     if (await pathExists(candidate)) {
       return path.relative(root, candidate).replace(/\\/g, "/");
     }
   }
-  return undefined;
-}
 
-async function resolveImportPathFromCall(
-  call: {
-    callee: { type: string };
-    arguments: Array<{ type: string; value?: string }>;
-  },
-  registryDir: string,
-  root: string,
-  pathExists: PathExists,
-): Promise<string | undefined> {
-  const callee = call.callee;
-  if (callee.type !== "Import") return undefined;
-  const arg = call.arguments[0];
-  if (arg?.type !== "StringLiteral" || typeof arg.value !== "string")
-    return undefined;
-  return resolveImportPath(arg.value, registryDir, root, pathExists);
-}
-
-function getPropertyKey(prop: {
-  key: { type: string; name?: string; value?: string };
-}): string | undefined {
-  const key = prop.key;
-  if (key.type === "Identifier") return key.name;
-  if (key.type === "StringLiteral") return key.value;
-  return undefined;
-}
-
-function findExportedObject(
-  ast: ReturnType<typeof parse>,
-):
-  | { properties: Array<{ type: string; key: unknown; value: unknown }> }
-  | undefined {
-  for (const node of ast.program.body) {
-    if (node.type !== "ExportDefaultDeclaration") continue;
-    const decl = node.declaration as { type: string; name?: string };
-
-    const obj = getObjectExpression(
-      decl as { type: string; expression?: unknown; properties?: unknown[] },
-    );
-    if (obj) {
-      return obj as {
-        properties: Array<{ type: string; key: unknown; value: unknown }>;
-      };
-    }
-    if (decl.type === "Identifier") {
-      const varName = decl.name;
-      if (!varName) continue;
-      const def = findVariableDeclaration(ast, varName);
-      if (def?.init) {
-        return def.init as unknown as {
-          properties: Array<{ type: string; key: unknown; value: unknown }>;
-        };
-      }
-    }
-  }
-  return undefined;
-}
-
-function getObjectExpression(node: {
-  type: string;
-  expression?: unknown;
-  properties?: unknown[];
-}): { properties: unknown[] } | undefined {
-  if (node.type === "ObjectExpression") {
-    return node as { properties: unknown[] };
-  }
-  // TypeScript: { x } as const → TSAsExpression or TSSatisfiesExpression
-  if (
-    (node.type === "TSAsExpression" || node.type === "TSSatisfiesExpression") &&
-    "expression" in node
-  ) {
-    const inner = node.expression as { type: string; properties?: unknown[] };
-    if (inner?.type === "ObjectExpression") {
-      return inner as { properties: unknown[] };
-    }
-  }
-  return undefined;
-}
-
-function findVariableDeclaration(
-  ast: ReturnType<typeof parse>,
-  name: string,
-): { init: { properties: unknown[] } } | undefined {
-  for (const node of ast.program.body) {
-    if (node.type !== "VariableDeclaration") continue;
-    const decl = node;
-    for (const declarator of decl.declarations) {
-      if (
-        declarator.id.type === "Identifier" &&
-        declarator.id.name === name &&
-        declarator.init
-      ) {
-        const obj = getObjectExpression(
-          declarator.init as { type: string; expression?: unknown },
-        );
-        if (obj) return { init: obj };
-      }
-    }
-  }
   return undefined;
 }

package/src/parse-sdk-registry.test.mts

@@ -10,7 +10,8 @@ describe("parseSdkRegistry", () => {
     return (
       rel === "server/apis/GetUsers/api.ts" ||
       rel === "server/apis/v2/GetUsers/api.ts" ||
-      rel === "server/apis/CreateOrder/api.ts"
+      rel === "server/apis/CreateOrder/api.ts" ||
+      rel === "server/apis/JsOnly/api.js"
     );
   };
 
@@ -130,4 +131,19 @@ export default { GetUsers } as const;
     );
     expect(result.size).toBe(0);
   });
+
+  it("resolves .js files when .ts/.tsx are missing", async () => {
+    const content = `
+import JsOnly from './JsOnly/api.js';
+export default { JsOnly };
+`;
+    const result = await parseSdkRegistry(
+      content,
+      registryDir,
+      root,
+      pathExists,
+    );
+    expect(result.get("JsOnly")).toBe("server/apis/JsOnly/api.js");
+    expect(result.size).toBe(1);
+  });
 });