@onekeyfe/hd-core 1.2.0-alpha.128 → 1.2.0-alpha.129

package/__tests__/deviceUploadNft.test.ts

@@ -114,7 +114,6 @@ describe('DeviceUploadNft', () => {
       chunkSize: 2048,
       paceMs: 0,
     });
-    expect(method.unlockPolicy).toBe('unlock-before-run');
   });
 
   test('rejects invalid image Base64 before device communication', () => {

package/__tests__/firmware-update/firmware-prepared-resource-archive.test.ts

@@ -105,6 +105,27 @@ const createPreparedResourcePlan = ({
 };
 
 describe.each(['v2', 'v3'] as const)('%s prepared resource archive binding', executor => {
+  test('rejects a missing artifact reader', async () => {
+    const entryBinary = Uint8Array.from([1, 2, 3, 4]).buffer;
+    const zip = new JSZip();
+    zip.file('images/logo.bin', entryBinary);
+    const archiveBinary = await zip.generateAsync({ type: 'arraybuffer' });
+    const { preparedPlan } = createPreparedResourcePlan({
+      executor,
+      archiveBinary,
+      entryBinary,
+    });
+
+    await expect(
+      readVerifiedPreparedResourceArchive({
+        preparedPlan,
+        reader: undefined,
+      })
+    ).rejects.toMatchObject({
+      params: { firmwareUpdateCode: 'FirmwareArtifactReaderInvalid' },
+    });
+  });
+
   test('uses canonical bytes extracted from the approved ZIP', async () => {
     const entryBinary = Uint8Array.from([1, 2, 3, 4]).buffer;
     const zip = new JSZip();

package/__tests__/firmware-update/firmware-update-v4-install-poll.test.ts

@@ -42,7 +42,12 @@ describe('FirmwareUpdateV4 install polling', () => {
 
     method.device = {
       getCommands: () => ({ typedCall, call }),
+      createProtocolV2UiPhaseMetadata: jest.fn().mockReturnValue(undefined),
+      toMessageObject: jest.fn().mockReturnValue({ connectId: 'pro2-ble' }),
+      setCancelableAction: jest.fn(),
+      clearCancelableAction: jest.fn(),
     } as unknown as Device;
+    method.postMessage = jest.fn();
     method.postTipMessage = jest.fn();
     method.postProgressMessage = jest.fn();
 

package/__tests__/protocol-v2-resources.test.ts

@@ -31,25 +31,6 @@ const neoResourceSource = {
   archiveSize: 12_345_678,
 };
 
-const pro2Features = {
-  deviceType: EDeviceType.Pro2,
-  firmwareVersion: '1.0.0',
-} as unknown as Features;
-
-const neoFeatures = {
-  deviceType: EDeviceType.Neo,
-  firmwareVersion: '1.0.0',
-} as unknown as Features;
-
-const createProtocolV2Release = (source: typeof resourceSource) => ({
-  required: false,
-  version: [1, 0, 0],
-  url: 'https://example.com/firmware.okpkg',
-  fingerprint: 'c'.repeat(64),
-  changelog: {},
-  resources: { source },
-});
-
 const manifestFiles = [
   ['bundles/firmware_logo-build.okpkg', 'firmware_logo.okpkg', 'vol0:/bundles/firmware_logo.okpkg'],
   ['bundles/font/noto-build.okpkg', 'noto.okpkg', 'vol0:/bundles/font/noto.okpkg'],
@@ -127,11 +108,38 @@ const createRemoteConfig = (): RemoteConfigResponse =>
     mini: { firmware: [], ble: [] },
     touch: { firmware: [], ble: [] },
     pro: { firmware: [], ble: [] },
-    pro2: { 'firmware-v1': [createProtocolV2Release(resourceSource)] },
-    neo: { 'firmware-v1': [createProtocolV2Release(neoResourceSource)] },
+    pro2: {
+      'firmware-v1': [
+        {
+          required: false,
+          version: [1, 0, 0],
+          url: 'https://example.com/pro2.okpkg',
+          fingerprint: 'a'.repeat(64),
+          changelog: { 'zh-CN': 'Pro2', 'en-US': 'Pro2' },
+          resources: { source: resourceSource },
+        },
+      ],
+      ble: [],
+    },
+    neo: {
+      'firmware-v1': [
+        {
+          required: false,
+          version: [1, 0, 0],
+          url: 'https://example.com/neo.okpkg',
+          fingerprint: 'b'.repeat(64),
+          changelog: { 'zh-CN': 'Neo', 'en-US': 'Neo' },
+          resources: { source: neoResourceSource },
+        },
+      ],
+      ble: [],
+    },
     bridge: {},
   } as unknown as RemoteConfigResponse);
 
+const getProtocolV2Release = (deviceType: EDeviceType.Pro2 | EDeviceType.Neo) =>
+  DataManager.deviceMap[deviceType]?.['firmware-v1']?.[0];
+
 describe('Pro2 resource configuration', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -203,52 +211,68 @@ describe('Pro2 resource configuration', () => {
     expect(configFetcher).toHaveBeenCalledWith(
       expect.stringMatching(/^https:\/\/data\.onekey\.so\/pre-config\.json\?noCache=/)
     );
-    expect(DataManager.getProtocolV2ResourceSource(pro2Features, EFirmwareType.Universal)).toEqual(
+    expect(DataManager.getProtocolV2ResourceSource(getProtocolV2Release(EDeviceType.Pro2))).toEqual(
       resourceSource
     );
     expect(DataManager.lastCheckTimestamp).toBeGreaterThan(0);
   });
 
-  test('does not use a device-level resource archive outside the selected firmware release', async () => {
-    const remoteConfig = createRemoteConfig();
-    const pro2Config = remoteConfig.pro2 as {
-      resources?: unknown;
-      'firmware-v1': Array<{ resources?: unknown }>;
+  test('uses the resource archive bound to the selected firmware release', async () => {
+    const newerResourceSource = {
+      archiveUrl: 'https://example.com/resource/pro2-resource-v2.zip',
+      archiveSha256: 'c'.repeat(64),
+      archiveSize: 20_000_000,
     };
-    pro2Config.resources = { source: resourceSource };
-    delete pro2Config['firmware-v1'][0].resources;
+    const remoteConfig = createRemoteConfig();
+    remoteConfig.pro2['firmware-v1']?.push({
+      ...remoteConfig.pro2['firmware-v1'][0],
+      version: [2, 0, 0],
+      resources: { source: newerResourceSource },
+    });
 
     await expect(
       DataManager.load(createSettings(jest.fn().mockResolvedValue(remoteConfig)))
     ).resolves.toBe(true);
 
-    expect(
-      DataManager.getProtocolV2ResourceSource(pro2Features, EFirmwareType.Universal)
-    ).toBeUndefined();
+    const selectedRelease = DataManager.getFirmwareLatestRelease(
+      { deviceType: 'pro2', firmwareVersion: '1.0.0' } as Features,
+      EFirmwareType.Universal
+    );
+    expect(selectedRelease?.version).toEqual([2, 0, 0]);
+    expect(DataManager.getProtocolV2ResourceSource(selectedRelease)).toEqual(newerResourceSource);
   });
 
-  test('uses the resource archive from the selected latest firmware release', async () => {
+  test('does not use a device-level Protocol V2 resource archive', async () => {
     const remoteConfig = createRemoteConfig();
-    const olderRelease = {
-      ...createProtocolV2Release(resourceSource),
-      version: [0, 9, 0],
-    };
-    const latestRelease = {
-      ...createProtocolV2Release(neoResourceSource),
-      version: [1, 1, 0],
+    delete remoteConfig.pro2['firmware-v1']?.[0].resources;
+    (remoteConfig.pro2 as unknown as { resources: unknown }).resources = {
+      source: resourceSource,
     };
-    (remoteConfig.pro2 as { 'firmware-v1': unknown[] })['firmware-v1'] = [
-      olderRelease,
-      latestRelease,
-    ];
 
     await expect(
       DataManager.load(createSettings(jest.fn().mockResolvedValue(remoteConfig)))
     ).resolves.toBe(true);
 
-    expect(DataManager.getProtocolV2ResourceSource(pro2Features, EFirmwareType.Universal)).toEqual(
-      neoResourceSource
-    );
+    expect(
+      DataManager.getProtocolV2ResourceSource(getProtocolV2Release(EDeviceType.Pro2))
+    ).toBeUndefined();
+  });
+
+  test('does not block the latest release when an older release has invalid resources', async () => {
+    const remoteConfig = createRemoteConfig();
+    (remoteConfig.pro2['firmware-v1']?.[0] as { resources?: unknown }).resources = { source: {} };
+    remoteConfig.pro2['firmware-v1']?.push({
+      ...remoteConfig.pro2['firmware-v1'][0],
+      version: [2, 0, 0],
+      resources: { source: resourceSource },
+    });
+    const configFetcher = jest.fn().mockResolvedValue(remoteConfig);
+
+    await expect(DataManager.load(createSettings(configFetcher))).resolves.toBe(true);
+    await expect(DataManager.forceReloadData({ requireResources: true })).resolves.toBeUndefined();
+
+    const latestRelease = DataManager.deviceMap[EDeviceType.Pro2]?.['firmware-v1']?.[1];
+    expect(DataManager.getProtocolV2ResourceSource(latestRelease)).toEqual(resourceSource);
   });
 
   test('reuses the configuration fetched during SDK initialization for an immediate update', async () => {
@@ -263,40 +287,32 @@ describe('Pro2 resource configuration', () => {
 
   test('keeps base SDK initialization available when remote Pro2 resources are invalid', async () => {
     const remoteConfig = createRemoteConfig();
-    (
-      remoteConfig.pro2 as {
-        'firmware-v1': Array<{ resources?: unknown }>;
-      }
-    )['firmware-v1'][0].resources = { source: {} };
+    (remoteConfig.pro2['firmware-v1']?.[0] as { resources?: unknown }).resources = { source: {} };
     const configFetcher = jest.fn().mockResolvedValue(remoteConfig);
 
     await expect(DataManager.load(createSettings(configFetcher))).resolves.toBe(true);
 
     expect(
-      DataManager.getProtocolV2ResourceSource(pro2Features, EFirmwareType.Universal)
+      DataManager.getProtocolV2ResourceSource(getProtocolV2Release(EDeviceType.Pro2))
     ).toBeUndefined();
     expect(DataManager.protocolV2ResourcesConfigError).toBeInstanceOf(Error);
-    expect(DataManager.getProtocolV2ResourceSource(neoFeatures, EFirmwareType.Universal)).toEqual(
+    expect(DataManager.getProtocolV2ResourceSource(getProtocolV2Release(EDeviceType.Neo))).toEqual(
       neoResourceSource
     );
   });
 
   test('keeps Pro2 resources available when remote Neo resources are invalid', async () => {
     const remoteConfig = createRemoteConfig();
-    (
-      remoteConfig.neo as {
-        'firmware-v1': Array<{ resources?: unknown }>;
-      }
-    )['firmware-v1'][0].resources = { source: {} };
+    (remoteConfig.neo?.['firmware-v1']?.[0] as { resources?: unknown }).resources = { source: {} };
     const configFetcher = jest.fn().mockResolvedValue(remoteConfig);
 
     await expect(DataManager.load(createSettings(configFetcher))).resolves.toBe(true);
 
-    expect(DataManager.getProtocolV2ResourceSource(pro2Features, EFirmwareType.Universal)).toEqual(
+    expect(DataManager.getProtocolV2ResourceSource(getProtocolV2Release(EDeviceType.Pro2))).toEqual(
       resourceSource
     );
     expect(
-      DataManager.getProtocolV2ResourceSource(neoFeatures, EFirmwareType.Universal)
+      DataManager.getProtocolV2ResourceSource(getProtocolV2Release(EDeviceType.Neo))
     ).toBeUndefined();
     await expect(
       DataManager.forceReloadData({
@@ -317,11 +333,7 @@ describe('Pro2 resource configuration', () => {
 
   test('only blocks resource mutation when the refreshed Pro2 resources are invalid', async () => {
     const remoteConfig = createRemoteConfig();
-    (
-      remoteConfig.pro2 as {
-        'firmware-v1': Array<{ resources?: unknown }>;
-      }
-    )['firmware-v1'][0].resources = { source: {} };
+    (remoteConfig.pro2['firmware-v1']?.[0] as { resources?: unknown }).resources = { source: {} };
     const settings = createSettings(jest.fn().mockResolvedValue(remoteConfig));
     DataManager.settings = settings;
 
@@ -335,11 +347,7 @@ describe('Pro2 resource configuration', () => {
 
   test('checks resource configuration errors for the requested device only', async () => {
     const remoteConfig = createRemoteConfig();
-    (
-      remoteConfig.pro2 as {
-        'firmware-v1': Array<{ resources?: unknown }>;
-      }
-    )['firmware-v1'][0].resources = { source: {} };
+    (remoteConfig.pro2['firmware-v1']?.[0] as { resources?: unknown }).resources = { source: {} };
     const settings = createSettings(jest.fn().mockResolvedValue(remoteConfig));
     DataManager.settings = settings;
 

package/__tests__/protocol-v2.test.ts

@@ -211,7 +211,7 @@ describe('DeviceUploadWallpaper', () => {
     const result = await method.run();
 
     expect(method.getSupportedProtocols()).toEqual(['V2']);
-    expect(method.unlockPolicy).toBe('unlock-before-run');
+    expect(method.unlockPolicy).toBe('none');
     expect(typedCall).toHaveBeenNthCalledWith(1, 'FilesystemDirMake', 'Success', {
       path: 'vol1:/wallpapers',
     });
@@ -514,6 +514,10 @@ function stubDevice<T extends Record<string, any>>(device: T): T {
   const d = device as any;
   d.updateState ??= jest.fn();
   d.markProtocolV2Reboot ??= jest.fn();
+  d.setCancelableAction ??= jest.fn();
+  d.clearCancelableAction ??= jest.fn();
+  d.toMessageObject ??= jest.fn(() => ({ connectId: d.originalDescriptor?.id }));
+  d.createProtocolV2UiPhaseMetadata ??= jest.fn(() => undefined);
   d.isProtocolV2 ??= () => d.originalDescriptor?.protocolType === 'V2';
   d.isBootloader ??= () => d.features?.mode === 'bootloader';
   d.isRomloader ??= () => d.features?.mode === 'romloader';
@@ -4271,7 +4275,7 @@ describe('Protocol V2 firmware update targets', () => {
     });
     (method as any).protocolV2Reboot = jest.fn();
     (method as any).enterProtocolV2BootloaderMode = jest.fn().mockResolvedValue(true);
-    method.postTipMessage = jest.fn();
+    method.postMessage = jest.fn();
 
     await method.run();
 
@@ -5254,10 +5258,26 @@ describe('Protocol V2 firmware update targets', () => {
     const targets = [{ target_id: 4, path: 'vol1:firmware.bin' }];
     const typedCall = jest.fn().mockResolvedValue({ type: 'Success', message: {} });
     const call = jest.fn().mockResolvedValue({ type: 'WriteCompleted', message: {} });
+    const cancelDevice = jest.fn().mockResolvedValue(undefined);
+    let cancelableAction: (() => Promise<unknown>) | undefined;
+    const interaction = {
+      interactionId: 'firmware-update',
+      phaseId: 'firmware-update:phase-1',
+      sequence: 1,
+      phase: 'button',
+      transition: 'start',
+      protocol: 'V2',
+    };
 
     (method as any).device = stubDevice({
-      getCommands: () => ({ typedCall, call }),
+      getCommands: () => ({ typedCall, call, cancelDevice }),
+      createProtocolV2UiPhaseMetadata: jest.fn().mockReturnValue(interaction),
+      toMessageObject: jest.fn().mockReturnValue({ connectId: 'pro2' }),
+      setCancelableAction: jest.fn(action => {
+        cancelableAction = action;
+      }),
     });
+    method.postMessage = jest.fn();
     method.postTipMessage = jest.fn();
     method.postProgressMessage = jest.fn();
 
@@ -5266,14 +5286,32 @@ describe('Protocol V2 firmware update targets', () => {
     ).resolves.toBeUndefined();
 
     expect(typedCall).toHaveBeenCalledWith('DeviceFirmwareUpdateStage', 'Success', { targets });
+    expect(method.postMessage).toHaveBeenCalledWith({
+      event: 'UI_EVENT',
+      type: UI_REQUEST.REQUEST_BUTTON,
+      payload: {
+        device: { connectId: 'pro2' },
+        source: 'method-lifecycle',
+        reason: 'firmware-update',
+        completion: 'operation-completed',
+        deviceOnly: true,
+        operation: 'firmwareUpdateV4',
+        interaction,
+      },
+    });
     expect(call).toHaveBeenCalledWith(
       'DeviceFirmwareUpdateRequest',
       {},
       { returnAfterWrite: true }
     );
     expect(typedCall.mock.invocationCallOrder[0]).toBeLessThan(call.mock.invocationCallOrder[0]);
-    expect(method.postTipMessage).toHaveBeenCalledWith('ConfirmOnDevice');
+    expect((method.postMessage as jest.Mock).mock.invocationCallOrder[0]).toBeLessThan(
+      call.mock.invocationCallOrder[0]
+    );
+    expect(method.postTipMessage).not.toHaveBeenCalled();
     expect(method.postProgressMessage).not.toHaveBeenCalled();
+    await cancelableAction?.();
+    expect(cancelDevice).toHaveBeenCalledTimes(1);
   });
 
   test('does not send the install request when Protocol V2 staging fails', async () => {
@@ -5289,6 +5327,7 @@ describe('Protocol V2 firmware update targets', () => {
     (method as any).device = stubDevice({
       getCommands: () => ({ typedCall, call }),
     });
+    method.postMessage = jest.fn();
     method.postTipMessage = jest.fn();
     method.postProgressMessage = jest.fn();
 
@@ -5299,6 +5338,7 @@ describe('Protocol V2 firmware update targets', () => {
     ).rejects.toThrow('stage failed');
 
     expect(call).not.toHaveBeenCalled();
+    expect(method.postMessage).not.toHaveBeenCalled();
     expect(method.postTipMessage).not.toHaveBeenCalled();
     expect(method.postProgressMessage).not.toHaveBeenCalled();
   });
@@ -5315,7 +5355,10 @@ describe('Protocol V2 firmware update targets', () => {
 
     (method as any).device = stubDevice({
       getCommands: () => ({ typedCall, call }),
+      createProtocolV2UiPhaseMetadata: jest.fn().mockReturnValue(undefined),
+      toMessageObject: jest.fn().mockReturnValue({ connectId: 'pro2' }),
     });
+    method.postMessage = jest.fn();
     method.postTipMessage = jest.fn();
     method.postProgressMessage = jest.fn();
 
@@ -5347,16 +5390,14 @@ describe('Protocol V2 firmware update targets', () => {
         type: 'DeviceFirmwareUpdateStatus',
         message: { records: [{ target_id: 4, status: 2 }] },
       });
-    const reconnectProtocolV2Device = jest
-      .fn()
-      .mockRejectedValueOnce(new Error('Device rebooting'))
-      .mockResolvedValue(undefined);
+    const reconnectProtocolV2Device = jest.fn();
+    const verifyProtocolV2ReconnectIdentity = jest.fn();
 
     (method as any).device = stubDevice({
       getCommands: () => ({ typedCall }),
     });
     (method as any).reconnectProtocolV2Device = reconnectProtocolV2Device;
-    (method as any).verifyProtocolV2ReconnectIdentity = jest.fn().mockResolvedValue(undefined);
+    (method as any).verifyProtocolV2ReconnectIdentity = verifyProtocolV2ReconnectIdentity;
     method.postProgressMessage = jest.fn();
     method.postTipMessage = jest.fn();
 
@@ -5364,7 +5405,8 @@ describe('Protocol V2 firmware update targets', () => {
       { target_id: 4, path: 'vol0:/application_p1.bin' },
     ]);
 
-    expect(reconnectProtocolV2Device).toHaveBeenCalledTimes(2);
+    expect(reconnectProtocolV2Device).not.toHaveBeenCalled();
+    expect(verifyProtocolV2ReconnectIdentity).not.toHaveBeenCalled();
     expect(typedCall.mock.calls.map(call => call[0])).toEqual([
       'DeviceFirmwareUpdateStatusGet',
       'DeviceFirmwareUpdateStatusGet',
@@ -5410,7 +5452,6 @@ describe('Protocol V2 firmware update targets', () => {
     (method as any).reconnectProtocolV2Device = reconnectProtocolV2Device;
     (method as any).verifyProtocolV2ReconnectIdentity = jest.fn().mockResolvedValue(undefined);
     method.postProgressMessage = jest.fn();
-    method.postTipMessage = jest.fn();
 
     try {
       await (method as any).waitForProtocolV2FirmwareUpdateComplete([
@@ -5420,7 +5461,7 @@ describe('Protocol V2 firmware update targets', () => {
       setTimeoutSpy.mockRestore();
     }
 
-    expect(reconnectProtocolV2Device).toHaveBeenCalledTimes(1);
+    expect(reconnectProtocolV2Device).not.toHaveBeenCalled();
     expect(typedCall.mock.calls.map(call => call[0])).toEqual([
       'DeviceFirmwareUpdateStatusGet',
       'DeviceFirmwareUpdateStatusGet',
@@ -5465,7 +5506,6 @@ describe('Protocol V2 firmware update targets', () => {
     (method as any).reconnectProtocolV2Device = jest.fn().mockResolvedValue(undefined);
     (method as any).verifyProtocolV2ReconnectIdentity = jest.fn().mockResolvedValue(undefined);
     method.postProgressMessage = jest.fn();
-    method.postTipMessage = jest.fn();
 
     try {
       await (method as any).waitForProtocolV2FirmwareUpdateComplete(
@@ -5477,50 +5517,9 @@ describe('Protocol V2 firmware update targets', () => {
     }
 
     expect(typedCall).toHaveBeenCalledTimes(3);
-    expect(method.postTipMessage).toHaveBeenCalledTimes(1);
-    expect(method.postTipMessage).toHaveBeenCalledWith('FirmwareUpdating');
     expect(method.postProgressMessage).toHaveBeenCalledWith(100, 'installingFirmware');
   });
 
-  test('reports missing current target records as unconfirmed device installation', async () => {
-    const method = new FirmwareUpdateV4({
-      id: 1,
-      payload: {
-        method: 'firmwareUpdateV4',
-      },
-    });
-    const typedCall = jest.fn().mockResolvedValue({
-      type: 'DeviceFirmwareUpdateStatus',
-      message: {
-        records: [{ target_id: 7, status: 2 }],
-      },
-    });
-    let now = 0;
-    jest.spyOn(Date, 'now').mockImplementation(() => now);
-    jest.spyOn(global, 'setTimeout').mockImplementation(((callback: () => void) => {
-      now += 31 * 1000;
-      callback();
-      return 0 as any;
-    }) as typeof setTimeout);
-
-    (method as any).device = stubDevice({
-      getCommands: () => ({ typedCall }),
-    });
-    (method as any).reconnectProtocolV2Device = jest.fn().mockResolvedValue(undefined);
-    (method as any).verifyProtocolV2ReconnectIdentity = jest.fn().mockResolvedValue(undefined);
-
-    await expect(
-      (method as any).waitForProtocolV2FirmwareUpdateComplete(
-        [{ target_id: 4, path: 'vol0:/application_p1.bin' }],
-        true
-      )
-    ).rejects.toMatchObject({
-      errorCode: HardwareErrorCode.FirmwareError,
-      message: expect.stringContaining('was not confirmed on the device'),
-    });
-    expect(typedCall).toHaveBeenCalledTimes(2);
-  });
-
   test('ignores stale finished records until the current install starts', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
@@ -5750,7 +5749,9 @@ describe('Protocol V2 firmware update targets', () => {
       'DeviceFirmwareUpdateStatusGet',
       'DeviceFirmwareUpdateStatusGet',
     ]);
-    expect((method as any).probeProtocolV2NormalMode).toHaveBeenCalledWith(deviceInfo);
+    expect((method as any).reconnectProtocolV2Device).toHaveBeenCalledTimes(1);
+    expect((method as any).verifyProtocolV2ReconnectIdentity).toHaveBeenCalledTimes(1);
+    expect((method as any).probeProtocolV2NormalMode).not.toHaveBeenCalled();
   });
 
   test('rejects a finished target whose payload version conflicts with the plan', () => {
@@ -5960,7 +5961,7 @@ describe('Protocol V2 firmware update targets', () => {
       ])
     ).resolves.toBeUndefined();
 
-    expect(reconnectProtocolV2Device).toHaveBeenCalledTimes(1);
+    expect(reconnectProtocolV2Device).not.toHaveBeenCalled();
     expect(typedCall).toHaveBeenCalledWith(
       'DeviceFirmwareUpdateStatusGet',
       ['DeviceFirmwareUpdateStatus', 'Success'],
@@ -6059,7 +6060,7 @@ describe('Protocol V2 firmware update targets', () => {
         { target_id: 4, path: 'vol0:/application_p1.bin' },
       ])
     ).resolves.toBeUndefined();
-    expect(reconnectProtocolV2Device).toHaveBeenCalledTimes(2);
+    expect(reconnectProtocolV2Device).toHaveBeenCalledTimes(1);
     expect(typedCall).toHaveBeenCalledTimes(4);
   });
 
@@ -8470,7 +8471,7 @@ describe('Protocol V2 firmware update targets', () => {
     expect(writePayloads.map(payload => payload.file.data.byteLength)).toEqual([1960, 1]);
   });
 
-  test('starts install progress only after Stage and the empty Request are written', async () => {
+  test('keeps the confirmation UI active after Stage and the empty Request are written', async () => {
     const method = new FirmwareUpdateV4({
       id: 1,
       payload: {
@@ -8488,7 +8489,10 @@ describe('Protocol V2 firmware update targets', () => {
 
     (method as any).device = stubDevice({
       getCommands: () => ({ typedCall, call }),
+      createProtocolV2UiPhaseMetadata: jest.fn().mockReturnValue(undefined),
+      toMessageObject: jest.fn().mockReturnValue({ connectId: 'pro2' }),
     });
+    method.postMessage = jest.fn();
     method.postProgressMessage = jest.fn();
     method.postTipMessage = jest.fn();
 
@@ -8514,9 +8518,8 @@ describe('Protocol V2 firmware update targets', () => {
 
     resolveWrite?.({ type: 'WriteCompleted', message: {} });
     await startPromise;
-    expect(method.postTipMessage).toHaveBeenCalledWith('ConfirmOnDevice');
+    expect(method.postTipMessage).not.toHaveBeenCalled();
     expect(method.postProgressMessage).not.toHaveBeenCalled();
-    expect(method.postTipMessage).toHaveBeenCalledTimes(1);
   });
 
   test('sends an empty Protocol V2 firmware install request without waiting for its response', async () => {
@@ -8534,7 +8537,10 @@ describe('Protocol V2 firmware update targets', () => {
 
     (method as any).device = stubDevice({
       getCommands: () => ({ typedCall, call }),
+      createProtocolV2UiPhaseMetadata: jest.fn().mockReturnValue(undefined),
+      toMessageObject: jest.fn().mockReturnValue({ connectId: 'pro2' }),
     });
+    method.postMessage = jest.fn();
     method.postProgressMessage = jest.fn();
     method.postTipMessage = jest.fn();
 
@@ -8548,7 +8554,7 @@ describe('Protocol V2 firmware update targets', () => {
       {},
       { returnAfterWrite: true }
     );
-    expect(method.postTipMessage).toHaveBeenCalledWith('ConfirmOnDevice');
+    expect(method.postTipMessage).not.toHaveBeenCalled();
   });
 });
 

package/dist/api/FirmwareUpdateV4.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FirmwareUpdateV4.d.ts","sourceRoot":"","sources":["../../src/api/FirmwareUpdateV4.ts"],"names":[],"mappings":"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"}

package/dist/api/firmware/FirmwarePreparedResourceArchive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FirmwarePreparedResourceArchive.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwarePreparedResourceArchive.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AAY7F,MAAM,MAAM,6BAA6B,GAAG;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;CACrB,CAAC;AAgCF,eAAO,MAAM,mCAAmC;kBAIhC,0BAA0B;YAChC,sBAAsB,GAAG,SAAS;MACxC,QAAQ,6BAA6B,EAAE,CA4H1C,CAAC"}
+{"version":3,"file":"FirmwarePreparedResourceArchive.d.ts","sourceRoot":"","sources":["../../../src/api/firmware/FirmwarePreparedResourceArchive.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AAY7F,MAAM,MAAM,6BAA6B,GAAG;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;CACrB,CAAC;AAmCF,eAAO,MAAM,mCAAmC;kBAIhC,0BAA0B;YAChC,sBAAsB,GAAG,SAAS;MACxC,QAAQ,6BAA6B,EAAE,CAkI1C,CAAC"}

package/dist/data-manager/DataManager.d.ts

@@ -1,5 +1,5 @@
 import { EDeviceType, EFirmwareType } from '@onekeyfe/hd-shared';
-import type { AssetsMap, ConnectSettings, DeviceTypeMap, Features, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus, ITransportStatus, IVersionArray } from '../types';
+import type { AssetsMap, ConnectSettings, DeviceTypeMap, Features, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus, IFirmwareReleaseInfo, ITransportStatus, IVersionArray } from '../types';
 export declare const FIRMWARE_FIELDS: readonly ["firmware", "firmware-v1", "firmware-v2", "firmware-v8", "firmware-btc-v8"];
 export type IFirmwareField = (typeof FIRMWARE_FIELDS)[number];
 export type ProtocolV1MessageSchema = 'v1CurrentSchema' | 'v1LegacySchema';
@@ -30,7 +30,7 @@ export default class DataManager {
         "zh-CN": string;
         "en-US": string;
     }[];
-    static getFirmwareLatestRelease: (features: Features, firmwareType: EFirmwareType) => import("../types").IFirmwareReleaseInfo | undefined;
+    static getFirmwareLatestRelease: (features: Features, firmwareType: EFirmwareType) => IFirmwareReleaseInfo | undefined;
     static getBLEFirmwareStatus: (features: Features) => IDeviceBLEFirmwareStatus;
     static getBleFirmwareChangelog: (features: Features) => {
         "zh-CN": string;
@@ -52,7 +52,7 @@ export default class DataManager {
         requireResources?: boolean;
         resourceDeviceType?: EDeviceType.Pro2 | EDeviceType.Neo;
     }): Promise<void>;
-    static getProtocolV2ResourceSource(features: Features, firmwareType: EFirmwareType): import("../types").IProtocolV2ResourceSource | undefined;
+    static getProtocolV2ResourceSource(release: IFirmwareReleaseInfo | undefined): import("../types").IProtocolV2ResourceSource | undefined;
     static getProtobufMessages(schema?: ProtobufMessageSchema): JSON;
     static getSettings(key?: undefined): ConnectSettings;
     static getSettings<T extends keyof ConnectSettings>(key: T): ConnectSettings[T];

package/dist/data-manager/DataManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/DataManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataManager.d.ts","sourceRoot":"","sources":["../../src/data-manager/DataManager.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -259,7 +259,7 @@ type IFirmwareReleaseInfo = {
     upgradeType?: 'payload-package-set' | string;
     components?: Record<string, IProtocolV2FirmwareComponent>;
     installOrder?: string[];
-    /** Resource archive released together with this Protocol V2 firmware release. */
+    /** Protocol V2 resources matched to this firmware release. */
     resources?: IProtocolV2Resources;
     bootloaderChangelog?: {
         [k in ILocale]: string;
@@ -4735,7 +4735,7 @@ declare class DataManager {
         requireResources?: boolean;
         resourceDeviceType?: EDeviceType.Pro2 | EDeviceType.Neo;
     }): Promise<void>;
-    static getProtocolV2ResourceSource(features: Features, firmwareType: EFirmwareType): IProtocolV2ResourceSource | undefined;
+    static getProtocolV2ResourceSource(release: IFirmwareReleaseInfo | undefined): IProtocolV2ResourceSource | undefined;
     static getProtobufMessages(schema?: ProtobufMessageSchema): JSON;
     static getSettings(key?: undefined): ConnectSettings;
     static getSettings<T extends keyof ConnectSettings>(key: T): ConnectSettings[T];

package/dist/index.js

@@ -40850,24 +40850,23 @@ class DataManager {
         });
         return enrichedData;
     }
-    static enrichProtocolV2FirmwareReleaseInfo(deviceData, deviceName, onResourcesConfigError) {
+    static enrichProtocolV2FirmwareReleaseInfo(deviceData, onResourcesError) {
         const enrichedData = this.enrichFirmwareReleaseInfo(deviceData);
-        const _b = enrichedData, releaseScopedData = __rest(_b, ["resources"]);
-        const releases = releaseScopedData['firmware-v1'];
+        const releases = enrichedData['firmware-v1'];
         if (!Array.isArray(releases)) {
-            return releaseScopedData;
+            return enrichedData;
         }
-        return Object.assign(Object.assign({}, releaseScopedData), { 'firmware-v1': releases.map(release => {
+        const latestRelease = findLatestRelease(releases);
+        return Object.assign(Object.assign({}, enrichedData), { 'firmware-v1': releases.map(release => {
                 const { resources: rawResources } = release, releaseWithoutResources = __rest(release, ["resources"]);
                 try {
                     const resources = parseProtocolV2Resources(rawResources);
-                    return resources
-                        ? Object.assign(Object.assign({}, releaseWithoutResources), { resources }) : releaseWithoutResources;
+                    return Object.assign(Object.assign({}, releaseWithoutResources), (resources ? { resources } : undefined));
                 }
                 catch (error) {
-                    const resourcesError = error instanceof Error ? error : new Error(String(error));
-                    onResourcesConfigError(resourcesError);
-                    Log$k.warn(`[DataConfig] Ignoring invalid ${deviceName} release resources config:`, error);
+                    if (release === latestRelease) {
+                        onResourcesError(error instanceof Error ? error : new Error(String(error)));
+                    }
                     return releaseWithoutResources;
                 }
             }) });
@@ -40933,13 +40932,13 @@ class DataManager {
         });
     }
     static applyRemoteConfig(data) {
-        const pro2Config = this.enrichProtocolV2FirmwareReleaseInfo(data.pro2, 'Pro2', error => {
-            var _b;
-            (_b = this.protocolV2ResourcesConfigError) !== null && _b !== void 0 ? _b : (this.protocolV2ResourcesConfigError = error);
+        const pro2Config = this.enrichProtocolV2FirmwareReleaseInfo(data.pro2, error => {
+            this.protocolV2ResourcesConfigError = error;
+            Log$k.warn('[DataConfig] Ignoring invalid Pro2 release resources config:', error);
         });
-        const neoConfig = this.enrichProtocolV2FirmwareReleaseInfo(data.neo, 'Neo', error => {
-            var _b;
-            (_b = this.protocolV2NeoResourcesConfigError) !== null && _b !== void 0 ? _b : (this.protocolV2NeoResourcesConfigError = error);
+        const neoConfig = this.enrichProtocolV2FirmwareReleaseInfo(data.neo, error => {
+            this.protocolV2NeoResourcesConfigError = error;
+            Log$k.warn('[DataConfig] Ignoring invalid Neo release resources config:', error);
         });
         this.deviceMap = {
             [hdShared.EDeviceType.Classic]: this.enrichFirmwareReleaseInfo(data.classic),
@@ -41003,9 +41002,9 @@ class DataManager {
             this.lastCheckTimestamp = getTimeStamp();
         });
     }
-    static getProtocolV2ResourceSource(features, firmwareType) {
-        var _b, _c;
-        return (_c = (_b = this.getFirmwareLatestRelease(features, firmwareType)) === null || _b === void 0 ? void 0 : _b.resources) === null || _c === void 0 ? void 0 : _c.source;
+    static getProtocolV2ResourceSource(release) {
+        var _b;
+        return (_b = release === null || release === void 0 ? void 0 : release.resources) === null || _b === void 0 ? void 0 : _b.source;
     }
     static getProtobufMessages(schema = 'v1CurrentSchema') {
         return this.messages[schema];
@@ -47855,7 +47854,7 @@ class CheckAllFirmwareRelease extends BaseMethod {
                 release,
                 deviceType: state.identity.deviceType,
             });
-            const resourceSource = DataManager.getProtocolV2ResourceSource(features, firmwareType);
+            const resourceSource = DataManager.getProtocolV2ResourceSource(release);
             const resourceStatus = 'unknown';
             const detectedComponentTargets = validatedForceUpdateTargets.includes('firmware')
                 ? plan.components.flatMap(component => component.updateTarget ? [component.updateTarget] : [])
@@ -50251,6 +50250,9 @@ const readVerifiedPreparedResourceArchive = ({ preparedPlan, reader, }) => __awa
         }
         return [];
     }
+    if (!reader) {
+        return resourceArchiveError('Firmware artifact reader is required for prepared resource archives', 'FirmwareArtifactReaderInvalid');
+    }
     if (resourceArtifacts.length !== 1) {
         return resourceArchiveError('Firmware prepared plan must contain exactly one materialized resource ZIP', 'FirmwareArtifactsNotPrepared');
     }
@@ -52945,7 +52947,8 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             if (deviceType !== hdShared.EDeviceType.Pro2 && deviceType !== hdShared.EDeviceType.Neo) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.RuntimeError, 'Protocol V2 resource archive requires a Pro2 or Neo device');
             }
-            const source = DataManager.getProtocolV2ResourceSource(features, firmwareType);
+            const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
+            const source = DataManager.getProtocolV2ResourceSource(release);
             const expectedSha256 = normalizeProtocolV2Hex(source === null || source === void 0 ? void 0 : source.archiveSha256);
             if (!(source === null || source === void 0 ? void 0 : source.archiveUrl) ||
                 !Number.isSafeInteger(source.archiveSize) ||
@@ -53276,6 +53279,7 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
         });
     }
     executeProtocolV2TransferPhase({ installSources, resourceSources, }) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             let totalSize = installSources.reduce((total, item) => total + item.source.size, 0);
             const resourcesToSync = [];
@@ -53330,9 +53334,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                 target_id: item.targetId,
                 path: item.path,
             }));
-            yield this.protocolV2StartFirmwareUpdate({ targets });
-            yield hdShared.wait(PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY);
-            yield this.waitForProtocolV2FirmwareUpdateComplete(targets, true);
+            try {
+                yield this.protocolV2StartFirmwareUpdate({ targets });
+                yield hdShared.wait(PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY);
+                yield this.waitForProtocolV2FirmwareUpdateComplete(targets, true);
+            }
+            finally {
+                (_a = this.device) === null || _a === void 0 ? void 0 : _a.clearCancelableAction();
+            }
         });
     }
     protocolV2SourceUpdateProcess({ source, filePath, processedSize, totalSize, }) {
@@ -53506,14 +53515,13 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             const expectedPaths = new Map(targets.map(target => [target.target_id, target.path]));
             const startTime = Date.now();
             let lastError;
-            let shouldReconnect = true;
+            let shouldReconnect = false;
             let deviceInfo;
             let missingTargetStatusSince;
             let missingTargetStatusKey;
             let normalModeWithoutInstallEvidenceSince;
             let installEvidenceObserved = false;
             let currentInstallStatusObserved = false;
-            let firmwareUpdatingTipPosted = false;
             const resetMissingTargetStatusGrace = () => {
                 missingTargetStatusSince = undefined;
                 missingTargetStatusKey = undefined;
@@ -53543,18 +53551,14 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                         const statusTargets = statusResponse.type === 'DeviceFirmwareUpdateStatus'
                             ? ((_a = statusResponse.message.records) !== null && _a !== void 0 ? _a : [])
                             : [];
-                        const hasCurrentInstallStatus = statusTargets.some(target => {
+                        const hasInProgressTarget = statusTargets.some(target => {
                             const targetId = normalizeProtocolV2TargetId(target.target_id);
                             return (targetId !== undefined &&
                                 expectedTargetIds.has(targetId) &&
                                 isProtocolV2TargetStatusInProgress(target.status));
                         });
-                        if (hasCurrentInstallStatus) {
+                        if (hasInProgressTarget) {
                             currentInstallStatusObserved = true;
-                            if (!firmwareUpdatingTipPosted) {
-                                this.postTipMessage(exports.FirmwareUpdateTipMessage.FirmwareUpdating);
-                                firmwareUpdatingTipPosted = true;
-                            }
                         }
                         const hasMatchingTargetStatus = statusTargets.some(target => {
                             const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -53607,9 +53611,6 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
                                 }
                                 else if (now - missingTargetStatusSince >=
                                     PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT) {
-                                    if (requireCurrentInstallStatus && !currentInstallStatusObserved) {
-                                        throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError, 'Protocol V2 firmware installation was not confirmed on the device');
-                                    }
                                     const reportedTargetIds = statusTargets
                                         .map(target => normalizeProtocolV2TargetId(target.target_id))
                                         .filter((targetId) => targetId !== undefined);
@@ -53889,8 +53890,10 @@ class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod {
             this.protocolV2LastRuntimeProbeFeatures = undefined;
             const commands = this.device.getCommands();
             yield commands.typedCall('DeviceFirmwareUpdateStage', 'Success', { targets });
+            this.device.setCancelableAction(() => commands.cancelDevice());
+            const interaction = this.device.createProtocolV2UiPhaseMetadata('button', 'start');
+            this.postMessage(createUiMessage(UI_REQUEST.REQUEST_BUTTON, Object.assign({ device: this.device.toMessageObject(), source: 'method-lifecycle', reason: 'firmware-update', completion: 'operation-completed', deviceOnly: true, operation: this.name }, (interaction ? { interaction } : {}))));
             yield commands.call('DeviceFirmwareUpdateRequest', {}, { returnAfterWrite: true });
-            this.postTipMessage(exports.FirmwareUpdateTipMessage.ConfirmOnDevice);
         });
     }
     protocolV2Reboot(rebootType) {
@@ -54392,7 +54395,7 @@ class DeviceUploadWallpaper extends BaseMethod {
         });
         this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
         this.params = { jpegBase64, fileName, chunkSize };
-        this.unlockPolicy = 'unlock-before-run';
+        this.unlockPolicy = 'none';
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
     }
@@ -54540,7 +54543,7 @@ class DeviceUploadNft extends BaseMethod {
             paceMs,
             timeoutMs,
         };
-        this.unlockPolicy = 'unlock-before-run';
+        this.unlockPolicy = 'none';
         this.skipForceUpdateCheck = true;
         this.useDevicePassphraseState = false;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.128",
+  "version": "1.2.0-alpha.129",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.128",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.128",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.129",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.129",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "buffer": "^6.0.3",
@@ -46,5 +46,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "121180c237cddef9279041969d0d2394fac75a7a"
+  "gitHead": "d996758fef2d61a868b1989efcce1f04c8ef5e22"
 }

package/src/api/CheckAllFirmwareRelease.ts

@@ -411,7 +411,7 @@ export default class CheckAllFirmwareRelease extends BaseMethod {
       release,
       deviceType: state.identity.deviceType,
     });
-    const resourceSource = DataManager.getProtocolV2ResourceSource(features, firmwareType);
+    const resourceSource = DataManager.getProtocolV2ResourceSource(release);
     const resourceStatus = 'unknown' as const;
     const detectedComponentTargets = validatedForceUpdateTargets.includes('firmware')
       ? plan.components.flatMap(component =>

package/src/api/FirmwareUpdateV4.ts

@@ -9,7 +9,7 @@ import {
 } from '@onekeyfe/hd-transport';
 import { sha256 } from '@noble/hashes/sha256';
 
-import { FirmwareUpdateTipMessage, UI_REQUEST } from '../events/ui-request';
+import { FirmwareUpdateTipMessage, UI_REQUEST, createUiMessage } from '../events/ui-request';
 import { validateParams } from './helpers/paramsValidator';
 import {
   LoggerNames,
@@ -71,6 +71,7 @@ import type {
   IProtocolV2FirmwareComponent,
   IProtocolV2ResourceManifestFile,
   IVersionArray,
+  KnownDevice,
 } from '../types';
 import type { FirmwareByteSource } from './firmware/FirmwareArtifactSource';
 import type {
@@ -1891,7 +1892,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         'Protocol V2 resource archive requires a Pro2 or Neo device'
       );
     }
-    const source = DataManager.getProtocolV2ResourceSource(features, firmwareType);
+    const release = DataManager.getFirmwareLatestRelease(features, firmwareType);
+    const source = DataManager.getProtocolV2ResourceSource(release);
     const expectedSha256 = normalizeProtocolV2Hex(source?.archiveSha256);
     if (
       !source?.archiveUrl ||
@@ -2379,9 +2381,13 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       target_id: item.targetId,
       path: item.path,
     }));
-    await this.protocolV2StartFirmwareUpdate({ targets });
-    await wait(PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY);
-    await this.waitForProtocolV2FirmwareUpdateComplete(targets, true);
+    try {
+      await this.protocolV2StartFirmwareUpdate({ targets });
+      await wait(PROTOCOL_V2_INSTALL_STATUS_INITIAL_DELAY);
+      await this.waitForProtocolV2FirmwareUpdateComplete(targets, true);
+    } finally {
+      this.device?.clearCancelableAction();
+    }
   }
 
   private async protocolV2SourceUpdateProcess({
@@ -2641,14 +2647,15 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     const expectedPaths = new Map(targets.map(target => [target.target_id, target.path]));
     const startTime = Date.now();
     let lastError: unknown;
-    let shouldReconnect = true;
+    // DeviceFirmwareUpdateRequest leaves the current loader link usable for status polling.
+    // Reconnecting here probes DeviceInfo, which loaders reject while installation is active.
+    let shouldReconnect = false;
     let deviceInfo: ProtocolV2DeviceInfo | undefined;
     let missingTargetStatusSince: number | undefined;
     let missingTargetStatusKey: string | undefined;
     let normalModeWithoutInstallEvidenceSince: number | undefined;
     let installEvidenceObserved = false;
     let currentInstallStatusObserved = false;
-    let firmwareUpdatingTipPosted = false;
     const resetMissingTargetStatusGrace = () => {
       missingTargetStatusSince = undefined;
       missingTargetStatusKey = undefined;
@@ -2689,7 +2696,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
             statusResponse.type === 'DeviceFirmwareUpdateStatus'
               ? ((statusResponse.message.records ?? []) as ProtocolV2FirmwareUpdateStatusTarget[])
               : [];
-          const hasCurrentInstallStatus = statusTargets.some(target => {
+          const hasInProgressTarget = statusTargets.some(target => {
             const targetId = normalizeProtocolV2TargetId(target.target_id);
             return (
               targetId !== undefined &&
@@ -2697,12 +2704,8 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
               isProtocolV2TargetStatusInProgress(target.status)
             );
           });
-          if (hasCurrentInstallStatus) {
+          if (hasInProgressTarget) {
             currentInstallStatusObserved = true;
-            if (!firmwareUpdatingTipPosted) {
-              this.postTipMessage(FirmwareUpdateTipMessage.FirmwareUpdating);
-              firmwareUpdatingTipPosted = true;
-            }
           }
           const hasMatchingTargetStatus = statusTargets.some(target => {
             const targetId = normalizeProtocolV2TargetId(target.target_id);
@@ -2776,12 +2779,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
                 now - missingTargetStatusSince >=
                 PROTOCOL_V2_MISSING_TARGET_STATUS_GRACE_TIMEOUT
               ) {
-                if (requireCurrentInstallStatus && !currentInstallStatusObserved) {
-                  throw ERRORS.TypedError(
-                    HardwareErrorCode.FirmwareError,
-                    'Protocol V2 firmware installation was not confirmed on the device'
-                  );
-                }
                 const reportedTargetIds = statusTargets
                   .map(target => normalizeProtocolV2TargetId(target.target_id))
                   .filter((targetId): targetId is number => targetId !== undefined);
@@ -3152,8 +3149,20 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     this.protocolV2LastRuntimeProbeFeatures = undefined;
     const commands = this.device.getCommands();
     await commands.typedCall('DeviceFirmwareUpdateStage', 'Success', { targets });
+    this.device.setCancelableAction(() => commands.cancelDevice());
+    const interaction = this.device.createProtocolV2UiPhaseMetadata('button', 'start');
+    this.postMessage(
+      createUiMessage(UI_REQUEST.REQUEST_BUTTON, {
+        device: this.device.toMessageObject() as KnownDevice,
+        source: 'method-lifecycle',
+        reason: 'firmware-update',
+        completion: 'operation-completed',
+        deviceOnly: true,
+        operation: this.name,
+        ...(interaction ? { interaction } : {}),
+      })
+    );
     await commands.call('DeviceFirmwareUpdateRequest', {}, { returnAfterWrite: true });
-    this.postTipMessage(FirmwareUpdateTipMessage.ConfirmOnDevice);
   }
 
   private async protocolV2Reboot(rebootType: DeviceRebootType) {

package/src/api/firmware/FirmwarePreparedResourceArchive.ts

@@ -26,7 +26,10 @@ export type VerifiedPreparedResourceEntry = {
 
 const resourceArchiveError = (
   message: string,
-  firmwareUpdateCode: 'FirmwareArtifactsNotPrepared' | 'FirmwareArtifactReceiptMismatch'
+  firmwareUpdateCode:
+    | 'FirmwareArtifactsNotPrepared'
+    | 'FirmwareArtifactReceiptMismatch'
+    | 'FirmwareArtifactReaderInvalid'
 ): never => {
   throw ERRORS.TypedError(HardwareErrorCode.RuntimeError, message, { firmwareUpdateCode });
 };
@@ -73,6 +76,12 @@ export const readVerifiedPreparedResourceArchive = async ({
     }
     return [];
   }
+  if (!reader) {
+    return resourceArchiveError(
+      'Firmware artifact reader is required for prepared resource archives',
+      'FirmwareArtifactReaderInvalid'
+    );
+  }
   if (resourceArtifacts.length !== 1) {
     return resourceArchiveError(
       'Firmware prepared plan must contain exactly one materialized resource ZIP',

package/src/api/protocol-v2/DeviceUploadNft.ts

@@ -129,7 +129,7 @@ export default class DeviceUploadNft extends BaseMethod<DeviceUploadNftParams> {
       paceMs,
       timeoutMs,
     };
-    this.unlockPolicy = 'unlock-before-run';
+    this.unlockPolicy = 'none';
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
   }

package/src/api/protocol-v2/DeviceUploadWallpaper.ts

@@ -76,7 +76,7 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
     });
     this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
     this.params = { jpegBase64, fileName, chunkSize };
-    this.unlockPolicy = 'unlock-before-run';
+    this.unlockPolicy = 'none';
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
   }

package/src/data-manager/DataManager.ts

@@ -26,6 +26,7 @@ import type {
   Features,
   IDeviceBLEFirmwareStatus,
   IDeviceFirmwareStatus,
+  IFirmwareReleaseInfo,
   ITransportStatus,
   IVersionArray,
   RemoteConfigResponse,
@@ -408,35 +409,29 @@ export default class DataManager {
 
   private static enrichProtocolV2FirmwareReleaseInfo(
     deviceData: DeviceTypeMap[keyof DeviceTypeMap] | undefined,
-    deviceName: 'Pro2' | 'Neo',
-    onResourcesConfigError: (error: Error) => void
+    onResourcesError: (error: Error) => void
   ): NonNullable<DeviceTypeMap[keyof DeviceTypeMap]> {
     const enrichedData = this.enrichFirmwareReleaseInfo(deviceData);
-    const { resources: _legacyDeviceResources, ...releaseScopedData } =
-      enrichedData as typeof enrichedData & {
-        resources?: unknown;
-      };
-    const releases = releaseScopedData['firmware-v1'];
+    const releases = enrichedData['firmware-v1'];
     if (!Array.isArray(releases)) {
-      return releaseScopedData;
+      return enrichedData;
     }
+    const latestRelease = findLatestRelease(releases);
 
     return {
-      ...releaseScopedData,
+      ...enrichedData,
       'firmware-v1': releases.map(release => {
         const { resources: rawResources, ...releaseWithoutResources } = release;
         try {
           const resources = parseProtocolV2Resources(rawResources);
-          return resources
-            ? {
-                ...releaseWithoutResources,
-                resources,
-              }
-            : releaseWithoutResources;
+          return {
+            ...releaseWithoutResources,
+            ...(resources ? { resources } : undefined),
+          };
         } catch (error) {
-          const resourcesError = error instanceof Error ? error : new Error(String(error));
-          onResourcesConfigError(resourcesError);
-          Log.warn(`[DataConfig] Ignoring invalid ${deviceName} release resources config:`, error);
+          if (release === latestRelease) {
+            onResourcesError(error instanceof Error ? error : new Error(String(error)));
+          }
           return releaseWithoutResources;
         }
       }),
@@ -507,11 +502,15 @@ export default class DataManager {
   }
 
   private static applyRemoteConfig(data: RemoteConfigResponse) {
-    const pro2Config = this.enrichProtocolV2FirmwareReleaseInfo(data.pro2, 'Pro2', error => {
-      this.protocolV2ResourcesConfigError ??= error;
+    const pro2Config = this.enrichProtocolV2FirmwareReleaseInfo(data.pro2, error => {
+      // Firmware resource metadata is not required for base communication. If the
+      // The selected release is incomplete, so disable its resource update only.
+      this.protocolV2ResourcesConfigError = error;
+      Log.warn('[DataConfig] Ignoring invalid Pro2 release resources config:', error);
     });
-    const neoConfig = this.enrichProtocolV2FirmwareReleaseInfo(data.neo, 'Neo', error => {
-      this.protocolV2NeoResourcesConfigError ??= error;
+    const neoConfig = this.enrichProtocolV2FirmwareReleaseInfo(data.neo, error => {
+      this.protocolV2NeoResourcesConfigError = error;
+      Log.warn('[DataConfig] Ignoring invalid Neo release resources config:', error);
     });
     this.deviceMap = {
       [EDeviceType.Classic]: this.enrichFirmwareReleaseInfo(data.classic),
@@ -599,8 +598,8 @@ export default class DataManager {
     this.lastCheckTimestamp = getTimeStamp();
   }
 
-  static getProtocolV2ResourceSource(features: Features, firmwareType: EFirmwareType) {
-    return this.getFirmwareLatestRelease(features, firmwareType)?.resources?.source;
+  static getProtocolV2ResourceSource(release: IFirmwareReleaseInfo | undefined) {
+    return release?.resources?.source;
   }
 
   static getProtobufMessages(schema: ProtobufMessageSchema = 'v1CurrentSchema'): JSON {

package/src/types/settings.ts

@@ -116,7 +116,7 @@ export type IFirmwareReleaseInfo = {
   upgradeType?: 'payload-package-set' | string;
   components?: Record<string, IProtocolV2FirmwareComponent>;
   installOrder?: string[];
-  /** Resource archive released together with this Protocol V2 firmware release. */
+  /** Protocol V2 resources matched to this firmware release. */
   resources?: IProtocolV2Resources;
   bootloaderChangelog?: {
     [k in ILocale]: string;