feat(recipes): add KIOU 1.1.0 target and per-version RVA headers

Account/Persistence.m

@@ -42,7 +42,7 @@ void KIOUSaveAccount(NSString *uuid, NSString *userName, NSString *openId,
                    NSString *userId, NSString *distinctId) {
     if (userId.length == 0) {
         IPALog([NSString stringWithFormat:
-                  @"[ACCOUNT] save skipped: missing userId (uuid=%@ userName=%@)",
+                  @"[ACCOUNT] skipped: reason=missingUserId uuid=%@ userName=%@",
                   uuid ?: @"", userName ?: @""]);
         return;
     }
@@ -59,6 +59,7 @@ void KIOUSaveAccount(NSString *uuid, NSString *userName, NSString *openId,
         kFieldDistinctId: distinctId ?: @"",
         kFieldSavedAt:    @((NSInteger)[[NSDate date] timeIntervalSince1970]),
     };
+    BOOL noopMerge = NO;
     for (NSDictionary *e in existing) {
         NSString *eId = e[kFieldUserId];
         if ([eId isKindOfClass:[NSString class]] && [eId isEqualToString:userId]) {
@@ -67,6 +68,15 @@ void KIOUSaveAccount(NSString *uuid, NSString *userName, NSString *openId,
             if (userName.length   == 0) merged[kFieldUserName]   = e[kFieldUserName]   ?: @"";
             if (openId.length     == 0) merged[kFieldOpenId]     = e[kFieldOpenId]     ?: @"";
             if (distinctId.length == 0) merged[kFieldDistinctId] = e[kFieldDistinctId] ?: @"";
+            // Detect a no-op re-save: every non-timestamp field already
+            // matches. Common when RunLoginSequence and AccountExists both
+            // fire for the same account within a few dozen ms.
+            noopMerge =
+                [merged[kFieldUuid]       isEqual:e[kFieldUuid]] &&
+                [merged[kFieldUserName]   isEqual:e[kFieldUserName]] &&
+                [merged[kFieldOpenId]     isEqual:e[kFieldOpenId]] &&
+                [merged[kFieldUserId]     isEqual:e[kFieldUserId]] &&
+                [merged[kFieldDistinctId] isEqual:e[kFieldDistinctId]];
             [next addObject:merged];
             replaced = YES;
         } else {
@@ -75,9 +85,11 @@ void KIOUSaveAccount(NSString *uuid, NSString *userName, NSString *openId,
     }
     if (!replaced) [next addObject:fresh];
     [d setObject:next forKey:kKeyAccounts];
-    IPALog([NSString stringWithFormat:
-              @"[ACCOUNT] saved userId=%@ userName=%@ uuid=%@ total=%lu",
-              userId, userName ?: @"", uuid ?: @"", (unsigned long)next.count]);
+    if (!noopMerge) {
+        IPALog([NSString stringWithFormat:
+                  @"[ACCOUNT] saved: userId=%@ userName=%@ uuid=%@ total=%lu",
+                  userId, userName ?: @"", uuid ?: @"", (unsigned long)next.count]);
+    }
     kfPostAccountStateChanged();
 }
 
@@ -104,7 +116,7 @@ void KIOUUpdateAccountProfile(NSString *userId, NSString *openId,
     if (!found) return;
     [d setObject:next forKey:kKeyAccounts];
     IPALog([NSString stringWithFormat:
-              @"[ACCOUNT] profile updated userId=%@ openId=%@ ranks=%lu",
+              @"[ACCOUNT] updated: scope=profile userId=%@ openId=%@ ranks=%lu",
               userId, openId ?: @"", (unsigned long)ranks.count]);
     kfPostAccountStateChanged();
 }
@@ -122,7 +134,7 @@ void KIOUDeleteAccount(NSString *userId) {
     }
     [d setObject:next forKey:kKeyAccounts];
     IPALog([NSString stringWithFormat:
-              @"[ACCOUNT] deleted userId=%@ remaining=%lu",
+              @"[ACCOUNT] deleted: userId=%@ remaining=%lu",
               userId, (unsigned long)next.count]);
     kfPostAccountStateChanged();
 }
@@ -139,7 +151,7 @@ void KIOUSetActiveAccountUserId(NSString *userId) {
     } else {
         [d setObject:userId forKey:kKeyActiveUserId];
     }
-    IPALog([NSString stringWithFormat:@"[ACCOUNT] active_user_id=%@",
+    IPALog([NSString stringWithFormat:@"[ACCOUNT] applied: activeUserId=%@",
               userId.length > 0 ? userId : @"(none)"]);
     kfPostAccountStateChanged();
 }
@@ -156,7 +168,7 @@ void KIOUSetForceRegisterOnNextLaunch(bool enabled) {
     } else {
         [d removeObjectForKey:kKeyForceRegister];
     }
-    IPALog([NSString stringWithFormat:@"[ACCOUNT] force_register=%s",
+    IPALog([NSString stringWithFormat:@"[ACCOUNT] applied: forceRegister=%s",
               enabled ? "true" : "false"]);
 }
 
@@ -169,10 +181,10 @@ void KIOUSetPendingDeviceId(NSString *uuid) {
     NSUserDefaults *d = [NSUserDefaults standardUserDefaults];
     if (uuid.length == 0) {
         [d removeObjectForKey:kKeyPendingDeviceId];
-        IPALog(@"[ACCOUNT] pending_device_id cleared");
+        IPALog(@"[ACCOUNT] deleted: field=pendingDeviceId");
     } else {
         [d setObject:uuid forKey:kKeyPendingDeviceId];
-        IPALog([NSString stringWithFormat:@"[ACCOUNT] pending_device_id=%@", uuid]);
+        IPALog([NSString stringWithFormat:@"[ACCOUNT] applied: pendingDeviceId=%@", uuid]);
     }
     kfPostAccountStateChanged();
 }
@@ -186,10 +198,10 @@ void KIOUSetPendingDistinctId(NSString *uuid) {
     NSUserDefaults *d = [NSUserDefaults standardUserDefaults];
     if (uuid.length == 0) {
         [d removeObjectForKey:kKeyPendingDistinctId];
-        IPALog(@"[ACCOUNT] pending_distinct_id cleared");
+        IPALog(@"[ACCOUNT] deleted: field=pendingDistinctId");
     } else {
         [d setObject:uuid forKey:kKeyPendingDistinctId];
-        IPALog([NSString stringWithFormat:@"[ACCOUNT] pending_distinct_id=%@", uuid]);
+        IPALog([NSString stringWithFormat:@"[ACCOUNT] applied: pendingDistinctId=%@", uuid]);
     }
     kfPostAccountStateChanged();
 }
@@ -198,13 +210,13 @@ void KIOUSwitchAccount(NSString *uuid) {
     NSString *armedDistinct = KIOUPendingDistinctId();
     if (armedDistinct.length > 0) {
         IPALog([NSString stringWithFormat:
-                  @"[ACCOUNT] KIOUSwitchAccount refused: Register flow in progress "
-                  @"(pending_distinct_id=%@)", armedDistinct]);
+                  @"[ACCOUNT] skipped: op=switchAccount reason=registerInProgress "
+                  @"pendingDistinctId=%@", armedDistinct]);
         return;
     }
     KIOUSetPendingDeviceId(uuid);
     IPALog([NSString stringWithFormat:
-              @"[ACCOUNT] KIOUSwitchAccount armed pending_device_id=%@", uuid ?: @"(nil)"]);
+              @"[ACCOUNT] armed: op=switchAccount pendingDeviceId=%@", uuid ?: @"(nil)"]);
 }
 
 // ---------------------------------------------------------------------------

Hook/AccountObserve.m

@@ -1,4 +1,5 @@
 #import "KIOUHook.h"
+#import "Hook/Common.h"
 #import "Account/Persistence.h"
 #import "il2cpp.h"
 #import "logging.h"
@@ -21,11 +22,10 @@
 //   TitleMenuPopupPresenter.RunDeleteAccountSequenceAsync   (raw site, not in catalog)
 // ===========================================================================
 
-// RunReset / RunDelete are not in the catalog (not binpatched / not part
-// of the cave system); keep their RVAs local so the hook installer can
-// MSHookFunction them on JB.
-#define KF_RVA_RUN_RESET_USER_DATA_SEQ       0x5DCC204
-#define KF_RVA_RUN_DELETE_ACCOUNT_SEQ        0x5DCC2B4
+// RunReset / RunDelete have no cave (they aren't binpatched), so they are
+// JB-only MSHookFunction targets. Their addresses still come from the
+// catalog — as hook_id = -1 rows — so they track the build's target
+// version like everything else.
 
 // ---------------------------------------------------------------------------
 // Field offsets
@@ -136,12 +136,12 @@
         void *newStr = g_il2cpp_string_new(pending.UTF8String);
         if (newStr) {
             IPALog([NSString stringWithFormat:
-                      @"[ACCOUNT] RegisterUserArgs.Create distinctId → %@", pending]);
+                      @"[ACCOUNT] applied: at=RegisterUserArgs.Create field=distinctId value=%@", pending]);
             return newStr;
         }
     }
     IPALog([NSString stringWithFormat:
-              @"[ACCOUNT] RegisterUserArgs.Create userName=%@ distinctId=%@",
+              @"[ACCOUNT] fire: at=RegisterUserArgs.Create userName=%@ distinctId=%@",
               readIl2CppStr(userName) ?: @"(nil)",
               readIl2CppStr(distinctId) ?: @"(nil)"]);
     return distinctId;
@@ -163,12 +163,12 @@
         void *newStr = g_il2cpp_string_new(pending.UTF8String);
         if (newStr) {
             IPALog([NSString stringWithFormat:
-                      @"[ACCOUNT] LoginArgs.Create deviceId → %@", pending]);
+                      @"[ACCOUNT] applied: at=LoginArgs.Create field=deviceId value=%@", pending]);
             return newStr;
         }
     }
     IPALog([NSString stringWithFormat:
-              @"[ACCOUNT] LoginArgs.Create deviceId=%@ distinctId=%@",
+              @"[ACCOUNT] fire: at=LoginArgs.Create deviceId=%@ distinctId=%@",
               readIl2CppStr(deviceId) ?: @"(nil)",
               readIl2CppStr(distinctId) ?: @"(nil)"]);
     return deviceId;
@@ -197,7 +197,7 @@ static void observeRunLoginSeqCompletion(void *self) {
         NSString *userName    = readIl2CppStr(readPtr(candidate, OFF_LOGIN_REPLY_USER_NAME));
         if (!userName && !deviceId) continue;
         IPALog([NSString stringWithFormat:
-                  @"[ACCOUNT] LoginReply @0x%lx userName=%@ deviceId=%@",
+                  @"[ACCOUNT] resolved: subject=loginReply offset=0x%lx userName=%@ deviceId=%@",
                   (unsigned long)offsets[i], userName ?: @"(nil)", deviceId ?: @"(nil)"]);
 
         NSString *userId = extractJWTSub(accessToken);
@@ -218,7 +218,7 @@ void KIOUHookRunLoginSeqMoveNext(void *self, void *mi) {
         @try { s_origRunLoginSeqMoveNext(self, mi); }
         @catch (NSException *e) {
             IPALog([NSString stringWithFormat:
-                      @"[ACCOUNT] RunLoginSeq.MoveNext orig threw: %@", e]);
+                      @"[ACCOUNT] exception: at=RunLoginSeq.MoveNext error=%@", e]);
             return;
         }
     }
@@ -242,7 +242,7 @@ static void observeGetSelfProfileCompletion(void *self) {
         if (userName.length == 0 && openUserId.length == 0) continue;
 
         IPALog([NSString stringWithFormat:
-                  @"[ACCOUNT] SelfProfile @0x%lx userName=%@ openUserId=%@",
+                  @"[ACCOUNT] resolved: subject=selfProfile offset=0x%lx userName=%@ openUserId=%@",
                   (unsigned long)off, userName ?: @"(nil)", openUserId ?: @"(nil)"]);
 
         NSMutableArray<NSDictionary *> *rankDicts = [NSMutableArray array];
@@ -279,7 +279,7 @@ void KIOUHookGetSelfProfileMoveNext(void *self, void *mi) {
         @try { s_origGetSelfProfileMoveNext(self, mi); }
         @catch (NSException *e) {
             IPALog([NSString stringWithFormat:
-                      @"[ACCOUNT] GetSelfProfile.MoveNext orig threw: %@", e]);
+                      @"[ACCOUNT] exception: at=GetSelfProfile.MoveNext error=%@", e]);
             return;
         }
     }
@@ -310,14 +310,14 @@ bool KIOUHookAccountExists(void *data, void *mi) {
     if (s_origAccountExists) {
         @try { origResult = s_origAccountExists(data, mi); }
         @catch (NSException *e) {
-            IPALog([NSString stringWithFormat:@"[ACCOUNT] AccountExists orig threw: %@", e]);
+            IPALog([NSString stringWithFormat:@"[ACCOUNT] exception: at=AccountExists error=%@", e]);
         }
     }
     observeAccountExistsData(data);
     bool forceRegister = KIOUForceRegisterOnNextLaunch();
     bool result = forceRegister ? false : origResult;
     if (forceRegister) {
-        IPALog(@"[ACCOUNT] AccountExists overridden false (force_register)");
+        IPALog(@"[ACCOUNT] applied: at=AccountExists override=false reason=forceRegister");
     }
     return result;
 }
@@ -330,13 +330,13 @@ KIOUUniTaskRet KIOUHookRunResetUserDataSeq(void *ct, void *mi) {
     KIOUSetPendingDistinctId(freshUuid);
     KIOUSetPendingDeviceId(freshUuid);
     IPALog([NSString stringWithFormat:
-              @"[ACCOUNT] RunResetUserDataSequenceAsync armed fresh_uuid=%@", freshUuid]);
+              @"[ACCOUNT] armed: at=RunResetUserDataSequenceAsync freshUuid=%@", freshUuid]);
     return s_origRunResetSeq ? s_origRunResetSeq(ct, mi) : (KIOUUniTaskRet){0, 0};
 }
 
 KIOUUniTaskRet KIOUHookRunDeleteAccountSeq(void *ct, void *mi) {
     IPALog([NSString stringWithFormat:
-              @"[ACCOUNT] RunDeleteAccountSequenceAsync (active=%@)",
+              @"[ACCOUNT] fire: at=RunDeleteAccountSequenceAsync active=%@",
               KIOUActiveAccountUserId() ?: @"(none)"]);
     return s_origRunDeleteAccountSeq ? s_origRunDeleteAccountSeq(ct, mi) : (KIOUUniTaskRet){0, 0};
 }
@@ -351,21 +351,21 @@ KIOUUniTaskRet KIOUHookRunDeleteAccountSeq(void *ct, void *mi) {
 
 void KIOUNavigateToTitleScene(void) {
     if (g_unityBase == 0) {
-        IPALog(@"[ACCOUNT] KIOUNavigateToTitleScene: unityBase not yet set");
+        IPALog(@"[ACCOUNT] skipped: at=KIOUNavigateToTitleScene reason=unityBaseUnset");
         return;
     }
     uintptr_t addr = KIOUHookSiteAddr(KIOU_HOOK_NAME_BACK_TO_TITLE_RUN_ASYNC, g_unityBase);
     if (addr == 0) {
-        IPALog(@"[ACCOUNT] KIOUNavigateToTitleScene: site address unknown");
+        IPALog(@"[ACCOUNT] skipped: at=KIOUNavigateToTitleScene reason=siteAddrUnknown");
         return;
     }
     BackToTitleRunAsync_t fn = (BackToTitleRunAsync_t)addr;
     @try {
         (void)fn(NULL, NULL);
-        IPALog(@"[ACCOUNT] BackToTitleSequence.RunAsync invoked");
+        IPALog(@"[ACCOUNT] fire: at=BackToTitleSequence.RunAsync");
     } @catch (NSException *e) {
         IPALog([NSString stringWithFormat:
-                  @"[ACCOUNT] BackToTitleSequence.RunAsync threw: %@", e]);
+                  @"[ACCOUNT] exception: at=BackToTitleSequence.RunAsync error=%@", e]);
     }
 }
 
@@ -378,37 +378,42 @@ void KIOUInstallAccountObserveHook(uintptr_t unityBase) {
 
     s_origAccountExists = (AccountExists_t)
         KIOUHookInstall(KIOU_HOOK_NAME_ACCOUNT_EXISTS, (void *)KIOUHookAccountExists, unityBase);
+    KIOU_HOOK_PUBLISH_SLOT(unityBase, KIOU_HOOK_SLOT_ACCOUNT_EXISTS, KIOUHookAccountExists);
     s_origLoginArgsCreate = (LoginArgsCreate_t)
         KIOUHookInstall(KIOU_HOOK_NAME_LOGIN_ARGS_CREATE, (void *)KIOUHookLoginArgsCreate, unityBase);
+    KIOU_HOOK_PUBLISH_SLOT(unityBase, KIOU_HOOK_SLOT_LOGIN_ARGS_CREATE, KIOUHookLoginArgsCreate);
     s_origRegisterUserArgsCreate = (RegisterUserArgsCreate_t)
         KIOUHookInstall(KIOU_HOOK_NAME_REGISTER_USER_ARGS_CREATE, (void *)KIOUHookRegisterUserArgsCreate, unityBase);
+    KIOU_HOOK_PUBLISH_SLOT(unityBase, KIOU_HOOK_SLOT_REGISTER_USER_ARGS_CREATE, KIOUHookRegisterUserArgsCreate);
     s_origRunLoginSeqMoveNext = (MoveNextVoid_t)
         KIOUHookInstall(KIOU_HOOK_NAME_RUN_LOGIN_SEQ_MOVENEXT, (void *)KIOUHookRunLoginSeqMoveNext, unityBase);
+    KIOU_HOOK_PUBLISH_SLOT(unityBase, KIOU_HOOK_SLOT_RUN_LOGIN_SEQ_MOVENEXT, KIOUHookRunLoginSeqMoveNext);
     s_origGetSelfProfileMoveNext = (MoveNextVoid_t)
         KIOUHookInstall(KIOU_HOOK_NAME_GET_SELF_PROFILE_MOVENEXT, (void *)KIOUHookGetSelfProfileMoveNext, unityBase);
+    KIOU_HOOK_PUBLISH_SLOT(unityBase, KIOU_HOOK_SLOT_GET_SELF_PROFILE_MOVENEXT, KIOUHookGetSelfProfileMoveNext);
 
 #if IPA_CHINLAN
-    (void)KF_RVA_RUN_RESET_USER_DATA_SEQ;
-    (void)KF_RVA_RUN_DELETE_ACCOUNT_SEQ;
-    IPALog(@"[ACCOUNT] chinlan: catalog hooks resolved; raw-RVA hooks (Reset/Delete) skipped");
+    IPALog(@"[ACCOUNT] resolved: variant=chinlan catalogHooks=yes rawRvaHooks=skipped");
 #else
     // RunReset / RunDelete are JB-only sites (no chinlan cave for them).
     {
-        uintptr_t addr = unityBase + KF_RVA_RUN_RESET_USER_DATA_SEQ;
+        uintptr_t addr = KIOUHookSiteAddr(
+            KIOU_HOOK_NAME_RUN_RESET_USER_DATA_SEQ, unityBase);
         void *orig = NULL;
         MSHookFunction((void *)addr, (void *)KIOUHookRunResetUserDataSeq, &orig);
         s_origRunResetSeq = (RunResetSeq_t)orig;
         IPALog([NSString stringWithFormat:
-                  @"[ACCOUNT] hooked RunResetUserDataSeq @0x%lx", (unsigned long)addr]);
+                  @"[ACCOUNT] hooked: target=RunResetUserDataSeq addr=0x%lx", (unsigned long)addr]);
     }
     {
-        uintptr_t addr = unityBase + KF_RVA_RUN_DELETE_ACCOUNT_SEQ;
+        uintptr_t addr = KIOUHookSiteAddr(
+            KIOU_HOOK_NAME_RUN_DELETE_ACCOUNT_SEQ, unityBase);
         void *orig = NULL;
         MSHookFunction((void *)addr, (void *)KIOUHookRunDeleteAccountSeq, &orig);
         s_origRunDeleteAccountSeq = (RunResetSeq_t)orig;
         IPALog([NSString stringWithFormat:
-                  @"[ACCOUNT] hooked RunDeleteAccountSeq @0x%lx", (unsigned long)addr]);
+                  @"[ACCOUNT] hooked: target=RunDeleteAccountSeq addr=0x%lx", (unsigned long)addr]);
     }
-    IPALog(@"[ACCOUNT] hooks installed");
+    IPALog(@"[ACCOUNT] installed:");
 #endif
 }

Hook/AfkDisable.m

@@ -31,7 +31,8 @@ void KIOUEditorInstallAfkDisableHook(uintptr_t unityBase) {
     s_origGO_IsAfkEnabled = (GameOrchestratorIsAfkEnabled_t)KIOUHookInstall(
         KIOU_HOOK_NAME_GAME_ORCHESTRATOR_IS_AFK,
         (void *)hook_GO_IsAfkEnabled, unityBase);
+    KIOU_HOOK_PUBLISH_SLOT(unityBase, KIOU_HOOK_SLOT_GAME_ORCHESTRATOR_IS_AFK, hook_GO_IsAfkEnabled);
     IPALog([NSString stringWithFormat:
-            @"[AFK] installed: orig=%p (toggled by KIOU_FEATURE_DISABLE_AFK)",
+            @"[AFK] installed: orig=%p gate=KIOU_FEATURE_DISABLE_AFK",
             (void *)s_origGO_IsAfkEnabled]);
 }