@@ -24,6 +24,11 @@ public class Conversation
 
     public string Channel { get; set; } = ConversationChannel.OpenAPI;
 
+    /// <summary>
+    /// Channel id, like phone number, email address, etc.
+    /// </summary>
+    public string ChannelId { get; set; }
+
     public int DialogCount { get; set; }
 
     public List<string> Tags { get; set; } = new();
 
@@ -172,10 +172,12 @@ public async Task<Conversation> GetConversationRecordOrCreateNew(string agentId)
         {
             var state = _services.GetRequiredService<IConversationStateService>();
             var channel = state.GetState("channel");
+            var channelId = state.GetState("channel_id");
             var sess = new Conversation
             {
                 Id = _conversationId,
                 Channel = channel,
+                ChannelId = channelId,
                 AgentId = agentId
             };
             converation = await NewConversation(sess);
 
@@ -10,7 +10,7 @@ public void CreateNewConversation(Conversation conversation)
             var utcNow = DateTime.UtcNow;
             conversation.CreatedTime = utcNow;
             conversation.UpdatedTime = utcNow;
-            conversation.Tags = conversation.Tags ?? new();
+            conversation.Tags ??= new();
 
             var dir = Path.Combine(_dbSettings.FileRepository, _conversationSettings.DataDir, conversation.Id);
             if (!Directory.Exists(dir))
 
@@ -7,6 +7,7 @@ public class ConversationDocument : MongoBase
     public string? TaskId { get; set; }
     public string Title { get; set; }
     public string Channel { get; set; }
+    public string ChannelId { get; set; }
     public string Status { get; set; }
     public int DialogCount { get; set; }
     public List<string> Tags { get; set; }
 
@@ -17,6 +17,7 @@ public void CreateNewConversation(Conversation conversation)
             UserId = !string.IsNullOrEmpty(conversation.UserId) ? conversation.UserId : string.Empty,
             Title = conversation.Title,
             Channel = conversation.Channel,
+            ChannelId = conversation.ChannelId,
             TaskId = conversation.TaskId,
             Status = conversation.Status,
             Tags = conversation.Tags ?? new(),
 
@@ -108,6 +108,7 @@ private static void InitConversation(CallerMessage message, RoleDialogModel inpu
             var states = new List<MessageState>
             {
                 new("channel", ConversationChannel.Phone),
+                new("channel_id", message.From),
                 new("calling_phone", message.From)
             };
             states.AddRange(message.States.Select(kvp => new MessageState(kvp.Key, kvp.Value)));
Original file line number	Diff line number	Diff line change
`@@ -172,10 +172,12 @@ public async Task<Conversation> GetConversationRecordOrCreateNew(string agentId)`
`172`	`172`	`{`
`173`	`173`	`var state = _services.GetRequiredService<IConversationStateService>();`
`174`	`174`	`var channel = state.GetState("channel");`
	`175`	`+ var channelId = state.GetState("channel_id");`
`175`	`176`	`var sess = new Conversation`
`176`	`177`	`{`
`177`	`178`	`Id = _conversationId,`
`178`	`179`	`Channel = channel,`
	`180`	`+ ChannelId = channelId,`
`179`	`181`	`AgentId = agentId`
`180`	`182`	`};`
`181`	`183`	`converation = await NewConversation(sess);`
Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,7 @@ private static void InitConversation(CallerMessage message, RoleDialogModel inpu`
`108`	`108`	`var states = new List<MessageState>`
`109`	`109`	`{`
`110`	`110`	`new("channel", ConversationChannel.Phone),`
	`111`	`+ new("channel_id", message.From),`
`111`	`112`	`new("calling_phone", message.From)`
`112`	`113`	`};`
`113`	`114`	`states.AddRange(message.States.Select(kvp => new MessageState(kvp.Key, kvp.Value)));`