Unverified Commit 59a5fae3 authored by Jiwon Choi's avatar Jiwon Choi Committed by GitHub

Nudge latest version upgrades for manual `next dev|build` (#98873)

Stacked on #98872.

Counter part of agent nudge for auto upgrade. Prompt user when runs
`next dev` or `next build` based on `experimental.agenticAutoUpgrade`
value. This PR covers `latest`.
parent 447e018f
...@@ -23,7 +23,7 @@ export type NudgeKind = 'security' | 'latest' | 'future' ...@@ -23,7 +23,7 @@ export type NudgeKind = 'security' | 'latest' | 'future'
function getRequestedUpgrade() { function getRequestedUpgrade() {
const policy = process.env.__NEXT_AGENTIC_AUTO_UPGRADE const policy = process.env.__NEXT_AGENTIC_AUTO_UPGRADE
return policy === 'security' ? policy : null return policy === 'security' || policy === 'latest' ? policy : null
} }
const RETRY_TTL = 5 * 60 * 1000 const RETRY_TTL = 5 * 60 * 1000
...@@ -126,7 +126,7 @@ type UpgradeReminder = { ...@@ -126,7 +126,7 @@ type UpgradeReminder = {
targetVersion: string | null targetVersion: string | null
unavailableReason: string | null unavailableReason: string | null
} }
| { kind: 'latest'; latestVersion: string } | { kind: 'latest'; latestVersion: string | null }
| { kind: 'future'; names: string[] } | { kind: 'future'; names: string[] }
) )
...@@ -145,7 +145,8 @@ export async function assessUpgrade( ...@@ -145,7 +145,8 @@ export async function assessUpgrade(
_directory: string, _directory: string,
config: UpgradeContext, config: UpgradeContext,
installedVersion: string = process.env.__NEXT_VERSION || 'unknown', installedVersion: string = process.env.__NEXT_VERSION || 'unknown',
stopBefore: NudgeKind | null = null stopBefore: NudgeKind | null = null,
forceVersionReminder: boolean = false
): Promise<UpgradeReminder | null> { ): Promise<UpgradeReminder | null> {
const policy = config.experimental.agenticAutoUpgrade const policy = config.experimental.agenticAutoUpgrade
if (policy !== 'security' && policy !== 'latest' && policy !== 'future') { if (policy !== 'security' && policy !== 'latest' && policy !== 'future') {
...@@ -202,8 +203,16 @@ export async function assessUpgrade( ...@@ -202,8 +203,16 @@ export async function assessUpgrade(
installedVersion, installedVersion,
upgrade.targetVersion upgrade.targetVersion
) )
if (latestVersion) { if (
return { kind: 'latest', policy, installedVersion, latestVersion } latestVersion ||
(forceVersionReminder && upgrade.targetVersion !== installedVersion)
) {
return {
kind: 'latest',
policy,
installedVersion,
latestVersion: upgrade.targetVersion,
}
} }
if (policy !== 'future' || stopBefore === 'future') { if (policy !== 'future' || stopBefore === 'future') {
...@@ -241,9 +250,9 @@ async function nudgeUpgradeForAgent( ...@@ -241,9 +250,9 @@ async function nudgeUpgradeForAgent(
reference = reminder.reference reference = reminder.reference
break break
case 'latest': case 'latest':
summary = `Next.js ${reminder.latestVersion} is available. You're using ${reminder.installedVersion}.` summary = `Next.js ${reminder.latestVersion ?? '[latest version]'} is available. You're using ${reminder.installedVersion}.`
recommendation = 'We recommend you upgrade Next.js.' recommendation = 'We recommend you upgrade Next.js.'
reference = `https://registry.npmjs.org/next/${semver.prerelease(reminder.latestVersion)?.[0] === 'canary' ? 'canary' : 'latest'}` reference = `https://registry.npmjs.org/next/${semver.prerelease(reminder.latestVersion ?? reminder.installedVersion)?.[0] === 'canary' ? 'canary' : 'latest'}`
break break
case 'future': case 'future':
summary = `Installed Next.js ${reminder.installedVersion} includes Future Defaults available for this app:\n\n${reminder.names.map((name) => `- ${name}`).join('\n')}` summary = `Installed Next.js ${reminder.installedVersion} includes Future Defaults available for this app:\n\n${reminder.names.map((name) => `- ${name}`).join('\n')}`
...@@ -378,6 +387,8 @@ async function nudgeUpgradeForHuman( ...@@ -378,6 +387,8 @@ async function nudgeUpgradeForHuman(
message = `⚠ Installed Next.js version ${reminder.installedVersion} is affected by a known security vulnerability.` message = `⚠ Installed Next.js version ${reminder.installedVersion} is affected by a known security vulnerability.`
canUpgrade = reminder.unavailableReason === null canUpgrade = reminder.unavailableReason === null
message += `\n\n${reminder.unavailableReason ?? `Next.js security version upgrade available: ${reminder.installedVersion} -> ${reminder.targetVersion ?? '[target version]'}`}` message += `\n\n${reminder.unavailableReason ?? `Next.js security version upgrade available: ${reminder.installedVersion} -> ${reminder.targetVersion ?? '[target version]'}`}`
} else if (reminder.kind === 'latest') {
message = `Next.js latest version upgrade available: ${reminder.installedVersion} -> ${reminder.latestVersion ?? '[target version]'}`
} else { } else {
return 'skip' return 'skip'
} }
...@@ -452,9 +463,7 @@ export async function nudgeUpgrade( ...@@ -452,9 +463,7 @@ export async function nudgeUpgrade(
installedVersion, installedVersion,
policy policy
) )
if (stopBefore !== 'security') { stopBefore ??= 'future'
stopBefore = 'latest'
}
} }
if (signal.aborted) { if (signal.aborted) {
return return
...@@ -464,7 +473,8 @@ export async function nudgeUpgrade( ...@@ -464,7 +473,8 @@ export async function nudgeUpgrade(
directory, directory,
{ ...config, experimental: { agenticAutoUpgrade: policy } }, { ...config, experimental: { agenticAutoUpgrade: policy } },
installedVersion, installedVersion,
stopBefore stopBefore,
requested !== null
) )
const preview = !reminder && requested !== null const preview = !reminder && requested !== null
if (preview) { if (preview) {
...@@ -481,6 +491,13 @@ export async function nudgeUpgrade( ...@@ -481,6 +491,13 @@ export async function nudgeUpgrade(
unavailableReason: null, unavailableReason: null,
} }
break break
case 'latest':
reminder = {
...context,
kind: 'latest',
latestVersion: null,
}
break
} }
} }
if (!reminder || signal?.aborted) { if (!reminder || signal?.aborted) {
......
...@@ -677,6 +677,11 @@ describe('human upgrade nudge', () => { ...@@ -677,6 +677,11 @@ describe('human upgrade nudge', () => {
'17.0.0', '17.0.0',
'⚠ Installed Next.js version 16.4.0 is affected by a known security vulnerability.\n\nNext.js security version upgrade available: 16.4.0 -> 17.0.0', '⚠ Installed Next.js version 16.4.0 is affected by a known security vulnerability.\n\nNext.js security version upgrade available: 16.4.0 -> 17.0.0',
], ],
[
'latest',
'17.0.0',
'Next.js latest version upgrade available: 16.4.0 -> 17.0.0',
],
] as const)( ] as const)(
'renders concise %s copy for target %s', 'renders concise %s copy for target %s',
async (policy, targetVersion, message) => { async (policy, targetVersion, message) => {
...@@ -711,7 +716,7 @@ describe('human upgrade nudge', () => { ...@@ -711,7 +716,7 @@ describe('human upgrade nudge', () => {
} }
) )
it.each(['security'] as const)( it.each(['security', 'latest'] as const)(
'forces a %s request without changing installed-version eligibility', 'forces a %s request without changing installed-version eligibility',
async (policy) => { async (policy) => {
process.env.__NEXT_AGENTIC_AUTO_UPGRADE = policy process.env.__NEXT_AGENTIC_AUTO_UPGRADE = policy
...@@ -775,6 +780,29 @@ describe('human upgrade nudge', () => { ...@@ -775,6 +780,29 @@ describe('human upgrade nudge', () => {
) )
}) })
it('uses real release data for a forced latest nudge with config disabled', async () => {
process.env.__NEXT_AGENTIC_AUTO_UPGRADE = 'latest'
mockUpgrade('16.4.1')
await nudgeUpgrade(
directory,
config(false),
'dev',
new AbortController().signal
)
const message = jest.mocked(promptUpgrade).mock.calls[0][0]
expect(message).toContain(
'Next.js latest version upgrade available: 16.4.0 -> 16.4.1'
)
expect(message).not.toContain('Forced preview:')
expect(getUpgradeAssessment).toHaveBeenCalledWith('16.4.0', 'latest', false)
jest.mocked(getAgentName).mockResolvedValue('codex')
await expect(
nudgeUpgrade(directory, config(false), 'dev')
).rejects.toMatchObject({
message: expect.stringContaining('next upgrade --ai=latest'),
})
})
it('ignores invalid requests and retains the configured policy', async () => { it('ignores invalid requests and retains the configured policy', async () => {
process.env.__NEXT_AGENTIC_AUTO_UPGRADE = 'invalid' process.env.__NEXT_AGENTIC_AUTO_UPGRADE = 'invalid'
const context = getUpgradeContext(config(false)) const context = getUpgradeContext(config(false))
...@@ -787,7 +815,7 @@ describe('human upgrade nudge', () => { ...@@ -787,7 +815,7 @@ describe('human upgrade nudge', () => {
) )
expect(promptUpgrade).not.toHaveBeenCalled() expect(promptUpgrade).not.toHaveBeenCalled()
await expect(run()).resolves.toBe('skip') await expect(run()).resolves.toBe('skip')
expect(getUpgradeAssessment).toHaveBeenCalledWith('16.4.0', 'future', true) expect(getUpgradeAssessment).toHaveBeenCalledWith('16.4.0', 'future', false)
}) })
it('does not open an explicitly requested prompt after cancellation', async () => { it('does not open an explicitly requested prompt after cancellation', async () => {
...@@ -891,12 +919,27 @@ describe('human upgrade nudge', () => { ...@@ -891,12 +919,27 @@ describe('human upgrade nudge', () => {
} }
) )
it('stops before release metadata for human reminders', async () => { it.each([false, true])(
mockUpgrade('17.0.0') 'still checks security after a latest dismissal (affected: %s)',
await run() async (affected) => {
expect(getUpgradeAssessment).toHaveBeenCalledWith('16.4.0', 'future', true) mockUpgrade('17.0.0')
expect(promptUpgrade).toHaveBeenCalledTimes(0) jest.mocked(promptUpgrade).mockResolvedValue('dismiss')
}) await run()
jest.clearAllMocks()
jest.mocked(getUpgradeAssessment).mockResolvedValue({
...securityAssessment,
affected,
})
jest.mocked(promptUpgrade).mockResolvedValue('skip')
await run()
expect(getUpgradeAssessment).toHaveBeenCalledWith(
'16.4.0',
'future',
true
)
expect(promptUpgrade).toHaveBeenCalledTimes(affected ? 1 : 0)
}
)
it.each(['blocked', 'unknown'] as const)( it.each(['blocked', 'unknown'] as const)(
'omits Update when security target availability is %s', 'omits Update when security target availability is %s',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment