Merge pull request #9 from magicdrive/revival_mcp_server

Revival mcp server

Author: magicdrive

README.md

@@ -86,13 +86,14 @@ ark mcp-server [OPTIONS]
 | `--delete-comments` | `-D` | Strip comments (language‑aware) | – |
 
 ---
-<!--
+
 ## 🛰  mcp‑server Options
 
 | Option | Alias | Description | Default |
 |--------|-------|-------------|---------|
 | `--root <dir>` | `-r` | Serve directory root | `$PWD` |
-| `--port <port>` | `-p` | HTTP listen port | `8522` |
+| `--type <stdio|http>` | `-t` | HTTP listen port | `stdio` |
+| `--http-port <port>` | `-p` | HTTP listen port | `8522` |
 | `--scan-buffer <size>` | `-b` | Read buffer size (`10M`, `500K`, …) | `10M` |
 | `--mask-secrets <on/off>` | `-m` | Detect & mask secrets | `on` |
 | `--allow-gitignore <on/off>` | `-a` | Obey `.gitignore` rules | `on` |
@@ -108,7 +109,7 @@ ark mcp-server [OPTIONS]
 | `--delete-comments` | `-D` | Strip comments (language‑aware) | – |
 
 ---
--->
+
 ## 📝 Arguments
 
 | Argument | Description |

cmd/ark/mod.go

@@ -11,11 +11,15 @@ import (
 )
 
 func Execute(version string) {
-	if len(os.Args) > 2 && os.Args[1] == "mcp-server" && false {
-		_, opt, err := commandline.ServerOptParse(os.Args[2:])
+	if len(os.Args) >= 2 && os.Args[1] == "mcp-server" {
+		_, opt, err := commandline.ServerOptParse(version, os.Args[2:])
 		if err != nil {
 			log.Fatalf("Faital Error: %v\n", err)
 		}
+		if opt.GeneralOption.HelpFlag {
+			opt.GeneralOption.FlagSet.Usage()
+			os.Exit(0)
+		}
 		mcp.RunMCPServe(opt.RootDir, opt)
 
 	} else {

internal/commandline/help.txt

@@ -3,7 +3,11 @@ Usage: ark [OPTIONS] <dirname>
 Description:
    Yet another alternate [directory|repository] represent text generator tool.
 
-Options:
+Sub commands:
+  mcp-server                                       Start MCP server.
+
+
+general (text generator mode) options:
   -h, --help                                       Show this help message and exit.
   -v, --version                                    Show version.
   -o, --output-filename <filename>                 Specify ark output txt filename. (optional. default: 'ark_output.txt')
@@ -25,6 +29,25 @@ Options:
   -S, --silent                                     Specify flag process without displaying messages during processing. (optional.)
   -D, --delete-comments                            Specify flag strip comments based on language detection. (optional.)
 
+mcp-server options:
+  -r, --root <dirname>                             Specify the mcp-server serve root dirname(optional. default: $pwd)
+  -t, --type <http|stdio>                          Specify the mcp-server serve type. (optional. default: 'stdio')
+  -p, --port <number>                              Specify the mcp-server port. (optional. default: 8522)
+  -b, --scan-buffer <number|byte-string>           Specify the line scan buffer size. (optional. default: '10M')
+  -m, --mask-secrets <'on'|'off'>                  Specify Detect the secrets and convert it to masked output. (optional. default: 'on').
+  -a, --allow-gitignore <'on'|'off'>               Specify enable .gitignore filter rule. (optional. default: 'on')
+  -A, --additionally-ignorerule <filepath>         Specify a file containing additional ignore rules. (optional.)
+  -d, --ignore-dotfile <'on'|'off'>                Specify ignore dot files. (optional. default 'off')
+  -x, --pattern-regex <regxp>                      Specify watch file pattern regexp. (optional.)
+  -i, --include-ext <extention>                    Specify include file extention. Allows comma separated list.(optional.)
+  -g, --exclude-dir-regex <regexp>                 Specify include directory ignore pattern regexp. (optional.)
+  -G, --exclude-file-regex <regexp>                Specify watch file ignore pattern regexp. (optional.)
+  -e, --exclude-ext <extention>                    Specify watch exclude file extention. Allows comma separated list. (optional.)
+  -E, --exclude-dir <dirname>                      Specify watch exclude dirname. Allows comma separated list. (optional.)
+  -s, --skip-non-utf8                              Specify flag to ignore files that do not have utf8 charset. (optional.)
+  -D, --delete-comments                            Specify flag strip comments based on language detection. (optional.)
+
+
 Arguments:
   <byte-string>                                    byte size string. (ex) 10M, 100k
   <dirname>                                        The directory name.

internal/commandline/help_mcp.txt

@@ -1,22 +1,28 @@
 package commandline
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"os"
 	"strconv"
+	"strings"
 
 	"github.com/magicdrive/ark/internal/common"
+	"github.com/magicdrive/ark/internal/model"
 )
 
 // ServeOption defines options for launching the MCP server
 type ServeOption struct {
-	RootDir       string
-	Port          string
-	GeneralOption *Option
+	ThisVersion        string
+	RootDir            string
+	McpServerType      model.McpSreverType
+	McpServerTypeValue string
+	HttpPort           string
+	GeneralOption      *Option
 }
 
-func ServerOptParse(args []string) (int, *ServeOption, error) {
+func ServerOptParse(version string, args []string) (int, *ServeOption, error) {
 
 	optLength := len(args)
 
@@ -28,9 +34,13 @@ func ServerOptParse(args []string) (int, *ServeOption, error) {
 	rootDirOpt := fs.String("root", currentDir, "Specify ark mcp server serv directory.")
 	fs.StringVar(rootDirOpt, "r", currentDir, "Specify ark mcp server serv directory.")
 
-	// --port
-	portOpt := fs.Int("port", 8522, "Specify ark mcp server port.")
-	fs.IntVar(portOpt, "p", 8522, "Specify ark mcp server port.")
+	// --type
+	mcpServerTypeOpt := fs.String("type", "stdio", "Specify ark mcp server serv type.")
+	fs.StringVar(mcpServerTypeOpt, "t", "stdio", "Specify ark mcp server serv type.")
+
+	// --http-port
+	httpPortOpt := fs.Int("http-port", 8522, "Specify ark mcp server port.")
+	fs.IntVar(httpPortOpt, "p", 8522, "Specify ark mcp server port.")
 
 	// --scan-buffer
 	scanBufferValueOpt := fs.String("scan-buffer", "10M", "Specify the line scan buffer size.")
@@ -120,17 +130,35 @@ func ServerOptParse(args []string) (int, *ServeOption, error) {
 		FlagSet:                         fs,
 	}
 
-	if err := generalOpt.Normalize(); err != nil {
-		return optLength, nil, err
+	result := &ServeOption{
+		ThisVersion:        version,
+		RootDir:            *rootDirOpt,
+		McpServerTypeValue: *mcpServerTypeOpt,
+		HttpPort:           strconv.Itoa(*httpPortOpt),
+		GeneralOption:      generalOpt,
 	}
 
-	result := &ServeOption{
-		RootDir:       *rootDirOpt,
-		Port:          strconv.Itoa(*portOpt),
-		GeneralOption: generalOpt,
+	if err := common.JoinErrors(result.Normalize(), generalOpt.Normalize()); err != nil {
+		return optLength, nil, err
 	}
 
 	OverRideHelp(fs)
 
 	return optLength, result, nil
 }
+
+func (cr *ServeOption) Normalize() error {
+
+	var errorMessages = []string{}
+
+	// --type
+	if err := cr.McpServerType.Set(cr.McpServerTypeValue); err != nil {
+		errorMessages = append(errorMessages, fmt.Sprintf("--type %s", err.Error()))
+	}
+
+	if len(errorMessages) == 0 {
+		return nil
+	} else {
+		return errors.New(strings.Join(errorMessages, "\n"))
+	}
+}

internal/commandline/mod.go

@@ -9,7 +9,8 @@ import (
 func TestServerOptParse_Basic(t *testing.T) {
 	args := []string{
 		"--root", "/my/project",
-		"--port", "12345",
+		"--type", "http",
+		"--http-port", "12345",
 		"--scan-buffer", "20M",
 		"--mask-secrets", "off",
 		"--allow-gitignore", "off",
@@ -25,16 +26,19 @@ func TestServerOptParse_Basic(t *testing.T) {
 		"--delete-comment",
 	}
 
-	_, opt, err := commandline.ServerOptParse(args)
+	_, opt, err := commandline.ServerOptParse("v1.0.0", args)
 	if err != nil {
 		t.Fatalf("Expected no error, got: %v", err)
 	}
 
 	if opt.RootDir != "/my/project" {
 		t.Errorf("RootDir mismatch. got=%s", opt.RootDir)
 	}
-	if opt.Port != "12345" {
-		t.Errorf("Port mismatch. got=%s", opt.Port)
+	if opt.McpServerTypeValue != "http" {
+		t.Errorf("McpServerTypeValue mismatch. got=%s", opt.McpServerTypeValue)
+	}
+	if opt.HttpPort != "12345" {
+		t.Errorf("HttpPort mismatch. got=%s", opt.HttpPort)
 	}
 	if opt.GeneralOption.MaskSecretsFlagValue != "off" {
 		t.Errorf("MaskSecretsFlagValue mismatch. got=%s", opt.GeneralOption.MaskSecretsFlagValue)

internal/commandline/server_option.go

@@ -1,10 +1,24 @@
 package common
 
 import (
+	"errors"
 	"os"
 	"strings"
 )
 
+func JoinErrors(errs ...error) error {
+	var messages []string
+	for _, err := range errs {
+		if err != nil {
+			messages = append(messages, err.Error())
+		}
+	}
+	if len(messages) == 0 {
+		return nil
+	}
+	return errors.New(strings.Join(messages, "\n"))
+}
+
 func MergeAllowFileList(a, b map[string]bool) map[string]bool {
 	merged := make(map[string]bool)
 	for k, v := range a {
@@ -52,4 +66,3 @@ func GetCurrentDir() string {
 func TrimDotSlash(path string) string {
 	return strings.TrimPrefix(path, "./")
 }
-