Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0d7b2ce

Browse files
committed
feat(codersdk): add toolsdk and replace existing mcp server tool impl
1 parent1e0051a commit0d7b2ce

File tree

7 files changed

+1694
-1046
lines changed

7 files changed

+1694
-1046
lines changed

‎cli/exp_mcp.go

Lines changed: 63 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ import (
66
"errors"
77
"os"
88
"path/filepath"
9+
"slices"
910
"strings"
1011

12+
"github.com/mark3labs/mcp-go/mcp"
1113
"github.com/mark3labs/mcp-go/server"
1214
"github.com/spf13/afero"
1315
"golang.org/x/xerrors"
1416

15-
"cdr.dev/slog"
16-
"cdr.dev/slog/sloggers/sloghuman"
1717
"github.com/coder/coder/v2/buildinfo"
1818
"github.com/coder/coder/v2/cli/cliui"
1919
"github.com/coder/coder/v2/codersdk"
2020
"github.com/coder/coder/v2/codersdk/agentsdk"
21-
codermcp"github.com/coder/coder/v2/mcp"
21+
"github.com/coder/coder/v2/codersdk/toolsdk"
2222
"github.com/coder/serpent"
2323
)
2424

@@ -365,6 +365,8 @@ func mcpServerHandler(inv *serpent.Invocation, client *codersdk.Client, instruct
365365
ctx,cancel:=context.WithCancel(inv.Context())
366366
defercancel()
367367

368+
fs:=afero.NewOsFs()
369+
368370
me,err:=client.User(ctx,codersdk.Me)
369371
iferr!=nil {
370372
cliui.Errorf(inv.Stderr,"Failed to log in to the Coder deployment.")
@@ -397,40 +399,36 @@ func mcpServerHandler(inv *serpent.Invocation, client *codersdk.Client, instruct
397399
server.WithInstructions(instructions),
398400
)
399401

400-
// Create a separate logger for the tools.
401-
toolLogger:=slog.Make(sloghuman.Sink(invStderr))
402-
403-
toolDeps:= codermcp.ToolDeps{
404-
Client:client,
405-
Logger:&toolLogger,
406-
AppStatusSlug:appStatusSlug,
407-
AgentClient:agentsdk.New(client.URL),
408-
}
409-
402+
// Create a new context for the tools with all relevant information.
403+
clientCtx:=toolsdk.WithClient(ctx,client)
410404
// Get the workspace agent token from the environment.
411-
agentToken,ok:=os.LookupEnv("CODER_AGENT_TOKEN")
412-
ifok&&agentToken!="" {
413-
toolDeps.AgentClient.SetSessionToken(agentToken)
405+
ifagentToken,err:=getAgentToken(fs);err==nil&&agentToken!="" {
406+
agentClient:=agentsdk.New(client.URL)
407+
agentClient.SetSessionToken(agentToken)
408+
clientCtx=toolsdk.WithAgentClient(clientCtx,agentClient)
414409
}else {
415410
cliui.Warnf(inv.Stderr,"CODER_AGENT_TOKEN is not set, task reporting will not be available")
416411
}
417-
ifappStatusSlug=="" {
412+
ifappStatusSlug!="" {
418413
cliui.Warnf(inv.Stderr,"CODER_MCP_APP_STATUS_SLUG is not set, task reporting will not be available.")
414+
}else {
415+
clientCtx=toolsdk.WithWorkspaceAppStatusSlug(clientCtx,appStatusSlug)
419416
}
420417

421418
// Register tools based on the allowlist (if specified)
422-
reg:=codermcp.AllTools()
423-
iflen(allowedTools)>0 {
424-
reg=reg.WithOnlyAllowed(allowedTools...)
419+
for_,tool:=rangetoolsdk.All {
420+
iflen(allowedTools)==0||slices.ContainsFunc(allowedTools,func(tstring)bool {
421+
returnt==tool.Tool.Name
422+
}) {
423+
mcpSrv.AddTools(mcpFromSDK(tool))
424+
}
425425
}
426426

427-
reg.Register(mcpSrv,toolDeps)
428-
429427
srv:=server.NewStdioServer(mcpSrv)
430428
done:=make(chanerror)
431429
gofunc() {
432430
deferclose(done)
433-
srvErr:=srv.Listen(ctx,invStdin,invStdout)
431+
srvErr:=srv.Listen(clientCtx,invStdin,invStdout)
434432
done<-srvErr
435433
}()
436434

@@ -674,7 +672,7 @@ func indexOf(s, substr string) int {
674672

675673
funcgetAgentToken(fs afero.Fs) (string,error) {
676674
token,ok:=os.LookupEnv("CODER_AGENT_TOKEN")
677-
ifok {
675+
ifok&&token!=""{
678676
returntoken,nil
679677
}
680678
tokenFile,ok:=os.LookupEnv("CODER_AGENT_TOKEN_FILE")
@@ -687,3 +685,44 @@ func getAgentToken(fs afero.Fs) (string, error) {
687685
}
688686
returnstring(bs),nil
689687
}
688+
689+
// mcpFromSDK adapts a toolsdk.Tool to go-mcp's server.ServerTool.
690+
// It assumes that the tool responds with a valid JSON object.
691+
funcmcpFromSDK(sdkTool toolsdk.Tool[any]) server.ServerTool {
692+
return server.ServerTool{
693+
Tool: mcp.Tool{
694+
Name:sdkTool.Tool.Name,
695+
Description:sdkTool.Description,
696+
InputSchema: mcp.ToolInputSchema{
697+
Type:"object",// Default of mcp.NewTool()
698+
Properties:sdkTool.Schema.Properties,
699+
Required:sdkTool.Schema.Required,
700+
},
701+
},
702+
Handler:func(ctx context.Context,request mcp.CallToolRequest) (*mcp.CallToolResult,error) {
703+
result,err:=sdkTool.Handler(ctx,request.Params.Arguments)
704+
iferr!=nil {
705+
returnnil,err
706+
}
707+
varsb strings.Builder
708+
iferr:=json.NewEncoder(&sb).Encode(result);err==nil {
709+
return&mcp.CallToolResult{
710+
Content: []mcp.Content{
711+
mcp.NewTextContent(sb.String()),
712+
},
713+
},nil
714+
}
715+
// If the result is not JSON, return it as a string.
716+
// This is a fallback for tools that return non-JSON data.
717+
resultStr,ok:=result.(string)
718+
if!ok {
719+
returnnil,xerrors.Errorf("tool call result is neither valid JSON or a string, got: %T",result)
720+
}
721+
return&mcp.CallToolResult{
722+
Content: []mcp.Content{
723+
mcp.NewTextContent(resultStr),
724+
},
725+
},nil
726+
},
727+
}
728+
}

‎cli/exp_mcp_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,13 @@ func TestExpMcpServer(t *testing.T) {
3939
_=coderdtest.CreateFirstUser(t,client)
4040

4141
// Given: we run the exp mcp command with allowed tools set
42-
inv,root:=clitest.New(t,"exp","mcp","server","--allowed-tools=coder_whoami,coder_list_templates")
42+
inv,root:=clitest.New(t,"exp","mcp","server","--allowed-tools=coder_whoami")
4343
inv=inv.WithContext(cancelCtx)
4444

4545
pty:=ptytest.New(t)
4646
inv.Stdin=pty.Input()
4747
inv.Stdout=pty.Output()
48+
// nolint: gocritic // not the focus of this test
4849
clitest.SetupConfig(t,client,root)
4950

5051
cmdDone:=make(chanstruct{})
@@ -73,13 +74,13 @@ func TestExpMcpServer(t *testing.T) {
7374
}
7475
err:=json.Unmarshal([]byte(output),&toolsResponse)
7576
require.NoError(t,err)
76-
require.Len(t,toolsResponse.Result.Tools,2,"should have exactly2 tools")
77+
require.Len(t,toolsResponse.Result.Tools,1,"should have exactly1 tool")
7778
foundTools:=make([]string,0,2)
7879
for_,tool:=rangetoolsResponse.Result.Tools {
7980
foundTools=append(foundTools,tool.Name)
8081
}
8182
slices.Sort(foundTools)
82-
require.Equal(t, []string{"coder_list_templates","coder_whoami"},foundTools)
83+
require.Equal(t, []string{"coder_whoami"},foundTools)
8384
})
8485

8586
t.Run("OK",func(t*testing.T) {

‎coderd/database/dbfake/dbfake.go

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -287,23 +287,25 @@ type TemplateVersionResponse struct {
287287
}
288288

289289
typeTemplateVersionBuilderstruct {
290-
t testing.TB
291-
db database.Store
292-
seed database.TemplateVersion
293-
fileID uuid.UUID
294-
ps pubsub.Pubsub
295-
resources []*sdkproto.Resource
296-
params []database.TemplateVersionParameter
297-
promotebool
290+
t testing.TB
291+
db database.Store
292+
seed database.TemplateVersion
293+
fileID uuid.UUID
294+
ps pubsub.Pubsub
295+
resources []*sdkproto.Resource
296+
params []database.TemplateVersionParameter
297+
promotebool
298+
autoCreateTemplatebool
298299
}
299300

300301
// TemplateVersion generates a template version and optionally a parent
301302
// template if no template ID is set on the seed.
302303
funcTemplateVersion(t testing.TB,db database.Store)TemplateVersionBuilder {
303304
returnTemplateVersionBuilder{
304-
t:t,
305-
db:db,
306-
promote:true,
305+
t:t,
306+
db:db,
307+
promote:true,
308+
autoCreateTemplate:true,
307309
}
308310
}
309311

@@ -337,6 +339,13 @@ func (t TemplateVersionBuilder) Params(ps ...database.TemplateVersionParameter)
337339
returnt
338340
}
339341

342+
func (tTemplateVersionBuilder)SkipCreateTemplate()TemplateVersionBuilder {
343+
// nolint: revive // returns modified struct
344+
t.autoCreateTemplate=false
345+
t.promote=false
346+
returnt
347+
}
348+
340349
func (tTemplateVersionBuilder)Do()TemplateVersionResponse {
341350
t.t.Helper()
342351

@@ -347,7 +356,7 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse {
347356
t.fileID=takeFirst(t.fileID,uuid.New())
348357

349358
varrespTemplateVersionResponse
350-
ift.seed.TemplateID.UUID==uuid.Nil {
359+
ift.seed.TemplateID.UUID==uuid.Nil&&t.autoCreateTemplate{
351360
resp.Template=dbgen.Template(t.t,t.db, database.Template{
352361
ActiveVersionID:t.seed.ID,
353362
OrganizationID:t.seed.OrganizationID,
@@ -360,16 +369,14 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse {
360369
}
361370

362371
version:=dbgen.TemplateVersion(t.t,t.db,t.seed)
363-
364-
// Always make this version the active version. We can easily
365-
// add a conditional to the builder to opt out of this when
366-
// necessary.
367-
err:=t.db.UpdateTemplateActiveVersionByID(ownerCtx, database.UpdateTemplateActiveVersionByIDParams{
368-
ID:t.seed.TemplateID.UUID,
369-
ActiveVersionID:t.seed.ID,
370-
UpdatedAt:dbtime.Now(),
371-
})
372-
require.NoError(t.t,err)
372+
ift.promote {
373+
err:=t.db.UpdateTemplateActiveVersionByID(ownerCtx, database.UpdateTemplateActiveVersionByIDParams{
374+
ID:t.seed.TemplateID.UUID,
375+
ActiveVersionID:t.seed.ID,
376+
UpdatedAt:dbtime.Now(),
377+
})
378+
require.NoError(t.t,err)
379+
}
373380

374381
payload,err:=json.Marshal(provisionerdserver.TemplateVersionImportJob{
375382
TemplateVersionID:t.seed.ID,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp