@ohos-ports/nx 23.2.0-beta.4 → 23.2.1-beta.1

package/dist/bin/nx.js

@@ -36,10 +36,10 @@ async function main() {
     if (process.env.NX_COMPLETE) {
         try {
             perf_hooks_1.performance.mark('init-local');
-            const { tryValueCompletion } = await import('@ohos-ports/nx/src/command-line/completion/value-completions');
+            const { tryValueCompletion } = await import('nx/src/command-line/completion/value-completions');
             if (tryValueCompletion())
                 return;
-            const { tryCommandSurfaceCompletion } = await import('@ohos-ports/nx/src/command-line/completion/command-completions');
+            const { tryCommandSurfaceCompletion } = await import('nx/src/command-line/completion/command-completions');
             tryCommandSurfaceCompletion();
         }
         catch (e) {
@@ -91,7 +91,7 @@ async function main() {
             // inherited via NX_ANALYTICS_SESSION_ID.
             await initAnalytics();
         }
-        (await import('@ohos-ports/nx/src/command-line/nx-commands')).commandsObject.argv;
+        (await import('nx/src/command-line/nx-commands')).commandsObject.argv;
     }
     else {
         // polyfill rxjs observable to avoid issues with multiple version of Observable installed in node_modules
@@ -127,7 +127,7 @@ async function main() {
             await initAnalytics();
             // nx-cloud commands can run without local Nx installation
             process.env.NX_DAEMON = 'false';
-            (await import('@ohos-ports/nx/src/command-line/nx-commands')).commandsObject.argv;
+            (await import('nx/src/command-line/nx-commands')).commandsObject.argv;
         }
         else if (isLocalInstall) {
             const { daemonClient } = await import('../src/daemon/client/client.js');
@@ -198,13 +198,13 @@ function resolveNx(workspace) {
         const installPath = (0, installation_directory_1.getNxInstallationPath)(root);
         if ((0, fs_1.existsSync)(installPath)) {
             const installRequire = (0, module_1.createRequire)((0, path_1.join)(installPath, 'package.json'));
-            return installRequire.resolve('@ohos-ports/nx/bin/nx.js');
+            return installRequire.resolve('nx/bin/nx.js');
         }
     }
     catch { }
     // check for root install
     const rootRequire = (0, module_1.createRequire)((0, path_1.join)(root, 'package.json'));
-    return rootRequire.resolve('@ohos-ports/nx/bin/nx.js');
+    return rootRequire.resolve('nx/bin/nx.js');
 }
 function isNxCloudCommand(command) {
     const nxCloudCommands = [
@@ -295,7 +295,7 @@ function getLocalNxVersion(workspace) {
             }
             try {
                 const externalRequire = (0, module_1.createRequire)((0, path_1.join)(searchPath, 'package.json'));
-                const pkgJsonPath = externalRequire.resolve('@ohos-ports/nx/package.json');
+                const pkgJsonPath = externalRequire.resolve('nx/package.json');
                 return require(pkgJsonPath).version;
             }
             catch { }

package/dist/bin/post-install.js

@@ -36,12 +36,10 @@ const postinstallTimeout = setTimeout(() => {
     }
 })();
 function isMainNxPackage() {
-    // @ohos-ports/nx port: resolve the self package under its real name —
-    // a bare `nx` specifier would fail when no `node_modules/nx` alias exists.
-    const mainNxPath = require.resolve('@ohos-ports/nx', {
+    const mainNxPath = require.resolve('nx', {
         paths: [workspace_root_1.workspaceRoot],
     });
-    const thisNxPath = require.resolve('@ohos-ports/nx');
+    const thisNxPath = require.resolve('nx');
     return mainNxPath === thisNxPath;
 }
 process.on('uncaughtException', (e) => {

package/dist/release/changelog-renderer/index.d.ts

@@ -106,5 +106,9 @@ export default class DefaultChangelogRenderer {
     protected groupChangesByScope(changes: ChangelogChange[]): Record<string, ChangelogChange[]>;
     protected extractBreakingChangeExplanation(message: string): string | null;
     private isBreakingChangeBoundary;
+    protected isAiAgentAuthor(author: {
+        name: string;
+        email: string;
+    }): boolean;
     protected formatName(name?: string): string;
 }

package/dist/release/changelog-renderer/index.js

@@ -3,6 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const semver_1 = require("semver");
 // Stripped from breaking change explanations (e.g. bot/session markers).
 const HtmlCommentRegex = /<!--[\s\S]*?-->/g;
+// Keyed on email: agent display names track model versions (e.g. "Claude Opus
+// 5 (1M context)"), and a human contributor can share a name with an agent.
+const AiAgentAuthorEmails = new Set([
+    'noreply@anthropic.com',
+    'claude@anthropic.com',
+    'amp@ampcode.com',
+    'cursoragent@cursor.com',
+    'openhands@all-hands.dev',
+    'opendevin@all-hands.dev',
+]);
+// The Copilot coding agent's trailer is not always [bot]-suffixed.
+const CopilotAuthorEmailRegex = /^(?:\d+\+)?copilot@users\.noreply\.github\.com$/;
 class DefaultChangelogRenderer {
     /**
      * A ChangelogRenderer class takes in the determined changes and other relevant metadata
@@ -212,7 +224,7 @@ class DefaultChangelogRenderer {
             }
             for (const author of change.authors) {
                 const name = this.formatName(author.name);
-                if (!name || name.includes('[bot]')) {
+                if (!name || name.includes('[bot]') || this.isAiAgentAuthor(author)) {
                     continue;
                 }
                 if (!_authors.has(name)) {
@@ -371,6 +383,10 @@ class DefaultChangelogRenderer {
             // Git metadata delimiter following the body
             trimmed === '"');
     }
+    isAiAgentAuthor(author) {
+        const email = (author.email || '').trim().toLowerCase();
+        return (AiAgentAuthorEmails.has(email) || CopilotAuthorEmailRegex.test(email));
+    }
     formatName(name = '') {
         return name
             .split(' ')

package/dist/src/command-line/add/add.js

@@ -129,7 +129,7 @@ function parsePackageSpecifier(packageSpecifier) {
     const version = packageSpecifier.substring(i + 1);
     return [pkgName, version];
 }
-exports.coreNxPluginVersions = require(require.resolve('@ohos-ports/nx/package.json'))['nx-migrations'].packageGroup.reduce((map, entry) => {
+exports.coreNxPluginVersions = require(require.resolve('nx/package.json'))['nx-migrations'].packageGroup.reduce((map, entry) => {
     const packageName = typeof entry === 'string' ? entry : entry.package;
     const version = typeof entry === 'string' ? versions_1.nxVersion : entry.version;
     return map.set(packageName, version);

package/dist/src/command-line/configure-ai-agents/configure-ai-agents.js

@@ -47,7 +47,7 @@ async function configureAiAgentsHandler(args, inner = false) {
         await (0, provenance_1.ensurePackageHasProvenance)('nx', 'latest');
         const packageInstallResults = (0, package_json_1.installPackageToTmp)('nx', 'latest', (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot));
         cleanup = packageInstallResults.cleanup;
-        let modulePath = require.resolve('@ohos-ports/nx/src/command-line/configure-ai-agents/configure-ai-agents.js', { paths: [packageInstallResults.tempDir] });
+        let modulePath = require.resolve('nx/src/command-line/configure-ai-agents/configure-ai-agents.js', { paths: [packageInstallResults.tempDir] });
         const module = await (0, handle_import_1.handleImport)(modulePath);
         await module.configureAiAgentsHandler(args, true);
         cleanup();

package/dist/src/command-line/init/init-v2.js

@@ -48,7 +48,7 @@ async function initHandler(options, inner = false) {
         await (0, provenance_1.ensurePackageHasProvenance)('nx', 'latest');
         const packageInstallResults = (0, package_json_1.installPackageToTmp)('nx', 'latest', (0, package_manager_1.detectPackageManager)(process.cwd()));
         cleanup = packageInstallResults.cleanup;
-        let modulePath = require.resolve('@ohos-ports/nx/src/command-line/init/init-v2.js', {
+        let modulePath = require.resolve('nx/src/command-line/init/init-v2.js', {
             paths: [packageInstallResults.tempDir],
         });
         const module = await (0, handle_import_1.handleImport)(modulePath);

package/dist/src/command-line/migrate/migrate.js

@@ -1061,7 +1061,7 @@ function createInstalledPackageVersionsResolver(root) {
                 (() => {
                     for (const req of nxRequires) {
                         try {
-                            const packageJsonPath = req.resolve('@ohos-ports/nx/package.json');
+                            const packageJsonPath = req.resolve('nx/package.json');
                             if (packageJsonPath.startsWith(workspace_root_1.workspaceRoot)) {
                                 return (0, fileutils_1.readJsonFile)(packageJsonPath).version;
                             }
@@ -1244,7 +1244,7 @@ async function downloadPackageMigrationsFromRegistry(packageName, packageVersion
     const { dir, cleanup } = (0, package_manager_1.createTempNpmDirectory)();
     let result;
     try {
-        const { tarballPath } = await (0, package_manager_1.packageRegistryPack)(dir, packageName, packageVersion,
+        const { tarballPath } = await (0, package_manager_1.packageRegistryPack)(dir, packageName, packageVersion, 
         // packageVersion is exact and already resolved through the workspace
         // package manager's min-release-age policy by the fetcher. In an npm
         // workspace the pack gate IS that policy, so leave it enforcing; for
@@ -1478,7 +1478,7 @@ async function isMigratingToNewMajor(from, to) {
     return (0, semver_1.major)(from) < (0, semver_1.major)(to);
 }
 function readNxVersion(packageJson, root) {
-    return ((0, package_json_1.getDependencyVersionFromPackageJson)('@ohos-ports/nx', root, packageJson) ??
+    return ((0, package_json_1.getDependencyVersionFromPackageJson)('nx', root, packageJson) ??
         (0, package_json_1.getDependencyVersionFromPackageJson)('@nx/workspace', root, packageJson) ??
         (0, package_json_1.getDependencyVersionFromPackageJson)('@nrwl/workspace', root, packageJson));
 }
@@ -1890,7 +1890,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
                 }
             }
             else if ((0, migration_shape_1.isHybridMigration)(m)) {
-                const { changes, nextSteps, agentContext, skipAgentic, logs, madeChanges, } = await (0, execute_migration_1.runNxOrAngularMigration)(root, m, isVerbose,
+                const { changes, nextSteps, agentContext, skipAgentic, logs, madeChanges, } = await (0, execute_migration_1.runNxOrAngularMigration)(root, m, isVerbose, 
                 /* captureGeneratorOutput: */ !!agenticRun, resolvedCollection);
                 migrationEmittedNextSteps.push(...nextSteps);
                 if (skipAgentic) {
@@ -1949,7 +1949,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
                 // Defer commit until validation succeeds; failed validation leaves
                 // changes uncommitted in the working tree for the user to review.
                 const validationRun = agenticRun && shouldRunValidation ? agenticRun : undefined;
-                const { changes, nextSteps, agentContext, skipAgentic, logs, madeChanges, } = await (0, execute_migration_1.runNxOrAngularMigration)(root, m, isVerbose,
+                const { changes, nextSteps, agentContext, skipAgentic, logs, madeChanges, } = await (0, execute_migration_1.runNxOrAngularMigration)(root, m, isVerbose, 
                 /* captureGeneratorOutput: */ !!validationRun, resolvedCollection);
                 migrationEmittedNextSteps.push(...nextSteps);
                 // Whether a validation step was on the table at all. `skipAgentic`
@@ -2152,7 +2152,7 @@ async function runMigrations(root, opts, args, isVerbose, shouldCreateCommits, c
             !(await (0, migrate_commits_1.confirmMigrationCommitsOnDefaultBranch)(root, 'running migrations'))) {
             return;
         }
-        const { packageJson: orchestratorNxPackageJson } = (0, package_json_1.readModulePackageJson)('@ohos-ports/nx', (0, installation_directory_1.getNxRequirePaths)(root));
+        const { packageJson: orchestratorNxPackageJson } = (0, package_json_1.readModulePackageJson)('nx', (0, installation_directory_1.getNxRequirePaths)(root));
         const { runOrchestratorInit } = require('./run');
         return await runOrchestratorInit({
             root,
@@ -2215,7 +2215,7 @@ async function runMigrations(root, opts, args, isVerbose, shouldCreateCommits, c
     }
     if (agentic.kind === 'enabled') {
         const { applyAgenticHandoffGitignoreFallback } = require('./agentic/handoff-gitignore');
-        const { packageJson: nxPackageJson } = (0, package_json_1.readModulePackageJson)('@ohos-ports/nx', (0, installation_directory_1.getNxRequirePaths)(root));
+        const { packageJson: nxPackageJson } = (0, package_json_1.readModulePackageJson)('nx', (0, installation_directory_1.getNxRequirePaths)(root));
         await applyAgenticHandoffGitignoreFallback({
             migrations,
             installedNxVersion: nxPackageJson.version,
@@ -2472,7 +2472,7 @@ function readLocalNxVersion(root) {
                     exports: {},
                 };
                 new Function('module', 'exports', 'require', '__dirname', '__filename', (0, fs_1.readFileSync)(pnpManifest, 'utf-8').replace(/^#!.*/, ''))(manifestModule, manifestModule.exports, require, root, pnpManifest);
-                const packageJsonPath = manifestModule.exports.resolveRequest('@ohos-ports/nx/package.json', (0, path_1.join)(root, 'package.json'));
+                const packageJsonPath = manifestModule.exports.resolveRequest('nx/package.json', (0, path_1.join)(root, 'package.json'));
                 if (packageJsonPath) {
                     // A resolving manifest names the install the yarn spawn runs, so
                     // every branch below returns rather than falling through to the
@@ -2651,7 +2651,7 @@ async function runMigration() {
                 cliVersionSpec,
                 fromEnvOverride: !!process.env.NX_MIGRATE_CLI_VERSION,
                 ownNxVersion: versions_1.nxVersion,
-                resolveVersion: (spec) =>
+                resolveVersion: (spec) => 
                 // A probe must not prompt, write pnpm excludes, or install; a
                 // minimum-release-age violation surfaces as a rejection and
                 // routes local.

package/dist/src/command-line/migrate/prompt-files.js

@@ -44,15 +44,8 @@ async function resolvePromptFiles(packageName, packageVersion, migrations, migra
         ? resolvedPromptFiles
         : undefined;
 }
-function isPromptPathWithinMigrationsDir(migrationsDir, promptRelPath) {
-    const rel = (0, path_1.relative)(migrationsDir, (0, path_1.join)(migrationsDir, promptRelPath));
-    return !((0, path_1.isAbsolute)(promptRelPath) ||
-        rel === '..' ||
-        rel.startsWith(`..${path_1.sep}`) ||
-        rel.startsWith(`..${path_1.posix.sep}`));
-}
 function assertPromptPathWithinMigrationsDir(migrationsDir, promptRelPath, packageName, packageVersion) {
-    if (!isPromptPathWithinMigrationsDir(migrationsDir, promptRelPath)) {
+    if (!(0, path_2.isContainedRelativePath)(promptRelPath)) {
         throw new Error(`Invalid prompt path "${promptRelPath}" in package "${packageName}@${packageVersion}": prompt paths must be relative and resolve within the package's migrations directory.`);
     }
 }
@@ -77,7 +70,7 @@ exports.PromptResolutionError = PromptResolutionError;
  * directory and point at an existing file.
  */
 function resolvePrompt(promptPath, migrationsDir) {
-    if (!isPromptPathWithinMigrationsDir(migrationsDir, promptPath)) {
+    if (!(0, path_2.isContainedRelativePath)(promptPath)) {
         throw new PromptResolutionError(promptPath, migrationsDir);
     }
     const resolvedPath = (0, path_1.join)(migrationsDir, promptPath);

package/dist/src/command-line/migrate/run/worker.js

@@ -539,7 +539,7 @@ function buildOutcome(changes, nextSteps, description, root) {
 // imports both statically.
 async function prepareAgenticRun(root, migration, agentic, effectiveCreateCommits, commitPrefix) {
     const { applyAgenticHandoffGitignoreFallback } = require('../agentic/handoff-gitignore');
-    const { packageJson: nxPackageJson } = (0, package_json_1.readModulePackageJson)('@ohos-ports/nx', (0, installation_directory_1.getNxRequirePaths)(root));
+    const { packageJson: nxPackageJson } = (0, package_json_1.readModulePackageJson)('nx', (0, installation_directory_1.getNxRequirePaths)(root));
     await applyAgenticHandoffGitignoreFallback({
         migrations: [migration],
         installedNxVersion: nxPackageJson.version,

package/dist/src/command-line/release/changelog.js

@@ -380,7 +380,9 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
                 }
                 else {
                     const groupCacheKey = `${releaseGroup.name}:fixed`;
-                    const fromSHA = await getCachedFromSHA(groupCacheKey, releaseGroup.releaseTag.pattern, {}, workspacePreid ?? projectsPreid?.[Object.keys(projectsPreid)[0]], releaseGroup.releaseTag.checkAllBranchesWhen, releaseGroup.releaseTag.requireSemver, releaseGroup.releaseTag.strictPreid);
+                    const fromSHA = await getCachedFromSHA(groupCacheKey, releaseGroup.releaseTag.pattern, {
+                        releaseGroupName: releaseGroup.name,
+                    }, workspacePreid ?? projectsPreid?.[Object.keys(projectsPreid)[0]], releaseGroup.releaseTag.checkAllBranchesWhen, releaseGroup.releaseTag.requireSemver, releaseGroup.releaseTag.strictPreid);
                     if (!fromSHA) {
                         throw new Error(`Unable to determine the previous git tag. If this is the first release of your release group, use the --first-release option or set the "release.changelog.automaticFromRef" config property in nx.json to generate a changelog from the first commit. Otherwise, be sure to configure the "release.releaseTag.pattern" property in nx.json to match the structure of your repository's git tags.`);
                     }

package/dist/src/command-line/repair/repair.js

@@ -6,7 +6,7 @@ const migrate_1 = require("../migrate/migrate");
 const output_1 = require("../../utils/output");
 async function repair(args, extraMigrations = []) {
     return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
-        const migrationsJson = require(require.resolve('@ohos-ports/nx/migrations.json'));
+        const migrationsJson = require(require.resolve('nx/migrations.json'));
         const nxMigrations = Object.entries(migrationsJson.generators).reduce((agg, [name, migration]) => {
             const skip = migration['x-repair-skip'];
             if (!skip) {

package/dist/src/command-line/report/report.d.ts

@@ -13,6 +13,7 @@ export declare const patternsWeIgnoreInCommunityReport: Array<string | RegExp>;
  *
  */
 export declare function reportHandler(): Promise<void>;
+export declare function cacheSectionLines(cache: NonNullable<ReportData['cache']>): string[];
 export interface ReportData {
     pm: PackageManager;
     pmVersion: string;
@@ -49,6 +50,7 @@ export interface ReportData {
     cache: {
         max: number;
         used: number;
+        location: string;
     } | null;
 }
 export declare function getReportData(): Promise<ReportData>;

package/dist/src/command-line/report/report.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patternsWeIgnoreInCommunityReport = exports.packagesWeCareAbout = void 0;
 exports.reportHandler = reportHandler;
+exports.cacheSectionLines = cacheSectionLines;
 exports.getReportData = getReportData;
 exports.findMisalignedPackagesForPackage = findMisalignedPackagesForPackage;
 exports.findInstalledPowerpackPlugins = findInstalledPowerpackPlugins;
@@ -11,6 +12,8 @@ exports.findInstalledPackagesWeCareAbout = findInstalledPackagesWeCareAbout;
 const tslib_1 = require("tslib");
 const pc = tslib_1.__importStar(require("picocolors"));
 const output_1 = require("../../utils/output");
+const path_1 = require("path");
+const os_1 = require("os");
 const package_manager_1 = require("../../utils/package-manager");
 const fileutils_1 = require("../../utils/fileutils");
 const package_json_1 = require("../../utils/package-json");
@@ -25,9 +28,10 @@ const operators_1 = require("../../project-graph/operators");
 const versions_1 = require("../../utils/versions");
 const nx_key_1 = require("../../utils/nx-key");
 const cache_1 = require("../../tasks-runner/cache");
+const cache_directory_1 = require("../../utils/cache-directory");
 const client_1 = require("../../daemon/client/client");
 const nx_package_group_1 = require("../../utils/nx-package-group");
-const nxPackageJson = (0, fileutils_1.readJsonFile)(require.resolve('@ohos-ports/nx/package.json'));
+const nxPackageJson = (0, fileutils_1.readJsonFile)(require.resolve('nx/package.json'));
 exports.packagesWeCareAbout = [
     'lerna',
     ...(0, nx_package_group_1.readNxPackageGroup)(),
@@ -140,7 +144,7 @@ async function reportHandler() {
     }
     if (cache) {
         bodyLines.push(LINE_SEPARATOR);
-        bodyLines.push(`Cache Usage: ${(0, cache_1.formatCacheSize)(cache.used)} / ${cache.max === 0 ? '∞' : (0, cache_1.formatCacheSize)(cache.max)}`);
+        bodyLines.push(...cacheSectionLines(cache));
     }
     if (outOfSyncPackageGroup) {
         bodyLines.push(LINE_SEPARATOR);
@@ -182,6 +186,28 @@ async function reportHandler() {
         bodyLines,
     });
 }
+/**
+ * The report is meant to be pasted into public issues, so the home directory
+ * is elided rather than printing the user's account name.
+ */
+function collapseHome(path) {
+    const home = (0, os_1.homedir)();
+    return path === home || path.startsWith(home + path_1.sep)
+        ? `~${path.slice(home.length)}`
+        : path;
+}
+function cacheSectionLines(cache) {
+    const unlimited = cache.max === 0;
+    const max = unlimited ? '∞' : (0, cache_1.formatCacheSize)(cache.max);
+    const share = unlimited
+        ? ''
+        : ` (${((cache.used / cache.max) * 100).toFixed(1)}%)`;
+    return [
+        'Cache',
+        `- Usage: ${(0, cache_1.formatCacheSize)(cache.used)} / ${max}${share}`,
+        `- Location: ${collapseHome(cache.location)}`,
+    ];
+}
 function findDependencyChain(graph, targetNode) {
     const reversedGraph = (0, operators_1.reverse)(graph);
     // BFS to find shortest path to root dependency
@@ -266,6 +292,7 @@ async function getReportData() {
         ? {
             max: (0, cache_1.resolveMaxCacheSize)(nxJson),
             used: new cache_1.DbCache({ nxCloudRemoteCache: null }).getUsedCacheSpace(),
+            location: cache_directory_1.cacheDir,
         }
         : null;
     return {

package/dist/src/command-line/reset/reset.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resetHandler = resetHandler;
 const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
 const client_1 = require("../../daemon/client/client");
 const tmp_dir_1 = require("../../daemon/tmp-dir");
 const cache_directory_1 = require("../../utils/cache-directory");
@@ -125,8 +124,7 @@ async function resetCloudClient() {
 }
 function removeInstalledNxCloudClient() {
     return incrementalBackoff(INCREMENTAL_BACKOFF_FIRST_DELAY, INCREMENTAL_BACKOFF_MAX_DURATION, () => {
-        const cloudClientDir = (0, update_manager_1.getBundleInstallDefaultLocation)();
-        (0, node_fs_1.rmSync)((0, node_path_1.join)(cloudClientDir, 'cloud'), { recursive: true, force: true });
+        (0, node_fs_1.rmSync)((0, update_manager_1.getBundleInstallDefaultLocation)(), { recursive: true, force: true });
     });
 }
 function cleanupCacheEntries() {

package/dist/src/command-line/run/run.js

@@ -56,7 +56,7 @@ async function printTargetRunHelpInternal({ project, target }, root, projectsCon
         plugin: nodeModule,
         entity: executor,
     });
-    if ((nodeModule === 'nx' || nodeModule === '@ohos-ports/nx') &&
+    if (nodeModule === 'nx' &&
         executor === 'run-commands' &&
         targetConfig.options.command) {
         const command = targetConfig.options.command.split(' ')[0];

package/dist/src/config/nx-json.d.ts

@@ -357,7 +357,7 @@ export interface NxReleaseChangelogConfiguration {
      * If configuring using a custom `ReleaseClient` via the programmatic API, you can either provide a path or directly
      * provide the implementation class itself.
      *
-     * By default, the renderer is set to the DefaultChangelogRenderer implementation from "@ohos-ports/nx/release/changelog-renderer",
+     * By default, the renderer is set to the DefaultChangelogRenderer implementation from "nx/release/changelog-renderer",
      * which nx provides out of the box.
      */
     renderer?: string | typeof ChangelogRenderer;
@@ -409,7 +409,7 @@ export interface NxReleaseConventionalCommitsConfiguration {
      * If not set, this will default to 'true'
      */
     useCommitScope?: boolean;
-    types?: Record<string,
+    types?: Record<string, 
     /**
      * A map of commit types to their configuration.
      * If a type is set to 'true', then it will be enabled with the default 'semverBump' of 'patch' and will appear in the changelog.

package/dist/src/daemon/client/daemon-environment.d.ts

@@ -62,3 +62,13 @@ export declare function getAppliedDaemonClientEnv(): {
  * previous client is stale all the same.
  */
 export declare function applyDaemonEnvFromClient(newEnv: NodeJS.ProcessEnv): string[];
+/**
+ * Yarn Berry creates a fresh BERRY_BIN_FOLDER for every invocation and puts it
+ * first on PATH. The wrappers inside are runtime state the daemon and workers
+ * must receive, but the folder's random name is not project-graph identity:
+ * two invocations whose environments differ only by it would compute the same
+ * graph. Strips the folder from PATH and pins the var to a sentinel so such
+ * environments compare equal. Returns a copy; never mutates runtime env.
+ */
+export declare function normalizeDaemonEnvironmentForGraph(env: NodeJS.ProcessEnv, platform?: NodeJS.Platform): NodeJS.ProcessEnv;
+export declare function getChangedEnvKeys(before: NodeJS.ProcessEnv, after: NodeJS.ProcessEnv): string[];

package/dist/src/daemon/client/daemon-environment.js

@@ -6,6 +6,8 @@ exports.getDaemonClientEnvGeneration = getDaemonClientEnvGeneration;
 exports.getDaemonSpawnEnv = getDaemonSpawnEnv;
 exports.getAppliedDaemonClientEnv = getAppliedDaemonClientEnv;
 exports.applyDaemonEnvFromClient = applyDaemonEnvFromClient;
+exports.normalizeDaemonEnvironmentForGraph = normalizeDaemonEnvironmentForGraph;
+exports.getChangedEnvKeys = getChangedEnvKeys;
 const file_hasher_1 = require("../../hasher/file-hasher");
 const DAEMON_ENV_REQUIRED_SETTINGS = {
     NX_PROJECT_GLOB_CACHE: 'false',
@@ -376,3 +378,45 @@ function applyDaemonEnvFromClient(newEnv) {
     appliedClientEnv = { ...newEnv };
     return [...changedKeys];
 }
+const BERRY_BIN_FOLDER_GRAPH_IDENTITY = '<YARN_BERRY_BIN_FOLDER>';
+/**
+ * Yarn Berry creates a fresh BERRY_BIN_FOLDER for every invocation and puts it
+ * first on PATH. The wrappers inside are runtime state the daemon and workers
+ * must receive, but the folder's random name is not project-graph identity:
+ * two invocations whose environments differ only by it would compute the same
+ * graph. Strips the folder from PATH and pins the var to a sentinel so such
+ * environments compare equal. Returns a copy; never mutates runtime env.
+ */
+function normalizeDaemonEnvironmentForGraph(env, platform = process.platform) {
+    const normalized = { ...env };
+    const berryBinFolder = normalized.BERRY_BIN_FOLDER;
+    if (!berryBinFolder) {
+        return normalized;
+    }
+    const pathKey = Object.keys(normalized).find((key) => key.toUpperCase() === 'PATH');
+    if (pathKey && normalized[pathKey]) {
+        const pathDelimiter = platform === 'win32' ? ';' : ':';
+        const canonicalize = (value) => {
+            const withPlatformSeparators = platform === 'win32' ? value.replaceAll('/', '\\') : value;
+            return platform === 'win32'
+                ? withPlatformSeparators.toLowerCase()
+                : withPlatformSeparators;
+        };
+        const canonicalBerryBinFolder = canonicalize(berryBinFolder);
+        normalized[pathKey] = normalized[pathKey]
+            .split(pathDelimiter)
+            .filter((entry) => canonicalize(entry) !== canonicalBerryBinFolder)
+            .join(pathDelimiter);
+    }
+    normalized.BERRY_BIN_FOLDER = BERRY_BIN_FOLDER_GRAPH_IDENTITY;
+    return normalized;
+}
+function getChangedEnvKeys(before, after) {
+    const changedKeys = [];
+    for (const key of new Set([...Object.keys(before), ...Object.keys(after)])) {
+        if (before[key] !== after[key]) {
+            changedKeys.push(key);
+        }
+    }
+    return changedKeys;
+}

package/dist/src/daemon/server/handle-client-env.js

@@ -29,12 +29,30 @@ async function handleClientEnv(env) {
     while (inFlightApply) {
         await inFlightApply;
     }
+    const graphEnvBefore = (0, daemon_environment_1.normalizeDaemonEnvironmentForGraph)(process.env);
+    const previousClientEnv = (0, daemon_environment_1.getAppliedDaemonClientEnv)()?.env;
     const changedEnvKeys = (0, daemon_environment_1.applyDaemonEnvFromClient)(env);
     if (changedEnvKeys.length === 0) {
         return;
     }
-    logger_1.serverLogger.log(`Graph recompute necessary due to env variable refresh. Changed keys: ${changedEnvKeys.join(', ')}`);
-    const apply = applyEnvChange(env);
+    // Runtime changes always reach the workers, but only changes that survive
+    // graph normalization (e.g. Yarn Berry's per-invocation BERRY_BIN_FOLDER
+    // does not) invalidate the computed graph.
+    const graphChangedKeys = new Set([
+        ...(0, daemon_environment_1.getChangedEnvKeys)(graphEnvBefore, (0, daemon_environment_1.normalizeDaemonEnvironmentForGraph)(process.env)),
+        ...(previousClientEnv
+            ? (0, daemon_environment_1.getChangedEnvKeys)((0, daemon_environment_1.normalizeDaemonEnvironmentForGraph)(previousClientEnv), (0, daemon_environment_1.normalizeDaemonEnvironmentForGraph)(env))
+            : []),
+    ]);
+    if (graphChangedKeys.size > 0) {
+        logger_1.serverLogger.log(`Graph recompute necessary due to env variable refresh. Changed keys: ${[
+            ...graphChangedKeys,
+        ].join(', ')}`);
+    }
+    else {
+        logger_1.serverLogger.log(`Env variable refresh changed only runtime values (${changedEnvKeys.join(', ')}); graph identity is unchanged, keeping the cached graph.`);
+    }
+    const apply = applyEnvChange(env, graphChangedKeys.size > 0);
     inFlightApply = apply;
     try {
         await apply;
@@ -45,8 +63,11 @@ async function handleClientEnv(env) {
         }
     }
 }
-async function applyEnvChange(env) {
+async function applyEnvChange(env, invalidateGraph) {
     await forwardEnvToPluginWorkers(env);
+    if (!invalidateGraph) {
+        return;
+    }
     // Discarding the cached graph makes the next request recompute under the
     // new env, and chains any in-flight compute (started under the old env) to
     // that successor.

package/dist/src/daemon/server/handle-configure-ai-agents.js

@@ -71,11 +71,11 @@ async function computeAgentStatuses() {
         let modulePath;
         if (process.env.NX_USE_LOCAL === 'true') {
             log('Using local implementation (NX_USE_LOCAL=true)');
-            modulePath = require.resolve('@ohos-ports/nx/src/ai/utils.js');
+            modulePath = require.resolve('nx/src/ai/utils.js');
         }
         else {
             const tmpPath = await (0, latest_nx_1.getLatestNxTmpPath)();
-            modulePath = require.resolve('@ohos-ports/nx/src/ai/utils.js', {
+            modulePath = require.resolve('nx/src/ai/utils.js', {
                 paths: [tmpPath],
             });
         }

package/dist/src/daemon/server/nx-console-operations.js

@@ -26,7 +26,7 @@ async function getNxConsoleStatus({ inner, } = {}) {
     }
     try {
         const tmpPath = await (0, latest_nx_1.getLatestNxTmpPath)();
-        const modulePath = require.resolve('@ohos-ports/nx/src/daemon/server/nx-console-operations.js', { paths: [tmpPath] });
+        const modulePath = require.resolve('nx/src/daemon/server/nx-console-operations.js', { paths: [tmpPath] });
         const module = await (0, handle_import_1.handleImport)(modulePath);
         const result = await module.getNxConsoleStatus({ inner: true });
         log('Console status check completed, shouldPrompt:', result);
@@ -53,7 +53,7 @@ async function handleNxConsolePreferenceAndInstall({ preference, inner, }) {
     }
     try {
         const tmpPath = await (0, latest_nx_1.getLatestNxTmpPath)();
-        const modulePath = require.resolve('@ohos-ports/nx/src/daemon/server/nx-console-operations.js', { paths: [tmpPath] });
+        const modulePath = require.resolve('nx/src/daemon/server/nx-console-operations.js', { paths: [tmpPath] });
         const module = await (0, handle_import_1.handleImport)(modulePath);
         const result = await module.handleNxConsolePreferenceAndInstall({
             preference,

package/dist/src/daemon/server/shutdown-utils.js

@@ -38,7 +38,7 @@ async function startNewDaemonInBackground() {
     // Resolve from workspace root to pick up the correct symlink target
     let startScriptPath;
     try {
-        startScriptPath = require.resolve('@ohos-ports/nx/src/daemon/server/start.js', {
+        startScriptPath = require.resolve('nx/src/daemon/server/start.js', {
             paths: [workspace_root_1.workspaceRoot],
         });
     }

package/dist/src/native/assert-supported-platform.js

@@ -12,8 +12,7 @@ function assertSupportedPlatform() {
         if (process.platform == 'win32' ||
             process.platform == 'darwin' ||
             process.platform == 'linux' ||
-            process.platform == 'freebsd' ||
-            process.platform == 'openharmony') {
+            process.platform == 'freebsd') {
             title = 'Missing Platform Dependency';
             bodyLines = [
                 `The Nx CLI could not find or load the native binary for your supported platform (${process.platform}-${process.arch}).`,

package/dist/src/native/index.js

@@ -35,14 +35,12 @@ const nxPackages = new Set([
   '@nx/nx-darwin-x64',
   '@nx/nx-darwin-arm64',
   '@nx/nx-freebsd-x64',
-  '@nx/nx-openharmony-arm64',
-  '@nx/nx-openharmony-arm',
-  '@nx/nx-openharmony-x64',
   '@nx/nx-linux-x64-musl',
   '@nx/nx-linux-x64-gnu',
   '@nx/nx-linux-arm64-musl',
   '@nx/nx-linux-arm64-gnu',
   '@nx/nx-linux-arm-gnueabihf',
+  '@nx/nx-openharmony-arm64',
 ]);
 
 const localNodeFiles = [
@@ -55,14 +53,12 @@ const localNodeFiles = [
   'nx.darwin-x64.node',
   'nx.darwin-arm64.node',
   'nx.freebsd-x64.node',
-  'nx.openharmony-arm64.node',
-  'nx.openharmony-arm.node',
-  'nx.openharmony-x64.node',
   'nx.linux-x64-musl.node',
   'nx.linux-x64-gnu.node',
   'nx.linux-arm64-musl.node',
   'nx.linux-arm64-gnu.node',
   'nx.linux-arm-gnueabihf.node',
+  'nx.openharmony-arm64.node',
 ];
 
 const originalLoad = Module._load;