From ba579389b822af27dfb8ff32e7865b292554b8a1 Mon Sep 17 00:00:00 2001 From: Amolith Date: Tue, 23 Dec 2025 13:56:43 -0700 Subject: [PATCH] chore: migrate URLs, use fang Also integrates fang for version handling and fixes build targets to use root package so ldflags work correctly. Assisted-by: Claude Opus 4.5 via Crush --- README.md | 6 ++-- Taskfile.yaml | 6 ++-- cmd/config/areas.go | 2 +- cmd/config/config.go | 6 ++-- cmd/config/habits.go | 2 +- cmd/config/steps.go | 4 +-- cmd/config/token.go | 4 +-- cmd/config/ui.go | 4 +-- cmd/root.go | 23 +++--------- cmd/serve.go | 14 ++++---- go.mod | 34 ++++++++++++------ go.sum | 74 +++++++++++++++++++++++++------------- main.go | 2 +- tools/areas/handler.go | 2 +- tools/habits/handler.go | 2 +- tools/tasks/handler.go | 2 +- tools/timestamp/handler.go | 2 +- 17 files changed, 108 insertions(+), 81 deletions(-) diff --git a/README.md b/README.md index 9f7ef4620498894af3395f246a38de23b40eb595..88d8e490477a11fc4c654123a36b44cf03fa563b 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ SPDX-License-Identifier: CC0-1.0 _Interact with [Lunatask](https://lunatask.app) using `$PREFERRED_LLM`_ [![scratchanitch.dev badge](https://img.shields.io/badge/scratchanitch-dev-FFC4B5)](https://scratchanitch.dev) -[![Go Report Card](https://goreportcard.com/badge/git.sr.ht/~amolith/lunatask-mcp-server)](https://goreportcard.com/report/git.sr.ht/~amolith/lunatask-mcp-server) -[![REUSE status](https://api.reuse.software/badge/git.sr.ht/~amolith/lunatask-mcp-server)](https://api.reuse.software/info/git.sr.ht/~amolith/lunatask-mcp-server) +[![Go Report Card](https://goreportcard.com/badge/git.secluded.site/lunatask-mcp-server)](https://goreportcard.com/report/git.secluded.site/lunatask-mcp-server) +[![REUSE status](https://api.reuse.software/badge/git.secluded.site/lunatask-mcp-server)](https://api.reuse.software/info/git.secluded.site/lunatask-mcp-server) [![Liberapay donation status](https://img.shields.io/liberapay/receives/Amolith.svg?logo=liberapay)](https://liberapay.com/Amolith/) **Note:** lots of this was written by LLMs and I haven't reviewed it thoroughly @@ -26,7 +26,7 @@ Ensure you have [the Go toolchain] installed. [the Go toolchain]: https://go.dev/doc/install ```sh -git clone https://git.sr.ht/~amolith/lunatask-mcp-server +git clone https://git.secluded.site/lunatask-mcp-server cd lunatask-mcp-server # specify GOOS and GOARCH if cross-compiling CGO_ENABLED=0 go build -o lunatask-mcp-server . diff --git a/Taskfile.yaml b/Taskfile.yaml index 38f67834ec6cd91a55b65112fd82c90deed2e3e1..80a5acc4a67955d3c9cef5e65ee50761a38cd61d 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -60,17 +60,17 @@ tasks: build: cmds: - - go build -o lunatask-mcp-server -ldflags "-s -w -X main.version={{.VERSION}}" ./cmd + - go build -o lunatask-mcp-server -ldflags "-s -w -X main.version={{.VERSION}}" . generates: - lunatask-mcp-server install: cmds: - - go install -ldflags "-s -w -X main.version={{.VERSION}}" ./cmd + - go install -ldflags "-s -w -X main.version={{.VERSION}}" . run: cmds: - - go run -ldflags "-s -w -X main.version={{.VERSION}}" ./cmd {{.CLI_ARGS}} + - go run -ldflags "-s -w -X main.version={{.VERSION}}" . {{.CLI_ARGS}} pack: desc: Pack lunatask-mcp-server with UPX diff --git a/cmd/config/areas.go b/cmd/config/areas.go index 0c622cb74e4aacddf56c032a236ee59a36fbacad..a41e9dd6641c5685a6f2e61793d527cca3f4a207 100644 --- a/cmd/config/areas.go +++ b/cmd/config/areas.go @@ -10,7 +10,7 @@ import ( "github.com/charmbracelet/huh" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/config" + "git.secluded.site/lunatask-mcp-server/internal/config" ) func manageAreas(cfg *config.Config) error { diff --git a/cmd/config/config.go b/cmd/config/config.go index 43f61282a8be0820a9fcf061a5f21139c0e3cc05..27f36a433e4e16637891a13629cf49c531de5bf7 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -15,8 +15,8 @@ import ( "github.com/charmbracelet/huh" "github.com/spf13/cobra" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/config" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/ui" + "git.secluded.site/lunatask-mcp-server/internal/config" + "git.secluded.site/lunatask-mcp-server/internal/ui" ) // errQuit signals that the user wants to exit the wizard entirely. @@ -267,7 +267,7 @@ func saveWithSummary(cmd *cobra.Command, cfg *config.Config) error { // exampleConfig is a commented TOML config for manual editing. const exampleConfig = `# lunatask-mcp-server configuration file -# See: https://git.sr.ht/~amolith/lunatask-mcp-server for documentation +# See: https://git.secluded.site/lunatask-mcp-server for documentation # Server settings [server] diff --git a/cmd/config/habits.go b/cmd/config/habits.go index 1d27030abe265b7c6aa3efcae4ff2807165f66ed..3426ab338d04eed331ead6edad5f1759ab57e81e 100644 --- a/cmd/config/habits.go +++ b/cmd/config/habits.go @@ -10,7 +10,7 @@ import ( "github.com/charmbracelet/huh" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/config" + "git.secluded.site/lunatask-mcp-server/internal/config" ) func manageHabits(cfg *config.Config) error { diff --git a/cmd/config/steps.go b/cmd/config/steps.go index b6efdde8991f5fdb2c26e91ec3eddac96e3d2821..07f925c2b5237a6091101463acd169a9cad5211f 100644 --- a/cmd/config/steps.go +++ b/cmd/config/steps.go @@ -12,8 +12,8 @@ import ( "github.com/charmbracelet/huh" "github.com/spf13/cobra" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/config" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/ui" + "git.secluded.site/lunatask-mcp-server/internal/config" + "git.secluded.site/lunatask-mcp-server/internal/ui" ) // Port validation errors. diff --git a/cmd/config/token.go b/cmd/config/token.go index a80f7ec896876a1af909e4d26f34f3b6f5ab18bc..27e7c1ddfed059cebb586ceff384cfd86a683de7 100644 --- a/cmd/config/token.go +++ b/cmd/config/token.go @@ -15,8 +15,8 @@ import ( "github.com/charmbracelet/huh" "github.com/spf13/cobra" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/client" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/ui" + "git.secluded.site/lunatask-mcp-server/internal/client" + "git.secluded.site/lunatask-mcp-server/internal/ui" ) const tokenValidationTimeout = 10 * time.Second diff --git a/cmd/config/ui.go b/cmd/config/ui.go index 636493050742b5573b68a302ad246427bd315d58..f53f5d6dd45ff34500b72a039ab20ecc88944033 100644 --- a/cmd/config/ui.go +++ b/cmd/config/ui.go @@ -16,8 +16,8 @@ import ( "github.com/spf13/cobra" "git.secluded.site/go-lunatask" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/config" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/ui" + "git.secluded.site/lunatask-mcp-server/internal/config" + "git.secluded.site/lunatask-mcp-server/internal/ui" ) const ( diff --git a/cmd/root.go b/cmd/root.go index efc0b58a7d3f0d07c160d5b7f3898de3084c8167..90c8417acbe4da7cfbb45ac91e45723fa126cc52 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,13 +6,16 @@ package cmd import ( + "context" "os" + "github.com/charmbracelet/fang" "github.com/spf13/cobra" - configcmd "git.sr.ht/~amolith/lunatask-mcp-server/cmd/config" + configcmd "git.secluded.site/lunatask-mcp-server/cmd/config" ) +// version is set by Execute and used by serve command for MCP server info. var version = "dev" // rootCmd is the base command when called without subcommands. @@ -30,28 +33,12 @@ Use 'lunatask-mcp-server config' to configure the server interactively.`, func init() { rootCmd.AddCommand(configcmd.Cmd) rootCmd.AddCommand(serveCmd) - rootCmd.AddCommand(versionCmd) -} - -//nolint:exhaustruct // cobra only requires a subset of fields -var versionCmd = &cobra.Command{ - Use: "version", - Short: "Print version information", - Run: func(cmd *cobra.Command, _ []string) { - _, _ = cmd.OutOrStdout().Write([]byte("lunatask-mcp-server " + version + "\n")) - }, } // Execute runs the root command. func Execute(v string) { version = v - - if err := rootCmd.Execute(); err != nil { + if err := fang.Execute(context.Background(), rootCmd, fang.WithVersion(version)); err != nil { os.Exit(1) } } - -// SetVersion sets the version for display. -func SetVersion(v string) { - version = v -} diff --git a/cmd/serve.go b/cmd/serve.go index 1326f1a1796abeb41ce3b264ed7790431d228eb1..4466ff87bb838a0c11e1a655a3b3c09199a613ec 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -17,13 +17,13 @@ import ( "github.com/modelcontextprotocol/go-sdk/mcp" "github.com/spf13/cobra" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/client" - "git.sr.ht/~amolith/lunatask-mcp-server/internal/config" - "git.sr.ht/~amolith/lunatask-mcp-server/tools/areas" - "git.sr.ht/~amolith/lunatask-mcp-server/tools/habits" - "git.sr.ht/~amolith/lunatask-mcp-server/tools/shared" - "git.sr.ht/~amolith/lunatask-mcp-server/tools/tasks" - "git.sr.ht/~amolith/lunatask-mcp-server/tools/timestamp" + "git.secluded.site/lunatask-mcp-server/internal/client" + "git.secluded.site/lunatask-mcp-server/internal/config" + "git.secluded.site/lunatask-mcp-server/tools/areas" + "git.secluded.site/lunatask-mcp-server/tools/habits" + "git.secluded.site/lunatask-mcp-server/tools/shared" + "git.secluded.site/lunatask-mcp-server/tools/tasks" + "git.secluded.site/lunatask-mcp-server/tools/timestamp" ) // Serve errors. diff --git a/go.mod b/go.mod index 780316277f418dbbef91cf6c31b048464cac8edc..c8550c95e658fefaa1fb6eb1908b9a45002e6671 100644 --- a/go.mod +++ b/go.mod @@ -2,13 +2,14 @@ // // SPDX-License-Identifier: CC0-1.0 -module git.sr.ht/~amolith/lunatask-mcp-server +module git.secluded.site/lunatask-mcp-server go 1.25.5 require ( git.secluded.site/go-lunatask v0.1.0-rc10 github.com/BurntSushi/toml v1.5.0 + github.com/charmbracelet/fang v0.4.4 github.com/charmbracelet/huh v0.8.0 github.com/charmbracelet/huh/spinner v0.0.0-20251215014908-6f7d32faaff3 github.com/charmbracelet/lipgloss v1.1.0 @@ -21,16 +22,24 @@ require ( require ( al.essio.dev/pkg/shellescape v1.5.1 // indirect + charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251106193318-19329a3e8410 // indirect github.com/atotto/clipboard v0.1.4 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/catppuccin/go v0.3.0 // indirect github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 // indirect github.com/charmbracelet/bubbletea v1.3.10 // indirect - github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect - github.com/charmbracelet/x/ansi v0.10.1 // indirect - github.com/charmbracelet/x/cellbuf v0.0.13 // indirect + github.com/charmbracelet/colorprofile v0.4.1 // indirect + github.com/charmbracelet/ultraviolet v0.0.0-20251217160852-6b0c0e26fad9 // indirect + github.com/charmbracelet/x/ansi v0.11.3 // indirect + github.com/charmbracelet/x/cellbuf v0.0.14 // indirect + github.com/charmbracelet/x/exp/charmtone v0.0.0-20251215102626-e0db08df7383 // indirect github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect - github.com/charmbracelet/x/term v0.2.1 // indirect + github.com/charmbracelet/x/term v0.2.2 // indirect + github.com/charmbracelet/x/termios v0.1.1 // indirect + github.com/charmbracelet/x/windows v0.2.2 // indirect + github.com/clipperhouse/displaywidth v0.6.2 // indirect + github.com/clipperhouse/stringish v0.1.1 // indirect + github.com/clipperhouse/uax29/v2 v2.3.0 // indirect github.com/danieljoos/wincred v1.2.2 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect @@ -39,18 +48,23 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/ijt/goparsify v0.0.0-20221203142333-3a5276334b8d // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/lucasb-eyer/go-colorful v1.2.0 // indirect + github.com/lucasb-eyer/go-colorful v1.3.0 // indirect github.com/mattn/go-localereader v0.0.1 // indirect - github.com/mattn/go-runewidth v0.0.16 // indirect + github.com/mattn/go-runewidth v0.0.19 // indirect github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect github.com/muesli/cancelreader v0.2.2 // indirect + github.com/muesli/mango v0.2.0 // indirect + github.com/muesli/mango-cobra v1.3.0 // indirect + github.com/muesli/mango-pflag v0.2.0 // indirect + github.com/muesli/roff v0.1.0 // indirect github.com/muesli/termenv v0.16.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect - github.com/spf13/pflag v1.0.9 // indirect + github.com/spf13/pflag v1.0.10 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect github.com/yosida95/uritemplate/v3 v3.0.2 // indirect golang.org/x/oauth2 v0.30.0 // indirect - golang.org/x/sys v0.36.0 // indirect - golang.org/x/text v0.23.0 // indirect + golang.org/x/sync v0.19.0 // indirect + golang.org/x/sys v0.39.0 // indirect + golang.org/x/text v0.32.0 // indirect ) diff --git a/go.sum b/go.sum index 318e9e821b12d28823e6d595271ba4d3dab5886b..59278c75ca28db997c1c5507808752e81a439527 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ al.essio.dev/pkg/shellescape v1.5.1 h1:86HrALUujYS/h+GtqoB26SBEdkWfmMI6FubjXlsXyho= al.essio.dev/pkg/shellescape v1.5.1/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890= +charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251106193318-19329a3e8410 h1:D9PbaszZYpB4nj+d6HTWr1onlmlyuGVNfL9gAi8iB3k= +charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251106193318-19329a3e8410/go.mod h1:1qZyvvVCenJO2M1ac2mX0yyiIZJoZmDM4DG4s0udJkU= git.secluded.site/go-lunatask v0.1.0-rc10 h1:KKkYNs/cipNjIlRPXAvpPm5QcWSuA3REcG8XZ8sALk4= git.secluded.site/go-lunatask v0.1.0-rc10/go.mod h1:rxps7BBqF+BkY8VN5E7J9zSOzSbtZ1hDmLEOHxjTHZQ= github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= @@ -18,32 +20,46 @@ github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 h1:JFgG/x github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7/go.mod h1:ISC1gtLcVilLOf23wvTfoQuYbW2q0JevFxPfUzZ9Ybw= github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw= github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4= -github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= -github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= +github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk= +github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk= +github.com/charmbracelet/fang v0.4.4 h1:G4qKxF6or/eTPgmAolwPuRNyuci3hTUGGX1rj1YkHJY= +github.com/charmbracelet/fang v0.4.4/go.mod h1:P5/DNb9DddQ0Z0dbc0P3ol4/ix5Po7Ofr2KMBfAqoCo= github.com/charmbracelet/huh v0.8.0 h1:Xz/Pm2h64cXQZn/Jvele4J3r7DDiqFCNIVteYukxDvY= github.com/charmbracelet/huh v0.8.0/go.mod h1:5YVc+SlZ1IhQALxRPpkGwwEKftN/+OlJlnJYlDRFqN4= github.com/charmbracelet/huh/spinner v0.0.0-20251215014908-6f7d32faaff3 h1:KUeWGoKnmyrLaDIa0smE6pK5eFMZWNIxPGweQR12iLg= github.com/charmbracelet/huh/spinner v0.0.0-20251215014908-6f7d32faaff3/go.mod h1:OMqKat/mm9a/qOnpuNOPyYO9bPzRNnmzLnRZT5KYltg= github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= -github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7D2jVDQ= -github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE= -github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k= -github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= +github.com/charmbracelet/ultraviolet v0.0.0-20251217160852-6b0c0e26fad9 h1:dsDBRP9Iyco0EjVpCsAzl8VGbxk04fP3sa80ySJSAZw= +github.com/charmbracelet/ultraviolet v0.0.0-20251217160852-6b0c0e26fad9/go.mod h1:Ns3cOzzY9hEFFeGxB6VpfgRnqOJZJFhQAPfRxPqflQs= +github.com/charmbracelet/x/ansi v0.11.3 h1:6DcVaqWI82BBVM/atTyq6yBoRLZFBsnoDoX9GCu2YOI= +github.com/charmbracelet/x/ansi v0.11.3/go.mod h1:yI7Zslym9tCJcedxz5+WBq+eUGMJT0bM06Fqy1/Y4dI= +github.com/charmbracelet/x/cellbuf v0.0.14 h1:iUEMryGyFTelKW3THW4+FfPgi4fkmKnnaLOXuc+/Kj4= +github.com/charmbracelet/x/cellbuf v0.0.14/go.mod h1:P447lJl49ywBbil/KjCk2HexGh4tEY9LH0/1QrZZ9rA= github.com/charmbracelet/x/conpty v0.1.0 h1:4zc8KaIcbiL4mghEON8D72agYtSeIgq8FSThSPQIb+U= github.com/charmbracelet/x/conpty v0.1.0/go.mod h1:rMFsDJoDwVmiYM10aD4bH2XiRgwI7NYJtQgl5yskjEQ= github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA= github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0= -github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ= -github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U= +github.com/charmbracelet/x/exp/charmtone v0.0.0-20251215102626-e0db08df7383 h1:xGojlO6kHCDB1k6DolME79LG0u90TzVd8atGhmxFRIo= +github.com/charmbracelet/x/exp/charmtone v0.0.0-20251215102626-e0db08df7383/go.mod h1:nsExn0DGyX0lh9LwLHTn2Gg+hafdzfSXnC+QmEJTZFY= +github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6gmGpCE7F3FcjaOEKYriCvpmIN4+6OS/RD0vm4uIA= +github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I= github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 h1:qko3AQ4gK1MTS/de7F5hPGx6/k1u0w4TeYmBFwzYVP4= github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ= -github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= -github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= +github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk= +github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI= github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY= github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo= +github.com/charmbracelet/x/windows v0.2.2 h1:IofanmuvaxnKHuV04sC0eBy/smG6kIKrWG2/jYn2GuM= +github.com/charmbracelet/x/windows v0.2.2/go.mod h1:/8XtdKZzedat74NQFn0NGlGL4soHB0YQZrETF96h75k= github.com/charmbracelet/x/xpty v0.1.2 h1:Pqmu4TEJ8KeA9uSkISKMU3f+C1F6OGBn8ABuGlqCbtI= github.com/charmbracelet/x/xpty v0.1.2/go.mod h1:XK2Z0id5rtLWcpeNiMYBccNNBrP2IJnzHI0Lq13Xzq4= +github.com/clipperhouse/displaywidth v0.6.2 h1:ZDpTkFfpHOKte4RG5O/BOyf3ysnvFswpyYrV7z2uAKo= +github.com/clipperhouse/displaywidth v0.6.2/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o= +github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs= +github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA= +github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4= +github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s= github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= @@ -73,14 +89,14 @@ github.com/ijt/goparsify v0.0.0-20221203142333-3a5276334b8d h1:LFOmpWrSbtolg0YqY github.com/ijt/goparsify v0.0.0-20221203142333-3a5276334b8d/go.mod h1:112TOyA+aruNSUBlyBWlKBdLVYTdhjiO2CKD0j/URSU= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= -github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag= +github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= -github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= -github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw= +github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE= github.com/modelcontextprotocol/go-sdk v1.2.0 h1:Y23co09300CEk8iZ/tMxIX1dVmKZkzoSBZOpJwUnc/s= @@ -89,22 +105,30 @@ github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= +github.com/muesli/mango v0.2.0 h1:iNNc0c5VLQ6fsMgAqGQofByNUBH2Q2nEbD6TaI+5yyQ= +github.com/muesli/mango v0.2.0/go.mod h1:5XFpbC8jY5UUv89YQciiXNlbi+iJgt29VDC5xbzrLL4= +github.com/muesli/mango-cobra v1.3.0 h1:vQy5GvPg3ndOSpduxutqFoINhWk3vD5K2dXo5E8pqec= +github.com/muesli/mango-cobra v1.3.0/go.mod h1:Cj1ZrBu3806Qw7UjxnAUgE+7tllUBj1NCLQDwwGx19E= +github.com/muesli/mango-pflag v0.2.0 h1:QViokgKDZQCzKhYe1zH8D+UlPJzBSGoP9yx0hBG0t5k= +github.com/muesli/mango-pflag v0.2.0/go.mod h1:X9LT1p/pbGA1wjvEbtwnixujKErkP0jVmrxwrw3fL0Y= +github.com/muesli/roff v0.1.0 h1:YD0lalCotmYuF5HhZliKWlIx7IEhiXeSfq7hNjFqGF8= +github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig= github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= -github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY= github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tj/assert v0.0.0-20190920132354-ee03d75cd160 h1:NSWpaDaurcAJY7PkL8Xt0PhZE7qpvbZl5ljd8r6U0bI= github.com/tj/assert v0.0.0-20190920132354-ee03d75cd160/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= @@ -118,14 +142,16 @@ golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI= golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= +golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= +golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= -golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= -golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo= -golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg= +golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= +golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU= +golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY= +golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ= +golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index 63cfeb794b14fed6e0b98eb7035f4684f4fdf592..a4db1a9544b2a0fd2064743338ca9973845ee1d5 100644 --- a/main.go +++ b/main.go @@ -5,7 +5,7 @@ // lunatask-mcp-server exposes Lunatask to LLMs via the Model Context Protocol. package main -import "git.sr.ht/~amolith/lunatask-mcp-server/cmd" +import "git.secluded.site/lunatask-mcp-server/cmd" var version = "dev" diff --git a/tools/areas/handler.go b/tools/areas/handler.go index b117576cc749433092a49c859633da8e32e16943..cb6634f540014bb9878c9714456480f3d37debf8 100644 --- a/tools/areas/handler.go +++ b/tools/areas/handler.go @@ -11,7 +11,7 @@ import ( "github.com/modelcontextprotocol/go-sdk/mcp" - "git.sr.ht/~amolith/lunatask-mcp-server/tools/shared" + "git.secluded.site/lunatask-mcp-server/tools/shared" ) // ResourceURI is the URI for the areas resource. diff --git a/tools/habits/handler.go b/tools/habits/handler.go index cf799430f5ff09d0cc8ccf264234710e362b4498..7956fdeb8c9b98d74ad5d82a8ec631c41cb7eb9c 100644 --- a/tools/habits/handler.go +++ b/tools/habits/handler.go @@ -13,7 +13,7 @@ import ( "git.secluded.site/go-lunatask" "github.com/modelcontextprotocol/go-sdk/mcp" - "git.sr.ht/~amolith/lunatask-mcp-server/tools/shared" + "git.secluded.site/lunatask-mcp-server/tools/shared" ) // Handler handles habit-related MCP tool calls. diff --git a/tools/tasks/handler.go b/tools/tasks/handler.go index b784e27d5da5c765a94850243e8489f5b6ff66d4..4fd78db4a6e48a62f480079d8aab3d4bbc91d8ea 100644 --- a/tools/tasks/handler.go +++ b/tools/tasks/handler.go @@ -12,7 +12,7 @@ import ( "git.secluded.site/go-lunatask" "github.com/modelcontextprotocol/go-sdk/mcp" - "git.sr.ht/~amolith/lunatask-mcp-server/tools/shared" + "git.secluded.site/lunatask-mcp-server/tools/shared" ) // MaxNameLength is the maximum allowed task name length. diff --git a/tools/timestamp/handler.go b/tools/timestamp/handler.go index d77983cdf190ae59a635ec196c6d7cdfc4d08c96..9c9df0cf867a78bb4c39be8a284d27a396dd86b6 100644 --- a/tools/timestamp/handler.go +++ b/tools/timestamp/handler.go @@ -14,7 +14,7 @@ import ( "github.com/ijt/go-anytime" "github.com/modelcontextprotocol/go-sdk/mcp" - "git.sr.ht/~amolith/lunatask-mcp-server/tools/shared" + "git.secluded.site/lunatask-mcp-server/tools/shared" ) // Handler handles timestamp-related MCP tool calls.