intentkit 0.6.13.dev2__py3-none-any.whl → 0.8.17__py3-none-any.whl

intentkit/core/credit.py

@@ -1,10 +1,8 @@
 import logging
 from datetime import datetime
 from decimal import ROUND_HALF_UP, Decimal
-from typing import List, Optional, Tuple
 
 from epyxid import XID
-from fastapi import HTTPException
 from pydantic import BaseModel
 from sqlalchemy import desc, select
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -22,6 +20,7 @@ from intentkit.models.credit import (
     DEFAULT_PLATFORM_ACCOUNT_REFILL,
     DEFAULT_PLATFORM_ACCOUNT_REWARD,
     DEFAULT_PLATFORM_ACCOUNT_SKILL,
+    DEFAULT_PLATFORM_ACCOUNT_WITHDRAW,
     CreditAccount,
     CreditAccountTable,
     CreditDebit,
@@ -38,6 +37,7 @@ from intentkit.models.credit import (
 )
 from intentkit.models.db import get_session
 from intentkit.models.skill import Skill
+from intentkit.utils.error import IntentKitAPIError
 from intentkit.utils.slack_alert import send_slack_message
 
 logger = logging.getLogger(__name__)
@@ -49,7 +49,7 @@ FOURPLACES = Decimal("0.0001")
 async def update_credit_event_note(
     session: AsyncSession,
     event_id: str,
-    note: Optional[str] = None,
+    note: str | None = None,
 ) -> CreditEvent:
     """
     Update the note of a credit event.
@@ -71,7 +71,9 @@ async def update_credit_event_note(
     event = result.scalar_one_or_none()
 
     if not event:
-        raise HTTPException(status_code=404, detail="Credit event not found")
+        raise IntentKitAPIError(
+            status_code=404, key="CreditEventNotFound", message="Credit event not found"
+        )
 
     # Update the note
     event.note = note
@@ -86,7 +88,7 @@ async def recharge(
     user_id: str,
     amount: Decimal,
     upstream_tx_id: str,
-    note: Optional[str] = None,
+    note: str | None = None,
 ) -> CreditAccount:
     """
     Recharge credits to a user account.
@@ -117,8 +119,9 @@ async def recharge(
         session=session,
         owner_type=OwnerType.USER,
         owner_id=user_id,
-        amount=amount,
-        credit_type=CreditType.PERMANENT,  # Recharge adds to permanent credits
+        amount_details={
+            CreditType.PERMANENT: amount
+        },  # Recharge adds to permanent credits
         event_id=event_id,
     )
 
@@ -149,6 +152,9 @@ async def recharge(
         + user_account.reward_credits,
         base_amount=amount,
         base_original_amount=amount,
+        base_free_amount=Decimal("0"),  # No free credits involved in base amount
+        base_reward_amount=Decimal("0"),  # No reward credits involved in base amount
+        base_permanent_amount=amount,  # All base amount is permanent for recharge
         permanent_amount=amount,  # Set permanent_amount since this is a permanent credit
         free_amount=Decimal("0"),  # No free credits involved
         reward_amount=Decimal("0"),  # No reward credits involved
@@ -168,6 +174,9 @@ async def recharge(
         credit_debit=CreditDebit.CREDIT,
         change_amount=amount,
         credit_type=CreditType.PERMANENT,
+        free_amount=Decimal("0"),
+        reward_amount=Decimal("0"),
+        permanent_amount=amount,
     )
     session.add(user_tx)
 
@@ -180,6 +189,9 @@ async def recharge(
         credit_debit=CreditDebit.DEBIT,
         change_amount=amount,
         credit_type=CreditType.PERMANENT,
+        free_amount=Decimal("0"),
+        reward_amount=Decimal("0"),
+        permanent_amount=amount,
     )
     session.add(platform_tx)
 
@@ -202,13 +214,178 @@ async def recharge(
     return user_account
 
 
+async def withdraw(
+    session: AsyncSession,
+    agent_id: str,
+    amount: Decimal,
+    upstream_tx_id: str,
+    note: str | None = None,
+) -> CreditAccount:
+    """
+    Withdraw credits from an agent account to platform account.
+
+    Args:
+        session: Async session to use for database operations
+        agent_id: ID of the agent to withdraw from
+        amount: Amount of credits to withdraw
+        upstream_tx_id: ID of the upstream transaction
+        note: Optional note for the transaction
+
+    Returns:
+        Updated agent credit account
+    """
+    # Check for idempotency - prevent duplicate transactions
+    await CreditEvent.check_upstream_tx_id_exists(
+        session, UpstreamType.API, upstream_tx_id
+    )
+
+    if amount <= Decimal("0"):
+        raise ValueError("Withdraw amount must be positive")
+
+    # Get agent to retrieve user_id from agent.owner
+    agent = await Agent.get(agent_id)
+    if not agent:
+        raise IntentKitAPIError(
+            status_code=404, key="AgentNotFound", message="Agent not found"
+        )
+
+    if not agent.owner:
+        raise IntentKitAPIError(
+            status_code=400, key="AgentNoOwner", message="Agent has no owner"
+        )
+
+    # Get agent wallet address
+    agent_data = await AgentData.get(agent.id)
+    agent_wallet_address = agent_data.evm_wallet_address if agent_data else None
+
+    user_id = agent.owner
+
+    # Get agent account to check balance
+    agent_account = await CreditAccount.get_in_session(
+        session=session,
+        owner_type=OwnerType.AGENT,
+        owner_id=agent_id,
+    )
+
+    # Check if agent has sufficient permanent credits
+    if agent_account.credits < amount:
+        raise IntentKitAPIError(
+            status_code=400,
+            key="InsufficientBalance",
+            message=f"Insufficient balance. Available: {agent_account.credits}, Required: {amount}",
+        )
+
+    # 1. Create credit event record first to get event_id
+    event_id = str(XID())
+
+    # 2. Update agent account - deduct credits
+    updated_agent_account = await CreditAccount.deduction_in_session(
+        session=session,
+        owner_type=OwnerType.AGENT,
+        owner_id=agent_id,
+        credit_type=CreditType.PERMANENT,
+        amount=amount,
+        event_id=event_id,
+    )
+
+    # 3. Update platform withdraw account - add credits
+    platform_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_WITHDRAW,
+        amount_details={
+            CreditType.PERMANENT: amount
+        },  # Withdraw adds to platform permanent credits
+        event_id=event_id,
+    )
+
+    # 4. Create credit event record
+    event = CreditEventTable(
+        id=event_id,
+        event_type=EventType.WITHDRAW,
+        user_id=user_id,
+        upstream_type=UpstreamType.API,
+        upstream_tx_id=upstream_tx_id,
+        direction=Direction.EXPENSE,
+        account_id=updated_agent_account.id,
+        total_amount=amount,
+        credit_type=CreditType.PERMANENT,
+        credit_types=[CreditType.PERMANENT],
+        balance_after=updated_agent_account.credits
+        + updated_agent_account.free_credits
+        + updated_agent_account.reward_credits,
+        base_amount=amount,
+        base_original_amount=amount,
+        base_free_amount=Decimal("0"),  # No free credits involved in base amount
+        base_reward_amount=Decimal("0"),  # No reward credits involved in base amount
+        base_permanent_amount=amount,  # All base amount is permanent for withdraw
+        permanent_amount=amount,  # Set permanent_amount since this is a permanent credit
+        free_amount=Decimal("0"),  # No free credits involved
+        reward_amount=Decimal("0"),  # No reward credits involved
+        agent_wallet_address=agent_wallet_address,  # Include agent wallet address
+        note=note,
+    )
+    session.add(event)
+    await session.flush()
+
+    # 5. Create credit transaction records
+    # 5.1 Agent account transaction (debit)
+    agent_tx = CreditTransactionTable(
+        id=str(XID()),
+        account_id=updated_agent_account.id,
+        event_id=event_id,
+        tx_type=TransactionType.WITHDRAW,
+        credit_debit=CreditDebit.DEBIT,
+        change_amount=amount,
+        credit_type=CreditType.PERMANENT,
+        free_amount=Decimal("0"),
+        reward_amount=Decimal("0"),
+        permanent_amount=amount,
+    )
+    session.add(agent_tx)
+
+    # 5.2 Platform withdraw account transaction (credit)
+    platform_tx = CreditTransactionTable(
+        id=str(XID()),
+        account_id=platform_account.id,
+        event_id=event_id,
+        tx_type=TransactionType.WITHDRAW,
+        credit_debit=CreditDebit.CREDIT,
+        change_amount=amount,
+        credit_type=CreditType.PERMANENT,
+        free_amount=Decimal("0"),
+        reward_amount=Decimal("0"),
+        permanent_amount=amount,
+    )
+    session.add(platform_tx)
+
+    # Commit all changes
+    await session.commit()
+
+    # Send Slack notification for withdraw
+    try:
+        send_slack_message(
+            f"💸 **Credit Withdraw**\n"
+            f"• Agent ID: `{agent_id}`\n"
+            f"• User ID: `{user_id}`\n"
+            f"• Amount: `{amount}` credits\n"
+            f"• Transaction ID: `{upstream_tx_id}`\n"
+            f"• New Balance: `{updated_agent_account.credits}` credits\n"
+            f"• Note: {note or 'N/A'}"
+        )
+    except Exception as e:
+        logger.error(f"Failed to send Slack notification for withdraw: {str(e)}")
+
+    return updated_agent_account
+
+
 async def reward(
     session: AsyncSession,
     user_id: str,
     amount: Decimal,
     upstream_tx_id: str,
-    note: Optional[str] = None,
-    reward_type: Optional[RewardType] = RewardType.REWARD,
+    note: str | None = None,
+    reward_type: RewardType | None = RewardType.REWARD,
 ) -> CreditAccount:
     """
     Reward a user account with reward credits.
@@ -239,8 +416,7 @@ async def reward(
         session=session,
         owner_type=OwnerType.USER,
         owner_id=user_id,
-        amount=amount,
-        credit_type=CreditType.REWARD,  # Reward adds to reward credits
+        amount_details={CreditType.REWARD: amount},  # Reward adds to reward credits
         event_id=event_id,
     )
 
@@ -271,6 +447,11 @@ async def reward(
         + user_account.reward_credits,
         base_amount=amount,
         base_original_amount=amount,
+        base_free_amount=Decimal("0"),  # No free credits involved in base amount
+        base_reward_amount=amount,  # All base amount is reward for reward events
+        base_permanent_amount=Decimal(
+            "0"
+        ),  # No permanent credits involved in base amount
         reward_amount=amount,  # Set reward_amount since this is a reward credit
         free_amount=Decimal("0"),  # No free credits involved
         permanent_amount=Decimal("0"),  # No permanent credits involved
@@ -290,6 +471,9 @@ async def reward(
         credit_debit=CreditDebit.CREDIT,
         change_amount=amount,
         credit_type=CreditType.REWARD,
+        free_amount=Decimal("0"),
+        reward_amount=amount,
+        permanent_amount=Decimal("0"),
     )
     session.add(user_tx)
 
@@ -302,6 +486,9 @@ async def reward(
         credit_debit=CreditDebit.DEBIT,
         change_amount=amount,
         credit_type=CreditType.REWARD,
+        free_amount=Decimal("0"),
+        reward_amount=amount,
+        permanent_amount=Decimal("0"),
     )
     session.add(platform_tx)
 
@@ -375,8 +562,7 @@ async def adjustment(
             session=session,
             owner_type=OwnerType.USER,
             owner_id=user_id,
-            amount=abs_amount,
-            credit_type=credit_type,
+            amount_details={credit_type: abs_amount},
             event_id=event_id,
         )
     else:
@@ -407,8 +593,7 @@ async def adjustment(
             session=session,
             owner_type=OwnerType.PLATFORM,
             owner_id=DEFAULT_PLATFORM_ACCOUNT_ADJUSTMENT,
-            amount=abs_amount,
-            credit_type=credit_type,
+            amount_details={credit_type: abs_amount},
             event_id=event_id,
         )
 
@@ -441,6 +626,9 @@ async def adjustment(
         + user_account.reward_credits,
         base_amount=abs_amount,
         base_original_amount=abs_amount,
+        base_free_amount=free_amount,
+        base_reward_amount=reward_amount,
+        base_permanent_amount=permanent_amount,
         free_amount=free_amount,
         reward_amount=reward_amount,
         permanent_amount=permanent_amount,
@@ -460,6 +648,9 @@ async def adjustment(
         credit_debit=credit_debit_user,
         change_amount=abs_amount,
         credit_type=credit_type,
+        free_amount=free_amount,
+        reward_amount=reward_amount,
+        permanent_amount=permanent_amount,
     )
     session.add(user_tx)
 
@@ -472,6 +663,9 @@ async def adjustment(
         credit_debit=credit_debit_platform,
         change_amount=abs_amount,
         credit_type=credit_type,
+        free_amount=free_amount,
+        reward_amount=reward_amount,
+        permanent_amount=permanent_amount,
     )
     session.add(platform_tx)
 
@@ -484,8 +678,8 @@ async def adjustment(
 async def update_daily_quota(
     session: AsyncSession,
     user_id: str,
-    free_quota: Optional[Decimal] = None,
-    refill_amount: Optional[Decimal] = None,
+    free_quota: Decimal | None = None,
+    refill_amount: Decimal | None = None,
     upstream_tx_id: str = "",
     note: str = "",
 ) -> CreditAccount:
@@ -511,11 +705,11 @@ async def update_daily_quota(
 async def list_credit_events_by_user(
     session: AsyncSession,
     user_id: str,
-    direction: Optional[Direction] = None,
-    cursor: Optional[str] = None,
+    direction: Direction | None = None,
+    cursor: str | None = None,
     limit: int = 20,
-    event_type: Optional[EventType] = None,
-) -> Tuple[List[CreditEvent], Optional[str], bool]:
+    event_type: EventType | None = None,
+) -> tuple[list[CreditEvent], str | None, bool]:
     """
     List credit events for a user account with cursor pagination.
 
@@ -576,13 +770,13 @@ async def list_credit_events_by_user(
 
 async def list_credit_events(
     session: AsyncSession,
-    direction: Optional[Direction] = Direction.EXPENSE,
-    cursor: Optional[str] = None,
+    direction: Direction | None = Direction.EXPENSE,
+    cursor: str | None = None,
     limit: int = 20,
-    event_type: Optional[EventType] = None,
-    start_at: Optional[datetime] = None,
-    end_at: Optional[datetime] = None,
-) -> Tuple[List[CreditEvent], Optional[str], bool]:
+    event_type: EventType | None = None,
+    start_at: datetime | None = None,
+    end_at: datetime | None = None,
+) -> tuple[list[CreditEvent], str | None, bool]:
     """
     List all credit events with cursor pagination.
 
@@ -646,9 +840,9 @@ async def list_credit_events(
 async def list_fee_events_by_agent(
     session: AsyncSession,
     agent_id: str,
-    cursor: Optional[str] = None,
+    cursor: str | None = None,
     limit: int = 20,
-) -> Tuple[List[CreditEvent], Optional[str], bool]:
+) -> tuple[list[CreditEvent], str | None, bool]:
     """
     List fee events for an agent with cursor pagination.
     These events represent income for the agent from users' expenses.
@@ -728,9 +922,10 @@ async def fetch_credit_event_by_upstream_tx_id(
 
     # Raise 404 if not found
     if not result:
-        raise HTTPException(
+        raise IntentKitAPIError(
             status_code=404,
-            detail=f"Credit event with upstream_tx_id '{upstream_tx_id}' not found",
+            key="CreditEventNotFound",
+            message=f"Credit event with upstream_tx_id '{upstream_tx_id}' not found",
         )
 
     # Convert to Pydantic model and return
@@ -752,7 +947,7 @@ async def fetch_credit_event_by_id(
         The credit event if found.
 
     Raises:
-        HTTPException: If the credit event is not found.
+        IntentKitAPIError: If the credit event is not found.
     """
     # Build the query to find the event by ID
     stmt = select(CreditEventTable).where(CreditEventTable.id == event_id)
@@ -762,9 +957,10 @@ async def fetch_credit_event_by_id(
 
     # Raise 404 if not found
     if not result:
-        raise HTTPException(
+        raise IntentKitAPIError(
             status_code=404,
-            detail=f"Credit event with ID '{event_id}' not found",
+            key="CreditEventNotFound",
+            message=f"Credit event with ID '{event_id}' not found",
         )
 
     # Convert to Pydantic model and return
@@ -842,34 +1038,7 @@ async def expense_message(
             session=session, id=agent.id, amount=details.get(CreditType.FREE)
         )
 
-    # 3. Update fee account - add credits
-    message_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_MESSAGE,
-        credit_type=CreditType.PERMANENT,
-        amount=base_amount,
-        event_id=event_id,
-    )
-    platform_fee_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
-        credit_type=CreditType.PERMANENT,
-        amount=fee_platform_amount,
-        event_id=event_id,
-    )
-    if fee_agent_amount > 0:
-        agent_account = await CreditAccount.income_in_session(
-            session=session,
-            owner_type=OwnerType.AGENT,
-            owner_id=agent.id,
-            credit_type=CreditType.REWARD,
-            amount=fee_agent_amount,
-            event_id=event_id,
-        )
-
-    # 4. Create credit event record
+    # 3. Calculate detailed amounts for fees based on user payment details
     # Set the appropriate credit amount field based on credit type
     free_amount = details.get(CreditType.FREE, Decimal("0"))
     reward_amount = details.get(CreditType.REWARD, Decimal("0"))
@@ -925,6 +1094,52 @@ async def expense_message(
             fee_agent_amount - fee_agent_free_amount - fee_agent_reward_amount
         ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
+    # Calculate base amounts by credit type using subtraction method
+    # This ensures that: permanent_amount = base_permanent_amount + fee_platform_permanent_amount + fee_agent_permanent_amount
+    base_free_amount = free_amount - fee_platform_free_amount - fee_agent_free_amount
+    base_reward_amount = (
+        reward_amount - fee_platform_reward_amount - fee_agent_reward_amount
+    )
+    base_permanent_amount = (
+        permanent_amount - fee_platform_permanent_amount - fee_agent_permanent_amount
+    )
+
+    # 4. Update fee account - add credits with detailed amounts
+    message_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_MESSAGE,
+        amount_details={
+            CreditType.FREE: base_free_amount,
+            CreditType.REWARD: base_reward_amount,
+            CreditType.PERMANENT: base_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    platform_fee_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
+        amount_details={
+            CreditType.FREE: fee_platform_free_amount,
+            CreditType.REWARD: fee_platform_reward_amount,
+            CreditType.PERMANENT: fee_platform_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    if fee_agent_amount > 0:
+        agent_account = await CreditAccount.income_in_session(
+            session=session,
+            owner_type=OwnerType.AGENT,
+            owner_id=agent.id,
+            amount_details={
+                CreditType.FREE: fee_agent_free_amount,
+                CreditType.REWARD: fee_agent_reward_amount,
+                CreditType.PERMANENT: fee_agent_permanent_amount,
+            },
+            event_id=event_id,
+        )
+
     # Get agent wallet address
     agent_data = await AgentData.get(agent.id)
     agent_wallet_address = agent_data.evm_wallet_address if agent_data else None
@@ -949,6 +1164,9 @@ async def expense_message(
         + user_account.reward_credits,
         base_amount=base_amount,
         base_original_amount=base_original_amount,
+        base_free_amount=base_free_amount,
+        base_reward_amount=base_reward_amount,
+        base_permanent_amount=base_permanent_amount,
         base_llm_amount=base_llm_amount,
         fee_platform_amount=fee_platform_amount,
         fee_platform_free_amount=fee_platform_free_amount,
@@ -977,6 +1195,9 @@ async def expense_message(
         credit_debit=CreditDebit.DEBIT,
         change_amount=total_amount,
         credit_type=credit_type,
+        free_amount=free_amount,
+        reward_amount=reward_amount,
+        permanent_amount=permanent_amount,
     )
     session.add(user_tx)
 
@@ -989,6 +1210,9 @@ async def expense_message(
         credit_debit=CreditDebit.CREDIT,
         change_amount=base_amount,
         credit_type=credit_type,
+        free_amount=base_free_amount,
+        reward_amount=base_reward_amount,
+        permanent_amount=base_permanent_amount,
     )
     session.add(message_tx)
 
@@ -1001,6 +1225,9 @@ async def expense_message(
         credit_debit=CreditDebit.CREDIT,
         change_amount=fee_platform_amount,
         credit_type=credit_type,
+        free_amount=fee_platform_free_amount,
+        reward_amount=fee_platform_reward_amount,
+        permanent_amount=fee_platform_permanent_amount,
     )
     session.add(platform_tx)
 
@@ -1014,6 +1241,9 @@ async def expense_message(
             credit_debit=CreditDebit.CREDIT,
             change_amount=fee_agent_amount,
             credit_type=credit_type,
+            free_amount=fee_agent_free_amount,
+            reward_amount=fee_agent_reward_amount,
+            permanent_amount=fee_agent_permanent_amount,
         )
         session.add(agent_tx)
 
@@ -1170,43 +1400,7 @@ async def expense_skill(
             session=session, id=agent.id, amount=details[CreditType.FREE]
         )
 
-    # 3. Update fee account - add credits
-    skill_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_SKILL,
-        credit_type=CreditType.PERMANENT,
-        amount=skill_cost_info.base_amount,
-        event_id=event_id,
-    )
-    platform_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
-        credit_type=CreditType.PERMANENT,
-        amount=skill_cost_info.fee_platform_amount,
-        event_id=event_id,
-    )
-    if skill_cost_info.fee_dev_amount > 0:
-        dev_account = await CreditAccount.income_in_session(
-            session=session,
-            owner_type=skill_cost_info.fee_dev_user_type,
-            owner_id=skill_cost_info.fee_dev_user,
-            credit_type=CreditType.REWARD,  # put dev fee in reward
-            amount=skill_cost_info.fee_dev_amount,
-            event_id=event_id,
-        )
-    if skill_cost_info.fee_agent_amount > 0:
-        agent_account = await CreditAccount.income_in_session(
-            session=session,
-            owner_type=OwnerType.AGENT,
-            owner_id=agent.id,
-            credit_type=CreditType.REWARD,
-            amount=skill_cost_info.fee_agent_amount,
-            event_id=event_id,
-        )
-
-    # 4. Create credit event record
+    # 3. Calculate detailed amounts for fees
     # Set the appropriate credit amount field based on credit type
     free_amount = details.get(CreditType.FREE, Decimal("0"))
     reward_amount = details.get(CreditType.REWARD, Decimal("0"))
@@ -1306,6 +1500,78 @@ async def expense_skill(
             skill_cost_info.fee_dev_amount - fee_dev_free_amount - fee_dev_reward_amount
         ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
+    # Calculate base amounts by credit type using subtraction method
+    base_free_amount = (
+        free_amount
+        - fee_platform_free_amount
+        - fee_agent_free_amount
+        - fee_dev_free_amount
+    )
+
+    base_reward_amount = (
+        reward_amount
+        - fee_platform_reward_amount
+        - fee_agent_reward_amount
+        - fee_dev_reward_amount
+    )
+
+    base_permanent_amount = (
+        permanent_amount
+        - fee_platform_permanent_amount
+        - fee_agent_permanent_amount
+        - fee_dev_permanent_amount
+    )
+
+    # 4. Update fee account - add credits
+    skill_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_SKILL,
+        amount_details={
+            CreditType.FREE: base_free_amount,
+            CreditType.REWARD: base_reward_amount,
+            CreditType.PERMANENT: base_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    platform_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
+        amount_details={
+            CreditType.FREE: fee_platform_free_amount,
+            CreditType.REWARD: fee_platform_reward_amount,
+            CreditType.PERMANENT: fee_platform_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    if skill_cost_info.fee_dev_amount > 0:
+        dev_account = await CreditAccount.income_in_session(
+            session=session,
+            owner_type=skill_cost_info.fee_dev_user_type,
+            owner_id=skill_cost_info.fee_dev_user,
+            amount_details={
+                CreditType.FREE: fee_dev_free_amount,
+                CreditType.REWARD: fee_dev_reward_amount,
+                CreditType.PERMANENT: fee_dev_permanent_amount,
+            },
+            event_id=event_id,
+        )
+    if skill_cost_info.fee_agent_amount > 0:
+        agent_account = await CreditAccount.income_in_session(
+            session=session,
+            owner_type=OwnerType.AGENT,
+            owner_id=agent.id,
+            amount_details={
+                CreditType.FREE: fee_agent_free_amount,
+                CreditType.REWARD: fee_agent_reward_amount,
+                CreditType.PERMANENT: fee_agent_permanent_amount,
+            },
+            event_id=event_id,
+        )
+
+    # 5. Create credit event record
+
     # Get agent wallet address
     agent_data = await AgentData.get(agent.id)
     agent_wallet_address = agent_data.evm_wallet_address if agent_data else None
@@ -1332,6 +1598,9 @@ async def expense_skill(
         base_amount=skill_cost_info.base_amount,
         base_original_amount=skill_cost_info.base_original_amount,
         base_skill_amount=skill_cost_info.base_skill_amount,
+        base_free_amount=base_free_amount,
+        base_reward_amount=base_reward_amount,
+        base_permanent_amount=base_permanent_amount,
         fee_platform_amount=skill_cost_info.fee_platform_amount,
         fee_platform_free_amount=fee_platform_free_amount,
         fee_platform_reward_amount=fee_platform_reward_amount,
@@ -1366,6 +1635,9 @@ async def expense_skill(
         credit_debit=CreditDebit.DEBIT,
         change_amount=skill_cost_info.total_amount,
         credit_type=credit_type,
+        free_amount=free_amount,
+        reward_amount=reward_amount,
+        permanent_amount=permanent_amount,
     )
     session.add(user_tx)
 
@@ -1378,6 +1650,9 @@ async def expense_skill(
         credit_debit=CreditDebit.CREDIT,
         change_amount=skill_cost_info.base_amount,
         credit_type=credit_type,
+        free_amount=base_free_amount,
+        reward_amount=base_reward_amount,
+        permanent_amount=base_permanent_amount,
     )
     session.add(skill_tx)
 
@@ -1390,6 +1665,9 @@ async def expense_skill(
         credit_debit=CreditDebit.CREDIT,
         change_amount=skill_cost_info.fee_platform_amount,
         credit_type=credit_type,
+        free_amount=fee_platform_free_amount,
+        reward_amount=fee_platform_reward_amount,
+        permanent_amount=fee_platform_permanent_amount,
     )
     session.add(platform_tx)
 
@@ -1403,6 +1681,9 @@ async def expense_skill(
             credit_debit=CreditDebit.CREDIT,
             change_amount=skill_cost_info.fee_dev_amount,
             credit_type=CreditType.REWARD,
+            free_amount=fee_dev_free_amount,
+            reward_amount=fee_dev_reward_amount,
+            permanent_amount=fee_dev_permanent_amount,
         )
         session.add(dev_tx)
 
@@ -1416,6 +1697,9 @@ async def expense_skill(
             credit_debit=CreditDebit.CREDIT,
             change_amount=skill_cost_info.fee_agent_amount,
             credit_type=credit_type,
+            free_amount=fee_agent_free_amount,
+            reward_amount=fee_agent_reward_amount,
+            permanent_amount=fee_agent_permanent_amount,
         )
         session.add(agent_tx)
 
@@ -1447,7 +1731,7 @@ async def refill_free_credits_for_account(
     # If adding refill_amount would exceed free_quota, only add what's needed to reach free_quota
     amount_to_add = min(
         account.refill_amount, account.free_quota - account.free_credits
-    )
+    ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
     if amount_to_add <= Decimal("0"):
         return  # Nothing to add
@@ -1460,8 +1744,7 @@ async def refill_free_credits_for_account(
         session=session,
         owner_type=account.owner_type,
         owner_id=account.owner_id,
-        amount=amount_to_add,
-        credit_type=CreditType.FREE,
+        amount_details={CreditType.FREE: amount_to_add},
         event_id=event_id,
     )
 
@@ -1492,6 +1775,9 @@ async def refill_free_credits_for_account(
         + updated_account.reward_credits,
         base_amount=amount_to_add,
         base_original_amount=amount_to_add,
+        base_free_amount=amount_to_add,
+        base_reward_amount=Decimal("0"),
+        base_permanent_amount=Decimal("0"),
         free_amount=amount_to_add,  # Set free_amount since this is a free credit refill
         reward_amount=Decimal("0"),  # No reward credits involved
         permanent_amount=Decimal("0"),  # No permanent credits involved
@@ -1511,6 +1797,9 @@ async def refill_free_credits_for_account(
         credit_debit=CreditDebit.CREDIT,
         change_amount=amount_to_add,
         credit_type=CreditType.FREE,
+        free_amount=amount_to_add,
+        reward_amount=Decimal("0"),
+        permanent_amount=Decimal("0"),
     )
     session.add(user_tx)
 
@@ -1523,6 +1812,9 @@ async def refill_free_credits_for_account(
         credit_debit=CreditDebit.DEBIT,
         change_amount=amount_to_add,
         credit_type=CreditType.FREE,
+        free_amount=amount_to_add,
+        reward_amount=Decimal("0"),
+        permanent_amount=Decimal("0"),
     )
     session.add(platform_tx)
 
@@ -1636,38 +1928,12 @@ async def expense_summarize(
             session=session, id=agent.id, amount=details.get(CreditType.FREE)
         )
 
-    # 3. Update fee account - add credits
-    memory_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_MEMORY,
-        credit_type=CreditType.PERMANENT,
-        amount=base_amount,
-        event_id=event_id,
-    )
-    platform_fee_account = await CreditAccount.income_in_session(
-        session=session,
-        owner_type=OwnerType.PLATFORM,
-        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
-        credit_type=CreditType.PERMANENT,
-        amount=fee_platform_amount,
-        event_id=event_id,
-    )
-    if fee_agent_amount > 0:
-        agent_account = await CreditAccount.income_in_session(
-            session=session,
-            owner_type=OwnerType.AGENT,
-            owner_id=agent.id,
-            credit_type=CreditType.REWARD,
-            amount=fee_agent_amount,
-            event_id=event_id,
-        )
-
-    # 4. Create credit event record
+    # 3. Calculate fee amounts by credit type before income_in_session calls
     # Set the appropriate credit amount field based on credit type
     free_amount = details.get(CreditType.FREE, Decimal("0"))
     reward_amount = details.get(CreditType.REWARD, Decimal("0"))
     permanent_amount = details.get(CreditType.PERMANENT, Decimal("0"))
+
     if CreditType.PERMANENT in details:
         credit_type = CreditType.PERMANENT
     elif CreditType.REWARD in details:
@@ -1719,6 +1985,55 @@ async def expense_summarize(
             fee_agent_amount - fee_agent_free_amount - fee_agent_reward_amount
         ).quantize(FOURPLACES, rounding=ROUND_HALF_UP)
 
+    # Calculate base amounts by credit type using subtraction method
+    base_free_amount = free_amount - fee_platform_free_amount - fee_agent_free_amount
+
+    base_reward_amount = (
+        reward_amount - fee_platform_reward_amount - fee_agent_reward_amount
+    )
+
+    base_permanent_amount = (
+        permanent_amount - fee_platform_permanent_amount - fee_agent_permanent_amount
+    )
+
+    # 4. Update fee account - add credits
+    memory_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_MEMORY,
+        amount_details={
+            CreditType.FREE: base_free_amount,
+            CreditType.REWARD: base_reward_amount,
+            CreditType.PERMANENT: base_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    platform_fee_account = await CreditAccount.income_in_session(
+        session=session,
+        owner_type=OwnerType.PLATFORM,
+        owner_id=DEFAULT_PLATFORM_ACCOUNT_FEE,
+        amount_details={
+            CreditType.FREE: fee_platform_free_amount,
+            CreditType.REWARD: fee_platform_reward_amount,
+            CreditType.PERMANENT: fee_platform_permanent_amount,
+        },
+        event_id=event_id,
+    )
+    if fee_agent_amount > 0:
+        agent_account = await CreditAccount.income_in_session(
+            session=session,
+            owner_type=OwnerType.AGENT,
+            owner_id=agent.id,
+            amount_details={
+                CreditType.FREE: fee_agent_free_amount,
+                CreditType.REWARD: fee_agent_reward_amount,
+                CreditType.PERMANENT: fee_agent_permanent_amount,
+            },
+            event_id=event_id,
+        )
+
+    # 5. Create credit event record
+
     # Get agent wallet address
     agent_data = await AgentData.get(agent.id)
     agent_wallet_address = agent_data.evm_wallet_address if agent_data else None
@@ -1744,6 +2059,9 @@ async def expense_summarize(
         base_amount=base_amount,
         base_original_amount=base_original_amount,
         base_llm_amount=base_llm_amount,
+        base_free_amount=base_free_amount,
+        base_reward_amount=base_reward_amount,
+        base_permanent_amount=base_permanent_amount,
         fee_platform_amount=fee_platform_amount,
         fee_platform_free_amount=fee_platform_free_amount,
         fee_platform_reward_amount=fee_platform_reward_amount,
@@ -1769,6 +2087,9 @@ async def expense_summarize(
         credit_debit=CreditDebit.DEBIT,
         change_amount=total_amount,
         credit_type=credit_type,
+        free_amount=free_amount,
+        reward_amount=reward_amount,
+        permanent_amount=permanent_amount,
     )
     session.add(user_tx)
 
@@ -1781,6 +2102,9 @@ async def expense_summarize(
         credit_debit=CreditDebit.CREDIT,
         change_amount=base_amount,
         credit_type=credit_type,
+        free_amount=base_free_amount,
+        reward_amount=base_reward_amount,
+        permanent_amount=base_permanent_amount,
     )
     session.add(memory_tx)
 
@@ -1793,6 +2117,9 @@ async def expense_summarize(
         credit_debit=CreditDebit.CREDIT,
         change_amount=fee_platform_amount,
         credit_type=credit_type,
+        free_amount=fee_platform_free_amount,
+        reward_amount=fee_platform_reward_amount,
+        permanent_amount=fee_platform_permanent_amount,
     )
     session.add(platform_tx)
 
@@ -1806,6 +2133,9 @@ async def expense_summarize(
             credit_debit=CreditDebit.CREDIT,
             change_amount=fee_agent_amount,
             credit_type=CreditType.REWARD,
+            free_amount=fee_agent_free_amount,
+            reward_amount=fee_agent_reward_amount,
+            permanent_amount=fee_agent_permanent_amount,
         )
         session.add(agent_tx)