@agent-native/core 0.111.2 → 0.111.4

package/corpus/core/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @agent-native/core
 
+## 0.111.4
+
+### Patch Changes
+
+- 2f61097: Re-scan installed package exports after dependency installation before applying manifest import migrations.
+
+## 0.111.3
+
+### Patch Changes
+
+- 7843f92: Apply active import migrations to starter-owned source and install newly introduced migration dependencies before rewriting imports.
+
 ## 0.111.2
 
 ### Patch Changes

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.111.2",
+  "version": "0.111.4",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {

package/corpus/core/src/cli/migration-codemod.ts

@@ -1,3 +1,4 @@
+import { spawnSync } from "node:child_process";
 import fs from "node:fs";
 import { createRequire } from "node:module";
 import path from "node:path";
@@ -48,7 +49,7 @@ export interface RunMigrationCodemodsOptions {
   root: string;
   manifests?: MigrationManifest[];
   apply?: boolean;
-  targetExists?: (specifier: string) => boolean;
+  targetExists?: (specifier: string, sourceFile?: string) => boolean;
 }
 
 interface PendingDependency {
@@ -104,6 +105,91 @@ function packageNameFromSpecifier(specifier: string): string | null {
   return name && !name.startsWith(".") ? name : null;
 }
 
+function isPackageInstalled(
+  requireFromProject: ReturnType<typeof createRequire>,
+  packageName: string,
+): boolean {
+  const searchPaths = requireFromProject.resolve.paths(packageName) ?? [];
+  return searchPaths.some((searchPath) =>
+    fs.existsSync(path.join(searchPath, packageName, "package.json")),
+  );
+}
+
+export function createMigrationPlanningTargetResolver(
+  projectRoot: string,
+): (specifier: string, sourceFile?: string) => boolean {
+  const fallbackPath = path.join(path.resolve(projectRoot), "package.json");
+  return (specifier: string, sourceFile = fallbackPath): boolean => {
+    const requireFromSource = createRequire(sourceFile);
+    try {
+      requireFromSource.resolve(specifier);
+      return true;
+    } catch {
+      const packageName = packageNameFromSpecifier(specifier);
+      return Boolean(
+        packageName && !isPackageInstalled(requireFromSource, packageName),
+      );
+    }
+  };
+}
+
+const FRESH_RESOLVE_SCRIPT = [
+  'const { createRequire } = require("node:module");',
+  "try {",
+  "  createRequire(process.argv[1]).resolve(process.argv[2]);",
+  "} catch {",
+  "  process.exitCode = 1;",
+  "}",
+].join("\n");
+
+function nodeConditionArgs(): string[] {
+  const conditions: string[] = [];
+  for (let index = 0; index < process.execArgv.length; index += 1) {
+    const argument = process.execArgv[index];
+    if (argument === "--conditions" || argument === "-C") {
+      const value = process.execArgv[index + 1];
+      if (value) {
+        conditions.push(argument, value);
+        index += 1;
+      }
+    } else if (
+      argument.startsWith("--conditions=") ||
+      argument.startsWith("-C=")
+    ) {
+      conditions.push(argument);
+    }
+  }
+  return conditions;
+}
+
+function createFreshMigrationTargetResolver(
+  projectRoot: string,
+): (specifier: string, sourceFile?: string) => boolean {
+  const fallbackPath = path.join(path.resolve(projectRoot), "package.json");
+  const cache = new Map<string, boolean>();
+  return (specifier: string, sourceFile = fallbackPath): boolean => {
+    const resolutionBase =
+      nearestPackageFile(sourceFile, projectRoot) ?? sourceFile;
+    const key = `${resolutionBase}\0${specifier}`;
+    const cached = cache.get(key);
+    if (cached !== undefined) return cached;
+    const resolved =
+      spawnSync(
+        process.execPath,
+        [
+          ...nodeConditionArgs(),
+          "-e",
+          FRESH_RESOLVE_SCRIPT,
+          resolutionBase,
+          specifier,
+        ],
+        { stdio: "ignore" },
+      ).status === 0;
+    cache.set(key, resolved);
+    return resolved;
+  };
+}
+
 function nearestPackageFile(file: string, root: string): string | null {
   let directory = path.dirname(file);
   const boundary = path.resolve(root);
@@ -175,7 +261,7 @@ function rewriteImportDeclaration(
   root: string,
   pendingDependencies: PendingDependency[],
   warnings: string[],
-  targetExists: (specifier: string) => boolean,
+  targetExists: (specifier: string, sourceFile?: string) => boolean,
 ): boolean {
   const originalSpecifier = declaration.getModuleSpecifierValue();
   const sourceFile = declaration.getSourceFile();
@@ -186,7 +272,7 @@ function rewriteImportDeclaration(
       warnSkippedTarget(warnings, sourceFile.getFilePath(), move.to, "planned");
       return false;
     }
-    if (!targetExists(move.to)) {
+    if (!targetExists(move.to, sourceFile.getFilePath())) {
       warnSkippedTarget(
         warnings,
         sourceFile.getFilePath(),
@@ -228,7 +314,7 @@ function rewriteImportDeclaration(
       );
       continue;
     }
-    if (!targetExists(resolved.to)) {
+    if (!targetExists(resolved.to, sourceFile.getFilePath())) {
       warnSkippedTarget(
         warnings,
         sourceFile.getFilePath(),
@@ -286,7 +372,7 @@ function rewriteExportDeclarations(
   root: string,
   pendingDependencies: PendingDependency[],
   warnings: string[],
-  targetExists: (specifier: string) => boolean,
+  targetExists: (specifier: string, sourceFile?: string) => boolean,
 ): void {
   for (const declaration of [...sourceFile.getExportDeclarations()]) {
     const originalSpecifier = declaration.getModuleSpecifierValue();
@@ -305,7 +391,7 @@ function rewriteExportDeclarations(
         );
         continue;
       }
-      if (!targetExists(move.to)) {
+      if (!targetExists(move.to, sourceFile.getFilePath())) {
         warnSkippedTarget(
           warnings,
           sourceFile.getFilePath(),
@@ -349,7 +435,7 @@ function rewriteExportDeclarations(
         );
         continue;
       }
-      if (!targetExists(resolved.to)) {
+      if (!targetExists(resolved.to, sourceFile.getFilePath())) {
         warnSkippedTarget(
           warnings,
           sourceFile.getFilePath(),
@@ -469,17 +555,8 @@ export function runMigrationCodemods(
   const root = path.resolve(options.root);
   const manifests = options.manifests ?? loadMigrationManifests(root);
   const moves = mergeManifestMoves(manifests);
-  const requireFromProject = createRequire(path.join(root, "package.json"));
   const targetExists =
-    options.targetExists ??
-    ((specifier: string): boolean => {
-      try {
-        requireFromProject.resolve(specifier);
-        return true;
-      } catch {
-        return false;
-      }
-    });
+    options.targetExists ?? createFreshMigrationTargetResolver(root);
   const project = new Project({
     skipAddingFilesFromTsConfig: true,
     manipulationSettings: { quoteKind: QuoteKind.Double },

package/corpus/core/src/cli/sync-builder-starter-manifest.ts

@@ -3,7 +3,12 @@ import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
+import {
+  isMigrationManifestActive,
+  readMigrationManifest,
+} from "../package-lifecycle/migration-manifest.js";
 import { _postProcessStandalone } from "./create.js";
+import { runMigrationCodemods } from "./migration-codemod.js";
 
 export const STARTER_APP_NAME = "builder-agent-native-starter";
 export const CHAT_TEMPLATE = "chat";
@@ -25,6 +30,11 @@ export const STARTER_TOOLCHAIN_SYNC_PATHS = [
   "netlify.toml",
 ] as const;
 
+export const STARTER_SOURCE_MIGRATION_PATHS = [
+  ":(glob)**/*.ts",
+  ":(glob)**/*.tsx",
+] as const;
+
 const STANDALONE_SNAPSHOT_EXCLUDED_TOP_LEVEL = new Set([
   ".deploy-tmp",
   ".env",
@@ -58,9 +68,79 @@ export function listStarterSyncPaths(): string[] {
     "pnpm-lock.yaml",
     "pnpm-workspace.yaml",
     ...STARTER_TOOLCHAIN_SYNC_PATHS,
+    ...STARTER_SOURCE_MIGRATION_PATHS,
   ];
 }
 
+export function migrateStarterSources(options: {
+  starterDir: string;
+  repoRoot: string;
+  coreVersion: string | null;
+  write?: boolean;
+}): { changedPaths: string[]; warnings: string[] } {
+  const manifestPath = path.join(
+    options.repoRoot,
+    "packages/core/migration-manifest.json",
+  );
+  const manifest = readMigrationManifest(manifestPath);
+  if (!manifest) {
+    throw new Error(`Could not read migration manifest at ${manifestPath}.`);
+  }
+  if (!isMigrationManifestActive(manifest, options.coreVersion)) {
+    return { changedPaths: [], warnings: [] };
+  }
+
+  const result = runMigrationCodemods({
+    root: options.starterDir,
+    manifests: [manifest],
+    apply: options.write,
+    // Checked-in migration targets are validated by the manifest guard before
+    // this source sync runs; starter dependencies are installed afterward.
+    targetExists: () => true,
+  });
+
+  return {
+    changedPaths: [
+      ...new Set(
+        result.changes.map((change) =>
+          path.relative(options.starterDir, change.file),
+        ),
+      ),
+    ].sort(),
+    warnings: result.warnings,
+  };
+}
+
+export function resolveStarterCoreVersion(
+  starterPackageJson: PackageJson,
+  repoRoot: string,
+): string | null {
+  const dependencies = starterPackageJson.dependencies;
+  if (dependencies && typeof dependencies === "object") {
+    const declared = (dependencies as Record<string, unknown>)[
+      "@agent-native/core"
+    ];
+    if (typeof declared === "string") {
+      const version = declared.match(/\d+\.\d+\.\d+/)?.[0];
+      if (version) return version;
+    }
+  }
+
+  try {
+    const corePackageJson = JSON.parse(
+      fs.readFileSync(
+        path.join(repoRoot, "packages/core/package.json"),
+        "utf-8",
+      ),
+    ) as { version?: unknown };
+    return typeof corePackageJson.version === "string"
+      ? corePackageJson.version
+      : null;
+  } catch {
+    return null;
+  }
+}
+
 export function findAgentNativeRoot(startDir = process.cwd()): string {
   let dir = path.resolve(startDir);
   for (let i = 0; i < 12; i++) {
@@ -296,6 +376,8 @@ export type SyncStarterManifestResult = {
   pnpmWorkspaceYaml: string | null;
   toolchainChanges: StarterToolchainSyncChange[];
   changedToolchainPaths: StarterToolchainSyncPath[];
+  changedSourceMigrationPaths: string[];
+  sourceMigrationWarnings: string[];
 };
 
 export function resolveStarterPaths(options: {
@@ -345,6 +427,19 @@ export function syncStarterManifestFiles(options: {
   const snapshot = createStandaloneChatSnapshot(options.repoRoot);
 
   try {
+    const repoRoot = options.repoRoot ?? findAgentNativeRoot();
+    const initialStarterPackageJson = JSON.parse(
+      fs.readFileSync(starterPackageJsonPath, "utf-8"),
+    ) as PackageJson;
+    const sourceMigration = migrateStarterSources({
+      starterDir,
+      repoRoot,
+      coreVersion: resolveStarterCoreVersion(
+        initialStarterPackageJson,
+        repoRoot,
+      ),
+      write: options.write,
+    });
     const starterPackageJson = JSON.parse(
       fs.readFileSync(starterPackageJsonPath, "utf-8"),
     ) as PackageJson;
@@ -371,7 +466,10 @@ export function syncStarterManifestFiles(options: {
       .filter((change) => change.changed)
       .map((change) => change.relativePath);
     const changed =
-      packageChanged || workspaceChanged || changedToolchainPaths.length > 0;
+      packageChanged ||
+      workspaceChanged ||
+      changedToolchainPaths.length > 0 ||
+      sourceMigration.changedPaths.length > 0;
 
     if (options.write && changed) {
       if (packageChanged) {
@@ -396,6 +494,8 @@ export function syncStarterManifestFiles(options: {
       pnpmWorkspaceYaml: snapshot.pnpmWorkspaceYaml,
       toolchainChanges,
       changedToolchainPaths,
+      changedSourceMigrationPaths: sourceMigration.changedPaths,
+      sourceMigrationWarnings: sourceMigration.warnings,
     };
   } finally {
     snapshot.cleanup();
@@ -494,11 +594,18 @@ export function runSyncStarterManifestCli(argv: string[]): number {
     write: args.write,
   });
 
+  for (const warning of result.sourceMigrationWarnings) {
+    console.warn(`[starter migration] ${warning}`);
+  }
+
   if (result.changed) {
     const updatedPaths = [
-      ...(result.packageChanged ? ["package.json"] : []),
-      ...(result.workspaceChanged ? ["pnpm-workspace.yaml"] : []),
-      ...result.changedToolchainPaths,
+      ...new Set([
+        ...(result.packageChanged ? ["package.json"] : []),
+        ...(result.workspaceChanged ? ["pnpm-workspace.yaml"] : []),
+        ...result.changedToolchainPaths,
+        ...result.changedSourceMigrationPaths,
+      ]),
     ];
     const summary = updatedPaths.length ? ` (${updatedPaths.join(", ")})` : "";
     console.log(

package/corpus/core/src/cli/upgrade.ts

@@ -18,6 +18,8 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 
+import type { MigrationCodemodResult } from "./migration-codemod.js";
+
 const AGENT_NATIVE_SCOPE = "@agent-native/";
 const PINNABLE_VERSION = "latest";
 
@@ -541,6 +543,19 @@ const FAILURE_GUIDANCE = [
   "  npx @agent-native/core@latest upgrade",
 ].join("\n");
 
+function applyCodemodDependencyPlan(
+  codemodResult: MigrationCodemodResult,
+): MigrationCodemodResult["changes"] {
+  const dependencyFiles = new Set(codemodResult.dependencyFiles);
+  const applied: MigrationCodemodResult["changes"] = [];
+  for (const change of codemodResult.changes) {
+    if (!dependencyFiles.has(change.file)) continue;
+    fs.writeFileSync(change.file, change.after);
+    applied.push(change);
+  }
+  return applied;
+}
+
 export async function runUpgrade(
   argv: string[],
   io: UpgradeIo = defaultIo,
@@ -659,39 +674,57 @@ export async function runUpgrade(
     });
   }
 
+  let codemodPlan:
+    | {
+        module: typeof import("./migration-codemod.js");
+        dependencyChanges: MigrationCodemodResult["changes"];
+      }
+    | undefined;
+
   if (opts.codemods) {
-    const { formatMigrationCodemodDiff, runMigrationCodemods } =
-      await import("./migration-codemod.js");
-    const codemodResult = runMigrationCodemods({
+    const codemodModule = await import("./migration-codemod.js");
+    const codemodResult = codemodModule.runMigrationCodemods({
       root: project.root,
-      apply: !dryRun,
-    });
-    const diff = formatMigrationCodemodDiff(codemodResult, project.root);
-    result.codemod = {
-      files: codemodResult.changes.map((change) =>
-        relativeTo(project.root, change.file),
+      targetExists: codemodModule.createMigrationPlanningTargetResolver(
+        project.root,
       ),
-      warnings: codemodResult.warnings,
-      diff,
-    };
-    result.steps.push({
-      id: "codemods",
-      status:
-        codemodResult.changes.length === 0
-          ? "skipped"
-          : dryRun
-            ? "planned"
-            : "ok",
-      detail:
-        codemodResult.changes.length === 0
-          ? "No manifest migrations found"
-          : `${dryRun ? "Would update" : "Updated"} ${codemodResult.changes.length} file(s)`,
     });
-    if (!opts.json && diff) {
+    const diff = codemodModule.formatMigrationCodemodDiff(
+      codemodResult,
+      project.root,
+    );
+    const dependencyChanges = dryRun
+      ? []
+      : applyCodemodDependencyPlan(codemodResult);
+    codemodPlan = {
+      module: codemodModule,
+      dependencyChanges,
+    };
+
+    if (dryRun) {
+      result.codemod = {
+        files: codemodResult.changes.map((change) =>
+          relativeTo(project.root, change.file),
+        ),
+        warnings: codemodResult.warnings,
+        diff,
+      };
+    }
+    if (dryRun) {
+      result.steps.push({
+        id: "codemods",
+        status: codemodResult.changes.length === 0 ? "skipped" : "planned",
+        detail:
+          codemodResult.changes.length === 0
+            ? "No manifest migrations found"
+            : `Would update ${codemodResult.changes.length} file(s)`,
+      });
+    }
+    if (dryRun && !opts.json && diff) {
       io.log(diff);
       io.log("");
     }
-    if (!opts.json) {
+    if (dryRun && !opts.json) {
       for (const warning of codemodResult.warnings) {
         io.err(`[codemods] ${warning}`);
       }
@@ -721,6 +754,30 @@ export async function runUpgrade(
       result.ok = false;
       result.exitCode = spawned.status ?? 1;
       result.message = `${pm} install failed`;
+      if (codemodPlan && codemodPlan.dependencyChanges.length > 0) {
+        const dependencyResult: MigrationCodemodResult = {
+          changes: codemodPlan.dependencyChanges,
+          dependencyFiles: codemodPlan.dependencyChanges.map(
+            (change) => change.file,
+          ),
+          warnings: [],
+        };
+        const diff = codemodPlan.module.formatMigrationCodemodDiff(
+          dependencyResult,
+          project.root,
+        );
+        result.codemod = {
+          files: dependencyResult.changes.map((change) =>
+            relativeTo(project.root, change.file),
+          ),
+          warnings: [],
+          diff,
+        };
+        if (!opts.json && diff) {
+          io.log(diff);
+          io.log("");
+        }
+      }
       result.steps.push({
         id: "install",
         status: "failed",
@@ -732,6 +789,51 @@ export async function runUpgrade(
     result.steps.push({ id: "install", status: "ok", detail: `${pm} install` });
   }
 
+  if (codemodPlan && !dryRun) {
+    const applied = codemodPlan.module.runMigrationCodemods({
+      root: project.root,
+      apply: true,
+    });
+    const actualResult: MigrationCodemodResult = {
+      changes: [...codemodPlan.dependencyChanges, ...applied.changes],
+      dependencyFiles: codemodPlan.dependencyChanges.map(
+        (change) => change.file,
+      ),
+      warnings: applied.warnings,
+    };
+    const diff = codemodPlan.module.formatMigrationCodemodDiff(
+      actualResult,
+      project.root,
+    );
+    const files = [
+      ...new Set(actualResult.changes.map((change) => change.file)),
+    ];
+    result.codemod = {
+      files: files.map((file) => relativeTo(project.root, file)),
+      warnings: actualResult.warnings,
+      diff,
+    };
+    result.steps.push({
+      id: "codemods",
+      status: files.length === 0 ? "skipped" : "ok",
+      detail:
+        files.length === 0
+          ? "No resolvable manifest migrations found"
+          : opts.skipInstall
+            ? `Updated ${files.length} file(s) without installing dependencies`
+            : `Updated ${files.length} file(s) after dependency installation`,
+    });
+    if (!opts.json && diff) {
+      io.log(diff);
+      io.log("");
+    }
+    if (!opts.json) {
+      for (const warning of actualResult.warnings) {
+        io.err(`[codemods] ${warning}`);
+      }
+    }
+  }
+
   // Skills refresh.
   if (opts.skipSkills) {
     result.steps.push({

package/dist/cli/migration-codemod.d.ts

@@ -13,9 +13,10 @@ export interface RunMigrationCodemodsOptions {
     root: string;
     manifests?: MigrationManifest[];
     apply?: boolean;
-    targetExists?: (specifier: string) => boolean;
+    targetExists?: (specifier: string, sourceFile?: string) => boolean;
 }
 export declare function loadMigrationManifests(projectRoot: string): MigrationManifest[];
+export declare function createMigrationPlanningTargetResolver(projectRoot: string): (specifier: string, sourceFile?: string) => boolean;
 export declare function runMigrationCodemods(options: RunMigrationCodemodsOptions): MigrationCodemodResult;
 export declare function formatMigrationCodemodDiff(result: MigrationCodemodResult, root: string): string;
 //# sourceMappingURL=migration-codemod.d.ts.map

package/dist/cli/migration-codemod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migration-codemod.d.ts","sourceRoot":"","sources":["../../src/cli/migration-codemod.ts"],"names":[],"mappings":"AAYA,OAAO,EAML,KAAK,iBAAiB,EAEvB,MAAM,4CAA4C,CAAC;AAcpD,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,0BAA0B,EAAE,CAAC;IACtC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAChC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;CAC/C;AAqCD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,GAClB,iBAAiB,EAAE,CAKrB;AAkXD,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,2BAA2B,GACnC,sBAAsB,CA6DxB;AAiCD,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,MAAM,GACX,MAAM,CAIR"}
+{"version":3,"file":"migration-codemod.d.ts","sourceRoot":"","sources":["../../src/cli/migration-codemod.ts"],"names":[],"mappings":"AAaA,OAAO,EAML,KAAK,iBAAiB,EAEvB,MAAM,4CAA4C,CAAC;AAcpD,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,0BAA0B,EAAE,CAAC;IACtC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAChC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;CACpE;AAqCD,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,GAClB,iBAAiB,EAAE,CAKrB;AAqBD,wBAAgB,qCAAqC,CACnD,WAAW,EAAE,MAAM,GAClB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,OAAO,CAcrD;AAkaD,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,2BAA2B,GACnC,sBAAsB,CAoDxB;AAiCD,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,MAAM,GACX,MAAM,CAIR"}