forgeos 0.1.0-alpha.36 → 0.1.0-alpha.37

package/AGENTS.md

@@ -1,4 +1,4 @@
-// @forge-generated generator=0.1.0-alpha.36 input=fed0c5202e23edeb9d4d7f31d0de594194b8a898741da3c1a74b8c2d54758aa5 content=721818a6f9a664aa898092d4aa5cd68cbbd8ad6e150c7d3ad3ef785a2e3fcf53
+// @forge-generated generator=0.1.0-alpha.37 input=055c7d65fca3d6d8b05af2899c233ff69d377edf0f46f719e2d164ee0574309a content=721818a6f9a664aa898092d4aa5cd68cbbd8ad6e150c7d3ad3ef785a2e3fcf53
 # AGENTS.md
 
 <!-- forge-generated:start -->

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # forgeos
 
+## 0.1.0-alpha.37
+
+### Patch Changes
+
+- Fix `forge deps upgrade-plan` for npm alias installs used by ForgeOS apps.
+
+  - Record the real package name from package metadata in the generated package graph when a dependency is installed through an alias such as `forge: npm:forgeos@...`.
+  - Resolve upgrade plans by either the real package name (`forgeos`) or the dependency alias (`forge`) while preserving install specs like `forge@npm:forgeos@0.1.0-alpha.37`.
+  - Avoid attempting to resolve the unrelated public `forge@alpha` package when an app asks to upgrade its ForgeOS alias dependency.
+  - Add regression coverage for aliased package graph entries where the import name and real npm package name differ.
+
 ## 0.1.0-alpha.36
 
 ### Patch Changes

package/docs/changelog.md

@@ -6,6 +6,20 @@ The canonical source file in the repository is `CHANGELOG.md`.
 
 ## Unreleased
 
+## 0.1.0-alpha.37
+
+- Fixed `forge deps upgrade-plan` for npm alias installs used by ForgeOS apps.
+- Recorded the real package name from package metadata in generated package
+  graph entries when a dependency is installed through an alias such as
+  `forge: npm:forgeos@...`.
+- Resolved upgrade plans by either the real package name (`forgeos`) or the
+  dependency alias (`forge`) while preserving install specs like
+  `forge@npm:forgeos@0.1.0-alpha.37`.
+- Avoided attempting to resolve the unrelated public `forge@alpha` package when
+  an app asks to upgrade its ForgeOS alias dependency.
+- Added regression coverage for aliased package graph entries where the import
+  name and real npm package name differ.
+
 ## 0.1.0-alpha.36
 
 - Smoothed the alpha field-test loop after the Vendor Access app exercise.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forgeos",
-  "version": "0.1.0-alpha.36",
+  "version": "0.1.0-alpha.37",
   "description": "Agent-native application framework and compiler for building Forge apps without a mandatory dashboard.",
   "type": "module",
   "license": "MIT",

package/src/forge/_generated/releaseManifest.json

@@ -1 +1 @@
-{"defaultProvider":"local","diagnostics":[],"env":{"deployEnv":"FORGE_DEPLOY_ENV","deployId":"FORGE_DEPLOY_ID","publicReleaseId":"NEXT_PUBLIC_FORGE_RELEASE_ID","releaseId":"FORGE_RELEASE_ID"},"gitSha":"unknown","optionalProviders":["local","sentry-compatible","sentry","glitchtip","bugsink","otel","custom"],"packageName":"forgeos","packageVersion":"0.1.0-alpha.36","releaseId":"forgeos@0.1.0-alpha.36+unknown","schemaVersion":"0.1.0"}
+{"defaultProvider":"local","diagnostics":[],"env":{"deployEnv":"FORGE_DEPLOY_ENV","deployId":"FORGE_DEPLOY_ID","publicReleaseId":"NEXT_PUBLIC_FORGE_RELEASE_ID","releaseId":"FORGE_RELEASE_ID"},"gitSha":"unknown","optionalProviders":["local","sentry-compatible","sentry","glitchtip","bugsink","otel","custom"],"packageName":"forgeos","packageVersion":"0.1.0-alpha.37","releaseId":"forgeos@0.1.0-alpha.37+unknown","schemaVersion":"0.1.0"}

package/src/forge/_generated/releaseManifest.ts

@@ -1,4 +1,4 @@
-// @forge-generated generator=0.1.0-alpha.36 input=fed0c5202e23edeb9d4d7f31d0de594194b8a898741da3c1a74b8c2d54758aa5 content=55e1e8090cce3a057473a21fe3382f8f159581327fa98ecee1a489f8de6965d0
+// @forge-generated generator=0.1.0-alpha.37 input=055c7d65fca3d6d8b05af2899c233ff69d377edf0f46f719e2d164ee0574309a content=1e26c5249853569091c1b295aab06bd2b9546462328fe8126eda099222430b61
 export const releaseManifest = {
   "defaultProvider": "local",
   "diagnostics": [],
@@ -19,7 +19,7 @@ export const releaseManifest = {
     "custom"
   ],
   "packageName": "forgeos",
-  "packageVersion": "0.1.0-alpha.36",
-  "releaseId": "forgeos@0.1.0-alpha.36+unknown",
+  "packageVersion": "0.1.0-alpha.37",
+  "releaseId": "forgeos@0.1.0-alpha.37+unknown",
   "schemaVersion": "0.1.0"
 } as const;

package/src/forge/cli/deps.ts

@@ -93,7 +93,9 @@ function findPackage(workspaceRoot: string, packageName: string): {
   const lock = nodeFileSystem.exists(join(workspaceRoot, "forge.lock"))
     ? (JSON.parse((nodeFileSystem.readText(join(workspaceRoot, "forge.lock")) ?? "")) as ForgeLock)
     : null;
-  const pkg = graph?.packages.find((candidate) => candidate.name === packageName);
+  const pkg = graph?.packages.find((candidate) =>
+    candidate.name === packageName || candidate.packageName === packageName
+  );
   return { graph, pkg, lock };
 }
 

package/src/forge/compiler/package-graph/compiler.ts

@@ -271,6 +271,7 @@ export class PackageGraphCompiler {
 
     const partialApi = {
       name: dep.name,
+      ...(packageJson.name && packageJson.name !== dep.name ? { packageName: packageJson.name } : {}),
       version: dep.version,
       packageManager: dep.packageManager,
       resolutionMode: opts.resolutionMode,
@@ -454,10 +455,11 @@ function portableDtsPath(dtsPath: string, dep: Pick<Dependency, "installPath" |
 }
 
 function readPackageJson(installPath: string): {
+  name?: string;
   exports?: unknown;
 } {
   const raw = readTextFile(join(installPath, "package.json"));
-  return JSON.parse(raw) as { exports?: unknown };
+  return JSON.parse(raw) as { name?: string; exports?: unknown };
 }
 
 function resolveSandboxBackend(

package/src/forge/compiler/package-graph/constants.ts

@@ -1,4 +1,4 @@
 export const PACKAGE_GRAPH_SCHEMA_VERSION = "1.0.0";
-export const PACKAGE_ANALYZER_VERSION = "0.2.0";
+export const PACKAGE_ANALYZER_VERSION = "0.2.1";
 export { GENERATOR_VERSION } from "../../version.ts";
 export const DEFAULT_PATTERN_EXPANSION_LIMIT = 50;

package/src/forge/compiler/package-upgrades/planner.ts

@@ -119,6 +119,10 @@ interface PackageResolution {
   current: PackageApi;
 }
 
+function matchesPackageName(candidate: PackageApi, packageName: string): boolean {
+  return candidate.name === packageName || candidate.packageName === packageName;
+}
+
 function parseNpmAliasSpec(spec: string): NpmAliasSpec | null {
   if (!spec.startsWith("npm:")) {
     return null;
@@ -162,6 +166,12 @@ function dependencyType(workspaceRoot: string, packageName: string): DependencyT
   if (packageName in (pkg.devDependencies ?? {})) {
     return "devDependency";
   }
+  for (const entry of dependencyEntries(pkg)) {
+    const alias = parseNpmAliasSpec(entry.spec);
+    if (alias?.packageName === packageName) {
+      return entry.type;
+    }
+  }
   return "dependency";
 }
 
@@ -180,7 +190,8 @@ function resolvePackageForUpgrade(workspaceRoot: string, requestedName: string):
   if (aliasEntry) {
     const alias = parseNpmAliasSpec(aliasEntry.spec);
     const packageName = alias?.packageName ?? aliasEntry.name;
-    const current = graph.packages.find((candidate) => candidate.name === packageName);
+    const current = graph.packages.find((candidate) => matchesPackageName(candidate, packageName)) ??
+      graph.packages.find((candidate) => candidate.name === aliasEntry.name);
     if (current) {
       return {
         requestedName,
@@ -194,18 +205,23 @@ function resolvePackageForUpgrade(workspaceRoot: string, requestedName: string):
     }
   }
 
-  const current = graph.packages.find((candidate) => candidate.name === requestedName);
+  const current = graph.packages.find((candidate) => matchesPackageName(candidate, requestedName));
   if (!current) {
     return null;
   }
-  const directEntry = entries.find((entry) => entry.name === requestedName);
+  const directEntry = entries.find((entry) => {
+    const alias = parseNpmAliasSpec(entry.spec);
+    return entry.name === requestedName || alias?.packageName === requestedName;
+  });
+  const alias = directEntry ? parseNpmAliasSpec(directEntry.spec) : null;
+  const packageName = alias?.packageName ?? current.packageName ?? requestedName;
   return {
     requestedName,
-    packageName: requestedName,
-    dependencyName: requestedName,
+    packageName,
+    dependencyName: directEntry?.name ?? requestedName,
     dependencySpec: directEntry?.spec,
     dependencyType: directEntry?.type ?? dependencyType(workspaceRoot, requestedName),
-    isNpmAlias: false,
+    isNpmAlias: Boolean(alias),
     current,
   };
 }
@@ -632,18 +648,19 @@ export function listOutdatedFromFixture(options: {
 
   return graph.packages
     .flatMap((pkg) => {
-      const metadata = fixtureMetadata(registryDir, pkg.name);
+      const packageName = pkg.packageName ?? pkg.name;
+      const metadata = fixtureMetadata(registryDir, packageName);
       const latest = metadata?.["dist-tags"]?.latest;
       if (!latest || latest === pkg.version) {
         return [];
       }
-      const recipe = resolveByPackageName(pkg.name);
+      const recipe = resolveByPackageName(packageName);
       return [{
-        name: pkg.name,
+        name: packageName,
         current: pkg.version,
         wanted: latest,
         latest,
-        type: dependencyType(options.workspaceRoot, pkg.name),
+        type: dependencyType(options.workspaceRoot, packageName),
         managedByRecipe: Boolean(recipe),
         ...(recipe?.alias ? { recipe: recipe.alias } : {}),
       }];

package/src/forge/compiler/types/package-graph.ts

@@ -92,7 +92,13 @@ export interface Entrypoint {
 }
 
 export interface PackageApi {
+  /**
+   * Import/dependency name used by the app, which may be an npm alias such as
+   * "forge" for "npm:forgeos@...".
+   */
   name: string;
+  /** Real package.json name when it differs from the dependency/import name. */
+  packageName?: string;
   version: string;
   packageManager: PackageManager;
   resolutionMode: ResolutionMode;

package/src/forge/version.ts

@@ -1,3 +1,3 @@
-export const FORGEOS_VERSION = "0.1.0-alpha.36";
+export const FORGEOS_VERSION = "0.1.0-alpha.37";
 export const GENERATOR_VERSION = FORGEOS_VERSION;
 export const CLI_VERSION = FORGEOS_VERSION;