Merge origin/release/test and preserve storage rent checks with request unlock

tests/outbound-lifecycle.test.mjs

@@ -7,7 +7,7 @@ const deferred = () => { let resolve; const promise = new Promise(done => { reso
 function page(overrides = {}) {
   const calls = []
   const deps = { PortalHeader: {}, ScanTargetInput: {}, session: { currentUser: {} }, fulfillment: { outbound: { packages: 1, currentTaskNo: 'OLD-TASK' } },
-    updateFulfillmentDraft() {}, fulfillmentIdempotencyKey: () => ({ value: 'key', signature: 'signature' }), releaseFulfillmentKey() {},
+    updateFulfillmentDraft() {}, fulfillmentIdempotencyKey: () => ({ value: 'key' }),
     playErrorSound() {}, playSuccessSound() {}, pickOutboundPallet: async () => calls.push('pick'), completeOutboundTask: async () => calls.push('complete'),
     listCargoDiscardPhotos: async () => [], getOutboundTask: async () => ({ taskNo: 'TASK', status: 'COMPLETED', items: [] }), normalizeCargoDiscardTask: value => value,
     ...overrides }
@@ -257,19 +257,19 @@ test('partial bound pallet confirmation sends only selected marks and preserves
   assert.deepEqual(payload, ['CD-P', 'P-1', [{ itemId: 'sku', actualPackages: 1 }], ['101'], ['BOX-2'], false, { idempotencyKey: 'key' }])
 })
 
-test('discard confirmation retains its original request key until a definite successful response', async () => {
-  const released = []; const submitted = []
+test('discard confirmation preserves inputs after preflight failure and starts a new checked request', async () => {
+  const submitted = []
   const retry = deferred()
   let attempt = 0
   const { vm } = page({
     confirmCargoDiscard: async (...args) => { submitted.push(args); if (++attempt === 1) throw new Error('费用确认中'); await retry.promise },
-    releaseFulfillmentKey: (...args) => released.push(args), listCargoDiscardTasks: async () => []
+    fulfillmentIdempotencyKey: () => ({ value: `discard-${attempt}` }), listCargoDiscardTasks: async () => []
   })
   vm.discardCurrent = { discardNo: 'CD-RETRY' }
   vm.discardTask = { palletNo: 'P-1', status: 'PENDING', skus: [{ itemId: 'sku', plannedPackages: 1 }] }
   vm.discardActuals = { sku: 1 }; vm.discardPhotoReady = true; vm.discardPhotos = [{ fileId: '101' }]
   await vm.confirmDiscard()
-  assert.equal(released.length, 0)
+  assert.equal(vm.discardBusy, false)
   assert.ok(vm.discardTask)
   assert.equal(vm.error.message, '费用确认中')
   vm.successMessage = '上次作业已完成'
@@ -277,8 +277,9 @@ test('discard confirmation retains its original request key until a definite suc
   assert.equal(vm.error, null)
   assert.equal(vm.successMessage, '')
   retry.resolve(); await retried
-  assert.deepEqual(submitted[0], submitted[1])
-  assert.deepEqual(released, [['outbound', 'signature']])
+  assert.deepEqual(submitted[0].slice(0, 6), submitted[1].slice(0, 6))
+  assert.notEqual(submitted[0][6].idempotencyKey, submitted[1][6].idempotencyKey)
+  assert.equal(vm.discardBusy, false)
   assert.equal(vm.error, null)
   assert.match(vm.successMessage, /已完成/)
 })