diff --git a/third_party/astrolabe/lib/Service/McpTokenStorage.php b/third_party/astrolabe/lib/Service/McpTokenStorage.php
index 8c36211..6e71eb3 100644
--- a/third_party/astrolabe/lib/Service/McpTokenStorage.php
+++ b/third_party/astrolabe/lib/Service/McpTokenStorage.php
@@ -217,14 +217,22 @@ class McpTokenStorage {
 					if ($newTokenData && isset($newTokenData['access_token'])) {
 						// Store refreshed token
 						// Use new refresh token if provided (rotation), otherwise keep old one
+						$now = time();
+						/** @var string $accessToken */
+						$accessToken = $newTokenData['access_token'];
+						/** @var string $refreshToken */
+						$refreshToken = $newTokenData['refresh_token'] ?? $token['refresh_token'];
+						$expiresIn = (int)($newTokenData['expires_in'] ?? 3600);
+
 						$this->storeUserToken(
 							$userId,
-							$newTokenData['access_token'],
-							$newTokenData['refresh_token'] ?? $token['refresh_token'],
-							time() + ($newTokenData['expires_in'] ?? 3600)
+							$accessToken,
+							$refreshToken,
+							$now + $expiresIn,
+							$now  // issued_at for accurate lifetime calculation
 						);
 
-						return $newTokenData['access_token'];
+						return $accessToken;
 					}
 				} catch (\Exception $e) {
 					$this->logger->error("Failed to refresh token for user $userId", [
diff --git a/third_party/astrolabe/psalm-baseline.xml b/third_party/astrolabe/psalm-baseline.xml
index 626e059..b4c0207 100644
--- a/third_party/astrolabe/psalm-baseline.xml
+++ b/third_party/astrolabe/psalm-baseline.xml
@@ -388,11 +388,6 @@
     <InvalidReturnType>
       <code><![CDATA[array|null]]></code>
     </InvalidReturnType>
-    <MixedArgument>
-      <code><![CDATA[$newTokenData['access_token']]]></code>
-      <code><![CDATA[$newTokenData['refresh_token'] ?? $token['refresh_token']]]></code>
-      <code><![CDATA[time() + ($newTokenData['expires_in'] ?? 3600)]]></code>
-    </MixedArgument>
     <MixedAssignment>
       <code><![CDATA[$newTokenData]]></code>
     </MixedAssignment>
@@ -400,11 +395,9 @@
       <code><![CDATA[string|null]]></code>
     </MixedInferredReturnType>
     <MixedOperand>
-      <code><![CDATA[$newTokenData['expires_in'] ?? 3600]]></code>
       <code><![CDATA[$token['expires_at']]]></code>
     </MixedOperand>
     <MixedReturnStatement>
-      <code><![CDATA[$newTokenData['access_token']]]></code>
       <code><![CDATA[$token['access_token']]]></code>
     </MixedReturnStatement>
     <PossiblyUnusedMethod>