Support built-in tools for AIShell

Author: daxian-dbw

shell/AIShell.Abstraction/NamedPipe.cs

@@ -43,7 +43,7 @@ public enum ContextType : int
     /// <summary>
     /// Ask for the current working directory of the shell.
     /// </summary>
-    WorkingDirectory = 0,
+    CurrentLocation = 0,
 
     /// <summary>
     /// Ask for the command history of the shell session.

shell/AIShell.Integration/Channel.cs

@@ -368,7 +368,7 @@ private PostContextMessage OnAskContext(AskContextMessage askContextMessage)
         string contextInfo;
         switch (type)
         {
-            case ContextType.WorkingDirectory:
+            case ContextType.CurrentLocation:
                 contextInfo = JsonSerializer.Serialize(
                     new { Provider = _currentLocation.Provider.Name, _currentLocation.Path });
                 break;

shell/AIShell.Integration/Commands/InvokeAishCommand.cs

@@ -17,8 +17,8 @@ public class InvokeAIShellCommand : PSCmdlet
     /// <summary>
     /// Sets and gets the query to be sent to AIShell
     /// </summary>
-    [Parameter(Mandatory = true, ValueFromRemainingArguments = true, ParameterSetName = DefaultSet)]
-    [Parameter(Mandatory = true, ValueFromRemainingArguments = true, ParameterSetName = ClipboardSet)]
+    [Parameter(Position = 0, ParameterSetName = DefaultSet)]
+    [Parameter(Position = 0, ParameterSetName = ClipboardSet)]
     public string[] Query { get; set; }
 
     /// <summary>
@@ -88,6 +88,26 @@ protected override void EndProcessing()
                 message = "/exit";
                 break;
             default:
+                if (Query is not null)
+                {
+                    message = string.Join(' ', Query);
+                }
+                else
+                {
+                    Host.UI.Write("Query: ");
+                    message = Host.UI.ReadLine();
+                }
+
+                if (string.IsNullOrEmpty(message))
+                {
+                    ThrowTerminatingError(
+                        new ErrorRecord(
+                            new ArgumentException("A query message is required."),
+                            "QueryIsMissing",
+                            ErrorCategory.InvalidArgument,
+                            targetObject: null));
+                }
+
                 Collection<string> results = null;
                 if (_contextObjects is not null)
                 {
@@ -107,7 +127,6 @@ protected override void EndProcessing()
                 }
 
                 context = results?.Count > 0 ? results[0] : null;
-                message = string.Join(' ', Query);
                 break;
         }
 

shell/AIShell.Kernel/Command/CodeCommand.cs

@@ -36,12 +36,6 @@ public CodeCommand()
         copy.SetHandler(CopyAction, nth);
         save.SetHandler(SaveAction, file, append);
         post.SetHandler(PostAction, nth);
-
-        var get = new Command("get", "Post context information.");
-        var ctx = new Argument<string>("context");
-        get.AddArgument(ctx);
-        get.SetHandler(GetAction, ctx);
-        AddCommand(get);
     }
 
     private static string GetCodeText(Shell shell, int index)
@@ -187,29 +181,4 @@ private void PostAction(int nth)
             host.WriteErrorLine(e.Message);
         }
     }
-
-    private async Task GetAction(string context)
-    {
-        var shell = (Shell)Shell;
-        var host = shell.Host;
-
-        if (shell.Channel is null)
-        {
-            host.WriteErrorLine("Cannot get context information because the bi-directional channel was not established.");
-            return;
-        }
-
-        try
-        {
-            var type = Enum.Parse<ContextType>(context);
-            var message = new AskContextMessage(type);
-
-            PostContextMessage response = await shell.Channel.AskContext(message, shell.CancellationToken);
-            host.WriteLine(response.ContextInfo);
-        }
-        catch (Exception e)
-        {
-            host.WriteErrorLine(e.Message);
-        }
-    }
 }

shell/AIShell.Kernel/Command/McpCommand.cs

@@ -28,8 +28,9 @@ private void ShowMCPData()
     {
         var shell = (Shell)Shell;
         var host = shell.Host;
+        var mcpManager = shell.McpManager;
 
-        if (shell.McpManager.McpServers.Count is 0)
+        if (mcpManager.McpServers.Count is 0 && mcpManager.BuiltInTools is null)
         {
             host.WriteErrorLine("No MCP server is available.");
             return;

shell/AIShell.Kernel/Host.cs

@@ -662,6 +662,20 @@ internal void RenderMcpServersAndTools(McpManager mcpManager)
             }
         }
 
+        if (mcpManager.BuiltInTools is { Count: > 0 })
+        {
+            if (toolTable.Rows is { Count: > 0 })
+            {
+                toolTable.AddEmptyRow();
+            }
+
+            toolTable.AddRow($"[olive underline]{McpManager.BuiltInServerName}[/]", "[green]\u2713 Ready[/]", string.Empty);
+            foreach (var item in mcpManager.BuiltInTools)
+            {
+                toolTable.AddRow(string.Empty, item.Key.EscapeMarkup(), item.Value.Description.EscapeMarkup());
+            }
+        }
+
         if (readyServers is not null)
         {
             foreach (var (name, status, info) in readyServers)