fix: updates to mcp

benjivesterby · benjivesterby · commit 88d0b5adadc5 · 2025-11-01T16:59:27.000-04:00
diff --git a/canary-new b/canary-new
diff --git a/cli/checkpoint/checkpoint.go b/cli/checkpoint/checkpoint.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
-	"go.devnw.com/canary/internal/storage"
 	"go.devnw.com/canary/cli/internal/utils"
+	"go.devnw.com/canary/internal/storage"
 )
 
 // CANARY: REQ=CBIN-128; FEATURE="CheckpointCmd"; ASPECT=CLI; STATUS=IMPL; OWNER=canary; UPDATED=2025-10-16
diff --git a/cli/cmds.go b/cli/cmds.go
@@ -40,7 +40,8 @@ import (
 // Subcommands are already registered with their parent commands via init() functions.
 //
 // Usage:
-//   rootCmd.AddCommand(cli.Commands()...)
+//
+//	rootCmd.AddCommand(cli.Commands()...)
 //
 // Note: Commands with subcommands (bug, gap, deps, project, db, doc, legacy, migrate)
 // have their subcommands registered in their respective package init() functions.
@@ -85,9 +86,9 @@ func Commands() []*cobra.Command {
 		deps.CreateDepsCommand(),
 
 		// Advanced features with subcommands
-		gap.GapCmd,  // Subcommands: mark, query, report, helpful, unhelpful, config, categories
+		gap.GapCmd, // Subcommands: mark, query, report, helpful, unhelpful, config, categories
 		specs.SpecsCmd,
-		bug.BugCmd,  // Subcommands: list, create, update, show
+		bug.BugCmd, // Subcommands: list, create, update, show
 
 		// Project management
 		project.DbCmd,
diff --git a/cli/implement/implement.go b/cli/implement/implement.go
@@ -16,8 +16,8 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"go.devnw.com/canary/internal/matcher"
 	"go.devnw.com/canary/cli/internal/utils"
+	"go.devnw.com/canary/internal/matcher"
 )
 
 // CANARY: REQ=CBIN-133; FEATURE="ImplementCmd"; ASPECT=CLI; STATUS=TESTED; TEST=TestCANARY_CBIN_133_CLI_ExactMatch; OWNER=canary; DOC=user:docs/user/implement-command-guide.md; DOC_HASH=ed68fb1d97cf0562; UPDATED=2025-10-17
diff --git a/cli/index/index.go b/cli/index/index.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"go.devnw.com/canary/internal/storage"
 	"go.devnw.com/canary/cli/internal/utils"
+	"go.devnw.com/canary/internal/storage"
 )
 
 // CANARY: REQ=CBIN-124; FEATURE="IndexCmd"; ASPECT=CLI; STATUS=IMPL; OWNER=canary; UPDATED=2025-10-16
diff --git a/cli/init/canary.go b/cli/init/canary.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"go.devnw.com/canary/embedded"
 	"go.devnw.com/canary/cli/internal/utils"
+	"go.devnw.com/canary/embedded"
 )
 
 // CANARY: REQ=CBIN-105; FEATURE="InitWorkflow"; ASPECT=CLI; STATUS=IMPL; OWNER=canary; UPDATED=2025-10-16
diff --git a/cli/init/copilot.go b/cli/init/copilot.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"text/template"
+
 	"go.devnw.com/canary/cli/internal/utils"
 )
 
diff --git a/cli/list/list.go b/cli/list/list.go
@@ -7,8 +7,8 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
-	"go.devnw.com/canary/internal/storage"
 	"go.devnw.com/canary/cli/internal/utils"
+	"go.devnw.com/canary/internal/storage"
 )
 
 // CANARY: REQ=CBIN-125; FEATURE="ListCmd"; ASPECT=CLI; STATUS=IMPL; OWNER=canary; UPDATED=2025-10-16
diff --git a/cli/next/next.go b/cli/next/next.go
@@ -17,9 +17,9 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
+	"go.devnw.com/canary/cli/internal/utils"
 	"go.devnw.com/canary/internal/config"
 	"go.devnw.com/canary/internal/storage"
-	"go.devnw.com/canary/cli/internal/utils"
 )
 
 // CANARY: REQ=CBIN-132; FEATURE="NextCmd"; ASPECT=CLI; STATUS=BENCHED; TEST=TestCANARY_CBIN_132_CLI_NextPrioritySelection; BENCH=BenchmarkCANARY_CBIN_132_CLI_PriorityQuery; OWNER=canary; DOC=user:docs/user/next-priority-guide.md; DOC_HASH=17524f7a14d2c410; UPDATED=2025-10-17
diff --git a/cli/plan/plan.go b/cli/plan/plan.go
@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
+	"go.devnw.com/canary/cli/internal/utils"
 	"go.devnw.com/canary/internal/gap"
 	"go.devnw.com/canary/internal/reqid"
 	"go.devnw.com/canary/internal/storage"
-	"go.devnw.com/canary/cli/internal/utils"
 )
 
 // CANARY: REQ=CBIN-121; FEATURE="PlanCmd"; ASPECT=CLI; STATUS=IMPL; OWNER=canary; UPDATED=2025-10-16
diff --git a/cli/specify/specify.go b/cli/specify/specify.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/spf13/cobra"
-	"go.devnw.com/canary/internal/reqid"
 	"go.devnw.com/canary/cli/internal/utils"
+	"go.devnw.com/canary/internal/reqid"
 )
 
 // CANARY: REQ=CBIN-120; FEATURE="SpecifyCmd"; ASPECT=CLI; STATUS=IMPL; OWNER=canary; UPDATED=2025-10-16
diff --git a/go.mod b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/golang-migrate/migrate/v4 v4.19.0
 	github.com/invopop/jsonschema v0.13.0
 	github.com/jmoiron/sqlx v1.4.0
+	github.com/modelcontextprotocol/go-sdk v1.1.0
 	github.com/openai/openai-go v1.12.0
 	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
 	github.com/spf13/cobra v1.10.1
diff --git a/go.sum b/go.sum
@@ -17,6 +17,8 @@ github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpv
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/golang-migrate/migrate/v4 v4.19.0 h1:RcjOnCGz3Or6HQYEJ/EEVLfWnmw9KnoigPSjzhCuaSE=
 github.com/golang-migrate/migrate/v4 v4.19.0/go.mod h1:9dyEcu+hO+G9hPSw8AIg50yg622pXJsoHItQnDGZkI0=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/jsonschema-go v0.3.0 h1:6AH2TxVNtk3IlvkkhjrtbUc4S8AvO0Xii0DxIygDg+Q=
 github.com/google/jsonschema-go v0.3.0/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
 github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"strings"`
`8`	`8`
`9`	`9`	`"github.com/spf13/cobra"`
`10`		`- "go.devnw.com/canary/internal/storage"`
`11`	`10`	`"go.devnw.com/canary/cli/internal/utils"`
	`11`	`+ "go.devnw.com/canary/internal/storage"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// CANARY: REQ=CBIN-128; FEATURE="CheckpointCmd"; ASPECT=CLI; STATUS=IMPL; OWNER=canary; UPDATED=2025-10-16`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ import (`
`16`	`16`	`"time"`
`17`	`17`
`18`	`18`	`"github.com/spf13/cobra"`
`19`		`- "go.devnw.com/canary/internal/matcher"`
`20`	`19`	`"go.devnw.com/canary/cli/internal/utils"`
	`20`	`+ "go.devnw.com/canary/internal/matcher"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`// CANARY: REQ=CBIN-133; FEATURE="ImplementCmd"; ASPECT=CLI; STATUS=TESTED; TEST=TestCANARY_CBIN_133_CLI_ExactMatch; OWNER=canary; DOC=user:docs/user/implement-command-guide.md; DOC_HASH=ed68fb1d97cf0562; UPDATED=2025-10-17`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ import (`
`9`	`9`	`"time"`
`10`	`10`
`11`	`11`	`"github.com/spf13/cobra"`
`12`		`- "go.devnw.com/canary/internal/storage"`
`13`	`12`	`"go.devnw.com/canary/cli/internal/utils"`
	`13`	`+ "go.devnw.com/canary/internal/storage"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`// CANARY: REQ=CBIN-124; FEATURE="IndexCmd"; ASPECT=CLI; STATUS=IMPL; OWNER=canary; UPDATED=2025-10-16`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"path/filepath"`
`8`	`8`	`"strings"`
`9`	`9`
`10`		`- "go.devnw.com/canary/embedded"`
`11`	`10`	`"go.devnw.com/canary/cli/internal/utils"`
	`11`	`+ "go.devnw.com/canary/embedded"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// CANARY: REQ=CBIN-105; FEATURE="InitWorkflow"; ASPECT=CLI; STATUS=IMPL; OWNER=canary; UPDATED=2025-10-16`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`	`"path/filepath"`
`7`	`7`	`"text/template"`
	`8`	`+`
`8`	`9`	`"go.devnw.com/canary/cli/internal/utils"`
`9`	`10`	`)`
`10`	`11`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"strconv"`
`8`	`8`
`9`	`9`	`"github.com/spf13/cobra"`
`10`		`- "go.devnw.com/canary/internal/storage"`
`11`	`10`	`"go.devnw.com/canary/cli/internal/utils"`
	`11`	`+ "go.devnw.com/canary/internal/storage"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// CANARY: REQ=CBIN-125; FEATURE="ListCmd"; ASPECT=CLI; STATUS=IMPL; OWNER=canary; UPDATED=2025-10-16`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ import (`
`17`	`17`	`"time"`
`18`	`18`
`19`	`19`	`"github.com/spf13/cobra"`
	`20`	`+ "go.devnw.com/canary/cli/internal/utils"`
`20`	`21`	`"go.devnw.com/canary/internal/config"`
`21`	`22`	`"go.devnw.com/canary/internal/storage"`
`22`		`- "go.devnw.com/canary/cli/internal/utils"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`// CANARY: REQ=CBIN-132; FEATURE="NextCmd"; ASPECT=CLI; STATUS=BENCHED; TEST=TestCANARY_CBIN_132_CLI_NextPrioritySelection; BENCH=BenchmarkCANARY_CBIN_132_CLI_PriorityQuery; OWNER=canary; DOC=user:docs/user/next-priority-guide.md; DOC_HASH=17524f7a14d2c410; UPDATED=2025-10-17`