From bae568178c5fecbea0620db0039f54fcb66820c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Nov 2025 08:03:09 +0000
Subject: [PATCH 01/11] chore(deps): bump the minor-and-patch group with 2
 updates

Bumps the minor-and-patch group with 2 updates: [golang.org/x/crypto](https://github.com/golang/crypto) and [golang.org/x/text](https://github.com/golang/text).


Updates `golang.org/x/crypto` from 0.43.0 to 0.44.0
- [Commits](https://github.com/golang/crypto/compare/v0.43.0...v0.44.0)

Updates `golang.org/x/text` from 0.30.0 to 0.31.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](https://github.com/golang/text/compare/v0.30.0...v0.31.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.44.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: minor-and-patch
- dependency-name: golang.org/x/text
  dependency-version: 0.31.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: minor-and-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod |  4 ++--
 go.sum | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 1d902f0..d7a7549 100644
--- a/go.mod
+++ b/go.mod
@@ -20,9 +20,9 @@ require (
 	github.com/spf13/pflag v1.0.10
 	github.com/xuri/excelize/v2 v2.10.0
 	goftp.io/server v0.4.1
-	golang.org/x/crypto v0.43.0
+	golang.org/x/crypto v0.44.0
 	golang.org/x/sys v0.38.0
-	golang.org/x/text v0.30.0
+	golang.org/x/text v0.31.0
 )
 
 require (
diff --git a/go.sum b/go.sum
index d9ec155..d89da73 100644
--- a/go.sum
+++ b/go.sum
@@ -77,8 +77,8 @@ goftp.io/server v0.4.1/go.mod h1:hFZeR656ErRt3ojMKt7H10vQ5nuWV1e0YeUTeorlR6k=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
-golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
+golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU=
+golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc=
 golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
 golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -96,12 +96,12 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
 golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/term v0.36.0 h1:zMPR+aF8gfksFprF/Nc/rd1wRS1EI6nDBGyWAvDzx2Q=
-golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss=
+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
-golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=

From b8184e2407530a9b9c69b32febf80d2a297aebc7 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 17 Nov 2025 09:55:05 +0000
Subject: [PATCH 02/11] Add instance name option (--name/-n)

Add a new command-line option --name/-n to set an instance name for the Ayd server.
The instance name is:
- Stored as a global variable in internal/meta/instance.go
- Displayed in HTTP page titles and logo
- Included in startup and shutdown logs as instance_name field

This allows users to distinguish between multiple Ayd instances when running
them concurrently or viewing their logs.
---
 cmd/ayd/help.txt                      |  1 +
 cmd/ayd/main.go                       | 23 +++++++++++++---------
 cmd/ayd/server.go                     | 28 +++++++++++++++++----------
 internal/endpoint/templates.go        |  4 ++++
 internal/endpoint/templates/base.html |  4 ++--
 internal/meta/instance.go             |  5 +++++
 6 files changed, 44 insertions(+), 21 deletions(-)
 create mode 100644 internal/meta/instance.go

diff --git a/cmd/ayd/help.txt b/cmd/ayd/help.txt
index 13be6bc..6da3852 100644
--- a/cmd/ayd/help.txt
+++ b/cmd/ayd/help.txt
@@ -18,6 +18,7 @@ Options:
                           Ayd won't create log file if set "-" or empty.
                           You can use time spec %Y, %y, %m, %d, %H, %M, in the file name.
                           (default "ayd_%Y%m%d.log")
+  -n, --name=NAME         Instance name. This will be shown in page titles and logs.
   -p, --port=PORT         Listen port of status page. (default 9000)
   -u, --user=USER[:PASS]  Username and password for HTTP basic auth.
   -c, --ssl-cert=FILE     Path to certificate file for HTTPS. Please set also -k.
diff --git a/cmd/ayd/main.go b/cmd/ayd/main.go
index 292c256..467c906 100644
--- a/cmd/ayd/main.go
+++ b/cmd/ayd/main.go
@@ -24,15 +24,16 @@ type AydCommand struct {
 	OutStream io.Writer
 	ErrStream io.Writer
 
-	ListenPort  int
-	StorePath   string
-	OneshotMode bool
-	AlertURLs   []string
-	UserInfo    string
-	CertPath    string
-	KeyPath     string
-	ShowVersion bool
-	ShowHelp    bool
+	ListenPort   int
+	StorePath    string
+	InstanceName string
+	OneshotMode  bool
+	AlertURLs    []string
+	UserInfo     string
+	CertPath     string
+	KeyPath      string
+	ShowVersion  bool
+	ShowHelp     bool
 
 	Tasks     []Task
 	StartedAt time.Time
@@ -60,6 +61,7 @@ func (cmd *AydCommand) ParseArgs(args []string) (exitCode int) {
 
 	flags.IntVarP(&cmd.ListenPort, "port", "p", 9000, "HTTP listen port")
 	flags.StringVarP(&cmd.StorePath, "log-file", "f", "ayd_%Y%m%d.log", "Path to log file")
+	flags.StringVarP(&cmd.InstanceName, "name", "n", "", "Instance name")
 	flags.BoolVarP(&cmd.OneshotMode, "oneshot", "1", false, "Check status only once and exit")
 	flags.StringArrayVarP(&cmd.AlertURLs, "alert", "a", nil, "The alert URLs")
 	flags.StringVarP(&cmd.UserInfo, "user", "u", "", "Username and password for HTTP endpoint")
@@ -99,6 +101,9 @@ func (cmd *AydCommand) ParseArgs(args []string) (exitCode int) {
 		cmd.StorePath = ""
 	}
 
+	// Set the instance name globally
+	meta.InstanceName = cmd.InstanceName
+
 	var err error
 	cmd.Tasks, err = ParseArgs(flags.Args())
 	if err != nil {
diff --git a/cmd/ayd/server.go b/cmd/ayd/server.go
index fc8e545..e356059 100644
--- a/cmd/ayd/server.go
+++ b/cmd/ayd/server.go
@@ -33,31 +33,39 @@ func (cmd *AydCommand) reportStartServer(s *store.Store, protocol, listen string
 	cmd.StartedAt = time.Now()
 
 	u := &api.URL{Scheme: "ayd", Opaque: "server"}
+	extra := map[string]interface{}{
+		"url":     fmt.Sprintf("%s://%s", protocol, listen),
+		"targets": tasks,
+		"version": fmt.Sprintf("%s (%s)", meta.Version, meta.Commit),
+	}
+	if meta.InstanceName != "" {
+		extra["instance_name"] = meta.InstanceName
+	}
 	s.Report(u, api.Record{
 		Time:    cmd.StartedAt,
 		Status:  api.StatusHealthy,
 		Target:  u,
 		Message: "start Ayd server",
-		Extra: map[string]interface{}{
-			"url":     fmt.Sprintf("%s://%s", protocol, listen),
-			"targets": tasks,
-			"version": fmt.Sprintf("%s (%s)", meta.Version, meta.Commit),
-		},
+		Extra:   extra,
 	})
 }
 
 func (cmd *AydCommand) reportStopServer(s *store.Store, protocol, listen string) {
 	u := &api.URL{Scheme: "ayd", Opaque: "server"}
+	extra := map[string]interface{}{
+		"url":     fmt.Sprintf("%s://%s", protocol, listen),
+		"version": fmt.Sprintf("%s (%s)", meta.Version, meta.Commit),
+		"since":   cmd.StartedAt.Format(time.RFC3339),
+	}
+	if meta.InstanceName != "" {
+		extra["instance_name"] = meta.InstanceName
+	}
 	s.Report(u, api.Record{
 		Time:    time.Now(),
 		Status:  api.StatusHealthy,
 		Target:  u,
 		Message: "stop Ayd server",
-		Extra: map[string]interface{}{
-			"url":     fmt.Sprintf("%s://%s", protocol, listen),
-			"version": fmt.Sprintf("%s (%s)", meta.Version, meta.Commit),
-			"since":   cmd.StartedAt.Format(time.RFC3339),
-		},
+		Extra:   extra,
 	})
 }
 
diff --git a/internal/endpoint/templates.go b/internal/endpoint/templates.go
index ed41419..3d319a8 100644
--- a/internal/endpoint/templates.go
+++ b/internal/endpoint/templates.go
@@ -12,6 +12,7 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/goccy/go-json"
 	"github.com/google/uuid"
+	"github.com/macrat/ayd/internal/meta"
 	api "github.com/macrat/ayd/lib-ayd"
 	"golang.org/x/text/width"
 )
@@ -29,6 +30,9 @@ func loadHTMLTemplate(s string) *template.Template {
 
 var (
 	templateFuncs = map[string]interface{}{
+		"instance_name": func() string {
+			return meta.InstanceName
+		},
 		"sort_history": func(hm map[string]api.ProbeHistory) []api.ProbeHistory {
 			hs := make([]api.ProbeHistory, 0, len(hm))
 			for _, h := range hm {
diff --git a/internal/endpoint/templates/base.html b/internal/endpoint/templates/base.html
index d0ec312..1d808f1 100644
--- a/internal/endpoint/templates/base.html
+++ b/internal/endpoint/templates/base.html
@@ -30,7 +30,7 @@ <h1>
 
 <html lang=en>
     <head>
-        <title>Ayd {{ block "title" . }}{{ end }}</title>
+        <title>{{ if instance_name }}{{ instance_name }} - {{ end }}Ayd {{ block "title" . }}{{ end }}</title>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width,initial-scale=1" />
 <style>
@@ -188,7 +188,7 @@ <h1>
 
         <header>
             <nav>
-                <a class="logo" href="/status.html">Ayd?</a>
+                <a class="logo" href="/status.html">{{ if instance_name }}{{ instance_name }}{{ else }}Ayd?{{ end }}</a>
                 <ul class="site-menu">
                     <li>
                         <a href="/status.html" type="text/html">Status</a>
diff --git a/internal/meta/instance.go b/internal/meta/instance.go
new file mode 100644
index 0000000..7440332
--- /dev/null
+++ b/internal/meta/instance.go
@@ -0,0 +1,5 @@
+package meta
+
+// InstanceName holds the name of this Ayd instance.
+// It can be set via the --name/-n command-line flag.
+var InstanceName string

From eb22a42222a82f09b0482e69d27acedfce07496d Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Mon, 17 Nov 2025 10:46:35 +0000
Subject: [PATCH 03/11] Add tests for instance name feature

Add unit tests for the instance name option:
- Test instance_name template function in templates_test.go
- Test --name/-n command-line option parsing in main_test.go

Both short form (-n) and long form (--name) are tested.
---
 cmd/ayd/main_test.go                | 18 ++++++++++++++++++
 internal/endpoint/templates_test.go | 25 +++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/cmd/ayd/main_test.go b/cmd/ayd/main_test.go
index 065bebd..5828fda 100644
--- a/cmd/ayd/main_test.go
+++ b/cmd/ayd/main_test.go
@@ -117,6 +117,24 @@ func TestAydCommand_ParseArgs(t *testing.T) {
 			Pattern:  "invalid argument:\n  ::invalid URL: Not valid as schedule or target URL.\n\nPlease see `ayd -h` for more information\\.\n",
 			ExitCode: 2,
 		},
+		{
+			Args:     []string{"ayd", "-n", "Test Instance", "dummy:"},
+			ExitCode: 0,
+			Extra: func(t *testing.T, cmd main.AydCommand) {
+				if cmd.InstanceName != "Test Instance" {
+					t.Errorf("expected InstanceName is %q but got %q", "Test Instance", cmd.InstanceName)
+				}
+			},
+		},
+		{
+			Args:     []string{"ayd", "--name", "My Server", "dummy:"},
+			ExitCode: 0,
+			Extra: func(t *testing.T, cmd main.AydCommand) {
+				if cmd.InstanceName != "My Server" {
+					t.Errorf("expected InstanceName is %q but got %q", "My Server", cmd.InstanceName)
+				}
+			},
+		},
 	}
 
 	for _, tt := range tests {
diff --git a/internal/endpoint/templates_test.go b/internal/endpoint/templates_test.go
index c93cb52..daa7ed3 100644
--- a/internal/endpoint/templates_test.go
+++ b/internal/endpoint/templates_test.go
@@ -6,9 +6,34 @@ import (
 	"testing"
 	"time"
 
+	"github.com/macrat/ayd/internal/meta"
 	api "github.com/macrat/ayd/lib-ayd"
 )
 
+func TestInstanceName(t *testing.T) {
+	f := templateFuncs["instance_name"].(func() string)
+
+	// Save original value and restore after test
+	original := meta.InstanceName
+	defer func() { meta.InstanceName = original }()
+
+	t.Run("empty", func(t *testing.T) {
+		meta.InstanceName = ""
+		result := f()
+		if result != "" {
+			t.Errorf("expected empty string but got %q", result)
+		}
+	})
+
+	t.Run("with_name", func(t *testing.T) {
+		meta.InstanceName = "Test Instance"
+		result := f()
+		if result != "Test Instance" {
+			t.Errorf("expected %q but got %q", "Test Instance", result)
+		}
+	})
+}
+
 func TestInvertIncidents(t *testing.T) {
 	f := templateFuncs["invert_incidents"].(func([]api.Incident) []api.Incident)
 

From 440d8596a100b58ee4265b0837ae4dbd201a1efe Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 18 Nov 2025 12:13:09 +0000
Subject: [PATCH 04/11] Update MCP server Implementation with instance name

Modify MCP server Implementation Name and Title based on instance name:
- Name: "Ayd - alive monitoring - {instance_name}" (or "Ayd - alive monitoring" if not set)
- Title: "Ayd - {instance_name}" (or "Ayd" if not set)

This allows LLMs to correctly identify the right instance when multiple
Ayd MCP servers are configured.
---
 internal/endpoint/mcp.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/internal/endpoint/mcp.go b/internal/endpoint/mcp.go
index d9f7bb0..651122f 100644
--- a/internal/endpoint/mcp.go
+++ b/internal/endpoint/mcp.go
@@ -316,9 +316,18 @@ func FetchLogsByJq(ctx context.Context, s Store, input MCPLogsInput) (output MCP
 }
 
 func MCPHandler(s Store) http.HandlerFunc {
+	implName := "Ayd - alive monitoring"
+	implTitle := "Ayd"
+
+	if meta.InstanceName != "" {
+		implName = fmt.Sprintf("Ayd - alive monitoring - %s", meta.InstanceName)
+		implTitle = fmt.Sprintf("Ayd - %s", meta.InstanceName)
+	}
+
 	server := mcp.NewServer(&mcp.Implementation{
-		Name:    "Ayd",
+		Name:    implName,
 		Version: meta.Version,
+		Title:   implTitle,
 	}, nil)
 
 	mcp.AddTool(server, &mcp.Tool{

From 6cbb620ad59012223ecad70b700e4e02aa2e72b6 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 18 Nov 2025 12:14:54 +0000
Subject: [PATCH 05/11] Refactor MCP Implementation initialization

Use a single impl variable instead of separate variables for Name and Title.
Initialize with default values, then override if instance name is set.
This makes the code more readable and maintainable.
---
 internal/endpoint/mcp.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/internal/endpoint/mcp.go b/internal/endpoint/mcp.go
index 651122f..fe59c3c 100644
--- a/internal/endpoint/mcp.go
+++ b/internal/endpoint/mcp.go
@@ -316,19 +316,18 @@ func FetchLogsByJq(ctx context.Context, s Store, input MCPLogsInput) (output MCP
 }
 
 func MCPHandler(s Store) http.HandlerFunc {
-	implName := "Ayd - alive monitoring"
-	implTitle := "Ayd"
+	impl := &mcp.Implementation{
+		Name:    "Ayd - alive monitoring",
+		Version: meta.Version,
+		Title:   "Ayd",
+	}
 
 	if meta.InstanceName != "" {
-		implName = fmt.Sprintf("Ayd - alive monitoring - %s", meta.InstanceName)
-		implTitle = fmt.Sprintf("Ayd - %s", meta.InstanceName)
+		impl.Name = fmt.Sprintf("Ayd - alive monitoring - %s", meta.InstanceName)
+		impl.Title = fmt.Sprintf("Ayd - %s", meta.InstanceName)
 	}
 
-	server := mcp.NewServer(&mcp.Implementation{
-		Name:    implName,
-		Version: meta.Version,
-		Title:   implTitle,
-	}, nil)
+	server := mcp.NewServer(impl, nil)
 
 	mcp.AddTool(server, &mcp.Tool{
 		Name:        "list_targets",

From 20524ba91eecaecf1081f49bd6555eabdfb10d6b Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 18 Nov 2025 12:38:24 +0000
Subject: [PATCH 06/11] Refactor MCP Implementation initialization

Change MCP server configuration:
- Name: fixed to "ayd" (no longer includes instance name)
- Title: "Ayd ({instance_name})" or "Ayd"
- Instructions: Added with instance name information when set

This approach provides better identification for LLMs when multiple
Ayd instances are configured, using Title and Instructions instead
of overloading the Name field.
---
 internal/endpoint/mcp.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/internal/endpoint/mcp.go b/internal/endpoint/mcp.go
index fe59c3c..9acd0e2 100644
--- a/internal/endpoint/mcp.go
+++ b/internal/endpoint/mcp.go
@@ -317,17 +317,21 @@ func FetchLogsByJq(ctx context.Context, s Store, input MCPLogsInput) (output MCP
 
 func MCPHandler(s Store) http.HandlerFunc {
 	impl := &mcp.Implementation{
-		Name:    "Ayd - alive monitoring",
+		Name:    "ayd",
 		Version: meta.Version,
 		Title:   "Ayd",
 	}
 
+	opts := &mcp.ServerOptions{
+		Instructions: "Ayd is a simple alive monitoring tool. You can analyze targets status using flexible jq queries.",
+	}
+
 	if meta.InstanceName != "" {
-		impl.Name = fmt.Sprintf("Ayd - alive monitoring - %s", meta.InstanceName)
-		impl.Title = fmt.Sprintf("Ayd - %s", meta.InstanceName)
+		impl.Title = fmt.Sprintf("Ayd (%s)", meta.InstanceName)
+		opts.Instructions = fmt.Sprintf("Ayd is a simple alive monitoring tool. You can analyze targets status using flexible jq queries. The instance name of this server is \"%s\".", meta.InstanceName)
 	}
 
-	server := mcp.NewServer(impl, nil)
+	server := mcp.NewServer(impl, opts)
 
 	mcp.AddTool(server, &mcp.Tool{
 		Name:        "list_targets",

From c5d68c4fbd3727f40e2b325352998cb8b2831793 Mon Sep 17 00:00:00 2001
From: MacRat <m@crat.jp>
Date: Sat, 22 Nov 2025 13:15:05 +0900
Subject: [PATCH 07/11] feat(mcp): improve instructions for MCP server

---
 internal/endpoint/mcp.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/endpoint/mcp.go b/internal/endpoint/mcp.go
index 9acd0e2..0fddce3 100644
--- a/internal/endpoint/mcp.go
+++ b/internal/endpoint/mcp.go
@@ -109,7 +109,7 @@ func jqParseURL(x any, _ []any) any {
 
 	if u.Opaque != "" && u.Host == "" {
 		switch u.Scheme {
-		case "ping":
+		case "ping", "ping4", "ping6":
 			u.Host = u.Opaque
 			u.Opaque = ""
 		case "dns", "dns4", "dns6", "file", "exec", "mailto", "source":
@@ -323,12 +323,12 @@ func MCPHandler(s Store) http.HandlerFunc {
 	}
 
 	opts := &mcp.ServerOptions{
-		Instructions: "Ayd is a simple alive monitoring tool. You can analyze targets status using flexible jq queries.",
+		Instructions: "Ayd is a simple alive monitoring tool. The logs and status can be large, so it is recommended to extract necessary information using jq queries instead of fetching all data at once.",
 	}
 
 	if meta.InstanceName != "" {
 		impl.Title = fmt.Sprintf("Ayd (%s)", meta.InstanceName)
-		opts.Instructions = fmt.Sprintf("Ayd is a simple alive monitoring tool. You can analyze targets status using flexible jq queries. The instance name of this server is \"%s\".", meta.InstanceName)
+		opts.Instructions = fmt.Sprintf(`%s This Ayd instance's name is %q.`, opts.Instructions, meta.InstanceName)
 	}
 
 	server := mcp.NewServer(impl, opts)

From a7b6ae865d0f7e4d2b70fd9437a2be7e53444e92 Mon Sep 17 00:00:00 2001
From: MacRat <m@crat.jp>
Date: Sat, 22 Nov 2025 13:20:36 +0900
Subject: [PATCH 08/11] feat(endpoint): simplify HTML page titles

---
 internal/endpoint/templates/base.html     | 4 ++--
 internal/endpoint/testdata/incidents.html | 2 +-
 internal/endpoint/testdata/log.html       | 2 +-
 internal/endpoint/testdata/status.html    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/endpoint/templates/base.html b/internal/endpoint/templates/base.html
index 1d808f1..45bac0d 100644
--- a/internal/endpoint/templates/base.html
+++ b/internal/endpoint/templates/base.html
@@ -30,7 +30,7 @@ <h1>
 
 <html lang=en>
     <head>
-        <title>{{ if instance_name }}{{ instance_name }} - {{ end }}Ayd {{ block "title" . }}{{ end }}</title>
+        <title>{{ if instance_name }}{{ instance_name }} - {{ else }}Ayd {{ end }}{{ block "title" . }}{{ end }}</title>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width,initial-scale=1" />
 <style>
@@ -188,7 +188,7 @@ <h1>
 
         <header>
             <nav>
-                <a class="logo" href="/status.html">{{ if instance_name }}{{ instance_name }}{{ else }}Ayd?{{ end }}</a>
+                <a class="logo" href="/status.html">{{ if instance_name }}{{ instance_name }}{{ else }}Ayd{{ end }}</a>
                 <ul class="site-menu">
                     <li>
                         <a href="/status.html" type="text/html">Status</a>
diff --git a/internal/endpoint/testdata/incidents.html b/internal/endpoint/testdata/incidents.html
index 5d712da..187178d 100644
--- a/internal/endpoint/testdata/incidents.html
+++ b/internal/endpoint/testdata/incidents.html
@@ -188,7 +188,7 @@
 
         <header>
             <nav>
-                <a class="logo" href="/status.html">Ayd?</a>
+                <a class="logo" href="/status.html">Ayd</a>
                 <ul class="site-menu">
                     <li>
                         <a href="/status.html" type="text/html">Status</a>
diff --git a/internal/endpoint/testdata/log.html b/internal/endpoint/testdata/log.html
index b89d68a..03950b2 100644
--- a/internal/endpoint/testdata/log.html
+++ b/internal/endpoint/testdata/log.html
@@ -251,7 +251,7 @@
 
         <header>
             <nav>
-                <a class="logo" href="/status.html">Ayd?</a>
+                <a class="logo" href="/status.html">Ayd</a>
                 <ul class="site-menu">
                     <li>
                         <a href="/status.html" type="text/html">Status</a>
diff --git a/internal/endpoint/testdata/status.html b/internal/endpoint/testdata/status.html
index 6447c96..2047321 100644
--- a/internal/endpoint/testdata/status.html
+++ b/internal/endpoint/testdata/status.html
@@ -323,7 +323,7 @@
 
         <header>
             <nav>
-                <a class="logo" href="/status.html">Ayd?</a>
+                <a class="logo" href="/status.html">Ayd</a>
                 <ul class="site-menu">
                     <li>
                         <a href="/status.html" type="text/html">Status</a>

From 9824c3caebf528a1c05077de4b21a67a8dfc3805 Mon Sep 17 00:00:00 2001
From: MacRat <m@crat.jp>
Date: Sat, 22 Nov 2025 13:59:07 +0900
Subject: [PATCH 09/11] refactor: change how to store instance name to avoid
 race condition in test

---
 cmd/ayd/main.go                       |  5 +--
 cmd/ayd/main_test.go                  | 12 +++----
 cmd/ayd/server.go                     |  8 ++---
 internal/endpoint/healthz_test.go     |  4 +++
 internal/endpoint/log.go              |  2 ++
 internal/endpoint/log_test.go         |  2 +-
 internal/endpoint/mcp.go              |  6 ++--
 internal/endpoint/mcp_test.go         |  2 +-
 internal/endpoint/store.go            |  3 ++
 internal/endpoint/templates.go        |  4 ---
 internal/endpoint/templates/base.html |  4 +--
 internal/endpoint/templates_test.go   | 25 --------------
 internal/meta/instance.go             |  5 ---
 internal/scheme/http.go               |  5 +++
 internal/store/scanner_test.go        |  4 +--
 internal/store/store.go               | 10 +++++-
 internal/store/store_test.go          | 48 ++++++++++++++++++++-------
 internal/testutil/store.go            |  4 +--
 lib-ayd/report.go                     |  3 ++
 19 files changed, 84 insertions(+), 72 deletions(-)
 delete mode 100644 internal/meta/instance.go

diff --git a/cmd/ayd/main.go b/cmd/ayd/main.go
index 467c906..c247df4 100644
--- a/cmd/ayd/main.go
+++ b/cmd/ayd/main.go
@@ -101,9 +101,6 @@ func (cmd *AydCommand) ParseArgs(args []string) (exitCode int) {
 		cmd.StorePath = ""
 	}
 
-	// Set the instance name globally
-	meta.InstanceName = cmd.InstanceName
-
 	var err error
 	cmd.Tasks, err = ParseArgs(flags.Args())
 	if err != nil {
@@ -138,7 +135,7 @@ func (cmd *AydCommand) Run(args []string) (exitCode int) {
 		return 0
 	}
 
-	s, err := store.New(cmd.StorePath, cmd.OutStream)
+	s, err := store.New(cmd.InstanceName, cmd.StorePath, cmd.OutStream)
 	if err != nil {
 		fmt.Fprintf(cmd.ErrStream, "error: failed to open log file: %s\n", err)
 		return 1
diff --git a/cmd/ayd/main_test.go b/cmd/ayd/main_test.go
index 5828fda..a9b270e 100644
--- a/cmd/ayd/main_test.go
+++ b/cmd/ayd/main_test.go
@@ -118,20 +118,20 @@ func TestAydCommand_ParseArgs(t *testing.T) {
 			ExitCode: 2,
 		},
 		{
-			Args:     []string{"ayd", "-n", "Test Instance", "dummy:"},
+			Args:     []string{"ayd", "dummy:"},
 			ExitCode: 0,
 			Extra: func(t *testing.T, cmd main.AydCommand) {
-				if cmd.InstanceName != "Test Instance" {
-					t.Errorf("expected InstanceName is %q but got %q", "Test Instance", cmd.InstanceName)
+				if cmd.InstanceName != "" {
+					t.Errorf("expected InstanceName is empty in default but got %q", cmd.InstanceName)
 				}
 			},
 		},
 		{
-			Args:     []string{"ayd", "--name", "My Server", "dummy:"},
+			Args:     []string{"ayd", "-n", "Test Instance", "dummy:"},
 			ExitCode: 0,
 			Extra: func(t *testing.T, cmd main.AydCommand) {
-				if cmd.InstanceName != "My Server" {
-					t.Errorf("expected InstanceName is %q but got %q", "My Server", cmd.InstanceName)
+				if cmd.InstanceName != "Test Instance" {
+					t.Errorf("expected InstanceName is %q but got %q", "Test Instance", cmd.InstanceName)
 				}
 			},
 		},
diff --git a/cmd/ayd/server.go b/cmd/ayd/server.go
index e356059..a877118 100644
--- a/cmd/ayd/server.go
+++ b/cmd/ayd/server.go
@@ -38,8 +38,8 @@ func (cmd *AydCommand) reportStartServer(s *store.Store, protocol, listen string
 		"targets": tasks,
 		"version": fmt.Sprintf("%s (%s)", meta.Version, meta.Commit),
 	}
-	if meta.InstanceName != "" {
-		extra["instance_name"] = meta.InstanceName
+	if s.Name() != "" {
+		extra["instance_name"] = s.Name()
 	}
 	s.Report(u, api.Record{
 		Time:    cmd.StartedAt,
@@ -57,8 +57,8 @@ func (cmd *AydCommand) reportStopServer(s *store.Store, protocol, listen string)
 		"version": fmt.Sprintf("%s (%s)", meta.Version, meta.Commit),
 		"since":   cmd.StartedAt.Format(time.RFC3339),
 	}
-	if meta.InstanceName != "" {
-		extra["instance_name"] = meta.InstanceName
+	if s.Name() != "" {
+		extra["instance_name"] = s.Name()
 	}
 	s.Report(u, api.Record{
 		Time:    time.Now(),
diff --git a/internal/endpoint/healthz_test.go b/internal/endpoint/healthz_test.go
index c831a63..dd3c858 100644
--- a/internal/endpoint/healthz_test.go
+++ b/internal/endpoint/healthz_test.go
@@ -40,6 +40,10 @@ type DummyErrorsGetter struct {
 	messages []string
 }
 
+func (d DummyErrorsGetter) Name() string {
+	return "dummy"
+}
+
 func (d DummyErrorsGetter) Path() string {
 	return ""
 }
diff --git a/internal/endpoint/log.go b/internal/endpoint/log.go
index 926e296..ed20286 100644
--- a/internal/endpoint/log.go
+++ b/internal/endpoint/log.go
@@ -367,6 +367,7 @@ func LogHTMLEndpoint(s Store) http.HandlerFunc {
 
 		w.Header().Set("Content-Type", "text/html; charset=UTF-8")
 		handleError(s, "log.html", tmpl.Execute(newFlushWriter(w), logData{
+			InstanceName: s.Name(),
 			Query:        query,
 			RawQuery:     rawQuery.Encode(),
 			Records:      rs,
@@ -382,6 +383,7 @@ func LogHTMLEndpoint(s Store) http.HandlerFunc {
 }
 
 type logData struct {
+	InstanceName string
 	Since        time.Time
 	Until        time.Time
 	Query        string
diff --git a/internal/endpoint/log_test.go b/internal/endpoint/log_test.go
index 8cee439..9b4559b 100644
--- a/internal/endpoint/log_test.go
+++ b/internal/endpoint/log_test.go
@@ -82,7 +82,7 @@ func TestLogScanner(t *testing.T) {
 		{
 			"LogGenerator",
 			func(since, until time.Time) api.LogScanner {
-				s, err := store.New("", io.Discard)
+				s, err := store.New("", "", io.Discard)
 				if err != nil {
 					t.Fatalf("failed to create store: %s", err)
 				}
diff --git a/internal/endpoint/mcp.go b/internal/endpoint/mcp.go
index 0fddce3..37b392d 100644
--- a/internal/endpoint/mcp.go
+++ b/internal/endpoint/mcp.go
@@ -326,9 +326,9 @@ func MCPHandler(s Store) http.HandlerFunc {
 		Instructions: "Ayd is a simple alive monitoring tool. The logs and status can be large, so it is recommended to extract necessary information using jq queries instead of fetching all data at once.",
 	}
 
-	if meta.InstanceName != "" {
-		impl.Title = fmt.Sprintf("Ayd (%s)", meta.InstanceName)
-		opts.Instructions = fmt.Sprintf(`%s This Ayd instance's name is %q.`, opts.Instructions, meta.InstanceName)
+	if s.Name() != "" {
+		impl.Title = fmt.Sprintf("Ayd (%s)", s.Name())
+		opts.Instructions = fmt.Sprintf(`%s This Ayd instance's name is %q.`, opts.Instructions, s.Name())
 	}
 
 	server := mcp.NewServer(impl, opts)
diff --git a/internal/endpoint/mcp_test.go b/internal/endpoint/mcp_test.go
index fa30b0b..fd5d3db 100644
--- a/internal/endpoint/mcp_test.go
+++ b/internal/endpoint/mcp_test.go
@@ -50,7 +50,7 @@ func TestJQQuery(t *testing.T) {
 				"hostname": "example.com",
 				"port":     "",
 				"path":     "/path",
-				"queries":  map[string][]any{"query": []any{"value"}},
+				"queries":  map[string][]any{"query": {"value"}},
 				"fragment": "fragment",
 				"opaque":   "",
 			},
diff --git a/internal/endpoint/store.go b/internal/endpoint/store.go
index f6ce15f..92a539c 100644
--- a/internal/endpoint/store.go
+++ b/internal/endpoint/store.go
@@ -7,6 +7,9 @@ import (
 )
 
 type Store interface {
+	// Name returns the Ayd instance name.
+	Name() string
+
 	// Targets returns target URLs include inactive target.
 	Targets() []string
 
diff --git a/internal/endpoint/templates.go b/internal/endpoint/templates.go
index 3d319a8..ed41419 100644
--- a/internal/endpoint/templates.go
+++ b/internal/endpoint/templates.go
@@ -12,7 +12,6 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/goccy/go-json"
 	"github.com/google/uuid"
-	"github.com/macrat/ayd/internal/meta"
 	api "github.com/macrat/ayd/lib-ayd"
 	"golang.org/x/text/width"
 )
@@ -30,9 +29,6 @@ func loadHTMLTemplate(s string) *template.Template {
 
 var (
 	templateFuncs = map[string]interface{}{
-		"instance_name": func() string {
-			return meta.InstanceName
-		},
 		"sort_history": func(hm map[string]api.ProbeHistory) []api.ProbeHistory {
 			hs := make([]api.ProbeHistory, 0, len(hm))
 			for _, h := range hm {
diff --git a/internal/endpoint/templates/base.html b/internal/endpoint/templates/base.html
index 45bac0d..5e6ccb8 100644
--- a/internal/endpoint/templates/base.html
+++ b/internal/endpoint/templates/base.html
@@ -30,7 +30,7 @@ <h1>
 
 <html lang=en>
     <head>
-        <title>{{ if instance_name }}{{ instance_name }} - {{ else }}Ayd {{ end }}{{ block "title" . }}{{ end }}</title>
+        <title>{{ if .InstanceName }}{{ .InstanceName }} - {{ else }}Ayd {{ end }}{{ block "title" . }}{{ end }}</title>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width,initial-scale=1" />
 <style>
@@ -188,7 +188,7 @@ <h1>
 
         <header>
             <nav>
-                <a class="logo" href="/status.html">{{ if instance_name }}{{ instance_name }}{{ else }}Ayd{{ end }}</a>
+                <a class="logo" href="/status.html">{{ if .InstanceName }}{{ .InstanceName }}{{ else }}Ayd{{ end }}</a>
                 <ul class="site-menu">
                     <li>
                         <a href="/status.html" type="text/html">Status</a>
diff --git a/internal/endpoint/templates_test.go b/internal/endpoint/templates_test.go
index daa7ed3..c93cb52 100644
--- a/internal/endpoint/templates_test.go
+++ b/internal/endpoint/templates_test.go
@@ -6,34 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/macrat/ayd/internal/meta"
 	api "github.com/macrat/ayd/lib-ayd"
 )
 
-func TestInstanceName(t *testing.T) {
-	f := templateFuncs["instance_name"].(func() string)
-
-	// Save original value and restore after test
-	original := meta.InstanceName
-	defer func() { meta.InstanceName = original }()
-
-	t.Run("empty", func(t *testing.T) {
-		meta.InstanceName = ""
-		result := f()
-		if result != "" {
-			t.Errorf("expected empty string but got %q", result)
-		}
-	})
-
-	t.Run("with_name", func(t *testing.T) {
-		meta.InstanceName = "Test Instance"
-		result := f()
-		if result != "Test Instance" {
-			t.Errorf("expected %q but got %q", "Test Instance", result)
-		}
-	})
-}
-
 func TestInvertIncidents(t *testing.T) {
 	f := templateFuncs["invert_incidents"].(func([]api.Incident) []api.Incident)
 
diff --git a/internal/meta/instance.go b/internal/meta/instance.go
deleted file mode 100644
index 7440332..0000000
--- a/internal/meta/instance.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package meta
-
-// InstanceName holds the name of this Ayd instance.
-// It can be set via the --name/-n command-line flag.
-var InstanceName string
diff --git a/internal/scheme/http.go b/internal/scheme/http.go
index efb8a28..1c7fd50 100644
--- a/internal/scheme/http.go
+++ b/internal/scheme/http.go
@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/goccy/go-json"
+	"github.com/macrat/ayd/internal/meta"
 	api "github.com/macrat/ayd/lib-ayd"
 )
 
@@ -19,6 +20,10 @@ var (
 	HTTPUserAgent = "ayd health check"
 )
 
+func init() {
+	HTTPUserAgent = fmt.Sprintf("ayd/%s health check", meta.Version)
+}
+
 const (
 	HTTP_REDIRECT_MAX = 10
 )
diff --git a/internal/store/scanner_test.go b/internal/store/scanner_test.go
index 724ee05..ad4e5dc 100644
--- a/internal/store/scanner_test.go
+++ b/internal/store/scanner_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 func TestStore_OpenLog(t *testing.T) {
-	inMemory, err := store.New("", io.Discard)
+	inMemory, err := store.New("", "", io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create in-memory store: %s", err)
 	}
@@ -100,7 +100,7 @@ func TestStore_OpenLog(t *testing.T) {
 func TestStore_OpenLog_logRemoved(t *testing.T) {
 	p := filepath.Join(t.TempDir(), "ayd.log")
 
-	s, err := store.New(p, io.Discard)
+	s, err := store.New("", p, io.Discard)
 	if err != nil {
 		t.Fatalf("failed to make store: %s", err)
 	}
diff --git a/internal/store/store.go b/internal/store/store.go
index 5a63a96..ee58cf3 100644
--- a/internal/store/store.go
+++ b/internal/store/store.go
@@ -28,6 +28,7 @@ type RecordHandler func(api.Record)
 
 // Store is the log handler of Ayd, and it also the database of Ayd.
 type Store struct {
+	name string
 	path PathPattern
 
 	Console io.Writer
@@ -47,10 +48,11 @@ type Store struct {
 	healthy       bool
 }
 
-func New(path string, console io.Writer) (*Store, error) {
+func New(name, path string, console io.Writer) (*Store, error) {
 	ch := make(chan api.Record, 32)
 
 	store := &Store{
+		name:             name,
 		path:             ParsePathPattern(path),
 		Console:          console,
 		probeHistory:     make(probeHistoryMap),
@@ -65,6 +67,11 @@ func New(path string, console io.Writer) (*Store, error) {
 	return store, nil
 }
 
+// Name returns the Ayd instance name set by command line option.
+func (s *Store) Name() string {
+	return s.name
+}
+
 // Path returns pathes to log files.
 func (s *Store) Pathes() []string {
 	return s.path.ListAll()
@@ -497,6 +504,7 @@ func (s *Store) MakeReport(probeHistoryLength int) api.Report {
 	ih := s.incidentHistoryWithoutLock()
 
 	report := api.Report{
+		InstanceName:     s.name,
 		ProbeHistory:     make(map[string]api.ProbeHistory),
 		CurrentIncidents: make([]api.Incident, len(ci)),
 		IncidentHistory:  make([]api.Incident, len(ih)),
diff --git a/internal/store/store_test.go b/internal/store/store_test.go
index ee71986..4e42dd8 100644
--- a/internal/store/store_test.go
+++ b/internal/store/store_test.go
@@ -63,7 +63,7 @@ func TestStore_errorLogging(t *testing.T) {
 	f.Close()
 
 	buf := NewBuffer()
-	s, err := store.New(f.Name(), buf)
+	s, err := store.New("", f.Name(), buf)
 	if err != nil {
 		t.Errorf("failed to open store %s (with permission 600): %s", f.Name(), err)
 	}
@@ -121,7 +121,7 @@ func TestStore_errorLogging(t *testing.T) {
 func TestStore_Restore(t *testing.T) {
 	path := filepath.Join(t.TempDir(), "%H.log")
 
-	s1, err := store.New(path, io.Discard)
+	s1, err := store.New("", path, io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create store: %s", err)
 	}
@@ -164,7 +164,7 @@ func TestStore_Restore(t *testing.T) {
 
 	time.Sleep(100 * time.Millisecond) // wait for write
 
-	s2, err := store.New(path, io.Discard)
+	s2, err := store.New("", path, io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create store: %s", err)
 	}
@@ -239,7 +239,7 @@ func TestStore_Restore(t *testing.T) {
 }
 
 func TestStore_Restore_removePassword(t *testing.T) {
-	s, err := store.New("./testdata/with-password.log", io.Discard)
+	s, err := store.New("", "./testdata/with-password.log", io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create store: %s", err)
 	}
@@ -264,7 +264,7 @@ func TestStore_Restore_removePassword(t *testing.T) {
 }
 
 func TestStore_Restore_disableLog(t *testing.T) {
-	s, err := store.New("", io.Discard)
+	s, err := store.New("", "", io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create store: %s", err)
 	}
@@ -288,7 +288,7 @@ func TestStore_Restore_permission(t *testing.T) {
 	defer os.Remove(f.Name())
 	defer f.Close()
 
-	s, err := store.New(f.Name(), io.Discard)
+	s, err := store.New("", f.Name(), io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create store: %s", err)
 	}
@@ -323,7 +323,7 @@ func TestStore_Restore_limitBorder(t *testing.T) {
 
 	f.Sync()
 
-	s, err := store.New(f.Name(), io.Discard)
+	s, err := store.New("", f.Name(), io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create store: %s", err)
 	}
@@ -360,7 +360,7 @@ func TestStore_Restore_fileRemoved(t *testing.T) {
 	defer os.Remove(f.Name())
 	defer f.Close()
 
-	s, err := store.New(f.Name(), io.Discard)
+	s, err := store.New("", f.Name(), io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create store: %s", err)
 	}
@@ -726,7 +726,7 @@ func TestStore_incident_len_limit(t *testing.T) {
 func TestStore_Path_empty(t *testing.T) {
 	t.Parallel()
 
-	s1, err := store.New("", io.Discard)
+	s1, err := store.New("", "", io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create store")
 	}
@@ -743,7 +743,7 @@ func TestStore_Path_empty(t *testing.T) {
 
 	time.Sleep(10 * time.Millisecond) // waiting for writer
 
-	s2, err := store.New("", io.Discard)
+	s2, err := store.New("", "", io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create store")
 	}
@@ -759,7 +759,7 @@ func TestStore_ReportInternalError(t *testing.T) {
 
 	buf := &bytes.Buffer{}
 
-	s, err := store.New("", buf)
+	s, err := store.New("", "", buf)
 	if err != nil {
 		t.Fatalf("failed to create store")
 	}
@@ -782,7 +782,7 @@ func TestStore_ReportInternalError(t *testing.T) {
 func TestStore_logRotate(t *testing.T) {
 	dir := t.TempDir()
 
-	s, err := store.New(filepath.Join(dir, "dt=%Y%m%d/%H.log"), io.Discard)
+	s, err := store.New("", filepath.Join(dir, "dt=%Y%m%d/%H.log"), io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create store: %s", err)
 	}
@@ -916,6 +916,30 @@ func TestStore_MakeReport(t *testing.T) {
 	assert(3, 0, 1)
 }
 
+func TestStore_Name(t *testing.T) {
+	withoutName, err := store.New("", filepath.Join(t.TempDir(), "ayd.log"), io.Discard)
+	if err != nil {
+		t.Fatalf("failed to create store: %s", err)
+	}
+	if withoutName.Name() != "" {
+		t.Errorf("unexpected name for store without name: %q", withoutName.Name())
+	}
+	if n := withoutName.MakeReport(10).InstanceName; n != "" {
+		t.Errorf("unexpected name in report for store without name: %q", n)
+	}
+
+	withName, err := store.New("test", filepath.Join(t.TempDir(), "ayd.log"), io.Discard)
+	if err != nil {
+		t.Fatalf("failed to create store: %s", err)
+	}
+	if withName.Name() != "test" {
+		t.Errorf("unexpected name for store with name: %q", withName.Name())
+	}
+	if n := withName.MakeReport(10).InstanceName; n != "test" {
+		t.Errorf("unexpected name in report for store with name: %q", n)
+	}
+}
+
 func BenchmarkStore_Append(b *testing.B) {
 	for _, status := range []api.Status{api.StatusHealthy, api.StatusFailure} {
 		b.Run(status.String(), func(b *testing.B) {
diff --git a/internal/testutil/store.go b/internal/testutil/store.go
index 602a5c9..a90fad1 100644
--- a/internal/testutil/store.go
+++ b/internal/testutil/store.go
@@ -14,7 +14,7 @@ import (
 func NewStoreWithConsole(t testing.TB, w io.Writer) *store.Store {
 	t.Helper()
 
-	s, err := store.New(filepath.Join(t.TempDir(), "ayd.log"), w)
+	s, err := store.New("", filepath.Join(t.TempDir(), "ayd.log"), w)
 	if err != nil {
 		t.Fatalf("failed to create store: %s", err)
 	}
@@ -35,7 +35,7 @@ func NewStoreWithLog(t testing.TB) *store.Store {
 		t.Fatalf("failed to prepare test log file: %s", err)
 	}
 
-	s, err := store.New(fpath, io.Discard)
+	s, err := store.New("", fpath, io.Discard)
 	if err != nil {
 		t.Fatalf("failed to create store: %s", err)
 	}
diff --git a/lib-ayd/report.go b/lib-ayd/report.go
index 0fe4716..94928ff 100644
--- a/lib-ayd/report.go
+++ b/lib-ayd/report.go
@@ -10,6 +10,9 @@ import (
 //
 // Deprecated: this struct planed be removed in future version.
 type Report struct {
+	// InstanceName is the name of Ayd instance.
+	InstanceName string
+
 	// ProbeHistory is the map of ProbeHistory.
 	// The key is target URL string, and the value is struct ProbeHistory.
 	ProbeHistory map[string]ProbeHistory

From 42719f6b53875125f816a3ae026c2edc4f5713a2 Mon Sep 17 00:00:00 2001
From: MacRat <m@crat.jp>
Date: Sat, 22 Nov 2025 14:35:20 +0900
Subject: [PATCH 10/11] test(MCP): improve test related to instance name

---
 cmd/ayd/main.go                     |  4 --
 cmd/ayd/server_test.go              |  4 +-
 internal/endpoint/benchmark_test.go |  2 +-
 internal/endpoint/log_fuzz_test.go  |  2 +-
 internal/endpoint/log_test.go       |  6 +--
 internal/endpoint/mcp_test.go       | 61 ++++++++++++++++++++++++++++
 internal/logconv/csv_test.go        |  2 +-
 internal/logconv/ltsv_test.go       |  2 +-
 internal/logconv/xlsx_test.go       |  2 +-
 internal/store/scanner_test.go      |  2 +-
 internal/store/store_test.go        |  2 +-
 internal/testutil/endpoint.go       |  4 +-
 internal/testutil/store.go          | 63 ++++++++++++++++++++---------
 13 files changed, 120 insertions(+), 36 deletions(-)

diff --git a/cmd/ayd/main.go b/cmd/ayd/main.go
index c247df4..58cfe69 100644
--- a/cmd/ayd/main.go
+++ b/cmd/ayd/main.go
@@ -16,10 +16,6 @@ import (
 	"github.com/spf13/pflag"
 )
 
-func init() {
-	scheme.HTTPUserAgent = fmt.Sprintf("ayd/%s health check", meta.Version)
-}
-
 type AydCommand struct {
 	OutStream io.Writer
 	ErrStream io.Writer
diff --git a/cmd/ayd/server_test.go b/cmd/ayd/server_test.go
index 0f5fe1a..7470d48 100644
--- a/cmd/ayd/server_test.go
+++ b/cmd/ayd/server_test.go
@@ -61,7 +61,7 @@ func TestRunServer_tls(t *testing.T) {
 	log, stdout := io.Pipe()
 	defer log.Close()
 	defer stdout.Close()
-	s := testutil.NewStoreWithConsole(t, stdout)
+	s := testutil.NewStore(t, testutil.WithConsole(stdout))
 	defer s.Close()
 
 	cert := testutil.NewCertificate(t)
@@ -129,7 +129,7 @@ func TestRunServer_tls_error(t *testing.T) {
 			cmd.CertPath = tt.Cert
 			cmd.KeyPath = tt.Key
 
-			s := testutil.NewStoreWithConsole(t, output)
+			s := testutil.NewStore(t, testutil.WithConsole(output))
 
 			ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
 			defer cancel()
diff --git a/internal/endpoint/benchmark_test.go b/internal/endpoint/benchmark_test.go
index e328f9b..82f94a7 100644
--- a/internal/endpoint/benchmark_test.go
+++ b/internal/endpoint/benchmark_test.go
@@ -37,7 +37,7 @@ func Benchmark_endpoints(b *testing.B) {
 
 	for _, tt := range benchmarks {
 		b.Run(tt.Path, func(b *testing.B) {
-			s := testutil.NewStoreWithLog(b)
+			s := testutil.NewStore(b, testutil.WithLog())
 			defer s.Close()
 
 			h := tt.Endpoint(s)
diff --git a/internal/endpoint/log_fuzz_test.go b/internal/endpoint/log_fuzz_test.go
index 6b53e17..4ff639e 100644
--- a/internal/endpoint/log_fuzz_test.go
+++ b/internal/endpoint/log_fuzz_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 func FuzzLogJsonEndpoint(f *testing.F) {
-	s := testutil.NewStoreWithLog(f)
+	s := testutil.NewStore(f, testutil.WithLog())
 	defer s.Close()
 	handler := endpoint.LogJsonEndpoint(s)
 
diff --git a/internal/endpoint/log_test.go b/internal/endpoint/log_test.go
index 9b4559b..6520022 100644
--- a/internal/endpoint/log_test.go
+++ b/internal/endpoint/log_test.go
@@ -157,7 +157,7 @@ func TestLogScanner(t *testing.T) {
 }
 
 func TestPagingScanner(t *testing.T) {
-	s := testutil.NewStoreWithLog(t)
+	s := testutil.NewStore(t, testutil.WithLog())
 
 	messages := []string{
 		"hello world",
@@ -218,7 +218,7 @@ func TestPagingScanner(t *testing.T) {
 }
 
 func TestContextScanner_scanAll(t *testing.T) {
-	s := testutil.NewStoreWithLog(t)
+	s := testutil.NewStore(t, testutil.WithLog())
 
 	r, err := s.OpenLog(time.Unix(0, 0), time.Date(2100, 1, 1, 0, 0, 0, 0, time.UTC))
 	if err != nil {
@@ -243,7 +243,7 @@ func TestContextScanner_scanAll(t *testing.T) {
 }
 
 func TestContextScanner_cancel(t *testing.T) {
-	s := testutil.NewStoreWithLog(t)
+	s := testutil.NewStore(t, testutil.WithLog())
 
 	r, err := s.OpenLog(time.Unix(0, 0), time.Date(2100, 1, 1, 0, 0, 0, 0, time.UTC))
 	if err != nil {
diff --git a/internal/endpoint/mcp_test.go b/internal/endpoint/mcp_test.go
index fd5d3db..08ef632 100644
--- a/internal/endpoint/mcp_test.go
+++ b/internal/endpoint/mcp_test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -624,3 +625,63 @@ func TestMCPHandler_QueryLogs(t *testing.T) {
 
 	RunMCPTest(t, "query_logs", tests)
 }
+
+func TestMCP_connection(t *testing.T) {
+	tests := []struct {
+		Name             string
+		WithInstanceName bool
+	}{
+		{"without_instance_name", false},
+		{"with_instance_name", true},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.Name, func(t *testing.T) {
+			var opts []testutil.StoreOption
+			if tt.WithInstanceName {
+				opts = append(opts, testutil.WithInstanceName("test-instance"))
+			}
+
+			srv := testutil.StartTestServer(t, opts...)
+			t.Cleanup(func() {
+				srv.Close()
+			})
+
+			client := mcp.NewClient(&mcp.Implementation{
+				Name:    "test-client",
+				Version: "none",
+			}, nil)
+			sess, err := client.Connect(t.Context(), &mcp.StreamableClientTransport{
+				Endpoint: srv.URL + "/mcp",
+			}, nil)
+			if err != nil {
+				t.Fatalf("failed to connect to MCP server: %v", err)
+			}
+			defer sess.Close()
+
+			initResult := sess.InitializeResult()
+			if initResult.ServerInfo.Name != "ayd" {
+				t.Errorf("unexpected server name: %q", initResult.ServerInfo.Name)
+			}
+			if tt.WithInstanceName {
+				if initResult.ServerInfo.Title != "Ayd (test-instance)" {
+					t.Errorf("unexpected server title: %q", initResult.ServerInfo.Title)
+				}
+				if !strings.Contains(initResult.Instructions, "test-instance") {
+					t.Errorf("instructions does not contain instance name: %q", initResult.Instructions)
+				}
+			} else {
+				if initResult.ServerInfo.Title != "Ayd" {
+					t.Errorf("unexpected server title: %q", initResult.ServerInfo.Title)
+				}
+				if strings.Contains(initResult.Instructions, "instance") {
+					t.Errorf("instructions contains instance name: %q", initResult.Instructions)
+				}
+			}
+
+			if err := sess.Ping(t.Context(), nil); err != nil {
+				t.Fatalf("failed to ping MCP server: %v", err)
+			}
+		})
+	}
+}
diff --git a/internal/logconv/csv_test.go b/internal/logconv/csv_test.go
index 8cbfdd9..e87e000 100644
--- a/internal/logconv/csv_test.go
+++ b/internal/logconv/csv_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestToCSV(t *testing.T) {
-	s := testutil.NewStoreWithLog(t)
+	s := testutil.NewStore(t, testutil.WithLog())
 
 	r, err := s.OpenLog(time.Unix(0, 0), time.Date(9999, 0, 0, 0, 0, 0, 0, time.UTC))
 	if err != nil {
diff --git a/internal/logconv/ltsv_test.go b/internal/logconv/ltsv_test.go
index 7d9d983..f83558c 100644
--- a/internal/logconv/ltsv_test.go
+++ b/internal/logconv/ltsv_test.go
@@ -10,7 +10,7 @@ import (
 )
 
 func TestToLTSV(t *testing.T) {
-	s := testutil.NewStoreWithLog(t)
+	s := testutil.NewStore(t, testutil.WithLog())
 
 	r, err := s.OpenLog(time.Unix(0, 0), time.Date(9999, 0, 0, 0, 0, 0, 0, time.UTC))
 	if err != nil {
diff --git a/internal/logconv/xlsx_test.go b/internal/logconv/xlsx_test.go
index 820aebc..5c49195 100644
--- a/internal/logconv/xlsx_test.go
+++ b/internal/logconv/xlsx_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestToXlsx(t *testing.T) {
-	s := testutil.NewStoreWithLog(t)
+	s := testutil.NewStore(t, testutil.WithLog())
 
 	r, err := s.OpenLog(time.Unix(0, 0), time.Date(9999, 0, 0, 0, 0, 0, 0, time.UTC))
 	if err != nil {
diff --git a/internal/store/scanner_test.go b/internal/store/scanner_test.go
index ad4e5dc..2f5ffe4 100644
--- a/internal/store/scanner_test.go
+++ b/internal/store/scanner_test.go
@@ -18,7 +18,7 @@ func TestStore_OpenLog(t *testing.T) {
 		t.Fatalf("failed to create in-memory store: %s", err)
 	}
 	defer inMemory.Close()
-	inStorage := testutil.NewStoreWithLog(t)
+	inStorage := testutil.NewStore(t, testutil.WithLog())
 	defer inStorage.Close()
 
 	stores := []struct {
diff --git a/internal/store/store_test.go b/internal/store/store_test.go
index 4e42dd8..3d43ac6 100644
--- a/internal/store/store_test.go
+++ b/internal/store/store_test.go
@@ -866,7 +866,7 @@ func TestStore_logRotate(t *testing.T) {
 }
 
 func TestStore_MakeReport(t *testing.T) {
-	s := testutil.NewStoreWithLog(t)
+	s := testutil.NewStore(t, testutil.WithLog())
 	defer s.Close()
 
 	assert := func(targetCount, currentIncidentCount, incidentHistoryCount int) {
diff --git a/internal/testutil/endpoint.go b/internal/testutil/endpoint.go
index d65b3ba..804ddfa 100644
--- a/internal/testutil/endpoint.go
+++ b/internal/testutil/endpoint.go
@@ -8,10 +8,10 @@ import (
 	api "github.com/macrat/ayd/lib-ayd"
 )
 
-func StartTestServer(t testing.TB) *httptest.Server {
+func StartTestServer(t testing.TB, opts ...StoreOption) *httptest.Server {
 	t.Helper()
 
-	s := NewStoreWithLog(t)
+	s := NewStore(t, append(opts, WithLog())...)
 	t.Cleanup(func() {
 		s.Close()
 	})
diff --git a/internal/testutil/store.go b/internal/testutil/store.go
index a90fad1..b8f27b7 100644
--- a/internal/testutil/store.go
+++ b/internal/testutil/store.go
@@ -11,41 +11,68 @@ import (
 	api "github.com/macrat/ayd/lib-ayd"
 )
 
-func NewStoreWithConsole(t testing.TB, w io.Writer) *store.Store {
-	t.Helper()
+type StoreOption func(*storeOptionStruct)
 
-	s, err := store.New("", filepath.Join(t.TempDir(), "ayd.log"), w)
-	if err != nil {
-		t.Fatalf("failed to create store: %s", err)
+type storeOptionStruct struct {
+	InstanceName string
+	Console      io.Writer
+	WithLog      bool
+}
+
+func WithInstanceName(name string) StoreOption {
+	return func(o *storeOptionStruct) {
+		o.InstanceName = name
 	}
+}
 
-	return s
+func WithConsole(w io.Writer) StoreOption {
+	return func(o *storeOptionStruct) {
+		o.Console = w
+	}
+}
+
+func WithLog() StoreOption {
+	return func(o *storeOptionStruct) {
+		o.WithLog = true
+	}
 }
 
-func NewStore(t testing.TB) *store.Store {
+func NewStore(t testing.TB, opts ...StoreOption) *store.Store {
 	t.Helper()
 
-	return NewStoreWithConsole(t, io.Discard)
-}
+	var opt storeOptionStruct
+	for _, o := range opts {
+		o(&opt)
+	}
 
-func NewStoreWithLog(t testing.TB) *store.Store {
 	fpath := filepath.Join(t.TempDir(), "ayd.log")
 
-	if err := os.WriteFile(fpath, []byte(DummyLog), 0644); err != nil {
-		t.Fatalf("failed to prepare test log file: %s", err)
+	if opt.WithLog {
+		if err := os.WriteFile(fpath, []byte(DummyLog), 0644); err != nil {
+			t.Fatalf("failed to prepare test log file: %s", err)
+		}
 	}
 
-	s, err := store.New("", fpath, io.Discard)
+	name := opt.InstanceName
+
+	console := io.Discard
+	if opt.Console != nil {
+		console = opt.Console
+	}
+
+	s, err := store.New(name, fpath, console)
 	if err != nil {
 		t.Fatalf("failed to create store: %s", err)
 	}
 
-	if err = s.Restore(); err != nil {
-		t.Fatalf("failed to restore store: %s", err)
-	}
+	if opt.WithLog {
+		if err = s.Restore(); err != nil {
+			t.Fatalf("failed to restore store: %s", err)
+		}
 
-	noRecordTarget := &api.URL{Scheme: "dummy", Fragment: "no-record-yet"}
-	s.ActivateTarget(noRecordTarget, noRecordTarget)
+		noRecordTarget := &api.URL{Scheme: "dummy", Fragment: "no-record-yet"}
+		s.ActivateTarget(noRecordTarget, noRecordTarget)
+	}
 
 	return s
 }

From ad9db44d579205d6c097063cced6ab48950ab9e2 Mon Sep 17 00:00:00 2001
From: SHIDA Yuma <m@crat.jp>
Date: Sat, 22 Nov 2025 14:49:24 +0900
Subject: [PATCH 11/11] doc(lib): improve grammar in comment

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 lib-ayd/report.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib-ayd/report.go b/lib-ayd/report.go
index 94928ff..2ee2247 100644
--- a/lib-ayd/report.go
+++ b/lib-ayd/report.go
@@ -10,7 +10,7 @@ import (
 //
 // Deprecated: this struct planed be removed in future version.
 type Report struct {
-	// InstanceName is the name of Ayd instance.
+	// InstanceName is the name of the Ayd instance.
 	InstanceName string
 
 	// ProbeHistory is the map of ProbeHistory.