fix: sync canonical kiro.rs settings for upload

background/kiro/publisher-kiro-rs.js

@@ -284,13 +284,6 @@
       await addLog(message, level, nodeId ? { nodeId } : {});
     }
 
-    async function getExecutionState(state = {}) {
-      if (state && typeof state === 'object' && !Array.isArray(state) && Object.keys(state).length) {
-        return state;
-      }
-      return getState();
-    }
-
     async function applyRuntimeState(currentState = {}, patch = {}) {
       const nextPatch = mergeRuntimePatch(currentState, patch);
       await setState(nextPatch);
@@ -313,7 +306,7 @@
 
     async function executeKiroUploadCredential(state = {}) {
       const nodeId = String(state?.nodeId || 'kiro-upload-credential').trim();
-      const currentState = await getExecutionState(state);
+      const currentState = await getState();
       try {
         const targetId = resolveKiroTargetId(currentState);
         const targetConfig = resolveKiroTargetConfig(currentState, targetId);

background/message-router.js

@@ -1430,21 +1430,21 @@
             || phoneSignupReloginAfterBindEmailChanged;
           const oauthFlowTimeoutDisabled = Object.prototype.hasOwnProperty.call(updates, 'oauthFlowTimeoutEnabled')
             && updates.oauthFlowTimeoutEnabled === false;
-          await setPersistentSettings(updates);
+          const canonicalSettingsUpdates = await setPersistentSettings(updates);
           const stateUpdates = {
-            ...updates,
+            ...canonicalSettingsUpdates,
             ...sessionUpdates,
             ...(oauthFlowTimeoutDisabled ? {
               oauthFlowDeadlineAt: null,
               oauthFlowDeadlineSourceUrl: null,
             } : {}),
           };
-          if (Object.prototype.hasOwnProperty.call(updates, 'activeFlowId')
+          if (Object.prototype.hasOwnProperty.call(canonicalSettingsUpdates, 'activeFlowId')
             && !Object.prototype.hasOwnProperty.call(stateUpdates, 'flowId')) {
-            stateUpdates.flowId = updates.activeFlowId;
+            stateUpdates.flowId = canonicalSettingsUpdates.activeFlowId;
           }
-          if (Object.prototype.hasOwnProperty.call(updates, 'icloudHostPreference')) {
-            const nextHostPreference = String(updates.icloudHostPreference || '').trim().toLowerCase();
+          if (Object.prototype.hasOwnProperty.call(canonicalSettingsUpdates, 'icloudHostPreference')) {
+            const nextHostPreference = String(canonicalSettingsUpdates.icloudHostPreference || '').trim().toLowerCase();
             stateUpdates.preferredIcloudHost = nextHostPreference === 'icloud.com' || nextHostPreference === 'icloud.com.cn'
               ? nextHostPreference
               : '';