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

Commitc5282ea

Browse files
committed
Extract connecting to agent from MCP
This will be used in multiple tools.
1 parent8083d9d commitc5282ea

File tree

4 files changed

+119
-116
lines changed

4 files changed

+119
-116
lines changed

‎codersdk/toolsdk/bash.go‎

Lines changed: 2 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717

1818
"github.com/coder/coder/v2/cli/cliui"
1919
"github.com/coder/coder/v2/codersdk"
20-
"github.com/coder/coder/v2/codersdk/workspacesdk"
2120
)
2221

2322
typeWorkspaceBashArgsstruct {
@@ -94,42 +93,12 @@ Examples:
9493
ctx,cancel:=context.WithTimeoutCause(ctx,5*time.Minute,xerrors.New("MCP handler timeout after 5 min"))
9594
defercancel()
9695

97-
// Normalize workspace input to handle various formats
98-
workspaceName:=NormalizeWorkspaceInput(args.Workspace)
99-
100-
// Find workspace and agent
101-
_,workspaceAgent,err:=findWorkspaceAndAgent(ctx,deps.coderClient,workspaceName)
102-
iferr!=nil {
103-
returnWorkspaceBashResult{},xerrors.Errorf("failed to find workspace: %w",err)
104-
}
105-
106-
// Wait for agent to be ready
107-
iferr:=cliui.Agent(ctx,io.Discard,workspaceAgent.ID, cliui.AgentOptions{
108-
FetchInterval:0,
109-
Fetch:deps.coderClient.WorkspaceAgent,
110-
FetchLogs:deps.coderClient.WorkspaceAgentLogsAfter,
111-
Wait:true,// Always wait for startup scripts
112-
});err!=nil {
113-
returnWorkspaceBashResult{},xerrors.Errorf("agent not ready: %w",err)
114-
}
115-
116-
// Create workspace SDK client for agent connection
117-
wsClient:=workspacesdk.New(deps.coderClient)
118-
119-
// Dial agent
120-
conn,err:=wsClient.DialAgent(ctx,workspaceAgent.ID,&workspacesdk.DialAgentOptions{
121-
BlockEndpoints:false,
122-
})
96+
conn,err:=newAgentConn(ctx,deps.coderClient,args.Workspace)
12397
iferr!=nil {
124-
returnWorkspaceBashResult{},xerrors.Errorf("failed to dial agent: %w",err)
98+
returnWorkspaceBashResult{},err
12599
}
126100
deferconn.Close()
127101

128-
// Wait for connection to be reachable
129-
if!conn.AwaitReachable(ctx) {
130-
returnWorkspaceBashResult{},xerrors.New("agent connection not reachable")
131-
}
132-
133102
// Create SSH client
134103
sshClient,err:=conn.SSHClient(ctx)
135104
iferr!=nil {
@@ -323,32 +292,6 @@ func namedWorkspace(ctx context.Context, client *codersdk.Client, identifier str
323292
returnclient.WorkspaceByOwnerAndName(ctx,owner,workspaceName, codersdk.WorkspaceOptions{})
324293
}
325294

326-
// NormalizeWorkspaceInput converts workspace name input to standard format.
327-
// Handles the following input formats:
328-
// - workspace → workspace
329-
// - workspace.agent → workspace.agent
330-
// - owner/workspace → owner/workspace
331-
// - owner--workspace → owner/workspace
332-
// - owner/workspace.agent → owner/workspace.agent
333-
// - owner--workspace.agent → owner/workspace.agent
334-
// - agent.workspace.owner → owner/workspace.agent (Coder Connect format)
335-
funcNormalizeWorkspaceInput(inputstring)string {
336-
// Handle the special Coder Connect format: agent.workspace.owner
337-
// This format uses only dots and has exactly 3 parts
338-
ifstrings.Count(input,".")==2&&!strings.Contains(input,"/")&&!strings.Contains(input,"--") {
339-
parts:=strings.Split(input,".")
340-
iflen(parts)==3 {
341-
// Convert agent.workspace.owner → owner/workspace.agent
342-
returnfmt.Sprintf("%s/%s.%s",parts[2],parts[1],parts[0])
343-
}
344-
}
345-
346-
// Convert -- separator to / separator for consistency
347-
normalized:=strings.ReplaceAll(input,"--","/")
348-
349-
returnnormalized
350-
}
351-
352295
// executeCommandWithTimeout executes a command with timeout support
353296
funcexecuteCommandWithTimeout(ctx context.Context,session*gossh.Session,commandstring) ([]byte,error) {
354297
// Set up pipes to capture output

‎codersdk/toolsdk/bash_test.go‎

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -99,63 +99,6 @@ func TestWorkspaceBash(t *testing.T) {
9999
})
100100
}
101101

102-
funcTestNormalizeWorkspaceInput(t*testing.T) {
103-
t.Parallel()
104-
ifruntime.GOOS=="windows" {
105-
t.Skip("Skipping on Windows: Workspace MCP bash tools rely on a Unix-like shell (bash) and POSIX/SSH semantics. Use Linux/macOS or WSL for these tests.")
106-
}
107-
108-
testCases:= []struct {
109-
namestring
110-
inputstring
111-
expectedstring
112-
}{
113-
{
114-
name:"SimpleWorkspace",
115-
input:"workspace",
116-
expected:"workspace",
117-
},
118-
{
119-
name:"WorkspaceWithAgent",
120-
input:"workspace.agent",
121-
expected:"workspace.agent",
122-
},
123-
{
124-
name:"OwnerAndWorkspace",
125-
input:"owner/workspace",
126-
expected:"owner/workspace",
127-
},
128-
{
129-
name:"OwnerDashWorkspace",
130-
input:"owner--workspace",
131-
expected:"owner/workspace",
132-
},
133-
{
134-
name:"OwnerWorkspaceAgent",
135-
input:"owner/workspace.agent",
136-
expected:"owner/workspace.agent",
137-
},
138-
{
139-
name:"OwnerDashWorkspaceAgent",
140-
input:"owner--workspace.agent",
141-
expected:"owner/workspace.agent",
142-
},
143-
{
144-
name:"CoderConnectFormat",
145-
input:"agent.workspace.owner",// Special Coder Connect reverse format
146-
expected:"owner/workspace.agent",
147-
},
148-
}
149-
150-
for_,tc:=rangetestCases {
151-
t.Run(tc.name,func(t*testing.T) {
152-
t.Parallel()
153-
result:=toolsdk.NormalizeWorkspaceInput(tc.input)
154-
require.Equal(t,tc.expected,result,"Input %q should normalize to %q but got %q",tc.input,tc.expected,result)
155-
})
156-
}
157-
}
158-
159102
funcTestAllToolsIncludesBash(t*testing.T) {
160103
t.Parallel()
161104
ifruntime.GOOS=="windows" {

‎codersdk/toolsdk/toolsdk.go‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ import (
55
"bytes"
66
"context"
77
"encoding/json"
8+
"fmt"
89
"io"
910
"runtime/debug"
11+
"strings"
1012

1113
"github.com/google/uuid"
1214
"golang.org/x/xerrors"
@@ -1360,3 +1362,64 @@ type MinimalTemplate struct {
13601362
ActiveVersionID uuid.UUID`json:"active_version_id"`
13611363
ActiveUserCountint`json:"active_user_count"`
13621364
}
1365+
1366+
// NormalizeWorkspaceInput converts workspace name input to standard format.
1367+
// Handles the following input formats:
1368+
// - workspace → workspace
1369+
// - workspace.agent → workspace.agent
1370+
// - owner/workspace → owner/workspace
1371+
// - owner--workspace → owner/workspace
1372+
// - owner/workspace.agent → owner/workspace.agent
1373+
// - owner--workspace.agent → owner/workspace.agent
1374+
// - agent.workspace.owner → owner/workspace.agent (Coder Connect format)
1375+
funcNormalizeWorkspaceInput(inputstring)string {
1376+
// Handle the special Coder Connect format: agent.workspace.owner
1377+
// This format uses only dots and has exactly 3 parts
1378+
ifstrings.Count(input,".")==2&&!strings.Contains(input,"/")&&!strings.Contains(input,"--") {
1379+
parts:=strings.Split(input,".")
1380+
iflen(parts)==3 {
1381+
// Convert agent.workspace.owner → owner/workspace.agent
1382+
returnfmt.Sprintf("%s/%s.%s",parts[2],parts[1],parts[0])
1383+
}
1384+
}
1385+
1386+
// Convert -- separator to / separator for consistency
1387+
normalized:=strings.ReplaceAll(input,"--","/")
1388+
1389+
returnnormalized
1390+
}
1391+
1392+
// newAgentConn returns a connection to the agent specified by the workspace,
1393+
// which must be in the format [owner/]workspace[.agent].
1394+
funcnewAgentConn(ctx context.Context,client*codersdk.Client,workspacestring) (workspacesdk.AgentConn,error) {
1395+
workspaceName:=NormalizeWorkspaceInput(workspace)
1396+
_,workspaceAgent,err:=findWorkspaceAndAgent(ctx,client,workspaceName)
1397+
iferr!=nil {
1398+
returnnil,xerrors.Errorf("failed to find workspace: %w",err)
1399+
}
1400+
1401+
// Wait for agent to be ready.
1402+
iferr:=cliui.Agent(ctx,io.Discard,workspaceAgent.ID, cliui.AgentOptions{
1403+
FetchInterval:0,
1404+
Fetch:client.WorkspaceAgent,
1405+
FetchLogs:client.WorkspaceAgentLogsAfter,
1406+
Wait:true,// Always wait for startup scripts
1407+
});err!=nil {
1408+
returnnil,xerrors.Errorf("agent not ready: %w",err)
1409+
}
1410+
1411+
wsClient:=workspacesdk.New(client)
1412+
1413+
conn,err:=wsClient.DialAgent(ctx,workspaceAgent.ID,&workspacesdk.DialAgentOptions{
1414+
BlockEndpoints:false,
1415+
})
1416+
iferr!=nil {
1417+
returnnil,xerrors.Errorf("failed to dial agent: %w",err)
1418+
}
1419+
1420+
if!conn.AwaitReachable(ctx) {
1421+
conn.Close()
1422+
returnnil,xerrors.New("agent connection not reachable")
1423+
}
1424+
returnconn,nil
1425+
}

‎codersdk/toolsdk/toolsdk_test.go‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,3 +748,57 @@ func TestReportTaskWithReporter(t *testing.T) {
748748
// Verify response
749749
require.Equal(t,"Thanks for reporting!",result.Message)
750750
}
751+
752+
funcTestNormalizeWorkspaceInput(t*testing.T) {
753+
t.Parallel()
754+
755+
testCases:= []struct {
756+
namestring
757+
inputstring
758+
expectedstring
759+
}{
760+
{
761+
name:"SimpleWorkspace",
762+
input:"workspace",
763+
expected:"workspace",
764+
},
765+
{
766+
name:"WorkspaceWithAgent",
767+
input:"workspace.agent",
768+
expected:"workspace.agent",
769+
},
770+
{
771+
name:"OwnerAndWorkspace",
772+
input:"owner/workspace",
773+
expected:"owner/workspace",
774+
},
775+
{
776+
name:"OwnerDashWorkspace",
777+
input:"owner--workspace",
778+
expected:"owner/workspace",
779+
},
780+
{
781+
name:"OwnerWorkspaceAgent",
782+
input:"owner/workspace.agent",
783+
expected:"owner/workspace.agent",
784+
},
785+
{
786+
name:"OwnerDashWorkspaceAgent",
787+
input:"owner--workspace.agent",
788+
expected:"owner/workspace.agent",
789+
},
790+
{
791+
name:"CoderConnectFormat",
792+
input:"agent.workspace.owner",// Special Coder Connect reverse format
793+
expected:"owner/workspace.agent",
794+
},
795+
}
796+
797+
for_,tc:=rangetestCases {
798+
t.Run(tc.name,func(t*testing.T) {
799+
t.Parallel()
800+
result:=toolsdk.NormalizeWorkspaceInput(tc.input)
801+
require.Equal(t,tc.expected,result,"Input %q should normalize to %q but got %q",tc.input,tc.expected,result)
802+
})
803+
}
804+
}

0 commit comments

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