forgeos 0.1.0-alpha.45 → 0.1.0-alpha.46

package/AGENTS.md

@@ -1,4 +1,4 @@
-// @forge-generated generator=0.1.0-alpha.45 input=bd2a19728a6c6eef99a21730384e4e1f16b60d6e561897a0b6f307c136f9555c content=721818a6f9a664aa898092d4aa5cd68cbbd8ad6e150c7d3ad3ef785a2e3fcf53
+// @forge-generated generator=0.1.0-alpha.46 input=fa019b5420e754f08100c96852edfc9ea0b39a6b050cbd9bc99106b88775c207 content=721818a6f9a664aa898092d4aa5cd68cbbd8ad6e150c7d3ad3ef785a2e3fcf53
 # AGENTS.md
 
 <!-- forge-generated:start -->

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # forgeos
 
+## 0.1.0-alpha.46
+
+### Patch Changes
+
+- Smooth the package upgrade apply path used by real ForgeOS apps.
+
+  - `forge deps upgrade-apply` and `forge deps upgrade-rollback` now accept the
+    `planDir` returned by `forge deps upgrade-plan`, automatically resolving it
+    to `plan.json`.
+  - Passing a directory without `plan.json` now returns a targeted
+    `FORGE_DEPS_TARGET_NOT_FOUND` diagnostic with the exact suggested command
+    instead of falling through to a generic JSON parse failure.
+  - Add regression coverage for applying upgrade plans through the returned
+    directory path and for invalid plan directories.
+
 ## 0.1.0-alpha.45
 
 ### Patch Changes

package/docs/changelog.md

@@ -6,6 +6,17 @@ The canonical source file in the repository is `CHANGELOG.md`.
 
 ## Unreleased
 
+## 0.1.0-alpha.46
+
+- `forge deps upgrade-apply` and `forge deps upgrade-rollback` now accept the
+  `planDir` returned by `forge deps upgrade-plan`, resolving it to the nested
+  `plan.json` automatically.
+- Invalid upgrade plan directories now return a precise
+  `FORGE_DEPS_TARGET_NOT_FOUND` diagnostic with suggested commands instead of a
+  generic JSON parse failure.
+- Added regression coverage for plan-directory apply behavior and missing
+  `plan.json` diagnostics.
+
 ## 0.1.0-alpha.45
 
 - `forge workos setup/prove --real` now passes the top-level unknown-option

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forgeos",
-  "version": "0.1.0-alpha.45",
+  "version": "0.1.0-alpha.46",
   "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.45","releaseId":"forgeos@0.1.0-alpha.45+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.46","releaseId":"forgeos@0.1.0-alpha.46+unknown","schemaVersion":"0.1.0"}

package/src/forge/_generated/releaseManifest.ts

@@ -1,4 +1,4 @@
-// @forge-generated generator=0.1.0-alpha.45 input=bd2a19728a6c6eef99a21730384e4e1f16b60d6e561897a0b6f307c136f9555c content=ddd1dcdfbef3bde6b2457bcfc5fd270a97d6d97ec6477305dc9c47c9f85f7c05
+// @forge-generated generator=0.1.0-alpha.46 input=fa019b5420e754f08100c96852edfc9ea0b39a6b050cbd9bc99106b88775c207 content=715d49dd9abed8465a5cf5e82713973aab97cc178fda3b1e8b1647b93683ee58
 export const releaseManifest = {
   "defaultProvider": "local",
   "diagnostics": [],
@@ -19,7 +19,7 @@ export const releaseManifest = {
     "custom"
   ],
   "packageName": "forgeos",
-  "packageVersion": "0.1.0-alpha.45",
-  "releaseId": "forgeos@0.1.0-alpha.45+unknown",
+  "packageVersion": "0.1.0-alpha.46",
+  "releaseId": "forgeos@0.1.0-alpha.46+unknown",
   "schemaVersion": "0.1.0"
 } as const;

package/src/forge/cli/deps.ts

@@ -73,15 +73,55 @@ function readGeneratedJson<T>(workspaceRoot: string, relative: string): T | null
   return JSON.parse(raw) as T;
 }
 
-function planPathFor(workspaceRoot: string, planIdOrPath: string): string {
-  if (nodeFileSystem.exists(planIdOrPath)) {
-    return planIdOrPath;
-  }
-  const direct = join(workspaceRoot, planIdOrPath);
-  if (nodeFileSystem.exists(direct)) {
-    return direct;
+function resolvePlanPathFor(
+  workspaceRoot: string,
+  planIdOrPath: string,
+): { ok: true; path: string } | { ok: false; diagnostics: Diagnostic[] } {
+  const candidates = [
+    planIdOrPath,
+    join(workspaceRoot, planIdOrPath),
+    join(workspaceRoot, ".forge", "upgrades", planIdOrPath, "plan.json"),
+  ];
+
+  for (const candidate of candidates) {
+    if (!nodeFileSystem.exists(candidate)) {
+      continue;
+    }
+    if (!nodeFileSystem.isDirectory(candidate)) {
+      return { ok: true, path: candidate };
+    }
+    const nestedPlan = join(candidate, "plan.json");
+    if (nodeFileSystem.exists(nestedPlan) && !nodeFileSystem.isDirectory(nestedPlan)) {
+      return { ok: true, path: nestedPlan };
+    }
+    return {
+      ok: false,
+      diagnostics: [{
+        severity: "error",
+        code: "FORGE_DEPS_TARGET_NOT_FOUND",
+        message: `upgrade plan directory '${planIdOrPath}' does not contain plan.json`,
+        fixHint: "Pass the plan.json file returned by forge deps upgrade-plan, or rerun upgrade-plan.",
+        suggestedCommands: [
+          `forge deps upgrade-apply ${nestedPlan} --json`,
+          "forge deps upgrade-plan <package> --to latest --json",
+        ],
+      }],
+    };
   }
-  return join(workspaceRoot, ".forge", "upgrades", planIdOrPath, "plan.json");
+
+  return {
+    ok: false,
+    diagnostics: [{
+      severity: "error",
+      code: "FORGE_DEPS_TARGET_NOT_FOUND",
+      message: `upgrade plan '${planIdOrPath}' was not found`,
+      fixHint: "Use the planDir or plan.json path returned by forge deps upgrade-plan.",
+      suggestedCommands: [
+        `forge deps upgrade-apply .forge/upgrades/${planIdOrPath}/plan.json --json`,
+        "forge deps upgrade-plan <package> --to latest --json",
+      ],
+    }],
+  };
 }
 
 function findPackage(workspaceRoot: string, packageName: string): {
@@ -395,9 +435,17 @@ export async function runDepsCommand(options: DepsCommandOptions): Promise<DepsC
     if (!options.planPath) {
       return missingPlan();
     }
+    const resolvedPlan = resolvePlanPathFor(options.workspaceRoot, options.planPath);
+    if (!resolvedPlan.ok) {
+      return {
+        ok: false,
+        diagnostics: resolvedPlan.diagnostics,
+        exitCode: 1,
+      };
+    }
     const applied = await applyUpgradePlan({
       workspaceRoot: options.workspaceRoot,
-      planPath: planPathFor(options.workspaceRoot, options.planPath),
+      planPath: resolvedPlan.path,
       yes: options.yes,
       allowScripts: options.allowScripts,
       skipTests: options.skipTests,
@@ -409,6 +457,7 @@ export async function runDepsCommand(options: DepsCommandOptions): Promise<DepsC
         applied: applied.applied,
         rolledBack: applied.rolledBack,
         reinstallCommand: applied.plan?.rollback.reinstallCommand,
+        planPath: resolvedPlan.path,
       },
       diagnostics: applied.diagnostics,
       exitCode: applied.exitCode,
@@ -419,15 +468,24 @@ export async function runDepsCommand(options: DepsCommandOptions): Promise<DepsC
     if (!options.planPath) {
       return missingPlan();
     }
+    const resolvedPlan = resolvePlanPathFor(options.workspaceRoot, options.planPath);
+    if (!resolvedPlan.ok) {
+      return {
+        ok: false,
+        diagnostics: resolvedPlan.diagnostics,
+        exitCode: 1,
+      };
+    }
     const rolledBack = rollbackUpgradePlan({
       workspaceRoot: options.workspaceRoot,
-      planPath: planPathFor(options.workspaceRoot, options.planPath),
+      planPath: resolvedPlan.path,
     });
     return {
       ok: rolledBack.ok,
       data: {
         rolledBack: rolledBack.rolledBack,
         reinstallCommand: rolledBack.plan?.rollback.reinstallCommand,
+        planPath: resolvedPlan.path,
       },
       diagnostics: rolledBack.diagnostics,
       exitCode: rolledBack.exitCode,

package/src/forge/version.ts

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