rm copypasta

johnstcn · johnstcn · commit ba898b9907e0 · 2025-03-27T21:17:00.000Z
diff --git a/mcp/tools/tools_coder.go b/mcp/tools/tools_coder.go
@@ -214,21 +214,9 @@ func handleCoderWorkspaceExec(client *codersdk.Client) mcpserver.ToolHandlerFunc
 
 		// Attempt to fetch the workspace. We may get a UUID or a name, so try to
 		// handle both.
-		var ws codersdk.Workspace
-		if wsid, err := uuid.Parse(wsArg); err == nil {
-			ws, err = client.Workspace(ctx, wsid)
-			if err != nil {
-				return nil, xerrors.Errorf("failed to fetch workspace: %w", err)
-			}
-		} else {
-			owner, workspaceName, err := splitNamedWorkspace(wsArg)
-			if err != nil {
-				return nil, xerrors.Errorf("failed to split workspace name: %w", err)
-			}
-			ws, err = client.WorkspaceByOwnerAndName(ctx, owner, workspaceName, codersdk.WorkspaceOptions{})
-			if err != nil {
-				return nil, xerrors.Errorf("failed to fetch workspace: %w", err)
-			}
+		ws, err := getWorkspaceByIDOrOwnerName(ctx, client, wsArg)
+		if err != nil {
+			return nil, xerrors.Errorf("failed to fetch workspace: %w", err)
 		}
 
 		// Ensure the workspace is started.
@@ -277,19 +265,9 @@ func handleCoderWorkspaceExec(client *codersdk.Client) mcpserver.ToolHandlerFunc
 	}
 }
 
-// COPYPASTA: from cli/root.go
-func splitNamedWorkspace(identifier string) (owner string, workspaceName string, err error) {
-	parts := strings.Split(identifier, "/")
-
-	switch len(parts) {
-	case 1:
-		owner = codersdk.Me
-		workspaceName = parts[0]
-	case 2:
-		owner = parts[0]
-		workspaceName = parts[1]
-	default:
-		return "", "", xerrors.Errorf("invalid workspace name: %q should be in the format <workspace> or <owner>/<workspace>", identifier)
+func getWorkspaceByIDOrOwnerName(ctx context.Context, client *codersdk.Client, identifier string) (codersdk.Workspace, error) {
+	if wsid, err := uuid.Parse(identifier); err == nil {
+		return client.Workspace(ctx, wsid)
 	}
-	return owner, workspaceName, nil
+	return client.WorkspaceByOwnerAndName(ctx, codersdk.Me, identifier, codersdk.WorkspaceOptions{})
 }
