调整skills加载

Author: imxcstar

sharpclaw/Agents/MainAgent.cs

@@ -131,11 +131,6 @@ public MainAgent(
             archiver: archiver,
             memorySaver: memorySaver);
 
-
-#pragma warning disable MAAI001 // 类型仅用于评估，在将来的更新中可能会被更改或删除。取消此诊断以继续。
-        var skillsProvider = new FileAgentSkillsProvider(skillPath: _agentContext.GetSkillsDirPath());
-#pragma warning restore MAAI001 // 类型仅用于评估，在将来的更新中可能会被更改或删除。取消此诊断以继续。
-
         _agent = new ChatClientBuilder(mainClient)
             .UseFunctionInvocation()
             .UseChatReducer(_reducer)
@@ -145,8 +140,7 @@ public MainAgent(
                 {
                     Instructions = systemPrompt,
                     Tools = tools
-                },
-                AIContextProviders = [skillsProvider]
+                }
             });
     }
 

sharpclaw/Chat/MemoryPipelineChatReducer.cs

@@ -110,7 +110,8 @@ public async Task<IEnumerable<ChatMessage>> ReduceAsync(
         ArchiveResult? archiveResult = null;
 
         List<ChatMessage> allMessages = [.. OldWorkingMemoryContent, .. conversationMessages];
-        if (allMessages.Sum(x => x.Contents.Count()) > _resetThreshold)
+        var messageText = ConvertMessagesToText(allMessages).Replace(" ", "");
+        if (messageText.Length > 200000)
         {
             // 进入裁剪，清空累积的工作记忆
             OldWorkingMemoryContent.Clear();
@@ -181,6 +182,44 @@ public async Task<IEnumerable<ChatMessage>> ReduceAsync(
         return result;
     }
 
+    private string ConvertMessagesToText(IEnumerable<ChatMessage> messages)
+    {
+        var sb = new StringBuilder();
+        foreach (var msg in messages)
+        {
+            if (msg.Role == ChatRole.User)
+            {
+                var text = string.Join("", msg.Contents.OfType<TextContent>()
+                    .Where(t => !string.IsNullOrWhiteSpace(t.Text))
+                    .Select(t => t.Text.Trim()));
+                if (!string.IsNullOrWhiteSpace(text))
+                    sb.Append($"### 用户\n\n{text}\n\n");
+                continue;
+            }
+
+            foreach (var content in msg.Contents)
+            {
+                switch (content)
+                {
+                    case TextContent text when !string.IsNullOrWhiteSpace(text.Text):
+                        sb.Append($"### 助手\n\n{text.Text.Trim()}\n\n");
+                        break;
+                    case FunctionCallContent call:
+                        var args = call.Arguments is not null
+                            ? JsonSerializer.Serialize(call.Arguments)
+                            : "";
+                        sb.Append($"#### 工具调用: {call.Name}\n\n参数: `{args}`\n\n");
+                        break;
+                    case FunctionResultContent result:
+                        var resultText = result.Result?.ToString() ?? "";
+                        sb.Append($"<details>\n<summary>执行结果</summary>\n\n```\n{resultText}\n```\n\n</details>\n\n");
+                        break;
+                }
+            }
+        }
+        return sb.ToString();
+    }
+
     private async Task SaveHistoryFileAsync(
         IReadOnlyList<ChatMessage> messages,
         CancellationToken cancellationToken)
@@ -196,39 +235,7 @@ private async Task SaveHistoryFileAsync(
 
             var sb = new StringBuilder();
             sb.Append($"# 对话历史 {DateTime.Now:yyyy-MM-dd HH:mm:ss}\n\n");
-
-            foreach (var msg in messages)
-            {
-                if (msg.Role == ChatRole.User)
-                {
-                    var text = string.Join("", msg.Contents.OfType<TextContent>()
-                        .Where(t => !string.IsNullOrWhiteSpace(t.Text))
-                        .Select(t => t.Text.Trim()));
-                    if (!string.IsNullOrWhiteSpace(text))
-                        sb.Append($"### 用户\n\n{text}\n\n");
-                    continue;
-                }
-
-                foreach (var content in msg.Contents)
-                {
-                    switch (content)
-                    {
-                        case TextContent text when !string.IsNullOrWhiteSpace(text.Text):
-                            sb.Append($"### 助手\n\n{text.Text.Trim()}\n\n");
-                            break;
-                        case FunctionCallContent call:
-                            var args = call.Arguments is not null
-                                ? JsonSerializer.Serialize(call.Arguments)
-                                : "";
-                            sb.Append($"#### 工具调用: {call.Name}\n\n参数: `{args}`\n\n");
-                            break;
-                        case FunctionResultContent result:
-                            var resultText = result.Result?.ToString() ?? "";
-                            sb.Append($"<details>\n<summary>执行结果</summary>\n\n```\n{resultText}\n```\n\n</details>\n\n");
-                            break;
-                    }
-                }
-            }
+            sb.Append(ConvertMessagesToText(messages));
 
             await File.WriteAllTextAsync(filePath, sb.ToString(), cancellationToken);
             AppLogger.Log($"[Archive] 已保存历史文件: {fileName}（{messages.Count} 条消息）");

sharpclaw/Core/AgentBootstrap.cs

@@ -1,3 +1,4 @@
+using AgentSkillsDotNet;
 using Microsoft.Extensions.AI;
 using sharpclaw.Commands;
 using sharpclaw.Core.TaskManagement;
@@ -77,8 +78,12 @@ public static BootstrapResult Initialize()
         if (!Directory.Exists(skillsDirPath))
             Directory.CreateDirectory(skillsDirPath);
 
+        var agentSkillsFactory = new AgentSkillsFactory();
+        var agentSkills = agentSkillsFactory.GetAgentSkills(skillsDirPath);
+        var skillTools = agentSkills.GetAsTools();
+
         var memoryStore = ClientFactory.CreateMemoryStore(config);
 
-        return new BootstrapResult(config, taskManager, commandSkills, memoryStore, agentContext);
+        return new BootstrapResult(config, taskManager, [.. commandSkills, .. skillTools], memoryStore, agentContext);
     }
 }

sharpclaw/sharpclaw.csproj

@@ -12,6 +12,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="AgentSkillsDotNet" Version="1.0.0-rc2" />
 		<PackageReference Include="Anthropic" Version="12.5.0" />
 		<PackageReference Include="Cronos" Version="0.11.1" />
 		<PackageReference Include="GeminiDotnet.Extensions.AI" Version="0.22.0" />